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

Re: user32/tests: Use 'start' and 'end' variables in test comparisons
by Dmitry Timoshkov Dec. 17, 2015

Dec. 17, 2015

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > - INT start,end; > + unsigned short start, end; This can't work. -- Dmitry.

2 4

Re: user32: Select/deselect edit field text when a combo box gets/loses focus
by Dmitry Timoshkov Dec. 17, 2015

Dec. 17, 2015

Hugh McMaster <hugh.mcmaster(a)outlook.com> wrote: > --- a/dlls/user32/combo.c > +++ b/dlls/user32/combo.c > @@ -1215,7 +1215,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) > case (EN_SETFOCUS >> 8): > > TRACE("[%p]: edit [%p] got focus\n", lphc->self, lphc->hWndEdit ); > - > + SendMessageW( lphc->hWndEdit, EM_SETSEL, 0, -1 ); > COMBO_SetFocus( lphc ); > break; > > @@ -1228,7 +1228,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) > * notification (only when it happens to be a part of > * the combo). ?? - AK. > */ > - > + SendMessageW( lphc->hWndEdit, EM_SETSEL, -1, 0 ); > COMBO_KillFocus( lphc ); > break; These changes require tests to confirm their correctness, and the tests need to cover the cases when a control is part of a dialog and when it's not. -- Dmitry.

2 2

Re: [PATCH 2/2] user32/tests: Add tests for WM_DEVICECHANGE message. (try 2)
by Marvin Dec. 17, 2015

Dec. 17, 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=19005 Your paranoid android. === w1064 (32 bit msg) === msg.c:6139: Test failed: Update region shouldn't be empty msg.c:6373: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6375: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6145: Test failed: Regions are different msg.c:6145: Test failed: Regions are different msg.c:6145: Test failed: Regions are different === w1064 (64 bit msg) === msg.c:4644: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH 2/2] user32/tests: Add tests for WM_DEVICECHANGE message.
by Marvin Dec. 17, 2015

Dec. 17, 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=19004 Your paranoid android. === w1064 (32 bit msg) === msg.c:6135: Test failed: Update region shouldn't be empty msg.c:6369: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6371: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6141: Test failed: Regions are different msg.c:6141: Test failed: Regions are different msg.c:6141: Test failed: Regions are different

1 0

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture.
by Stefan Dösinger Dec. 16, 2015

Dec. 16, 2015

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, Cool to see that you're still working on this :-) . Am 2015-12-15 um 16:41 schrieb Aaryaman Vasishta: > + * Copyright 2015 Aaryaman Vasishta I think you can make this 2014-2015. > +static char *create_testbitmap(const char *filename, LPCSTR resource) LPCSTR -> const char * is better IMO. > +{ > + static char path[MAX_PATH]; > + DWORD written; > + HANDLE file; > + HRSRC res; > + void *ptr; > + > + GetTempPathA(sizeof(path)/sizeof(WCHAR), path); Why sizeof(WCHAR)? > + lstrcatA(path, filename); > + > + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, > + GetLastError()); > + > + res = FindResourceA(GetModuleHandleA(NULL), resource, (LPCSTR)RT_RCDATA); const char * > + ok( res != 0, "couldn't find resource\n" ); > + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); > + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); > + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); > + CloseHandle( file ); You have inconsistent style here. ok(foo, "bar\n"); vs ok( foo, "bar\n" ); > +static BOOL test_bitmap_data1(unsigned char *buffer1, unsigned char *buffer2, D3DRMIMAGE *img, int w, int h, int depth) afaics you can make buffer1 and buffer2 const, probably applies to img as well. > + if (img->palette) > + { > + if (depth == 8) > + { > + for (i = 0; i < size; i++) > + { > + if (buffer1[i] != buffer2[i]) > + return FALSE; > + } > + } > + else > + { > + /* d3drm aligns the 24bpp texture to 4 bytes in the buffer, with one bype padding from 24bpp texture. */ > + /* The image is palettized if the total number of colors used is < 256. */ Does this ever happen? A palettized image with != 8 bpp? > + for (i = 0, j = 0; i < w * h; i += 3, j++) > + { > + val1 = img->palette[buffer1[j]].blue == buffer2[i]; > + val2 = img->palette[buffer1[j]].green == buffer2[i + 1]; > + val3 = img->palette[buffer1[j]].red == buffer2[i + 2]; > + if (!(val1 && val2 && val3)) > + return FALSE; > + } > + } Your indentation is wrong here. > + for (i = 0, j = 0; i < w * h; i += 4, j += 3) > + { > + val1 = buffer1[i] == buffer2[j]; > + val2 = buffer1[i + 1] == buffer2[j + 1]; > + val3 = buffer1[i + 2] == buffer2[j + 2]; > + if (!(val1 && val2 && val3)) > + return FALSE; > + } I think you're supposed to use img->bytes_per_line to advance from one line to another. See e.g. how lPitch is handled in ddraw tests. > +static void test_load_texture1(void) > +{ > + HRESULT hr; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRMTexture *texture1 = NULL; > + D3DRMIMAGE *d3drm_img = NULL; > + HWND window; > + HBITMAP hbm = NULL; > + BITMAP bm; > + BITMAPFILEHEADER *bmp_header = NULL; > + BITMAPINFO *bmp_info = NULL; > + HANDLE hfile, hmapping = NULL; > + BOOL check; > + DWORD size; > + char *file = NULL; > + unsigned char *buffer = NULL, *buffer1 = NULL, *buffer2 = NULL; > + HDC mem_dc = NULL; > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); > + file = create_testbitmap("8bpp.bmp", (LPCSTR)MAKEINTRESOURCE(IDD_BITMAPDATA_8BPP)); > + > + hbm = LoadImageA(NULL, file, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); > + ok(hbm != NULL, "Cannot load image %s (error = %x).\n", file, GetLastError()); > + > + mem_dc = CreateCompatibleDC(NULL); > + ok(mem_dc != NULL, "Cannot create memory device context.\n"); > + > + SelectObject(mem_dc, hbm); > + GetObjectA(hbm, sizeof(bm), &bm); > + > + > + /* Test if image information matches that from the header by loading the bitmap seperately. */ Two newlines. > + hfile = CreateFileA(file, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); > + ok(file != INVALID_HANDLE_VALUE, "Failed to open file at %s, error %d\n", file, > + GetLastError()); > + if (hfile == INVALID_HANDLE_VALUE) > + goto cleanup; > + > + size = GetFileSize(hfile, NULL); > + ok(size != INVALID_FILE_SIZE, "Failed to get file size, error %d\n", GetLastError()); > + if (size == INVALID_FILE_SIZE) > + goto cleanup; > + > + hmapping = CreateFileMappingA(hfile, NULL, PAGE_READONLY, 0, 0, NULL); > + ok(hmapping != NULL, "Cannot create file mapping (error = %x).\n", GetLastError()); > + if (hmapping == NULL) > + goto cleanup; > + > + buffer = MapViewOfFile(hmapping, FILE_MAP_READ, 0, 0, 0); > + ok(buffer != NULL, "Cannot create map view of file (error = %x).\n", GetLastError()); > + if (buffer == NULL) > + goto cleanup; > + > + bmp_header = (BITMAPFILEHEADER *)buffer; > + bmp_info = (BITMAPINFO *)((unsigned char *)buffer + sizeof(BITMAPFILEHEADER)); > + buffer1 = ((unsigned char *)buffer + bmp_header->bfOffBits); This seems a bit unelegant to me, but I don't have a better solution available right now. I guess something along the lines of copying the image into a DIB section with BitBlt may work. > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); > + > + hr = IDirect3DRM_LoadTexture(d3drm1, file, &texture1); > + ok(SUCCEEDED(hr), "Failed to load texture (hr = %x).\n", hr); > + d3drm_img = IDirect3DRMTexture_GetImage(texture1); > + todo_wine ok(d3drm_img != NULL, "Could not get a D3DRMIMAGE struct from texture.\n"); > + if (d3drm_img == NULL) > + goto cleanup; > + ok(bmp_info->bmiHeader.biWidth == d3drm_img->width, "Expected texture width == %d, got %d.\n", bmp_info->bmiHeader.biWidth, d3drm_img->width); > + ok(bmp_info->bmiHeader.biHeight == d3drm_img->height, "Expected texture height == %d, got %d.\n", bmp_info->bmiHeader.biHeight, d3drm_img->height); > + buffer2 = (unsigned char *)d3drm_img->buffer1; > + check = test_bitmap_data1(buffer2, buffer1, d3drm_img, bm.bmWidth, bm.bmHeight, bmp_info->bmiHeader.biBitCount); > + ok(check, "Buffer contents do not match that of bitmap.\n"); > + > +cleanup: > + UnmapViewOfFile(buffer); > + CloseHandle(hmapping); > + CloseHandle(hfile); > + DeleteDC(mem_dc); > + DeleteObject(hbm); > + IDirect3DRMTexture_Release(texture1); > + IDirect3DRM_Release(d3drm1); > + check = DeleteFileA(file); > + ok(check, "Cannot delete image stored in %s (error = %x).\n", file, GetLastError()); > + DestroyWindow(window); > +} > + > +static BOOL test_bitmap_data2(unsigned char *buffer1, unsigned char *buffer2, D3DRMIMAGE *img, int w, int h, int depth) If I understand it right and remember it properly from our chat, the difference is that version 2 is upside down. I think that can be handled via a parameter and without duplicating the function. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJWcIZjAAoJEN0/YqbEcdMw2ZcP/3h4HmIjK2ENd0nhkj4Zae34 XgMQe9gXTRtdmsjIHgcFRDwIfxbjA0XX5CazCFAsL0cz58zzNtMUuugXBeraDzeR 7CTUNPdivsHzVm3V8hRjCDWuGSGZmVHiBNJE2OL0GKVdzYOmRWC3FOMy5ICD/ZdR GDrut5zr59vTieRZieov0Mx3jfAtWkeHLU/MVEFFljCBcUVRj1FIvClrGZDXk3Xn DW82LQrv8QXRtPh8ruLySFgeBDG0iTZ+4N6iIJwWPvd6qbg5Ku0MQOx3K8VsnQi8 7OlcQ8wzIvX8QxXsu1zBQwVNbJBQCup3zC8rqeqg27EoEYPZvQLwIAL/U7xd83Ul s8tFatOV9WD/sBmSa4XY4A1hMkgDqyhNIWrcOd6mm4hUaAbLac60NwNG6cAPtj0w fxlhIegqJ9B7Cs7xhGjFtsO5TqIeLUd0f5k6IWsgEAKv4KVz6pVYKGlrB5PM9jLw Xv8b3usjk9c3eoB5KExb/VhU6ea+sacc6XBGkEJEyu2b5r4gFNfrBRrxvOzKHJ1x xkvle6mmHSn3lxZXmvuEKHZBZPvRNDszvLX4BCuGPRRCpU4JNLY3/aF1kXpX3ks1 RwHYJU/ufJgDvLtYRnBeQOjK4cNdkZyhbH0lrkkcBig38F4xPcjjym+jdPro0X1N voYrN8i/7cKq/ASKNWAD =3KSr -----END PGP SIGNATURE-----

2 1

Re: [PATCH] d3drm/tests: Add tests for IDirect3DRM*::LoadTexture.
by Henri Verbeet Dec. 16, 2015

Dec. 16, 2015

On 15 December 2015 at 17:41, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > dlls/d3drm/tests/24bpp.bmp | Bin 0 -> 195894 bytes > dlls/d3drm/tests/8bpp.bmp | Bin 0 -> 2142 bytes > dlls/d3drm/tests/Makefile.in | 4 +- > dlls/d3drm/tests/d3drm.c | 400 +++++++++++++++++++++++++++++++++++++++++++ > dlls/d3drm/tests/d3drmrs.rc | 28 +++ > dlls/d3drm/tests/palette.bmp | Bin 0 -> 30054 bytes > dlls/d3drm/tests/resources.h | 26 +++ > 7 files changed, 457 insertions(+), 1 deletion(-) > create mode 100644 dlls/d3drm/tests/24bpp.bmp > create mode 100644 dlls/d3drm/tests/8bpp.bmp > create mode 100644 dlls/d3drm/tests/d3drmrs.rc > create mode 100644 dlls/d3drm/tests/palette.bmp > create mode 100644 dlls/d3drm/tests/resources.h > I suppose I'm missing something subtle, but these bitmaps look like it would take considerably less bytes to just generate them in the test.

2 1

Re: [PATCH 2/5] wined3d: Limit the number of multisample levels reported by wined3d_check_device_multisample_type().
by Henri Verbeet Dec. 15, 2015

Dec. 15, 2015

On 14 December 2015 at 23:37, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -4426,7 +4428,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 > if (quality_levels) > { > if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) > - *quality_levels = gl_info->limits.samples; > + *quality_levels = wined3d_log2i(gl_info->limits.samples); > else > *quality_levels = 1; > } I'm not sure this really makes sense. It may make sense to limit the number of non-maskable quality levels to 8, similar to how we limit e.g. shader constants and render targets for d3d9, although that would need a test and a comment. I don't see how you can justify the wined3d_log2i(). As an aside, note that we don't actually support maskable multi-sampling and would need ARB_texture_multisample for that, although applications don't seem to do a lot of masking in practice. D3d10+ only has maskable multi-sampling.

2 2

Re: [PATCH 2/2] d3dx9_36: Make DDS header the same as native. (try 5)
by Matteo Bruni Dec. 15, 2015

Dec. 15, 2015

2015-12-15 9:13 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > From: Christian Costa <titan.costa(a)gmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> The subject isn't quite right given that the caps field is still different from native. Something like "d3dx9: Improve generated DDS file header." would be better. Again, just deferring until the release, looks good enough otherwise.

1 0

Re: [PATCH 1/2] d3dx9_36/tests: Add D3DXSaveSurfaceToFileInMemory D3DXIFF_DDS tests (try 5)
by Matteo Bruni Dec. 15, 2015

Dec. 15, 2015

2015-12-15 9:13 GMT+01:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: With the summary changed to "d3dx9/tests: Add D3DXSaveSurfaceToFileInMemory DDS header tests." or something like that this would be fine to me. Not signing off just because of the code freeze, please resend after the 1.8 release.

1 0

Re: Fwd: Patch for https://bugs.winehq.org/show_bug.cgi?id=39759 (Add support for Nvidia GTX TITAN Black card)
by Nikolay Sivov Dec. 15, 2015

Dec. 15, 2015

On 15.12.2015 20:23, SpinFlo wrote: > Hi > > As said in https://bugs.winehq.org/show_bug.cgi?id=39759#c5 > > here a patch to add Support for Nvidia GTX TITAN Black card in wine, > this patch include 3 modifications: > > - Add the info for Nividia GTX TITAN Black card > - Remove a ',' in a Vram column in NVIDIA GeForce4 Ti 4200 (none of > all cards have this ',', then, i think is a typo) > - Add some spaces between columns, because the string > 'CARD_NVIDIA_GEFORCE_GTXTITANBLACK},' is too long and breaks the > look&feel code. some other intel cards have a similar problem in their > descriptions, then apply spaces un all cards to keep the equality > I can't speak for the maintainer, but it looks easier to use a shorter name than rearranging everything. > Greetings >

2 1

Bored waiting for Wine 1.8?
by Jeremy White Dec. 15, 2015

Dec. 15, 2015

Have I just got the thing for you! We are *this* close to having what I consider a rational set of Windows VMs running the tests cleanly: https://www.winehq.org/~jwhite/latest.html (As a reminder, that just scrapes all the testbot vms, excludes win2k, win8 and win10, and reports any ones that are not consistently green). We have a record low of 12 failures. Woohoo! I want to remind Andrew, Francois, Jacek, Aric, Bruno, Hans, Stefan and Jacek that they agreed to work on items on this list... And for anyone looking for a new failure, we have two: http://test.winehq.org/data/ca9001d6bda3084ab9bc80baa7d6e5533252c797/win7_n… http://test.winehq.org/data/e69d9ec3c4e8829c5c18cea7d8348171d51dcd76/vista_… Act now, bugs are going fast! <grin> Cheers, Jeremy

1 0

d3d software cursor test
by Stefan Dösinger Dec. 15, 2015

Dec. 15, 2015

Hi, I've written a test for d3d9 software cursors, but I'll need some help testing it on Windows. The behavior on Windows 10 is different from the one I remember from Windows 7. It doesn't affect the visual appearance of the cursor, but it does change how the test can verify the output. Please give the attached test a try on Windows. I am without my test machines right now (except for one with Win10 on it), so my abilities are somewhat limited at the moment. What I am interested in is the trace() line it writes at the end. It says if the test could read back the cursor with GetDC and/or GetFrontBufferData. Thanks, Stefan

3 3

Re: [PATCH 3/5] wined3d: Add a real implementation of wined3d_check_device_multisample_type().
by Henri Verbeet Dec. 15, 2015

Dec. 15, 2015

On 14 December 2015 at 23:37, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 70857c9..f798f1d 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -185,6 +185,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; > #define MAX_SAMPLER_OBJECTS 16 > #define MAX_SHADER_RESOURCE_VIEWS 128 > #define MAX_VERTEX_BLENDS 4 > +#define MAX_MULTISAMPLE_TYPES 8 > > struct min_lookup > { > @@ -3242,6 +3243,8 @@ struct wined3d_format > GLint glFormat; > GLint glType; > UINT conv_byte_count; > + GLint multisample_types_count; > + GLint multisample_types[MAX_MULTISAMPLE_TYPES]; I guess this is easy when initializing the data, but it seems a bit wasteful. Wouldn't it be nicer to store this as a 32-bit mask? It would be nice to have some basic tests for d3d10 and d3d11 as well. (See also ID3D11Device::CheckMultisampleQualityLevels())

1 0

Re: [PATCH 5/5] d3d8/tests: Port test_checkdevicemultisampletype() to d3d8.
by Marvin Dec. 14, 2015

Dec. 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=18979 Your paranoid android. === w1064 (32 bit device) === device.c:2659: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2664: Test failed: The focus window is active. device.c:2672: Test failed: Got unexpected hr 0x88760869. device.c:2678: Test failed: Got unexpect screen size 800x600. device.c:2693: Test failed: Expected message 0x47 for window 0, but didn't receive it, i=1. device.c:2702: Test failed: Got unexpect screen size 800x600. device.c:2715: Test failed: Expected message 0x7e for window 0, but didn't receive it. device.c:2723: Test failed: Got unexpect width 640. device.c:2724: Test failed: Got unexpect height 480.

1 0

Re: ddraw/tests: Rename mips to mipmaps
by Henri Verbeet Dec. 14, 2015

Dec. 14, 2015

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 Dec. 13, 2015

Dec. 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=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 Dec. 13, 2015

Dec. 13, 2015

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 Dec. 11, 2015

Dec. 11, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

> 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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 10, 2015

Dec. 10, 2015

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 Dec. 9, 2015

Dec. 9, 2015

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 Dec. 9, 2015

Dec. 9, 2015

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 Dec. 9, 2015

Dec. 9, 2015

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 Dec. 8, 2015

Dec. 8, 2015

> 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 Dec. 8, 2015

Dec. 8, 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=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 Dec. 8, 2015

Dec. 8, 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=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 Dec. 8, 2015

Dec. 8, 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=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 Dec. 8, 2015

Dec. 8, 2015

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 Dec. 8, 2015

Dec. 8, 2015

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 Dec. 8, 2015

Dec. 8, 2015

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 Dec. 8, 2015

Dec. 8, 2015

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 Dec. 7, 2015

Dec. 7, 2015

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 Dec. 7, 2015

Dec. 7, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

> +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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 4, 2015

Dec. 4, 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=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 Dec. 4, 2015

Dec. 4, 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=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 Dec. 4, 2015

Dec. 4, 2015

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 Dec. 3, 2015

Dec. 3, 2015

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