April 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Fix some memory leaks (valgrind).
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: cfddf2796eb668055237693e4aecf194db36068a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfddf2796eb668055237693e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:40:29 2011 +0200 msi/tests: Fix some memory leaks (valgrind). --- dlls/msi/tests/patch.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ee712bb..23aac2d 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -975,6 +975,7 @@ static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) { UINT r_tmp; ret = MsiRecordGetInteger( hrec, field ); + MsiCloseHandle( hrec ); r_tmp = MsiViewFetch( hview, &hrec ); ok( r_tmp == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r); @@ -982,8 +983,6 @@ static INT get_integer( MSIHANDLE hdb, UINT field, const char *query) MsiViewClose( hview ); MsiCloseHandle( hview ); - MsiCloseHandle( hrec ); - return ret; } @@ -1008,6 +1007,7 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query) UINT size = MAX_PATH; r = MsiRecordGetStringA( hrec, field, ret, &size ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r); + MsiCloseHandle( hrec ); r = MsiViewFetch( hview, &hrec ); ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r); @@ -1015,8 +1015,6 @@ static char *get_string( MSIHANDLE hdb, UINT field, const char *query) MsiViewClose( hview ); MsiCloseHandle( hview ); - MsiCloseHandle( hrec ); - return ret; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: d627836e8d2056d82b2ec0cb83d4d4c0ae1c134c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d627836e8d2056d82b2ec0cb8… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Apr 14 18:19:06 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/po/lt.po b/po/lt.po index 932f6a3..595543e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-12 19:25+0300\n" +"PO-Revision-Date: 2011-04-14 18:18+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2180,36 +2180,32 @@ msgid "Configure Wine Internet Browser and related settings" msgstr "Konfigūruokite Wine interneto naršyklės ir susijusias nuostatas" #: inetcpl.rc:30 -#, fuzzy msgid "Security settings for zone: " -msgstr "Išsaugoti &nuostatas išeinant" +msgstr "Saugumo nuostatos zonai:" #: inetcpl.rc:31 -#, fuzzy msgid "Custom" -msgstr "Adaptuoti" +msgstr "Pritaikytos" #: inetcpl.rc:32 msgid "Very Low" -msgstr "" +msgstr "Labai žemos" #: inetcpl.rc:33 -#, fuzzy msgid "Low" -msgstr "&Mažas" +msgstr "Žemos" #: inetcpl.rc:34 msgid "Medium" -msgstr "" +msgstr "Vidutinės" #: inetcpl.rc:35 msgid "Increased" -msgstr "" +msgstr "Padidintos" #: inetcpl.rc:36 -#, fuzzy msgid "High" -msgstr "&Didelis" +msgstr "Aukštos" #: jscript.rc:25 msgid "Error converting object to primitive type" @@ -8629,9 +8625,8 @@ msgid "&Replace...\tCtrl+H" msgstr "Pa&keisti...\tVald+H" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 -#, fuzzy msgid "&Contents\tF1" -msgstr "&Turinys" +msgstr "&Turinys\tF1" #: notepad.rc:59 msgid "&About Notepad" @@ -10913,7 +10908,7 @@ msgstr "%s iš %s laisva" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "Ž&aidimas" #: winemine.rc:35 msgid "&New\tF2" @@ -10921,7 +10916,7 @@ msgstr "&Naujas\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Klaustukai" #: winemine.rc:39 msgid "&Beginner" @@ -10940,7 +10935,6 @@ msgid "&Custom..." msgstr "Pasirin&ktas..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" msgstr "&Geriausi laikai"

1 0

Jacek Caban : urlmon: Use winetest post.php URLs for http POST tests.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: ba2bcaf9c4afde1b3facb89d85a84021ff27a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2bcaf9c4afde1b3facb89d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 14 18:27:24 2011 +0200 urlmon: Use winetest post.php URLs for http POST tests. --- dlls/urlmon/tests/protocol.c | 5 ++--- dlls/urlmon/tests/url.c | 12 +++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 6c8e5db..40a6323 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -2869,9 +2869,8 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym static void test_http_protocol(void) { static const WCHAR posttest_url[] = - {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'p','o','s','t','t','e','s','t','.','p','h','p',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; static const WCHAR redirect_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', 't','e','s','t','s','/','r','e','d','i','r','e','c','t',0}; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 7202052..003b3c8 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -152,10 +152,9 @@ static const WCHAR winetest_data_urlW[] = static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','s','/','d','a','t','a','.','p','h','p','\0'}; -static const WCHAR SHORT_RESPONSE_URL[] = - {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', - 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', - 'p','o','s','t','t','e','s','t','.','p','h','p',0}; +static const WCHAR winetest_post_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','p','o','s','t','.','p','h','p',0}; static const WCHAR ABOUT_BLANK[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; static WCHAR INDEX_HTML[MAX_PATH]; static const WCHAR ITS_URL[] = @@ -2686,7 +2685,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) tymed = t; filedwl_api = (flags & BINDTEST_FILEDWLAPI) != 0; if(flags & BINDTEST_HTTPRESPONSE) - urls[HTTP_TEST] = SHORT_RESPONSE_URL; + urls[HTTP_TEST] = winetest_post_urlW; else urls[HTTP_TEST] = winetest_data_urlW; if(flags & BINDTEST_INVALID_CN) @@ -3161,7 +3160,7 @@ static void test_BindToObject(int protocol, DWORD flags) CLEAR_CALLED(GetWindow_IWindowForBindingUI); } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) { - if(urls[test_protocol] == SHORT_RESPONSE_URL) + if(urls[test_protocol] == winetest_post_urlW) CLEAR_CALLED(Obj_OnProgress_SENDINGREQUEST); else CHECK_CALLED(Obj_OnProgress_SENDINGREQUEST); @@ -3602,7 +3601,6 @@ START_TEST(url) test_BindToObject(HTTP_TEST, 0); trace("http test (short response)...\n"); - http_is_first = TRUE; test_BindToStorage(HTTP_TEST, BINDTEST_HTTPRESPONSE, TYMED_ISTREAM); trace("http test (short response, to object)...\n");

1 0

Aurimas Fišeras : inetcpl: Update Lithuanian translation.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 790296b09fb73e0462beac6b623a57d7938a3cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790296b09fb73e0462beac6b6… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Apr 14 18:23:49 2011 +0300 inetcpl: Update Lithuanian translation. --- dlls/inetcpl.cpl/cpl_Lt.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Lt.rc b/dlls/inetcpl.cpl/cpl_Lt.rc index 217f62c..47d0fe2 100644 --- a/dlls/inetcpl.cpl/cpl_Lt.rc +++ b/dlls/inetcpl.cpl/cpl_Lt.rc @@ -70,6 +70,24 @@ BEGIN END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Saugumas" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Vitaliy Margolen : dinput: Implement getting DIPROP_VIDPID property for evdev joystick driver. Fixes bug 26418.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 20aa3410326073ba825c8c43c757e61556e4fe9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=20aa3410326073ba825c8c43c… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Apr 14 08:08:01 2011 -0600 dinput: Implement getting DIPROP_VIDPID property for evdev joystick driver. Fixes bug 26418. --- dlls/dinput/joystick_linuxinput.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 9b0c52c..c11edc7 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -110,6 +110,8 @@ struct JoyDev { /* data returned by the EVIOCGABS() ioctl */ struct wine_input_absinfo axes[ABS_MAX]; + + WORD vendor_id, product_id; }; struct JoystickImpl @@ -187,6 +189,7 @@ static void find_joydevs(void) int no_ff_check = 0; int j; struct JoyDev *new_joydevs; + struct input_id device_id = {0}; snprintf(buf, sizeof(buf), EVDEVPREFIX"%d", i); @@ -282,6 +285,14 @@ static void find_joydevs(void) } } + if (ioctl(fd, EVIOCGID, &device_id) == -1) + WARN("ioct(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + else + { + joydev.vendor_id = device_id.vendor; + joydev.product_id = device_id.product; + } + if (!have_joydevs) new_joydevs = HeapAlloc(GetProcessHeap(), 0, sizeof(struct JoyDev)); else @@ -946,6 +957,17 @@ static HRESULT WINAPI JoystickWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF break; } + case (DWORD_PTR) DIPROP_VIDPID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + if (!This->joydev->product_id || !This->joydev->vendor_id) + return DIERR_UNSUPPORTED; + pd->dwData = MAKELONG(This->joydev->vendor_id, This->joydev->product_id); + TRACE("DIPROP_VIDPID(%08x)\n", pd->dwData); + break; + } + default: return JoystickWGenericImpl_GetProperty(iface, rguid, pdiph); }

1 0

Hans Leidekker : msi: Add offsets to disk ids added by patches.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: eee070f1e0ad48afafef75b2fe27d1ba8d14126b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee070f1e0ad48afafef75b2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:42:48 2011 +0200 msi: Add offsets to disk ids added by patches. --- dlls/msi/action.c | 172 ++++++++++++++++++++++++++++++++++++++++++++---- dlls/msi/database.c | 2 +- dlls/msi/files.c | 2 +- dlls/msi/media.c | 64 +++++++++--------- dlls/msi/msipriv.h | 2 + dlls/msi/tests/patch.c | 11 +++- 6 files changed, 204 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eee070f1e0ad48afafef7…

1 0

Hans Leidekker : msi: Fix a memory leak (valgrind).
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 741b0f37f8c274cd3d4206e8ddf9d3aee74f66c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=741b0f37f8c274cd3d4206e8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:40:15 2011 +0200 msi: Fix a memory leak (valgrind). --- dlls/msi/msi.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index def9e72..4a79daf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2395,25 +2395,36 @@ HRESULT WINAPI MsiGetFileSignatureInformationW( LPCWSTR path, DWORD flags, PCCER data.dwProvFlags = 0; data.dwUIContext = WTD_UICONTEXT_INSTALL; hr = WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); - if (FAILED(hr)) return hr; + if (FAILED(hr)) goto done; - signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 ); - if (!signer) return TRUST_E_NOSIGNATURE; + if (!(signer = WTHelperGetProvSignerFromChain( data.hWVTStateData, 0, FALSE, 0 ))) + { + hr = TRUST_E_NOSIGNATURE; + goto done; + } if (hash) { DWORD len = signer->psSigner->EncryptedHash.cbData; if (*hashlen < len) { *hashlen = len; - return HRESULT_FROM_WIN32(ERROR_MORE_DATA); + hr = HRESULT_FROM_WIN32(ERROR_MORE_DATA); + goto done; } memcpy( hash, signer->psSigner->EncryptedHash.pbData, len ); *hashlen = len; } - provider = WTHelperGetProvCertFromChain( signer, 0 ); - if (!provider) return TRUST_E_PROVIDER_UNKNOWN; + if (!(provider = WTHelperGetProvCertFromChain( signer, 0 ))) + { + hr = TRUST_E_PROVIDER_UNKNOWN; + goto done; + } *cert = CertDuplicateCertificateContext( provider->pCert ); - return S_OK; + +done: + data.dwStateAction = WTD_STATEACTION_CLOSE; + WinVerifyTrustEx( INVALID_HANDLE_VALUE, &generic_verify_v2, &data ); + return hr; } /******************************************************************

1 0

Hans Leidekker : msi: Avoid redundant loading of media info.
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 5521646380b2a8093f463fa3713ecce5500b8a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5521646380b2a8093f463fa37… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:40:45 2011 +0200 msi: Avoid redundant loading of media info. --- dlls/msi/media.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 7cf7585..9ce92b5 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -658,16 +658,16 @@ static UINT get_drive_type(const WCHAR *path) UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) { + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','M','e','d','i','a','`',' ', + 'W','H','E','R','E',' ','`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ', + '>','=',' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; MSIRECORD *row; - LPWSTR source_dir; - LPWSTR source; + LPWSTR source_dir, source; DWORD options; - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', - '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', - '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','i', - ' ','O','R','D','E','R',' ','B','Y',' ','`','D','i','s','k','I','d','`',0}; + if (Sequence <= mi->last_sequence) /* already loaded */ + return ERROR_SUCCESS; row = MSI_QueryGetRecord(package->db, query, Sequence); if (!row) @@ -720,6 +720,7 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); msi_free(source_dir); + TRACE("sequence %u -> cabinet %s disk id %u\n", Sequence, debugstr_w(mi->cabinet), mi->disk_id); return ERROR_SUCCESS; }

1 0

Hans Leidekker : msi: Add support for maintaining a list of cabinet streams .
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 131ef6372fb17decb118df90c229409670571666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=131ef6372fb17decb118df90c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:41:19 2011 +0200 msi: Add support for maintaining a list of cabinet streams. --- dlls/msi/media.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 11 +++++++++++ dlls/msi/package.c | 11 +++++++++++ 3 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 9ce92b5..c699ecc 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -890,3 +890,43 @@ UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, MSIMEDIA msi_free(cabinet_file); return ERROR_SUCCESS; } + +UINT msi_add_cabinet_stream( MSIPACKAGE *package, UINT disk_id, IStorage *storage, const WCHAR *name ) +{ + MSICABINETSTREAM *cab, *item; + + TRACE("%p, %u, %p, %s\n", package, disk_id, storage, debugstr_w(name)); + + LIST_FOR_EACH_ENTRY( item, &package->cabinet_streams, MSICABINETSTREAM, entry ) + { + if (item->disk_id == disk_id) + { + TRACE("duplicate disk id %u\n", disk_id); + return ERROR_FUNCTION_FAILED; + } + } + if (!(cab = msi_alloc( sizeof(*cab) ))) return ERROR_OUTOFMEMORY; + if (!(cab->stream = msi_alloc( (strlenW( name ) + 1) * sizeof(WCHAR ) ))) + { + msi_free( cab ); + return ERROR_OUTOFMEMORY; + } + strcpyW( cab->stream, name ); + cab->disk_id = disk_id; + cab->storage = storage; + IStorage_AddRef( storage ); + list_add_tail( &package->cabinet_streams, &cab->entry ); + + return ERROR_SUCCESS; +} + +MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id ) +{ + MSICABINETSTREAM *cab; + + LIST_FOR_EACH_ENTRY( cab, &package->cabinet_streams, MSICABINETSTREAM, entry ) + { + if (cab->disk_id == disk_id) return cab; + } + return NULL; +} diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2dd2c9b..fead8ea 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -157,6 +157,14 @@ typedef struct tagMSIMEDIAINFO WCHAR sourcedir[MAX_PATH]; } MSIMEDIAINFO; +typedef struct tagMSICABINETSTREAM +{ + struct list entry; + UINT disk_id; + IStorage *storage; + WCHAR *stream; +} MSICABINETSTREAM; + typedef struct tagMSIPATCHINFO { struct list entry; @@ -350,6 +358,7 @@ typedef struct tagMSIPACKAGE struct list tempfiles; struct list folders; struct list binaries; + struct list cabinet_streams; LPWSTR ActionFormat; LPWSTR LastAction; HANDLE log_file; @@ -1007,6 +1016,8 @@ extern UINT ready_media(MSIPACKAGE *package, UINT Sequence, BOOL IsCompressed, M extern UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); +extern MSICABINETSTREAM *msi_get_cabinet_stream(MSIPACKAGE *, UINT); +extern UINT msi_add_cabinet_stream(MSIPACKAGE *, UINT, IStorage *, const WCHAR *); /* control event stuff */ extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event, diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 49acdb7..bad8ab3 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -300,6 +300,16 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( binary ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->cabinet_streams ) + { + MSICABINETSTREAM *cab = LIST_ENTRY( item, MSICABINETSTREAM, entry ); + + list_remove( &cab->entry ); + IStorage_Release( cab->storage ); + msi_free( cab->stream ); + msi_free( cab ); + } + msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); @@ -1080,6 +1090,7 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->sourcelist_media ); list_init( &package->patches ); list_init( &package->binaries ); + list_init( &package->cabinet_streams ); } return package;

1 0

Hans Leidekker : msi: Check the return value of MSIREG_OpenUpgradeCodesKey (valgrind).
by Alexandre Julliard April 14, 2011

April 14, 2011

Module: wine Branch: master Commit: 846811be594b8ce3b391662d9d35a2b5fc91ca49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846811be594b8ce3b391662d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 14 14:39:55 2011 +0200 msi: Check the return value of MSIREG_OpenUpgradeCodesKey (valgrind). --- dlls/msi/action.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3244b6d..8267aa9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5293,8 +5293,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) WCHAR squashed_pc[SQUISH_GUID_SIZE]; MSIRECORD *uirow; LPWSTR upgrade_code; - HKEY hkey, props; - HKEY upgrade; + HKEY hkey, props, upgrade_key; UINT rc; /* FIXME: also need to publish if the product is in advertise mode */ @@ -5325,11 +5324,14 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) upgrade_code = msi_dup_property(package->db, szUpgradeCode); if (upgrade_code) { - MSIREG_OpenUpgradeCodesKey(upgrade_code, &upgrade, TRUE); - squash_guid(package->ProductCode, squashed_pc); - msi_reg_set_val_str(upgrade, squashed_pc, NULL); - RegCloseKey(upgrade); - msi_free(upgrade_code); + rc = MSIREG_OpenUpgradeCodesKey( upgrade_code, &upgrade_key, TRUE ); + if (rc == ERROR_SUCCESS) + { + squash_guid( package->ProductCode, squashed_pc ); + msi_reg_set_val_str( upgrade_key, squashed_pc, NULL ); + RegCloseKey( upgrade_key ); + } + msi_free( upgrade_code ); } done:

1 0