- wine-devel - winehq.org

Re: [PATCH 4/5] xaudio2: Add a simple audio streaming test
by Marvin 28 Aug '15

28 Aug '15

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=16389 Your paranoid android. === build (build) === Unable to regenerate dlls/xaudio2_7/Makefile Unable to regenerate dlls/xaudio2_7/Makefile

1 0

Re: [PATCH 5/5] d3d11/tests: Add test for 2D texture interfaces.
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); > + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); > + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); You don't need the Release(), if the QueryInterface() would succeed the test would fail. > + if (FAILED(hr)) > + { > + skip("2D textures do not implement ID3D10Texture2D, skipping tests.\n"); This should probably be a win_skip(). You're leaking the device here. > + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); > + ok(SUCCEEDED(hr), "%u: Failed to create a 2d texture, hr %#x.\n", i, hr); > + if (FAILED(hr)) continue; ... > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); > + ok(SUCCEEDED(hr), "%u: Texture should implement IDXGISurface.\n", i); > + if (SUCCEEDED(hr)) IDXGISurface_Release(surface); ... > + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); > + ok(SUCCEEDED(hr), "%u: Texture should implement ID3D10Texture2D.\n", i); > + if (SUCCEEDED(hr)) > + { Similar to above, you don't need to account for conditions where the test would fail.

1 0

Re: [PATCH 4/5] d3d11/tests: Port test_create_texture2d() from d3d10core.
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static ID3D11Device *create_default_device(void) > +{ > + ID3D11Device *device; > + > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, > + &device, NULL, NULL))) > + return device; > + > + return NULL; > +} > + I think I'd make the "feature_level" parameter to the existing create_device() a pointer, and then make it optional. See also e.g. create_device() in dlls/d3d9/tests/device.c.

1 0

Re: [PATCH 3/5] d3d11: Implement d3d11_device_CreateTexture2D().
by Henri Verbeet 28 Aug '15

28 Aug '15

On 28 August 2015 at 00:39, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +static inline struct d3d10_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) > +{ > + return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D11Texture2D_iface); > +} > + We usually try to keep these in the file that contains the interface implementation, texture.c in this case. We do make the occasional exception though. > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > + if (!object) You could just do "if (!(object = HeapAlloc(...)))" here, but it doesn't matter that much. > @@ -2006,15 +2025,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa > { > struct d3d_device *device = impl_from_ID3D10Device(iface); > D3D11_TEXTURE2D_DESC d3d11_desc; > + ID3D11Texture2D *d3d11_texture; > struct d3d10_texture2d *object; > HRESULT hr; > > TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture); > > - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > - if (!object) > - return E_OUTOFMEMORY; > - > d3d11_desc.Width = desc->Width; > d3d11_desc.Height = desc->Height; > d3d11_desc.MipLevels = desc->MipLevels; > @@ -2026,16 +2042,14 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa > d3d11_desc.CPUAccessFlags = d3d11_cpu_access_flags_from_d3d10_cpu_access_flags(desc->CPUAccessFlags); > d3d11_desc.MiscFlags = d3d11_resource_misc_flags_from_d3d10_resource_misc_flags(desc->MiscFlags); > > - if (FAILED(hr = d3d10_texture2d_init(object, device, &d3d11_desc, data))) > - { > - WARN("Failed to initialize texture, hr %#x.\n", hr); > - HeapFree(GetProcessHeap(), 0, object); > + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &d3d11_desc, > + (const D3D11_SUBRESOURCE_DATA *)data, &d3d11_texture))) > return hr; > - } > > + object = impl_from_ID3D11Texture2D(d3d11_texture); > *texture = &object->ID3D10Texture2D_iface; > > - TRACE("Created ID3D10Texture2D %p\n", object); > + TRACE("Created ID3D10Texture2D %p.\n", object); > > return S_OK; > } This change doesn't really seem worth it. You do save a couple of lines by avoiding the memory allocation, but you need to make impl_from_ID3D11Texture2D() available outside of texture.c to do it. You could create a d3d_texture2d_create() function similar to e.g. d3d9_swapchain_create() in d3d9 and avoid the duplication that way, but it may not make much of a difference in line count. Up to you.

1 0

Re: [PATCH 5/5] d3d11/tests: Add test for 2D texture interfaces.
by Marvin 28 Aug '15

28 Aug '15

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=16380 Your paranoid android. === w7u (32 bit d3d11) === d3d11.c:360: Test failed: 0: Texture should implement ID3D10Texture2D. d3d11.c:352: Test failed: 2: Failed to create a 2d texture, hr 0x8007000e. === w8 (32 bit d3d11) === d3d11.c:360: Test failed: 0: Texture should implement ID3D10Texture2D.

2 1

Re: ieframe: Fixed random test failures.
by Marvin 28 Aug '15

28 Aug '15

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=16383 Your paranoid android. === w2000pro (32 bit webbrowser) === webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2972: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2977: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE

1 0

What would the best approach for adding securing Wine and is it a reasonable goal?
by Steven Stewart-Gallus 28 Aug '15

28 Aug '15

Hello, I noticed that CreateRestrictedToken basically just duplicates the token and doesn't do anything. This makes sense as Wine is implemented as a compatibility library and program loader and not as a virtual machine and Windows programs running on Wine can break out and access Linux system calls so making CreateRestrictedToken do anything more wouldn't accomplish anything. I think it would be really cool though if CreateRestrictedToken and similar sandboxing APIs actually accomplished something in Wine though. What would the best approach for securing Wine be and is it a reasonable goal? First, see http://wiki.winehq.org/SecuringWine. So far, I can think of a few approaches. The first approach is to make a whole operating system such as ReactOS. The second approach is making a whole operating system that only has device drivers for working on top of virtual machines or hypervisors. The third approach is making a kernel that runs as a normal user process on top of a full OS (similar to User-Mode Linux or a weekend project I am working on at https://gitlab.com/sstewartgallus/wum, also see the Chrome sandbox at https://www.chromium.org/developers/design-documents/sandbox, https://code.google.com/p/chromium/wiki/LinuxSandboxing and https://dev.chromium.org/developers/design-documents/sandbox/osx-sandboxing…). The fourth approach is to abandon securing Wine itself and simply run Wine programs inside separate sandboxes. ReactOS already serves as an example of the first approach. The second approach is basically similar to ReactOS. My project at https://gitlab.com/sstewartgallus/wum serves as a tiny example of of the third approach might work. The fourth approach of separate sandboxes is actually very simple. One possible implementation of this fourth approach on Linux might be to use a script like the sandbox-X.sh script shown below and remove the Z: symlink in dosdevices (this isn't actually needed or improves security but just looks nice.) Note that to make this script work I had to do some configuration to let my automatically su into the sandbox account. As well, I also had to download a dummy Xorg configuration to the home directory of the sandbox account. Thank you, Steven Stewart-Gallus sandbox-X.sh: #! /bin/sh set -e set -C set -u exec su -l -c 'exec sh <&3' sstewartgallus-sandbox 3<<'EOF' set -e set -C set -u exec 3<&- export DISPLAY=':76' export XPRA_SOCKET_DIR='/tmp' exec xpra\ start\ ${DISPLAY}\ --xvfb="Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./${DISPLAY}.log -config ./xorg.conf"\ "--no-daemon"\ "--mmap-group"\ "--no-sharing"\ "--bell"\ "--system-tray"\ "--xsettings"\ "--cursors"\ "--encoding=rgb"\ "--clipboard"\ --start-child=xterm

2 1

Re: [1/3] comdlg32: Implement open dropdown menu.
by Marvin 27 Aug '15

27 Aug '15

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=16371 Your paranoid android. === wvistau64 (64 bit itemdlg) === No test summary line found

1 0

Re: Winelib and C++ static initialization
by Luke Dunstan 27 Aug '15

27 Aug '15

On Thu, 27 Aug 2015 at 00:44 Stefan Dösinger <stefandoesinger(a)gmail.com> wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi, > > You dropped the wine-devel CC. Was that intentional? There are people > who have more clues about winelib than I do. > No, it was accidental, sorry. > > >> I found that OutputDebugStringA doesn't write anything here, > >> even if successful. I replaced it with printf calls to get > >> actual output. > > > > OK, but why exactly is this necessary? This is just an artificial > > example to demonstrate the general problem. > I looked into the source code of OutputDebugStringA, but I couldn't find > an obvious answer. It certainly does a lot more than just write a string > to STDOUT. I didn't really understand what it was doing. > Yes, it sends the message to the attached debugger if any, not to stdout. On Windows or Wine you can run SysInternals DbgView.exe to see it. It's just an example though, and many other APIs also crash when called from initialisers. >> Though it's not quite working here either: > > > > Any ideas why, or how it could be fixed? > Sorry, no idea :-( . > > > Yes. My hope was that Winelib could be used to help port a legacy > > Windows CE 4.x application to Linux (ARM, though I am testing on > > x86 right now). Initially I could try compiling on Windows and > > running it on Linux, but the real goal would be to port the > > application in stages, so changing a few modules at a time to use > > Linux APIs while leaving some parts using the Win32 (and MFC) APIs. > > Eventually there would be no need for Winelib but I'd expect that > > porting all of the code at once would resulting in a lot more > > debugging effort because changes would not be localised. > Hmm yeah, that sounds like a task where you need winelib. Unfortunately > winelib isn't something that gets used a lot, and even less so with C++. > > Also keep in mind that Wine doesn't target Windows CE applications, so > you'll have to invest a lot of time into bridging Windows CE <-> Win32 > differences. > Yes I understand, but fortunately most of the application also runs on normal Win32. You'll also have to compile MFC with Winelib to target ARM. It should > be possible to compile MFC (or at least parts of it) with winelib, but > I don't expect this to be easy either. > That's true, and that was actually the first thing I tried to do. I tried both static and dynamic libraries but it crashes before it gets to WinMain(), hence my question. GDB can trap the crash but the stack trace gives no function names or other useful information. (gdb) bt #0 0x00000000 in ?? () #1 0x7ec4b7c0 in ?? () #2 0x7ec4b77e in ?? () #3 0x7ec4b79e in ?? () #4 0xb7febd77 in ?? () Backtrace stopped: previous frame inner to this frame (corrupt stack?) Winedbg cannot even get that far. But I will try 1.7... Luke

2 1

Re: [2/4] comdlg32: Implement open dropdown menu.
by Alexandre Julliard 27 Aug '15

27 Aug '15

Vincent Povirk <madewokherd(a)gmail.com> writes: > This implements the open dropdown button as a separate button, rather > than using BS_SPLITBUTTON, which is unimplemented in Wine. This adds > some complexity, but I don't think it changes things enough to get in > the way of other work on this component. > > I have an implementation using BS_SPLITBUTTON that works on Windows, > and could theoretically be used once we have support for window class > redirection and BS_SPLITBUTTON. I will send that to wine-devel so you > can see how much complexity this approach adds, and what the correct > approach will look like. It breaks the tests: ../../../tools/runtest -q -P wine -T ../../.. -M comdlg32.dll -p comdlg32_test.exe.so itemdlg && touch itemdlg.ok itemdlg.c:2088: Test succeeded inside todo block: got 0x00000000. itemdlg.c:2089: Test succeeded inside todo block: got 0. Makefile:270: recipe for target 'itemdlg.ok' failed make: *** [itemdlg.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] dxgi/tests: Add a Test presentation parameter combinations.
by Marvin 26 Aug '15

26 Aug '15

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=16348 Your paranoid android. === wvistau64 (32 bit device) === device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 12. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 13. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 19. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 24. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 25. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 27. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 28. device.c:1173: Test failed: Got usage 160, expected 60, test 28, buffer 1. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 29. device.c:1173: Test failed: Got usage 160, expected 60, test 29, buffer 2. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 35. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 36. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 40. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 41. device.c:1173: Test failed: Got usage 160, expected 60, test 41, buffer 15. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 42. === w2008s64 (32 bit device) === device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 12. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 13. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 19. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 35. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 36. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 42. === w7u (32 bit device) === device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 24. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 25. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 27. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 28. device.c:1173: Test failed: Got usage 160, expected 60, test 28, buffer 1. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 29. device.c:1173: Test failed: Got usage 160, expected 60, test 29, buffer 2. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 35. device.c:1173: Test failed: Got usage 160, expected 60, test 35, buffer 1. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 36. device.c:1173: Test failed: Got usage 160, expected 60, test 36, buffer 2. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 40. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 41. device.c:1173: Test failed: Got usage 160, expected 60, test 41, buffer 15. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 42. device.c:1173: Test failed: Got usage 160, expected 60, test 42, buffer 15. === w8 (32 bit device) === device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 24. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 25. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 27. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 28. device.c:1173: Test failed: Got usage 160, expected 60, test 28, buffer 1. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 29. device.c:1173: Test failed: Got usage 160, expected 60, test 29, buffer 2. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 35. device.c:1173: Test failed: Got usage 160, expected 60, test 35, buffer 1. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 36. device.c:1173: Test failed: Got usage 160, expected 60, test 36, buffer 2. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 40. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 41. device.c:1173: Test failed: Got usage 160, expected 60, test 41, buffer 15. device.c:1128: Test failed: Got unexpected hr 0x87a0001, test 42. device.c:1173: Test failed: Got usage 160, expected 60, test 42, buffer 15. === wvistau64 (64 bit device) === device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 12. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 13. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 19. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 35. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 36. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 42. === w2008s64 (64 bit device) === device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 12. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 13. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 19. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 35. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 36. device.c:1128: Test failed: Got unexpected hr 0x887a0001, test 42.

1 0

Re: [PATCH 4/5] d3d8/tests: Test presentation parameter combinations.
by Marvin 26 Aug '15

26 Aug '15

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=16347 Your paranoid android. === w8 (32 bit device) === device.c:1216: Test failed: TestCooperativeLevel failed, hr 0x88760868. device.c:1261: Test failed: Reset failed, hr 0x88760868. device.c:1263: Test failed: TestCooperativeLevel failed, hr 0x88760869. device.c:1267: Test failed: Got unexpected value 0 for D3DRS_LIGHTING. device.c:1274: Test failed: D3DVIEWPORT->X = 10, expected 0. device.c:1275: Test failed: D3DVIEWPORT->Y = 20, expected 0. device.c:1276: Test failed: D3DVIEWPORT->Width = 400, expected 800. device.c:1277: Test failed: D3DVIEWPORT->Height = 300, expected 600. device.c:1278: Test failed: D3DVIEWPORT->MinZ = 2.00000003e-001, expected 0. device.c:1279: Test failed: D3DVIEWPORT->MaxZ = 3.00000012e-001, expected 1. device.c:1284: Test failed: Screen width is 640, expected 800. device.c:1285: Test failed: Screen height is 480, expected 600. device.c:1291: Test failed: Back buffer width is 640, expected 800. device.c:1293: Test failed: Back buffer height is 480, expected 600. device.c:1323: Test failed: Screen width is 640, expected 1024. device.c:1324: Test failed: Screen height is 480, expected 768. device.c:2571: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2576: Test failed: The focus window is active. device.c:2584: Test failed: Got unexpected hr 0x88760869. device.c:2590: Test failed: Got unexpect screen size 800x600. device.c:2605: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2614: Test failed: Got unexpect screen size 800x600. device.c:2627: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2635: Test failed: Got unexpect width 640. device.c:2636: Test failed: Got unexpect height 480.

1 0

Re: [PATCH 5/5] dxgi/tests: Add a Test presentation parameter combinations.
by Henri Verbeet 26 Aug '15

26 Aug '15

On 26 August 2015 at 21:50, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + wc.lpfnWndProc = DefWindowProcA; > + wc.lpszClassName = "dxgi_test_wc"; > + RegisterClassA(&wc); Do we really need that?

1 0

Winelib and C++ static initialization
by Luke Dunstan 26 Aug '15

26 Aug '15

Hi, I am new to Winelib and I have crashes with very basic C++ code. Consider the following code: #include <windows.h> struct MyInit { MyInit() { OutputDebugStringA("Init ctor\n"); } }; MyInit InitObj; extern "C" int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { OutputDebugStringA("WinMain()\n"); return 0; } If I compile it on Ubuntu 32-bit with wine-1.6.2 with: wineg++ -c -mno-cygwin -o hello.o hello.cpp wineg++ -mwindows -mno-cygwin -o hellocpp.exe hello.o The result is: $ ./hellocpp.exe Segmentation fault (core dumped) On Windows this program obviously outputs "Init ctor\n" followed by "WinMain()\n", as viewed in DbgView. Removing the call to OutputDebugStringA from the static constructor prevents the crash in Winelib. How do I get C++ static initialization to work properly in Winelib? Thanks, Luke

2 1

Re: [1/2] msi: Don't add the same environment string more than once.
by Marvin 26 Aug '15

26 Aug '15

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=16331 Your paranoid android. === w7u (32 bit action) === The test timed out === w8 (32 bit action) === The test timed out === wvistau64 (64 bit action) === The test timed out

1 0

Re: [PATCH 3/3] kernel32/tests: Add tests for Invariant
by Alexandre Julliard 26 Aug '15

26 Aug '15

Daniel Lehman <dlehman(a)esri.com> writes: > + { X(LOCALE_SNATIVEDIGITS), "0123456789" }, > + { X(LOCALE_SCURRENCY), "" }, Please avoid non-ASCII characters in source code. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/2] reg: simplify root key search
by Stefan Dösinger 26 Aug '15

26 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Something is still wrong with the submission: $ git am ~/Desktop/\[PATCH\ 1_2\]\ reg\:\ simplify\ root\ key\ search\ -\ Michel\ Zou\ \<xantares09\(a)hotmail.com\>\ -\ 2015-08-25\ 2150.eml Applying: reg: simplify root key search /home/stefan/src/wine/.git/rebase-apply/patch:33: trailing whitespace. static const WCHAR short_hklm[] = {'H','K','L','M',0}; /home/stefan/src/wine/.git/rebase-apply/patch:34: trailing whitespace. static const WCHAR short_hkcu[] = {'H','K','C','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:35: trailing whitespace. static const WCHAR short_hkcr[] = {'H','K','C','R',0}; /home/stefan/src/wine/.git/rebase-apply/patch:36: trailing whitespace. static const WCHAR short_hku[] = {'H','K','U',0}; /home/stefan/src/wine/.git/rebase-apply/patch:37: trailing whitespace. static const WCHAR short_hkcc[] = {'H','K','C','C',0}; error: patch failed: programs/reg/reg.c:22 error: programs/reg/reg.c: patch does not apply Patch failed at 0001 reg: simplify root key search It looks like the patch has Windows line endings, but AFAIK that shouldn't break git am. I strongly recommend to use git send-email to make git send the patches directly to the SMTP server instead of going through text files and MUAs. That avoids issues like that pretty reliably. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV3as6AAoJEN0/YqbEcdMwEfYP/1ibDcxPQ9VF6tKyfQKVeuVW cC1rFbAbbXdWPxALIiJa/qEz/3DKV4j1tIvU68GA6SE5gh4XLsVfH1Li66PX3KQy 6ytqG263r677dDxjTPIJHOTsl4ncFvCVHkVz3cn9zBLM3G6V8BLeL4rCVFq1Wso0 pNS5abhVQNzDTY+gLG2oh9XqtLuI2oAmF6YO/VklVKF8pVwN50RX7FXJuGwlhScn +6GvzOLrkirbTL1jKW+v+4BZ22CjzGRZPVMGPlmgGIdyexVjoG8nAlfvLoH6+Qds 6WQatGcHFNnJjE275Snl9EjnspfedMLcYWspbbC7IsWDvdMrt8LawUGDOyZsqxzC yUYnMHNaotC7K0FpqHG+OKTRgrJy8dX10xSkTAhj6FtLj49BFhNb7hWsqc3T//g6 GlcmCYxWXNmseOt5t5E/v4eb9XowBab9Mv4zNU8sFZWlfUvbv3vMnhfzjslZnHNY h+yBR9OQZiKInPsHxW3wsuIIt0xBjPE1RHUac9vfPc031PvjqYulQ2PfQkUyljo2 vHwqCU6i9S8Y2INd7PwOggoHqE9SKMFvaRg9Tf5vOiG9YQHtaTWHj+xgQsb5DRxd QWV+uK0gZW2UX0ozxzrCK2Kd5mEhTRd/dVZK75/ALoprf2r7aqU7gS+4aQYActlL LIk5K82tvISRR7QdN0KN =cTjQ -----END PGP SIGNATURE-----

2 1

Re: [PATCH v2 2/2] ucrtbase: Hook up some functions with new names to existing implementations
by Alexandre Julliard 26 Aug '15

26 Aug '15

Martin Storsjo <martin(a)martin.st> writes: > These are some functions that on a first glance seem to have a > matching signature even though the exact symbol name isn't the > same as in msvcr120. It would be better to create a separate function, unless there is strong evidence that they are doing the exact same thing. For example, I expect that there's a reason for having both malloc and malloc_base; mapping them to the same function would make any difference hard to spot. -- Alexandre Julliard julliard(a)winehq.org

2 2

FW: [PATCH 2/2] kernel32: add Invariant string table wrc: add support for LANG_INVARIANT
by Daniel Lehman 25 Aug '15

25 Aug '15

-----Original Message----- From: wine-patches [mailto:wine-patches-bounces@winehq.org] On Behalf Of Daniel Lehman Sent: Monday, August 24, 2015 12:27 PM To: 'wine-patches(a)winehq.org' Subject: [PATCH 2/2] kernel32: add Invariant string table wrc: add support for LANG_INVARIANT I noticed this was marked as "Superseded". What is it superseded by? https://source.winehq.org/patches/data/113923 (I also noticed the subject got messed up, so I can resubmit if needed) thanks daniel

2 1

Re: user32: Fix error handling in {Begin,End,}DeferWindowPos() to match Windows behavior (resend)
by Sebastian Lackner 25 Aug '15

25 Aug '15

I also think moving the tests to an existing test file would be better, but here a few additional comments: On 25.08.2015 15:08, Rodrigo Rivas wrote: > diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in > index 7149dc8..982b0fe 100644 > --- a/dlls/user32/tests/Makefile.in > +++ b/dlls/user32/tests/Makefile.in > @@ -9,6 +9,7 @@ C_SRCS = \ > cursoricon.c \ > dce.c \ > dde.c \ > + defer.c \ > dialog.c \ > edit.c \ > generated.c \ > diff --git a/dlls/user32/tests/defer.c b/dlls/user32/tests/defer.c > new file mode 100644 > index 0000000..eb63384 > --- /dev/null > +++ b/dlls/user32/tests/defer.c > @@ -0,0 +1,168 @@ > +/* > + * Unit tests for DeferWindowPos > + * > + * Copyright 2015 Rodrigo Rivas Costa > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > + */ > + > +#include "windows.h" > + > +#include "wine/test.h" > + > + > +#define WIDTH_CHILDREN 50 > +#define NCHILDREN 3 > +#define IDX_FAIL 1 > + > +static HINSTANCE g_hInstance; This is not a DLL, so theoretically no need to use a static variable for that. The overhead of calling GetModuleHandle multiple times should be very small. > +static HWND hChildren[NCHILDREN]; > + > +static void ExpectY(HWND hwnd, int y) > +{ > + RECT r; > + POINT p; > + GetWindowRect(hwnd, &r); > + p.x = r.left; > + p.y = r.top; > + MapWindowPoints(NULL, GetParent(hwnd), &p, 1); > + ok(p.y == y, "Window has not been properly moved: %d != %d\n", (int)p.y, y); I didn't test it, but there should be no need to explicitly cast here. > +} Such a helper function will make it complicated to track down test failures. In this case the code doesn't look too long, so you could directly duplicate it into the individual test functions. The alternative would be to pass the line number to the function, and then use ok_(...) instead. You can take a look at existing tests how to do that. > + > +static void TestDeferWindowPos(int posY) You could split each test function into a separate patch (failing tests marked with "todo_wine"), and then send the fix as a forth patch at the end. It is not strictly necessary, but it would probably be easier for reviewing. > +{ > + int i; > + BOOL res; > + HDWP hdwp; > + > + hdwp = BeginDeferWindowPos(1); > + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + { > + HWND h = hChildren[i]; > + hdwp = DeferWindowPos(hdwp, h, NULL, i*WIDTH_CHILDREN, posY, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOACTIVATE); > + ok(hdwp != NULL, "DeferWindowPos failed\n"); > + } > + res = EndDeferWindowPos(hdwp); > + ok(res, "EndDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + ExpectY(hChildren[i], posY); > +} > + > +static void TestBogusDeferWindowPos(int posY) > +{ > + int i; > + BOOL res; > + HDWP hdwp; > + > + hdwp = BeginDeferWindowPos(1); > + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + { > + HDWP hnext; > + HWND h = hChildren[i]; > + if (i==IDX_FAIL) The style (missing spaces inbetween) is a bit inconsistent here, and also at a couple of places below. > + h = (HWND)0; //Insert an error. This is not a valid HWND. C++ Style comments are not allowed in Wine source. Also, you can use NULL instead of casting 0 to a HWND. > + hnext = DeferWindowPos(hdwp, h, NULL, i*WIDTH_CHILDREN, posY, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOACTIVATE); > + if (i==IDX_FAIL) > + { > + DWORD err = GetLastError(); > + ok(hnext == NULL, "DeferWindowPos accepted a bogus HWND\n"); > + ok(err == ERROR_INVALID_WINDOW_HANDLE, "Bogus HWND should return ERROR_INVALID_WINDOW_HANDLE, got %d\n", (int)err); Also no need to explicitly cast here. > + } > + else > + { > + ok(hnext != NULL, "DeferWindowPos failed\n"); > + hdwp = hnext; > + } > + } > + res = EndDeferWindowPos(hdwp); > + ok(res, "EndDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + { > + if (i != IDX_FAIL) > + ExpectY(hChildren[i], posY); > + } > +} > + > +static void TestDestroyDeferWindowPos(int posY) > +{ > + int i; > + BOOL res; > + HDWP hdwp; > + > + hdwp = BeginDeferWindowPos(1); > + ok(hdwp != NULL, "BeginDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + { > + HWND h = hChildren[i]; > + hdwp = DeferWindowPos(hdwp, h, NULL, i*WIDTH_CHILDREN, posY, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOACTIVATE); > + ok(hdwp != NULL, "DeferWindowPos failed\n"); > + /* Destroying a window after DeferWindowPos but before EndDeferWindowPos should be silently ignored */ > + if (i == IDX_FAIL) > + DestroyWindow(h); > + } > + res = EndDeferWindowPos(hdwp); > + ok(res, "EndDeferWindowPos failed\n"); > + for (i = 0; i < NCHILDREN; ++i) > + { > + if (i != IDX_FAIL) > + ExpectY(hChildren[i], posY); > + } > +} > + > +static LRESULT CALLBACK TestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) > +{ > + switch (msg) > + { > + case WM_CREATE: > + { > + int i; > + int posY = 0; > + for (i=0; i < NCHILDREN; ++i) > + { > + hChildren[i] = CreateWindowExA(0, "Button", NULL, WS_CHILD|WS_VISIBLE, > + i*WIDTH_CHILDREN, posY, WIDTH_CHILDREN, WIDTH_CHILDREN, > + hWnd, NULL, g_hInstance, NULL); > + } > + > + TestDeferWindowPos(++posY); > + TestBogusDeferWindowPos(++posY); > + TestDestroyDeferWindowPos(++posY); If possible you should move those calls outside of the TestWndProc. > + } > + break; > + } > + return DefWindowProcA(hWnd, msg, wParam, lParam); > +} > + > +START_TEST(defer) > +{ > + WNDCLASSEXA cls; > + ATOM acls; > + > + g_hInstance = GetModuleHandleA(NULL); > + memset(&cls, 0, sizeof(cls)); > + cls.cbSize = sizeof(cls); > + cls.lpfnWndProc = TestWndProc; > + cls.hInstance = g_hInstance; > + cls.lpszClassName = "TestWnd"; > + > + acls = RegisterClassExA(&cls); > + > + HWND hWnd = CreateWindowExA(0, MAKEINTRESOURCEA(acls), "TestWnd", WS_OVERLAPPEDWINDOW, You can't declare a variable in the middle of a function (should give you a warning while compiling). > + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, > + NULL, NULL, g_hInstance, NULL); > + ok(hWnd != NULL, "CreateWindowEx failed\n"); > +} > diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c > index f92a3dc..7cb3a4f 100644 > --- a/dlls/user32/winpos.c > +++ b/dlls/user32/winpos.c > @@ -2349,6 +2349,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, > > hwnd = WIN_GetFullHandle( hwnd ); > if (is_desktop_window( hwnd )) return 0; > + if (!IsWindow( hwnd )) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return 0; > + } > > if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; > if (pDWP == OBJ_OTHER_PROCESS) > @@ -2418,7 +2423,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) > { > DWP *pDWP; > WINDOWPOS *winpos; > - BOOL res = TRUE; > int i; > > TRACE("%p\n", hdwp); > @@ -2430,20 +2434,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) > return FALSE; > } > > - for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++) > + for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++) > { > TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", > winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y, > winpos->cx, winpos->cy, winpos->flags); > > if (WIN_IsCurrentThread( winpos->hwnd )) > - res = USER_SetWindowPos( winpos ); > + USER_SetWindowPos( winpos ); > else > - res = SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); > + SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos ); > } > HeapFree( GetProcessHeap(), 0, pDWP->winPos ); > HeapFree( GetProcessHeap(), 0, pDWP ); > - return res; > + return TRUE; > }

2 1

comdlg32: itemdlg split button implementation
by Vincent Povirk 25 Aug '15

25 Aug '15

These patches apply on top of my series that implements the open dropdown menu in the common item dialog, based on BS_SPLITBUTTON. They work in my testing on Windows, but they do not yet work on Wine because BS_SPLITBUTTON is unimplemented. This is mostly to show how to do this properly (and hopefully make the case that the deficiency won't hinder development in the mean time), but if I'm not around when BS_SPLITBUTTON is implemented, I consider this a contribution to Wine under the LGPL just like anything I send to wine-patches. I'm interested in feedback in terms of whether this is as correct and clean as it could be, but it's sort of academic until Wine has the necessary architecture to support it.

1 0

Re: [3/3] ddraw: Implement DDENUMSURFACES_CANBECREATED flag in ddraw7_EnumSurfaces.
by Stefan Dösinger 25 Aug '15

25 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-25 um 11:17 schrieb Sebastian Lackner: > + if (match_flags != DDENUMSURFACES_MATCH) > + return DDERR_INVALIDPARAMS; Personally I prefer if the code writes WARN messages if it returns an error. > + memcpy(&testdesc, DDSD, sizeof(testdesc)); Technically you should honor DDSD.dwSize. Most likely the correct behavior is to return an error if the size doesn't match sizeof(DDSURFACEDESC) in IDirectDraw and IDirectDraw2 or sizeof(DDSURFACEDESC2) in IDirectDraw4 and 7. > + if (!(testdesc.dwFlags & DDSD_WIDTH)) > + { > + testdesc.dwFlags |= DDSD_WIDTH; > + testdesc.dwWidth = 512; > + } > + if (!(testdesc.dwFlags & DDSD_HEIGHT)) > + { > + testdesc.dwFlags |= DDSD_HEIGHT; > + testdesc.dwHeight = 512; > + } Does it inject any caps or pixelformat if they aren't set? Does it fall back to DDSCAPS_SYSTEMMEMORY if you don't request a location and whatever pixel format or size you request isn't supported? > + hr = IDirectDraw7_CreateSurface(iface, &testdesc, &surface, NULL); > + if (SUCCEEDED(hr)) > { > ... > + surf = unsafe_impl_from_IDirectDrawSurface7(surface); > + Callback(NULL, &surf->surface_desc, Context); > + IDirectDrawSurface7_Release(surface); > } > + else > + ERR("Failed to create surface, hr %#x.\n", hr); I don't think that's an ERR. It may be a legitimate case where the surface requested by the application isn't supported. A question that should be answered by the tests is if EnumSurfaces just enumerates 0 descs with success, or if it returns a failure. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV3NFlAAoJEN0/YqbEcdMwRm0P/jajJLkLdEd4gjVCm/siaccO UmNvomXKOhkrh9kLI7LWZQ2B4fvuc5pma0K6klngRhaoa3+ZIAC59q9eTGzQieWB ibE9LXRU9FHFNThjprkGyHZtYu0MHRTTrYfgsRtOVhpfBTkxPYtKPsxJqEDqi9ug xyRNzuRxz+bsG+4DFocwKXHQtbq/dXndHC5i2VyWh3uUX7HI1QJ1klIbaNf8kBGn w+Hm09qzWU0uudNKNRUTqvulUgd/OPn133h1/IkB27OhdDe0jexVl5hFc+7fyQFG dZ6kdQEimJ1jz9eRIItfOWLYvOKC0J3x7H8kQnQeoeDNJVnoK0rYS5mAz+p4gWLY 3eeuhKeq2iQ1P6851x9KnywZ/wEwSabg6ZqgCrQUCVdIVQNb+s6b5e5BEip/C3BG oSXgO/7ONj682c3S0GoiYFx6eMUPPGS7xbMqhHDJqfQneUEGUXU8VGgT+snTxsS/ JJ0NzQOlmwZm0wx7zCPwjs9173Vz25tCMuAm18CvkRLoXygZeUzU7PbfXE2qqO6j iNsfkUCP7rA+XhCV/vMFdzThI8j0YEDFPliZumQCJ5qN/Yz/6dhls+3J0IHMZexa iGjHFsTlI/yXc01+865tZZQaFEFZEJ0rfE7RChMFsY9LTGe2bzc6P49gdjuhm1em zLhWBw58Jqx2LoY/wAFR =1rMk -----END PGP SIGNATURE-----

1 0

Re: [1/3] ddraw/tests: Add more tests for IDirectDraw7::EnumSurfaces.
by Stefan Dösinger 25 Aug '15

25 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-25 um 11:15 schrieb Sebastian Lackner: > dlls/ddraw/ddraw.c | 3 > dlls/ddraw/tests/d3d.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++--- Please add the test to ddraw{1-7}.c, testing each interface version. This is the preferred place for new tests. Feel free to remove the lone EnumSurfaces test from CreateDirect3D. Arguably it's poorly placed there because CreateDirect3D is more of a helper function than a real test function. > +typedef struct > +{ > + int found; > + int surfaces; > +} EnumSurfaceTest; You shouldn't need the typedef, and the counters can be unsigned. In ddraw*.c enum_surfaces_test matches the naming convention. > + memset(&ddsd2, 0, sizeof(ddsd2)); > + ddsd2.dwSize = sizeof(ddsd2); > + ddsd2.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; > + ddsd2.dwWidth = 256; > + ddsd2.dwHeight = 256; The test will be more meaningful if there are more than 2 surfaces that can be enumerated, and if they have different sizes. > + count.found = count.surfaces = 0; > + rc = IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, > + &ddsd, &count, SurfaceCounter); > + ok(rc == DD_OK, "Expected DD_OK, got %x\n", rc); > + todo_wine ok(count.found == 1, "Has %d surface descriptions, expected 1\n", count.found); > + ok(count.surfaces == 0, "Has %d surfaces, expected 0\n", count.surfaces); What does the enumerated surface description look like? Is it just your input description, or does ddraw set additional flags like DDSCAPS_OFFSCREENPLAIN? If it looks like it is your surface desc you can try to set some nonsense fields before the call, e.g. set lpSurface = (void *)0xdeadbeef without setting DDSD_LPSURFACE. If ddraw adds extra flags please check for them. If you call CreateSurface inside the callback with the enumerated desc, does it successfully create a surface? Another thing to test is DDSCAPS_PRIMARYSURFACE, both without an existing primary and without one that's already created. This should show if calling CreateSurface to try to create a test surface is the right solution. There are a few more things you could check to satisfy my curiosity, but I don't think we necessarily need this: In your implementation calling EnumSurfaces with DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST from the enumeration callback will find the temporary surface and you could e.g. AddRef it and keep it. I doubt this is the case with Microsoft's implementation, otherwise they could give you their test surface in the callback. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV3M6jAAoJEN0/YqbEcdMw4BcP/Rc/D6f3d2KoEG9mqftIxsGO TaO7KAeclV2ctUUYCXQ9kuUamDblNtyFebhb6p/zr7i1I9dymiN1EMgpUs7DUU2Y IJB3QJVvG1csFporvAkqNm1ERN12YbNPcmCL7nSuT8/X0uP3c4Mcjr2MQphz6Ng5 CyZPp5fKah7xrQrfEqQ7FGTpuXPickkTm710JerjZr4UNP+LrW38WTMxgH3a/McW ucuvRF+D2qc/Ml+fbHMBrO0gUlmLCKWvyPAAM5LU9b4lpMSBvVM0avbDP1BfV68e W18pj3ZBjGsbPCIGQWV4YqyiEtdQgvJPYvmbLTwSWxfOn1hXDdqgzOX6xtuGw93G jVu7D8FZduLDwlG8k3KWWZVQKZ6Cd0RuaGUOztNXXkFIzyH57MWGaJOsAr7RVB1T 81JANe7pq4wcs6eA2yJo7vEoGqdR13waV13Em44aR7sp8hNZod05vlAlS//zViNU 0zkisY70ceaQNug22BlyFxdJ67mLHxNduseQ2oAZLQj3c/W2kpu9sAG09bJTaj3p FfgW1+oCq4bIt2lkdTewuPHcIylhvBc46EGpSmU6Tq4Rip4MmVZEsK8bFXQyZUrL Dn+oGMdOwTPIvv1bKIx36SXGqr3Q7wV4k8Ai10eHVjygWj1cnX5BSBH3zf2ZRSa5 A4YR+nFRZkEdr8rvO37C =jk68 -----END PGP SIGNATURE-----

1 0

Re: wevtapi: implement EvtClose()
by Nikolay Sivov 25 Aug '15

25 Aug '15

On 25.08.2015 21:20, Austin English wrote: > +BOOL WINAPI EvtClose(EVT_HANDLE handle) > +{ > + BOOL ret; > + > + TRACE("(%p)\n", handle); > + ret = HeapFree(GetProcessHeap(), 0, handle); > + return ret; > +} It makes no sense to free it like that.

1 0

Re: mscoree: Implement semi-stub for _CorValidateImage.
by Vincent Povirk 25 Aug '15

25 Aug '15

Why do we set the entry point to 0 on 64-bit and _CorDllMain or _CorExeMain on 32-bit?

2 1

Re: user32: Fix error handling in {Begin,End,}DeferWindowPos() to match Windows behavior (resend)
by Nikolay Sivov 25 Aug '15

25 Aug '15

On 25.08.2015 17:01, Rodrigo Rivas wrote: > [Sorry for the double post, I forgot to reply to the list] > > On Tue, Aug 25, 2015 at 3:35 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: >> On 25.08.2015 16:08, Rodrigo Rivas wrote: >>> >>> I sent this on July 15th, but it went through the cracks. Maybe the >>> mail text was not detailed enough, so I will try and explain it better >>> this time. >>> >>> The error behaviour of functions BeginDeferWindowPos(), >>> DeferWindowPos() and EndDeferWindowPos() in Wine is different than in >>> Windows. >>> >>> In Windows, when DeferWindowPos() is used with an invalid HWND, this >>> function fails, but the eventual EndDeferWindowPos() will succeed and >>> move all the other windows in the set. >>> In Wine, however, DeferWindowPos() does not check the HWND, so it >>> never fails. But then, it fails in EndDeferWindowPos(), moving only >>> the windows passed before the invalid HWND and leaving the windows >>> after the invalid HWND unmoved. >>> >>> The Windows behaviour is consistent in every version I tested (XP and 7). >>> >>> The attached patch makes the Wine error behaviour the same as the Windows >>> one. >>> It also considers the case where the HWND is valid when calling >>> DeferWindowPos() but is destroyed before calling EndDeferWindowPos(): >>> The error is simply ignored. >>> >>> It fixes bug #23187. >>> >>> --- >>> dlls/user32/tests/Makefile.in | 1 + >>> dlls/user32/tests/defer.c | 168 >>> ++++++++++++++++++++++++++++++++++++++++++ >>> dlls/user32/winpos.c | 14 ++-- >>> 3 files changed, 178 insertions(+), 5 deletions(-) >>> create mode 100644 dlls/user32/tests/defer.c >>> >> >> I don't think you need a new file for that, how about moving this to win.c? > > It may make sense in win.c. I assumed that user32/tests/win.c is > related to user32/win.c. And since the affected functions are in > user32/winpos.c... maybe I should have named it user32/tests/winpos.c? > But I don't have a strong preference > If you really want it, would you like me to do the merge and resend > the patch? Or is it not necessary? > We try to avoid adding new files for every new test, to keep number of files under reasonable limit. So yes, I think it's better to have that moved to win.c, and no, renaming it is not necessary. >> Regarding fix itself, it's probably better to split it to two - fix >> DeferWindowPos() in first + related tests, and End* one in the second. > > In this I disagree. Changing DeferWindowPos() without changing > EndDeferWindowPos() would make little sense, because the error > checking is moving from EDWP to DWP. > The special case of the window being destroyed between DWP and EDWP is > just a consequence of EDWP not having any error checking left. > You could have one patch that adds the check to DWP and another that > removes it from EDWP, but what's the point? The intermediate step will > not even pass the test case, it will fail at > TestDestroyDeferWindowPos(). > > So to fair you would have to split in: a) fix DWP + tess1+test2; b) > fix EDWP + test3. > Sure, that's what I meant, to have one fix + its tests in first patch, followed by second fix + its own tests. But let's see if someone else has anything to add to this, it might be okay to have it they way you did.

1 0

Re: user32: Fix error handling in {Begin,End,}DeferWindowPos() to match Windows behavior (resend)
by Nikolay Sivov 25 Aug '15

25 Aug '15

On 25.08.2015 16:08, Rodrigo Rivas wrote: > I sent this on July 15th, but it went through the cracks. Maybe the > mail text was not detailed enough, so I will try and explain it better > this time. > > The error behaviour of functions BeginDeferWindowPos(), > DeferWindowPos() and EndDeferWindowPos() in Wine is different than in > Windows. > > In Windows, when DeferWindowPos() is used with an invalid HWND, this > function fails, but the eventual EndDeferWindowPos() will succeed and > move all the other windows in the set. > In Wine, however, DeferWindowPos() does not check the HWND, so it > never fails. But then, it fails in EndDeferWindowPos(), moving only > the windows passed before the invalid HWND and leaving the windows > after the invalid HWND unmoved. > > The Windows behaviour is consistent in every version I tested (XP and 7). > > The attached patch makes the Wine error behaviour the same as the Windows one. > It also considers the case where the HWND is valid when calling > DeferWindowPos() but is destroyed before calling EndDeferWindowPos(): > The error is simply ignored. > > It fixes bug #23187. > > --- > dlls/user32/tests/Makefile.in | 1 + > dlls/user32/tests/defer.c | 168 ++++++++++++++++++++++++++++++++++++++++++ > dlls/user32/winpos.c | 14 ++-- > 3 files changed, 178 insertions(+), 5 deletions(-) > create mode 100644 dlls/user32/tests/defer.c > I don't think you need a new file for that, how about moving this to win.c? Regarding fix itself, it's probably better to split it to two - fix DeferWindowPos() in first + related tests, and End* one in the second.

1 0

Re: [PATCH 4/6] d3drm: Fix spelling mistake in Set/GetDecalTransparentColor macros.
by Stefan Dösinger 25 Aug '15

25 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I noticed that Microsoft's headers don't define these C interface macros at all. Technically we should remove them from our headers (and write obj->lpVtbl->Method(obj, param1, param2) in the code). However, given that it's quite unlikely that anyone wants to compile a d3drm application against our headers I don't think this needs to be a priorit y. This also means our tests (and implementation) won't compile against Microsoft's headers, but this is also something that is nice to have but not generally supported (e.g. Microsoft's d3d9ex C interfaces are broken, so our d3d9ex tests only compile with our header). Stefan Am 2015-08-24 um 15:58 schrieb Aaryaman Vasishta: > --- include/d3drmobj.h | 12 ++++++------ 1 file changed, 6 > insertions(+), 6 deletions(-) > > diff --git a/include/d3drmobj.h b/include/d3drmobj.h index > 942c69a..28340fb 100644 --- a/include/d3drmobj.h +++ > b/include/d3drmobj.h @@ -3284,7 +3284,7 @@ > DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define > IDirect3DRMTexture_SetDecalOrigin(p,a,b) (p)->SetDecalOrigin(a,b) > #define IDirect3DRMTexture_SetDecalScale(p,a) (p)->SetDecalScale(a) > #define IDirect3DRMTexture_SetDecalTransparency(p,a) > (p)->SetDecalTransparency(a) -#define > IDirect3DRMTexture_SetDecalTransparencyColor(p,a) > (p)->SetDecalTransparentColor(a) +#define > IDirect3DRMTexture_SetDecalTransparentColor(p,a) > (p)->SetDecalTransparentColor(a) #define > IDirect3DRMTexture_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) > #define IDirect3DRMTexture_GetDecalOrigin(p,a,b) > (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture_GetImage(p) > (p)->GetImage() @@ -3292,7 +3292,7 @@ > DECLARE_INTERFACE_(IDirect3DRMTexture, IDirect3DRMVisual) #define > IDirect3DRMTexture_GetColors(p) (p)->GetColors() #define > IDirect3DRMTexture_GetDecalScale(p) (p)->GetDecalScale() #define > IDirect3DRMTexture_GetDecalTransparency(p) > (p)->GetDecalTransparency() -#define > IDirect3DRMTexture_GetDecalTransparencyColor(p) > (p)->GetDecalTransparencyColor() +#define > IDirect3DRMTexture_GetDecalTransparentColor(p) > (p)->GetDecalTransparentColor() #endif > > /********************************************************************* ******** > > > @@ -3404,7 +3404,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) > #define IDirect3DRMTexture2_SetDecalOrigin(p,a,b) > (p)->SetDecalOrigin(a,b) #define > IDirect3DRMTexture2_SetDecalScale(p,a) (p)->SetDecalScale(a) > #define IDirect3DRMTexture2_SetDecalTransparency(p,a) > (p)->SetDecalTransparency(a) -#define > IDirect3DRMTexture2_SetDecalTransparencyColor(p,a) > (p)->SetDecalTransparentColor(a) +#define > IDirect3DRMTexture2_SetDecalTransparentColor(p,a) > (p)->SetDecalTransparentColor(a) #define > IDirect3DRMTexture2_GetDecalSize(p,a,b) (p)->GetDecalSize(a,b) > #define IDirect3DRMTexture2_GetDecalOrigin(p,a,b) > (p)->GetDecalOrigin(a,b) #define IDirect3DRMTexture2_GetImage(p) > (p)->GetImage() @@ -3412,7 +3412,7 @@ > DECLARE_INTERFACE_(IDirect3DRMTexture2, IDirect3DRMTexture) > #define IDirect3DRMTexture2_GetColors(p) (p)->GetColors() #define > IDirect3DRMTexture2_GetDecalScale(p) (p)->GetDecalScale() #define > IDirect3DRMTexture2_GetDecalTransparency(p) > (p)->GetDecalTransparency() -#define > IDirect3DRMTexture2_GetDecalTransparencyColor(p) > (p)->GetDecalTransparencyColor() +#define > IDirect3DRMTexture2_GetDecalTransparentColor(p) > (p)->GetDecalTransparentColor() /*** IDirect3DRMTexture2 methods > ***/ #define IDirect3DRMTexture2_InitFromImage(p,a) > (p)->InitFromImage(a) #define > IDirect3DRMTexture2_InitFromResource2(p,a,b,c) > (p)->InitFromResource2(a,b,c) @@ -3494,7 +3494,7 @@ > DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) #define > IDirect3DRMTexture3_SetDecalOrigin(p,a,b) > (p)->lpVtbl->SetDecalOrigin(p,a,b) #define > IDirect3DRMTexture3_SetDecalScale(p,a) > (p)->lpVtbl->SetDecalScale(p,a) #define > IDirect3DRMTexture3_SetDecalTransparency(p,a) > (p)->lpVtbl->SetDecalTransparency(p,a) -#define > IDirect3DRMTexture3_SetDecalTransparencyColor(p,a) > (p)->lpVtbl->SetDecalTransparentColor(p,a) +#define > IDirect3DRMTexture3_SetDecalTransparentColor(p,a) > (p)->lpVtbl->SetDecalTransparentColor(p,a) #define > IDirect3DRMTexture3_GetDecalSize(p,a,b) > (p)->lpVtbl->GetDecalSize(p,a,b) #define > IDirect3DRMTexture3_GetDecalOrigin(p,a,b) > (p)->lpVtbl->GetDecalOrigin(p,a,b) #define > IDirect3DRMTexture3_GetImage(p) (p)->lpVtbl->GetImage(p) @@ -3502,7 > +3502,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, > IDirect3DRMVisual) #define IDirect3DRMTexture3_GetColors(p) > (p)->lpVtbl->GetColors(p) #define > IDirect3DRMTexture3_GetDecalScale(p) (p)->lpVtbl->GetDecalScale(p) > #define IDirect3DRMTexture3_GetDecalTransparency(p) > (p)->lpVtbl->GetDecalTransparency(p) -#define > IDirect3DRMTexture3_GetDecalTransparencyColor(p) > (p)->lpVtbl->GetDecalTransparencyColor(p) +#define > IDirect3DRMTexture3_GetDecalTransparentColor(p) > (p)->lpVtbl->GetDecalTransparentColor(p) #define > IDirect3DRMTexture3_InitFromImage(p,a) > (p)->lpVtbl->InitFromImage(p,a) #define > IDirect3DRMTexture3_InitFromResource2(p,a,b,c) > (p)->lpVtbl->InitFromResource2(p,a,b,c) #define > IDirect3DRMTexture3_GenerateMIPMap(p,a) > (p)->lpVtbl->GenerateMIPMap(p,a) > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJV3EhqAAoJEN0/YqbEcdMw2R8QAJMTA2LoM42LSV4mZUNH1oe/ TrErVK3o2VRiRlBlQL1CLrv6178p01GmIoRmlkXyYgrvmM7Z7mGIEFfhD7g4irVr Cw1M6WnrTFyWgu0DfOw6qaYqknjLcGJTukQ97R1nd8wgQ0/dfDVmB8SWl7V6KWO9 F0UyY3P05B20hbeKhUouoxfhdEO0pkVDgvFffe9A5+01uP/uTzFFYWVhacmoY9nl VYhyDFhCM+Fut/I8RhDzZfRA+VmvxRBTQyEdlH93GMhov4Tf50bSdu41pd3WZL6g bf2WW/vIAhwsIpoSe6GUPEkqjq9hc4a5TXVyUZhStergGeEiy3USuSbXSRRbLc+w yu/jLr/BLm/nVOicP/BmWVspEt1z9ksjfcVYdXgpQEoeS7NLn0gyihLn7lnbl2dv pSVgfVLUMsWcO0IzlTruARHEelEZV9DFKnLkQpe1U1nKqw27M9J7L+bE5euWHj9L ZSXjip4Yf9wSENVNqyeZK9I+kXpOs1i3TVquY9tvFgwjoXtj+F3ZyGCETRFXcPti dCX0xmIl9M1jwxdJn9rSlVr8w0ZSuYZHGjsxGBZDFWPVMDUNql5HTD5Tbe47iTXg 8ZiB6qzrcuTdXS4DaQjVvKVmiv0lqvrKPaKWg7u2Q5wBlUr0ITXSfq5vam4uMHIf C36Co9yOt+tapC7y73gU =1Eea -----END PGP SIGNATURE-----

2 1

Re: [PATCH 5/5] d3d11: Add ID3D11Texture2D stub interface.
by Henri Verbeet 24 Aug '15

24 Aug '15

On 24 August 2015 at 01:04, Józef Kucia <jkucia(a)codeweavers.com> wrote: > struct d3d10_texture2d > { > ID3D10Texture2D ID3D10Texture2D_iface; > + ID3D11Texture2D ID3D11Texture2D_iface; We usually put the newest interface version first. > +static HRESULT texture2d_query_interface(struct d3d10_texture2d *texture, REFIID riid, void **object) > { > - struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); > - > - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); > - > if (IsEqualGUID(riid, &IID_ID3D10Texture2D) > || IsEqualGUID(riid, &IID_ID3D10Resource) > || IsEqualGUID(riid, &IID_ID3D10DeviceChild) > || IsEqualGUID(riid, &IID_IUnknown)) > { > - IUnknown_AddRef(iface); > - *object = iface; > + *object = &texture->ID3D10Texture2D_iface; > + IUnknown_AddRef((IUnknown *)*object); > + return S_OK; > + } > + else if (IsEqualGUID(riid, &IID_ID3D11Texture2D) > + || IsEqualGUID(riid, &IID_ID3D11Resource) > + || IsEqualGUID(riid, &IID_ID3D11DeviceChild)) > + { > + *object = &texture->ID3D11Texture2D_iface; > + IUnknown_AddRef((IUnknown *)*object); > return S_OK; > } > Here too. > +static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) > +{ > + struct d3d10_texture2d *This = impl_from_ID3D10Texture2D(iface); > + > + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); > + > + return texture2d_query_interface(This, riid, object); > +} There's something to say for this approach, but what we usually do is to just forward to the newest interface version (where possible, practical, etc.) I.e. "return d3d11_texture2d_queryInterface(&texture->ID3D11Texture2d_iface, iid, out);". > +HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) These should be static.

1 0

IDirect3DRMTexture stub patches.
by Aaryaman Vasishta 24 Aug '15

24 Aug '15

These patches will be needed before I can add tests for, and implement version 1 of Create/LoadTexture. Please provide feedback on any modifications required. (Patches 0000-0006 are already in wine-patches but not committed yet). Cheers, Jam

2 2

Re: [PATCH] ucrtbase: Add the new universal CRT DLL.
by Alexandre Julliard 24 Aug '15

24 Aug '15

Martin Storsjo <martin(a)martin.st> writes: > +@ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned int) > +@ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned __int64) > +@ stub _set_new_mode > +@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output > +@ cdecl _set_purecall_handler(ptr) > +@ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *) > +@ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64) I don't see any mangled names in my version. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: winhttp: Add support for WinHttpRequestOption_URLCodePage.
by Hans Leidekker 24 Aug '15

24 Aug '15

On Mon, 2015-08-24 at 15:03 +0800, Dmitry Timoshkov wrote: > @@ -3071,6 +3072,7 @@ static void initialize_request( struct winhttp_request *request ) > request->connect_timeout = 60000; > request->send_timeout = 30000; > request->receive_timeout = 30000; > + request->url_codepage = CP_ACP; MSDN says that it defaults to CP_UTF8 and my tests confirm that.

1 0

Re: ieframe: Added more test traces to diagnose some test failures.
by Marvin 23 Aug '15

23 Aug '15

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=16243 Your paranoid android. === w2000pro (32 bit webbrowser) === webbrowser.c:2971: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2976: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2971: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2976: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2971: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2976: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE

1 0

Re: [3/4] ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory.
by Marvin 23 Aug '15

23 Aug '15

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=16238 Your paranoid android. === w8 (32 bit file) === file.c:410: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: gdi32/tests: 64 bit GetFontFileInfo may fail with error ERROR_NOACCESS.
by Marvin 22 Aug '15

22 Aug '15

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=16214 Your paranoid android. === wvistau64 (32 bit font) === The test timed out

1 0

Re: different behaviors of mixed-mode assembly under .net/wine-mono/native mono.
by Hin-Tak Leung 22 Aug '15

22 Aug '15

------------------------------ On Sat, Aug 22, 2015 5:07 PM BST Vincent Povirk wrote: >> Is it possible to enable win32 mono's mixed mode support at runtime, >> or does it requires a re-compile? > >I'm not sure, but I think there is a switch to mono.exe. > Hmm, I just read the linux mono man pages... don't know where the win32-specfic features of mono might be documented. I'll try to find out. >> The two ldarg.s look invalid to me, but it is possible that Cecil is getting >> confused in the same way as mono. > >The solution is probably to modify the JIT compiler in wine-mono to >accept this code. If you feel like looking into this issue, the application concerned is Microsoft's font validator: https://www.microsoft.com/typography/FontValidator.mspx The LTSH and hdmx, vdmx table tests and the rasterization test (on a different tab) throws illegal IL code exception captured in its report. You can de-select the other tests which don't matter. To use, click "add font" under the options, load up any truetype font, and click the 'tick" symbol to start. The XML viewer doesn't work under wine - COM/ActiveX and IE - so you probably want to save the report and read it as text. The exceptions are thrown in the truetype.dll as: Invalid IL code in Avalon.Media.Text.TrueType.RasterInterf:CalcDevMetrics (int,int,int,uint16,byte[],uint16,byte,byte,uint16[],uint16[],uint16,Avalon.Media.Text.TrueType.RasterInterf/UpdateProgressDelegate): IL_039a: ldarg.s Invalid IL code in Avalon.Media.Text.TrueType.RasterInterf:RastTest (int,int,int[],single,single,single,single,single[2],Avalon.Media.Text.TrueType.RasterInterf/RastTestErrorDelegate,Avalon.Media.Text.TrueType.RasterInterf/UpdateProgressDelegate): IL_0098: ldarg.s if you don't even want to run it :-). As I said it works correctly under wine + .net 2, and throws the "correct" error under linux mono and win32 mono about not being able to initialize the constructor of an object around native code, so both behaviors are "expected". I have a command-line wrapper around the Font Validator to make batch testing easier, though I don't expect it is of any use for looking at the IL code issue?

1 2

Re: [3/3] ntdll: Implement FileRenameInformation support. (try 2)
by Marvin 22 Aug '15

22 Aug '15

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=16212 Your paranoid android. === w8 (32 bit file) === file.c:408: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: different behaviors of mixed-mode assembly under .net/wine-mono/native mono.
by Hin-Tak Leung 22 Aug '15

22 Aug '15

------------------------------ On Fri, Aug 21, 2015 8:20 PM BST Vincent Povirk wrote: >> So I have a specific question - how do I go about finding >> out how the IL code exception comes about? >> (I have had a couple of patches in either camp so >> I am not against patching wine or mono, or wine-mono for that matter) > >You can set the WINE_MONO_VERBOSE environment variable to a single >digit greater than 0 to get debugging information related to JIT >compilation. This should at least tell you exactly which method's IL >is being rejected. > Actually I don't need that - the applicatin itself records the stack trace in its normal xml output as: Invalid IL code in method1 (int,int,int,uint16,byte[],uint16,byte,byte,uint16[],uint16[],uint16, delegate type1): IL_039a: ldarg.s 12

 and Invalid IL code in method2 (int,int,int[],single,single,single,single,single[2],delegate type1, delegate2): IL_0098: ldarg.s 8

 The first one is doing "ldarg.s <the delegate>", while the other is doing "ldarg.s <the single[2]>". I just noticed one anomaly - the single[2] type should be a single[,] type; These are according to monodevelop's assembly browser. >Setting MONO_VERBOSE_METHOD will show debugging information for the >JIT compilation of a specific method, unfortunately Mono crashes >trying to parse many of the mangled names that appear in Managed C++ >assemblies, so often this approach does not work for me. I've often >had to hack the code that checks MONO_VERBOSE_METHOD to special-case a >specific method name. > monodis somehow doesn't show either of those. >> And a general question: are mixed mode assemblies supposed >> to work under win32 mono at all, or wine-mono definitely needed? >> I saw some wine + mono discussions a while ago and >> I got the impression that mixed mode assemblies are supposed to >> work with win32 mono somewhat? > >There is some support for mixed-mode in win32 mono, but it is disabled >by default. They are different enough that I would not use win32 mono >on Windows to learn anything about how well wine-mono "should" work. > Is it possible to enable win32 mono's mixed mode support at runtime, or does it requires a re-compile? >> The application itself is available as a public download in binary form. >> But since it mostly works - correctly under .net, and even the >> illegal IL exception was caught, just not the null constructor. >> Editing the IL code to put a try+catch around the constructor >> makes it largely operational too under linux mono, so there is >> not much of a bug to file; mostly a curiosity why >> wine-mono doesn't behave like it support mixed-mode fully, or >> not at all, but something between. > >Microsoft's managed C++ compiler has been known to generate IL that >technically violates ecma 335, or otherwise gives Mono trouble. We >have hacks in wine-mono for a few of these cases, but it's likely we >have not addressed all of them. > >There are also features used by managed C++, such as "thiscall" >reverse-pinvokes, which are technically independent of mixed-mode, but >which are not implemented in wine-mono. The two ldarg.s look invalid to me, but it is possible that Cecil is getting confused in the same way as mono.

2 1

Re: [2/4] ntdll/tests: Add additional tests for FileRenameInformation.
by Marvin 21 Aug '15

21 Aug '15

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=16200 Your paranoid android. === w8 (32 bit file) === file.c:408: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

different behaviors of mixed-mode assembly under .net/wine-mono/native mono.
by Hin-Tak Leung 21 Aug '15

21 Aug '15

Hi, I am trying to look into a somewhat curious issue about mixed mode assembly under wine-mono. The application works correctly under wine + MS .net 2. With native mono on the explicit command line, either win32 mono + wine, or x86_64 linux mono on x86_64 linux, the win32 native constructor of a class returns a null. That's fair enough. But with wine-mono, the application does not behave either like .net 2 or win32 mono on the command line. It throws illegal IL code exception. So I have a specific question - how do I go about finding out how the IL code exception comes about? (I have had a couple of patches in either camp so I am not against patching wine or mono, or wine-mono for that matter) And a general question: are mixed mode assemblies supposed to work under win32 mono at all, or wine-mono definitely needed? I saw some wine + mono discussions a while ago and I got the impression that mixed mode assemblies are supposed to work with win32 mono somewhat? The application itself is available as a public download in binary form. But since it mostly works - correctly under .net, and even the illegal IL exception was caught, just not the null constructor. Editing the IL code to put a try+catch around the constructor makes it largely operational too under linux mono, so there is not much of a bug to file; mostly a curiosity why wine-mono doesn't behave like it support mixed-mode fully, or not at all, but something between. Hin-Tak

2 1

Re: [PATCH 7/7] d3d11/tests: Add test for device interfaces.
by Marvin 21 Aug '15

21 Aug '15

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=16187 Your paranoid android. === wvistau64 (32 bit d3d11) === d3d11.c:80: Test failed: Device should implement ID3D10Multithread interface, hr 0x80004002. d3d11: unhandled exception c0000005 at 00401721 === w2008s64 (32 bit d3d11) === d3d11.c:80: Test failed: Device should implement ID3D10Multithread interface, hr 0x80004002. d3d11: unhandled exception c0000005 at 00401721 === wvistau64 (64 bit d3d11) === d3d11.c:80: Test failed: Device should implement ID3D10Multithread interface, hr 0x80004002. d3d11: unhandled exception c0000005 at 000000000040168C === w2008s64 (64 bit d3d11) === d3d11.c:80: Test failed: Device should implement ID3D10Multithread interface, hr 0x80004002. d3d11: unhandled exception c0000005 at 000000000040168C

1 0

Re: [PATCH 2/3] xaudio2: Add stub IXAudio2MasteringVoice implementation
by Henri Verbeet 21 Aug '15

21 Aug '15

On 20 August 2015 at 22:06, Andrew Eikum <aeikum(a)codeweavers.com> wrote: > +struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { Should that have been "static const"?

2 1

Re: [PATCH 2/3] xaudio2: Implement IXAudio2::GetDeviceDetails
by Marvin 21 Aug '15

21 Aug '15

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=16244 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] po: Update Finnish translation.
by Nikolay Sivov 21 Aug '15

21 Aug '15

On 21.08.2015 16:02, Lauri Kenttä wrote: > #: uninstaller.rc:33 > -#, fuzzy > -#| msgid "Error: Invalid option '%c'.\n" > msgid "uninstaller: Invalid option [%1]\n" > -msgstr "Virhe: Viallinen vaihtoehto '%c'.\n" > +msgstr "unistaller: Virheellinen valitsin [%1]\n" Hi, Lauri. Is this a typo in "uninstaller" ?

1 0

Re: [3/3] server: Do not permit FileDispositionInformation to delete a file without write access.
by Marvin 21 Aug '15

21 Aug '15

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=16154 Your paranoid android. === w8 (32 bit file) === file.c:408: Test failed: mismatched file size for L"WindowsUpdate.log"

1 0

Re: [PATCH] gdi32: unlock critsection on error exit (Coverity)
by Nikolay Sivov 21 Aug '15

21 Aug '15

On Friday, August 21, 2015, Marcus Meissner <marcus(a)jet.franken.de> wrote: > 713131 Missing unlock > --- > dlls/gdi32/freetype.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > > I think enum_face_charsets() unlocks it internally, is it not a case sometimes?

1 0

Re: [2/3] server: Add support for setting file disposition information.
by Marvin 21 Aug '15

21 Aug '15

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=16152 Your paranoid android. === wvistau64 (32 bit file) === file.c:450: Test failed: attributes of file "testfile.xxx" are 0x0820 === wvistau64 (64 bit file) === file.c:450: Test failed: attributes of file "testfile.xxx" are 0x0820

1 0

Re: [PATCH 4/5] d3d11/tests: Add test for device interfaces. (try 2)
by Henri Verbeet 21 Aug '15

21 Aug '15

On 21 August 2015 at 00:07, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Try 2: > * Add missing "implement" in a test failure message. > * It seems that ID3D10Multithread is not available on Windows Vista. Odd. (Although perhaps more so the fact that it is available on the other Windows versions while e.g. ID3D10Device1 isn't.) > + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, &feature_level, 1, D3D11_SDK_VERSION, > + &device, NULL, NULL))) I think the indentation here is a bit weird. Strictly speaking I suppose it's correct because the D3D11CreateDevice() call is inside a SUCCEEDED(), but I'd prefer just 8 space indent.

1 0

Re: msvcirt: Add a more accurate implementation of streambuf::pbackfail
by Piotr Caban 21 Aug '15

21 Aug '15

On 08/19/15 19:04, Iván Matellanes wrote: > +/* ?pbackfail@streambuf@@UAEHH@Z */ > +/* ?pbackfail@streambuf@@UEAAHH@Z */ > +DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) > +#define call_streambuf_pbackfail(this, c) CALL_VTBL_FUNC(this, 36, int, (streambuf*, int), (this, c)) > +int __thiscall streambuf_pbackfail(streambuf *this, int c) > +{ > + TRACE("(%p %d)\n", this, c); > + if (this->gptr > this->eback) > + return *--this->gptr = c; > + if (call_streambuf_seekoff(this, -1, SEEKDIR_cur, OPENMODE_in) == EOF) > + return EOF; > + return c; > +} If seekoff is used the buffers needs to be updated. Otherwise next read will return incorrect data. You will need to make space for put back character and place it in the buffer. Thanks, Piotr

1 0

Re: [1/2] kernel32/tests: Fix compilation with PSDK.
by Marvin 21 Aug '15

21 Aug '15

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=16143 Your paranoid android. === w7u (32 bit process) === process.c:2663: Test failed: WaitForSingleObject returned 258 process.c:2680: Test failed: WaitForSingleObject returned 258

1 0

Re: [PATCH] mshtml: Add IHTMLXMLHttpRequest::abort() method implementation.
by Marvin 21 Aug '15

21 Aug '15

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=16139 Your paranoid android. === w2000pro (32 bit xmlhttprequest) === xmlhttprequest: unhandled exception c0000005 at 00475F35

1 0

Re: [1/3] comdlg32: Implement SetControlItemState for menu controls.
by Marvin 20 Aug '15

20 Aug '15

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=16136 Your paranoid android. === w7u (32 bit itemdlg) === itemdlg: unhandled exception c0000005 at 76A81EA3 === wvistau64 (64 bit itemdlg) === No test summary line found

1 0

Re: [PATCH 4/5] d3d11/tests: Add test for device interfaces. (try 2)
by Marvin 20 Aug '15

20 Aug '15

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=16232 Your paranoid android. === build (build) === Patch failed to apply

2 1

Re: [PATCH 14/16] msvcp110: Add tr2_sys__Stat_wchar and tr2_sys__Lstat_wchar implementation and test.(resend)
by Marvin 20 Aug '15

20 Aug '15

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=16129 Your paranoid android. === w2008s64 (64 bit msvcp120) === msvcp120.c:176: Test failed: Export '?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PB_WAAH@Z' not found msvcp120: unhandled exception c0000005 at 0000000000000000

1 0

CreateDeviceFromD3D implementations, device QI tests and some other patches.
by Aaryaman Vasishta 20 Aug '15

20 Aug '15

Hello! Attached are patches related to implementations of CreateDeviceFromD3D and device QI tests along with fixes to return values for GetDirect3DDevice2 and device QueryInterface. Cheers, Jam

2 5

Re: [PATCH 3/4] wined3d: Add a slop for color keying.
by Henri Verbeet 20 Aug '15

20 Aug '15

On 20 August 2015 at 10:03, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > @@ -6332,7 +6332,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * > } > > if (settings->color_key_enabled) > - shader_addline(buffer, "if (all(equal(tex0, color_key))) discard;\n"); > + shader_addline(buffer, "if (all(lessThan(abs(tex0 - color_key), vec4(%s)))) discard;\n", > + wined3d_color_key_precision); > ... > +/* Normalization of B5G6R5_UNORM textures is horribly imprecise if we don't have > + * GL_RGB_565 support. 1 / 256 (~0.0039) works in practice, but is awfully close > + * to the next possible value in 8 bit formats. 1 / 384 is too precise for some > + * 5 and 6 bit channel values at least on Nvidia. > + * > + * An exact comparison isn't reliable for any format, except for the normalized > + * values 0.0 and 1.0. */ > +const char *wined3d_color_key_precision = "0.003"; > Shouldn't you just pass the color key as a range to the shader instead? E.g. in a 6 bpc format anything between 0.484f and 0.500f would get quantized to 0x1f. (Which, other floating point issues aside, would correspond to about 0.008 slop here. For a 5 bpc format you'd even have 0.016.)

2 3

Re: [PATCH 02/16] msvcp110: Add tr2_sys__Rename_wchar implementation and test.(try 2)
by Marvin 20 Aug '15

20 Aug '15

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=16121 Your paranoid android. === w2000pro (32 bit msvcp120) === The test timed out

1 0

Re: [PATCH 6/7] d3d10core: Implement D3D10CoreCreateDevice using D3D11CoreCreateDevice.
by Henri Verbeet 20 Aug '15

20 Aug '15

On 20 August 2015 at 01:47, Józef Kucia <jkucia(a)codeweavers.com> wrote: > DXGID3D10* functions will be dropped once IDXGIDevice is moved to d3d11. > > D3D10CoreRegisterLayers returns E_NOTIMPL on modern Windows systems. > --- I think the general idea of this patchset works (I haven't looked at all the details yet), but I don't think you can use d3d11 source files in d3d10core like that. If there's really no better way you can probably temporarily use PARENTSRC (look at e.g. d3dcompiler_47 for an example of how to use that), but it may be better to reorder things a bit so that you can essentially merge this patch with the one moving the files.

2 2

Re: [PATCH 7/7] d3d11/tests: Add test for device interfaces.
by Henri Verbeet 20 Aug '15

20 Aug '15

On 20 August 2015 at 01:48, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + hr = ID3D11Device_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); > + todo_wine ok(hr == E_NOINTERFACE, "Device should not ID3D10Device1 interface, hr %#x.\n", hr); I think you're missing an "implement" here.

1 0

Re: [PATCH 2/7] d3d11: Rename d3d10_device to d3d_device.
by Henri Verbeet 20 Aug '15

20 Aug '15

On 20 August 2015 at 01:47, Józef Kucia <jkucia(a)codeweavers.com> wrote: > --- I think this is fine, but it doesn't need to be in the middle of the series, you can do it either before or after moving the implementation to d3d11.

1 0

Re: [PATCH 1/7] d3d11: Move d3d10core to d3d11.
by Henri Verbeet 20 Aug '15

20 Aug '15

On 20 August 2015 at 01:47, Józef Kucia <jkucia(a)codeweavers.com> wrote: > -#include "d3d10core_private.h" > +#include "d3d11_private.h" > > WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); I think you should rename the debug channel as well. I don't think we need layer.c.

1 0

Re: [3/4] ntdll: Implement FileRenameInformation support.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > --- > dlls/ntdll/file.c | 44 ++++++++++++++++++ > dlls/ntdll/tests/file.c | 76 +++++++++++++++++-------------- > server/fd.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++-- > server/protocol.def | 8 +++ > 4 files changed, 205 insertions(+), 38 deletions(-) You need to validate the path name, probably the same way create_file() does. Also I think it would be cleaner with a separate request. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: cmd: Implement 'echo/'
by Marvin 20 Aug '15

20 Aug '15

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=16108 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 716 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 726 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 727 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 733 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 735 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 739 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 740 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 745 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 746 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 748 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 761 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 766 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 767 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 783 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 784 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 786 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 787 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 788 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 789 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 790 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 791 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 792 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 793 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 794 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 795 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 796 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 797 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 798 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 799 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1383 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1384 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1385 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1386 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1387 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1388 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1392 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1395 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1396 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1397 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1398 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1399 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1400 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1401 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === w2003std (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 708 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 709 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 715 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 716 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 717 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 718 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 719 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 721 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 722 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 723 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 724 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 725 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 726 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 727 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 731 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 732 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 733 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 734 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 735 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 739 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 740 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 741 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 745 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 746 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 747 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 748 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 755 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 756 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 757 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 761 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 762 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 763 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 764 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 765 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 766 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 767 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 768 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 769 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 770 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 774 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 775 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 776 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 783 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 784 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 785 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 786 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 787 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 788 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 789 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 790 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 791 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 792 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 793 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 794 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 795 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 796 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 797 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 798 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 799 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1383 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1384 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1385 (got 'C:\Documents and Settings\Administrator\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1386 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1387 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1388 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1389 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1390 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1392 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1395 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1396 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1397 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1398 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1399 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1400 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1401 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 334 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 334 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 334 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

1 0

Re: [PATCH 4/4] ieframe: Fixed and improved navigation command state tests.
by Marvin 20 Aug '15

20 Aug '15

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=16093 Your paranoid android. === w2000pro (32 bit webbrowser) === webbrowser.c:2970: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2970: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE webbrowser.c:2970: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE webbrowser.c:2975: Test failed: expected Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE

1 0

Re: msi: Only remove environment strings that were added on install.
by Marvin 20 Aug '15

20 Aug '15

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=16087 Your paranoid android. === w7u (32 bit action) === The test timed out === w8 (32 bit action) === The test timed out

1 0

Re: Assorted spelling and typos fixes (resend)
by Marvin 19 Aug '15

19 Aug '15

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=16085 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:485: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/003F0001 === w8 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 005D0000/005D0001 exception: unhandled exception 80000004 at 005D0000 exception.c:485: Test failed: 42: Wrong exception address 77174D17/005D0001

1 0

Re: [PATCH] ucrtbase: Add the new universal CRT DLL.
by Martin Storsjö 19 Aug '15

19 Aug '15

On Thu, 13 Aug 2015, Martin Storsjo wrote: > Since MSVC 2015/Windows 10, the C runtime has now been split into two > parts, ucrtbase, which is the generic C runtime which is now considered > a system component (in Windows 10, and as an extra installed runtime > component for older Windows version), and vcruntimeX which is specific > to the compiler version. > > This uses the msvcrt implementation, just like the earlier msvcr* DLLs. > > Functions with names that existed in msvcr120 are hooked up so far. > --- > This is based on ucrtbase.dll from Windows 10 RTM. > > Sending this as a standalone patch, with the other pieces coming > in smaller bunches once this is applied. > --- > configure.ac | 1 + > dlls/ucrtbase/Makefile.in | 33 + > dlls/ucrtbase/ucrtbase.spec | 2542 +++++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 2576 insertions(+) > create mode 100644 dlls/ucrtbase/Makefile.in > create mode 100644 dlls/ucrtbase/ucrtbase.spec Any further comments on this? I resent it as a single patch without the rest of the patchset, as suggested on IRC, but still haven't seen any comment on it. // Martin

1 0

Re: Assorted spelling and typos fixes (resend)
by Marvin 19 Aug '15

19 Aug '15

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=16084 Your paranoid android. === wvistau64 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w2008s64 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w7u (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w8 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === wvistau64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004230EA === w2008s64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004230EA === wxppro (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 00420B8C === w2003std (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 00420B8C === w8 (32 bit marshal) === marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x320 instead of 0xea8 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x320 instead of 0xea8

1 0

Re: [tools] winetest: Add Windows 10 to group Win10 (try 2)
by Sebastian Lackner 19 Aug '15

19 Aug '15

On 19.08.2015 18:33, André Hentschel wrote: > diff --git a/winetest/dissect b/winetest/dissect > index cd24fc3..0a99773 100755 > --- a/winetest/dissect > +++ b/winetest/dissect > @@ -207,6 +207,13 @@ if ($plid==1 && $major==4) { > $version = "win8"; > } > } > + } elsif ($major==10) { > + if ($minor == 0) { This looks a bit weird, did you want to remove the "}" in the line before?

1 0

Windows Service + CreateWindowEx
by Robert D Kocisko 19 Aug '15

19 Aug '15

I am attempting to make some tweaks to Wine so it can run a (3rd party) windows service that uses CreateWindowEx, and I'm not sure whether I'm on the right track or not. What is happening is that when the service calls CreateWindowEx, I get this error: Application tried to create a window, but no driver could be loaded. The explorer process failed to start. I traced it down to the following source code line in wine/dlls/user32/driver.c: UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); What is happening is that guid_atom returns 0 which ultimately ends up disallowing any connection to a graphics driver. Now it seems to me that the explorer.exe process is supposed to be providing a desktop window and setting that atom value. But if I try to run wine explorer.exe it doesn't make any difference. I am keeping Wine alive by running wine notepad & and I am also running wine services to make sure that the SCM is alive and available for the services. OS: Elementary OS Freya 0.3 Is this something that Wine should support? I have had success getting other 3rd party services to work so it seems that it shouldn't be too difficult to make this work. Could anyone provide guidance on how I should proceed to tweak the code to support this? Or if this is going to be a huge project to make this work I would appreciate knowing that too :). Thanks much, Bob Kocisko

2 2

Re: [PATCH 3/4] d3dx9/tests: Add tests for DDS file format size validation.
by Matteo Bruni 19 Aug '15

19 Aug '15

2015-08-16 22:28 GMT+02:00 Józef Kucia <jkucia(a)codeweavers.com>: > --- > dlls/d3dx9_36/tests/surface.c | 172 ++++++++++++++++++++++++++++-------------- > 1 file changed, 116 insertions(+), 56 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 7a4dff8..9da3628 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > + { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, DDS_MIPMAPCOUNT, 256, 256, 0, 0, 196607, { D3DXERR_INVALIDDATA, 0 } }, > + { { 32, DDS_PF_RGB, 0, 24, 0xff0000, 0x00ff00, 0x0000ff, 0x000000 }, DDS_MIPMAPCOUNT, 256, 256, 0, 0, 196608, { D3D_OK, 1 } }, I would add another test for DDS_MIPMAPCOUNT with a count of 0 but a larger data size. I wonder if 0 actually means something like "as many levels as they fit in the file".

1 0

Re: [1/2] kernel32/tests: Fix compilation with PSDK.
by Michael Stefaniuc 19 Aug '15

19 Aug '15

Hello Dmitry, On 08/19/2015 06:23 AM, Dmitry Timoshkov wrote: > --- > dlls/kernel32/tests/process.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c > index 113ec35..a8abdc1 100644 > --- a/dlls/kernel32/tests/process.c > +++ b/dlls/kernel32/tests/process.c > @@ -2302,7 +2302,7 @@ static void test_TerminateJobObject(void) > > static void test_QueryInformationJobObject(void) > { > - char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; > + char buf[sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + sizeof(ULONG_PTR) * 5]; this change looks odd. Using offsetof (or FIELD_OFFSET) is the standard Wine way of getting the size of a struct with a variable length array. I have done quite a few patches on Alexandre's request that replace sizeof+sizeof*x with offsetof. E.g. 14e20162f9448a648f3973a86e03aea17387c040 Last but not least you're not allocating the same amount of memory: offsetof(struct, field[n]) == sizeof(struct) + (n-1) * sizeof(field) bye michael

2 1

Re: [1/3] comdlg32: Implement SetControlItemState for menu controls.
by Dmitry Timoshkov 19 Aug '15

19 Aug '15

Vincent Povirk <madewokherd(a)gmail.com> wrote: > This required some rethinking because menus and combo boxes don't > provide a way to "hide" items, just remove them, and native always > shows items in the order they were added even when hidden and shown. You can always add an item at a particular position. That should allow implementing hide/show for menus and combo/listboxes pretty easily using standard functionality. -- Dmitry.

2 1

Re: [PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.
by Marvin 18 Aug '15

18 Aug '15

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=16135 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/5] d3drm: Implement IDirect3DRMDevice*::GetDirect3DDevice (resend).
by Marvin 18 Aug '15

18 Aug '15

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=16134 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/5] d3drm: Implement IDirect3DRM::CreateDeviceFromClipper.
by Marvin 18 Aug '15

18 Aug '15

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=16133 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 5/5] d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper.
by Aaryaman Vasishta 18 Aug '15

18 Aug '15

Please ignore this patchset. Just realized this patchset was already committed 13 hours ago. Is the bot on IRC not working? Cheers, Jam On Wed, Aug 19, 2015 at 12:17 AM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/d3drm.c | 54 > +++++++++++++++++++++++++++++++++++++++++------- > dlls/d3drm/tests/d3drm.c | 36 ++++++++++++++++---------------- > 2 files changed, 64 insertions(+), 26 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index e4cc4fa..61d0a25 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -697,18 +697,24 @@ static HRESULT WINAPI > d3drm2_CreateDeviceFromClipper(IDirect3DRM2 *iface, > IDirectDrawClipper *clipper, GUID *guid, int width, int height, > IDirect3DRMDevice2 **device) > { > - struct d3drm_device *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMDevice3 *device3; > HRESULT hr; > - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > + > + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > iface, clipper, debugstr_guid(guid), width, height, device); > > - hr = d3drm_device_create(&object); > + if (!device) > + return D3DRMERR_BADVALUE; > + *device = NULL; > + hr = IDirect3DRM3_CreateDeviceFromClipper(&d3drm->IDirect3DRM3_iface, > clipper, guid, width, height, &device3); > if (FAILED(hr)) > return hr; > > - *device = IDirect3DRMDevice2_from_impl(object); > + hr = IDirect3DRMDevice3_QueryInterface(device3, > &IID_IDirect3DRMDevice2, (void**)device); > + IDirect3DRMDevice3_Release(device3); > > - return D3DRM_OK; > + return hr; > } > > static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, > @@ -1103,18 +1109,50 @@ static HRESULT WINAPI > d3drm3_CreateDeviceFromClipper(IDirect3DRM3 *iface, > IDirectDrawClipper *clipper, GUID *guid, int width, int height, > IDirect3DRMDevice3 **device) > { > + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); > struct d3drm_device *object; > + IDirectDraw *ddraw; > + IDirectDrawSurface *render_target; > HRESULT hr; > - FIXME("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > + > + TRACE("iface %p, clipper %p, guid %s, width %d, height %d, device > %p.\n", > iface, clipper, debugstr_guid(guid), width, height, device); > > + if (!device) > + return D3DRMERR_BADVALUE; > + *device = NULL; > + > + if (!clipper || !width || !height) > + return D3DRMERR_BADVALUE; > + > + hr = DirectDrawCreate(NULL, &ddraw, NULL); > + if (FAILED(hr)) > + return hr; > + > hr = d3drm_device_create(&object); > if (FAILED(hr)) > + { > + IDirectDraw_Release(ddraw); > return hr; > + } > > - *device = IDirect3DRMDevice3_from_impl(object); > + hr = d3drm_device_create_surfaces_from_clipper(object, ddraw, > clipper, width, height, &render_target); > + if (FAILED(hr)) > + { > + IDirectDraw_Release(ddraw); > + d3drm_device_destroy(object); > + return hr; > + } > > - return D3DRM_OK; > + hr = d3drm_device_init(object, 3, &d3drm->IDirect3DRM_iface, ddraw, > render_target); > + IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(render_target); > + if (FAILED(hr)) > + d3drm_device_destroy(object); > + else > + *device = IDirect3DRMDevice3_from_impl(object); > + > + return hr; > } > > static HRESULT WINAPI d3drm3_CreateShadow(IDirect3DRM3 *iface, IUnknown > *object, IDirect3DRMLight *light, > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index c797ccd..2d25bf3 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2134,7 +2134,7 @@ static void test_create_device_from_clipper2(void) > IDirect3DRM2 *d3drm2 = NULL; > IDirectDraw *ddraw = NULL; > IUnknown *unknown = NULL; > - IDirect3DRMDevice2 *device2 = NULL; > + IDirect3DRMDevice2 *device2 = (IDirect3DRMDevice2 *)0xdeadbeef; > IDirect3DDevice2 *d3ddevice2 = NULL; > IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > @@ -2164,24 +2164,24 @@ static void test_create_device_from_clipper2(void) > ref2 = get_refcount((IUnknown *)d3drm2); > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 0, 0, &device2); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice2_Release(device2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + ok(device2 == NULL, "Expected device returned == NULL, got %p.\n", > device2); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 300, > 200, &device2); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice2_Release(device2); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 300, 200, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 300, 200, &device2); > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = > %x).\n", hr); > ref3 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 > = %u.\n", ref1, ref3); > + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", > ref1, ref3); > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , > cref2 = %u.\n", cref1, cref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = > %u.\n", cref1, cref2); > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > @@ -2322,7 +2322,7 @@ static void test_create_device_from_clipper3(void) > IDirect3DRM3 *d3drm3 = NULL; > IDirectDraw *ddraw = NULL; > IUnknown *unknown = NULL; > - IDirect3DRMDevice3 *device3 = NULL; > + IDirect3DRMDevice3 *device3 = (IDirect3DRMDevice3 *)0xdeadbeef; > IDirect3DDevice2 *d3ddevice2 = NULL; > IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > @@ -2352,24 +2352,24 @@ static void test_create_device_from_clipper3(void) > ref2 = get_refcount((IUnknown *)d3drm3); > > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 0, 0, &device3); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice3_Release(device3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + ok(device3 == NULL, "Expected device returned == NULL, got %p.\n", > device3); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 300, > 200, &device3); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice3_Release(device3); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > + > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 300, 200, NULL); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got > %x.\n", hr); > > hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, > 300, 200, &device3); > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = > %x).\n", hr); > ref3 = get_refcount((IUnknown *)d3drm1); > - todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 > = %u.\n", ref1, ref3); > + ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", > ref1, ref3); > ref3 = get_refcount((IUnknown *)d3drm3); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , > cref2 = %u.\n", cref1, cref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = > %u.\n", cref1, cref2); > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > -- > 2.3.2 (Apple Git-55) > >

2 2

Re: d3drm: Implement GetDirect3DDevice
by Marvin 18 Aug '15

18 Aug '15

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=16107 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement GetDirect3DDevice2.
by Marvin 18 Aug '15

18 Aug '15

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=16106 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromClipper
by Marvin 18 Aug '15

18 Aug '15

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=16105 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement IDirect3DRM::CreateDeviceFromClipper
by Marvin 18 Aug '15

18 Aug '15

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=16104 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Add version specific tests frr CreateDeviceFrom* methods.
by Marvin 18 Aug '15

18 Aug '15

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=16103 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 10).
by Marvin 18 Aug '15

18 Aug '15

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=16102 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement GetDirect3DDevice
by Aaryaman Vasishta 18 Aug '15

18 Aug '15

Apologies! All the patches sent this minute were sent by mistake - I'll be sending the proper patch set now. Jam On Tue, Aug 18, 2015 at 7:23 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/device.c | 27 ++++++++++++++++++++++++--- > dlls/d3drm/tests/d3drm.c | 4 ++-- > 2 files changed, 26 insertions(+), 5 deletions(-) > > diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c > index b703077..bb8eeae 100644 > --- a/dlls/d3drm/device.c > +++ b/dlls/d3drm/device.c > @@ -418,7 +418,14 @@ static D3DRMTEXTUREQUALITY WINAPI > d3drm_device1_GetTextureQuality(IDirect3DRMDev > > static HRESULT WINAPI d3drm_device1_GetDirect3DDevice(IDirect3DRMDevice > *iface, IDirect3DDevice **d3d_device) > { > - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); > + > + if (device->device) > + { > + *d3d_device = device->device; > + return D3DRM_OK; > + } > > return E_NOTIMPL; > } > @@ -772,7 +779,14 @@ static D3DRMTEXTUREQUALITY WINAPI > d3drm_device2_GetTextureQuality(IDirect3DRMDev > > static HRESULT WINAPI d3drm_device2_GetDirect3DDevice(IDirect3DRMDevice2 > *iface, IDirect3DDevice **d3d_device) > { > - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice2(iface); > + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); > + > + if (device->device) > + { > + *d3d_device = device->device; > + return D3DRM_OK; > + } > > return E_NOTIMPL; > } > @@ -1139,7 +1153,14 @@ static D3DRMTEXTUREQUALITY WINAPI > d3drm_device3_GetTextureQuality(IDirect3DRMDev > > static HRESULT WINAPI d3drm_device3_GetDirect3DDevice(IDirect3DRMDevice3 > *iface, IDirect3DDevice **d3d_device) > { > - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); > + TRACE("iface %p, d3d_device %p!\n", iface, d3d_device); > + > + if (device->device) > + { > + *d3d_device = device->device; > + return D3DRM_OK; > + } > > return E_NOTIMPL; > } > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 959dbc3..4b5cd92 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2008,7 +2008,7 @@ static void test_create_device_from_clipper1(void) > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface > (hr = %x).\n", hr); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = > %x).\n", hr); > if (FAILED(hr)) > goto cleanup; > > @@ -2103,7 +2103,7 @@ static void test_create_device_from_clipper1(void) > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice interface (hr = > %x).\n", hr); > > hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3ddevice1); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface > (hr = %x).\n", hr); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = > %x).\n", hr); > if (FAILED(hr)) > goto cleanup; > > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: tempory patch by slackner
by Aaryaman Vasishta 18 Aug '15

18 Aug '15

My bad, I sent the wrong folder of patches -.- ignore all patches sent this minute please. Jam On Tue, Aug 18, 2015 at 7:23 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/windowscodecs/icnsformat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/windowscodecs/icnsformat.c > b/dlls/windowscodecs/icnsformat.c > index 54c7707..5d48a1a 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI > IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - > IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); > + > IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [PATCH 1/2] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 8).
by Marvin 18 Aug '15

18 Aug '15

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=16101 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] msvcr120: Implement strtof and _strtof_l (try 3)
by Henri Verbeet 18 Aug '15

18 Aug '15

On 14 August 2015 at 04:44, Bernhard Übelacker <bernhardu(a)vr-web.de> wrote: > + /*strtof*/ > + f = p_strtof(float1, &end); > + ok(compare_float(f, 12.1, 4096), "f = %lf\n", f); Is it really that inaccurate, or did you just copy 4096 from the ddraw tests?

2 4

Re: mshtml: Wine Gecko 2.40 release.
by Austin English 18 Aug '15

18 Aug '15

You forgot to push the tag: http://sourceforge.net/p/wine/wine-gecko/ref/master/tags/ On Tue, Aug 11, 2015 at 8:11 AM, Jacek Caban <jacek(a)codeweavers.com> wrote: > --- > dlls/appwiz.cpl/addons.c | 6 +- > dlls/mshtml/nsembed.c | 6 +- > dlls/mshtml/nsiface.idl | 114 ++++++++++++++++++++-------------- > dlls/mshtml/nsio.c | 155 > +++++++++++++++++++++++++++++++++++++---------- > 4 files changed, 199 insertions(+), 82 deletions(-) > > > > > -- -Austin

2 2

Re: ntdll: Move cookie initialization code from memory management to loader.
by Dmitry Timoshkov 18 Aug '15

18 Aug '15

Sebastian Lackner <sebastian(a)fds-team.de> wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=39040 > > Manually testing reveals that the security cookie is not initialized by NtMapViewOfSection. > > However, I guess nobody will be surprised, that this testing revealed even more differences. > In fact, the whole relocation logic is implemented at the wrong place, it should also be > moved to the loader to be compatible with modern versions of Windows (tested on Windows 7). Last attempt in trying to get some comments/attention was the following patch (which didn't receive any responce just like previous two e-mails): https://www.winehq.org/pipermail/wine-patches/2012-April/113746.html I'll resend once again if Alexandre is willing to review it it provide some suggestions. Alexandre? -- Dmitry.

2 1

Re: Assorted spelling and typos fixes
by Marvin 18 Aug '15

18 Aug '15

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=16053 Your paranoid android. === wvistau64 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w2008s64 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w7u (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === w8 (32 bit moniker) === moniker: unhandled exception c0000005 at 004290B9 === wvistau64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004230EA === w2008s64 (64 bit moniker) === moniker: unhandled exception c0000005 at 00000000004230EA === wxppro (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 00420B8C === w2003std (32 bit marshal) === marshal.c:3054: Test failed: wait timed out marshal.c:3058: Test failed: CoCreateInstance failed with error 0x80040154 marshal: unhandled exception c0000005 at 00420B8C === w8 (32 bit marshal) === marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3315: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3316: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3332: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3333: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3370: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3371: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3388: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3389: Test failed: info->dwServerPid was 0x374 instead of 0xf34 marshal.c:3352: Test failed: info->cbSize was 194370934 instead of 48 marshal.c:3353: Test failed: info->dwServerPid was 0x374 instead of 0xf34

1 0

Re: Assorted spelling and typos fixes
by Marvin 17 Aug '15

17 Aug '15

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=16052 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002C0000/002C0001 exception: unhandled exception 80000004 at 002C0000 exception.c:485: Test failed: 42: Wrong exception address 7751ED97/002C0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003F0000/003F0001 exception: unhandled exception 80000004 at 003F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/003F0001 === w8 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003E0000/003E0001 exception: unhandled exception 80000004 at 003E0000 exception.c:485: Test failed: 42: Wrong exception address 77174D17/003E0001

1 0

Re: [PATCH 4/4] msvcp110: Add tr2_sys__Stat_wchar and tr2_sys__Lstat_wchar implementation and test.
by Marvin 17 Aug '15

17 Aug '15

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=16062 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] msvcp110: Add tr2_sys__Statvfs_wchar implementation and test.(resend)
by Marvin 17 Aug '15

17 Aug '15

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=16061 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] msvcp110: Add tr2_sys__Rename_wchar implementation and test.(resend)
by Marvin 17 Aug '15

17 Aug '15

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=16060 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] msvcp110: Add tr2_sys__Copy_file_wchar implementation and test.(try 2)
by Marvin 17 Aug '15

17 Aug '15

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=16059 Your paranoid android. === build (build) === Patch failed to apply

1 0

Request for help with running Unreal ED 3.0 in Wine (from developer Running With Scissors)
by Jon M 17 Aug '15

17 Aug '15

Greetings everyone, I work as a project manager and developer for Running with Scissors. We have a game called POSTAL 2 that natively supports Linux and runs on the Unreal 2 engine, and includes modding Steam workshop features. Sadly, the Level editor (based on UnrealED 3.0) is not supported in Linux, and rewriting it to support it natively is out of the question. However, when running the Windows build under Wine, almost everything works perfectly, including navigating the viewports and rebuilding the maps. It’s so close to being perfectly usable as a level editor, with one major caveat - not being able to select actors or surfaces by clicking or access their right click menus to add actors. It is possible select actors with marquee select in the orthographic views, and you are able to add static meshes to a level via the Insert button in the Static Mesh browser. The texture browser also has issues with selection which can be worked around by increasing the size in the View menu. It run a bit slow but well enough for practical use (20 FPS in the viewports on bigger maps on a 2.8ghz CPU). There is a log on the WineHQ database regarding this here which focuses on the UT2004 editor, but the problems are much the same. https://appdb.winehq.org/objectManager.php?sClass=version&iId=4638 Reason I'm interested in this is because, with that one thing fixed, we could use a Wine wrapper and put the SDK up for Linux on Steam and elsewhere. We'd even have it so it hands off to the native Linux version of the game when testing the map from the editor. It would be quite a thing to be one of the few games with a full SDK for Linux on Steam. No one is maintaining this it seems in WineHQ, but there is a a least a chance the fix it needs may not be too hard to work out, so I'm hoping to find someone that's willing to see if they can fix this (and any other problems we come across in QA). Thank you for your time in reading this, Jon

2 3

Re: Assorted spelling and typos fixes
by Henri Verbeet 17 Aug '15

17 Aug '15

On 17 August 2015 at 15:14, Andrey Gusev <andrey.goosev(a)gmail.com> wrote: > - TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," > + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p,\n" > "\tshader_byte_code_length %lu, input_layout %p\n", This is the same as 113682, same comment applies.

1 0

Implementation patches for d3drm's CreateDeviceFromD3D.
by Aaryaman Vasishta 17 Aug '15

17 Aug '15

Attached is the patches for implementing CreateDeviceFromD3D. Please take a look and provide feedback, if any. Thank you! Aaryaman

2 8

Re: [PATCH 2/2] d3d10core: Add missing \n in trace.
by Henri Verbeet 17 Aug '15

17 Aug '15

On 16 August 2015 at 22:21, Józef Kucia <jkucia(a)codeweavers.com> wrote: > - TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," > + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p,\n" > "\tshader_byte_code_length %lu, input_layout %p\n", I'd rather just remove the '\t'. In particular, having newlines in the middle of TRACEs makes it a bit harder to extract all calls from a single thread from a log.

1 0

Re: [PATCH 1/2] includes: Add D3D11CreateDeviceAndSwapChain declaration to d3d11.idl.
by Henri Verbeet 17 Aug '15

17 Aug '15

On 16 August 2015 at 22:21, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +cpp_quote("HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter*,D3D_DRIVER_TYPE,HMODULE,UINT,") > +cpp_quote(" const D3D_FEATURE_LEVEL*,UINT,UINT,const DXGI_SWAP_CHAIN_DESC*,IDXGISwapChain**,ID3D11Device**,") > +cpp_quote(" D3D_FEATURE_LEVEL*,ID3D11DeviceContext**);") The existing declarations aren't really helping here, but could you please avoid using cpp_quote and include parameter names?

1 0

Re: [PATCH] shell32: Fix SHFileOperation(FO_MOVE) for creating subdirectories.
by Olivier F. R. Dierick 15 Aug '15

15 Aug '15

Hello, I noticed tests failures in shlfileop while trying to add a new test. The failures were in parts that are not touched by my patches (same errors that you got). I have a patch ready for submission that correct the failures in the existing tests. You may want to wait until I submit my patch and it is committed before submitting your patch again. I'll submit my patch as soon as possible. Regards. Le vendredi 14 août 2015 à 21:18 +0800, Zhenbo Li a écrit : > This patch fixes bug 25207. Seems that a dozen of apps are affected by > this bug, so please tell me how I can improve this patch if this patch > can't be committed directly. > > There will be a test error: > shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR > > It is not related to my patch. > > Hope you enjoy your weekend. > > --- > dlls/shell32/shlfileop.c | 11 +++++++++-- > dlls/shell32/tests/shlfileop.c | 6 +++--- > 2 files changed, 12 insertions(+), 5 deletions(-) > > -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

2 4

Re: monthcal.c patch.txt
by Nikolay Sivov 15 Aug '15

15 Aug '15

On 14.08.2015 19:54, s.p. wrote: > Countries use different rules for determining week numbers. For the > classic month calendar however, windows seems to ignore the first week > of the year registry setting. The attached file 'patch.txt' addresses > this quirk by simply implementing the rules of ISO8601. Although this > patch works and has been tested, it is not intended as a complete fix. > For that it probably needs some more investigation. Usage: > > > cd wine/dlls/comctl32 > patch monthcal.c < patch.txt > > Greets, sbmpost Hi, what is that registry settings you're talking about? I think I heard about different week numbering used in different countries, what are you using as a test case? I think what we actually want is locale-dependent algorithm for that (but it will require some research and testing, because monthcal could differ from what you'd expect).

1 0

Re: [PATCH 9/9] msvcp110: Add tr2_sys__Unlink implementation and test.
by Marvin 15 Aug '15

15 Aug '15

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=16028 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 8/9] msvcp110: Add tr2_sys__Symlink implementation and test.
by Marvin 15 Aug '15

15 Aug '15

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=16027 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 7/9] msvcp110: Add tr2_sys__Link implementation and test.
by Marvin 15 Aug '15

15 Aug '15

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=16026 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 6/9] msvcp120/tests: Add test of tr2_sys__Open_dir, tr2_sys__Read_dir and tr2_sys__Close_dir.
by Marvin 15 Aug '15

15 Aug '15

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=16025 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/9] msvcp120/tests: Add tr2_sys__Last_write_time test.
by Marvin 15 Aug '15

15 Aug '15

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=16024 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 1/9] msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Marvin 15 Aug '15

15 Aug '15

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=16023 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH] shell32: Fix SHFileOperation(FO_MOVE) for creating subdirectories.
by Marvin 14 Aug '15

14 Aug '15

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=16012 Your paranoid android. === wvistau64 (32 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

1 0

Prelink usage
by Michael Cronenworth 14 Aug '15

14 Aug '15

Does prelink still provide any benefits in wine? The package is being retired in Fedora so starting with 1.7.48 the wine package will no longer be compiled with it. A few applications I have run under 1.7.48 still function, but I am curious to know the possible failure cases. Thanks, Michael

4 6

Re: [PATCH] mshtml: Handle nsIDOMWindow_GetFrames returning NULL
by Jacek Caban 14 Aug '15

14 Aug '15

Hi Indrek, On 08/09/15 09:09, Indrek Altpere wrote: > + if(!nsframes) { > + WARN("nsIDOMWindow_GetFrames returned NULL nsframes: %p\n", This->nswindow); > + return E_FAIL; The patch looks mostly good, but I think we should return DISP_E_MEMBERNOTFOUND in this case. Thanks, Jacek

1 0

Re: [PATCH] msvcr120: Implement strtof and _strtof_l (try 2)
by Henri Verbeet 13 Aug '15

13 Aug '15

On 13 August 2015 at 02:23, Bernhard Übelacker <bernhardu(a)vr-web.de> wrote: > +static inline BOOL almost_equal(float d1, float d2) { > + if(d1-d2>-1e-30 && d1-d2<1e-30) > + return TRUE; > + return FALSE; > +} > + You almost never want to compare floating point values like that. See e.g. compare_float() in dlls/ddraw/tests/ddraw7.c for a better (if perhaps not quite perfect) way. E.g. for the FLT_MAX case this only works because you happen to get an exact match. "1e-30" is a double instead of a float. Of course this is probably copied from the existing tests, so I suppose I can't complain too much.

2 1

Re: [PATCH] msvcr120: implement strtof and _strtof_l
by Piotr Caban 12 Aug '15

12 Aug '15

On 08/12/15 00:42, Bernhard Übelacker wrote: > + ok(*(unsigned*)&f == __inf_bytes && sizeof(unsigned) == sizeof(float), "f = %x\n", *(unsigned*)&f); It would be nicer to use _finitef from msvcr120 here. Thanks to it you can avoid __inf_bytes and __ninf_bytes declaration. Thanks, Piotr

1 0

Re: [PATCH 1/2] reg: simplify root key search
by Sebastian Lackner 11 Aug '15

11 Aug '15

On 06.08.2015 23:14, xantares 09 wrote: > From: Jonathan Vollebregt <jnvsor(a)gmail.com> > > --- > programs/reg/reg.c | 85 +++++++++++++++++++++++++++--------------------------- > 1 file changed, 43 insertions(+), 42 deletions(-) It is a bit pointless to send patches anonymously to the wine-patches mailing list. No matter if you are the author or not, when you are sending the patches you are the person responsible for it. To establish trust, all developers should use their real names here on the mailing lists. (see the rules for submitting patches: http://wiki.winehq.org/SubmittingPatches ) Besides that I see much bigger chances when Jonathan would send these patches himself. He is experienced with his own code, can respond to feedback, can fix regressions if it causes problems, and so on. For people new to Wine development its always easier to start with some self-written patches. @Jonathan: I would like to encourage you again to give it another try. If you need any help, feel free to ask me. I assume Stefan Dösinger would also be willing to help again. Regards, Sebastian

3 2

Re: [1/3] usp10/tests: Add tests for control character glyphs.
by Marvin 11 Aug '15

11 Aug '15

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=15955 Your paranoid android. === wvistau64 (32 bit usp10) === Failure running script in VM: timed out waiting for the child process

1 0

Re: quartz: waveparser support wav file generated by ffmpeg (try3)
by Dmitry Timoshkov 11 Aug '15

11 Aug '15

"Changhui LIU" <liuchanghui(a)linuxdeepin.com> wrote: > Superseded patch 113457. > > > Change log: > remove todo_wine win_skip The patch looks good, and it actually more closely resembles mmioDescend behaviour (except of alignment to even boundary, but that's a separate issue). -- Dmitry.

2 1

Re: comctl32: ILC_COLORDDB imagelists can be created with 0 sizes
by Huw Davies 11 Aug '15

11 Aug '15

On Mon, Aug 10, 2015 at 08:21:52PM -0500, Aric Stewart wrote: > diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c > index 6f13846..fcf5162 100644 > --- a/dlls/comctl32/tests/imagelist.c > +++ b/dlls/comctl32/tests/imagelist.c > @@ -1994,6 +1994,47 @@ static void test_create_destroy(void) > ok(rc == FALSE, "ImageList_Destroy(0xdeadbeef) should fail and not crash\n"); > } > > +static void test_0size_DIB(void) > +{ > + INT cx, cy; > + HIMAGELIST himl; > + IImageList *imgl; > + HRESULT hr; > + INT ret; > + > + himl = ImageList_Create(0, 14, ILC_COLORDDB, 4, 4); This seems an odd choice of function name when you're actually testing DDBs. Also, I think zero_size is much nicer than 0size. Better yet, move all of these into test_create_destroy() where it'll make the difference in behaviour between these and the DIBs more apparent. Huw.

1 0

Re: comctl32: ILC_COLORDDB imagelists can be created with 0 sizes
by Marvin 11 Aug '15

11 Aug '15

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=15944 Your paranoid android. === w2000pro (32 bit imagelist) === imagelist: unhandled exception c0000005 at 0041CED0

1 0

Re: [PATCH 2/5] dwrite: Use OS/2 table data to set font style, make it preferable
by Dmitry Timoshkov 10 Aug '15

10 Aug '15

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > if (tt_os2) { > + USHORT version = GET_BE_WORD(tt_os2->version); > + USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); > + > if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) > props->stretch = GET_BE_WORD(tt_os2->usWidthClass); > > props->weight = GET_BE_WORD(tt_os2->usWeightClass); > + if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE)) > + props->style = DWRITE_FONT_STYLE_OBLIQUE; > + else if (fsSelection & OS2_FSSELECTION_ITALIC) > + props->style = DWRITE_FONT_STYLE_ITALIC; It's much better to use freetype flags for bold and italic, that way styles will match between gdi32 and dwrite. Besides I'd prefer to trust freetype instead of some handmade code which was not tested by thousands of fonts out there. -- Dmitry.

2 4

Re: d3dcompiler_43: Define BWRITER_SM1_VS and BWRITER_SM1_PS as unsigned constants.
by Józef Kucia 10 Aug '15

10 Aug '15

Hi Gerald, On Sun, Aug 9, 2015 at 1:47 AM, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > -#define BWRITER_SM1_VS 0xfffe > -#define BWRITER_SM1_PS 0xffff > +#define BWRITER_SM1_VS 0xFFFEu > +#define BWRITER_SM1_PS 0xFFFFu > > Lowercase hex literals are preferred in D3D code.

2 1

Re: [PATCH 2/7] d3d11/tests: Port test_create_texture2d() from d3d10core.
by Henri Verbeet 10 Aug '15

10 Aug '15

On 10 August 2015 at 01:11, Józef Kucia <jkucia(a)codeweavers.com> wrote: > --- > configure | 3 +- > configure.ac | 3 +- It's not a problem to include these, but it's not necessary either. Alexandre will generate these with tools/make_makefiles before committing the patch. > + if (!(device = create_device())) > + { > + skip("Failed to create device, skipping tests.\n"); > + return; > + } > + There's nothing necessarily wrong with these tests, but you may want to consider waiting with submitting them until after they pass. Right now you're depending on create_device() to fail so the tests are skipped, but that means that once D3D11CreateDevice() is implemented you'd need to add todo_wine's and error handling to every test.

2 2

Re: [PATCH 9/9] msvcp110: Add tr2_sys__Statvfs_wchar implementation and test.
by Marvin 10 Aug '15

10 Aug '15

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=15925 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: m[PATCH 8/9] svcp110: Add tr2_sys__Rename_wchar implementation and test.
by Marvin 10 Aug '15

10 Aug '15

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=15924 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 7/9] msvcp110: Add tr2_sys__Copy_file_wchar implementation and test.
by Marvin 10 Aug '15

10 Aug '15

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=15923 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 7/7] d3d11/tests: Add test for device feature level.
by Józef Kucia 10 Aug '15

10 Aug '15

Please ignore this patchset. I've sent it before subscribing to wine-patches and hoped that it won't reach the mailing list. It should be superseded by the version which reached the mailing list earlier. I'm sorry for the inconvenience. -- Józef Kucia

1 0

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). (try 4)
by Nikolay Sivov 09 Aug '15

09 Aug '15

This looks okay to me (assuming it passes testbot of course).

1 0

Re: comctl32/tests: Add ARM and ARM64 arch strings
by Marvin 09 Aug '15

09 Aug '15

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=15887 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (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 3/4] mshtml: Add IHTMLSelectElement::name property implementation.
by Jacek Caban 07 Aug '15

07 Aug '15

On 08/07/15 12:12, Zhenbo Li wrote: > - if(NS_SUCCEEDED(nsres)) { > - static const WCHAR wszGarbage[] = {'g','a','r','b','a','g','e',0}; > > - nsAString_GetData(&name_str, &name); > + nsAString_GetData(&name_str, &name); > + if(*name) > + *p = SysAllocString(name); > + else > + *p = NULL; > + nsAString_Finish(&name_str); > > - /* > - * Native never returns empty string here. If an element has no name, > - * name of previous element or ramdom data is returned. > - */ > - *p = SysAllocString(*name ? name : wszGarbage); > - }else { > + if(NS_FAILED(nsres)) { > ERR("GetName failed: %08x\n", nsres); > + return E_FAIL; > } > - > - nsAString_Finish(&name_str); > - > - TRACE("name=%s\n", debugstr_w(*p)); > return S_OK; Why don't you use return_nsstr? Jacek

1 0

Assorted spelling fixes.
by Hugh McMaster 07 Aug '15

07 Aug '15

Hi Francois, Just some suggestions to improve your patch. Feel free to use the suggestions (or not). On Friday, 7 August 2015 11:56:27 +0200 (CEST), Francois Gouget wrote: >- /* for keyframes allow to consume all unused bytes */ >+ /* for keyframes allow consuming all the unused bytes */ What about "allow keyframes to consume all unused bytes"? >- /* must we check for framesize to gain requested >- * datarate or could we trust codec? */ >+ /* must we check for frame size to gain requested >+ * data rate or could we trust the codec? */ "must we check for frame size to gain the requested data rate or can we trust the codec?" >+ * This would allow framing items (iterator_frameditems), >+ * and finding the nearest item (LVFI_NEARESTXY) a lot more efficiently. "This would allow us to frame items (iterator_frameditems) and find the nearest item (LVFI_NEARESTXY) far more efficiently." >- /* to make tests pass we follow Windows behaviour and allow to read these fields only >+ /* to make tests pass we follow Windows behaviour and allow reading these fields only "...we follow Windows' behaviour..." (apostrophe) >- * Since, we're also allow to load ELF (pure) libraries and Wine ELF libraries >+ * Since, we also allow loading ELF (pure) libraries and Wine ELF libraries "Since we also allow..." (no comma) >- /* XP doesn't allow to create bitmaps larger than 128 Mb */ >+ /* XP doesn't allow creating bitmaps larger than 128 MB */ "XP doesn't allow the creation of bitmaps larger than 128 MB" >- FIXME("Mode doesn't allow to wrap. However, we should allow to overwrite current string\n"); >+ FIXME("Mode doesn't allow wrapping. However, we should allow overwriting the current string\n"); "... However, we should allow the current string to be overwritten\n" >- /* win7 doesn't allow to create a thread during process shutdown, >+ /* win7 doesn't allow creating a thread during process shutdown but "win7 doesn't allow threads to be created during process shutdown, but..." >- /* win7 doesn't allow to create a thread during process shutdown, >- * earlier Windows versions allow it, and DLL_THREAD_DETACH is >+ /* win7 doesn't allow creating a thread during process shutdown but >+ * earlier Windows versions allow it. In that case DLL_THREAD_DETACH is Same here. >- * Native localui does not allow to delete a COM / LPT - Port (ERROR_NOT_SUPPORTED) >+ * Native localui does not allow deleting a COM / LPT - Port (ERROR_NOT_SUPPORTED) "...does not allow COM/LPT-Ports to be deleted..."

1 0

Re: dmobject: Remove unused unimpl_IPersistStream_GetClassID() functions.
by Nikolay Sivov 07 Aug '15

07 Aug '15

It's better to keep this, so dmobject* copies don't differ.

2 1

Re: d2d1: Make d2d_geometry_sink_vtbl static.
by Henri Verbeet 07 Aug '15

07 Aug '15

On 7 August 2015 at 12:42, Francois Gouget <fgouget(a)free.fr> wrote: > --- > dlls/d2d1/geometry.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c > index 056923e..beebf73 100644 > --- a/dlls/d2d1/geometry.c > +++ b/dlls/d2d1/geometry.c > @@ -1299,7 +1299,7 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddArc(ID2D1GeometrySink *iface, > ++geometry->u.path.segment_count; > } > > -struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = > +static struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl = It should actually be const too.

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.(try 3)
by Piotr Caban 07 Aug '15

07 Aug '15

Hi, On 08/05/15 07:45, YongHao Hu wrote: > +typedef struct _REPARSE_MOUNTPOINT_DATA_BUFFER > +{ > + DWORD ReparseTag; > + DWORD ReparseDataLength; > + WORD Reserved; > + WORD ReparseTargetLength; > + WORD ReparseTargetMaximumLength; > + WORD Reserved1; > + WCHAR ReparseTarget[1]; > +} REPARSE_MOUNTPOINT_DATA_BUFFER, *PREPARSE_MOUNTPOINT_DATA_BUFFER; This structure is not defined in native ntifs.h. I don't know if it's acceptable to add it in wine. I think that it may be easier to get sys::tr2::_Stat implementation to wine without tests on reparse points. You can add this tests later but I'm not sure if they belong to msvcp tests. Thanks, Piotr

3 5

Re: [6/7] vcomp: Implement _vcomp_enter_critsect and _vcomp_leave_critsect.
by Nikolay Sivov 07 Aug '15

07 Aug '15

On 07.08.2015 9:22, Sebastian Lackner wrote: >However, this does not fully prevent a > leak when frequently unloading / reloading a library using OpenMP... sounds a bit > like a design flaw to me. You could keep a list of allocations to fix that if it's really a problem.

2 3

Re: Re: d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2 (try 2).
by Marvin 06 Aug '15

06 Aug '15

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=15844 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm: Implement IDirect3DRMDevice{2-3}::GetDirect3DDevice2 (try 2).
by Aaryaman Vasishta 06 Aug '15

06 Aug '15

This patch supersedes patch 113488. On Fri, Aug 7, 2015 at 3:50 AM, Aaryaman Vasishta <jem456.vasishta(a)gmail.com > wrote: > --- > dlls/d3drm/device.c | 7 ++++- > dlls/d3drm/tests/d3drm.c | 68 > ++++++++++++++---------------------------------- > 2 files changed, 26 insertions(+), 49 deletions(-) > > diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c > index 1de6f91..26240c1 100644 > --- a/dlls/d3drm/device.c > +++ b/dlls/d3drm/device.c > @@ -1325,7 +1325,12 @@ static DWORD WINAPI > d3drm_device3_GetRenderMode(IDirect3DRMDevice3 *iface) > > static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 > *iface, IDirect3DDevice2 **d3d_device) > { > - FIXME("iface %p, d3d_device %p stub!\n", iface, d3d_device); > + struct d3drm_device *device = impl_from_IDirect3DRMDevice3(iface); > + > + TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); > + > + if (device->device) > + return IDirect3DDevice_QueryInterface(device->device, > &IID_IDirect3DDevice2, (void**)d3d_device); > > return E_NOTIMPL; > } > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 2d25bf3..52b0d9a 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2185,9 +2185,7 @@ static void test_create_device_from_clipper2(void) > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2263,7 +2261,7 @@ static void test_create_device_from_clipper2(void) > ref3 = get_refcount((IUnknown *)d3drm2); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = > %u, cref2 = %u.\n", cref1, cref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = > %u.\n", cref1, cref2); > > /* Test if render target format follows the screen format */ > hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > @@ -2279,9 +2277,7 @@ static void test_create_device_from_clipper2(void) > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2295,23 +2291,13 @@ static void test_create_device_from_clipper2(void) > hr = IDirectDraw2_RestoreDisplayMode(ddraw); > ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > > -cleanup: > - if (ds) > - IDirectDrawSurface_Release(ds); > - if (surface) > - IDirectDrawSurface_Release(surface); > - if (d3ddevice2) > - IDirect3DDevice2_Release(d3ddevice2); > - if (device2) > - IDirect3DRMDevice2_Release(device2); > - if (d3drm2) > - IDirect3DRM2_Release(d3drm2); > - if (d3drm1) > - IDirect3DRM_Release(d3drm1); > - if (clipper) > - IDirectDrawClipper_Release(clipper); > - if (ddraw) > - IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(surface); > + IDirect3DDevice2_Release(d3ddevice2); > + IDirect3DRMDevice2_Release(device2); > + IDirect3DRM2_Release(d3drm2); > + IDirect3DRM_Release(d3drm1); > + IDirectDrawClipper_Release(clipper); > + IDirectDraw_Release(ddraw); > DestroyWindow(window); > } > > @@ -2373,9 +2359,7 @@ static void test_create_device_from_clipper3(void) > > /* Fetch immediate mode device in order to access render target */ > hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2451,7 +2435,7 @@ static void test_create_device_from_clipper3(void) > ref3 = get_refcount((IUnknown *)d3drm3); > ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = > %u.\n", ref2, ref3); > cref2 = get_refcount((IUnknown *)clipper); > - todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = > %u, cref2 = %u.\n", cref1, cref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = > %u.\n", cref1, cref2); > > /* Test if render target format follows the screen format */ > hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > @@ -2467,9 +2451,7 @@ static void test_create_device_from_clipper3(void) > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice3 interface (hr = > %x).\n", hr); > > hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); > - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface > (hr = %x).\n", hr); > - if (FAILED(hr)) > - goto cleanup; > + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = > %x).\n", hr); > > hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > ok(hr == DD_OK, "Cannot get surface to the render target (hr = > %x).\n", hr); > @@ -2483,23 +2465,13 @@ static void test_create_device_from_clipper3(void) > hr = IDirectDraw2_RestoreDisplayMode(ddraw); > ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > > -cleanup: > - if (ds) > - IDirectDrawSurface_Release(ds); > - if (surface) > - IDirectDrawSurface_Release(surface); > - if (d3ddevice2) > - IDirect3DDevice2_Release(d3ddevice2); > - if (device3) > - IDirect3DRMDevice3_Release(device3); > - if (d3drm3) > - IDirect3DRM3_Release(d3drm3); > - if (d3drm1) > - IDirect3DRM_Release(d3drm1); > - if (clipper) > - IDirectDrawClipper_Release(clipper); > - if (ddraw) > - IDirectDraw_Release(ddraw); > + IDirectDrawSurface_Release(surface); > + IDirect3DDevice2_Release(d3ddevice2); > + IDirect3DRMDevice3_Release(device3); > + IDirect3DRM3_Release(d3drm3); > + IDirect3DRM_Release(d3drm1); > + IDirectDrawClipper_Release(clipper); > + IDirectDraw_Release(ddraw); > DestroyWindow(window); > } > > -- > 2.3.2 (Apple Git-55) > >

1 0

Re: [PATCH 7/8] d3drm: Implement IDirect3DRMDevice::CreateDeviceFromSurface.
by Stefan Dösinger 06 Aug '15

06 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-06 um 00:49 schrieb Aaryaman Vasishta: > device->d3drm = d3drm; > + device->render_target = surface; > IDirect3DRM_AddRef(d3drm); > device->render_target = surface; This is redundant. > + hr = IDirectDrawSurface_AddAttachedSurface(surface, ds); > + IDirectDrawSurface_Release(ds); > + if (FAILED(hr)) > + return hr; > + } You've overshot my suggestion for pre-attached depth stencils a bit. Now you no longer detach application-created depth stencils any more in case CreateDevice() fails, but you also don't detach a depth stencil that you attached. This may even be the correct behavior. If you want you can write a test (e.g. try to pass a color surface without DDSCAPS_3DDEVICE, but *with* a depth stencil attached. See if it is detached. Try to pass a color surface without DDSCAPS_3DDEVICE and see if a depth stencil is attached after the failing CreateDevice call), but I don't think it's worth spending much time on this. My suggestion is to detach if creating the IM device fails, but only if create_z_surface is TRUE. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVw1yLAAoJEN0/YqbEcdMwyJMP/jsXffvDJlssOGTqhDZvVpl0 WBoSf9mClvG7T5Gqz9Kq8tXXZaETSLPdovHryDn3Ux7kJcJllDfE1C/TqP0jc3X8 weQFMEK49TiNsYBItqgVr7v8YU15GMTqyrhwjIH6zTq9XIx27yhAecKNExb10nfD u32ebnJ//Eh90qkfIe6uvSytFUGmjs0OWZjPlneBbEPOj0jyGMFOyNX3IxN1bB6f czAxJBr6z8EQ0KHRQK9sq98WmIA2najmfakXPzg2fbE+RYRDPnYgcfQ1KmQdtvb1 b9KhIt7FMmL+O1VqgyNsWTUwUin57I0RpyjdBcZ8F48yblUf07a0qiY9udKawKYB xwAmriEMOd37n9Ip6PguawySmdv7a4Jrd8O0Xcu+FRidUMjzq9ZkgvqNht2OaWgv 2dYOCCR6TuA5dYxD3YaqHgJpUB46KS/vE7Nh8EG/Dh2e6paTQoamBUi15WNG/TQB o5Lr2DlJKuXaJnZYoNLDlYgy88P4/JoDvRBLYekbO/fDB1sqMgdBJbRlKGoy72g5 iIrEUbtMpNNLLpxw+ChwH7Gb5U8LZJWMSeyVv8oO/xliir6vF9Dm/sCt4b+bK4uM Y5Q2hC10oEd6jHkbdSKdU6/C8oyKMcfBQJ9adiiQWF+wXQoOPcsaDxwDILVmInGy /3lu18CaUtUdBEhoX/PR =JeVt -----END PGP SIGNATURE-----

2 1

Re: [PATCH 0/3] mshtml: Image map support
by Alex Henrie 06 Aug '15

06 Aug '15

2015-08-04 8:36 GMT-06:00 Alex Henrie <alexhenrie24(a)gmail.com>: > Hi, > > Could I get some feedback on the following changes before I submit them > to wine-patches? Shoot, I just sent these to wine-patches by accident instead of wine-devel. Feedback would still be appreciated. -Alex

2 4

Re: [4/4] msvcirt: Implement filebuf::setbuf
by Piotr Caban 06 Aug '15

06 Aug '15

On 08/05/15 20:32, Iván Matellanes wrote: > @@ -1000,8 +1000,14 @@ streampos __thiscall filebuf_seekoff(filebuf *this, streamoff offset, ios_seek_d > DEFINE_THISCALL_WRAPPER(filebuf_setbuf, 12) > streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) > { > - FIXME("(%p %p %d) stub\n", this, buffer, length); > - return NULL; > + streambuf *ret; > + > + TRACE("(%p %p %d)\n", this, buffer, length); > + > + streambuf_lock(&this->base); > + ret = streambuf_setbuf(&this->base, buffer, length); > + streambuf_unlock(&this->base); > + return ret; > } It doesn't look correct if buffer was already set. Probably the function needs to sync previous buffer or return error in this case. Thanks, Piotr

2 1

Re: [PATCH 1/3] dwrite: Properly initialize LOGFONT returned from ConvertFontToLOGFONT()
by Alexandre Julliard 06 Aug '15

06 Aug '15

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > From: Nikolay Sivov <nsivov(a)codeweavers.com> > Date: Tue, 4 Aug 2015 21:40:52 +0300 > Subject: [PATCH 1/4] dwrite: Properly initialize LOGFONT returned from > ConvertFontToLOGFONT() > > --- > dlls/dwrite/gdiinterop.c | 2 ++ > dlls/dwrite/tests/font.c | 34 +++++++++++++++++++++++++++++++++- > 2 files changed, 35 insertions(+), 1 deletion(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M dwrite.dll -p dwrite_test.exe.so font && touch font.ok font.c:2767: Test failed: got 300 font.c:3028: Tests skipped: Courier New font not found. font.c:4030: Tests skipped: Skipping tests with Arial Makefile:202: recipe for target 'font.ok' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/8] d3drm: Implement IDirect3DRMDevice::CreateDeviceFromClipper.
by Stefan Dösinger 06 Aug '15

06 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-06 um 00:49 schrieb Aaryaman Vasishta:> + IDirect3DRMDevice *device1; ... hr = > + IDirect3DRMDevice *device1; > ... > hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, 0, 0, &device1); > - todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > - if (SUCCEEDED(hr)) > - IDirect3DRMDevice_Release(device1); > + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1); Set device1 = (IDirect3DRMDevice *)0xdeadbeef before calling CreateDeviceFromClipper, otherwise the device == NULL check isn't worth much at the end. (You don't know if its NULL because IDirect3DRM::CreateDeviceFromClipper set it to NULL or because it happened to randomly contain NULL at the start of the function. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVw1NZAAoJEN0/YqbEcdMwSkcP/1NMXYG2m/OkDgVhrAg3kLB3 RRu4egHLkAPpxx9Ms0iAqfl9NtbhtlQpFBjOdwmdElOQbjRZFVpU5pUhFQO4jgbo ywlrvkXYJvmsYWjMTzNFKM0vZaNO6uRQK/pg/QWwqCW+xlunCyHa8vWLzu4u34sB FqGfjOeS/FoQkH2IYnFjpSV12Org9wJC+GVwqw8h1yfgiW3lKaCgRUcA0pRNgC5o l4OlkLhnAC9EqvdSHDgW+A9UkslVDMZq7iq5XFNCasRKqPixCoEsXXu8LH3JakCI 3WOn0z8bgelcLl8Z6xr4dXO5iKvw2Ff1DxKPnmQrykzY2E4OQkZdjqMznXKNqq3g SVXqHq23KuU+CMkimeyDLd8z7brIQfud5W2Ru9/PIWrftuU3y+TgKjZR9awC7pT/ dXF8cCwPOa33MEOUAL2syunC/nAf7RDhBeCnWtj0G9wKGXWdnqFlzIaKVr4sO0wQ RO457ySvXReGkhxe7Df178VQfst9jppCA0FR7m+MlNe8BP31gNEfUvHi0HxYnD4r lyOXA3ltnhgirKhR070wHOPVbR2ZqWuwe4Qv+QAmwYJup95IU6UsXDBcU5VVHNqa 9U+Mb9+FTfcPkgKX60AHJiWdgMsPvuYIKrNoYPBLexv+x1uYdCTr6iB1YQnHCQee jyRW8O7NLo/lxDIAJsh0 =5ZQO -----END PGP SIGNATURE-----

2 2

Re: [PATCH 2/2] msvcp110: Add tr2_sys__Stat and tr2_sys__Lstat implementation and test.（try2 resend)
by Piotr Caban 06 Aug '15

06 Aug '15

On 08/05/15 07:46, YongHao Hu wrote: > +enum file_type tr2_sys__Stat(char const* path, int* err_code) > +enum file_type tr2_sys__Lstat(char const* path, int* err_code) Calling conventions are missing here. Thanks, Piotr

1 0

Re: [3/4] msvcirt: Implement filebuf::setmode
by Piotr Caban 06 Aug '15

06 Aug '15

On 08/05/15 20:32, Iván Matellanes wrote: > diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c > index bf89650..0f82f30 100644 > --- a/dlls/msvcirt/msvcirt.c > +++ b/dlls/msvcirt/msvcirt.c > @@ -1009,8 +1009,16 @@ streambuf* __thiscall filebuf_setbuf(filebuf *this, char *buffer, int length) > DEFINE_THISCALL_WRAPPER(filebuf_setmode, 8) > int __thiscall filebuf_setmode(filebuf *this, int mode) > { > - FIXME("(%p %d) stub\n", this, mode); > - return 0; > + int previous; > + > + TRACE("(%p %d)\n", this, mode); > + if (mode != filebuf_text && mode != filebuf_binary) > + return -1; > + > + streambuf_lock(&this->base); > + previous = _setmode(this->fd, mode); > + streambuf_unlock(&this->base); > + return previous; > } The function should empty the buffers before it changes the mode. Also it will be cleaner if filebuf_text and filebuf_binary definition is changed so _O_TEXT and _O_BINARY is used instead of its value. Thanks, Piotr

1 0

D3DRM Implementation patches upto CreateDeviceFromSurface
by Aaryaman Vasishta 05 Aug '15

05 Aug '15

CreateDeviceFromD3D will be pushed as soon as patch 9 is finalised. The main concern right now is the thunking of the Release methods of the device. This concern comes up from the fact that the CreateDeviceFromSurface methods from all 3 versions behave the same way except for one difference in version 3, which I mention below. When you create a device from IDirect3DRM3::CreateDeviceFromSurface and release it, native will also destroy the depth surface attached to it (if it created it internally), otherwise it'll let the application keep the reference to the depth surface it created. Other than the above peculiarity, the behaviour is identical. I've attached all the commits which lead to the point of implementing CreateDeviceFromSurface. Please, review the patches as much as you'd like and if possible, provide feedback and suggestions on any improvements that can be made, possible comments required, any stupid mistakes I made etc. :) Thank you! Aaryaman

2 20

Re: [PATCH 1/2] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2 resend)
by Marvin 05 Aug '15

05 Aug '15

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=15799 Your paranoid android. === w8 (32 bit mesh) === mesh.c:8258: Test failed: Mesh 26: new_num_vertices == 4, expected 6. mesh.c:8272: Test failed: Mesh 26: indices[3] == 1, expected 3 mesh.c:8272: Test failed: Mesh 26: indices[4] == 3, expected 4 mesh.c:8272: Test failed: Mesh 26: indices[5] == 2, expected 5 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[3] == 4, expected 3 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[4] == -1, expected 4 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[5] == -1, expected 5 mesh.c:8328: Test failed: Mesh 26: Got (3.000000, 0.000000, 0.000000) for vertex 3 position, expected (2.000000, 3.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 3 undefined color, expected (0, 0, 0, 0). mesh.c:8328: Test failed: Mesh 26: Got (2.000000, 3.000000, 0.000000) for vertex 4 position, expected (3.000000, 0.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 5 undefined color, expected (1, 1, 1, 1).

1 0

Re: reg: implement reg query operation
by Stefan Dösinger 05 Aug '15

05 Aug '15

Hi, > +#define MAX_NAME_BUFFER 255 > +#define MAX_VALUE_BUFFER 16383 I don't like this. Ideally the code should query the lengths from the Registry APIs and allocate appropriate buffers. If the Reg* functions guarantee a maximum size use defines from the public headers. > +static const WCHAR fmt_value[] = {' ',' ',' ','%','s',' ','%','s',' ','%','s','\n',0}; This is used in print_value() only, you can move it into this function. > +static const WCHAR no_name[] = { 'n','o','_','n','a','m','e',0 }; Is this used for the default value? Is "no_name" the right choice? Does this need localization? > + hkey = get_rootkey(key_name); > + subkey_name = strchrW(key_name, '\\'); > + if (NULL == hkey || NULL == subkey_name) > + { > + reg_printfW(fmt_err, key_name); > + return 1; > + } Are you sure that this is the right behavior? I haven't checked, but I can imagine that I can e.g. have a string value directly in HKEY_CURRENT_USER, in which case subkey_name would be NULL. > + value_buffer = HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_BUFFER); Please check for allocation errors. If you do stay with the fixed size buffer, do you need HeapAlloc at all? Can't you just put this on the stack? On a related note, passing value_buffer to the two helper functions but not its length, and setting value_len in those functions is ugly. This way the helper functions depend on an implementation detail of their caller. Yeah, the #define makes it a bit better, but it's still not pretty. > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /ve", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /v test0", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg Query HKCU\\" KEY_BASE " /s", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); > + > + run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); > + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); Some tests for error cases would be helpful as well, including all the error checks you have in your code. I expect scripts to parse the output of this command. Please add some tests that check the output. There's infrastructure for reading command output in other program tests that you can use. The following are style issues. I'm pointing them out while I'm at it, please fix them as well. > +static void query_sub(HKEY hkey, WCHAR* key_name, WCHAR* value_buffer) (Style) WCHAR *key_name please. "WCHAR*" is more common in C++. > + HKEY hsubkey = NULL; > + HKEY hkey = NULL; (Style) Please drop the h from these names. > + ret = RegOpenKeyExW( hkey, subkey_name+1, 0, KEY_READ, &hsubkey ); (Style) inconsistent space after parenthesis. > + if (ret == ERROR_SUCCESS ) Same > + static const WCHAR* reg_type[] = { > + type_none, > + type_sz, (Style) { placement

2 1

Re: widl: Added support for -ns_prefix option.
by Sebastian Lackner 05 Aug '15

05 Aug '15

On 04.08.2015 14:26, Jacek Caban wrote: > --- > tools/widl/header.c | 10 ++++++++-- > tools/widl/parser.l | 3 +++ > tools/widl/typetree.c | 12 ++++++++++-- > tools/widl/widl.c | 6 ++++++ > tools/widl/widl.h | 1 + > tools/widl/widl.man.in | 2 ++ > 6 files changed, 30 insertions(+), 4 deletions(-) > [...] > winrt_mode = 1; > break; > + case RT_NS_PREFIX: > + use_abi_namespace = 1; > case WIN32_OPTION: > do_win32 = 1; > do_win64 = 0; Is there maybe a break missing?

2 1

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). (try 2)
by Nikolay Sivov 05 Aug '15

05 Aug '15

On 31.07.2015 12:12, Zhenbo Li wrote: > try 2: > Test get_ownerDocument for more xml nodes. > > --- > dlls/msxml3/node.c | 2 ++ > dlls/msxml3/tests/domdoc.c | 51 > ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 53 insertions(+) > Hi. This looks fine to me. It would be nice to test attribute node too (I don't think it appears in children list, but it's been a while since I looked into it), but it's not a blocking issue.

1 0

Re:TestBot job 15747 results: quartz: waveparser support wav file generated by ffmpeg
by Changhui LIU 05 Aug '15

05 Aug '15

Hi Alexandre: The error code 80040256 is VFW_E_NO_AUDIO_HARDWARE, According to MSDN, the detail info is: Cannot play back the audio stream: no audio hardware is available, or the hardware is not supported. So these test failed on 64 bit windows is not caused by my patch: http://source.winehq.org/patches/data/113403 ------------------ Regards, Changhui Liu ------------------ Original ------------------ From: "Marvin"<testbot(a)winehq.org>; Date: Tue, Aug 4, 2015 07:04 PM To: "liuchanghui"<liuchanghui(a)linuxdeepin.com>; Subject: TestBot job 15747 results: quartz: waveparser support wav file generated by ffmpeg VM Status Number of test failures build completed w2000pro completed 0 wxppro completed 0 w2003std completed 0 wvistau64 completed 2 w2008s64 completed 2 w7u completed 0 w8 completed 0 wvistau64 completed 2 w2008s64 completed 2 === build (build) === No build failures found === w2000pro (32 bit filtergraph) === No test failures found === wxppro (32 bit filtergraph) === No test failures found === w2003std (32 bit filtergraph) === No test failures found === wvistau64 (32 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (32 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w7u (32 bit filtergraph) === No test failures found === w8 (32 bit filtergraph) === No test failures found === wvistau64 (64 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (64 bit filtergraph) === quartz: filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0

1 0

Re: [PATCH] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2)
by Matteo Bruni 04 Aug '15

04 Aug '15

2015-08-02 22:29 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > Fixes bug 38976. > > Try 2: Remove useless hr assignments. > --- > dlls/d3dx9_36/mesh.c | 4 ++ > dlls/d3dx9_36/tests/mesh.c | 168 ++++++++++++++++++++++++--------------------- > 2 files changed, 94 insertions(+), 78 deletions(-) > > diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c > index d0459da..39d279d 100644 > --- a/dlls/d3dx9_36/mesh.c > +++ b/dlls/d3dx9_36/mesh.c > @@ -5847,6 +5847,10 @@ static HRESULT triangulate(struct triangulation_array *triangulations) > int i; > struct point2d_index *idx_ptr; > > + /* Glyphs without outlines do not generate any vertices. */ > + if (!glyph->outlines.count) > + return D3D_OK; > + > for (i = 0; i < glyph->outlines.count; i++) > nb_vertices += glyph->outlines.items[i].count; > > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 0243a61..16c79ea 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -3617,57 +3617,17 @@ static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int da > return S_OK; > } > > -static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > - float deviation, float extrusion, float otmEMSquare) > +static BOOL compute_text_mesh(struct mesh *mesh, const char *text, > + float deviation, float extrusion, float otmEMSquare, const struct glyphinfo *glyphs) > { > - HRESULT hr = E_FAIL; > DWORD nb_vertices, nb_faces; > DWORD nb_corners, nb_outline_points; > int textlen = 0; > - float offset_x; > - char *raw_outline = NULL; > - struct glyphinfo *glyphs = NULL; > - GLYPHMETRICS gm; > int i; > struct vertex *vertex_ptr; > face *face_ptr; > > - if (deviation == 0.0f) > - deviation = 1.0f / otmEMSquare; > - > textlen = strlen(text); > - glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, textlen * sizeof(*glyphs)); > - if (!glyphs) { > - hr = E_OUTOFMEMORY; > - goto error; > - } > - > - offset_x = 0.0f; > - for (i = 0; i < textlen; i++) > - { > - /* get outline points from data returned from GetGlyphOutline */ > - const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > - int datasize; > - > - glyphs[i].offset_x = offset_x; > - > - datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > - if (datasize < 0) { > - hr = E_FAIL; > - goto error; > - } > - HeapFree(GetProcessHeap(), 0, raw_outline); > - raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); > - if (!raw_outline) { > - hr = E_OUTOFMEMORY; > - goto error; > - } > - datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, datasize, raw_outline, &identity); > - > - create_outline(&glyphs[i], raw_outline, datasize, deviation, otmEMSquare); > - > - offset_x += gm.gmCellIncX / (float)otmEMSquare; > - } > > /* corner points need an extra vertex for the different side faces normals */ > nb_corners = 0; > @@ -3691,7 +3651,7 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > nb_faces = nb_outline_points * 2; > > if (!new_mesh(mesh, nb_vertices, nb_faces)) > - goto error; > + return FALSE; > > /* convert 2D vertices and faces into 3D mesh */ > vertex_ptr = mesh->vertices; > @@ -3801,24 +3761,11 @@ static BOOL compute_text_mesh(struct mesh *mesh, HDC hdc, const char *text, > vertex_ptr++; > } > > - hr = D3D_OK; > -error: > - if (glyphs) { > - for (i = 0; i < textlen; i++) > - { > - int j; > - for (j = 0; j < glyphs[i].outlines.count; j++) > - HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items[j].items); > - HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items); > - } > - HeapFree(GetProcessHeap(), 0, glyphs); > - } > - HeapFree(GetProcessHeap(), 0, raw_outline); > - > - return hr == D3D_OK; > + return TRUE; > } > > -static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, int textlen, float extrusion) > +static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, struct mesh *mesh, > + size_t textlen, float extrusion, const struct glyphinfo *glyphs) > { > HRESULT hr; > DWORD number_of_vertices, number_of_faces; > @@ -3936,13 +3883,20 @@ static void compare_text_outline_mesh(const char *name, ID3DXMesh *d3dxmesh, str > > first_vtx1 = vtx_idx1; > first_vtx2 = vtx_idx2; > - for (; vtx_idx1 < number_of_vertices; vtx_idx1++) { > - if (vertices[vtx_idx1].normal.z != 0) > - break; > - } > - for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) { > - if (mesh->vertices[vtx_idx2].normal.z != 0) > - break; > + /* Glyphs without outlines do not generate any vertices. */ > + if (glyphs[i].outlines.count > 0) > + { > + for (; vtx_idx1 < number_of_vertices; vtx_idx1++) > + { > + if (vertices[vtx_idx1].normal.z != 0) > + break; > + } > + > + for (; vtx_idx2 < mesh->number_of_vertices; vtx_idx2++) > + { > + if (mesh->vertices[vtx_idx2].normal.z != 0) > + break; > + } > } > nb_outline_vertices1 = vtx_idx1 - first_vtx1; > nb_outline_vertices2 = vtx_idx2 - first_vtx2; > @@ -4124,15 +4078,19 @@ error: > static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, float extrusion) > { > HRESULT hr; > - ID3DXMesh *d3dxmesh; > - struct mesh mesh; > + ID3DXMesh *d3dxmesh = NULL; > + struct mesh mesh = {0}; > char name[256]; > OUTLINETEXTMETRICA otm; > GLYPHMETRICS gm; > + struct glyphinfo *glyphs = NULL; > GLYPHMETRICSFLOAT *glyphmetrics_float = HeapAlloc(GetProcessHeap(), 0, sizeof(GLYPHMETRICSFLOAT) * strlen(text)); > int i; > LOGFONTA lf; > + float offset_x; > + size_t textlen; > HFONT font = NULL, oldfont = NULL; > + char *raw_outline = NULL; > > sprintf(name, "text ('%s', %f, %f)", text, deviation, extrusion); > > @@ -4141,7 +4099,7 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > if (hr != D3D_OK) > { > skip("Couldn't create text with D3DXCreateText\n"); > - return; > + goto error; > } > > /* must select a modified font having lfHeight = otm.otmEMSquare before > @@ -4149,21 +4107,25 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > if (!GetObjectA(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf) > || !GetOutlineTextMetricsA(hdc, sizeof(otm), &otm)) > { > - d3dxmesh->lpVtbl->Release(d3dxmesh); > skip("Couldn't get text outline\n"); > - return; > + goto error; > } > lf.lfHeight = otm.otmEMSquare; > lf.lfWidth = 0; > if (!(font = CreateFontIndirectA(&lf))) > { > - d3dxmesh->lpVtbl->Release(d3dxmesh); > skip("Couldn't create the modified font\n"); > - return; > + goto error; > } > + > + textlen = strlen(text); > + glyphs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, textlen * sizeof(*glyphs)); > + if (!glyphs) > + goto error; > + > oldfont = SelectObject(hdc, font); > > - for (i = 0; i < strlen(text); i++) > + for (i = 0; i < textlen; i++) > { > const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > @@ -4175,8 +4137,42 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > compare_float(glyphmetrics_float[i].gmfCellIncY, gm.gmCellIncY / (float)otm.otmEMSquare); > } > > + if (deviation == 0.0f) > + deviation = 1.0f / otm.otmEMSquare; > + > + offset_x = 0.0f; > + for (i = 0; i < textlen; i++) > + { > + /* get outline points from data returned from GetGlyphOutline */ > + const MAT2 identity = {{0, 1}, {0, 0}, {0, 0}, {0, 1}}; > + int datasize; > + > + glyphs[i].offset_x = offset_x; > + > + datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, 0, NULL, &identity); > + if (datasize < 0) > + { > + SelectObject(hdc, oldfont); > + goto error; > + } > + HeapFree(GetProcessHeap(), 0, raw_outline); > + raw_outline = HeapAlloc(GetProcessHeap(), 0, datasize); > + if (!raw_outline) > + { > + SelectObject(hdc, oldfont); > + goto error; > + } > + datasize = GetGlyphOutlineA(hdc, text[i], GGO_NATIVE, &gm, datasize, raw_outline, &identity); > + > + create_outline(&glyphs[i], raw_outline, datasize, deviation, otm.otmEMSquare); > + > + offset_x += gm.gmCellIncX / (float)otm.otmEMSquare; > + } > + > + SelectObject(hdc, oldfont); > + > ZeroMemory(&mesh, sizeof(mesh)); > - if (!compute_text_mesh(&mesh, hdc, text, deviation, extrusion, otm.otmEMSquare)) > + if (!compute_text_mesh(&mesh, text, deviation, extrusion, otm.otmEMSquare, glyphs)) > { > skip("Couldn't create mesh\n"); > d3dxmesh->lpVtbl->Release(d3dxmesh); > @@ -4184,13 +4180,26 @@ static void test_createtext(IDirect3DDevice9 *device, HDC hdc, const char *text, > } > mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; > > - compare_text_outline_mesh(name, d3dxmesh, &mesh, strlen(text), extrusion); > + compare_text_outline_mesh(name, d3dxmesh, &mesh, textlen, extrusion, glyphs); > > +error: > free_mesh(&mesh); > > - d3dxmesh->lpVtbl->Release(d3dxmesh); > - SelectObject(hdc, oldfont); > + if (d3dxmesh) d3dxmesh->lpVtbl->Release(d3dxmesh); > HeapFree(GetProcessHeap(), 0, glyphmetrics_float); > + > + if (glyphs) > + { > + for (i = 0; i < textlen; i++) > + { > + int j; > + for (j = 0; j < glyphs[i].outlines.count; j++) > + HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items[j].items); > + HeapFree(GetProcessHeap(), 0, glyphs[i].outlines.items); > + } > + HeapFree(GetProcessHeap(), 0, glyphs); > + } > + HeapFree(GetProcessHeap(), 0, raw_outline); > } It looks like there is a minor (preexisting) issue here, the font is not deleted. Maybe fix that in a followup patch, while you're at it? The patch itself is fine to me though.

1 0

Re: [include] - add new file tcpestats.h
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 01:19, Vijay Kiran Kamuju wrote: > Changelog > include - add new file tcpestats.h > Your patch contains the same whitespace errors as the mingw header files. As far as I know, copying header files is not allowed, you have to type them yourself (even when the mingw header files are under a public domain license). (If someone else knows better, please correct me.) Regards, Sebastian

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.(try 2)
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 19:58, YongHao Hu wrote: > try 2: > Fix nameless union.(thanks Piotr) > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > > > + ULONG ReparseTag; > + USHORT ReparseDataLength; > + USHORT Reserved; > + union foo > + { > + struct > + { Please use DUMMYUNIONNAME instead, like in the other include files. It should look like this: union { ... } DUMMYUNIONNAME; Regards, Sebastian

1 0

Re: [5/5] msvcirt: Implement filebuf::open/close
by Piotr Caban 04 Aug '15

04 Aug '15

On 08/03/15 16:49, Iván Matellanes wrote: > @@ -884,8 +893,16 @@ filebuf* __thiscall filebuf_attach(filebuf *this, filedesc fd) > DEFINE_THISCALL_WRAPPER(filebuf_close, 4) > filebuf* __thiscall filebuf_close(filebuf *this) > { > - FIXME("(%p) stub\n", this); > - return NULL; > + TRACE("(%p)\n", this); > + if (this->fd == -1) > + return NULL; > + > + streambuf_lock(&this->base); > + call_streambuf_sync(&this->base); Please handle call_streambuf_sync failure here. > /* ?fd@filebuf@@QBEHXZ */ > @@ -911,8 +928,46 @@ int __thiscall filebuf_is_open(const filebuf *this) > DEFINE_THISCALL_WRAPPER(filebuf_open, 16) > filebuf* __thiscall filebuf_open(filebuf *this, const char *name, ios_open_mode mode, int protection) > { > - FIXME("(%p %s %d %d) stub\n", this, name, mode, protection); > - return NULL; > + const int inout_mode[4] = {-1, _O_RDONLY, _O_WRONLY, _O_RDWR}; > + const int share_mode[4] = {_SH_DENYRW, _SH_DENYWR, _SH_DENYRD, _SH_DENYNO}; > + int op_flags, sh_flags, fd; > + > + TRACE("(%p %s %d %d)\n", this, name, mode, protection); It will be easier to read the logs if mode and protection is printed as hexadecimal value. The same way op_flags and sh_flags should be printed. > + if (this->fd != -1) > + return NULL; > + > + /* mode */ > + if (mode & (OPENMODE_app|OPENMODE_trunc)) > + mode |= OPENMODE_out; > + op_flags = inout_mode[mode & (OPENMODE_in|OPENMODE_out)]; > + if (op_flags < 0) > + return NULL; > + if (mode & OPENMODE_app) > + op_flags |= _O_APPEND; > + if ((mode & OPENMODE_trunc) || > + ((mode & OPENMODE_out) && !(mode & (OPENMODE_in|OPENMODE_app|OPENMODE_ate)))) > + op_flags |= _O_TRUNC; > + if (!(mode & OPENMODE_nocreate)) > + op_flags |= _O_CREAT; > + if (mode & OPENMODE_noreplace) > + op_flags |= _O_EXCL; > + op_flags |= (mode & OPENMODE_binary) ? _O_BINARY : _O_TEXT; > + > + /* share protection */ > + sh_flags = (protection & filebuf_sh_none) ? share_mode[(protection >> 9) & 3] : _SH_DENYNO; > + > + TRACE("op_flags %d, sh_flags %d\n", op_flags, sh_flags); > + fd = _sopen(name, op_flags, sh_flags, _S_IREAD|_S_IWRITE); > + if (fd < 0) > + return NULL; > + > + streambuf_lock(&this->base); > + this->fd = fd; > + this->close = 1; > + if (mode & OPENMODE_ate) > + call_streambuf_seekoff(&this->base, 0, SEEKDIR_end, OPENMODE_in|OPENMODE_out); Please handle seek failure here. Thanks, Piotr

1 0

Re: wine.inf: Add UTC Time Zone (try 4)
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 04.08.2015 03:05, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..30cf5ab 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/UTC" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Coordinated Universal Time" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Looks good, thanks! :)

1 0

Re: quartz: waveparser support wav file generated by ffmpeg
by Marvin 04 Aug '15

04 Aug '15

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=15747 Your paranoid android. === wvistau64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (32 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === wvistau64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0 === w2008s64 (64 bit filtergraph) === filtergraph.c:165: Test failed: RenderFile returned: 80040256 filtergraph.c:83: Test failed: Cannot run the graph returned: 0

1 0

Re: [PATCH 4/5] d3d9: Don't assert on invalid IDirect3DBaseTexture9 interfaces.
by Stefan Dösinger 04 Aug '15

04 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-08-04 um 08:53 schrieb Henri Verbeet: > + texture->lpVtbl = (IDirect3DBaseTexture9Vtbl *)0xdeadbeef; > + hr = IDirect3DDevice9_SetTexture(device, 0, texture); > + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); I guess you're not testing GetTexture because it crashes when trying to AddRef the texture? > + if (iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_cube_vtbl > + && iface->lpVtbl != (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl) > + { > + WARN("%p is not a valid IDirect3DBaseTexture8 interface.\n", iface); > + return NULL; > + } Minor copypaste bug ("IDirect3DBaseTexture8"). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVwHkaAAoJEN0/YqbEcdMwAykP/3XM3HslUzcvJ+d5Jz59febN pBoVG5dJO0uboxYAjuv1Fj6Ft9+CWvcSOva6Oo1cnwV06ojY82oFC5XIQp+UB9xQ nU+T8In0b5IPX82uTSEM6k/uVE3Yycc41DmvD1/VxF29el64Oifn1afOcAg7TRAV f93+yR464vBzx7esXRpXkF5X1xvmsW1LtnJe3Z1uHqNMiZwixn9M33kuceMz0ZqD H9o8Hxn1sESurxR/2cEZFFzHne36l067NY2/HsJ9yeBk90zay+99iojMcWCLhhF2 CHj6xynbxWZCGFSRQM29HtCt/P5nl6lrg/jXeFY8AwmAf0n9NMBOyxqb8c7BVFx/ bSO75oPiyHS8xzBxdgqCuJka18QlTuy40UwNwQTU6TckcHl+MyezthLKAFSRV42i zGjcV0S725bQWy2/S4ep+fuxWaJNT5JKULvcqQxHDo3h/NBLyvHI+fNXMhZGJWdH Z1Xl2lGhoihIieu+2Xo5Jt+ghuecs8RQYIfamsYGQJDIuyovE8PAKGoPy/S+CzyN ypOPjXwhDTEIJpMm0/Gaxc49FkjbHiLjcevJS6wRP5JQJzIrKy94SwPCIhRiQoj7 dLgsiPAppEGLgkhFTQ1DcYvkS4UcPMlN8K0dmcXFiMWgzmfeKm2gnZ9+2p2WfhZf 5FGMz4ENg5TuWxay3YRj =4SY2 -----END PGP SIGNATURE-----

2 1

Re: loader: Add UTC Time Zone
by Sebastian Lackner 04 Aug '15

04 Aug '15

On 03.08.2015 16:32, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..1627ad6 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" I just saw that we have also a unix timezone Etc/UTC, this might be more appropriate (especially to avoid confusion with "GMT Standard Time", which is a separate entry in the file). > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" For all other entries it contains a human readable name. Something like "Coordinated Universal Time" for both Dlt and Std might be a bit better. > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" > Two other remarks: * When you send an updated version, please append "(try N)" to your subject, to make clear which version is newer. * A subject starting with "wine.inf:" might be better, since your patch only touches this single file, not the loader itself. Sorry for not pointing out all those things earlier. Best regards, Sebastian

2 3

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by Piotr Caban 03 Aug '15

03 Aug '15

On 07/29/15 20:01, YongHao Hu wrote: > + union > + { > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + ULONG Flags; > + WCHAR PathBuffer[1]; > + } SymbolicLinkReparseBuffer; > + struct > + { > + USHORT SubstituteNameOffset; > + USHORT SubstituteNameLength; > + USHORT PrintNameOffset; > + USHORT PrintNameLength; > + WCHAR PathBuffer[1]; > + } MountPointReparseBuffer; > + struct > + { > + UCHAR DataBuffer[1]; > + } GenericReparseBuffer; > + }; This will not work on some compilers (nameless unions). Thanks, Piotr

1 0

Re: winex11.drv: Unmaximize restored windows when necessary.
by Vincent Povirk 03 Aug '15

03 Aug '15

I don't think it's possible to sync the window modes correctly without maximizing first or messing with user32 internals. Is there something else I can follow up on?

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner 03 Aug '15

03 Aug '15

On 03.08.2015 14:48, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2ab6ff3 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 This is still wrong unfortunately, there should only be one "," before the 1, otherwise it is not interpreted correctly. > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

1 0

Re: loader: Add UTC Time Zone
by Sebastian Lackner 03 Aug '15

03 Aug '15

On 02.08.2015 14:12, Philippe Groarke wrote: > Fixes 39008 > --- > loader/wine.inf.in | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in > index 315ef29..2a7505c 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -3070,6 +3070,10 @@ HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Display",,"America > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Dlt",,"US Mountain Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"Std",,"US Mountain Standard Time" > HKLM,%CurrentVersionNT%\Time Zones\US Mountain Standard Time,"TZI",1,a4,01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Display",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Dlt",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"Std",,"Etc/GMT" > +HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Hello Philippe, thanks for working on this. The line above is unfortunately not completely correct, you forgot to specify the type of the registry key (it should be a binary key in this case). It should look like this: HKLM,%CurrentVersionNT%\Time Zones\UTC,"TZI",1,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 Besides that the patch is fine. Regards, Sebastian > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Display",,"America/Caracas" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Dlt",,"Venezuela Daylight Time" > HKLM,%CurrentVersionNT%\Time Zones\Venezuela Standard Time,"Std",,"Venezuela Standard Time" >

2 1

Re: [PATCH 1/4] reg: Add path/key conversion functions
by Stefan Dösinger 03 Aug '15

03 Aug '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Thanks for picking up this work! Please submit patches with your real name. We need this for proper copyright attribution. Since this is derived from Jonathan work please mention this as well. The patch doesn't apply for me, I suspect that this is because of the no-break spaces instead of normal spaces. I highly recommend to use git send-email to send the mail. I haven't looked at the code itself. I hope I get around to look at it later today or on Sunday and compare it to the last suggestions I gave Jonathan. If you don't hear from me by Monday please ping me again. Cheers, Stefan Am 2015-07-31 um 11:46 schrieb xantares 09: > --- programs/reg/reg.c | 166 > +++++++++++++++++++++++++++------------------------- 1 file > changed, 86 insertions(+), 80 deletions(-) > > diff --git a/programs/reg/reg.c b/programs/reg/reg.c index > 4ec25bc..cf6425e 100644 --- a/programs/reg/reg.c +++ > b/programs/reg/reg.c @@ -22,6 +22,32 @@ > > #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) > > +static const WCHAR short_hklm[] = {'H','K','L','M',0}; +static > const WCHAR short_hkcu[] = {'H','K','C','U',0}; +static const WCHAR > short_hkcr[] = {'H','K','C','R',0}; +static const WCHAR short_hku[] > = {'H','K','U',0}; +static const WCHAR short_hkcc[] = > {'H','K','C','C',0}; +static const WCHAR long_hklm[] = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > +static const WCHAR long_hkcu[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; > +static const WCHAR long_hkcr[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > +static const WCHAR long_hku[] = {'H','K','E','Y','_','U','S','E','R','S',0}; > +static const WCHAR long_hkcc[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > + > +static const struct +{ + HKEY key; + const WCHAR > *short_name; + const WCHAR *long_name; +} +root_rels[] = +{ + > {HKEY_LOCAL_MACHINE, short_hklm, long_hklm}, + > {HKEY_CURRENT_USER, short_hkcu, long_hkcu}, + > {HKEY_CLASSES_ROOT, short_hkcr, long_hkcr}, + {HKEY_USERS, > short_hku, long_hku}, + {HKEY_CURRENT_CONFIG, short_hkcc, > long_hkcc}, +}; + static const WCHAR type_none[] = > {'R','E','G','_','N','O','N','E',0}; static const WCHAR type_sz[] = > {'R','E','G','_','S','Z',0}; static const WCHAR type_expand_sz[] = > {'R','E','G','_','E','X','P','A','N','D','_','S','Z',0}; @@ -95,51 > +121,56 @@ static int reg_message(int msg) return > reg_printfW(formatW, msg_buffer); } > > -static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) > +static inline BOOL path_rootname_cmp(const WCHAR *input_path, > const WCHAR *rootkey_name) { - int i; + DWORD length = > strlenW(rootkey_name); > > - for (i = 0; i < len; i++) + return (!strncmpiW(input_path, > rootkey_name, length) && + (input_path[length] == 0 || > input_path[length] == '\\')); +} + +static HKEY > path_get_rootkey(const WCHAR *path) +{ + DWORD i; + + for (i > = 0; i < ARRAY_SIZE(root_rels); i++) { - if (!str[i]) - > { - len = i + 1; - break; - } + > if (path_rootname_cmp(path, root_rels[i].short_name) || + > path_rootname_cmp(path, root_rels[i].long_name)) + > return root_rels[i].key; } > > - return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, > len) - CSTR_EQUAL; + return NULL; } > > -static HKEY get_rootkey(LPWSTR key) +static HKEY path_open(const > WCHAR *path, BOOL create) { - static const WCHAR szHKLM[] = > {'H','K','L','M',0}; - static const WCHAR szHKEY_LOCAL_MACHINE[] > = > {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N',' E',0}; > > - - static const WCHAR szHKCU[] = {'H','K','C','U',0}; > - static const WCHAR szHKEY_CURRENT_USER[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0 }; > > - - static const WCHAR szHKCR[] = {'H','K','C','R',0}; > - static const WCHAR szHKEY_CLASSES_ROOT[] = > {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0 }; > > - - static const WCHAR szHKU[] = {'H','K','U',0}; > - static const WCHAR szHKEY_USERS[] = > {'H','K','E','Y','_','U','S','E','R','S',0}; - static const > WCHAR szHKCC[] = {'H','K','C','C',0}; - static const WCHAR > szHKEY_CURRENT_CONFIG[] = > {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F',' I','G',0}; > > - - > - if (!reg_StrCmpNIW(key, szHKLM, 4) || - > !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) - return > HKEY_LOCAL_MACHINE; - else if (!reg_StrCmpNIW(key, szHKCU, 4) > || - !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) - > return HKEY_CURRENT_USER; - else if (!reg_StrCmpNIW(key, szHKCR, > 4) || - !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) - > return HKEY_CLASSES_ROOT; - else if (!reg_StrCmpNIW(key, szHKU, > 3) || - !reg_StrCmpNIW(key, szHKEY_USERS, 10)) - > return HKEY_USERS; - else if (!reg_StrCmpNIW(key, szHKCC, 4) || > - !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) - > return HKEY_CURRENT_CONFIG; - else return NULL; + LONG err; + > HKEY k; + + k = path_get_rootkey(path); + if (!k) + { + > reg_message(STRING_INVALID_KEY); + return NULL; + } + + > path = strchrW(path, '\\'); + if (path) + path++; + + > if (create) + err = RegCreateKeyW(k, path, &k); + else + > err = RegOpenKeyW(k, path, &k); + + if (err != ERROR_SUCCESS) + > { + reg_message(STRING_CANNOT_FIND); + return NULL; + > } + + return k; } > > static DWORD wchar_get_type(const WCHAR *type_name) @@ -221,34 > +252,16 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, > BOOL value_empty, { static const WCHAR stubW[] = {'A','D','D',' > ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s',' > ','%','s',' ','%','d','\n',0}; - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; > > reg_printfW(stubW, key_name, value_name, value_empty, type, data, > force); > > if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > TRUE); + if (!subkey) return 1; - } - - > if(RegCreateKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } > > if (value_name || data) { @@ -288,8 +301,8 @@ static int > reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, > static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL > value_empty, BOOL value_all, BOOL force) { - LPWSTR p; - HKEY > root,subkey; + HKEY subkey; + LONG err; > > static const WCHAR stubW[] = {'D','E','L','E','T','E', ' ','-',' > ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' @@ > -299,20 +312,9 @@ static int reg_delete(WCHAR *key_name, WCHAR > *value_name, BOOL value_empty, if (!sane_path(key_name)) return 1; > > - p = strchrW(key_name,'\\'); - if (!p) - { - > reg_message(STRING_INVALID_KEY); - return 1; - } - > p++; - - root = get_rootkey(key_name); - if (!root) - { - > reg_message(STRING_INVALID_KEY); + subkey = path_open(key_name, > FALSE); + if (!subkey) return 1; - } > > if (value_name && value_empty) { @@ -334,7 +336,17 @@ static int > reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* > Delete subtree only if no /v* option is given */ if (!value_name && > !value_empty && !value_all) { - if > (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + static const WCHAR > empty_wstr[] = {0}; + + err = RegDeleteTreeW(subkey, NULL); > + if (err != ERROR_SUCCESS) + { + > reg_message(STRING_CANNOT_FIND); + return 1; + } > + + err = RegDeleteKeyW(subkey, empty_wstr); + if > (err != ERROR_SUCCESS) { reg_message(STRING_CANNOT_FIND); return > 1; @@ -343,12 +355,6 @@ static int reg_delete(WCHAR *key_name, > WCHAR *value_name, BOOL value_empty, return 0; } > > - if(RegOpenKeyW(root,p,&subkey)!=ERROR_SUCCESS) - { - > reg_message(STRING_CANNOT_FIND); - return 1; - } - if > (value_all) { LPWSTR szValue; > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVu33xAAoJEN0/YqbEcdMw1MEP/RZYiu5ZzcuAxcOvzmu2LrqR siZmDtSFzd+KN40tHl8IgrFB2kX2RePc0i4cNZJ1EUeMReS84HXoXSzUtDil5oy8 g0J9jFaZVv3xtznxKtQZDur2v3t+IYicjquhfbj7szheLpRbnfULwk3cs825QN1k C/Nhpj9aeDST49fe/YSi84XC15n2OyVHcZtTRgd4IZFVgd76L5kQYKYzLmv4ttes Mm5LGn5No72nehefRkW9YaFv2JAddgM/2jgz48+nd/pFhCB1NyXL2K6c5WPxT1OT Ahyx3oatrP5vSgNDc1Q3g0qGgYlk+aJAfulbSYZ4aSxS/YFcVqMbjEqb8mpPGUzX 1viNVuxg4dcfxozINJYPLkyU/ef9DwlSLdG3HlN9HDy/WFK/0lW4L4TEV9DrPwA+ /OPB8I7Vkb3r6qjsBEH4c1yG9PVQ0TiP3vjpEZM20J/gsvlTnJ6g3PSm9hFjwBWH bv5eBKJMUJKYiEJSoamfnermKEcxBcdOKsGbMApvRyVifcuUpY45+zv4bH0iVnKM 6pxb0EhWfizzbsDItSLDYNJZj1/XgMisgoKwnfUyxdmzRuzW9SipFmFqU6v8Sxpd QQOFSVG0IzL1QED51V2rlS5H1kZxCjRp+mKAn0j6a6KGNuZHcSAqCanhkyVW8FY7 OiDRd7mrwc32lMRcxqS+ =Sn4W -----END PGP SIGNATURE-----

2 2

Re: ole32: Add stub implementations of CoGetActivationState and CoGetCallState.
by Dmitry Timoshkov 03 Aug '15

03 Aug '15

Hans Leidekker <hans(a)codeweavers.com> wrote: > +/*********************************************************************** > + * CoGetActivationState (ole32.@) > + */ > +HRESULT CoGetActivationState(GUID guid, DWORD unknown, DWORD *unknown2) > +{ > + FIXME("%s, %x, %p\n", debugstr_guid(&guid), unknown, unknown2); > + return E_NOTIMPL; > +} > + > +/*********************************************************************** > + * CoGetCallState (ole32.@) > + */ > +HRESULT WINAPI CoGetCallState(int unknown, PULONG unknown2) > +{ > + FIXME("%d, %p\n", unknown, unknown2); > + return E_NOTIMPL; > +} wct.h from PSDK has typedefs for COGETCALLSTATE and COGETACTIVATIONSTATE without WINAPI, so probably implementations shouldn't have them either. Same applies to .spec file entries. -- Dmitry.

1 0

Re: [PATCH] d3dx9: Correctly handle whitespace character in D3DXCreateText. (try 2)
by Marvin 03 Aug '15

03 Aug '15

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=15708 Your paranoid android. === w8 (32 bit mesh) === mesh.c:8258: Test failed: Mesh 26: new_num_vertices == 4, expected 6. mesh.c:8272: Test failed: Mesh 26: indices[3] == 1, expected 3 mesh.c:8272: Test failed: Mesh 26: indices[4] == 3, expected 4 mesh.c:8272: Test failed: Mesh 26: indices[5] == 2, expected 5 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[3] == 4, expected 3 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[4] == -1, expected 4 mesh.c:8313: Test failed: Mesh 26: vertex_remap_ptr[5] == -1, expected 5 mesh.c:8328: Test failed: Mesh 26: Got (3.000000, 0.000000, 0.000000) for vertex 3 position, expected (2.000000, 3.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 3 undefined color, expected (0, 0, 0, 0). mesh.c:8328: Test failed: Mesh 26: Got (2.000000, 3.000000, 0.000000) for vertex 4 position, expected (3.000000, 0.000000, 0.000000). mesh.c:8328: Test failed: Mesh 26: Got (255, 255, 255, 255) for vertex 5 undefined color, expected (1, 1, 1, 1).

2 1

Re: [PATCH] include: Fix packing of digitalv.h
by Dmitry Timoshkov 02 Aug '15

02 Aug '15

Bernhard Übelacker <bernhardu(a)vr-web.de> wrote: > diff --git a/include/digitalv.h b/include/digitalv.h > index a4ceb54..00601f4 100644 > --- a/include/digitalv.h > +++ b/include/digitalv.h > @@ -23,6 +23,8 @@ > * Wine Digital Video extensions > */ > > +#include <pshpack1.h> > + > #ifdef __cplusplus > extern "C" { > #endif This needs a matching #include <poppack.h> -- Dmitry.

1 0

Re: [PATCH 1/2] include: Add ntifs.h with Reparse point related definitions and typedefs.
by YongHao Hu 02 Aug '15

02 Aug '15

Excuse me, Is there anything to do to improve this patch? On 15/7/30 上午2:01, YongHao Hu wrote: > --- > include/Makefile.in | 1 + > include/ntifs.h | 83 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 include/ntifs.h > >

1 0

Re: [PATCH] user32: Return correct size for SM_CXSMICON on high-DPI screens.
by Ken Thomases 01 Aug '15

01 Aug '15

On Aug 1, 2015, at 8:49 AM, Mark Harmstone <hellas(a)burntcomma.com> wrote: > Wine currently hardcodes the value of SM_CXSMICON in GetSystemMetrics as 16, > but Windows scales this on high-DPI screens: see https://msdn.microsoft.com/en-us/library/ms701681.aspx. According to that page, it only scales the results from GetSystemMetrics() for apps which have disabled automatic DPI scaling by calling SetProcessDPIAware(). Which makes sense because if the DPI is 192 and the app thinks the small icon size is 32x32 pixels and draws something that size and then it's scaled again for the DPI, it will appear 4 times the linear pixel size, rather than just the 2 times it should be for the DPI. -Ken

1 0

Re: [PATCH 00/21] MSVC 2015 CRT
by Martin Storsjö 01 Aug '15

01 Aug '15

Hi, On Thu, 23 Jul 2015, Martin Storsjo wrote: > The RTM version of MSVC 2015 is out now, and along with that, a new > CRT version (again). As most of you probably know already, the CRT > has now been split into two parts, ucrtbase (which is considered > a system component in Windows 10, and is available as a redistributable > installable component for older Windows versions) and vcruntime140 > (which is the normal, compiler specific runtime). > > Even if Windows 10 isn't out yet, this is based on the redistributable > ucrtbase.dll that is installed by MSVC 2015. > > The ucrtbase.dll isn't very functional after this patchset; e.g. many > stdio functions have been restructured and need to be updated. (I'll > send a patch for that later, once this patchset has been merged.) But > after this set, a minimal plain empty exe built with the dynamic CRT > with MSVC 2015 does start up. Any comments on this patchset, other than the detail about cdecl vs stdcall in the forwarding dlls that Sebastian pointed out? Now that Windows 10 RTM is out, this can also be updated with the version of ucrtbase.dll from there. The only difference is a few added private (functions starting with _o_) stubs in the spec file. If there's no further comments on the set as such, I can resend it with the spec file updated, and the cdecl vs stdcall issues fixed. // Martin

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin 31 Jul '15

31 Jul '15

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=15677 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin 31 Jul '15

31 Jul '15

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=15676 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin 31 Jul '15

31 Jul '15

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=15675 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin 31 Jul '15

31 Jul '15

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=15671 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin 31 Jul '15

31 Jul '15

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=15670 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin 31 Jul '15

31 Jul '15

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=15669 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: ole32/tests: Fix new failures in CoWaitForMultipleHandles tests
by Marvin 30 Jul '15

30 Jul '15

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=15660 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test (v2).
by Marvin 30 Jul '15

30 Jul '15

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=15655 Your paranoid android. === w8 (32 bit visual) === visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 77. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 77. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 77. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 77. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 77. visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 75. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 75. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 75. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 75. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 75. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 75.

1 0

Re: ole32: Don't pump all messages in CoWaitForMultipleHandles in threads without apartment window
by Marvin 30 Jul '15

30 Jul '15

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=15654 Your paranoid android. === w8 (32 bit compobj) === compobj.c:2149: Test failed: expected index 0, got 3735928559 compobj.c:2157: Test failed: expected index 0, got 3735928559

1 0

Re: [PATCH 4/4] reg: Clean up reg_delete
by Marvin 30 Jul '15

30 Jul '15

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=15658 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 3/4] reg: Clean up reg_add
by Marvin 30 Jul '15

30 Jul '15

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=15657 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] reg: Add wchar/raw data conversion functions
by Marvin 30 Jul '15

30 Jul '15

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=15656 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test.
by Marvin 30 Jul '15

30 Jul '15

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=15652 Your paranoid android. === w8 (32 bit visual) === visual.c:19757: Test failed: Got unexpected color 00ffffff at x=64, format 77. visual.c:19759: Test failed: Got unexpected color 00ffffff at x=190, format 77. visual.c:19762: Test failed: Got unexpected color 00ffffff at x=194, format 77. visual.c:19764: Test failed: Got unexpected color 00ffffff at x=318, format 77. visual.c:19767: Test failed: Got unexpected color 00000000 at x=322, format 77. visual.c:19769: Test failed: Got unexpected color 00000000 at x=446, format 77.

1 0

Re: [4 PATCHES] reg.exe: implement query (bug #24017)
by Alex Henrie 30 Jul '15

30 Jul '15

Xan, You will have to send these patches to the mailing list in separate emails. I strongly recommend using the `git send-email` command for this purpose. It would also be a good idea to ask for feedback on the #wine-staging IRC channel. -Alex

5 5

Re: [PATCH] ws2_32: Implement setting the keep-alive idle timeout and interval on Mac OS.
by Ken Thomases 30 Jul '15

30 Jul '15

On Jul 30, 2015, at 1:38 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > @@ -4459,14 +4464,20 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID > fd = get_sock_fd(s, 0, NULL); > if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive, sizeof(int)) == -1) > status = WSAEINVAL; > -#if defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) > +#if defined(TCP_KEEPIDLE) This could be an #ifdef, but see below. > /* these values need to be set only if SO_KEEPALIVE is enabled */ > else if(keepalive) > { > if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&keepidle, sizeof(int)) == -1) > status = WSAEINVAL; > + /* TCP_KEEPINTVL was only introduced on Mac in 10.9 */ > +#ifdef TCP_KEEPINTVL > else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&keepintvl, sizeof(int)) == -1) > status = WSAEINVAL; > +#else > + else > + FIXME("ignoring keepalive interval\n"); > +#endif > } > #else > else The #ifdef's in the above don't seem quite right. If TCP_KEEPINTVL is a legitimate alternative to TCP_KEEPIDLE/TCP_KEEPALIVE, then why is the latter a precondition for trying the former? That is, if TCP_KEEPINTVL is defined but TCP_KEEPIDLE is not, we still don't try it. That's not something that you introduced, but might as well fix it. -Ken

1 0

HID work?
by Aric Stewart 30 Jul '15

30 Jul '15

Hi, Just a poke around the HID patches I have submitted. After my last refactor they did not appear to get any review. I know that Alexandre has been off on a vacation so that is part of it. But I wanted to know what is next that I need to fix or if they can start getting in. thanks! -aric

1 0

Re: [PATCH 1/2] wined3d: Try to detect the polygon offset scale value.
by Henri Verbeet 30 Jul '15

30 Jul '15

On 30 July 2015 at 12:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + if (depth->format_flags & WINED3DFMT_FLAG_FLOAT) > + scale = gl_info->float_polyoffset_scale; > + else > + scale = gl_info->fixed_polyoffset_scale; Ideally this would be a format property. In practice it probably works because we only use 24 and 32 bit depth formats, and the hardware probably either only distinguishes between 16 and 24/32, or just doesn't support 32. > + while(1) I would have preferred that as "for (;;)" > + return powf(2, cur); It seems the compiler is smart enough to work it out, but strictly speaking powf() takes floating point arguments.

2 1

Re: [PATCH 2/2] d3d9/tests: Add a depth bias test.
by Henri Verbeet 30 Jul '15

30 Jul '15

On 30 July 2015 at 12:00, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > + static const D3DFORMAT formats[] = > + { > + D3DFMT_D16, D3DFMT_D24X8, D3DFMT_D32, > + > + /* The scaling factor detection function detects the wrong factor for > + * float formats on Nvidia, therefore the following tests are disabled. > + * The wined3d function detects 2^23 like for fixed point formats but > + * the test needs 2^22 to pass. > + * > + * AMD GPUs need a different scaling factor for float depth buffers > + * (2^24) than fixed point (2^23), but the wined3d detection function > + * works there, producing the right result in the test. > + * > + * D3DFMT_D32F_LOCKABLE, D3DFMT_D24FS8, > + */ > + }; > + No D24S8? I think that's one of the most common formats. (No INTZ either, but I suppose it's likely to behave like everything else.)

1 0

Re: ws2_32: socket keepalive for OSX
by Charles Davis 30 Jul '15

30 Jul '15

> On Jul 29, 2015, at 7:30 PM, Matt Durgavich <mattdurgavich(a)gmail.com> wrote: > --- a/dlls/ws2_32/socket.c > +++ b/dlls/ws2_32/socket.c > @@ -4468,6 +4468,15 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID […] > + else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, (void*)&keepintvl, sizeof(int)) == -1) > + status = WSAEINVAL; This isn’t correct. Not for Darwin, anyway. TCP_KEEPALIVE on Darwin corresponds to Linux TCP_KEEPIDLE, not TCP_KEEPINTVL. (I checked. I read the kernel source to make sure of this.) The easiest way to implement this is to define TCP_KEEPIDLE to TCP_KEEPALIVE if TCP_KEEPIDLE isn’t defined but TCP_KEEPALIVE is. As for the other BSD systems, I’m pretty sure they implement the Linux interface (if at all). I know FreeBSD does. Also, Darwin only grew support for TCP_KEEPINTVL in Darwin 13 (i.e. Mac OS 10.9), so even with my suggested change, the existing #ifdef block won’t get compiled in on lower than 10.9. If you want to support 10.6 (when TCP_KEEPALIVE was introduced) through 10.8, you might consider pulling the TCP_KEEPINTVL check into its own #ifdef block, and printing a FIXME if it isn’t defined. You know what? I already have a patch that does all these things. I think I’ll just send that. (I’ve really got to start sending more of my patches upstream…) Chip

1 0

Re: ws2_32: socket keepalive for OSX
by Bruno Jesus 30 Jul '15

30 Jul '15

Hi, Matt, thanks for the patch, here is some feedback. Please use a 4 space identation like the code style in this function. > +#elif defined(SO_KEEPALIVE) && defined(TCP_KEEPALIVE) SO_KEEPALIVE is defined for sure (already used outside #ifdef) so there is no need to test. > + /* BSDish platforms like Darwin */ > + else if (keepalive) > + { > + if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (void*)&keepalive, sizeof(int)) == 1) > + status = WSAEINVAL; SO_KEEPALIVE value was already set by a previous call before the #ifdef. Is there a reason to repeat it? Also you are testing the return value for 1 instead of -1. > + else if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, (void*)&keepintvl, sizeof(int)) == -1) > + status = WSAEINVAL; > + } Please note that in the rest of the code it is used (void *), not (void*). Best wishes, Bruno On Wed, Jul 29, 2015 at 10:30 PM, Matt Durgavich <mattdurgavich(a)gmail.com> wrote: > Set socket options for keepalive on OSX tcp connections. > No tests at this time. > > dlls/ws2_32/socket.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > > >

1 0

Re: [PATCH 5/5] d3dx9/tests: Add tests for normals computation.
by Matteo Bruni 29 Jul '15

29 Jul '15

2015-07-25 11:23 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > --- > dlls/d3dx9_36/tests/mesh.c | 573 +++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 573 insertions(+) > > diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c > index 2da077a..a5b3c46 100644 > --- a/dlls/d3dx9_36/tests/mesh.c > +++ b/dlls/d3dx9_36/tests/mesh.c > @@ -65,6 +65,11 @@ static BOOL compare_vec3(D3DXVECTOR3 u, D3DXVECTOR3 v) > return ( compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) ); > } > > +static BOOL compare_vec4(D3DXVECTOR4 u, D3DXVECTOR4 v) > +{ > + return compare(u.x, v.x) && compare(u.y, v.y) && compare(u.z, v.z) && compare(u.w, v.w); > +} > + > #define check_floats(got, exp, dim) check_floats_(__LINE__, "", got, exp, dim) > static void check_floats_(int line, const char *prefix, const float *got, const float *exp, int dim) > { > @@ -10373,6 +10378,573 @@ static void test_optimize_faces(void) > "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); > } > > +static HRESULT clear_normals(ID3DXMesh *mesh) > +{ > + HRESULT hr; > + BYTE *vertices; > + size_t normal_size; > + DWORD i, num_vertices, vertex_stride; > + const D3DXVECTOR4 normal = {NAN, NAN, NAN, NAN}; > + D3DVERTEXELEMENT9 *normal_declaration = NULL; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + > + if (FAILED(hr = mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + return hr; > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) > + { > + if (declaration[i].Usage == D3DDECLUSAGE_NORMAL && declaration[i].UsageIndex == 0) Style, lowercase hex literal and !var instead of var == 0 are usually preferred in d3d. > + { > + normal_declaration = &declaration[i]; > + break; > + } > + } > + > + if (!normal_declaration) > + return D3DERR_INVALIDCALL; > + > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + normal_size = sizeof(D3DXVECTOR3); > + } > + else if (normal_declaration->Type == D3DDECLTYPE_FLOAT4) > + { > + normal_size = sizeof(D3DXVECTOR4); > + } > + else > + { > + trace("Cannot clear normals\n"); > + return E_NOTIMPL; > + } > + > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + > + if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + return hr; > + > + vertices += normal_declaration->Offset; > + > + for (i = 0; i < num_vertices; i++, vertices += vertex_stride) > + memcpy(vertices, &normal, normal_size); > + > + return mesh->lpVtbl->UnlockVertexBuffer(mesh); > +} > + > +static void compare_normals(unsigned int line, const char *test_name, > + ID3DXMesh *mesh, const D3DXVECTOR3 *normals, unsigned int num_normals) > +{ > + unsigned int i; > + BYTE *vertices; > + DWORD num_vertices, vertex_stride; > + D3DVERTEXELEMENT9 *normal_declaration = NULL; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + > + if (FAILED(mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + { > + ok_(__FILE__, line)(0, "%s: Failed to get declaration\n", test_name); > + return; > + } > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) > + { > + if (declaration[i].Usage == D3DDECLUSAGE_NORMAL && declaration[i].UsageIndex == 0) > + { > + normal_declaration = &declaration[i]; > + break; > + } > + } > + > + if (!normal_declaration) > + { > + ok_(__FILE__, line)(0, "%s: Mesh has no normals\n", test_name); > + return; > + } > + > + if (normal_declaration->Type != D3DDECLTYPE_FLOAT3 && normal_declaration->Type != D3DDECLTYPE_FLOAT4) > + { > + ok_(__FILE__, line)(0, "%s: Mesh has invalid normals type\n", test_name); > + return; > + } > + > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + > + ok_(__FILE__, line)(num_vertices == num_normals, "%s: Expected %u vertices, got %u\n", test_name, > + num_normals, num_vertices); > + > + if (FAILED(mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + { > + ok_(__FILE__, line)(0, "%s: Failed to compare normals\n", test_name); > + return; > + } > + > + vertices += normal_declaration->Offset; > + > + for (i = 0; i < min(num_vertices, num_normals); i++, vertices += vertex_stride) > + { > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + const D3DXVECTOR3 *n = (D3DXVECTOR3 *)vertices; > + ok_(__FILE__, line)(compare_vec3(*n, normals[i]), > + "%s: normal %2u, expected (%f, %f, %f), got (%f, %f, %f)\n", > + test_name, i, normals[i].x, normals[i].y, normals[i].z, n->x, n->y, n->z); > + } > + else > + { > + const D3DXVECTOR4 *n = (D3DXVECTOR4 *)vertices; > + const D3DXVECTOR4 normal = {normals[i].x, normals[i].y, normals[i].z, 1.0f}; > + ok_(__FILE__, line)(compare_vec4(*n, normal), > + "%s: normal %2u, expected (%f, %f, %f, %f), got (%f, %f, %f, %f)\n", > + test_name, i, normals[i].x, normals[i].y, normals[i].z, 1.0f, > + n->x, n->y, n->z, n->w); > + } > + } > + > + mesh->lpVtbl->UnlockVertexBuffer(mesh); > +} > + > +static HRESULT compute_normals_D3DXComputeNormals(ID3DXMesh *mesh, const DWORD *adjacency) > +{ > + return D3DXComputeNormals((ID3DXBaseMesh *)mesh, adjacency); > +} > + > +static HRESULT compute_normals_D3DXComputeTangentFrameEx(ID3DXMesh *mesh, const DWORD *adjacency) > +{ > + return D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); > +} > + > +static void test_compute_normals(void) > +{ > + HRESULT hr; > + ULONG refcount; > + ID3DXMesh *mesh, *cloned_mesh; > + ID3DXBuffer *adjacency; > + IDirect3DDevice9 *device; > + struct test_context *test_context; > + unsigned int i; > + > + static const struct compute_normals_func > + { > + const char *name; > + HRESULT (*apply)(ID3DXMesh *mesh, const DWORD *adjacency); > + } > + compute_normals_funcs[] = > + { > + {"D3DXComputeNormals", compute_normals_D3DXComputeNormals }, > + {"D3DXComputeTangentFramEx", compute_normals_D3DXComputeTangentFrameEx} Typo. BTW, I feel like you could push this kind of table-based test organization further. E.g. also add a couple more variants for D3DXTANGENT_WEIGHT_BY_AREA and D3DXTANGENT_WEIGHT_EQUAL. You might have to store the expected results for box and sphere normals in the table. Doing that might be more messy than it looks like though, so I'm okay if you think that's not worth it. > + }; > + > + static const D3DXVECTOR3 box_normals[24] = > + { > + {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, {-1.0f, 0.0f, 0.0f}, > + { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.0f}, > + { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, { 1.0f, 0.0f, 0.0f}, > + { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, { 0.0f,-1.0f, 0.0f}, > + { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f, 1.0f}, > + { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f}, { 0.0f, 0.0f,-1.0f} > + }; > + float box_normal_component = 1.0f / sqrtf(3.0f); > + D3DXVECTOR3 box_normals_adjacency[24] = I think you can still make this const. > + { > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, -box_normal_component, box_normal_component}, > + { box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, box_normal_component, box_normal_component}, > + {-box_normal_component, -box_normal_component, -box_normal_component}, > + {-box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, box_normal_component, -box_normal_component}, > + { box_normal_component, -box_normal_component, -box_normal_component} > + }; > + static const D3DXVECTOR3 box_normals_adjacency_area[24] = > + { > + {-0.666667f, -0.333333f, -0.666667f}, {-0.333333f, -0.666667f, 0.666667f}, > + {-0.816496f, 0.408248f, 0.408248f}, {-0.408248f, 0.816496f, -0.408248f}, > + {-0.408248f, 0.816496f, -0.408248f}, {-0.816496f, 0.408248f, 0.408248f}, > + { 0.333333f, 0.666667f, 0.666667f}, { 0.666667f, 0.333333f, -0.666667f}, > + { 0.666667f, 0.333333f, -0.666667f}, { 0.333333f, 0.666667f, 0.666667f}, > + { 0.816496f, -0.408248f, 0.408248f}, { 0.408248f, -0.816496f, -0.408248f}, > + {-0.333333f, -0.666667f, 0.666667f}, {-0.666667f, -0.333333f, -0.666667f}, > + { 0.408248f, -0.816496f, -0.408248f}, { 0.816496f, -0.408248f, 0.408248f}, > + {-0.333333f, -0.666667f, 0.666667f}, { 0.816497f, -0.408248f, 0.408248f}, > + { 0.333333f, 0.666667f, 0.666667f}, {-0.816497f, 0.408248f, 0.408248f}, > + {-0.666667f, -0.333333f, -0.666667f}, {-0.408248f, 0.816497f, -0.408248f}, > + { 0.666667f, 0.333333f, -0.666667f}, { 0.408248f, -0.816496f, -0.408248f} > + }; > + static const D3DXVECTOR3 box_normals_position1f[24] = {{0}}; > + static const D3DXVECTOR3 box_normals_position2f[24] = > + { > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, > + {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, -1.0f}, > + {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f}, {0.0f, 0.0f, -1.0f} > + }; > + > + static const D3DXVECTOR3 sphere_normals[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, { 0.000000f, 0.582244f, 0.813014f}, > + { 0.582244f, -0.000000f, 0.813014f}, {-0.000000f, -0.582244f, 0.813014f}, > + {-0.582244f, 0.000000f, 0.813014f}, {-0.000000f, 0.890608f, 0.454772f}, > + { 0.890608f, 0.000000f, 0.454772f}, { 0.000000f, -0.890608f, 0.454772f}, > + {-0.890608f, -0.000000f, 0.454772f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.000000f, 0.890608f, -0.454773f}, > + { 0.890608f, -0.000000f, -0.454772f}, {-0.000000f, -0.890608f, -0.454773f}, > + {-0.890608f, 0.000000f, -0.454773f}, { 0.000000f, 0.582244f, -0.813015f}, > + { 0.582244f, -0.000000f, -0.813015f}, { 0.000000f, -0.582244f, -0.813015f}, > + {-0.582243f, 0.000000f, -0.813015f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + static const D3DXVECTOR3 sphere_normals_area[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, {-0.215311f, 0.554931f, 0.803550f}, > + { 0.554931f, 0.215311f, 0.803550f}, { 0.215311f, -0.554931f, 0.803550f}, > + {-0.554931f, -0.215311f, 0.803550f}, {-0.126638f, 0.872121f, 0.472618f}, > + { 0.872121f, 0.126638f, 0.472618f}, { 0.126638f, -0.872121f, 0.472618f}, > + {-0.872121f, -0.126637f, 0.472618f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.126638f, 0.872121f, -0.472618f}, > + { 0.872121f, -0.126638f, -0.472618f}, {-0.126638f, -0.872121f, -0.472618f}, > + {-0.872121f, 0.126638f, -0.472618f}, { 0.215311f, 0.554931f, -0.803550f}, > + { 0.554931f, -0.215311f, -0.803550f}, {-0.215311f, -0.554931f, -0.803550f}, > + {-0.554931f, 0.215311f, -0.803550f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + static const D3DXVECTOR3 sphere_normals_equal[22] = > + { > + { 0.000000f, -0.000000f, 1.000000f}, {-0.134974f, 0.522078f, 0.842150f}, > + { 0.522078f, 0.134974f, 0.842150f}, { 0.134974f, -0.522078f, 0.842150f}, > + {-0.522078f, -0.134974f, 0.842150f}, {-0.026367f, 0.857121f, 0.514440f}, > + { 0.857121f, 0.026367f, 0.514440f}, { 0.026367f, -0.857121f, 0.514440f}, > + {-0.857121f, -0.026367f, 0.514440f}, { 0.000000f, 1.000000f, -0.000000f}, > + { 1.000000f, -0.000000f, -0.000000f}, {-0.000000f, -1.000000f, -0.000000f}, > + {-1.000000f, 0.000000f, -0.000000f}, { 0.026367f, 0.857121f, -0.514440f}, > + { 0.857121f, -0.026367f, -0.514440f}, {-0.026367f, -0.857121f, -0.514440f}, > + {-0.857121f, 0.026367f, -0.514440f}, { 0.134975f, 0.522078f, -0.842150f}, > + { 0.522078f, -0.134975f, -0.842150f}, {-0.134974f, -0.522078f, -0.842150f}, > + {-0.522078f, 0.134974f, -0.842150f}, { 0.000000f, 0.000000f, -1.000000f} > + }; > + > + static const D3DVERTEXELEMENT9 position3f_normal1f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR3), D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position3f_normal2f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR3), D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 normal4f_position3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + {0, sizeof(D3DXVECTOR4), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + D3DDECL_END() > + }; Can you check that a 4-component normal placed after the position gives the same results? It doesn't need to be in the patch if there are no surprises (and there shouldn't be, this is me being paranoid). > + static const D3DVERTEXELEMENT9 position1f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT1, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(float), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position2f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT2, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR2), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + static const D3DVERTEXELEMENT9 position4f_normal3f_declaration[] = > + { > + {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, > + {0, sizeof(D3DXVECTOR4), D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, > + D3DDECL_END() > + }; > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + hr = compute_normals_funcs[i].apply(NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", compute_normals_funcs[i].name, hr); > + } > + > + if (!(test_context = new_test_context())) > + { > + skip("Couldn't create test context\n"); > + return; > + } > + device = test_context->device; > + > + hr = D3DXCreateBox(device, 1.0f, 1.0f, 1.0f, &mesh, &adjacency); > + ok(SUCCEEDED(hr), "D3DXCreateBox failed %#x\n", hr); > + > + /* Check wrong input */ > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE, NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DDECLUSAGE_NORMAL, 0, > + D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, 0, NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 1, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DX_DEFAULT, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_CALCULATE_NORMALS, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + todo_wine ok(hr == D3DERR_INVALIDCALL, "D3DXComputeTangentFrameEx returned %#x, expected D3DERR_INVALIDCALL\n", hr); > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + const struct compute_normals_func *func = &compute_normals_funcs[i]; > + > + /* Mesh without normals */ > + hr = mesh->lpVtbl->CloneMeshFVF(mesh, 0, D3DFVF_XYZ, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMeshFVF failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh without positions */ > + hr = mesh->lpVtbl->CloneMeshFVF(mesh, 0, D3DFVF_NORMAL, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMeshFVF failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT1 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position3f_normal1f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT2 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position3f_normal2f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = func->apply(cloned_mesh, NULL); > + ok(hr == D3DERR_INVALIDCALL, "%s returned %#x, expected D3DERR_INVALIDCALL\n", func->name, hr); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh without adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, NULL); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + /* Mesh with adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + /* Mesh with custom vertex format, D3DDECLTYPE_FLOAT4 normals and adjacency */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, normal4f_position3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT1 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position1f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_position1f, ARRAY_SIZE(box_normals_position1f)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT2 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position2f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_position2f, ARRAY_SIZE(box_normals_position2f)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + > + /* Mesh with D3DDECLTYPE_FLOAT4 positions and D3DDECLTYPE_FLOAT3 normals */ > + hr = mesh->lpVtbl->CloneMesh(mesh, 0, position4f_normal3f_declaration, device, &cloned_mesh); > + ok(SUCCEEDED(hr), "CloneMesh failed %#x\n", hr); > + > + hr = clear_normals(cloned_mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(cloned_mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, cloned_mesh, box_normals_adjacency, ARRAY_SIZE(box_normals_adjacency)); > + > + refcount = cloned_mesh->lpVtbl->Release(cloned_mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + } > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals_adjacency_area, ARRAY_SIZE(box_normals_adjacency_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals, ARRAY_SIZE(box_normals)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, box_normals_adjacency_area, ARRAY_SIZE(box_normals_adjacency_area)); > + > + refcount = mesh->lpVtbl->Release(mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + refcount = ID3DXBuffer_Release(adjacency); > + ok(!refcount, "Buffer has %u references left\n", refcount); > + > + hr = D3DXCreateSphere(device, 1.0f, 4, 6, &mesh, &adjacency); > + ok(SUCCEEDED(hr), "D3DXCreateSphere failed %#x\n", hr); > + > + for (i = 0; i < ARRAY_SIZE(compute_normals_funcs); i++) > + { > + const struct compute_normals_func *func = &compute_normals_funcs[i]; > + > + /* Sphere without adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, NULL); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, sphere_normals, ARRAY_SIZE(sphere_normals)); > + > + /* Sphere with adjacency data */ > + hr = clear_normals(mesh); > + ok(SUCCEEDED(hr), "Failed to clear normals, returned %#x\n", hr); > + > + hr = func->apply(mesh, ID3DXBuffer_GetBufferPointer(adjacency)); > + ok(hr == D3D_OK, "%s returned %#x, expected D3D_OK\n", func->name, hr); > + > + compare_normals(__LINE__, func->name, mesh, sphere_normals, ARRAY_SIZE(sphere_normals)); > + } > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_area, ARRAY_SIZE(sphere_normals_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_BY_AREA, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_area, ARRAY_SIZE(sphere_normals_area)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + NULL, -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_equal, ARRAY_SIZE(sphere_normals_equal)); > + > + hr = D3DXComputeTangentFrameEx(mesh, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, D3DX_DEFAULT, 0, > + D3DDECLUSAGE_NORMAL, 0, D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL, > + ID3DXBuffer_GetBufferPointer(adjacency), -1.01f, -0.01f, -1.01f, NULL, NULL); > + ok(hr == D3D_OK, "D3DXComputeTangentFrameEx returned %#x, expected D3D_OK\n", hr); > + > + compare_normals(__LINE__, "D3DXComputeTangentFrameEx", mesh, sphere_normals_equal, ARRAY_SIZE(sphere_normals_equal)); > + > + refcount = mesh->lpVtbl->Release(mesh); > + ok(!refcount, "Mesh has %u references left\n", refcount); > + refcount = ID3DXBuffer_Release(adjacency); > + ok(!refcount, "Buffer has %u references left\n", refcount); > + > + free_test_context(test_context); > +} > + > START_TEST(mesh) > { > D3DXBoundProbeTest(); > @@ -10401,4 +10973,5 @@ START_TEST(mesh) > test_clone_mesh(); > test_valid_mesh(); > test_optimize_faces(); > + test_compute_normals(); > } > -- > 2.3.6 Looking good otherwise, thanks!

2 1

Re: gdi32: Simplify bitwise and and xor with 0 (PVS-Studio)
by Huw Davies 29 Jul '15

29 Jul '15

On 29 Jul 2015, at 12:32, Michael Stefaniuc wrote: > --- > Same sha1 for primitives.o with and without patch. > > > > dlls/gdi32/dibdrv/primitives.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c > index c7b48ed..9da08ad 100644 > --- a/dlls/gdi32/dibdrv/primitives.c > +++ b/dlls/gdi32/dibdrv/primitives.c > @@ -5655,8 +5655,8 @@ static void create_dither_masks_1(const dib_info *dib, int rop2, COLORREF color, > } > else > { > - rop_mask.and = (0x00 & codes.a1) ^ codes.a2; > - rop_mask.xor = (0x00 & codes.x1) ^ codes.x2; > + rop_mask.and = codes.a2; > + rop_mask.xor = codes.x2; > } > *and_bits |= (rop_mask.and & pixel_masks_1[x]); > *xor_bits |= (rop_mask.xor & pixel_masks_1[x]); It's clearer as it was, especially given the lines just above this hunk. Huw.

2 2

Re: [PATCH 4/5] amstream: Zero-initialize DirectDraw surface desc. (Valgrind)
by Henri Verbeet 29 Jul '15

29 Jul '15

On 28 July 2015 at 23:14, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c > index 947be1e..3725c68 100644 > --- a/dlls/amstream/mediastream.c > +++ b/dlls/amstream/mediastream.c > @@ -991,6 +991,7 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD > return hr; > } > > + memset(&desc, 0, sizeof(desc)); > desc.dwSize = sizeof(desc); > desc.dwFlags = DDSD_CAPS|DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT; > desc.dwHeight = 100; This should not be needed. If this is for bug 38911, that's a duplicate of bug 36383, and sort of a false positive. ddraw_surface_create() clears DDSD_LPSURFACE if desc->lpSurface is NULL. The issue is that desc->lpSurface may be uninitialized if DDSD_LPSURFACE is not set, but in that case clearing the flag also wouldn't make a difference. If we want to do something about the false positive that should happen in ddraw_surface_create(). I don't personally feel strongly about it one way or the other.

1 0

Re: [2/2] shell32/tests: Check if error status is reset after successful file copy
by Marvin 28 Jul '15

28 Jul '15

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=15616 Your paranoid android. === w2000pro (32 bit shlfileop) === shlfileop.c:1833: Test failed: Expected ERROR_SUCCESS, got 6 === wvistau64 (32 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR === wvistau64 (64 bit shlfileop) === shlfileop.c:818: Test failed: Expected ERROR_CANCELLED or DE_DIFFDIR

1 0

Re: [1/2] ntdll/tests: Add basic tests for RtlQueueWorkItem.
by Marvin 28 Jul '15

28 Jul '15

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=15580 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:763: Test failed: WaitForSingleObject returned 258 threadpool.c:777: Test failed: WaitForSingleObject returned 0 threadpool.c:779: Test failed: threadpool.c:715: Running timer callback

3 3

Re: odbccp32: Implement SQLGetPrivateProfileString/W (try 9)
by Nikolay Sivov 28 Jul '15

28 Jul '15

On 28.07.2015 12:55, Alistair Leslie-Hughes wrote: > + if(!defvalue) > + buff[0] = 0; > + > + if (!section || !defvalue || !buff) > + return 0; > + > + if (buff) > + buff[0] = 0; This makes no sense.

1 0

Re: [PATCH] gdi32: check for NULL pointer in GetOutlineTextMetrics (try 2)
by Marvin 27 Jul '15

27 Jul '15

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=15598 Your paranoid android. === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

2 1

Re: [PATCH 3/5] d3dx9: Partially implement D3DXComputeTangentFrameEx().
by Matteo Bruni 27 Jul '15

27 Jul '15

Hi, I've got a number of nitpicks but these patches are essentially okay with me. 2015-07-25 11:23 GMT+02:00 Józef Kucia <joseph.kucia(a)gmail.com>: > --- > dlls/d3dx9_36/mesh.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 232 insertions(+), 3 deletions(-) > > diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c > index 4aeac26..1558b17 100644 > --- a/dlls/d3dx9_36/mesh.c > +++ b/dlls/d3dx9_36/mesh.c > @@ -7235,6 +7235,41 @@ error: > return hr; > } > > +static inline D3DXVECTOR3 *vertex_element_vec3(BYTE *vertices, > + const D3DVERTEXELEMENT9 *declaration, DWORD vertex_stride, DWORD index) Better not to include the "inline" specifier, the compiler will inline the function anyway if it thinks it's a good idea. > +{ > + return (D3DXVECTOR3 *)(vertices + declaration->Offset + index * vertex_stride); > +} > + > +static inline D3DXVECTOR3 read_vec3(BYTE *vertices, const D3DVERTEXELEMENT9 *declaration, > + DWORD vertex_stride, DWORD index) > +{ > + D3DXVECTOR3 vec3 = {0}; > + const float *src = (float *)(vertices + declaration->Offset + index * vertex_stride); You can just use vertex_element_vec3() here, like e.g. const D3DXVECTOR3 *src = vertex_element_vec3(vertices, declaration, vertex_stride, index); although the source data isn't necessarily a full vec3. Your call. > + > + switch (declaration->Type) > + { > + case D3DDECLTYPE_FLOAT1: > + vec3.x = src[0]; > + break; > + case D3DDECLTYPE_FLOAT2: > + vec3.x = src[0]; > + vec3.y = src[1]; > + break; > + case D3DDECLTYPE_FLOAT3: > + case D3DDECLTYPE_FLOAT4: > + vec3.x = src[0]; > + vec3.y = src[1]; > + vec3.z = src[2]; > + break; > + default: > + ERR("Cannot read vec3\n"); > + break; > + } You could sort the cases the other way around and fallthrough to make this part shorter. Again, this is also fine and it's up to you. > + > + return vec3; > +} > + > /************************************************************************* > * D3DXComputeTangentFrameEx (D3DX9_36.@) > */ > @@ -7244,15 +7279,209 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh, DWORD texture_in_seman > const DWORD *adjacency, float partial_edge_threshold, float singular_point_threshold, > float normal_edge_threshold, ID3DXMesh **mesh_out, ID3DXBuffer **vertex_mapping) > { > - FIXME("mesh %p, texture_in_semantic %u, texture_in_index %u, u_partial_out_semantic %u, u_partial_out_index %u, " > + HRESULT hr; > + void *indices = NULL; > + BYTE *vertices = NULL; > + DWORD *point_reps = NULL; > + size_t normal_size; > + BOOL indices_are_32bit; > + DWORD i, j, num_faces, num_vertices, vertex_stride; > + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = {D3DDECL_END()}; > + D3DVERTEXELEMENT9 *position_declaration = NULL, *normal_declaration = NULL; > + > + TRACE("mesh %p, texture_in_semantic %u, texture_in_index %u, u_partial_out_semantic %u, u_partial_out_index %u, " > "v_partial_out_semantic %u, v_partial_out_index %u, normal_out_semantic %u, normal_out_index %u, " > "options %#x, adjacency %p, partial_edge_threshold %f, singular_point_threshold %f, " > - "normal_edge_threshold %f, mesh_out %p, vertex_mapping %p stub!\n", > + "normal_edge_threshold %f, mesh_out %p, vertex_mapping %p\n", > mesh, texture_in_semantic, texture_in_index, u_partial_out_semantic, u_partial_out_index, > v_partial_out_semantic, v_partial_out_index, normal_out_semantic, normal_out_index, options, adjacency, > partial_edge_threshold, singular_point_threshold, normal_edge_threshold, mesh_out, vertex_mapping); > > - return E_NOTIMPL; > + if (!mesh) > + { > + WARN("mesh is NULL\n"); > + return D3DERR_INVALIDCALL; > + } > + > + if ((options & (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) == (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) I would store the result of "options & (D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)" in a variable and use it here and below. > + { > + WARN("D3DXTANGENT_WEIGHT_BY_AREA and D3DXTANGENT_WEIGHT_EQUAL are mutally exclusive\n"); > + return D3DERR_INVALIDCALL; > + } > + > + if (u_partial_out_semantic != D3DX_DEFAULT) > + { > + FIXME("tangent vectors computation is not supported\n"); > + return E_NOTIMPL; > + } > + > + if (v_partial_out_semantic != D3DX_DEFAULT) > + { > + FIXME("binormal vectors computation is not supported\n"); > + return E_NOTIMPL; > + } > + > + if (options & ~(D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_CALCULATE_NORMALS | D3DXTANGENT_WEIGHT_EQUAL | D3DXTANGENT_WEIGHT_BY_AREA)) > + { > + FIXME("unsupported options %#x\n", options); > + return E_NOTIMPL; > + } > + > + if (!(options & D3DXTANGENT_CALCULATE_NORMALS)) > + { > + FIXME("only normals computation is supported\n"); > + return E_NOTIMPL; > + } > + > + if (!(options & D3DXTANGENT_GENERATE_IN_PLACE) || mesh_out || vertex_mapping) > + { > + FIXME("only D3DXTANGENT_GENERATE_IN_PLACE is supported\n"); > + return E_NOTIMPL; > + } > + > + if (FAILED(hr = mesh->lpVtbl->GetDeclaration(mesh, declaration))) > + return hr; > + > + for (i = 0; declaration[i].Stream != 0xFF; i++) Lowercase is preferred for hex literals. > + { > + if (declaration[i].Usage == D3DDECLUSAGE_POSITION && declaration[i].UsageIndex == 0) > + position_declaration = &declaration[i]; > + if (declaration[i].Usage == normal_out_semantic && declaration[i].UsageIndex == normal_out_index) > + normal_declaration = &declaration[i]; > + } > + > + if (!position_declaration || !normal_declaration) > + return D3DERR_INVALIDCALL; > + > + if (normal_declaration->Type == D3DDECLTYPE_FLOAT3) > + { > + normal_size = sizeof(D3DXVECTOR3); > + } > + else if (normal_declaration->Type == D3DDECLTYPE_FLOAT4) > + { > + normal_size = sizeof(D3DXVECTOR4); > + } > + else > + { > + WARN("unsupported normals type %u\n", normal_declaration->Type); > + return D3DERR_INVALIDCALL; > + } > + > + num_faces = mesh->lpVtbl->GetNumFaces(mesh); > + num_vertices = mesh->lpVtbl->GetNumVertices(mesh); > + vertex_stride = mesh->lpVtbl->GetNumBytesPerVertex(mesh); > + indices_are_32bit = mesh->lpVtbl->GetOptions(mesh) & D3DXMESH_32BIT; > + > + point_reps = HeapAlloc(GetProcessHeap(), 0, num_vertices * sizeof(*point_reps)); > + if (!point_reps) > + { > + hr = E_OUTOFMEMORY; > + goto done; > + } > + > + if (adjacency) > + { > + if (FAILED(hr = mesh->lpVtbl->ConvertAdjacencyToPointReps(mesh, adjacency, point_reps))) > + goto done; > + } > + else > + { > + for (i = 0; i < num_vertices; i++) > + point_reps[i] = i; > + } > + > + if (FAILED(hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, &indices))) > + goto done; > + > + if (FAILED(hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (void **)&vertices))) > + goto done; > + > + for (i = 0; i < num_vertices; i++) > + { > + const D3DXVECTOR4 zero = {0.0f, 0.0f, 0.0f, 1.0f}; That's a weird zero :) Not sure about a better name though, maybe "default_vector"? Also, please make it static. > + void *normal = vertices + normal_declaration->Offset + i * vertex_stride; > + > + memcpy(normal, &zero, normal_size); > + } > + > + for (i = 0; i < num_faces; i++) > + { > + float weights[3]; > + D3DXVECTOR3 a, b, cross, face_normal; > + const DWORD face_indices[3] = > + { > + read_ib(indices, indices_are_32bit, 3 * i + 0), > + read_ib(indices, indices_are_32bit, 3 * i + 1), > + read_ib(indices, indices_are_32bit, 3 * i + 2) > + }; > + const D3DXVECTOR3 v0 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[0]); > + const D3DXVECTOR3 v1 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[1]); > + const D3DXVECTOR3 v2 = read_vec3(vertices, position_declaration, vertex_stride, face_indices[2]); > + > + D3DXVec3Cross(&cross, D3DXVec3Subtract(&a, &v0, &v1), D3DXVec3Subtract(&b, &v0, &v2)); > + > + switch (options & (D3DXTANGENT_WEIGHT_BY_AREA | D3DXTANGENT_WEIGHT_EQUAL)) > + { > + case D3DXTANGENT_WEIGHT_EQUAL: > + weights[0] = weights[1] = weights[2] = 1.0f; > + break; > + case D3DXTANGENT_WEIGHT_BY_AREA: > + weights[0] = weights[1] = weights[2] = D3DXVec3Length(&cross); > + break; > + default: > + weights[0] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + D3DXVec3Subtract(&a, &v1, &v0); > + D3DXVec3Subtract(&b, &v1, &v2); > + weights[1] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + D3DXVec3Subtract(&a, &v2, &v0); > + D3DXVec3Subtract(&b, &v2, &v1); > + weights[2] = acosf(D3DXVec3Dot(&a, &b) / (D3DXVec3Length(&a) * D3DXVec3Length(&b))); > + > + if (isnan(weights[0])) weights[0] = 1.0f; > + if (isnan(weights[1])) weights[1] = 1.0f; > + if (isnan(weights[2])) weights[2] = 1.0f; > + break; This might cause problems in the (unlikely) case float exceptions are enabled. Ideally this case would need to be tested with native and, if it doesn't throw exceptions, your code would need to take care of that. I don't think this is super critical though, it should be easy to figure it out later on if some application crashes here. > + } > + > + D3DXVec3Normalize(&face_normal, &cross); > + > + for (j = 0; j < 3; j++) > + { > + D3DXVECTOR3 normal; > + DWORD rep_index = point_reps[face_indices[j]]; > + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); > + > + D3DXVec3Scale(&normal, &face_normal, weights[j]); > + D3DXVec3Add(rep_normal, rep_normal, &normal); > + } > + } > + > + for (i = 0; i < num_vertices; i++) > + { > + DWORD rep_index = point_reps[i]; > + D3DXVECTOR3 *normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, i); > + D3DXVECTOR3 *rep_normal = vertex_element_vec3(vertices, normal_declaration, vertex_stride, rep_index); > + > + if (i == rep_index) > + D3DXVec3Normalize(rep_normal, rep_normal); > + else > + *normal = *rep_normal; > + } > + > + hr = D3D_OK; > + > +done: > + if (vertices) > + mesh->lpVtbl->UnlockVertexBuffer(mesh); > + > + if (indices) > + mesh->lpVtbl->UnlockIndexBuffer(mesh); > + > + HeapFree(GetProcessHeap(), 0, point_reps); > + > + return hr; > } > > /************************************************************************* > -- > 2.3.6 > > >

2 1

Re: [PATCH] gdi32: check for NULL pointer in GetOutlineTextMetrics
by Nikolay Sivov 27 Jul '15

27 Jul '15

On 27.07.2015 21:19, Daniel Lehman wrote: > > Yes, looks like it will access NULL out pointer if cbData != 0. Please add a test for that, if it returns required buffer size your fix looks correct to me, if it returns 0 we don't need to call driver at all and API call itself should be fixed, not a driver.

1 0

Re: include/d3dcommon.idl: Add missing typedefs
by Matteo Bruni 27 Jul '15

27 Jul '15

2015-07-26 3:24 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > + D3D_SIF_TEXTURE_COMPONENT_0 = 4, > + D3D_SIF_TEXTURE_COMPONENT_1 = 8, > + D3D_SIF_TEXTURE_COMPONENTS = 12, Please use hexadecimal here. FWIW in the Win 8.1 SDK headers there is also a D3D_SIF_UNUSED enum value.

1 0

Re: [PATCH 3/9] d2d1: Validate bitmap formats.
by Marvin 27 Jul '15

27 Jul '15

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=15530 Your paranoid android. === wvistau64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w7u (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w8 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2.

2 1

mountmgr.sys: Write usable device paths into HKLM\SYSTEM\MountedDevices.
by Bernhard Übelacker 27 Jul '15

27 Jul '15

Hello, I got asked if I could get a discussion started for the attached patch and bug #38235 [1]. This bug is about Blindwrite 7 not showing any usable source DVD drive. It seems Blindwrite relies on the values stored in HKLM\SYSTEM\MountedDevices to enumerate drives. Wine currently stores in e.g. "\DosDevices\D:" the linux mount point of the drive as ansi string. A native Windows XP stores there (as wide string): \??\IDE#CdRomVBOX_CD-ROM_____________________________1.0_____#42562d3231303037333036372020202020202020#{53f5630d-b6bf-11d0-94f2-00a0c91efb8b} This patch stores now as content just the device (also as wide string): \\.\d: This is sufficient to make Blindwrite 7 happy. - Is there currently any use of the stored linux mount point anywhere? - Is there a test needed and where should that be placed as mountmgr.sys has currently no tests subdirectory? - Is there a reason known why this short device name should not be used in this situation? Kind regards, Bernhard [1] https://bugs.winehq.org/show_bug.cgi?id=38235

1 0

Re: d3dx9_36: Add D3DXTessellateNPatches stub
by Matteo Bruni 27 Jul '15

27 Jul '15

2015-07-24 11:06 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > > > Changelog: > d3dx9_36: Add D3DXTessellateNPatches stub > > > Best Regards > Alistair Leslie-Hughes Please avoid caps in the parameter names. Also don't forget the period at the end of the FIXME message.

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel