November 2011 - Wine-Commits

Piotr Caban : msvcp90: Fixed parameters number in functions returning structures.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 3bb1a7309bcd995bb14c82957e88db9f04bf627a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb1a7309bcd995bb14c82957… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 16:28:19 2011 +0100 msvcp90: Fixed parameters number in functions returning structures. --- dlls/msvcp90/msvcp90.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 226b17d..8b5bff9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3770,10 +3770,10 @@ @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)G@std@@SA_NAEBG0(a)Z(ptr ptr) MSVCP_char_traits_short_eq_int_type @ cdecl -arch=win32 ?eq_int_type@?$char_traits(a)_W@std@@SA_NABG0(a)Z(ptr ptr) MSVCP_char_traits_wchar_eq_int_tpe @ cdecl -arch=win64 ?eq_int_type@?$char_traits(a)_W@std@@SA_NAEBG0(a)Z(ptr ptr) MSVCP_char_traits_wchar_eq_int_tpe -@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr ptr) basic_string_char_erase_iter_range -@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr) basic_string_char_erase_iter_range -@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr ptr) basic_string_char_erase_iter -@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr) basic_string_char_erase_iter +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr ptr ptr) basic_string_char_erase_iter_range +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)0@Z(ptr ptr ptr ptr) basic_string_char_erase_iter_range +@ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr ptr ptr) basic_string_char_erase_iter +@ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAA?AV?$_String_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)V?$_String_const_iterator(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z(ptr ptr ptr) basic_string_char_erase_iter @ thiscall -arch=win32 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)II@Z(ptr long long) MSVCP_basic_string_char_erase @ cdecl -arch=win64 ?erase@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) MSVCP_basic_string_char_erase @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)0@Z @@ -3782,10 +3782,10 @@ @ stub -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA?AV?$_String_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2(a)V?$_String_const_iterator(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@2@@Z @ stub -arch=win32 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)II@Z @ stub -arch=win64 ?erase@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV12(a)_K0@Z -@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr ptr) basic_string_wchar_erase_iter_range -@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr) basic_string_wchar_erase_iter_range -@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z(ptr ptr ptr) basic_string_wchar_erase_iter -@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z(ptr ptr) basic_string_wchar_erase_iter +@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr ptr ptr) basic_string_wchar_erase_iter_range +@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0@Z(ptr ptr ptr ptr) basic_string_wchar_erase_iter_range +@ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z(ptr ptr ptr ptr) basic_string_wchar_erase_iter +@ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA?AV?$_String_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z(ptr ptr ptr) basic_string_wchar_erase_iter @ thiscall -arch=win32 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)II@Z(ptr long long) MSVCP_basic_string_wchar_erase @ cdecl -arch=win64 ?erase@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)_K0@Z(ptr long long) MSVCP_basic_string_wchar_erase @ thiscall -arch=win32 ?exceptions(a)ios_base@std@@QAEXH(a)Z(ptr long) ios_base_exception_set @@ -4099,8 +4099,8 @@ @ stub -arch=win64 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_K(a)Z @ stub -arch=win32 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z @ stub -arch=win64 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_N(a)Z -@ thiscall -arch=win32 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV?$allocator(a)D@2(a)XZ(ptr) basic_string_char_get_allocator -@ cdecl -arch=win64 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV?$allocator(a)D@2(a)XZ(ptr) basic_string_char_get_allocator +@ thiscall -arch=win32 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV?$allocator(a)D@2(a)XZ(ptr ptr) basic_string_char_get_allocator +@ cdecl -arch=win64 ?get_allocator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV?$allocator(a)D@2(a)XZ(ptr ptr) basic_string_char_get_allocator @ stub -arch=win32 ?get_allocator@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE?AV?$allocator(a)G@2(a)XZ @ stub -arch=win64 ?get_allocator@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA?AV?$allocator(a)G@2(a)XZ @ thiscall -arch=win32 ?get_allocator@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV?$allocator(a)_W@2(a)XZ(ptr) basic_string_wchar_get_allocator

1 0

Francois Gouget : crypt32: Delete the oid and sip static critical sections when unloading the dll.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 10faa9997ea7ebd2d7ec096c7d3bfd1797dbdc11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10faa9997ea7ebd2d7ec096c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:33:42 2011 +0100 crypt32: Delete the oid and sip static critical sections when unloading the dll. --- dlls/crypt32/oid.c | 2 ++ dlls/crypt32/sip.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index e5d61f5..932bba2 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -92,6 +92,7 @@ static void free_function_sets(void) DeleteCriticalSection(&setCursor->cs); CryptMemFree(setCursor); } + DeleteCriticalSection(&funcSetCS); } /* There is no free function associated with this; therefore, the sets are @@ -1461,6 +1462,7 @@ static void free_oid_info(void) list_remove(&info->entry); CryptMemFree(info); } + DeleteCriticalSection(&oidInfoCS); } /*********************************************************************** diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index d2f55f2..e43ebc7 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -616,6 +616,7 @@ void crypt_sip_free(void) FreeLibrary(prov->info.hSIP); CryptMemFree(prov); } + DeleteCriticalSection(&providers_cs); } /* Loads the SIP for pgSubject into the global cache. Returns FALSE if the

1 0

Francois Gouget : dinput: Delete the static critical section when unloading the dll.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 4ed24cd5f5c336291ffe0ffb9a7e65f5e0de2303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed24cd5f5c336291ffe0ffb9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:31:26 2011 +0100 dinput: Delete the static critical section when unloading the dll. --- dlls/dinput/dinput_main.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 373b990..c121ae9 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -97,20 +97,6 @@ static const struct dinput_device *dinput_devices[] = static HINSTANCE DINPUT_instance = NULL; -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) -{ - switch(reason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - DINPUT_instance = inst; - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - static BOOL check_hook_thread(void); static CRITICAL_SECTION dinput_hook_crit; static struct list direct_input_list = LIST_INIT( direct_input_list ); @@ -1443,3 +1429,18 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) LeaveCriticalSection(&dinput_hook_crit); } + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) +{ + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + DINPUT_instance = inst; + break; + case DLL_PROCESS_DETACH: + DeleteCriticalSection(&dinput_hook_crit); + break; + } + return TRUE; +}

1 0

Francois Gouget : wininet: Give a name to the critical sections, make them static and delete them when unloading the dll.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 17929b925ea93cdbe140b6a5a7b120589cf020fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=17929b925ea93cdbe140b6a5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:29:44 2011 +0100 wininet: Give a name to the critical sections, make them static and delete them when unloading the dll. --- dlls/wininet/http.c | 2 ++ dlls/wininet/netconnection.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1847820..16f550c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1825,6 +1825,7 @@ static void HTTPREQ_Destroy(object_header_t *hdr) } heap_free(request->cacheFile); + request->read_section.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &request->read_section ); WININET_Release(&request->session->hdr); @@ -3047,6 +3048,7 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->data_stream = &request->netconn_stream.data_stream; InitializeCriticalSection( &request->read_section ); + request->read_section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": http_request_t.read_section"); WININET_AddRef( &session->hdr ); request->session = session; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index dd887eb..bf93301 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -484,7 +484,10 @@ static DWORD init_openssl(void) return ERROR_OUTOFMEMORY; for(i = 0; i < num_ssl_locks; i++) + { InitializeCriticalSection(&ssl_locks[i]); + ssl_locks[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ssl_locks"); + } pCRYPTO_set_locking_callback(ssl_lock_callback); return ERROR_SUCCESS; @@ -578,7 +581,11 @@ void NETCON_unload(void) if (ssl_locks) { int i; - for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection(&ssl_locks[i]); + for (i = 0; i < num_ssl_locks; i++) + { + ssl_locks[i].DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&ssl_locks[i]); + } heap_free(ssl_locks); } #endif

1 0

Alexandre Julliard : winex11: Make sure we create valid bitmaps even for a 1x1 mask.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: bd44f10496ddbd1562926e63aa2b9c16cfd85bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd44f10496ddbd1562926e63a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 18:21:21 2011 +0100 winex11: Make sure we create valid bitmaps even for a 1x1 mask. --- dlls/winex11.drv/mouse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d4249f4..7eabd1e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1161,7 +1161,7 @@ static Cursor create_cursor( HANDLE handle ) #endif GetObjectW( info.hbmMask, sizeof(bm), &bm ); - if (!info.hbmColor) bm.bmHeight /= 2; + if (!info.hbmColor) bm.bmHeight = max( 1, bm.bmHeight / 2 ); /* make sure hotspot is valid */ if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight)

1 0

Alexandre Julliard : user32/tests: Add tests for small sizes of cursor bitmaps.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 3bbb208f8ed3a603614e5edc14265591030e60b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bbb208f8ed3a603614e5edc1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 16 18:08:12 2011 +0100 user32/tests: Add tests for small sizes of cursor bitmaps. --- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/cursoricon.c | 43 +++++++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 7475ecab..4ae7098 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2116,7 +2116,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) width = bmpXor.bmWidth; height = bmpXor.bmHeight; - if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1) + if (bmpXor.bmPlanes * bmpXor.bmBitsPixel != 1 || bmpAnd.bmPlanes * bmpAnd.bmBitsPixel != 1) { color = CreateCompatibleBitmap( screen_dc, width, height ); mask = CreateBitmap( width, height, 1, 1, NULL ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8a0d7c3..4a570ae 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -696,7 +696,7 @@ static void test_initial_cursor(void) ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); } -static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_bpp, int line) +static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_mask_cy, UINT exp_bpp, int line) { ICONINFO info; DWORD ret; @@ -736,13 +736,13 @@ static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_b ok_(__FILE__, line)(bmMask.bmBitsPixel == 1, "bmMask.bmBitsPixel = %d\n", bmMask.bmBitsPixel); ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); - ok_(__FILE__, line)(bmMask.bmHeight == exp_cy, "bmMask.bmHeight = %d\n", bmMask.bmHeight); + ok_(__FILE__, line)(bmMask.bmHeight == exp_mask_cy, "bmMask.bmHeight = %d\n", bmMask.bmHeight); } else { ok_(__FILE__, line)(bmMask.bmBitsPixel == 1, "bmMask.bmBitsPixel = %d\n", bmMask.bmBitsPixel); ok_(__FILE__, line)(bmMask.bmWidth == exp_cx, "bmMask.bmWidth = %d\n", bmMask.bmWidth); - ok_(__FILE__, line)(bmMask.bmHeight == exp_cy * 2, "bmMask.bmHeight = %d\n", bmMask.bmHeight); + ok_(__FILE__, line)(bmMask.bmHeight == exp_mask_cy, "bmMask.bmHeight = %d\n", bmMask.bmHeight); } if (pGetIconInfoExA) { @@ -777,7 +777,7 @@ static void test_icon_info_dbg(HICON hIcon, UINT exp_cx, UINT exp_cy, UINT exp_b } } -#define test_icon_info(a,b,c,d) test_icon_info_dbg((a),(b),(c),(d),__LINE__) +#define test_icon_info(a,b,c,d,e) test_icon_info_dbg((a),(b),(c),(d),(e),__LINE__) static void test_CreateIcon(void) { @@ -789,6 +789,7 @@ static void test_CreateIcon(void) HDC hdc; void *bits; UINT display_bpp; + int i; hdc = GetDC(0); display_bpp = GetDeviceCaps(hdc, BITSPIXEL); @@ -800,12 +801,12 @@ static void test_CreateIcon(void) hIcon = CreateIcon(0, 16, 16, 1, 1, bmp_bits, bmp_bits); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, 1); + test_icon_info(hIcon, 16, 16, 32, 1); DestroyIcon(hIcon); hIcon = CreateIcon(0, 16, 16, 1, display_bpp, bmp_bits, bmp_bits); ok(hIcon != 0, "CreateIcon failed\n"); - test_icon_info(hIcon, 16, 16, display_bpp); + test_icon_info(hIcon, 16, 16, 16, display_bpp); DestroyIcon(hIcon); hbmMask = CreateBitmap(16, 16, 1, 1, bmp_bits); @@ -840,7 +841,7 @@ static void test_CreateIcon(void) info.hbmColor = hbmColor; hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, display_bpp); + test_icon_info(hIcon, 16, 16, 16, display_bpp); DestroyIcon(hIcon); DeleteObject(hbmMask); @@ -857,11 +858,27 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 16, 16, 1); + test_icon_info(hIcon, 16, 16, 32, 1); DestroyIcon(hIcon); - DeleteObject(hbmMask); - DeleteObject(hbmColor); + + for (i = 0; i <= 4; i++) + { + hbmMask = CreateBitmap(1, i, 1, 1, bmp_bits); + ok(hbmMask != 0, "CreateBitmap failed\n"); + + info.fIcon = TRUE; + info.xHotspot = 0; + info.yHotspot = 0; + info.hbmMask = hbmMask; + info.hbmColor = 0; + SetLastError(0xdeadbeaf); + hIcon = CreateIconIndirect(&info); + ok(hIcon != 0, "CreateIconIndirect failed\n"); + test_icon_info(hIcon, 1, i / 2, max(i,1), 1); + DestroyIcon(hIcon); + DeleteObject(hbmMask); + } /* test creating an icon from a DIB section */ @@ -890,7 +907,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 8); + test_icon_info(hIcon, 32, 32, 32, 8); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -908,7 +925,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 8); + test_icon_info(hIcon, 32, 32, 32, 8); DestroyIcon(hIcon); DeleteObject(hbmColor); @@ -926,7 +943,7 @@ static void test_CreateIcon(void) SetLastError(0xdeadbeaf); hIcon = CreateIconIndirect(&info); ok(hIcon != 0, "CreateIconIndirect failed\n"); - test_icon_info(hIcon, 32, 32, 8); + test_icon_info(hIcon, 32, 32, 32, 8); DestroyIcon(hIcon); DeleteObject(hbmMask);

1 0

Rico Schüller : d3dx9: Add count to trace in ID3DXBaseEffect::GetMatrixArray().
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: f7a4cabb467890390e84f0143cd97365244c0b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a4cabb467890390e84f0143… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 15 15:35:39 2011 +0100 d3dx9: Add count to trace in ID3DXBaseEffect::GetMatrixArray(). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 661721d..9e0063a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1938,7 +1938,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); if (!count) return D3D_OK;

1 0

Piotr Caban : msvcp90: Added basic_string::insert implementation.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 486239b1676a7c80262c2a45e4c1eee90a69d519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=486239b1676a7c80262c2a45e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 16:28:01 2011 +0100 msvcp90: Added basic_string::insert implementation. --- dlls/msvcp90/msvcp90.spec | 80 +++++++++--------- dlls/msvcp90/string.c | 198 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=486239b1676a7c80262c2…

1 0

Piotr Caban : msvcp90: Added basic_string::copy implementation.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: b9f544a2ab21956b1313d3919d04871191a9a365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f544a2ab21956b1313d3919… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 16 16:27:47 2011 +0100 msvcp90: Added basic_string::copy implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ce6fea7..7c44668 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3168,12 +3168,12 @@ @ cdecl -arch=win64 ?construct@?$allocator(a)G@std@@QEAAXPEAGAEBG(a)Z(ptr ptr ptr) MSVCP_allocator_short_construct @ thiscall -arch=win32 ?construct@?$allocator(a)_W@std@@QAEXPA_WAB_W(a)Z(ptr ptr ptr) MSVCP_allocator_wchar_construct @ cdecl -arch=win64 ?construct@?$allocator(a)_W@std@@QEAAXPEA_WAEB_W(a)Z(ptr ptr ptr) MSVCP_allocator_wchar_construct -@ stub -arch=win32 ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADII(a)Z -@ stub -arch=win64 ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K1(a)Z +@ thiscall -arch=win32 ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADII(a)Z(ptr ptr long long) basic_string_char_copy +@ cdecl -arch=win64 ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K1(a)Z(ptr ptr long long) basic_string_char_copy @ stub -arch=win32 ?copy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIPAGII(a)Z @ stub -arch=win64 ?copy@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEAG_K1(a)Z -@ stub -arch=win32 ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WII(a)Z -@ stub -arch=win64 ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K1(a)Z +@ thiscall -arch=win32 ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WII(a)Z(ptr ptr long long) basic_string_wchar_copy +@ cdecl -arch=win64 ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K1(a)Z(ptr ptr long long) basic_string_wchar_copy @ cdecl -arch=win32 ?copy@?$char_traits(a)D@std@@SAPADPADPBDI(a)Z(ptr ptr long) MSVCP_char_traits_char_copy @ cdecl -arch=win64 ?copy@?$char_traits(a)D@std@@SAPEADPEADPEBD_K(a)Z(ptr ptr long) MSVCP_char_traits_char_copy @ cdecl -arch=win32 ?copy@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z(ptr ptr long) MSVCP_char_traits_short_copy diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index ed68929..cc22795 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -853,9 +853,9 @@ void __thiscall MSVCP_basic_string_char_Chassign(basic_string_char *this, /* ?_Copy_s@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K11(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_Copy_s, 20) MSVCP_size_t __thiscall MSVCP_basic_string_char_Copy_s(const basic_string_char *this, - char *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) + char *dest, MSVCP_size_t size, MSVCP_size_t count, MSVCP_size_t off) { - TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + TRACE("%p %p %lu %lu %lu\n", this, dest, size, count, off); if(this->size < off) MSVCP__String_base_Xran(); @@ -868,6 +868,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_Copy_s(const basic_string_char * return count; } +/* ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPADII(a)Z */ +/* ?copy@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEAD_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_copy, 16) +MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, + char *dest, MSVCP_size_t count, MSVCP_size_t off) +{ + return MSVCP_basic_string_char_Copy_s(this, dest, count, count, off); +} + /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?c_str@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ @@ -2530,9 +2539,9 @@ void __thiscall MSVCP_basic_string_wchar_Chassign(basic_string_wchar *this, /* ?_Copy_s@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K11(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_Copy_s, 20) MSVCP_size_t __thiscall MSVCP_basic_string_wchar_Copy_s(const basic_string_wchar *this, - wchar_t *dest, MSVCP_size_t size, MSVCP_size_t off, MSVCP_size_t count) + wchar_t *dest, MSVCP_size_t size, MSVCP_size_t count, MSVCP_size_t off) { - TRACE("%p %p %lu %lu %lu\n", this, dest, size, off, count); + TRACE("%p %p %lu %lu %lu\n", this, dest, size, count, off); if(this->size < off) MSVCP__String_base_Xran(); @@ -2545,6 +2554,15 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_Copy_s(const basic_string_wchar return count; } +/* ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPA_WII(a)Z */ +/* ?copy@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEA_W_K1(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_wchar_copy, 16) +MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, + wchar_t *dest, MSVCP_size_t count, MSVCP_size_t off) +{ + return MSVCP_basic_string_wchar_Copy_s(this, dest, count, count, off); +} + /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */ /* ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ */ /* ?data@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ */

1 0

Francois Gouget : dxgi: Delete the static critical section when unloading the dll.
by Alexandre Julliard Nov. 16, 2011

Nov. 16, 2011

Module: wine Branch: master Commit: 903146bdcd0e400ddbfe4f3f0bb71cfcf5fe0c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903146bdcd0e400ddbfe4f3f0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 16 16:31:35 2011 +0100 dxgi: Delete the static critical section when unloading the dll. --- dlls/dxgi/dxgi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 36e3326..c9d6f2e 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -54,6 +54,7 @@ static void dxgi_main_cleanup(void) dxgi_main.d3d10core = NULL; LeaveCriticalSection(&dxgi_cs); + DeleteCriticalSection(&dxgi_cs); } BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)

1 0