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

Alexandre Julliard : crypt32: Increase buffer size to silence a gcc warning.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: 8738b038a41f5d7ca051d7ce6bfa921c5bd4b849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8738b038a41f5d7ca051d7ce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 09:42:17 2017 +0200 crypt32: Increase buffer size to silence a gcc warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 29b3a66..6f9f595 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3534,11 +3534,11 @@ static BOOL WINAPI CRYPT_AsnEncodeUtcTime(DWORD dwCertEncodingType, __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[16]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 15; + char buf[40]; if (!pbEncoded) { @@ -3591,11 +3591,11 @@ static BOOL CRYPT_AsnEncodeGeneralizedTime(DWORD dwCertEncodingType, __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[18]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 17; + char buf[40]; if (!pbEncoded) {

1 0

Paul Gofman : d3dx9: Get rid of constants modification bitmasks.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: 72b926568056c19f85860ce5e73317101ea62d63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b926568056c19f85860ce5e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Aug 29 17:54:02 2017 +0300 d3dx9: Get rid of constants modification bitmasks. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 3 +- dlls/d3dx9_36/preshader.c | 325 +++++++++++++++++++----------------------- 2 files changed, 148 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72b926568056c19f85860…

1 0

Stefan Dösinger : ws2_32: Also check the FQDN when injecting the local IP.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: a2053597cc326e2305c44e1c1a954c2e0ee2853e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2053597cc326e2305c44e1c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 29 16:15:21 2017 +0200 ws2_32: Also check the FQDN when injecting the local IP. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 06f1c26..681f340 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6539,15 +6539,15 @@ static int convert_eai_u2w(int unixret) { return unixret; } -static char *get_hostname(void) +static char *get_fqdn(void) { char *ret; DWORD size = 0; - GetComputerNameExA( ComputerNamePhysicalDnsHostname, NULL, &size ); + GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, NULL, &size ); if (GetLastError() != ERROR_MORE_DATA) return NULL; if (!(ret = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL; - if (!GetComputerNameExA( ComputerNamePhysicalDnsHostname, ret, &size )) + if (!GetComputerNameExA( ComputerNamePhysicalDnsFullyQualified, ret, &size )) { HeapFree( GetProcessHeap(), 0, ret ); return NULL; @@ -6564,8 +6564,9 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr struct addrinfo *unixaires = NULL; int result; struct addrinfo unixhints, *punixhints = NULL; - char *hostname, *nodeV6 = NULL; + char *dot, *nodeV6 = NULL, *fqdn; const char *node; + size_t hostname_len = 0; *res = NULL; if (!nodename && !servname) @@ -6574,13 +6575,16 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr return WSAHOST_NOT_FOUND; } - hostname = get_hostname(); - if (!hostname) return WSA_NOT_ENOUGH_MEMORY; + fqdn = get_fqdn(); + if (!fqdn) return WSA_NOT_ENOUGH_MEMORY; + dot = strchr(fqdn, '.'); + if (dot) + hostname_len = dot - fqdn; if (!nodename) node = NULL; else if (!nodename[0]) - node = hostname; + node = fqdn; else { node = nodename; @@ -6595,7 +6599,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr nodeV6 = HeapAlloc(GetProcessHeap(), 0, close_bracket - node); if (!nodeV6) { - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); return WSA_NOT_ENOUGH_MEMORY; } lstrcpynA(nodeV6, node + 1, close_bracket - node); @@ -6624,7 +6628,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr if (punixhints->ai_socktype < 0) { SetLastError(WSAESOCKTNOSUPPORT); - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); HeapFree(GetProcessHeap(), 0, nodeV6); return SOCKET_ERROR; } @@ -6648,7 +6652,8 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(node, servname, punixhints, &unixaires); - if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) && !strcmp(hostname, node)) + if (result && (!hints || !(hints->ai_flags & WS_AI_NUMERICHOST)) + && (!strcmp(fqdn, node) || (!strncmp(fqdn, node, hostname_len) && !node[hostname_len]))) { /* If it didn't work it means the host name IP is not in /etc/hosts, try again * by sending a NULL host and avoid sending a NULL servname too because that @@ -6657,7 +6662,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr result = getaddrinfo(NULL, servname ? servname : "0", punixhints, &unixaires); } TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); - HeapFree(GetProcessHeap(), 0, hostname); + HeapFree(GetProcessHeap(), 0, fqdn); HeapFree(GetProcessHeap(), 0, nodeV6); if (!result) {

1 0

Vincent Povirk : gdiplus: Test that GdipGetRegionHRgn includes gdi32 transform.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: 0241da1c2d893013eff26f6221a499bf58867d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0241da1c2d893013eff26f622… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 30 12:32:15 2017 -0500 gdiplus: Test that GdipGetRegionHRgn includes gdi32 transform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 06c47d9..86a2e40 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -1118,6 +1118,8 @@ static void test_gethrgn(void) GpGraphics *graphics; HRGN hrgn; HDC hdc=GetDC(0); + INT rgntype; + RECT rgnbox; static const RECT empty_rect = {0,0,0,0}; static const RECT test_rect = {10, 11, 20, 21}; static const GpRectF test_rectF = {10.0, 11.0, 10.0, 10.0}; @@ -1238,6 +1240,35 @@ static void test_gethrgn(void) ok(status == Ok, "status %08x\n", status); status = GdipDeleteGraphics(graphics); ok(status == Ok, "status %08x\n", status); + + /* test with gdi32 transform */ + SetViewportOrgEx(hdc, 10, 10, NULL); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateRegionRect(&test_rectF, &region); + expect(Ok, status); + + status = GdipGetRegionHRgn(region, graphics, &hrgn); + expect(Ok, status); + + rgntype = GetRgnBox(hrgn, &rgnbox); + DeleteObject(hrgn); + + expect(SIMPLEREGION, rgntype); + expect(20, rgnbox.left); + expect(21, rgnbox.top); + expect(30, rgnbox.right); + expect(31, rgnbox.bottom); + + status = GdipDeleteRegion(region); + expect(Ok, status); + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + + SetViewportOrgEx(hdc, 0, 0, NULL); + ReleaseDC(0, hdc); }

1 0

Alexandre Julliard : kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: ff8af74189086ae2dc29a6ebbd364cee369f1178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8af74189086ae2dc29a6ebb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 30 09:45:29 2017 +0200 kernel32/tests: Use function pointers to avoid gcc warnings for invalid parameter tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0acf109..2c91bb9 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -89,6 +89,12 @@ static void test_heap(void) HGLOBAL hsecond; SIZE_T size, size2; const SIZE_T max_size = 1024, init_size = 10; + /* use function pointers to avoid warnings for invalid parameter tests */ + LPVOID (WINAPI *pHeapAlloc)(HANDLE,DWORD,SIZE_T); + LPVOID (WINAPI *pHeapReAlloc)(HANDLE,DWORD,LPVOID,SIZE_T); + + pHeapAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapAlloc" ); + pHeapReAlloc = (void *)GetProcAddress( GetModuleHandleA("kernel32"), "HeapReAlloc" ); /* Heap*() functions */ mem = HeapAlloc(GetProcessHeap(), 0, 0); @@ -111,12 +117,12 @@ static void test_heap(void) /* test some border cases of HeapAlloc and HeapReAlloc */ mem = HeapAlloc(GetProcessHeap(), 0, 0); ok(mem != NULL, "memory not allocated for size 0\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0 - 7); ok(msecond == NULL, "HeapReAlloc(~0 - 7) should have failed\n"); - msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); + msecond = pHeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~(SIZE_T)0); ok(msecond == NULL, "HeapReAlloc(~0) should have failed\n"); HeapFree(GetProcessHeap(), 0, mem); - mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); + mem = pHeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); mem = HeapAlloc(GetProcessHeap(), 0, 17); msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0);

1 0

Fabian Maurer : winecfg: Use proper size for combobox controls.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: 9944b97a89b98f05495977b54827b8d50e3dfe9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9944b97a89b98f05495977b54… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Aug 29 19:06:37 2017 +0200 winecfg: Use proper size for combobox controls. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.rc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 72c3e1b..5908b49 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -191,7 +191,7 @@ BEGIN LTEXT "Dynamic Link Libraries can be specified individually to be either builtin (provided by Wine) or native (taken from Windows or provided by the application)." ,IDC_STATIC,16,16,228,32 LTEXT "&New override for library:",IDC_STATIC,16,58,220,8 - COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE + COMBOBOX IDC_DLLCOMBO,16,68,140,60,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE PUSHBUTTON "A&dd",IDC_DLLS_ADDDLL, 164,68,82,13 LTEXT "Existing &overrides:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,112,WS_BORDER | WS_TABSTOP | WS_VSCROLL @@ -268,16 +268,16 @@ BEGIN LTEXT "Voice output device:",IDC_STATIC,18,61,230,8 LTEXT "Input device:",IDC_STATIC,18,77,230,8 LTEXT "Voice input device:",IDC_STATIC,18,93,230,8 - COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_VOICEIN_DEVICE,110,91,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_AUDIOOUT_DEVICE,110,43,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_VOICEOUT_DEVICE,110,59,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_AUDIOIN_DEVICE,110,75,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_VOICEIN_DEVICE,110,91,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Test Sound",IDC_AUDIO_TEST,8,113,69,14 GROUPBOX "Speaker configuration",IDC_STATIC,8,132,244,86 CONTROL "",IDC_LIST_AUDIO_DEVICES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP | LVS_NOSORTHEADER, 15,146,230,52 LTEXT "Speakers:",IDC_STATIC,18,202,230,8 - COMBOBOX IDC_SPEAKERCONFIG_SPEAKERS,110,200,135,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SPEAKERCONFIG_SPEAKERS,110,200,135,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 @@ -286,12 +286,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Appearance",IDC_STATIC,8,4,244,106 LTEXT "&Theme:",IDC_STATIC,15,16,130,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_THEMECOMBO,15,26,130,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Install theme...",IDC_THEME_INSTALL,152,26,93,14 LTEXT "&Color:",IDC_THEME_COLORTEXT,15,48,105,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_COLORCOMBO,15,58,105,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "&Size:",IDC_THEME_SIZETEXT,126,48,120,8 - COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_THEME_SIZECOMBO,126,58,120,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "It&em:",IDC_STATIC,15,80,105,8 COMBOBOX IDC_SYSPARAM_COMBO,15,90,105,120,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT LTEXT "C&olor:",IDC_SYSPARAM_COLOR_TEXT,126,80,25,8,WS_DISABLED

1 0

Nikolay Sivov : d2d1: Fix rounding when setting scissor rectangle.
by Alexandre Julliard Aug. 30, 2017

Aug. 30, 2017

Module: wine Branch: master Commit: 0a315ba0653f8de70386b2424c595621f76bd453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a315ba0653f8de70386b2424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 29 15:13:38 2017 +0300 d2d1: Fix rounding when setting scissor rectangle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 8 +++--- dlls/d2d1/tests/d2d1.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0428245..f37565d 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -166,10 +166,10 @@ static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_sh const D2D1_RECT_F *clip_rect; clip_rect = &render_target->clip_stack.stack[render_target->clip_stack.count - 1]; - scissor_rect.left = clip_rect->left + 0.5f; - scissor_rect.top = clip_rect->top + 0.5f; - scissor_rect.right = clip_rect->right + 0.5f; - scissor_rect.bottom = clip_rect->bottom + 0.5f; + scissor_rect.left = ceilf(clip_rect->left - 0.5f); + scissor_rect.top = ceilf(clip_rect->top - 0.5f); + scissor_rect.right = ceilf(clip_rect->right - 0.5f); + scissor_rect.bottom = ceilf(clip_rect->bottom - 0.5f); } else { diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c1ca98d..f626129 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1059,6 +1059,72 @@ static void test_clip(void) match = compare_surface(surface, "035a44d4198d6e422e9de6185b5b2c2bac5e33c9"); ok(match, "Surface does not match.\n"); + /* Fractional clip rectangle coordinates, aliased mode. */ + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + ID2D1RenderTarget_SetDpi(rt, 96.0f, 96.0f); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + scale_matrix(&matrix, 2.0f, 2.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 200.0f, 100.5f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_matrix_identity(&matrix); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.0f, 0.5f, 100.0f, 200.5f); + set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 0.5f, 250.0f, 100.5f, 300.0f); + set_color(&color, 1.0f, 1.0f, 0.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + translate_matrix(&matrix, 0.1f, 0.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_rect(&rect, 110.0f, 250.25f, 150.0f, 300.25f); + set_color(&color, 0.0f, 0.5f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + set_rect(&rect, 160.0f, 250.75f, 200.0f, 300.75f); + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 48.0f, 192.0f); + set_rect(&rect, 160.25f, 0.0f, 200.25f, 100.0f); + set_color(&color, 1.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + set_rect(&rect, 160.75f, 100.0f, 200.75f, 120.0f); + set_color(&color, 0.0f, 1.0f, 1.0f, 1.0f); + ID2D1RenderTarget_PushAxisAlignedClip(rt, &rect, D2D1_ANTIALIAS_MODE_ALIASED); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_PopAxisAlignedClip(rt); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "a958d1fe69ee880200d47b206948e4c1ef382748"); + ok(match, "Surface does not match.\n"); + ID2D1RenderTarget_Release(rt); IDXGISurface_Release(surface); IDXGISwapChain_Release(swapchain);

1 0

Dmitry Timoshkov : gdiplus/tests: Add a test for image flags to PNG grayscale image tests.
by Alexandre Julliard Aug. 29, 2017

Aug. 29, 2017

Module: wine Branch: master Commit: 221c04d0dfb813750a458dfd6b40b828403ed958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221c04d0dfb813750a458dfd6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 28 11:30:15 2017 -0500 gdiplus/tests: Add a test for image flags to PNG grayscale image tests. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b9685c3..9f7cf66 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4980,22 +4980,24 @@ static void test_png_color_formats(void) { char bit_depth, color_type; PixelFormat format; + UINT flags; } td[] = { /* 2 - PNG_COLOR_TYPE_RGB */ - { 8, 2, PixelFormat24bppRGB }, + { 8, 2, PixelFormat24bppRGB, ImageFlagsColorSpaceRGB }, /* 0 - PNG_COLOR_TYPE_GRAY */ - { 1, 0, PixelFormat1bppIndexed }, - { 2, 0, PixelFormat32bppARGB }, - { 4, 0, PixelFormat32bppARGB }, - { 8, 0, PixelFormat32bppARGB }, - { 16, 0, PixelFormat32bppARGB }, + { 1, 0, PixelFormat1bppIndexed, ImageFlagsColorSpaceRGB }, + { 2, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 4, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 8, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, + { 16, 0, PixelFormat32bppARGB, ImageFlagsColorSpaceGRAY }, }; BYTE buf[sizeof(png_1x1_data)]; GpStatus status; GpImage *image; ImageType type; PixelFormat format; + UINT flags; int i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) @@ -5018,6 +5020,13 @@ static void test_png_color_formats(void) broken(td[i].bit_depth == 1 && td[i].color_type == 0 && format == PixelFormat32bppARGB), /* XP */ "%d: expected %#x, got %#x\n", i, td[i].format, format); + status = GdipGetImageFlags(image, &flags); + expect(Ok, status); +todo_wine_if(td[i].bit_depth > 1 && td[i].color_type == 0) + ok((flags & td[i].flags) == td[i].flags || + broken(td[i].bit_depth == 1 && td[i].color_type == 0 && (flags & ImageFlagsColorSpaceGRAY)), /* XP */ + "%d: expected %#x, got %#x\n", i, td[i].flags, flags); + GdipDisposeImage(image); } }

1 0

Alexandre Julliard : rsaenh: Avoid potential buffer overflows in registry key name.
by Alexandre Julliard Aug. 29, 2017

Aug. 29, 2017

Module: wine Branch: master Commit: f7eb53b1f9aac5a3d1252e31b649477dc050355d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eb53b1f9aac5a3d1252e31b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 12:52:31 2017 +0200 rsaenh: Avoid potential buffer overflows in registry key name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 98bba16..3db8286 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1096,7 +1096,7 @@ static void store_key_permissions(HCRYPTKEY hCryptKey, HKEY hKey, DWORD dwKeySpe */ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pKeyContainer->szName); @@ -1127,7 +1127,7 @@ static BOOL create_container_key(KEYCONTAINER *pKeyContainer, REGSAM sam, HKEY * */ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM access, HKEY *phKey) { - CHAR szRSABase[MAX_PATH]; + CHAR szRSABase[sizeof(RSAENH_REGKEY) + MAX_PATH]; HKEY hRootKey; sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); @@ -1154,24 +1154,21 @@ static BOOL open_container_key(LPCSTR pszContainerName, DWORD dwFlags, REGSAM ac */ static BOOL delete_container_key(LPCSTR pszContainerName, DWORD dwFlags) { - CHAR szRegKey[MAX_PATH]; + CHAR szRegKey[sizeof(RSAENH_REGKEY) + MAX_PATH]; + HKEY hRootKey; - if (snprintf(szRegKey, MAX_PATH, RSAENH_REGKEY, pszContainerName) >= MAX_PATH) { - SetLastError(NTE_BAD_KEYSET_PARAM); - return FALSE; + sprintf(szRegKey, RSAENH_REGKEY, pszContainerName); + + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + if (!RegDeleteKeyA(hRootKey, szRegKey)) { + SetLastError(ERROR_SUCCESS); + return TRUE; } else { - HKEY hRootKey; - if (dwFlags & CRYPT_MACHINE_KEYSET) - hRootKey = HKEY_LOCAL_MACHINE; - else - hRootKey = HKEY_CURRENT_USER; - if (!RegDeleteKeyA(hRootKey, szRegKey)) { - SetLastError(ERROR_SUCCESS); - return TRUE; - } else { - SetLastError(NTE_BAD_KEYSET); - return FALSE; - } + SetLastError(NTE_BAD_KEYSET); + return FALSE; } }

1 0

Alexandre Julliard : kernel32/tests: Add tests for SetSearchPathMode.
by Alexandre Julliard Aug. 29, 2017

Aug. 29, 2017

Module: wine Branch: master Commit: 5841521477b18d5f8d8af5032cec220d309ee57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5841521477b18d5f8d8af5032… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 29 15:50:40 2017 +0200 kernel32/tests: Add tests for SetSearchPathMode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 109 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 7eb9e75..632aefc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -72,6 +72,7 @@ static BOOL (WINAPI *pNeedCurrentDirectoryForExePathW)(LPCWSTR); static DWORD (WINAPI *pSearchPathA)(LPCSTR,LPCSTR,LPCSTR,DWORD,LPSTR,LPSTR*); static DWORD (WINAPI *pSearchPathW)(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,LPWSTR,LPWSTR*); +static BOOL (WINAPI *pSetSearchPathMode)(DWORD); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); @@ -2119,6 +2120,7 @@ static void init_pointers(void) MAKEFUNC(NeedCurrentDirectoryForExePathW); MAKEFUNC(SearchPathA); MAKEFUNC(SearchPathW); + MAKEFUNC(SetSearchPathMode); MAKEFUNC(ActivateActCtx); MAKEFUNC(CreateActCtxW); MAKEFUNC(DeactivateActCtx); @@ -2276,6 +2278,112 @@ static void test_CheckNameLegalDOS8Dot3(void) } } +static void test_SetSearchPathMode(void) +{ + BOOL ret; + char orig[MAX_PATH], buf[MAX_PATH], dir[MAX_PATH], expect[MAX_PATH]; + HANDLE handle; + + if (!pSetSearchPathMode) + { + win_skip( "SetSearchPathMode isn't available\n" ); + return; + } + GetCurrentDirectoryA( MAX_PATH, orig ); + GetTempPathA( MAX_PATH, buf ); + GetTempFileNameA( buf, "path", 0, dir ); + DeleteFileA( dir ); + CreateDirectoryA( dir, NULL ); + ret = SetCurrentDirectoryA( dir ); + ok( ret, "failed to switch to %s\n", dir ); + if (!ret) + { + RemoveDirectoryA( dir ); + return; + } + + handle = CreateFileA( "kernel32.dll", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + CloseHandle( handle ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( 0x80 ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetCurrentDirectoryA( MAX_PATH, expect ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE ); + ok( !ret, "SetSearchPathMode succeeded\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pSetSearchPathMode( BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT ); + ok( ret, "SetSearchPathMode failed err %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = SearchPathA( NULL, "kernel32.dll", NULL, MAX_PATH, buf, NULL ); + ok( ret, "SearchPathA failed err %u\n", GetLastError() ); + GetSystemDirectoryA( expect, MAX_PATH ); + strcat( expect, "\\kernel32.dll" ); + ok( !lstrcmpiA( buf, expect ), "found %s expected %s\n", buf, expect ); + + DeleteFileA( "kernel32.dll" ); + SetCurrentDirectoryA( orig ); + RemoveDirectoryA( dir ); +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -2309,4 +2417,5 @@ START_TEST(path) test_GetFullPathNameA(); test_GetFullPathNameW(); test_CheckNameLegalDOS8Dot3(); + test_SetSearchPathMode(); }

1 0