September 2009 - Wine-Commits

Frédéric Delanoy : documentation: Keep README. fr in sync; fixes.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: bbab7f2782aeacb6fee2946f67290dcb1c142b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbab7f2782aeacb6fee2946f6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 8 22:25:25 2009 +0200 documentation: Keep README.fr in sync; fixes. In addition, conversion to UTF-8. --- documentation/README.fr | 233 +++++++++++++++++++++++------------------------ 1 files changed, 115 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbab7f2782aeacb6fee29…

1 0

Huw Davies : oledb32: Add stub DllCanUnloadNow.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: 50046f21d47ce15604a98c144ab02fa8077c44b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50046f21d47ce15604a98c144… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 12:21:43 2009 +0100 oledb32: Add stub DllCanUnloadNow. --- dlls/oledb32/main.c | 9 +++++++++ dlls/oledb32/oledb32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 6ff580c..6e22f71 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -134,3 +134,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } + +/****************************************************************** + * DllCanUnloadNow + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + FIXME("(): stub\n"); + return S_FALSE; +} diff --git a/dlls/oledb32/oledb32.spec b/dlls/oledb32/oledb32.spec index 4e15e00..b16365d 100644 --- a/dlls/oledb32/oledb32.spec +++ b/dlls/oledb32/oledb32.spec @@ -1,4 +1,4 @@ -@ stub DllCanUnloadNow +@ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Huw Davies : oledb32: Add registration routines.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: d36e1cefdee57c5eabd01cbe6ab570ada03cf5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36e1cefdee57c5eabd01cbe6… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 9 12:15:47 2009 +0100 oledb32: Add registration routines. --- dlls/oledb32/Makefile.in | 3 +- dlls/oledb32/oledb32.spec | 4 +- dlls/oledb32/regsvr.c | 560 +++++++++++++++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 4 files changed, 565 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d36e1cefdee57c5eabd01…

1 0

Hans Leidekker : msi: Add a test to show that creating shortcuts works regardless of COM initialization state .
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: 92cd7a8fa0046658e01a17fe47723f19e79961b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cd7a8fa0046658e01a17fe4… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 9 12:26:27 2009 +0200 msi: Add a test to show that creating shortcuts works regardless of COM initialization state. --- dlls/msi/tests/install.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index beb0630..3a22ca3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -124,6 +124,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" "DuplicateFiles\t\t4500\n" + "CreateShortcuts\t\t4600\n" "InstallServices\t\t5000\n" "InstallFinalize\t\t6600\n" "InstallInitialize\t\t1500\n" @@ -159,6 +160,11 @@ static const CHAR property_dat[] = "Property\tValue\n" "SERVNAME\tTestService\n" "SERVDISP\tTestServiceDisp\n"; +static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" + "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" + "Shortcut\tShortcut\n" + "Shortcut\tMSITESTDIR\tShortcut\tcomponent\tShortcut\t\tShortcut\t\t\t\t\t\n"; + static const CHAR up_property_dat[] = "Property\tValue\n" "s72\tl0\n" "Property\tProperty\n" @@ -885,6 +891,19 @@ static const msi_table tables[] = ADD_TABLE(service_control) }; +static const msi_table sc_tables[] = +{ + ADD_TABLE(component), + ADD_TABLE(directory), + ADD_TABLE(feature), + ADD_TABLE(feature_comp), + ADD_TABLE(file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property), + ADD_TABLE(shortcut) +}; + static const msi_table up_tables[] = { ADD_TABLE(component), @@ -6181,6 +6200,49 @@ static void test_int_widths( void ) RemoveDirectoryA(tmpdir); } +static void test_shortcut(void) +{ + UINT r; + HRESULT hr; + + create_test_files(); + create_database(msifile, sc_tables, sizeof(sc_tables) / sizeof(msi_table)); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + + r = MsiInstallProductA(msifile, NULL); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + CoUninitialize(); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + CoUninitialize(); + + delete_pf("msitest\\cabout\\new\\five.txt", TRUE); + delete_pf("msitest\\cabout\\new", FALSE); + delete_pf("msitest\\cabout\\four.txt", TRUE); + delete_pf("msitest\\cabout", FALSE); + delete_pf("msitest\\changed\\three.txt", TRUE); + delete_pf("msitest\\changed", FALSE); + delete_pf("msitest\\first\\two.txt", TRUE); + delete_pf("msitest\\first", FALSE); + delete_pf("msitest\\filename", TRUE); + delete_pf("msitest\\one.txt", TRUE); + delete_pf("msitest\\service.exe", TRUE); + delete_pf("msitest\\Shortcut.lnk", TRUE); + delete_pf("msitest", FALSE); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -6262,6 +6324,7 @@ START_TEST(install) test_adminimage(); test_propcase(); test_int_widths(); + test_shortcut(); DeleteFileA(log_file);

1 0

Hans Leidekker : shell32: Reject NULL path in IShellLink_SetPath.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: 6b107c7f62d568d8f1c026fad394f8897abd1523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b107c7f62d568d8f1c026fad… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 9 12:25:44 2009 +0200 shell32: Reject NULL path in IShellLink_SetPath. --- dlls/shell32/shelllink.c | 4 ++++ dlls/shell32/tests/shelllink.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 05978f3..231c72c 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1651,6 +1651,8 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile) TRACE("(%p)->(path=%s)\n",This, pszFile); + if (!pszFile) return E_INVALIDARG; + str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); if( !str ) return E_OUTOFMEMORY; @@ -2168,6 +2170,8 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile TRACE("(%p)->(path=%s)\n",This, debugstr_w(pszFile)); + if (!pszFile) return E_INVALIDARG; + /* quotes at the ends of the string are stripped */ len = lstrlenW(pszFile); if (pszFile[0] == '"' && pszFile[len-1] == '"') diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c28c715..a1e1cd4 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -156,6 +156,9 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + r = IShellLinkA_SetPath(sl, NULL); + ok(r==E_INVALIDARG, "SetPath failed (0x%08x)\n", r); + r = IShellLinkA_SetPath(sl, ""); ok(r==S_OK, "SetPath failed (0x%08x)\n", r); @@ -700,6 +703,9 @@ static void test_datalink(void) ok( r == E_FAIL, "CopyDataBlock failed\n"); ok( dar == NULL, "should be null\n"); + r = IShellLinkW_SetPath(sl, NULL); + ok(r == E_INVALIDARG, "set path failed\n"); + r = IShellLinkW_SetPath(sl, lnk); ok(r == S_OK, "set path failed\n");

1 0

Nikolay Sivov : comctl32/header: Add XP SP3 workaround for Header tests. Fix window handle leak.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: fffb41f6a6ba50a2a2b80ef9bbdae2d0187a36d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fffb41f6a6ba50a2a2b80ef9b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 8 20:23:54 2009 +0400 comctl32/header: Add XP SP3 workaround for Header tests. Fix window handle leak. --- dlls/comctl32/tests/header.c | 17 +++++++++++++++++ dlls/comctl32/tests/listview.c | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index d0f3f28..3bbaaa8 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1701,6 +1701,7 @@ START_TEST(header) { HWND parent_hwnd; ULONG_PTR ctx_cookie; + HWND hwnd; if (!init()) return; @@ -1732,6 +1733,22 @@ START_TEST(header) return; } + /* this is a XP SP3 failure workaround */ + hwnd = CreateWindowExA(0, WC_HEADER, NULL, + WS_CHILD|WS_BORDER|WS_VISIBLE|HDS_BUTTONS|HDS_HORZ, + 0, 0, 100, 100, + parent_hwnd, NULL, GetModuleHandleA(NULL), NULL); + + if (!IsWindow(hwnd)) + { + win_skip("FIXME: failed to create Header window.\n"); + unload_v6_module(ctx_cookie); + DestroyWindow(parent_hwnd); + return; + } + else + DestroyWindow(hwnd); + /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5b39176..d0f2273 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4071,6 +4071,7 @@ START_TEST(listview) { win_skip("FIXME: failed to create ListView window.\n"); unload_v6_module(ctx_cookie); + DestroyWindow(hwndparent); return; } else

1 0

Nikolay Sivov : comctl32/monthcal: Draw selected day as v6 does. Get rid of ugly selection curve.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: cbe960f1e9f43229b79862ceb0807b862db5c662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe960f1e9f43229b79862ceb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 8 11:55:22 2009 +0400 comctl32/monthcal: Draw selected day as v6 does. Get rid of ugly selection curve. --- dlls/comctl32/monthcal.c | 60 +++++++++------------------------------------ 1 files changed, 12 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 05cac4e..2738795 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -271,62 +271,28 @@ static inline void MONTHCAL_CalcPosFromDay(const MONTHCAL_INFO *infoPtr, /* month is the month value(1 == january, 12 == december) */ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month) { - HPEN hRedPen = CreatePen(PS_SOLID, 2, RGB(255, 0, 0)); + HPEN hRedPen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); HPEN hOldPen2 = SelectObject(hdc, hRedPen); - POINT points[13]; - int x, y; + HBRUSH hOldBrush; RECT day_rect; - MONTHCAL_CalcPosFromDay(infoPtr, day, month, &day_rect); - x = day_rect.left; - y = day_rect.top; - - points[0].x = x; - points[0].y = y - 1; - points[1].x = x + 0.8 * infoPtr->width_increment; - points[1].y = y - 1; - points[2].x = x + 0.9 * infoPtr->width_increment; - points[2].y = y; - points[3].x = x + infoPtr->width_increment; - points[3].y = y + 0.5 * infoPtr->height_increment; - - points[4].x = x + infoPtr->width_increment; - points[4].y = y + 0.9 * infoPtr->height_increment; - points[5].x = x + 0.6 * infoPtr->width_increment; - points[5].y = y + 0.9 * infoPtr->height_increment; - points[6].x = x + 0.5 * infoPtr->width_increment; - points[6].y = y + 0.9 * infoPtr->height_increment; /* bring the bottom up just - a hair to fit inside the day rectangle */ - - points[7].x = x + 0.2 * infoPtr->width_increment; - points[7].y = y + 0.8 * infoPtr->height_increment; - points[8].x = x + 0.1 * infoPtr->width_increment; - points[8].y = y + 0.8 * infoPtr->height_increment; - points[9].x = x; - points[9].y = y + 0.5 * infoPtr->height_increment; - - points[10].x = x + 0.1 * infoPtr->width_increment; - points[10].y = y + 0.2 * infoPtr->height_increment; - points[11].x = x + 0.2 * infoPtr->width_increment; - points[11].y = y + 0.3 * infoPtr->height_increment; - points[12].x = x + 0.4 * infoPtr->width_increment; - points[12].y = y + 0.2 * infoPtr->height_increment; - - PolyBezier(hdc, points, 13); + hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); + Rectangle(hdc, day_rect.left, day_rect.top, day_rect.right, day_rect.bottom); + + SelectObject(hdc, hOldBrush); DeleteObject(hRedPen); SelectObject(hdc, hOldPen2); } - static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month, int x, int y, int bold) { static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r; - static int haveBoldFont, haveSelectedDay = FALSE; + static BOOL haveBoldFont, haveSelectedDay = FALSE; HBRUSH hbr; COLORREF oldCol = 0; COLORREF oldBk = 0; @@ -341,16 +307,14 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int if((day>=infoPtr->minSel.wDay) && (day<=infoPtr->maxSel.wDay) && (month==infoPtr->currentMonth)) { - HRGN hrgn; RECT r2; TRACE("%d %d %d\n",day, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); oldCol = SetTextColor(hdc, infoPtr->monthbk); oldBk = SetBkColor(hdc, infoPtr->trailingtxt); - hbr = GetSysColorBrush(COLOR_GRAYTEXT); - hrgn = CreateEllipticRgn(r.left, r.top, r.right, r.bottom); - FillRgn(hdc, hrgn, hbr); + hbr = GetSysColorBrush(COLOR_HIGHLIGHT); + FillRect(hdc, &r, hbr); /* FIXME: this may need to be changed now b/c of the other drawing changes 11/3/99 CMM */ @@ -375,14 +339,14 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int haveBoldFont = FALSE; } + SetBkMode(hdc,TRANSPARENT); + DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); + if(haveSelectedDay) { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); } - SetBkMode(hdc,TRANSPARENT); - DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); - /* draw a rectangle around the currently selected days text */ if((day==infoPtr->curSelDay) && (month==infoPtr->currentMonth)) DrawFocusRect(hdc, &r);

1 0

Nikolay Sivov : comctl32/monthcal: Cache window GWL_STYLE.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: 86bd48d512e8321f5f6f98930e3b5963bb5739e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86bd48d512e8321f5f6f98930… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 8 10:44:55 2009 +0400 comctl32/monthcal: Cache window GWL_STYLE. --- dlls/comctl32/monthcal.c | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index be41451..05cac4e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -76,7 +76,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); typedef struct { - HWND hwndSelf; + HWND hwndSelf; + DWORD dwStyle; /* cached GWL_STYLE */ COLORREF bk; COLORREF txt; COLORREF titlebk; @@ -1032,7 +1033,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, LPARAM lParam) TRACE("%lx\n", lParam); if((infoPtr==NULL) ||(lpSel==NULL)) return FALSE; - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) return FALSE; + if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; MONTHCAL_CopyTime(&infoPtr->minSel, lpSel); TRACE("%d/%d/%d\n", lpSel->wYear, lpSel->wMonth, lpSel->wDay); @@ -1048,7 +1049,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, LPARAM lParam) TRACE("%lx\n", lParam); if((infoPtr==NULL) ||(lpSel==NULL)) return FALSE; - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) return FALSE; + if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; if(!MONTHCAL_ValidateTime(*lpSel)) return FALSE; @@ -1076,7 +1077,7 @@ MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, WPARAM wParam) { TRACE("%lx\n", wParam); - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) { + if(infoPtr->dwStyle & MCS_MULTISELECT) { infoPtr->maxSelCount = wParam; } @@ -1095,7 +1096,7 @@ MONTHCAL_GetSelRange(const MONTHCAL_INFO *infoPtr, LPARAM lParam) if((infoPtr==NULL) ||(lprgSysTimeArray==NULL)) return FALSE; - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) + if(infoPtr->dwStyle & MCS_MULTISELECT) { MONTHCAL_CopyTime(&infoPtr->maxSel, &lprgSysTimeArray[1]); MONTHCAL_CopyTime(&infoPtr->minSel, &lprgSysTimeArray[0]); @@ -1118,7 +1119,7 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, LPARAM lParam) if((infoPtr==NULL) ||(lprgSysTimeArray==NULL)) return FALSE; - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) + if(infoPtr->dwStyle & MCS_MULTISELECT) { MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxSel); MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minSel); @@ -1282,8 +1283,6 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, LPARAM lParam) static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - TRACE("MONTHCAL_GoToNextMonth\n"); infoPtr->currentMonth++; @@ -1292,7 +1291,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) infoPtr->currentMonth = 1; } - if(dwStyle & MCS_DAYSTATE) { + if(infoPtr->dwStyle & MCS_DAYSTATE) { NMDAYSTATE nmds; int i; @@ -1316,8 +1315,6 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) { - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); - TRACE("\n"); infoPtr->currentMonth--; @@ -1326,7 +1323,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) infoPtr->currentMonth = 12; } - if(dwStyle & MCS_DAYSTATE) { + if(infoPtr->dwStyle & MCS_DAYSTATE) { NMDAYSTATE nmds; int i; @@ -1652,7 +1649,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->curSelDay = selday; MONTHCAL_CalcPosFromDay(infoPtr, selday, ht.st. wMonth, &r); - if(GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & MCS_MULTISELECT) { + if(infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME selArray[2]; int i; @@ -1763,7 +1760,6 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) RECT *todayrect=&infoPtr->todayrect; SIZE size; TEXTMETRICW tm; - DWORD dwStyle = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); HFONT currentFont; int xdiv, left_offset; RECT rcClient; @@ -1781,7 +1777,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* recalculate the height and width increments and offsets */ GetTextExtentPoint32W(hdc, O0W, 2, &size); - xdiv = (dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; + xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; infoPtr->width_increment = size.cx * 2 + 4; infoPtr->height_increment = infoPtr->textHeight; @@ -1811,7 +1807,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) /* setup the dimensions of the rectangle we draw the names of the */ /* days of the week in */ weeknumrect->left = left_offset; - if(dwStyle & MCS_WEEKNUMBERS) + if(infoPtr->dwStyle & MCS_WEEKNUMBERS) weeknumrect->right=prev->right; else weeknumrect->right=weeknumrect->left; @@ -1890,6 +1886,19 @@ static LRESULT theme_changed (const MONTHCAL_INFO* infoPtr) return 0; } +static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, + const STYLESTRUCT *lpss) +{ + TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + wStyleType, lpss->styleOld, lpss->styleNew); + + if (wStyleType != GWL_STYLE) return 0; + + infoPtr->dwStyle = lpss->styleNew; + + return 0; +} + /* FIXME: check whether dateMin/dateMax need to be adjusted. */ static LRESULT MONTHCAL_Create(HWND hwnd, LPARAM lParam) @@ -1907,6 +1916,7 @@ MONTHCAL_Create(HWND hwnd, LPARAM lParam) infoPtr->hwndSelf = hwnd; infoPtr->hwndNotify = ((LPCREATESTRUCTW)lParam)->hwndParent; + infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); MONTHCAL_SetFont(infoPtr, GetStockObject(DEFAULT_GUI_FONT), FALSE); @@ -2086,6 +2096,9 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; + case WM_STYLECHANGED: + return MONTHCAL_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam);

1 0

Aric Stewart : msctf/tests: Add handler sink_check_ok for checking fired sinks.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: 91791768f7ad860e5589c484e45d3819521ede78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91791768f7ad860e5589c484e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 8 13:29:56 2009 -0500 msctf/tests: Add handler sink_check_ok for checking fired sinks. --- dlls/msctf/tests/inputprocessor.c | 73 ++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91791768f7ad860e5589c…

1 0

Aric Stewart : msctf/test: Add sink_fire_ok helper and use it to check sink firing.
by Alexandre Julliard Sept. 9, 2009

Sept. 9, 2009

Module: wine Branch: master Commit: b0e452f1cf5136601569ade5ad86a77214e3147e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e452f1cf5136601569ade5a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 8 13:29:49 2009 -0500 msctf/test: Add sink_fire_ok helper and use it to check sink firing. --- dlls/msctf/tests/inputprocessor.c | 92 ++++++++++++++++++++++++------------ 1 files changed, 61 insertions(+), 31 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 1770cac..efa5127 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -44,6 +44,13 @@ static ITextStoreACPSink *ACPSink; #define SINK_EXPECTED 1 #define SINK_FIRED 2 #define SINK_IGNORE 3 +#define SINK_OPTIONAL 4 + +#define SINK_ACTION_MASK 0xff +#define SINK_OPTION_MASK 0xff00 +#define SINK_EXPECTED_COUNT_MASK 0xff0000 + +#define SINK_OPTION_TODO 0x0100 static BOOL test_ShouldActivate = FALSE; static BOOL test_ShouldDeactivate = FALSE; @@ -69,6 +76,46 @@ static INT test_ACP_SetSelection = SINK_UNEXPECTED; static INT test_OnEndEdit = SINK_UNEXPECTED; +static inline int expected_count(int *sink) +{ + return (*sink & SINK_EXPECTED_COUNT_MASK)>>16; +} + +static inline void _sink_fire_ok(INT *sink, const CHAR* name) +{ + int count; + int todo = *sink & SINK_OPTION_TODO; + int action = *sink & SINK_ACTION_MASK; + + if (winetest_interactive) + winetest_trace("firing %s\n",name); + + switch (action) + { + case SINK_OPTIONAL: + case SINK_EXPECTED: + count = expected_count(sink); + if (count > 1) + { + count --; + *sink = (*sink & ~SINK_EXPECTED_COUNT_MASK) + (count << 16); + return; + } + break; + case SINK_IGNORE: + winetest_trace("Ignoring %s\n",name); + return; + default: + if (todo) todo_wine + { + winetest_ok(0, "Unexpected %s sink\n",name); + } + } + *sink = SINK_FIRED; +} + +#define sink_fire_ok(a,b) (winetest_set_location(__FILE__,__LINE__), 0) ? 0 : _sink_fire_ok(a,b) + /********************************************************************** * ITextStoreACP **********************************************************************/ @@ -125,8 +172,7 @@ static HRESULT WINAPI TextStoreACP_AdviseSink(ITextStoreACP *iface, { HRESULT hr; - ok(test_ACP_AdviseSink == SINK_EXPECTED, "Unexpected TextStoreACP_AdviseSink sink\n"); - test_ACP_AdviseSink = SINK_FIRED; + sink_fire_ok(&test_ACP_AdviseSink,"TextStoreACP_AdviseSink"); hr = IUnknown_QueryInterface(punk, &IID_ITextStoreACPSink,(LPVOID*)(&ACPSink)); ok(SUCCEEDED(hr),"Unable to QueryInterface on sink\n"); @@ -143,19 +189,14 @@ static HRESULT WINAPI TextStoreACP_UnadviseSink(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_RequestLock(ITextStoreACP *iface, DWORD dwLockFlags, HRESULT *phrSession) { - ok(test_ACP_RequestLock == SINK_EXPECTED,"Unexpected TextStoreACP_RequestLock\n"); - test_ACP_RequestLock = SINK_FIRED; + sink_fire_ok(&test_ACP_RequestLock,"TextStoreACP_RequestLock"); *phrSession = ITextStoreACPSink_OnLockGranted(ACPSink, dwLockFlags); return S_OK; } static HRESULT WINAPI TextStoreACP_GetStatus(ITextStoreACP *iface, TS_STATUS *pdcs) { - ok(test_ACP_GetStatus == SINK_EXPECTED || test_ACP_GetStatus == SINK_IGNORE, "Unexpected TextStoreACP_GetStatus\n"); - if (test_ACP_GetStatus == SINK_EXPECTED) - test_ACP_GetStatus = SINK_FIRED; - else if (test_ACP_GetStatus == SINK_IGNORE) - trace("Ignoring fired TextStoreACP_GetStatus\n"); + sink_fire_ok(&test_ACP_GetStatus,"TextStoreACP_GetStatus"); pdcs->dwDynamicFlags = documentStatus; return S_OK; } @@ -169,8 +210,7 @@ static HRESULT WINAPI TextStoreACP_QueryInsert(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetSelection(ITextStoreACP *iface, ULONG ulIndex, ULONG ulCount, TS_SELECTION_ACP *pSelection, ULONG *pcFetched) { - ok(test_ACP_GetSelection == SINK_EXPECTED, "Unexpected TextStoreACP_GetSelection\n"); - test_ACP_GetSelection = SINK_FIRED; + sink_fire_ok(&test_ACP_GetSelection,"TextStoreACP_GetSelection"); pSelection->acpStart = 10; pSelection->acpEnd = 20; @@ -183,8 +223,7 @@ static HRESULT WINAPI TextStoreACP_GetSelection(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_SetSelection(ITextStoreACP *iface, ULONG ulCount, const TS_SELECTION_ACP *pSelection) { - ok(test_ACP_SetSelection == SINK_EXPECTED,"Unexpected TextStoreACP_SetSelection\n"); - test_ACP_SetSelection = SINK_FIRED; + sink_fire_ok(&test_ACP_SetSelection,"TextStoreACP_SetSelection"); return S_OK; } static HRESULT WINAPI TextStoreACP_GetText(ITextStoreACP *iface, @@ -231,8 +270,7 @@ static HRESULT WINAPI TextStoreACP_InsertTextAtSelection(ITextStoreACP *iface, DWORD dwFlags, const WCHAR *pchText, ULONG cch, LONG *pacpStart, LONG *pacpEnd, TS_TEXTCHANGE *pChange) { - ok(test_ACP_InsertTextAtSelection == SINK_EXPECTED,"Unexpected TextStoreACP_InsertTextAtSelection\n"); - test_ACP_InsertTextAtSelection = SINK_FIRED; + sink_fire_ok(&test_ACP_InsertTextAtSelection,"TextStoreACP_InsertTextAtSelection"); return S_OK; } static HRESULT WINAPI TextStoreACP_InsertEmbeddedAtSelection(ITextStoreACP *iface, @@ -278,8 +316,7 @@ static HRESULT WINAPI TextStoreACP_RetrieveRequestedAttrs(ITextStoreACP *iface, static HRESULT WINAPI TextStoreACP_GetEndACP(ITextStoreACP *iface, LONG *pacp) { - ok(test_ACP_GetEndACP == SINK_EXPECTED,"Unexpected TextStoreACP_GetEndACP\n"); - test_ACP_GetEndACP = SINK_FIRED; + sink_fire_ok(&test_ACP_GetEndACP,"TextStoreACP_GetEndACP"); return S_OK; } static HRESULT WINAPI TextStoreACP_GetActiveView(ITextStoreACP *iface, @@ -419,8 +456,7 @@ static ULONG WINAPI ThreadMgrEventSink_Release(ITfThreadMgrEventSink *iface) static HRESULT WINAPI ThreadMgrEventSink_OnInitDocumentMgr(ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdim) { - ok(test_OnInitDocumentMgr == SINK_EXPECTED, "Unexpected OnInitDocumentMgr sink\n"); - test_OnInitDocumentMgr = SINK_FIRED; + sink_fire_ok(&test_OnInitDocumentMgr,"ThreadMgrEventSink_OnInitDocumentMgr"); return S_OK; } @@ -434,10 +470,9 @@ ITfDocumentMgr *pdim) static HRESULT WINAPI ThreadMgrEventSink_OnSetFocus(ITfThreadMgrEventSink *iface, ITfDocumentMgr *pdimFocus, ITfDocumentMgr *pdimPrevFocus) { - ok(test_OnSetFocus == SINK_EXPECTED, "Unexpected OnSetFocus sink\n"); + sink_fire_ok(&test_OnSetFocus,"ThreadMgrEventSink_OnSetFocus"); ok(pdimFocus == test_CurrentFocus,"Sink reports wrong focus\n"); ok(pdimPrevFocus == test_PrevFocus,"Sink reports wrong previous focus\n"); - test_OnSetFocus = SINK_FIRED; return S_OK; } @@ -458,8 +493,7 @@ ITfContext *pic) if (test) ITfContext_Release(test); - ok(test_OnPushContext == SINK_EXPECTED, "Unexpected OnPushContext sink\n"); - test_OnPushContext = SINK_FIRED; + sink_fire_ok(&test_OnPushContext,"ThreadMgrEventSink_OnPushContext"); return S_OK; } @@ -480,8 +514,7 @@ ITfContext *pic) if (test) ITfContext_Release(test); - ok(test_OnPopContext == SINK_EXPECTED, "Unexpected OnPopContext sink\n"); - test_OnPopContext = SINK_FIRED; + sink_fire_ok(&test_OnPopContext,"ThreadMgrEventSink_OnPopContext"); return S_OK; } @@ -984,8 +1017,7 @@ static ULONG WINAPI KeyEventSink_Release(ITfKeyEventSink *iface) static HRESULT WINAPI KeyEventSink_OnSetFocus(ITfKeyEventSink *iface, BOOL fForeground) { - ok(test_KEV_OnSetFocus == SINK_EXPECTED,"Unexpected KeyEventSink_OnSetFocus\n"); - test_KEV_OnSetFocus = SINK_FIRED; + sink_fire_ok(&test_KEV_OnSetFocus,"KeyEventSink_OnSetFocus"); return S_OK; } @@ -1240,8 +1272,7 @@ static ULONG WINAPI TextEditSink_Release(ITfTextEditSink *iface) static HRESULT WINAPI TextEditSink_OnEndEdit(ITfTextEditSink *iface, ITfContext *pic, TfEditCookie ecReadOnly, ITfEditRecord *pEditRecord) { - ok(test_OnEndEdit == SINK_EXPECTED, "Unexpected OnEndEdit\n"); - test_OnEndEdit = SINK_FIRED; + sink_fire_ok(&test_OnEndEdit,"TextEditSink_OnEndEdit"); return S_OK; } @@ -1617,9 +1648,8 @@ TfEditCookie ec) ULONG fetched; HRESULT hr; - ok(test_DoEditSession == SINK_EXPECTED, "Unexpected DoEditSession\n"); + sink_fire_ok(&test_DoEditSession,"EditSession_DoEditSession"); ok(test_ACP_RequestLock == SINK_FIRED,"Expected RequestLock not fired\n"); - test_DoEditSession = SINK_FIRED; ITfThreadMgr_GetFocus(g_tm, &dm); ITfDocumentMgr_GetTop(dm,&cxt);

1 0