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

Alexandre Julliard : kernel32: Implement SetDefaultDllDirectories.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: e99811aee2dff88c41d6e2875401810a85325839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e99811aee2dff88c41d6e2875… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 13:29:09 2017 +0200 kernel32: Implement SetDefaultDllDirectories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 30 ++++++++++++++++---- dlls/kernel32/path.c | 10 ------- dlls/kernel32/tests/module.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 97d815c..8abf195 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -48,6 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); #define NE_FFLAGS_LIBMODULE 0x8000 static WCHAR *dll_directory; /* extra path for SetDllDirectoryW */ +static DWORD default_search_flags; /* default flags set by SetDefaultDllDirectories */ static CRITICAL_SECTION dlldir_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -58,6 +59,10 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION dlldir_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static const DWORD load_library_search_flags = (LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_USER_DIRS | + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); /**************************************************************************** * GetDllDirectoryA (KERNEL32.@) @@ -148,6 +153,21 @@ BOOL WINAPI SetDllDirectoryW( LPCWSTR dir ) } +/************************************************************************* + * SetDefaultDllDirectories (KERNEL32.@) + */ +BOOL WINAPI SetDefaultDllDirectories( DWORD flags ) +{ + if (!flags || (flags & ~load_library_search_flags)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + default_search_flags = flags; + return TRUE; +} + + /**************************************************************************** * DisableThreadLibraryCalls (KERNEL32.@) * @@ -964,16 +984,14 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) NTSTATUS nts; HMODULE hModule; WCHAR *load_path; - static const DWORD unsupported_flags = + static const DWORD unsupported_flags = load_library_search_flags | LOAD_IGNORE_CODE_AUTHZ_LEVEL | LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_REQUIRE_SIGNED_TARGET | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | - LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_USER_DIRS | - LOAD_LIBRARY_SEARCH_SYSTEM32 | - LOAD_LIBRARY_SEARCH_DEFAULT_DIRS; + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; + + if (!(flags & load_library_search_flags)) flags |= default_search_flags; if( flags & unsupported_flags) FIXME("unsupported flag(s) used (flags: 0x%08x)\n", flags); diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index c746693..ec7c53b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -2081,13 +2081,3 @@ BOOL WINAPI SetSearchPathMode(DWORD flags) SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } - -/************************************************************************* - * SetDefaultDllDirectories (KERNEL32.@) - */ -BOOL WINAPI SetDefaultDllDirectories(DWORD flags) -{ - FIXME("(%x): stub\n", flags); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; -} diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bb22c24..6b178c8 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -25,6 +25,7 @@ static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); +static BOOL (WINAPI *pSetDefaultDllDirectories)(DWORD); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, @@ -515,6 +516,7 @@ static void init_pointers(void) MAKEFUNC(GetDllDirectoryA); MAKEFUNC(GetDllDirectoryW); MAKEFUNC(SetDllDirectoryA); + MAKEFUNC(SetDefaultDllDirectories); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); MAKEFUNC(K32GetModuleInformation); @@ -739,6 +741,70 @@ static void testK32GetModuleInformation(void) ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); } +static void test_SetDefaultDllDirectories(void) +{ + HMODULE mod; + BOOL ret; + + if (!pSetDefaultDllDirectories) + { + win_skip( "SetDefaultDllDirectories not available\n" ); + return; + } + + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_SYSTEM32 ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + todo_wine ok( !mod, "loading authz succeeded\n" ); + FreeLibrary( mod ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); + ok( ret, "SetDefaultDllDirectories failed err %u\n", GetLastError() ); + mod = LoadLibraryA( "authz.dll" ); + ok( mod != NULL, "loading authz failed\n" ); + FreeLibrary( mod ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 0 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( 3 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_APPLICATION_DIR | 0x8000 ); + ok( !ret, "SetDefaultDllDirectories succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_USER_DIRS ); + ok( !ret || broken(ret) /* win7 */, "SetDefaultDllDirectories succeeded\n" ); + if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + /* restore some sane defaults */ + pSetDefaultDllDirectories( LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -768,4 +834,5 @@ START_TEST(module) testLoadLibraryEx(); testGetModuleHandleEx(); testK32GetModuleInformation(); + test_SetDefaultDllDirectories(); }

1 0

Alexandre Julliard : kernel32: Implement safe dll search mode.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: 66e302f80b2ecaac087756f1df3ae55f77f33838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e302f80b2ecaac087756f1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 12:47:34 2017 +0200 kernel32: Implement safe dll search mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 69 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index badfe1d..97d815c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -728,13 +728,11 @@ static const WCHAR *get_dll_system_path(void) if (!cached_path) { WCHAR *p, *path; - int len = 3; + int len = 1; len += 2 * GetSystemDirectoryW( NULL, 0 ); len += GetWindowsDirectoryW( NULL, 0 ); p = path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - *p++ = '.'; - *p++ = ';'; GetSystemDirectoryW( p, path + len - p); p += strlenW(p); /* if system directory ends in "32" add 16-bit version too */ @@ -751,6 +749,52 @@ static const WCHAR *get_dll_system_path(void) return cached_path; } +/*********************************************************************** + * get_dll_safe_mode + */ +static BOOL get_dll_safe_mode(void) +{ + static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; + static const WCHAR valueW[] = {'S','a','f','e','D','l','l','S','e','a','r','c','h','M','o','d','e',0}; + + static int safe_mode = -1; + + if (safe_mode == -1) + { + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + HANDLE hkey; + DWORD size = sizeof(buffer); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + safe_mode = 1; + RtlInitUnicodeString( &nameW, keyW ); + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + RtlInitUnicodeString( &nameW, valueW ); + if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && + info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) + safe_mode = !!*(DWORD *)info->Data; + NtClose( hkey ); + } + if (!safe_mode) TRACE( "SafeDllSearchMode disabled through the registry\n" ); + } + return safe_mode; +} + /****************************************************************** * get_module_path_end * @@ -783,6 +827,7 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) const WCHAR *system_path = get_dll_system_path(); const WCHAR *mod_end = NULL; UNICODE_STRING name, value; + BOOL safe_mode; WCHAR *p, *ret; int len = 0, path_len = 0; @@ -811,7 +856,9 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) path_len = value.Length; RtlEnterCriticalSection( &dlldir_section ); + safe_mode = get_dll_safe_mode(); if (dll_directory) len += strlenW(dll_directory) + 1; + else len += 2; /* current directory */ if ((p = ret = HeapAlloc( GetProcessHeap(), 0, path_len + len * sizeof(WCHAR) ))) { if (module) @@ -826,13 +873,23 @@ WCHAR *MODULE_get_dll_load_path( LPCWSTR module ) p += strlenW(p); *p++ = ';'; } + else if (!safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } + strcpyW( p, system_path ); + p += strlenW(p); + *p++ = ';'; + if (!dll_directory && safe_mode) + { + *p++ = '.'; + *p++ = ';'; + } } RtlLeaveCriticalSection( &dlldir_section ); if (!ret) return NULL; - strcpyW( p, system_path ); - p += strlenW(p); - *p++ = ';'; value.Buffer = p; value.MaximumLength = path_len;

1 0

Alexandre Julliard : gdi32: Use the correct brush origin when the blit operation requires an intermediate bitmap.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: 1c56b3b5168844eb72e0dd22cbe98713c1da7b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c56b3b5168844eb72e0dd22c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 09:10:45 2017 +0200 gdi32: Use the correct brush origin when the blit operation requires an intermediate bitmap. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index f4efc8f..0acb23f 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -742,6 +742,7 @@ static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info * { dib_info *dibs[3], *result = src, tmp; RECT rects[3]; + POINT origin; int width = dst_rect->right - dst_rect->left; int height = dst_rect->bottom - dst_rect->top; const BYTE *opcode = BITBLT_Opcodes[(rop >> 16) & 0xff]; @@ -788,7 +789,10 @@ static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info * brush_org, OP_ROP(*opcode) ); break; case OP_ARGS(PAT,SRC): - pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], brush_org, OP_ROP(*opcode) ); + /* offset the brush origin to match the final dest rectangle */ + origin.x = brush_org->x + rects[DST].left - rects[SRC].left; + origin.y = brush_org->y + rects[DST].top - rects[SRC].top; + pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], &origin, OP_ROP(*opcode) ); break; } }

1 0

Nikolay Sivov : wsdapi: Fix use-after-free when checking for unique prefix (Valgrind).
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: 3cb938fd4f3f16b52022e109a2ededb40371765b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb938fd4f3f16b52022e109a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 26 22:12:59 2017 +0300 wsdapi: Fix use-after-free when checking for unique prefix (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/xml.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 145c394..824b7ff 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -529,6 +529,7 @@ static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPC if (setNewPrefix) { WSDFreeLinkedMemory((void *)ns->PreferredPrefix); + ns->PreferredPrefix = NULL; if ((newPrefix != NULL) && (is_prefix_unique(This->namespaces, newPrefix))) {

1 0

Miklós Máté : winex11: Improve the desktop resolution list.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: cd4139df3c3cf4eb55143d81c9a7b499bb519712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4139df3c3cf4eb55143d81c… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Fri Aug 25 21:25:40 2017 +0200 winex11: Improve the desktop resolution list. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 48 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index bf2c463..4df8784 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,9 +37,43 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 320, 400, 512, 640, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 240, 300, 384, 400, 480, 600, 768, 864, 960, 1024, 1050, 1200}; -#define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) +static struct screen_size { + unsigned int width; + unsigned int height; +} screen_sizes[] = { + /* 4:3 */ + { 320, 240}, + { 400, 300}, + { 512, 384}, + { 640, 480}, + { 768, 576}, + { 800, 600}, + {1024, 768}, + {1152, 864}, + {1280, 960}, + {1400, 1050}, + {1600, 1200}, + {2048, 1536}, + /* 5:4 */ + {1280, 1024}, + {2560, 2048}, + /* 16:9 */ + {1280, 720}, + {1366, 768}, + {1600, 900}, + {1920, 1080}, + {2560, 1440}, + {3840, 2160}, + /* 16:10 */ + { 320, 200}, + { 640, 400}, + {1280, 800}, + {1440, 900}, + {1680, 1050}, + {1920, 1200}, + {2560, 1600} +}; +#define NUM_DESKTOP_MODES (sizeof(screen_sizes) / sizeof(struct screen_size)) #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 @@ -56,13 +90,13 @@ static void make_modes(void) X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); for (i=0; i<NUM_DESKTOP_MODES; i++) { - if ( (widths[i] <= max_width) && (heights[i] <= max_height) ) + if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) { - if ( ( (widths[i] != max_width) || (heights[i] != max_height) ) && - ( (widths[i] != screen_width) || (heights[i] != screen_height) ) ) + if ( ( (screen_sizes[i].width != max_width) || (screen_sizes[i].height != max_height) ) && + ( (screen_sizes[i].width != screen_width) || (screen_sizes[i].height != screen_height) ) ) { /* only add them if they are smaller than the root window and unique */ - X11DRV_Settings_AddOneMode(widths[i], heights[i], 0, 60); + X11DRV_Settings_AddOneMode(screen_sizes[i].width, screen_sizes[i].height, 0, 60); } } }

1 0

Alexandre Julliard : gdi32: Pass the brush origin explicitly to the brush backend functions.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: 97a9db43d256b85fae84fd63fcadd3d064602b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a9db43d256b85fae84fd63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 28 09:07:31 2017 +0200 gdi32: Pass the brush origin explicitly to the brush backend functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 10 ++++++---- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 6 ++++-- dlls/gdi32/dibdrv/objects.c | 9 ++++----- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 79cd629..f4efc8f 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -737,7 +737,8 @@ static DWORD create_tmp_dib( const dib_info *copy, int width, int height, dib_in } static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info *src, - const RECT *src_rect, const struct clipped_rects *clipped_rects, DWORD rop ) + const RECT *src_rect, const struct clipped_rects *clipped_rects, + const POINT *brush_org, DWORD rop ) { dib_info *dibs[3], *result = src, tmp; RECT rects[3]; @@ -784,10 +785,10 @@ static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info * break; case OP_ARGS(PAT,DST): pdev->brush.rects( pdev, &pdev->brush, dibs[DST], clipped_rects->count, clipped_rects->rects, - OP_ROP(*opcode) ); + brush_org, OP_ROP(*opcode) ); break; case OP_ARGS(PAT,SRC): - pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], OP_ROP(*opcode) ); + pdev->brush.rects( pdev, &pdev->brush, dibs[SRC], 1, &rects[SRC], brush_org, OP_ROP(*opcode) ); break; } } @@ -1026,7 +1027,8 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, mask_rect( &pdev->dib, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, rop2 ); } else - ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, rop ); + ret = execute_rop( pdev, &dst->visrect, &src_dib, &src->visrect, &clipped_rects, + &dc->brush_org, rop ); free_clipped_rects( &clipped_rects ); } if (tmp_rgn) DeleteObject( tmp_rgn ); diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index adf16c4..ce34c0d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -75,7 +75,7 @@ typedef struct dib_brush rop_mask_bits masks; struct brush_pattern pattern; BOOL (*rects)(struct dibdrv_physdev *pdev, struct dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop); + int num, const RECT *rects, const POINT *brush_org, INT rop); } dib_brush; struct intensity_range diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 98b4dcf..a39f1e2 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -74,7 +74,7 @@ static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - dc->ROPmode ); + &dc->brush_org, dc->ROPmode ); free_clipped_rects( &clipped_rects ); return ret; } @@ -1174,6 +1174,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); dib_brush *brush = &pdev->brush; + DC *dc = get_physdev_dc( dev ); int rop2 = get_rop2_from_rop( rop ); struct clipped_rects clipped_rects; DWORD and = 0, xor = 0; @@ -1196,7 +1197,8 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) case R2_NOP: break; default: - ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop2 ); + ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, + &dc->brush_org, rop2 ); break; } free_clipped_rects( &clipped_rects ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index a36e03f..736e526 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1773,7 +1773,7 @@ BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *r * Fill a number of rectangles with the solid brush */ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); @@ -2005,9 +2005,8 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * * FIXME: Should we insist l < r && t < b? Currently we assume this. */ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { - DC *dc = get_physdev_dc( &pdev->dev ); BOOL needs_reselect = FALSE; if (rop != brush->rop) @@ -2043,14 +2042,14 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, } } - dib->funcs->pattern_rects( dib, num, rects, &dc->brush_org, &brush->dib, &brush->masks ); + dib->funcs->pattern_rects( dib, num, rects, brush_org, &brush->dib, &brush->masks ); if (needs_reselect) free_pattern_brush( brush ); return TRUE; } static BOOL null_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, - int num, const RECT *rects, INT rop) + int num, const RECT *rects, const POINT *brush_org, INT rop) { return TRUE; }

1 0

Nikolay Sivov : wsdapi/tests: Use constants for test strings when possible.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: b491635f0ada4fb9501610270282505bf59d68f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b491635f0ada4fb9501610270… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 26 22:38:44 2017 +0300 wsdapi/tests: Use constants for test strings when possible. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index d6a7294..633124f 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -35,7 +35,7 @@ static void BuildAnyForSingleElement_tests(void) WSDXML_NAME name; WSDXML_NAMESPACE ns; WCHAR nameText[] = {'E','l','1',0}; - WCHAR text[] = {'H','e','l','l','o',0}; + static const WCHAR text[] = {'H','e','l','l','o',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'t',0}; HRESULT hr; @@ -277,8 +277,8 @@ static void GetValueFromAny_tests(void) WCHAR child1NameText[] = {'T','i','m',0}; WCHAR child2NameText[] = {'B','o','b',0}; WCHAR child3NameText[] = {'J','o','e',0}; - WCHAR child1Value[] = {'V','1',0}; - WCHAR child2Value[] = {'V','2',0}; + static const WCHAR child1Value[] = {'V','1',0}; + static const WCHAR child2Value[] = {'V','2',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; static const WCHAR uri2[] = {'h','t','t','p',':','/','/','t','e','s','t','2','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'t',0}; @@ -379,15 +379,15 @@ static void GetValueFromAny_tests(void) static void XMLContext_AddNamespace_tests(void) { - WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; - WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; - WCHAR ns3Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','a','g','a','i','n',0}; - WCHAR ns4Uri[] = {'h','t','t','p',':','/','/','o','n','e','.','m','o','r','e',0}; - WCHAR prefix1[] = {'t','s','t',0}; - WCHAR prefix2[] = {'w','i','n','e',0}; - WCHAR unPrefix0[] = {'u','n','0',0}; - WCHAR unPrefix1[] = {'u','n','1',0}; - WCHAR unPrefix2[] = {'u','n','2',0}; + static const WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; + static const WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; + static const WCHAR ns3Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','a','g','a','i','n',0}; + static const WCHAR ns4Uri[] = {'h','t','t','p',':','/','/','o','n','e','.','m','o','r','e',0}; + static const WCHAR prefix1[] = {'t','s','t',0}; + static const WCHAR prefix2[] = {'w','i','n','e',0}; + static const WCHAR unPrefix0[] = {'u','n','0',0}; + static const WCHAR unPrefix1[] = {'u','n','1',0}; + static const WCHAR unPrefix2[] = {'u','n','2',0}; IWSDXMLContext *context; WSDXML_NAMESPACE *ns1 = NULL, *ns2 = NULL; @@ -506,12 +506,12 @@ static void XMLContext_AddNamespace_tests(void) static void XMLContext_AddNameToNamespace_tests(void) { - WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; - WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; - WCHAR prefix2[] = {'w','i','n','e',0}; - WCHAR unPrefix0[] = {'u','n','0',0}; - WCHAR name1Text[] = {'B','o','b',0}; - WCHAR name2Text[] = {'T','i','m',0}; + static const WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; + static const WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; + static const WCHAR prefix2[] = {'w','i','n','e',0}; + static const WCHAR unPrefix0[] = {'u','n','0',0}; + static const WCHAR name1Text[] = {'B','o','b',0}; + static const WCHAR name2Text[] = {'T','i','m',0}; IWSDXMLContext *context; WSDXML_NAMESPACE *ns2 = NULL; WSDXML_NAME *name1 = NULL, *name2 = NULL;

1 0

Paul Gofman : d3d9/tests: Add test for SW shader in MVP mode.
by Alexandre Julliard Aug. 28, 2017

Aug. 28, 2017

Module: wine Branch: master Commit: 0a4d3074ee7a13deea2d737fd35326b979a7f771 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4d3074ee7a13deea2d737fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Aug 25 12:51:47 2017 +0300 d3d9/tests: Add test for SW shader in MVP mode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4d3074ee7a13deea2d7…

1 0

Rosanne DiMesio : Add fixInvalidTestSubmitTime to admin control center
by Jeremy Newman Aug. 28, 2017

Aug. 28, 2017

Module: appdb Branch: master Commit: 7021b123e6c8723fe45fd18e4b1fea0ce9eb2e0b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7021b123e6c8723fe45fd18e… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Aug 28 08:12:41 2017 -0500 Add fixInvalidTestSubmitTime to admin control center Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/admin.php b/admin.php index 5f89a4b..11e3aba 100644 --- a/admin.php +++ b/admin.php @@ -221,6 +221,14 @@ function fixNoteLinks() } +function fixInvalidTestSubmitTime() +{ + $sQuery = "UPDATE testResults SET submitTime = testedDate WHERE submitTime = '0000-00-00 00:00:00'"; + $hResult = query_parameters($sQuery); + + echo "Updated ".query_affected_rows()." test reports with invalid submit times.<br>"; +} + function deleteOrphanComments() { $sQuery = "DELETE FROM appComments WHERE NOT EXISTS( SELECT appVersion.versionId FROM appVersion"; @@ -312,6 +320,8 @@ function showChoices() echo '<div class="list-group">'; echo '<a href="admin.php?sAction=fixNoteLinks" class="list-group-item"><h4>Fix/Show note links</h4></a>'; + + echo '<a href="admin.php?sAction=fixInvalidTestSubmitTime" class="list-group-item"><h4>Fix Invalid Test Submission Times</h4></a>'; echo '<a href="admin.php?sAction=updateAppMaintainerStates" class="list-group-item"><h4>Update application maintainer states</h4></a>'; @@ -354,6 +364,10 @@ switch(getInput('sAction', $aClean)) case 'fixNoteLinks': fixNoteLinks(); break; + + case 'fixInvalidTestSubmitTime'; + fixInvalidTestSubmitTime(); + break; case 'deleteOrphanComments': deleteOrphanComments();

1 0

Jeremy Newman : Revert "Fix submitTime field"
by Jeremy Newman Aug. 28, 2017

Aug. 28, 2017

Module: appdb Branch: master Commit: 69991e4b2e9a211a043c3650249ba2017e77ac5e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=69991e4b2e9a211a043c3650… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Aug 28 13:36:26 2017 -0500 Revert "Fix submitTime field" This reverts commit c2d2c7ad817828cafcf6e967b451fbdf009f268d. --- include/testData.php | 7 ++++--- tables/alter.sql | 4 ---- tables/testResults.sql | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/testData.php b/include/testData.php index 98f1c09..49cfa69 100644 --- a/include/testData.php +++ b/include/testData.php @@ -84,11 +84,11 @@ class testData{ "testedRelease, staging, installs, runs,". "usedWorkaround, workarounds,". "testedRating, comments,". - "submitterId, state,". + "submitTime, submitterId, state,". "gpuMfr, graphicsDriver)". "VALUES('?', '?', '?', '?', '?', '?', '?',". "'?', '?', '?', '?', '?',". - "'?', '?', '?', '?', '?', '?')", + "'?', '?', '?', '?', '?', '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, @@ -102,7 +102,8 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->sComments, + "NOW()", $_SESSION['current']->iUserId, $this->sState, $this->sGpuMfr, diff --git a/tables/alter.sql b/tables/alter.sql index 8aa4423..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,6 +1,2 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE `testResults` CHANGE `submitTime` `submitTime` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP; - -/* to fix the incorrect entries*/ -UPDATE testResults SET submitTime = testedDate WHERE submitTime = '0000-00-00 00:00:00' diff --git a/tables/testResults.sql b/tables/testResults.sql index be80b9d..511c115 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -21,7 +21,7 @@ create table testResults ( workarounds text default NULL, testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL, comments text, - submitTime datetime NOT NULL default CURRENT_TIMESTAMP, + submitTime datetime NOT NULL, submitterId int(11) NOT NULL default '0', state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', gpuMfr enum('AMD', 'Intel', 'Nvidia', 'Other', 'Unknown') default NULL,

1 0