April 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : d3d11/tests: Port swapchain_flip() to d3d11.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: d028e1978fe4db7b7635990aea2588cd4404d93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d028e1978fe4db7b7635990ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:26 2016 +0200 d3d11/tests: Port swapchain_flip() to d3d11. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 330 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 310 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d028e1978fe4db7b76359…

1 0

Stefan Dösinger : d3d10core/tests: Remove dead code.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 3272e49984ef58435b670143ad94ac2432b7cd77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3272e49984ef58435b670143a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Apr 5 18:24:25 2016 +0200 d3d10core/tests: Remove dead code. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 45b0fd2..3783da5 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5679,7 +5679,6 @@ static void test_swapchain_flip(void) DWORD color; HWND window; HRESULT hr; - UINT count; static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = { @@ -5919,8 +5918,6 @@ static void test_swapchain_flip(void) ID3D10Texture2D_Release(backbuffer_2); IDXGISwapChain_Release(swapchain); - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); - ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in read_from_framebuffer().
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: d5dd78a4bade8d9e091ac8dab5c95429a0f248c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5dd78a4bade8d9e091ac8dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:22 2016 +0200 wined3d: Use the texture dimension helpers in read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6e8f99..681caa9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1858,6 +1858,7 @@ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; unsigned int row_pitch, slice_pitch; + unsigned int width, height; BYTE *mem; BYTE *row, *top, *bottom; int i; @@ -1909,8 +1910,9 @@ static void read_from_framebuffer(struct wined3d_surface *surface, gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); - gl_info->gl_ops.gl.p_glReadPixels(0, 0, - surface->resource.width, surface->resource.height, + width = wined3d_texture_get_level_width(texture, surface->texture_level); + height = wined3d_texture_get_level_height(texture, surface->texture_level); + gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, texture->resource.format->glFormat, texture->resource.format->glType, data.addr); checkGLcall("glReadPixels"); @@ -1936,8 +1938,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, mem = data.addr; top = mem; - bottom = mem + row_pitch * (surface->resource.height - 1); - for (i = 0; i < surface->resource.height / 2; i++) + bottom = mem + row_pitch * (height - 1); + for (i = 0; i < height / 2; i++) { memcpy(row, top, row_pitch); memcpy(top, bottom, row_pitch);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in fb_copy_to_texture_direct().
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: e5102126260dc7fc3c9855fbc3c938ab19f68beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5102126260dc7fc3c9855fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:24 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_direct(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 67ec03f..8d898bc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2082,6 +2082,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; + unsigned int src_height; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -2128,6 +2129,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ERR("Texture filtering not supported in direct blit\n"); } + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) @@ -2135,13 +2137,13 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_surface->texture_target, dst_surface->texture_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, - src_rect->left, src_surface->resource.height - src_rect->bottom, + src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); } else { LONG row; - UINT yoffset = src_surface->resource.height - src_rect->top + dst_rect.top - 1; + UINT yoffset = src_height - src_rect->top + dst_rect.top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_upload_from_surface().
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 4ef9f113c9d168521fe046db2ff84f8217b394df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef9f113c9d168521fe046db2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:21 2016 +0200 wined3d: Use the texture dimension helpers in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0055e62..b6e8f99 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1287,7 +1287,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (!src_rect) { - SetRect(&r, 0, 0, src_surface->resource.width, src_surface->resource.height); + SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), + wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); src_rect = &r; } else if (src_rect->left < 0 || src_rect->left >= src_rect->right @@ -1297,8 +1298,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - dst_w = dst_surface->resource.width; - dst_h = dst_surface->resource.height; + dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); + dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); update_w = src_rect->right - src_rect->left; update_h = src_rect->bottom - src_rect->top;

1 0

Aric Stewart : hidclass.sys: Correct input vs output parameters for IOCTL_HID_SET_FEATURE.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: 1b62b7f3c93dec8e6aba5b6f1f9ffaeafd6c83e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b62b7f3c93dec8e6aba5b6f1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:43:43 2016 -0500 hidclass.sys: Correct input vs output parameters for IOCTL_HID_SET_FEATURE. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 886a77a..2900d9e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -479,7 +479,7 @@ static NTSTATUS HID_set_feature(DEVICE_OBJECT *device, IRP *irp) packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.InputBufferLength; TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet.reportId, packet.reportBufferLen, packet.reportBuffer); - rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, NULL, 0, &packet, sizeof(packet)); + rc = call_minidriver(IOCTL_HID_SET_FEATURE, device, &packet, sizeof(packet), NULL, 0); irp->IoStatus.u.Status = rc; if (irp->IoStatus.u.Status == STATUS_SUCCESS)

1 0

Aric Stewart : hidclass.sys: Improvements for IOCTL_HID_GET_FEATURE handling.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: be91fcd879a1de768a57b4a06be470c10313b08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91fcd879a1de768a57b4a06… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:43:48 2016 -0500 hidclass.sys: Improvements for IOCTL_HID_GET_FEATURE handling. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 2900d9e..aae4e5f 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -437,11 +437,11 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) HID_XFER_PACKET *packet; DWORD len; NTSTATUS rc = STATUS_SUCCESS; - WCHAR *out_buffer; + BYTE *out_buffer; irp->IoStatus.Information = 0; - out_buffer = (WCHAR*)(((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); + out_buffer = (((BYTE*)irp->MdlAddress->StartVa) + irp->MdlAddress->ByteOffset); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", device, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -452,16 +452,21 @@ static NTSTATUS HID_get_feature(DEVICE_OBJECT *device, IRP *irp) TRACE_(hid_report)("(id %i, len %i buffer %p)\n", packet->reportId, packet->reportBufferLen, packet->reportBuffer); - rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, len); + rc = call_minidriver(IOCTL_HID_GET_FEATURE, device, NULL, 0, packet, sizeof(*packet)); irp->IoStatus.u.Status = rc; if (irp->IoStatus.u.Status == STATUS_SUCCESS) - irp->IoStatus.Information = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + { + irp->IoStatus.Information = packet->reportBufferLen; + memcpy(out_buffer, packet->reportBuffer, packet->reportBufferLen); + } else irp->IoStatus.Information = 0; TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); + HeapFree(GetProcessHeap(), 0, packet); + return rc; }

1 0

Michael Müller : krnl386.exe16: Emulate 'mov Eb, Gb' instruction on x86 processor architecture.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: d8599db40ada552cecf11235cf770112b33fdf6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8599db40ada552cecf11235c… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Apr 5 16:27:55 2016 +0200 krnl386.exe16: Emulate 'mov Eb, Gb' instruction on x86 processor architecture. Similar to the implementation in ntoskrnl.exe. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/instr.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/instr.c b/dlls/krnl386.exe16/instr.c index b44bd55..b0de30f 100644 --- a/dlls/krnl386.exe16/instr.c +++ b/dlls/krnl386.exe16/instr.c @@ -113,7 +113,7 @@ static BOOL INSTR_ReplaceSelector( CONTEXT *context, WORD *sel ) /* store an operand into a register */ -static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) +static void store_reg_word( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int long_op ) { switch((regmodrm >> 3) & 7) { @@ -152,6 +152,22 @@ static void store_reg( CONTEXT *context, BYTE regmodrm, const BYTE *addr, int lo } } +/* store an operand into a byte register */ +static void store_reg_byte( CONTEXT *context, BYTE regmodrm, const BYTE *addr ) +{ + switch((regmodrm >> 3) & 7) + { + case 0: context->Eax = (context->Eax & 0xffffff00) | *addr; break; + case 1: context->Ecx = (context->Ecx & 0xffffff00) | *addr; break; + case 2: context->Edx = (context->Edx & 0xffffff00) | *addr; break; + case 3: context->Ebx = (context->Ebx & 0xffffff00) | *addr; break; + case 4: context->Eax = (context->Eax & 0xffff00ff) | (*addr << 8); break; + case 5: context->Ecx = (context->Ecx & 0xffff00ff) | (*addr << 8); break; + case 6: context->Edx = (context->Edx & 0xffff00ff) | (*addr << 8); break; + case 7: context->Ebx = (context->Ebx & 0xffff00ff) | (*addr << 8); break; + } +} + /*********************************************************************** * INSTR_GetOperandAddr * @@ -333,7 +349,7 @@ static BOOL INSTR_EmulateLDS( CONTEXT *context, BYTE *instr, int long_op, /* Now store the offset in the correct register */ - store_reg( context, *regmodrm, addr, long_op ); + store_reg_word( context, *regmodrm, addr, long_op ); /* Store the correct segment in the segment register */ @@ -689,19 +705,26 @@ DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) } return ExceptionContinueExecution; + case 0x8a: /* mov Eb, Gb */ case 0x8b: /* mov Ev, Gv */ { - BYTE *addr = INSTR_GetOperandAddr(context, instr + 1, long_addr, + BYTE *data = INSTR_GetOperandAddr(context, instr + 1, long_addr, segprefix, &len); + unsigned int data_size = (*instr == 0x8b) ? (long_op ? 4 : 2) : 1; struct idtr idtr = get_idtr(); - unsigned int offset = addr - idtr.base; + unsigned int offset = data - idtr.base; - if (offset <= idtr.limit + 1 - (long_op ? 4 : 2)) + if (offset <= idtr.limit + 1 - data_size) { idt[1].LimitLow = 0x100; /* FIXME */ idt[2].LimitLow = 0x11E; /* FIXME */ idt[3].LimitLow = 0x500; /* FIXME */ - store_reg( context, instr[1], (BYTE *)idt + offset, long_op ); + + switch (*instr) + { + case 0x8a: store_reg_byte( context, instr[1], (BYTE *)idt + offset ); break; + case 0x8b: store_reg_word( context, instr[1], (BYTE *)idt + offset, long_op ); break; + } context->Eip += prefixlen + len + 1; return ExceptionContinueExecution; }

1 0

Józef Kucia : d3d11/tests: Test exact return values returned by D3D11CreateDevice functions.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: d2ca5419e3f6d2b241ccd3e50dbe201f98e1ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca5419e3f6d2b241ccd3e50… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 5 10:22:12 2016 +0200 d3d11/tests: Test exact return values returned by D3D11CreateDevice functions. 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> --- dlls/d3d11/tests/d3d11.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff2d56d..6355065 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -515,24 +515,24 @@ static void test_create_device(void) ID3D11Device_Release(device); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, default_feature_levels, sizeof(default_feature_levels) / sizeof(default_feature_levels[0]), D3D11_SDK_VERSION, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &immediate_context); - ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!!immediate_context, "Expected immediate device context pointer, got NULL.\n"); refcount = get_refcount((IUnknown *)immediate_context); @@ -575,17 +575,17 @@ static void test_create_device(void) hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, &swapchain, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); memset(&obtained_desc, 0, sizeof(obtained_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &obtained_desc); @@ -635,27 +635,32 @@ static void test_create_device(void) hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D11Device_Release(device); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, NULL, &feature_level, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, + NULL, NULL, NULL, NULL, &immediate_context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D11DeviceContext_Release(immediate_context); + + hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); swapchain_desc.OutputWindow = NULL; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, &device, NULL, NULL); - ok(SUCCEEDED(hr), "D3D11CreateDeviceAndSwapChain failed %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D11Device_Release(device); swapchain = (IDXGISwapChain *)0xdeadbeef;

1 0

Sebastian Lackner : advapi32: Fix return value of RegNotifyChangeKeyValue for pending events.
by Alexandre Julliard April 5, 2016

April 5, 2016

Module: wine Branch: master Commit: df77e490d89a0582fde621d54f834acfd9588ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df77e490d89a0582fde621d54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 5 16:20:05 2016 +0200 advapi32: Fix return value of RegNotifyChangeKeyValue for pending events. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 2 +- dlls/advapi32/tests/registry.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 7992384..4b3d852 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2760,7 +2760,7 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree, fdwNotifyFilter, fWatchSubTree, NULL, 0, fAsync); - if (status && status != STATUS_TIMEOUT) + if (status && status != STATUS_PENDING) return RtlNtStatusToDosError( status ); return ERROR_SUCCESS; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index f877b36..82f5015 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3452,6 +3452,33 @@ static void test_RegOpenCurrentUser(void) RegCloseKey(key); } +static void test_RegNotifyChangeKeyValue(void) +{ + HKEY key, subkey; + HANDLE event; + DWORD dwret; + LONG ret; + + event = CreateEventW(NULL, FALSE, TRUE, NULL); + ok(event != NULL, "CreateEvent failed, error %u\n", GetLastError()); + ret = RegCreateKeyA(hkey_main, "TestKey", &key); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + + ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME, event, TRUE); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret); + + ret = RegCreateKeyA(key, "SubKey", &subkey); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); + dwret = WaitForSingleObject(event, 0); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + + RegDeleteKeyA(key, ""); + RegCloseKey(key); + CloseHandle(event); +} + START_TEST(registry) { /* Load pointers for functions that are not available in all Windows versions */ @@ -3486,6 +3513,7 @@ START_TEST(registry) test_delete_value(); test_delete_key_value(); test_RegOpenCurrentUser(); + test_RegNotifyChangeKeyValue(); /* cleanup */ delete_key( hkey_main );

1 0