May 2011 - Wine-Commits - list.winehq.org

Thomas Mullaly : mshtml/tests: Added IDispatch event tests.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: ea2ab11a74df1e29707d7f888bd6b6ee4089f362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2ab11a74df1e29707d7f888… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Sat May 7 22:56:52 2011 -0400 mshtml/tests: Added IDispatch event tests. --- dlls/mshtml/tests/htmldoc.c | 109 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea2ab11a74df1e29707d7…

1 0

Thomas Mullaly : mshtml/tests: Added more IDispatch event tests.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 34a297fe76ce63487a93a78b1fdfd476c115a703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a297fe76ce63487a93a78b1… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Mon May 9 10:23:07 2011 -0400 mshtml/tests: Added more IDispatch event tests. --- dlls/mshtml/tests/events.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 32f943f..212f0a1 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); DEFINE_EXPECT(doccp_onclick_cancel); DEFINE_EXPECT(div_onclick_disp); +DEFINE_EXPECT(invoke_onclick); DEFINE_EXPECT(iframe_onreadystatechange_loading); DEFINE_EXPECT(iframe_onreadystatechange_interactive); DEFINE_EXPECT(iframe_onreadystatechange_complete); @@ -1300,6 +1301,91 @@ static void unregister_cp(IUnknown *unk, REFIID riid, DWORD cookie) ok(hres == S_OK, "Unadvise failed: %08x\n", hres); } +static HRESULT WINAPI EventDispatch_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "Unexpected call\n"); + return E_NOINTERFACE; +} + +static DWORD WINAPI EventDispatch_AddRef(IDispatch *iface) +{ + return 2; +} + +static DWORD WINAPI EventDispatch_Release(IDispatch *iface) +{ + return 1; +} + +static HRESULT WINAPI EventDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventDispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventDispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok(pDispParams != NULL, "pDispParams == NULL\n"); + ok(pExcepInfo != NULL, "pExcepInfo == NULL\n"); + ok(puArgErr != NULL, "puArgErr == NULL\n"); + ok(V_VT(pVarResult) == 0, "V_VT(pVarResult) = %d\n", V_VT(pVarResult)); + ok(wFlags == DISPATCH_METHOD, "wFlags = %d\n", wFlags); + + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT2(invoke_onclick); + break; + case DISPID_HTMLDOCUMENTEVENTS2_ONPROPERTYCHANGE: + case DISPID_HTMLDOCUMENTEVENTS2_ONREADYSTATECHANGE: + case 1027: + case 1034: + case 1037: + case 1044: + case 1045: + case 1047: + case 1048: + case 1049: + break; /* TODO */ + default: + ok(0, "Unexpected call: %d\n", dispIdMember); + } + + return S_OK; +} + +static const IDispatchVtbl EventDispatchVtbl = { + EventDispatch_QueryInterface, + EventDispatch_AddRef, + EventDispatch_Release, + EventDispatch_GetTypeInfoCount, + EventDispatch_GetTypeInfo, + EventDispatch_GetIDsOfNames, + EventDispatch_Invoke +}; + +static IDispatch EventDispatch = { &EventDispatchVtbl }; + static void test_onclick(IHTMLDocument2 *doc) { IHTMLElement *div, *body; @@ -1307,6 +1393,8 @@ static void test_onclick(IHTMLDocument2 *doc) VARIANT v; HRESULT hres; + register_cp((IUnknown*)doc, &IID_IDispatch, (IUnknown*)&EventDispatch); + div = get_elem_id(doc, "clickdiv"); elem_attach_event((IUnknown*)div, "abcde", (IDispatch*)&nocall_obj); @@ -1366,11 +1454,13 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(invoke_onclick); pump_msgs(&called_document_onclick); CHECK_CALLED(div_onclick); CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + todo_wine CHECK_CALLED(invoke_onclick); } xy_todo = TRUE; @@ -1379,6 +1469,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); ok(hres == S_OK, "click failed: %08x\n", hres); @@ -1387,11 +1478,13 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + todo_wine CHECK_CALLED(invoke_onclick); SET_EXPECT(div_onclick); SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(invoke_onclick); V_VT(&v) = VT_EMPTY; elem_fire_event((IUnknown*)div, "onclick", &v); @@ -1400,6 +1493,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + todo_wine CHECK_CALLED(invoke_onclick); cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); @@ -1412,6 +1506,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); + SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); ok(hres == S_OK, "click failed: %08x\n", hres); @@ -1423,6 +1518,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); + todo_wine CHECK_CALLED(invoke_onclick); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); @@ -1442,6 +1538,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(div_onclick_attached); SET_EXPECT(body_onclick); SET_EXPECT(document_onclick); + SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); ok(hres == S_OK, "click failed: %08x\n", hres); @@ -1449,6 +1546,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(div_onclick_attached); CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + todo_wine CHECK_CALLED(invoke_onclick); IHTMLElement_Release(div); IHTMLElement_Release(body);

1 0

Aric Stewart : usp10: Correct lookahead offset in Coverage-based Chaining Context Glyph Substitution .
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: ecd43b4bd84de84d79b34bb44fabebbd4fa70731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd43b4bd84de84d79b34bb44… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 19 10:47:36 2011 -0500 usp10: Correct lookahead offset in Coverage-based Chaining Context Glyph Substitution. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index fb6084e..9263e19 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -690,7 +690,7 @@ static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSU for (k = 0; k < GET_BE_WORD(ccsf3_3->LookaheadGlyphCount); k++) { offset = GET_BE_WORD(ccsf3_3->Coverage[k]); - if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k+1))]) == -1) + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) break; } if (k != GET_BE_WORD(ccsf3_3->LookaheadGlyphCount))

1 0

Alexandre Julliard : quartz: Make sure the preferred allocator pointer is initialized.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 7f6e677d5ad5048dd2f1defb50f64928c380606e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6e677d5ad5048dd2f1defb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 10:28:21 2011 +0200 quartz: Make sure the preferred allocator pointer is initialized. --- dlls/quartz/pin.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 2a3b2d1..af26a6b 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -199,6 +199,7 @@ static HRESULT PullPin_Init(const IPinVtbl *PullPin_Vtbl, const PIN_INFO * pPinI pPinImpl->fnDone = pDone; pPinImpl->fnPreConnect = NULL; pPinImpl->pAlloc = NULL; + pPinImpl->prefAlloc = NULL; pPinImpl->pReader = NULL; pPinImpl->hThread = NULL; pPinImpl->hEventStateChanged = CreateEventW(NULL, TRUE, TRUE, NULL);

1 0

Nikolay Sivov : explorerframe: Get rid of interface pointer casts.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: 478316ceec8e5c2ecb177972a8f9184169fc531b URL: http://source.winehq.org/git/wine.git/?a=commit;h=478316ceec8e5c2ecb177972a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 18 15:21:37 2011 +0400 explorerframe: Get rid of interface pointer casts. --- dlls/explorerframe/nstc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 9628543..9a8c75b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -495,7 +495,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) ERR("Failed to get the System Image List.\n"); } - INameSpaceTreeControl_AddRef((INameSpaceTreeControl*)This); + INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); /* Subclass the treeview to get the keybord events. */ This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, @@ -528,10 +528,10 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) RemovePropA(This->hwnd_tv, "PROP_THIS"); } - INameSpaceTreeControl_RemoveAllRoots((INameSpaceTreeControl*)This); + INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface); /* This reference was added in create_namespacetree */ - INameSpaceTreeControl_Release((INameSpaceTreeControl*)This); + INameSpaceTreeControl2_Release(&This->INameSpaceTreeControl2_iface); return TRUE; } @@ -1597,8 +1597,8 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void list_init(&nstc->roots); - ret = INameSpaceTreeControl_QueryInterface((INameSpaceTreeControl*)nstc, riid, ppv); - INameSpaceTreeControl_Release((INameSpaceTreeControl*)nstc); + ret = INameSpaceTreeControl2_QueryInterface(&nstc->INameSpaceTreeControl2_iface, riid, ppv); + INameSpaceTreeControl2_Release(&nstc->INameSpaceTreeControl2_iface); TRACE("--(%p)\n", ppv); return ret;

1 0

Nikolay Sivov : comctl32/tests: Some tests for TVM_GETNEXTITEM and item toggle.
by Alexandre Julliard May 20, 2011

May 20, 2011

Module: wine Branch: master Commit: f9ca298b21a79af22a26a150671526d6b364b673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ca298b21a79af22a26a1506… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 18 15:14:33 2011 +0400 comctl32/tests: Some tests for TVM_GETNEXTITEM and item toggle. --- dlls/comctl32/tests/treeview.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0b43e87..0437d65 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1341,6 +1341,12 @@ static void test_expandnotify(void) the only way is to reset with all children removed */ ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "collapse after expand notifications", FALSE); + /* try to toggle child that doesn't have children itself */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_EXPAND, TVE_TOGGLE, (LPARAM)hChild); + expect(FALSE, ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "toggle node without children", TRUE); + DestroyWindow(hTree); /* test TVM_GETITEMRECT inside TVN_ITEMEXPANDED notification */ @@ -1350,6 +1356,7 @@ static void test_expandnotify(void) ret = TreeView_Select(hTree, hChild, TVGN_CARET); g_get_rect_in_expand = FALSE; ok(ret, "got %d\n", ret); + DestroyWindow(hTree); } @@ -1602,6 +1609,44 @@ static void test_TVS_CHECKBOXES(void) DestroyWindow(hTree); } +static void test_TVM_GETNEXTITEM(void) +{ + HTREEITEM item; + HWND hTree; + + hTree = create_treeview_control(0); + fill_tree(hTree); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)TVI_ROOT); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)hRoot); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)hChild); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CHILD, 0); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)hRoot); + ok(item == hChild, "got %p, expected %p\n", item, hChild); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)TVI_ROOT); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_PARENT, 0); + ok(item == NULL, "got %p\n", item); + + item = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)hChild); + ok(item == hRoot, "got %p, expected %p\n", item, hRoot); + + DestroyWindow(hTree); +} + START_TEST(treeview) { HMODULE hComctl32; @@ -1672,6 +1717,7 @@ START_TEST(treeview) test_delete_items(); test_htreeitem_layout(); test_TVS_CHECKBOXES(); + test_TVM_GETNEXTITEM(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Alistair Leslie-Hughes : gdi32: Add support in DeviceCaps CURVECAPS, LINECAPS, POLYGONALCAPS for EnhMetafiles.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: 5a7dba5a70c4c5cc29669358c0faddeb85af5b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7dba5a70c4c5cc29669358c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 18 14:24:01 2011 +1000 gdi32: Add support in DeviceCaps CURVECAPS, LINECAPS, POLYGONALCAPS for EnhMetafiles. --- dlls/gdi32/enhmfdrv/dc.c | 9 +++++++++ dlls/gdi32/tests/metafile.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 4b1e311..7a84265 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -541,6 +541,15 @@ INT CDECL EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) return physDev->planes; case NUMCOLORS: return physDev->numcolors; + case CURVECAPS: + return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | + CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); + case LINECAPS: + return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | + LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); + case POLYGONALCAPS: + return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | + PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); default: FIXME("Unimplemented cap %d\n", cap); return 0; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 002e66a..206e15a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2806,6 +2806,7 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) METAHEADER *mh = NULL; METARECORD *rec; INT horz_res, vert_res, horz_size, vert_size; + INT curve_caps, line_caps, poly_caps; display_dc = GetDC(NULL); ok(display_dc != NULL, "display_dc is NULL\n"); @@ -2817,6 +2818,16 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) emf_dc = CreateEnhMetaFileA(display_dc, NULL, rc, NULL); ok(emf_dc != NULL, "emf_dc is NULL\n"); + + curve_caps = GetDeviceCaps(emf_dc, CURVECAPS); + ok(curve_caps == 511, "expect 511 got %d\n", curve_caps); + + line_caps = GetDeviceCaps(emf_dc, LINECAPS); + ok(line_caps == 254, "expect 254 got %d\n", line_caps); + + poly_caps = GetDeviceCaps(emf_dc, POLYGONALCAPS); + ok(poly_caps == 255, "expect 511 got %d\n", poly_caps); + for(i = 0; i < 3000; i++) /* This is enough to take emf_size > 0xffff */ Rectangle(emf_dc, 0, 0, 1000, 20); emf = CloseEnhMetaFile(emf_dc);

1 0

Piotr Caban : msvcrt: Make scanf functions thread safe.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: 73b9acf2735055df6ae285137f047b36da4c1b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73b9acf2735055df6ae285137… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 15:32:00 2011 +0200 msvcrt: Make scanf functions thread safe. --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/scanf.h | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index bd41bac..e677022 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -784,6 +784,8 @@ int __cdecl MSVCRT_iswspace(MSVCRT_wint_t); int __cdecl MSVCRT_iswdigit(MSVCRT_wint_t); int __cdecl MSVCRT_isleadbyte(int); +void __cdecl MSVCRT__lock_file(MSVCRT_FILE*); +void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*); int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 8b796b1..8324349 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,6 +48,8 @@ #ifdef CONSOLE #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) +#define _LOCK_FILE_(file) MSVCRT__lock_file(MSVCRT_stdin) +#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(MSVCRT_stdin) #ifdef WIDE_SCANF #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vcwscanf_s_l(const char *format, MSVCRT__locale_t locale, __ms_va_list ap) @@ -68,6 +70,8 @@ #ifdef STRING_LEN #define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++)) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) +#define _LOCK_FILE_(file) do {} while(0) +#define _UNLOCK_FILE_(file) do {} while(0) #ifdef WIDE_SCANF #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vsnwscanf_s_l(const MSVCRT_wchar_t *file, MSVCRT_size_t length, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) @@ -84,6 +88,8 @@ #else /* STRING_LEN */ #define _GETC_(file) (consumed++, *file++) #define _UNGETC_(nch, file) do { file--; consumed--; } while(0) +#define _LOCK_FILE_(file) do {} while(0) +#define _UNLOCK_FILE_(file) do {} while(0) #ifdef WIDE_SCANF #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vswscanf_s_l(const MSVCRT_wchar_t *file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) @@ -102,6 +108,8 @@ #ifdef WIDE_SCANF #define _GETC_(file) (consumed++, MSVCRT_fgetwc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetwc(nch, file); consumed--; } while(0) +#define _LOCK_FILE_(file) MSVCRT__lock_file(file) +#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file) #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vfwscanf_s_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* SECURE */ @@ -110,6 +118,8 @@ #else /* WIDE_SCANF */ #define _GETC_(file) (consumed++, MSVCRT_fgetc(file)) #define _UNGETC_(nch, file) do { MSVCRT_ungetc(nch, file); consumed--; } while(0) +#define _LOCK_FILE_(file) MSVCRT__lock_file(file) +#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file) #ifdef SECURE #define _FUNCTION_ static int MSVCRT_vfscanf_s_l(MSVCRT_FILE* file, const char *format, MSVCRT__locale_t locale, __ms_va_list ap) #else /* SECURE */ @@ -134,8 +144,13 @@ _FUNCTION_ { #endif /* STRING */ #endif /* CONSOLE */ #endif /* WIDE_SCANF */ + _LOCK_FILE_(file); + nch = _GETC_(file); - if (nch == _EOF_) return _EOF_RET; + if (nch == _EOF_) { + _UNLOCK_FILE_(file); + return _EOF_RET; + } if(!locale) locale = get_locale(); @@ -400,6 +415,7 @@ _FUNCTION_ { *sptr++ = _CHAR2SUPPORTED_(nch); if(size>1) size--; else { + _UNLOCK_FILE_(file); *sptr_beg = 0; return rd; } @@ -429,6 +445,7 @@ _FUNCTION_ { *sptr++ = _WIDE2SUPPORTED_(nch); if(size>1) size--; else { + _UNLOCK_FILE_(file); *sptr_beg = 0; return rd; } @@ -474,6 +491,7 @@ _FUNCTION_ { *str++ = _CHAR2SUPPORTED_(nch); if(size) size--; else { + _UNLOCK_FILE_(file); *pstr = 0; return rd; } @@ -499,6 +517,7 @@ _FUNCTION_ { *str++ = _WIDE2SUPPORTED_(nch); if(size) size--; else { + _UNLOCK_FILE_(file); *pstr = 0; return rd; } @@ -586,6 +605,7 @@ _FUNCTION_ { if (width>0) width--; if(size>1) size--; else { + _UNLOCK_FILE_(file); *str = 0; return rd; } @@ -628,7 +648,9 @@ _FUNCTION_ { if (nch!=_EOF_) { _UNGETC_(nch, file); } + TRACE("returning %d\n", rd); + _UNLOCK_FILE_(file); return rd; } @@ -642,5 +664,7 @@ _FUNCTION_ { #undef _CHAR2DIGIT_ #undef _GETC_ #undef _UNGETC_ +#undef _LOCK_FILE_ +#undef _UNLOCK_FILE_ #undef _FUNCTION_ #undef _BITMAPSIZE_

1 0

Piotr Caban : msvcrt: Make printf functions thread safe.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: c5894bacf5cc55c1e25bb9905535d5ef0dc2ab14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5894bacf5cc55c1e25bb9905… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 15:31:51 2011 +0200 msvcrt: Make printf functions thread safe. --- dlls/msvcrt/file.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ee95c28..b9c7e90 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3563,7 +3563,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { - return pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + int ret; + + MSVCRT__lock_file(file); + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -3571,12 +3577,18 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { + int ret; + if(!MSVCRT_CHECK_PMT(file != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } - return pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + MSVCRT__lock_file(file); + ret = pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -3584,7 +3596,13 @@ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { - return pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + int ret; + + MSVCRT__lock_file(file); + ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; } /********************************************************************* @@ -3592,12 +3610,18 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { + int ret; + if(!MSVCRT_CHECK_PMT( file != NULL)) { *MSVCRT__errno() = MSVCRT_EINVAL; return -1; } - return pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + MSVCRT__lock_file(file); + ret = pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Allocate ioinfo tables dynamically.
by Alexandre Julliard May 19, 2011

May 19, 2011

Module: wine Branch: master Commit: 2679186d19031b900c8bae53ca13a3eebaf0799d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2679186d19031b900c8bae53c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 19 15:31:12 2011 +0200 msvcrt: Allocate ioinfo tables dynamically. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/file.c | 303 ++++++++++++++++++++++++------------------- 4 files changed, 176 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2679186d19031b900c8ba…

1 0