Bug 11149

Summary:

[S60] This is required so that correct dll gets loaded uunder webkit

Product:

WebKit

Reporter:

Shyam Sareen <shyam.sareen>

Component:

WebKit Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

CLOSED FIXED

Severity:

Normal

CC:

shyam.sareen

Priority:

Version:

420+

Hardware:

S60 Emulator

OS:

S60 3rd edition

Bug Depends on:

Bug Blocks:

9435

Attachments:

Description	Flags
Changes in memory Manager	yongjun.zhang: review-
Changes in the webkit	yongjun.zhang: review-
Change in the manin bld.inf file.	yongjun.zhang: review+
Add the Bugzilla ID	yongjun.zhang: review+
Add bugzilla id	yongjun.zhang: review+

Shyam Sareen

Reported 2006-10-04 06:31:20 PDT

This contains misc. mmp and bld.inf files for dll name change under open source code.

Attachments
Changes in memory Manager (3.83 KB, patch) 2006-10-04 07:08 PDT, Shyam Sareen	yongjun.zhang: review-	Details Formatted Diff Diff
Changes in the webkit (39.14 KB, patch) 2006-10-04 07:09 PDT, Shyam Sareen	yongjun.zhang: review-	Details Formatted Diff Diff
Change in the manin bld.inf file. (3.01 KB, patch) 2006-10-04 07:16 PDT, Shyam Sareen	yongjun.zhang: review+	Details Formatted Diff Diff
Add the Bugzilla ID (3.83 KB, patch) 2006-10-04 12:30 PDT, Shyam Sareen	yongjun.zhang: review+	Details Formatted Diff Diff
Add bugzilla id (39.15 KB, patch) 2006-10-04 12:31 PDT, Shyam Sareen	yongjun.zhang: review+	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Shyam Sareen

Comment 1 2006-10-04 07:08:51 PDT

Created attachment 10896 [details] Changes in memory Manager

Shyam Sareen

Comment 2 2006-10-04 07:09:36 PDT

Created attachment 10897 [details] Changes in the webkit

Shyam Sareen

Comment 3 2006-10-04 07:11:56 PDT

Comment on attachment 10897 [details] Changes in the webkit Please pay special attension during the commit of the file \WebKit\group\icon.mk. This requies the tab not the space. If spaces are there then make build breaks. So, careful about spaces.

Shyam Sareen

Comment 4 2006-10-04 07:16:06 PDT

Created attachment 10898 [details] Change in the manin bld.inf file.

Yongjun Zhang

Comment 5 2006-10-04 08:41:23 PDT

Comment on attachment 10896 [details] Changes in memory Manager Please add the bugzilla id to Changelog

Bradley Morrison

Comment 6 2006-10-04 11:06:37 PDT

Comment on attachment 10896 [details] Changes in memory Manager ><?xml version="1.0"?><html><body><pre>Index: MemoryManager/ChangeLog > >=================================================================== > >--- MemoryManager/ChangeLog (revision 16778) > >+++ MemoryManager/ChangeLog (working copy) > >@@ -1,3 +1,14 @@ > >+2006-10-04 sareen <shyam.sareen@nokia.com> > >+ > >+ Reviewed by Yongjun Zhang. > >+ DESC: Change the dll names under open source and change the > >+ def file. > >+ http://bugzilla.opendarwin.org/show_bug.cgi?id=11149 > >+ > >+ * BWINS/MemMan_sdkU.DEF: Added. > >+ * Group/MemMan.mmp: > >+ * Group/MemManTest.mmp: > >+ > > 2006-09-29 spadma <Sachin.Padma@nokia.com> > > > > Reviewed by Yongjun. > >Index: MemoryManager/BWINS/MemMan_sdkU.DEF > >=================================================================== > >--- MemoryManager/BWINS/MemMan_sdkU.DEF (revision 0) > >+++ MemoryManager/BWINS/MemMan_sdkU.DEF (revision 0) > >@@ -0,0 +1,19 @@ > >+EXPORTS > >+ ?AddCollector@MemoryManager@@SAXPAVMMemoryCollector@@@Z @ 1 NONAME ; void MemoryManager::AddCollector(class MMemoryCollector *) > >+ ?AddStopper@MemoryManager@@SAXPAVMOOMStopper@@@Z @ 2 NONAME ; void MemoryManager::AddStopper(class MOOMStopper *) > >+ ?Alloc@MemoryManager@@SAPAXI@Z @ 3 NONAME ; void * MemoryManager::Alloc(unsigned int) > >+ ?Calloc@MemoryManager@@SAPAXII@Z @ 4 NONAME ; void * MemoryManager::Calloc(unsigned int, unsigned int) > >+ ?Free@MemoryManager@@SAXPAX@Z @ 5 NONAME ; void MemoryManager::Free(void *) > >+ ?FreeRam@MemoryManager@@SAXXZ @ 6 NONAME ; void MemoryManager::FreeRam(void) > >+ ?PostCheck@MemoryManager@@SAIXZ @ 7 NONAME ; unsigned int MemoryManager::PostCheck(void) > >+ ?PreCheck@MemoryManager@@SAHIIABVTDesC8@@@Z @ 8 NONAME ; int MemoryManager::PreCheck(unsigned int, unsigned int, class TDesC8 const &) > >+ ?PrepareForExit@MemoryManager@@SAXXZ @ 9 NONAME ; void MemoryManager::PrepareForExit(void) > >+ ?ReAlloc@MemoryManager@@SAPAXPAXI@Z @ 10 NONAME ; void * MemoryManager::ReAlloc(void *, unsigned int) > >+ ?RemoveCollector@MemoryManager@@SAXPAVMMemoryCollector@@@Z @ 11 NONAME ; void MemoryManager::RemoveCollector(class MMemoryCollector *) > >+ ?RemoveStopper@MemoryManager@@SAXPAVMOOMStopper@@@Z @ 12 NONAME ; void MemoryManager::RemoveStopper(class MOOMStopper *) > >+ ?RestoreCollectors@MemoryManager@@SAXXZ @ 13 NONAME ; void MemoryManager::RestoreCollectors(void) > >+ ?SetNotifier@MemoryManager@@SAXPAVMOOMNotifier@@@Z @ 14 NONAME ; void MemoryManager::SetNotifier(class MOOMNotifier *) > >+ ?SetStatus@MemoryManager@@SAXW4TOOMCheckResult@@@Z @ 15 NONAME ; void MemoryManager::SetStatus(enum TOOMCheckResult) > >+ ?Status@MemoryManager@@SAIXZ @ 16 NONAME ; unsigned int MemoryManager::Status(void) > >+ ?SetRescueBufferSize@MemoryManager@@SAXH@Z @ 17 NONAME ; void MemoryManager::SetRescueBufferSize(int) > >+ > >Index: MemoryManager/Group/MemMan.mmp > >=================================================================== > >--- MemoryManager/Group/MemMan.mmp (revision 16634) > >+++ MemoryManager/Group/MemMan.mmp (working copy) > >@@ -38,12 +38,10 @@ > > * Please see file patentlicense.txt for further grants. > > * ============================================================================== > > */ > >-#ifndef __BROWSER_SDK > >-#include <domain\osextensions\platform_paths.hrh> > >-#endif > >-#ifdef __GCCE__ > >-TARGET MemMan_gcce.dll > >+#if defined(__BROWSER_SDK) > >+TARGET MemMan_sdk.dll > > #else > >+#include <domain\osextensions\platform_paths.hrh> > > TARGET MemMan.dll > > #endif > > > >Index: MemoryManager/Group/MemManTest.mmp > >=================================================================== > >--- MemoryManager/Group/MemManTest.mmp (revision 16634) > >+++ MemoryManager/Group/MemManTest.mmp (working copy) > >@@ -72,7 +72,11 @@ SOURCE MemManUTContainer.cpp > > > > > > LIBRARY ResLoader.lib > >-LIBRARY MemMan.lib > >+#if defined(__BROWSER_SDK) > >+LIBRARY MemMan_sdk.lib > >+#else > >+LIBRARY memman.lib > >+#endif > > LIBRARY ESTLIB.lib > > LIBRARY euser.lib > > LIBRARY EFSRV.lib

Yongjun Zhang

Comment 7 2006-10-04 11:20:16 PDT

Comment on attachment 10897 [details] Changes in the webkit Please add the bugzilla id in ChangeLog

Yongjun Zhang

Comment 8 2006-10-04 11:21:16 PDT

Comment on attachment 10898 [details] Change in the manin bld.inf file. r = me

Shyam Sareen

Comment 9 2006-10-04 12:30:24 PDT

Created attachment 10909 [details] Add the Bugzilla ID

Shyam Sareen

Comment 10 2006-10-04 12:31:02 PDT

Created attachment 10910 [details] Add bugzilla id

Yongjun Zhang

Comment 11 2006-10-04 12:32:25 PDT

Comment on attachment 10909 [details] Add the Bugzilla ID r=me

Yongjun Zhang

Comment 12 2006-10-04 12:32:54 PDT

Comment on attachment 10910 [details] Add bugzilla id r=me

Bradley Morrison

Comment 13 2006-10-10 09:25:36 PDT

Applied - r16969

Krishna

Comment 14 2006-10-16 11:00:15 PDT

TSW ID: KPOY-6UMN72

Krishna

Comment 15 2006-10-27 18:12:05 PDT

Verified on the S60WebKitTrunkSDK\20061027161039. Also Closed.

Note You need to log in before you can comment on or make changes to this bug.