July 2010 - Wine-commits - list.winehq.org

David Hedberg : shell32: Change a fixme to a trace in shfldr_unixfs.c.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: a6db972c774178e8cccac6ada6dedbea6a0cab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6db972c774178e8cccac6ada… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Jul 21 21:49:13 2010 +0200 shell32: Change a fixme to a trace in shfldr_unixfs.c. This downgrades a FIXME that can be triggered in normal operation through the use of, for example, SHGetIDListFromObject. --- dlls/shell32/shfldr_unixfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 745f308..9ae030f 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -847,7 +847,7 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_QueryInterface(IShellFolder2 *ifa cfShellIDList = RegisterClipboardFormatW(CFSTR_SHELLIDLISTW); } else { *ppv = NULL; - FIXME("Unimplemented interface %s\n", shdebugstr_guid(riid)); + TRACE("Unimplemented interface %s\n", shdebugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Paul Vriens : shlwapi/tests: Load shell32 explicitly.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: eaa6376e64f1de887153b9d23ac3bdd922763cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa6376e64f1de887153b9d23… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jul 22 15:13:06 2010 +0200 shlwapi/tests: Load shell32 explicitly. --- dlls/shlwapi/tests/Makefile.in | 2 +- dlls/shlwapi/tests/ordinal.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in index a810f84..e3f9b94 100644 --- a/dlls/shlwapi/tests/Makefile.in +++ b/dlls/shlwapi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = shlwapi.dll -IMPORTS = shell32 shlwapi user32 ole32 oleaut32 advapi32 +IMPORTS = shlwapi user32 ole32 oleaut32 advapi32 C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 88165ef..d60effd 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -64,6 +64,9 @@ static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); +static HMODULE hshell32; +static HRESULT (WINAPI *pSHGetDesktopFolder)(IShellFolder**); + static const CHAR ie_international[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', @@ -2514,7 +2517,7 @@ static void test_SHIShellFolder_EnumObjects(void) ok(enm == (IEnumIDList*)0xcafebabe, "Didn't get expected enumerator location, instead: %p\n", enm); /* SHIShellFolder_EnumObjects isn't strict about the IShellFolder object */ - hres = SHGetDesktopFolder(&folder); + hres = pSHGetDesktopFolder(&folder); ok(hres == S_OK, "SHGetDesktopFolder failed: 0x%08x\n", hres); enm = NULL; @@ -2696,6 +2699,9 @@ START_TEST(ordinal) hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); + hshell32 = LoadLibraryA("shell32.dll"); + pSHGetDesktopFolder = (void *)GetProcAddress(hshell32, "SHGetDesktopFolder"); + test_GetAcceptLanguagesA(); test_SHSearchMapInt(); test_alloc_shared(); @@ -2714,4 +2720,7 @@ START_TEST(ordinal) test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); test_SHSetIniString(); + + FreeLibrary(hshell32); + FreeLibrary(hmlang); }

1 0

Hans Leidekker : msi/tests: Avoid a long timeout in the test for DeleteServices.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c4511481db93aa7c96eb9f0f33ec40c5b3cde1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4511481db93aa7c96eb9f0f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:49:05 2010 +0200 msi/tests: Avoid a long timeout in the test for DeleteServices. --- dlls/msi/tests/install.c | 47 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 82542d0..c5e26f5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -382,21 +382,39 @@ static const CHAR sss_service_control_dat[] = "ServiceControl\tName\tEvent\tArgu static const CHAR sss_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "s72\tS255\tI2\n" "InstallExecuteSequence\tAction\n" - "CostFinalize\t\t1000\n" + "LaunchConditions\t\t100\n" "CostInitialize\t\t800\n" "FileCost\t\t900\n" "ResolveSource\t\t950\n" - "MoveFiles\t\t1700\n" - "InstallFiles\t\t4000\n" - "DuplicateFiles\t\t4500\n" - "WriteEnvironmentStrings\t\t4550\n" - "CreateShortcuts\t\t4600\n" - "StartServices\t\t5000\n" - "DeleteServices\t\t5500\n" - "InstallFinalize\t\t6600\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" "InstallInitialize\t\t1500\n" + "DeleteServices\t\t5000\n" + "MoveFiles\t\t5100\n" + "InstallFiles\t\t5200\n" + "DuplicateFiles\t\t5300\n" + "StartServices\t\t5400\n" + "InstallFinalize\t\t6000\n"; + +static const CHAR sds_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "ResolveSource\t\t950\n" + "CostFinalize\t\t1000\n" "InstallValidate\t\t1400\n" - "LaunchConditions\t\t100\n"; + "InstallInitialize\t\t1500\n" + "DeleteServices\tInstalled\t5000\n" + "MoveFiles\t\t5100\n" + "InstallFiles\t\t5200\n" + "DuplicateFiles\t\t5300\n" + "InstallServices\tNOT Installed\t5400\n" + "RegisterProduct\t\t5500\n" + "PublishFeatures\t\t5600\n" + "PublishProduct\t\t5700\n" + "InstallFinalize\t\t6000\n"; /* tables for test_continuouscabs */ static const CHAR cc_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" @@ -2693,8 +2711,9 @@ static const msi_table sds_tables[] = ADD_TABLE(feature), ADD_TABLE(feature_comp), ADD_TABLE(file), - ADD_TABLE(sss_install_exec_seq), + ADD_TABLE(sds_install_exec_seq), ADD_TABLE(service_control), + ADD_TABLE(service_install), ADD_TABLE(media), ADD_TABLE(property) }; @@ -9081,6 +9100,12 @@ static void test_delete_services(void) { UINT r; + if (on_win9x) + { + win_skip("Services are not implemented on Win9x and WinMe\n"); + return; + } + create_test_files(); create_database(msifile, sds_tables, sizeof(sds_tables) / sizeof(msi_table));

1 0

Hans Leidekker : msi/tests: Fix some more wow64 test failures.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: c4bf9fb7101ced58409d053e83d78d15fb389877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4bf9fb7101ced58409d053e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:49:28 2010 +0200 msi/tests: Fix some more wow64 test failures. --- dlls/msi/tests/automation.c | 69 +++++++--- dlls/msi/tests/install.c | 314 ++++++++++++++++++++++++++----------------- dlls/msi/tests/package.c | 66 ++++++--- 3 files changed, 286 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4bf9fb7101ced58409d0…

1 0

Piotr Caban : msvcrt: Fixed strtod_l/wcstod_l implementation.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 9915dd03b432664c15ce4d1a1b8a019aee53c739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9915dd03b432664c15ce4d1a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 12:35:08 2010 +0200 msvcrt: Fixed strtod_l/wcstod_l implementation. --- dlls/msvcrt/string.c | 5 ++++- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 8c99399..f44e6eb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -169,6 +169,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca int exp=0, sign=1; const char *p; double ret; + BOOL found_digit = FALSE; if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -191,6 +192,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca p++; while(isdigit(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; @@ -207,6 +209,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca p++; while(isdigit(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; @@ -217,7 +220,7 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca while(isdigit(*p)) p++; - if(p == str) { + if(!found_digit) { if(end) *end = (char*)str; return 0.0; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 55cb5e4..e2324b0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1096,6 +1096,7 @@ static void test__strtod(void) const char double4[] = ".21e12"; const char double5[] = "214353e-3"; const char overflow[] = "1d9999999999999999999"; + const char white_chars[] = " d10"; char *end; double d; @@ -1123,6 +1124,10 @@ static void test__strtod(void) d = strtod("12.1d2", NULL); ok(almost_equal(d, 12.1e2), "d = %lf\n", d); + d = strtod(white_chars, &end); + ok(almost_equal(d, 0), "d = %lf\n", d); + ok(end == white_chars, "incorrect end (%d)\n", (int)(end-white_chars)); + /* Set locale with non '.' decimal point (',') */ if(!setlocale(LC_ALL, "Polish")) { win_skip("system with limited locales\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 03ecc7f..529547b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -133,6 +133,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, int exp=0, sign=1; const MSVCRT_wchar_t *p; double ret; + BOOL found_digit = FALSE; if(!str) { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); @@ -154,6 +155,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, p++; while(isdigitW(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) { exp++; @@ -169,6 +171,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, p++; while(isdigitW(*p)) { + found_digit = TRUE; hlp = d*10+*(p++)-'0'; if(d>MSVCRT_UI64_MAX/10 || hlp<d) break; @@ -179,7 +182,7 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, while(isdigitW(*p)) p++; - if(p == str) { + if(!found_digit) { if(end) *end = (MSVCRT_wchar_t*)str; return 0.0;

1 0

Jacek Caban : shdocvw: Don' t fail on invalid headers argument in navigate_url.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: ad759e793cf86dda7c8611c607911f8f3a53a9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad759e793cf86dda7c8611c60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 22 13:58:45 2010 +0200 shdocvw: Don't fail on invalid headers argument in navigate_url. --- dlls/shdocvw/navigate.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 6f05cf2..6d73fd9 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -759,19 +759,12 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, Flags, Flags ? V_VT(Flags) : -1, TargetFrameName, TargetFrameName ? V_VT(TargetFrameName) : -1); - if(PostData) { - TRACE("PostData vt=%d\n", V_VT(PostData)); - - if(V_VT(PostData) == (VT_ARRAY | VT_UI1)) { - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; - } + if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1)) { + SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); + post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; } - if(Headers && V_VT(Headers) != VT_EMPTY && V_VT(Headers) != VT_ERROR) { - if(V_VT(Headers) != VT_BSTR) - return E_INVALIDARG; - + if(Headers && V_VT(Headers) == VT_BSTR) { headers = V_BSTR(Headers); TRACE("Headers: %s\n", debugstr_w(headers)); }

1 0

Dylan Smith : wordpad: Allow objects & images to be added with native riched20.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d8a05c37d992d8b51d26fc100bd86d35bf0ef203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a05c37d992d8b51d26fc100… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 22 08:30:19 2010 -0400 wordpad: Allow objects & images to be added with native riched20. Native riched20.dll seems to need an IRichEditOleCallback object in order to get a buffer to store the image (using the GetNewStorage method). --- programs/wordpad/Makefile.in | 3 +- programs/wordpad/olecallback.c | 210 ++++++++++++++++++++++++++++++++++++++++ programs/wordpad/wordpad.c | 31 +------ programs/wordpad/wordpad.h | 6 + 4 files changed, 220 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8a05c37d992d8b51d26f…

1 0

Hans Leidekker : msi: Downgrade a warning.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: d8b7a2099e696c9f479220aa440a9c03f2b1e594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b7a2099e696c9f479220aa4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:47:30 2010 +0200 msi: Downgrade a warning. --- dlls/msi/classes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 019ac06..30ee36b 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -1149,7 +1149,7 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) res = RegDeleteTreeW( HKEY_CLASSES_ROOT, progid->ProgID ); if (res != ERROR_SUCCESS) - WARN("Failed to delete progid key %d\n", res); + TRACE("Failed to delete progid key %d\n", res); uirow = MSI_CreateRecord( 1 ); MSI_RecordSetStringW( uirow, 1, progid->ProgID );

1 0

Hans Leidekker : msi/tests: Fix test failures on wow64.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: 21d09ffb4363ae76b3762eb56299bea7765cbee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d09ffb4363ae76b3762eb56… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:47:46 2010 +0200 msi/tests: Fix test failures on wow64. --- dlls/msi/tests/msi.c | 644 +++++++++++++++++++++++++++------------------- dlls/msi/tests/package.c | 28 ++- dlls/msi/tests/source.c | 207 +++++++++------ 3 files changed, 518 insertions(+), 361 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21d09ffb4363ae76b3762…

1 0

Hans Leidekker : msi/tests: Return an error code from helper_createpackage and package_from_db.
by Alexandre Julliard 22 Jul '10

22 Jul '10

Module: wine Branch: master Commit: dad50e3aa08c881972e5513dffd074a0498e0773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad50e3aa08c881972e5513df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 22 11:48:10 2010 +0200 msi/tests: Return an error code from helper_createpackage and package_from_db. --- dlls/msi/tests/db.c | 24 +++++--- dlls/msi/tests/format.c | 65 ++++++++++----------- dlls/msi/tests/package.c | 142 +++++++++++++++++++++++---------------------- 3 files changed, 119 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dad50e3aa08c881972e55…

1 0