- wine-devel - winehq.org

Re: ddraw/tests: Rename mips to mipmaps
by Henri Verbeet 14 Dec '15

14 Dec '15

On 13 December 2015 at 22:33, André Hentschel <nerv(a)dawncrow.de> wrote: > GCC for mips defines mips to 1, thus this file won't build with a mips compiler without this patch > I think -std=c90 should help with that, although there may be some instances of e.g. "inline" and "typeof" we'd need to fix. Still, I like "mipmaps" better than "mips", even though it's supposed to be called "mipmap_count".

1 0

Re: ddraw/tests: Rename mips to mipmaps
by Marvin 13 Dec '15

13 Dec '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=18975 Your paranoid android. === w1064 (32 bit dsurface) === dsurface.c:296: Test failed: Destination data after blitting is not correct dsurface.c:330: Test failed: Destination data after blitting is not correct dsurface.c:509: Test failed: Surface data after srckey blit does not match dsurface.c:534: Test failed: Surface data after src override key blit does not match dsurface.c:588: Test failed: Surface data after dest key blit does not match dsurface.c:614: Test failed: Surface data after dest key override blit does not match dsurface.c:676: Test failed: Surface data with src key and dest key blit does not match

1 0

Re: [PATCH] Support -march in winegcc and winebuild
by André Hentschel 13 Dec '15

13 Dec '15

Am 13.12.2015 um 19:17 schrieb Stephen Kitt: > Since -mcpu is already supported, it seems to make sense to also support > -march. Having -march simplifies building for ARM platforms... > > Signed-off-by: Stephen Kitt <steve(a)sk2.org> > --- > tools/winebuild/build.h | 1 + > tools/winebuild/main.c | 2 ++ > tools/winebuild/utils.c | 1 + > tools/winegcc/winegcc.c | 2 +- > 4 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h > index 4a71eed..e32e7a9 100644 > --- a/tools/winebuild/build.h > +++ b/tools/winebuild/build.h > @@ -362,6 +362,7 @@ extern struct strarray *cc_command; > extern struct strarray *ld_command; > extern struct strarray *nm_command; > extern char *cpu_option; > +extern char *arch_option; > extern int thumb_mode; > > #endif /* __WINE_BUILD_H */ > diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c > index d1717c0..08c8c2c 100644 > --- a/tools/winebuild/main.c > +++ b/tools/winebuild/main.c > @@ -89,6 +89,7 @@ struct strarray *cc_command = NULL; > struct strarray *ld_command = NULL; > struct strarray *nm_command = NULL; > char *cpu_option = NULL; > +char *arch_option = NULL; > > #ifdef __thumb__ > int thumb_mode = 1; > @@ -408,6 +409,7 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) > else if (!strcmp( optarg, "arm" )) thumb_mode = 0; > else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; > else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); > + else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); > else fatal_error( "Unknown -m option '%s'\n", optarg ); > break; > case 'M': > diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c > index 83eb803..4860a19 100644 > --- a/tools/winebuild/utils.c > +++ b/tools/winebuild/utils.c > @@ -388,6 +388,7 @@ struct strarray *get_as_command(void) > if (force_pointer_size) > strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); > if (cpu_option) strarray_add_one( args, strmake("-mcpu=%s", cpu_option) ); > + if (arch_option) strarray_add_one( args, strmake("-march=%s", arch_option) ); > return args; > } > > diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c > index c07243b..1326afe 100644 > --- a/tools/winegcc/winegcc.c > +++ b/tools/winegcc/winegcc.c > @@ -1525,7 +1525,7 @@ int main(int argc, char **argv) > strarray_add(opts.winebuild_args, argv[i]); > raw_linker_arg = 1; > } > - else if (strncmp("-mcpu=", argv[i], 6) == 0) > + else if (strncmp("-mcpu=", argv[i], 6) == 0 || strncmp("-march=", argv[i], 7) == 0) > strarray_add(opts.winebuild_args, argv[i]); > break; > case 'n': > Hi, please first change winebuild to support it, make the subject something like "[1/2] winebuild: Add support for -march" and please update tools/winebuild/winebuild.man.in In the second patch make use of that new feature in winegcc Otherwise it looks good, maybe mention why this is needed for Debian/armel

2 1

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests (try 4)
by Matteo Bruni 11 Dec '15

11 Dec '15

2015-12-11 10:59 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > The DDS_CAPS_TEXTURE | DDSCAPS_ALPHA caps check was to address testbot failures > http://testbot.winehq.org/JobDetails.pl?Key=18888 Yes, I understand that. What I meant is that I don't get the header->caps == DDS_CAPS_TEXTURE case ever, except on Wine, so the check should be simply: todo_wine ok(header->caps == (DDS_CAPS_TEXTURE | DDSCAPS_ALPHA), "Got unexpected caps %x.\n", header->caps); Unless you can actually get that one to fail on Windows. If that's the case I'd like to know where does it fail for you.

2 7

Random err:winediag:nulldrv_CreateWindow errors related to windows and explorer
by Bruno Jesus 10 Dec '15

10 Dec '15

I believe that since code freeze started (or maybe 1.7.55) a random behavior was introduced related to these 2 messages: err:winediag:nulldrv_CreateWindow Application tried to create a window, but no driver could be loaded. err:winediag:nulldrv_CreateWindow The explorer process failed to start. Sometimes together there is also: err:ole:apartment_createwindowifneeded CreateWindow failed with error 0 I'm not seeing this alone. at November 23 there was a mention to it in bug https://bugs.winehq.org/show_bug.cgi?id=39384 and also in December 1 there was a mention at bug https://bugs.winehq.org/show_bug.cgi?id=39057 The issue seems to manifest more when the computer is heavily loaded (cpu/ram). I believe a regression test to be very hard since the issue is random, sorry. Is anyone else affected by this? I'm still affected with today's git. Best wishes, Bruno

5 8

Re: [PATCH] wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
by Stefan Dösinger 10 Dec '15

10 Dec '15

> Am 08.12.2015 um 20:42 schrieb Henri Verbeet <hverbeet(a)codeweavers.com>: > > - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING) > + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) This also helps bugs like 29878, or the Crysis bug that was I think incorrectly closed. However, the reason why I've never made this seemingly obvious change is that you'll get other applications that crash due to VM exhaustion now. So I'm afraid you'll just trade one kind of breakage for another. The proper fix is probably somewhere in GL_ARB_buffer_storage, but that is too complicated for 1.8. One app that needed direct mapping of managed buffers to run properly was Half Life 2. I think the game changed since then and sets the LAA flag, but there are other games with the same problem.

3 4

Re: winepulse.drv: Add a winediag message when buffer is too small.
by Andrew Eikum 10 Dec '15

10 Dec '15

On Thu, Dec 10, 2015 at 03:27:24PM +0100, Sebastian Lackner wrote: > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > After pulseaudio was added, a lot of Debian people complained about missing sound. As it turns out, > this was the result of a packaging "mistake". Debian wrapper scripts set PULSE_LATENCY_MSEC to small > value by default, which worked fine with winealsa. > More than "worked fine," it actually made winealsa work better for some setups. So it was a good idea for winealsa, but is no longer needed and causes problems for winepulse. See also Bug 39744 and numerous references around the web to setting pulse's default-fragment-size-msec, which equates to about the same thing. > Even when the problem is fixed on Debian, the same problem might still occur when people have set > PULSE_LATENCY_MSEC manually on their machine, and the value is too small. http://ix.io/mJp would > be an alternative solution, but no longer allows users to control this environment variable manually. > Yeah, I definitely don't want to override the user's settings. > This patch adds at least a warning, so that users know which environment variable could be related > when sound is suddenly missing after an upgrade. Comments welcome, would like to know Andrews opinion > first how to proceed with this issue. > Adding a warning seems like a good idea, but I would do it in AudioClient_Initialize and remove the once-check. Around line 1340, warn the user if tlength is less than bufsize_bytes. Andrew

1 0

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests (try 3)
by Matteo Bruni 10 Dec '15

10 Dec '15

2015-12-09 5:35 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Also updates the structure dds_header to be the same as d3dx9_36/surface.c. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- Thank you for improving the patches according to our comments. I've found more though. > dlls/d3dx9_36/tests/surface.c | 45 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 44 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 1697a03..eaab0f74 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > @@ -211,7 +211,9 @@ struct dds_header > struct dds_pixel_format pixel_format; > DWORD caps; > DWORD caps2; > - DWORD reserved2[3]; > + DWORD caps3; > + DWORD caps4; > + DWORD reserved2; > }; > > /* fills dds_header with reasonable default values */ > @@ -1231,6 +1233,8 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > RECT rect; > ID3DXBuffer *buffer; > IDirect3DSurface9 *surface; > + struct dds_header *header; > +#define BROKEN_CAPS (DDS_CAPS_TEXTURE | 0x02) You don't need a define for this, I'd just put the expression in the ok() or maybe use a const DWORD variable for this kind of situation. FWIW 0x2 is probably DDSCAPS_ALPHA (see ddraw.h). Notice though that I always get 0x1002 in the caps field on Windows (7 and XP tested) so probably it isn't right to consider that result as broken. Did you actually get header->caps == DDS_CAPS_TEXTURE on any Windows version (and if so, which one)? If not I'd only accept (DDSCAPS_TEXTURE | DDSCAPS_ALPHA) as a valid result and add a todo_wine to the relevant ok() call. You don't need a define or const for the broken caps then and you can just put the expected result in the ok(). > > hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); > if (FAILED(hr)) { > @@ -1248,6 +1252,45 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > ID3DXBuffer_Release(buffer); > } > > + SetRectEmpty(&rect); > + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, &rect); > + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x\n", hr); Missing period. > + if (SUCCEEDED(hr)) > + { > + header = ID3DXBuffer_GetBufferPointer(buffer); > + > + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); > + ok(header->size == 124, "Invalid DDS size %u.\n", header->size); > + ok(!header->height, "Got unexpected height %u.\n", header->height); > + ok(!header->width, "Got unexpected width %u.\n", header->width); > + ok(!header->depth, "Got unexpected depth %u.\n", header->depth); > + ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); > + ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); > + ok(header->caps == DDS_CAPS_TEXTURE || broken(header->caps == BROKEN_CAPS), > + "Got unexpected caps %x.\n", header->caps); Indentation. > + ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > + "Got unexpected flags %x.\n", header->flags); > + ID3DXBuffer_Release(buffer); > + } > + > + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL); > + ok(hr == D3D_OK, "Got unexpected hr %#x\n", hr); Missing period. > + header = ID3DXBuffer_GetBufferPointer(buffer); > + > + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature.\n"); > + todo_wine ok(header->size == 124, "Invalid DDS size %u.\n", header->size); > + ok(header->height == 4, "Got unexpected height %u.\n", header->height); > + ok(header->width == 4, "Got unexpected width %u.\n", header->width); > + todo_wine ok(!header->depth, "Got unexpected depth %u.\n", header->depth); > + todo_wine ok(!header->miplevels, "Got unexpected miplevels %u.\n", header->miplevels); > + todo_wine ok(!header->pitch_or_linear_size, "Got unexpected pitch_or_linear_size %u.\n", header->pitch_or_linear_size); > + ok(header->caps == DDS_CAPS_TEXTURE || broken(header->caps == BROKEN_CAPS), > + "Got unexpected caps %x.\n", header->caps); > + todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > + "Got unexpected flags %x.\n", header->flags); > + ID3DXBuffer_Release(buffer); > + > +#undef BROKEN_CAPS > IDirect3DSurface9_Release(surface); > } Looks good to me otherwise.

1 0

Release status
by Alexandre Julliard 10 Dec '15

10 Dec '15

Folks, I'm pleased with the progress we've made since code freeze started, with about 40 regressions and many other bugs fixed. Thanks to everybody for taking the time to fix them! At this point it looks like we are running out of easily fixable bugs, so my plan is that rc4 is going to be the last release candidate, and that 1.8 will be released next week. Note also that rc4 is going to be a little delayed since I'm travelling on Friday; it will be out during the weekend. Thank you all for your help! -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] msvcrt: Add tmpnam_s() and _wtmpnam_s() with tests.
by Piotr Caban 10 Dec '15

10 Dec '15

Hi, it this patch fixing any application or is it only letting it execute a little further? It doesn't compile: ../../../wine_src/dlls/msvcr71/msvcr71.spec:667: function 'MSVCRT_wtmpnam' not defined ../../../wine_src/dlls/msvcr70/msvcr70.spec:671: function 'MSVCRT_wtmpnam' not defined ... On 12/10/15 00:08, lejcik wrote: > /********************************************************************* > + * tmpnam_s (MSVCRT.@) > + */ > +int CDECL MSVCRT_tmpnam_s(char *s, MSVCRT_size_t size) > +{ > + char tmpstr[16]; > + char *p; > + int count, tmpsize; > + > + if (!MSVCRT_CHECK_PMT(s != NULL)) > + return MSVCRT_EINVAL; > + > + msvcrt_int_to_base32(GetCurrentProcessId(), tmpstr); > + tmpsize = MSVCRT__snprintf(s, size, "\\s%s.", tmpstr); > + if (tmpsize == -1) > + return MSVCRT_ERANGE; > + > + p = s + tmpsize; You can reuse s variable here (s += tmpsize). > + size -= tmpsize; > + for (count = 0; count < MSVCRT_TMP_MAX; count++) According to MSDN TMP_MAX_S should be used here. It's different then TMP_MAX. > + { > + tmpsize = msvcrt_int_to_base32(tmpnam_unique++, tmpstr); > + if ((MSVCRT_size_t) tmpsize > size) > + return MSVCRT_ERANGE; Is invalid parameter handler called in this case? > char * CDECL MSVCRT_tmpnam(char *s) > { ... > + return MSVCRT_tmpnam_s(s, MAX_PATH) == 0 ? s : NULL; You can't use tmpnam_s here because of TMP_MAX and TMP_MAX_S inequality (unless MSDN is wrong here). Thanks, Piotr

1 0

Re: winhttp/tests: Add an authentication test using IWinHttpRequest.
by Hans Leidekker 10 Dec '15

10 Dec '15

It doesn't build cleanly for me: winhttp.c: In function ‘test_IWinHttpRequest’: winhttp.c:3631:5: warning: implicit declaration of function ‘sprintf’ [-Wimplicit-function-declaration] sprintf( buf, "http://localhost:%d/auth", port ); ^ winhttp.c:3631:5: warning: incompatible implicit declaration of built-in function ‘sprintf’

1 0

Re: programs/iexplore: sync registry and program resource values
by Alexandre Julliard 10 Dec '15

10 Dec '15

Austin English <austinenglish(a)gmail.com> writes: > From: Austin English <austinenglish(a)gmail.com> > Date: Tue, 8 Dec 2015 17:05:28 -0600 > Subject: [PATCH] programs/iexplore: sync registry and program resource values > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > programs/iexplore/iexplore.rc | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Which bug is this for? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] wined3d: Restore WINEDDBLT_ALPHATEST support.
by Henri Verbeet 09 Dec '15

09 Dec '15

On 7 December 2015 at 23:36, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > -static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, > +static void arbfp_blit_surface(enum wined3d_blit_op op, struct wined3d_device *device, DWORD filter, I think I'd prefer "device" to stay the first parameter for consistency with the other blitter ops. It's probably not a big deal though. > @@ -7881,6 +7885,9 @@ static void arbfp_blit_surface(struct wined3d_device *device, DWORD filter, > /* Leave the opengl state valid for blitting */ > arbfp_blit_unset(context->gl_info); > > + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) > + glDisable(GL_ALPHA_TEST); > + You shouldn't need this. context_apply_blit_state() invalidates WINED3D_RS_ALPHATESTENABLE, but even if it didn't, disabling the alpha test isn't necessarily the right thing to do. Not that arbfp_blit_surface() necessarily needs all the invalidation context_apply_blit_state() does though. > @@ -4335,8 +4336,16 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, > wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); > > context = context_acquire(device, dst_surface); > + > + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) > + glEnable(GL_ALPHA_TEST); > + > surface_blt_to_drawable(device, context, filter, > !!color_key, src_surface, src_rect, dst_surface, dst_rect); > + > + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) > + glDisable(GL_ALPHA_TEST); > + Like above. Some basic tests probably wouldn't hurt. If we had had any the regression might not have happened in the first place.

2 3

Re: [PATCH 3/3] bthprops.cpl: add BluetoothFindFirstRadio/BluetoothFindRadioClose stubs
by Bruno Jesus 09 Dec '15

09 Dec '15

On Sat, Dec 5, 2015 at 7:21 AM, Austin English <austinenglish(a)gmail.com> wrote: > > +HBLUETOOTH_RADIO_FIND WINAPI BluetoothFindFirstRadio(BLUETOOTH_FIND_RADIO_PARAMS *params, HANDLE *radio) > +{ > + FIXME("(%p %p): stub!\n", params, radio); > + *radio = NULL; > + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); > + return NULL; > +} Please set the last error to ERROR_NO_MORE_ITEMS. This is the common return when no devices are found and will make other bluetooth appications more happy.

1 0

Re: [1/2] riched32/tests: Add selection tests.
by Jactry Zeng 09 Dec '15

09 Dec '15

2015-12-08 21:55 GMT+08:00 Jactry Zeng <jzeng(a)codeweavers.com>: > > This patch try to reproduce reason of bug 32112: https://bugs.winehq.org/show_bug.cgi?id=32112 > riched32's selection is different to riched20's. It'll count some multibyte characters as two when riched20 count them as two. Sorry, a typo here: riched32's selection is different to riched20's. It'll count some multibyte characters as two when riched20 counts them as *one*. -- Regards, Jactry Zeng

1 0

Re: [PATCH] Programs: fix extrac32 heap leak
by Alex Henrie 08 Dec '15

08 Dec '15

> diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c > index 63205e8..a6e7438 100644 > --- a/programs/extrac32/extrac32.c > +++ b/programs/extrac32/extrac32.c > @@ -207,6 +207,8 @@ static LPWSTR *get_extrac_args(LPWSTR cmdline, int *pargc) > str++; > } > > + HeapFree(GetProcessHeap(), 0, str); > + > argv[argc] = NULL; > *pargc = argc; I don't think this is right. Pointers to str are returned in the argv array, and it's the caller's responsibility to free them. And in this case, there's not much to be gained by freeing these pointers before the end of the program anyway. By the way, when writing patches for Wine programs in the future, please use the name of the program as the component name. For example, "extrac32: Fix heap leak." -Alex

1 0

Re: [PATCH] wined3d: Set WINED3D_BUFFER_DOUBLEBUFFER for managed buffers as well.
by Marvin 08 Dec '15

08 Dec '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=18871 Your paranoid android. === w1064 (32 bit device) === device.c:2613: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2618: Test failed: The focus window is active. device.c:2626: Test failed: Got unexpected hr 0x88760869. device.c:2632: Test failed: Got unexpect screen size 800x600. device.c:2647: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2656: Test failed: Got unexpect screen size 800x600. device.c:2669: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2677: Test failed: Got unexpect width 640. device.c:2678: Test failed: Got unexpect height 480.

1 0

Re: advapi32: Set last error to ERROR_SUCCESS in GetSidIdentifierAuthority.
by Marvin 08 Dec '15

08 Dec '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=18853 Your paranoid android. === w1064 (32 bit security) === security.c:3740: Test failed: MACHINE\Software owner SID != Administrators SID. security.c:3780: Test failed: Builtin Users ACE has unexpected flags (0x12 != 0xa) security.c:3784: Test failed: Builtin Users ACE has unexpected mask (0x20019 != 0x80000000) security.c:3793: Test failed: Builtin Admins ACE has unexpected flags (0x12 != 0x0)

1 0

Re: [PATCH] ddraw: Mark surfaces as lost on mode changes.
by Marvin 08 Dec '15

08 Dec '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=18845 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: po: Use lowercase+underscore names for the replaceable parts of the French usage messages.
by Alexandre Julliard 08 Dec '15

08 Dec '15

Francois Gouget <fgouget(a)free.fr> writes: > This brings consistency and this format keeps the spellchecker happy. > > Signed-off-by: Francois Gouget <fgouget(a)free.fr> > --- > po/fr.po | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) I figured it out this time, but when sending patches that depend on each other, could you please number them so I don't have to try all possible orderings? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: Call the EnumChildWindows callback using a wrapper.
by Sebastian Lackner 08 Dec '15

08 Dec '15

On 08.12.2015 09:53, Dmitry Timoshkov wrote: > +extern LRESULT WNDENUMPROC_wrapper( WNDENUMPROC proc, HWND hwnd, LPARAM lparam ); > +__ASM_GLOBAL_FUNC( WNDENUMPROC_wrapper, > + "pushl %ebp\n\t" > + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") > + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") > + "movl %esp,%ebp\n\t" > + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") > + "pushl %edi\n\t" > + __ASM_CFI(".cfi_rel_offset %edi,-4\n\t") > + "pushl %esi\n\t" > + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") > + "pushl %ebx\n\t" > + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") > + "pushl 16(%ebp)\n\t" > + "pushl 12(%ebp)\n\t" > + "movl 8(%ebp),%eax\n\t" > + "call *%eax\n\t" There is no need to safe edi/esi/ebx when the purpose is just to be compatible with cdecl calling conventions. Also, you should try to keep the stack aligned, like most other assembler wrappers do. Does it also work with something like: http://source.winehq.org/git/wine.git/blob/HEAD:/dlls/dinput/dinput_main.c#… ? Regards, Sebastian

2 1

Re: [PATCH 2/2] d3dx9_36: Fix several issues in save_dds_surface_to_memory. (try 2)
by Henri Verbeet 08 Dec '15

08 Dec '15

Any time you find yourself writing something along the lines of "Fix several issues ..." in a patch description, that's an indication you should probably be writing several patches instead. On 7 December 2015 at 07:53, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > From: Christian Costa <titan.costa(a)gmail.com> > > This makes the default values line up with native. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> I suppose a Signed-off-by from the original author as well would too much to ask. /shrug. > - header->size = sizeof(*header); > - header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT; > + /* The signature is not really part of the DDS header */ > + header->size = sizeof(*header) - sizeof(header->signature); This isn't necessarily wrong, although it would be more correct to write this kind of thing as "sizeof(*header) - FIELD_OFFSET(struct dds_header, size)". As the comment already indicates though, the real issue is that the signature field shouldn't be part of the same structure. > + header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT; > header->height = src_desc.Height; > header->width = src_desc.Width; > header->pitch_or_linear_size = dst_pitch; You remove DDS_PITCH from the flags, but set the field here anyway. The test doesn't test it. Somewhat similarly, the test doesn't verify the value of the "caps" field.

1 0

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests (try 2)
by Henri Verbeet 08 Dec '15

08 Dec '15

On 7 December 2015 at 07:53, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > + SetRect(&rect, 0, 0, 0, 0); It's not a bit deal, but "SetRectEmpty(&rect);". > + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, &rect); > + todo_wine ok(hr == D3D_OK, "D3DXSaveSurfaceToFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); Just write something like "Got unexpected hr %#x.\n". You can easily tell what the expected value is by looking at the test. > + ok(header->size == 124, "Invalid DDS size %d.\n", header->size); > + ok(!header->height, "Wrong height %d.\n", header->height); > + ok(!header->width, "Wrong width %d.\n", header->width); > + ok(!header->depth, "Wrong depth %d.\n", header->depth); > + ok(!header->miplevels, "Wrong miplevels %d.\n", header->miplevels); These are all unsigned values, so use %u. Note that if a test returns something you didn't expect that's not necessarily wrong or invalid, just unexpected.

1 0

Re: po: Add a couple of missing ellipses to the Catalan translation.
by Alex Henrie 07 Dec '15

07 Dec '15

I'm attaching screenshots so you can see exactly what the problem is. I agree that having ellipses would be ideal, but would you please submit patches to fix this properly instead of breaking it in a different way? -Alex

2 1

Re: [3/4] winhttp/tests: Send a not empty payload in the server authorization response, check the received data on the client side.
by Hans Leidekker 07 Dec '15

07 Dec '15

On Mon, 2015-12-07 at 13:16 +0800, Dmitry Timoshkov wrote: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/winhttp/tests/winhttp.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) It fails here: winhttp.c:2389: Test failed: expected 11, got 15

3 4

Re: [PATCH 2/3] include: add bluetoothapis.h
by Nikolay Sivov 04 Dec '15

04 Dec '15

On 05.12.2015 2:21, Austin English wrote: > +typedef struct _BLUETOOTH_ADDRESS { > + union { > + BTH_ADDR ullLong; > + BYTE rgBytes[ 6 ]; > + }; > +} BLUETOOTH_ADDRESS_STRUCT; > +#define BLUETOOTH_NULL_ADDRESS ( (ULONGLONG) 0x0) > +typedef struct _BLUETOOTH_FIND_RADIO_PARAMS { > + DWORD dwSize; > +} BLUETOOTH_FIND_RADIO_PARAMS; > +typedef struct _BLUETOOTH_DEVICE_SEARCH_PARAMS { > + DWORD dwSize; > + BOOL fReturnAuthenticated; > + BOOL fReturnRemembered; > + BOOL fReturnUnknown; > + BOOL fReturnConnected; > + BOOL fIssueInquiry; > + UCHAR cTimeoutMultiplier; > + HANDLE hRadio; > +} BLUETOOTH_DEVICE_SEARCH_PARAMS; > +/* Raw Attribute Enumeration */ Same as with 1/3, it's essentially a copy, that's not funny.

1 0

Re: [PATCH 1/3] include: add bthsdpdef.h
by Nikolay Sivov 04 Dec '15

04 Dec '15

> +struct SDP_LARGE_INTEGER_16 { > + ULONGLONG LowPart; > + LONGLONG HighPart; > +}; > + > +struct SDP_ULARGE_INTEGER_16 { > + ULONGLONG LowPart; > + ULONGLONG HighPart; > +}; > + > +typedef struct SDP_LARGE_INTEGER_16 SDP_LARGE_INTEGER_16, *PSDP_LARGE_INTEGER_16, *LPSDP_LARGE_INTEGER_16; > +typedef struct SDP_ULARGE_INTEGER_16 SDP_ULARGE_INTEGER_16, *PSDP_ULARGE_INTEGER_16, *LPSDP_ULARGE_INTEGER_16; > +enum SDP_TYPE { > + SDP_TYPE_NIL = 0x00, This directly matches SDK style, including formatting nuances. > +typedef > +#ifdef USE_MIDL_SYNTAX > + [switch_type(unsigned short)] > +#endif You sure we need this MIDL specific thing? To me it looks like it was copied over for no reason.

1 0

Re: [PATCH] configure: Create d3dx10.lib
by Matteo Bruni 04 Dec '15

04 Dec '15

2015-12-03 8:13 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > configure.ac | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > index 2d2a168..187c963 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2791,7 +2791,7 @@ WINE_CONFIG_DLL(d3dx10_39) > WINE_CONFIG_DLL(d3dx10_40) > WINE_CONFIG_DLL(d3dx10_41) > WINE_CONFIG_DLL(d3dx10_42) > -WINE_CONFIG_DLL(d3dx10_43) > +WINE_CONFIG_DLL(d3dx10_43,,[implib]) I think you should override the implib name to drop the version suffix, in the same fashion as d3dx9 a few lines below. > WINE_CONFIG_DLL(d3dx11_42) > WINE_CONFIG_DLL(d3dx11_43) > WINE_CONFIG_DLL(d3dx9_24) > -- > 1.9.1

2 1

Re: [PATCH 2/2] d3dx9_36: Fix several issues in save_dds_surface_to_memory.
by Matteo Bruni 04 Dec '15

04 Dec '15

2015-12-03 7:55 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > The different fixes are: > - Fix header size of the DDS file > - Remove DDS_MIPMAPCOUNT as mipmap levels are not supported yet That's okay but not for the the right reason (a good reason is matching native, as the test in the previous patch shows). > - Do not set depth and miplevels fields as their flags are not set (to match native) That's not really significant, the DDS_MIPMAPCOUNT flag is effectively ignored when loading DDS files (see test_dds_header_handling()). Again, setting depth and miplevels to 0 matches native so that's fine for now. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/surface.c | 7 +++---- > dlls/d3dx9_36/tests/surface.c | 8 ++++---- > 2 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c > index b14f5e7..6857c56 100644 > --- a/dlls/d3dx9_36/surface.c > +++ b/dlls/d3dx9_36/surface.c > @@ -487,13 +487,12 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur > > memset(header, 0, sizeof(*header)); Idea for a possible followup, we allocate the ID3DXBuffer objects data with HEAP_ZERO_MEMORY so that memset is unnecessary. There might be more of that kind of unnecessary explicit zeroing in d3dx9. This requires a test for D3DXCreateBuffer() (probably in test_ID3DXBuffer()) to check that we're actually supposed to zero the memory in the first place. > header->signature = MAKEFOURCC('D','D','S',' '); > - header->size = sizeof(*header); > - header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT; > + /* The signature is not really part of the DDS header */ > + header->size = sizeof(*header) - sizeof(header->signature); > + header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT; > header->height = src_desc.Height; > header->width = src_desc.Width; > header->pitch_or_linear_size = dst_pitch; > - header->depth = 1; > - header->miplevels = 1; > header->caps = DDS_CAPS_TEXTURE; > hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format); > if (FAILED(hr)) > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 1c85ca3..b735af0 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > @@ -1274,12 +1274,12 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > header = ID3DXBuffer_GetBufferPointer(buffer); > > ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n"); > - todo_wine ok(header->size == 124, "Invalid DDS size %d\n", header->size); > + ok(header->size == 124, "Invalid DDS size %d\n", header->size); > ok(header->height == 4, "Wrong height %d\n", header->height); > ok(header->width == 4, "Wrong width %d\n", header->width); > - todo_wine ok(header->depth == 0, "Wrong depth %d\n", header->depth); > - todo_wine ok(header->miplevels == 0, "Wrong miplevels %d\n", header->miplevels); > - todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > + ok(header->depth == 0, "Wrong depth %d\n", header->depth); > + ok(header->miplevels == 0, "Wrong miplevels %d\n", header->miplevels); > + ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > "Wrong flags %x\n", header->flags); > ID3DXBuffer_Release(buffer); > } > -- > 1.9.1

1 0

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests
by Matteo Bruni 04 Dec '15

04 Dec '15

2015-12-03 7:55 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Also updates the structure dds_header to be the same as d3dx9_36/surface.c. > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3dx9_36/tests/surface.c | 38 +++++++++++++++++++++++++++++++++++++- > 1 file changed, 37 insertions(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c > index 1697a03..1c85ca3 100644 > --- a/dlls/d3dx9_36/tests/surface.c > +++ b/dlls/d3dx9_36/tests/surface.c > @@ -211,7 +211,9 @@ struct dds_header > struct dds_pixel_format pixel_format; > DWORD caps; > DWORD caps2; > - DWORD reserved2[3]; > + DWORD caps3; > + DWORD caps4; > + DWORD reserved2; > }; > > /* fills dds_header with reasonable default values */ > @@ -1231,6 +1233,7 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > RECT rect; > ID3DXBuffer *buffer; > IDirect3DSurface9 *surface; > + struct dds_header *header; > > hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 4, 4, D3DFMT_A8R8G8B8, D3DPOOL_SCRATCH, &surface, NULL); > if (FAILED(hr)) { > @@ -1248,6 +1251,39 @@ static void test_D3DXSaveSurfaceToFileInMemory(IDirect3DDevice9 *device) > ID3DXBuffer_Release(buffer); > } > > + SetRect(&rect, 0, 0, 0, 0); > + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, &rect); > + todo_wine ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); If the broken() predicate is there for the same reason as the previous test (i.e. failure with the debug d3d9 runtime) I think it should be dropped. If that's not the case, where does this fail for you? Please put a period at the end of the ok() string. > + if (SUCCEEDED(hr)) { '{' on the next line please. > + header = ID3DXBuffer_GetBufferPointer(buffer); > + > + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n"); > + ok(header->size == 124, "Invalid DDS size %d\n", header->size); > + ok(header->height == 0, "Wrong height %d\n", header->height); We usually do something like "!header->height" in d3d code in similar cases. > + ok(header->width == 0, "Wrong width %d\n", header->width); > + ok(header->depth == 0, "Wrong depth %d\n", header->depth); > + ok(header->miplevels == 0, "Wrong miplevels %d\n", header->miplevels); > + ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > + "Wrong flags %x\n", header->flags); Please use 8 spaces indents for line continuations. > + ID3DXBuffer_Release(buffer); > + } > + > + hr = D3DXSaveSurfaceToFileInMemory(&buffer, D3DXIFF_DDS, surface, NULL, NULL); > + ok(hr == D3D_OK || broken(hr == D3DERR_INVALIDCALL), "D3DXSaveSurfaceToFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); > + if (SUCCEEDED(hr)) { You can avoid the 'if' here if you don't need the broken() above. > + header = ID3DXBuffer_GetBufferPointer(buffer); > + > + ok(header->magic == MAKEFOURCC('D','D','S',' '), "Invalid DDS signature\n"); > + todo_wine ok(header->size == 124, "Invalid DDS size %d\n", header->size); > + ok(header->height == 4, "Wrong height %d\n", header->height); > + ok(header->width == 4, "Wrong width %d\n", header->width); > + todo_wine ok(header->depth == 0, "Wrong depth %d\n", header->depth); > + todo_wine ok(header->miplevels == 0, "Wrong miplevels %d\n", header->miplevels); > + todo_wine ok(header->flags == (DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PIXELFORMAT), > + "Wrong flags %x\n", header->flags); > + ID3DXBuffer_Release(buffer); > + } > + > IDirect3DSurface9_Release(surface); > } > > -- > 1.9.1

1 0

Re: [PATCH 1/2] wined3d: Correctly parse SM4 dcl_immediateConstantBuffer opcode.
by Henri Verbeet 04 Dec '15

04 Dec '15

On 3 December 2015 at 11:04, Józef Kucia <jkucia(a)codeweavers.com> wrote: > Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> > --- > This fixes infinite loop when dcl_immediateConstantBuffer is parsed. > > Unfortunately, I had to reindent whole wined3d_sm4_opcode enum in order to make > space for WINED3D_SM4_OP_DCL_IMMEDIATE_CONSTANT_BUFFER. I was also considering > to use a shorter name: WINED3D_SM4_OP_DCL_IMMEDIATE_BUFFER. > --- It's fine, if perhaps unfortunate. You could do something like WINED3D_SM4_OP_DCL_IMM_CB if we really want something shorter, but it's probably best to just follow the opcode name. > + WINED3D_SM4_OP_MAX = 0x34, > + WINED3D_SM4_OP_DCL_IMMEDIATE_CONSTANT_BUFFER = 0x35, > + WINED3D_SM4_OP_MOV = 0x36, This is odd. I'd expect a DCL_ opcode to be in the > 0x58 range. Still, there's a hole there in the normal range, and "min" and "max" are also reversed compared to what you'd expect, so I suppose it's at least plausible. > opcode_token = *(*ptr)++; > opcode = opcode_token & WINED3D_SM4_OPCODE_MASK; > - len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; > + > + if (opcode == WINED3D_SM4_OP_DCL_IMMEDIATE_CONSTANT_BUFFER) > + len = *(*ptr) - 1; > + else > + len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; > I don't think this is the right place to handle this. You should be able to handle this the same way as the other DCL_ opcodes. It should probably also have an entry in the opcode_info table. (Compare e.g. 6d948e1a8cdd8a9a5ae2b6124468275cbf13f2b8.)

2 3

Re: [PATCH 2/2] wined3d: Print opcode names instead of enum values.
by Henri Verbeet 04 Dec '15

04 Dec '15

On 3 December 2015 at 11:04, Józef Kucia <jkucia(a)codeweavers.com> wrote: > +const char *debug_d3dshaderinstructionhandler(enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx) > +{ > + if (handler_idx >= sizeof(shader_opcode_names) / sizeof(*shader_opcode_names)) > + { > + FIXME("Unrecognized shader instruction handler %#x.\n", handler_idx); > + return "UNRECOGNIZED"; You can do something like "wine_dbg_sprintf("UNRECOGNIZED(%#x)", handler_idx);" and have it print the handler_idx. (See also e.g. debug_d3dstate().) Note that we could also move this to utils.c, not sure if that's worth it.

2 1

Re: [PATCH 3/3] ddraw: Do not mark surfaces as lost unconditionally when setting the cooperative level.
by Marvin 04 Dec '15

04 Dec '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=18780 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: [PATCH 2/3] ddraw: Mark surfaces as lost when the device window is deactivated.
by Marvin 04 Dec '15

04 Dec '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=18779 Your paranoid android. === w1064 (32 bit ddraw2) === ddraw2.c:2337: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw1) === ddraw1.c:2186: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw7) === ddraw7.c:2253: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}. === w1064 (32 bit ddraw4) === ddraw4.c:2522: Test failed: Expected {0, 0, 512, 384}, got {0, 0, 1024, 768}.

1 0

Re: fusion: add a stub for CopyPDBs
by Sebastian Lackner 04 Dec '15

04 Dec '15

On 02.12.2015 07:19, Austin English wrote: > +void WINAPI CopyPDBs(const WCHAR *module) Did you find the prototype somewhere? The output doesn't really look a WCHAR string: fixme:fusion:CopyPDBs (L"\4141\636a\304d\7257\5355\666c\4262\3552\7445\5063\3353\5338\3533\5656\6f63\7674\427a\7457\6249\4d41\7858\7362\5135\6164\6b36\4c71\5277\3351\642f\796c\5755\7452\3735\6a50\3658\5a59\546d\5763\4276\7a45\4b43\5362\7655\5132\4b39\4339\4d37\5131\4f79\5645\452b\5364\4272\4a51\3832\4458\5435\6b77\3454\3135\2f52"...) stub! It could be a char *, but on the other hand also some internal data, so its probably better to use void *. For the result, several hints on the internet seem to suggest that its HRESULT. Regards, Sebastian

2 1

Re: mshtml: Add IHTMLXMLHttpRequest::responseXML() method implementation. (try 3)
by Jacek Caban 03 Dec '15

03 Dec '15

Hi Zhenbo, On 12/03/15 02:34, Zhenbo Li wrote: > Thanks for the reply. The patch looks good to me now, thanks. However, we're in the code freeze, so the patch can't be committed now. Please resend the patch after 1.8 is released. Jacek

1 0

programs/xcopy: Fix casing of usage message
by Hugh McMaster 03 Dec '15

03 Dec '15

On Wednesday, 18 Nov 2015 19:08:29 -0600, Austin English wrote: >- STRING_SIMCOPY, "%1!d! file(s) would be copied\n" >- STRING_COPY, "%1!d! file(s) copied\n" >+ STRING_SIMCOPY, "%1!d! File(s) would be copied\n" >+ STRING_COPY, "%1!d! File(s) copied\n" Hi Austin, You should probably patch all of the po files as well. It's a simple change, and it means Alexandre doesn't have to regenerate everything. -- Hugh McMaster

3 6

Simplified local IP reordering patch for default routes
by Bruno Jesus 03 Dec '15

03 Dec '15

Hi, Jamie and Joachim and list. This is a short version of a long patch I'm working on, it orders the IP list with the default routes on top and it supports more than one default route. It fixes the problem on Linux and FreeBSD, could anyone also test it on OSX, please? This patch does not touch the magic IP so the loopback route will still return the IP 127.12.34.56 but at least it won't be the first one anymore. Thanks in advance, Bruno

3 6

Re: winedbg: Print windows version in system info.
by Austin English 02 Dec '15

02 Dec '15

On Wed, Dec 2, 2015 at 5:20 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > From: Michael Müller <michael(a)fds-team.de> > > Signed-off-by: Michael Müller <michael(a)fds-team.de> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > > ... for those who don't have a crystal ball while triaging bug reports. :) > > programs/winedbg/tgt_active.c | 58 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c > index 989e433..07edccc 100644 > --- a/programs/winedbg/tgt_active.c > +++ b/programs/winedbg/tgt_active.c > @@ -678,6 +678,63 @@ static HANDLE create_temp_file(void) > NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, 0 ); > } > > +static const struct > +{ > + int type; > + int platform; > + int major; > + int minor; > + const char *str; > +} > +version_table[] = > +{ > + { 0, VER_PLATFORM_WIN32s, 2, 0, "2.0" }, > + { 0, VER_PLATFORM_WIN32s, 3, 0, "3.0" }, > + { 0, VER_PLATFORM_WIN32s, 3, 10, "3.1" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 0, "95" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 10, "98" }, > + { 0, VER_PLATFORM_WIN32_WINDOWS, 4, 90, "ME" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 3, 51, "NT 3.51" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 4, 0, "NT 4.0" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 0, "2000" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 1, "XP" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 5, 2, "XP" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 5, 2, "Server 2003" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 0, "Vista" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 0, "Server 2008" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 1, "7" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 1, "Server 2008 R2" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 2, "8" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 2, "Server 2012" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 6, 3, "8.1" }, > + { VER_NT_SERVER, VER_PLATFORM_WIN32_NT, 6, 3, "Server 2012 R2" }, > + { VER_NT_WORKSTATION, VER_PLATFORM_WIN32_NT, 10, 0, "10" }, > +}; > + > +static const char *get_windows_version(void) > +{ > + OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; > + static char str[64]; > + int i; > + > + GetVersionExW( (OSVERSIONINFOW *)&info ); > + > + for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) > + { > + if (version_table[i].type == info.wProductType && > + version_table[i].platform == info.dwPlatformId && > + version_table[i].major == info.dwMajorVersion && > + version_table[i].minor == info.dwMinorVersion) > + { > + return version_table[i].str; > + } > + } > + > + snprintf( str, sizeof(str), "%d.%d (%d)", info.dwMajorVersion, > + info.dwMinorVersion, info.wProductType ); > + return str; > +} > + > static void output_system_info(void) > { > #ifdef __i386__ > @@ -705,6 +762,7 @@ static void output_system_info(void) > dbg_printf( "System information:\n" ); > if (wine_get_build_id) dbg_printf( " Wine build: %s\n", wine_get_build_id() ); > dbg_printf( " Platform: %s%s\n", platform, is_wow64 ? " (WOW64)" : "" ); > + dbg_printf( " Version: Windows %s\n", get_windows_version() ); > if (wine_get_host_version) > { > const char *sysname, *release; > -- > 2.6.2 > > With my bugzilla hat on: Thank you!! -- -Austin

1 0

Re: loader/wine.inf.in: add 'HKLM\Software\Classes\Applications\iexplore.exe\shell\open\command' key
by Jacek Caban 02 Dec '15

02 Dec '15

Hi Austin, On 12/02/15 07:31, Austin English wrote: > > From a8309f37269bc374359e6ee473e66465551b867f Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 2 Dec 2015 01:27:15 -0500 > Subject: [PATCH] loader/wine.inf.in: add > 'HKLM\Software\Classes\Applications\iexplore.exe\shell\open\command' key > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > loader/wine.inf.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/loader/wine.inf.in b/loader/wine.inf.in I believe this should go to programs/iexplore/iexplore.inf. > index 58a8d1d..02b92f4 100644 > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -245,6 +245,7 @@ HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" > HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" > HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" > HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" > +HKLM,Software\Classes\Applications\iexplore.exe\shell\open\command,,2,"""%16422%\Internet Explorer\iexplore.exe"" %1" Why don't you use HKCR here? Thanks, Jacek

2 1

Re: [PATCH 3/3] ntdll/tests: Restore old value in a more context independent way.
by Marvin 02 Dec '15

02 Dec '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=18722 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002D0000/002D0001 exception: unhandled exception 80000004 at 002D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/002D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 1/3] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 4).
by Marvin 02 Dec '15

02 Dec '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=18721 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH 4/4 v2] dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN
by Andrew Eikum 02 Dec '15

02 Dec '15

This looks fine, but since it doesn't fix a bug, I think this one should be deferred. As Michael knows, dsound applications can be fragile... Andrew On Tue, Dec 01, 2015 at 02:49:45PM +0100, Michael Stefaniuc wrote: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/dsound/dsound.c | 5 +++++ > dlls/dsound/tests/ds3d8.c | 1 - > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index 7b93455..e50ef58 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -542,6 +542,11 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( > return DSERR_INVALIDPARAM; > } > > + if (from8 && (dsbd->dwFlags & DSBCAPS_CTRL3D) && (dsbd->dwFlags & DSBCAPS_CTRLPAN)) { > + WARN("invalid parameter: DSBCAPS_CTRL3D and DSBCAPS_CTRLPAN cannot be used together\n"); > + return DSERR_INVALIDPARAM; > + } > + > hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); > if (dsb) { > *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; > diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c > index 330f590..25eb010 100644 > --- a/dlls/dsound/tests/ds3d8.c > +++ b/dlls/dsound/tests/ds3d8.c > @@ -654,7 +654,6 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, > /* Invalid flag combination */ > bufdesc.dwFlags|=DSBCAPS_CTRLPAN; > rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); > - todo_wine > ok(rc==DSERR_INVALIDPARAM, > "IDirectSound8_CreateSoundBuffer(secondary) should have " > "returned DSERR_INVALIDPARAM, returned %08x\n", rc); > -- > 2.1.0 > >

1 0

Re: [PATCH 1/2] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 3).
by Alexandre Julliard 02 Dec '15

02 Dec '15

Qian Hong <qhong(a)codeweavers.com> writes: > Try 3: > - Correctly revert side effect of previous ldmxcsr, change 0x200 to > 0x80, 0x80 & 0xff7f = 0, 0x200 & 0xfdff = 0. It would be even better to restore the original value, without making assumptions about the previous contents. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [PATCH 1/2] ntdll/tests: Add SIMD exception test for floating point invalid operation fault (try 3).
by Marvin 02 Dec '15

02 Dec '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=18719 Your paranoid android. === wvistau64 (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 003D0000/003D0001 exception: unhandled exception 80000004 at 003D0000 exception.c:485: Test failed: 42: Wrong exception address 77BAED97/003D0001 === w7u (32 bit exception) === exception.c:485: Test failed: 42: Wrong exception address 002F0000/002F0001 exception: unhandled exception 80000004 at 002F0000 exception.c:485: Test failed: 42: Wrong exception address 77CDE34F/002F0001 === w1064 (32 bit exception) === Failure running script in VM: network read timed out (Connect:AgentVersion.h:0/9)

1 0

Re: [PATCH] ntdll: Fix valgrind heap realloc notifications.
by Alexandre Julliard 02 Dec '15

02 Dec '15

Thomas Faller <tfaller1(a)gmx.de> writes: > Valgrind can't handle a realloc, if the new size is zero. > Fix for bug https://bugs.winehq.org/show_bug.cgi?id=37646 I'd suggest fixing valgrind, or if not possible, using a size of 1. Your change seems like it would make notifications less useful in several cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shlwapi/tests: Test NULL handle duplication in SHMapHandle()
by Olivier F. R. Dierick 02 Dec '15

02 Dec '15

Le mardi 01 décembre 2015 à 19:51 +0800, Bruno Jesus a écrit : > Related to https://bugs.winehq.org/show_bug.cgi?id=36838 > > Not sure when Olivier Dierick will be back to this so I'm sending the > test I made. > > Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Thank you. The shlwapi functions are undocumented in MSDN. This is were I found documentation for the SHMapHandle() function: http://www.geoffchappell.com/studies/windows/shell/shlwapi/api/shared/mapha… -- Olivier F. R. Dierick o.dierick(a)piezo-forte.be

1 0

Re: Shell32: Check null handles before freeing
by Nikolay Sivov 01 Dec '15

01 Dec '15

On 25.11.2015 10:02, Olivier F. R. Dierick wrote: > Fix one of the error leak source that prevents the installer to succeed > (bug 36838). > > The original code did not check if the handles were null before freeing > them. For some reason they happen to be null and last error is set to > ERROR_INVALID_HANDLE. The game installer chokes at some point when the > last error is anything but zero and fails to complete the installation. > Checking if the handles are non-null before freeing them avoids this. > According to MSDN, it is not an error to have null values for those > handles. > > Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> > --- > dlls/shell32/changenotify.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > We most likely have many more places that do same thing, it will need tests for SHFree() and CoTaskMemFree(). If it turns out error is not changed on NULLs, it's easier to return early from SHFree or CoTaskMemFree than fix all places where those are used.

2 2

Re: dinput: Implement device property DIPROP_USERNAME.
by Sebastian Lackner 01 Dec '15

01 Dec '15

On 01.12.2015 14:54, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=39667 > > Probably same issue as in https://bugs.winehq.org/show_bug.cgi?id=12432 . > (Attached backtrace seems equal.) > > Steps to reproduce: > - start launcher > - "Configure Controller" > - leave dialog with "Cancel" > - crash > > MotoGP 3 demo launcher uses ConfigureDevices for the key mapping. > The crash seems to happen because the result of a > GetProperty(DIPROP_USERNAME) is used without checking. > > This affects just the launcher. The game starts without problems with > a default key mapping. > > Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> > --- > dlls/dinput/device.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/dinput/device_private.h | 1 + > dlls/dinput8/tests/device.c | 29 +++++++++++++++++++++++++++-- > 3 files changed, 72 insertions(+), 2 deletions(-) > > diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c > index e525f01..1095c4c 100644 > --- a/dlls/dinput/device.c > +++ b/dlls/dinput/device.c > @@ -783,6 +783,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L > DIOBJECTDATAFORMAT *obj_df = NULL; > DIPROPDWORD dp; > DIPROPRANGE dpr; > + DIPROPSTRING dps; > WCHAR username[MAX_PATH]; > DWORD username_size = MAX_PATH; > int i, action = 0, num_actions = 0; > @@ -863,6 +864,19 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L > else > lstrcpynW(username, lpszUserName, MAX_PATH); > > + dps.diph.dwSize = sizeof(dps); > + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); > + dps.diph.dwObj = 0; > + dps.diph.dwHow = DIPH_DEVICE; > + lstrcpynW(dps.wsz, username, sizeof(dps.wsz)); > + IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); > + > + if (dwFlags & DIDSAM_NOUSER) > + { > + HeapFree(GetProcessHeap(), 0, This->username); > + This->username = NULL; > + } When I understand it correctly, if DISAM_NOUSER is set, you set the username just to reset it manually again afterwards? Why not pass an empty string to IDirectInputDevice8_SetProperty? > + > /* Save the settings to disk */ > save_mapping_settings(iface, lpdiaf, username); > > @@ -1100,6 +1114,9 @@ ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) > /* Free action mapping */ > HeapFree(GetProcessHeap(), 0, This->action_map); > > + /* Free username */ > + HeapFree(GetProcessHeap(), 0, This->username); > + > EnterCriticalSection( &This->dinput->crit ); > list_remove( &This->entry ); > LeaveCriticalSection( &This->dinput->crit ); > @@ -1251,6 +1268,17 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, > TRACE("buffersize = %d\n", pd->dwData); > break; > } > + case (DWORD_PTR) DIPROP_USERNAME: > + { > + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; > + > + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; > + > + ps->wsz[0] = 0; > + if (This->username) > + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)); The last argument is wrong, it should be a WCHAR count. > + break; > + } > case (DWORD_PTR) DIPROP_VIDPID: > FIXME("DIPROP_VIDPID not implemented\n"); > return DIERR_UNSUPPORTED; > @@ -1324,6 +1352,22 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( > LeaveCriticalSection(&This->crit); > break; > } > + case (DWORD_PTR) DIPROP_USERNAME: > + { > + LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; > + > + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; > + > + if (!This->username) > + This->username = HeapAlloc(GetProcessHeap(), 0, sizeof(ps->wsz)); > + if (!This->username) > + return DIERR_OUTOFMEMORY; > + > + This->username[0] = 0; > + if (ps->wsz) > + lstrcpynW(This->username, ps->wsz, sizeof(ps->wsz)); Same here. Also, it could make sense to look at the actual string length, instead of allocating a fixed size buffer. > + break; > + } > default: > WARN("Unknown property %s\n", debugstr_guid(rguid)); > return DIERR_UNSUPPORTED; > diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h > index 52bbec4..26ec7c2 100644 > --- a/dlls/dinput/device_private.h > +++ b/dlls/dinput/device_private.h > @@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl > /* Action mapping */ > int num_actions; /* number of actions mapped */ > ActionMap *action_map; /* array of mappings */ > + WCHAR *username; /* set in SetActionMap */ > }; > > extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; > diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c > index 6495559..af8667d 100644 > --- a/dlls/dinput8/tests/device.c > +++ b/dlls/dinput8/tests/device.c > @@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec > dps.wsz[0] = '\0'; > > hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph); > - todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); > - todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); > + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); > + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); > > /* Test buffer size */ > memset(&dp, 0, sizeof(dp)); > @@ -275,6 +275,7 @@ static void test_action_mapping(void) > HINSTANCE hinst = GetModuleHandleA(NULL); > IDirectInput8A *pDI = NULL; > DIACTIONFORMATA af; > + DIPROPSTRING dps; > struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; > HWND hwnd; > > @@ -342,6 +343,30 @@ static void test_action_mapping(void) > > af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); > af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); > + > + /* test DIDSAM_NOUSER */ > + dps.diph.dwSize = sizeof(dps); > + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); > + dps.diph.dwObj = 0; > + dps.diph.dwHow = DIPH_DEVICE; > + dps.wsz[0] = '\0'; > + > + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); > + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); > + ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1)); > + > + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER); > + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); > + > + dps.diph.dwSize = sizeof(dps); > + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); > + dps.diph.dwObj = 0; > + dps.diph.dwHow = DIPH_DEVICE; > + dps.wsz[0] = '\0'; > + > + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); > + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); > + ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_wn(dps.wsz, -1)); > } > > if (data.mouse != NULL) >

1 0

Re: [PATCH 4/4 v2] dsound: Fail to create a version 8 3d buffer with DSBCAPS_CTRLPAN
by Alexandre Julliard 01 Dec '15

01 Dec '15

Michael Stefaniuc <mstefani(a)redhat.de> writes: > Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> > --- > dlls/dsound/dsound.c | 5 +++++ > dlls/dsound/tests/ds3d8.c | 1 - > 2 files changed, 5 insertions(+), 1 deletion(-) Does this one fix a bug or is it just a consequence of the tests? -- Alexandre Julliard julliard(a)winehq.org

2 1

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