September 2012 - Wine-commits

Alexandre Julliard : gdi32: Enumerate a default charset if no other valid charset was found.
by Alexandre Julliard 27 Sep '12

27 Sep '12

1 0

Aric Stewart : imm32: Properly separate the IME UI window and the thread default IME window.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 5f5f20d6cf7c38f59171b760870d58b8fdf53132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f5f20d6cf7c38f59171b7608… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 27 09:42:54 2012 -0500 imm32: Properly separate the IME UI window and the thread default IME window. --- dlls/imm32/imm.c | 86 ++++++++++++++++++++++++++++++++++++------ dlls/imm32/tests/imm32.c | 38 ++++++++++++++++++ dlls/winex11.drv/Makefile.in | 4 +- 3 files changed, 114 insertions(+), 14 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 7394101..cf76df1 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -50,6 +50,7 @@ typedef struct _tagImmHkl{ IMEINFO imeInfo; WCHAR imeClassName[17]; /* 16 character max */ ULONG uSelected; + HWND UIWnd; /* Function Pointers */ MAKE_FUNCPTR(ImeInquire); @@ -77,7 +78,6 @@ typedef struct tagInputContextData INPUTCONTEXT IMC; ImmHkl *immKbd; - HWND imeWnd; UINT lastVK; } InputContextData; @@ -110,6 +110,8 @@ static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam); #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -357,6 +359,8 @@ static void IMM_FreeAllImmHkl(void) ptr->pImeDestroy(1); FreeLibrary(ptr->hIME); } + if (ptr->UIWnd) + DestroyWindow(ptr->UIWnd); HeapFree(GetProcessHeap(),0,ptr); } } @@ -372,6 +376,22 @@ static void IMM_RegisterMessages(void) WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); } +static void IMM_RegisterIMEClass(HINSTANCE hInstDLL) +{ + static const WCHAR szwIME[] = {'I','M','E',0}; + WNDCLASSW wndClass; + + ZeroMemory(&wndClass, sizeof(WNDCLASSW)); + + wndClass.style = CS_GLOBALCLASS; + wndClass.lpfnWndProc = (WNDPROC) DefIME_WindowProc; + wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); + wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + wndClass.lpszClassName = szwIME; + + RegisterClassW(&wndClass); +} + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { TRACE("%p, %x, %p\n",hInstDLL,fdwReason,lpReserved); @@ -382,6 +402,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) tlsIndex = TlsAlloc(); if (tlsIndex == TLS_OUT_OF_INDEXES) return FALSE; + IMM_RegisterIMEClass(hInstDLL); break; case DLL_THREAD_ATTACH: break; @@ -678,10 +699,6 @@ static BOOL IMM_DestroyContext(HIMC hIMC) data->immKbd->pImeSelect(hIMC, FALSE); SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)GetKeyboardLayout(0)); - if (IMM_GetThreadData()->hwndDefault == data->imeWnd) - IMM_GetThreadData()->hwndDefault = NULL; - DestroyWindow(data->imeWnd); - ImmDestroyIMCC(data->IMC.hCompStr); ImmDestroyIMCC(data->IMC.hCandInfo); ImmDestroyIMCC(data->IMC.hGuideLine); @@ -1490,6 +1507,10 @@ BOOL WINAPI ImmGetConversionStatus( */ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { + static const WCHAR szwIME[] = {'I','M','E',0}; + if (IMM_GetThreadData()->hwndDefault == NULL) + IMM_GetThreadData()->hwndDefault = CreateWindowExW( WS_EX_TOOLWINDOW, + szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); TRACE("Default is %p\n",IMM_GetThreadData()->hwndDefault); return IMM_GetThreadData()->hwndDefault; } @@ -2262,16 +2283,16 @@ BOOL WINAPI ImmSetCompositionWindow( data->IMC.cfCompForm = *lpCompForm; - if (IsWindowVisible(IMM_GetThreadData()->hwndDefault)) + if (IsWindowVisible(data->immKbd->UIWnd)) { reshow = TRUE; - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_HIDE); + ShowWindow(data->immKbd->UIWnd,SW_HIDE); } /* FIXME: this is a partial stub */ if (reshow) - ShowWindow(IMM_GetThreadData()->hwndDefault,SW_SHOWNOACTIVATE); + ShowWindow(data->immKbd->UIWnd,SW_SHOWNOACTIVATE); ImmInternalSendIMENotify(data, IMN_SETCOMPOSITIONWINDOW, 0); return TRUE; @@ -2321,14 +2342,13 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) if (!data) return FALSE; - if (data->imeWnd == NULL) + if (data->immKbd->UIWnd == NULL) { /* create the ime window */ - data->imeWnd = CreateWindowExW( WS_EX_TOOLWINDOW, + data->immKbd->UIWnd = CreateWindowExW( WS_EX_TOOLWINDOW, data->immKbd->imeClassName, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, data->immKbd->hIME, 0); - SetWindowLongPtrW(data->imeWnd, IMMGWL_IMC, (LONG_PTR)data); - IMM_GetThreadData()->hwndDefault = data->imeWnd; + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); } if (!fOpen != !data->IMC.fOpen) @@ -2855,3 +2875,45 @@ BOOL WINAPI ImmGetHotKey(DWORD hotkey, UINT *modifiers, UINT *key, HKL hkl) FIXME("%x, %p, %p, %p: stub\n", hotkey, modifiers, key, hkl); return FALSE; } + + +/* + * Window Proc for the Default IME window class + */ +static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + case WM_NCCREATE: + return TRUE; + case WM_IME_COMPOSITION: + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_SELECT: + case WM_IME_CONTROL: + case WM_IME_NOTIFY: + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + return TRUE; + } + default: + if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || + (uMsg ==WM_MSIME_SERVICE) || + (uMsg == WM_MSIME_MOUSE) || + (uMsg == WM_MSIME_RECONVERTREQUEST) || + (uMsg == WM_MSIME_RECONVERT) || + (uMsg == WM_MSIME_QUERYPOSITION) || + (uMsg == WM_MSIME_DOCUMENTFEED)) + { + ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); + if (immHkl->UIWnd) + PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + return TRUE; + } + return FALSE; + } +} diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7fa8551..6eb8a41 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -618,6 +618,43 @@ static void test_ImmGetDescription(void) UnloadKeyboardLayout(hkl); } +static void test_ImmDefaultHwnd(void) +{ + HIMC imc1, imc2, imc3; + HWND def1, def3; + HWND hwnd; + + hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, "EDIT", "Wine imm32.dll test", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, + 240, 120, NULL, NULL, GetModuleHandle(0), NULL); + + ShowWindow(hwnd, SW_SHOWNORMAL); + + imc1 = ImmGetContext(hwnd); + if (!imc1) + { + win_skip("IME support not implemented\n"); + return; + } + + def1 = ImmGetDefaultIMEWnd(hwnd); + + imc2 = ImmCreateContext(); + ImmSetOpenStatus(imc2, TRUE); + + imc3 = ImmGetContext(hwnd); + def3 = ImmGetDefaultIMEWnd(hwnd); + + ok(def3 == def1, "Default IME window should not change\n"); + ok(imc1 == imc3, "IME context should not change\n"); + ImmSetOpenStatus(imc2, FALSE); + + ImmReleaseContext(hwnd, imc1); + ImmReleaseContext(hwnd, imc3); + ImmDestroyContext(imc2); + DestroyWindow(hwnd); +} + START_TEST(imm32) { if (init()) { @@ -630,6 +667,7 @@ START_TEST(imm32) { test_ImmIsUIMessage(); test_ImmGetContext(); test_ImmGetDescription(); + test_ImmDefaultHwnd(); } cleanup(); } diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 2bc49f5..96c9a7b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,6 +1,6 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 imm32 -DELAYIMPORTS = comctl32 ole32 shell32 +IMPORTS = uuid user32 gdi32 advapi32 +DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@

1 0

Jacek Caban : vbscript: Added WeekDayName implementation.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: a42f3cb45ee1666e3fe160632a36d785062bf347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42f3cb45ee1666e3fe160632… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 27 13:10:49 2012 +0200 vbscript: Added WeekDayName implementation. --- dlls/vbscript/global.c | 51 ++++++++++++++++++++++++++++++++++++++---- dlls/vbscript/tests/api.vbs | 15 ++++++++++++ dlls/vbscript/tests/run.c | 10 ++++---- 3 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ae5db24..793d7c8 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -63,7 +63,7 @@ static IInternetHostSecurityManager *get_sec_mgr(script_ctx_t *ctx) return ctx->secmgr = secmgr; } -static HRESULT return_bstr(VARIANT *res, const WCHAR *str) +static HRESULT return_string(VARIANT *res, const WCHAR *str) { BSTR ret; @@ -79,6 +79,17 @@ static HRESULT return_bstr(VARIANT *res, const WCHAR *str) return S_OK; } +static HRESULT return_bstr(VARIANT *res, BSTR str) +{ + if(res) { + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + }else { + SysFreeString(str); + } + return S_OK; +} + static HRESULT return_short(VARIANT *res, short val) { if(res) { @@ -137,6 +148,9 @@ static HRESULT to_int(VARIANT *v, int *ret) *ret = n; break; } + case VT_BOOL: + *ret = V_BOOL(v) ? -1 : 0; + break; default: FIXME("not supported %s\n", debugstr_variant(v)); return E_NOTIMPL; @@ -427,7 +441,7 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA *ptr = '0'; } - return return_bstr(res, ptr); + return return_string(res, ptr); } static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1224,8 +1238,35 @@ static HRESULT Global_FormatDateTime(vbdisp_t *This, VARIANT *arg, unsigned args static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int weekday, first_day = 0, abbrev = 0; + BSTR ret; + HRESULT hres; + + TRACE("\n"); + + assert(1 <= args_cnt && args_cnt <= 3); + + hres = to_int(arg+args_cnt-1, &weekday); + if(FAILED(hres)) + return hres; + + if(args_cnt > 1) { + hres = to_int(arg+args_cnt-2, &abbrev); + if(FAILED(hres)) + return hres; + + if(args_cnt == 3) { + hres = to_int(arg, &first_day); + if(FAILED(hres)) + return hres; + } + } + + hres = VarWeekdayName(weekday, abbrev, first_day, 0, &ret); + if(FAILED(hres)) + return hres; + + return return_bstr(res, ret); } static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -1988,7 +2029,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_FORMATCURRENCY, Global_FormatCurrency, 0, 1, 5}, {DISPID_GLOBAL_FORMATPERCENT, Global_FormatPercent, 0, 1, 5}, {DISPID_GLOBAL_FORMATDATETIME, Global_FormatDateTime, 0, 1, 2}, - {DISPID_GLOBAL_WEEKDAYNAME, Global_WeekdayName, 0, 3}, + {DISPID_GLOBAL_WEEKDAYNAME, Global_WeekdayName, 0, 1, 3}, {DISPID_GLOBAL_MONTHNAME, Global_MonthName, 0, 1, 2}, {DISPID_GLOBAL_ROUND, Global_Round, 0, 1, 2}, {DISPID_GLOBAL_ESCAPE, Global_Escape, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 5efde28..66b95a9 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -190,6 +190,7 @@ Call ok(Len(empty) = 0, "Len(empty) = " & Len(empty)) Call ok(Space(1) = " ", "Space(1) = " & Space(1) & """") Call ok(Space(0) = "", "Space(0) = " & Space(0) & """") +Call ok(Space(false) = "", "Space(false) = " & Space(false) & """") Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") @@ -210,4 +211,18 @@ TestRound "2", 2, "VT_R8" TestRound true, true, "VT_BOOL" TestRound false, false, "VT_BOOL" +if isEnglishLang then + Call ok(WeekDayName(1) = "Sunday", "WeekDayName(1) = " & WeekDayName(1)) + Call ok(WeekDayName(3) = "Tuesday", "WeekDayName(3) = " & WeekDayName(3)) + Call ok(WeekDayName(7) = "Saturday", "WeekDayName(7) = " & WeekDayName(7)) + Call ok(WeekDayName(1.1) = "Sunday", "WeekDayName(1.1) = " & WeekDayName(1.1)) + Call ok(WeekDayName(1, false) = "Sunday", "WeekDayName(1, false) = " & WeekDayName(1, false)) + Call ok(WeekDayName(1, true) = "Sun", "WeekDayName(1, true) = " & WeekDayName(1, true)) + Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) + Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) + Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) + Call ok(WeekDayName(1, true, 7) = "Sat", "WeekDayName(1, true, 7) = " & WeekDayName(1, true, 7)) + Call ok(WeekDayName(1, true, 7.1) = "Sat", "WeekDayName(1, true, 7.1) = " & WeekDayName(1, true, 7.1)) +end if + Call reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ae590bf..3f68717 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -202,10 +202,10 @@ static BOOL is_lang_english(void) pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); } - if (pGetThreadUILanguage) - return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; - if (pGetUserDefaultUILanguage) - return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + if (pGetThreadUILanguage && PRIMARYLANGID(pGetThreadUILanguage()) != LANG_ENGLISH) + return FALSE; + if (pGetUserDefaultUILanguage && PRIMARYLANGID(pGetUserDefaultUILanguage()) != LANG_ENGLISH) + return FALSE; return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; } @@ -1906,7 +1906,7 @@ START_TEST(run) is_english = is_lang_english(); if(!is_english) - skip("Skipping some tests in non-English UIs\n"); + skip("Skipping some tests in non-English locale\n"); argc = winetest_get_mainargs(&argv);

1 0

Jacek Caban : vbscript: Added MonthName implementation.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 564d551a89ba34b9df6d7f0a632d4e790e0f90b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564d551a89ba34b9df6d7f0a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 27 13:11:08 2012 +0200 vbscript: Added MonthName implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 793d7c8..bf423b4 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1271,8 +1271,29 @@ static HRESULT Global_WeekdayName(vbdisp_t *This, VARIANT *arg, unsigned args_cn static HRESULT Global_MonthName(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int month, abbrev = 0; + BSTR ret; + HRESULT hres; + + TRACE("\n"); + + assert(args_cnt == 1 || args_cnt == 2); + + hres = to_int(arg+args_cnt-1, &month); + if(FAILED(hres)) + return hres; + + if(args_cnt == 2) { + hres = to_int(arg, &abbrev); + if(FAILED(hres)) + return hres; + } + + hres = VarMonthName(month, abbrev, 0, &ret); + if(FAILED(hres)) + return hres; + + return return_bstr(res, ret); } static HRESULT Global_Round(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 66b95a9..78e4a8b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -223,6 +223,13 @@ if isEnglishLang then Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) Call ok(WeekDayName(1, true, 7) = "Sat", "WeekDayName(1, true, 7) = " & WeekDayName(1, true, 7)) Call ok(WeekDayName(1, true, 7.1) = "Sat", "WeekDayName(1, true, 7.1) = " & WeekDayName(1, true, 7.1)) + + Call ok(MonthName(1) = "January", "MonthName(1) = " & MonthName(1)) + Call ok(MonthName(12) = "December", "MonthName(12) = " & MonthName(12)) + Call ok(MonthName(1, 0) = "January", "MonthName(1, 0) = " & MonthName(1, 0)) + Call ok(MonthName(12, false) = "December", "MonthName(12, false) = " & MonthName(12, false)) + Call ok(MonthName(1, 10) = "Jan", "MonthName(1, 10) = " & MonthName(1, 10)) + Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true)) end if Call reportSuccess()

1 0

Alexandre Julliard : user32: Add tests for UpdateLayeredWindowIndirect and fix the behavior of the ULW_EX_NORESIZE flag .
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 53e4e504b94e7e100b03702f025f85cf73f2870f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e4e504b94e7e100b03702f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 17:16:21 2012 +0200 user32: Add tests for UpdateLayeredWindowIndirect and fix the behavior of the ULW_EX_NORESIZE flag. --- dlls/user32/tests/win.c | 43 +++++++++++++++++++++++++++ dlls/user32/win.c | 74 ++++++++++++++++++++++++++-------------------- include/winerror.h | 9 ++++++ 3 files changed, 94 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53e4e504b94e7e100b037…

1 0

Dmitry Timoshkov : gdiplus: Move font substitution test into a separate function.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 25ee85fe8457a2b2719eee3d45206ddd1c8f87b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ee85fe8457a2b2719eee3d4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 15:52:07 2012 +0900 gdiplus: Move font substitution test into a separate function. --- dlls/gdiplus/tests/font.c | 104 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 93 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 03f5769..e7930cd 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -104,17 +104,6 @@ static void test_logfont(void) memset(&lfa, 0, sizeof(LOGFONTA)); memset(&lfa2, 0xff, sizeof(LOGFONTA)); - - lstrcpyA(lfa.lfFaceName, "Nonexistent font"); - stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); - ok(stat == NotTrueTypeFont || broken(stat == FileNotFound), /* before XP */ - "expected NotTrueTypeFont, got %d\n", stat); - - /* empty FaceName */ - lfa.lfFaceName[0] = 0; - stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); - expect(NotTrueTypeFont, stat); - lstrcpyA(lfa.lfFaceName, "Tahoma"); stat = GdipCreateFontFromLogfontA(hdc, &lfa, &font); @@ -727,6 +716,98 @@ static void test_font_metrics(void) DeleteDC(hdc); } +static void test_font_substitution(void) +{ + WCHAR ms_shell_dlg[LF_FACESIZE]; + HDC hdc; + HFONT hfont; + LOGFONT lf; + GpStatus status; + GpGraphics *graphics; + GpFont *font; + GpFontFamily *family; + int ret; + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + hfont = GetStockObject(DEFAULT_GUI_FONT); + ok(hfont != 0, "GetStockObject(DEFAULT_GUI_FONT) failed\n"); + + memset(&lf, 0xfe, sizeof(lf)); + ret = GetObject(hfont, sizeof(lf), &lf); + ok(ret == sizeof(lf), "GetObject failed\n"); + ok(!lstrcmp(lf.lfFaceName, "MS Shell Dlg"), "wrong face name %s\n", lf.lfFaceName); + MultiByteToWideChar(CP_ACP, 0, lf.lfFaceName, -1, ms_shell_dlg, LF_FACESIZE); + + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + expect(Ok, status); + memset(&lf, 0xfe, sizeof(lf)); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + ok(!lstrcmp(lf.lfFaceName, "Microsoft Sans Serif") || + !lstrcmp(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + GdipDeleteFont(font); + + status = GdipCreateFontFamilyFromName(ms_shell_dlg, NULL, &family); + expect(Ok, status); + status = GdipCreateFont(family, 12, FontStyleRegular, UnitPoint, &font); + expect(Ok, status); + memset(&lf, 0xfe, sizeof(lf)); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + ok(!lstrcmp(lf.lfFaceName, "Microsoft Sans Serif") || + !lstrcmp(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); + GdipDeleteFont(font); + GdipDeleteFontFamily(family); + + status = GdipCreateFontFamilyFromName(nonexistent, NULL, &family); + ok(status == FontFamilyNotFound, "expected FontFamilyNotFound, got %d\n", status); + + lstrcpy(lf.lfFaceName, "ThisFontShouldNotExist"); + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); +todo_wine + expect(Ok, status); + memset(&lf, 0xfe, sizeof(lf)); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + GdipDeleteFont(font); + + /* empty FaceName */ + lf.lfFaceName[0] = 0; + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); +todo_wine + expect(Ok, status); + memset(&lf, 0xfe, sizeof(lf)); + status = GdipGetLogFontA(font, graphics, &lf); + expect(Ok, status); +todo_wine + ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); + GdipDeleteFont(font); + + /* zeroing out lfWeight and lfCharSet leads to font creation failure */ + lf.lfWeight = 0; + lf.lfCharSet = 0; + lstrcpy(lf.lfFaceName, "ThisFontShouldNotExist"); + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ + "expected NotTrueTypeFont, got %d\n", status); + + /* empty FaceName */ + lf.lfFaceName[0] = 0; + status = GdipCreateFontFromLogfontA(hdc, &lf, &font); + ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ + "expected NotTrueTypeFont, got %d\n", status); + + GdipDeleteGraphics(graphics); + DeleteDC(hdc); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -739,6 +820,7 @@ START_TEST(font) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_font_substitution(); test_font_metrics(); test_createfont(); test_logfont();

1 0

Dmitry Timoshkov : gdiplus: Take into account font substitution in GdipCreateFontFamilyFromName.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 65a966de76eb22a9c3ec7494c7a7beb9870aebfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a966de76eb22a9c3ec7494c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 15:52:18 2012 +0900 gdiplus: Take into account font substitution in GdipCreateFontFamilyFromName. --- dlls/gdiplus/font.c | 5 ++++- dlls/gdiplus/tests/font.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 51fda73..39449cb 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -624,6 +624,7 @@ static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, struct font_metrics { + WCHAR facename[LF_FACESIZE]; UINT16 em_height, ascent, descent, line_spacing; /* in font units */ int dpi; }; @@ -639,6 +640,8 @@ static BOOL get_font_metrics(HDC hdc, struct font_metrics *fm) otm.otmSize = sizeof(otm); if (!GetOutlineTextMetricsW(hdc, otm.otmSize, &otm)) return FALSE; + GetTextFaceW(hdc, LF_FACESIZE, fm->facename); + fm->em_height = otm.otmEMSquare; fm->dpi = GetDeviceCaps(hdc, LOGPIXELSY); @@ -739,7 +742,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, ffamily = GdipAlloc(sizeof (GpFontFamily)); if (!ffamily) return OutOfMemory; - lstrcpynW(ffamily->FamilyName, name, LF_FACESIZE); + lstrcpyW(ffamily->FamilyName, fm.facename); ffamily->em_height = fm.em_height; ffamily->ascent = fm.ascent; ffamily->descent = fm.descent; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index e7930cd..4dfda25 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -746,7 +746,6 @@ static void test_font_substitution(void) memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine ok(!lstrcmp(lf.lfFaceName, "Microsoft Sans Serif") || !lstrcmp(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); GdipDeleteFont(font); @@ -758,7 +757,6 @@ todo_wine memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine ok(!lstrcmp(lf.lfFaceName, "Microsoft Sans Serif") || !lstrcmp(lf.lfFaceName, "Tahoma"), "wrong face name %s\n", lf.lfFaceName); GdipDeleteFont(font);

1 0

Dmitry Timoshkov : gdiplus: Take into account font substitution in GdipCreateFontFromLogfont.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: 691be74f176f084c7f8bf109ae953e0ed65cff5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=691be74f176f084c7f8bf109a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 15:52:29 2012 +0900 gdiplus: Take into account font substitution in GdipCreateFontFromLogfont. --- dlls/gdiplus/font.c | 4 +++- dlls/gdiplus/tests/font.c | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 39449cb..e4f979c 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -205,6 +205,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, { HFONT hfont, oldfont; OUTLINETEXTMETRICW otm; + WCHAR facename[LF_FACESIZE]; GpStatus stat; int ret; @@ -217,6 +218,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, oldfont = SelectObject(hdc, hfont); otm.otmSize = sizeof(otm); ret = GetOutlineTextMetricsW(hdc, otm.otmSize, &otm); + GetTextFaceW(hdc, LF_FACESIZE, facename); SelectObject(hdc, oldfont); DeleteObject(hfont); @@ -229,7 +231,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->emSize = otm.otmTextMetrics.tmAscent; (*font)->otm = otm; - stat = GdipCreateFontFamilyFromName(logfont->lfFaceName, NULL, &(*font)->family); + stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family); if (stat != Ok) { GdipFree(*font); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 4dfda25..66517b1 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -767,24 +767,20 @@ static void test_font_substitution(void) lstrcpy(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine expect(Ok, status); memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); GdipDeleteFont(font); /* empty FaceName */ lf.lfFaceName[0] = 0; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); -todo_wine expect(Ok, status); memset(&lf, 0xfe, sizeof(lf)); status = GdipGetLogFontA(font, graphics, &lf); expect(Ok, status); -todo_wine ok(!lstrcmp(lf.lfFaceName, "Arial"), "wrong face name %s\n", lf.lfFaceName); GdipDeleteFont(font); @@ -793,12 +789,14 @@ todo_wine lf.lfCharSet = 0; lstrcpy(lf.lfFaceName, "ThisFontShouldNotExist"); status = GdipCreateFontFromLogfontA(hdc, &lf, &font); +todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status); /* empty FaceName */ lf.lfFaceName[0] = 0; status = GdipCreateFontFromLogfontA(hdc, &lf, &font); +todo_wine ok(status == NotTrueTypeFont || broken(status == FileNotFound), /* before XP */ "expected NotTrueTypeFont, got %d\n", status);

1 0

André Hentschel : ole32/tests: Use IUnknown_Release instead of deprecated WdtpInterfacePointer_UserFree.
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: fb383cd5a6869daa4980030b7ae692f244582b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb383cd5a6869daa4980030b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Sep 27 20:32:25 2012 +0200 ole32/tests: Use IUnknown_Release instead of deprecated WdtpInterfacePointer_UserFree. --- dlls/ole32/tests/usrmarshal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index ed09558..6314006 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -551,7 +551,6 @@ static IStream Test_Stream = { &TestStream_Vtbl }; ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); -void __RPC_USER WdtpInterfacePointer_UserFree(IUnknown *); static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) { @@ -624,7 +623,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); - WdtpInterfacePointer_UserFree(unk2); + IUnknown_Release(unk2); } static void test_marshal_WdtpInterfacePointer(void)

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_blend_variable_GetBlendState( ).
by Alexandre Julliard 27 Sep '12

27 Sep '12

Module: wine Branch: master Commit: fb2dac9621aa9cfae93cb50162ccf576a7415475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb2dac9621aa9cfae93cb5016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 22:34:01 2012 +0200 d3d10: Implement d3d10_effect_blend_variable_GetBlendState(). --- dlls/d3d10/d3d10_private.h | 4 +++ dlls/d3d10/effect.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 4f40c3e..65ec465 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -109,6 +109,10 @@ struct d3d10_effect_state_object_variable D3D10_BLEND_DESC blend; D3D10_SAMPLER_DESC sampler; } desc; + union + { + ID3D10BlendState *blend; + } object; }; /* ID3D10EffectType */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 30832f5..7d14620 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1561,6 +1561,32 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * return S_OK; } +static HRESULT create_state_object(struct d3d10_effect_variable *v) +{ + ID3D10Device *device = v->effect->device; + HRESULT hr; + + switch (v->type->basetype) + { + case D3D10_SVT_BLEND: + if (FAILED(hr = ID3D10Device_CreateBlendState(device, + &v->u.state.desc.blend, &v->u.state.object.blend))) + return hr; + break; + + case D3D10_SVT_DEPTHSTENCIL: + case D3D10_SVT_RASTERIZER: + case D3D10_SVT_SAMPLER: + break; + + default: + ERR("Unhandled variable type %s.\n", debug_d3d10_shader_variable_type(v->type->basetype)); + return E_FAIL; + } + + return S_OK; +} + static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) { unsigned int i; @@ -1660,6 +1686,9 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const ERR("Failed to read property list.\n"); return E_FAIL; } + + if (FAILED(hr = create_state_object(v))) + return hr; } } break; @@ -5984,9 +6013,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetRawValue(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D10EffectBlendVariable *iface, UINT index, ID3D10BlendState **blend_state) { - FIXME("iface %p, index %u, blend_state %p stub!\n", iface, index, blend_state); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_state); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_BLEND) + { + WARN("Variable is not a blend state.\n"); + return E_FAIL; + } + + if ((*blend_state = v->u.state.object.blend)) + ID3D10BlendState_AddRef(*blend_state); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3D10EffectBlendVariable *iface,

1 0