wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

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

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

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

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

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

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

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

Nikolay Sivov : scrrun: Implement Reset() for file collection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 6dbc8195a0e4ae5fcb9751437e400e6473c0c2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dbc8195a0e4ae5fcb9751437… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:20 2014 +0400 scrrun: Implement Reset() for file collection. --- dlls/scrrun/filesystem.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index eb75a1f..a2562ef 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -705,8 +705,13 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + FindClose(This->data.u.filecoll.find); + This->data.u.filecoll.find = NULL; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone)

1 0

Nikolay Sivov : scrrun: Implement Next() for file collection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 308f1144ac6ffd64d08d2a72ce6b4090617d9082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=308f1144ac6ffd64d08d2a72c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:25:02 2014 +0400 scrrun: Implement Next() for file collection. --- dlls/scrrun/filesystem.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 94d894f..eb75a1f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -50,6 +50,8 @@ struct enumdata { struct { IFileCollection *coll; + HANDLE find; + BSTR path; } filecoll; } u; }; @@ -70,6 +72,7 @@ struct foldercollection { struct filecollection { IFileCollection IFileCollection_iface; LONG ref; + BSTR path; }; struct folder { @@ -142,6 +145,7 @@ static inline HRESULT create_error(DWORD err) } static HRESULT create_folder(const WCHAR*, IFolder**); +static HRESULT create_file(BSTR, IFile**); static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) { @@ -153,6 +157,11 @@ static inline BOOL is_dir_data(const WIN32_FIND_DATAW *data) strcmpW(data->cFileName, dotW); } +static inline BOOL is_file_data(const WIN32_FIND_DATAW *data) +{ + return !(data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY); +} + static BSTR get_full_path(BSTR path, const WIN32_FIND_DATAW *data) { int len = SysStringLen(path); @@ -606,6 +615,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) if (!ref) { IFileCollection_Release(This->data.u.filecoll.coll); + SysFreeString(This->data.u.filecoll.path); heap_free(This); } @@ -615,8 +625,74 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); - return E_NOTIMPL; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + ULONG count = 0; + + TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + + if (fetched) + *fetched = 0; + + if (!handle) + { + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + BSTR parent = This->data.u.filecoll.path; + int len; + + strcpyW(pathW, parent); + len = SysStringLen(parent); + if (parent[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, &data); + if (handle == INVALID_HANDLE_VALUE) + return S_FALSE; + + while (1) + { + if (is_file_data(&data)) + break; + else + if (!FindNextFileW(handle, &data)) + { + FindClose(handle); + return S_FALSE; + } + } + + This->data.u.filecoll.find = handle; + } + + do + { + if (count >= celt) break; + + if (is_file_data(&data)) + { + IFile *file; + HRESULT hr; + BSTR str; + + str = get_full_path(This->data.u.filecoll.path, &data); + hr = create_file(str, &file); + SysFreeString(str); + if (FAILED(hr)) return hr; + + V_VT(&var[count]) = VT_DISPATCH; + V_DISPATCH(&var[count]) = (IDispatch*)file; + count++; + } + } while (FindNextFileW(handle, &data)); + + if (count < celt) + return S_FALSE; + + if (fetched) + *fetched = count; + + return S_OK; } static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) @@ -661,6 +737,12 @@ static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; This->ref = 1; + This->data.u.filecoll.path = SysAllocString(collection->path); + if (!This->data.u.filecoll.path) + { + heap_free(This); + return E_OUTOFMEMORY; + } This->data.u.filecoll.coll = &collection->IFileCollection_iface; IFileCollection_AddRef(This->data.u.filecoll.coll); @@ -903,7 +985,10 @@ static ULONG WINAPI filecoll_Release(IFileCollection *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + SysFreeString(This->path); heap_free(This); + } return ref; } @@ -1006,7 +1091,7 @@ static const IFileCollectionVtbl filecollectionvtbl = { filecoll_get_Count }; -static HRESULT create_filecoll(IFileCollection **files) +static HRESULT create_filecoll(BSTR path, IFileCollection **files) { struct filecollection *This; @@ -1017,6 +1102,12 @@ static HRESULT create_filecoll(IFileCollection **files) This->IFileCollection_iface.lpVtbl = &filecollectionvtbl; This->ref = 1; + This->path = SysAllocString(path); + if (!This->path) + { + heap_free(This); + return E_OUTOFMEMORY; + } *files = &This->IFileCollection_iface; return S_OK; @@ -1290,7 +1381,7 @@ static HRESULT WINAPI folder_get_Files(IFolder *iface, IFileCollection **files) if(!files) return E_POINTER; - return create_filecoll(files); + return create_filecoll(This->path, files); } static HRESULT WINAPI folder_CreateTextFile(IFolder *iface, BSTR filename, VARIANT_BOOL overwrite,

1 0

Nikolay Sivov : scrrun: Added stub NewEnum support for IFileCollection.
by Alexandre Julliard 07 Jan '14

07 Jan '14

Module: wine Branch: master Commit: 0920a3296ee68d07276d83b0db1f4865af102102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0920a3296ee68d07276d83b0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 03:24:41 2014 +0400 scrrun: Added stub NewEnum support for IFileCollection. --- dlls/scrrun/filesystem.c | 87 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index c61020d..94d894f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -47,6 +47,10 @@ struct enumdata { HANDLE find; BSTR path; } foldercoll; + struct + { + IFileCollection *coll; + } filecoll; } u; }; @@ -592,6 +596,80 @@ static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnkn return S_OK; } +static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + IFileCollection_Release(This->data.u.filecoll.coll); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d %p %p): stub\n", This, celt, var, fetched); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%d): stub\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI filecoll_enumvariant_Clone(IEnumVARIANT *iface, IEnumVARIANT **pclone) +{ + struct enumvariant *This = impl_from_IEnumVARIANT(iface); + FIXME("(%p)->(%p): stub\n", This, pclone); + return E_NOTIMPL; +} + +static const IEnumVARIANTVtbl filecollenumvariantvtbl = { + enumvariant_QueryInterface, + enumvariant_AddRef, + filecoll_enumvariant_Release, + filecoll_enumvariant_Next, + filecoll_enumvariant_Skip, + filecoll_enumvariant_Reset, + filecoll_enumvariant_Clone +}; + +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +{ + struct enumvariant *This; + + *newenum = NULL; + + This = heap_alloc(sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->IEnumVARIANT_iface.lpVtbl = &filecollenumvariantvtbl; + This->ref = 1; + + This->data.u.filecoll.coll = &collection->IFileCollection_iface; + IFileCollection_AddRef(This->data.u.filecoll.coll); + + *newenum = (IUnknown*)&This->IEnumVARIANT_iface; + + return S_OK; +} + static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID riid, void **obj) { struct foldercollection *This = impl_from_IFolderCollection(iface); @@ -899,8 +977,13 @@ static HRESULT WINAPI filecoll_get_Item(IFileCollection *iface, VARIANT Key, IFi static HRESULT WINAPI filecoll_get__NewEnum(IFileCollection *iface, IUnknown **ppenum) { struct filecollection *This = impl_from_IFileCollection(iface); - FIXME("(%p)->(%p)\n", This, ppenum); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppenum); + + if(!ppenum) + return E_POINTER; + + return create_filecoll_enum(This, ppenum); } static HRESULT WINAPI filecoll_get_Count(IFileCollection *iface, LONG *count)

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014