January 2014 - Wine-commits

Nikolay Sivov : scrrun: Implement Name() property for File.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 3ee9f2407b8fede4ddcfbf455660488b2ae856e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee9f2407b8fede4ddcfbf455… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:48 2014 +0400 scrrun: Implement Name() property for File. --- dlls/scrrun/filesystem.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index a2562ef..1c0c6c3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1559,11 +1559,29 @@ static HRESULT WINAPI file_get_Path(IFile *iface, BSTR *pbstrPath) return E_NOTIMPL; } -static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *pbstrName) +static HRESULT WINAPI file_get_Name(IFile *iface, BSTR *name) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pbstrName); - return E_NOTIMPL; + WCHAR *ptr; + + TRACE("(%p)->(%p)\n", This, name); + + if(!name) + return E_POINTER; + + *name = NULL; + + ptr = strrchrW(This->path, '\\'); + if (ptr) + { + *name = SysAllocString(ptr+1); + TRACE("%s\n", debugstr_w(*name)); + if (!*name) return E_OUTOFMEMORY; + } + else + return E_FAIL; + + return S_OK; } static HRESULT WINAPI file_put_Name(IFile *iface, BSTR pbstrName)

1 0

André Hentschel : kernel32/tests: Add missing last errors for win8.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 29907a28629d1b67afc5b97288aa926a0b56011e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29907a28629d1b67afc5b9728… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 7 00:36:15 2014 +0100 kernel32/tests: Add missing last errors for win8. --- dlls/kernel32/tests/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 7c43663..b38bb30 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1401,7 +1401,7 @@ static void test_WriteConsoleInputA(HANDLE input_handle) {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_HANDLE, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, @@ -1645,7 +1645,7 @@ static void test_WriteConsoleInputW(HANDLE input_handle) {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, - {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_HANDLE, ERROR_INVALID_ACCESS}, {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1}, {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 0, 1},

1 0

Andrey Gusev : d3dcompiler: Correct filename string.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 7ad3b863dc8d2b73a69b3290cbe3c44db357fcd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad3b863dc8d2b73a69b3290c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 16:19:28 2014 +0200 d3dcompiler: Correct filename string. --- dlls/d3dcompiler_33/version.rc | 2 +- dlls/d3dcompiler_34/version.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_33/version.rc b/dlls/d3dcompiler_33/version.rc index 11d0618..880a0b5 100644 --- a/dlls/d3dcompiler_33/version.rc +++ b/dlls/d3dcompiler_33/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" -#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILENAME_STR "d3dcompiler_33.dll" #define WINE_FILEVERSION 9,18,904,15 #define WINE_FILEVERSION_STR "9.18.904.0015" #define WINE_PRODUCTVERSION 9,18,904,15 diff --git a/dlls/d3dcompiler_34/version.rc b/dlls/d3dcompiler_34/version.rc index 8e89a96..b4f9788 100644 --- a/dlls/d3dcompiler_34/version.rc +++ b/dlls/d3dcompiler_34/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" -#define WINE_FILENAME_STR "d3dcompiler_1.dll" +#define WINE_FILENAME_STR "d3dcompiler_34.dll" #define WINE_FILEVERSION 9,19,949,46 #define WINE_FILEVERSION_STR "9.19.949.0046" #define WINE_PRODUCTVERSION 9,19,949,46

1 0

Andrey Gusev : d3dx9_xx: Correct filename string.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 4ec773a0991cc6bacb7e57999ecb531f46db21f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec773a0991cc6bacb7e57999… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 6 16:21:02 2014 +0200 d3dx9_xx: Correct filename string. --- dlls/d3dx9_24/version.rc | 2 +- dlls/d3dx9_25/version.rc | 2 +- dlls/d3dx9_26/version.rc | 2 +- dlls/d3dx9_27/version.rc | 2 +- dlls/d3dx9_28/version.rc | 2 +- dlls/d3dx9_29/version.rc | 2 +- dlls/d3dx9_30/version.rc | 2 +- dlls/d3dx9_31/version.rc | 2 +- dlls/d3dx9_32/version.rc | 2 +- dlls/d3dx9_33/version.rc | 2 +- dlls/d3dx9_34/version.rc | 2 +- dlls/d3dx9_35/version.rc | 2 +- dlls/d3dx9_36/version.rc | 2 +- dlls/d3dx9_37/version.rc | 2 +- dlls/d3dx9_38/version.rc | 2 +- dlls/d3dx9_39/version.rc | 2 +- dlls/d3dx9_40/version.rc | 2 +- dlls/d3dx9_41/version.rc | 2 +- dlls/d3dx9_42/version.rc | 2 +- dlls/d3dx9_43/version.rc | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/version.rc b/dlls/d3dx9_24/version.rc index 8deff20..80a48cb 100644 --- a/dlls/d3dx9_24/version.rc +++ b/dlls/d3dx9_24/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_24.dll" #define WINE_FILEVERSION 9,5,132,0 #define WINE_FILEVERSION_STR "9.5.132.0" #define WINE_PRODUCTVERSION 9,5,132,0 diff --git a/dlls/d3dx9_25/version.rc b/dlls/d3dx9_25/version.rc index 922770c..6f89654 100644 --- a/dlls/d3dx9_25/version.rc +++ b/dlls/d3dx9_25/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_25.dll" #define WINE_FILEVERSION 9,6,168,0 #define WINE_FILEVERSION_STR "9.6.168.0" #define WINE_PRODUCTVERSION 9,6,168,0 diff --git a/dlls/d3dx9_26/version.rc b/dlls/d3dx9_26/version.rc index 56edd13..0497ee5 100644 --- a/dlls/d3dx9_26/version.rc +++ b/dlls/d3dx9_26/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_26.dll" #define WINE_FILEVERSION 9,7,239,0 #define WINE_FILEVERSION_STR "9.7.239.0" #define WINE_PRODUCTVERSION 9,7,239,0 diff --git a/dlls/d3dx9_27/version.rc b/dlls/d3dx9_27/version.rc index 82be05e..0ecef4b 100644 --- a/dlls/d3dx9_27/version.rc +++ b/dlls/d3dx9_27/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_27.dll" #define WINE_FILEVERSION 9,8,299,0 #define WINE_FILEVERSION_STR "9.8.299.0" #define WINE_PRODUCTVERSION 9,8,299,0 diff --git a/dlls/d3dx9_28/version.rc b/dlls/d3dx9_28/version.rc index 0f61f70..67f9e55 100644 --- a/dlls/d3dx9_28/version.rc +++ b/dlls/d3dx9_28/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_28.dll" #define WINE_FILEVERSION 9,10,455,0 #define WINE_FILEVERSION_STR "9.10.455.0" #define WINE_PRODUCTVERSION 9,10,455,0 diff --git a/dlls/d3dx9_29/version.rc b/dlls/d3dx9_29/version.rc index f6f7b13..8fcd63d 100644 --- a/dlls/d3dx9_29/version.rc +++ b/dlls/d3dx9_29/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_29.dll" #define WINE_FILEVERSION 9,11,519,0 #define WINE_FILEVERSION_STR "9.11.519.0" #define WINE_PRODUCTVERSION 9,11,519,0 diff --git a/dlls/d3dx9_30/version.rc b/dlls/d3dx9_30/version.rc index b10286e..575cbfe 100644 --- a/dlls/d3dx9_30/version.rc +++ b/dlls/d3dx9_30/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_30.dll" #define WINE_FILEVERSION 9,12,589,0 #define WINE_FILEVERSION_STR "9.12.589.0" #define WINE_PRODUCTVERSION 9,12,589,0 diff --git a/dlls/d3dx9_31/version.rc b/dlls/d3dx9_31/version.rc index eb97454..b9d5432 100644 --- a/dlls/d3dx9_31/version.rc +++ b/dlls/d3dx9_31/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_31.dll" #define WINE_FILEVERSION 9,15,779,0 #define WINE_FILEVERSION_STR "9.15.779.0" #define WINE_PRODUCTVERSION 9,15,779,0 diff --git a/dlls/d3dx9_32/version.rc b/dlls/d3dx9_32/version.rc index 330f8be..ca1ebde 100644 --- a/dlls/d3dx9_32/version.rc +++ b/dlls/d3dx9_32/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_32.dll" #define WINE_FILEVERSION 9,16,843,0 #define WINE_FILEVERSION_STR "9.16.843.0" #define WINE_PRODUCTVERSION 9,16,843,0 diff --git a/dlls/d3dx9_33/version.rc b/dlls/d3dx9_33/version.rc index 06eba53..2de5aa0 100644 --- a/dlls/d3dx9_33/version.rc +++ b/dlls/d3dx9_33/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_33.dll" #define WINE_FILEVERSION 9,18,904,15 #define WINE_FILEVERSION_STR "9.18.904.15" #define WINE_PRODUCTVERSION 9,18,904,15 diff --git a/dlls/d3dx9_34/version.rc b/dlls/d3dx9_34/version.rc index 5045d8f..f5385d1 100644 --- a/dlls/d3dx9_34/version.rc +++ b/dlls/d3dx9_34/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_34.dll" #define WINE_FILEVERSION 9,19,949,46 #define WINE_FILEVERSION_STR "9.19.949.46" #define WINE_PRODUCTVERSION 9,19,949,46 diff --git a/dlls/d3dx9_35/version.rc b/dlls/d3dx9_35/version.rc index 6ffaafb..8a6f11f 100644 --- a/dlls/d3dx9_35/version.rc +++ b/dlls/d3dx9_35/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_35.dll" #define WINE_FILEVERSION 9,19,949,1104 #define WINE_FILEVERSION_STR "9.19.949.1104" #define WINE_PRODUCTVERSION 9,19,949,1104 diff --git a/dlls/d3dx9_36/version.rc b/dlls/d3dx9_36/version.rc index 8ca195d..38c2942 100644 --- a/dlls/d3dx9_36/version.rc +++ b/dlls/d3dx9_36/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_36.dll" #define WINE_FILEVERSION 9,19,949,2111 #define WINE_FILEVERSION_STR "9.19.949.2111" #define WINE_PRODUCTVERSION 9,19,949,2111 diff --git a/dlls/d3dx9_37/version.rc b/dlls/d3dx9_37/version.rc index aeb99d2..996388e 100644 --- a/dlls/d3dx9_37/version.rc +++ b/dlls/d3dx9_37/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_37.dll" #define WINE_FILEVERSION 9,22,949,2248 #define WINE_FILEVERSION_STR "9.22.949.2248" #define WINE_PRODUCTVERSION 9,22,949,2248 diff --git a/dlls/d3dx9_38/version.rc b/dlls/d3dx9_38/version.rc index a8fdca8..5c33e25 100644 --- a/dlls/d3dx9_38/version.rc +++ b/dlls/d3dx9_38/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_38.dll" #define WINE_FILEVERSION 9,23,949,2378 #define WINE_FILEVERSION_STR "9.23.949.2378" #define WINE_PRODUCTVERSION 9,23,949,2378 diff --git a/dlls/d3dx9_39/version.rc b/dlls/d3dx9_39/version.rc index 234dcb9..d33fc41 100644 --- a/dlls/d3dx9_39/version.rc +++ b/dlls/d3dx9_39/version.rc @@ -17,7 +17,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_39.dll" #define WINE_FILEVERSION 9,24,949,2307 #define WINE_FILEVERSION_STR "9.24.949.2307" #define WINE_PRODUCTVERSION 9,24,949,2307 diff --git a/dlls/d3dx9_40/version.rc b/dlls/d3dx9_40/version.rc index f951079..79894fd 100644 --- a/dlls/d3dx9_40/version.rc +++ b/dlls/d3dx9_40/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_40.dll" #define WINE_FILEVERSION 9,24,950,2656 #define WINE_FILEVERSION_STR "9.24.950.2656" #define WINE_PRODUCTVERSION 9,24,950,2656 diff --git a/dlls/d3dx9_41/version.rc b/dlls/d3dx9_41/version.rc index 6db7842..2419a7d 100644 --- a/dlls/d3dx9_41/version.rc +++ b/dlls/d3dx9_41/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_41.dll" #define WINE_FILEVERSION 9,26,952,2844 #define WINE_FILEVERSION_STR "9.26.952.2844" #define WINE_PRODUCTVERSION 9,26,952,2844 diff --git a/dlls/d3dx9_42/version.rc b/dlls/d3dx9_42/version.rc index 5733eb9..16afffc 100644 --- a/dlls/d3dx9_42/version.rc +++ b/dlls/d3dx9_42/version.rc @@ -19,7 +19,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_42.dll" #define WINE_FILEVERSION 9,27,952,3001 #define WINE_FILEVERSION_STR "9.27.952.3001" #define WINE_PRODUCTVERSION 9,27,952,3001 diff --git a/dlls/d3dx9_43/version.rc b/dlls/d3dx9_43/version.rc index 865caac..7220bd2 100644 --- a/dlls/d3dx9_43/version.rc +++ b/dlls/d3dx9_43/version.rc @@ -18,7 +18,7 @@ */ #define WINE_FILEDESCRIPTION_STR "Wine D3DX9" -#define WINE_FILENAME_STR "d3dx9.dll" +#define WINE_FILENAME_STR "d3dx9_43.dll" #define WINE_FILEVERSION 9,29,952,3111 #define WINE_FILEVERSION_STR "9.29.952.3111" #define WINE_PRODUCTVERSION 9,29,952,3111

1 0

Bruno Jesus : ws2_32/tests: Add some FIONREAD tests.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 7e4d075ec1859f5fadcad4a39a261237f1d8eb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4d075ec1859f5fadcad4a39… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 6 20:58:54 2014 -0200 ws2_32/tests: Add some FIONREAD tests. --- dlls/ws2_32/tests/sock.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 54b0840..9a90454 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3859,7 +3859,7 @@ static void test_addr_to_print(void) static void test_ioctlsocket(void) { - SOCKET sock; + SOCKET sock, src, dst; struct tcp_keepalive kalive; int ret, optval; static const LONG cmds[] = {FIONBIO, FIONREAD, SIOCATMARK}; @@ -3943,6 +3943,32 @@ static void test_ioctlsocket(void) ok(ret == 0 || broken(ret == SOCKET_ERROR), "WSAIoctl failed unexpectedly\n"); closesocket(sock); + + if (tcp_socketpair(&src, &dst) != 0) + { + ok(0, "creating socket pair failed, skipping test\n"); + return; + } + + /* test FIONREAD on TCP sockets */ + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 0, "FIONREAD should have returned 0 bytes, got %d instead\n", optval); + + optval = 0xdeadbeef; + ok(send(src, "TEST", 4, 0) == 4, "failed to send test data\n"); + Sleep(100); + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == 0, "WSAIoctl failed unexpectedly with error %d\n", WSAGetLastError()); + ok(optval == 4, "FIONREAD should have returned 4 bytes, got %d instead\n", optval); + + closesocket(dst); + optval = 0xdeadbeef; + ret = WSAIoctl(dst, FIONREAD, NULL, 0, &optval, sizeof(optval), &arg, NULL, NULL); + ok(ret == SOCKET_ERROR, "WSAIoctl succeeded unexpectedly\n"); + ok(optval == 0xdeadbeef, "FIONREAD should not have changed last error, got %d instead\n", optval); + closesocket(src); } static BOOL drain_pause = FALSE;

1 0

Bruno Jesus : ws2_32/tests: Show that the last WSACleanup must destroy sockets.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: a1e22940069b050e376944c66d4a1030184c67e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1e22940069b050e376944c66… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 6 20:58:56 2014 -0200 ws2_32/tests: Show that the last WSACleanup must destroy sockets. --- dlls/ws2_32/tests/sock.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9a90454..86a829e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1027,6 +1027,8 @@ static void test_WithWSAStartup(void) WORD version = MAKEWORD( 2, 2 ); INT res; LPVOID ptr; + SOCKET src, dst; + DWORD error; res = WSAStartup( version, &data ); ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); @@ -1034,6 +1036,31 @@ static void test_WithWSAStartup(void) ptr = gethostbyname("localhost"); ok(ptr != NULL, "gethostbyname() failed unexpectedly: %d\n", WSAGetLastError()); + ok(!tcp_socketpair(&src, &dst), "creating socket pair failed\n"); + + res = send(src, "TEST", 4, 0); + ok(res == 4, "send failed with error %d\n", WSAGetLastError()); + + WSACleanup(); + + res = WSAStartup( version, &data ); + ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); + + /* show that sockets are destroyed automatically after WSACleanup */ + todo_wine { + SetLastError(0xdeadbeef); + res = send(src, "TEST", 4, 0); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "send should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + + SetLastError(0xdeadbeef); + res = closesocket(dst); + error = WSAGetLastError(); + ok(res == SOCKET_ERROR, "closesocket should have failed\n"); + ok(error == WSAENOTSOCK, "expected 10038, got %d\n", error); + } + WSACleanup(); }

1 0

Alexandre Julliard : makefiles: Expand define arguments directly into the generated rules.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 1a74fdbcee3530f4b66590e5f0eebf947ebc9e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74fdbcee3530f4b66590e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 10:56:15 2014 +0100 makefiles: Expand define arguments directly into the generated rules. --- Make.rules.in | 9 ++++----- tools/makedep.c | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 6966144..7e6a09d 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -11,15 +11,14 @@ # First some useful definitions -DEFS = -D__WINESRC__ $(EXTRADEFS) -ALLCFLAGS = $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) -IDLFLAGS = $(DEFS) $(EXTRAIDLFLAGS) -RCFLAGS = --nostdinc $(PORCFLAGS) $(DEFS) +ALLCFLAGS = $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) +IDLFLAGS = $(EXTRAIDLFLAGS) +RCFLAGS = --nostdinc $(PORCFLAGS) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS:.m=.o) \ $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) -ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS) +ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS) # Rules for dependencies diff --git a/tools/makedep.c b/tools/makedep.c index 28f60fd..4d38613 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -92,6 +92,7 @@ struct strarray static const struct strarray empty_strarray; static struct strarray include_args; +static struct strarray define_args; static struct strarray make_vars; static struct strarray cmdline_vars; @@ -1475,9 +1476,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res rsrc.pot:", obj ); @@ -1487,9 +1489,10 @@ static struct strarray output_sources(void) { output( "%s.res: $(WRC) %s\n", obj, sourcedep ); output( "\t$(WRC) -o $@ %s", source->filename ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output( "\n" ); output( "%s.res:", obj ); @@ -1524,8 +1527,9 @@ static struct strarray output_sources(void) output_filenames( targets ); output( ": $(WIDL)\n" ); output( "\t$(WIDL) -o $@ %s", source->filename ); - output_filenames( includes ); output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); @@ -1602,6 +1606,7 @@ static struct strarray output_sources(void) output( "%s.o: %s\n", obj, sourcedep ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); if (module || staticlib || testdll) output_filenames( dllflags ); output_filename( "$(ALLCFLAGS)" ); output( "\n" ); @@ -1611,6 +1616,8 @@ static struct strarray output_sources(void) output( "%s.cross.o: %s\n", obj, sourcedep ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); + output_filenames( define_args ); + output_filename( "-DWINE_CROSSTEST" ); output_filename( "$(ALLCROSSCFLAGS)" ); output( "\n" ); } @@ -1642,9 +1649,10 @@ static struct strarray output_sources(void) output_filenames( po_files ); output( "\n" ); output( "\t$(WRC) -O pot -o $@" ); - output_filenames( includes ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); + output_filenames( includes ); + output_filenames( define_args ); output_filename( "$(RCFLAGS)" ); output_filenames( po_files ); output( "\n" ); @@ -2090,10 +2098,16 @@ static void update_makefile( const char *path ) parent_dir = get_expanded_make_variable( "PARENTSRC" ); include_args = empty_strarray; + define_args = empty_strarray; + strarray_add( &define_args, "-D__WINESRC__" ); + value = get_expanded_make_var_array( "EXTRAINCL" ); for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &include_args, value.str[i] ); + else + strarray_add_uniq( &define_args, value.str[i] ); + strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); init_paths();

1 0

Alexandre Julliard : makefiles: Allow define arguments to be specific to a single file.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 0d533cf0bd566310e3906b7b93e155999bfc5c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d533cf0bd566310e3906b7b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 12:20:25 2014 +0100 makefiles: Allow define arguments to be specific to a single file. --- dlls/actxprxy/Makefile.in | 3 ++- dlls/appwiz.cpl/Makefile.in | 3 ++- dlls/dispex/Makefile.in | 3 ++- dlls/msdaps/Makefile.in | 3 ++- dlls/ole32/Makefile.in | 4 +++- dlls/oleaut32/Makefile.in | 4 +++- dlls/qmgrprxy/Makefile.in | 3 ++- dlls/quartz/Makefile.in | 3 ++- dlls/sti/Makefile.in | 3 ++- dlls/urlmon/Makefile.in | 6 ++++-- dlls/windowscodecs/Makefile.in | 3 ++- libs/wine/Makefile.in | 18 ++++++++++-------- tools/makedep.c | 8 ++++++++ tools/widl/Makefile.in | 2 +- tools/winegcc/Makefile.in | 18 +++++++++--------- tools/wrc/Makefile.in | 3 ++- 16 files changed, 56 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d533cf0bd566310e3906…

1 0

Alexandre Julliard : makefiles: Always create dependencies from the top-level directory.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 3dfcec768d93d3b332ff2402066e808c52f08c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dfcec768d93d3b332ff24020… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 11:36:12 2014 +0100 makefiles: Always create dependencies from the top-level directory. --- Make.rules.in | 7 ------- tools/makedep.c | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 7e6a09d..947419e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -20,13 +20,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(OBJC_SRCS: ALLCROSSCFLAGS = $(CPPFLAGS) $(CFLAGS) -# Rules for dependencies - -depend: dummy - $(MAKEDEP) -M . - -.PHONY: depend - # Rules for cleaning clean:: diff --git a/tools/makedep.c b/tools/makedep.c index 7f8e518..20b1064 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1944,6 +1944,7 @@ static struct strarray output_sources(void) output( "\t$(RM)" ); output_filenames( clean_files ); output( "\n" ); + strarray_add( &phony_targets, "clean" ); } if (subdirs.count) @@ -1953,6 +1954,13 @@ static struct strarray output_sources(void) output( "\t$(MKDIR_P) -m 755 $@\n" ); } + if (top_obj_dir) + { + output( "depend:\n" ); + output( "\t(a)cd %s && $(MAKE) %s/depend\n", top_obj_dir, base_dir ); + strarray_add( &phony_targets, "depend" ); + } + if (phony_targets.count) { output( ".PHONY:" );

1 0

Alexandre Julliard : mountmgr.sys: Use the correct variable for the include paths.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 15b40f62cc7027495bcccf7429fcdcc6076b6de5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b40f62cc7027495bcccf742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 7 11:33:57 2014 +0100 mountmgr.sys: Use the correct variable for the include paths. --- dlls/mountmgr.sys/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index e1c4bbb..36895e3 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -2,7 +2,7 @@ MODULE = mountmgr.sys IMPORTS = uuid advapi32 ntoskrnl.exe DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native -EXTRADEFS = @DBUS_CFLAGS@ @HAL_CFLAGS@ +EXTRAINCL = @DBUS_CFLAGS@ @HAL_CFLAGS@ EXTRALIBS = @DISKARBITRATIONLIB@ C_SRCS = \

1 0