December 2009 - Wine-Commits

Alexandre Julliard : user32: Store the 16-bit edit handle directly in the window extra bytes.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 810e701a3f21ccebdff4684ac1685d57d98f98ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=810e701a3f21ccebdff4684ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 18:13:03 2009 +0100 user32: Store the 16-bit edit handle directly in the window extra bytes. --- dlls/user32/edit.c | 56 ++++++++++++++++++++++++++++----------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 7f7520b..c91abc1 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -149,8 +149,6 @@ typedef struct LPINT tabs; LINEDEF *first_line_def; /* linked list of (soft) linebreaks */ HLOCAL hloc32W; /* our unicode local memory block */ - HLOCAL16 hloc16; /* alias for 16-bit control receiving EM_GETHANDLE16 - or EM_SETHANDLE16 */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ /* @@ -1176,29 +1174,32 @@ static inline void text_buffer_changed(EDITSTATE *es) es->text_length = (UINT)-1; } +#define GWW_HANDLE16 sizeof(EDITSTATE*) + /********************************************************************* * EDIT_LockBuffer16 */ static void EDIT_LockBuffer16(EDITSTATE *es) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); HANDLE16 oldDS; HLOCAL hloc32; UINT size; - if (!es->hloc16) return; + if (!hloc16) return; if (!(hloc32 = es->hloc32A)) return; oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - size = LocalSize16(es->hloc16); + size = LocalSize16(hloc16); if (LocalReAlloc( hloc32, size, LMEM_MOVEABLE )) { - char *text = MapSL( LocalLock16( es->hloc16 )); + char *text = MapSL( LocalLock16( hloc16 )); char *dest = LocalLock( hloc32 ); memcpy( dest, text, size ); LocalUnlock( hloc32 ); - LocalUnlock16( es->hloc16 ); + LocalUnlock16( hloc16 ); } stack16->ds = oldDS; @@ -1211,23 +1212,24 @@ static void EDIT_LockBuffer16(EDITSTATE *es) static void EDIT_UnlockBuffer16(EDITSTATE *es) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); HANDLE16 oldDS; HLOCAL hloc32; UINT size; - if (!es->hloc16) return; + if (!hloc16) return; if (!(hloc32 = es->hloc32A)) return; size = LocalSize( hloc32 ); oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - if (LocalReAlloc16( es->hloc16, size, LMEM_MOVEABLE )) + if (LocalReAlloc16( hloc16, size, LMEM_MOVEABLE )) { char *text = LocalLock( hloc32 ); - char *dest = MapSL( LocalLock16( es->hloc16 )); + char *dest = MapSL( LocalLock16( hloc16 )); memcpy( dest, text, size ); LocalUnlock( hloc32 ); - LocalUnlock16( es->hloc16 ); + LocalUnlock16( hloc16 ); } stack16->ds = oldDS; } @@ -2472,8 +2474,9 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) HLOCAL hloc; STACK16FRAME* stack16; HANDLE16 oldDS; + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); - if (es->hloc16) return es->hloc16; + if (hloc16) return hloc16; if (!(hloc = EDIT_EM_GetHandle(es))) return 0; alloc_size = LocalSize( hloc ); @@ -2492,26 +2495,27 @@ static HLOCAL16 EDIT_EM_GetHandle16(EDITSTATE *es) } TRACE("Allocating 16-bit ANSI alias buffer\n"); - if (!(es->hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { + if (!(hloc16 = LocalAlloc16(LMEM_MOVEABLE | LMEM_ZEROINIT, alloc_size))) { ERR("could not allocate new 16 bit buffer\n"); goto done; } - if (!(textA = MapSL(LocalLock16( es->hloc16)))) { + if (!(textA = MapSL(LocalLock16( hloc16)))) { ERR("could not lock new 16 bit buffer\n"); - LocalFree16(es->hloc16); - es->hloc16 = 0; + LocalFree16(hloc16); + hloc16 = 0; goto done; } memcpy( textA, LocalLock( hloc ), alloc_size ); LocalUnlock( hloc ); - LocalUnlock16(es->hloc16); + LocalUnlock16( hloc16 ); + SetWindowWord( es->hwndSelf, GWW_HANDLE16, hloc16 ); - TRACE("Returning %04X, LocalSize() = %d\n", es->hloc16, LocalSize16(es->hloc16)); + TRACE("Returning %04X, LocalSize() = %d\n", hloc16, alloc_size); done: stack16->ds = oldDS; - return es->hloc16; + return hloc16; } @@ -2893,7 +2897,7 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc16) memcpy( LocalLock(hloc32), text, count ); LocalUnlock(hloc32); LocalUnlock16(hloc16); - es->hloc16 = hloc16; + SetWindowWord( es->hwndSelf, GWW_HANDLE16, hloc16 ); } stack16->ds = oldDS; @@ -4683,6 +4687,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) { LINEDEF *pc, *pp; + HLOCAL16 hloc16 = GetWindowWord( es->hwndSelf, GWW_HANDLE16 ); if (es->hloc32W) { LocalFree(es->hloc32W); @@ -4690,14 +4695,15 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) if (es->hloc32A) { LocalFree(es->hloc32A); } - if (es->hloc16) { + if (hloc16) { STACK16FRAME* stack16 = MapSL(PtrToUlong(NtCurrentTeb()->WOW32Reserved)); HANDLE16 oldDS = stack16->ds; stack16->ds = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - while (LocalUnlock16(es->hloc16)) ; - LocalFree16(es->hloc16); + while (LocalUnlock16(hloc16)) ; + LocalFree16(hloc16); stack16->ds = oldDS; + SetWindowWord( es->hwndSelf, GWW_HANDLE16, 0 ); } pc = es->first_line_def; @@ -5411,10 +5417,10 @@ const struct builtin_class_descr EDIT_builtin_class = CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ -#ifdef _WIN64 - sizeof(EDITSTATE *), /* extra */ +#ifdef __i386__ + sizeof(EDITSTATE *) + sizeof(HLOCAL16), /* extra */ #else - sizeof(EDITSTATE *) + sizeof(HANDLE16), /* extra */ + sizeof(EDITSTATE *), /* extra */ #endif IDC_IBEAM, /* cursor */ 0 /* brush */

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the listbox winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 8b226ac4d69f8706cfeeed0a543df77a276ececc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b226ac4d69f8706cfeeed0a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:25:23 2009 +0100 user32: Split the handling of the 16-bit messages out of the listbox winproc. --- dlls/user32/listbox.c | 234 ++++++++++++++++++++++++------------------------- 1 files changed, 116 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b226ac4d69f8706cfeee…

1 0

Alexandre Julliard : user32: Split the handling of the 16-bit messages out of the combo winproc.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: wine Branch: master Commit: 51770cdbbc7cc8efa59aa62f8d5f503616540e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51770cdbbc7cc8efa59aa62f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 20:25:18 2009 +0100 user32: Split the handling of the 16-bit messages out of the combo winproc. --- dlls/user32/combo.c | 148 ++++++++++++++++++++++++++------------------------ 1 files changed, 77 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51770cdbbc7cc8efa59aa…

1 0

Paul Vriens : winetest: Detect Windows 2008 R2.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: tools Branch: master Commit: 1cf288a59d0b9ccd86e9caa7d14e4231fe526bd8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1cf288a59d0b9ccd86e9caa7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Dec 12 19:31:08 2009 +0100 winetest: Detect Windows 2008 R2. --- winetest/dissect | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 4436b26..16cc118 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -182,7 +182,11 @@ if ($plid==1 && $major==4) { $version = "2008"; } } elsif ($minor == 1) { - $version = "win7"; + if ($product==1) { + $version = "win7"; + } elsif ($product==3) { + $version = "2008"; + } } } } elsif ($plid==3) {

1 0

Alexandre Julliard : Initial import of the server-side scripts for the patch tracker.
by Alexandre Julliard Dec. 14, 2009

Dec. 14, 2009

Module: tools Branch: master Commit: f5897624decc9a10fa6902d74c1d3d3e38fc0b5b URL: http://source.winehq.org/git/tools.git/?a=commit;h=f5897624decc9a10fa6902d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 14 12:44:39 2009 +0100 Initial import of the server-side scripts for the patch tracker. --- patches/expire | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++ patches/filter | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++ patches/index.cgi | 156 +++++++++++++++++++++++++++++++++++++++++++++++++ patches/patches.css | 59 +++++++++++++++++++ 4 files changed, 534 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f5897624decc9a10fa69…

1 0

Alexander Nicolaysen Sørnes : application_queue: Show a link for merging with any app when processing entries
by Alexander Nicolaysen Sørnes Dec. 13, 2009

Dec. 13, 2009

Module: appdb Branch: master Commit: fcf23ec690b71eab7f9400dc61dc1fa7bf8d367d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fcf23ec690b71eab7f9400dc… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Dec 13 21:23:14 2009 +0100 application_queue: Show a link for merging with any app when processing entries --- include/application_queue.php | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 44d4901..b1bdc69 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -295,6 +295,14 @@ class application_queue echo " \n"; echo "Partial matches \n"; $this->displayDuplicateTable(searchForApplicationPartial($this->oApp->sName, $this->oApp->objectGetId())); + echo ' '; + if($this->oApp->iAppId && $this->oApp->canEdit()) + { + echo "<a href=\"objectManager.php?sClass=application&". + "bIsQueue=true&sAction=showMoveChildren&iId=". + $this->oApp->iAppId. + "\">Merge with another application</a>"; + } } function displayDuplicateTable($hResult)

1 0

Alexander Nicolaysen Sørnes : util: Replace split() calls in search functions as it is deprecated in newer versions
by Alexander Nicolaysen Sørnes Dec. 13, 2009

Dec. 13, 2009

Module: appdb Branch: master Commit: da35126ebca59a5f13d7c9aa79047ceb242d1374 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=da35126ebca59a5f13d7c9aa… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Sun Dec 13 21:01:53 2009 +0100 util: Replace split() calls in search functions as it is deprecated in newer versions --- include/util.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/util.php b/include/util.php index 7eba466..e856aff 100644 --- a/include/util.php +++ b/include/util.php @@ -404,7 +404,7 @@ function cleanupSearchWords($search_words) $filtered_search = ""; /* search each word in $search_words */ - $split_words = split(" ", $search_words); + $split_words = explode(" ", $search_words); $removed_words = ''; foreach($split_words as $key=>$value) @@ -501,7 +501,7 @@ function searchForApplication($search_words, $iExcludeAppId = null) /* remove any search words less than 4 letters */ $split_words = array(); - $split_search_words = split(" ", $search_words); + $split_search_words = explode(" ", $search_words); foreach($split_search_words as $key=>$value) { if(strlen($value) >= 4)

1 0

Andrew Nguyen : tables: Fix a few syntax errors in appdb_tables.sql
by Alexander Nicolaysen Sørnes Dec. 12, 2009

Dec. 12, 2009

Module: appdb Branch: master Commit: 9f3b96665df1b7ad0bf04b7b60b8f3e6118c6d37 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9f3b96665df1b7ad0bf04b7b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Dec 12 15:40:31 2009 +0100 tables: Fix a few syntax errors in appdb_tables.sql --- tables/appdb_tables.sql | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index d2bfbb8..d883108 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -142,7 +142,7 @@ create table appData ( submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected') NOT NULL default 'accepted', - testedVersion text NOT NULL + testedVersion text NOT NULL, KEY id (id), KEY versionId (versionId) ); @@ -173,7 +173,7 @@ create table appNotes ( appId int not null, submitterId int not null, submitTime datetime not null, - linkedWith int not null + linkedWith int not null, key(noteId) );

1 0

Chris Schafer : msi/tests: Remove some barriers to running msi tests in parallel.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 350cdd2fe5c8ac415787b6032489baba0171adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=350cdd2fe5c8ac415787b6032… Author: Chris Schafer <chrisp.schafer(a)gmail.com> Date: Thu Dec 10 14:07:14 2009 -0800 msi/tests: Remove some barriers to running msi tests in parallel. --- dlls/msi/tests/automation.c | 4 ++-- dlls/msi/tests/db.c | 9 ++++----- dlls/msi/tests/format.c | 17 +++++++---------- dlls/msi/tests/package.c | 11 ++++++----- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/suminfo.c | 10 +++++----- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bb498c0..8a0eede 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -34,8 +34,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const char *msifile = "winetest.msi"; -static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; +static const char *msifile = "winetest-automation.msi"; +static const WCHAR szMsifile[] = {'w','i','n','e','t','e','s','t','-','a','u','t','o','m','a','t','i','o','n','.','m','s','i',0}; static const WCHAR szMSITEST[] = { 'M','S','I','T','E','S','T',0 }; static const WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static const WCHAR szUpgradeCode[] = { '{','C','E','0','6','7','E','8','D','-','2','E','1','A','-','4','3','6','7','-','B','7','3','4','-','4','E','B','2','B','D','A','D','6','5','6','5','}',0 }; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 041e860..bafa0db 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -31,9 +31,10 @@ #include "wine/test.h" -static const char *msifile = "winetest.msi"; -static const char *msifile2 = "winetst2.msi"; -static const char *mstfile = "winetst.mst"; +static const char *msifile = "winetest-db.msi"; +static const char *msifile2 = "winetst2-db.msi"; +static const char *mstfile = "winetst-db.mst"; +static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','d','b','.','m','s','i',0}; static void test_msidatabase(void) { @@ -5569,8 +5570,6 @@ static void test_defaultdatabase(void) MSIHANDLE hdb; IStorage *stg = NULL; - static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; - DeleteFile(msifile); r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 2b2661c..3d4029c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -27,7 +27,7 @@ #include "wine/test.h" -static const char msifile[] = "winetest.msi"; +static const char msifile[] = "winetest-format.msi"; static UINT run_query( MSIHANDLE hdb, const char *query ) { @@ -315,17 +315,16 @@ static MSIHANDLE helper_createpackage( const char *szName ) static void test_createpackage(void) { - static const CHAR filename[] = "winetest.msi"; MSIHANDLE hPackage = 0; UINT res; - hPackage = helper_createpackage( filename ); + hPackage = helper_createpackage( msifile ); ok ( hPackage != 0, " Failed to create package\n"); res = MsiCloseHandle( hPackage); ok( res == ERROR_SUCCESS , "Failed to close package\n" ); - DeleteFile( filename ); + DeleteFile( msifile ); } static void test_formatrecord(void) @@ -1620,14 +1619,13 @@ static void test_formatrecord(void) static void test_formatrecord_package(void) { - static const CHAR filename[] = "winetest.msi"; char buffer[100]; MSIHANDLE hrec; MSIHANDLE package; UINT r; DWORD sz=100; - package = helper_createpackage( filename ); + package = helper_createpackage( msifile ); ok(package!=0, "Unable to create package\n"); hrec = MsiCreateRecord(12); @@ -2117,7 +2115,7 @@ static void test_formatrecord_package(void) r = MsiCloseHandle(package); ok(r==ERROR_SUCCESS, "Unable to close package\n"); - DeleteFile( filename ); + DeleteFile( msifile ); } static void test_formatrecord_tables(void) @@ -2383,12 +2381,11 @@ static void test_formatrecord_tables(void) static void test_processmessage(void) { - static const CHAR filename[] = "winetest.msi"; MSIHANDLE hrec; MSIHANDLE package; int r; - package = helper_createpackage( filename ); + package = helper_createpackage( msifile ); ok(package!=0, "Unable to create package\n"); hrec = MsiCreateRecord(3); @@ -2403,7 +2400,7 @@ static void test_processmessage(void) MsiCloseHandle(hrec); MsiCloseHandle(package); - DeleteFile(filename); + DeleteFile(msifile); } START_TEST(format) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 903e2ac..979de1a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -30,7 +30,7 @@ #include "wine/test.h" -static const char msifile[] = "winetest.msi"; +static const char msifile[] = "winetest-package.msi"; char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); @@ -2341,9 +2341,9 @@ static void test_states(void) MSIHANDLE hdb; INSTALLSTATE state, action; - static const CHAR msifile2[] = "winetest2.msi"; - static const CHAR msifile3[] = "winetest3.msi"; - static const CHAR msifile4[] = "winetest4.msi"; + static const CHAR msifile2[] = "winetest2-package.msi"; + static const CHAR msifile3[] = "winetest3-package.msi"; + static const CHAR msifile4[] = "winetest4-package.msi"; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -11601,7 +11601,8 @@ static void test_MsiGetProductProperty(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); lstrcpyA(val, path); - lstrcatA(val, "\\winetest.msi"); + lstrcatA(val, "\\"); + lstrcatA(val, msifile); res = RegSetValueExA(props, "LocalPackage", 0, REG_SZ, (const BYTE *)val, lstrlenA(val) + 1); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 0da69c7..2c8f5bf 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -24,7 +24,7 @@ #include "wine/test.h" -static const char *msifile = "winetest.msi"; +static const char *msifile = "winetest-record.msi"; static BOOL create_temp_file(char *name) { diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index f0e7fdd..a0b225b 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -63,9 +63,12 @@ #define PID_MSISOURCE PID_WORDCOUNT #define PID_MSIRESTRICT PID_CHARCOUNT +const char *msifile = "winetest-suminfo.msi"; +static const WCHAR msifileW[] = { + 'w','i','n','e','t','e','s','t','-','s','u','m','i','n','f','o','.','m','s','i',0 }; + static void test_suminfo(void) { - const char *msifile = "winetest.msi"; MSIHANDLE hdb = 0, hsuminfo; UINT r, count, type; DWORD sz; @@ -284,8 +287,6 @@ static void test_create_database_binary(void) static const CLSID FMTID_SummaryInformation = { 0xf29f85e0, 0x4ff9, 0x1068, {0xab, 0x91, 0x08, 0x00, 0x2b, 0x27, 0xb3, 0xd9}}; DWORD mode = STGM_CREATE | STGM_READWRITE | STGM_DIRECT | STGM_SHARE_EXCLUSIVE; - static const WCHAR msifile[] = { - 'w','i','n','e','t','e','s','t','.','m','s','i',0 }; IPropertySetStorage *pss = NULL; IPropertyStorage *ps = NULL; IStorage *stg = NULL; @@ -295,7 +296,7 @@ static void test_create_database_binary(void) PROPVARIANT propvar[10]; USHORT data[2] = { 0, 0 }; - r = StgCreateDocfile( msifile, mode, 0, &stg ); + r = StgCreateDocfile( msifileW, mode, 0, &stg ); ok( r == S_OK, "failed to create database\n"); r = IStorage_SetClass( stg, &CLSID_MsiDatabase ); @@ -386,7 +387,6 @@ static void test_create_database_binary(void) static void test_summary_binary(void) { - const char *msifile = "winetest.msi"; MSIHANDLE hdb = 0, hsuminfo = 0; UINT r, type, count; INT ival;

1 0

Juan Lang : winhttp: Free OpenSSL error strings at unload.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 9352509eb27625fa3d02f30de409cf4e8e71402e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9352509eb27625fa3d02f30de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 08:16:25 2009 -0800 winhttp: Free OpenSSL error strings at unload. --- dlls/winhttp/net.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 6512db5..034b229 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -122,6 +122,7 @@ MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); +MAKE_FUNCPTR( ERR_free_strings ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -442,6 +443,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( CRYPTO_num_locks ); LOAD_FUNCPTR( CRYPTO_set_id_callback ); LOAD_FUNCPTR( CRYPTO_set_locking_callback ); + LOAD_FUNCPTR( ERR_free_strings ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); @@ -499,6 +501,7 @@ void netconn_unload( void ) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) { + pERR_free_strings(); wine_dlclose( libcrypto_handle, NULL, 0 ); } if (libssl_handle)

1 0