February 2015 - Wine-commits

Jacek Caban : jscript: Don't use builtin property for *Error constructors.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: 90d3569c6292f18096d4306317d8fff3890990cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d3569c6292f18096d430631… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:47:51 2015 +0100 jscript: Don't use builtin property for *Error constructors. --- dlls/jscript/global.c | 100 ++++++++++++++------------------------------------ 1 file changed, 28 insertions(+), 72 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 1d1ec5b..dbfb95b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -112,71 +112,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT constructor_call(jsdisp_t *constr, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) -{ - if(flags != DISPATCH_PROPERTYGET) - return jsdisp_call_value(constr, NULL, flags, argc, argv, r); - - *r = jsval_obj(jsdisp_addref(constr)); - return S_OK; -} - -static HRESULT JSGlobal_EvalError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->eval_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RangeError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->range_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_RegExpError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->regexp_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_ReferenceError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->reference_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_SyntaxError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->syntax_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_TypeError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->type_error_constr, flags, argc, argv, r); -} - -static HRESULT JSGlobal_URIError(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->uri_error_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1001,18 +936,11 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, - {EvalErrorW, JSGlobal_EvalError, PROPF_CONSTR|1}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, - {ReferenceErrorW, JSGlobal_ReferenceError, PROPF_CONSTR|1}, - {RegExpErrorW, JSGlobal_RegExpError, PROPF_CONSTR|1}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, {ScriptEngineMajorVersionW, JSGlobal_ScriptEngineMajorVersion, PROPF_METHOD}, {ScriptEngineMinorVersionW, JSGlobal_ScriptEngineMinorVersion, PROPF_METHOD}, - {SyntaxErrorW, JSGlobal_SyntaxError, PROPF_CONSTR|1}, - {TypeErrorW, JSGlobal_TypeError, PROPF_CONSTR|1}, - {URIErrorW, JSGlobal_URIError, PROPF_CONSTR|1}, {decodeURIW, JSGlobal_decodeURI, PROPF_METHOD|1}, {decodeURIComponentW, JSGlobal_decodeURIComponent, PROPF_METHOD|1}, {encodeURIW, JSGlobal_encodeURI, PROPF_METHOD|1}, @@ -1087,6 +1015,34 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, EvalErrorW, jsval_obj(ctx->eval_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, RangeErrorW, jsval_obj(ctx->range_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, ReferenceErrorW, jsval_obj(ctx->reference_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, RegExpErrorW, jsval_obj(ctx->regexp_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, SyntaxErrorW, jsval_obj(ctx->syntax_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, TypeErrorW, jsval_obj(ctx->type_error_constr)); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, URIErrorW, jsval_obj(ctx->uri_error_constr)); + if(FAILED(hres)) + return hres; + hres = create_number_constr(ctx, object_prototype, &ctx->number_constr); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use separated functions for implementing builtin call, get and set operation.
by Alexandre Julliard 05 Feb '15

05 Feb '15

Module: wine Branch: master Commit: b7fae52964e53ab9d4250da8f5d09fe2bce40c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7fae52964e53ab9d4250da8f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 5 14:49:01 2015 +0100 jscript: Use separated functions for implementing builtin call, get and set operation. --- dlls/jscript/array.c | 73 ++++++-------- dlls/jscript/date.c | 21 +--- dlls/jscript/dispex.c | 46 ++++++--- dlls/jscript/function.c | 85 ++++++---------- dlls/jscript/jscript.h | 11 ++- dlls/jscript/jsregexp.c | 250 ++++++++++++++++++++---------------------------- dlls/jscript/number.c | 20 +--- dlls/jscript/object.c | 27 ++---- dlls/jscript/string.c | 50 ++++------ 9 files changed, 242 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7fae52964e53ab9d4250…

1 0

Austin English : include: Add hidusage.h.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 47e7f4fdf24e26ba750f4c12ab7836acbc19de47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e7f4fdf24e26ba750f4c12a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 3 16:08:55 2015 -0600 include: Add hidusage.h. --- include/Makefile.in | 1 + include/ddk/hidsdi.h | 2 +- include/hidusage.h | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 203 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47e7f4fdf24e26ba750f4…

1 0

Piotr Caban : user32/tests: Added GetMessagePos tests.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 008a2b46f5360eea86bf94f46dcc30f4714000cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=008a2b46f5360eea86bf94f46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 3 16:58:05 2015 +0100 user32/tests: Added GetMessagePos tests. --- dlls/user32/tests/win.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 404017f..c6dee75 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7979,6 +7979,67 @@ static void test_smresult(void) CloseHandle(data.thread_replied); } +static void test_GetMessagePos(void) +{ + HWND button; + DWORD pos; + MSG msg; + + button = CreateWindowExA(0, "button", "button", WS_VISIBLE, + 100, 100, 100, 100, 0, 0, 0, NULL); + ok(button != 0, "CreateWindowExA failed\n"); + + SetCursorPos(120, 140); + flush_events(TRUE); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + SetCursorPos(340, 320); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + SendMessageW(button, WM_APP, 0, 0); + pos = GetMessagePos(); + ok(pos == MAKELONG(120, 140), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + SetCursorPos(350, 330); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + + PostMessageA(button, WM_APP, 0, 0); + SetCursorPos(320, 340); + PostMessageA(button, WM_APP+1, 0, 0); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(340, 320), "pos = %08x\n", pos); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(350, 330), "pos = %08x\n", pos); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_APP+1, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(320, 340), "pos = %08x\n", pos); + + SetTimer(button, 1, 250, NULL); + SetCursorPos(330, 350); + GetMessageA(&msg, button, 0, 0); + ok(msg.message == WM_TIMER, "msg.message = %x\n", msg.message); + pos = GetMessagePos(); + todo_wine ok(pos == MAKELONG(330, 350), "pos = %08x\n", pos); + KillTimer(button, 1); + + DestroyWindow(button); +} + START_TEST(win) { char **argv; @@ -8110,6 +8171,7 @@ START_TEST(win) test_update_region(); test_window_without_child_style(); test_smresult(); + test_GetMessagePos(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook);

1 0

Nikolay Sivov : dwrite: Simplify collection_find_family().
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 77189de8b7bb9b19ec6ce90571d890826bbb9d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=77189de8b7bb9b19ec6ce9057… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 4 15:28:48 2015 +0300 dwrite: Simplify collection_find_family(). --- dlls/dwrite/font.c | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ca586ea..3dc5738 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1424,40 +1424,33 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * return create_fontfamily(This->family_data[index], iface, family); } -static HRESULT collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name, UINT32 *index, BOOL *exists) +static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name) { UINT32 i; - if (collection->family_count) { - for (i = 0; i < collection->family_count; i++) { - IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; - HRESULT hr; - int j; - - for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { - WCHAR buffer[255]; - hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); - if (SUCCEEDED(hr)) { - if (!strcmpW(buffer, name)) { - *index = i; - *exists = TRUE; - return S_OK; - } - } - } + for (i = 0; i < collection->family_count; i++) { + IDWriteLocalizedStrings *family_name = collection->family_data[i]->familyname; + HRESULT hr; + int j; + + for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j++) { + WCHAR buffer[255]; + hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); + if (SUCCEEDED(hr) && !strcmpW(buffer, name)) + return i; } - *index = (UINT32)-1; - *exists = FALSE; } - return S_OK; + return ~0u; } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(name), index, exists); - return collection_find_family(This, name, index, exists); + *index = collection_find_family(This, name); + *exists = *index != ~0u; + return S_OK; } static BOOL is_same_fontfile(IDWriteFontFile *left, IDWriteFontFile *right) @@ -1728,7 +1721,6 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat IDWriteFontFileStream *stream; WCHAR buffer[255]; UINT32 index; - BOOL exists; /* alloc and init new font data structure */ font_data = heap_alloc_zero(sizeof(struct dwrite_font_data)); @@ -1755,9 +1747,8 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat buffer[0] = 0; IDWriteLocalizedStrings_GetString(family_name, 0, buffer, sizeof(buffer)/sizeof(WCHAR)); - exists = FALSE; - hr = collection_find_family(collection, buffer, &index, &exists); - if (exists) + index = collection_find_family(collection, buffer); + if (index != ~0u) fontfamily_add_font(collection->family_data[index], font_data); else { struct dwrite_fontfamily_data *family_data;

1 0

Nikolay Sivov : dwrite: Improve error handling during font collection creation.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: afd1911cd7430f24ffc3747df0dbf33e6888459f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd1911cd7430f24ffc3747df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 4 15:34:12 2015 +0300 dwrite: Improve error handling during font collection creation. --- dlls/dwrite/font.c | 83 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3dc5738..1f1f367 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1551,7 +1551,6 @@ static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, s } family_data->fonts[family_data->font_count] = font_data; - InterlockedIncrement(&font_data->ref); family_data->font_count++; return S_OK; } @@ -1617,17 +1616,25 @@ HRESULT get_filestream_from_file(IDWriteFontFile *file, IDWriteFontFileStream ** return hr; } -static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_FACE_TYPE face_type, struct dwrite_font_data *data) +static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_FACE_TYPE face_type, + IDWriteFontFileStream **stream, struct dwrite_font_data **ret) { void *os2_context, *head_context; const void *tt_os2 = NULL, *tt_head = NULL; - IDWriteFontFileStream *stream; + struct dwrite_font_data *data; HRESULT hr; - hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) + data = heap_alloc_zero(sizeof(*data)); + if (!data) + return E_OUTOFMEMORY; + + hr = get_filestream_from_file(file, stream); + if (FAILED(hr)) { + heap_free(data); return hr; + } + data->ref = 1; data->factory = factory; data->file = file; data->face_index = face_index; @@ -1635,23 +1642,29 @@ static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, U IDWriteFontFile_AddRef(file); IDWriteFactory2_AddRef(factory); - opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); - opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); + opentype_get_font_table(*stream, face_type, face_index, MS_OS2_TAG, &tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(*stream, face_type, face_index, MS_HEAD_TAG, &tt_head, &head_context, NULL, NULL); - opentype_get_font_properties(stream, face_type, face_index, &data->stretch, &data->weight, &data->style); - opentype_get_font_metrics(stream, face_type, face_index, &data->metrics, NULL); + opentype_get_font_properties(*stream, face_type, face_index, &data->stretch, &data->weight, &data->style); + opentype_get_font_metrics(*stream, face_type, face_index, &data->metrics, NULL); if (tt_os2) - IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + IDWriteFontFileStream_ReleaseFileFragment(*stream, os2_context); if (tt_head) - IDWriteFontFileStream_ReleaseFileFragment(stream, head_context); - IDWriteFontFileStream_Release(stream); + IDWriteFontFileStream_ReleaseFileFragment(*stream, head_context); + *ret = data; return S_OK; } -static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data *data) +static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct dwrite_fontfamily_data **ret) { + struct dwrite_fontfamily_data *data; + + data = heap_alloc(sizeof(*data)); + if (!data) + return E_OUTOFMEMORY; + data->ref = 1; data->font_count = 0; data->font_alloc = 2; @@ -1665,6 +1678,7 @@ static HRESULT init_fontfamily_data(IDWriteLocalizedStrings *familyname, struct data->familyname = familyname; IDWriteLocalizedStrings_AddRef(familyname); + *ret = data; return S_OK; } @@ -1672,7 +1686,7 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat { struct dwrite_fontcollection *collection; BOOL current = FALSE; - HRESULT hr; + HRESULT hr = S_OK; *ret = NULL; @@ -1689,7 +1703,7 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat TRACE("building font collection:\n"); - while (1) { + while (hr == S_OK) { DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; IDWriteFontFile *file; @@ -1723,24 +1737,22 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat UINT32 index; /* alloc and init new font data structure */ - font_data = heap_alloc_zero(sizeof(struct dwrite_font_data)); - init_font_data(factory, file, i, face_type, font_data); - - hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) { - heap_free (font_data); - return hr; - } + hr = init_font_data(factory, file, i, face_type, &stream, &font_data); + if (FAILED(hr)) + break; /* get family name from font file */ name_table = NULL; opentype_get_font_table(stream, face_type, i, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) + if (name_table) { hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &family_name); + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + } IDWriteFontFileStream_Release(stream); if (FAILED(hr) || !family_name) { WARN("unable to get family name from font\n"); + release_font_data(font_data); continue; } @@ -1749,26 +1761,33 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat index = collection_find_family(collection, buffer); if (index != ~0u) - fontfamily_add_font(collection->family_data[index], font_data); + hr = fontfamily_add_font(collection->family_data[index], font_data); else { struct dwrite_fontfamily_data *family_data; /* create and init new family */ - family_data = heap_alloc(sizeof(*family_data)); - init_fontfamily_data(family_name, family_data); - - /* add font to family, family - to collection */ - fontfamily_add_font(family_data, font_data); - fontcollection_add_family(collection, family_data); + hr = init_fontfamily_data(family_name, &family_data); + if (hr == S_OK) { + /* add font to family, family - to collection */ + hr = fontfamily_add_font(family_data, font_data); + if (hr == S_OK) + hr = fontcollection_add_family(collection, family_data); + + if (FAILED(hr)) + release_fontfamily_data(family_data); + } } IDWriteLocalizedStrings_Release(family_name); + + if (FAILED(hr)) + break; } IDWriteFontFile_Release(file); }; - return S_OK; + return hr; } struct system_fontfile_enumerator

1 0

Nikolay Sivov : dwrite/tests: Fix couple of leaks when creating test font instance.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 34a5cd20865aa3149aa8c4d2e0ebc82419c7b8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a5cd20865aa3149aa8c4d2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 4 15:35:18 2015 +0300 dwrite/tests: Fix couple of leaks when creating test font instance. --- dlls/dwrite/tests/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6bea288..915fb98 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2099,6 +2099,8 @@ static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STY DWRITE_FONT_STRETCH_NORMAL, style, &font); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + IDWriteFontCollection_Release(collection); return font; }

1 0

Stefan Dösinger : wined3d: Fix the color keyed P8 alpha ref value.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 3d49060fdf1906bd756ec7a877fa32d7d6355bfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d49060fdf1906bd756ec7a87… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 4 13:45:30 2015 +0100 wined3d: Fix the color keyed P8 alpha ref value. --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 43dfca0..1753cd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3482,7 +3482,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, * other cases pixels that should be masked away have alpha set to 0. */ if (src_surface->resource.format->id == WINED3DFMT_P8_UINT) gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, - (float)src_surface->container->src_blt_color_key.color_space_low_value / 256.0f); + (float)src_surface->container->src_blt_color_key.color_space_low_value / 255.0f); else gl_info->gl_ops.gl.p_glAlphaFunc(GL_NOTEQUAL, 0.0f); checkGLcall("glAlphaFunc");

1 0

Stefan Dösinger : wined3d: Don' t use TXP for rectangle P8 textures.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: e178b7ec9a206f5e32b38ba6cd6fb7d8cfaa964b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e178b7ec9a206f5e32b38ba6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 4 13:45:31 2015 +0100 wined3d: Don't use TXP for rectangle P8 textures. This was probably taken from the YUV shaders, incorrectly and in reverse logic. It did happen to work though because fragment.texcoord[0].w is 1.0. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a7babda..763a4a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7255,7 +7255,7 @@ static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, /* The alpha-component contains the palette index */ if(textype == GL_TEXTURE_RECTANGLE_ARB) - shader_addline(&buffer, "TXP index, fragment.texcoord[0], texture[0], RECT;\n"); + shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], RECT;\n"); else shader_addline(&buffer, "TEX index, fragment.texcoord[0], texture[0], 2D;\n");

1 0

Jacek Caban : jscript: Don' t use builtin property for exposing Boolean constructor.
by Alexandre Julliard 04 Feb '15

04 Feb '15

Module: wine Branch: master Commit: 6eb49669aaf1a8f7f48af3b628950dd7f0a4d688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb49669aaf1a8f7f48af3b62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 4 16:03:08 2015 +0100 jscript: Don't use builtin property for exposing Boolean constructor. --- dlls/jscript/global.c | 13 ++++--------- dlls/jscript/tests/lang.js | 3 +++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 5ae6019..774ed05 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -129,14 +129,6 @@ static HRESULT JSGlobal_Array(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un return constructor_call(ctx->array_constr, flags, argc, argv, r); } -static HRESULT JSGlobal_Boolean(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->bool_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_Date(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1080,7 +1072,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {ArrayW, JSGlobal_Array, PROPF_CONSTR|1}, - {BooleanW, JSGlobal_Boolean, PROPF_CONSTR|1}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, {DateW, JSGlobal_Date, PROPF_CONSTR|7}, {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, @@ -1206,6 +1197,10 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = jsdisp_propput_dontenum(ctx->global, BooleanW, jsval_obj(ctx->bool_constr)); + if(FAILED(hres)) + return hres; + hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); jsdisp_release(constr); if(FAILED(hres)) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index a55bf75..b846eb2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1453,6 +1453,9 @@ ok(returnTest() === undefined, "returnTest = " + returnTest()); ActiveXObject = 1; ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); +Boolean = 1; +ok(Boolean === 1, "Boolean = " + Boolean); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0