October 2014 - Wine-Devel - list.winehq.org

Error handling in RpcBindingVectorFree (dlls/rpcrt4/rpc_binding.c)
by Gerald Pfeifer Nov. 22, 2020

Nov. 22, 2020

Looking at RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; ULONG c; TRACE("(%p)\n", BindingVector); for (c=0; c<(*BindingVector)->Count; c++) { status = RpcBindingFree(&(*BindingVector)->BindingH[c]); } HeapFree(GetProcessHeap(), 0, *BindingVector); *BindingVector = NULL; return RPC_S_OK; } we currently always ignore the outcome of RpcBindingFree and return RPC_S_OK. However, there is one case where RpcBindingFree returns something different (which is if *Binding is null when RPC_S_INVALID_BINDING is returned). What is the proper way of handling this? Just keeping the code as is and removing the unused status variable? Breaking the loop once RpcBindingFree returns something different from RPC_S_OK? Continuing and returning the first / the last status different from RPC_S_OK? Gerald

1 1

ntoskrnl.exe: unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces
by Qian Hong Sept. 28, 2018

Sept. 28, 2018

Dear all, While test another online bank with wine ActiveX, I got an unimplemented fuction of ntoskrnl: IoGetDeviceInterfaces, I found it listed in http://source.winehq.org/WineAPI/ntoskrnl.html as a stup, so I can't understand this log: wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 0022), starting debugger... Grateful for any explain! env: wine1.3.12 on Ubuntu 10.04 Here are the steps: 1. install an ActiveX from https://e.bank.ecitic.com/perbank5/plugs/CNCBSecPkg_EN.exe $ rm -rf ~/.wine $ winetricks -q mfc42 $ wine CNCBSecPkg_EN.exe fixme:ole:DllRegisterServer stub fixme:win:DisableProcessWindowsGhosting : stub fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:msg:ChangeWindowMessageFilter c057 00000001 fixme:ole:CoCreateInstance no instance created for interface {ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf} of class {56fdf344-fd6d-11d0-958a-006097c9a090}, hres is 0x80004002 fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\\4e2d\4fe1\94f6\884c\7f51\94f6\5b89\5168\63a7\4ef6\\unins000.exe") stub fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 -1: stub! fixme:win:WINNLSEnableIME hUnknown1 0x1011a bUnknown2 0: stub! wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces called at address 0x7b839552 (thread 002b), starting debugger... wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting wine: Call from 0x7b839552 to unimplemented function ntoskrnl.exe.IoGetDeviceInterfaces, aborting 2. open the online bank entry with wine builtin IE, then IE will crash: $ wine iexplore https://e.bank.ecitic.com/perbank5/signIn.do Please checkout the full log here: http://pastebin.com/rbAg7gwj Should I file a singel bug in ntoskrnl component , or separate bugs, one for ntoskrnl and one for the IE crashing? Generalliy what component should I switch while file a bug about IE crashing? Many thanks! -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

5 6

ODBC Databases: Jet/Access success
by Barry Bird June 14, 2018

June 14, 2018

Good Afternoon. In section 3.3.6.2 of your User Guide you ask readers to report successes with databases other than MS SQL. Well here's one (I know Access 2000 can work with Wine, but this doesn't require Access): How to set up Wine to enable Windows programs that read and write to Jet (Access) databases using ODBC. I write such programs in C and use the API defined in ODBC API Reference http://msdn.microsoft.com/en-us/library/ms714562%28VS.85%29.aspx They work fine on Windows and only require Mingw to be installed to compile and link them, both for console programs and those using Windows SDK. You then can write interactive programs in C which use a full-featured SQL database which comes bundled with Windows. No need to purchase Access. With the set-up below they will also run on Linux (Kubuntu 9.04) and Wine 1.1.26. You need to update the registry to install the Access drivers. Under Windows, export from the Registry to *.reg files the registry entries - HKLM\Software\ODBC - HKLM\Software\Microsoft\Jet all subsidiary keys and values come with them. You can carefully edit these files to remove drivers and DSNs you don't need. Import these files using the registry editor in wine: wine regedit.exe. You need to bring across from Windows to Windows\System32 under wine: clbcatq.dll comres.dll expsrv.dll msjet40.dll mswstr10.dll msjter40.dll msjint40.dll msjtes40.dll msrd3x40.dll odbc32.dll odbccp32.dll odbcji32.dll odbcjt32.dll odbcad32.exe odbcint.dll odbctrac.dll vbajet32.dll Register this server in wine: wine regsvr32.exe msjtes40.dll No need to install MDAC. To use Windows ODBC drivers, you have to override Wine's odbccp32.dll and odbc32.dll with the native versions because the Wine versions are currently wired directly to Linux's unixodbc. This can be done by setting up the ODBC Data Source Administrator odbcad32.exe using winecfg: - Add the program to the Applications tab - then in the libraries tab, pick from 'New override for library' drop-down odbc32.dll and odbccp32.dll add them and edit them to be Native for Windows. Then if you do wine odbcad32.exe this brings up the ODBC Data Source Administrator window as in the Windows Control Panel If needed, set up (System) DSNs using this program. Bring across the programs and *.mdb database files from Windows. Using winecfg, you need to set up each program you want to run with overrides for odbc32.dll and odbccp32.dll (Applications and Libraries tabs) as above. The programs should then run as they did in Windows but perhaps a bit slower with: wine Odbc-prog.exe This has been tested twice on a clean .wine install. I cannot vouch for support of all API and SQL facilities however. I hope someone finds this useful. Barry Bird

5 4

IMM / IME work
by Aric Stewart June 16, 2016

June 16, 2016

Hello all, I know this will only interest a small portion of you but thought i would give a quick update on the state of IMM32 since I have brought it to a major milestone. All the main patches are in which now separate IMM32 and IMEs. There is still more work to do but the major framework is in place. X11 XIM processing should be unchanged. However wine can now begin to load native windows IMEs as well. I have tested with windows ATOK20 (a popular Japanese IME) and successfully had text processing in a fully IME aware application. There are still clear issues to resolve in many aspects of this processing but we have forward progress. ImmInstallIME does not work yet, nor does switching keyboards. So to get the native IME to work you need to add this registry key. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\<keyboard layout>] "Ime File"=<IME filename> so for example for ATOK20 in Japanese i used. [System\\CurrentControlSet\\Control\\Keyboard Layouts\\e0010411] "Ime File"="ATOK20W.IME" I would love to hear how well things work. I am sure using native IMEs will quickly show us many places where IMM32 needs to be improved. One issues I am going to investigate next is that sometimes non x11drv ime initialization, if occurring too early, causes x11drv to fail to create windows. I have not investigated with the latest changes to xim.c (which may already correct this problem) but if you see this problem this patch may help and i believe the IME_UpdateAssociation(NULL) is already unneeded. diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..0c98136 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -475,7 +475,6 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XP XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, wine_tsx11_unlock(); IME_XIMPresent(TRUE); - IME_UpdateAssociation(NULL); } thanks, -aric

5 7

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger July 5, 2015

July 5, 2015

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Wine 64 bit
by Kevin Davies June 5, 2015

June 5, 2015

Hello, Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of the available memory. Its becoming necessary to have this capability. Many thanks Kevin

13 31

Re: [PATCH] user32/tests: Test SetUserObjectInformation for invisible winstation.
by Alexandre Julliard April 23, 2015

April 23, 2015

Qian Hong <qhong(a)codeweavers.com> writes: > --- > dlls/user32/tests/winstation.c | 57 > ++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) Can you please fix the test failures introduced by your previous changes first? cf. https://test.winehq.org/data/tests/user32:winstation.html -- Alexandre Julliard julliard(a)winehq.org

3 8

Re: [4/6] msvcrt: Added _fread_nolock_s implementation
by Alexandre Julliard Nov. 3, 2014

Nov. 3, 2014

"Iván Matellanes" <matellanesivan(a)gmail.com> writes: > { > + MSVCRT_size_t ret; > + > + MSVCRT__lock_file(stream); > + ret = MSVCRT__fread_nolock_s(buf, buf_size, elem_size, count, stream); > + MSVCRT__unlock_file(stream); The parameter validation has to be done before locking the file. -- Alexandre Julliard julliard(a)winehq.org

2 2

[PATCH] Mystery hang reduction -- clear new allocations
by mtewoodbury＠gmail.com Nov. 2, 2014

Nov. 2, 2014

From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> I was getting mystery frozen processes that cleared when a total screen redraw was forced. This has been reported numerous times over several years. It came and went with various releases. I have been getting it consistantly recently. I had an idea that it might have something to do with partially uninitialized drawing data structures, so I started adding HEAP_ZERO_MEMORY flags in various places. This particular set cleared the problem, at least for now... diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cf5378c..cf1c814 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -178,7 +178,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara declaration->parent = parent; declaration->parent_ops = parent_ops; declaration->device = device; - declaration->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*declaration->elements) * element_count); + declaration->elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*declaration->elements) * element_count); if (!declaration->elements) { ERR("Failed to allocate elements memory.\n"); @@ -316,7 +317,7 @@ static unsigned int convert_fvf_to_declaration(const struct wined3d_gl_info *gl_ has_psize + has_diffuse + has_specular + num_textures; state.gl_info = gl_info; - state.elements = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*state.elements)); + state.elements = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(*state.elements)); if (!state.elements) return ~0U; state.offset = 0; state.idx = 0; -- 1.8.0.rc0.18.gf84667d

2 1

Re: [PATCH] vbscript: Implemented String(try 2)
by Piotr Caban Nov. 2, 2014

Nov. 2, 2014

Hi, Some of the tests are not working on windows: E:\>vbscript_crosstest.exe run run.c:1043: Test failed: api.vbs: L"String(1, 564) = 4" run.c:1043: Test failed: api.vbs: L"String(1, 16895.49) = \00ff" run.c:1043: Test failed: api.vbs: L"String(1, CSng(16895.5)) = " run.c:1043: Test failed: api.vbs: L"755826670, w: Err.number = 0" run: 26885 tests executed (0 marked as todo, 4 failures), 0 skipped. On 10/25/14 10:10, Shuai Meng wrote: > +Call ok(String(1, 65.5) = "B", "String(1, 65.5) = " & String(1, 65.5)) > +Call ok(getVT(String(1, 65.5)) = "VT_BSTR", "getVT(String(1, 65.5)) = " & getVT(String(1, 65.5))) > +Call ok(String(1, 66.5) = "B", "String(1, 66.5) = " & String(1, 66.5)) > +Call ok(getVT(String(1, 66.5)) = "VT_BSTR", "getVT(String(1, 66.5)) = " & getVT(String(1, 66.5))) You have added exactly the same test twice. > +Call testStringError(2147483648, "w", 6) > +Call testStringError(2147483647, "w", 5) > +Call testStringError(1073741824, "w", 5) > +Call testStringError(1073741823, "w", 14) > +Call testStringError(755826670, "w", 14) > +Call testStringError(755826669, "w", 0) You can't assume it's possible to allocate ~700mb of memory in tests. The function never returns E_OUTOFMEMORY. You can't test it in wine tests suite but you can see it by calling the function in loop until system runs out of memory and then checking the error. You should simply try to allocate the string and if it fails return VBSE_OUT_OF_STRING_SPACE. Cheers, Piotr

3 3

Re: comctl32: Avoid magic numbers
by Nikolay Sivov Oct. 31, 2014

Oct. 31, 2014

> /* FIXME: This flag is undocumented and unknown by our CompareString. > - * We need a define for it. > */ > - dwFlags = 0x10000000; > + dwFlags = LOCALE_RETURN_GENITIVE_NAMES; > if (!bCase) dwFlags |= NORM_IGNORECASE; It makes no sense to use this flag from CompareString(). I think it's better to remove it along with this comment.

3 2

Re: [PATCH 2/2] user32/tests: Test exception handling for timer callbacks.
by Marvin Oct. 31, 2014

Oct. 31, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9924 Your paranoid android. === w7u (32 bit msg) === msg.c:12154: Test failed: unexpected hwnd 0014013C msg.c:12176: Test failed: bad time 325e7/325f6

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Alexandre Julliard Oct. 31, 2014

Oct. 31, 2014

Guillaume Charifi <guillaume.charifi(a)sfr.fr> writes: > + strcpyW(szTLBPath, szPath); > + snprintfW(szStringName, sizeof(szStringName)/sizeof(WCHAR), resFormatStrW, PtrToInt(lpszIntName)); > + strcatW(szTLBPath, szStringName); > + > + ret = TLB_PEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); > + if (ret == TYPE_E_CANTLOADLIBRARY) > + ret = TLB_NEFile_Open(szPath, PtrToInt(lpszIntName), &pBase, &dwTLBLength, &pFile); > + if (ret == TYPE_E_CANTLOADLIBRARY) > + ret = TLB_Mapping_Open(szPath, &pBase, &dwTLBLength, &pFile); > + if (SUCCEEDED(ret)) > + { > + if (dwTLBLength >= 4) > + { > + DWORD dwSignature = FromLEDWord(*((DWORD*) pBase)); > + if (dwSignature == MSFT_SIGNATURE) > + pTLib = ITypeLib2_Constructor_MSFT(pBase, dwTLBLength); > + else if (dwSignature == SLTG_SIGNATURE) > + pTLib = ITypeLib2_Constructor_SLTG(pBase, dwTLBLength); > + else > + { > + FIXME("Header type magic 0x%08x not supported.\n", dwSignature); > + ret = E_FAIL; > + } > + } > + else > + ret = E_FAIL; > + IUnknown_Release(pFile); > + } You should avoid duplicating all that code. > + if(pTLib) { > + ITypeLibImpl *impl = impl_from_ITypeLib2(pTLib); > + ret = UuidEqual((UUID *)This->guid, (UUID *)TLB_get_guid_null(impl->guid), &rpc_stat); > + ITypeLib_Release((ITypeLib *)pTLib); > + > + ret = (ret == TRUE) ? LoadTypeLibEx(szTLBPath, REGKIND_NONE, (ITypeLib **)&pTLib) : E_FAIL; > + } That's pretty ugly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] d3d9/tests: Add a test for ATI1N and ATI2N texture formats.
by Henri Verbeet Oct. 30, 2014

Oct. 30, 2014

On 29 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6145,6 +6145,7 @@ static void test_lockrect_offset(void) > {D3DFMT_DXT3, "D3DFMT_DXT3", 4, 4, 16}, > {D3DFMT_DXT4, "D3DFMT_DXT4", 4, 4, 16}, > {D3DFMT_DXT5, "D3DFMT_DXT5", 4, 4, 16}, > + {MAKEFOURCC('A','T','I','1'), "ATI1N", 1, 1, 1}, > {MAKEFOURCC('A','T','I','2'), "ATI2N", 1, 1, 1}, Mostly just curiosity, but there are other tests in device.c for ATI2N, any reason for not adding ATI1N coverage to those as well? > + static const DWORD expected_colors_ati[] = {0x003f3f3f, 0x003f3f3f, 0x00007fff, 0x007f00ff}; > + static const DWORD expected_colors_nvidia[] = {0x007f0000, 0x007f0000, 0x00007fff, 0x007f00ff}; Conceptually I might have preferred this as static const struct { struct vec2 position; D3DCOLOR amd; D3DCOLOR nvidia; } expected_colors[] { ... } but it's not a big deal. > + for (i = 0; i < 4; ++i) > + { > + color = getPixelColor(device, 80 + 160 * i, 240); > + trace("Got 0x%08x.\n", color); Is this leftover debug code?

2 2

Need feedback on first four UTF-7 patches
by Alex Henrie Oct. 30, 2014

Oct. 30, 2014

Alexandre, I submitted four UTF-7 patches on October 19 and am still waiting for feedback. I was hoping that these patches would not be controversial because they only add encoding tests. I have six additional patches waiting in https://github.com/alexhenrie/wine/commits/master - four patches for adding decoding tests and two patches to make all the tests pass - but I will not submit them until I get feedback about the first four that I have already submitted. -Alex

8 13

Re: msi: Format registry values before interpreting value type.
by Marvin Oct. 30, 2014

Oct. 30, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9898 Your paranoid android. === wxppro (32 bit action) === The test timed out === w7u (32 bit action) === The test timed out

1 0

Re: [PATCH 3/5] wined3d: Dirtify pixel shader on texture format change.
by Henri Verbeet Oct. 30, 2014

Oct. 30, 2014

On 29 October 2014 18:01, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + if (!prev || op->texture->target != prev->target > + || op->texture->resource.format != prev->resource.format) Shouldn't this just check the color_fixup? And in principle I think this would apply to vertex shaders as well, except that we don't track color fixups in struct vs_compile_args at all. The real pain will come with d3d10 of course, since you can access a much larger amount of resources there.

2 1

Re: dplayx: Fix some crashes and wine_todo's ( try 3)
by Marvin Oct. 30, 2014

Oct. 30, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9894 Your paranoid android. === w8 (32 bit dplayx) === Failure running script in VM: timed out waiting for the child process

1 0

Re: [PATCH 1/4] kernel32/tests: Add simple UTF-7 encoding tests.
by Sebastian Lackner Oct. 29, 2014

Oct. 29, 2014

On 20.10.2014 06:41, Alex Henrie wrote: > --- > dlls/kernel32/tests/codepage.c | 134 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 134 insertions(+) > > diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c > index 8423c75..684ede1 100644 > --- a/dlls/kernel32/tests/codepage.c > +++ b/dlls/kernel32/tests/codepage.c > @@ -412,6 +412,138 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) > ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); > } > > +static void test_utf7_encoding(void) > +{ > + struct simple_test > + { > + WCHAR utf16[1024]; > + int utf16_len; > + char utf7[1024]; > + int utf7_len; 1024 is unnecessary big. A couple of bytes would be sufficient for all these tests. > + }; > + > + static const struct simple_test simple_tests[] = { No need to give that struct a name. You can simply do: static const struct { ... } simple_tests[] = { ... } > + /* tests some valid UTF-16 */ > + { > + {0x4F60,0x597D,0x5417,0}, > + 4, > + "+T2BZfVQX-", > + 11 > + }, > + /* tests some invalid UTF-16 */ > + /* (stray lead surrogate) */ That looks ugly, either put it in a single line or use: /* line1 * line2 */ > + { > + {0xD801,0}, > + 2, > + "+2AE-", > + 6 > + }, > + /* tests some more invalid UTF-16 */ > + /* (codepoint does not exist) */ > + { > + {0xFF00,0}, > + 2, > + "+/wA-", > + 6 > + } > + }; > + > + int i; > + > + for (i = 0; i < sizeof(simple_tests) / sizeof(simple_tests[0]); i++) > + { > + char c_buffer[1024]; > + WCHAR w_buffer[1024]; Same as above, way too big. > + int len; > + > + c_buffer[sizeof(c_buffer) - 1] = 0; > + w_buffer[sizeof(w_buffer) / sizeof(WCHAR) - 1] = 0; It probably makes more sense to initialize the buffers before each test, instead of one time at the beginning. > + > + /* test string conversion with srclen=-1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, sizeof(c_buffer), NULL, NULL); > + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) > + { > + skip("UTF-7 encoding not implemented\n"); > + return; > + } At my opinion it would be better to do one basic test at the beginning, and then abort immediately, instead of doing that inside of the for loop, if its not too complicated. > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test string conversion with srclen=-2 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -2, c_buffer, sizeof(c_buffer), NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); You are testing a lot of things in a single ok(...) block. It will be very difficult to find out whats wrong if we get test failures in the future. I think it would be better to split that into multiple checks, probably with some more meaningful message about what is wrong (wrong len, wrong content, ...) > + > + /* test string conversion with dstlen=len-1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len - 1, NULL, NULL); > + ok(len == 0 && > + memcmp(c_buffer, simple_tests[i].utf7, simple_tests[i].utf7_len - 1) == 0 && > + c_buffer[simple_tests[i].utf7_len - 1] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "error=%x\n", GetLastError()); > + > + /* test string conversion with dstlen=len */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test string conversion with dstlen=len+1 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, simple_tests[i].utf7_len + 1, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + strcmp(c_buffer, simple_tests[i].utf7) == 0 && > + c_buffer[len] == '#', > + "simple_test failure i=%i dst=\"%s\" len=%i\n", i, c_buffer, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test dry run with dst=NULL and dstlen=0 */ > + memset(c_buffer, '#', sizeof(c_buffer)); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, NULL, 0, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + c_buffer[0] == '#', > + "simple_test failure i=%i len=%i\n", i, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* test dry run with dst!=NULL and dstlen=0 */ > + memset(c_buffer, '#', sizeof(c_buffer) - 1); > + SetLastError(0xdeadbeef); > + len = WideCharToMultiByte(CP_UTF7, 0, simple_tests[i].utf16, -1, c_buffer, 0, NULL, NULL); > + ok(len == simple_tests[i].utf7_len && > + c_buffer[0] == '#', > + "simple_test failure i=%i len=%i\n", i, len); > + ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); > + > + /* all simple utf16-to-utf7 tests can be reversed to make utf7-to-utf16 tests */ > + memset(w_buffer, '#', sizeof(w_buffer) - sizeof(WCHAR)); > + SetLastError(0xdeadbeef); > + len = MultiByteToWideChar(CP_UTF7, 0, simple_tests[i].utf7, -1, w_buffer, sizeof(w_buffer) / sizeof(WCHAR)); > + todo_wine ok(len == simple_tests[i].utf16_len && > + memcmp(w_buffer, simple_tests[i].utf16, len * sizeof(WCHAR)) == 0 && > + w_buffer[len] == 0x2323, > + "simple_test failure i=%i dst=%s len=%i\n", i, wine_dbgstr_w(w_buffer), len); > + todo_wine ok(GetLastError() == 0xdeadbeef, "error=%x\n", GetLastError()); Why do you use todo_wine when the whole test block is skipped? Moreover, it should probably go into the later patches which add the MultibyteToWideChar tests. > + } > +} > + > static void test_undefined_byte_char(void) > { > static const struct tag_testset { > @@ -618,6 +750,8 @@ START_TEST(codepage) > test_string_conversion(NULL); > test_string_conversion(&bUsedDefaultChar); > > + test_utf7_encoding(); > + > test_undefined_byte_char(); > test_threadcp(); > } >

1 0

Re: [2/2] oleaut32: Implement TLB dependencies lookup in resources (resend 3 - last submit before abandon)
by Andrew Eikum Oct. 29, 2014

Oct. 29, 2014

On Sat, Sep 27, 2014 at 08:10:28PM +0200, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=34184 > > This is the last time without a review before I give up. > I'm not sure why this is hung up, but to reiterate, it seems acceptable to me. Andrew

1 0

Re: [PATCH 1/6] reg: Sanitize key paths in main
by Stefan Dösinger Oct. 29, 2014

Oct. 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This patch is a lot more readable than the past version IMO. I'll look at the other patches tomorrow. Am 2014-10-27 13:10, schrieb Jonathan Vollebregt: > +static WCHAR *sanitize_path(WCHAR *key){ Inconsistent curly bracket placement. The other patches have more cases of that. > + else > + reg_message(STRING_INVALID_KEY); Doesn't get_rootkey() implicitly take care of this? I don't see why you need an extra check for a single leading backslash. There's one (intended?) side effect of this check though: It ensures that the code below doesn't crash on the input string "\\". > + i = strlenW(key); > + if (key[i - 1] == '\\') > + key[i - 1] = 0; Why do you need this? The existing code and the todo_wine test suggests that RegCreateKey accepts any number of trailing slashes. Adding a test for this in dlls/advapi32/tests/registry.c would be a good idea. This is the only case where you modify the input string. If it indeed is not necessary you can change the parameter to a const WCHAR * and return a BOOL. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUTs1oAAoJEN0/YqbEcdMw0rsP/3XocRwBZ2zPgs/0ERHMOL0q 84+09LlpOMMBzEQDue4WnxLgNwT6EUdP1W+CpMLtjdh6r35qePWRuHwrieuRoKsF 7SoZhAqB1XGfSTfHC5yaSlC3a3didsGn8wCvb9R66wFcBstWY+wW9cdnyUzRhXeK oowmLBioiKlWGHBX84k7pvxLEzokeW+yEj0D/NXaVeFJ5ATfsqRynIiMJOeMJzJj XcnrH9YBDzvOy36zSREclwEtwt73dZ9dRYiLO4fHaaqsBMM0xiuZYl5CkfUxGjtm /c33mOOUl4l9EEpQLdu6kMtrT6kF13XbT2ume0AcqTbL4KrJVl7j173wck0vt1e7 kaLS1ViU4TGxHHo7mkqfMUjDpJM1tR5etV9DqQGQYui+BQ1ZOTpISrmuFxbXPAOd ecwvZGXEePGWrZlsV4lECc25/1BJQfEpxKK/5pc6fTv0TYd+JGOOnOSlTR9xlOSW rs/mjTuedQDNIFr+RvfMK+OpJIXXA9ve0jkpDX0XLnl3lZWG0p+rGholQXwHC5VS 1YUucH8moIW/8kN1s39/RSzcBgkxvAEDgiFsIigYqyEnPpafTbSQn3rNIVD5DQ0X +Fy7gBffr+uaOSKAh8ShdMGvRFGipd4WNQTelemCVcD1Pku2X01ImBImyHeMxBzW 2JdXxGTtZT8PribxigHn =eTay -----END PGP SIGNATURE-----

2 6

Re: [1/2] ndis.sys: add a stub dll
by Alistair Leslie-Hughes Oct. 29, 2014

Oct. 29, 2014

Hi Austin, On 29/10/14 06:10, Austin English wrote: > > -- > -Austin This file should be installed into the system32\drivers directory by default. Modify wine.in.inf, look for mountmgr.sys as an example. Best Regards Alistair Leslie-Hughes

2 1

Re: [PATCH] mshtml: check null before release the elem object
by Jacek Caban Oct. 29, 2014

Oct. 29, 2014

Hi Hao, On 10/24/14 11:37, Hao Peng wrote: > Check null pointer before release the script elem object, prevent to > release them twice. The real problem is that stop_binding is called twice. I sent a patch fixing that. Jacek

1 0

Re: dpnet: Implement IDirectPlay8Address GetComponentByName (try 2 - resend)
by Stefan Dösinger Oct. 29, 2014

Oct. 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-29 05:26, schrieb Alistair Leslie-Hughes: > + switch (entry->type) + { + > case DPNA_DATATYPE_DWORD: + memcpy(pvBuffer, > &entry->data.value, sizeof(DWORD)); + break; + > case DPNA_DATATYPE_GUID: + memcpy(pvBuffer, > &entry->data.guid, sizeof(GUID)); + break; + > case DPNA_DATATYPE_STRING: + memcpy(pvBuffer, > &entry->data.string, entry->size); + break; + > case DPNA_DATATYPE_STRING_ANSI: + > memcpy(pvBuffer, &entry->data.ansi, entry->size); + > break; + case DPNA_DATATYPE_BINARY: + > memcpy(pvBuffer, &entry->data.binary, entry->size); + > break; + } Using assignments like in AddComponent would be nicer. Since you're replacing everything but the function declaration you can rename the parameter names to get rid of the lpFoo names. The string types need some tests for the terminating 0 character. AddComponent currently does not check if the string length matches the input size. (It doesn't overflow though since it allocates according to the string length.) > + size = sizeof(GUID)-1; + hr = > IDirectPlay8Address_GetComponentByName(localaddr, UNKNOWN, > &compguid, &size, &type); + ok(hr == DPNERR_BUFFERTOOSMALL, > "got 0x%08x\n", hr); + ok(size == sizeof(GUID), "got %d > expected %d\n", size, sizeof(GUID)); Does it return DPNERR_BUFFERTOSMALL if pvBuffer is NULL? The d3d private data API returns D3D_OK in this case. This is worth a check. Does GetComponentByName correct the size downward when *pdwBufferSize > size? Also test this with pvBuffer != NULL Your implementation suggests pdwDataType is only set if the buffer has an appropriate size. Is this the case? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUUPfSAAoJEN0/YqbEcdMwlBoP/jL3jPsPavfF4iQEr/fKe5y3 HLT67L/yqgriTCo4soOECoa+9fh9+8YFvBKrDvN7ISpZyni+paK38kxifAtwR0Xl QB7yrk3x+TVvIy8f3+QxwbqI7b/CX6AxEYcXG7Y30QNZchw+qN396HOs8XPU+HCG umYrNcnknizbASMQwkl0vaoZgun0JJP3L1jSEFnuLSZkl3f9CTIq5exS3q+ndqn7 0P0iqvo1CI1Pry/5qQGCYYxKqoFRfrqKbF0q1kGcImnwjpz211iuEQyVo23UICVI 0iMX1X2KueFQ4r9QrzRJmo+/8H5PpKsEQrWlhdBZyhhOX6m3BMxOrQK9/7OIzpua l8cYkrKpLCgMsvhF5hZchX1CY5ZomFdhOjFAQldYCpSVHuupnFqOPXx2qqmjGzU3 38h/liv4VgHLvpckLgvjsD8SGqtkBH/nk4WTk50fzWupegtLqnQ1gxILTNuh+e9Y kX4PWcMbbMQ6t1rjrdjBz4hDX/wAF44vx4NDLnht59aV3of9xtKfVWW8SFV9il40 2WDPhHESojF8BU/Nt/qx70YokSPIqpmwXdg1RQPXi5FNj2W5uqZoGCxCTeFfnY60 a68+EOaZaQhdSW5VSjGGWprs9jfBN4wB5SPoUU24adu5ygjcUsGj3IHj9H6ssBPN vwscAjUYyZDTzkgRQYAE =OHT3 -----END PGP SIGNATURE-----

1 1

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Stefan Dösinger Oct. 29, 2014

Oct. 29, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-29 06:13, schrieb Alistair Leslie-Hughes: > hr = IDirectPlayX_InitializeConnection( pDP, pAddress, 0 ); > - todo_wine checkHR( DP_OK, hr ); > + checkHR( DP_OK, hr ); Apparently running those tests only in interactive mode caused quite a bit of bitrot :-\ . According to ab448df3 the tests were too slow. Is this still the case? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUUPlaAAoJEN0/YqbEcdMwYHsP/jwHawWB1Y+iGVlg+fT56yaI kYJ5knxAn2JaLwPB9DVyt2JRMG2SqvWmS0glqKfOVvWR8RFOGzUL/S1nS0H1VpgD drKtxFJFq1KOYFsgsBxHZdvsPnlayB/GXwAmIRXn6rI4rvkvuWDM2q7ovM9ZNsW+ 0zgiV5z9JMMiC/UOVedS4WF5ScoHjJfwW6S9bk4KAWltaybDFQA1Txo4OT+wpW0t 34p+GOB8uAoqqpyzONA5O2MpOdtodhFT03++6FLU3Y26+pyeKDqMP+TpX3MTRB70 JwIk09OBxSlqHjKUiU/4shd4bFSY0Pf/yzGpvFEsXTDHlcodvpBEHMKQj+8RXqqL PglmiK/Xy1J4OmrDmrTRMuGn/FmD1Mkj4WfQTsZ17ODHcubRlVhdNxsHqgDZDEVB krHYGcAJ5t6ZjVnM8m7uGLyvyJbsMeefHiR1+SFHi1VyBJnlD6Iu+osDQPKRSDK7 vcMciPMuXI0e3UUIzf5Kuz0gXDHdWuNerMI8j+6s3hyjc4zQnSd4GRL3fKV0GQOv lMEYS9DiF9ESUhjqC/9NFb233sbPmxabkVaoA+9C6vXgDdDhbE2rAQ75HFDoXh52 856Mq5tMuQQVFaZxHVd0A8bArNlb1ZLksuN02b5bo/q4Q0mN7oJEjxybgSxuHKAd yODcTxiiPmIVo1IWzKYJ =wqXw -----END PGP SIGNATURE-----

1 0

Re: [1/2] wined3d: Set D3DPMISCCAPS_FOGVERTEXCLAMPED flag in get_device_caps
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

On 28 October 2014 00:43, Joachim Priesner <joachim.priesner(a)web.de> wrote: > Wine clamps the oFog output of vertex shaders. Tests for the flag follow > in the second part of this patch. Why is it better to add the flag instead of just removing the clamping?

2 5

Re: [PATCH 7/8] dwrite: Implement system font collection as any other font collection
by Alexandre Julliard Oct. 29, 2014

Oct. 29, 2014

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Subject: [PATCH 7/8] dwrite: Implement system font collection as any other > font collection It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so analyzer && touch analyzer.ok wine: Unhandled page fault on read access to 0x001a0000 at address 0x68665c0b (thread 007f), starting debugger... Unhandled exception: page fault on read access to 0x001a0000 in 32-bit code (0x68665c0b). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:68665c0b ESP:0032f6c0 EBP:0032f6e8 EFLAGS:00010216( R- -- I -A-P- ) EAX:001a0000 EBX:6867e828 ECX:006e0065 EDX:0018d418 ESI:0018c798 EDI:0018c7b8 Stack dump: 0x0032f6c0: 00000013 7b84aa26 0018c7d0 0018c7b8 0x0032f6d0: 0032f736 0018c928 68665b5b 6867e828 0x0032f6e0: 0032f736 0018c928 0032f7f8 6866720b 0x0032f6f0: 0018c798 0032f736 0018d418 00000000 0x0032f700: 00000040 00000001 6867298d 00002710 0x0032f710: 00000001 00000518 0018cb32 00000000 Backtrace: =>0 0x68665c0b add_localizedstring+0xbb(iface=0x18c798, locale="en-US", string="WenQuanYi Micro Hei?? ???I??????8bg --auto %ld %ld") [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite (0x0032f6e8) 1 0x6866720b opentype_get_font_strings_from_id+0x2fa(table_data=0x18c910, id=DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, strings=0x32f854) [/home/julliard/wine/wine/dlls/dwrite/opentype.c:815] in dwrite (0x0032f7f8) 2 0x6865cab2 create_font_collection+0x1b1(factory=0x12af18, enumerator=0x12b830, ret=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1486] in dwrite (0x0032fa88) 3 0x6865d048 get_system_fontcollection+0x97(factory=0x12af18, collection=0x12af20) [/home/julliard/wine/wine/dlls/dwrite/font.c:1676] in dwrite (0x0032fab8) 4 0x68664bbd dwritefactory_GetSystemFontCollection+0xdc(iface=<couldn't compute location>, collection=<couldn't compute location>, check_for_updates=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/main.c:566] in dwrite (0x0032faf8) 5 0x6865d59b gdiinterop_CreateFontFromLOGFONT+0x5a(iface=<couldn't compute location>, logfont=<couldn't compute location>, font=<couldn't compute location>) [/home/julliard/wine/wine/dlls/dwrite/../../include/dwrite.h:6896] in dwrite (0x0032fb58) 6 0x6862a87d create_fontface+0xac() [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/dwrite.h:4396] in dwrite_test (0x0032fc18) 7 0x6862b700 func_analyzer+0xb1f() [/home/julliard/wine/wine/dlls/dwrite/tests/analyzer.c:1044] in dwrite_test (0x0032fd58) 8 0x6862a083 main+0x332(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/dwrite/tests/../../../include/wine/test.h:584] in dwrite_test (0x0032fe08) 9 0x6863571f __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in dwrite_test (0x0032fe58) 10 0x7b85992c call_process_entry+0xb() in kernel32 (0x0032fe78) 11 0x7b85a8aa start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 12 0x7bc7a5a0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 13 0x7bc7d361 call_thread_func+0xb0(entry=0x7b85a850, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2724] in ntdll (0x0032ffa8) 14 0x7bc7a57e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 15 0x7bc50f57 start_process+0x16(kernel_start=0x7b85a850) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2870] in ntdll (0x0032ffe8) 16 0x6803121d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 17 0x68031380 wine_switch_to_stack+0x1f(func=0x7bc50f40, arg=0x7b85a850, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffdc1c18) 18 0x7bc56365 LdrInitializeThunk+0x1f4(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2924] in ntdll (0xffdc1c58) 19 0x7b860613 __wine_kernel_init+0x9b2() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffdc2b48) 20 0x7bc57123 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3133] in ntdll (0xffdc2bb8) 21 0x6802ee83 wine_init+0x2c2(argc=0x3, argv=0xffdc30f4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:958] in libwine.so.1 (0xffdc2c08) 22 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:237] in <wine-loader> (0xffdc3048) 23 0x68251a63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x68665c0b add_localizedstring+0xbb [/home/julliard/wine/wine/dlls/dwrite/../../include/wine/unicode.h:200] in dwrite: cmpw $0,0x0(%eax) 200 while (*s) s++; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] ddraw/tests: Port test_mode_change to ddraw (v2)
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

For whatever it's worth, the ddraw test test_mode_change() was originally related to is test_coop_level_mode_set(). (I.e., see also commits 43aac32f, 1ac6f487, f41ea4fe.)

1 0

Re: [PATCH 1/3] d3d9/tests: The device restores the mode settings from the registry (v2).
by Henri Verbeet Oct. 29, 2014

Oct. 29, 2014

On 27 October 2014 23:28, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + IDirect3D9_GetAdapterDisplayMode(d3d9, D3DADAPTER_DEFAULT, &d3ddm); > + adapter_mode_count = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format); Shouldn't "d3ddm.Format" just be "D3DFMT_A8R8G8B8" here, since the test is using create_device()? > + modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); > + for (i = 0; i < adapter_mode_count; ++i) > + { > + UINT j; > + > + hr = IDirect3D9_EnumAdapterModes(d3d9, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); > + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); > + > + if (d3ddm2.Width == screen_width && d3ddm2.Height == screen_height) > + continue; Given the nature of this test, we'd probably want to retrieve "screen_width" and "screen_height" with EnumDisplaySettingsW() and ENUM_REGISTRY_SETTINGS, and perhaps also make sure they match the current settings before running any tests. > + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but > + * refuses to create a device at these sizes. */ > + if (d3ddm2.Width < 640 || d3ddm2.Height < 480) > + continue; > + > + for (j = 0; j < mode_count; ++j) > + { > + if (modes[j].w == d3ddm2.Width && modes[j].h == d3ddm2.Height) > + break; > + } > + if (j == mode_count) > + { > + modes[j].w = d3ddm2.Width; > + modes[j].h = d3ddm2.Height; > + ++mode_count; > + } > + } > + > + /* Make sure the d3d mode is smaller or equal in both width and height > + * than the mode passed to ChangeDisplaySettings. Otherwise Windows > + * shrinks the window to the ChangeDisplaySettings parameters + 12. */ > + d3ddm.Width = d3ddm.Height = d3ddm2.Width = d3ddm2.Height = ~0U; > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width && modes[i].h < d3ddm.Height) > + { > + d3ddm.Width = modes[i].w; > + d3ddm.Height = modes[i].h; > + } > + } > + for (i = 0; i < mode_count; i++) > + { > + if (modes[i].w < d3ddm.Width || modes[i].h < d3ddm.Height) > + continue; > + if (modes[i].w == d3ddm.Width && modes[i].h == d3ddm.Height) > + continue; > + d3ddm2.Width = modes[i].w; > + d3ddm2.Height = modes[i].h; > + break; > + } > + > + HeapFree(GetProcessHeap(), 0, modes); > + if (d3ddm2.Width == ~0U) > + { > + skip("Could not find adequate modes, skipping mode tests.\n"); > + IDirect3D9_Release(d3d9); > + return; > + } This looks fairly complicated, but in the end you just need two display modes that satisfy a couple of conditions. I suspect this code could be simplified a fair bit. Of course that probably also applies to test_reset() where this looks borrowed from.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Marvin Oct. 29, 2014

Oct. 29, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9845 Your paranoid android. === w8 (32 bit dplayx) === The test timed out

3 3

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Nikolay Sivov Oct. 29, 2014

Oct. 29, 2014

On 10/29/2014 08:13 AM, Alistair Leslie-Hughes wrote: > +#if 0 > + /* Crashes under Win7 */ > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > check( -1, dwDataSize ); > +#endif That's the same. Wine test use if (0) {} block to disable code. Also you don't need checkHR() at all in such cases.

2 1

Re: dplayx: Fix some crashes and wine_todo's ( try 2)
by Sebastian Lackner Oct. 29, 2014

Oct. 29, 2014

On 29.10.2014 06:13, Alistair Leslie-Hughes wrote: > Hi, > use #if 0 > Using "#if"s is no good idea, since this doesn't ensure that the code still compiles in the future. Better use "if (0)" instead.

1 0

Re: dplayx: Fix some crashes and wine_todo's
by Nikolay Sivov Oct. 29, 2014

Oct. 29, 2014

> - hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > +/* hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], NULL ); > checkHR( DPERR_INVALIDPARAM, hr ); > dwDataSize=-1; > hr = IDirectPlayX_GetSessionDesc( pDP[0], lpData[0], &dwDataSize ); > checkHR( DPERR_INVALIDPARAMS, hr ); > - check( -1, dwDataSize ); > + check( -1, dwDataSize );*/ You can't just comment out parts, if those crash on Windows put them in compilable block inside if (0) and add appropriate comment.

1 0

Re: gdiplus: Fix error when drawing from a rectangle outside bitmap bounds.
by Vincent Povirk Oct. 28, 2014

Oct. 28, 2014

Don't commit this. Right and bottom are included and I incorrectly treated them as excluded. I will send a fixed version.

1 0

Re: [2/2] wined3d: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate
by Stefan Dösinger Oct. 28, 2014

Oct. 28, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-28 00:44, schrieb Joachim Priesner: > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > ... > + /* We are using an affine projection matrix, so pixel fog assumes fog start and end > + * to be in device space coordinates. Pixel fog will therefore be calculated from > + * z=-1 to z=1, whereas vertex fog will be calculated from z=0 to z=1. */ > + start.f = 0.0f; > + end.f = 1.0f; I think this comment is wrong. In d3d normalized Z coordiantes go from 0.0 to 1.0. In GL (sans GL_ARB_clip_control) they go from -1.0 to 1.0. The fog results above agree with this - otherwise you'd get C_UNFOGGED for table fog in the middle of the quad with the given projection matrix and fogstart and end. Strictly speaking you don't have to set start = 0, end = 1, those are the default values. A comment stating that is enough. > + {0, D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, > + {0, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, > + {0, D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, There's a space missing in line 3. Otherwise this patch looks good to me. It also passes on my Radeon X1600 GPU. I didn't retest the HD 5770, I assume it passes there as well. I also tested it on Vista with my GeForce 7400, it works as expected. The Radeon 9000 GPU crashes on the vs1 ("non-foggy") + table fog tests. The other non-foggy shader tests run, but don't pass. I have attached the output in case you're interested, but otherwise don't bother about this. If I have time some day I'll try to find out where the driver's limitations are. I guess it's generally broken when fog is on and the shader does not write a fog coordinate. This is not the only fog-related problem on this card on Windows. Thanks again for your hard work. I hope I didn't miss anything this time :-) Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUT4SlAAoJEN0/YqbEcdMwYKoP/0UgSvtbxdM2sTto3Fmtl5dB fHvudTRqxQJs/7ymaxcoknGOwgY8iyu4UB0lQ1vWgIG0kJAI3QK351AujXTEG2bm Rbke87C//kTyb8DRMRYvpA05BnF1eMMtzZXD/+d1CDp8xqnUEwpdsCUz+5ZMymrk z07+zmGyq6t7XKVT4yvVA58dkIB5FuJQ/XS7mkiJ+267A+ZN+odnFGrMP/rT/jnE x/ySDcOatBsZ94LpsYqSLQH33COki+ngD2H0qAQG33Y1UAQnRb7l5g/fFwrs8vqS o5P8Hq5zEKjyjfP9Gr/BdVUjLgNurTLrpgs7T06XwMGeVJvQV2HyEIffXjrKUsqg T2H4fJaa9DHyehm+zB7YRdk+QKr0ibODA8/AG+m85nmcUFK7TZY0n+OMEHdwR8xk g6pr01zw4mJg7bJZE+uVdLwNuWA/BhTsxCrjphI9GAUf7VVr/VdaZC30m2p7lTsn rtH7vjh/UEBZg8vGwVgkpHNwaop8Cr1sfXH+uy4K6F1O/j+oLH0qpP15PCRkPqq4 HF39Lnj0/JYuI6Ak7M70K8Qw6ExP6KDs9KL9rn2znsomtPYRfkRyLe2uUCjeBHNz OfCWB8zQUrYfV9VCmK77rNgqui7+/Nyb7+MODwbnkkgBIOF/dao7WNYz501Cubee Ab85oRdj1ReT91QW2Awt =k/GT -----END PGP SIGNATURE-----

2 2

Re: [PATCH] d3d8/tests: The device restores the mode settings from the registry (v3).
by Marvin Oct. 28, 2014

Oct. 28, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9818 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000701B2, got 0002004C. device.c:3219: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: gdiplus: Blend in the background colour.
by Vincent Povirk Oct. 28, 2014

Oct. 28, 2014

> + return ((b + ((BYTE)bkgnd * (255 - alpha) + 127) / 255) | What's the purpose of adding 127 here? > stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, > PixelFormat32bppPARGB, &lockeddata); > > + if (background & 0xffffff) > + { > + DWORD *ptr; > + UINT i; > + for (ptr = (DWORD*)bits, i = 0; i < width * height; ptr++, i++) > + { > + if ((*ptr & 0xff000000) == 0xff000000) continue; > + *ptr = blend_argb_no_bkgnd_alpha(*ptr, background); > + } > + } I guess it wouldn't hurt anything, but it doesn't make much sense to do this if LockBits fails.

2 1

Re: comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Marvin Oct. 28, 2014

Oct. 28, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9817 Your paranoid android. === w2000pro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === wxppro (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w7u (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! propsheet.c:785: Test failed: property sheet with custom window proc: the msg 0x001c was expected, but got msg 0x0047 instead === w8 (32 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === wvistau64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed! === w2008s64 (64 bit propsheet) === propsheet.c:584: Test failed: The Add button has not been pressed!

1 0

Re: ws2_32: WS_get_local_ips: Fix sorting IP addresses by metric if two addresses have the same metric
by Ken Thomases Oct. 28, 2014

Oct. 28, 2014

Hi, On Oct 24, 2014, at 3:27 PM, Joachim Priesner <joachim.priesner(a)web.de> wrote: > The previous implementation required the metrics to be mutually inequal > (because of the "this_metric > last_metric" check). If the metrics were > not mutually inequal, it would write only one address per metric value to the list > and fill up the rest of the list with the magic loopback IP address 127.12.34.56. > > I take it that this is not the expected behavior, please correct me if I'm wrong! I was recently looking at this code and noticed the same problem. Thanks for working on this. I don't understand why the original code ever would have wanted to return the magic loopback address, other than to cover up the brokenness of the sort. So, why do you still have that logic in there? Each pass of the outer (i) loop can "consume" at most one entry in the list. So, the inner (j) loop should always find a remaining lowest-metric entry. lowest_metric_idx should never be -1 at the end of that loop and the magic address should never be used. More simply, this is just an attempt to sort the routes. None should be added and none should be removed (i.e. replaced with magic). Since it's a sort, I recommend that this loop simply be replaced with an invocation of qsort() with an appropriate comparison function. That's what's done in iphlpapi for similar situations. (This can be conditioned on numroutes >= 2 to avoid the overhead when it's not necessary.) After the routes are sorted, the addresses can be copied over to the h_addr_list with a much simpler loop. -Ken

1 0

Re: [PATCH 2/6] reg: Add path/key conversion functions
by Stefan Dösinger Oct. 27, 2014

Oct. 27, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-27 13:10, schrieb Jonathan Vollebregt: > +#define ARRAY_COUNT(A) (sizeof(A)/sizeof(*A)) Other places that use a macro like this call it ARRAY_SIZE. > +typedef struct { > + HKEY key; > + const WCHAR *short_name; > + const WCHAR *long_name; > +} hkey_rel; Style :-) > +static inline int path_rootname_cmp(const WCHAR *path, const WCHAR *name) > +{ > + DWORD length = strlenW(name); > + > + return (strncmpiW(path, name, length) == 0 && (path[length] == 0 || path[length] == '\\')); > +} I don't like the names "path" and "name". I wondered why you're relying on the length of name. A better name for "path" could be "input", but I can't think of anything for "name". > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + DWORD i; > + for (i = 0; i < ARRAY_COUNT(root_rels); i++) > + { > + if (path_rootname_cmp(path, root_rels[i].short_name) || > + path_rootname_cmp(path, root_rels[i].long_name)) > + return root_rels[i].key; > + } > + > + reg_message(STRING_INVALID_KEY); > + return NULL; > +} Is it a good idea to write an error message from deep inside a helper function? What happens when you just pass the NULL root to RegOpenKey? Can you tell the cases for STRING_INVALID_KEY and STRING_CANNOT_FIND apart base on the return value? You could also consider a function that returns an error string ID for each advapi32 Reg* error result. Then you can propagate the advapi32 return codes to main() and write the error string there. Depending on the possible failure modes this may or may not be possible. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I see that this is why you need the trailing backslash elimination in the previous patch. But still, do you need this? What happens when you call e.g. RegOpenKey(HKEY_CURRENT_USER, "\\", &k)? If it returns HKEY_CURRENT_USER or a handle that points to HKEY_CURRENT_USER you're fine. Similarly for RegOpenKey(HKEY_CURRENT_USER, "", &k). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUTtS5AAoJEN0/YqbEcdMw+kEP/0DwI2fMgk2o6bKh1mCVwzeg AFH+EKh1pAwpHBmIRHX7XzyDBAusd0GVH0+B5WQFnl+Fr49ybYqp8CGfytqm0H/e lgqS0SCDZjaDTI5WO5zT/L5/VGhQ5tQHSQJiHS3UhXX3IBDXd7aYcbreSMHNcyJ8 ZPaFmVVCH8iRiR4qqMS8cJKXPxzx5tg5Ec9TpXfyYraI8YDPTNPOGlUipl9m5kwa lrqjD+TbGbCOczq1mx6WSJnVxKWboWhz3FnzYDM0C8PzpJlRyzODWlfUHVMSLSmQ xu9K/lXl2XJpmXbjFsCPZ5C4K3pRVH3poAtPNs+yOEeHkWTE2Pf3uyKNBwpW4ONU 3PFhn0beJM1scJY/LRjpCWLi74xA+FdBq6WDuxx2BpMoDvKCe/zV+LEY6zbymtxY OsXQXXQwpcVBAC3mWQK0EWce8g2/he4PoPi8/l4ZakkCEAF4dqtdfSEQAccf9KfV EeI8PJOAZRLoKAUQgKse2mYHG8V4EJEp8IQA0HcuWgR9zEMTpIUt08xdmU5cIWfu Ena2T9phlAWmDIjcgr9haIHEreZkMI8DZI07XOmVAlZL44rSdkVop816I/ItTE98 CTwU6N0pD/V4htZcwWN7ZVojPK4AA7UD9NW7sg326drl2KIpk5j0ZmYq0/WwSL2o uS2pHS9eKgBarX7GCXyd =k2ys -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/3] d3d8/tests: The device restores the mode settings from the registry (v2).
by Marvin Oct. 27, 2014

Oct. 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9791 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3129: Test failed: Got unexpect width 800, expected 1024. device.c:3131: Test failed: Got unexpect height 600, expected 768. device.c:3217: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: wined3d: Take abs() of vertex z coordinate as FFP fog coordinate and remove oFog clamp for vertex shaders
by Stefan Dösinger Oct. 27, 2014

Oct. 27, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I have tested your patches on my various systems. I have replaced C_IGNORE in the d3d8 test with C_FOGGED. The test passes on Nvidia cards, but fails (also in d3d9) on my AMD cards. As far as I can see AMD cards clamp the fog coord. I have attached results from a Radeon 9000 (WinXP), Radeon X1600 (Win7) and Radeon HD 5770 (Win7). The Radeon 9000 driver crashes in the tests. Windows somehow restores it, but the screen resolution is broken until the next reboot (Can't set back the native resolution of 1400x1050.) I haven't quite understood yet what you're doing with quad2/quad3, so I can't comment on the code yet. Cheers, Stefan Am 2014-10-22 09:43, schrieb Joachim Priesner: > Supersedes 107021. (The title of that patch really was not fitting > any more.) > > The FFP fog coordinate is not vertex.z, but the absolute value of > it. The patch fixes that and adds a test. > > The tests also suggest that the vertex shader side clamp of oFog > is incorrect. The test results are clear on that for d3d9, but vary > across different Windows machines for d3d8. Therefore, the d3d8 > oFog clamp tests are disabled for now. > > Tested on openSuse 13.1 and Windows 8.1 (VMware, Wine test bot, > real machine with nVidia graphics card). --- > dlls/d3d8/tests/visual.c | 335 > +++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | > 399 +++++++++++++++++++++++++++++++++++++++++++++ > dlls/ddraw/tests/ddraw7.c | 186 +++++++++++++++++++++ > dlls/wined3d/glsl_shader.c | 4 +- 4 files changed, 922 > insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c > index ba73bb6..42d3e97 100644 --- a/dlls/d3d8/tests/visual.c +++ > b/dlls/d3d8/tests/visual.c @@ -696,6 +696,340 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000, + > C_IGNORE = 0xdeadbeef + }; + + /* Fill the null-shader > entry with the FVF (SetVertexShader is "overloaded" on d3d8). */ + > DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE | > D3DFVF_SPECULAR, 0, 0}; + DWORD pixel_shader[2] = {0, 0}; + > IDirect3D8 *d3d; + IDirect3DDevice8 *device; + BOOL > has_vs_support, has_ps_support, has_table_fog_support; + > unsigned int i, ps, y; + D3DCOLOR color, expected_middle_color; > + ULONG refcount; + D3DCAPS8 caps; + HWND window; + > HRESULT hr; + union + { + float f; + DWORD i; + > } start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0100, > /* vs_1_0 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + + static const > struct + { + struct vec3 position; + DWORD > diffuse; + DWORD specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const > DWORD vertex_decl[] = + { + D3DVSD_STREAM(0), + > D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position, v0 */ + > D3DVSD_REG(1, D3DVSDT_D3DCOLOR), /* diffuse color, v1 */ + > D3DVSD_REG(2, D3DVSDT_D3DCOLOR), /* specular color, v2 */ + > D3DVSD_END() + }; + static const struct test_data_t + { + > int vshader; + D3DFOGMODE vfog; + D3DFOGMODE tfog; + > DWORD color_left; + DWORD color_middle_top; + DWORD > color_middle_bottom; + DWORD color_right; + } + > test_data[] = + { + /* Using z-based fog, the bottom quad > should have a gradient UNFOGGED->FOGGED + * for table fog, > and be completely fogged for vertex fog. + * When the fog > coordinate returned by the vertex shader is used instead, + > * the result is a gradient FOGGED->UNFOGGED. */ + + /* No > vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader with vertex fog > computation. + * Ignore the bottom middle color as test > results vary on different Windows machines. */ + {2, > D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, > D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, > C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_IGNORE, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_IGNORE, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f + }}}; + > /* Transposed version of proj_mat to pass to the vertex shaders. > */ + static const D3DMATRIX proj_mat_transposed = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + > static const D3DMATRIX view_mat = + {{{ + 1.0f, 0.0f, > 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, > 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}; + + window > = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | > WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + > d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to > create a D3D object\n"); + if (!(device = create_device(d3d, > window, window, TRUE))) + { + skip("Failed to create a > D3D device, skipping tests\n"); + goto done; + } + + > hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice8_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + > has_vs_support = caps.VertexShaderVersion >= D3DVS_VERSION(1, 0); + > if (has_vs_support) + { + hr = > IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code1, &vertex_shader[1], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + > hr = IDirect3DDevice8_CreateVertexShader(device, vertex_decl, > vertex_shader_code2, &vertex_shader[2], 0); + > ok(SUCCEEDED(hr), "CreateVertexShader failed (%#x)\n", hr); + + > /* Note: Shaders expect matrices in column-major form, so they > have + * to be transposed if they are not symmetrical. */ + > hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &view_mat, > 4); + ok(SUCCEEDED(hr), "SetVertexShaderConstant (view > matrix) failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetVertexShaderConstant(device, 4, > &proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstant (projection matrix) failed (%#x)\n", hr); > + } + else + { + skip("No vs_1_0 support, skipping > some fog tests\n"); + } + + /* Setup initial states: No depth > test, no lighting, fog on, fog color */ + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + + /* We are using an affine > projection matrix, so fog start and end are in device space > coords. + * This corresponds to a fog from z=-1 to z=1. */ + > start.f = 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, start.i); + > ok(SUCCEEDED(hr), "Setting fog start failed (%#x)\n", hr); + hr > = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, end.i); + > ok(SUCCEEDED(hr), "Setting fog end failed (%#x)\n", hr); + + hr > = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice8_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + ok(SUCCEEDED(hr), > "SetVertexShader failed (%#x)\n", hr); + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice8_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice8_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + if (expected_middle_color != C_IGNORE) + > { + color = getPixelColor(device, 320, y); + > ok(color_match(color, expected_middle_color, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got middle color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, > ps, test_data[i].vfog, test_data[i].tfog, y, + > color, expected_middle_color); + } + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[i]); + > for (i = 0; i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) > + if (pixel_shader[i]) + > IDirect3DDevice8_DeletePixelShader(device, pixel_shader[i]); + > refcount = IDirect3DDevice8_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D8_Release(d3d); + DestroyWindow(window); +} + /* This > tests fog in combination with shaders. * What's tested: linear fog > (vertex and table) with pixel shader * linear table > fog with non foggy vertex shader @@ -5092,6 +5426,7 @@ > START_TEST(visual) offscreen_test(); alpha_test(); > test_scalar_instructions(); + fog_negative_z_test(); > fog_with_shader_test(); cnd_test(); p8_texture_test(); diff --git > a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index > 117c8eb..421cae0 100644 --- a/dlls/d3d9/tests/visual.c +++ > b/dlls/d3d9/tests/visual.c @@ -1825,6 +1825,404 @@ done: > DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void fog_negative_z_test(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + IDirect3DVertexShader9 *vertex_shader[4] = {NULL, NULL, > NULL, NULL}; + IDirect3DPixelShader9 *pixel_shader[3] = {NULL, > NULL, NULL}; + IDirect3DVertexDeclaration9 *vertex_declaration = > NULL; + IDirect3DDevice9 *device; + BOOL has_vs_support, > has_ps_support, has_table_fog_support; + unsigned int i, ps, y; > + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + > DWORD color, expected_middle_color; + HWND window; + HRESULT > hr; + union + { + float f; + DWORD i; + } > start, end; + + /* For all vertex shaders the view matrix goes > in registers c0...c3, + * the projection matrix goes in > registers c4...c7. */ + + /* Basic vertex shader without fog > computation ("non foggy") */ + static const DWORD > vertex_shader_code1[] = + { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"). + * Using the vertex' x coordinate > as fog coordinate so that all test cases that use vertex fog + > * will have a gradient from fully fogged (green, left) to unfogged > (red, right). */ + static const DWORD vertex_shader_code2[] = + > { + 0xfffe0101, > /* vs_1_1 */ + 0x0000001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0000001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x00000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x00000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x00000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x00000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x00000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x00000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x00000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x00000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x00000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x00000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic vertex shader with > fog computation ("foggy"), vs_2_0 */ + static const DWORD > vertex_shader_code3[] = + { + 0xfffe0200, > /* vs_2_0 */ + 0x0200001f, 0x80000000, > 0x900f0000, /* dcl_position0 v0 > */ + 0x0200001f, 0x8000000a, 0x900f0001, > /* dcl_color0 v1 */ + /* output.Pos = mul(input.Pos, > View) */ + 0x03000009, 0x80010000, 0x90e40000, 0xa0e40000, > /* dp4 r0.x, v0, c0 */ + 0x03000009, 0x80020000, > 0x90e40000, 0xa0e40001, /* dp4 r0.y, v0, c1 > */ + 0x03000009, 0x80040000, 0x90e40000, 0xa0e40002, > /* dp4 r0.z, v0, c2 */ + 0x03000009, 0x80080000, > 0x90e40000, 0xa0e40003, /* dp4 r0.w, v0, c3 > */ + /* output.Pos = mul(output.Pos, Projection) */ + > 0x03000009, 0xc0010000, 0x80e40000, 0xa0e40004, > /* dp4 oPos.x, r0, c4 */ + 0x03000009, 0xc0020000, > 0x80e40000, 0xa0e40005, /* dp4 oPos.y, r0, > c5 */ + 0x03000009, 0xc0040000, 0x80e40000, 0xa0e40006, > /* dp4 oPos.z, r0, c6 */ + 0x03000009, 0xc0080000, > 0x80e40000, 0xa0e40007, /* dp4 oPos.w, r0, > c7 */ + /* output.Color = input.Color */ + > 0x02000001, 0xd00f0000, 0x90e40001, > /* mov oD0, v1 */ + /* output.Fog = input.Pos.x */ + > 0x02000001, 0xc00f0001, 0x90000000, > /* mov oFog, v0.x */ + 0x0000ffff, > /* END */ + }; + + /* Basic pixel shader */ + > static const DWORD pixel_shader_code[] = + { + > 0xffff0101, > /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, > /* mov r0, v0 */ + 0x0000ffff + }; + static const > DWORD pixel_shader_code2[] = + { + 0xffff0200, > /* ps_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, > /* dcl v0 */ + 0x02000001, 0x800f0800, 0x90e40000, > /* mov oC0, v0 */ + 0x0000ffff + }; + static const > struct + { + struct vec3 position; + D3DCOLOR > diffuse; + D3DCOLOR specular; + } + quad1[] = + { + > {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, -1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad2[] = + > { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{-1.0f, 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + > { + {{ 0.0f, 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 0.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, > 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + + static > const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, > D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, > 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, > D3DDECLUSAGE_COLOR, 0}, /* diffuse */ + {0, 16, > D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, > 1}, /* specular */ + D3DDECL_END() + }; + static const > struct test_data_t + { + int vshader; + D3DFOGMODE > vfog; + D3DFOGMODE tfog; + DWORD color_left; + > DWORD color_middle_top; + DWORD color_middle_bottom; + > DWORD color_right; + } + test_data[] = + { + /* > Using z-based fog, the bottom quad should have a gradient > UNFOGGED->FOGGED + * for table fog, and be completely > fogged for vertex fog. + * When the fog coordinate returned > by the vertex shader is used instead, + * the result is a > gradient FOGGED->UNFOGGED in the right half of the screen. */ + + > /* No vertex shader */ + {0, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {0, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {0, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_UNFOGGED, C_FOGGED, C_FOGGED}, + {0, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader without vertex fog > computation */ + {1, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {1, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {1, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_FOGGED}, + {1, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_FOGGED}, + + /* Vertex shader vs_1_1 with vertex fog > computation */ + {2, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {2, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {2, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {2, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + + /* Vertex shader vs_2_0 with vertex fog > computation */ + {3, D3DFOG_NONE, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + {3, > D3DFOG_LINEAR, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {3, D3DFOG_LINEAR, D3DFOG_NONE, > C_FOGGED, C_FOGGED, C_FOGGED, C_UNFOGGED}, + {3, > D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, C_FOGGED, C_FOGGED, > C_UNFOGGED}, + }; + /* Affine projection matrix for z-near = > -1, z-far = 1. */ + static const D3DMATRIX proj_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 0.5f, 0.0f, + 0.0f, 0.0f, 0.5f, 1.0f, + }}}; > + /* Transposed version of proj_mat to pass to the vertex > shaders. */ + static const D3DMATRIX proj_mat_transposed = + > {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 0.5f, 0.5f, + 0.0f, 0.0f, 0.0f, > 1.0f, + }}}; + static const D3DMATRIX view_mat = + {{{ + > 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + > 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; > + + window = CreateWindowA("static", "d3d9_test", > WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, > NULL, NULL, NULL, NULL); + d3d = > Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create > a D3D object\n"); + if (!(device = create_device(d3d, window, > window, TRUE))) + { + skip("Failed to create a D3D > device, skipping tests\n"); + goto done; + } + + hr = > IDirect3DDevice9_GetDeviceCaps(device, &caps); + > ok(SUCCEEDED(hr), "Failed to get device caps (%#x)\n", hr); + + > has_table_fog_support = caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE; > + if (!has_table_fog_support) + skip("No table fog > support, skipping some fog tests\n"); + + has_vs_support = > caps.VertexShaderVersion >= D3DVS_VERSION(1, 1); + if > (has_vs_support) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, > &vertex_shader[1]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code2, > &vertex_shader[2]); + ok(SUCCEEDED(hr), "CreateVertexShader > failed (%#x)\n", hr); + + if (caps.VertexShaderVersion >= > D3DVS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code3, > &vertex_shader[3]); + ok(SUCCEEDED(hr), > "CreateVertexShader failed (%#x)\n", hr); + } + else > + { + skip("No vs_2_0 support, skipping some fog > tests\n"); + } + + /* Note: Shaders expect matrices > in column-major form, so they have + * to be transposed if > they are not symmetrical. */ + hr = > IDirect3DDevice9_SetVertexShaderConstantF(device, 0, (const > float*)&view_mat, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (view matrix) failed (%#x)\n", hr); + > hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 4, (const > float*)&proj_mat_transposed, 4); + ok(SUCCEEDED(hr), > "SetVertexShaderConstantF (projection matrix) failed (%#x)\n", > hr); + } + else + { + skip("No vs_1_1 support, > skipping some fog tests\n"); + } + + has_ps_support = > caps.PixelShaderVersion >= D3DPS_VERSION(1, 1); + if > (has_ps_support) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, > &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader > failed (%#x)\n", hr); + + if (caps.PixelShaderVersion >= > D3DPS_VERSION(2, 0)) + { + hr = > IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, > &pixel_shader[2]); + ok(SUCCEEDED(hr), > "CreatePixelShader failed (%#x)\n", hr); + } + else + > { + skip("No ps_2_0 support, skipping some fog > tests\n"); + } + } + else + { + skip("No > ps_1_1 support, skipping some fog tests\n"); + } + + hr = > IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, > &vertex_declaration); + ok(SUCCEEDED(hr), > "CreateVertexDeclaration failed (%#x)\n", hr); + + /* Setup > initial states: No depth test, no lighting, fog on, fog color */ + > hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Turning off depth test failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Turning off > lighting failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + > ok(SUCCEEDED(hr), "Turning on fog calculations failed (%#x)\n", > hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGCOLOR, C_FOGGED); + ok(SUCCEEDED(hr), "Setting fog > color failed (%#x)\n", hr); + hr = > IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); > + ok(SUCCEEDED(hr), "SetVertexDeclaration failed (%#x)\n", hr); > + + /* We are using an affine projection matrix, so fog start > and end are in device space coords. + * This corresponds to a > fog from z=-1 to z=1. */ + start.f = 0.0f; + end.f = 1.0f; + > + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, > start.i); + ok(SUCCEEDED(hr), "Setting fog start failed > (%#x)\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGEND, end.i); + ok(SUCCEEDED(hr), "Setting fog end > failed (%#x)\n", hr); + + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform (%#x)\n", hr); + hr = > IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &view_mat); + > ok(SUCCEEDED(hr), "Failed to set view transform (%#x)\n", hr); + + > for (i = 0; i < sizeof(test_data)/sizeof(test_data[0]); i++) + > { + if (test_data[i].vshader != 0 && > !vertex_shader[test_data[i].vshader]) + continue; + > if (test_data[i].tfog != D3DFOG_NONE && !has_table_fog_support) + > continue; + + if (has_vs_support) + { + hr > = IDirect3DDevice9_SetVertexShader(device, > vertex_shader[test_data[i].vshader]); + > ok(SUCCEEDED(hr), "SetVertexShader failed (%#x)\n", hr); + > } + + for (ps = 0; ps < > sizeof(pixel_shader)/sizeof(pixel_shader[0]); ps++) + { + > if (ps != 0 && !pixel_shader[ps]) + continue; + + > if (has_ps_support) + { + hr = > IDirect3DDevice9_SetPixelShader(device, pixel_shader[ps]); + > ok(SUCCEEDED(hr), "SetPixelShader failed (%#x)\n", hr); + > } + + hr = IDirect3DDevice9_SetRenderState(device, > D3DRS_FOGVERTEXMODE, test_data[i].vfog); + > ok(SUCCEEDED(hr), "Setting fog vertex mode to %d failed (%#x)\n", > test_data[i].vfog, hr); + hr = > IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, > test_data[i].tfog); + ok(SUCCEEDED(hr), "Setting fog > table mode to %d failed (%#x)\n", test_data[i].tfog, hr); + + > hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, > C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed > (%#x)\n", hr); + hr = > IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), > "BeginScene failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad1[0], sizeof(quad1[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad2[0], sizeof(quad2[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, > &quad3[0], sizeof(quad3[0])); + ok(SUCCEEDED(hr), > "DrawPrimitiveUP failed (%#x)\n", hr); + hr = > IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), > "EndScene failed (%#x)\n", hr); + + /* Use 5% tolerance > on the colors since there may be a gradient + * between > left and right vertices. */ + for (y = 120; y <= 360; y > += 240) + { + color = > getPixelColor(device, 2, y); + ok(color_match(color, > test_data[i].color_left, 13), + "fog vs%i > ps%i fvm%i ftm%i, y=%i: got left color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_left); + color = > getPixelColor(device, 320, y); + > expected_middle_color = + (y == 120 ? > test_data[i].color_middle_top : test_data[i].color_middle_bottom); > + ok(color_match(color, expected_middle_color, 13), > + "fog vs%i ps%i fvm%i ftm%i, y=%i: got > middle color %08x, expected %08x+-5%%\n", + > test_data[i].vshader, ps, test_data[i].vfog, test_data[i].tfog, y, > + color, expected_middle_color); + > color = getPixelColor(device, 638, y); + > ok(color_match(color, test_data[i].color_right, 13), + > "fog vs%i ps%i fvm%i ftm%i, y=%i: got right color %08x, expected > %08x+-5%%\n", + test_data[i].vshader, ps, > test_data[i].vfog, test_data[i].tfog, y, + > color, test_data[i].color_right); + } + + hr > = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + > ok(SUCCEEDED(hr), "Present failed (%#x)\n", hr); + } + } > + + for (i = 0; i < > sizeof(vertex_shader)/sizeof(vertex_shader[0]); i++) + if > (vertex_shader[i]) + > IDirect3DVertexShader9_Release(vertex_shader[i]); + for (i = 0; > i < sizeof(pixel_shader)/sizeof(pixel_shader[0]); i++) + if > (pixel_shader[i]) + > IDirect3DPixelShader9_Release(pixel_shader[i]); + > IDirect3DVertexDeclaration9_Release(vertex_declaration); + > refcount = IDirect3DDevice9_Release(device); + ok(!refcount, > "Device has %u references left\n", refcount); +done: + > IDirect3D9_Release(d3d); + DestroyWindow(window); +} + /* This > test tests fog in combination with shaders. * What's tested: linear > fog (vertex and table) with pixel shader * linear > table fog with non foggy vertex shader @@ -16729,6 +17127,7 @@ > START_TEST(visual) test_vshader_input(); test_vshader_float16(); > stream_test(); + fog_negative_z_test(); fog_with_shader_test(); > texbem_test(); texdepth_test(); diff --git > a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index > ec50fb8..286b828 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ > b/dlls/ddraw/tests/ddraw7.c @@ -3384,6 +3384,191 @@ static void > test_fog_special(void) DestroyWindow(window); } > > +/* This test tests fog in combination with negative vertex z > coordinates. */ +static void test_fog_negative_z(void) +{ + > enum + { + C_ALPHA_0x00 = 0x00000000, + C_CLEAR > = 0xffff00ff, + C_FOGGED = 0x0000ff00, + > C_HALF_FOGGED = 0x00808000, + C_UNFOGGED = 0x00ff0000 + > }; + + D3DCOLOR color, expected_middle_color; + HRESULT hr; + > ULONG refcount; + BOOL has_table_fog_support; + unsigned int > i, y; + HWND window; + IDirect3DDevice7 *device; + > IDirectDrawSurface7 *rt; + D3DDEVICEDESC7 caps; + + union + > { + float f; + DWORD d; + } start, end; + + > static struct + { + struct vec3 position; + > D3DCOLOR diffuse; + D3DCOLOR specular; + } + quad1[] > = + { + {{-1.0f, 0.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, 0.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{-1.0f, -1.0f, -1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + {{ 1.0f, -1.0f, 1.0f}, C_UNFOGGED, > C_ALPHA_0x00}, + }, + quad2[] = + { + {{-1.0f, > 1.0f, -1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 1.0f, > 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{-1.0f, 0.0f, -1.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, 0.0f, 0.0f}, > C_UNFOGGED, C_ALPHA_0x00}, + }, + quad3[] = + { + > {{ 0.0f, 1.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ > 1.0f, 1.0f, 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 0.0f, > 0.0f, 0.0f}, C_UNFOGGED, C_ALPHA_0x00}, + {{ 1.0f, 0.0f, > 1.0f}, C_UNFOGGED, C_ALPHA_0x00}, + }; + static const struct > test_data_t + { + DWORD vertexmode, tablemode; + > D3DCOLOR color_left, color_middle_top, color_middle_bottom, > color_right; + } + test_data[] = + { + > {D3DFOG_NONE, D3DFOG_LINEAR, C_UNFOGGED, C_HALF_FOGGED, > C_HALF_FOGGED, C_FOGGED}, + {D3DFOG_LINEAR, D3DFOG_LINEAR, > C_UNFOGGED, C_HALF_FOGGED, C_HALF_FOGGED, C_FOGGED}, + > {D3DFOG_LINEAR, D3DFOG_NONE, C_FOGGED, C_UNFOGGED, C_FOGGED, > C_FOGGED}, + {D3DFOG_NONE, D3DFOG_NONE, C_FOGGED, > C_FOGGED, C_FOGGED, C_FOGGED}, + }; + /* Affine > projection matrix for z-near = -1, z-far = 1. */ + static > D3DMATRIX proj_mat = + { + 1.0f, 0.0f, 0.0f, 0.0f, + > 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.5f, 0.0f, + > 0.0f, 0.0f, 0.5f, 1.0f + }; + static D3DMATRIX view_mat = + > { + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, > 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, > 1.0f + }; + + window = CreateWindowA("static", "ddraw_test", > WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + > if (!(device = create_device(window, DDSCL_NORMAL))) + { + > skip("Failed to create a 3D device, skipping test.\n"); + > DestroyWindow(window); + return; + } + + memset(&caps, > 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, > &caps); + ok(SUCCEEDED(hr), "IDirect3DDevice7_GetCaps failed, hr > %#x.\n", hr); + + has_table_fog_support = > caps.dpcTriCaps.dwRasterCaps & D3DPRASTERCAPS_FOGTABLE; + if > (!has_table_fog_support) + skip("No table fog support, > skipping some fog tests.\n"); + + hr = > IDirect3DDevice7_GetRenderTarget(device, &rt); + > ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + > + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to > enable fog, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, > C_FOGGED); + ok(SUCCEEDED(hr), "Failed to set fog color, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to > disable lighting, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, > D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable depth test, > hr %#x.\n", hr); + + /* We are using an affine projection > matrix, so fog start and end are in device space coords. + * > This corresponds to a fog from z=-1 to z=1. */ + start.f = > 0.0f; + end.f = 1.0f; + + hr = > IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, > start.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr > %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGEND, end.d); + ok(SUCCEEDED(hr), "Failed to > set fog end, hr %#x.\n", hr); + + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_PROJECTION, > &proj_mat); + ok(SUCCEEDED(hr), "Failed to set projection > transform, hr %#x.\n", hr); + hr = > IDirect3DDevice7_SetTransform(device, D3DTRANSFORMSTATE_VIEW, > &view_mat); + ok(SUCCEEDED(hr), "Failed to set view transform, > hr %#x.\n", hr); + + for (i = 0; i < > sizeof(test_data)/sizeof(test_data[0]); i++) + { + if > (test_data[i].tablemode != D3DFOG_NONE && !has_table_fog_support) + > continue; + + hr = IDirect3DDevice7_Clear(device, 0, NULL, > D3DCLEAR_TARGET, C_CLEAR, 1.0f, 0); + ok(SUCCEEDED(hr), > "Failed to clear render target, i=%d, hr %#x.\n", i, hr); + + > hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGVERTEXMODE, test_data[i].vertexmode); + > ok(SUCCEEDED(hr), "Failed to set fog vertex mode, i=%d, hr %#x.\n", > i, hr); + hr = IDirect3DDevice7_SetRenderState(device, > D3DRENDERSTATE_FOGTABLEMODE, test_data[i].tablemode); + > ok(SUCCEEDED(hr), "Failed to set fog table mode, i=%d, hr %#x.\n", > i, hr); + + hr = IDirect3DDevice7_BeginScene(device); + > ok(SUCCEEDED(hr), "Failed to begin scene, i=%d, hr %#x.\n", i, > hr); + hr = IDirect3DDevice7_DrawPrimitive(device, > D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | D3DFVF_DIFFUSE | > D3DFVF_SPECULAR, quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed > to draw, i=%d, hr %#x.\n", i, hr); + hr = > IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad2, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + > D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, quad3, 4, 0); + > ok(SUCCEEDED(hr), "Failed to draw, i=%d, hr %#x.\n", i, hr); + > hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), > "Failed to end scene, i=%d, hr %#x.\n", i, hr); + + /* Use > 5% tolerance on the colors since there may be a gradient + > * between left and right vertices. */ + for (y = 120; y <= > 360; y += 240) + { + color = > get_surface_color(rt, 2, y); + ok(compare_color(color, > test_data[i].color_left, 13), + "fog fvm%i ftm%i > y=%i: got left color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, color, y, + > test_data[i].color_left); + color = > get_surface_color(rt, 320, y); + expected_middle_color > = + (y == 120 ? test_data[i].color_middle_top : > test_data[i].color_middle_bottom); + > ok(compare_color(color, expected_middle_color, 13), + > "fog fvm%i ftm%i y=%i: got middle color %08x, expected > %08x+-5%%.\n", + test_data[i].vertexmode, > test_data[i].tablemode, y, + color, > expected_middle_color); + color = get_surface_color(rt, > 638, y); + ok(compare_color(color, > test_data[i].color_right, 13), + "fog fvm%i > ftm%i y=%i: got right color %08x, expected %08x+-5%%.\n", + > test_data[i].vertexmode, test_data[i].tablemode, y, + > color, test_data[i].color_right); + } + } + + > IDirectDrawSurface7_Release(rt); + refcount = > IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u > references left.\n", refcount); + DestroyWindow(window); +} + > static void test_lighting_interface_versions(void) { > IDirect3DDevice7 *device; @@ -7671,6 +7856,7 @@ START_TEST(ddraw7) > test_clear_rect_count(); test_coop_level_versions(); > test_fog_special(); + test_fog_negative_z(); > test_lighting_interface_versions(); test_coop_level_activateapp(); > test_texturemanage(); diff --git a/dlls/wined3d/glsl_shader.c > b/dlls/wined3d/glsl_shader.c index 7379ba2..b78e59e 100644 --- > a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ > -4352,7 +4352,7 @@ static GLhandleARB > generate_param_reorder_function(struct wined3d_shader_buffer } else > if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) > { - shader_addline(buffer, "gl_FogFragCoord = > clamp(vs_out[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); + > shader_addline(buffer, "gl_FogFragCoord = vs_out[%u].%c;\n", i, > reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -5005,7 +5005,7 > @@ static GLhandleARB shader_glsl_generate_ffp_vertex_shader(struct > wined3d_shader_ /* Need to undo the [0.0 - 1.0] -> [-1.0 - 1.0] > transformation from D3D to GL coordinates. */ > shader_addline(buffer, "gl_FogFragCoord = gl_Position.z * 0.5 + > 0.5;\n"); else - shader_addline(buffer, > "gl_FogFragCoord = ec_pos.z;\n"); + > shader_addline(buffer, "gl_FogFragCoord = abs(ec_pos.z);\n"); > break; > > default: > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUR5+HAAoJEN0/YqbEcdMwkzAP/Rr0nW6/UhcjbrhTWFapJgu1 yofwZuo6jh6hWeqYJQKmI+ltYY+D6zX8yjaAZv8b+JbW5QbNAAUkH8UR1DakrvuY ZxBKxOURffVifx3cC1K6c8Joy2j/0TLKMGBtB5MMNZKpRaROPa+jGo6Yp7B3lyqr V3V0OfOSyduQTSpFdXLTkQzXK0qu4Knk1tGqg3IuuLERMZC8ClYnrTMnwO1nU93J PLXT+AVF0/h6/pHOyyXJm63w5+j8ZQGScqEVaqaT+Js3Yl2KKc+IgiOCo81VdCF+ AcTh2ReRSxQLIp+5qcGw36/dw/+RSq+Hld54OsnDZlgpLd1nYs3Bs6DBae7aaQZ8 QUEzc74DThOssKcOmObfuplzAEcg1VP7Asb7aHxWAzRUrnpLJS5L+NAJYtzzOld3 1dLTjXoQO+B+RCwh5Ea5gbSLbhX8h5U2amA6IEract8rKU5EMWlGmJ7l2TX+3HY9 5hiBMXSEeARTfkwXTqhf+NTpL4A0kXudd25/9RgubfOJusZT5vWKMJryMbW/H5Ah TKpYDiFYC7bBGaTlsxHb1CWoOweFIRm1ord4vob7IB3KBE9VCvm2j+3ZxHmm2dld J4WyhbrErJq86Qxa6tToh9ELZlg4UkJxvUOxjdD7ra4qo2isd9ABkbxhxoHgcvY2 PqVs5A384cEgYrNgBe55 =hu36 -----END PGP SIGNATURE-----

2 5

Re: [PATCH 2/5] dwrite: Block attempts of registering local file loader
by Marvin Oct. 27, 2014

Oct. 27, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9762 Your paranoid android. === wvistau64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:949: Test failed: got 0x88985006 font.c:953: Test failed: got 0x80070057

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly (try 2)
by Nikolay Sivov Oct. 26, 2014

Oct. 26, 2014

On 10/26/2014 21:02, Dan Bassi wrote: This should be a normal message sequence test, we have everything in place for that. And you're not testing text callback case.

1 0

Re: [1/2] server: Store the time of the socket connection (resend)
by Alexandre Julliard Oct. 26, 2014

Oct. 26, 2014

Bruno Jesus <00cpxxx(a)gmail.com> writes: > diff --git a/server/protocol.def b/server/protocol.def > index fec5e75..1e83862 100644 > --- a/server/protocol.def > +++ b/server/protocol.def > @@ -1250,6 +1250,7 @@ enum server_fd_type > int family; /* family, see socket manpage */ > int type; /* type, see socket manpage */ > int protocol; /* protocol, see socket manpage */ > + unsigned int connect_time; /* time the socket was connected (tick count) */ There doesn't seem to be any reason to return a tick count (as opposed to a normal server timestamp). -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: urlmon/tests: Clarify ok() condition
by Marvin Oct. 25, 2014

Oct. 25, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9754 Your paranoid android. === w2008s64 (64 bit url) === url.c:1681: Test failed: unexpected call OnProgress_CONNECTING

1 0

Re: [PATCH] vbscript: Implemented String(try 2)
by Marvin Oct. 25, 2014

Oct. 25, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9751 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [PATCH v4 2/8] reg.exe: Add path_get_key() to remove boilerplate
by Stefan Dösinger Oct. 24, 2014

Oct. 24, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think this patch has the potential to improve code readability if improved a bit. Am 2014-10-09 10:55, schrieb Jonathan Vollebregt: > +#define MAX_ROOT_KEY_NAME_LENGTH 20 > +#define NUM_ROOT_KEYS 5 > + > +static const WCHAR short_HKEY_name[NUM_ROOT_KEYS][5] = { > ... > +}; > + > +static const WCHAR long_HKEY_name[NUM_ROOT_KEYS][MAX_ROOT_KEY_NAME_LENGTH] = { > ... > +}; > + > +static const HKEY HKEYs[NUM_ROOT_KEYS] = { > ... > +}; Why not use one table instead of 3 separate arrays with magically matching indices? Something like static const struct { HKEY key; const WCHAR *long_name; const WCHAR *short_name; } keys[] = { {HKEY_LOCAL_MACHINE, {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}, {'H','K','L','M',0}}, ... }; static HKEY path_get_rootkey(const WCHAR *path) { unsigned int i; for (i = 0; i < sizeof(keys) / sizeof(*keys); i++) { if (!strcmpi(keys[i].short_name, name) || !strcmpi(keys[i].long_name, name)) return keys[i].key; } return NULL; } > + if (strncmpiW(path, short_HKEY_name[i], strlenW(short_HKEY_name[i])) == 0 || > + strncmpiW(path, long_HKEY_name[i], strlenW(long_HKEY_name[i])) == 0) I don't think strncmpi(x, y, strlen(y)) has any advantage over strcmpi(x, y). strlen just counts the number of characters to the first 0 byte, where strcmpi would stop anyway. Are you sure there is not some other behavior of CompareStringW that str(n)cmpi does not have? I have not found any, but I am not sure about the CP_ACP part. The original code probably has a bug if the user passes a string like HKEY_LOCAL_MACHINE_GARBAGE. It's worth writing a test for this. > +static HKEY path_get_rootkey(const WCHAR *path) > +{ > + if (path_get_rootkey_name(path)) > + return HKEYs[(path_get_rootkey_name(path) - long_HKEY_name[0]) / MAX_ROOT_KEY_NAME_LENGTH]; This searches the array twice. > + path = strchrW(path, '\\'); > + if (!path) > + return k; I expect that this causes trouble with RegCloseKey. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOoj8AAoJEN0/YqbEcdMwBI8P/1CgdHX0yt2Z6iZqn61fA1wt M89EKguHgXoQmorrtpMYtZJNoMd6f0kIv4yH+corcZwz01iGAuu4Zq7v3grD3SIz uv6S+QNiysw8wT5tTSFVu+DiGuxQXreb1BryjMXgmoOLbmPLPbcYX+yEj1DaiRqg gh1hXYpVoqCjKGed8Wukk+Cq481azQz41e2vUqd2pP8mux0BToWaBU8H9HufTxYg RyHYaKksstGhQLINm2FOAtq2S8eZN5TRdELcTEuQoDiE6c6YNIepLLJ5f6MiH4lt 6Biq2CUeIOhkqEWjWGzGmfom2rBq1lcSWuLnV9N7coRKdCOC+wWpeEvUBjvFTqMW JcbdZxusE3Rp80scp7YFnUBVXfOlQr4IofKkNeJkVUjoAIGOuSAcr6pHnO8KTpMI K/9nkFb/cOF8IQi6Gc3PxJxXYBBQFw578aeNpUk6QEmimXcyBvmCe/K2Oki1Qa7x CoU7MIMvtE1oSL2kN5o4yzJ+YrIZ4CGfg8yhvl9M54tWHvLMLe+Bw+5pMefwgDXP QIYCdKKIWf+hsTOJCYHLgD5wU8euvTvcgmBklI5cGivwLQqrLfZMucmnsG4jmXH4 pLdZwJsC1XXRRej13YofPzfRSZbK3pcjGwpiq7sxJTrWH05pTm+kBOGId1ChelcS jW7y6q/ecery5/13atxt =PXew -----END PGP SIGNATURE-----

4 9

Re: [PATCH 3/5] ddraw/tests: RestoreDisplayMode uses the registry mode.
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9733 Your paranoid android. === w8 (32 bit ddraw1) === ddraw1.c:1318: Test failed: Expected color 0x00ff0000 for test 0, got 0x0000ff00. ddraw1.c:1340: Test failed: Expected color 0x000000ff for test 0, got 0x0000ff00.

1 0

Re: [PATCH 2/5] d3d8/tests: The device restores the mode settings from the registry.
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9732 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000301BA, got 0002004C. device.c:3098: Test failed: Expected {0, 0, 640, 480}, got {0, 0, 800, 600}. device.c:3121: Test failed: Got unexpect width 640, expected 1024. device.c:3123: Test failed: Got unexpect height 480, expected 768. device.c:3209: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: [PATCH 1/5] d3d9/tests: The device restores the mode settings from the registry.
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9731 Your paranoid android. === w8 (32 bit device) === device.c:4008: Test failed: Expected {0, 0, 800, 600}, got {0, 0, 652, 492}.

1 0

Re: [PATCH 4/5] dwrite: Pass raw NAME table pointer to table reading code
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9730 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/5] dwrite: Cache fontface instances at factory level
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9729 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/2] ws2_32: Properly implement SO_CONNECT_TIME (try 3)
by Marvin Oct. 24, 2014

Oct. 24, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9727 Your paranoid android. === wvistau64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000 === w2008s64 (32 bit sock) === sock: unhandled exception c0000005 at 00000000 === w2008s64 (64 bit sock) === sock.c:6676: Test failed: failed to create socket 10022 sock.c:6679: Test failed: failed to create completion port 87 sock.c:6684: Test failed: WSAIoctl failed 10038 sock.c:6687: Test failed: failed to get completion status 6

1 0

Re: [PATCH] wininet: remove custom port handling in HTTP_HandleRedirect (try 2)
by Alexandre Julliard Oct. 24, 2014

Oct. 24, 2014

Daniel Lehman <dlehman(a)esri.com> writes: > HTTP_HandleRedirect updates both: > - the Host: field > - and session->hostname > > If there is a custom port, it is appended to session->hostName. This causes problems for later HttpOpenRequest/process_host_port calls that append the port to the host name (resulting in "foobar:1234:1234") > > There is already logic in HTTP_HandleRequest that will update the > request->server if the new host or port don't match. in that case, > get_server/process_host_port use the updated host and port and store > them appended in server->host_port. If they already match, > server->host_port is left untouched > > The attached change removes the current custom port logic to instead > use server->host_port to update the Host: field It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M wininet.dll -p wininet_test.exe.so http && touch http.ok http.c:693: Test failed: Wrong URL http://test.winehq.org:80/tests/hello.html http.c:693: Test failed: Wrong URL http://test.winehq.org:80/tests/hello.html make[1]: *** [http.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3dx10_43: Add stub for D3DXCpuOptimizations
by Henri Verbeet Oct. 24, 2014

Oct. 24, 2014

On 24 October 2014 00:28, André Hentschel <nerv(a)dawncrow.de> wrote: > +typedef enum _D3DX_CPU_OPTIMIZATION > +{ > + D3DX_NOT_OPTIMIZED = 0, > + D3DX_3DNOW_OPTIMIZED = 1, > + D3DX_SSE2_OPTIMIZED = 2, > + D3DX_SSE_OPTIMIZED = 3 > +} D3DX_CPU_OPTIMIZATION; I think this should be in d3dx10math.h. > + FIXME("%i - stub\n", enable); I'd like to see that as "FIXME("enable %#x stub!\n", enable);" for consistency with other D3D code, but I don't think it's a big deal.

1 0

[PATCH] mshtml: check null before release the elem object
by Hao Peng Oct. 24, 2014

Oct. 24, 2014

Check null pointer before release the script elem object, prevent to release them twice. --- dlls/mshtml/script.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

1 0

Fw:[PATCH] mlang: add gbk to Chinese Simplified codepage
by Hao Peng Oct. 24, 2014

Oct. 24, 2014

Add gbk to Chinese Simplified codepage data array in mlang, to make sure GBK encoded strings were decoded in codepage 936. --- dlls/mlang/mlang.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)

1 0

Re: [PATCH] vbscript: Implemented String
by Nikolay Sivov Oct. 23, 2014

Oct. 23, 2014

> + str = SysAllocStringLen(NULL, 1023); > + newstr = SysAllocStringLen(NULL, 1023); Where this length comes from? > + switch(V_VT(arg + 1)) { > + case VT_NULL: > + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); > + case VT_BSTR: > + str = V_BSTR(arg + 1); > + break; > + case VT_ARRAY|VT_BYREF|VT_VARIANT: > + return DISP_E_TYPEMISMATCH; > + default: > + hres = to_short(arg + 1, &tmp); > + if(FAILED(hres)) > + return hres; > + str[0] = (char)tmp; > + break; > + } You only need first character, right? Then why do you need a full BSTR pointer in VT_BSTR case? And assigning it to 'str' you leak a previously allocated buffer. Why cast to (char)tmp? > + else if(len == 0) > + newstr = '\0'; Same way you're losing pointer to allocated buffer.

2 4

Re: [PATCH 2/2] dwrite/tests: Some tests for local font file loader
by Marvin Oct. 23, 2014

Oct. 23, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9714 Your paranoid android. === wvistau64 (32 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === w2008s64 (32 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === wvistau64 (64 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057 === w2008s64 (64 bit font) === font.c:943: Test failed: got 0x88985006 font.c:945: Test failed: got 0x80070057

1 0

Re: [PATCH v3 1/6] reg.exe/tests: Parameterise error messages
by Alexandre Julliard Oct. 23, 2014

Oct. 23, 2014

Jonathan Vollebregt <jnvsor(a)gmail.com> writes: > Also use %u for DWORD instead of %d It's not worth changing that sort of thing, the expected value is in general not useful. In the tests that you are modifying you can get rid of it, otherwise leave them alone. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: [PATCH 1/3] d3d8/tests: Skip unsupported resources in test_resource_type.
by Marvin Oct. 22, 2014

Oct. 22, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9711 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3141: Test failed: Expected wndproc 0x412ba0, got 0x412ba0.

1 0

Re: dpnet: Check if DirectDplay is installed (try 4 - resend)
by Stefan Dösinger Oct. 22, 2014

Oct. 22, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I don't remember and cannot find out from the archives what happened to try 1-3. > +#include "dpnet_private.h" I think we want our test files to be stand-alone if possible. Having a copy of the code in each file or merging the test files are alternatives to giving up this independence. Though at least dlls/ntdll/tests/ntdll_test.h is an example of an existing test header. Another option is to generalize this function beyond dpnet.dll and put it in include/wine/test.h or make programs/winetest responsible for checking for stubs. I think programs/winetest is the best place, as it also handles missing DLLs. If you keep the header please rename it, along with the protection define. > +extern BOOL IsStubDLL(const char *filename) DECLSPEC_HIDDEN; You have CamelCase in there. You could also consider making this a static inline function in the header, that way you avoid dependencies between the .c files. > +/* + * Windows 8 has a concept of stub DLL's. When DLLMain is > called the user is prompted I think DLLs is the correct plural, DLL's would be the possessive. > + LPSTR data = HeapAlloc(GetProcessHeap(), 0, size); LPFOO. There are other cases on this code. > + if (VerQueryValueA(data, > "\\StringFileInfo\\040904b0\\OriginalFilename", (LPVOID*)&p, > &size)) What's 040904b0? I could not find an explanation on google, so maybe there's no way to avoid it. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUSAkhAAoJEN0/YqbEcdMw3y8QAJMwgh4rHP2iHgQV1mPkjSFR bHMv/CZynb/cd6e8of2oQybSC+iAt4e6MUPqMQCkg0CcsqcDTHf27Ci6r5q+P7Lg fTxAp2U/Vz5r77cKRejarjNueN62SBet7wDR9Bx8pIZ7+yAQDQ6H2qf5iqHOr5KU 0kjftpeKA9YUy1nuQJEf3wUUqnXEy8tZBL9UqryV6ya+HLzYdwq1SNJunH/rOaFh QQBM9CQ4HPMvj7BnGmKdQhFdssptaNYLPrK0QUCb/EyroqB0YGQ2QZsINQREKGYl y8iwjFaMkpIALtXX88UapHfPBn6jc4Y7abaEWm0ReRly1FCkMOgoPIqwLyWIunga sJalQeULE8ztPh/dseofH7mtOJyWY82JCs2l8F3iTRANwjbJCiZVE/dFJHurs8EZ 0wQ4zNH3wp1HwjYXDxOuVS2phJ9Y1SC30Cjb2jDLotg1NX/5QWLbQvn6R+S1+YV/ AkFbizAFUf6GNhnLTKMB+WC+lChc2ZF57P+H0iFixbpnW8OTNYDKiefKKQuScicE i6TgiKBTw7pWrn6h+s1GV+nILBsqzO8HqGaTLvvQUGkPKdaxjN/5HJLYQ60Xhg7P RvLSiYm0xOQNgZyoVCrGlLyiKZg7r192q+Yv9OG4AQ/GQkdeP9PahKmhu9a0WhDt xD1zmLqLy45erH4m4oa4 =Wf/H -----END PGP SIGNATURE-----

1 0

Re: [PATCH v3 1/6] reg.exe/tests: Parameterise error messages
by Stefan Dösinger Oct. 22, 2014

Oct. 22, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 These patches look reasonable to me. There are some things that are matters of opinion as far as I can see, like printing static expected values in this patch, or reusing the same buffer in patch 4-6. I left those up to Jonathan to decide. If we have written rules about those please point them out. Am 2014-10-22 18:13, schrieb Jonathan Vollebregt: > Also use %u for DWORD instead of %d > --- > programs/reg/tests/reg.c | 60 ++++++++++++++++++++++++------------------------ > 1 file changed, 30 insertions(+), 30 deletions(-) > > diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c > index 5b79aed..772d81d 100644 > --- a/programs/reg/tests/reg.c > +++ b/programs/reg/tests/reg.c > @@ -73,13 +73,13 @@ static void verify_reg_(unsigned line, HKEY hkey, const char* value, > return; > > if (todo & TODO_REG_TYPE) > - todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > + todo_wine lok(type == exp_type, "got wrong type %u, expected %u\n", type, exp_type); > else > - lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > + lok(type == exp_type, "got wrong type %u, expected %u\n", type, exp_type); > if (todo & TODO_REG_SIZE) > - todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > + todo_wine lok(size == exp_size, "got wrong size %u, expected %u\n", size, exp_size); > else > - lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > + lok(size == exp_size, "got wrong size %u, expected %u\n", size, exp_size); > if (todo & TODO_REG_DATA) > todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); > else > @@ -93,7 +93,7 @@ static void test_add(void) > DWORD r, dword, type, size; > > run_reg_exe("reg add", &r); > - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); > ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > @@ -102,7 +102,7 @@ static void test_add(void) > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > > err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); > ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); > @@ -110,36 +110,36 @@ static void test_add(void) > /* REG_SZ */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /d WineTest /f", &r); > ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > if (r == REG_EXIT_SUCCESS) > verify_reg(hkey, "", REG_SZ, "WineTest", 9, 0); > else > win_skip("broken reg.exe detected\n"); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); > > run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test2", REG_SZ, "", 1, TODO_REG_SIZE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test3 /f /d \"\"", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > verify_reg(hkey, "test3", REG_SZ, "", 1, 0); > > /* REG_DWORD */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); > ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 12345678; > if (r == REG_EXIT_SUCCESS) > verify_reg(hkey, "", REG_DWORD, &dword, sizeof(dword), 0); > @@ -148,41 +148,41 @@ static void test_add(void) > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); > todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 12345678; > verify_reg(hkey, "dword5", REG_DWORD, &dword, sizeof(dword), 0); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword6 /t REG_DWORD /D 0123 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > size = sizeof(dword); > err = RegQueryValueExA(hkey, "dword6", NULL, &type, (LPBYTE)&dword, &size); > ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); > - ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); > - ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); > + ok(type == REG_DWORD, "got wrong type %u, expected %u\n", type, REG_DWORD); > + ok(size == sizeof(DWORD), "got wrong size %u, expected %u\n", size, (unsigned int) sizeof(DWORD)); > todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), > - "got wrong data %d, expected %d\n", dword, 123); > + "got wrong data %u, expected %u\n", dword, 123); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); > - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 0xdeadbeef; > verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), > (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); > > /* REG_DWORD_LITTLE_ENDIAN */ > run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > dword = 456; > verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); > > @@ -200,7 +200,7 @@ static void test_delete(void) > const DWORD deadbeef = 0xdeadbeef; > > run_reg_exe("reg delete", &r); > - ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + ok(r == REG_EXIT_FAILURE, "got exit code %u, expected %u\n", r, REG_EXIT_FAILURE); > > err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); > ok(err == ERROR_SUCCESS, "got %d\n", err); > @@ -219,17 +219,17 @@ static void test_delete(void) > RegCloseKey(hsubkey); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "bar", NULL, NULL, NULL, NULL); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "", NULL, NULL, NULL, NULL); > todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegQueryValueExA(hkey, "foo", NULL, NULL, NULL, NULL); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); > @@ -238,7 +238,7 @@ static void test_delete(void) > RegCloseKey(hkey); > > run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); > - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); > err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); > ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); > } > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUSAPxAAoJEN0/YqbEcdMw46UP/2gJ9G9eYnhotsSlgl5S+fKw +BheiroQvKsqoCVHxw4LdunAtJDYA7i9lohaXrl+3EmMlgA/YMzwhRiZawC2Nukh 6OkZrjCYNx9V5PWNPrzAmj6wWE0UJ9QJDlm6krN9sI8KtFRG3Xaeo6qcWF/Hb3Rj S9htN0+hi5mex8v0mAEICkoISDgmfUVvHc1CF/W9wx1aNYMN1vmgdRNd4R6HrnTg rOH4AFugV5rdHHvZxfcnHg1S7k0T+uiXp7qN5o3rch2zE5yM/YXGzapMRT9OijpC rm+AntnROz4NgW3lZdR4rCOGm1dFmaP87NAAnm3o+LWioWzgV4YsalfowDxSi7L5 TTwE/+NfYhrkgFfTRywFeAdO3Yj6hQ1gLe8rwUrA2fprNxRbloLXRfsBuuzi2HHR DAndXbzLvLydu87I5DvmZKWcwvch68RqsBLDUMcyApquXNULINOLi3Wdrn7Ce4vq CLQEyUFS9Yl+IyoSOC0Xh1VXZ6tmRsJQAsOsm2DGLZpwRCSNjgmR1SBb4mM4TH0m n6010JV5apbQX0csTF3xQX7OXzYR6DT4IfkI4CndtMkUOSJfGigE6OydtaeH/+mF MGTWvJlmbG98U59fZYoCR/FmxsHHrc4clpZNkaNFH0RK/bbcUrzHRdV0A/IKAOWM MFGf31X9gvGNdeuBjqNP =vmiv -----END PGP SIGNATURE-----

1 0

Re: [PATCH 4/4] d3d8/tests: Use create_device in test_swvp_buffer.
by Marvin Oct. 22, 2014

Oct. 22, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9690 Your paranoid android. === w8 (32 bit device) === device.c:2437: Test failed: Expected foreground window 000301B8, got 0002004C. device.c:3141: Test failed: Expected wndproc 0x412ae0, got 0x412ae0.

1 0

Re: [PATCH 3/4] d3d8/tests: Use create_device for test_fpu_setup.
by Marvin Oct. 21, 2014

Oct. 21, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9689 Your paranoid android. === w8 (32 bit device) === device.c:2432: Test failed: Expected foreground window 00080166, got 0002004C. device.c:3136: Test failed: Expected wndproc 0x412b10, got 0x412b10.

1 0

Re: [PATCH 1/6] reg.exe/tests: Parameterise error messages
by Stefan Dösinger Oct. 21, 2014

Oct. 21, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-20 22:24, schrieb Jonathan Vollebregt: > - ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); > - ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); > + ok(type == REG_DWORD, "got wrong type %u, expected %u\n", type, REG_DWORD); > + ok(size == sizeof(DWORD), "got wrong size %u, expected %u\n", size, (DWORD)sizeof(DWORD)); I don't know if this is the canonical way to handle this. My gut feeling is that a cast to unsigned int would be nicer than a cast of DWORD, but I hope others can give a better answer. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURiJmAAoJEN0/YqbEcdMw3HEP/1MBp8qA+CyiaauJYQiiQ7+s Ixo1oO/cBewMzYwbqf+4luIxtWPl2v3ocRecHVrns7SRoOrLnsdfp/Tjf5pzx3GL 0mjDrXjKJCPEsY6tTTx3uHKnGhMt7coYymef4LPpZHVwYdy8DuwhCaCiZWwxY54M /apfZ3sFieiMqO4aXPAMR02mKcyPDIarLn0t2A1pJWV10iSJ1BunyM+tBNV0523B V98UknVYqlBUoqwqywbMKMCCnCCvN/Z7gtUiydodQdHlkPTgWFSwNvLTrEgSclXo 1L04NH9JzvTYlIN2oHSELNpdiZycEaBS7xTaYk0DjdnvXYG3jS/zsgYBURjnuWJr oFz86pFOnEeirvkixEfAtPy5RwKfJKvgXVKH3eP75g9pLpGJ7L5+2hS/VMYbV40O ENK4D/U41L4ldJVDo/3GQUyiU8Me0OukgIFbHS+axygKgp5YWcH7HDhAgwG3xTu9 LLeAgLnWxeQ0RHVSohPLrVVNSOlwFyLQQsc6Jh+ZbcnxetF0mFJtvVPfRfkWjzkV nC6AamdvpnZlxfrqP66VB3ZKaSScMiqvlUvP/JRRd9bto6Hp5wbnD/1g9sAV8Iyl 6cSOH44kDB5qdFg8IWr+Dsh8PpQVUai1HzBioKrDA3av6XVgV/rwCSaoRhwkdjTS MmjNbHDCXnNMlx7S7dQe =3Os0 -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/6] d3d9/tests: Use create_device in test_fpu_setup.
by Henri Verbeet Oct. 21, 2014

Oct. 21, 2014

On 20 October 2014 13:08, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -3598,20 +3604,18 @@ static void test_fpu_setup(void) > d3d9 = Direct3DCreate9(D3D_SDK_VERSION); > ok(!!d3d9, "Failed to create a D3D object.\n"); > > - memset(&present_parameters, 0, sizeof(present_parameters)); > - present_parameters.Windowed = TRUE; > - present_parameters.hDeviceWindow = window; > - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; > + device_desc.device_window = window; > + device_desc.width = 640; > + device_desc.height = 480; > + device_desc.flags = CREATE_DEVICE_HWVP_ONLY; > This essentially matches the existing code, but does the test really not work with software vertexprocessing? It seems to work for me.

2 2

Re: [PATCH 5/6] reg.exe/tests: Add REG_BINARY tests for reg add
by Stefan Dösinger Oct. 21, 2014

Oct. 21, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-20 22:24, schrieb Jonathan Vollebregt: > + // Remaining nibble prefixed C++ comments are not allowed in Wine. Otherwise this series looks good to me. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURiGjAAoJEN0/YqbEcdMwoCAP/RZB/7kV5iPt9E2yQ9f5Dr0G wlo+XleoqM8oQ87lPKT7RturEb0LAhZRWFp9IAh32CoxKyTqoMSlvCMJ1I266dXz 7CDxe7+HW8HvDziUBAM5FMKno/PXQoBoLCjx0EUXAmbTCQP9hIxWwr6knPgXsJo4 OF1PIUH3xJQ+O4/hea4EGNl2zmglkBQhYpq6Ab+jSNEd42MYHTq0x+W987ltW9eA KnrTZbXg+wAW0GIxJaZkeiwV6fKDNxbb4DbRnti1O31C7k+kzQ8nUciDVo/BpaXd FBa89MBWvuMLva7W3OcncOmTR6thOQiutS3363dNfsOrTvL1EwU9FBSNui1yl18Q y0WPmpoH4IDEhcfdcQ8gbCENQrM9ybltpRFTonSom0L0PYff1Irc2mvw7O0SGzxj a6V4oipqTkdHCwiMGEW5h05K2KMAuwq8dYTXoGgtODjLO1bm79SHKSHS7jQ6Vldd WR6rhkJKStOc/EpuPF9ls6gLcDZJsHxqoz66Qj77XQnwPrmduWtMMhty9Eg/eMMH WHZr8PrgS77nFdA4xmBqYpk8opOfTTNfBO0vjBG+l2ymBdTSYoCvzPmMtCMlcC55 aePuvqflwuvqZ7RogSa9GMkVJEEP1xHOJUWPWos95YsslCQyQox7qvOQcccPx+Nz xUeuNIXIay7SBn9EINVC =8eal -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/2] kernel32: Handle win32 hresult in FormatMessage.
by Sebastian Lackner Oct. 20, 2014

Oct. 20, 2014

On 20.10.2014 19:05, Catalin Patulea wrote: > +static LPWSTR search_message( DWORD flags, HMODULE module, UINT id, WORD lang ) > +{ > + LPWSTR from = NULL; > + if (flags & FORMAT_MESSAGE_FROM_HMODULE) > + from = load_message( module, id, lang ); > + if (!from && (flags & FORMAT_MESSAGE_FROM_SYSTEM)) { <---- [1] > + // Fold win32 hresult to its embedded error code. <---- [2] > + if (HRESULT_SEVERITY(id) == SEVERITY_ERROR && > + HRESULT_FACILITY(id) == FACILITY_WIN32) { <---- [1] > + id = HRESULT_CODE(id); > + } > + from = load_message( kernel32_handle, id, lang ); > + } > + return from; > +} > + Some small style improvement suggestions: 1) better use this style for if conditions: --- snip --- if (...) { } --- snip --- 2) Wine prefers comments using the following style --- snip --- /* ... */ --- snip --- Regards, Sebastian

1 0

Re: [PATCH 1/2] kernel32/tests: Add test for FormatMessage with HRESULT
by Sebastian Lackner Oct. 20, 2014

Oct. 20, 2014

On 20.10.2014 19:05, Catalin Patulea wrote: > > + /* Test HRESULT. It's not documented but in practice _com_error::ErrorMessage relies on this. */ > + ret = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE, h, 0x80070005 /* E_ACCESSDENIED */, > + MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), out, sizeof(out)/sizeof(CHAR), NULL); > + ok(ret != 0, "FormatMessageA returned 0\n"); > + As this test is failing on Wine you should mark it with "todo_wine", to avoid introducing test failures. Patch 2 which fixes the issue should remove the "todo_wine" again.

1 0

Re: secur32/test: Switch requested protocol from SSL3 to TLS1.
by Marvin Oct. 20, 2014

Oct. 20, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9643 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] vbscript: Implemented String
by Piotr Caban Oct. 20, 2014

Oct. 20, 2014

On 10/19/14 17:44, Shuai Meng wrote: > + newstr = SysAllocStringLen(NULL, 1023); You need to allocate correct length string. First argument should be used here. You're also leaking the string in error-handling paths. > + > + switch(V_VT(arg + 1)) { > + case VT_NULL: > + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); > + case VT_BSTR: > + str = V_BSTR(arg + 1); > + break; > + case VT_ARRAY|VT_BYREF|VT_VARIANT: > + return DISP_E_TYPEMISMATCH; > + default: > + hres = to_short(arg + 1, &tmp); > + if(FAILED(hres)) > + return hres; > + str[0] = (char)tmp; Please add a test with second argument larger then 256. It would be also interesting to see a test with second argument being BSTR with first character out of ASCII range. Please also check what happens if V_BSTR(arg+1)==NULL. > + hres = to_short(arg, &len); > + if(FAILED(hres)) > + return hres; > + if(len < 0) > + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); > + else if(len == 0) > + newstr = '\0'; > + else if(len > 1023) > + len = 1023; I guess that first argument is probably an integer. The length of produced string is probably also not limited to 1023 characters. Thanks, Piotr

2 1

Re: [v5 03/12] reg.exe: Add REG_MULTI_SZ tests for reg add
by Stefan Dösinger Oct. 20, 2014

Oct. 20, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > + /* REG_MULTI_SZ */ > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi0 /t REG_MULTI_SZ /d \"three\\0little\\0strings\" /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + memcpy(buffer, "three", 6); > + memcpy(buffer+6, "little", 7); > + memcpy(buffer+6+7, "strings", 8); > + buffer[21] = 0; > + verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, 22, TODO_REG_SIZE); I think this shoudl work as well: const char buffer[] = "three\0little\0strings\0"; verify_reg(hkey, "multi0", REG_MULTI_SZ, buffer, sizeof(buffer), TODO_REG_SIZE); Notice the [] to declare an array so sizeof returns the proper value. strlen will not work. > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#randomgibberish\" /d \"three#little#strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"\" /d \"three#little#strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"##\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"two##strings\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); > + run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_MULTI_SZ /v multi4 /s \"#\" /d \"#a\" /f", &r); > + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); What about the following cases? /s ABC /d threeABClittleABCstrings /s \\0 /d three\\0little\\0strings -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURR9NAAoJEN0/YqbEcdMw/6UP/Rs7diy+TUkZDbJq2x3JyZYZ c+YK2Z9PoWNs3oTvwvVtaxrVqSX1y0fVnGEpNixGEMbo5fae7/rm9fN5WqvI+1FW RWG0ViCpJ4EduNVhORtHmMGzhqQAAGlfuEF0fthSshynaD8MirwPMW5LzBVTK/A8 zhI0wvveQElhscEoYtaZOkuI5WZzzKnjGpuGtserx31B41ClASEpR/MiU4XJD78p OvqaPotzlbQermrte9B+ZWcxjjVyrsM2fToVbXMNhtBDyDy17uG1Lpr8lQrXL85J uFYpVFiYoRf7CCHrhY2Gx8H7AsHwc8W0LDlnvlIKk6yRWnzyQuSzQJVbFNzBAy9u wBlQ6kZjMJzvaGCk9el5MXiwgN6Vs2bHa3j/8qvrzQyaGNebiZA7QLaXUXOqXpb6 De6/ev8iyTD1cyFwVootQBAsb40HKBk24ZwmP0sp+j3seJUlzR37ve/R71avexWL uheZ9Xj5xeBm0G3JJQ3C0cxUYo+f22t9gDLbKtOa+5BcRskjtmgHjEHEzZs33T8F BcXhGtAyL99XwXh73ILHg321pjkTu1sWzd9ILigVz6mYmOJzZp/L4Azy6E3W/U7j GHkT46Ag7/aUN4BTR5MieySdFtAQ9pbdYI1FRMBINie2Ny9AC71UrDYtFpNQuzaN C4BbMES4ZXNJQuGSHs33 =iJxu -----END PGP SIGNATURE-----

2 2

Re: [v5 01/12] reg.exe: Fix wrong error message in reg add DWORD test
by Stefan Dösinger Oct. 20, 2014

Oct. 20, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); > todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), > - "got exit code %d, expected 0\n", r); > + "got exit code %d, expected 1\n", r); r is a DWORD, which is an unsigned value, so %u is the correct format to print it. There's not much point in printing the expected value. One can look it up by looking at the source file. Having the expected value twice only asks for inconsistencies like the one you're fixing here. If you want to print the expected value I'd prefer something like this: todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u, expected %u\n", r, REG_EXIT_SUCCESS); or maybe todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected REG_EXIT_SUCCESS(%d)\n", r, REG_EXIT_SUCCESS); That way you don't hardcode the numerical value of REG_EXIT_SUCCESS. I recommend sending smaller patchsets, e.g. in your case send the tests, and once they are in, send the implementation changes. The tests make sense on their own, and that way you don't flood wine-patches too much. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURSKoAAoJEN0/YqbEcdMwgVsP/0rEoBVYlB3zoP979b5q4Wbw U0Y+ilARyJ4vAoeVKlJtQ8xLxg2Mej6vYvCx5fve6cq6pokUbfrHBpEgBNsjx7gq AI88t8CSDYnpFBGpDYRVDdwq5enLP0cJKOZHb7pVIR5+1JIbDW/RxA3eLGmbvLsE EU8nGiSEzYuRwKMy4XfuMFCG1oPRIzg2WO+8ckneJ+P2ZYDmNVWv1sxcuitAm7Lr g6pq5CwN1Y1agzPHd45W10/hPTnD9ViqaSQgHIpXs47urElL6z1nRb3bgwKAVeBf 9KA9qm12F+zqNoEc9cTHPdnjjOHM7LgQFTmWJDNdZSiXDKMvqZAldRkuI2cAp4jX tRFYSeUlNk3KDLnJ5msINwRklatovSBbUizHY/D+YhCJVU1aRIKsebJ0zOFrVoUp 2UBbtfBembEOr917aXngNlpZzKPbwPGpm+wyBum7q8OU19CN5X8/WqXZVhms3QAU bchyP9EnX6SjnHiZn4XE0gC8ABj5LeS24/Zgtfm/T19FT7NL00U49pis+F8RMim8 kthoNp2YO+rpzcvQjaWvBMQlCtecpZx2f9b9x/lfAxd+fMVDGjsVxFcp5V7OipJG 1pdISvYtwOqrlgqiy1Bm4q9vX47y+qDmM1NnAvfBcDkkE/hk+QaCQo+MjAW1W/Bm 7DS30tdCw2E6+XWdk/Du =Xz8b -----END PGP SIGNATURE-----

1 0

Re: [v5 02/12] reg.exe: Add REG_EXPAND_SZ tests for reg add
by Stefan Dösinger Oct. 20, 2014

Oct. 20, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-10-17 20:38, schrieb Jonathan Vollebregt: > + /* REG_EXPAND_SZ */ > + run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + verify_reg(hkey, "expand0", REG_EXPAND_SZ, "dead%PATH%beef", 15, TODO_REG_SIZE); Is there really no observable difference between REG_SZ and REG_EXPAND_SZ? The MSDN description suggests that the behavior you observe here is correct, but I wonder what REG_EXPAND_SZ is good for in this case, other than just an elaborate way to set a flag that says "please call ExpandEnvironmentStrings". -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJURRrSAAoJEN0/YqbEcdMwsFMP/0KQ0ZQxOe5pwDcAX2h2B1tI peMiCJsmb8AwNru1qNjfwEZ/cU5Y7JvDmue3AQqkHKenkyyu5dYw1ItWmsTYW1z/ mRqK7R7/v6frRzPr1iMT4+8MKYVuiPxkgCPHQsMWQGfYBhLk3xVLq/ev64+paLw3 09GjgVWY5JS+vChI+4WX8T0+WS0mmmnbp/+QZb/z3jfNZvYEDXaNFmkITwROfaif ftuYS5VJL70UUxHvHcx6ctcexwnga0ka+voCVFRK/yALLesTB01+eYkn9bgVYVPl O4UC3INvMJsfdDd3KhFJSh/RZBHKn/4TyKQDu0DZDeMJMx/l8Q22TxsutsR5de+L BLQhrxzHVirrBkBrOwc5GCrpdBU0NpQX8mBW/E9kISzFlCHbtWa97F2gqCw6rnaA BU3430R+6aolQ3E47y4CdMZA5I7sIbTa5EdXJdkshExuMDS1V8xph2N/JCttzNPh QczIL7NAHekm+5W/DvuC4wx9jajmiQ/ol4Jr140h48SaEKL97/tWkoXTF/UmtqPi k7kaY3zqTNUyrLAQxarERVy3tZkicRMimvTCLbAFTZ4g86JgU9vjNYRbdbGS/fwr e0bsk8k3C1vtARYi+pYIbHQaQrzAE+/dR3caMVsXf08PTfituRQjlCqgb637Uf43 5iX8bhy6U/mdi9xIUn5W =7z6c -----END PGP SIGNATURE-----

1 0

Re: [PATCH 6/6] d3d8/tests: Use create_device in test_swvp_buffer.
by Marvin Oct. 20, 2014

Oct. 20, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9637 Your paranoid android. === w8 (32 bit device) === device.c:2438: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3142: Test failed: Expected wndproc 0x412ae0, got 0x412ae0.

1 0

Re: [PATCH 5/6] d3d8/tests: Use create_device for test_fpu_setup.
by Marvin Oct. 20, 2014

Oct. 20, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9636 Your paranoid android. === w8 (32 bit device) === device.c:2435: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3139: Test failed: Expected wndproc 0x412b30, got 0x412b30.

1 0

Re: [PATCH 4/6] d3d8/tests: Update create_device to match d3d9.
by Marvin Oct. 20, 2014

Oct. 20, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9635 Your paranoid android. === w8 (32 bit device) === device.c:2423: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3130: Test failed: Expected wndproc 0x412e30, got 0x412e30.

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly
by Nikolay Sivov Oct. 19, 2014

Oct. 19, 2014

On 10/19/2014 20:01, Dan Bassi wrote: > Hi Nikolay. In uTorrent, the Treeview box on the left doesn't update > under Wine unless the box is clicked (whereas under Windows, it > updates automatically without clicking). > > I later traced the error to the "item_changed()" function in > comctl32/treeview.c, which was (incorrectly) detecting the text as > never having changed. This patch seems to fix that behaviour. > > Please let me know your thoughts. Many thanks. What I mean is that we need more tests in comctl32/tests/treeview.c to prove that patch is correct. The fact that it fixes some case with some application is not enough. > > On Sun, Oct 19, 2014 at 4:49 PM, Nikolay Sivov <bunglehead(a)gmail.com > <mailto:bunglehead(a)gmail.com>> wrote: > > On 10/19/2014 18:44, Dan Bassi wrote: > > + /* Old text is a null pointer due to HeapAlloc() failing, > therefore unable to perform strcmpW so assume text has changed */ > + if (!tiOld->pszText) > + return TRUE; > + > > I don't think you should necessary assume it's changed. > > /* Text has changed and it's not a callback */ > - if ((tvChange->mask & TVIF_TEXT) && (tiOld->pszText != > tiNew->pszText) && > + if ((tvChange->mask & TVIF_TEXT) && > (strcmpW(tiOld->pszText, tiNew->pszText) != 0) && > tiNew->pszText != LPSTR_TEXTCALLBACKW) > return TRUE; > > This is wrong, you can't compare if it's a special callback value. > > + originalItem.pszText = HeapAlloc(GetProcessHeap(), 0, > originalItem.cchTextMax * sizeof(WCHAR)); > > Normally comctl32 code uses Alloc()/Free() functions. > > This patch needs tests first, those tests should cover all > possible combinations regarding callback cases, different pointers > but same data, > same data but different pointers, maybe something else. > > >

1 0

Re: [PATCH] vbscript: Implemented String
by Marvin Oct. 19, 2014

Oct. 19, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9624 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: comctl32: Use strcmpW instead of pointer comparison to ensure treeview updates correctly
by Nikolay Sivov Oct. 19, 2014

Oct. 19, 2014

On 10/19/2014 18:44, Dan Bassi wrote: > + /* Old text is a null pointer due to HeapAlloc() failing, therefore unable to perform strcmpW so assume text has changed */ > + if (!tiOld->pszText) > + return TRUE; > + I don't think you should necessary assume it's changed. > /* Text has changed and it's not a callback */ > - if ((tvChange->mask & TVIF_TEXT) && (tiOld->pszText != tiNew->pszText) && > + if ((tvChange->mask & TVIF_TEXT) && (strcmpW(tiOld->pszText, tiNew->pszText) != 0) && > tiNew->pszText != LPSTR_TEXTCALLBACKW) > return TRUE; This is wrong, you can't compare if it's a special callback value. > + originalItem.pszText = HeapAlloc(GetProcessHeap(), 0, originalItem.cchTextMax * sizeof(WCHAR)); Normally comctl32 code uses Alloc()/Free() functions. This patch needs tests first, those tests should cover all possible combinations regarding callback cases, different pointers but same data, same data but different pointers, maybe something else.

1 0

Re: wined3d: Correctly display fog for right-handed projection matrix (try 7)
by Stefan Dösinger Oct. 18, 2014

Oct. 18, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, This one looks good to me. Am 2014-10-12 17:08, schrieb Joachim Priesner: > + enum > + { > + COLOR_ALPHA_0x00 = 0x00000000, > + COLOR_CLEAR = 0xffff00ff, > + COLOR_FOGGED = 0x0000ff00, > + COLOR_UNFOGGED = 0x00ff0000 > + }; > + > + /* Fill the null-shader entry with the FVF (SetVertexShader is "overloaded" on d3d8). */ > + DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR, 0, 0}; Do you need the specular color on Windows as well, or to make this work right on Wine? I suspect that the NONE/NONE test doesn't work right on Wine because we do not set a controlled fog coordinate in wined3d/state.c, load_vertex_data(), in the case where WINED3D_FFP_SPECULAR is absent and similarly in drawprim.c, drawStridedSlow(). In either case that's no reason to hold up this patch any longer IMHO. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUOp0lAAoJEN0/YqbEcdMwgD4P/iLeSfFbE/jEsJ+Yux1lR9PC FDoJ50dxiedieOJWl4TbvIgr5uNyXnBm9YtPiiLgZJNfwoJ2znYjYDsA4h2yZ8FU lrgHwWcAo1ZvlPS0QolSYfx7QH4TpGIKklfEr7Qe4LQgftJjHNGioDuK1zpT+E3e JjcZOXDKjOP4ACNu5awEBq9v427TxOT9E+GJQWrq/cxbCYRbDurFwuFS2Jb1o/j+ 9zEoy8qiaQ+6v0j8+RcAkBTMdg6DBwSOYsH7P/KjrnzUkj+yH1w+R9dcnHMdaeMP RRoJSLsGzfANXF05vn7vE5Q5QzOjhXtIWWL/yun/IAL/EofZrXyVikoGP28wxUV1 QBICfDUvel4dhnYxNzNGUMQXC7gaXmJI3q12gemhkX4vj2W/FxVIaSN7vr5j+5rp 2ijdi9rexyBopbDM/9ay599GSNjXrTljkv8sEH23JMIpKR2BP7afyih6Hta9e/zf Ao9LtFwyBye2F9HTyM9G10MBrnVdNIKhJ9ZY30bRhomtXrfP1HuRvvpfRPja9gjZ M/aiwqPM6a3vfdJ/kIOra72vNZAoE9ccEOuDPQqMhg2ccoYvLUg6+LGvKRLanmOO lCsKiFYUChwJlebbo98+bfhMiR7TBI5fkwXOxR4coDu9jIl1oP2GblaL5Sul+zg1 rXbnkL2Pltlb/ZaW33l0 =Ozzv -----END PGP SIGNATURE-----

3 6

Re: [PATCH 1/3] kernel32: Support UTF-7 in MultiByteToWideChar. (try 3)
by Michael Stefaniuc Oct. 17, 2014

Oct. 17, 2014

Hello Alex, I'll have a go at reviewing your patches as Alexandre didn't take them as is. On 10/13/2014 05:54 AM, Alex Henrie wrote: > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c I'm pulling this diff chunk to the front as it is wrong and some of your code is over-complicated based on that assumption. > @@ -1963,7 +2119,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla > * flags [I] Character mapping flags > * src [I] Source string buffer > * srclen [I] Length of src (in bytes), or -1 if src is NUL terminated > - * dst [O] Destination buffer > + * dst [O] Destination buffer, or NULL to compute the required length > * dstlen [I] Length of dst (in WCHARs), or 0 to compute the required length The only case where dst == NULL is when dstlen == 0 but that already implies computing the required length. dst == NULL and dstlen != 0 is an error and MultiByteToWideChar() bails out. > @@ -1954,6 +1954,162 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPAGE_ENUMPROCW lpfnCodePageEnum, DWORD fla > > > /*********************************************************************** > + * write_to_w_string > + * > + * Helper for utf7_mbstowcs > + * > + * RETURNS > + * TRUE on success, FALSE on error > + */ > +static inline BOOL write_to_w_string(WCHAR *dst, int dstlen, int *index, WCHAR character) This isn't a good name for the helper as that's not what it does. It is more a "count and optionally write". Also prefixing it utf7 would make it clear that is just a helper for utf7_mbstowcs and not a generic function and thus would remove the need for the comment that it is just a helper for utf7_mbstowcs. I know you're using this helper to avoid code duplication between the length calculation and the conversion unlike wine_utf8_mbstowcs(). But it complicates the handling of available space in dst. Without seeing the code for both approaches I'm not sure what is best so I'll review it as is. > +{ > + if (dst) You have to force dst = NULL in utf7_mbstowcs() for this to work. Just checking for dstlen > 0 should avoid that. > + { > + if (*index >= dstlen) > + return FALSE; > + > + dst[*index] = character; > + } > + > + (*index)++; > + > + return TRUE; > +} > + > +/*********************************************************************** > + * utf7_mbstowcs > + * > + * UTF-7 to UTF-16 string conversion, helper for MultiByteToWideChar > + * > + * RETURNS > + * On success, the number of characters written > + * On dst buffer overflow, -1 What about the case where it fails to decode a character? E.g. wine_utf8_mbstowcs() has -2 for that case which then translates to SetLastError(ERROR_NO_UNICODE_TRANSLATION). I looked at the tests but you didn't seem to test the GetLastError in the cases with the invalid input characters. > + */ > +static int utf7_mbstowcs(const char *src, int srclen, WCHAR *dst, int dstlen) > +{ > + static const WCHAR base64_decoding_table[] = { Why is this table an array of WCHAR? The entries aren't WCHARs. > + /* \0 */ -1, /* \x01 */ -1, /* \x02 */ -1, /* \x03 */ -1, This table is really hard to read even in a editor that does syntax highlighting. As you just need 4 characters per column you could have sixteen columns and merge the comments to one comment at the end of the line. Something like this would be more readable as well as being more compact: -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00 - 0x15 */ .... /* '0' - '?' */ > + /* \x04 */ -1, /* \x05 */ -1, /* \x06 */ -1, /* \a */ -1, > + /* \b */ -1, /* \t */ -1, /* \n */ -1, /* \v */ -1, > + /* \f */ -1, /* \r */ -1, /* \x0E */ -1, /* \x0F */ -1, > + /* \x10 */ -1, /* \x11 */ -1, /* \x12 */ -1, /* \x13 */ -1, > + /* \x14 */ -1, /* \x15 */ -1, /* \x16 */ -1, /* \x17 */ -1, > + /* \x18 */ -1, /* \x19 */ -1, /* \x1A */ -1, /* \e */ -1, > + /* \x1C */ -1, /* \x1D */ -1, /* \x1E */ -1, /* \x1F */ -1, > + /* */ -1, /* ! */ -1, /* " */ -1, /* # */ -1, > + /* $ */ -1, /* % */ -1, /* & */ -1, /* ' */ -1, > + /* ( */ -1, /* ) */ -1, /* * */ -1, /* + */ 62, > + /* , */ -1, /* - */ -1, /* . */ -1, /* / */ 63, > + /* 0 */ 52, /* 1 */ 53, /* 2 */ 54, /* 3 */ 55, > + /* 4 */ 56, /* 5 */ 57, /* 6 */ 58, /* 7 */ 59, > + /* 8 */ 60, /* 9 */ 61, /* : */ -1, /* ; */ -1, > + /* < */ -1, /* = */ -1, /* > */ -1, /* ? */ -1, > + /* @ */ -1, /* A */ 0, /* B */ 1, /* C */ 2, > + /* D */ 3, /* E */ 4, /* F */ 5, /* G */ 6, > + /* H */ 7, /* I */ 8, /* J */ 9, /* K */ 10, > + /* L */ 11, /* M */ 12, /* N */ 13, /* O */ 14, > + /* P */ 15, /* Q */ 16, /* R */ 17, /* S */ 18, > + /* T */ 19, /* U */ 20, /* V */ 21, /* W */ 22, > + /* X */ 23, /* Y */ 24, /* Z */ 25, /* [ */ -1, > + /* \ */ -1, /* ] */ -1, /* ^ */ -1, /* _ */ -1, > + /* ` */ -1, /* a */ 26, /* b */ 27, /* c */ 28, > + /* d */ 29, /* e */ 30, /* f */ 31, /* g */ 32, > + /* h */ 33, /* i */ 34, /* j */ 35, /* k */ 36, > + /* l */ 37, /* m */ 38, /* n */ 39, /* o */ 40, > + /* p */ 41, /* q */ 42, /* r */ 43, /* s */ 44, > + /* t */ 45, /* u */ 46, /* v */ 47, /* w */ 48, > + /* x */ 49, /* y */ 50, /* z */ 51, /* { */ -1, > + /* | */ -1, /* } */ -1, /* ~ */ -1, /* \x7F */ -1 > + }; > + > + const char *source_end = src + srclen; > + int dest_index = 0; > + > + DWORD byte_pair = 0; > + short offset = 0; > + > + /* MultiByteToWideChar guarantees that srclen > 0 */ > + assert(srclen > 0); This assert isn't needed. Just rewriting the first do..while loop to a while loop avoids it. That eliminates 3 lines of code of which one is a comment pointing to an unneeded assert. > + > + if (!dstlen) > + dst = NULL; Unneeded if the helper just checks for dstlen > 0. > + > + do Should be just "while (src < source_end)" to avoid the assert from above. > + { > + if (*src == '+') > + { > + src++; /* skip the + sign */ > + if (src >= source_end) > + break; > + > + if (*src == '-') > + { > + /* just a plus sign escaped as +- */ > + if (!write_to_w_string(dst, dstlen, &dest_index, '+')) > + return -1; > + src++; > + continue; > + } > + > + do > + { > + WCHAR sextet = *src; Same as for base64_decoding_table, sextet is not a WCHAR. > + if (sextet == '-') > + { > + /* skip over the dash and end base64 decoding */ > + /* the current, unfinished byte pair is discarded */ > + src++; > + offset = 0; > + break; > + } > + else if (sextet <= 127) > + { > + sextet = base64_decoding_table[sextet]; > + if (sextet == (WCHAR)-1) Unneeded cast. Using a signed type for sextet also avoids the -Wsign-compare compiler warning. Alternatively use ~0 instead of -1 if you want to keep an unsigned type. > + { > + /* -1 means that the next character of src is not part of a base64 sequence */ This upper part of the comment is better placed in the declaration of base64_decoding_table. > + /* in other words, all sextets in this base64 sequence have been processed */ > + /* the current, unfinished byte pair is discarded */ > + offset = 0; > + break; > + } > + } > + else > + { > + /* the next character of src is > 127 and therefore not part of a base64 sequence */ > + /* the current, unfinished byte pair is NOT discarded in this case */ > + /* this is probably a bug in Windows */ > + break; > + } > + > + byte_pair = (byte_pair << 6) | sextet; > + offset += 6; > + > + if (offset >= 16) > + { > + /* this byte pair is done */ > + if (!write_to_w_string(dst, dstlen, &dest_index, (byte_pair >> (offset - 16)) & 0xFFFF)) > + return -1; > + offset -= 16; > + } > + > + /* this sextet is done */ > + src++; > + } while (src < source_end); > + } > + else > + { > + /* we have to convert to unsigned char in case *src > 127 */ > + if (!write_to_w_string(dst, dstlen, &dest_index, (unsigned char)*src)) > + return -1; > + src++; > + } > + } while (src < source_end); > + > + return dest_index; > +} > + > +/*********************************************************************** > * MultiByteToWideChar (KERNEL32.@) > * > * Convert a multibyte character string into a Unicode string. bye michael

3 7

reg.exe platform specific test?
by Jonathan Vollebregt Oct. 17, 2014

Oct. 17, 2014

In the reg.exe tests around line 181: > verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), > (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); What's the reason for this? Is there some platform specific quirk I should be aware of?

4 4

Re: Italian translation of Wine
by Matteo Bruni Oct. 17, 2014

Oct. 17, 2014

2014-10-16 11:19 GMT+02:00 Davide Pizzetti <erpizzo(a)alice.it>: > This is an updated patch for the Italian translation of Wine. > Hi Davide, Please bear with me, but: @@ -30,7 +34,6 @@ msgid "&Install..." msgstr "&Installa..." #: appwiz.rc:65 -#, fuzzy #| msgid "" #| "The following software can be automatically removed. To remove a program " #| "or to modify its installed components, select it from the list and click " I still think you should remove those "#| msgid" lines when removing the fuzzy tags. If the program you're using to update the .po file doesn't help you with that, you might have to do it by hand by opening the .po file in a plain text editor. @@ -1682,11 +1682,11 @@ msgstr "Autenticazione del client" #: crypt32.rc:140 msgid "Code Signing" -msgstr "Firma codice" +msgstr "Firma del codice" #: crypt32.rc:141 msgid "Secure Email" -msgstr "Email sicura" +msgstr "E-mail sicura" #: crypt32.rc:142 msgid "Time Stamping" I don't like those changes, they seem mostly gratuitous to me (there are others similar instances below). If you're changing the "email" translation, make sure to be consistent. In general I'd avoid adding more stuff to this patch on each iteration, first get this patch in and then you can work on another one with more string translations. @@ -1834,7 +1834,7 @@ msgstr "Altro nome=" #: crypt32.rc:186 msgid "Email Address=" -msgstr "Indirizzo Email=" +msgstr "Indirizzo mail=" This looks wrong. @@ -2861,7 +2855,7 @@ msgstr "" #: cryptui.rc:127 msgid "Protects e-mail messages" -msgstr "Protegge messaggi e-mail" +msgstr "Protegge i messaggi mail" Same. @@ -4800,7 +4785,7 @@ msgstr "Nessuno spegnimento in corso.\n" #: winerror.mc:1381 msgid "I/O device error.\n" -msgstr "Errore I/O dell'unità.\n" +msgstr "Errore I/O del dispositiov.\n" #: winerror.mc:1386 This is still wrong. #: netstat.rc:48 msgid "Reset Connections" -msgstr "Connessione LAN" +msgstr "Resetta le connessioni" This means "Connessioni resettate". You can use "chiuse" instead, or probably even "annullate" as you wrote in another message translation. @@ -13103,7 +13080,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"La configurazione di Wine in %s è in aggiornamento, aspetta un momento..." +"La configurazione di Wine in %s sta venendo aggiornata, aspetta un momento..." I prefer the previous translation.

3 4

Re: server: Fix invalid memory access when copying KeyNameInformation data.
by Austin English Oct. 17, 2014

Oct. 17, 2014

On Thu, Oct 16, 2014 at 11:13 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=37411 for me. > > --- > server/registry.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Works here as well, thanks for the fix. -- -Austin

2 1

todo_wine under the hood
by Jonathan Vollebregt Oct. 17, 2014

Oct. 17, 2014

I was looking at verify_reg_() in programs/reg/tests/reg.c:61 and noticed some simple if statements: > if (todo & TODO_REG_TYPE) > todo_wine lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > else > lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); > if (todo & TODO_REG_SIZE) > todo_wine lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > else > lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); > if (todo & TODO_REG_DATA) > todo_wine lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); > else > lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); Simple enough, except if I pass TODO_REG_TYPE to this function it never even tries the size or data blocks. While this makes sense to implement (You can't test the data if you don't know it's size) I have no idea *how* it does it. I've tried the obvious - the mask values don't overlap in a way that would cause it to fallthrough. The lok and todo_wine macros don't have anything in them that returns. In fact the todo_wine macro appears to start a loop for some reason and all in all I'm very confused as to how exactly it's doing this. I'm curious as to how this works under the hood. I also need to stick a broken() in there somewhere but every time I do it falls through, and I don't want to rewrite the entire verify_reg_() function for a single exception. (If you're interested, reg add a REG_BINARY with an odd number of characters prefixes a 0 nibble, but suffixes it in XP)

2 4

Re: [PATCH 3/5] d3d9/tests: Add style and size tests for D3DCREATE_NOWINDOWCHANGES.
by Henri Verbeet Oct. 17, 2014

Oct. 17, 2014

On 16 October 2014 17:07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c > index 11fe091..34b967a 100644 > --- a/dlls/d3d9/tests/d3d9ex.c > +++ b/dlls/d3d9/tests/d3d9ex.c > @@ -37,6 +37,7 @@ struct device_desc > unsigned int width; > unsigned int height; > BOOL windowed; > + DWORD behavior_flags; > }; > I don't like this much, I'd probably prefer "windowed" and "behavior_flags" to be merged into a single flags field and then have flags along the lines of e.g. CREATE_DEVICE_FULLSCREEN, CREATE_DEVICE_NOWINDOWCHANGES, CREATE_DEVICE_SWVP_ONLY, etc.

2 1

Re: server: KeyNameInformation returns the full name of the key. (try 3)
by Austin English Oct. 16, 2014

Oct. 16, 2014

On Mon, Oct 13, 2014 at 10:25 AM, Akihiro Sagawa <sagawa.aki(a)gmail.com> wrote: > Try 3: > - Avoid allocating memory. (Based on Alexandre's comment, thanks.) > - Use k != root_key instead of k->namelen != 0. > - Add insufficient buffer test. > > --- > dlls/ntdll/tests/reg.c | 19 ++++++++++++++----- > server/registry.c | 25 ++++++++++++++++++++++++- > 2 files changed, 38 insertions(+), 6 deletions(-) > Hi Akihiro, This change breaks the tests on my machine (causing wineserver to crash and the ntdll/reg test to fail), see https://bugs.winehq.org/show_bug.cgi?id=37411 Could you please take a look? Thanks, -Austin

1 1

Wine Gecko 2.34-beta2
by Jacek Caban Oct. 16, 2014

Oct. 16, 2014

Hi all, I uploaded new beta2 Wine Gecko builds. I believe that it makes sense to have another beta this time, because beta1 was off the tip. This week Firefox 34 entered beta stage and I merged its changes made upstream meantime. To test it, use the attached patch or my Wine fork [1]. It should work out of box as soon as [2] is committed. Until then, you may download the package manually [3]. I will be mostly away next week. If all goes well, I will merge Mozilla beta and release new Wine Gecko in about two weeks. All testing is appreciated. If you find any regression, please let me know. Thanks, Jacek [1] http://repo.or.cz/w/wine/wine-gecko.git [2] http://source.winehq.org/patches/data/107093 [3] https://sourceforge.net/projects/wine/files/Wine%20Gecko/2.34-beta2/

1 0

d3d focus patches
by Stefan Dösinger Oct. 16, 2014

Oct. 16, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Matteo, I have attached the current state of my focus handling patches. They are more readable than the last ones and contain additional tests, but they're not finished yet. I hope they help with the gamma restore handling. I'd be interested to know if they pass for you on Windows. Especially d3d9ex has unreliable / buggy behavior on my Windows boxes. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJUPtvBAAoJEN0/YqbEcdMw6JoP/jIUtgxta1SubRejbBz6lVS3 +CXS5WFNV8Kpc1fKpK6VRqs+HHNy7fH55zXAuw3KCzIarh7JPPjrgP2U4pSzuaHa fH2cWhysMbxK2tKRD0VHiZY696H/rpGgqFVwxusQuB/+Pzeqe7wpSOFOJ2QGUWqb GuAm4YFRfNdXaSQ94c4NBMU+a4N+TcXuI7YDus3WDcDIASAUnMs3i3NCmh/0IxI0 wrIfuY1szbVqI+qs6eGeN0TzTcRgEC9QHrevwdOyE7OsiN7z850wKX0k/zHxuHCl BazHk6JS0i0r3r9V+6NmUVCAqmplY93Kr04hHWxJDMWIilIxvVHs62m+wEBg+pDC LBTVlJhh28fPNAM6pPqrTUeAKnNGXwd+bevGrjl1035+qokKsj2VbIL6TnP2vDKo APORCXZ7INPp8c4EVIKHex60N2+Ec+Y8CWruUtn/UIJeMue2dgKxEq/FY5c4otWn Xu2OIUe/76cWG1tNxsTp6QhauYCW/JlteBKkyNnt/Wj/1I2LkQ8PxKEwNNCF9sbq +0oQIbLH0TRO5qU4uNAiKzPhFY4Sgy6RfMZpNpyQLSm0rT7bXeIb/EnF0Isklkaz t++UztQ/1A5ZjfeH235sPuyJ61YUTFgLfFG5swZcyZTdtTa0gymG4Ku9G1P018TU gwUbjaw/QqYKJsmEcjFK =Y/QI -----END PGP SIGNATURE-----

3 4

Re: [PATCH 2/5] d3d8/tests: Port the applicable parts of the new unsupported shaders tests to d3d8.
by Marvin Oct. 16, 2014

Oct. 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9559 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3128: Test failed: Expected wndproc 0x412e30, got 0x412e30.

1 0

Re: [PATCH 1/5] d3d9/tests: Port the unsupported shaders test to D3D9Ex.
by Marvin Oct. 16, 2014

Oct. 16, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9558 Your paranoid android. === w8 (32 bit device) === device.c:2421: Test failed: Expected foreground window 000B00CA, got 0002004C. device.c:3078: Test failed: Expected wndproc 0x412c60, got 0x412c60.

1 0

Re: Italian translation of Wine
by Matteo Bruni Oct. 15, 2014

Oct. 15, 2014

2014-10-15 15:55 GMT+02:00 Davide Pizzetti <erpizzo(a)alice.it>: > This is the patch that improves the Italian translation of Wine. > Davide > Thank you for the translation! I do have some comments though. @@ -187,8 +188,8 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine non ha trovato un pacchetto Gecko, necessario ad applicazioni che " -"incorporano HTML per funzionare correttamente. Wine lo può scaricare e " +"Wine non è riuscito a trovare un pacchetto Mono, che è necessario ad " +"applicazioni .NET per funzionare correttamente. Wine lo può scaricare e " "ad" doesn't sound right. Maybe "per"? Or something like "per far sì che applicazioni .NET funzionino correttamente". @@ -868,7 +869,7 @@ msgstr "Il file non esiste" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "La selezione contiene un oggetto non in una cartella" That's not what the original message means. I don't have a nice translation for it though... @@ -3579,33 +3570,30 @@ msgstr "Errore di sintassi" #: jscript.rc:37 msgid "Expected ';'" -msgstr "Richiesto ';'" +msgstr "Previsto ';'" I'd probably prefer "Atteso", here and in the other similar messages. @@ -3613,7 +3601,7 @@ msgstr "Costante stringa non terminata" #: jscript.rc:44 msgid "'return' statement outside of function" -msgstr "" +msgstr "dichiarazione 'return' al di fuori della funzione" A nitpick, but 'return' is not a declaration. I would simply go for "Istruzione". @@ -4785,10 +4769,9 @@ msgid "No Unicode translation.\n" msgstr "Nessuna traduzione Unicode.\n" #: winerror.mc:1366 -#, fuzzy #| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "Inizializzazione DLL fallita.\n" +msgstr "Inizializzazione del DLL fallita.\n" Another one that's probably arguable, but I prefer the previous translation here. If you really want to add the preposition, that clearly wants the feminine form - yeah I know foreign words don't have a gender in Italian :P FWIW you use the feminine form with "DLL" later on in the patch. A general comment, I think it's best if you also remove the old, commented out, msgid when you fix those fuzzy translations. @@ -4800,7 +4783,7 @@ msgstr "Nessuno spegnimento in corso.\n" #: winerror.mc:1381 msgid "I/O device error.\n" -msgstr "Errore I/O dell'unità.\n" +msgstr "Errore I/O del dispositiov.\n" Typo. #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "ondeggiante" "ondeggiante" sounds quite bad. Not sure what would be the right translation here though... "galleggiante" would be the most direct translation but it doesn't seem right either. Maybe "mobile" or something? #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "attraversabile" "attraversato" #: oleacc.rc:127 -#, fuzzy #| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Protetto da scrittura.\n" +msgstr "protetto\n" You should drop the \n here. #: urlmon.rc:43 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"Quando installato, un componente ActiveX ha un accesso completo al tuo " +"computer. Non installarlo finché non ne hai una fiducia assoluta." "finché" doesn't seem appropriate. I'd go with "a meno che". @@ -9737,14 +9690,13 @@ msgid "" "CD <directory> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "" -"CD <dir> è la versione ridotta di CHDIR. Cambia la cartella\n" +"CD <director> è la versione ridotta di CHDIR. Cambia la cartella\n" "predefinita attuale.\n" Typo. @@ -9810,7 +9761,9 @@ msgstr "" "Il comando FOR è usato per eseguire un comando per ciascuno di un set di " "files.\n" "\n" -"Sintassi: FOR %variabile IN (set) DO comando\n" +"Sintassi: FOR %variable IN (set) DO comando\n" +"\n" +"Il segno % dev'essere ripetuto quando si utilizza FOR in un file batch.\n" "%variabile" was probably on purpose. #: netstat.rc:56 -#, fuzzy #| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Errore di decodifica" +msgstr "Ricevi gli errori" That message means "Errori di ricezione". @@ -11095,7 +11026,7 @@ msgid "" msgstr "" "Il file '%s' non esiste.\n" "\n" -"Creare un nuovo file?" +"Vuoi creare un nuovo file?" Arguable, but I preferred the impersonal form of the previous translation. #: winecfg.rc:226 -#, fuzzy #| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configurazione di Wine" +msgstr "Configurazione dell'unità di memorizzazione di massa" Maybe simply "Configurazione dischi"? I do like the general tone of your translations. Thank you again!

1 0

Re: [PATCH 4/4] dwrite: Implement HasCharacter()
by Marvin Oct. 15, 2014

Oct. 15, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9549 Your paranoid android. === wvistau64 (32 bit font) === font.c:676: Test failed: got 0x80004002 === w2008s64 (32 bit font) === font.c:676: Test failed: got 0x80004002 === wvistau64 (64 bit font) === font.c:676: Test failed: got 0x80004002 === w2008s64 (64 bit font) === font.c:676: Test failed: got 0x80004002

1 0

Re: [PATCH 3/4] dwrite: Added one more test for system font collection
by Marvin Oct. 15, 2014

Oct. 15, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9548 Your paranoid android. === wvistau64 (32 bit font) === font.c:665: Test failed: got 0x80004002 === w2008s64 (32 bit font) === font.c:665: Test failed: got 0x80004002 === wvistau64 (64 bit font) === font.c:665: Test failed: got 0x80004002 === w2008s64 (64 bit font) === font.c:665: Test failed: got 0x80004002

2 1

Re: [3/3] msvcrt: Added _fflush_nolock() implementation
by Piotr Caban Oct. 15, 2014

Oct. 15, 2014

Hi, On 10/09/14 19:52, Iván Matellanes wrote: > +/********************************************************************* > + * _fflush_nolock (MSVCRT.@) > + */ > +int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) > +{ > + if(!file) { > + msvcrt_flush_all_buffers(MSVCRT__IOWRT); There's one more thing that looks strange here. msvcrt_flush_all_buffers calls MSVCRT_fflush internally. That causes some streams to get locked and unlocked. Could you please add a test that checks how native behaves here? I'm not sure if we should lock any FILE's in a _nolock function variant. Thanks, Piotr

2 2

Re: Updated the Italian .po file of Wine
by Nikolay Sivov Oct. 15, 2014

Oct. 15, 2014

On 10/14/2014 04:48 PM, Davide Pizzetti wrote: > I just updated the Italian translation of Wine. > Davide > > > Hi, Davide. Thank you for your contribution, but you need to do one more step to these changes accepted into Wine - changes should be sent in a diff format. That means you need to fetch Wine git repo, update translations and generate a patch that will contain your changes only, not the whole po-file. Whole process is described here http://wiki.winehq.org/SubmittingPatches, if you have any question after reading this wiki article feel free to ask them on wine-devel mailing list.

1 0

Re: [PATCH 2/4] d3d9/tests: Avoid mode changes in d3d9ex' test_lost_device.
by Marvin Oct. 15, 2014

Oct. 15, 2014

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=9532 Your paranoid android. === w8 (32 bit d3d9ex) === d3d9ex.c:1276: Test failed: Got unexpected hr 0. d3d9ex.c:1278: Test failed: Got unexpected hr 0. d3d9ex.c:1280: Test failed: Got unexpected hr 0. d3d9ex.c:1282: Test failed: Got unexpected hr 0.

3 3