February 2010 - Wine-commits

Piotr Caban : oleaut32: Added implementation of ITypeInfo2_GetRefTypeOfImplType.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 77e1b7a13f858e678e8918a3c7e3987ebd93d385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1b7a13f858e678e8918a3c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 24 14:28:09 2010 +0100 oleaut32: Added implementation of ITypeInfo2_GetRefTypeOfImplType. --- dlls/oleaut32/tests/typelib.c | 23 +++++++++++++++++++++++ dlls/oleaut32/typelib2.c | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index be90570..aaaaceb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1037,6 +1037,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface1, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 3, "hreftype = %d\n", hreftype); + memset(&funcdesc, 0, sizeof(FUNCDESC)); funcdesc.funckind = FUNC_PUREVIRTUAL; funcdesc.invkind = INVOKE_PROPERTYGET; @@ -1168,6 +1172,9 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&interface2); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface2, 0, &hreftype); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + hres = ICreateTypeInfo_AddRefTypeInfo(createti, interface1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); @@ -1180,6 +1187,10 @@ static void test_CreateTypeLib(void) { hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeInfo_GetRefTypeOfImplType(interface2, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 2, "hreftype = %d\n", hreftype); + hres = ICreateTypeInfo_SetImplTypeFlags(createti, 0, IMPLTYPEFLAG_FDEFAULT); ok(hres == TYPE_E_BADMODULEKIND, "got %08x\n", hres); @@ -1240,6 +1251,18 @@ static void test_CreateTypeLib(void) { ok(hres == S_OK, "got %08x\n", hres); ok(impltypeflags == 0, "impltypeflags = %x\n", impltypeflags); + hres = ITypeInfo_GetRefTypeOfImplType(ti, 0, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 0, "hreftype = %d\n", hreftype); + + hres = ITypeInfo_GetRefTypeOfImplType(ti, 1, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 1, "hreftype = %d\n", hreftype); + + hres = ITypeInfo_GetRefTypeOfImplType(ti, 2, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + ok(hreftype == 1, "hreftype = %d\n", hreftype); + ITypeInfo_Release(ti); ICreateTypeInfo_Release(createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 8a3d808..03db7b5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2835,8 +2835,35 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeOfImplType( UINT index, HREFTYPE* pRefType) { - FIXME("(%p,%d,%p), stub!\n", iface, index, pRefType); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ITypeInfo2(iface); + MSFT_RefRecord *ref; + int offset; + + TRACE("(%p,%d,%p)\n", iface, index, pRefType); + + if(!pRefType) + return E_INVALIDARG; + + if(index == -1) { + FIXME("Dual interfaces not handled yet\n"); + return E_NOTIMPL; + } + + if(index >= This->typeinfo->cImplTypes) + return TYPE_E_ELEMENTNOTFOUND; + + if((This->typeinfo->typekind&0xf) == TKIND_INTERFACE) { + *pRefType = This->typeinfo->datatype1 + 2; + return S_OK; + } + + offset = ctl2_find_nth_reference(This->typelib, This->typeinfo->datatype1, index); + if(offset == -1) + return TYPE_E_ELEMENTNOTFOUND; + + ref = (MSFT_RefRecord *)&This->typelib->typelib_segment_data[MSFT_SEG_REFERENCES][offset]; + *pRefType = ref->reftype; + return S_OK; } /****************************************************************************** @@ -2968,10 +2995,10 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( WCHAR *filename; HRESULT hres; - if(hRefType-1 >= This->typelib->typelib_segdir[MSFT_SEG_IMPORTINFO].length) + if((hRefType&(~0x3)) >= This->typelib->typelib_segdir[MSFT_SEG_IMPORTINFO].length) return E_FAIL; - impinfo = (MSFT_ImpInfo*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTINFO][hRefType-1]; + impinfo = (MSFT_ImpInfo*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTINFO][hRefType&(~0x3)]; impfile = (MSFT_ImpFile*)&This->typelib->typelib_segment_data[MSFT_SEG_IMPORTFILES][impinfo->oImpFile]; guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][impinfo->oGuid]; @@ -2990,7 +3017,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetRefTypeInfo( int i = 0; for(iter=This->typelib->typeinfos; iter; iter=iter->next_typeinfo) { - if(This->typelib->typelib_typeinfo_offsets[i] == hRefType) { + if(This->typelib->typelib_typeinfo_offsets[i] == (hRefType&(~0x3))) { *ppTInfo = (ITypeInfo*)&iter->lpVtblTypeInfo2; ITypeLib_AddRef(*ppTInfo);

1 0

David Hedberg : msvcrt: Implement _mbctombb.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 4148ac0ab59b9bd01c565bc31d4e5bf241a66436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4148ac0ab59b9bd01c565bc31… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Feb 24 04:52:52 2010 +0100 msvcrt: Implement _mbctombb. --- dlls/msvcrt/mbcs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 23 ++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 38891e6..e0ce3e2 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -53,6 +53,24 @@ static struct cp_extra_info_t g_cpextrainfo[] = {0, {1, 255, 0, 0}} /* match all with FIXME */ }; +/* Maps multibyte cp932 punctuation marks to single byte equivalents */ +static const unsigned char mbctombb_932_punct[] = { + 0x20,0xa4,0xa1,0x2c,0x2e,0xa5,0x3a,0x3b,0x3f,0x21,0xde,0xdf,0x00,0x00,0x00,0x5e, + 0x7e,0x5f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb0,0x00,0x00,0x2f,0x00, + 0x00,0x00,0x7c,0x00,0x00,0x60,0x27,0x00,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,0x7b, + 0x7d,0x00,0x00,0x00,0x00,0xa2,0xa3,0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,0x00, + 0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x5c, + 0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40}; + +/* Maps multibyte cp932 hiragana/katakana to single-byte equivalents */ +static const unsigned char mbctombb_932_kana[] = { + 0xa7,0xb1,0xa8,0xb2,0xa9,0xb3,0xaa,0xb4,0xab,0xb5,0xb6,0xb6,0xb7,0xb7,0xb8,0xb8, + 0xb9,0xb9,0xba,0xba,0xbb,0xbb,0xbc,0xbc,0xbd,0xbd,0xbe,0xbe,0xbf,0xbf,0xc0,0xc0, + 0xc1,0xc1,0xaf,0xc2,0xc2,0xc3,0xc3,0xc4,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xca, + 0xca,0xcb,0xcb,0xcb,0xcc,0xcc,0xcc,0xcd,0xcd,0xcd,0xce,0xce,0xce,0xcf,0xd0,0xd1, + 0xd2,0xd3,0xac,0xd4,0xad,0xd5,0xae,0xd6,0xd7,0xd8,0xd9,0xda,0xdb,0xdc,0xdc,0xb2, + 0xb4,0xa6,0xdd,0xb3,0xb6,0xb9}; + static MSVCRT_wchar_t msvcrt_mbc_to_wc(unsigned int ch) { MSVCRT_wchar_t chW; @@ -319,6 +337,34 @@ unsigned int CDECL _mbctoupper(unsigned int c) } /********************************************************************* + * _mbctombb (MSVCRT.@) + */ +unsigned int CDECL _mbctombb(unsigned int c) +{ + unsigned int value; + + if(MSVCRT___lc_codepage == 932) + { + if(c >= 0x829f && c <= 0x82f1) /* Hiragana */ + return mbctombb_932_kana[c - 0x829f]; + if(c >= 0x8340 && c <= 0x8396 && c != 0x837f) /* Katakana */ + return mbctombb_932_kana[c - 0x8340 - (c >= 0x837f ? 1 : 0)]; + if(c >= 0x8140 && c <= 0x8197) /* Punctuation */ + { + value = mbctombb_932_punct[c - 0x8140]; + return value ? value : c; + } + if((c >= 0x824f && c <= 0x8258) || /* Fullwidth digits */ + (c >= 0x8260 && c <= 0x8279)) /* Fullwidth capitals letters */ + return c - 0x821f; + if(c >= 0x8281 && c <= 0x829a) /* Fullwidth small letters */ + return c - 0x8220; + /* all other cases return c */ + } + return c; +} + +/********************************************************************* * _mbcjistojms(MSVCRT.@) * * Converts a jis character to sjis. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a3bbb88..0e91d83 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -380,7 +380,7 @@ @ stub _mbctohira #(long) @ stub _mbctokata #(long) @ cdecl _mbctolower(long) -@ stub _mbctombb #(long) +@ cdecl _mbctombb(long) @ cdecl _mbctoupper(long) @ extern _mbctype MSVCRT_mbctype @ cdecl _mbsbtype(str long) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 199c0fa..a7b3404 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -730,6 +730,28 @@ static void test_mbcjisjms(void) } while(jisjms[i++][0] != 0); } +static void test_mbctombb(void) +{ + static const unsigned int mbcmbb_932[][2] = { + {0x829e, 0x829e}, {0x829f, 0xa7}, {0x82f1, 0xdd}, {0x82f2, 0x82f2}, + {0x833f, 0x833f}, {0x8340, 0xa7}, {0x837e, 0xd0}, {0x837f, 0x837f}, + {0x8380, 0xd1}, {0x8396, 0xb9}, {0x8397, 0x8397}, {0x813f, 0x813f}, + {0x8140, 0x20}, {0x814c, 0x814c}, {0x814f, 0x5e}, {0x8197, 0x40}, + {0x8198, 0x8198}, {0x8258, 0x39}, {0x8259, 0x8259}, {0x825f, 0x825f}, + {0x8260, 0x41}, {0x82f1, 0xdd}, {0x82f2, 0x82f2}, {0,0}}; + unsigned int exp, ret, i; + unsigned int prev_cp = _getmbcp(); + + _setmbcp(932); + for (i = 0; mbcmbb_932[i][0] != 0; i++) + { + ret = _mbctombb(mbcmbb_932[i][0]); + exp = mbcmbb_932[i][1]; + ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret); + } + _setmbcp(prev_cp); +} + static void test_ismbclegal(void) { unsigned int prev_cp = _getmbcp(); int ret, exp, err; @@ -931,6 +953,7 @@ START_TEST(string) test_strcat_s(); test__mbsnbcpy_s(); test_mbcjisjms(); + test_mbctombb(); test_ismbclegal(); test_strtok(); test_wcscpy_s();

1 0

Alexandre Julliard : makefiles: Remove makedep only after everything else has been cleaned.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 9b02b5cddb16a4692c06d2e56b5755133540d2b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02b5cddb16a4692c06d2e56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 12:26:11 2010 +0100 makefiles: Remove makedep only after everything else has been cleaned. --- Makefile.in | 3 ++- tools/Makefile.in | 3 +-- tools/make_makefiles | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 2cd8bf1..187f563 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,7 +107,7 @@ $(ALL_DIRS:%=%/__clean__): dummy @cd `dirname $@` && $(MAKE) clean clean:: $(ALL_DIRS:%=%/__clean__) - $(RM) $(ALL_DIRS:%=%/Makefile) + $(RM) $(ALL_DIRS:%=%/Makefile) tools/makedep$(EXEEXT) distclean:: clean $(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h $(ALL_CONFIGS) @@ -229,6 +229,7 @@ RECURSE_TARGETS = \ __instal-dev__ \ __install-lib__ \ __uninstall__ \ + __testclean__ \ __crosstest__ $(MAKEDEP): include/config.h tools/Makefile diff --git a/tools/Makefile.in b/tools/Makefile.in index 2d5190b..2f6eaca 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -12,7 +12,6 @@ PROGRAMS = \ fnt2bdf$(EXEEXT) \ fnt2fon$(EXEEXT) \ make_ctests$(EXEEXT) \ - makedep$(EXEEXT) \ relpath$(EXEEXT) \ sfnt2fnt$(EXEEXT) \ wine.inf \ @@ -40,7 +39,7 @@ INSTALLDIRS = \ UPDATE_DESKTOP_DATABASE = update-desktop-database -all: $(PROGRAMS) $(MANPAGES) +all: makedep$(EXEEXT) $(PROGRAMS) $(MANPAGES) @MAKE_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index 04a351c..a3efc3b 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -97,6 +97,7 @@ my @ignores = ( "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", "programs/winetest/build.rc", + "tools/makedep", ); # Source files and their resulting target to ignore

1 0

Dylan Smith : wordpad: Added zoom cursor for print preview.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: adc2c9547eb54bb3aa4874d0ae3409b7d28a26f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc2c9547eb54bb3aa4874d0a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 24 02:28:57 2010 -0500 wordpad: Added zoom cursor for print preview. In print preview you can zoom in by left clicking on one of the pages. The zoom cursor is displayed whenever the mouse is over the page to indicate to the user that they can zoom in. When fully zoomed in it will zoom out when this is done again. When clicking on the second page, it will zoom into that page. --- programs/wordpad/print.c | 101 ++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 3 + programs/wordpad/wordpad.h | 2 + programs/wordpad/zoom.cur | Bin 0 -> 766 bytes 4 files changed, 106 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index f77ab12..0fef3ac 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -988,6 +988,29 @@ static void toggle_num_pages(HWND hMainWnd) update_preview(hMainWnd); } +/* Returns the page shown that the point is in (1 or 2) or 0 if the point + * isn't inside either page */ +int preview_page_hittest(POINT pt) +{ + RECT rc; + rc.left = preview.spacing.cx; + rc.right = rc.left + preview.bmScaledSize.cx; + rc.top = preview.spacing.cy; + rc.bottom = rc.top + preview.bmScaledSize.cy; + if (PtInRect(&rc, pt)) + return 1; + + if (preview.pages_shown <= 1) + return 0; + + rc.left += preview.bmScaledSize.cx + preview.spacing.cx; + rc.right += preview.bmScaledSize.cx + preview.spacing.cx; + if (PtInRect(&rc, pt)) + return 2; + + return 0; +} + LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) @@ -1086,6 +1109,84 @@ LRESULT CALLBACK preview_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) return 0; } + case WM_SETCURSOR: + { + POINT pt; + RECT rc; + int bHittest = FALSE; + DWORD messagePos = GetMessagePos(); + pt.x = (short)LOWORD(messagePos); + pt.y = (short)HIWORD(messagePos); + ScreenToClient(hWnd, &pt); + + GetClientRect(hWnd, &rc); + if (PtInRect(&rc, pt)) + { + pt.x += GetScrollPos(hWnd, SB_HORZ); + pt.y += GetScrollPos(hWnd, SB_VERT); + bHittest = preview_page_hittest(pt); + } + + if (bHittest) + SetCursor(LoadCursorW(GetModuleHandleW(0), + MAKEINTRESOURCEW(IDC_ZOOM))); + else + SetCursor(LoadCursorW(NULL, (WCHAR*)IDC_ARROW)); + + return TRUE; + } + + case WM_LBUTTONDOWN: + { + int page; + POINT pt; + pt.x = (short)LOWORD(lParam) + GetScrollPos(hWnd, SB_HORZ); + pt.y = (short)HIWORD(lParam) + GetScrollPos(hWnd, SB_VERT); + if ((page = preview_page_hittest(pt)) > 0) + { + HWND hMainWnd = GetParent(hWnd); + + /* Convert point from client coordinate to unzoomed page + * coordinate. */ + pt.x -= preview.spacing.cx; + if (page > 1) + pt.x -= preview.bmScaledSize.cx + preview.spacing.cx; + pt.y -= preview.spacing.cy; + pt.x /= preview.zoomratio; + pt.y /= preview.zoomratio; + + preview.zoomlevel = (preview.zoomlevel + 1) % 3; + preview.zoomratio = 0; + if (preview.pages_shown > 1) + { + if (page >= 2) preview.page++; + toggle_num_pages(hMainWnd); + } else { + update_preview_sizes(hWnd, TRUE); + update_scaled_preview(hMainWnd); + update_preview_buttons(hMainWnd); + } + + if (preview.zoomlevel > 0) { + SCROLLINFO si; + /* Convert the coordinate back to client coordinate. */ + pt.x *= preview.zoomratio; + pt.y *= preview.zoomratio; + pt.x += preview.spacing.cx; + pt.y += preview.spacing.cy; + /* Scroll to center view at that point on the page */ + si.cbSize = sizeof(si); + si.fMask = SIF_PAGE; + GetScrollInfo(hWnd, SB_HORZ, &si); + pt.x -= si.nPage / 2; + SetScrollPos(hWnd, SB_HORZ, pt.x, TRUE); + GetScrollInfo(hWnd, SB_VERT, &si); + pt.y -= si.nPage / 2; + SetScrollPos(hWnd, SB_VERT, pt.y, TRUE); + } + } + } + default: return DefWindowProcW(hWnd, msg, wParam, lParam); } diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index ac159da..c074e3d 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -60,3 +60,6 @@ IDI_WRI ICON "wri.ico" /* @makedep: txt.ico */ IDI_TXT ICON "txt.ico" + +/* @makedep: zoom.cur */ +IDC_ZOOM CURSOR "zoom.cur" diff --git a/programs/wordpad/wordpad.h b/programs/wordpad/wordpad.h index 5c70c3e..33d6b45 100644 --- a/programs/wordpad/wordpad.h +++ b/programs/wordpad/wordpad.h @@ -189,6 +189,8 @@ #define IDI_WRI 104 #define IDI_TXT 105 +#define IDC_ZOOM 106 + #define STRING_ALL_FILES 1400 #define STRING_TEXT_FILES_TXT 1401 #define STRING_TEXT_FILES_UNICODE_TXT 1402 diff --git a/programs/wordpad/zoom.cur b/programs/wordpad/zoom.cur new file mode 100644 index 0000000..26d1a8f Binary files /dev/null and b/programs/wordpad/zoom.cur differ

1 0

Dylan Smith : wordpad: Number of preview pages to show when unzoomed is persistent.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 3355be3e5d0bb7b3421509ee47d745198c34803e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3355be3e5d0bb7b3421509ee4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Feb 24 02:29:02 2010 -0500 wordpad: Number of preview pages to show when unzoomed is persistent. Either one or two pages may be shown in print preview when zoomed out. This value is stored in the registry in native wordpad, and preserved while opening and closing the print preview. Zooming in will only show one page, but the pages shown value must be saved because it will return to the preview pages shown value after unzooming completely. If two pages should be shown when there is only one page of text, then a second blank page is shown. --- programs/wordpad/print.c | 94 ++++++++++++++++++++++++++++++------------ programs/wordpad/registry.c | 15 ++++++- programs/wordpad/wordpad.h | 2 + 3 files changed, 83 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3355be3e5d0bb7b342150…

1 0

Jörg Höhle : winmm/tests: Fix transient notification error: messages may arrive late.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 10b1e2ee8894f8a6b0aac67909732d767127409a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b1e2ee8894f8a6b0aac6790… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Feb 23 19:19:12 2010 +0100 winmm/tests: Fix transient notification error: messages may arrive late. --- dlls/winmm/tests/mci.c | 42 ++++++++++++++++++------------------------ dlls/winmm/tests/midi.c | 11 +++++++++++ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 6607e17..f9ab137 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -135,33 +135,27 @@ static BOOL spurious_message(LPMSG msg) return FALSE; } +/* A single ok() in each code path allows to prefix this with todo_wine */ static void test_notification(HWND hwnd, const char* command, WPARAM type) { /* Use type 0 as meaning no message */ MSG msg; BOOL seen; do { seen = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE); } while(seen && spurious_message(&msg)); - if(type==0) - ok(!seen, "Expect no message from command %s\n", command); - else - ok(seen, "PeekMessage should succeed for command %s\n", command); - if(seen) { + if(type && !seen) { + /* We observe transient delayed notification, mostly on native. + * Notification is not always present right when mciSend returns. */ + trace("Waiting for delayed notification from %s\n", command); + MsgWaitForMultipleObjects(0, NULL, FALSE, 3000, QS_POSTMESSAGE); + seen = PeekMessageA(&msg, hwnd, MM_MCINOTIFY, MM_MCINOTIFY, PM_REMOVE); + } + if(!seen) + ok(type==0, "Expect message %lx from %s\n", type, command); + else if(msg.hwnd != hwnd) ok(msg.hwnd == hwnd, "Didn't get the handle to our test window\n"); + else if(msg.message != MM_MCINOTIFY) ok(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY from command %s\n", msg.message, command); - ok(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); - } -} -static void test_notification1(HWND hwnd, const char* command, WPARAM type) -{ /* This version works with todo_wine prefix. */ - MSG msg; - BOOL seen; - do { seen = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE); } - while(seen && spurious_message(&msg)); - if(type==0) - ok(!seen, "Expect no message from command %s\n", command); - else if(seen) - ok(msg.message == MM_MCINOTIFY && msg.wParam == type,"got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); - else ok(seen, "PeekMessage should succeed for command %s\n", command); + else ok(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } static void test_openCloseWAVE(HWND hwnd) @@ -276,7 +270,7 @@ static void test_recordWAVE(HWND hwnd) /* In Wine, both MCI_Open and the individual drivers send notifications. */ test_notification(hwnd, "open new", MCI_NOTIFY_SUCCESSFUL); - todo_wine test_notification1(hwnd, "open new no #2", 0); + todo_wine test_notification(hwnd, "open new no #2", 0); /* Do not query time format as string because result depends on locale! */ parm.status.dwItem = MCI_STATUS_TIME_FORMAT; @@ -423,7 +417,7 @@ static void test_playWAVE(HWND hwnd) err = mciSendString("cue mysound output notify", NULL, 0, hwnd); ok(!err,"mci cue output after open file returned %s\n", dbg_mcierr(err)); /* Notification is delayed as a play thread is started. */ - todo_wine test_notification1(hwnd, "cue immediate", 0); + todo_wine test_notification(hwnd, "cue immediate", 0); /* Cue pretends to put the MCI into paused state. */ err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); @@ -438,14 +432,14 @@ static void test_playWAVE(HWND hwnd) * Guessed that from (flaky) status mode and late notification arrival. */ err = mciSendString("play mysound from 0 to 0 notify", NULL, 0, hwnd); ok(!err,"mci play from 0 to 0 returned %s\n", dbg_mcierr(err)); - todo_wine test_notification1(hwnd, "cue aborted by play", MCI_NOTIFY_ABORTED); + todo_wine test_notification(hwnd, "cue aborted by play", MCI_NOTIFY_ABORTED); /* play's own notification follows below */ err = mciSendString("play mysound from 250 to 0", NULL, 0, NULL); ok(err==MCIERR_OUTOFRANGE,"mci play from 250 to 0 returned %s\n", dbg_mcierr(err)); Sleep(50); /* Give play from 0 to 0 time to finish. */ - todo_wine test_notification1(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL); + todo_wine test_notification(hwnd, "play from 0 to 0", MCI_NOTIFY_SUCCESSFUL); err = mciSendString("status mysound mode", buf, sizeof(buf), hwnd); ok(!err,"mci status mode returned %s\n", dbg_mcierr(err)); @@ -505,7 +499,7 @@ static void test_playWAVE(HWND hwnd) /* Another play from == to testcase */ err = mciSendString("play mysound to 250 wait notify", NULL, 0, hwnd); ok(!err,"mci play (from 250) to 250 returned %s\n", dbg_mcierr(err)); - todo_wine test_notification1(hwnd,"play to 250 wait notify",MCI_NOTIFY_SUCCESSFUL); + todo_wine test_notification(hwnd,"play to 250 wait notify",MCI_NOTIFY_SUCCESSFUL); err = mciSendString("cue mysound output", NULL, 0, NULL); ok(!err,"mci cue output after play returned %s\n", dbg_mcierr(err)); diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 15e02e2..ceb7ad9 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -69,6 +69,17 @@ static void test_notification(HWND hwnd, const char* command, UINT m1, DWORD_PTR BOOL seen; do { seen = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE); } while(seen && spurious_message(&msg)); + if (m1 && !seen) { + /* We observe transient delayed notification, mostly on native. + * Perhaps the OS preempts the player thread after setting MHDR_DONE + * or clearing MHDR_INQUEUE, before calling DriverCallback. */ + DWORD rc; + trace("Waiting for delayed message %x from %s\n", m1, command); + SetLastError(0xDEADBEEF); + rc = MsgWaitForMultipleObjects(0, NULL, FALSE, 3000, QS_POSTMESSAGE); + ok(rc==WAIT_OBJECT_0, "Wait failed: %04x %d\n", rc, GetLastError()); + seen = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE); + } if (seen) { trace("Message %x, wParam=%lx, lParam=%lx from %s\n", msg.message, msg.wParam, msg.lParam, command);

1 0

Dmitry Timoshkov : gdi32: Dump GDI objects in the case of running out of GDI handles.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 4c088cbe35403d31ebd05c36422ddf62e08c3d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c088cbe35403d31ebd05c364… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 24 17:11:32 2010 +0800 gdi32: Dump GDI objects in the case of running out of GDI handles. --- dlls/gdi32/gdiobj.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index c45ff4b..3c8bdfa 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -635,6 +635,50 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) static GDIOBJHDR *large_handles[MAX_LARGE_HANDLES]; static int next_large_handle; +static const char *gdi_obj_type( unsigned type ) +{ + switch ( type ) + { + case OBJ_PEN: return "OBJ_PEN"; + case OBJ_BRUSH: return "OBJ_BRUSH"; + case OBJ_DC: return "OBJ_DC"; + case OBJ_METADC: return "OBJ_METADC"; + case OBJ_PAL: return "OBJ_PAL"; + case OBJ_FONT: return "OBJ_FONT"; + case OBJ_BITMAP: return "OBJ_BITMAP"; + case OBJ_REGION: return "OBJ_REGION"; + case OBJ_METAFILE: return "OBJ_METAFILE"; + case OBJ_MEMDC: return "OBJ_MEMDC"; + case OBJ_EXTPEN: return "OBJ_EXTPEN"; + case OBJ_ENHMETADC: return "OBJ_ENHMETADC"; + case OBJ_ENHMETAFILE: return "OBJ_ENHMETAFILE"; + case OBJ_COLORSPACE: return "OBJ_COLORSPACE"; + default: return "UNKNOWN"; + } +} + +static void dump_gdi_objects( void ) +{ + int i; + + TRACE( "%u objects:\n", MAX_LARGE_HANDLES ); + + EnterCriticalSection( &gdi_section ); + for (i = 0; i < MAX_LARGE_HANDLES; i++) + { + if (!large_handles[i]) + { + TRACE( "index %d handle %p FREE\n", i, (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2) ); + continue; + } + TRACE( "handle %p obj %p type %s selcount %u deleted %u\n", + (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2), + large_handles[i], gdi_obj_type( large_handles[i]->type ), + large_handles[i]->selcount, large_handles[i]->deleted ); + } + LeaveCriticalSection( &gdi_section ); +} + /*********************************************************************** * alloc_gdi_handle * @@ -658,6 +702,9 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs for (i = 0; i <= next_large_handle; i++) if (!large_handles[i]) goto found; LeaveCriticalSection( &gdi_section ); + + ERR( "out of GDI object handles, expect a crash\n" ); + if (TRACE_ON(gdi)) dump_gdi_objects(); return 0; found:

1 0

Kusanagi Kouichi : winex11.drv: Generate IME messages as needed.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: f32483dde158c6dbb51deb827274ae03a6f25a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f32483dde158c6dbb51deb827… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 24 20:03:44 2010 +0900 winex11.drv: Generate IME messages as needed. --- dlls/winex11.drv/ime.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 4e821ad..242ecda 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1055,10 +1055,14 @@ BOOL IME_SetCompositionString(DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) { + HIMC imc; LPINPUTCONTEXT lpIMC; HIMCC newCompStr; + LPIMEPRIVATE myPrivate; + BOOL fOpen; - lpIMC = LockRealIMC(FROM_X11); + imc = RealIMC(FROM_X11); + lpIMC = ImmLockIMC(imc); if (lpIMC == NULL) return; @@ -1066,9 +1070,19 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; - GenerateIMEMessage(FROM_X11, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); + myPrivate = ImmLockIMCC(lpIMC->hPrivate); + fOpen = lpIMC->fOpen; + ImmSetOpenStatus(imc, TRUE); + if (!myPrivate->bInComposition) + GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); + GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); + if (!myPrivate->bInComposition) + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + if (!fOpen) + ImmSetOpenStatus(imc, FALSE); + ImmUnlockIMCC(lpIMC->hPrivate); - UnlockRealIMC(FROM_X11); + ImmUnlockIMC(imc); } /*****

1 0

Kusanagi Kouichi : winex11.drv: There seems to be nothing to be done for IMN_SETOPENSTATUS.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 097d3f0aa0a4ab392c58b1d9fd196ee899afde09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097d3f0aa0a4ab392c58b1d9f… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 24 20:04:01 2010 +0900 winex11.drv: There seems to be nothing to be done for IMN_SETOPENSTATUS. --- dlls/winex11.drv/ime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 242ecda..f9e0538 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1311,7 +1311,7 @@ static LRESULT ImeHandleNotify(HIMC hIMC, HWND hwnd, UINT msg, WPARAM wParam, FIXME("WM_IME_NOTIFY:IMN_SETSENTENCEMODE\n"); break; case IMN_SETOPENSTATUS: - FIXME("WM_IME_NOTIFY:IMN_SETOPENSTATUS\n"); + TRACE("WM_IME_NOTIFY:IMN_SETOPENSTATUS\n"); break; case IMN_SETCANDIDATEPOS: FIXME("WM_IME_NOTIFY:IMN_SETCANDIDATEPOS\n");

1 0

Kusanagi Kouichi : winex11.drv: Add a new debug channel for XIM.
by Alexandre Julliard 24 Feb '10

24 Feb '10

Module: wine Branch: master Commit: 32c39db84d4de1d873ae6b34db1cc436b82fd15d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c39db84d4de1d873ae6b34d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Feb 24 20:04:14 2010 +0900 winex11.drv: Add a new debug channel for XIM. --- dlls/winex11.drv/xim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index ee2bd15..6daa075 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -32,7 +32,7 @@ #include "imm.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +WINE_DEFAULT_DEBUG_CHANNEL(xim); #ifndef HAVE_XICCALLBACK_CALLBACK #define XICCallback XIMCallback

1 0