November 2018 - Wine-Commits

Jacek Caban : user32: Attempt to set scroll info in SetScrollPos even if SCROLL_GetInternalInfo fails.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 9d4ce95de50e019c3522ec95f6525d85230ea699 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4ce95de50e019c3522ec95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 16:27:01 2018 +0100 user32: Attempt to set scroll info in SetScrollPos even if SCROLL_GetInternalInfo fails. SetScrollPos may be called on non-scroll window and we should send SBM_SETSCROLLINFO. This fixes scrollbars in Visio. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 5 ++--- dlls/user32/tests/scroll.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 37095df..95d9761 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1854,10 +1854,9 @@ INT WINAPI DECLSPEC_HOTPATCH SetScrollPos( HWND hwnd, INT nBar, INT nPos, BOOL b { SCROLLINFO info; SCROLLBAR_INFO *infoPtr; - INT oldPos; + INT oldPos = 0; - if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ))) return 0; - oldPos = infoPtr->curVal; + if ((infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ))) oldPos = infoPtr->curVal; info.cbSize = sizeof(info); info.nPos = nPos; info.fMask = SIF_POS; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 43d4720..fbc94a6 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -604,11 +604,16 @@ static void test_SetScrollInfo(void) static WNDPROC scrollbar_wndproc; +static SCROLLINFO set_scrollinfo; + static LRESULT CALLBACK subclass_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { if (msg == WM_CREATE && ((CREATESTRUCTA*)lparam)->lpCreateParams) return DefWindowProcA(hwnd, msg, wparam, lparam); + if (msg == SBM_SETSCROLLINFO) + set_scrollinfo = *(SCROLLINFO*)lparam; + return CallWindowProcA(scrollbar_wndproc, hwnd, msg, wparam, lparam); } @@ -637,6 +642,20 @@ static void test_subclass(void) CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0 ); ok(hwnd != NULL, "Failed to create window: %u\n", GetLastError()); + r = SetScrollRange(hwnd, SB_CTL, 0, 100, TRUE); + ok(r, "SetScrollRange failed: %u\n", GetLastError()); + + res = SetScrollPos(hwnd, SB_CTL, 2, FALSE); + ok(!res, "SetScrollPos returned %lu\n", res); + + memset(&set_scrollinfo, 0xcc, sizeof(set_scrollinfo)); + res = SetScrollPos(hwnd, SB_CTL, 1, FALSE); + ok(res == 2, "SetScrollPos returned %lu\n", res); + ok(set_scrollinfo.cbSize == sizeof(SCROLLINFO), "cbSize = %u\n", set_scrollinfo.cbSize); + todo_wine + ok(set_scrollinfo.fMask == (0x1000 | SIF_POS), "fMask = %x\n", set_scrollinfo.fMask); + ok(set_scrollinfo.nPos == 1, "nPos = %x\n", set_scrollinfo.nPos); + memset(&scroll_info, 0xcc, sizeof(scroll_info)); scroll_info.cbSize = sizeof(scroll_info); res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); @@ -671,6 +690,14 @@ static void test_subclass(void) res = SendMessageA(hwnd, SBM_GETSCROLLBARINFO, 0, (LPARAM)&scroll_info); ok(!res, "SBM_GETSCROLLBARINFO returned %lu\n", res); + memset(&set_scrollinfo, 0xcc, sizeof(set_scrollinfo)); + res = SetScrollPos(hwnd, SB_CTL, 1, FALSE); + ok(res == 0, "SetScrollPos returned %lu\n", res); + ok(set_scrollinfo.cbSize == sizeof(SCROLLINFO), "cbSize = %u\n", set_scrollinfo.cbSize); + todo_wine + ok(set_scrollinfo.fMask == (0x1000 | SIF_POS), "fMask = %x\n", set_scrollinfo.fMask); + ok(set_scrollinfo.nPos == 1, "nPos = %x\n", set_scrollinfo.nPos); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : gdi32/tests: Run memory resource font test in a child process.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 65ef40bff78fca9c8fcee462284753415e5dadb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ef40bff78fca9c8fcee462… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 21 15:54:00 2018 +0300 gdi32/tests: Run memory resource font test in a child process. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4f10e2f..dfb2f8e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include "windef.h" @@ -6859,8 +6860,25 @@ static void test_long_names(void) START_TEST(font) { + static const char *test_names[] = + { + "AddFontMemResource", + }; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + int argc, i; + init(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "AddFontMemResource")) + test_AddFontMemResource(); + return; + } + test_stock_fonts(); test_logfont(); test_bitmap_font(); @@ -6879,7 +6897,6 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); - test_AddFontMemResource(); test_EnumFonts(); test_EnumFonts_subst(); @@ -6928,4 +6945,19 @@ START_TEST(font) */ test_vertical_font(); test_CreateScalableFontResource(); + + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_names); ++i) + { + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s font %s", argv[0], test_names[i]); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } }

1 0

Nikolay Sivov : gdi32: Set data size for fonts created from memory.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 93eca9e919f3298f818e8bb7c6617dd92246189e URL: https://source.winehq.org/git/wine.git/?a=commit;h=93eca9e919f3298f818e8bb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 21 15:54:02 2018 +0300 gdi32: Set data size for fonts created from memory. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 1 + dlls/gdi32/tests/font.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1f46fc8..96e8e30 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5335,6 +5335,7 @@ static void fill_fileinfo_from_face( GdiFont *font, Face *face ) if (!face->file) { font->fileinfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*font->fileinfo)); + font->fileinfo->size.QuadPart = face->font_data_size; return; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f492f7b..468e7d9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5139,7 +5139,6 @@ static void test_realization_info(const char *name, DWORD size, BOOL is_memory_r ok(ret != 0, "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError()); if (ret) { - todo_wine_if(is_memory_resource) ok(is_memory_resource ? file_info.size.QuadPart == size : file_info.size.QuadPart > 0, "Unexpected file size.\n"); ok(is_memory_resource ? !file_info.path[0] : file_info.path[0], "Unexpected file path %s.\n", wine_dbgstr_w(file_info.path));

1 0

Henri Verbeet : d3d9: Do not add map access indiscriminately in cubetexture_init().
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 0ffaf5c28a63344ba86c7650d1f80f518f4c134c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffaf5c28a63344ba86c7650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 21 17:05:27 2018 +0330 d3d9: Do not add map access indiscriminately in cubetexture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 5 +++-- dlls/d3d9/texture.c | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 205a9cc..cb38aea 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,10 +12877,11 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D + && surface_types[i].type != SURFACE_CUBE) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); - todo_wine_if(expected_hr != D3D_OK) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_CUBE) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index de485ba..84a1bd8 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1397,8 +1397,7 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1;

1 0

Henri Verbeet : d3d9: Disallow rendertarget and depth/ stencil usage on vertex buffers.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 5e000be16ec3ec3ecc98ada8db710364960e6dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e000be16ec3ec3ecc98ada8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 21 17:05:23 2018 +0330 d3d9: Disallow rendertarget and depth/stencil usage on vertex buffers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 4 ++++ dlls/d3d9/tests/device.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index b870107..67586c2 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -283,6 +283,10 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * return D3DERR_INVALIDCALL; } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index af0e8a0..b2803ba 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12998,16 +12998,14 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); - todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) - ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) + ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; hr = IDirect3DVertexBuffer9_GetDesc(vb, &vb_desc); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) - ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); + ok(vb_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, vb_desc.Usage); ok(vb_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, vb_desc.Pool); hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, 0);

1 0

Józef Kucia : dxgi: Report non-zero shared system memory.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: a96f6f8bf5ac285e2ade2847b00abcfa01c5f714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a96f6f8bf5ac285e2ade2847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:23 2018 +0100 dxgi: Report non-zero shared system memory. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40803 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/dxgi/adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 71e15d7..4371ae7 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -178,7 +178,7 @@ static HRESULT dxgi_adapter_get_desc(struct dxgi_adapter *adapter, DXGI_ADAPTER_ desc->Revision = adapter_id.revision; desc->DedicatedVideoMemory = adapter_id.video_memory; desc->DedicatedSystemMemory = 0; /* FIXME */ - desc->SharedSystemMemory = 0; /* FIXME */ + desc->SharedSystemMemory = adapter_id.shared_system_memory; desc->AdapterLuid = adapter_id.adapter_luid; desc->Flags = 0; desc->GraphicsPreemptionGranularity = 0; /* FIXME */

1 0

Józef Kucia : wined3d: Report system shared memory for adapters.
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: b0b27730e65d437e46de54a4b0a31e9ef0d00abf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b27730e65d437e46de54a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 21 10:13:22 2018 +0100 wined3d: Report system shared memory for adapters. 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/wined3d/directx.c | 15 ++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e41da8d..b9aa9fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -492,11 +492,12 @@ const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_p void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { + const struct driver_version_information *version_info; + enum wined3d_driver_model driver_model; + enum wined3d_display_driver driver; + MEMORYSTATUSEX memory_status; OSVERSIONINFOW os_version; WORD driver_os_version; - enum wined3d_display_driver driver; - enum wined3d_driver_model driver_model; - const struct driver_version_information *version_info; memset(&os_version, 0, sizeof(os_version)); os_version.dwOSVersionInfoSize = sizeof(os_version); @@ -585,6 +586,13 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_info->vram_bytes = LONG_MAX; } + driver_info->sysmem_bytes = 64 * 1024 * 1024; + memory_status.dwLength = sizeof(memory_status); + if (GlobalMemoryStatusEx(&memory_status)) + driver_info->sysmem_bytes = max(memory_status.ullTotalPhys / 2, driver_info->sysmem_bytes); + else + ERR("Failed to get global memory status.\n"); + /* Try to obtain driver version information for the current Windows version. This fails in * some cases: * - the gpu is not available on the currently selected OS version: @@ -1200,6 +1208,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); + identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 668bbc7..f908ff7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2648,6 +2648,7 @@ struct wined3d_driver_info const char *name; const char *description; UINT64 vram_bytes; + UINT64 sysmem_bytes; DWORD version_high; DWORD version_low; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f8e201c..40553f7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1736,6 +1736,7 @@ struct wined3d_adapter_identifier DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; + SIZE_T shared_system_memory; }; struct wined3d_swapchain_desc

1 0

Zebediah Figura : setupapi/tests: Add some more tests for SetupDiRegisterDeviceInfo().
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 9ac9e4b955baace94eb0373841e6ebd5080c3b51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac9e4b955baace94eb03738… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 21 00:06:12 2018 -0600 setupapi/tests: Add some more tests for SetupDiRegisterDeviceInfo(). Changed USB\BOGUS to the testcase used elsewhere since it fails on Windows 8. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3e49da0..888b247 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -539,10 +539,11 @@ static void test_register_device_info(void) { static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0}; + 'E','n','u','m','\\','R','o','o','t','\\','L','E','G','A','C','Y','_','B','O','G','U','S',0}; SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + char id[30]; SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); @@ -568,15 +569,34 @@ static void test_register_device_info(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = SetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 0, &device); + ok(ret, "Failed to enumerate devices, error %#x.\n", GetLastError()); + ret = SetupDiGetDeviceInstanceIdA(set, &device, id, sizeof(id), NULL); + ok(ret, "Failed to get device id, error %#x.\n", GetLastError()); + ok(!strcasecmp(id, "Root\\LEGACY_BOGUS\\0000"), "Got unexpected id %s.\n", id); + ret = SetupDiRemoveDevice(set, &device); todo_wine ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInfo(set, 1, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); /* remove once Wine is fixed */

1 0

Zebediah Figura : setupapi/tests: Remove workarounds in testRegisterDeviceInfo().
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 4e9b306e0686f595a20943f27adc791caecaa03c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9b306e0686f595a20943f2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 21 00:06:11 2018 -0600 setupapi/tests: Remove workarounds in testRegisterDeviceInfo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 68 +++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 7ae198a..3e49da0 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -535,52 +535,52 @@ static void test_get_device_instance_id(void) SetupDiDestroyDeviceInfoList(set); } -static void testRegisterDeviceInfo(void) +static void test_register_device_info(void) { static const WCHAR bogus[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','U','S','B','\\','B','O','G','U','S',0}; + SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { 0 }; + ret = SetupDiRegisterDeviceInfo(NULL, NULL, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - devInfo.cbSize = sizeof(devInfo); - SetLastError(0xdeadbeef); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = pSetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRegisterDeviceInfo(set, &devInfo, 0, NULL, NULL, NULL); - ok(ret, "SetupDiRegisterDeviceInfo failed: %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); - pSetupDiDestroyDeviceInfoList(set); + device.cbSize = sizeof(device); + SetLastError(0xdeadbeef); + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - /* remove once Wine is fixed */ - devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); - } + ret = SetupDiCreateDeviceInfoA(set, "USB\\BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); + ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + + ret = SetupDiRemoveDevice(set, &device); +todo_wine + ok(ret, "Failed to remove device, error %#x.\n", GetLastError()); + SetupDiDestroyDeviceInfoList(set); + + /* remove once Wine is fixed */ + devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } static void testCreateDeviceInterface(void) @@ -1517,7 +1517,7 @@ START_TEST(devinst) test_install_class(); test_device_info(); test_get_device_instance_id(); - testRegisterDeviceInfo(); + test_register_device_info(); testCreateDeviceInterface(); testGetDeviceInterfaceDetail(); testDevRegKey();

1 0

Henri Verbeet : d3d9: Do not add map access indiscriminately in texture_init().
by Alexandre Julliard Nov. 21, 2018

Nov. 21, 2018

Module: wine Branch: master Commit: 949dbbd31f450178c90ea8267097a975b77c3219 URL: https://source.winehq.org/git/wine.git/?a=commit;h=949dbbd31f450178c90ea826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 21 17:05:26 2018 +0330 d3d9: Do not add map access indiscriminately in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 2 +- dlls/d3d9/texture.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 05e6d81..205a9cc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,7 +12877,7 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); todo_wine_if(expected_hr != D3D_OK) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index e652416..de485ba 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1314,8 +1314,7 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1;

1 0