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

Piotr Caban : msvcr80: Add __AdjustPointer implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 87bfb306bd591b2a45a9d09a19eb3ab090cc387d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bfb306bd591b2a45a9d09a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 12:08:06 2014 +0200 msvcr80: Add __AdjustPointer implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 34 ++++++++++++++++++++++++++++++++++ dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 77ba21d..07d50fc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -538,7 +538,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1afb3f2..e6576e0 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -869,7 +869,7 @@ @ stub _W_Gettnames @ stub _Wcsftime @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2aee520..9c7f85b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -172,7 +172,7 @@ @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 766d62e..e86541c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -163,7 +163,7 @@ @ stub _NLG_Return2 @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) -@ stub __AdjustPointer +@ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 1c8da4e..0a81edc 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -120,6 +120,7 @@ static int (__cdecl *p_ferror)(FILE*); static int (__cdecl *p_flsbuf)(int, FILE*); static unsigned long (__cdecl *p_byteswap_ulong)(unsigned long); static void** (__cdecl *p__pxcptinfoptrs)(void); +static void* (__cdecl *p__AdjustPointer)(void*, const void*); /* make sure we use the correct errno */ #undef errno @@ -377,6 +378,7 @@ static BOOL init(void) SET(p_flsbuf, "_flsbuf"); SET(p_byteswap_ulong, "_byteswap_ulong"); SET(p__pxcptinfoptrs, "__pxcptinfoptrs"); + SET(p__AdjustPointer, "__AdjustPointer"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method(a)type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1419,6 +1421,37 @@ static void test_is_exception_typeof(void) ok(ret == 0, "_is_exception_typeof returned %d\n", ret); } +static void test__AdjustPointer(void) +{ + int off = 0xf0; + void *obj1 = &off; + void *obj2 = (char*)&off - 2; + struct test_data { + void *ptr; + void *ret; + struct { + int this_offset; + int vbase_descr; + int vbase_offset; + } this_ptr_offsets; + } data[] = { + {NULL, NULL, {0, -1, 0}}, + {(void*)0xbeef, (void*)0xbef0, {1, -1, 1}}, + {(void*)0xbeef, (void*)0xbeee, {-1, -1, 0}}, + {&obj1, (char*)&obj1 + off, {0, 0, 0}}, + {(char*)&obj1 - 5, (char*)&obj1 + off, {0, 5, 0}}, + {(char*)&obj1 - 3, (char*)&obj1 + off + 24, {24, 3, 0}}, + {(char*)&obj2 - 17, (char*)&obj2 + off + 4, {4, 17, 2}} + }; + void *ret; + int i; + + for(i=0; i<sizeof(data)/sizeof(data[0]); i++) { + ret = p__AdjustPointer(data[i].ptr, &data[i].this_ptr_offsets); + ok(ret == data[i].ret, "%d) __AdjustPointer returned %p, expected %p\n", i, ret, data[i].ret); + } +} + START_TEST(msvcr90) { if(!init()) @@ -1446,4 +1479,5 @@ START_TEST(msvcr90) test_byteswap(); test_access_s(); test_is_exception_typeof(); + test__AdjustPointer(); } diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 37dc18a..db48dcb 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1431,3 +1431,8 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) return; } #endif + +void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) +{ + return get_this_pointer(off, obj); +}

1 0

Christoph von Wittich : comctl32/treeview: Notify the parent on a return key press.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 4cc503d164ab00b75567d1a206a303c373cbe044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cc503d164ab00b75567d1a20… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Tue May 6 23:27:44 2014 +0200 comctl32/treeview: Notify the parent on a return key press. --- dlls/comctl32/treeview.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dcc2be4..bb42b21 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5259,6 +5259,10 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) newSelection = TREEVIEW_GetNextListItem(infoPtr, prevItem); break; + case VK_RETURN: + TREEVIEW_SendSimpleNotify(infoPtr, NM_RETURN); + break; + case VK_HOME: newSelection = infoPtr->root->firstChild; break;

1 0

Qian Hong : atl: Include atlcom.h for ATL_PROPMAP_ENTRY.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2d80b3ed54891f5f897bf55fd300fa634870a611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d80b3ed54891f5f897bf55fd… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed May 7 15:39:02 2014 +0800 atl: Include atlcom.h for ATL_PROPMAP_ENTRY. --- dlls/atl/atl.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 53c7181..795ca9b 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "atlbase.h" +#include "atlcom.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -249,18 +250,6 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE return rc; } -/* FIXME: should be in a header file */ -typedef struct ATL_PROPMAP_ENTRY -{ - LPCOLESTR szDesc; - DISPID dispid; - const CLSID* pclsidPropPage; - const IID* piidDispatch; - DWORD dwOffsetData; - DWORD dwSizeData; - VARTYPE vt; -} ATL_PROPMAP_ENTRY; - /*********************************************************************** * AtlIPersistStreamInit_Load [atl100.@] */

1 0

Alistair Leslie-Hughes : netcfgx: Fix memory leak (valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 2aaef5e48fa0d4881ed4f3fcd18d9a2dd4d8b8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaef5e48fa0d4881ed4f3fcd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 14:02:01 2014 +1000 netcfgx: Fix memory leak (valgrind). --- dlls/netcfgx/tests/netcfgx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index 084f8cd..fda39f5 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -74,6 +74,7 @@ static void create_configuration(void) hr = INetCfgLock_ReleaseWriteLock(netlock); ok(hr == S_OK, "got 0x%08x\n", hr); + INetCfgLock_Release(netlock); INetCfg_Release(config); } }

1 0

Alistair Leslie-Hughes : dplayx: Initial msgtid variable (Valgrind).
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: e95f42fca418dbaa815997de9817b6f1aca98674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95f42fca418dbaa815997de9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 7 12:06:17 2014 +1000 dplayx: Initial msgtid variable (Valgrind). --- dlls/dplayx/dplobby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 7b0c57a..3a968de 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -2044,6 +2044,7 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) obj->IDirectPlayLobby3_iface.lpVtbl = &dpl3_vt; obj->IDirectPlayLobby3A_iface.lpVtbl = &dpl3A_vt; obj->numIfaces = 1; + obj->msgtid = 0; obj->ref = 0; obj->refA = 0; obj->ref2 = 0;

1 0

Piotr Caban : msvcrt: Fix ioinfo structure size.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 42e800fe796665d914f8ab7f93495e0c1d9602c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e800fe796665d914f8ab7f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 09:27:59 2014 +0200 msvcrt: Fix ioinfo structure size. --- dlls/msvcr100/msvcr100.spec | 3 +-- dlls/msvcr110/msvcr110.spec | 3 +-- dlls/msvcr80/msvcr80.spec | 3 +-- dlls/msvcr90/msvcr90.spec | 3 +-- dlls/msvcrt/file.c | 11 +++++++++++ 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 98e9539..77ba21d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -573,7 +573,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -648,7 +648,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cdca5c3..1afb3f2 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -900,7 +900,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -997,7 +997,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 13ea9f0..2aee520 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -207,7 +207,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -297,7 +297,6 @@ @ cdecl __p__winver() @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 710cb15..766d62e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -198,7 +198,7 @@ @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv -### extern __badioinfo #don't forward to msvcrt.__badioinfo, it has different size +@ extern __badioinfo MSVCRT___badioinfo @ cdecl __clean_type_info_names_internal(ptr) @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ stub __create_locale @@ -281,7 +281,6 @@ @ cdecl __p__wenviron() MSVCRT___p__wenviron @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func -#FIXME: add correct __pioinfo implementation @ extern __pioinfo MSVCRT___pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 957cfaf..77a0fed 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,6 +88,17 @@ typedef struct { char lookahead[3]; int exflag; CRITICAL_SECTION crit; +#if _MSVCR_VER >= 80 + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; +#endif +#if _MSVCR_VER >= 90 + char dbcsBuffer; + BOOL dbcsBufferUsed; +#endif } ioinfo; /*********************************************************************

1 0

Erich E. Hoover : hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 74c5e38b7c229fbd427a1dcc63507e687db4f69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c5e38b7c229fbd427a1dcc6… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Mon May 5 23:12:10 2014 -0600 hhctrl.ocx: Fix an off by one mistake in searching for the node endpoint. --- dlls/hhctrl.ocx/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hhctrl.ocx/stream.c b/dlls/hhctrl.ocx/stream.c index 6e831e5..84ed317 100644 --- a/dlls/hhctrl.ocx/stream.c +++ b/dlls/hhctrl.ocx/stream.c @@ -122,7 +122,7 @@ static BOOL find_node_end(stream_t *stream, strbuf_t *buf) if(buf->len == 0) break; p = &buf->buf[b]; - while((p = memchr(p+1, '"', buf->len-(p-buf->buf))) != NULL) + while((p = memchr(p+1, '"', buf->len-(p+1-buf->buf))) != NULL) tag_count++; b = buf->len; if(tag_count % 2 != 0)

1 0

Piotr Caban : msvcp70: Add basic_fstream(const char*, int) constructor implementation.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 6c4b075d1aeb8bdc9ab408580fa58dcb7a25f34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4b075d1aeb8bdc9ab408580… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 7 10:28:27 2014 +0200 msvcp70: Add basic_fstream(const char*, int) constructor implementation. --- dlls/msvcp70/msvcp70.spec | 10 +++++----- dlls/msvcp90/ios.c | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 8ff6620..4f02785 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -40,15 +40,15 @@ @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEAU_iobuf@@@Z(ptr ptr) basic_filebuf_wchar_ctor_file @ thiscall -arch=win32 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized @ cdecl -arch=win64 ??0?$basic_filebuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)W4_Uninitialized@1@@Z(ptr long) basic_filebuf_wchar_ctor_uninitialized -@ stub -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_char_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_char_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_char_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z -@ stub -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot +@ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z(ptr str long long) basic_fstream_short_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_short_ctor @ cdecl -arch=win64 ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)XZ(ptr long) basic_fstream_short_ctor -@ stub -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z +@ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z(ptr str long long) basic_fstream_wchar_ctor_name_noprot @ thiscall -arch=win32 ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)XZ(ptr long) basic_fstream_wchar_ctor @ stub -arch=win32 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z @ stub -arch=win64 ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 98d1696..e8d4b06 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -11626,6 +11626,15 @@ basic_fstream_char* __thiscall basic_fstream_char_ctor_name(basic_fstream_char * return this; } +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_char_ctor_name_noprot, 16) +basic_fstream_char* __thiscall basic_fstream_char_ctor_name_noprot(basic_fstream_char *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_char_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ @@ -11881,6 +11890,23 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha return this; } +/* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_wchar_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_wchar_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_wchar_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QAE(a)PBDH@Z */ +/* ??0?$basic_fstream(a)GU?$char_traits(a)G@std@@@std@@QEAA(a)PEBDH@Z */ +DEFINE_THISCALL_WRAPPER(basic_fstream_short_ctor_name_noprot, 16) +basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name_noprot(basic_fstream_wchar *this, + const char *name, int mode, MSVCP_bool virt_init) +{ + return basic_fstream_short_ctor_name(this, name, mode, _SH_DENYNO, virt_init); +} + /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QEAA(a)PEBGHH@Z */ /* ??0?$basic_fstream(a)_WU?$char_traits(a)_W@std@@@std@@QAE(a)PB_WHH@Z */

1 0

Stefan Dösinger : wined3d: Store RGBQUADs in palettes.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: 1558391a110c24e0119dbe4b2a013d26fa808915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1558391a110c24e0119dbe4b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 7 18:02:14 2014 +0200 wined3d: Store RGBQUADs in palettes. --- dlls/wined3d/palette.c | 38 +++++++++++++------- dlls/wined3d/surface.c | 77 +++++++++++----------------------------- dlls/wined3d/utils.c | 10 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 52 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1558391a110c24e0119db…

1 0

Bruno Jesus : ws2_32/tests: Test more the behavior of SO_REUSEADDR.
by Alexandre Julliard May 7, 2014

May 7, 2014

Module: wine Branch: master Commit: eda14e611cce9e9c0f72b9a2f84f75885ed3262e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda14e611cce9e9c0f72b9a2f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue May 6 19:36:04 2014 -0300 ws2_32/tests: Test more the behavior of SO_REUSEADDR. --- dlls/ws2_32/tests/sock.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dcedd99..1752d35 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1468,6 +1468,7 @@ static void test_so_reuseaddr(void) SOCKET s1,s2; unsigned int rc,reuse; int size; + DWORD err; saddr.sin_family = AF_INET; saddr.sin_port = htons(9375); @@ -1496,9 +1497,45 @@ static void test_so_reuseaddr(void) /* On Win2k3 and above, all SO_REUSEADDR seems to do is to allow binding to * a port immediately after closing another socket on that port, so * basically following the BSD socket semantics here. */ - closesocket(s1); rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); - ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + if(rc==0) + { + int s3=socket(AF_INET, SOCK_STREAM, 0), s4; + trace("<= Win XP behavior of SO_REUSEADDR\n"); + + /* If we could bind again in the same port this is Windows version <= XP. + * Lets test if we can really connect to one of them. */ + set_blocking(s1, FALSE); + set_blocking(s2, FALSE); + rc = listen(s1, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = listen(s2, 1); + ok(!rc, "listen() failed with error: %d\n", WSAGetLastError()); + rc = connect(s3, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(!rc, "connecting to accepting socket failed %d\n", WSAGetLastError()); + + /* the delivery of the connection is random so we need to try on both sockets */ + size = sizeof(saddr); + s4 = accept(s1, (struct sockaddr*)&saddr, &size); + if(s4 == INVALID_SOCKET) + s4 = accept(s2, (struct sockaddr*)&saddr, &size); + ok(s4 != INVALID_SOCKET, "none of the listening sockets could get the connection\n"); + + closesocket(s1); + closesocket(s3); + closesocket(s4); + } + else + { + trace(">= Win 2003 behavior of SO_REUSEADDR\n"); + err = WSAGetLastError(); +todo_wine + ok(err==WSAEACCES, "expected 10013, got %d\n", err); + + closesocket(s1); + rc = bind(s2, (struct sockaddr*)&saddr, sizeof(saddr)); + ok(rc==0, "bind() failed error: %d\n", WSAGetLastError()); + } closesocket(s2); }

1 0