May 2017 - Wine-Commits - list.winehq.org

Huw Davies : explorer: Set the rebar band height to match the combobox.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: db52c6d074eded1d5312f25257a5ca89823e3a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db52c6d074eded1d5312f2525… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 11:03:18 2017 +0100 explorer: Set the rebar band height to match the combobox. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/explorer.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 43466dc..cc3244d 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -301,7 +301,7 @@ static IExplorerBrowserEvents *make_explorer_events(explorer_info *info) static void make_explorer_window(IShellFolder* startFolder) { - RECT explorerRect; + RECT rect; HWND rebar,nav_toolbar; FOLDERSETTINGS fs; IExplorerBrowserEvents *events; @@ -340,12 +340,9 @@ static void make_explorer_window(IShellFolder* startFolder) fs.ViewMode = FVM_DETAILS; fs.fFlags = FWF_AUTOARRANGE; - explorerRect.left = 0; - explorerRect.top = 0; - explorerRect.right = DEFAULT_WIDTH; - explorerRect.bottom = DEFAULT_HEIGHT; - IExplorerBrowser_Initialize(info->browser,info->main_window,&explorerRect,&fs); + SetRect(&rect, 0, 0, DEFAULT_WIDTH, DEFAULT_HEIGHT); + IExplorerBrowser_Initialize(info->browser,info->main_window,&rect,&fs); IExplorerBrowser_SetOptions(info->browser,EBO_SHOWFRAMES); SetWindowLongPtrW(info->main_window,EXPLORER_INFO_INDEX,(LONG_PTR)info); @@ -392,9 +389,10 @@ static void make_explorer_window(IShellFolder* startFolder) WS_CHILD | WS_VISIBLE | CBS_DROPDOWN, 0,0,DEFAULT_WIDTH,PATHBOX_HEIGHT,rebar,NULL, explorer_hInstance,NULL); - band_info.cyChild=PATHBOX_HEIGHT; + GetWindowRect(info->path_box, &rect); + band_info.cyChild = rect.bottom - rect.top; band_info.cx=0; - band_info.cyMinChild=PATHBOX_HEIGHT; + band_info.cyMinChild = rect.bottom - rect.top; band_info.cxMinChild=0; band_info.fMask|=RBBIM_TEXT; band_info.lpText=pathbox_label;

1 0

Henri Verbeet : wined3d: Allow the command stream thread to run asynchronously.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 73170152dc66b5cee437e687d04d6cc2606b6797 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73170152dc66b5cee437e687d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 2 11:35:30 2017 +0200 wined3d: Allow the command stream thread to run asynchronously. For a modest performance improvement in CPU-limited scenarios, especially ones where a significant amount of time is spent in the graphics driver. There's certainly still more room for improvement, resource maps in particular will currently cause stalls. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 46 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 6 ++++++ dlls/wined3d/swapchain.c | 10 +++++++++ dlls/wined3d/texture.c | 11 ++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 72 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73170152dc66b5cee437e…

1 0

Henri Verbeet : wined3d: Use the CPU blitter for clearing depth/ stencil textures that are current in the map binding.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 2f0b9452358125063f03cadde77374e030136daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b9452358125063f03cadde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 2 11:35:29 2017 +0200 wined3d: Use the CPU blitter for clearing depth/stencil textures that are current in the map binding. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 864a20c..e86119d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2596,7 +2596,9 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { - if (fb->depth_stencil && fb->depth_stencil->resource->pool == WINED3D_POOL_SYSTEM_MEM) + view = fb->depth_stencil; + if (view && (view->resource->pool == WINED3D_POOL_SYSTEM_MEM + || ffp_blitter_use_cpu_clear(view))) goto next; }

1 0

Huw Davies : shell32: Fix the icon sizes of the shell imagelists.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 3a1b289d66db4fa4e1afe9777eafe7a618312808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1b289d66db4fa4e1afe9777… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:34 2017 +0100 shell32: Fix the icon sizes of the shell imagelists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 42 ++++++++++++++++++++++++++---- dlls/shell32/tests/shelllink.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 737f4d5..59fd8fb 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -73,6 +73,11 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION SHELL32_SicCS = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static const WCHAR WindowMetrics[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\\', + 'W','i','n','d','o','w','M','e','t','r','i','c','s',0}; +static const WCHAR ShellIconSize[] = {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0}; + /***************************************************************************** * SIC_CompareEntries * @@ -361,6 +366,24 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) return ret; } +static int get_shell_icon_size(void) +{ + WCHAR buf[32]; + DWORD value = 32, size = sizeof(buf), type; + HKEY key; + + if (!RegOpenKeyW( HKEY_CURRENT_USER, WindowMetrics, &key )) + { + if (!RegQueryValueExW( key, ShellIconSize, NULL, &type, (BYTE *)buf, &size ) && type == REG_SZ) + { + if (size == sizeof(buf)) buf[size / sizeof(WCHAR) - 1] = 0; + value = atoiW( buf ); + } + RegCloseKey( key ); + } + return value; +} + /***************************************************************************** * SIC_Initialize [internal] */ @@ -370,12 +393,21 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context int cx_small, cy_small; int cx_large, cy_large; - cx_small = GetSystemMetrics(SM_CXSMICON); - cy_small = GetSystemMetrics(SM_CYSMICON); - cx_large = GetSystemMetrics(SM_CXICON); - cy_large = GetSystemMetrics(SM_CYICON); + if (!IsProcessDPIAware()) + { + cx_large = cy_large = get_shell_icon_size(); + cx_small = GetSystemMetrics( SM_CXSMICON ); + cy_small = GetSystemMetrics( SM_CYSMICON ); + } + else + { + cx_large = GetSystemMetrics( SM_CXICON ); + cy_large = GetSystemMetrics( SM_CYICON ); + cx_small = cx_large / 2; + cy_small = cy_large / 2; + } - TRACE("\n"); + TRACE("large %dx%d small %dx%d\n", cx_large, cy_large, cx_small, cx_small); sic_hdpa = DPA_Create(16); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index db15ccd..ad254c8 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -44,6 +44,7 @@ static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINF static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); +static BOOL (WINAPI *pIsProcessDPIAware)(void); static const GUID _IID_IShellLinkDataList = { 0x45e2b4ae, 0xb1c3, 0x11d0, @@ -1304,6 +1305,21 @@ todo_wine { DestroyIcon(hicon); } +static int get_shell_icon_size(void) +{ + char buf[10]; + DWORD value = 32, size = sizeof(buf), type; + HKEY key; + + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Control Panel\\Desktop\\WindowMetrics", &key )) + { + if (!RegQueryValueExA( key, "Shell Icon Size", NULL, &type, (BYTE *)buf, &size ) && type == REG_SZ) + value = atoi( buf ); + RegCloseKey( key ); + } + return value; +} + static void test_SHGetImageList(void) { HRESULT hr; @@ -1311,6 +1327,8 @@ static void test_SHGetImageList(void) BOOL ret; HIMAGELIST lg, sm; ULONG start_refs, refs; + int i, width, height, expect; + BOOL dpi_aware = pIsProcessDPIAware && pIsProcessDPIAware(); hr = SHGetImageList( SHIL_LARGE, &IID_IImageList, (void **)&list ); ok( hr == S_OK, "got %08x\n", hr ); @@ -1340,6 +1358,44 @@ static void test_SHGetImageList(void) IImageList_Release( list2 ); IImageList_Release( list ); + + /* Test the icon sizes */ + for (i = 0; i <= SHIL_LAST; i++) + { + hr = SHGetImageList( i, &IID_IImageList, (void **)&list ); + todo_wine_if(i == SHIL_EXTRALARGE || i == SHIL_JUMBO) + ok( hr == S_OK || + broken( i == SHIL_JUMBO && hr == E_INVALIDARG ), /* XP and 2003 */ + "%d: got %08x\n", i, hr ); + if (FAILED(hr)) continue; + IImageList_GetIconSize( list, &width, &height ); + switch (i) + { + case SHIL_LARGE: + if (dpi_aware) expect = GetSystemMetrics( SM_CXICON ); + else expect = get_shell_icon_size(); + break; + case SHIL_SMALL: + if (dpi_aware) expect = GetSystemMetrics( SM_CXICON ) / 2; + else expect = GetSystemMetrics( SM_CXSMICON ); + break; + case SHIL_EXTRALARGE: + expect = (GetSystemMetrics( SM_CXICON ) * 3) / 2; + break; + case SHIL_SYSSMALL: + expect = GetSystemMetrics( SM_CXSMICON ); + break; + case SHIL_JUMBO: + expect = 256; + break; + } + todo_wine_if(i == SHIL_SYSSMALL && dpi_aware && expect != GetSystemMetrics( SM_CXICON ) / 2) + { + ok( width == expect, "%d: got %d expect %d\n", i, width, expect ); + ok( height == expect, "%d: got %d expect %d\n", i, height, expect ); + } + IImageList_Release( list ); + } } START_TEST(shelllink) @@ -1347,6 +1403,7 @@ START_TEST(shelllink) HRESULT r; HMODULE hmod = GetModuleHandleA("shell32.dll"); HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE huser32 = GetModuleHandleA("user32.dll"); pILFree = (void *)GetProcAddress(hmod, (LPSTR)155); pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); @@ -1356,6 +1413,7 @@ START_TEST(shelllink) pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); + pIsProcessDPIAware = (void *)GetProcAddress(huser32, "IsProcessDPIAware"); r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x)\n", r);

1 0

Andrew Wesie : setupapi: Fix SetupDiGetDeviceRegistryProperty if property does not exist.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: e4645d60d72a9fbfbd745e275d4f90110bdceb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4645d60d72a9fbfbd745e275… Author: Andrew Wesie <awesie(a)gmail.com> Date: Mon May 1 22:14:57 2017 -0500 setupapi: Fix SetupDiGetDeviceRegistryProperty if property does not exist. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 8 ++++++-- dlls/setupapi/tests/devinst.c | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ffb5fad..4a852da 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3125,7 +3125,9 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( LONG l = RegQueryValueExA(devInfo->key, PropertyMap[Property].nameA, NULL, PropertyRegDataType, PropertyBuffer, &size); - if (l == ERROR_MORE_DATA || !PropertyBufferSize) + if (l == ERROR_FILE_NOT_FOUND) + SetLastError(ERROR_INVALID_DATA); + else if (l == ERROR_MORE_DATA || !PropertyBufferSize) SetLastError(ERROR_INSUFFICIENT_BUFFER); else if (!l) ret = TRUE; @@ -3186,7 +3188,9 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( LONG l = RegQueryValueExW(devInfo->key, PropertyMap[Property].nameW, NULL, PropertyRegDataType, PropertyBuffer, &size); - if (l == ERROR_MORE_DATA || !PropertyBufferSize) + if (l == ERROR_FILE_NOT_FOUND) + SetLastError(ERROR_INVALID_DATA); + else if (l == ERROR_MORE_DATA || !PropertyBufferSize) SetLastError(ERROR_INSUFFICIENT_BUFFER); else if (!l) ret = TRUE; diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 6ca0e92..4df00b1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1053,6 +1053,10 @@ static void testDeviceRegistryPropertyA(void) todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ret = pSetupDiGetDeviceRegistryPropertyA(set, &devInfo, SPDRP_HARDWAREID, + NULL, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, bogus, &key); @@ -1158,6 +1162,10 @@ static void testDeviceRegistryPropertyW(void) todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ret = pSetupDiGetDeviceRegistryPropertyW(set, &devInfo, SPDRP_HARDWAREID, + NULL, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); pSetupDiDestroyDeviceInfoList(set); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key);

1 0

Michael Stefaniuc : dmusic: Avoid an intermediate copy in PackStructured() .
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 950b8a9699fc640b0b58126ce38d25ddaf91dac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950b8a9699fc640b0b58126ce… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon May 1 23:58:50 2017 +0200 dmusic: Avoid an intermediate copy in PackStructured(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/buffer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index dbc8058..9b0ca84 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -101,7 +101,7 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); DWORD new_write_pos = This->write_pos + DMUS_EVENT_SIZE(sizeof(channel_message)); - DMUS_EVENTHEADER header; + DMUS_EVENTHEADER *header; TRACE("(%p)->(0x%s, %u, 0x%x)\n", iface, wine_dbgstr_longlong(ref_time), channel_group, channel_message); @@ -119,13 +119,13 @@ static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER if (!This->write_pos) This->start_time = ref_time; - header.cbEvent = 3; /* Midi message takes 4 bytes space but only 3 are relevant */ - header.dwChannelGroup = channel_group; - header.rtDelta = ref_time - This->start_time; - header.dwFlags = DMUS_EVENT_STRUCTURED; + header = (DMUS_EVENTHEADER*)&This->data[This->write_pos]; + header->cbEvent = 3; /* Midi message takes 4 bytes space but only 3 are relevant */ + header->dwChannelGroup = channel_group; + header->rtDelta = ref_time - This->start_time; + header->dwFlags = DMUS_EVENT_STRUCTURED; - memcpy(This->data + This->write_pos, &header, sizeof(header)); - *(DWORD*)(This->data + This->write_pos + sizeof(header)) = channel_message; + *(DWORD*)&header[1] = channel_message; This->write_pos = new_write_pos; return S_OK;

1 0

Henri Verbeet : ddraw/tests: Port test_texturemapblend() to ddraw4.c as well.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 7f826a7131dbdf6b39c54d8eab9c8c759f359382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f826a7131dbdf6b39c54d8ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 2 15:31:03 2017 +0200 ddraw/tests: Port test_texturemapblend() to ddraw4.c as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 348 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 348 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f826a7131dbdf6b39c54…

1 0

Jacek Caban : ntdll/tests: Added more completion port tests.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: 4bf58b6e100f18dbb348738b6ed94aa47e4cc894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf58b6e100f18dbb348738b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 2 17:51:33 2017 +0200 ntdll/tests: Added more completion port tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 0a8e110..9de9009 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1023,6 +1023,7 @@ static void test_iocp_fileio(HANDLE h) { OVERLAPPED o = {0,}; BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + int apc_count = 0; DWORD read; long count; @@ -1051,6 +1052,60 @@ static void test_iocp_fileio(HANDLE h) } count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); + + /* using APCs on handle with associated completion port is not allowed */ + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + todo_wine + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); + } + + CloseHandle( hPipeSrv ); + CloseHandle( hPipeClt ); + + /* test associating a completion port with a handle after an async using APC is queued */ + hPipeSrv = CreateNamedPipeA( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 4, 1024, 1024, 1000, NULL ); + ok( hPipeSrv != INVALID_HANDLE_VALUE, "Cannot create named pipe\n" ); + if (hPipeSrv == INVALID_HANDLE_VALUE ) + return; + hPipeClt = CreateFileA( pipe_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, NULL ); + ok( hPipeClt != INVALID_HANDLE_VALUE, "Cannot connect to pipe\n" ); + if (hPipeClt != INVALID_HANDLE_VALUE) + { + BYTE send_buf[TEST_BUF_LEN], recv_buf[TEST_BUF_LEN]; + int apc_count = 0; + DWORD read; + long count; + + memset( send_buf, 0, TEST_BUF_LEN ); + memset( recv_buf, 0xde, TEST_BUF_LEN ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); + + U(iosb).Status = 0xdeadbeef; + res = pNtSetInformationFile( hPipeSrv, &iosb, &fci, sizeof(fci), FileCompletionInformation ); + ok( res == STATUS_SUCCESS, "NtSetInformationFile failed: %x\n", res ); + ok( U(iosb).Status == STATUS_SUCCESS, "iosb.Status invalid: %x\n", U(iosb).Status ); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + WriteFile( hPipeClt, send_buf, TEST_BUF_LEN, &read, NULL ); + + ok(!apc_count, "apc_count = %u\n", apc_count); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + SleepEx(1, TRUE); /* alertable sleep */ + ok(apc_count == 1, "apc was not called\n"); + count = get_pending_msgs(h); + ok( !count, "Unexpected msg count: %ld\n", count ); + + /* using APCs on handle with associated completion port is not allowed */ + res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + todo_wine + ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } CloseHandle( hPipeSrv );

1 0

Huw Davies : shell32: Simplify imagelist handling.
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: b8bf0c2628d69952aca59855e155807b6011d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bf0c2628d69952aca59855e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 2 16:12:35 2017 +0100 shell32: Simplify imagelist handling. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 0ccde93..7122591 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -429,7 +429,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, HRESULT hr = S_OK; BOOL IconNotYetLoaded=TRUE; UINT uGilFlags = 0; - HIMAGELIST big_icons, small_icons; TRACE("%s fattr=0x%x sfi=%p(attr=0x%08x) size=0x%x flags=0x%x\n", (flags & SHGFI_PIDL)? "pidl" : debugstr_w(path), dwFileAttributes, @@ -581,9 +580,6 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } /* ### icons ###*/ - - Shell_GetImageLists( &big_icons, &small_icons ); - if (flags & SHGFI_OPENICON) uGilFlags |= GIL_OPENICON; @@ -666,6 +662,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get icon index (or load icon)*/ if (SUCCEEDED(hr) && (flags & (SHGFI_ICON | SHGFI_SYSICONINDEX))) { + IImageList *icon_list; + SHGetImageList( (flags & SHGFI_SMALLICON) ? SHIL_SMALL : SHIL_LARGE, &IID_IImageList, (void **)&icon_list ); + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { WCHAR sTemp [MAX_PATH]; @@ -727,21 +726,14 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, } if (ret && (flags & SHGFI_SYSICONINDEX)) { - if (flags & SHGFI_SMALLICON) - ret = (DWORD_PTR)small_icons; - else - ret = (DWORD_PTR)big_icons; - IImageList_AddRef((IImageList*)ret); + IImageList_AddRef( icon_list ); + ret = (DWORD_PTR)icon_list; } - } - - /* icon handle */ - if (SUCCEEDED(hr) && (flags & SHGFI_ICON) && IconNotYetLoaded) - { - if (flags & SHGFI_SMALLICON) - psfi->hIcon = ImageList_GetIcon( small_icons, psfi->iIcon, ILD_NORMAL); - else - psfi->hIcon = ImageList_GetIcon( big_icons, psfi->iIcon, ILD_NORMAL); + if (ret && (flags & SHGFI_ICON)) + { + hr = IImageList_GetIcon( icon_list, psfi->iIcon, ILD_NORMAL, &psfi->hIcon ); + } + IImageList_Release( icon_list ); } if (flags & ~SHGFI_KNOWN_FLAGS)

1 0

Henri Verbeet : ddraw: Validate that non-fill blits have a source surface in ddraw_surface7_Blt( ).
by Alexandre Julliard May 2, 2017

May 2, 2017

Module: wine Branch: master Commit: fb4740bbb39ddfd017387b18c40c8582166f746c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb4740bbb39ddfd017387b18c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 2 15:31:04 2017 +0200 ddraw: Validate that non-fill blits have a source surface in ddraw_surface7_Blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 ++++++ dlls/ddraw/tests/ddraw1.c | 7 +++++++ dlls/ddraw/tests/ddraw2.c | 7 +++++++ dlls/ddraw/tests/ddraw4.c | 15 +++++++++++---- dlls/ddraw/tests/ddraw7.c | 15 +++++++++++---- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a780f1a..394e915 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1710,6 +1710,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 * } } + if (!(flags & (DDBLT_COLORFILL | DDBLT_DEPTHFILL)) && !src_impl) + { + WARN("No source surface.\n"); + return DDERR_INVALIDPARAMS; + } + if (flags & DDBLT_KEYSRC && (!src_impl || !(src_impl->surface_desc.dwFlags & DDSD_CKSRCBLT))) { WARN("DDBLT_KEYSRC blit without color key in surface, returning DDERR_INVALIDPARAMS\n"); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ac4942d..c052c03 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8863,6 +8863,13 @@ static void test_blt(void) hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, rt, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); + + hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + NULL, &test_data[i].src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, NULL, NULL, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 67a2b06..f81a296 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -9951,6 +9951,13 @@ static void test_blt(void) hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, rt, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); + + hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + NULL, &test_data[i].src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, NULL, NULL, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 763151a..f25b327 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11395,21 +11395,28 @@ static void test_blt(void) hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(surface, NULL, surface, NULL, 0, NULL); + hr = IDirectDrawSurface4_Blt(surface, NULL, surface, NULL, 0, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(surface, NULL, rt, NULL, 0, NULL); + hr = IDirectDrawSurface4_Blt(surface, NULL, rt, NULL, 0, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) { - hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + hr = IDirectDrawSurface4_Blt(surface, &test_data[i].dst_rect, surface, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); - hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + hr = IDirectDrawSurface4_Blt(surface, &test_data[i].dst_rect, rt, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); + + hr = IDirectDrawSurface4_Blt(surface, &test_data[i].dst_rect, + NULL, &test_data[i].src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirectDrawSurface4_Blt(surface, &test_data[i].dst_rect, NULL, NULL, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 79ce80f..354e872 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11374,21 +11374,28 @@ static void test_blt(void) hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(surface, NULL, surface, NULL, 0, NULL); + hr = IDirectDrawSurface7_Blt(surface, NULL, surface, NULL, 0, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); - hr = IDirectDrawSurface_Blt(surface, NULL, rt, NULL, 0, NULL); + hr = IDirectDrawSurface7_Blt(surface, NULL, rt, NULL, 0, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) { - hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + hr = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect, surface, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); - hr = IDirectDrawSurface_Blt(surface, &test_data[i].dst_rect, + hr = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect, rt, &test_data[i].src_rect, DDBLT_WAIT, NULL); ok(hr == test_data[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", i, hr, test_data[i].hr); + + hr = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect, + NULL, &test_data[i].src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_Blt(surface, &test_data[i].dst_rect, NULL, NULL, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Test %u: Got unexpected hr %#x.\n", i, hr); } IDirectDrawSurface7_Release(surface);

1 0