November 2015 - Wine-Commits

Daniel Lehman : msvcp120: Implement _Thrd_create/join.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: f3a0ac8d53813e5d44b8ab3a9b38b894f20309fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a0ac8d53813e5d44b8ab3a9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 28 11:41:57 2015 -0700 msvcp120: Implement _Thrd_create/join. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 24 ++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 96ad84c..a739dd4 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3856,12 +3856,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 32be6ea..e24268d 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3803,12 +3803,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) @ cdecl _Thrd_lt(ptr ptr) @ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index db14043..3f02051 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -139,10 +139,14 @@ typedef struct #define TIMEDELTA 150 /* 150 ms uncertainty allowed */ +typedef int (__cdecl *_Thrd_start_t)(void*); + static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); static void (__cdecl *p__Thrd_sleep)(const xtime*); static _Thrd_t (__cdecl *p__Thrd_current)(void); +static int (__cdecl *p__Thrd_create)(_Thrd_t*, _Thrd_start_t, void*); +static int (__cdecl *p__Thrd_join)(_Thrd_t, int*); #ifdef __i386__ static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); @@ -296,6 +300,10 @@ static BOOL init(void) "_Thrd_lt"); SET(p__Thrd_sleep, "_Thrd_sleep"); + SET(p__Thrd_create, + "_Thrd_create"); + SET(p__Thrd_join, + "_Thrd_join"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1163,9 +1171,17 @@ static void test_tr2_sys__Last_write_time(void) ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); } +static int __cdecl thrd_thread(void *arg) +{ + _Thrd_t *thr = arg; + + *thr = p__Thrd_current(); + return 0x42; +} + static void test_thrd(void) { - int ret, i; + int ret, i, r; struct test { _Thrd_t a; _Thrd_t b; @@ -1226,6 +1242,22 @@ static void test_thrd(void) ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); + + /* test for create/join */ + if (0) /* crash on Windows */ + { + p__Thrd_create(NULL, thrd_thread, NULL); + p__Thrd_create(&ta, NULL, NULL); + } + r = -1; + ret = p__Thrd_create(&ta, thrd_thread, (void*)&tb); + ok(!ret, "failed to create thread, got %d\n", ret); + ret = p__Thrd_join(ta, &r); + ok(!ret, "failed to join thread, got %d\n", ret); + ok(ta.id == tb.id, "expected %d, got %d\n", ta.id, tb.id); + ok(ta.hnd != tb.hnd, "same handles, got %p\n", ta.hnd); + ok(r == 0x42, "expected 0x42, got %d\n", r); + ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); } START_TEST(msvcp120) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index fc77cfe..d0debd1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3803,12 +3803,12 @@ @ cdecl _Strcoll(ptr ptr ptr ptr ptr) msvcp120._Strcoll @ stub _Strxfrm @ stub _Thrd_abort -@ stub _Thrd_create +@ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit -@ stub _Thrd_join +@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ stub _Thrd_start diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 4bcc716..25b3f23 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -691,6 +691,10 @@ typedef struct DWORD id; } _Thrd_t; +typedef int (__cdecl *_Thrd_start_t)(void*); + +#define _THRD_ERROR 4 + int __cdecl _Thrd_equal(_Thrd_t a, _Thrd_t b) { TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); @@ -750,4 +754,24 @@ ULONGLONG __cdecl _Thrd_current(void) return ret.ull; } #endif + +int __cdecl _Thrd_join(_Thrd_t thr, int *code) +{ + TRACE("(%p %u %p)\n", thr.hnd, thr.id, code); + if (WaitForSingleObject(thr.hnd, INFINITE)) + return _THRD_ERROR; + + if (code) + GetExitCodeThread(thr.hnd, (DWORD *)code); + + CloseHandle(thr.hnd); + return 0; +} + +int __cdecl _Thrd_create(_Thrd_t *thr, _Thrd_start_t proc, void *arg) +{ + TRACE("(%p %p %p)\n", thr, proc, arg); + thr->hnd = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)proc, arg, 0, &thr->id); + return !thr->hnd; +} #endif

1 0

Daniel Lehman : msvcp120: Implement _Thrd_current.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 498d8861e0378e3f3462256791b00598448b815e URL: http://source.winehq.org/git/wine.git/?a=commit;h=498d8861e0378e3f346225679… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 28 11:26:18 2015 -0700 msvcp120: Implement _Thrd_current. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 35 +++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index d227510..96ad84c 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3857,7 +3857,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index f316114..32be6ea 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) @ stub _Thrd_exit diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6cf8053..db14043 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -142,6 +142,20 @@ typedef struct static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); static void (__cdecl *p__Thrd_sleep)(const xtime*); +static _Thrd_t (__cdecl *p__Thrd_current)(void); + +#ifdef __i386__ +static ULONGLONG (__cdecl *p_i386_Thrd_current)(void); +_Thrd_t __cdecl i386_Thrd_current(void) +{ + union { + _Thrd_t thr; + ULONGLONG ull; + } r; + r.ull = p_i386_Thrd_current(); + return r.thr; +} +#endif static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -220,6 +234,8 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); + SET(p__Thrd_current, + "_Thrd_current"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -265,6 +281,14 @@ static BOOL init(void) "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); SET(p_tr2_sys__Last_write_time_set, "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); +#ifdef __i386__ + SET(p_i386_Thrd_current, + "_Thrd_current"); + p__Thrd_current = i386_Thrd_current; +#else + SET(p__Thrd_current, + "_Thrd_current"); +#endif } SET(p__Thrd_equal, "_Thrd_equal"); @@ -1151,6 +1175,7 @@ static void test_thrd(void) const HANDLE hnd2 = (HANDLE)0xdeadbeef; xtime xt, before, after; MSVCRT_long diff; + _Thrd_t ta, tb; struct test testeq[] = { { {0, 0}, {0, 0}, 1 }, @@ -1191,6 +1216,16 @@ static void test_thrd(void) p_xtime_get(&after, 1); diff = p__Xtime_diff_to_millis2(&after, &before); ok(diff > 2000 - TIMEDELTA, "got %d\n", diff); + + /* test for current */ + ta = p__Thrd_current(); + tb = p__Thrd_current(); + ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); + ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); + /* these can be different if new threads are created at same time */ + ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); + ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); } START_TEST(msvcp120) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index b5d423b..fc77cfe 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3804,7 +3804,7 @@ @ stub _Strxfrm @ stub _Thrd_abort @ stub _Thrd_create -@ stub _Thrd_current +@ cdecl _Thrd_current() msvcp120._Thrd_current @ stub _Thrd_detach @ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal @ stub _Thrd_exit diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ccf1d04..4bcc716 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -714,4 +714,40 @@ void __cdecl _Thrd_yield(void) TRACE("()\n"); Sleep(0); } + +static _Thrd_t thread_current(void) +{ + _Thrd_t ret; + + if(DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), + GetCurrentProcess(), &ret.hnd, 0, FALSE, DUPLICATE_SAME_ACCESS)) { + CloseHandle(ret.hnd); + } else { + ret.hnd = 0; + } + ret.id = GetCurrentThreadId(); + + TRACE("(%p %u)\n", ret.hnd, ret.id); + return ret; +} + +#ifndef __i386__ +_Thrd_t __cdecl _Thrd_current(void) +{ + return thread_current(); +} +#else +ULONGLONG __cdecl _Thrd_current(void) +{ + union { + _Thrd_t thr; + ULONGLONG ull; + } ret; + + C_ASSERT(sizeof(_Thrd_t) <= sizeof(ULONGLONG)); + + ret.thr = thread_current(); + return ret.ull; +} +#endif #endif

1 0

YongHao Hu : msvcp110: Add tr2_sys__Open_dir implementation.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: b5c12faa6a793443eb97fdb512787fb3b3ef82c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5c12faa6a793443eb97fdb51… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Oct 31 17:28:46 2015 +0800 msvcp110: Add tr2_sys__Open_dir implementation. Signed-off-by: YongHao Hu <christopherwuy(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/ios.c | 39 +++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a739dd4..dab4cd2 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1641,8 +1641,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEADPEBDAEAHAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z(ptr str long long) tr2_sys__Open_dir +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e24268d..4448764 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1602,8 +1602,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index d0debd1..7217a46 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1602,8 +1602,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z @ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAAXXZ diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 4005290..5242b53 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14439,6 +14439,45 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } +/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ +/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +{ + HANDLE handle; + WIN32_FIND_DATAA data; + char temppath[MAX_PATH]; + + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); + if(strlen(dest) > MAX_PATH - 3) { + *err_code = ERROR_BAD_PATHNAME; + return NULL; + } + strcpy(temppath, dest); + strcat(temppath, "\\*"); + + handle = FindFirstFileA(temppath, &data); + if(handle == INVALID_HANDLE_VALUE) { + *err_code = GetLastError(); + return NULL; + } + while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + if(!FindNextFileA(handle, &data)) { + *err_code = ERROR_SUCCESS; + *type = status_unknown; + FindClose(handle); + return NULL; + } + } + + strcpy(target, data.cFileName); + *err_code = ERROR_SUCCESS; + if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + *type = directory_file; + else + *type = regular_file; + return handle; +} + /* ??0strstream(a)std@@QAE(a)PADHH@Z */ /* ??0strstream(a)std@@QEAA(a)PEAD_JH@Z */ #if STREAMSIZE_BITS == 64

1 0

Sebastian Lackner : server: Clear last error when creating object without name.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 52f9acedd2fb4dab817f2204c74e7f9aa6b26943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f9acedd2fb4dab817f2204c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 2 06:02:16 2015 +0100 server: Clear last error when creating object without name. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 6 +++++- server/named_pipe.c | 6 +++++- server/object.c | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/directory.c b/server/directory.c index 4ebc974..e0cf75e 100644 --- a/server/directory.c +++ b/server/directory.c @@ -287,7 +287,11 @@ void *create_named_object_dir( struct directory *root, const struct unicode_str struct object *obj, *new_obj = NULL; struct unicode_str new_name; - if (!name || !name->len) return alloc_object( ops ); + if (!name || !name->len) + { + if ((new_obj = alloc_object( ops ))) clear_error(); + return new_obj; + } if (!(obj = find_object_dir( root, name, attributes, &new_name ))) return NULL; if (!new_name.len) diff --git a/server/named_pipe.c b/server/named_pipe.c index f5e536c..fbabc5a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -671,7 +671,11 @@ static struct named_pipe *create_named_pipe( struct directory *root, const struc struct named_pipe *pipe = NULL; struct unicode_str new_name; - if (!name || !name->len) return alloc_object( &named_pipe_ops ); + if (!name || !name->len) + { + if ((pipe = alloc_object( &named_pipe_ops ))) clear_error(); + return pipe; + } if (!(obj = find_object_dir( root, name, attr, &new_name ))) { diff --git a/server/object.c b/server/object.c index 965c11c..31883bd 100644 --- a/server/object.c +++ b/server/object.c @@ -242,7 +242,11 @@ void *create_named_object( struct namespace *namespace, const struct object_ops { struct object *obj; - if (!name || !name->len) return alloc_object( ops ); + if (!name || !name->len) + { + if ((obj = alloc_object( ops ))) clear_error(); + return obj; + } if ((obj = find_object( namespace, name, attributes ))) {

1 0

Daniel Lehman : msvcp120: Implement _Thrd_sleep/yield.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 23095b9debf9ae963e61731ad4b76183c21dfe12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23095b9debf9ae963e61731ad… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 28 11:17:23 2015 -0700 msvcp120: Implement _Thrd_sleep/yield. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120/tests/msvcp120.c | 18 ++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 12 ++++++++++++ 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 02ccf44..d227510 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3863,9 +3863,9 @@ @ stub _Thrd_exit @ stub _Thrd_join @ cdecl _Thrd_lt(ptr ptr) -@ stub _Thrd_sleep +@ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start -@ stub _Thrd_yield +@ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5b7ac61..f316114 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3810,9 +3810,9 @@ @ stub _Thrd_exit @ stub _Thrd_join @ cdecl _Thrd_lt(ptr ptr) -@ stub _Thrd_sleep +@ cdecl _Thrd_sleep(ptr) @ stub _Thrd_start -@ stub _Thrd_yield +@ cdecl _Thrd_yield() @ cdecl _Tolower(long ptr) @ cdecl _Toupper(long ptr) @ cdecl _Towlower(long ptr) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 3f24d05..6cf8053 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -137,8 +137,11 @@ typedef struct DWORD id; } _Thrd_t; +#define TIMEDELTA 150 /* 150 ms uncertainty allowed */ + static int (__cdecl *p__Thrd_equal)(_Thrd_t, _Thrd_t); static int (__cdecl *p__Thrd_lt)(_Thrd_t, _Thrd_t); +static void (__cdecl *p__Thrd_sleep)(const xtime*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -267,6 +270,8 @@ static BOOL init(void) "_Thrd_equal"); SET(p__Thrd_lt, "_Thrd_lt"); + SET(p__Thrd_sleep, + "_Thrd_sleep"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -1144,6 +1149,8 @@ static void test_thrd(void) }; const HANDLE hnd1 = (HANDLE)0xcccccccc; const HANDLE hnd2 = (HANDLE)0xdeadbeef; + xtime xt, before, after; + MSVCRT_long diff; struct test testeq[] = { { {0, 0}, {0, 0}, 1 }, @@ -1173,6 +1180,17 @@ static void test_thrd(void) ok(ret == testlt[i].r, "(%p %u) < (%p %u) expected %d, got %d\n", testlt[i].a.hnd, testlt[i].a.id, testlt[i].b.hnd, testlt[i].b.id, testlt[i].r, ret); } + + /* test for sleep */ + if (0) /* crash on Windows */ + p__Thrd_sleep(NULL); + p_xtime_get(&xt, 1); + xt.sec += 2; + p_xtime_get(&before, 1); + p__Thrd_sleep(&xt); + p_xtime_get(&after, 1); + diff = p__Xtime_diff_to_millis2(&after, &before); + ok(diff > 2000 - TIMEDELTA, "got %d\n", diff); } START_TEST(msvcp120) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 2701eee..b5d423b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3810,9 +3810,9 @@ @ stub _Thrd_exit @ stub _Thrd_join @ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt -@ stub _Thrd_sleep +@ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ stub _Thrd_start -@ stub _Thrd_yield +@ cdecl _Thrd_yield() msvcp120._Thrd_yield @ cdecl _Tolower(long ptr) msvcp120._Tolower @ cdecl _Toupper(long ptr) msvcp120._Toupper @ cdecl _Towlower(long ptr) msvcp120._Towlower diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 2ec34fe..ccf1d04 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -702,4 +702,16 @@ int __cdecl _Thrd_lt(_Thrd_t a, _Thrd_t b) TRACE("(%p %u %p %u)\n", a.hnd, a.id, b.hnd, b.id); return a.id < b.id; } + +void __cdecl _Thrd_sleep(const xtime *t) +{ + TRACE("(%p)\n", t); + Sleep(_Xtime_diff_to_millis(t)); +} + +void __cdecl _Thrd_yield(void) +{ + TRACE("()\n"); + Sleep(0); +} #endif

1 0

Andrew Eikum : xaudio2: For legacy xaudio2, prefer native version.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: b321834d56d197aa21ed89143674917239dc3810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b321834d56d197aa21ed89143… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 30 09:42:50 2015 -0500 xaudio2: For legacy xaudio2, prefer native version. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/xaudio_dll.c | 2 ++ dlls/xaudio2_1/xaudio_dll.c | 2 ++ dlls/xaudio2_2/xaudio_dll.c | 2 ++ dlls/xaudio2_3/xaudio_dll.c | 2 ++ dlls/xaudio2_4/xaudio_dll.c | 2 ++ dlls/xaudio2_5/xaudio_dll.c | 2 ++ dlls/xaudio2_6/xaudio_dll.c | 2 ++ 7 files changed, 14 insertions(+) diff --git a/dlls/xaudio2_0/xaudio_dll.c b/dlls/xaudio2_0/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_0/xaudio_dll.c +++ b/dlls/xaudio2_0/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_1/xaudio_dll.c b/dlls/xaudio2_1/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_1/xaudio_dll.c +++ b/dlls/xaudio2_1/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_2/xaudio_dll.c b/dlls/xaudio2_2/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_2/xaudio_dll.c +++ b/dlls/xaudio2_2/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_3/xaudio_dll.c b/dlls/xaudio2_3/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_3/xaudio_dll.c +++ b/dlls/xaudio2_3/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_4/xaudio_dll.c b/dlls/xaudio2_4/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_4/xaudio_dll.c +++ b/dlls/xaudio2_4/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_5/xaudio_dll.c b/dlls/xaudio2_5/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_5/xaudio_dll.c +++ b/dlls/xaudio2_5/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance); diff --git a/dlls/xaudio2_6/xaudio_dll.c b/dlls/xaudio2_6/xaudio_dll.c index 7c95c28..e55861c 100644 --- a/dlls/xaudio2_6/xaudio_dll.c +++ b/dlls/xaudio2_6/xaudio_dll.c @@ -28,6 +28,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { switch (reason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: instance = hinstance; DisableThreadLibraryCalls(hinstance);

1 0

Alexandre Julliard : mmdevapi/tests: Avoid %ll printf format.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: bc9a95bb517b0aedb8d3e505a6bb579fe35b6bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9a95bb517b0aedb8d3e505a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 31 15:02:29 2015 +0900 mmdevapi/tests: Avoid %ll printf format. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index be17a0d..298c886 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -337,7 +337,8 @@ static void test_audioclient(void) (UINT)(t2/10000), (UINT)(t2 % 10000)); ok(t2 >= t1 || broken(t2 >= t1/2 && pwfx->nSamplesPerSec > 48000) || broken(t2 == 0) /* (!) win10 */, - "Latency < default period, delta %ldus (%llu vs %llu)\n", (long)((t2-t1)/10), t2, t1); + "Latency < default period, delta %dus (%x%08x vs %x%08x)\n", + (LONG)((t2-t1)/10), (DWORD)(t2 >> 32), (DWORD)t2, (DWORD)(t1 >> 32), (DWORD)t1); /* Native appears to add the engine period to the HW latency in shared mode */ if(t2 == 0) win10 = TRUE;

1 0

Piotr Caban : include: Fix CreateSymbolicLink and TryAcquireSRWLockExclusive prototypes.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: ff698220c19eb04f4660cea203ca122212312326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff698220c19eb04f4660cea20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 30 15:49:09 2015 +0100 include: Fix CreateSymbolicLink and TryAcquireSRWLockExclusive prototypes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 4 ++-- include/winbase.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 9d5f25b..bc417bd 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1996,7 +1996,7 @@ WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) /************************************************************************* * CreateSymbolicLinkW (KERNEL32.@) */ -BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) +BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) { FIXME("(%s %s %d): stub\n", debugstr_w(link), debugstr_w(target), flags); return TRUE; @@ -2005,7 +2005,7 @@ BOOL WINAPI CreateSymbolicLinkW(LPCWSTR link, LPCWSTR target, DWORD flags) /************************************************************************* * CreateSymbolicLinkA (KERNEL32.@) */ -BOOL WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) +BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR link, LPCSTR target, DWORD flags) { FIXME("(%s %s %d): stub\n", debugstr_a(link), debugstr_a(target), flags); return TRUE; diff --git a/include/winbase.h b/include/winbase.h index 25bc593..f0cc23c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1790,8 +1790,8 @@ WINBASEAPI HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,L WINBASEAPI HANDLE WINAPI CreateSemaphoreExA(SECURITY_ATTRIBUTES*,LONG,LONG,LPCSTR,DWORD,DWORD); WINBASEAPI HANDLE WINAPI CreateSemaphoreExW(SECURITY_ATTRIBUTES*,LONG,LONG,LPCWSTR,DWORD,DWORD); #define CreateSemaphoreEx WINELIB_NAME_AW(CreateSemaphoreEx) -WINBASEAPI BOOL WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); -WINBASEAPI BOOL WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkA(LPCSTR,LPCSTR,DWORD); +WINBASEAPI BOOLEAN WINAPI CreateSymbolicLinkW(LPCWSTR,LPCWSTR,DWORD); #define CreateSymbolicLink WINELIB_NAME_AW(CreateSymbolicLink) WINBASEAPI BOOL WINAPI CreateHardLinkA(LPCSTR,LPCSTR,LPSECURITY_ATTRIBUTES); WINBASEAPI BOOL WINAPI CreateHardLinkW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); @@ -2542,8 +2542,8 @@ WINBASEAPI LPVOID WINAPI TlsGetValue(DWORD); WINBASEAPI BOOL WINAPI TlsSetValue(DWORD,LPVOID); WINBASEAPI BOOL WINAPI TransactNamedPipe(HANDLE,LPVOID,DWORD,LPVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); -WINBASEAPI BOOL WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); -WINBASEAPI BOOL WINAPI TryAcquireSRWLockShared(PSRWLOCK); +WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); +WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockShared(PSRWLOCK); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS);

1 0

Francois Gouget : configure: Fix the notices handling in WINE_PRINT_MESSAGES().
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: bc52901c732195e60640f46d6e723a9fc4b25a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc52901c732195e60640f46d6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Oct 30 22:30:25 2015 +0100 configure: Fix the notices handling in WINE_PRINT_MESSAGES(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index e236c92..5c2bbb8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -789,7 +789,7 @@ Use the --without-$1 option if you really want this.]) ;; esac])]) AC_DEFUN([WINE_PRINT_MESSAGES],[ac_save_IFS="$IFS" -if test "x$wine_notices != "x; then +if test "x$wine_notices" != x; then echo >&AS_MESSAGE_FD IFS="|" for msg in $wine_notices; do diff --git a/configure b/configure index ce5e820..6bf0887 100755 --- a/configure +++ b/configure @@ -19665,7 +19665,7 @@ then fi ac_save_IFS="$IFS" -if test "x$wine_notices != "x; then +if test "x$wine_notices" != x; then echo >&6 IFS="|" for msg in $wine_notices; do

1 0

Jacek Caban : dnsapi: Added DnsQueryEx stub.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 46626eebd58a844e3ac7e8e314c5780a8a50c3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46626eebd58a844e3ac7e8e31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 30 19:22:50 2015 +0100 dnsapi: Added DnsQueryEx stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.spec | 2 +- dlls/dnsapi/query.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 2fb6846..4f6f1c8 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -79,7 +79,7 @@ @ stub DnsNotifyResolver @ stdcall DnsQuery_A(str long long ptr ptr ptr) @ stdcall DnsQueryConfig(long long wstr ptr ptr ptr) -@ stub DnsQueryEx +@ stdcall DnsQueryEx(ptr ptr ptr) @ stdcall DnsQuery_UTF8(str long long ptr ptr ptr) @ stdcall DnsQuery_W(wstr long long ptr ptr ptr) @ stub DnsRecordBuild_UTF8 diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index e05205b..a66db37 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -641,6 +641,27 @@ exit: #endif /* HAVE_RESOLV */ +static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) +{ + if (!req) + return "(null)"; + + return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, + debugstr_w(req->QueryName), dns_type_to_str(req->QueryType), + (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, + req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); +} + +/****************************************************************************** + * DnsQueryEx [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST *request, DNS_QUERY_RESULT *result, DNS_QUERY_CANCEL *cancel) +{ + FIXME("(%s %p %p)\n", debugstr_query_request(request), result, cancel); + return DNS_ERROR_RCODE_NOT_IMPLEMENTED; +} + /****************************************************************************** * DnsQuery_A [DNSAPI.@] *

1 0