May 2010 - Wine-Commits - list.winehq.org

Kai Blin : ws2_32: Stub out WS_SIO_UDP_CONNRESET WSioctl.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 8a00bdddc0490d61e03ac84f492b142d5bc9810c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a00bdddc0490d61e03ac84f4… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue May 11 15:53:02 2010 +0200 ws2_32: Stub out WS_SIO_UDP_CONNRESET WSioctl. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 63607fe..6254bba 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2798,6 +2798,9 @@ INT WINAPI WSAIoctl(SOCKET s, release_sock_fd(s, fd); break; } + case WS_SIO_UDP_CONNRESET: + FIXME("WS_SIO_UDP_CONNRESET stub\n"); + break; default: FIXME("unsupported WS_IOCTL cmd (%08x)\n", dwIoControlCode); WSASetLastError(WSAEOPNOTSUPP);

1 0

Hans Leidekker : msi: Add a test to show that the InstallSource property is unchanged after an upgrade .
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 4d2fb55e4eb57faa5aa0c0f292b852d5845f7796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2fb55e4eb57faa5aa0c0f29… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 14:02:35 2010 +0200 msi: Add a test to show that the InstallSource property is unchanged after an upgrade. --- dlls/msi/tests/patch.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 8a762c7..8cb6a71 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -679,7 +679,7 @@ static void test_simple_patch( void ) { UINT r; DWORD size; - char path[MAX_PATH]; + char path[MAX_PATH], install_source[MAX_PATH]; const char *query; MSIHANDLE hpackage, hdb, hview, hrec; @@ -703,6 +703,11 @@ static void test_simple_patch( void ) size = get_pf_file_size( "msitest\\patch.txt" ); ok( size == 1000, "expected 1000, got %u\n", size ); + size = sizeof(install_source); + r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + "InstallSource", install_source, &size ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + r = MsiApplyPatchA( mspfile, NULL, INSTALLTYPE_DEFAULT, NULL ); ok( r == ERROR_SUCCESS || broken( r == ERROR_PATCH_PACKAGE_INVALID ), /* version 2.0 */ "expected ERROR_SUCCESS, got %u\n", r ); @@ -766,6 +771,12 @@ static void test_simple_patch( void ) MsiCloseHandle( hview ); MsiCloseHandle( hdb ); + size = sizeof(path); + r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + "InstallSource", path, &size ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + todo_wine ok( !strcasecmp( path, install_source ), "wrong path %s\n", path ); + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Hans Leidekker : msi: Set the SourceDir property to the registered source if the product is installed .
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: dd305c3700c1b5b0de41b87558930e08ba88bd68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd305c3700c1b5b0de41b8755… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 14:05:32 2010 +0200 msi: Set the SourceDir property to the registered source if the product is installed. --- dlls/msi/action.c | 45 +++++++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 8 +++----- dlls/msi/tests/patch.c | 2 +- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 23b2b07..fb46167 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -688,31 +688,41 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package ) static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { - LPWSTR p, db; LPWSTR source, check; - DWORD len; - - static const WCHAR szOriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; - db = msi_dup_property( package->db, szOriginalDatabase ); - if (!db) - return ERROR_OUTOFMEMORY; + if (msi_get_property_int( package->db, szInstalled, 0 )) + { + HKEY hkey; - p = strrchrW( db, '\\' ); - if (!p) + MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE ); + source = msi_reg_get_val_str( hkey, INSTALLPROPERTY_INSTALLSOURCEW ); + RegCloseKey( hkey ); + } + else { - p = strrchrW( db, '/' ); + LPWSTR p, db; + DWORD len; + + db = msi_dup_property( package->db, szOriginalDatabase ); + if (!db) + return ERROR_OUTOFMEMORY; + + p = strrchrW( db, '\\' ); if (!p) { - msi_free(db); - return ERROR_SUCCESS; + p = strrchrW( db, '/' ); + if (!p) + { + msi_free(db); + return ERROR_SUCCESS; + } } - } - len = p - db + 2; - source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, db, len ); + len = p - db + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, db, len ); + msi_free( db ); + } check = msi_dup_property( package->db, cszSourceDir ); if (!check || replace) @@ -729,7 +739,6 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) msi_free( check ); msi_free( source ); - msi_free( db ); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a8737a2..3848745 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1113,6 +1113,7 @@ static const WCHAR szInprocHandler[] = {'I','n','p','r','o','c','H','a','n','d', static const WCHAR szInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; static const WCHAR szMIMEDatabase[] = {'M','I','M','E','\\','D','a','t','a','b','a','s','e','\\','C','o','n','t','e','n','t',' ','T','y','p','e','\\',0}; static const WCHAR szLocalPackage[] = {'L','o','c','a','l','P','a','c','k','a','g','e',0}; +static const WCHAR szOriginalDatabase[] = {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e53de53..c73a3ad 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1225,8 +1225,6 @@ static UINT apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { - static const WCHAR OriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; static const WCHAR Database[] = {'D','A','T','A','B','A','S','E',0}; static const WCHAR dotmsi[] = {'.','m','s','i',0}; MSIDATABASE *db = NULL; @@ -1339,15 +1337,15 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) msi_set_property( package->db, Database, db->path ); if( UrlIsW( szPackage, URLIS_URL ) ) - msi_set_property( package->db, OriginalDatabase, szPackage ); + msi_set_property( package->db, szOriginalDatabase, szPackage ); else if( szPackage[0] == '#' ) - msi_set_property( package->db, OriginalDatabase, db->path ); + msi_set_property( package->db, szOriginalDatabase, db->path ); else { WCHAR fullpath[MAX_PATH]; GetFullPathNameW( szPackage, MAX_PATH, fullpath, NULL ); - msi_set_property( package->db, OriginalDatabase, fullpath ); + msi_set_property( package->db, szOriginalDatabase, fullpath ); } msi_set_context( package ); diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 8cb6a71..8029d16 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -775,7 +775,7 @@ static void test_simple_patch( void ) r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", "InstallSource", path, &size ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); - todo_wine ok( !strcasecmp( path, install_source ), "wrong path %s\n", path ); + ok( !strcasecmp( path, install_source ), "wrong path %s\n", path ); r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Huw Davies : comctl32: Fix an hfont leak.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: c7a9e3a1b2e0bff6dfbcdffb5a5cacec1afdba98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a9e3a1b2e0bff6dfbcdffb5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 11 15:24:19 2010 +0100 comctl32: Fix an hfont leak. --- dlls/comctl32/treeview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8eb0c6d..f1ff9c5 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1884,6 +1884,7 @@ TREEVIEW_SetFont(TREEVIEW_INFO *infoPtr, HFONT hFont, BOOL bRedraw) infoPtr->hFont = hFont ? hFont : infoPtr->hDefaultFont; DeleteObject(infoPtr->hBoldFont); + DeleteObject(infoPtr->hUnderlineFont); infoPtr->hBoldFont = TREEVIEW_CreateBoldFont(infoPtr->hFont); infoPtr->hUnderlineFont = TREEVIEW_CreateUnderlineFont(infoPtr->hFont);

1 0

Hans Leidekker : msi: Set install properties just once.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 347bb13fc7e4f8a884e3fb3265209351e4ee1ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347bb13fc7e4f8a884e3fb326… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 14:02:50 2010 +0200 msi: Set install properties just once. --- dlls/msi/action.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6ed1417..30e8d8d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4559,21 +4559,14 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) {'P','r','o','d','u','c','t','L','a','n','g','u','a','g','e',0}; static const WCHAR szProductVersion[] = {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; - static const WCHAR szProductName[] = - {'P','r','o','d','u','c','t','N','a','m','e',0}; - static const WCHAR szDisplayName[] = - {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR szDisplayVersion[] = {'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0}; - static const WCHAR szManufacturer[] = - {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const LPCSTR propval[] = { "ARPAUTHORIZEDCDFPREFIX", "AuthorizedCDFPrefix", "ARPCONTACT", "Contact", "ARPCOMMENTS", "Comments", "ProductName", "DisplayName", - "ProductVersion", "DisplayVersion", "ARPHELPLINK", "HelpLink", "ARPHELPTELEPHONE", "HelpTelephone", "ARPINSTALLLOCATION", "InstallLocation", @@ -4608,18 +4601,6 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) /* FIXME: Write real Estimated Size when we have it */ msi_reg_set_val_dword(hkey, szEstimatedSize, 0); - buffer = msi_dup_property(package->db, szProductName); - msi_reg_set_val_str(hkey, szDisplayName, buffer); - msi_free(buffer); - - buffer = msi_dup_property(package->db, cszSourceDir); - msi_reg_set_val_str(hkey, INSTALLPROPERTY_INSTALLSOURCEW, buffer); - msi_free(buffer); - - buffer = msi_dup_property(package->db, szManufacturer); - msi_reg_set_val_str(hkey, INSTALLPROPERTY_PUBLISHERW, buffer); - msi_free(buffer); - GetLocalTime(&systime); sprintfW(date, date_fmt, systime.wYear, systime.wMonth, systime.wDay); msi_reg_set_val_str(hkey, INSTALLPROPERTY_INSTALLDATEW, date);

1 0

Hans Leidekker : msi: Avoid A-> W conversions in msi_publish_install_properties.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 41a7f025e41a1eda65acbad6ced5ed6ea0bda8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a7f025e41a1eda65acbad6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 14:03:08 2010 +0200 msi: Avoid A->W conversions in msi_publish_install_properties. --- dlls/msi/action.c | 95 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 71 insertions(+), 24 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 30e8d8d..23b2b07 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4537,11 +4537,10 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) { - LPWSTR prop, val, key; SYSTEMTIME systime; DWORD size, langid; - WCHAR date[9]; - LPWSTR buffer; + WCHAR date[9], *val, *buffer; + const WCHAR *prop, *key; static const WCHAR date_fmt[] = {'%','i','%','0','2','i','%','0','2','i',0}; static const WCHAR szWindowsInstaller[] = @@ -4561,34 +4560,82 @@ static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) {'P','r','o','d','u','c','t','V','e','r','s','i','o','n',0}; static const WCHAR szDisplayVersion[] = {'D','i','s','p','l','a','y','V','e','r','s','i','o','n',0}; - - static const LPCSTR propval[] = { - "ARPAUTHORIZEDCDFPREFIX", "AuthorizedCDFPrefix", - "ARPCONTACT", "Contact", - "ARPCOMMENTS", "Comments", - "ProductName", "DisplayName", - "ARPHELPLINK", "HelpLink", - "ARPHELPTELEPHONE", "HelpTelephone", - "ARPINSTALLLOCATION", "InstallLocation", - "SourceDir", "InstallSource", - "Manufacturer", "Publisher", - "ARPREADME", "Readme", - "ARPSIZE", "Size", - "ARPURLINFOABOUT", "URLInfoAbout", - "ARPURLUPDATEINFO", "URLUpdateInfo", - NULL, + static const WCHAR szInstallSource[] = + {'I','n','s','t','a','l','l','S','o','u','r','c','e',0}; + static const WCHAR szARPAUTHORIZEDCDFPREFIX[] = + {'A','R','P','A','U','T','H','O','R','I','Z','E','D','C','D','F','P','R','E','F','I','X',0}; + static const WCHAR szAuthorizedCDFPrefix[] = + {'A','u','t','h','o','r','i','z','e','d','C','D','F','P','r','e','f','i','x',0}; + static const WCHAR szARPCONTACT[] = + {'A','R','P','C','O','N','T','A','C','T',0}; + static const WCHAR szContact[] = + {'C','o','n','t','a','c','t',0}; + static const WCHAR szARPCOMMENTS[] = + {'A','R','P','C','O','M','M','E','N','T','S',0}; + static const WCHAR szComments[] = + {'C','o','m','m','e','n','t','s',0}; + static const WCHAR szProductName[] = + {'P','r','o','d','u','c','t','N','a','m','e',0}; + static const WCHAR szDisplayName[] = + {'D','i','s','p','l','a','y','N','a','m','e',0}; + static const WCHAR szARPHELPLINK[] = + {'A','R','P','H','E','L','P','L','I','N','K',0}; + static const WCHAR szHelpLink[] = + {'H','e','l','p','L','i','n','k',0}; + static const WCHAR szARPHELPTELEPHONE[] = + {'A','R','P','H','E','L','P','T','E','L','E','P','H','O','N','E',0}; + static const WCHAR szHelpTelephone[] = + {'H','e','l','p','T','e','l','e','p','h','o','n','e',0}; + static const WCHAR szARPINSTALLLOCATION[] = + {'A','R','P','I','N','S','T','A','L','L','L','O','C','A','T','I','O','N',0}; + static const WCHAR szInstallLocation[] = + {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; + static const WCHAR szManufacturer[] = + {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR szPublisher[] = + {'P','u','b','l','i','s','h','e','r',0}; + static const WCHAR szARPREADME[] = + {'A','R','P','R','E','A','D','M','E',0}; + static const WCHAR szReadme[] = + {'R','e','a','d','M','e',0}; + static const WCHAR szARPSIZE[] = + {'A','R','P','S','I','Z','E',0}; + static const WCHAR szSize[] = + {'S','i','z','e',0}; + static const WCHAR szARPURLINFOABOUT[] = + {'A','R','P','U','R','L','I','N','F','O','A','B','O','U','T',0}; + static const WCHAR szURLInfoAbout[] = + {'U','R','L','I','n','f','o','A','b','o','u','t',0}; + static const WCHAR szARPURLUPDATEINFO[] = + {'A','R','P','U','R','L','U','P','D','A','T','E','I','N','F','O',0}; + static const WCHAR szURLUpdateInfo[] = + {'U','R','L','U','p','d','a','t','e','I','n','f','o',0}; + + static const WCHAR *propval[] = { + szARPAUTHORIZEDCDFPREFIX, szAuthorizedCDFPrefix, + szARPCONTACT, szContact, + szARPCOMMENTS, szComments, + szProductName, szDisplayName, + szARPHELPLINK, szHelpLink, + szARPHELPTELEPHONE, szHelpTelephone, + szARPINSTALLLOCATION, szInstallLocation, + cszSourceDir, szInstallSource, + szManufacturer, szPublisher, + szARPREADME, szReadme, + szARPSIZE, szSize, + szARPURLINFOABOUT, szURLInfoAbout, + szARPURLUPDATEINFO, szURLUpdateInfo, + NULL }; - const LPCSTR *p = propval; + const WCHAR **p = propval; while (*p) { - prop = strdupAtoW(*p++); - key = strdupAtoW(*p++); + prop = *p++; + key = *p++; val = msi_dup_property(package->db, prop); msi_reg_set_val_str(hkey, key, val); msi_free(val); - msi_free(key); - msi_free(prop); } msi_reg_set_val_dword(hkey, szWindowsInstaller, 1);

1 0

Hans Leidekker : msi: Add more patch registration tests.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 715a506fac175741bda05a6bb65820c9137e3649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715a506fac175741bda05a6bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 15:23:39 2010 +0200 msi: Add more patch registration tests. --- dlls/msi/tests/patch.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ad581d1..8a762c7 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -33,6 +33,8 @@ static UINT (WINAPI *pMsiApplyPatchA)( LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR ); static UINT (WINAPI *pMsiGetPatchInfoExA)( LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, DWORD * ); +static UINT (WINAPI *pMsiEnumPatchesExA)( LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, + LPSTR, MSIINSTALLCONTEXT *, LPSTR, LPDWORD ); static const char *msifile = "winetest-patch.msi"; static const char *mspfile = "winetest-patch.msp"; @@ -143,6 +145,7 @@ static void init_function_pointers( void ) GET_PROC( hmsi, MsiApplyPatchA ); GET_PROC( hmsi, MsiGetPatchInfoExA ); + GET_PROC( hmsi, MsiEnumPatchesExA ); #undef GET_PROC } @@ -988,9 +991,9 @@ static void test_system_tables( void ) static void test_patch_registration( void ) { UINT r, size; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], patch_code[39]; - if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA) + if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA || !pMsiEnumPatchesExA) { win_skip("required functions not available\n"); return; @@ -1043,6 +1046,22 @@ static void test_patch_registration( void ) ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); ok( !buffer[0], "got %s\n", buffer ); + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( !strcmp( patch_code, "{0F96CDC0-4CDF-4304-B283-7B9264889EF7}" ), "wrong patch code\n" ); + + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_MACHINE, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERMANAGED, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

Gerald Pfeifer : localspl/tests: Improve the tests in test_XcvDataPort_AddPort by properly checking return values and avoiding a duplicate test .
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 667944a3f78f95159e5ed21a8cd1f16d9168d2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=667944a3f78f95159e5ed21a8… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 12:48:34 2010 +0200 localspl/tests: Improve the tests in test_XcvDataPort_AddPort by properly checking return values and avoiding a duplicate test. --- dlls/localspl/tests/localmon.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 496be71..413a95a 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -775,6 +775,8 @@ static void test_XcvClosePort(void) static void test_XcvDataPort_AddPort(void) { + DWORD res; + /* * The following tests crash with native localspl.dll on w2k and xp, * but it works, when the native dll (w2k and xp) is used in wine. @@ -787,28 +789,28 @@ static void test_XcvDataPort_AddPort(void) { /* create a Port for a normal, writable file */ SetLastError(0xdeadbeef); - pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); /* add our testport again */ SetLastError(0xdeadbeef); - pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + ok( res == ERROR_ALREADY_EXISTS, "returned %d with %u (expected ERROR_ALREADY_EXISTS)\n", res, GetLastError()); /* create a well-known Port */ SetLastError(0xdeadbeef); - pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); - - SetLastError(0xdeadbeef); - pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); - /* native localspl.dll on wine: ERROR_ALREADY_EXISTS */ + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_lpt1W, (lstrlenW(portname_lpt1W) + 1) * sizeof(WCHAR), NULL, 0, NULL); + ok( res == ERROR_ALREADY_EXISTS, "returned %d with %u (expected ERROR_ALREADY_EXISTS)\n", res, GetLastError()); /* ERROR_ALREADY_EXISTS is also returned from native localspl.dll on wine, when "RPT1:" was already installed for redmonnt.dll: - pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_rpt1W, ... + res = pXcvDataPort(hXcv, cmd_AddPortW, (PBYTE) portname_rpt1W, ... */ /* cleanup */ SetLastError(0xdeadbeef); - pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, NULL); + ok( res == ERROR_SUCCESS, "returned %d with %u (expected ERROR_SUCCESS)\n", res, GetLastError()); } }

1 0

Michael Stefaniuc : mshtml/tests: Replace long with LONG.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 2b07eadf0a4682b16602f4478a7634093e9e76b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b07eadf0a4682b16602f4478… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 11 10:34:53 2010 +0200 mshtml/tests: Replace long with LONG. --- dlls/mshtml/tests/dom.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 80353f6..69c87cd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1188,7 +1188,7 @@ static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *do } #define test_img_width(o,w) _test_img_width(__LINE__,o,w) -static void _test_img_width(unsigned line, IHTMLImgElement *img, const long exp) +static void _test_img_width(unsigned line, IHTMLImgElement *img, const LONG exp) { LONG found = -1; HRESULT hres; @@ -1199,7 +1199,7 @@ static void _test_img_width(unsigned line, IHTMLImgElement *img, const long exp) } #define test_img_put_width(o,w) _test_img_put_width(__LINE__,o,w) -static void _test_img_put_width(unsigned line, IHTMLImgElement *img, const long width) +static void _test_img_put_width(unsigned line, IHTMLImgElement *img, const LONG width) { HRESULT hres; @@ -1210,7 +1210,7 @@ static void _test_img_put_width(unsigned line, IHTMLImgElement *img, const long } #define test_img_height(o,h) _test_img_height(__LINE__,o,h) -static void _test_img_height(unsigned line, IHTMLImgElement *img, const long exp) +static void _test_img_height(unsigned line, IHTMLImgElement *img, const LONG exp) { LONG found = -1; HRESULT hres; @@ -1221,7 +1221,7 @@ static void _test_img_height(unsigned line, IHTMLImgElement *img, const long exp } #define test_img_put_height(o,w) _test_img_put_height(__LINE__,o,w) -static void _test_img_put_height(unsigned line, IHTMLImgElement *img, const long height) +static void _test_img_put_height(unsigned line, IHTMLImgElement *img, const LONG height) { HRESULT hres;

1 0

Hans Leidekker : msi: Add a test to show that patches are not committed to the local package database .
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: 06a8cc2a0642be7a485320dd1348dab49500fe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06a8cc2a0642be7a485320dd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 14:01:47 2010 +0200 msi: Add a test to show that patches are not committed to the local package database. --- dlls/msi/tests/patch.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 2c7459d..ad581d1 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -717,6 +717,7 @@ static void test_simple_patch( void ) strcat( path, "\\" ); strcat( path, msifile ); + /* show that MsiOpenPackage applies registered patches */ r = MsiOpenPackageA( path, &hpackage ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); @@ -739,6 +740,29 @@ static void test_simple_patch( void ) MsiCloseHandle( hdb ); MsiCloseHandle( hpackage ); + /* show that patches are not committed to the local package database */ + size = sizeof(path); + r = MsiGetProductInfoA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + "LocalPackage", path, &size ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiOpenDatabaseA( path, MSIDBOPEN_READONLY, &hdb ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiDatabaseOpenView( hdb, query, &hview ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewExecute( hview, 0 ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + + r = MsiViewFetch( hview, &hrec ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + MsiCloseHandle( hrec ); + MsiViewClose( hview ); + MsiCloseHandle( hview ); + MsiCloseHandle( hdb ); + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0