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

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