June 2015 - Wine-Devel - list.winehq.org

Re: [PATCH 2/3] configure: Check if -lunwind is needed for libunwind.
by Alexandre Julliard June 15, 2015

June 15, 2015

Ken Thomases <ken(a)codeweavers.com> writes: > --- > configure.ac | 26 ++++++++++++++++++++++++++ > dlls/ntdll/Makefile.in | 2 +- > 2 files changed, 27 insertions(+), 1 deletion(-) I'm not sure what we gain by using libunwind on other platforms, but assuming it's useful it would have to be loaded dynamically. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/6] configure: Don't touch platform register x18 on ARM64
by Alexandre Julliard June 15, 2015

June 15, 2015

André Hentschel <nerv(a)dawncrow.de> writes: > diff --git a/configure.ac b/configure.ac > index 79110c1..b26ae3e 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -178,6 +178,9 @@ case $host in > CFLAGS="$CFLAGS -marm" > AC_SUBST(TARGETFLAGS,"-marm") > ;; > + aarch64*) > + CFLAGS="$CFLAGS -ffixed-x18" I don't see how this can work. It would have to be made the toolchain default to apply to all system libraries. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] kernel32/tests: Add a partial test for GetConsoleFontSize
by Marvin June 15, 2015

June 15, 2015

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=14266 Your paranoid android. === w8 (32 bit console) === console.c:1511: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1511: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1511: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1755: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1755: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1755: Test failed: [18] Expected output count to be 3735928559, got 2359244

2 1

Re: [PATCH 1/2] kernel32/tests: Add a test for GetLargestConsoleWindowSize
by Marvin June 15, 2015

June 15, 2015

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=14265 Your paranoid android. === w8 (32 bit console) === console.c:1489: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1489: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1489: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1733: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1733: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1733: Test failed: [18] Expected output count to be 3735928559, got 2359244

2 1

Re: [PATCH] winscard: add stubs for SCardListReadersA/W
by Bruno Jesus June 15, 2015

June 15, 2015

On Sunday, June 14, 2015, Marcus Meissner <marcus(a)jet.franken.de> wrote: > From: Austin English <austinenglish(a)gmail.com <javascript:;>> > > Fixes http://bugs.winehq.org/show_bug.cgi?id=26978 > --- > dlls/winscard/winscard.c | 12 ++++++++++++ > dlls/winscard/winscard.spec | 4 ++-- > 2 files changed, 14 insertions(+), 2 deletions(-) > > diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c > index bcf8129..cf7d52d 100644 > --- a/dlls/winscard/winscard.c > +++ b/dlls/winscard/winscard.c > @@ -129,3 +129,15 @@ void WINAPI SCardReleaseStartedEvent(void) > { > FIXME("stub\n"); > } > + > +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, LPCSTR groups, LPSTR > readers, LPDWORD buflen) > +{ > + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), > readers, buflen); > + return SCARD_F_INTERNAL_ERROR; > +} > + > +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, LPCWSTR groups, > LPWSTR readers, LPDWORD buflen) > +{ > + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), > readers, buflen); > + return SCARD_F_INTERNAL_ERROR; > +} Hi, that is not a good return code for error, it's better to return SCARD_E_NO_READERS_AVAILABLE. Most applications I tested will understand this error more properly and display better diagnose message to user. Best Regards, Bruno

1 0

Re: [PATCH 2/3] configure: Check if -lunwind is needed for libunwind.
by Ken Thomases June 15, 2015

June 15, 2015

On Jun 14, 2015, at 9:22 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > --- > configure.ac | 26 ++++++++++++++++++++++++++ > dlls/ntdll/Makefile.in | 2 +- > 2 files changed, 27 insertions(+), 1 deletion(-) Forgot to mention: this is for <https://bugs.winehq.org/show_bug.cgi?id=38713>. -Ken

1 0

Re: [PATCH] advapi32: Implement GetWindowsAccountDomainSid.
by Marvin June 14, 2015

June 14, 2015

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=14271 Your paranoid android. === w2000pro (32 bit security) === security.c:5882: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5888: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5889: Test failed: expected size 24, got 68 security.c:5894: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5900: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 1337 security.c:5901: Test failed: expected size 24, got 1 security.c:5906: Test failed: GetWindowsAccountDomainSid failed with error 1337 security.c:5907: Test failed: last error should not change security.c:5908: Test failed: expected size 24, got 68 security: unhandled exception c0000005 at 0043AC94 === wxppro (32 bit security) === security.c:5882: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5888: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5889: Test failed: expected size 24, got 68 security.c:5894: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5900: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 1337 security.c:5901: Test failed: expected size 24, got 1 security.c:5906: Test failed: GetWindowsAccountDomainSid failed with error 1337 security.c:5907: Test failed: last error should not change security.c:5908: Test failed: expected size 24, got 68 security: unhandled exception c0000005 at 0043AC94 === w2003std (32 bit security) === security.c:5882: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5888: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5889: Test failed: expected size 24, got 68 security.c:5894: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5900: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 1337 security.c:5901: Test failed: expected size 24, got 1 security.c:5906: Test failed: GetWindowsAccountDomainSid failed with error 1337 security.c:5907: Test failed: last error should not change security.c:5908: Test failed: expected size 24, got 68 security: unhandled exception c0000005 at 0043AC94 === w7u (32 bit security) === security.c:5882: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5888: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5889: Test failed: expected size 24, got 68 security.c:5894: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5900: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 1337 security.c:5901: Test failed: expected size 24, got 1 security.c:5906: Test failed: GetWindowsAccountDomainSid failed with error 1337 security.c:5907: Test failed: last error should not change security.c:5908: Test failed: expected size 24, got 68 security: unhandled exception c0000005 at 0043AC94 === w8 (32 bit security) === security.c:5882: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5888: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5889: Test failed: expected size 24, got 68 security.c:5894: Test failed: expected ERROR_INVALID_PARAMETER, got 1337 security.c:5900: Test failed: expected ERROR_INSUFFICIENT_BUFFER, got 1337 security.c:5901: Test failed: expected size 24, got 1 security.c:5906: Test failed: GetWindowsAccountDomainSid failed with error 1337 security.c:5907: Test failed: last error should not change security.c:5908: Test failed: expected size 24, got 68 security: unhandled exception c0000005 at 0043AC94

1 0

Re: winemac.drv: Improved App name on windows and menus (Mac Driver)
by Theodore Dubois June 14, 2015

June 14, 2015

I'm curious, given this, how Crossover manages to make the application menu title the same as the Windows program that is running, despite the actual executable being wineloader. Does it work if the executable has no bundle id? ~Theodore > But, more importantly, the title that a program sets for the application menu is ignored by Cocoa. It uses the bundle name regardless. So, this change has no effect.

2 1

Re: hlsl compiler question
by Matteo Bruni June 14, 2015

June 14, 2015

2015-06-14 10:42 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi Matteo, > > I was looking at this bug as if affects "Star Trek Online" as well. > > Do you know what/how much work it would be to get this fixed? > > http://bugs.winehq.org/show_bug.cgi?id=32932 > > Any help would be great. It still might be way out of my depth to fix. > > Best Regards > Alistair Leslie-Hughes Hi Alistair, fixing that specific bug (i.e. support for the ": register" syntax) is pretty trivial, I even have a patch for that in my queue. It's been postponed by other stuff for a long time but in principle I can send it in the next few days. The problem is that fixing it won't probably help for actually running Star Trek Online, nullDC or any other program currently blocked by that. The HLSL compiler is still missing a lot of stuff, only the parser is currently implemented and the code generation part is totally absent. Cheers, Matteo.

1 0

Re: gdiplus: Implement GdipCreateRegionRgnData.
by Vincent Povirk June 14, 2015

June 14, 2015

Seems like there are some unnecessary changes (cases reordered, element type fixme changed, breaking from default case), but it looks good otherwise.

1 0

Re: riched: Added ITextDocument2 definition and corresponding tests
by Marvin June 13, 2015

June 13, 2015

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=14249 Your paranoid android. === w2000pro (32 bit richole) === richole.c:178: Test failed: error: 126

1 0

Re: [PATCH] ntdll: link libunwind if present
by Ken Thomases June 13, 2015

June 13, 2015

Hi, On Jun 13, 2015, at 5:17 AM, Marcus Meissner <marcus(a)jet.franken.de> wrote: > On openSUSE 13.1/13.2 otherwise ntdll x86_64 build will fail with: > … This new link error is <https://bugs.winehq.org/show_bug.cgi?id=38713>. > (probably on x86 it all is inlined, but this is not the case for x86_64) The new code that introduced this issue is in x86_64-only code (signal_x86_64.c). Thanks for your attempt to fix the problem I created. I'm not sure why your configure check is in an if statement having to do with the support for CFI directives. Also, the symbol you're checking for (_U_dyn_register) seems suspicious. It's not mentioned in the link errors. Also, I'm not sure it's a reliable export from libunwind. As indicated in the bug report, libunwind does annoying symbol renaming that's not consistent among platforms. (It's definitely not present on OS X, although that's because Apple provides a somewhat customized interface.) Erich Hoover and I are working on a different approach on the bug. He attached a patch and I attached a counter-proposal patch. I'd appreciate if you could check that mine solves the problem for you. Thanks, Ken

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString (try 4)
by Nikolay Sivov June 13, 2015

June 13, 2015

On 13.06.2015 12:41, Alistair Leslie-Hughes wrote: > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + int i, len; > + > + len = ret < cbRetBuffer ? ret : cbRetBuffer; > + for (i=0; i < len; i++) > + RetBuffer[i] = retval[i]; > + RetBuffer[i] = 0; > + } You can't convert it like that, the idea is to do A->W conversion for inputs and W->A for output. Inputs are handled by heap_strdupAtoW(), so you need a single WideCharToMultiByte for retbuffer.

1 0

Re: [PATCH] oledb32: free memory on error exit (Coverity)
by Nikolay Sivov June 13, 2015

June 13, 2015

On 13.06.2015 8:54, Marcus Meissner wrote: > 966609 Resource leak > --- > dlls/oledb32/datainit.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c > index 3c5293a..3a6c924 100644 > --- a/dlls/oledb32/datainit.c > +++ b/dlls/oledb32/datainit.c > @@ -520,6 +520,8 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr > if (FAILED(hr)) > { > ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); > + CoTaskMemFree(*propset); > + *propset = NULL; > return hr; > } > > free_dbpropset() should be used for that, otherwise you'll still be leaking values.

1 0

Re: [PATCH 1/6] msvcp110: Add tr2_sys__File_size implementation and test.(try 4)
by Piotr Caban June 12, 2015

June 12, 2015

On 06/11/15 17:43, YongHao Hu wrote: > +@ cdecl -ret64 -arch=win32 ?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z(str) msvcp120.?tr2_sys__File_size > +@ cdecl -ret64 -arch=win64 ?_File_size(a)sys@tr2(a)std@@YA_KPEBD(a)Z(str) msvcp120.?tr2_sys__File_size This is not going to work. Thanks, Piotr

2 1

Re: [1/3] include: Add stuff related to WSAPoll() (try 2)
by Alexandre Julliard June 12, 2015

June 12, 2015

Bruno Jesus <00cpxxx(a)gmail.com> writes: > try 2: > I found the solution to typedef the struct pollfd just like it's done > with fd_set. Unfortunately that doesn't work on mingw: In file included from ../../../wine/include/winsock2.h:50:0, from ../../../wine/include/ws2tcpip.h:22, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:287:19: error: redefinition of ‘struct pollfd’ ../../../wine/include/ws2def.h:27:18: note: in definition of macro ‘WS’ In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:284:8: note: originally defined here -- Alexandre Julliard julliard(a)winehq.org

3 4

Re: [PATCH 2/2] dwrite: Fix splitted range length, initial test for GetMetrics()
by Marvin June 12, 2015

June 12, 2015

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=14198 Your paranoid android. === wvistau64 (32 bit layout) === layout.c:2355: Test failed: got 4 === w2008s64 (32 bit layout) === layout.c:2355: Test failed: got 4 === w7u (32 bit layout) === layout.c:2355: Test failed: got 4 === wvistau64 (64 bit layout) === layout.c:2355: Test failed: got 4 === w2008s64 (64 bit layout) === layout.c:2355: Test failed: got 4

1 0

Re: [PATCH 5/6] msvcp110: Add tr2_sys__Make_dir implementation and test.
by Piotr Caban June 12, 2015

June 12, 2015

Hi, On 06/11/15 17:45, YongHao Hu wrote: > + { "N:\\abc", -1 }, N:\\abc looks like a valid path for me. I guess this test will fail if someone have N: drive. Thanks, Piotr

1 0

Re: [1/1] advapi32/tests: Add preliminary event tracing tests. (try 3)
by Marvin June 12, 2015

June 12, 2015

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=14196 Your paranoid android. === w2000pro (32 bit eventlog) === eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wxppro (32 bit eventlog) === eventlog.c:686: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2003std (32 bit eventlog) === eventlog.c:686: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2008s64 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7u (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w8 (32 bit eventlog) === eventlog.c:695: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:768: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:776: Test failed: Expected success eventlog.c:784: Test failed: Expected ERROR_ALREADY_EXISTS, got 87

1 0

Re: [PATCH 4/4] d3drm/tests: Add refcount tests for IDirect3DRMDevice*
by Stefan Dösinger June 11, 2015

June 11, 2015

I think these tests are best integrated into CreateDeviceFromClipper. Similar tests are needed for the other creation methods, with some modifications. Check if the reference count of the surface passed to CreateDeviceFromSurface is incremented, and similarly for the device passed to CreateDeviceFromD3D. > Am 11.06.2015 um 13:51 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > The refcount tests for d3drm1 are the same for the device created from all three creation methods. > --- > dlls/d3drm/tests/d3drm.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index ac4c8fe..ecf1d4d 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -2367,6 +2367,86 @@ cleanup: > IDirectDraw_Release(ddraw1); > } > > +static void test_device_refcount(void) > +{ > + IDirect3DRM *d3drm1; > + IDirect3DRM2 *d3drm2; > + IDirect3DRM3 *d3drm3; > + IDirect3DRMDevice *device1; > + IDirect3DRMDevice2 *device2; > + IDirect3DRMDevice3 *device3; > + IDirectDrawClipper *clipper; > + HWND window; > + HRESULT hr; > + ULONG ref1, ref2, cref1, cref2; > + GUID driver; > + RECT rc; > + > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > + GetClientRect(window, &rc); > + hr = DirectDrawCreateClipper(0, &clipper, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x)\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x)\n", hr); > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + memcpy(&driver, &IID_IDirect3DRGBDevice, sizeof(GUID)); > + hr = IDirect3DRM_CreateDeviceFromClipper(d3drm1, clipper, &driver, rc.right, rc.bottom, &device1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d , ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device1) > + IDirect3DRMDevice_Release(device1); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice2 interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d , ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device2) > + IDirect3DRMDevice2_Release(device2); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, rc.right, rc.bottom, &device3); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRMDevice3 interface (hr = %x)\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %d , cref2 = %d\n", cref1, cref2); > + if (device3) > + IDirect3DRMDevice3_Release(device3); > + ref2 = get_refcount((IUnknown *)d3drm1); > + cref2 = get_refcount((IUnknown *)clipper); > + ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %d, ref2 = %d\n", ref1, ref2); > + ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %d, cref2 = %d\n", cref1, cref2); > + > + IDirectDrawClipper_Release(clipper); > + IDirect3DRM2_Release(d3drm2); > + IDirect3DRM3_Release(d3drm3); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -2387,4 +2467,5 @@ START_TEST(d3drm) > test_create_device_from_clipper(); > test_create_device_from_surface(); > test_create_device_from_d3d(); > + test_device_refcount(); > } > -- > 1.9.3 (Apple Git-50) > > >

2 1

Re: [PATCH] ddraw: Make some functions hotpachable.
by Stefan Dösinger June 11, 2015

June 11, 2015

This is fine with me. Note though that when I dealt with Fraps I noticed that it expects new interfaces to thunk to old interfaces, not the other way around like we do. We'll probably have to do something similar if we want these apps to work on ddraw. Also at least Fraps expects the functions to be at the same offset in the loaded library image. Setting a constant load address makes this work, but it's an overkill and Alexandre said no to it. > Am 11.06.2015 um 17:38 schrieb Marcus Meissner <marcus(a)jet.franken.de>: > > From: Michael Müller <michael(a)fds-team.de> > > --- > dlls/ddraw/surface.c | 55 ++++++++++++++++++++++++++++------------------------ > 1 file changed, 30 insertions(+), 25 deletions(-) > > diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c > index f716cfc..77a3d44 100644 > --- a/dlls/ddraw/surface.c > +++ b/dlls/ddraw/surface.c > @@ -1155,7 +1155,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, > * For more details, see IWineD3DSurface::UnlockRect > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); > HRESULT hr; > @@ -1171,7 +1171,7 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR > return hr; > } > > -static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > > @@ -1180,7 +1180,7 @@ static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pR > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, pRect); > } > > -static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > > @@ -1190,7 +1190,7 @@ static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *da > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > > @@ -1200,7 +1200,7 @@ static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *da > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > > @@ -1210,7 +1210,8 @@ static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *dat > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, > + IDirectDrawSurface7 *src, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); > struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); > @@ -1332,7 +1333,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra > return hr; > } > > -static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, > + IDirectDrawSurface4 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst); > @@ -1343,7 +1345,8 @@ static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, > + IDirectDrawSurface3 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst); > @@ -1354,7 +1357,8 @@ static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, > + IDirectDrawSurface2 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst); > @@ -1365,7 +1369,8 @@ static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface1_Flip(IDirectDrawSurface *iface, IDirectDrawSurface *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, > + IDirectDrawSurface *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst); > @@ -1514,7 +1519,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons > * See IWineD3DSurface::Blt for more details > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect, > IDirectDrawSurface7 *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) > { > struct ddraw_surface *dst_surface = impl_from_IDirectDrawSurface7(iface); > @@ -1640,7 +1645,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR > } > } > > -static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, > IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface4(iface); > @@ -1653,7 +1658,7 @@ static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_r > src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, > IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface); > @@ -1666,7 +1671,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, > IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface); > @@ -1679,7 +1684,7 @@ static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_r > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, > IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface); > @@ -2640,7 +2645,7 @@ static HRESULT WINAPI ddraw_surface2_PageUnlock(IDirectDrawSurface2 *iface, DWOR > * DDERR_UNSUPPORTED > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) > { > TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, Batch, Count, Flags); > > @@ -2648,7 +2653,7 @@ static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTB > return DDERR_UNSUPPORTED; > } > > -static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > > @@ -2657,7 +2662,7 @@ static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > > @@ -2666,7 +2671,7 @@ static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > > @@ -2675,7 +2680,7 @@ static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > > @@ -4093,7 +4098,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M > * For more details, see IWineD3DSurface::BltFast > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty, > IDirectDrawSurface7 *Source, RECT *rsrc, DWORD trans) > { > struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); > @@ -4165,7 +4170,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d > } > } > > -static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface4(iface); > @@ -4178,7 +4183,7 @@ static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface3(iface); > @@ -4191,7 +4196,7 @@ static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface2(iface); > @@ -4204,7 +4209,7 @@ static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); > -- > 1.8.4.5 > > >

1 0

Re: [PATCH] ddraw: Make some functions hotpachable.
by Stefan Dösinger June 11, 2015

June 11, 2015

This is fine with me. Note though that when I dealt with Fraps I noticed that it expects new interfaces to thunk to old interfaces, not the other way around like we do. We'll probably have to do something similar if we want these apps to work on ddraw. Also at least Fraps expects the functions to be at the same offset in the loaded library image. Setting a constant load address makes this work, but it's an overkill and Alexandre said no to it. > Am 11.06.2015 um 17:38 schrieb Marcus Meissner <marcus(a)jet.franken.de>: > > From: Michael Müller <michael(a)fds-team.de> > > --- > dlls/ddraw/surface.c | 55 ++++++++++++++++++++++++++++------------------------ > 1 file changed, 30 insertions(+), 25 deletions(-) > > diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c > index f716cfc..77a3d44 100644 > --- a/dlls/ddraw/surface.c > +++ b/dlls/ddraw/surface.c > @@ -1155,7 +1155,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, > * For more details, see IWineD3DSurface::UnlockRect > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); > HRESULT hr; > @@ -1171,7 +1171,7 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR > return hr; > } > > -static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pRect) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > > @@ -1180,7 +1180,7 @@ static HRESULT WINAPI ddraw_surface4_Unlock(IDirectDrawSurface4 *iface, RECT *pR > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, pRect); > } > > -static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > > @@ -1190,7 +1190,7 @@ static HRESULT WINAPI ddraw_surface3_Unlock(IDirectDrawSurface3 *iface, void *da > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > > @@ -1200,7 +1200,7 @@ static HRESULT WINAPI ddraw_surface2_Unlock(IDirectDrawSurface2 *iface, void *da > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *data) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > > @@ -1210,7 +1210,8 @@ static HRESULT WINAPI ddraw_surface1_Unlock(IDirectDrawSurface *iface, void *dat > return ddraw_surface7_Unlock(&surface->IDirectDrawSurface7_iface, NULL); > } > > -static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDrawSurface7 *src, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 *iface, > + IDirectDrawSurface7 *src, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); > struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); > @@ -1332,7 +1333,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra > return hr; > } > > -static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDrawSurface4 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, > + IDirectDrawSurface4 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst); > @@ -1343,7 +1345,8 @@ static HRESULT WINAPI ddraw_surface4_Flip(IDirectDrawSurface4 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, > + IDirectDrawSurface3 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst); > @@ -1354,7 +1357,8 @@ static HRESULT WINAPI ddraw_surface3_Flip(IDirectDrawSurface3 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDrawSurface2 *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, > + IDirectDrawSurface2 *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst); > @@ -1365,7 +1369,8 @@ static HRESULT WINAPI ddraw_surface2_Flip(IDirectDrawSurface2 *iface, IDirectDra > dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); > } > > -static HRESULT WINAPI ddraw_surface1_Flip(IDirectDrawSurface *iface, IDirectDrawSurface *dst, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, > + IDirectDrawSurface *dst, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst); > @@ -1514,7 +1519,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons > * See IWineD3DSurface::Blt for more details > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestRect, > IDirectDrawSurface7 *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) > { > struct ddraw_surface *dst_surface = impl_from_IDirectDrawSurface7(iface); > @@ -1640,7 +1645,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR > } > } > > -static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_rect, > IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface4(iface); > @@ -1653,7 +1658,7 @@ static HRESULT WINAPI ddraw_surface4_Blt(IDirectDrawSurface4 *iface, RECT *dst_r > src ? &src->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_rect, > IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface3(iface); > @@ -1666,7 +1671,7 @@ static HRESULT WINAPI ddraw_surface3_Blt(IDirectDrawSurface3 *iface, RECT *dst_r > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_rect, > IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface2(iface); > @@ -1679,7 +1684,7 @@ static HRESULT WINAPI ddraw_surface2_Blt(IDirectDrawSurface2 *iface, RECT *dst_r > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags, fx); > } > > -static HRESULT WINAPI ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Blt(IDirectDrawSurface *iface, RECT *dst_rect, > IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags, DDBLTFX *fx) > { > struct ddraw_surface *dst = impl_from_IDirectDrawSurface(iface); > @@ -2640,7 +2645,7 @@ static HRESULT WINAPI ddraw_surface2_PageUnlock(IDirectDrawSurface2 *iface, DWOR > * DDERR_UNSUPPORTED > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTBATCH *Batch, DWORD Count, DWORD Flags) > { > TRACE("iface %p, batch %p, count %u, flags %#x.\n", iface, Batch, Count, Flags); > > @@ -2648,7 +2653,7 @@ static HRESULT WINAPI ddraw_surface7_BltBatch(IDirectDrawSurface7 *iface, DDBLTB > return DDERR_UNSUPPORTED; > } > > -static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); > > @@ -2657,7 +2662,7 @@ static HRESULT WINAPI ddraw_surface4_BltBatch(IDirectDrawSurface4 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); > > @@ -2666,7 +2671,7 @@ static HRESULT WINAPI ddraw_surface3_BltBatch(IDirectDrawSurface3 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); > > @@ -2675,7 +2680,7 @@ static HRESULT WINAPI ddraw_surface2_BltBatch(IDirectDrawSurface2 *iface, DDBLTB > return ddraw_surface7_BltBatch(&surface->IDirectDrawSurface7_iface, batch, count, flags); > } > > -static HRESULT WINAPI ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltBatch(IDirectDrawSurface *iface, DDBLTBATCH *batch, DWORD count, DWORD flags) > { > struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); > > @@ -4093,7 +4098,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M > * For more details, see IWineD3DSurface::BltFast > * > *****************************************************************************/ > -static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty, > IDirectDrawSurface7 *Source, RECT *rsrc, DWORD trans) > { > struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); > @@ -4165,7 +4170,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d > } > } > > -static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface4 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface4(iface); > @@ -4178,7 +4183,7 @@ static HRESULT WINAPI ddraw_surface4_BltFast(IDirectDrawSurface4 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface3 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface3(iface); > @@ -4191,7 +4196,7 @@ static HRESULT WINAPI ddraw_surface3_BltFast(IDirectDrawSurface3 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface2 *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface2(iface); > @@ -4204,7 +4209,7 @@ static HRESULT WINAPI ddraw_surface2_BltFast(IDirectDrawSurface2 *iface, DWORD d > src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, src_rect, flags); > } > > -static HRESULT WINAPI ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y, > +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_BltFast(IDirectDrawSurface *iface, DWORD dst_x, DWORD dst_y, > IDirectDrawSurface *src_surface, RECT *src_rect, DWORD flags) > { > struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface(iface); > -- > 1.8.4.5 > > >

1 0

Re: winemac.drv: Improved App name on windows and menus (Mac Driver)
by Ken Thomases June 11, 2015

June 11, 2015

Hi, On Jun 10, 2015, at 9:48 AM, Vitor Marques <vitor251093(a)gmail.com> wrote: > In the actual code, the Mac Driver uses the Bundle Name on the Hide and Quit buttons, but not in the main menu item, which doesn't make sense since that's the most important place for the app name. It's a very simple change that surely will be very welcome to all Mac users. I've also attached the patch in case Gmail's line-wrapping cause any trouble. Although I have not tested, the changes are simple enough to be analyzed in sight. My system is a Mac OS X 10.10. Thanks for your interest in the Mac driver and your attempt to improve it. Unfortunately, it's clear you haven't tested, since this won't run. You've misspelled "length" as "lenght", which would cause an unrecognized selector exception at run time if it even compiles. But, more importantly, the title that a program sets for the application menu is ignored by Cocoa. It uses the bundle name regardless. So, this change has no effect. Was there an actual problem behavior that you observed that you were trying to fix? Or was this just determined by reading the code? -Ken

2 2

Re: [PATCH 1/4] msvcp110: Add tr2_sys__File_size implementation and test.(try 3)
by Piotr Caban June 11, 2015

June 11, 2015

On 06/09/15 18:49, YongHao Hu wrote: > try 3: > Add errno and SetLastError test. The series looks good for me. The GetLastError value seems to be inconsistent (it's best visible in _Equivalent tests). I'm not sure why I've asked you about testing GetLastError, I was probably thinking about errno. Anyway I don't think it's useful to test it in future. Thanks, Piotr

2 5

Re: PATCH: ParseX509EncodedCertificateForListBoxEntry stub
by Henri Verbeet June 11, 2015

June 11, 2015

I suppose I'll give Austin a hand because I like the occasional Valgrind runs. On 11 June 2015 at 11:24, Marcus Meissner <marcus(a)jet.franken.de> wrote: > +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) Please avoid the pointer typedefs and Hungarian. I.e., "char *listbox", "DWORD *listbox_size", etc. > + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); I'm not a particular fan of this tracing style, but I suppose it's the local wininet style. "len" is a DWORD, so unsigned, so %u. "szlistbox" is an output parameter, so tracing it as a string makes no sense. > -@ stub ParseX509EncodedCertificateForListBoxEntry > +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) Similarly, "str" is wrong for output parameters. > +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD); While not strictly wrong, I really think it's much more readable to include the parameter names in the prototypes. I suppose that's local wininet style too, but IMHO we should just fix it in that regard. Also, pointer typedefs again.

2 1

Re: winemac.drv: Improved App name on windows and menus (Mac Driver)
by Huw Davies June 11, 2015

June 11, 2015

On Wed, Jun 10, 2015 at 11:48:35AM -0300, Vitor Marques wrote: > Although I have not tested, the changes are simple enough > to be analyzed in sight. Indeed they are, see below. You really do need to test your patches. And yes, gmail messed up the whitespace. > diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m > index 82925c8..a9d98c6 100644 > --- a/dlls/winemac.drv/cocoa_app.m > +++ b/dlls/winemac.drv/cocoa_app.m > @@ -214,14 +214,14 @@ - (void) transformProcessToForeground > > mainMenu = [[[NSMenu alloc] init] autorelease]; > > - // Application menu > - submenu = [[[NSMenu alloc] initWithTitle:@"Wine"] autorelease]; > + // Application name > bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; > + if (!bundleName || ![bundleName lenght]) bundleName = @"Wine"; "lenght" is not what you want here. Huw.

2 2

Re: [PATCH 1/4] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 2).
by Henri Verbeet June 11, 2015

June 11, 2015

On 11 June 2015 at 13:51, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > + cleanup: > + IDirectDrawClipper_Release(clipper); I'm mostly leaving this for Stefan to actually review, but this seems like an indentation accident.

1 0

Re: dpnet: Correct adding components in Duplicate
by Marvin June 11, 2015

June 11, 2015

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

1 0

Re: PATCH: d3d8: mark one more function as hotpatchable
by Henri Verbeet June 11, 2015

June 11, 2015

I think the original subject was slightly better because it's more specific, although the proper name of the function is d3d8_swapchain_Present() of course.

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString ( try 2)
by Alexandre Julliard June 11, 2015

June 11, 2015

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > @@ -101,6 +102,21 @@ static inline WCHAR *heap_strdupAtoW(const char *str) > return ret; > } > > +static char *WtoA(LPCWSTR wstr) > +{ > + int length; > + char *result; > + > + length = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL); > + > + result = HeapAlloc(GetProcessHeap(), 0, length); > + > + if (result) > + WideCharToMultiByte(CP_UTF8, 0, wstr, -1, result, length, NULL, NULL); > + > + return result; UTF-8 makes no sense here, and you shouldn't need that function in the first place. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: PATCH: ParseX509EncodedCertificateForListBoxEntry stub
by Alexandre Julliard June 11, 2015

June 11, 2015

Marcus Meissner <marcus(a)jet.franken.de> writes: > From db29dec04c5c02ab2a96010d42aec00aaeccbec2 Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 25 Feb 2015 01:04:56 -0600 > Subject: wininet: add ParseX509EncodedCertificateForListBoxEntry stub (try 2) > > Try 2: Fix prototype/spec file, add to winineti.h > Fixes https://bugs.winehq.org/show_bug.cgi?id=29842 It's still wrong. If you want to help, review the patch, figure out what's wrong, email the original author (CC'ing wine-devel), and ask them to fix their patch and resubmit. And if you can't figure out what's wrong, then maybe you shouldn't be submitting other people's patches. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winemac.drv: Improved App name on windows and menus (Mac Driver)
by Nikolay Sivov June 11, 2015

June 11, 2015

On 06/10/2015 05:48 PM, Vitor Marques wrote: > + // Application name > bundleName = [[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleNameKey]; > + if (!bundleName || ![bundleName lenght]) bundleName = @"Wine"; I can't say I understand objc, but this looks like a typo.

1 0

Re: dpnet: Simplify the storing of component data
by Stefan Dösinger June 11, 2015

June 11, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I am OK with this patch in principle if you believe that it is an improvement. It reduces the code size, but on the other hand it means that you're having tiny allocations for DWORDs and GUIDs. Keep in mind that such allocations mean overhead in memory use, run time and memory fragmentation. I'd like to point out an alternative approach: You can give struct component a variable size, similar to how struct wined3d_private_data in include/wine/wined3d.h works. But overall I think this is a minor detail considering the overall state of the directplay libs and that there are more important issues to solve. I don't want to stand in your way by arguing about small things like this. I can't promise Alexandre agrees though. Either way, two style comments: The test is a good test to add, but should be in its own patch. Am 2015-06-10 um 06:41 schrieb Alistair Leslie-Hughes: > found = TRUE; > > - if(entry->type == DPNA_DATATYPE_STRING_ANSI) > - heap_free(entry->data.ansi); > - else if(entry->type == DPNA_DATATYPE_STRING) > - heap_free(entry->data.string); > - else if(entry->type == DPNA_DATATYPE_BINARY) > - heap_free(entry->data.binary); > + heap_free(entry->data); > > break; The added heap_free line is indented by 11 chars. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVeAC0AAoJEN0/YqbEcdMws9oP/RyusEIcZnV4GWTAmfaSKfFn 0iheACWwmeL3GlWeqmY51S8ImuKcoD0HoZ/vQm6jMhTTJFK3jENVJkMk/Mjx8Kk6 ZPcit6nPB184lDgzLXV0gHbMlPkFxdTPJi++1ZfKa9LskJ3zIrgF7LcJFidtCSeG 7yHdg6C0BiQH4oXjBzY+fVRzaQluKEihncaa2tYdErfMUCzUf+RAi99/tnete2Re EiejXowzg5HcxjBHMupsGEcFocUnXtUlPzJf0UIawbptxzPYXk3H0VYPohIrLVm6 f/chcdKlvAi5xdUlCuF4nLw9TQxyC5h3mf5p7l/JdDbgRE8knCO1w/HrzOHJJJRB TnkU5EdrnIc3Bx6Tw/kQGTKsM3SAuSapdjBsQRracNaQVzdqYKfsMPaiQeRVmdQO LJbyeECFw3l3opf/LFd/TUguDws2hChASaBAOf25vorhD6wH8fnaoNnEh1qMtBH5 x1jJjxB+B0Uwa4nYKProoOc0Qw0/zoaVlv3vCKiiEggz+BkXEuYb58ZDysSg4A1w JVO0S6GAfumFPWvHMtoIEPsFxiPl6xHiwXsKzrHc8K5EpUTZ2Jcv0lam53x39Tb1 cJmluv1SyxrdrTWT1nCtgg+ma8ezid8HEpOj+aIWVwYcKwR9uF09jvDEaAzwSuAr V6ogftbNHriUDl15YrO+ =zne3 -----END PGP SIGNATURE-----

2 1

Re: [1/1] advapi32/tests: Add preliminary event tracing tests. (v2 resend)
by Marvin June 11, 2015

June 11, 2015

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=14142 Your paranoid android. === w2000pro (32 bit eventlog) === eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wxppro (32 bit eventlog) === eventlog.c:687: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2003std (32 bit eventlog) === eventlog.c:687: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2008s64 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7u (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w8 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:787: Test failed: Expected success eventlog.c:795: Test failed: Expected ERROR_ALREADY_EXISTS, got 87

1 0

Re: [PATCH 5/5] d3d9/tests: Test the default colors for fixed function vertex processing.
by Marvin June 10, 2015

June 10, 2015

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=14137 Your paranoid android. === w8 (32 bit visual) === visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test. visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test. visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test.

1 0

Re: [PATCH 4/5] d3d9/tests: Test the default diffuse color for vertex shaders.
by Marvin June 10, 2015

June 10, 2015

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=14136 Your paranoid android. === w8 (32 bit visual) === visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test. visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test. visual.c:7924: Test failed: Got unexpected color 0x00ffff00 for no color attribute test.

1 0

Re: [PATCH 4/4] d3drm/tests: Add refcount tests for IDirect3DRMDevice*
by Marvin June 10, 2015

June 10, 2015

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=14110 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm.c:2037: Test failed: Expected 32 bpp, got 24d3drm.c:2054: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2058: Test failed: Expected 640x480, got 1024x768 d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840. === wxppro (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840. === w2003std (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840.

2 1

Re: [PATCH 2/2] mshtml: Implement IHTMLXMLHttpRequest as a stub. (try 2)
by Alexandre Julliard June 10, 2015

June 10, 2015

Zhenbo Li <litimetal(a)gmail.com> writes: > try 2: > add test_disp in dom.c for DIID_DispHTMLXMLHttpRequest It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so dom && touch dom.ok dom.c:6110: Test failed: unexpected guid {3051040a-98b5-11cf-bb82-00aa00bdce0b} make: *** [dom.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winebuild: Set a valid major and minor linker version.
by Nikolay Sivov June 10, 2015

June 10, 2015

On 10.06.2015 10:08, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > Some apps expect a nonzero linker version. > Just out of curiosity, could you name some of those applications?

2 1

Re: [PATCH 3/4] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D.
by Marvin June 10, 2015

June 10, 2015

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=14109 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm.c:2037: Test failed: Expected 32 bpp, got 24d3drm.c:2054: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2058: Test failed: Expected 640x480, got 1024x768 d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840. === wxppro (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840. === w2003std (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. d3drm.c:2306: Test failed: Expected 10006040 for caps, got 2840.

1 0

Re: [PATCH 2/4] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface.
by Marvin June 10, 2015

June 10, 2015

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=14108 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm.c:2037: Test failed: Expected 32 bpp, got 24d3drm.c:2054: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2058: Test failed: Expected 640x480, got 1024x768 d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. === wxppro (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840. === w2003std (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. d3drm.c:2138: Test failed: Expected 10006040 for caps, got 2840.

1 0

Re: [PATCH 1/4] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper.
by Marvin June 10, 2015

June 10, 2015

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=14107 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm.c:2037: Test failed: Expected 32 bpp, got 24d3drm.c:2054: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2058: Test failed: Expected 640x480, got 1024x768 === wxppro (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32. === w2003std (32 bit d3drm) === d3drm.c:2040: Test failed: Cannot set display mode to 8bpp (hr = 80004001). d3drm.c:2044: Test failed: Expected 16 bpp, got 32.

1 0

Re: [3/3] kernel32: Forward SetFileInformationByHandle FileDispositionInfo class to ntdll.
by Marvin June 10, 2015

June 10, 2015

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

1 0

Re: [1/3] kernel32: Improve stub for SetFileInformationByHandle.
by Marvin June 10, 2015

June 10, 2015

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=14101 Your paranoid android. === wvistau64 (32 bit file) === file.c:446: Test failed: attributes of file "testfile.xxx" are 0x0820 === w7u (32 bit file) === file.c:4204: Test failed: SetFileValidData failed 87 file.c:4207: Test failed: SetFileValidData failed 87 === wvistau64 (64 bit file) === file.c:446: Test failed: attributes of file "testfile.xxx" are 0x0820

2 1

Re: regedit: Need 3 bytes of room at end of buffer for \r\n\0 to avoid endless loop.
by Sebastian Lackner June 10, 2015

June 10, 2015

On 21.05.2015 13:14, Jiaxing Wang wrote: > --- > programs/regedit/regproc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > The patch looks correct to me, and the issue can be easily reproduced by trying to import for example http://ix.io/j1Y. (md5sum: 6928e59d2c1a92666377a088a1523666) The only problem I see is that the code for A/W has diverged a lot over time. I'm not sure, but I assume Alexandre might expect to merge or at least synchronize it, before fixing specific parser bugs.

1 0

Re: include: Fix definition of FILE_DISPOSITION_INFO.
by Nikolay Sivov June 10, 2015

June 10, 2015

On 09.06.2015 10:09, Sebastian Lackner wrote: > A member called DeleteFile cannot be accessed because its defined as > DeleteFile_must_be_suffixed_with_W_or_A_in_this_context. > > --- > include/winbase.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > This is how it's defined in SDK though, I don't think you can change that.

3 4

Re: rpcrt4: Restore original error code when ReadFile fails with ERROR_MORE_DATA.
by Alexandre Julliard June 9, 2015

June 9, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > Required when named pipe messagemode is implemented. Restoring last error is in general wrong. You'll need a better reason to justify this. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions
by Dmitry Timoshkov June 9, 2015

June 9, 2015

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > First bits for https://bugs.winehq.org/show_bug.cgi?id=34843 What is the reason of reimplementing it when wine-staging already includes full implementation with tests? https://github.com/wine-compholio/wine-staging/blob/master/patches/gdiplus-… -- Dmitry.

6 14

Re: gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions (try2)
by Vincent Povirk June 9, 2015

June 9, 2015

Looks good to me, thanks. On Tue, Jun 9, 2015 at 1:37 AM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > try2: check for both possible magic values > > >

1 0

mciqtz32: Guarantees that CoInitialize and CoUninitialize run on the same thread.
by Joerg-Cyril.Hoehle＠t-systems.com June 9, 2015

June 9, 2015

Aki, if I understand your critical section well, you serialize all accesses to the individual player thread. This may be ok for commands that return immediately, e.g. STATUS, but the MCI knows commands that may take a long time, in particular PLAY, RECORD and even SEEK. Did you run a test like this: CreateTask { SetEvent started MCICommand(MCI_PLAY, "av_file_that_takes_3_minutes.avi", MCI_WAIT); } Wait(started); Repeat 10 times { MCICommand(MCI_STATUS,MCI_POSITION); printf MCICommand(MCI_STATUS,MCI_MODE); Printf Sleep(2s); } Wait(thread); I would expect all MCI commands "STATUS POSITION" etc. to work while another thread is busy playing a file synchronously (using MCI_WAIT). Furthermore +static LRESULT MCIQTZ_relayTaskMessage [...] + if (WaitForSingleObject(wma->task.done, INFINITE) == WAIT_OBJECT_0) Are you sure it's ok to block the user thread like this? Shouldn't the code use a loop that also pumps the MS-Windows message queue and dispatches messages? E.g. there may be a need to dispatch REFRESH and PAINT messages? Did you cross-check what MS-Windows does here? On a related note, IIRC some wine devices use a more reliable approach to waiting: WaitForMultiple(2 objects: [task.done, task.threadId], INFINITE); That way, should the player crash or exit somehow, the main (user) task doesn't hang. Regards, Jörg Höhle

2 4