October 2014 - Wine-Commits

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: dabe5b4479521e16a040849b34dea247dd520dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabe5b4479521e16a040849b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:19 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7dde5e4..e5f34f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3259,6 +3259,29 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig } } +static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0xff000000; + else + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3297,21 +3320,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - *(DWORD *)dest = color & ~0xff000000; - else - *(DWORD *)dest = color | 0xff000000; - source += 4; - dest += 4; - } - } + convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8A8:

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 548978dec49761ea6c12e8e117b1a0322b8a81b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548978dec49761ea6c12e8e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:18 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86aa235..7dde5e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3238,6 +3238,27 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns } } +static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = (src_row[x * 3 + 2] << 16) | (src_row[x * 3 + 1] << 8) | src_row[x * 3]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3271,20 +3292,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&texture->src_blt_color_key, color)) - color |= 0xff000000; - *(DWORD *)dest = color; - source += 3; - dest += 4; - } - } + convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8X8:

1 0

Ken Thomases : winemac: Properly ignore attempts to set a window' s shape to its current shape.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 31d7f61cc3525d32c0624564f9ac9033010fb968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d7f61cc3525d32c0624564f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:19 2014 -0500 winemac: Properly ignore attempts to set a window's shape to its current shape. NSBezierPath doesn't override the -isEqual: method to actually compare paths, so it just falls back to object identity which, in our case, makes paths seem like they're never equal. Also, memcmp()-ing the rectangle array is almost certainly faster than any general test for equality between two paths. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 88ef23d..574ff75 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,6 +44,7 @@ pthread_mutex_t* surface_mutex; NSBezierPath* shape; + NSData* shapeData; BOOL shapeChangedSinceLastDraw; BOOL colorKeyed; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d9a421e..35222c1 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -182,6 +182,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (nonatomic) pthread_mutex_t* surface_mutex; @property (copy, nonatomic) NSBezierPath* shape; +(a)property (copy, nonatomic) NSData* shapeData; @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -540,7 +541,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; - @synthesize shape, shapeChangedSinceLastDraw; + @synthesize shape, shapeData, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; @@ -634,6 +635,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [latentChildWindows release]; [latentParentWindow release]; [shape release]; + [shapeData release]; [super dealloc]; } @@ -1401,7 +1403,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) setShape:(NSBezierPath*)newShape { if (shape == newShape) return; - if (shape && newShape && [shape isEqual:newShape]) return; if (shape) { @@ -2379,16 +2380,24 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) OnMainThread(^{ if (!rects || !count) + { window.shape = nil; + window.shapeData = nil; + } else { - NSBezierPath* path; - unsigned int i; + size_t length = sizeof(*rects) * count; + if (window.shapeData.length != length || memcmp(window.shapeData.bytes, rects, length)) + { + NSBezierPath* path; + unsigned int i; - path = [NSBezierPath bezierPath]; - for (i = 0; i < count; i++) - [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; - window.shape = path; + path = [NSBezierPath bezierPath]; + for (i = 0; i < count; i++) + [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; + window.shape = path; + window.shapeData = [NSData dataWithBytes:rects length:length]; + } } });

1 0

Nikolay Sivov : dwrite: Implement CreateNumberSubstitution().
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 7c035744f6bc1cbaa763554aa9cf023d8790fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c035744f6bc1cbaa763554aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 16:14:41 2014 +0400 dwrite: Implement CreateNumberSubstitution(). --- dlls/dwrite/analyzer.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/analyzer.c | 36 +++++++++++++++++ include/winnls.h | 3 +- 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2470fa2..7c32e6b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -165,6 +165,20 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, TRUE } }; +struct dwrite_numbersubstitution { + IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; + LONG ref; + + DWRITE_NUMBER_SUBSTITUTION_METHOD method; + WCHAR *locale; + BOOL ignore_user_override; +}; + +static inline struct dwrite_numbersubstitution *impl_from_IDWriteNumberSubstitution(IDWriteNumberSubstitution *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_numbersubstitution, IDWriteNumberSubstitution_iface); +} + static inline UINT16 get_char_script(WCHAR c) { UINT16 script = get_table_entry(wine_scripts_table, c); @@ -1044,3 +1058,82 @@ HRESULT get_textanalyzer(IDWriteTextAnalyzer **ret) *ret = (IDWriteTextAnalyzer*)&textanalyzer; return S_OK; } + +static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubstitution *iface, REFIID riid, void **obj) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteNumberSubstitution) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteNumberSubstitution_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) { + heap_free(This->locale); + heap_free(This); + } + + return ref; +} + +static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { + dwritenumbersubstitution_QueryInterface, + dwritenumbersubstitution_AddRef, + dwritenumbersubstitution_Release +}; + +HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, const WCHAR *locale, + BOOL ignore_user_override, IDWriteNumberSubstitution **ret) +{ + struct dwrite_numbersubstitution *substitution; + + *ret = NULL; + + if (method < DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE || method > DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL) + return E_INVALIDARG; + + if (method != DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE && !IsValidLocaleName(locale)) + return E_INVALIDARG; + + substitution = heap_alloc(sizeof(*substitution)); + if (!substitution) + return E_OUTOFMEMORY; + + substitution->IDWriteNumberSubstitution_iface.lpVtbl = &numbersubstitutionvtbl; + substitution->ref = 1; + substitution->ignore_user_override = ignore_user_override; + substitution->method = method; + substitution->locale = heap_strdupW(locale); + if (locale && !substitution->locale) { + heap_free(substitution); + return E_OUTOFMEMORY; + } + + *ret = &substitution->IDWriteNumberSubstitution_iface; + return S_OK; +} diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ccad5a8..3ca7114 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -89,6 +89,7 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; +extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7d62871..033e89a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -749,8 +749,8 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory *ifa WCHAR const* locale, BOOL ignore_user_override, IDWriteNumberSubstitution **substitution) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%d %s %d %p): stub\n", This, method, debugstr_w(locale), ignore_user_override, substitution); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %d %p)\n", This, method, debugstr_w(locale), ignore_user_override, substitution); + return create_numbersubstitution(method, locale, ignore_user_override, substitution); } static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory *iface, DWRITE_GLYPH_RUN const *glyph_run, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 45e2e07..31532ca 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1046,11 +1046,46 @@ if (0) { /* crashes on native */ ok(indices[0] == 0, "%d: got %d\n", i, indices[0]); } + IDWriteFont_Release(font); IDWriteFontFace_Release(fontface); IDWriteGdiInterop_Release(interop); IDWriteTextAnalyzer1_Release(analyzer1); } +static void test_numbersubstitution(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + IDWriteNumberSubstitution *substitution; + HRESULT hr; + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, NULL, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL+1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, -1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale, but it's not needed for this method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); +} + START_TEST(analyzer) { HRESULT hr; @@ -1070,6 +1105,7 @@ START_TEST(analyzer) test_AnalyzeLineBreakpoints(); test_GetScriptProperties(); test_GetTextComplexity(); + test_numbersubstitution(); IDWriteFactory_Release(factory); } diff --git a/include/winnls.h b/include/winnls.h index 9b353cb..13274be 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -863,8 +863,9 @@ WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); -WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocaleName(LPCWSTR); WINBASEAPI INT WINAPI LCIDToLocaleName(LCID,LPWSTR,INT,DWORD); WINBASEAPI INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);

1 0

Qian Hong : jscript: Ignore BOM mark in next_token.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 66ba778cadcc092b390cd867ac05c7b55c1f7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ba778cadcc092b390cd867a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 2 14:09:10 2014 +0800 jscript: Ignore BOM mark in next_token. --- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/run.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index b4a3700..af4b24b 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -241,7 +241,7 @@ static BOOL skip_comment(parser_ctx_t *ctx) static BOOL skip_spaces(parser_ctx_t *ctx) { - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + while(ctx->ptr < ctx->end && (isspaceW(*ctx->ptr) || *ctx->ptr == 0xFEFF /* UTF16 BOM */)) { if(is_endline(*ctx->ptr++)) ctx->nl = TRUE; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aa1783e..452f810 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -144,6 +144,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_TESTOBJ_ONLYDISPID 0x2001 #define DISPID_TESTOBJ_WITHPROP 0x2002 +#define JS_E_OUT_OF_MEMORY 0x800a03ec #define JS_E_INVALID_CHAR 0x800a03f6 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -1966,6 +1967,56 @@ static void test_script_exprs(void) testing_expr = FALSE; } +struct bom_test +{ + WCHAR str[1024]; + HRESULT hres; +}; + +static void run_bom_tests(void) +{ + BSTR src; + int i; + HRESULT hres; + struct bom_test bom_tests[] = { + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0}} + }; + + engine_clsid = &CLSID_JScript; + + for (i = 0; bom_tests[i].str[0]; i++) + { + if(bom_tests[i].hres == S_OK) + { + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + ok(hres == S_OK, "test %s failed with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + } + else + { + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + todo_wine ok(hres == bom_tests[i].hres, "test %s returned with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + } + } +} + static BOOL run_tests(void) { HRESULT hres; @@ -2259,6 +2310,8 @@ static BOOL run_tests(void) "Object expected", NULL); + run_bom_tests(); + return TRUE; }

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: c9b4344322b29441886d297925b4c2f0c120ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b4344322b29441886d29792… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 04:01:36 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag. --- dlls/kernel32/tests/file.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 106e68a..0973efe 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2608,22 +2608,38 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) skip("File system supports directory filtering\n"); /* Results from the previous call are not cleared */ ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); - FindClose( handle ); - goto cleanup; } + else + { + ok(ret, "Fetching fourth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); - ok(ret, "Fetching fourth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); - ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); + } #undef CHECK_NAME - ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); - FindClose( handle ); + /* Most Windows systems seem to ignore the FIND_FIRST_EX_CASE_SENSITIVE flag. Unofficial documentation + * suggests that there are registry keys and that it might depend on the used filesystem. */ + SetLastError(0xdeadbeef); + handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + if (flags & FIND_FIRST_EX_CASE_SENSITIVE) + { + ok(handle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_PATH_NOT_FOUND, + "Unexpected error %x, expected valid handle or ERROR_PATH_NOT_FOUND\n", GetLastError()); + trace("FindFirstFileExA flag FIND_FIRST_EX_CASE_SENSITIVE is %signored\n", + (handle == INVALID_HANDLE_VALUE) ? "not " : ""); + } + else + ok(handle != INVALID_HANDLE_VALUE, "Unexpected error %x, expected valid handle\n", GetLastError()); + if (handle != INVALID_HANDLE_VALUE) + FindClose( handle ); + cleanup: DeleteFileA("test-dir\\file1"); DeleteFileA("test-dir\\file2"); @@ -4177,9 +4193,11 @@ START_TEST(file) test_FindFirstFileA(); test_FindNextFileA(); test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing();

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 20b5c99f1172933e1736601c39373795f8395cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b5c99f1172933e1736601c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 03:53:30 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag. --- dlls/kernel32/tests/file.c | 15 +++++++++++---- include/winbase.h | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ddfa019..106e68a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) +static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) { WIN32_FIND_DATAA search_results; HANDLE handle; @@ -2579,12 +2579,17 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); goto cleanup; } + if ((flags & FIND_FIRST_EX_LARGE_FETCH) && handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("FindFirstFileExA flag FIND_FIRST_EX_LARGE_FETCH not supported, skipping test\n"); + goto cleanup; + } ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -4171,9 +4176,11 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(0); + test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ - test_FindFirstFileExA(FindExSearchLimitToDirectories); + test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure(); diff --git a/include/winbase.h b/include/winbase.h index dd5e816..edd6ad6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -289,6 +289,9 @@ typedef enum _FINDEX_INFO_LEVELS FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; +#define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 + typedef enum _FINDEX_SEARCH_OPS { FindExSearchNameMatch,

1 0

Jacek Caban : jscript: Added support for relational CC expressions.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: e7b8459bc334f47824a4739926734bebd0425b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b8459bc334f47824a473992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:40 2014 +0200 jscript: Added support for relational CC expressions. --- dlls/jscript/cc_parser.y | 8 ++++---- dlls/jscript/tests/cc.js | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index b22aef8..18c1cb1 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -192,13 +192,13 @@ CCEqualityExpression CCRelationalExpression : CCShiftExpression { $$ = $1; } | CCRelationalExpression '<' CCShiftExpression - { FIXME("'<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) < get_ccnum($3)); } | CCRelationalExpression tLEQ CCShiftExpression - { FIXME("'<=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) <= get_ccnum($3)); } | CCRelationalExpression '>' CCShiftExpression - { FIXME("'>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) > get_ccnum($3)); } | CCRelationalExpression tGEQ CCShiftExpression - { FIXME("'>=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) >= get_ccnum($3)); } CCShiftExpression : CCAdditiveExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 09ef285..8f45a3d 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -152,8 +152,33 @@ ok(@test === true, "@test = " + @test); @set @test = (1==false+1) ok(@test === true, "@test = " + @test); -(a)set @test = (1+true==false+1) -ok(@test === false, "@test = " + @test); +function expect(val, exval) { + ok(val === exval, "got " + val + " expected " + exval); +} + +(a)set @test = (false < 0.5) +expect(@test, true); + +(a)set @test = (true == 0 < 0.5) +expect(@test, true); + +(a)set @test = (false < 0) +expect(@test, false); + +(a)set @test = (false > 0.5) +expect(@test, false); + +(a)set @test = (1 < true) +expect(@test, false); + +(a)set @test = (1 <= true) +expect(@test, true); + +(a)set @test = (1 >= true) +expect(@test, true); + +(a)set @test = (1 >= true-1) +expect(@test, true); @if (false) this wouldn not parse

1 0

Jacek Caban : jscript: Added support for '==' CC expression.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: d9e8c013c6346a0fec875fdd51b5a85b47191713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e8c013c6346a0fec875fdd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:35 2014 +0200 jscript: Added support for '==' CC expression. --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 34ee90c..b22aef8 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -181,7 +181,7 @@ CCBitwiseANDExpression CCEqualityExpression : CCRelationalExpression { $$ = $1; } | CCEqualityExpression tEQ CCRelationalExpression - { FIXME("'==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) == get_ccnum($3)); } | CCEqualityExpression tNEQ CCRelationalExpression { $$ = ccval_bool(get_ccnum($1) != get_ccnum($3)); } | CCEqualityExpression tEQEQ CCRelationalExpression diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 7ce3682..09ef285 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -146,6 +146,15 @@ ok(@test === -1, "@test = " + @test); @set @test = (true-(a)_jscript) ok(@test === 0, "@test = " + @test); +(a)set @test = (true==1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1==false+1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1+true==false+1) +ok(@test === false, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 2c7be38bb4079aab316dd5efe0306bb79344ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7be38bb4079aab316dd5efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:37 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73b872f..a4a11c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,7 +1607,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3264,17 +3264,17 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = 0xffffff & *(const DWORD*)source; - DWORD dstcolor = color << 8; - if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->container->src_blt_color_key, color)) + *(DWORD *)dest = color & ~0xff000000; + else + *(DWORD *)dest = color | 0xff000000; source += 4; dest += 4; }

1 0