February 2009 - Wine-Commits

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderTopStyle.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 88be0330f9ffb186a576174f5944714c1d161c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=88be0330f9ffb186a576174f5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:37:48 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_borderTopStyle. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 65266b6..f167630 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -251,8 +251,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderBottomColor(IHTMLCurrentStyle * static HRESULT WINAPI HTMLCurrentStyle_get_borderTopStyle(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BORDER_TOP_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_borderRightStyle(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2d7d8ee..1fb54a3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2403,6 +2403,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); ok(!strcmp_wa(str, "normal"), "get_fontVariant returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_borderTopStyle(current_style, &str); + ok(hres == S_OK, "get_borderTopStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_borderTopStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontVariant.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 19f780c3645738560c448f09f56383f81ed429dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=19f780c3645738560c448f09f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:27:37 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_fontVariant. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 305acef..65266b6 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -174,8 +174,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontStyle(IHTMLCurrentStyle *iface, B static HRESULT WINAPI HTMLCurrentStyle_get_fontVariant(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_FONT_VARIANT, p); } static HRESULT WINAPI HTMLCurrentStyle_get_fontWeight(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 842bbd6..2d7d8ee 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2398,6 +2398,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_backgroundImage failed: %08x\n", hres); ok(!strcmp_wa(str, "none"), "get_backgroundImage returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_fontVariant(current_style, &str); + ok(hres == S_OK, "get_fontVariant failed: %08x\n", hres); + ok(!strcmp_wa(str, "normal"), "get_fontVariant returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_backgroundImage.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: e050152aceb145362edffd10b0b4013ef6681965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e050152aceb145362edffd10b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:24:00 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_backgroundImage. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 1932338..305acef 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -195,8 +195,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontSize(IHTMLCurrentStyle *iface, VA static HRESULT WINAPI HTMLCurrentStyle_get_backgroundImage(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BACKGROUND_IMAGE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_backgroundPositionX(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b9d4c15..842bbd6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2393,6 +2393,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); ok(!strcmp_wa(str, "normal"), "get_fontStyle returned %s\n", dbgstr_w(str)); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_backgroundImage(current_style, &str); + ok(hres == S_OK, "get_backgroundImage failed: %08x\n", hres); + ok(!strcmp_wa(str, "none"), "get_backgroundImage returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_fontStyle.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: bdb4dda16c985f33c71c405ed23575bbc8f824ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb4dda16c985f33c71c405ed… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 20 20:22:16 2009 +1100 mshtml: Implement IHTMLCurrentStyle_get_fontStyle. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 422c5b1..1932338 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -167,8 +167,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_fontFamily(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_fontStyle(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_FONT_STYLE, p); } static HRESULT WINAPI HTMLCurrentStyle_get_fontVariant(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1face6f..b9d4c15 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2388,6 +2388,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) hres = IHTMLCurrentStyle_get_fontFamily(current_style, &str); ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres); SysFreeString(str); + + hres = IHTMLCurrentStyle_get_fontStyle(current_style, &str); + ok(hres == S_OK, "get_fontStyle failed: %08x\n", hres); + ok(!strcmp_wa(str, "normal"), "get_fontStyle returned %s\n", dbgstr_w(str)); + SysFreeString(str); } static void test_style2(IHTMLStyle2 *style2)

1 0

Huw Davies : gdi32: Fix fractional scaling threshold.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: ff2f88cf08f47c6e2c17e0475d7f3364dae730b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2f88cf08f47c6e2c17e0475… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Feb 20 14:40:44 2009 +0000 gdi32: Fix fractional scaling threshold. --- dlls/gdi32/freetype.c | 6 ++++-- dlls/gdi32/tests/font.c | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 711f259..6ca35c3 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3627,8 +3627,10 @@ found: scale = (height + face->size.height - 1) / face->size.height; scaled_height = scale * face->size.height; - /* XP allows not more than 10% deviation */ - if (scale > 1 && scaled_height - height > scaled_height / 10) scale--; + /* Only jump to the next height if the difference <= 25% original height */ + if (scale > 2 && scaled_height - height > face->size.height / 4) scale--; + /* The jump between unscaled and doubled is delayed by 1 */ + else if (scale == 2 && scaled_height - height > (face->size.height / 4 - 1)) scale--; ret->scale_y = scale; width = face->size.x_ppem >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 92623dc..5b50a14 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -344,7 +344,7 @@ static void test_bitmap_font(void) bitmap_lf.lfWidth = lfWidth; /* test fractional scaling */ - for (i = 1; i <= height_orig * 3; i++) + for (i = 1; i <= height_orig * 6; i++) { INT nearest_height; @@ -352,8 +352,10 @@ static void test_bitmap_font(void) hfont = create_font("fractional", &bitmap_lf); scale = (i + height_orig - 1) / height_orig; nearest_height = scale * height_orig; - /* XP allows not more than 10% deviation */ - if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; + /* Only jump to the next height if the difference <= 25% original height */ + if (scale > 2 && nearest_height - i > height_orig / 4) scale--; + /* The jump between unscaled and doubled is delayed by 1 */ + else if(scale == 2 && nearest_height - i > (height_orig / 4 - 1)) scale--; old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); SelectObject(hdc, old_hfont);

1 0

Eddie Leung : msg711.acm: Pointer cast changed to DWORD_PTR.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 3bd8b3c6423618cad24925652f2e802d350002b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd8b3c6423618cad24925652… Author: Eddie Leung <eddie.leung.2009(a)anderson.ucla.edu> Date: Thu Feb 19 23:17:55 2009 -0800 msg711.acm: Pointer cast changed to DWORD_PTR. --- dlls/msg711.acm/msg711.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index c540b05..203942d 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -876,7 +876,7 @@ static LRESULT G711_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad = HeapAlloc(GetProcessHeap(), 0, sizeof(AcmG711Data)); if (aad == 0) return MMSYSERR_NOMEM; - adsi->dwDriver = (DWORD)aad; + adsi->dwDriver = (DWORD_PTR)aad; if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM)

1 0

Rein Klazes : user32: Implement support for HBMENU_POPUP_* magic menu bitmaps and use them to decorate the system menu .
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 0c6e37bb045e3ba710978da644d6caf076d4fb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6e37bb045e3ba710978da64… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Feb 20 15:28:37 2009 +0100 user32: Implement support for HBMENU_POPUP_* magic menu bitmaps and use them to decorate the system menu. --- dlls/user32/menu.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index efb14c6..1df3675 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -419,8 +419,24 @@ static HMENU MENU_CopySysPopup(void) HMENU hMenu = LoadMenuW(user32_module, sysmenuW); if( hMenu ) { + MENUINFO minfo; + MENUITEMINFOW miteminfo; POPUPMENU* menu = MENU_GetMenu(hMenu); menu->wFlags |= MF_SYSMENU | MF_POPUP; + minfo.cbSize = sizeof( MENUINFO); + minfo.dwStyle = MNS_CHECKORBMP; + minfo.fMask = MIM_STYLE; + SetMenuInfo( hMenu, &minfo); + miteminfo.cbSize = sizeof( MENUITEMINFOW); + miteminfo.fMask = MIIM_BITMAP; + miteminfo.hbmpItem = HBMMENU_POPUP_CLOSE; + SetMenuItemInfoW( hMenu, SC_CLOSE, FALSE, &miteminfo); + miteminfo.hbmpItem = HBMMENU_POPUP_RESTORE; + SetMenuItemInfoW( hMenu, SC_RESTORE, FALSE, &miteminfo); + miteminfo.hbmpItem = HBMMENU_POPUP_MAXIMIZE; + SetMenuItemInfoW( hMenu, SC_MAXIMIZE, FALSE, &miteminfo); + miteminfo.hbmpItem = HBMMENU_POPUP_MINIMIZE; + SetMenuItemInfoW( hMenu, SC_MINIMIZE, FALSE, &miteminfo); SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE); } else @@ -819,7 +835,8 @@ static void MENU_GetBitmapItemSize( MENUITEM *lpitem, SIZE *size, case (INT_PTR)HBMMENU_POPUP_RESTORE: case (INT_PTR)HBMMENU_POPUP_MAXIMIZE: case (INT_PTR)HBMMENU_POPUP_MINIMIZE: - FIXME("Magic %p not implemented\n", bmp ); + size->cx = GetSystemMetrics( SM_CYMENU ) - 4; /* FIXME: test */ + size->cy = size->cx; return; } if (GetObjectW(bmp, sizeof(bm), &bm )) @@ -852,6 +869,7 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, if (IS_MAGIC_BITMAP(hbmToDraw)) { UINT flags = 0; + WCHAR bmchr = 0; RECT r; switch((INT_PTR)hbmToDraw) @@ -910,17 +928,42 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, } break; case (INT_PTR)HBMMENU_POPUP_CLOSE: + bmchr = 0x72; + break; case (INT_PTR)HBMMENU_POPUP_RESTORE: + bmchr = 0x32; + break; case (INT_PTR)HBMMENU_POPUP_MAXIMIZE: + bmchr = 0x31; + break; case (INT_PTR)HBMMENU_POPUP_MINIMIZE: + bmchr = 0x30; + break; default: FIXME("Magic %p not implemented\n", hbmToDraw); return; } - r = *rect; - InflateRect( &r, -1, -1 ); - if (lpitem->fState & MF_HILITE) flags |= DFCS_PUSHED; - DrawFrameControl( hdc, &r, DFC_CAPTION, flags ); + if (bmchr) + { + HFONT hfont, hfontsav; + LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, + 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, + { 'M','a','r','l','e','t','t',0 } }; + logfont.lfHeight = min( h, w) - 2 ; + TRACE(" height %d rect %s\n", logfont.lfHeight, wine_dbgstr_rect( rect)); + hfont = CreateFontIndirectW( &logfont); + hfontsav = SelectObject(hdc, hfont); + TextOutW( hdc, rect->left, rect->top, &bmchr, 1); + SelectObject(hdc, hfontsav); + DeleteObject( hfont); + } + else + { + r = *rect; + InflateRect( &r, -1, -1 ); + if (lpitem->fState & MF_HILITE) flags |= DFCS_PUSHED; + DrawFrameControl( hdc, &r, DFC_CAPTION, flags ); + } return; }

1 0

Aric Stewart : msctf: Add tests for ITfCategoryMgr:: UnregisterCategory and ITfCategoryMgr::RegisterCategory.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: cb2637fa5daa2ad2e51343556ec92d849aff6365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2637fa5daa2ad2e51343556… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 08:07:06 2009 -0600 msctf: Add tests for ITfCategoryMgr::UnregisterCategory and ITfCategoryMgr::RegisterCategory. --- dlls/msctf/tests/inputprocessor.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 0e8ab5b..34e47e5 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -31,9 +31,17 @@ static ITfInputProcessorProfiles* g_ipp; static LANGID gLangid; +static ITfCategoryMgr * g_cm; DEFINE_GUID(CLSID_FakeService, 0xEDE1A7AD,0x66DE,0x47E0,0xB6,0x20,0x3E,0x92,0xF8,0x24,0x6B,0xF3); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); +DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); +DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); +DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); +DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); +DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static HRESULT initialize(void) { @@ -41,6 +49,9 @@ static HRESULT initialize(void) CoInitialize(NULL); hr = CoCreateInstance (&CLSID_TF_InputProcessorProfiles, NULL, CLSCTX_INPROC_SERVER, &IID_ITfInputProcessorProfiles, (void**)&g_ipp); + if (SUCCEEDED(hr)) + hr = CoCreateInstance (&CLSID_TF_CategoryMgr, NULL, + CLSCTX_INPROC_SERVER, &IID_ITfCategoryMgr, (void**)&g_cm); return hr; } @@ -48,6 +59,8 @@ static void cleanup(void) { if (g_ipp) ITfInputProcessorProfiles_Release(g_ipp); + if (g_cm) + ITfCategoryMgr_Release(g_cm); CoUninitialize(); } @@ -71,12 +84,28 @@ static void test_Unregister(void) ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); } +static void test_RegisterCategory(void) +{ + HRESULT hr; + hr = ITfCategoryMgr_RegisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_TIP_KEYBOARD, &CLSID_FakeService); + ok(SUCCEEDED(hr),"ITfCategoryMgr_RegisterCategory failed\n"); +} + +static void test_UnregisterCategory(void) +{ + HRESULT hr; + hr = ITfCategoryMgr_UnregisterCategory(g_cm, &CLSID_FakeService, &GUID_TFCAT_TIP_KEYBOARD, &CLSID_FakeService); + todo_wine ok(SUCCEEDED(hr),"ITfCategoryMgr_UnregisterCategory failed\n"); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) { gLangid = GetUserDefaultLCID(); test_Register(); + test_RegisterCategory(); + test_UnregisterCategory(); test_Unregister(); } else

1 0

Aric Stewart : msctf: Define TIP Category values.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: da8cdacf2f7d185e1dbd284d0a0e80ca32f3ed2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=da8cdacf2f7d185e1dbd284d0… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 08:00:50 2009 -0600 msctf: Define TIP Category values. --- dlls/uuid/uuid.c | 4 ++++ include/msctf.idl | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index f3af92e..c2cdf06 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -112,3 +112,7 @@ DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); +DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); +DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14); +DEFINE_GUID(GUID_TFCAT_TIP_HANDWRITING, 0x246ecb87,0xc2f2,0x4abe,0x90,0x5b,0xc8,0xb3,0x8a,0xdd,0x2c,0x43); +DEFINE_GUID (GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER, 0x046B8C80,0x1647,0x40F7,0x9B,0x21,0xB9,0x3B,0x81,0xAA,0xBC,0x1B); diff --git a/include/msctf.idl b/include/msctf.idl index 49fa875..1c3e652 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -28,6 +28,12 @@ cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") +/* GUIDs for Categories */ +cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_KEYBOARD;") +cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_SPEECH;") +cpp_quote("EXTERN_C const GUID GUID_TFCAT_TIP_HANDWRITING;") +cpp_quote("EXTERN_C const GUID GUID_TFCAT_DISPLAYATTRIBUTEPROVIDER;") + typedef [uuid(7213778c-7bb0-4270-b050-6189ee594e97)] DWORD TfEditCookie; typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId; typedef [uuid(88a9c478-f3ec-4763-8345-cd9250443f8d)] DWORD TfGuidAtom;

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles::Unregister.
by Alexandre Julliard Feb. 20, 2009

Feb. 20, 2009

Module: wine Branch: master Commit: 8bd19cc93fb9fc0d06021174cf08a95137721a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd19cc93fb9fc0d06021174c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 20 08:00:34 2009 -0600 msctf: Implement ITfInputProcessorProfiles::Unregister. --- dlls/msctf/inputprocessor.c | 14 ++++++++++++-- dlls/msctf/tests/inputprocessor.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index ca2bbda..3950a94 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -152,9 +152,19 @@ static HRESULT WINAPI InputProcessorProfiles_Register( static HRESULT WINAPI InputProcessorProfiles_Unregister( ITfInputProcessorProfiles *iface, REFCLSID rclsid) { + WCHAR buf[39]; + WCHAR fullkey[68]; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s\n",This,debugstr_guid(rclsid)); + + StringFromGUID2(rclsid, buf, 39); + sprintfW(fullkey,szwTipfmt,szwSystemTIPKey,buf); + + RegDeleteTreeW(HKEY_LOCAL_MACHINE, fullkey); + RegDeleteTreeW(HKEY_CURRENT_USER, fullkey); + + return S_OK; } static HRESULT WINAPI InputProcessorProfiles_AddLanguageProfile( diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2e71eec..0e8ab5b 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -68,7 +68,7 @@ static void test_Unregister(void) { HRESULT hr; hr = ITfInputProcessorProfiles_Unregister(g_ipp, &CLSID_FakeService); - todo_wine ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); + ok(SUCCEEDED(hr),"Unable to unregister text service(%x)\n",hr); } START_TEST(inputprocessor)

1 0