May 2016 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Properly handle function expressions with identifiers.
by Alexandre Julliard 06 May '16

06 May '16

Module: wine Branch: master Commit: e1970c8547aa7fed5a097faf172eadc282b3394e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1970c8547aa7fed5a097faf1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 6 12:56:35 2016 +0200 jscript: Properly handle function expressions with identifiers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 15 ++++--------- dlls/jscript/tests/lang.js | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0c40d1f..77bbc89 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -872,17 +872,11 @@ static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expres return S_OK; } -static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr, BOOL emit_ret) { + unsigned func_id = ctx->func->func_cnt++; ctx->func_tail = ctx->func_tail ? (ctx->func_tail->next = expr) : (ctx->func_head = expr); - - /* FIXME: not exactly right */ - if(expr->identifier && !expr->event_target) { - ctx->func->func_cnt++; - return push_instr_bstr(ctx, OP_ident, expr->identifier); - } - - return push_instr_uint(ctx, OP_func, ctx->func->func_cnt++); + return emit_ret ? push_instr_uint(ctx, OP_func, func_id) : S_OK; } static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL emit_ret) @@ -967,8 +961,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); break; case EXPR_FUNC: - hres = compile_function_expression(ctx, (function_expression_t*)expr); - break; + return compile_function_expression(ctx, (function_expression_t*)expr, emit_ret); case EXPR_GREATER: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); break; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 95655ab..a9f95f8 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -232,6 +232,58 @@ testNoRes(), testNoRes(); tmp = (function(){ return testNoRes(), testRes();})(); +var f1, f2; + +ok(funcexpr() == 2, "funcexpr() = " + funcexpr()); + +f1 = function funcexpr() { return 1; } +ok(f1 != funcexpr, "f1 == funcexpr"); +ok(f1() === 1, "f1() = " + f1()); + +f2 = function funcexpr() { return 2; } +ok(f2 != funcexpr, "f2 != funcexpr"); +ok(f2() === 2, "f2() = " + f2()); + +f1 = null; +for(i = 0; i < 3; i++) { + f2 = function funcexpr2() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; +} + +f1 = null; +for(i = 0; i < 3; i++) { + f2 = function() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; +} + +(function() { + ok(infuncexpr() == 2, "infuncexpr() = " + infuncexpr()); + + f1 = function infuncexpr() { return 1; } + ok(f1 != funcexpr, "f1 == funcexpr"); + ok(f1() === 1, "f1() = " + f1()); + + f2 = function infuncexpr() { return 2; } + ok(f2 != funcexpr, "f2 != funcexpr"); + ok(f2() === 2, "f2() = " + f2()); + + f1 = null; + for(i = 0; i < 3; i++) { + f2 = function infuncexpr2() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; + } + + f1 = null; + for(i = 0; i < 3; i++) { + f2 = function() {}; + ok(f1 != f2, "f1 == f2"); + f1 = f2; + } +})(); + var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); ok(obj1.constructor === Object, "unexpected obj1.constructor");

1 0

Jacek Caban : msctf: Added ITfTransitoryExtensionSink tests.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 4585687e7db342df7b6a56b06243fc3af0ee6e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4585687e7db342df7b6a56b06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 5 13:22:50 2016 +0200 msctf: Added ITfTransitoryExtensionSink tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 67 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index d78509d..16df012 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -62,6 +62,7 @@ static BOOL test_ShouldDeactivate = FALSE; static DWORD tmSinkCookie; static DWORD tmSinkRefCount; +static DWORD dmSinkCookie; static DWORD documentStatus; static ITfDocumentMgr *test_CurrentFocus = NULL; static ITfDocumentMgr *test_PrevFocus = NULL; @@ -622,6 +623,42 @@ static HRESULT ThreadMgrEventSink_Constructor(IUnknown **ppOut) return S_OK; } +static HRESULT WINAPI TfTransitoryExtensionSink_QueryInterface(ITfTransitoryExtensionSink *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITfTransitoryExtensionSink, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TfTransitoryExtensionSink_AddRef(ITfTransitoryExtensionSink *iface) +{ + return 2; +} + +static ULONG WINAPI TfTransitoryExtensionSink_Release(ITfTransitoryExtensionSink *iface) +{ + return 1; +} + +static HRESULT WINAPI TfTransitoryExtensionSink_OnTransitoryExtensionUpdated(ITfTransitoryExtensionSink *iface, ITfContext *pic, + TfEditCookie ecReadOnly, ITfRange *pResultRange, ITfRange *pCompositionRange, BOOL *pfDeleteResultRange) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ITfTransitoryExtensionSinkVtbl TfTransitoryExtensionSinkVtbl = { + TfTransitoryExtensionSink_QueryInterface, + TfTransitoryExtensionSink_AddRef, + TfTransitoryExtensionSink_Release, + TfTransitoryExtensionSink_OnTransitoryExtensionUpdated +}; + +static ITfTransitoryExtensionSink TfTransitoryExtensionSink = { &TfTransitoryExtensionSinkVtbl }; /******************************************************************************************** * Stub text service for testing @@ -1053,6 +1090,34 @@ static void test_ThreadMgrUnadviseSinks(void) ITfSource_Release(source); } +static void test_DocumentMgrAdviseSinks(void) +{ + ITfSource *source; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + dmSinkCookie = 0; + hr = ITfSource_AdviseSink(source, &IID_ITfTransitoryExtensionSink, (IUnknown*)&TfTransitoryExtensionSink, &dmSinkCookie); + ok(hr == S_OK,"Failed to Advise Sink\n"); + + ITfSource_Release(source); +} + +static void test_DocumentMgrUnadviseSinks(void) +{ + ITfSource *source = NULL; + HRESULT hr; + + hr = ITfDocumentMgr_QueryInterface(g_dm, &IID_ITfSource, (void**)&source); + ok(hr == S_OK,"Failed to get IID_ITfSource for DocumentMgr\n"); + + hr = ITfSource_UnadviseSink(source, dmSinkCookie); + ok(hr == S_OK,"Failed to unadvise Sink\n"); + ITfSource_Release(source); +} + /********************************************************************** * ITfKeyEventSink **********************************************************************/ @@ -2240,6 +2305,7 @@ START_TEST(inputprocessor) test_ThreadMgrAdviseSinks(); test_Activate(); test_startSession(); + test_DocumentMgrAdviseSinks(); test_TfGuidAtom(); test_ClientId(); test_KeystrokeMgr(); @@ -2250,6 +2316,7 @@ START_TEST(inputprocessor) test_FindClosestCategory(); test_Disable(); test_ThreadMgrUnadviseSinks(); + test_DocumentMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); test_profile_mgr();

1 0

Nikolay Sivov : dwrite/tests: A test for references returned from IDWriteFontFace3.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: ca99107daa82287305c92f5f952648f62393bdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca99107daa82287305c92f5f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:22 2016 +0300 dwrite/tests: A test for references returned from IDWriteFontFace3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0ae3251..99572ed 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5956,6 +5956,30 @@ todo_wine IDWriteFontFaceReference_Release(ref); IDWriteFontFaceReference_Release(ref1); + + /* references returned from IDWriteFontFace3 */ + hr = IDWriteFont3_CreateFontFace(font3, &fontface); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref == ref1, "got %p, %p\n", ref1, ref); + + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFaceReference_Release(ref1); + + IDWriteFontFace3_Release(fontface); +} IDWriteFont3_Release(font3); IDWriteFactory3_Release(factory3);

1 0

Nikolay Sivov : dwrite: Fix reference equality condition.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: bda5f5700863c85b114233ccb212f41a49eed25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda5f5700863c85b114233ccb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:23 2016 +0300 dwrite: Fix reference equality condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- dlls/dwrite/tests/font.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a890250..0edeebf 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5416,7 +5416,9 @@ static BOOL WINAPI fontfacereference_Equals(IDWriteFontFaceReference *iface, IDW if (FAILED(IDWriteFontFaceReference_GetFontFile(ref, &file))) return FALSE; - ret = is_same_fontfile(This->file, file); + ret = is_same_fontfile(This->file, file) && + This->index == IDWriteFontFaceReference_GetFontFaceIndex(ref) && + This->simulations == IDWriteFontFaceReference_GetSimulations(ref); IDWriteFontFile_Release(file); return ret; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 99572ed..affdfda 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5853,6 +5853,7 @@ static void test_CreateFontFaceReference(void) UINT32 index; WCHAR *path; HRESULT hr; + BOOL ret; factory = create_factory(); @@ -5923,7 +5924,23 @@ todo_wine IDWriteFontFace3_Release(fontface); IDWriteFontFace3_Release(fontface1); + /* reference equality */ + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(ret, "got %d\n", ret); + IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(!ret, "got %d\n", ret); IDWriteFontFaceReference_Release(ref1); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_BOLD, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ret = IDWriteFontFaceReference_Equals(ref, ref1); + ok(!ret, "got %d\n", ret); + IDWriteFontFaceReference_Release(ref1); + IDWriteFontFaceReference_Release(ref); /* create reference from a file */

1 0

Nikolay Sivov : dwrite: Validate simulation flags and fail face/ reference creation.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 890312ccfd0f54ece6bd330355183cc84a3a97ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=890312ccfd0f54ece6bd33035… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 5 14:35:24 2016 +0300 dwrite: Validate simulation flags and fail face/reference creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 6 ++++++ dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 3 +++ dlls/dwrite/tests/font.c | 13 ++++++++++++- 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 05b73df..61409c8 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -111,6 +111,12 @@ static inline FLOAT get_scaled_advance_width(INT32 advance, FLOAT emSize, const return (FLOAT)advance * emSize / (FLOAT)metrics->designUnitsPerEm; } +static inline BOOL is_simulation_valid(DWRITE_FONT_SIMULATIONS simulations) +{ + return (simulations & ~(DWRITE_FONT_SIMULATIONS_NONE | DWRITE_FONT_SIMULATIONS_BOLD | + DWRITE_FONT_SIMULATIONS_OBLIQUE)) == 0; +} + struct gdiinterop { IDWriteGdiInterop1 IDWriteGdiInterop1_iface; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0edeebf..2aad837 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5568,6 +5568,9 @@ HRESULT create_fontfacereference(IDWriteFactory3 *factory, IDWriteFontFile *file *ret = NULL; + if (!is_simulation_valid(simulations)) + return E_INVALIDARG; + ref = heap_alloc(sizeof(*ref)); if (!ref) return E_OUTOFMEMORY; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 0ecda11..7c9f085 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -839,6 +839,9 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory3 *iface, if (req_facetype != DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION && index) return E_INVALIDARG; + if (!is_simulation_valid(simulations)) + return E_INVALIDARG; + /* check actual file/face type */ is_supported = FALSE; face_type = DWRITE_FONT_FACE_TYPE_UNKNOWN; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index affdfda..5169f2a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1524,6 +1524,13 @@ if (0) /* crashes on native */ ok(face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %i\n", face_type); ok(count == 1, "got %i\n", count); + /* invalid simulation flags */ + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, ~0u, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, 0xf, &fontface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* try mismatching face type, the one that's not supported */ hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); @@ -5869,7 +5876,11 @@ static void test_CreateFontFaceReference(void) hr = IDWriteFactory3_CreateFontFaceReference(factory3, NULL, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - /* test file is not a collection, but reference could still be created */ + /* out of range simulation flags */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, ~0u, &ref); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* test file is not a collection, but reference could still be created with non-zero face index */ hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Ken Thomases : winemac: Use floor() rather than truncation when converting Cocoa event positions to integers.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 3d73f62f0161af7e34b90bae9dba6613e72d9880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d73f62f0161af7e34b90bae9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 4 10:11:04 2016 -0500 winemac: Use floor() rather than truncation when converting Cocoa event positions to integers. This is so negative coordinates are adjusted in the same direction as positive ones (left and up). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 12 ++++++------ dlls/winemac.drv/cocoa_window.m | 8 ++++---- dlls/winemac.drv/mouse.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 176d35c..97d13e2 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1592,8 +1592,8 @@ static NSString* WineLocalizedString(unsigned int stringID) [self clipCursorLocation:&point]; event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); - event->mouse_moved.x = point.x; - event->mouse_moved.y = point.y; + event->mouse_moved.x = floor(point.x); + event->mouse_moved.y = floor(point.y); mouseMoveDeltaX = 0; mouseMoveDeltaY = 0; @@ -1733,8 +1733,8 @@ static NSString* WineLocalizedString(unsigned int stringID) event = macdrv_create_event(MOUSE_BUTTON, window); event->mouse_button.button = [theEvent buttonNumber]; event->mouse_button.pressed = pressed; - event->mouse_button.x = pt.x; - event->mouse_button.y = pt.y; + event->mouse_button.x = floor(pt.x); + event->mouse_button.y = floor(pt.y); event->mouse_button.time_ms = [self ticksForEventTime:[theEvent timestamp]]; [window.queue postEvent:event]; @@ -1812,8 +1812,8 @@ static NSString* WineLocalizedString(unsigned int stringID) BOOL continuous = FALSE; event = macdrv_create_event(MOUSE_SCROLL, window); - event->mouse_scroll.x = pt.x; - event->mouse_scroll.y = pt.y; + event->mouse_scroll.x = floor(pt.x); + event->mouse_scroll.y = floor(pt.y); event->mouse_scroll.time_ms = [self ticksForEventTime:[theEvent timestamp]]; if (CGEventGetIntegerValueField(cgevent, kCGScrollWheelEventIsContinuous)) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3012118..1b0b655 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -2630,8 +2630,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_query* query = macdrv_create_query(); query->type = QUERY_DRAG_OPERATION; query->window = (macdrv_window)[self retain]; - query->drag_operation.x = pt.x; - query->drag_operation.y = pt.y; + query->drag_operation.x = floor(pt.x); + query->drag_operation.y = floor(pt.y); query->drag_operation.offered_ops = [sender draggingSourceOperationMask]; query->drag_operation.accepted_op = NSDragOperationNone; query->drag_operation.pasteboard = (CFTypeRef)[pb retain]; @@ -2652,8 +2652,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi macdrv_query* query = macdrv_create_query(); query->type = QUERY_DRAG_DROP; query->window = (macdrv_window)[self retain]; - query->drag_drop.x = pt.x; - query->drag_drop.y = pt.y; + query->drag_drop.x = floor(pt.x); + query->drag_drop.y = floor(pt.y); query->drag_drop.op = [sender draggingSourceOperationMask]; query->drag_drop.pasteboard = (CFTypeRef)[pb retain]; diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index f9130c0..f25b06d 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -697,8 +697,8 @@ BOOL CDECL macdrv_GetCursorPos(LPPOINT pos) if (ret) { TRACE("pointer at (%g,%g) server pos %d,%d\n", pt.x, pt.y, pos->x, pos->y); - pos->x = pt.x; - pos->y = pt.y; + pos->x = floor(pt.x); + pos->y = floor(pt.y); } return ret; }

1 0

Andrew Eikum : winmm: Restrict some MCI actions to the creating thread.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: d7cc002566e375ccea62777befe3a67554ad6c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7cc002566e375ccea62777be… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 4 12:42:53 2016 -0500 winmm: Restrict some MCI actions to the creating thread. This reverts commit 46d5973961fe2266074ac2855368c3fcf987c1b5 and fixes bug 38241 another way. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciqtz32/mciqtz.c | 199 +++++++++++------------------------------ dlls/mciqtz32/mciqtz_private.h | 13 --- dlls/winmm/mci.c | 6 ++ dlls/winmm/tests/mci.c | 41 +++++++++ 4 files changed, 97 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7cc002566e375ccea627…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: 2fff4d0343842d9e9efc8e61f6e9021f1d73e5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff4d0343842d9e9efc8e61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 4 22:23:45 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index f6968af..a78a280 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-14 19:13+0300\n" +"PO-Revision-Date: 2016-05-04 22:10+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11650,7 +11650,7 @@ msgstr "reg: не удалось завершить операцию. Произ #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Поиск завершён. Найдено совпадений: %1!d!\n" #: regedit.rc:34 msgid "&Registry"

1 0

Alistair Leslie-Hughes : inetcomm: Improve IMimeMessage SetOption.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: dcb659f03228fa9364cdcccda5a5ca0f6e17369d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb659f03228fa9364cdcccda… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 09:17:36 2016 +0000 inetcomm: Improve IMimeMessage SetOption. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 16 ++++++++++++---- dlls/inetcomm/tests/mimeole.c | 13 ++++++++++--- include/mimeole.idl | 4 ++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 96eab81..c653555 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2305,27 +2305,35 @@ static HRESULT WINAPI MimeMessage_SetOption( const TYPEDID oid, LPCPROPVARIANT pValue) { - HRESULT hr = E_NOTIMPL; + HRESULT hr = S_OK; TRACE("(%p)->(%08x, %p)\n", iface, oid, pValue); + /* Message ID is checked before type. + * OID 0x4D -> 0x56 and 0x58 aren't defined but will filtered out later. + */ + if(TYPEDID_ID(oid) < TYPEDID_ID(OID_ALLOW_8BIT_HEADER) || TYPEDID_ID(oid) > TYPEDID_ID(OID_SECURITY_2KEY_CERT_BAG_64)) + { + WARN("oid (%08x) out of range\n", oid); + return MIME_E_INVALID_OPTION_ID; + } + if(pValue->vt != TYPEDID_TYPE(oid)) { WARN("Called with vartype %04x and oid %08x\n", pValue->vt, oid); - return E_INVALIDARG; + return S_OK; } switch(oid) { case OID_HIDE_TNEF_ATTACHMENTS: FIXME("OID_HIDE_TNEF_ATTACHMENTS (value %d): ignoring\n", pValue->u.boolVal); - hr = S_OK; break; case OID_SHOW_MACBINARY: FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); - hr = S_OK; break; default: FIXME("Unhandled oid %08x\n", oid); + hr = MIME_E_INVALID_OPTION_ID; } return hr; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 498bbb7..f0fac08 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -412,7 +412,7 @@ static void test_MessageOptions(void) prop.u.pszVal = CoTaskMemAlloc(strlen(string)+1); strcpy(prop.u.pszVal, string); hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); - todo_wine ok(hr == S_OK, "ret %08x\n", hr); + ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); @@ -426,7 +426,7 @@ static void test_MessageOptions(void) prop.u.pszVal = CoTaskMemAlloc(strlen(zero)+1); strcpy(prop.u.pszVal, zero); hr = IMimeMessage_SetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); - todo_wine ok(hr == S_OK, "ret %08x\n", hr); + ok(hr == S_OK, "ret %08x\n", hr); PropVariantClear(&prop); hr = IMimeMessage_GetOption(msg, OID_HIDE_TNEF_ATTACHMENTS, &prop); @@ -439,7 +439,14 @@ static void test_MessageOptions(void) prop.vt = VT_BOOL; prop.u.boolVal = TRUE; hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); - todo_wine ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); + PropVariantClear(&prop); + + /* Out of range before type. */ + prop.vt = VT_I4; + prop.u.lVal = 1; + hr = IMimeMessage_SetOption(msg, 0xff00000a, &prop); + ok(hr == MIME_E_INVALID_OPTION_ID, "ret %08x\n", hr); PropVariantClear(&prop); IMimeMessage_Release(msg); diff --git a/include/mimeole.idl b/include/mimeole.idl index 5990c29..4a0d86c 100644 --- a/include/mimeole.idl +++ b/include/mimeole.idl @@ -153,6 +153,7 @@ cpp_quote(" PID_ATT_ACCOUNTNAME = 78,") cpp_quote(" PID_LAST = 79,") cpp_quote("} MIMEPROPID;") +cpp_quote("#define TYPEDID_ID(_typedid) (((ULONG)(_typedid))>>16)") cpp_quote("#define TYPEDID_MASK ((ULONG)0xffff)") cpp_quote("#define TYPEDID_TYPE(t) ((VARTYPE)((t) & TYPEDID_MASK))") @@ -177,6 +178,9 @@ cpp_quote("#define OID_CAN_INLINE_TEXT_BODIES (0x00380000 | VT_BOOL)") cpp_quote("#define OID_SHOW_MACBINARY (0x00390000 | VT_BOOL)") cpp_quote("#define OID_SAVEBODY_KEEPBOUNDARY (0x00400000 | VT_BOOL)") +cpp_quote("#define OID_SECURITY_2KEY_CERT_BAG (0x00590000 | VT_VECTOR | VT_UI4)") +cpp_quote("#define OID_SECURITY_2KEY_CERT_BAG_64 (0x00590000 | VT_VECTOR | VT_UI8)") + [ uuid(e4b28371-83b0-11d0-8259-00c04fd85ab4), version(1.0)

1 0

Alistair Leslie-Hughes : inetcomm: Ignore OID_SAVEBODY_KEEPBOUNDARY value in IMimeMessage_SetOption.
by Alexandre Julliard 05 May '16

05 May '16

Module: wine Branch: master Commit: c51c319b9f5f55103c49ec6876ad3f7730c8b525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51c319b9f5f55103c49ec687… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 3 09:17:45 2016 +0000 inetcomm: Ignore OID_SAVEBODY_KEEPBOUNDARY value in IMimeMessage_SetOption. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index c653555..14739ab 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2331,6 +2331,9 @@ static HRESULT WINAPI MimeMessage_SetOption( case OID_SHOW_MACBINARY: FIXME("OID_SHOW_MACBINARY (value %d): ignoring\n", pValue->u.boolVal); break; + case OID_SAVEBODY_KEEPBOUNDARY: + FIXME("OID_SAVEBODY_KEEPBOUNDARY (value %d): ignoring\n", pValue->u.boolVal); + break; default: FIXME("Unhandled oid %08x\n", oid); hr = MIME_E_INVALID_OPTION_ID;

1 0