November 2011 - Wine-commits

Alexandre Julliard : winex11: Don' t allocate the glyph cache without Xrender, and cleanup initialization.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 9efb9d480d9b720a7a34353b9ecc2e17e5c646fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9efb9d480d9b720a7a34353b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 20:44:26 2011 +0100 winex11: Don't allocate the glyph cache without Xrender, and cleanup initialization. --- dlls/winex11.drv/x11drv_main.c | 3 +- dlls/winex11.drv/xrender.c | 118 ++++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 66 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 8e2082d..ca03083 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -632,8 +632,7 @@ static void process_detach(void) /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup(); #endif - if(using_client_side_fonts) - X11DRV_XRender_Finalize(); + X11DRV_XRender_Finalize(); /* cleanup GDI */ X11DRV_GDI_Finalize(); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a1b0581..f6b19ba 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -44,6 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xrender); #ifdef SONAME_LIBXRENDER +WINE_DECLARE_DEBUG_CHANNEL(winediag); + static BOOL X11DRV_XRender_Installed = FALSE; #include <X11/Xlib.h> @@ -359,51 +361,51 @@ const struct gdi_dc_funcs *X11DRV_XRender_Init(void) { int event_base, i; - if (client_side_with_render && - (xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) - { - -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) goto sym_not_found; -LOAD_FUNCPTR(XRenderAddGlyphs) -LOAD_FUNCPTR(XRenderComposite) -LOAD_FUNCPTR(XRenderCompositeText16) -LOAD_FUNCPTR(XRenderCreateGlyphSet) -LOAD_FUNCPTR(XRenderCreatePicture) -LOAD_FUNCPTR(XRenderFillRectangle) -LOAD_FUNCPTR(XRenderFindFormat) -LOAD_FUNCPTR(XRenderFindVisualFormat) -LOAD_FUNCPTR(XRenderFreeGlyphSet) -LOAD_FUNCPTR(XRenderFreePicture) -LOAD_FUNCPTR(XRenderSetPictureClipRectangles) -LOAD_FUNCPTR(XRenderQueryExtension) + using_client_side_fonts = client_side_with_render || client_side_with_core; + + if (!client_side_with_render) return NULL; + if (!(xrender_handle = wine_dlopen(SONAME_LIBXRENDER, RTLD_NOW, NULL, 0))) return NULL; + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(xrender_handle, #f, NULL, 0)) == NULL) return NULL + LOAD_FUNCPTR(XRenderAddGlyphs); + LOAD_FUNCPTR(XRenderComposite); + LOAD_FUNCPTR(XRenderCompositeText16); + LOAD_FUNCPTR(XRenderCreateGlyphSet); + LOAD_FUNCPTR(XRenderCreatePicture); + LOAD_FUNCPTR(XRenderFillRectangle); + LOAD_FUNCPTR(XRenderFindFormat); + LOAD_FUNCPTR(XRenderFindVisualFormat); + LOAD_FUNCPTR(XRenderFreeGlyphSet); + LOAD_FUNCPTR(XRenderFreePicture); + LOAD_FUNCPTR(XRenderSetPictureClipRectangles); + LOAD_FUNCPTR(XRenderQueryExtension); #undef LOAD_FUNCPTR #ifdef HAVE_XRENDERSETPICTURETRANSFORM -#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0); -LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) +#define LOAD_OPTIONAL_FUNCPTR(f) p##f = wine_dlsym(xrender_handle, #f, NULL, 0) + LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform); #undef LOAD_OPTIONAL_FUNCPTR #endif - wine_tsx11_lock(); - X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); - wine_tsx11_unlock(); - if(X11DRV_XRender_Installed) { - TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); - if(!load_xrender_formats()) /* This fails in buggy versions of libXrender.so */ - { - wine_tsx11_unlock(); - WINE_MESSAGE( - "Wine has detected that you probably have a buggy version\n" - "of libXrender.so . Because of this client side font rendering\n" - "will be disabled. Please upgrade this library.\n"); - X11DRV_XRender_Installed = FALSE; - return NULL; - } + wine_tsx11_lock(); + X11DRV_XRender_Installed = pXRenderQueryExtension(gdi_display, &event_base, &xrender_error_base); + wine_tsx11_unlock(); + if (!X11DRV_XRender_Installed) return NULL; - if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) { - WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); - X11DRV_XRender_Installed = FALSE; - } - } + TRACE("Xrender is up and running error_base = %d\n", xrender_error_base); + if(!load_xrender_formats()) /* This fails in buggy versions of libXrender.so */ + { + ERR_(winediag)("Wine has detected that you probably have a buggy version " + "of libXrender. Because of this client side font rendering " + "will be disabled. Please upgrade this library.\n"); + X11DRV_XRender_Installed = FALSE; + return NULL; + } + + if (!visual->red_mask || !visual->green_mask || !visual->blue_mask) + { + WARN("one or more of the colour masks are 0, disabling XRENDER. Try running in 16-bit mode or higher.\n"); + X11DRV_XRender_Installed = FALSE; + return NULL; } #ifdef SONAME_LIBFONTCONFIG @@ -428,32 +430,20 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) #endif sym_not_found: - if(X11DRV_XRender_Installed || client_side_with_core) - { - glyphsetCache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*glyphsetCache) * INIT_CACHE_SIZE); - - glyphsetCacheSize = INIT_CACHE_SIZE; - lastfree = 0; - for(i = 0; i < INIT_CACHE_SIZE; i++) { - glyphsetCache[i].next = i + 1; - glyphsetCache[i].count = -1; - } - glyphsetCache[i-1].next = -1; - using_client_side_fonts = 1; + glyphsetCache = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(*glyphsetCache) * INIT_CACHE_SIZE); - if(!X11DRV_XRender_Installed) { - TRACE("Xrender is not available on your XServer, client side rendering with the core protocol instead.\n"); - if(screen_depth <= 8 || !client_side_antialias_with_core) - antialias = 0; - } else { - if(screen_depth <= 8 || !client_side_antialias_with_render) - antialias = 0; - } - return &xrender_funcs; + glyphsetCacheSize = INIT_CACHE_SIZE; + lastfree = 0; + for(i = 0; i < INIT_CACHE_SIZE; i++) { + glyphsetCache[i].next = i + 1; + glyphsetCache[i].count = -1; } - TRACE("Using X11 core fonts\n"); - return NULL; + glyphsetCache[i-1].next = -1; + + if(screen_depth <= 8 || !client_side_antialias_with_render) antialias = 0; + + return &xrender_funcs; } /* Helper function to convert from a color packed in a 32-bit integer to a XRenderColor */

1 0

Aric Stewart : usp10: Windows breaks punctuation into 2 different script types.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 2fe60ff696cd7a0ba3716a15f45a5c3d22d3c035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe60ff696cd7a0ba3716a15f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:05:22 2011 -0700 usp10: Windows breaks punctuation into 2 different script types. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 11 +++++++++++ dlls/usp10/usp10.c | 11 ++++++++++- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3662bc8..dd4d23b 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -583,6 +583,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, + {{ standard_features, 2}, NULL, "latn" , "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ede7603..b29f592 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -285,6 +285,13 @@ static void test_ScriptItemize( void ) static const WCHAR test21[] = {0x0710, 0x0712, 0x0308, 0x0712, 0x0714,0}; static const itemTest t211[2] = {{{0,0,0,0,0},0,1,1,1,syrc_tag,FALSE},{{0,0,0,0,0},5,0,0,0,-1,FALSE}}; + /* Latin Punctuation */ + static const WCHAR test22[] = {'#','$',',','!','\"','*',0}; + static const itemTest t221[3] = {{{0,0,0,0,0},0,0,0,0,latn_tag,FALSE},{{0,0,0,0,0},3,0,0,0,0,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t222[3] = {{{0,0,0,0,0},0,1,1,1,latn_tag,FALSE},{{0,0,0,0,0},3,1,1,1,0,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t223[2] = {{{0,0,0,0,0},0,1,1,1,latn_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -339,6 +346,7 @@ static void test_ScriptItemize( void ) test_items_ok(test19,6,NULL,NULL,1,t191,FALSE,0); test_items_ok(test20,5,NULL,NULL,2,t201,FALSE,0); test_items_ok(test21,5,NULL,NULL,1,t211,FALSE,0); + test_items_ok(test22,6,NULL,NULL,2,t221,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -367,6 +375,7 @@ static void test_ScriptItemize( void ) test_items_ok(test19,6,&Control,&State,1,t191,FALSE,0); test_items_ok(test20,5,&Control,&State,2,t201,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); + test_items_ok(test22,6,&Control,&State,2,t221,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -395,6 +404,7 @@ static void test_ScriptItemize( void ) test_items_ok(test19,6,&Control,&State,1,t192,FALSE,0); test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); + test_items_ok(test22,6,&Control,&State,2,t222,FALSE,1); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -424,6 +434,7 @@ static void test_ScriptItemize( void ) test_items_ok(test19,6,&Control,&State,1,t192,FALSE,0); test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); + test_items_ok(test22,6,&Control,&State,1,t223,FALSE,2); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ae3a7b4..72c00cf 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -362,6 +362,10 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 1, 0, 1, ANSI_CHARSET, 0, 0, 0, 0, 0, 1, 1, 0, 0}, 0x00000000, {0}}, + {{Script_Punctuation2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, + MS_MAKE_TAG('l','a','t','n'), + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -522,14 +526,19 @@ static WCHAR mirror_char( WCHAR ch ) static WORD get_char_script( WCHAR ch) { + static const WCHAR latin_punc[] = {'#','$','&','\'',',',';','<','>','?','@','\\','^','_','`','{','|','}','~', 0x00a0, 0}; WORD type = 0; int i; if (ch == 0xc || ch == 0x20 || ch == 0x202f) return Script_CR; + /* These punctuation are seperated out as Latin punctuation */ + if (strchrW(latin_punc,ch)) + return Script_Punctuation2; + /* These chars are itemized as Punctuation by Windows */ - if (ch == 0x2212 || ch == 0x2044 || ch == 0x00a0) + if (ch == 0x2212 || ch == 0x2044) return Script_Punctuation; GetStringTypeW(CT_CTYPE1, &ch, 1, &type); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index d6c910f..fc9bb7f 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -73,6 +73,7 @@ #define Script_Malayalam_Numeric 43 /* More supplemental */ #define Script_Diacritical 44 +#define Script_Punctuation2 45 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Itemize numbers outside of the basic ascii set in a seperate script.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 9097226a3c65228c78726280ded88a9edef543b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9097226a3c65228c78726280d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:05:45 2011 -0700 usp10: Itemize numbers outside of the basic ascii set in a seperate script. --- dlls/usp10/shape.c | 1 + dlls/usp10/tests/usp10.c | 9 +++++++++ dlls/usp10/usp10.c | 17 ++++++++++++++--- dlls/usp10/usp10_internal.h | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index dd4d23b..c463681 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -584,6 +584,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, {{ standard_features, 2}, NULL, "latn" , "", NULL, NULL}, + {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b29f592..dffc6a1 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -291,6 +291,11 @@ static void test_ScriptItemize( void ) static const itemTest t222[3] = {{{0,0,0,0,0},0,1,1,1,latn_tag,FALSE},{{0,0,0,0,0},3,1,1,1,0,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; static const itemTest t223[2] = {{{0,0,0,0,0},0,1,1,1,latn_tag,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + /* Number 2*/ + static const WCHAR test23[] = {'1','2','3',0x00b2,0x00b3,0x2070,0}; + static const itemTest t231[3] = {{{0,0,0,0,0},0,0,0,0,0,FALSE},{{0,0,0,0,0},3,0,0,0,0,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + static const itemTest t232[3] = {{{0,0,0,0,0},0,0,1,2,0,FALSE},{{0,0,0,0,0},3,0,1,2,0,FALSE},{{0,0,0,0,0},6,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; @@ -347,6 +352,7 @@ static void test_ScriptItemize( void ) test_items_ok(test20,5,NULL,NULL,2,t201,FALSE,0); test_items_ok(test21,5,NULL,NULL,1,t211,FALSE,0); test_items_ok(test22,6,NULL,NULL,2,t221,FALSE,0); + test_items_ok(test23,6,NULL,NULL,2,t231,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -376,6 +382,7 @@ static void test_ScriptItemize( void ) test_items_ok(test20,5,&Control,&State,2,t201,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); test_items_ok(test22,6,&Control,&State,2,t221,FALSE,0); + test_items_ok(test23,6,&Control,&State,2,t231,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -405,6 +412,7 @@ static void test_ScriptItemize( void ) test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); test_items_ok(test22,6,&Control,&State,2,t222,FALSE,1); + test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -435,6 +443,7 @@ static void test_ScriptItemize( void ) test_items_ok(test20,5,&Control,&State,2,t202,FALSE,0); test_items_ok(test21,5,&Control,&State,1,t211,FALSE,0); test_items_ok(test22,6,&Control,&State,1,t223,FALSE,2); + test_items_ok(test23,6,&Control,&State,2,t232,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string, diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 72c00cf..1cff0ee 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -52,11 +52,12 @@ typedef struct _scriptRange static const scriptRange scriptRanges[] = { /* Basic Latin: U+0000–U+007A */ + { Script_Latin, 0x00, 0x07a , Script_Numeric, Script_Punctuation}, /* Latin-1 Supplement: U+0080–U+00FF */ /* Latin Extended-A: U+0100–U+017F */ /* Latin Extended-B: U+0180–U+024F */ /* IPA Extensions: U+0250–U+02AF */ - { Script_Latin, 0x00, 0x2af , Script_Numeric, Script_Punctuation}, + { Script_Latin, 0x80, 0x2af , Script_Numeric2, Script_Punctuation}, /* Combining Diacritical Marks : U+0300–U+036F */ { Script_Diacritical,0x300, 0x36f, 0, 0}, /* Greek: U+0370–U+03FF */ @@ -119,9 +120,15 @@ static const scriptRange scriptRanges[] = { /* Greek Extended: U+1F00–U+1FFF */ { Script_Greek, 0x1f00, 0x1fff, 0, 0}, /* General Punctuation: U+2000 –U+206f */ + { Script_Latin, 0x2000, 0x206f, 0, 0}, /* Superscripts and Subscripts : U+2070 –U+209f */ /* Currency Symbols : U+20a0 –U+20cf */ - { Script_Latin, 0x2000, 0x20cf, 0, 0}, + { Script_Numeric2, 0x2070, 0x2070, 0, 0}, + { Script_Latin, 0x2071, 0x2073, 0, 0}, + { Script_Numeric2, 0x2074, 0x2079, 0, 0}, + { Script_Latin, 0x207a, 0x207f, 0, 0}, + { Script_Numeric2, 0x2080, 0x2089, 0, 0}, + { Script_Latin, 0x208a, 0x20cf, 0, 0}, /* Letterlike Symbols : U+2100 –U+214f */ /* Number Forms : U+2150 –U+218f */ /* Arrows : U+2190 –U+21ff */ @@ -366,6 +373,10 @@ static const scriptData scriptInformation[] = { {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('l','a','t','n'), {0}}, + {{Script_Numeric2, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {LANG_ENGLISH, 1, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + 0x00000000, + {0}}, }; static const SCRIPT_PROPERTIES *script_props[] = @@ -392,7 +403,7 @@ static const SCRIPT_PROPERTIES *script_props[] = &scriptInformation[38].props, &scriptInformation[39].props, &scriptInformation[40].props, &scriptInformation[41].props, &scriptInformation[42].props, &scriptInformation[43].props, - &scriptInformation[44].props + &scriptInformation[44].props, &scriptInformation[45].props }; typedef struct { diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index fc9bb7f..ebf9667 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -74,6 +74,7 @@ /* More supplemental */ #define Script_Diacritical 44 #define Script_Punctuation2 45 +#define Script_Numeric2 46 #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT)

1 0

Aric Stewart : usp10: Cache the script with the feature so that in caches with multiple scripts we do not fetch the wrong feature from the cache .
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 25d43d7a09f15fe84f19d31940a64160fc1c8c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d43d7a09f15fe84f19d3194… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sun Nov 20 21:06:18 2011 -0700 usp10: Cache the script with the feature so that in caches with multiple scripts we do not fetch the wrong feature from the cache. --- dlls/usp10/shape.c | 8 +++++++- dlls/usp10/usp10_internal.h | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c463681..66d65c2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1094,11 +1094,16 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { const GSUB_Feature *feature; + const char* script; int i; + script = get_opentype_script(hdc,psa,psc,FALSE); + for (i = 0; i < psc->feature_count; i++) - if (strncmp(psc->features[i].tag,feat,4)==0) + { + if (strncmp(psc->features[i].tag,feat,4)==0 && strncmp(psc->features[i].script,script,4)==0) return psc->features[i].feature; + } feature = NULL; @@ -1146,6 +1151,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); + lstrcpynA(psc->features[psc->feature_count - 1].script, script, 5); psc->features[psc->feature_count - 1].feature = feature; return feature; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index ebf9667..6f5d3d1 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -82,7 +82,8 @@ #define GLYPH_MAX 65536 typedef struct { - char tag[4]; + char tag[5]; + char script[5]; LPCVOID feature; } LoadedFeature;

1 0

Nikolay Sivov : msxml3: Added common ISupportErrorInfo implementation.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: b26ad412d316ae690a9183ebab38845e00eeba4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26ad412d316ae690a9183eba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 16:33:10 2011 +0300 msxml3: Added common ISupportErrorInfo implementation. --- dlls/msxml3/attribute.c | 10 ++++ dlls/msxml3/cdata.c | 10 ++++ dlls/msxml3/comment.c | 10 ++++ dlls/msxml3/dispex.c | 18 +++++-- dlls/msxml3/docfrag.c | 10 ++++ dlls/msxml3/domdoc.c | 52 +++---------------- dlls/msxml3/element.c | 10 ++++ dlls/msxml3/entityref.c | 10 ++++ dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 91 ++++++++++++++++++++++++++++++++ dlls/msxml3/pi.c | 10 ++++ dlls/msxml3/tests/domdoc.c | 121 +++++++++++++++++++++++++++++++++++++------ 12 files changed, 288 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b26ad412d316ae690a918…

1 0

Nikolay Sivov : msxml3: Fix support for IXMLDOMDocument3.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: a9d8f9a0a23f197638cb9ae1b79a310f2d6880c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d8f9a0a23f197638cb9ae1b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 17:00:24 2011 +0300 msxml3: Fix support for IXMLDOMDocument3. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/domdoc.c | 23 ++++++++++------------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index bcf528d..d71fb04 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -117,6 +117,7 @@ static tid_id_t tid_ids[] = { { &IID_IXMLDOMComment, LibXml2 }, { &IID_IXMLDOMDocument, LibXml2 }, { &IID_IXMLDOMDocument2, LibXml2 }, + { &IID_IXMLDOMDocument3, LibXml2 }, { &IID_IXMLDOMDocumentFragment, LibXml2 }, { &IID_IXMLDOMDocumentType, LibXml2 }, { &IID_IXMLDOMElement, LibXml2 }, diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2f67781..7d51255 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -813,6 +813,7 @@ static const tid_t domdoc_se_tids[] = { IXMLDOMNode_tid, IXMLDOMDocument_tid, IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, 0 }; @@ -926,13 +927,10 @@ static HRESULT WINAPI domdoc_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMDocument2_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMDocument3_tid, ppTInfo); } static HRESULT WINAPI domdoc_GetIDsOfNames( @@ -953,7 +951,7 @@ static HRESULT WINAPI domdoc_GetIDsOfNames( if(!rgszNames || cNames == 0 || !rgDispId) return E_INVALIDARG; - hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); + hr = get_typeinfo(IXMLDOMDocument3_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); @@ -982,7 +980,7 @@ static HRESULT WINAPI domdoc_Invoke( TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - hr = get_typeinfo(IXMLDOMDocument2_tid, &typeinfo); + hr = get_typeinfo(IXMLDOMDocument3_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMDocument3_iface, dispIdMember, wFlags, @@ -2378,7 +2376,7 @@ static HRESULT WINAPI domdoc_save( case VT_UNKNOWN: { IUnknown *pUnk = V_UNKNOWN(&destination); - IXMLDOMDocument2 *document; + IXMLDOMDocument3 *document; IStream *stream; ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&document); @@ -3011,7 +3009,7 @@ static HRESULT WINAPI domdoc_importNode( return E_NOTIMPL; } -static const struct IXMLDOMDocument3Vtbl domdoc_vtbl = +static const struct IXMLDOMDocument3Vtbl XMLDOMDocument3Vtbl = { domdoc_QueryInterface, domdoc_AddRef, @@ -3412,14 +3410,13 @@ static const IObjectSafetyVtbl domdocObjectSafetyVtbl = { }; static const tid_t domdoc_iface_tids[] = { - IXMLDOMNode_tid, - IXMLDOMDocument_tid, - IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, 0 }; + static dispex_static_data_t domdoc_dispex = { NULL, - IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, NULL, domdoc_iface_tids }; @@ -3432,7 +3429,7 @@ HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document) if( !doc ) return E_OUTOFMEMORY; - doc->IXMLDOMDocument3_iface.lpVtbl = &domdoc_vtbl; + doc->IXMLDOMDocument3_iface.lpVtbl = &XMLDOMDocument3Vtbl; doc->IPersistStreamInit_iface.lpVtbl = &xmldoc_IPersistStreamInit_VTable; doc->IObjectWithSite_iface.lpVtbl = &domdocObjectSite; doc->IObjectSafety_iface.lpVtbl = &domdocObjectSafetyVtbl; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 65f2834..10067a6 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -44,6 +44,7 @@ typedef enum tid_t { IXMLDOMComment_tid, IXMLDOMDocument_tid, IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, IXMLDOMDocumentFragment_tid, IXMLDOMDocumentType_tid, IXMLDOMElement_tid, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 03d19c1..abd0b37 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10712,7 +10712,7 @@ static const supporterror_t supporterror_test[] = { static void test_supporterrorinfo(void) { - static REFIID iids[3] = { &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2 }; + static REFIID iids[4] = { &IID_IXMLDOMDocument, &IID_IXMLDOMDocument2, &IID_IXMLDOMDocument3 }; const supporterror_t *ptr = supporterror_test; ISupportErrorInfo *errorinfo, *info2; IXMLDOMDocument *doc;

1 0

Nikolay Sivov : msxml3: Forward IDispatch to IDispatchEx when supported.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ed908b7b182f29fdd301ab9d4888d5fe63f7ade4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed908b7b182f29fdd301ab9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 19:32:23 2011 +0300 msxml3: Forward IDispatch to IDispatchEx when supported. --- dlls/msxml3/attribute.c | 51 +++++---------------------------------- dlls/msxml3/cdata.c | 52 +++++----------------------------------- dlls/msxml3/comment.c | 52 +++++----------------------------------- dlls/msxml3/docfrag.c | 52 +++++----------------------------------- dlls/msxml3/doctype.c | 52 +++++----------------------------------- dlls/msxml3/domdoc.c | 58 ++++++--------------------------------------- dlls/msxml3/domimpl.c | 49 +++++--------------------------------- dlls/msxml3/element.c | 52 +++++----------------------------------- dlls/msxml3/entityref.c | 51 +++++---------------------------------- dlls/msxml3/nodemap.c | 47 +++++------------------------------- dlls/msxml3/parseerror.c | 49 +++++--------------------------------- dlls/msxml3/selection.c | 49 +++++--------------------------------- dlls/msxml3/text.c | 52 +++++----------------------------------- 13 files changed, 92 insertions(+), 574 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed908b7b182f29fdd301a…

1 0

Nikolay Sivov : msxml3: Support IDispatchEx for IXMLDOMNodeList too.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 85ce39ddca6744bfa364058f7e25270b42288823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ce39ddca6744bfa364058f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 19 20:55:30 2011 +0300 msxml3: Support IDispatchEx for IXMLDOMNodeList too. --- dlls/msxml3/nodelist.c | 148 +++++++++++++++++++++++++++----------------- dlls/msxml3/selection.c | 2 +- dlls/msxml3/tests/domdoc.c | 21 ++++++ 3 files changed, 114 insertions(+), 57 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 6a25463..5710d48 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -33,6 +33,7 @@ #include "winuser.h" #include "ole2.h" #include "msxml6.h" +#include "msxml2did.h" #include "msxml_private.h" @@ -53,6 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlnodelist { + DispatchEx dispex; IXMLDOMNodeList IXMLDOMNodeList_iface; LONG ref; xmlNodePtr parent; @@ -69,7 +71,9 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( REFIID riid, void** ppvObject ) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -77,6 +81,10 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { *ppvObject = iface; } + else if (dispex_query_interface(&This->dispex, riid, ppvObject)) + { + return *ppvObject ? S_OK : E_NOINTERFACE; + } else { TRACE("interface %s not implemented\n", debugstr_guid(riid)); @@ -119,12 +127,7 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfoCount( UINT* pctinfo ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI xmlnodelist_GetTypeInfo( @@ -134,13 +137,8 @@ static HRESULT WINAPI xmlnodelist_GetTypeInfo( ITypeInfo** ppTInfo ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - HRESULT hr; - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - hr = get_typeinfo(IXMLDOMNodeList_tid, ppTInfo); - - return hr; + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI xmlnodelist_GetIDsOfNames( @@ -152,23 +150,8 @@ static HRESULT WINAPI xmlnodelist_GetIDsOfNames( DISPID* rgDispId ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI xmlnodelist_Invoke( @@ -183,21 +166,8 @@ static HRESULT WINAPI xmlnodelist_Invoke( UINT* puArgErr ) { xmlnodelist *This = impl_from_IXMLDOMNodeList( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IXMLDOMNodeList_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMNodeList_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI xmlnodelist_get_item( @@ -298,7 +268,6 @@ static HRESULT WINAPI xmlnodelist__newEnum( return E_NOTIMPL; } - static const struct IXMLDOMNodeListVtbl xmlnodelist_vtbl = { xmlnodelist_QueryInterface, @@ -315,22 +284,89 @@ static const struct IXMLDOMNodeListVtbl xmlnodelist_vtbl = xmlnodelist__newEnum, }; +static HRESULT xmlnodelist_get_dispid(IUnknown *iface, BSTR name, DWORD flags, DISPID *dispid) +{ + WCHAR *ptr; + int idx = 0; + + for(ptr = name; *ptr && isdigitW(*ptr); ptr++) + idx = idx*10 + (*ptr-'0'); + if(*ptr) + return DISP_E_UNKNOWNNAME; + + *dispid = DISPID_DOM_COLLECTION_BASE + idx; + TRACE("ret %x\n", *dispid); + return S_OK; +} + +static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, + VARIANT *res, EXCEPINFO *ei) +{ + xmlnodelist *This = impl_from_IXMLDOMNodeList( (IXMLDOMNodeList*)iface ); + + TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); + + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = NULL; + + if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX) + return DISP_E_UNKNOWNNAME; + + switch(flags) + { + case INVOKE_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + V_DISPATCH(res) = (IDispatch*)disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } + } + + TRACE("ret %p\n", V_DISPATCH(res)); + + return S_OK; +} + +static const dispex_static_data_vtbl_t xmlnodelist_dispex_vtbl = { + xmlnodelist_get_dispid, + xmlnodelist_invoke +}; + +static const tid_t xmlnodelist_iface_tids[] = { + IXMLDOMNodeList_tid, + 0 +}; +static dispex_static_data_t xmlnodelist_dispex = { + &xmlnodelist_dispex_vtbl, + IXMLDOMNodeList_tid, + NULL, + xmlnodelist_iface_tids +}; + IXMLDOMNodeList* create_children_nodelist( xmlNodePtr node ) { - xmlnodelist *nodelist; + xmlnodelist *This; - nodelist = heap_alloc( sizeof *nodelist ); - if ( !nodelist ) + This = heap_alloc( sizeof *This ); + if ( !This ) return NULL; - nodelist->IXMLDOMNodeList_iface.lpVtbl = &xmlnodelist_vtbl; - nodelist->ref = 1; - nodelist->parent = node; - nodelist->current = node->children; - + This->IXMLDOMNodeList_iface.lpVtbl = &xmlnodelist_vtbl; + This->ref = 1; + This->parent = node; + This->current = node->children; xmldoc_add_ref( node->doc ); - return &nodelist->IXMLDOMNodeList_iface; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMNodeList_iface, &xmlnodelist_dispex); + + return &This->IXMLDOMNodeList_iface; } #endif diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index aba8e7d..8871817 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -600,7 +600,7 @@ static HRESULT domselection_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD f { IXMLDOMNode *disp = NULL; - domselection_get_item(&This->IXMLDOMSelection_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + IXMLDOMSelection_get_item(&This->IXMLDOMSelection_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); V_DISPATCH(res) = (IDispatch*)disp; break; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index abd0b37..e72e1f3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10531,6 +10531,27 @@ static void test_dispex(void) IUnknown_Release(unk); IXMLDOMNodeList_Release(node_list); + /* IXMLDOMNodeList for children list */ + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + IXMLDOMNodeList_QueryInterface(node_list, &IID_IUnknown, (void**)&unk); + test_domobj_dispex(unk); + IUnknown_Release(unk); + + /* collection dispex test, empty collection */ + hr = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + did = 0; + hr = IDispatchEx_GetDispID(dispex, _bstr_("0"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE, "got 0x%08x\n", did); + hr = IDispatchEx_GetDispID(dispex, _bstr_("1"), 0, &did); + EXPECT_HR(hr, S_OK); + ok(did == DISPID_DOM_COLLECTION_BASE+1, "got 0x%08x\n", did); + IDispatchEx_Release(dispex); + + IXMLDOMNodeList_Release(node_list); + /* IXMLDOMParseError */ hr = IXMLDOMDocument_get_parseError(doc, &error); EXPECT_HR(hr, S_OK);

1 0

Nikolay Sivov : shell32: Avoid null pointer dereference in traces.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: 9d6204b297a756f7823bc75d1ec88c968fab96c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6204b297a756f7823bc75d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 21 10:58:58 2011 +0300 shell32: Avoid null pointer dereference in traces. --- dlls/shell32/shellpath.c | 32 +++++++++++--------------------- 1 files changed, 11 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 25ba4be..9612687 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -669,37 +669,27 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA( - LPSTR lpszPath, - LPCSTR *alpszPaths, - DWORD dwFlags) +static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", - lpszPath, *alpszPaths, dwFlags); - return 0; + FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); + return FALSE; } -static BOOL PathResolveW( - LPWSTR lpszPath, - LPCWSTR *alpszPaths, - DWORD dwFlags) +static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", - debugstr_w(lpszPath), debugstr_w(*alpszPaths), dwFlags); - return 0; + FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); + return FALSE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW( - LPVOID lpszPath, - LPCVOID *alpszPaths, - DWORD dwFlags) +BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) { - if (SHELL_OsIsUnicode()) - return PathResolveW(lpszPath, (LPCWSTR*)alpszPaths, dwFlags); - return PathResolveA(lpszPath, (LPCSTR*)alpszPaths, dwFlags); + if (SHELL_OsIsUnicode()) + return PathResolveW(path, (LPCWSTR*)paths, flags); + else + return PathResolveA(path, (LPCSTR*)paths, flags); } /*************************************************************************

1 0

Frédéric Delanoy : ntdll/tests: Avoid harcoding array lengths.
by Alexandre Julliard 21 Nov '11

21 Nov '11

Module: wine Branch: master Commit: ea67d804f3a3d39647714051c3b6cb7cafdde3a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea67d804f3a3d39647714051c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 21 09:17:06 2011 +0100 ntdll/tests: Avoid harcoding array lengths. --- dlls/ntdll/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 802a165..a4d0b8a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1146,8 +1146,8 @@ static void test_wcsrchr(void) static void test_wcslwrupr(void) { static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; - static WCHAR emptyW[1] = {0}; - static const WCHAR constemptyW[1] = {0}; + static WCHAR emptyW[] = {0}; + static const WCHAR constemptyW[] = {0}; if (0) /* crashes on native */ {

1 0