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

Rico Schüller : d3dx9: Improve is_valid_constant().
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: 12788436430dcf5ba6a89f0505be16c016abf52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12788436430dcf5ba6a89f050… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:58 2012 +0200 d3dx9: Improve is_valid_constant(). --- dlls/d3dx9_36/shader.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 69bb40e..c761aef 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -690,6 +690,28 @@ static inline D3DXHANDLE handle_from_constant(struct ctab_constant *constant) return (D3DXHANDLE)constant; } +static struct ctab_constant *is_valid_sub_constant(struct ctab_constant *parent, struct ctab_constant *constant) +{ + UINT i, count; + + /* all variable have at least elements = 1, but no elements */ + if (!parent->constants) return NULL; + + if (parent->desc.Elements > 1) count = parent->desc.Elements; + else count = parent->desc.StructMembers; + + for (i = 0; i < count; ++i) + { + if (&parent->constants[i] == constant) + return constant; + + if (is_valid_sub_constant(&parent->constants[i], constant)) + return constant; + } + + return NULL; +} + static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableImpl *table, D3DXHANDLE handle) { struct ctab_constant *c = constant_from_handle(handle); @@ -699,7 +721,11 @@ static inline struct ctab_constant *is_valid_constant(struct ID3DXConstantTableI for (i = 0; i < table->desc.Constants; ++i) { - if (&table->constants[i] == c) return c; + if (&table->constants[i] == c) + return c; + + if (is_valid_sub_constant(&table->constants[i], c)) + return c; } return NULL;

1 0

Rico Schüller : d3dx9: Parse structs and sub constants in ID3DXConstantTable.
by Alexandre Julliard Aug. 24, 2012

Aug. 24, 2012

Module: wine Branch: master Commit: b565e8fb4fd33c614088ad21f001a913177c2534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b565e8fb4fd33c614088ad21f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 23 21:36:50 2012 +0200 d3dx9: Parse structs and sub constants in ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 152 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 130 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 02727fd..69bb40e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -618,7 +618,7 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, struct ctab_constant { D3DXCONSTANT_DESC desc; - struct ctab_constant *members; + struct ctab_constant *constants; }; static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl; @@ -632,9 +632,32 @@ struct ID3DXConstantTableImpl { struct ctab_constant *constants; }; +static void free_constant(struct ctab_constant *constant) +{ + if (constant->constants) + { + UINT i, count = constant->desc.Elements > 1 ? constant->desc.Elements : constant->desc.StructMembers; + + for (i = 0; i < count; ++i) + { + free_constant(&constant->constants[i]); + } + HeapFree(GetProcessHeap(), 0, constant->constants); + } +} + static void free_constant_table(struct ID3DXConstantTableImpl *table) { - HeapFree(GetProcessHeap(), 0, table->constants); + if (table->constants) + { + UINT i; + + for (i = 0; i < table->desc.Constants; ++i) + { + free_constant(&table->constants[i]); + } + HeapFree(GetProcessHeap(), 0, table->constants); + } HeapFree(GetProcessHeap(), 0, table->ctab); } @@ -1426,27 +1449,117 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_SetMatrixTransposePointerArray }; -static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, struct ctab_constant *constant) +static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, struct ctab_constant *constant, + BOOL is_element, WORD index, WORD max, DWORD *offset, DWORD nameoffset, UINT regset) { + const D3DXSHADER_TYPEINFO *type = (LPD3DXSHADER_TYPEINFO)(ctab + typeoffset); + const D3DXSHADER_STRUCTMEMBERINFO *memberinfo = NULL; + HRESULT hr = D3D_OK; + UINT i, count = 0; + WORD size = 0; + + constant->desc.DefaultValue = offset ? ctab + *offset : NULL; constant->desc.Class = type->Class; constant->desc.Type = type->Type; constant->desc.Rows = type->Rows; constant->desc.Columns = type->Columns; - constant->desc.Elements = type->Elements; + constant->desc.Elements = is_element ? 1 : type->Elements; constant->desc.StructMembers = type->StructMembers; - constant->desc.Bytes = calc_bytes(&constant->desc); + constant->desc.Name = ctab + nameoffset; + constant->desc.RegisterSet = regset; + constant->desc.RegisterIndex = index; - TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", - constant->desc.Class, constant->desc.Type, constant->desc.Rows, - constant->desc.Columns, constant->desc.Elements, constant->desc.StructMembers); + TRACE("name %s, elements %u, index %u, defaultvalue %p\n", constant->desc.Name, + constant->desc.Elements, index, constant->desc.DefaultValue); + TRACE("class %d, type %d, rows %d, columns %d, elements %d, struct_members %d\n", + type->Class, type->Type, type->Rows, type->Columns, type->Elements, type->StructMembers); - if ((constant->desc.Class == D3DXPC_STRUCT) && constant->desc.StructMembers) + if (type->Elements > 1 && !is_element) + { + count = type->Elements; + } + else if ((type->Class == D3DXPC_STRUCT) && type->StructMembers) { - FIXME("Struct not supported yet\n"); - return E_NOTIMPL; + memberinfo = (D3DXSHADER_STRUCTMEMBERINFO*)(ctab + type->StructMemberInfo); + count = type->StructMembers; } + if (count) + { + WORD size_element = 0; + + constant->constants = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*constant->constants) * count); + if (!constant->constants) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto error; + } + + for (i = 0; i < count; ++i) + { + hr = parse_ctab_constant_type(ctab, memberinfo ? memberinfo[i].TypeInfo : typeoffset, + &constant->constants[i], memberinfo == NULL, index + size, max, offset, + memberinfo ? memberinfo[i].Name : nameoffset, regset); + if (hr != D3D_OK) + goto error; + + if (i == 0) size_element = constant->constants[i].desc.RegisterCount; + size += size_element; + } + } + else + { + WORD offsetdiff = 0; + + switch (type->Class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + offsetdiff = 1; + size = 1; + break; + + case D3DXPC_MATRIX_ROWS: + size = is_element ? type->Rows : max(type->Rows, type->Columns); + offsetdiff = type->Rows; + break; + + case D3DXPC_MATRIX_COLUMNS: + size = type->Columns; + offsetdiff = type->Columns; + break; + + case D3DXPC_OBJECT: + size = 1; + break; + + default: + FIXME("Unhandled type class %u\n", type->Class); + break; + } + + /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ + if (offset) *offset += offsetdiff * 4 * 4; + } + + constant->desc.RegisterCount = max(0, min(max - index, size)); + constant->desc.Bytes = calc_bytes(&constant->desc); + return D3D_OK; + +error: + if (constant->constants) + { + for (i = 0; i < count; ++i) + { + free_constant(&constant->constants[i]); + } + HeapFree(GetProcessHeap(), 0, constant->constants); + constant->constants = NULL; + } + + return hr; } HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, @@ -1537,16 +1650,12 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, constant_info = (LPD3DXSHADER_CONSTANTINFO)(object->ctab + ctab_header->ConstantInfo); for (i = 0; i < ctab_header->Constants; i++) { - TRACE("name = %s\n", object->ctab + constant_info[i].Name); - object->constants[i].desc.Name = object->ctab + constant_info[i].Name; - object->constants[i].desc.RegisterSet = constant_info[i].RegisterSet; - object->constants[i].desc.RegisterIndex = constant_info[i].RegisterIndex; - object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; - object->constants[i].desc.DefaultValue = constant_info[i].DefaultValue - ? object->ctab + constant_info[i].DefaultValue : NULL; - - hr = parse_ctab_constant_type((LPD3DXSHADER_TYPEINFO)(object->ctab + constant_info[i].TypeInfo), - &object->constants[i]); + DWORD offset = constant_info[i].DefaultValue; + + hr = parse_ctab_constant_type(object->ctab, constant_info[i].TypeInfo, + &object->constants[i], FALSE, constant_info[i].RegisterIndex, + constant_info[i].RegisterIndex + constant_info[i].RegisterCount, + offset ? &offset : NULL, constant_info[i].Name, constant_info[i].RegisterSet); if (hr != D3D_OK) goto error; } @@ -1556,7 +1665,6 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD *byte_code, return D3D_OK; error: - free_constant_table(object); HeapFree(GetProcessHeap(), 0, object);

1 0

Jérôme Gardou : opengl32/tests: Do not pass NULL attrib list to wglCreatePBufferARB.
by Alexandre Julliard Aug. 23, 2012

Aug. 23, 2012

Module: wine Branch: master Commit: dbf1c836323fda85888e1bd0280e2bd29c68b986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf1c836323fda85888e1bd02… Author: Jérôme Gardou <jerome.gardou(a)reactos.org> Date: Wed Aug 22 10:18:14 2012 +0200 opengl32/tests: Do not pass NULL attrib list to wglCreatePBufferARB. --- dlls/opengl32/tests/opengl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8e3d729..4f799d2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -197,7 +197,8 @@ static void test_pbuffers(HDC hdc) if(iPixelFormat != 0) { HDC pbuffer_hdc; - HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); + int attrib = 0; + HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, &attrib); if(!pbuffer) skip("Pbuffer creation failed!\n");

1 0

Alexandre Julliard : opengl32: Generate null driver entry points for all extension functions.
by Alexandre Julliard Aug. 23, 2012

Aug. 23, 2012

Module: wine Branch: master Commit: 2c54f8c12c8321b68999e2d8b3fb08cd7bc15610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c54f8c12c8321b68999e2d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 21:23:09 2012 +0200 opengl32: Generate null driver entry points for all extension functions. --- dlls/opengl32/make_opengl | 13 +- dlls/opengl32/opengl_norm.c | 4513 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 4518 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c54f8c12c8321b68999e…

1 0

Alexandre Julliard : configure: Only enable -gdwarf-2 if -g was specified.
by Alexandre Julliard Aug. 23, 2012

Aug. 23, 2012

Module: wine Branch: master Commit: ce48e2c8ab4537fb57e4416d03f6fdd0685262b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce48e2c8ab4537fb57e4416d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:28:41 2012 +0200 configure: Only enable -gdwarf-2 if -g was specified. --- configure | 11 ++++++++--- configure.ac | 10 ++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure b/configure index d067b54..29b50e8 100755 --- a/configure +++ b/configure @@ -12287,7 +12287,10 @@ $as_echo "$ac_cv_cflags__Wwrite_strings" >&6; } if test $ac_cv_cflags__Wwrite_strings = yes; then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 + + for ac_flag in $CFLAGS; do + case $ac_flag in + -g) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gdwarf-2" >&5 $as_echo_n "checking whether the compiler supports -gdwarf-2... " >&6; } if ${ac_cv_cflags__gdwarf_2+:} false; then : $as_echo_n "(cached) " >&6 @@ -12312,7 +12315,7 @@ $as_echo "$ac_cv_cflags__gdwarf_2" >&6; } if test $ac_cv_cflags__gdwarf_2 = yes; then : EXTRACFLAGS="$EXTRACFLAGS -gdwarf-2" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -gstrict-dwarf" >&5 $as_echo_n "checking whether the compiler supports -gstrict-dwarf... " >&6; } if ${ac_cv_cflags__gstrict_dwarf+:} false; then : $as_echo_n "(cached) " >&6 @@ -12336,7 +12339,9 @@ fi $as_echo "$ac_cv_cflags__gstrict_dwarf" >&6; } if test $ac_cv_cflags__gstrict_dwarf = yes; then : EXTRACFLAGS="$EXTRACFLAGS -gstrict-dwarf" -fi +fi ;; + esac + done case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 15ada86..a6be56f 100644 --- a/configure.ac +++ b/configure.ac @@ -1748,8 +1748,14 @@ then WINE_TRY_CFLAGS([-Wtype-limits]) WINE_TRY_CFLAGS([-Wunused-but-set-parameter]) WINE_TRY_CFLAGS([-Wwrite-strings]) - WINE_TRY_CFLAGS([-gdwarf-2]) - WINE_TRY_CFLAGS([-gstrict-dwarf]) + + dnl Default to dwarf-2 debug info + for ac_flag in $CFLAGS; do + case $ac_flag in + -g) WINE_TRY_CFLAGS([-gdwarf-2]) + WINE_TRY_CFLAGS([-gstrict-dwarf]) ;; + esac + done dnl gcc-4.6+ omits frame pointers by default, breaking some copy protections case $host_cpu in

1 0

Dmitry Timoshkov : gdiplus: Clarify in the tests where 1/ 3 of extra text height comes from.
by Alexandre Julliard Aug. 23, 2012

Aug. 23, 2012

Module: wine Branch: master Commit: e6c77a7c7a98e819d81aa91b30a0e66a068653cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c77a7c7a98e819d81aa91b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 15:27:35 2012 +0900 gdiplus: Clarify in the tests where 1/3 of extra text height comes from. --- dlls/gdiplus/tests/graphics.c | 39 ++++++++++----------------------------- 1 files changed, 10 insertions(+), 29 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6765bce..913d895 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3483,24 +3483,15 @@ static void test_GdipMeasureString(void) REAL base_cx = 0, base_cy = 0, height; INT chars, lines; LOGFONTW lf; - HDC display; - UINT i, font_dpi; - REAL font_to_pixel_scale, font_size; + UINT i; + REAL font_size; GpUnit font_unit, unit; - display = CreateCompatibleDC(0); - ok(display != 0, "CreateCompatibleDC failed\n"); - font_dpi = GetDeviceCaps(display, LOGPIXELSY); - DeleteDC(display); - status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, status); status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); - font_to_pixel_scale = units_scale(UnitPoint, UnitPixel, font_dpi); - trace("font to pixel, %u dpi => unit_scale %f\n", font_dpi, font_to_pixel_scale); - /* font size in pixels */ status = GdipCreateFont(family, 100.0, FontStyleRegular, UnitPixel, &font); expect(Ok, status); @@ -3524,7 +3515,7 @@ static void test_GdipMeasureString(void) ok(-lf.lfHeight == (LONG)(height + 0.5), "%u: expected %d (%f), got %d\n", i, (LONG)(height + 0.5), height, lf.lfHeight); - height = font_size * font_to_pixel_scale; + height = font_size + 2.0 * font_size / 6.0; set_rect_empty(&rc); set_rect_empty(&bounds); @@ -3571,7 +3562,8 @@ static void test_GdipMeasureString(void) for (unit = 3; unit <= 6; unit++) { /* create a font which final height is 100.0 pixels with 200 dpi device */ - height = pixels_to_units(100.0 / font_to_pixel_scale, unit, 200.0); + /* height + 2 * (height/6) = 100 => height = 100 * 3 / 4 => 75 */ + height = pixels_to_units(75.0, unit, 200.0); status = GdipCreateFont(family, height, FontStyleRegular, unit, &font); expect(Ok, status); status = GdipGetFontSize(font, &font_size); @@ -3603,7 +3595,7 @@ static void test_GdipMeasureString(void) else unit_scale = units_scale(font_unit, td[i].unit, td[i].res_y); /*trace("%u: %d to %d, %.1f dpi => unit_scale %f\n", i, font_unit, td[i].unit, td[i].res_y, unit_scale);*/ - height = font_size * font_to_pixel_scale * unit_scale; + height = (font_size + 2.0 * font_size / 6.0) * unit_scale; if (td[i].unit != UnitDisplay) height /= td[i].page_scale; /*trace("%u: %.1f font units = %f units with %.1f dpi, page_scale %.1f\n", i, font_size, height, td[i].res_y, td[i].page_scale);*/ @@ -3758,23 +3750,12 @@ static void test_font_height_scaling(void) differs in behaviour */ for (font_unit = 3; font_unit <= 6; font_unit++) { - /* There is a bug somewhere in native gdiplus that leads - * to extra conversion from points to pixels, so in order - * to get a 100 pixel text height it's needed to convert - * 100 pixels to points, and only then convert the result - * to desired units. The scale factor is 1.333333 at 96 dpi! - * Perhaps an implementor took name of GdipTransformPoints - * directly and assumed that it takes value in *points*? - */ - status = GdipSetPageUnit(graphics, UnitPoint); - expect(Ok, status); - ptf.X = 0; - ptf.Y = 100.0; - status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); - expect(Ok, status); - /*trace("100.0 pixels, %.1f dpi => %f points\n", dpi, ptf.Y);*/ + /* create a font for the final text height of 100 pixels */ + /* height + 2 * (height/6) = 100 => height = 100 * 3 / 4 => 75 */ status = GdipSetPageUnit(graphics, font_unit); expect(Ok, status); + ptf.X = 0; + ptf.Y = 75.0; status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); expect(Ok, status); height = ptf.Y;

1 0

Dmitry Timoshkov : gdiplus: Filter tabs out until they are properly supported using stringformat.
by Alexandre Julliard Aug. 23, 2012

Aug. 23, 2012

Module: wine Branch: master Commit: 144a692ffa4fb73eb3e526c832f598cf373bc362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=144a692ffa4fb73eb3e526c83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 10:24:22 2012 +0900 gdiplus: Filter tabs out until they are properly supported using stringformat. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9a9f092..5e76927 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4755,6 +4755,10 @@ GpStatus gdip_format_string(HDC hdc, if(!isprintW(string[i]) && (string[i] != '\n')) continue; + /* FIXME: tabs should be handled using tabstops from stringformat */ + if (string[i] == '\t') + continue; + if (seen_prefix && hkprefix == HotkeyPrefixShow && string[i] != '&') hotkeyprefix_offsets[hotkeyprefix_count++] = j; else if (!seen_prefix && hkprefix != HotkeyPrefixNone && string[i] == '&')

1 0

Francois Gouget : po: A spelling fix in the French translation.
by Alexandre Julliard Aug. 22, 2012

Aug. 22, 2012

Module: wine Branch: master Commit: 58d2d0898cd48f1145c0ea2305a28711f283c176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d2d0898cd48f1145c0ea230… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 22 09:12:52 2012 +0200 po: A spelling fix in the French translation. --- po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/fr.po b/po/fr.po index dbbb10a..934139e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13826,7 +13826,7 @@ msgstr "Erreur : ligne de commande invalide\n" #: wmic.rc:26 msgid "Error: Alias not found\n" -msgstr "Erreur : alias no trouvé\n" +msgstr "Erreur : alias non trouvé\n" #: wmic.rc:27 msgid "Error: Invalid query\n"

1 0

Piotr Caban : user32: Don' t limit time needed for WM_DDE_INITIATE processing.
by Alexandre Julliard Aug. 22, 2012

Aug. 22, 2012

Module: wine Branch: master Commit: d2e846f3d4c77f8e2cf4c1becf57ce9a0747641f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e846f3d4c77f8e2cf4c1bec… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 22 10:12:19 2012 +0200 user32: Don't limit time needed for WM_DDE_INITIATE processing. --- dlls/user32/dde_client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_client.c b/dlls/user32/dde_client.c index 90fa4db..91e1549 100644 --- a/dlls/user32/dde_client.c +++ b/dlls/user32/dde_client.c @@ -175,7 +175,7 @@ HCONV WINAPI DdeConnect(DWORD idInst, HSZ hszService, HSZ hszTopic, /* note: sent messages shall not use packing */ SendMessageTimeoutW( HWND_BROADCAST, WM_DDE_INITIATE, (WPARAM)hwndClient, MAKELPARAM(aSrv, aTpc), - SMTO_ABORTIFHUNG, 2000, NULL ); + SMTO_ABORTIFHUNG, 0, NULL ); pInstance = WDML_GetInstance(idInst); if (!pInstance)

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges shouldn' t treat empty layout rectangle as infinite bounds.
by Alexandre Julliard Aug. 22, 2012

Aug. 22, 2012

Module: wine Branch: master Commit: 1418cd796cf00636db3e75df25645e235a1a845d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1418cd796cf00636db3e75df2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 15:34:38 2012 +0900 gdiplus: GdipMeasureCharacterRanges shouldn't treat empty layout rectangle as infinite bounds. --- dlls/gdiplus/graphics.c | 9 ++++++--- dlls/gdiplus/tests/graphics.c | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 28fc570..785c44e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4731,9 +4731,6 @@ GpStatus gdip_format_string(HDC hdc, nwidth = rect->Width; nheight = rect->Height; - if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; - if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX; - if (format) hkprefix = format->hkprefix; else @@ -5064,6 +5061,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; + if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + bounds->X = rect->X; bounds->Y = rect->Y; bounds->Width = 0.0; @@ -5214,6 +5214,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; + if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (gdip_round(scaled_rect.Width) != 0 && gdip_round(scaled_rect.Height) != 0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c95bf11..b3509a2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3140,11 +3140,8 @@ static void test_string_functions(void) expect(Ok, status); } -todo_wine ok(region_isempty[0], "region should be empty\n"); -todo_wine ok(region_isempty[1], "region should be empty\n"); -todo_wine ok(region_isempty[2], "region should be empty\n"); ok(region_isempty[3], "region should be empty\n");

1 0