September 2010 - Wine-commits

Gerald Pfeifer : comctl32: Remove unused parameter lpcs from TOOLTIPS_Create.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 9724a432e95d7a7d89136b08afae5f1e76d364bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9724a432e95d7a7d89136b08a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 22:27:16 2010 +0200 comctl32: Remove unused parameter lpcs from TOOLTIPS_Create. --- dlls/comctl32/tooltips.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 688d3b5..e74c701 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -1848,7 +1848,7 @@ TOOLTIPS_WindowFromPoint (HWND hwnd, WPARAM wParam, LPARAM lParam) static LRESULT -TOOLTIPS_Create (HWND hwnd, const CREATESTRUCTW *lpcs) +TOOLTIPS_Create (HWND hwnd) { TOOLTIPS_INFO *infoPtr; @@ -2272,7 +2272,7 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_CREATE: - return TOOLTIPS_Create (hwnd, (LPCREATESTRUCTW)lParam); + return TOOLTIPS_Create (hwnd); case WM_DESTROY: return TOOLTIPS_Destroy (infoPtr);

1 0

Nikolay Sivov : msxml3/tests: Fix locale dependent string comparison.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 5a91bea3b213ce243a293d3450a5788747ebf2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a91bea3b213ce243a293d345… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 19 13:20:00 2010 +0400 msxml3/tests: Fix locale dependent string comparison. --- dlls/msxml3/tests/domdoc.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 50a4e54..205716a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5073,22 +5073,28 @@ static void test_nodeTypedValue(void) if (entry->type != VT_BSTR) { - if (entry->type == VT_DATE) + if (entry->type == VT_DATE || + entry->type == VT_R8 || + entry->type == VT_CY) { - hr = VariantChangeType(&value, &value, 0, VT_R4); + if (entry->type == VT_DATE) + { + hr = VariantChangeType(&value, &value, 0, VT_R4); + ok(hr == S_OK, "ret %08x\n", hr ); + } + hr = VariantChangeTypeEx(&value, &value, + MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), SORT_DEFAULT), + VARIANT_NOUSEROVERRIDE, VT_BSTR); ok(hr == S_OK, "ret %08x\n", hr ); - hr = VariantChangeType(&value, &value, 0, VT_BSTR); - ok(hr == S_OK, "ret %08x\n", hr ); - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else { hr = VariantChangeType(&value, &value, 0, VT_BSTR); ok(hr == S_OK, "ret %08x\n", hr ); - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } + + ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, + "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0,

1 0

Roderick Colenbrander : wined3d: Add Radeon HD3200 to gpu table.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: d73370313e64799119183f17d766bd7c0005fcb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73370313e64799119183f17d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Sep 19 22:28:45 2010 -0700 wined3d: Add Radeon HD3200 to gpu table. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb7c657..9f1b3be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1097,6 +1097,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2350, "ATI Mobility Radeon HD 2350", DRIVER_ATI_R600, 256 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_ATI_R600, 256 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_ATI_R600, 512 }, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_ATI_R600, 128 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_ATI_R600, 256 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_ATI_R600, 512 },

1 0

Hans Leidekker : msi: Handle fdintNEXT_CABINET and fdintPARTIAL_FILE for cabinet streams.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 39d6b6eb7057f00aea54c5b252caf23aa3cd34da URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d6b6eb7057f00aea54c5b25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 20 11:20:19 2010 +0200 msi: Handle fdintNEXT_CABINET and fdintPARTIAL_FILE for cabinet streams. --- dlls/msi/media.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index a2a9065..06cd76d 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -358,6 +358,40 @@ done: return res; } +static INT_PTR cabinet_next_cabinet_stream( FDINOTIFICATIONTYPE fdint, + PFDINOTIFICATION pfdin ) +{ + MSICABDATA *data = pfdin->pv; + MSIMEDIAINFO *mi = data->mi; + UINT rc; + + msi_free( mi->disk_prompt ); + msi_free( mi->cabinet ); + msi_free( mi->volume_label ); + mi->disk_prompt = NULL; + mi->cabinet = NULL; + mi->volume_label = NULL; + + mi->disk_id++; + mi->is_continuous = TRUE; + + rc = msi_media_get_disk_info( data->package, mi ); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to get next cabinet information: %u\n", rc); + return -1; + } + + msi_free( cab_stream.name ); + cab_stream.name = encode_streamname( FALSE, mi->cabinet + 1 ); + if (!cab_stream.name) + return -1; + + TRACE("next cabinet is %s\n", debugstr_w(mi->cabinet)); + + return 0; +} + static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { @@ -494,6 +528,12 @@ static INT_PTR CDECL cabinet_notify_stream( FDINOTIFICATIONTYPE fdint, PFDINOTIF { switch (fdint) { + case fdintPARTIAL_FILE: + return cabinet_partial_file( fdint, pfdin ); + + case fdintNEXT_CABINET: + return cabinet_next_cabinet_stream( fdint, pfdin ); + case fdintCOPY_FILE: return cabinet_copy_file( fdint, pfdin );

1 0

Hwang YunSong : shell32: Update Korean resource.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: f493e7e98e3ba4b438bec28aa2dd3539c7dd0c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f493e7e98e3ba4b438bec28aa… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Sep 20 17:21:32 2010 +0900 shell32: Update Korean resource. --- dlls/shell32/shell32_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Ko.rc b/dlls/shell32/shell32_Ko.rc index b3e4bba..8c0327c 100644 --- a/dlls/shell32/shell32_Ko.rc +++ b/dlls/shell32/shell32_Ko.rc @@ -305,6 +305,7 @@ IDS_USER_PROFILES "Users" IDS_COMMON_OEM_LINKS "OEM Links" IDS_DOCUMENTS "Documents" IDS_DOWNLOADS "Downloads" +IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "새 폴더"

1 0

Jacek Caban : urlmon: Skip tests on very old IEs as soon as possible.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 493a3172f47141ad48669987baf3cd87ccc4c0a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493a3172f47141ad48669987b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 20 12:45:50 2010 +0200 urlmon: Skip tests on very old IEs as soon as possible. --- dlls/urlmon/tests/misc.c | 51 ++---------------------------------------- dlls/urlmon/tests/sec_mgr.c | 25 ++------------------ 2 files changed, 6 insertions(+), 70 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 7681b5c..558fc42 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -317,10 +317,6 @@ static void test_CoInternetParseUrl(void) static WCHAR buf[4096]; - if (!pCoInternetParseUrl) { - return; - } - memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[0].url, PARSE_SCHEMA, 0, buf, 3, &size, 0); @@ -380,10 +376,6 @@ static void test_CoInternetCompareUrl(void) { HRESULT hres; - if (!pCoInternetCompareUrl) { - return; - } - hres = pCoInternetCompareUrl(url1, url1, 0); ok(hres == S_OK, "CoInternetCompareUrl failed: %08x\n", hres); @@ -414,10 +406,6 @@ static void test_CoInternetQueryInfo(void) DWORD cb, i; HRESULT hres; - if (!pCoInternetQueryInfo) { - return; - } - for(i=0; i < sizeof(query_info_tests)/sizeof(query_info_tests[0]); i++) { cb = 0xdeadbeef; memset(buf, '?', sizeof(buf)); @@ -665,10 +653,6 @@ static void test_FindMimeFromData(void) LPWSTR mime; int i; - if (!pFindMimeFromData) { - return; - } - for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { mime = (LPWSTR)0xf0f0f0f0; hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); @@ -770,10 +754,6 @@ static void register_protocols(void) static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; - if (!pCoInternetGetSession) { - return; - } - hres = pCoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(FAILED(hres)) @@ -947,10 +927,6 @@ static void test_NameSpace(void) static const WCHAR wszTest[] = {'t','e','s','t',0}; - if (!pCoInternetGetSession || !pCoInternetParseUrl) { - return; - } - hres = pCoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(FAILED(hres)) @@ -1105,10 +1081,6 @@ static void test_MimeFilter(void) static const WCHAR mimeW[] = {'t','e','s','t','/','m','i','m','e',0}; - if (!pCoInternetGetSession) { - return; - } - hres = pCoInternetGetSession(0, &session, 0); ok(hres == S_OK, "CoInternetGetSession failed: %08x\n", hres); if(FAILED(hres)) @@ -1146,10 +1118,6 @@ static void test_ReleaseBindInfo(void) BINDINFO bi; IUnknown unk = { &unk_vtbl }; - if (!pReleaseBindInfo) { - return; - } - pReleaseBindInfo(NULL); /* shouldn't crash */ memset(&bi, 0, sizeof(bi)); @@ -1183,11 +1151,6 @@ static void test_CopyStgMedium(void) static WCHAR fileW[] = {'f','i','l','e',0}; - if (!pCopyStgMedium) { - return; - } - - memset(&src, 0xf0, sizeof(src)); memset(&dst, 0xe0, sizeof(dst)); memset(&empty, 0xf0, sizeof(empty)); @@ -1231,11 +1194,6 @@ static void test_UrlMkGetSessionOption(void) DWORD encoding, size; HRESULT hres; - - if (!pUrlMkGetSessionOption) { - return; - } - size = encoding = 0xdeadbeef; hres = pUrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, sizeof(encoding), &size, 0); @@ -1281,10 +1239,6 @@ static void test_user_agent(void) HRESULT hres; DWORD size, saved; - if (!pObtainUserAgentString || !pUrlMkGetSessionOption) { - return; - } - hres = pObtainUserAgentString(0, NULL, NULL); ok(hres == E_INVALIDARG, "ObtainUserAgentString failed: %08x\n", hres); @@ -1507,8 +1461,6 @@ START_TEST(misc) { HMODULE hurlmon; - OleInitialize(NULL); - hurlmon = GetModuleHandle("urlmon.dll"); pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); @@ -1524,8 +1476,11 @@ START_TEST(misc) if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl || !pCoInternetGetSession || !pCoInternetParseUrl) { win_skip("Various needed functions not present in IE 4.0\n"); + return; } + OleInitialize(NULL); + register_protocols(); test_CreateFormatEnum(); diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 5a1894b..f6e4abd 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -349,10 +349,6 @@ static void test_polices(void) IInternetSecurityManager *secmgr = NULL; HRESULT hres; - if(!pCoInternetCreateSecurityManager || !pCoInternetCreateZoneManager) { - return; - } - hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0); ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); hres = pCoInternetCreateZoneManager(NULL, &zonemgr, 0); @@ -379,10 +375,6 @@ static void test_CoInternetCreateZoneManager(void) IUnknown *punk = NULL; HRESULT hr; - if(!pCoInternetCreateZoneManager) { - return; - } - hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0); ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); if (FAILED(hr)) @@ -427,10 +419,6 @@ static void test_CreateZoneEnumerator(void) DWORD dwCount; DWORD dwCount2; - if (!pCoInternetCreateZoneManager) { - return; - } - hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0); ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr); if (FAILED(hr)) @@ -641,10 +629,6 @@ static void test_InternetSecurityMarshalling(void) IStream *stream; HRESULT hres; - if(!pCoInternetCreateSecurityManager) { - return; - } - hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0); ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres); if(FAILED(hres)) @@ -680,10 +664,6 @@ static void test_InternetGetSecurityUrl(void) DWORD i; HRESULT hres; - if (!pCoInternetGetSecurityUrl) { - return; - } - for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); @@ -708,8 +688,6 @@ START_TEST(sec_mgr) { HMODULE hurlmon; - OleInitialize(NULL); - hurlmon = GetModuleHandle("urlmon.dll"); pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager"); pCoInternetCreateZoneManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateZoneManager"); @@ -718,8 +696,11 @@ START_TEST(sec_mgr) if (!pCoInternetCreateSecurityManager || !pCoInternetCreateZoneManager || !pCoInternetGetSecurityUrl) { win_skip("Various CoInternet* functions not present in IE 4.0\n"); + return; } + OleInitialize(NULL); + test_InternetGetSecurityUrl(); test_SecurityManager(); test_polices();

1 0

Henri Verbeet : wined3d: Move the vertex shader to wined3d_state.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: dd4aea36c99baca50e86bee26dae05e6630392fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4aea36c99baca50e86bee26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 12:04:27 2010 +0200 wined3d: Move the vertex shader to wined3d_state. --- dlls/wined3d/arb_program_shader.c | 9 +++++---- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/glsl_shader.c | 7 ++++--- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/stateblock.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++---- 6 files changed, 36 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd4aea36c99baca50e86b…

1 0

Henri Verbeet : wined3d: Move vertex shader constants to wined3d_state.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 8a148cc7c5bc625cef91d61d2d99b69ca8605719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a148cc7c5bc625cef91d61d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 20 12:04:28 2010 +0200 wined3d: Move vertex shader constants to wined3d_state. --- dlls/wined3d/arb_program_shader.c | 17 ++++++------ dlls/wined3d/device.c | 12 ++++---- dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/stateblock.c | 50 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 8 ++--- 5 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a148cc7c5bc625cef91d…

1 0

Paul Vriens : atl/tests: Fix a test failure on Win95.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 507b29a046a1741c408146971c40765b5b363684 URL: http://source.winehq.org/git/wine.git/?a=commit;h=507b29a046a1741c408146971… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Sep 19 17:18:25 2010 +0200 atl/tests: Fix a test failure on Win95. --- dlls/atl/tests/module.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 1b21f6e..2a97ef9 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -91,10 +91,14 @@ static void test_StructSize(void) ok (hres == S_OK, "AtlModuleInit with %d failed (0x%x).\n", i, (int)hres); break; default: - ok (FAILED(hres), "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); + ok (FAILED(hres) || + broken((i > FIELD_OFFSET( struct _ATL_MODULEW, dwAtlBuildVer )) && (hres == S_OK)), /* Win95 */ + "AtlModuleInit with %d succeeded? (0x%x).\n", i, (int)hres); break; } } + + HeapFree (GetProcessHeap(), 0, tst); } START_TEST(module)

1 0

Luca Bennati : kernel32: Remove dead assignments.
by Alexandre Julliard 20 Sep '10

20 Sep '10

Module: wine Branch: master Commit: 9941f846e88391e5fd904b3afb45be0523c45da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9941f846e88391e5fd904b3af… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sat Sep 18 15:26:05 2010 +0200 kernel32: Remove dead assignments. --- dlls/kernel32/console.c | 2 +- dlls/kernel32/module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index aa7f105..064cd53 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2276,7 +2276,7 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, * happen if we're asked to overwrite more than twice the part of the line, * which is unlikely */ - for (blk = done = 0; done < len; done += blk) + for (done = 0; done < len; done += blk) { blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 4dded4e..07957c9 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -864,7 +864,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) ULONG magic; LdrLockLoaderLock( 0, NULL, &magic ); - if (!(nts = LdrGetDllHandle( load_path, flags, libname, &hModule ))) + if (!LdrGetDllHandle( load_path, flags, libname, &hModule )) { LdrAddRefDll( 0, hModule ); LdrUnlockLoaderLock( 0, magic );

1 0