April 2017 - Wine-commits - list.winehq.org

Jacob Lifshay : kernel32: Fix improper escaping of quotes in command line.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: b098b31b85474524a58cb7dcb34bc4ed0fbb6b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b098b31b85474524a58cb7dcb… Author: Jacob Lifshay <programmerjake(a)gmail.com> Date: Thu Feb 9 16:26:36 2017 -0800 kernel32: Fix improper escaping of quotes in command line. Signed-off-by: Jacob Lifshay <programmerjake(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c7ad47e9b29971509d8ea76e918b6f623ca52a17) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 793f3ef..e1372fb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -745,6 +745,10 @@ static void update_library_argv0( const WCHAR *argv0 ) * resulting in an odd number of '\' followed by a '"' * '\"' -> '\\\"' * '\\"' -> '\\\\\"' + * - '\'s are followed by the closing '"' must be doubled, + * resulting in an even number of '\' followed by a '"' + * ' \' -> '" \\"' + * ' \\' -> '" \\\\"' * - '\'s that are not followed by a '"' can be left as is * 'a\b' == 'a\b' * 'a\\b' == 'a\\b' @@ -787,7 +791,7 @@ static BOOL build_command_line( WCHAR **argv ) } len+=(a-*arg)+1 /* for the separating space */; if (has_space) - len+=2; /* for the quotes */ + len+=2+bcount; /* for the quotes and doubling of '\' preceding the closing quote */ } if (!(rupp->CommandLine.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR)))) @@ -800,6 +804,7 @@ static BOOL build_command_line( WCHAR **argv ) { BOOL has_space,has_quote; WCHAR* a; + int bcount; /* Check for quotes and spaces in this argument */ has_space=has_quote=FALSE; @@ -821,9 +826,7 @@ static BOOL build_command_line( WCHAR **argv ) /* Now transfer it to the command line */ if (has_space) *p++='"'; - if (has_quote) { - int bcount; - + if (has_quote || has_space) { bcount=0; a=*arg; while (*a!='\0') { @@ -849,8 +852,14 @@ static BOOL build_command_line( WCHAR **argv ) WCHAR* x = *arg; while ((*p=*x++)) p++; } - if (has_space) + if (has_space) { + int i; + + /* Double all the '\' preceding the closing quote */ + for (i=0;i<bcount;i++) + *p++='\\'; *p++='"'; + } *p++=' '; } if (p > rupp->CommandLine.Buffer)

1 0

Bruno Jesus : winealsa.drv: Fix handling of system real time MIDI messages.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: d551678d79fb0d51b3d719df83e4d39368394a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d551678d79fb0d51b3d719df8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 31 04:16:17 2017 -0200 winealsa.drv: Fix handling of system real time MIDI messages. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53454ce9359f4ec485aa9411a0e9b14e3d1ed0fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6fc75ee..6ef1976 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -909,10 +909,15 @@ static DWORD modData(WORD wDevID, DWORD dwParam) case 0x0B: /* Continue */ case 0x0C: /* Stop */ case 0x0E: /* Active Sensing. */ - /* FIXME: Is this function suitable for these purposes - (and also Song Select and Song Position Pointer) */ - snd_seq_ev_set_sysex(&event, 1, &evt); + { + snd_midi_event_t *midi_event; + + snd_midi_event_new(1, &midi_event); + snd_midi_event_init(midi_event); + snd_midi_event_encode_byte(midi_event, evt, &event); + snd_midi_event_free(midi_event); break; + } case 0x0F: /* Reset */ /* snd_seq_ev_set_sysex(&event, 1, &evt); this other way may be better */

1 0

Henri Verbeet : ddraw: Kill stray tabs.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: bae26fed40047790dfe4a09a52da337e9c093965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae26fed40047790dfe4a09a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 24 22:15:28 2017 +0100 ddraw: Kill stray tabs. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 31fcbb6bf2fc65ec5e6b1ac735c6a043b85b5a7a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/executebuffer.c | 75 ++++++++++++++++++++++------------------------ dlls/ddraw/main.c | 6 ---- 2 files changed, 36 insertions(+), 45 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 09226cd..98e9404 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -75,12 +75,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, for (;;) { D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; - BYTE size; - WORD count; - - count = current->wCount; - size = current->bSize; - instr += sizeof(D3DINSTRUCTION); + BYTE size; + WORD count; + + count = current->wCount; + size = current->bSize; + instr += sizeof(*current); primitive_size = 0; switch (current->bOpcode) @@ -203,10 +203,10 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; } - case D3DOP_MATRIXLOAD: - WARN("MATRIXLOAD-s (%d)\n", count); - instr += count * size; - break; + case D3DOP_MATRIXLOAD: + WARN("MATRIXLOAD-s (%u)\n", count); + instr += count * size; + break; case D3DOP_MATRIXMULTIPLY: TRACE("MATRIXMULTIPLY (%d)\n", count); @@ -351,19 +351,15 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - case D3DOP_TEXTURELOAD: { - WARN("TEXTURELOAD-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_TEXTURELOAD: + WARN("TEXTURELOAD-s (%u)\n", count); + instr += count * size; + break; - case D3DOP_EXIT: { - TRACE("EXIT (%d)\n", count); - /* We did this instruction */ - instr += size; - /* Exit this loop */ - goto end_of_buffer; - } break; + case D3DOP_EXIT: + TRACE("EXIT (%u)\n", count); + instr += size; + goto end_of_buffer; case D3DOP_BRANCHFORWARD: TRACE("BRANCHFORWARD (%d)\n", count); @@ -380,26 +376,28 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, instr = (char*)current + ci->dwOffset; break; } - } - } else { - if (ci->bNegate) { + } + } + else + { + if (ci->bNegate) + { TRACE(" Branch to %d\n", ci->dwOffset); if (ci->dwOffset) { instr = (char*)current + ci->dwOffset; break; } - } - } + } + } - instr += size; + instr += size; } break; - case D3DOP_SPAN: { - WARN("SPAN-s (%d)\n", count); - - instr += count * size; - } break; + case D3DOP_SPAN: + WARN("SPAN-s (%u)\n", count); + instr += count * size; + break; case D3DOP_SETSTATUS: TRACE("SETSTATUS (%d)\n", count); @@ -410,12 +408,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, } break; - default: - ERR("Unhandled OpCode %d !!!\n",current->bOpcode); - /* Try to save ... */ - instr += count * size; - break; - } + default: + ERR("Unhandled OpCode %#x.\n",current->bOpcode); + instr += count * size; + break; + } } end_of_buffer: diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index abf20f9..4caa923 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -782,17 +782,11 @@ HRESULT WINAPI DllCanUnloadNow(void) } -/*********************************************************************** - * DllRegisterServer (DDRAW.@) - */ HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources( instance ); } -/*********************************************************************** - * DllUnregisterServer (DDRAW.@) - */ HRESULT WINAPI DllUnregisterServer(void) { return __wine_unregister_resources( instance );

1 0

Józef Kucia : ddraw: Implement D3DOP_TEXTURELOAD.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 6798a5b5331a8d73b199e829053f347b5e00c324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6798a5b5331a8d73b199e8290… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:11 2017 +0100 ddraw: Implement D3DOP_TEXTURELOAD. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 19d85623cf4d5540be709de3040a298700c4a8eb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/executebuffer.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 98e9404..393c52c 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -352,8 +352,30 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_TEXTURELOAD: - WARN("TEXTURELOAD-s (%u)\n", count); - instr += count * size; + TRACE("TEXTURELOAD (%u)\n", count); + + for (i = 0; i < count; ++i) + { + D3DTEXTURELOAD *ci = (D3DTEXTURELOAD *)instr; + struct ddraw_surface *dst, *src; + + instr += size; + + if (!(dst = ddraw_get_object(&device->handle_table, + ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid destination texture handle %#x.\n", ci->hDestTexture); + continue; + } + if (!(src = ddraw_get_object(&device->handle_table, + ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid source texture handle %#x.\n", ci->hSrcTexture); + continue; + } + + IDirect3DTexture2_Load(&dst->IDirect3DTexture2_iface, &src->IDirect3DTexture2_iface); + } break; case D3DOP_EXIT:

1 0

Józef Kucia : ddraw/tests: Add basic test for D3DOP_TEXTURELOAD.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 61be7768087e06036461b79d4f3d659b8faf493c URL: http://source.winehq.org/git/wine.git/?a=commit;h=61be7768087e06036461b79d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:12 2017 +0100 ddraw/tests: Add basic test for D3DOP_TEXTURELOAD. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a865aa368f94a7d6693782a69a44384b0f454399) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ff88b74..92a80f8 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -352,6 +352,23 @@ static void emit_tquad_tlist(void **ptr, WORD base_idx) *ptr = tri; } +static void emit_texture_load(void **ptr, D3DTEXTUREHANDLE dst_texture, + D3DTEXTUREHANDLE src_texture) +{ + D3DINSTRUCTION *instruction = *ptr; + D3DTEXTURELOAD *texture_load = (D3DTEXTURELOAD *)(instruction + 1); + + instruction->bOpcode = D3DOP_TEXTURELOAD; + instruction->bSize = sizeof(*texture_load); + instruction->wCount = 1; + + texture_load->hDestTexture = dst_texture; + texture_load->hSrcTexture = src_texture; + ++texture_load; + + *ptr = texture_load; +} + static void emit_end(void **ptr) { D3DINSTRUCTION *inst = *ptr; @@ -9954,6 +9971,156 @@ static void test_surface_desc_size(void) ok(!refcount, "DirectDraw has %u references left.\n", refcount); } +static void test_texture_load(void) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + }; + D3DTEXTUREHANDLE dst_texture_handle, src_texture_handle; + IDirectDrawSurface *dst_surface, *src_surface; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + DDSURFACEDESC surface_desc; + IDirect3DTexture *texture; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + D3DCOLOR color; + ULONG refcount; + HWND window; + DDBLTFX fx; + HRESULT hr; + void *ptr; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + surface_desc.dwWidth = 256; + surface_desc.dwHeight = 256; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(src_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &src_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(dst_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &dst_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x0000ffff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, tquad, sizeof(tquad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(tquad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); + emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ffff, 1), "Got unexpected color 0x%08x.\n", color); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x000000ff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(dst_surface); + IDirectDrawSurface_Release(src_surface); + IDirectDrawSurface_Release(rt); + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DMaterial_Release(background); + destroy_viewport(device, viewport); + IDirect3DDevice_Release(device); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { IDirectDraw *ddraw; @@ -10039,4 +10206,5 @@ START_TEST(ddraw1) test_transform_vertices(); test_display_mode_surface_pixel_format(); test_surface_desc_size(); + test_texture_load(); }

1 0

Józef Kucia : d3d9: Do not decrease swapchain surface refcount when it is already 0.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 68e064fe17d4c3df60574707db11e032327fc585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e064fe17d4c3df60574707d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 13 13:07:34 2017 +0100 d3d9: Do not decrease swapchain surface refcount when it is already 0. Based on a patch by Henri Verbeet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d39630fc396b0f732b49e9bbc29669c62338248f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/surface.c | 6 ++++++ dlls/d3d9/tests/device.c | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 07eaf7b..976a7fa 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -91,6 +91,12 @@ static ULONG WINAPI d3d9_surface_Release(IDirect3DSurface9 *iface) return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface); } + if (!surface->resource.refcount) + { + WARN("Surface does not have any references.\n"); + return 0; + } + refcount = InterlockedDecrement(&surface->resource.refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 14a9cc1..6f4f540 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1464,16 +1464,20 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); } /* Render target and back buffer are identical. */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, 0, &pBackBuffer); CHECK_CALL(hr, "GetBackBuffer", device, ++refcount); - if(pBackBuffer) + if (pBackBuffer) { CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", - pRenderTarget, pBackBuffer); + pRenderTarget, pBackBuffer); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT(device, --refcount); @@ -1481,7 +1485,7 @@ static void test_refcount(void) hr = IDirect3DDevice9_GetDepthStencilSurface(device, &pStencilSurface); CHECK_CALL(hr, "GetDepthStencilSurface", device, ++refcount); CHECK_REFCOUNT( pSwapChain, 1); - if(pStencilSurface) + if (pStencilSurface) { CHECK_SURFACE_CONTAINER(pStencilSurface, IID_IDirect3DDevice9, device); CHECK_REFCOUNT( pStencilSurface, 1); @@ -1491,7 +1495,7 @@ static void test_refcount(void) CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); CHECK_REFCOUNT(device, refcount); - CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); /* The stencil surface is released with the device, so AddRef with refcount=0 is fine here. */ @@ -1499,6 +1503,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); pStencilSurface = NULL; } @@ -1653,6 +1659,8 @@ static void test_refcount(void) CHECK_REFCOUNT(device, ++refcount); CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); pBackBuffer = NULL; } CHECK_REFCOUNT( pSwapChain, 1); @@ -1669,12 +1677,14 @@ static void test_refcount(void) * Otherwise GetRenderTarget would re-allocate it and the pointer would change.*/ hr = IDirect3DDevice9_GetRenderTarget(device, 0, &pRenderTarget2); CHECK_CALL(hr, "GetRenderTarget", device, ++refcount); - if(pRenderTarget2) + if (pRenderTarget2) { CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); ok(pRenderTarget == pRenderTarget2, "RenderTarget=%p and RenderTarget2=%p should be the same.\n", - pRenderTarget, pRenderTarget2); + pRenderTarget, pRenderTarget2); CHECK_REFCOUNT(device, --refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); + CHECK_RELEASE_REFCOUNT(pRenderTarget2, 0); pRenderTarget2 = NULL; } pRenderTarget = NULL;

1 0

Austin English : ntoskrnl.exe: Add IoCreateFile stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 52ba4223f1ec78bdc99058458c32253e80a641bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ba4223f1ec78bdc99058458… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:24:31 2017 -0600 ntoskrnl.exe: Add IoCreateFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8222a0437441fc3cb83413c869259b860faf46d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7527659..1ab3a4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3159,3 +3159,15 @@ BOOL WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, KDP FIXME("stub: %p %s %u %p\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); return TRUE; } + +/*********************************************************************** + * IoCreateFile (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + IO_STATUS_BLOCK *io, LARGE_INTEGER *alloc_size, ULONG attributes, ULONG sharing, + ULONG disposition, ULONG create_options, VOID *ea_buffer, ULONG ea_length, + CREATE_FILE_TYPE file_type, VOID *parameters, ULONG options ) +{ + FIXME(": stub\n"); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40bf0d2..0b5aca4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -339,7 +339,7 @@ @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) -@ stub IoCreateFile +@ stdcall IoCreateFile(ptr long ptr ptr long long long ptr long long ptr long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stub IoCreateNotificationEvent @ stub IoCreateStreamFileObject diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 95de8d0..4c696f7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -737,6 +737,12 @@ typedef enum _BUS_QUERY_ID_TYPE { BusQueryDeviceSerialNumber } BUS_QUERY_ID_TYPE, *PBUS_QUERY_ID_TYPE; +typedef enum _CREATE_FILE_TYPE { + CreateFileTypeNone, + CreateFileTypeNamedPipe, + CreateFileTypeMailslot +} CREATE_FILE_TYPE; + typedef enum { DevicePropertyDeviceDescription, DevicePropertyHardwareID,

1 0

Austin English : ntoskrnl.exe: Add stub KeClearEvent.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 54b883150e684bd9b22e923fa54f17946b560075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b883150e684bd9b22e923fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:31:34 2017 -0600 ntoskrnl.exe: Add stub KeClearEvent. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 23c95cabf38724f463954023a9d908b5c1838cdb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1ab3a4e..bc12788 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3171,3 +3171,11 @@ NTSTATUS WINAPI IoCreateFile(HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUT FIXME(": stub\n"); return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * KeClearEvent (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeClearEvent(PRKEVENT event) +{ + FIXME("stub: %p\n", event); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0b5aca4..078178b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,7 +515,7 @@ @ stub KeBugCheckEx @ stub KeCancelTimer @ stub KeCapturePersistentThreadState -@ stub KeClearEvent +@ stdcall KeClearEvent(ptr) @ stub KeConnectInterrupt @ stub KeDcacheFlushCount @ stdcall KeDelayExecutionThread(long long ptr)

1 0

Masanori Kakura : winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: 2bb94dee706c7f8a9b44e329784e4a1db816595d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb94dee706c7f8a9b44e3297… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Wed Jan 25 23:02:20 2017 +0900 winegstreamer: Avoid zero division in amt_from_gst_caps_video(). Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 442653b94ef21fad97a6cd82fe01bc95a79a52a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index c33ed9e..759a5db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -233,9 +233,8 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) bih->biCompression = amt->subtype.Data1; } bih->biSizeImage = width * height * bih->biBitCount / 8; - vih->AvgTimePerFrame = 10000000; - vih->AvgTimePerFrame *= denom; - vih->AvgTimePerFrame /= nom; + if ((vih->AvgTimePerFrame = (REFERENCE_TIME)MulDiv(10000000, denom, nom)) == -1) + vih->AvgTimePerFrame = 0; /* zero division or integer overflow */ vih->rcSource.left = 0; vih->rcSource.right = width; vih->rcSource.top = height;

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: stable Commit: f515b99ab45b32aea7c2cbe225387d0872e01929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f515b99ab45b32aea7c2cbe22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:03 2017 -0700 ddraw: Don't crash if writing out a new ddraw1 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9f2b4627af575ebcd28395d9ba3744cab6c5f36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 ++++++++++++++++------ dlls/ddraw/tests/ddraw1.c | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3b4c628..ecc0a46 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -26,6 +26,8 @@ #include "ddraw_private.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static const struct ddraw *exclusive_ddraw; @@ -2977,14 +2979,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ed4c5ec..ff88b74 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1967,6 +1967,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0