March 2012 - Wine-commits - list.winehq.org

Vincent Povirk : mscoree: Search for an arch-specific mono dll first.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: c110a55f12a0dae4fdff9fb3e861eb4eb8bc0380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c110a55f12a0dae4fdff9fb3e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 19 12:54:55 2012 -0500 mscoree: Search for an arch-specific mono dll first. --- dlls/mscoree/metahost.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e15a638..f915d73 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -564,6 +564,14 @@ HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **res return CLRRuntimeInfo_GetRuntimeHost(This, result); } +#ifdef __i386__ +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','.','d','l','l',0}; +#elif defined(__x86_64__) +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','_','6','4','.','d','l','l',0}; +#else +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; +#endif + static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; @@ -588,12 +596,19 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) else if (abi_version == 2) { strcpyW(dll_path, path); - strcatW(dll_path, mono2_dll); + strcatW(dll_path, libmono2_arch_dll); attributes = GetFileAttributesW(dll_path); if (attributes == INVALID_FILE_ATTRIBUTES) { strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + } + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); strcatW(dll_path, libmono2_dll); attributes = GetFileAttributesW(dll_path); }

1 0

Aric Stewart : usp10: Properly handle invalid arguments to ScriptBreak.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 5bb7590fadcba0d308870ddfa58fc43739a32112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bb7590fadcba0d308870ddfa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Mar 19 13:48:39 2012 -0500 usp10: Properly handle invalid arguments to ScriptBreak. --- dlls/usp10/tests/usp10.c | 13 +++++++++++++ dlls/usp10/usp10.c | 3 ++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8229755..0b5033b 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2798,6 +2798,19 @@ static void test_ScriptBreak(void) hr = ScriptItemize(test, 3, 4, NULL, NULL, items, NULL); ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + /* + * This Test crashes pre Vista. + + hr = ScriptBreak(test, 1, &items[0].a, NULL); + ok(hr == E_INVALIDARG, "ScriptBreak should return E_INVALIDARG not %08x\n", hr); + */ + + hr = ScriptBreak(test, 0, &items[0].a, &la); + ok(hr == E_FAIL || broken(hr == S_OK), "ScriptBreak should return E_FAIL not %08x\n", hr); + + hr = ScriptBreak(test, -1, &items[0].a, &la); + ok(hr == E_INVALIDARG || broken(hr == S_OK), "ScriptBreak should return E_INVALIDARG not %08x\n", hr); + memset(&la, 0, sizeof(la)); hr = ScriptBreak(test, 1, &items[0].a, &la); ok(!hr, "ScriptBreak should return S_OK not %08x\n", hr); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index cad234f..4d0d9f3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2665,7 +2665,8 @@ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS { TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); - if (!la) return S_FALSE; + if (count < 0 || !la) return E_INVALIDARG; + if (count == 0) return E_FAIL; BREAK_line(chars, count, sa, la);

1 0

Vincent Povirk : gdiplus: Detect hotkey prefixes when drawing strings.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: eef459968a480cb62c422cecb38f8844644779dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef459968a480cb62c422cecb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 21 12:50:11 2012 -0500 gdiplus: Detect hotkey prefixes when drawing strings. --- dlls/gdiplus/gdiplus_private.h | 3 +- dlls/gdiplus/graphics.c | 57 +++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/graphicspath.c | 6 +++- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 3cd01b4..24df3dd 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -424,7 +424,8 @@ struct GpRegion{ typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *user_data); + INT lineno, const RectF *bounds, INT *underlined_indexes, + INT underlined_index_count, void *user_data); GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index cbaf3ed..c5ac9d1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4686,6 +4686,11 @@ GpStatus gdip_format_string(HDC hdc, StringAlignment halign; GpStatus stat = Ok; SIZE size; + HotkeyPrefix hkprefix; + INT *hotkeyprefix_offsets=NULL; + INT hotkeyprefix_count=0; + INT hotkeyprefix_pos=0, hotkeyprefix_end_pos=0; + int seen_prefix=0; if(length == -1) length = lstrlenW(string); @@ -4698,11 +4703,40 @@ GpStatus gdip_format_string(HDC hdc, 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 + hkprefix = HotkeyPrefixNone; + + if (hkprefix == HotkeyPrefixShow) + { + for (i=0; i<length; i++) + { + if (string[i] == '&') + hotkeyprefix_count++; + } + } + + if (hotkeyprefix_count) + hotkeyprefix_offsets = GdipAlloc(sizeof(INT) * hotkeyprefix_count); + + hotkeyprefix_count = 0; + for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */ if(!isprintW(string[i]) && (string[i] != '\n')) continue; + if (seen_prefix && hkprefix == HotkeyPrefixShow && string[i] != '&') + hotkeyprefix_offsets[hotkeyprefix_count++] = j; + else if (!seen_prefix && hkprefix != HotkeyPrefixNone && string[i] == '&') + { + seen_prefix = 1; + continue; + } + + seen_prefix = 0; + stringdup[j] = string[i]; j++; } @@ -4777,8 +4811,14 @@ GpStatus gdip_format_string(HDC hdc, break; } + for (hotkeyprefix_end_pos=hotkeyprefix_pos; hotkeyprefix_end_pos<hotkeyprefix_count; hotkeyprefix_end_pos++) + if (hotkeyprefix_offsets[hotkeyprefix_end_pos] >= sum + lineend) + break; + stat = callback(hdc, stringdup, sum, lineend, - font, rect, format, lineno, &bounds, user_data); + font, rect, format, lineno, &bounds, + &hotkeyprefix_offsets[hotkeyprefix_pos], + hotkeyprefix_end_pos-hotkeyprefix_pos, user_data); if (stat != Ok) break; @@ -4787,6 +4827,8 @@ GpStatus gdip_format_string(HDC hdc, height += size.cy; lineno++; + hotkeyprefix_pos = hotkeyprefix_end_pos; + if(height > nheight) break; @@ -4796,6 +4838,7 @@ GpStatus gdip_format_string(HDC hdc, } GdipFree(stringdup); + GdipFree(hotkeyprefix_offsets); return stat; } @@ -4807,7 +4850,8 @@ struct measure_ranges_args { static GpStatus measure_ranges_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *user_data) + INT lineno, const RectF *bounds, INT *underlined_indexes, + INT underlined_index_count, void *user_data) { int i; GpStatus stat = Ok; @@ -4904,7 +4948,8 @@ struct measure_string_args { static GpStatus measure_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *user_data) + INT lineno, const RectF *bounds, INT *underlined_indexes, + INT underlined_index_count, void *user_data) { struct measure_string_args *args = user_data; @@ -4988,11 +5033,15 @@ struct draw_string_args { static GpStatus draw_string_callback(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *user_data) + INT lineno, const RectF *bounds, INT *underlined_indexes, + INT underlined_index_count, void *user_data) { struct draw_string_args *args = user_data; PointF position; + if (underlined_index_count) + FIXME("hotkey underlines not drawn yet\n"); + position.X = args->x + bounds->X / args->rel_width; position.Y = args->y + bounds->Y / args->rel_height + args->ascent; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 131477e..c41278c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -846,7 +846,8 @@ struct format_string_args static GpStatus format_string_callback(HDC dc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, - INT lineno, const RectF *bounds, void *priv) + INT lineno, const RectF *bounds, INT *underlined_indexes, + INT underlined_index_count, void *priv) { static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; struct format_string_args *args = priv; @@ -856,6 +857,9 @@ static GpStatus format_string_callback(HDC dc, float y = bounds->Y; int i; + if (underlined_index_count) + FIXME("hotkey underlines not drawn yet\n"); + for (i = index; i < length; ++i) { GLYPHMETRICS gm;

1 0

Vincent Povirk : gdiplus: Draw hotkey underlines in GdipDrawString.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 8a0b57a9a1d1611f0b00170841fc526e3344d6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0b57a9a1d1611f0b0017084… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 21 14:09:27 2012 -0500 gdiplus: Draw hotkey underlines in GdipDrawString. --- dlls/gdiplus/graphics.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c5ac9d1..89ed61b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5038,16 +5038,43 @@ static GpStatus draw_string_callback(HDC hdc, { struct draw_string_args *args = user_data; PointF position; - - if (underlined_index_count) - FIXME("hotkey underlines not drawn yet\n"); + GpStatus stat; position.X = args->x + bounds->X / args->rel_width; position.Y = args->y + bounds->Y / args->rel_height + args->ascent; - return GdipDrawDriverString(args->graphics, &string[index], length, font, + stat = GdipDrawDriverString(args->graphics, &string[index], length, font, args->brush, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); + + if (stat == Ok && underlined_index_count) + { + OUTLINETEXTMETRICW otm; + REAL underline_y, underline_height; + int i; + + GetOutlineTextMetricsW(hdc, sizeof(otm), &otm); + + underline_height = otm.otmsUnderscoreSize / args->rel_height; + underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2; + + for (i=0; i<underlined_index_count; i++) + { + REAL start_x, end_x; + SIZE text_size; + INT ofs = underlined_indexes[i] - index; + + GetTextExtentExPointW(hdc, string + index, ofs, INT_MAX, NULL, NULL, &text_size); + start_x = text_size.cx / args->rel_width; + + GetTextExtentExPointW(hdc, string + index, ofs+1, INT_MAX, NULL, NULL, &text_size); + end_x = text_size.cx / args->rel_width; + + GdipFillRectangle(args->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height); + } + } + + return stat; } GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string,

1 0

Vincent Povirk : gdiplus: Store copies of remap tables in ImageAttributes objects.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 673377a7b9979ec73b4c7d5ddf6dd3284d5b5b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=673377a7b9979ec73b4c7d5dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 21 15:29:25 2012 -0500 gdiplus: Store copies of remap tables in ImageAttributes objects. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/imageattributes.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 24df3dd..3b82b08 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -326,7 +326,7 @@ struct color_matrix{ struct color_remap_table{ BOOL enabled; INT mapsize; - GDIPCONST ColorMap *colormap; + ColorMap *colormap; }; struct GpImageAttributes{ diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index c157af3..bd5c082 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -62,11 +62,16 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) { + int i; + TRACE("(%p)\n", imageattr); if(!imageattr) return InvalidParameter; + for (i=0; i<ColorAdjustTypeCount; i++) + GdipFree(imageattr->colorremaptables[i].colormap); + GdipFree(imageattr); return Ok; @@ -205,6 +210,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt ColorAdjustType type, BOOL enableFlag, UINT mapSize, GDIPCONST ColorMap *map) { + ColorMap *new_map; + TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); if(!imageAttr || type >= ColorAdjustTypeCount) @@ -215,8 +222,22 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt if(!map || !mapSize) return InvalidParameter; + new_map = GdipAlloc(sizeof(*map) * mapSize); + + if (!new_map) + return OutOfMemory; + + memcpy(new_map, map, sizeof(*map) * mapSize); + + GdipFree(imageAttr->colorremaptables[type].colormap); + imageAttr->colorremaptables[type].mapsize = mapSize; - imageAttr->colorremaptables[type].colormap = map; + imageAttr->colorremaptables[type].colormap = new_map; + } + else + { + GdipFree(imageAttr->colorremaptables[type].colormap); + imageAttr->colorremaptables[type].colormap = NULL; } imageAttr->colorremaptables[type].enabled = enableFlag;

1 0

Hans Leidekker : msi: Get the UI level from the global variable instead of the property.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 9b2b760ea91708e021c4c78d378258267ee53289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2b760ea91708e021c4c78d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:02:06 2012 +0100 msi: Get the UI level from the global variable instead of the property. --- dlls/msi/action.c | 3 +-- dlls/msi/dialog.c | 3 +-- dlls/msi/media.c | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 16e2186..8abf456 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) static BOOL needs_ui_sequence(MSIPACKAGE *package) { - INT level = msi_get_property_int(package->db, szUILevel, 0); - return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; + return (gUILevel & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } UINT msi_set_context(MSIPACKAGE *package) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4e908ff..04a4a6b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3978,8 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; - if ( (msi_get_property_int( package->db, szUILevel, 0 ) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE ) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; if ( !error_dialog ) { diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0199178..dd5ecd6 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -77,9 +77,8 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ((msi_get_property_int(package->db, szUILevel, 0) & INSTALLUILEVEL_MASK) == - INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && + !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS; error = msi_build_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package->db, error_prop);

1 0

Hans Leidekker : msi: Mask off modifiers before setting the UILevel property.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 280af52666f66fc8185f9c482d254783550e87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280af52666f66fc8185f9c482… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:02:54 2012 +0100 msi: Mask off modifiers before setting the UILevel property. Spotted by Aric Stewart. --- dlls/msi/package.c | 6 +++--- dlls/msi/tests/package.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 25d00b4..43c6ff9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1154,9 +1154,9 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { - static const WCHAR szpi[] = {'%','i',0}; + static const WCHAR fmtW[] = {'%','u',0}; MSIPACKAGE *package; - WCHAR uilevel[10]; + WCHAR uilevel[11]; UINT r; TRACE("%p\n", db); @@ -1181,7 +1181,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) set_installed_prop( package ); set_installer_properties( package ); - sprintfW(uilevel,szpi,gUILevel); + sprintfW( uilevel, fmtW, gUILevel & INSTALLUILEVEL_MASK ); msi_set_property(package->db, szUILevel, uilevel); r = msi_load_summary_properties( package ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9808dfa..5a2ce9e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10031,6 +10031,7 @@ static void test_installprops(void) UINT r; REGSAM access = KEY_ALL_ACCESS; SYSTEM_INFO si; + INSTALLUILEVEL uilevel; if (is_wow64) access |= KEY_WOW64_64KEY; @@ -10039,6 +10040,8 @@ static void test_installprops(void) lstrcat(path, "\\"); lstrcat(path, msifile); + uilevel = MsiSetInternalUI(INSTALLUILEVEL_BASIC|INSTALLUILEVEL_SOURCERESONLY, NULL); + hdb = create_package_db(); ok( hdb, "failed to create database\n"); @@ -10046,6 +10049,7 @@ static void test_installprops(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); + MsiSetInternalUI(uilevel, NULL); DeleteFile(msifile); return; } @@ -10053,6 +10057,21 @@ static void test_installprops(void) MsiCloseHandle(hdb); + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "DATABASE", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10071,6 +10090,7 @@ static void test_installprops(void) RegQueryValueEx(hkey2, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "USERNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10088,37 +10108,44 @@ static void test_installprops(void) if (*path) { + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionDatabase = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionMsi", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionMsi = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Date", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Date = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Time", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Time = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "PackageCode", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ComputerName", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10127,18 +10154,21 @@ static void test_installprops(void) langid = GetUserDefaultLangID(); sprintf(path, "%d", langid); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); res = GetSystemMetrics(SM_CXSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenX", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); res = GetSystemMetrics(SM_CYSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenY", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10350,6 +10380,7 @@ static void test_installprops(void) CloseHandle(hkey2); MsiCloseHandle(hpkg); DeleteFile(msifile); + MsiSetInternalUI(uilevel, NULL); } static void test_launchconditions(void)

1 0

Michael Stefaniuc : d3d10core: Standardize COM aggregation for d3d10_device .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b01ce6b633dfaad9227b7fc4e707ffff1a01b953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01ce6b633dfaad9227b7fc4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 22 17:18:47 2012 +0100 d3d10core: Standardize COM aggregation for d3d10_device. --- dlls/d3d10core/d3d10core_main.c | 2 +- dlls/d3d10core/d3d10core_private.h | 4 +- dlls/d3d10core/device.c | 65 ++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 9d0c5d7..e977afa 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -82,7 +82,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba object = *layer_base; d3d10_device_init(object, device_object); - *device_layer = &object->inner_unknown_vtbl; + *device_layer = &object->IUnknown_inner; TRACE("Created d3d10 device at %p\n", object); diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 21e2e95..d99a337 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -69,10 +69,10 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* IDirect3D10Device */ struct d3d10_device { + IUnknown IUnknown_inner; ID3D10Device ID3D10Device_iface; - const struct IUnknownVtbl *inner_unknown_vtbl; IWineDXGIDeviceParent IWineDXGIDeviceParent_iface; - IUnknown *outer_unknown; + IUnknown *outer_unk; LONG refcount; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 7ca4409..cf21bba 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -26,41 +26,36 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); /* Inner IUnknown methods */ -static inline struct d3d10_device *d3d10_device_from_inner_unknown(IUnknown *iface) +static inline struct d3d10_device *impl_from_IUnknown(IUnknown *iface) { - return (struct d3d10_device *)((char*)iface - FIELD_OFFSET(struct d3d10_device, inner_unknown_vtbl)); + return CONTAINING_RECORD(iface, struct d3d10_device, IUnknown_inner); } -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, + void **ppv) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, ppv %p\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_ID3D10Device)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3D10Device)) + *ppv = &This->ID3D10Device_iface; + else if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) + *ppv = &This->IWineDXGIDeviceParent_iface; + else { - ID3D10Device_AddRef(&This->ID3D10Device_iface); - *object = This; - return S_OK; + WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; } - if (IsEqualGUID(riid, &IID_IWineDXGIDeviceParent)) - { - IWineDXGIDeviceParent_AddRef(&This->IWineDXGIDeviceParent_iface); - *object = &This->IWineDXGIDeviceParent_iface; - return S_OK; - } - - WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - - *object = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -70,7 +65,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) { - struct d3d10_device *This = d3d10_device_from_inner_unknown(iface); + struct d3d10_device *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -92,25 +87,22 @@ static inline struct d3d10_device *impl_from_ID3D10Device(ID3D10Device *iface) } static HRESULT STDMETHODCALLTYPE d3d10_device_QueryInterface(ID3D10Device *iface, REFIID riid, - void **object) + void **ppv) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_QueryInterface(This->outer_unknown, riid, object); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE d3d10_device_AddRef(ID3D10Device *iface) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_AddRef(This->outer_unknown); + return IUnknown_AddRef(This->outer_unk); } static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_Release(This->outer_unknown); + return IUnknown_Release(This->outer_unk); } /* ID3D10Device methods */ @@ -1306,22 +1298,22 @@ static inline struct d3d10_device *device_from_dxgi_device_parent(IWineDXGIDevic } static HRESULT STDMETHODCALLTYPE dxgi_device_parent_QueryInterface(IWineDXGIDeviceParent *iface, - REFIID riid, void **object) + REFIID riid, void **ppv) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_QueryInterface(&device->ID3D10Device_iface, riid, object); + return IUnknown_QueryInterface(device->outer_unk, riid, ppv); } static ULONG STDMETHODCALLTYPE dxgi_device_parent_AddRef(IWineDXGIDeviceParent *iface) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_AddRef(&device->ID3D10Device_iface); + return IUnknown_AddRef(device->outer_unk); } static ULONG STDMETHODCALLTYPE dxgi_device_parent_Release(IWineDXGIDeviceParent *iface) { struct d3d10_device *device = device_from_dxgi_device_parent(iface); - return d3d10_device_Release(&device->ID3D10Device_iface); + return IUnknown_Release(device->outer_unk); } static struct wined3d_device_parent * STDMETHODCALLTYPE dxgi_device_parent_get_wined3d_device_parent( @@ -1554,9 +1546,10 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = void d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; - device->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl; + device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d10_dxgi_device_parent_vtbl; device->device_parent.ops = &d3d10_wined3d_device_parent_ops; device->refcount = 1; - device->outer_unknown = outer_unknown; + /* COM aggregation always takes place */ + device->outer_unk = outer_unknown; }

1 0

Lucas Zawacki : dinput: Correct wrong loop delimiter in diactionformat_priority.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 146176cc3802e837cad011aaf7e0414cad57694c URL: http://source.winehq.org/git/wine.git/?a=commit;h=146176cc3802e837cad011aaf… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Sat Mar 24 18:47:47 2012 -0300 dinput: Correct wrong loop delimiter in diactionformat_priority. --- dlls/dinput/dinput_main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6350a18..46b7e08 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -308,32 +308,32 @@ void _copy_diactionformatWtoA(LPDIACTIONFORMATA to, LPDIACTIONFORMATW from) } } -/* _diactionformat_priority +/* diactionformat_priority * * Given a DIACTIONFORMAT structure and a DI genre, returns the enumeration * priority. Joysticks should pass the game genre, and mouse or keyboard their * respective DI*_MASK */ -static DWORD _diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre) +static DWORD diactionformat_priorityA(LPDIACTIONFORMATA lpdiaf, DWORD genre) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwActionSize; i++) + for(i=0; i < lpdiaf->dwNumActions; i++) if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; return priorityFlags; } -static DWORD _diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) +static DWORD diactionformat_priorityW(LPDIACTIONFORMATW lpdiaf, DWORD genre) { int i; DWORD priorityFlags = 0; /* If there's at least one action for the device it's priority 1 */ - for(i=0; i < lpdiaf->dwActionSize; i++) + for(i=0; i < lpdiaf->dwNumActions; i++) if ((lpdiaf->rgoAction[i].dwSemantic & genre) == genre) priorityFlags |= DIEDBS_MAPPEDPRI1; @@ -913,7 +913,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = _diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); + callbackFlags = diactionformat_priorityA(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = _diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); + callbackFlags = diactionformat_priorityA(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); @@ -973,7 +973,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( { TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); - callbackFlags = _diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); + callbackFlags = diactionformat_priorityW(lpdiActionFormat, lpdiActionFormat->dwGenre); /* Default behavior is to enumerate attached game controllers */ enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); if (enumSuccess) @@ -991,7 +991,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - callbackFlags = _diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); + callbackFlags = diactionformat_priorityW(lpdiActionFormat, actionMasks[i]); IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi);

1 0

Józef Kucia : dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 42235c3cc9dc34bce5e54fbbef0a7a379baf8890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42235c3cc9dc34bce5e54fbbe… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:48:37 2012 +0200 dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number. --- dlls/dinput8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 7fbdfaa..2deb348 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -271,7 +271,7 @@ static void test_action_mapping(void) DIACTIONFORMAT af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; - hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION || hr == REGDB_E_CLASSNOTREG)

1 0