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

Józef Kucia : d3d11/tests: Add 10_1 to default feature levels list.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 68c3df90cc50c130f666ff30a2433d17ac3c2d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c3df90cc50c130f666ff30a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:37 2017 +0200 d3d11/tests: Add 10_1 to default feature levels list. Avoids skipping some tests when the highest supported feature level is 10_1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 60ae0e0..e94366a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -997,6 +997,7 @@ static ID3D11Device *create_device(const struct device_desc *desc) static const D3D_FEATURE_LEVEL default_feature_level[] = { D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, D3D_FEATURE_LEVEL_10_0, }; const D3D_FEATURE_LEVEL *feature_level; @@ -6638,7 +6639,7 @@ static void test_texture(void) ID3D11Texture2D_Release(texture); ID3D11PixelShader_Release(ps); - if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_10_1) + if (is_warp_device(device) && feature_level < D3D_FEATURE_LEVEL_11_0) { win_skip("SRV tests are broken on WARP.\n"); ID3D11Buffer_Release(cb); @@ -14269,7 +14270,7 @@ static void test_face_culling(void) ID3D11RasterizerState_Release(state); } - broken_warp = is_warp_device(device) && ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_10_1; + broken_warp = is_warp_device(device) && ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_11_0; /* Test SV_IsFrontFace. */ ID3D11PixelShader_Release(test_context.ps);

1 0

Józef Kucia : d3d11: Simplify d3d10_query_GetData().
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: c4aac1c005730ef080488c3b50edb371da1af2a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aac1c005730ef080488c3b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 31 09:04:38 2017 +0200 d3d11: Simplify d3d10_query_GetData(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index ef8e63c..d37cbde 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -334,11 +334,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d && data_size == sizeof(D3D10_QUERY_DATA_PIPELINE_STATISTICS)) { data_size = sizeof(D3D11_QUERY_DATA_PIPELINE_STATISTICS); - if (data) - { - d3d10_data_pointer = data; - data = &d3d11_data; - } + d3d10_data_pointer = data; + data = &d3d11_data; } wined3d_flags = wined3d_getdata_flags_from_d3d11_async_getdata_flags(flags);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: 1df6b56233814df8bcea4fd2c27bd36e6270b52c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1df6b56233814df8bcea4fd2c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Aug 31 18:02:35 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/fi.po b/po/fi.po index a2a8ea9..0e7ac93 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11962,17 +11962,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -11988,7 +11977,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, QUERY\n" +" ADD, DELETE, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -12117,25 +12106,19 @@ msgstr "(arvoa ei asetettu)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT tiedosto.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Tiedostoa '%1' ei löydy.\n" +msgstr "reg: Tiedostoa '%1' ei löydy.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" +msgstr "reg: Rekisteriavainta '%1' ei voida avata.\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Tuntematon merkintä [\\%1!c!]\n" +msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" #: regedit.rc:34 msgid "&Registry"

1 0

Fabian Maurer : comctl32/tests: Use proper size for combobox controls.
by Alexandre Julliard 31 Aug '17

31 Aug '17

Module: wine Branch: master Commit: fdcd2a74ebc1a9bfca478b9fbb3280d3effc4888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcd2a74ebc1a9bfca478b9fb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 31 17:47:43 2017 +0200 comctl32/tests: 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> --- dlls/comctl32/tests/rsrc.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 4f7a225..93e1244 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -98,6 +98,6 @@ IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON DIALOG 5, 43, 227, 215 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" { - COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 14, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 60, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 }

1 0

Vincent Povirk : gdiplus: Account for gdi transform in SOFTWARE_GdipFillRegion.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 399fd55f5c4e7668b286f92cf43253bf17deefdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=399fd55f5c4e7668b286f92cf… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Aug 30 12:32:17 2017 -0500 gdiplus: Account for gdi transform in SOFTWARE_GdipFillRegion. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 +++ dlls/gdiplus/graphics.c | 57 +++++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphics.c | 2 +- 3 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9980afc..6bb7f88 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -81,6 +81,8 @@ extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN; #define WineCoordinateSpaceGdiDevice ((GpCoordinateSpace)4) +extern GpStatus gdi_transform_acquire(GpGraphics *graphics); +extern GpStatus gdi_transform_release(GpGraphics *graphics); extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) DECLSPEC_HIDDEN; extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, @@ -258,6 +260,8 @@ struct GpGraphics{ struct list containers; GraphicsContainer contid; /* last-issued container ID */ INT origin_x, origin_y; + INT gdi_transform_acquire_count, gdi_transform_save; + GpMatrix gdi_transform; /* For giving the caller an HDC when we technically can't: */ HBITMAP temp_hbitmap; int temp_hbitmap_width; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3dbb457..7aa1dac 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2039,7 +2039,7 @@ static GpStatus restore_container(GpGraphics* graphics, return Ok; } -static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) +static GpStatus get_graphics_device_bounds(GpGraphics* graphics, GpRectF* rect) { RECT wnd_rect; GpStatus stat=Ok; @@ -2083,7 +2083,14 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) rect->Height = GetDeviceCaps(graphics->hdc, VERTRES); } - if (graphics->hdc) + return stat; +} + +static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) +{ + GpStatus stat = get_graphics_device_bounds(graphics, rect); + + if (stat == Ok && graphics->hdc) { GpPointF points[4], min_point, max_point; int i; @@ -4457,14 +4464,17 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, if (!brush_can_fill_pixels(brush)) return NotImplemented; - stat = get_graphics_bounds(graphics, &graphics_bounds); + stat = gdi_transform_acquire(graphics); + + if (stat == Ok) + stat = get_graphics_device_bounds(graphics, &graphics_bounds); if (stat == Ok) stat = GdipCloneRegion(region, &temp_region); if (stat == Ok) { - stat = get_graphics_transform(graphics, CoordinateSpaceDevice, + stat = get_graphics_transform(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, &world_to_device); if (stat == Ok) @@ -4482,6 +4492,7 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, if (stat == Ok && GetRgnBox(hregion, &bound_rect) == NULLREGION) { DeleteObject(hregion); + gdi_transform_release(graphics); return Ok; } @@ -4513,6 +4524,8 @@ static GpStatus SOFTWARE_GdipFillRegion(GpGraphics *graphics, GpBrush *brush, DeleteObject(hregion); } + gdi_transform_release(graphics); + return stat; } @@ -6586,10 +6599,46 @@ static void get_gdi_transform(GpGraphics *graphics, GpMatrix *matrix) return; } + if (graphics->gdi_transform_acquire_count) + { + *matrix = graphics->gdi_transform; + return; + } + GetTransform(graphics->hdc, 0x204, &xform); GdipSetMatrixElements(matrix, xform.eM11, xform.eM12, xform.eM21, xform.eM22, xform.eDx, xform.eDy); } +GpStatus gdi_transform_acquire(GpGraphics *graphics) +{ + if (graphics->gdi_transform_acquire_count == 0 && graphics->hdc) + { + get_gdi_transform(graphics, &graphics->gdi_transform); + graphics->gdi_transform_save = SaveDC(graphics->hdc); + SetGraphicsMode(graphics->hdc, GM_COMPATIBLE); + SetMapMode(graphics->hdc, MM_TEXT); + SetWindowOrgEx(graphics->hdc, 0, 0, NULL); + SetViewportOrgEx(graphics->hdc, 0, 0, NULL); + } + graphics->gdi_transform_acquire_count++; + return Ok; +} + +GpStatus gdi_transform_release(GpGraphics *graphics) +{ + if (graphics->gdi_transform_acquire_count <= 0) + { + ERR("called without matching gdi_transform_acquire"); + return GenericError; + } + if (graphics->gdi_transform_acquire_count == 1 && graphics->hdc) + { + RestoreDC(graphics->hdc, graphics->gdi_transform_save); + } + graphics->gdi_transform_acquire_count--; + return Ok; +} + GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpMatrix *matrix) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5f45cc2..5416ebc 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6361,7 +6361,7 @@ static void test_GdipFillRectanglesOnMemoryDCTextureBrush(void) color[4] = get_bitmap_pixel(width/2-1, height-1); color[5] = get_bitmap_pixel(width-1, height/2-1); } - todo_wine ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && + ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, "Expected GdipFillRectangleI take effect!\n" ); ReleaseBitmapPixelBuffer(pixel);

1 0

Marcus Meissner : kernel32/tests: Fixed size to GetTempPathW.
by Alexandre Julliard 30 Aug '17

30 Aug '17

Module: wine Branch: master Commit: 844b57e4d800bfb260c1694ed54a02b9f5ad1f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=844b57e4d800bfb260c1694ed… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Aug 30 19:59:47 2017 +0200 kernel32/tests: Fixed size to GetTempPathW. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index bfe94b9..108d0cb 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -971,7 +971,7 @@ static void test_AddDllDirectory(void) } buf[0] = '\0'; - GetTempPathW( sizeof(path), path ); + GetTempPathW( sizeof(path)/sizeof(path[0]), path ); GetTempFileNameW( path, tmpW, 0, buf ); SetLastError( 0xdeadbeef ); cookie = pAddDllDirectory( buf );

1 0

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

30 Aug '17

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 30 Aug '17

30 Aug '17

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

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

30 Aug '17

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

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

30 Aug '17

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