January 2014 - Wine-Commits

Sergey Guralnik : winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 4d13f84903eb227acabeaa90beac3d59dd6f8f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d13f84903eb227acabeaa90b… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 8 12:56:26 2014 +0200 winedump: Get rid of the MAKE_DLL_RULES in the Makefile.in template. --- tools/winedump/output.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index c7804d0..aff7f66 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -457,8 +457,7 @@ void output_makefile (void) if (globals.forward_dll) fprintf (makefile, "IMPORTS = %s", globals.forward_dll); - fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", - OUTPUT_DLL_NAME); + fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n", OUTPUT_DLL_NAME); if (globals.forward_dll) fprintf (specfile,"#import %s.dll\n", globals.forward_dll);

1 0

Bruno Jesus : iphlpapi/tests: Add IcmpSendEcho tests.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 98e1560d498deb5aad34054d41b49e094d148ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e1560d498deb5aad34054d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 7 04:00:19 2014 -0200 iphlpapi/tests: Add IcmpSendEcho tests. --- dlls/iphlpapi/tests/iphlpapi.c | 133 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 0d99e3c..dbf97b2 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -73,6 +73,8 @@ static BOOL (WINAPI *pCancelIPChangeNotify)(LPOVERLAPPED); static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pSetTcpEntry)(PMIB_TCPROW); +static HANDLE(WINAPI *pIcmpCreateFile)(VOID); +static DWORD (WINAPI *pIcmpSendEcho)(HANDLE,IPAddr,LPVOID,WORD,PIP_OPTION_INFORMATION,LPVOID,DWORD,DWORD); static void loadIPHlpApi(void) { @@ -105,6 +107,8 @@ static void loadIPHlpApi(void) pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pSetTcpEntry = (void *)GetProcAddress(hLibrary, "SetTcpEntry"); + pIcmpCreateFile = (void *)GetProcAddress(hLibrary, "IcmpCreateFile"); + pIcmpSendEcho = (void *)GetProcAddress(hLibrary, "IcmpSendEcho"); } } @@ -860,6 +864,134 @@ static void testSetTcpEntry(void) "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND); } +static void testIcmpSendEcho(void) +{ + HANDLE icmp; + char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + DWORD ret, error, replysz = sizeof(replydata); + IPAddr address; + + if (!pIcmpSendEcho || !pIcmpCreateFile) + { + win_skip( "ImcpSendEcho or IcmpCreateFile not available\n" ); + return; + } + memset(senddata, 0, sizeof(senddata)); + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + + icmp = pIcmpCreateFile(); + if (icmp == INVALID_HANDLE_VALUE) + { + error = GetLastError(); + if (error == ERROR_ACCESS_DENIED) + { + skip ("ICMP is not available.\n"); + return; + } + } + ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); + + address = 0; + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + } + + address = htonl(INADDR_LOOPBACK); + if (0) /* crashes in XP */ + { + ret = pIcmpSendEcho(icmp, address, NULL, sizeof(senddata), NULL, replydata, replysz, 1000); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, NULL, 0, NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); + + if (0) /* crashes in wine, remove IF when fixed */ + { + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + } + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); +todo_wine + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, sizeof(replydata) - 1, 1000); + error = GetLastError(); + todo_wine { + ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); + ok (error == IP_GENERAL_FAILURE + || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, + "expected 11050, got %d\n", error); + } + + /* in windows >= vista the timeout can't be invalid */ + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 0); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, -1); + error = GetLastError(); + if (!ret) ok(error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); + + /* real ping test */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + if (ret) + { + PICMP_ECHO_REPLY pong = (PICMP_ECHO_REPLY) replydata; + trace ("ping roundtrip: %u ms\n", pong->RoundTripTime); + } + else + { + skip ("Failed to ping with error %d, is lo interface down?.\n", error); + } +} + /* still-to-be-tested NT4-onward functions: CreateIpForwardEntry @@ -892,6 +1024,7 @@ static void testWinNT4Functions(void) testGetTcpTable(); testGetUdpTable(); testSetTcpEntry(); + testIcmpSendEcho(); } static void testGetInterfaceInfo(void)

1 0

Piotr Caban : msvcp110: Fix streamsize parameter size in spec file.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: f1105d3f81054ab7b3d181ceafdc3c1efd7a3b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1105d3f81054ab7b3d181cea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 8 12:13:36 2014 +0100 msvcp110: Fix streamsize parameter size in spec file. --- dlls/msvcp110/msvcp110.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index e822130..f00cb3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3342,7 +3342,7 @@ @ cdecl -arch=arm ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAAXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ thiscall -arch=i386 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IAEXPA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp @ cdecl -arch=win64 ?setp@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IEAAXPEA_W0(a)Z(ptr ptr ptr) basic_streambuf_wchar_setp -@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setprecision +@ cdecl ?setprecision(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setprecision @ cdecl -arch=arm ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ thiscall -arch=i386 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @ cdecl -arch=win64 ?setstate@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAXH_N(a)Z(ptr long long) basic_ios_char_setstate_reraise @@ -3370,7 +3370,7 @@ @ cdecl -arch=arm ?setstate(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_setstate_unsigned @ thiscall -arch=i386 ?setstate(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_setstate_unsigned @ cdecl -arch=win64 ?setstate(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_setstate_unsigned -@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr long) setw +@ cdecl ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z(ptr int64) setw @ cdecl -arch=arm ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAAHXZ(ptr) basic_streambuf_char_sgetc @ thiscall -arch=i386 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sgetc @ cdecl -arch=win64 ?sgetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sgetc

1 0

Alexandre Julliard : makefiles: Generate explicit commands to create object subdirectories.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: ec8e5c610b82369e8111c1c7fa724d29ab03c37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8e5c610b82369e8111c1c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 8 16:04:33 2014 +0100 makefiles: Generate explicit commands to create object subdirectories. --- tools/makedep.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 3295359..e8a1161 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1394,7 +1394,6 @@ static struct strarray output_sources(void) struct strarray c2man_files = empty_strarray; struct strarray implib_objs = empty_strarray; struct strarray includes = empty_strarray; - struct strarray subdirs = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" ); struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" ); @@ -1423,7 +1422,7 @@ static struct strarray output_sources(void) LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) { struct strarray extradefs; - char *sourcedep; + char *subdir = NULL; char *obj = xstrdup( source->name ); char *ext = get_extension( obj ); @@ -1432,12 +1431,9 @@ static struct strarray output_sources(void) if (src_dir && strchr( obj, '/' )) { - char *dir = xstrdup( obj ); - *strrchr( dir, '/' ) = 0; - strarray_add_uniq( &subdirs, dir ); - sourcedep = strmake( "%s %s", dir, source->filename ); + subdir = xstrdup( obj ); + *strrchr( subdir, '/' ) = 0; } - else sourcedep = xstrdup( source->filename ); extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj )); @@ -1448,28 +1444,32 @@ static struct strarray output_sources(void) if (find_include_file( header )) { - output( "%s.tab.h: %s\n", obj, sourcedep ); + output( "%s.tab.h: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n", obj, obj, source->filename ); output( "%s.tab.c: %s %s\n", obj, source->filename, header ); strarray_add( &clean_files, strmake( "%s.tab.h", obj )); } - else output( "%s.tab.c: %s\n", obj, sourcedep ); + else output( "%s.tab.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename ); free( header ); continue; /* no dependencies */ } else if (!strcmp( ext, "x" )) /* template file */ { - output( "%s.h: $(MAKEXFTMPL) %s\n", obj, sourcedep ); + output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename ); strarray_add( &clean_files, strmake( "%s.h", obj )); continue; /* no dependencies */ } else if (!strcmp( ext, "l" )) /* lex file */ { - output( "%s.yy.c: %s\n", obj, sourcedep ); + output( "%s.yy.c: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename ); continue; /* no dependencies */ } @@ -1477,7 +1477,8 @@ static struct strarray output_sources(void) { if (source->flags & FLAG_RC_PO) { - output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1491,7 +1492,8 @@ static struct strarray output_sources(void) } else { - output( "%s.res: $(WRC) %s\n", obj, sourcedep ); + output( "%s.res: $(WRC) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WRC) -o $@ %s", source->filename ); if (is_win16) output_filename( "-m16" ); else output_filenames( targetflags ); @@ -1506,7 +1508,8 @@ static struct strarray output_sources(void) } else if (!strcmp( ext, "mc" )) /* message file */ { - output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep ); + output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename ); strarray_add( &res_files, strmake( "%s.res", obj )); strarray_add( &mc_files, source->filename ); @@ -1531,6 +1534,7 @@ static struct strarray output_sources(void) if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); output_filenames( targets ); output( ": $(WIDL)\n" ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(WIDL) -o $@ %s", source->filename ); output_filenames( targetflags ); output_filenames( includes ); @@ -1539,7 +1543,7 @@ static struct strarray output_sources(void) output_filename( "$(IDLFLAGS)" ); output( "\n" ); output_filenames( targets ); - output( ": %s", sourcedep ); + output( ": %s", source->filename ); } else if (!strcmp( ext, "in" )) /* .in file or man page */ { @@ -1565,7 +1569,8 @@ static struct strarray output_sources(void) strarray_add_uniq( &phony_targets, "install-man-pages" ); } else strarray_add( &clean_files, xstrdup(obj) ); - output( "%s: %s\n", obj, sourcedep ); + output( "%s: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename ); output( "%s:", obj ); } @@ -1609,7 +1614,8 @@ static struct strarray output_sources(void) if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename ); if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj )); strarray_add( &object_files, strmake( "%s.o", obj )); - output( "%s.o: %s\n", obj, sourcedep ); + output( "%s.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1620,7 +1626,8 @@ static struct strarray output_sources(void) if (crosstarget && need_cross) { strarray_add( &crossobj_files, strmake( "%s.cross.o", obj )); - output( "%s.cross.o: %s\n", obj, sourcedep ); + output( "%s.cross.o: %s\n", obj, source->filename ); + if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( includes ); output_filenames( define_args ); @@ -1643,7 +1650,6 @@ static struct strarray output_sources(void) output( ":" ); } free( obj ); - free( sourcedep ); for (i = 0; i < source->files_count; i++) output_include( source->files[i], source ); output( "\n" ); @@ -1947,13 +1953,6 @@ static struct strarray output_sources(void) strarray_add( &phony_targets, "clean" ); } - if (subdirs.count) - { - output_filenames( subdirs ); - output( ":\n" ); - output( "\t$(MKDIR_P) -m 755 $@\n" ); - } - if (top_obj_dir) { output( "depend:\n" );

1 0

Henri Verbeet : d3d9/tests: Make sure create_device() returns NULL on failure.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 86ffd6c4eaacaadceaaa9b47e67c495fff8709e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ffd6c4eaacaadceaaa9b47e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:16 2014 +0100 d3d9/tests: Make sure create_device() returns NULL on failure. --- dlls/d3d9/tests/visual.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d4e7bd0..534d8bd 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -177,7 +177,6 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - HRESULT hr; present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); @@ -188,14 +187,12 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, - "Failed to create a device, hr %#x.\n", hr); - if (FAILED(hr)) - DestroyWindow(present_parameters.hDeviceWindow); + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + return device; - return device; + DestroyWindow(present_parameters.hDeviceWindow); + return NULL; } static IDirect3DDevice9 *init_d3d9(void)

1 0

Henri Verbeet : wined3d: Fix up the backbuffer count on failure in swapchain_init().
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: ddae20b6899e65456750981ba002e426e6d35539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddae20b6899e65456750981ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:15 2014 +0100 wined3d: Fix up the backbuffer count on failure in swapchain_init(). --- dlls/wined3d/swapchain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ff2ac64..40fabc6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -952,6 +952,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 parent, &surface_desc, &swapchain->back_buffers[i]))) { WARN("Failed to create back buffer %u, hr %#x.\n", i, hr); + swapchain->desc.backbuffer_count = i; goto err; } surface_set_swapchain(swapchain->back_buffers[i], swapchain);

1 0

Henri Verbeet : wined3d: Get rid of the unused screen_palents field in struct wined3d_palette.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 2401a82bdc99fe8daf00ca0683bc1c625cbcfb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2401a82bdc99fe8daf00ca068… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 8 10:56:14 2014 +0100 wined3d: Get rid of the unused screen_palents field in struct wined3d_palette. --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0cb5bb..0735116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2951,8 +2951,6 @@ struct wined3d_palette WORD palVersion; /*| */ WORD palNumEntries; /*| LOGPALETTE */ PALETTEENTRY palents[256]; /*| */ - /* This is to store the palette in 'screen format' */ - int screen_palents[256]; DWORD flags; };

1 0

Nikolay Sivov : scrrun: Fill find data on second Next() call before testing it.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: fac0d13ee74979bcfe954ebab66f291efa7eda5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac0d13ee74979bcfe954ebab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:37:59 2014 +0400 scrrun: Fill find data on second Next() call before testing it. --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e0c9a34..bfb201c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -510,6 +510,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do { @@ -663,6 +665,8 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, This->data.u.filecoll.find = handle; } + else if (celt) + FindNextFileW(handle, &data); do {

1 0

Nikolay Sivov : scrrun: Implement Skip() for file and folder collections.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 64c93f607055c76a5ed4fa8f6a8fa1b68b2b42e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c93f607055c76a5ed4fa8f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:36:29 2014 +0400 scrrun: Implement Skip() for file and folder collections. --- dlls/scrrun/filesystem.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1c0c6c3..eb9073a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,8 +545,16 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - FIXME("(%p)->(%d): stub\n", This, celt); - return E_NOTIMPL; + HANDLE handle = This->data.u.foldercoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_dir_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Reset(IEnumVARIANT *iface) @@ -698,8 +706,16 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, 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; + HANDLE handle = This->data.u.filecoll.find; + WIN32_FIND_DATAW data; + + TRACE("(%p)->(%d)\n", This, celt); + + while (FindNextFileW(handle, &data) && celt) + if (is_file_data(&data)) + --celt; + + return celt ? S_FALSE : S_OK; } static HRESULT WINAPI filecoll_enumvariant_Reset(IEnumVARIANT *iface)

1 0

Sebastian Lackner : ntdll: Implement condition variable functions using keyed events.
by Alexandre Julliard Jan. 8, 2014

Jan. 8, 2014

Module: wine Branch: master Commit: 5472b9f9ca1a393c0153e256da67798a3afe53c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5472b9f9ca1a393c0153e256d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jan 5 03:48:34 2014 +0100 ntdll: Implement condition variable functions using keyed events. --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/sync.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 6 +++- 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 6418671..2e507bb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -672,6 +672,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) # @ stub RtlInitializeAtomPackage @ stdcall RtlInitializeBitMap(ptr long long) +@ stdcall RtlInitializeConditionVariable(ptr) @ stub RtlInitializeContext @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -867,6 +868,7 @@ @ stub RtlSetUserFlagsHeap @ stub RtlSetUserValueHeap @ stdcall RtlSizeHeap(long long ptr) +@ stdcall RtlSleepConditionVariableCS(ptr ptr ptr) @ stub RtlSplay @ stub RtlStartRXact # @ stub RtlStatMemoryStream @@ -932,6 +934,8 @@ # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long int64) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) +@ stdcall RtlWakeAllConditionVariable(ptr) +@ stdcall RtlWakeConditionVariable(ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stdcall RtlWow64EnableFsRedirection(long) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b05bd19..c94d9c4 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -63,6 +63,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); HANDLE keyed_event = NULL; +static inline int interlocked_dec_if_nonzero( int *dest ) +{ + int val, tmp; + for (val = *dest;; val = tmp) + { + if (!val || (tmp = interlocked_cmpxchg( dest, val - 1, val )) == val) + break; + } + return val; +} + /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS NTDLL_create_struct_sd(PSECURITY_DESCRIPTOR nt_sd, struct security_descriptor **server_sd, data_size_t *server_sd_len) @@ -1410,3 +1421,85 @@ void WINAPI RtlReleaseSRWLockShared( RTL_SRWLOCK *lock ) { FIXME( "%p stub\n", lock ); } + +/*********************************************************************** + * RtlInitializeConditionVariable (NTDLL.@) + * + * Initializes the condition variable with NULL. + * + * PARAMS + * variable [O] condition variable + * + * RETURNS + * Nothing. + */ +void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + variable->Ptr = NULL; +} + +/*********************************************************************** + * RtlWakeConditionVariable (NTDLL.@) + * + * Wakes up one thread waiting on the condition variable. + * + * PARAMS + * variable [I/O] condition variable to wake up. + * + * RETURNS + * Nothing. + * + * NOTES + * The calling thread does not have to own any lock in order to call + * this function. + */ +void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlWakeAllConditionVariable (NTDLL.@) + * + * See WakeConditionVariable, wakes up all waiting threads. + */ +void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) +{ + int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); + while (val-- > 0) + NtReleaseKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); +} + +/*********************************************************************** + * RtlSleepConditionVariableCS (NTDLL.@) + * + * Atomically releases the critical section and suspends the thread, + * waiting for a Wake(All)ConditionVariable event. Afterwards it enters + * the critical section again and returns. + * + * PARAMS + * variable [I/O] condition variable + * crit [I/O] critical section to leave temporarily + * timeout [I] timeout + * + * RETURNS + * see NtWaitForKeyedEvent for all possible return values. + */ +NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, RTL_CRITICAL_SECTION *crit, + const LARGE_INTEGER *timeout ) +{ + NTSTATUS status; + interlocked_xchg_add( (int *)&variable->Ptr, 1 ); + RtlLeaveCriticalSection( crit ); + + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, timeout ); + if (status != STATUS_SUCCESS) + { + if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr )) + status = NtWaitForKeyedEvent( keyed_event, &variable->Ptr, FALSE, NULL ); + } + + RtlEnterCriticalSection( crit ); + return status; +} diff --git a/include/winternl.h b/include/winternl.h index d93b37a..c840732 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2418,10 +2418,11 @@ NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); +NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); +NTSYSAPI void WINAPI RtlInitializeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount(RTL_CRITICAL_SECTION *,ULONG); NTSYSAPI NTSTATUS WINAPI RtlInitializeCriticalSectionEx(RTL_CRITICAL_SECTION *,ULONG,ULONG); -NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); NTSYSAPI void WINAPI RtlInitializeHandleTable(ULONG,ULONG,RTL_HANDLE_TABLE *); NTSYSAPI void WINAPI RtlInitializeResource(LPRTL_RWLOCK); NTSYSAPI void WINAPI RtlInitializeSRWLock(RTL_SRWLOCK*); @@ -2501,6 +2502,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOL NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI SIZE_T WINAPI RtlSizeHeap(HANDLE,ULONG,const void*); +NTSYSAPI NTSTATUS WINAPI RtlSleepConditionVariableCS(RTL_CONDITION_VARIABLE*,RTL_CRITICAL_SECTION*,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING); NTSYSAPI LPDWORD WINAPI RtlSubAuthoritySid(PSID,DWORD); NTSYSAPI LPBYTE WINAPI RtlSubAuthorityCountSid(PSID); @@ -2544,6 +2546,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidAcl(PACL); NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); +NTSYSAPI void WINAPI RtlWakeAllConditionVariable(RTL_CONDITION_VARIABLE *); +NTSYSAPI void WINAPI RtlWakeConditionVariable(RTL_CONDITION_VARIABLE *); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*);

1 0