July 2017 - Wine-Commits - list.winehq.org

Michael Müller : cabinet: Set index of folder in FDICopy callback.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 4a568851815f80b9d4d4f0a356f99e2d6513e695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a568851815f80b9d4d4f0a35… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 8 01:07:36 2017 +0100 cabinet: Set index of folder in FDICopy callback. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 67639e6ce7b88894009751b19051c58b7258f952) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cabinet/fdi.c | 2 ++ dlls/cabinet/tests/fdi.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index fdff0bf..758133e 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2640,6 +2640,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; + fdin.iFolder = file->index; if ((filehf = ((*pfnfdin)(fdintCOPY_FILE, &fdin))) == -1) { set_error( fdi, FDIERROR_USER_ABORT, 0 ); filehf = 0; @@ -2765,6 +2766,7 @@ BOOL __cdecl FDICopy( fdin.date = file->date; fdin.time = file->time; fdin.attribs = file->attribs; /* FIXME: filter _A_EXEC? */ + fdin.iFolder = file->index; ((*pfnfdin)(fdintCLOSE_FILE_INFO, &fdin)); filehf = 0; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index b5bec38..ba622f6 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -116,7 +116,7 @@ static const struct { { {'M','S','C','F'}, 0, 0x59, 0, sizeof(struct CFHEADER) + sizeof(struct CFFOLDER), 0, 3,1, 1, 1, 0, 0x1225, 0x2013 }, { sizeof(struct CFHEADER) + sizeof(struct CFFOLDER) + sizeof(struct CFFILE) + sizeof("file.dat"), 1, tcompTYPE_NONE }, - { sizeof("Hello World!")-1, 0, 0, 0x1225, 0x2013, 0xa114 }, + { sizeof("Hello World!")-1, 0, 0x1234, 0x1225, 0x2013, 0xa114 }, { 'f','i','l','e','.','d','a','t',0 }, { 0, sizeof("Hello World!")-1, sizeof("Hello World!")-1 }, { 'H','e','l','l','o',' ','W','o','r','l','d','!' } @@ -841,7 +841,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->date == 0x1225, "expected 0x1225, got %#x\n", info->date); ok(info->time == 0x2013, "expected 0x2013, got %#x\n", info->time); ok(info->attribs == 0xa114, "expected 0xa114, got %#x\n", info->attribs); - ok(info->iFolder == 0, "expected 0, got %#x\n", info->iFolder); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 1; case fdintCOPY_FILE: @@ -850,6 +850,7 @@ static INT_PTR CDECL fdi_mem_notify(FDINOTIFICATIONTYPE fdint, FDINOTIFICATION * ok(info->cb == 12, "expected 12, got %u\n", info->cb); ok(!strcmp(info->psz1, expected), "expected %s, got %s\n", expected, info->psz1); + ok(info->iFolder == 0x1234, "expected 0x1234, got %#x\n", info->iFolder); return 0x12345678; /* call write() callback */ }

1 0

Bruno Jesus : ws2_32/tests: Rework WSAStringToAddress tests.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: a9c08daaccb7cddae774693f5fa396bc28533555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c08daaccb7cddae774693f5… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:43 2017 -0300 ws2_32/tests: Rework WSAStringToAddress tests. Current IPv6 tests were hiddenly failing in wine due to overly acceptive ok calls. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 49a2d1b80230cbd6e4c1c645a85ef1dc080484a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5856718..f673688 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,15 +3325,27 @@ static void test_WSAStringToAddressA(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressA( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3342,8 +3354,8 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3352,16 +3364,23 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressA( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() should have failed with %d\n", GLE ); + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressA( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); } static void test_WSAStringToAddressW(void) @@ -3448,15 +3467,27 @@ static void test_WSAStringToAddressW(void) broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, "unexpected length %d\n", len ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressW( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3465,8 +3496,8 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3475,13 +3506,20 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressW( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressW( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), "WSAStringToAddressW() should have failed with %d\n", GLE );

1 0

Piotr Caban : msvcr: Add _Wcsftime implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: fd4ea8ea6a32dd1b6643efc474bb78bf60c23be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4ea8ea6a32dd1b6643efc47… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 14 17:41:59 2017 +0100 msvcr: Add _Wcsftime implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6400b9fe7e6247de21c35a8ec73dba629c6dd52) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/time.c | 33 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 5da3851..463ad7f 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl _W_Getdays() ucrtbase._W_Getdays @ cdecl _W_Getmonths() ucrtbase._W_Getmonths @ cdecl _W_Gettnames() ucrtbase._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) ucrtbase._Wcsftime @ cdecl __daylight() ucrtbase.__daylight @ cdecl __dstbias() ucrtbase.__dstbias @ cdecl __timezone() ucrtbase.__timezone diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 39a2eef..3eaa90b 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -867,7 +867,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d09c711..fa2cca7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -851,7 +851,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d51f5d3..7ecc163 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -845,7 +845,7 @@ @ cdecl _W_Getdays() msvcr120._W_Getdays @ cdecl _W_Getmonths() msvcr120._W_Getmonths @ cdecl _W_Gettnames() msvcr120._W_Gettnames -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) msvcr120._Wcsftime @ cdecl _XcptFilter(long ptr) msvcr120._XcptFilter @ cdecl __AdjustPointer(ptr ptr) msvcr120.__AdjustPointer @ stub __BuildCatchObject diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b0f5285..c390df6 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1263,16 +1263,14 @@ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *f return strftime_helper(str, max, format, mstm, NULL, NULL); } -/********************************************************************* - * _wcsftime_l (MSVCRT.@) - */ -MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, - const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +static MSVCRT_size_t wcsftime_helper( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data, MSVCRT__locale_t loc ) { char *s, *fmt; MSVCRT_size_t len; - TRACE("%p %ld %s %p %p\n", str, max, debugstr_w(format), mstm, loc); + TRACE("%p %ld %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc); len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; @@ -1280,7 +1278,7 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, if ((s = MSVCRT_malloc( max*4 ))) { - if (!MSVCRT__strftime_l( s, max*4, fmt, mstm, loc )) s[0] = 0; + if (!strftime_helper( s, max*4, fmt, mstm, time_data, loc )) s[0] = 0; len = MSVCRT__mbstowcs_l( str, s, max, loc ); MSVCRT_free( s ); } @@ -1291,12 +1289,31 @@ MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, } /********************************************************************* + * _wcsftime_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +{ + return wcsftime_helper(str, max, format, mstm, NULL, loc); +} + +/********************************************************************* * wcsftime (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) { - return MSVCRT__wcsftime_l(str, max, format, mstm, NULL); + return wcsftime_helper(str, max, format, mstm, NULL, NULL); +} + +/********************************************************************* + * _Wcsftime (MSVCRT.@) + */ +MSVCRT_size_t CDECL _Wcsftime(MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, + MSVCRT___lc_time_data *time_data) +{ + return wcsftime_helper(str, max, format, mstm, time_data, NULL); } static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index b66a4fe..e57b6d6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -44,7 +44,7 @@ @ cdecl _W_Getdays() @ cdecl _W_Getmonths() @ cdecl _W_Gettnames() -@ stub _Wcsftime +@ cdecl _Wcsftime(ptr long wstr ptr ptr) @ cdecl __AdjustPointer(ptr ptr) @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0

Piotr Caban : msvcp140: Add _TaskEventLogger class implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 046de3692b8611b0d0265e5456971bf0f13e7866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046de3692b8611b0d0265e545… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 15 12:06:20 2017 +0100 msvcp140: Add _TaskEventLogger class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe1ae48bbe7a367ded3f551369f0d5763efffa36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 36 +++++++++++++++--------------- dlls/msvcp90/misc.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 8d62936..f8a5dfd 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1475,24 +1475,24 @@ @ cdecl -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor @ cdecl ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_free -@ stub -arch=arm ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z -@ stub -arch=i386 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z -@ stub -arch=win64 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z -@ stub -arch=arm ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=i386 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ -@ stub -arch=arm ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ -@ stub -arch=win32 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ -@ stub -arch=win64 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ +@ cdecl -arch=arm ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ thiscall -arch=i386 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=win64 ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogCancelTask +@ cdecl -arch=arm ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ thiscall -arch=i386 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=win64 ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z(ptr long) _TaskEventLogger__LogScheduleTask +@ cdecl -arch=arm ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ thiscall -arch=i386 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=win64 ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskCompleted +@ cdecl -arch=arm ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ thiscall -arch=i386 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=win64 ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogTaskExecutionCompleted +@ cdecl -arch=arm ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ thiscall -arch=i386 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=win64 ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemCompleted +@ cdecl -arch=arm ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ thiscall -arch=i386 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ(ptr) _TaskEventLogger__LogWorkItemStarted +@ cdecl -arch=win64 ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ(ptr) _TaskEventLogger__LogWorkItemStarted @ stub -arch=win32 ?_MP_Add(a)std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Add(a)std@@YAXQEA_K_K(a)Z @ stub -arch=win32 ?_MP_Get(a)std@@YA_KQA_K(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa0a289..4ff3d51 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1427,4 +1427,58 @@ MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) TRACE("(%p)\n", this); return FALSE; } + +typedef struct { + /*_Task_impl_base*/void *task; + MSVCP_bool scheduled; + MSVCP_bool started; +} _TaskEventLogger; + +/* ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogCancelTask, 4) +void __thiscall _TaskEventLogger__LogCancelTask(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z */ +/* ?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QEAAX_N(a)Z */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogScheduleTask, 8) +void __thiscall _TaskEventLogger__LogScheduleTask(_TaskEventLogger *this, MSVCP_bool continuation) +{ + TRACE("(%p %x)\n", this, continuation); +} + +/* ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogTaskExecutionCompleted, 4) +void __thiscall _TaskEventLogger__LogTaskExecutionCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemCompleted, 4) +void __thiscall _TaskEventLogger__LogWorkItemCompleted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QAEXXZ */ +/* ?_LogWorkItemStarted(a)_TaskEventLogger@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogWorkItemStarted, 4) +void __thiscall _TaskEventLogger__LogWorkItemStarted(_TaskEventLogger *this) +{ + TRACE("(%p)\n", this); +} #endif

1 0

Piotr Caban : msvcp140: Add _ContextCallback implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 84ac5d59741f4c9c62ecf95b26cc4a6da8199fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ac5d59741f4c9c62ecf95b2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 10 16:01:36 2017 +0100 msvcp140: Add _ContextCallback implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2fe03d7d3765895260e524e41c187bc0393bc912) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 26 +++++++++++------------ dlls/msvcp90/misc.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 13df2e1..8d62936 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1096,9 +1096,9 @@ @ cdecl -arch=win64 ?_Addfac(a)_Locimp@locale(a)std@@AEAAXPEAVfacet(a)23@_K(a)Z(ptr ptr long) locale__Locimp__Addfac @ cdecl -arch=win32 ?_Addstd(a)ios_base@std@@SAXPAV12@@Z(ptr) ios_base_Addstd @ cdecl -arch=win64 ?_Addstd(a)ios_base@std@@SAXPEAV12@@Z(ptr) ios_base_Addstd -@ stub -arch=arm ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAAXPAX(a)Z -@ stub -arch=i386 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z -@ stub -arch=win64 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z +@ cdecl -arch=arm ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAAXPAX(a)Z(ptr ptr) _ContextCallback__Assign +@ thiscall -arch=i386 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z(ptr ptr) _ContextCallback__Assign +@ cdecl -arch=win64 ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z(ptr ptr) _ContextCallback__Assign @ stub ?_Atexit@@YAXP6AXXZ(a)Z @ extern ?_BADOFF(a)std@@3_JB std_BADOFF @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @@ -1110,15 +1110,15 @@ @ cdecl -arch=arm ?_C_str@?$_Yarn(a)_W@std@@QBAPB_WXZ(ptr) _Yarn_wchar__C_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)_W@std@@QBEPB_WXZ(ptr) _Yarn_wchar__C_str @ cdecl -arch=win64 ?_C_str@?$_Yarn(a)_W@std@@QEBAPEB_WXZ(ptr) _Yarn_wchar__C_str -@ stub -arch=arm ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z -@ stub -arch=i386 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z -@ stub -arch=win64 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z +@ cdecl -arch=arm ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr long) _ContextCallback__CallInContext +@ thiscall -arch=i386 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr long) _ContextCallback__CallInContext +@ cdecl -arch=win64 ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z(ptr ptr long) _ContextCallback__CallInContext @ cdecl -arch=arm ?_Callfns(a)ios_base@std@@AAAXW4event(a)12@@Z(ptr long) ios_base_Callfns @ thiscall -arch=i386 ?_Callfns(a)ios_base@std@@AAEXW4event(a)12@@Z(ptr long) ios_base_Callfns @ cdecl -arch=win64 ?_Callfns(a)ios_base@std@@AEAAXW4event(a)12@@Z(ptr long) ios_base_Callfns -@ stub -arch=arm ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) _ContextCallback__Capture +@ thiscall -arch=i386 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) _ContextCallback__Capture +@ cdecl -arch=win64 ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) _ContextCallback__Capture @ extern -arch=win32 ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A locale__Locimp__Clocptr @ extern -arch=win64 ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA locale__Locimp__Clocptr @ cdecl -arch=arm ?_Decref(a)facet@locale(a)std@@UAAPAV_Facet_base(a)3@XZ(ptr) locale_facet__Decref @@ -1442,7 +1442,7 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_short__Iput @ cdecl -arch=win32 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPADI(a)Z(ptr ptr long ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput -@ stub ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ +@ cdecl ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ(ptr) _ContextCallback__IsCurrentOriginSTA @ stub ?_IsNonBlockingThread(a)_Task_impl_base@details(a)Concurrency@@SA_NXZ @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @@ -1592,9 +1592,9 @@ @ stub ?_ReportUnobservedException(a)details@Concurrency@@YAXXZ @ stub -arch=win32 ?_Reschedule_chore(a)details@Concurrency@@YAHPBU_Threadpool_chore(a)12@@Z @ stub -arch=win64 ?_Reschedule_chore(a)details@Concurrency@@YAHPEBU_Threadpool_chore(a)12@@Z -@ stub -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) _ContextCallback__Reset +@ thiscall -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) _ContextCallback__Reset +@ cdecl -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) _ContextCallback__Reset @ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e819699..aa0a289 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1376,4 +1376,55 @@ task_continuation_context* __thiscall task_continuation_context_ctor(task_contin memset(this, 0, sizeof(*this)); return this; } + +typedef struct { + const vtable_ptr *vtable; + void (__cdecl *func)(void); + int unk[4]; + void *unk2[3]; + void *this; +} function_void_cdecl_void; + +/* ?_Assign(a)_ContextCallback@details(a)Concurrency@@AAEXPAX(a)Z */ +/* ?_Assign(a)_ContextCallback@details(a)Concurrency@@AEAAXPEAX(a)Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Assign, 8) +void __thiscall _ContextCallback__Assign(void *this, void *v) +{ + TRACE("(%p %p)\n", this, v); +} + +#define call_function_do_call(this) CALL_VTBL_FUNC(this, 8, void, (function_void_cdecl_void*), (this)) +#define call_function_do_clean(this,b) CALL_VTBL_FUNC(this, 16, void, (function_void_cdecl_void*,MSVCP_bool), (this, b)) +/* ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QBEXV?$function@$$A6AXXZ(a)std@@_N(a)Z */ +/* ?_CallInContext(a)_ContextCallback@details(a)Concurrency@@QEBAXV?$function@$$A6AXXZ(a)std@@_N(a)Z */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__CallInContext, 48) +void __thiscall _ContextCallback__CallInContext(const void *this, function_void_cdecl_void func, MSVCP_bool b) +{ + TRACE("(%p %p %x)\n", this, func.func, b); + call_function_do_call(func.this); + call_function_do_clean(func.this, func.this!=&func); +} + +/* ?_Capture(a)_ContextCallback@details(a)Concurrency@@AAEXXZ */ +/* ?_Capture(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Capture, 4) +void __thiscall _ContextCallback__Capture(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ */ +/* ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ContextCallback__Reset, 4) +void __thiscall _ContextCallback__Reset(void *this) +{ + TRACE("(%p)\n", this); +} + +/* ?_IsCurrentOriginSTA(a)_ContextCallback@details(a)Concurrency@@CA_NXZ */ +MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) +{ + TRACE("(%p)\n", this); + return FALSE; +} #endif

1 0

Michael Müller : wininet: Handle query parameters for HTTPS urls in InternetOpenUrlW.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: f26de321f94ae70457a39f43528e839253d4a32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26de321f94ae70457a39f435… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Feb 23 12:31:06 2017 +0100 wininet: Handle query parameters for HTTPS urls in InternetOpenUrlW. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6caecb6e58166b980ac610829c808550168e4451) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/internet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 772e4c1..02379c2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3462,7 +3462,9 @@ static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl, if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) return NULL; - if(urlComponents.nScheme == INTERNET_SCHEME_HTTP && urlComponents.dwExtraInfoLength) { + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + urlComponents.dwExtraInfoLength) + { assert(urlComponents.lpszUrlPath + urlComponents.dwUrlPathLength == urlComponents.lpszExtraInfo); urlComponents.dwUrlPathLength += urlComponents.dwExtraInfoLength; }

1 0

Austin English : ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: a37817e4e0b8d126d390c44b56500261989e4abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37817e4e0b8d126d390c44b5… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 7 16:01:20 2017 +0100 ntoskrnl.exe: Add KeAcquireInStackQueuedSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3ccfc092bc91773cf38e9e265eac6385d50cbc8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 10 ++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index bd6bc35..f441ac5 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -4,7 +4,7 @@ @ stub HalClearSoftwareInterrupt @ stub HalRequestSoftwareInterrupt @ stub HalSystemVectorDispatchEntry -@ stub KeAcquireInStackQueuedSpinLock +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) ntoskrnl.exe.KeAcquireInStackQueuedSpinLock @ stub KeAcquireInStackQueuedSpinLockRaiseToSynch @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06320d0..b3db46c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3188,3 +3188,16 @@ VOID WINAPI KeClearEvent(PRKEVENT event) { FIXME("stub: %p\n", event); } + +/*********************************************************************** + * KeAcquireInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( KeAcquireInStackQueuedSpinLock ) +void WINAPI __regs_KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#else +void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HANDLE *handle ) +#endif +{ + FIXME( "stub: %p %p\n", spinlock, handle ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 3e9dba2..7416740 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -41,6 +41,7 @@ @ stub IoWritePartitionTable @ stdcall -norelay IofCallDriver(ptr ptr) @ stdcall -norelay IofCompleteRequest(ptr long) +@ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4c696f7..61374a7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1210,6 +1210,16 @@ typedef struct _CALLBACK_OBJECT UCHAR reserved[3]; } CALLBACK_OBJECT, *PCALLBACK_OBJECT; +typedef struct _KSPIN_LOCK_QUEUE { + struct _KSPIN_LOCK_QUEUE * volatile Next; + volatile PKSPIN_LOCK Lock; +} KSPIN_LOCK_QUEUE, *PKSPIN_LOCK_QUEUE; + +typedef struct _KLOCK_QUEUE_HANDLE { + KSPIN_LOCK_QUEUE LockQueue; + KIRQL OldIrql; +} KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE; + typedef NTSTATUS (NTAPI EX_CALLBACK_FUNCTION)(void *CallbackContext, void *Argument1, void *Argument2); typedef EX_CALLBACK_FUNCTION *PEX_CALLBACK_FUNCTION; diff --git a/tools/make_specfiles b/tools/make_specfiles index 1e2400e..404af76 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -338,6 +338,10 @@ my @dll_groups = "bcrypt", "ncrypt", ], + [ + "ntoskrnl.exe", + "hal", + ], ); my $update_flags = 0;

1 0

André Hentschel : iphlpapi: Add GetUnicastIpAddressEntry implementation.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 2831e0c38091a10c08e9b68a1e326d33cf310de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2831e0c38091a10c08e9b68a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 10 18:30:13 2017 +0100 iphlpapi: Add GetUnicastIpAddressEntry implementation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ccdbceeefc196999a698fc1842d4f1bff651ec22) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 67 +++++++++++++++++++++++++++++++++++++++++++ include/netioapi.h | 17 +++++++++++ include/ws2def.h | 13 +++++++++ include/ws2ipdef.h | 7 +++++ 5 files changed, 105 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4be42fe..314ca17 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -147,7 +147,7 @@ @ stub GetUdpStatsFromStack @ stdcall GetUdpTable( ptr ptr long ) @ stub GetUdpTableFromStack -#@ stub GetUnicastIpAddressEntry +@ stdcall GetUnicastIpAddressEntry( ptr ) #@ stub GetUnicastIpAddressTable @ stdcall GetUniDirectionalAdapterInfo( ptr ptr ) @ stdcall Icmp6CreateFile() diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 54f7a37..b5b1f7b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2455,6 +2455,73 @@ DWORD WINAPI GetExtendedUdpTable(PVOID pUdpTable, PDWORD pdwSize, BOOL bOrder, return ret; } +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) +{ + IP_ADAPTER_ADDRESSES *aa, *ptr; + ULONG size = 0; + DWORD ret; + + TRACE("%p\n", row); + + if (!row) + return ERROR_INVALID_PARAMETER; + + ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, NULL, &size); + if (ret != ERROR_BUFFER_OVERFLOW) + return ret; + if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size))) + return ERROR_OUTOFMEMORY; + if ((ret = GetAdaptersAddresses(row->Address.si_family, 0, NULL, ptr, &size))) + { + HeapFree(GetProcessHeap(), 0, ptr); + return ret; + } + + ret = ERROR_FILE_NOT_FOUND; + for (aa = ptr; aa; aa = aa->Next) + { + IP_ADAPTER_UNICAST_ADDRESS *ua; + + if (aa->u.s.IfIndex != row->InterfaceIndex && + memcmp(&aa->Luid, &row->InterfaceLuid, sizeof(row->InterfaceLuid))) + continue; + ret = ERROR_NOT_FOUND; + + ua = aa->FirstUnicastAddress; + while (ua) + { + SOCKADDR_INET *uaaddr = (SOCKADDR_INET *)ua->Address.lpSockaddr; + + if ((row->Address.si_family == WS_AF_INET6 && + !memcmp(&row->Address.Ipv6.sin6_addr, &uaaddr->Ipv6.sin6_addr, sizeof(uaaddr->Ipv6.sin6_addr))) || + (row->Address.si_family == WS_AF_INET && + row->Address.Ipv4.sin_addr.S_un.S_addr == uaaddr->Ipv4.sin_addr.S_un.S_addr)) + { + memcpy(&row->InterfaceLuid, &aa->Luid, sizeof(aa->Luid)); + row->InterfaceIndex = aa->u.s.IfIndex; + row->PrefixOrigin = ua->PrefixOrigin; + row->SuffixOrigin = ua->SuffixOrigin; + row->ValidLifetime = ua->ValidLifetime; + row->PreferredLifetime = ua->PreferredLifetime; + row->OnLinkPrefixLength = ua->OnLinkPrefixLength; + row->SkipAsSource = 0; + row->DadState = ua->DadState; + if (row->Address.si_family == WS_AF_INET6) + row->ScopeId.u.Value = row->Address.Ipv6.sin6_scope_id; + else + row->ScopeId.u.Value = 0; + NtQuerySystemTime(&row->CreationTimeStamp); + HeapFree(GetProcessHeap(), 0, ptr); + return NO_ERROR; + } + ua = ua->Next; + } + } + HeapFree(GetProcessHeap(), 0, ptr); + + return ret; +} + /****************************************************************** * GetUniDirectionalAdapterInfo (IPHLPAPI.@) * diff --git a/include/netioapi.h b/include/netioapi.h index 0357431..0e777c7 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -82,6 +82,22 @@ typedef struct _MIB_IF_TABLE2 MIB_IF_ROW2 Table[1]; } MIB_IF_TABLE2, *PMIB_IF_TABLE2; +typedef struct _MIB_UNICASTIPADDRESS_ROW +{ + SOCKADDR_INET Address; + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + NL_PREFIX_ORIGIN PrefixOrigin; + NL_SUFFIX_ORIGIN SuffixOrigin; + ULONG ValidLifetime; + ULONG PreferredLifetime; + UINT8 OnLinkPrefixLength; + BOOLEAN SkipAsSource; + NL_DAD_STATE DadState; + SCOPE_ID ScopeId; + LARGE_INTEGER CreationTimeStamp; +} MIB_UNICASTIPADDRESS_ROW, *PMIB_UNICASTIPADDRESS_ROW; + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); @@ -92,5 +108,6 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); #endif /* __WINE_NETIOAPI_H */ diff --git a/include/ws2def.h b/include/ws2def.h index cbd6f74..fa21c06 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -27,6 +27,8 @@ #define WS(x) x #endif +typedef USHORT ADDRESS_FAMILY; + #ifndef __CSADDR_DEFINED__ #define __CSADDR_DEFINED__ @@ -78,6 +80,17 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +typedef struct +{ + union { + struct { + ULONG Zone : 28; + ULONG Level : 4; + } DUMMYSTRUCTNAME; + ULONG Value; + } DUMMYUNIONNAME; +} SCOPE_ID, *PSCOPE_ID; + typedef struct _WSABUF { ULONG len; diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index ca47caa..e13cf6e 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -135,6 +135,13 @@ typedef struct WS(sockaddr_in6_pair) PSOCKADDR_IN6 DestinationAddress; } SOCKADDR_IN6_PAIR, *PSOCKADDR_IN6_PAIR; +typedef union _SOCKADDR_INET +{ + SOCKADDR_IN Ipv4; + SOCKADDR_IN6 Ipv6; + ADDRESS_FAMILY si_family; +} SOCKADDR_INET, *PSOCKADDR_INET; + /* * Multicast group information */

1 0

Bruno Jesus : ws2_32: Fix WSAStringToAddress parsing for IPv6.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 6b72103758a84b6ccbfa2e9837c9acc43ed87c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b72103758a84b6ccbfa2e983… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:44 2017 -0300 ws2_32: Fix WSAStringToAddress parsing for IPv6. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b60cd6830848431e359196bb1d801e93d0952fdf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++------------------ dlls/ws2_32/tests/sock.c | 4 ---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4977bbf..e6ff524 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8266,10 +8266,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } - else - { - ((LPSOCKADDR_IN)lpAddress)->sin_port = 0; - } if(inet_aton(workBuffer, &inetaddr) > 0) { @@ -8280,11 +8276,12 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEINVAL; break; - } case WS_AF_INET6: { struct in6_addr inetaddr; + char *ptrAddr = workBuffer; + /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN6)) { @@ -8298,24 +8295,27 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; - /* This one is a bit tricky. An IPv6 address contains colons, so the - * check from IPv4 doesn't work like that. However, IPv6 addresses that - * contain a port are written with braces like [fd12:3456:7890::1]:12345 - * so what we will do is to look for ']', check if the next char is a - * colon, and if it is, parse the port as in IPv4. */ + /* Valid IPv6 addresses can also be surrounded by [ ], and in this case + * a port number may follow after like in [fd12:3456:7890::1]:12345 + * We need to cut the brackets and find the port if any. */ - ptrPort = strchr(workBuffer, ']'); - if(ptrPort && *(++ptrPort) == ':') + if(*workBuffer == '[') { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort+1)); + ptrPort = strchr(workBuffer, ']'); + if (!ptrPort) + { + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + if (ptrPort[1] == ':') + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort + 2)); + *ptrPort = '\0'; - } - else - { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = 0; + ptrAddr = workBuffer + 1; } - if(inet_pton(AF_INET6, workBuffer, &inetaddr) > 0) + if(inet_pton(AF_INET6, ptrAddr, &inetaddr) > 0) { memcpy(&((LPSOCKADDR_IN6)lpAddress)->sin6_addr, &inetaddr, sizeof(struct in6_addr)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f673688..8df3f5c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3354,7 +3354,6 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3364,7 +3363,6 @@ todo_wine ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); @@ -3496,7 +3494,6 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3506,7 +3503,6 @@ todo_wine ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE);

1 0

André Hentschel : include: Add the new version of the IP_ADAPTER_UNICAST_ADDRESS structure.
by Alexandre Julliard July 20, 2017

July 20, 2017

Module: wine Branch: stable Commit: 4de2aeab8f8008b6a2d2423c94ac9faed27820d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de2aeab8f8008b6a2d2423c9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 1 22:58:53 2017 +0100 include: Add the new version of the IP_ADAPTER_UNICAST_ADDRESS structure. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f3eaa681652ce8f7c8e4b5f085aa3bf5d68ff825) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/iptypes.h | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index cda879d..e4fa90c 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -94,22 +94,43 @@ typedef NL_DAD_STATE IP_DAD_STATE; #ifdef _WINSOCK2API_ -typedef struct _IP_ADAPTER_UNICAST_ADDRESS { +typedef struct _IP_ADAPTER_UNICAST_ADDRESS_LH { union { struct { ULONG Length; DWORD Flags; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_UNICAST_ADDRESS *Next; - SOCKET_ADDRESS Address; - IP_PREFIX_ORIGIN PrefixOrigin; - IP_SUFFIX_ORIGIN SuffixOrigin; - IP_DAD_STATE DadState; - ULONG ValidLifetime; - ULONG PreferredLifetime; - ULONG LeaseLifetime; -} IP_ADAPTER_UNICAST_ADDRESS, *PIP_ADAPTER_UNICAST_ADDRESS; + struct _IP_ADAPTER_UNICAST_ADDRESS_LH *Next; + SOCKET_ADDRESS Address; + IP_PREFIX_ORIGIN PrefixOrigin; + IP_SUFFIX_ORIGIN SuffixOrigin; + IP_DAD_STATE DadState; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG LeaseLifetime; + UINT8 OnLinkPrefixLength; +} IP_ADAPTER_UNICAST_ADDRESS_LH, *PIP_ADAPTER_UNICAST_ADDRESS_LH; + +typedef struct _IP_ADAPTER_UNICAST_ADDRESS_XP { + union { + struct { + ULONG Length; + DWORD Flags; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_UNICAST_ADDRESS_XP *Next; + SOCKET_ADDRESS Address; + IP_PREFIX_ORIGIN PrefixOrigin; + IP_SUFFIX_ORIGIN SuffixOrigin; + IP_DAD_STATE DadState; + ULONG ValidLifetime; + ULONG PreferredLifetime; + ULONG LeaseLifetime; +} IP_ADAPTER_UNICAST_ADDRESS_XP, *PIP_ADAPTER_UNICAST_ADDRESS_XP; + +typedef IP_ADAPTER_UNICAST_ADDRESS_LH IP_ADAPTER_UNICAST_ADDRESS; +typedef IP_ADAPTER_UNICAST_ADDRESS_LH *PIP_ADAPTER_UNICAST_ADDRESS; typedef struct _IP_ADAPTER_ANYCAST_ADDRESS { union { @@ -277,8 +298,8 @@ typedef struct _IP_ADAPTER_ADDRESSES_XP { PIP_ADAPTER_PREFIX FirstPrefix; } IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; -#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH -#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH +typedef IP_ADAPTER_ADDRESSES_LH IP_ADAPTER_ADDRESSES; +typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES; #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0