September 2009 - Wine-commits

Michael Stefaniuc : windowscodecs: Remove trailing '\'.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 22e2c111c1236def0bca3f572d26e07eda36f8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e2c111c1236def0bca3f572… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 29 15:55:42 2009 +0200 windowscodecs: Remove trailing '\'. --- dlls/windowscodecs/bmpencode.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 11c39e8..abe9977 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -342,7 +342,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; pos.QuadPart = 0; - hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL);\ + hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) return hr; hr = IStream_Write(This->stream, &bfh, sizeof(BITMAPFILEHEADER), &byteswritten);

1 0

Detlef Riekenberg : localspl: Implement fpAddPort.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 9d5377f50fe807252d836f56f9897bd02dc7cdf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5377f50fe807252d836f56f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:25:07 2009 +0200 localspl: Implement fpAddPort. --- dlls/localspl/provider.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 2bf9414..0f1c293 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1458,6 +1458,72 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } /****************************************************************************** + * fpAddPort [exported through PRINTPROVIDOR] + * + * Add a Port for a specific Monitor + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * hWnd [I] Handle to parent Window for the Dialog-Box + * pMonitorName [I] Name of the Monitor that manage the Port + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI fpAddPort(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) +{ + monitor_t * pm; + monitor_t * pui; + LONG lres; + DWORD res; + + TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); + + lres = copy_servername_from_name(pName, NULL); + if (lres) { + FIXME("server %s not supported\n", debugstr_w(pName)); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* an empty Monitorname is Invalid */ + if (!pMonitorName[0]) { + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + pm = monitor_load(pMonitorName, NULL); + if (pm && pm->monitor && pm->monitor->pfnAddPort) { + res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pm->dllname)); + } + else + { + pui = monitor_loadui(pm); + if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) { + res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL); + TRACE("got %d with %u (%s)\n", res, GetLastError(), debugstr_w(pui->dllname)); + } + else + { + FIXME("not implemented for %s (monitor %p: %s / monitorui %p: %s)\n", + debugstr_w(pMonitorName), pm, debugstr_w(pm ? pm->dllname : NULL), + pui, debugstr_w(pui ? pui->dllname : NULL)); + + SetLastError(ERROR_NOT_SUPPORTED); + res = FALSE; + } + monitor_unload(pui); + } + monitor_unload(pm); + + TRACE("returning %d with %u\n", res, GetLastError()); + return res; +} + +/****************************************************************************** * fpAddPrinterDriverEx [exported through PRINTPROVIDOR] * * Install a Printer Driver with the Option to upgrade / downgrade the Files @@ -2017,7 +2083,7 @@ void setup_provider(void) NULL, /* fpEnumForms */ fpEnumMonitors, fpEnumPorts, - NULL, /* fpAddPort */ + fpAddPort, fpConfigurePort, fpDeletePort, NULL, /* fpCreatePrinterIC */

1 0

Detlef Riekenberg : winspool: Use the backend for AddPortW.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: f6120c2aa4a739c7fff9b3ac72ef4c5f509cd259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6120c2aa4a739c7fff9b3ac7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:27:53 2009 +0200 winspool: Use the backend for AddPortW. --- dlls/winspool.drv/info.c | 88 +-------------------------------------------- 1 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index de7df36..67c1252 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -221,7 +221,6 @@ static const WCHAR Help_FileW[] = {'H','e','l','p',' ','F','i','l','e',0}; static const WCHAR LocationW[] = {'L','o','c','a','t','i','o','n',0}; static const WCHAR ManufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR MonitorW[] = {'M','o','n','i','t','o','r',0}; -static const WCHAR MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; static const WCHAR NameW[] = {'N','a','m','e',0}; static const WCHAR ObjectGUIDW[] = {'O','b','j','e','c','t','G','U','I','D',0}; static const WCHAR OEM_UrlW[] = {'O','E','M',' ','U','r','l',0}; @@ -946,48 +945,6 @@ cleanup: } /****************************************************************** - * monitor_loadui [internal] - * - * load the userinterface-dll for a given portmonitor - * - * On failure, NULL is returned - */ - -static monitor_t * monitor_loadui(monitor_t * pm) -{ - monitor_t * pui = NULL; - LPWSTR buffer[MAX_PATH]; - HANDLE hXcv; - DWORD len; - DWORD res; - - if (pm == NULL) return NULL; - TRACE("(%p) => dllname: %s\n", pm, debugstr_w(pm->dllname)); - - /* Try the Portmonitor first; works for many monitors */ - if (pm->monitorUI) { - EnterCriticalSection(&monitor_handles_cs); - pm->refcount++; - LeaveCriticalSection(&monitor_handles_cs); - return pm; - } - - /* query the userinterface-dllname from the Portmonitor */ - if ((pm->monitor) && (pm->monitor->pfnXcvDataPort)) { - /* building (",XcvMonitor %s",pm->name) not needed yet */ - res = pm->monitor->pfnXcvOpenPort(emptyStringW, SERVER_ACCESS_ADMINISTER, &hXcv); - TRACE("got %u with %p\n", res, hXcv); - if (res) { - res = pm->monitor->pfnXcvDataPort(hXcv, MonitorUIW, NULL, 0, (BYTE *) buffer, sizeof(buffer), &len); - TRACE("got %u with %s\n", res, debugstr_w((LPWSTR) buffer)); - if (res == ERROR_SUCCESS) pui = monitor_load(NULL, (LPWSTR) buffer); - pm->monitor->pfnXcvClosePort(hXcv); - } - } - return pui; -} - -/****************************************************************** * get_servername_from_name (internal) * * for an external server, a copy of the serverpart from the full name is returned @@ -6015,57 +5972,16 @@ BOOL WINAPI AddPortA(LPSTR pName, HWND hWnd, LPSTR pMonitorName) */ BOOL WINAPI AddPortW(LPWSTR pName, HWND hWnd, LPWSTR pMonitorName) { - monitor_t * pm; - monitor_t * pui; - DWORD res; - TRACE("(%s, %p, %s)\n", debugstr_w(pName), hWnd, debugstr_w(pMonitorName)); - if (pName && pName[0]) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if ((backend == NULL) && !load_backend()) return FALSE; if (!pMonitorName) { SetLastError(RPC_X_NULL_REF_POINTER); return FALSE; } - /* an empty Monitorname is Invalid */ - if (!pMonitorName[0]) { - SetLastError(ERROR_NOT_SUPPORTED); - return FALSE; - } - - pm = monitor_load(pMonitorName, NULL); - if (pm && pm->monitor && pm->monitor->pfnAddPort) { - res = pm->monitor->pfnAddPort(pName, hWnd, pMonitorName); - TRACE("got %d with %u\n", res, GetLastError()); - res = TRUE; - } - else - { - pui = monitor_loadui(pm); - if (pui && pui->monitorUI && pui->monitorUI->pfnAddPortUI) { - TRACE("use %p: %s\n", pui, debugstr_w(pui->dllname)); - res = pui->monitorUI->pfnAddPortUI(pName, hWnd, pMonitorName, NULL); - TRACE("got %d with %u\n", res, GetLastError()); - res = TRUE; - } - else - { - FIXME("not implemented for %s (%p: %s => %p: %s)\n", debugstr_w(pMonitorName), - pm, debugstr_w(pm ? pm->dllname : NULL), pui, debugstr_w(pui ? pui->dllname : NULL)); - - /* XP: ERROR_NOT_SUPPORTED, NT351,9x: ERROR_INVALID_PARAMETER */ - SetLastError(ERROR_NOT_SUPPORTED); - res = FALSE; - } - monitor_unload(pui); - } - monitor_unload(pm); - TRACE("returning %d with %u\n", res, GetLastError()); - return res; + return backend->fpAddPort(pName, hWnd, pMonitorName); } /******************************************************************************

1 0

Detlef Riekenberg : localui: Fix a memory leak.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 64bcb540bb8f147f1f4e652043247c07bf50e570 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64bcb540bb8f147f1f4e65204… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 13:35:45 2009 +0200 localui: Fix a memory leak. --- dlls/localui/localui.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/localui/localui.c b/dlls/localui/localui.c index 2acfc7e..b9e4c4e 100644 --- a/dlls/localui/localui.c +++ b/dlls/localui/localui.c @@ -503,7 +503,6 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam { addportui_t data; HANDLE hXcv; - LPWSTR ptr = NULL; DWORD needed; DWORD dummy; DWORD status; @@ -529,14 +528,11 @@ static BOOL WINAPI localui_AddPortUI(PCWSTR pName, HWND hWnd, PCWSTR pMonitorNam (PBYTE) &dummy, 0, &needed, &status); TRACE("got %u with status %u\n", res, status); - if (res && (status == ERROR_SUCCESS)) { + if (res && (status == ERROR_SUCCESS) && ppPortName) { /* Native localui uses GlobalAlloc also. The caller must GlobalFree the buffer */ - ptr = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, data.portname); - if (ppPortName) *ppPortName = ptr; - } + *ppPortName = GlobalAlloc(GPTR, (lstrlenW(data.portname)+1) * sizeof(WCHAR)); + if (*ppPortName) lstrcpyW(*ppPortName, data.portname); } if (res && (status == ERROR_ALREADY_EXISTS)) {

1 0

Detlef Riekenberg : include: Fix the fpAddPortEx prototype in struct PRINTPROVIDOR.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 29c9c7f50d192417b1c9783e5688f2f1991e2103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c9c7f50d192417b1c9783e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 29 14:54:04 2009 +0200 include: Fix the fpAddPortEx prototype in struct PRINTPROVIDOR. --- include/ddk/winsplp.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/include/ddk/winsplp.h b/include/ddk/winsplp.h index 4dfdb5b..c532be9 100644 --- a/include/ddk/winsplp.h +++ b/include/ddk/winsplp.h @@ -280,8 +280,7 @@ typedef struct _PRINTPROVIDOR { HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE hPrinter, DWORD fdwFlags, DWORD fdwOptions, LPVOID pPrinterNotifyOptions); BOOL (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE hChange); - BOOL (WINAPI *fpAddPortEx)(HANDLE hMonitor, LPWSTR pName, DWORD Level, - LPBYTE lpBuffer, LPWSTR lpMonitorName); + BOOL (WINAPI *fpAddPortEx)(LPWSTR, DWORD, LPBYTE, LPWSTR); BOOL (WINAPI *fpShutDown)(LPVOID pvReserved); BOOL (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE hPrinter, DWORD Reserved, PVOID pvReserved, PVOID pPrinterNotifyInfo);

1 0

Jeff Zaroyko : imm32/tests: Add another combination which should fail.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 26f380941be0a5a3c791f6da19cecce0d087fafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f380941be0a5a3c791f6da1… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Tue Sep 29 21:33:04 2009 +1000 imm32/tests: Add another combination which should fail. --- dlls/imm32/tests/imm32.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index db1cd8d..97a7201 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -287,6 +287,11 @@ static void test_ImmSetCompositionString(void) todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); + ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR | SCS_CHANGECLAUSE, + NULL, 0, NULL, 0); + todo_wine + ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); + ImmReleaseContext(hwnd, imc); }

1 0

Hans Leidekker : msi: Respect UI level in custom action type 19.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 1b7d1d4c8701b8d77b79d0f96aeac39f3691b331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b7d1d4c8701b8d77b79d0f96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 29 14:55:58 2009 +0200 msi: Respect UI level in custom action type 19. --- dlls/msi/custom.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index cbbcde5..7fcb09a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1046,10 +1046,11 @@ static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, if( row ) { LPCWSTR error = MSI_RecordGetString( row, 1 ); - MessageBoxW( NULL, error, NULL, MB_OK ); + if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) + MessageBoxW( NULL, error, NULL, MB_OK ); msiobj_release( &row->hdr ); } - else + else if ((gUILevel & INSTALLUILEVEL_MASK) != INSTALLUILEVEL_NONE) MessageBoxW( NULL, deformated, NULL, MB_OK ); msi_free( deformated );

1 0

Nikolay Sivov : comctl32/monthcal: Use a single calendar for hittesting tests, make point calculation at runtime.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 1f41db4c2fac11753fed12a2c88f3c5bd6c9ee3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f41db4c2fac11753fed12a2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Sep 28 22:50:21 2009 +0400 comctl32/monthcal: Use a single calendar for hittesting tests, make point calculation at runtime. --- dlls/comctl32/tests/monthcal.c | 181 ++++++++++++++++++++++------------------ 1 files changed, 99 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f41db4c2fac11753fed1…

1 0

Nikolay Sivov : comctl32/monthcal: Minimal rectangle should be zero based.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: 74eca56acb8ac4b09d6a2b710e1cd2b655bce71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74eca56acb8ac4b09d6a2b710… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 00:12:39 2009 +0400 comctl32/monthcal: Minimal rectangle should be zero based. --- dlls/comctl32/monthcal.c | 10 ++++++-- dlls/comctl32/tests/monthcal.c | 43 +++++++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 62c8dc8..6f60587 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -759,12 +759,16 @@ MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) if(!lpRect) return FALSE; - lpRect->left = infoPtr->title.left; - lpRect->top = infoPtr->title.top; - lpRect->right = infoPtr->title.right; + lpRect->left = infoPtr->title.left; + lpRect->top = infoPtr->title.top; + lpRect->right = infoPtr->title.right; lpRect->bottom = infoPtr->todayrect.bottom; + AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE); + /* minimal rectangle is zero based */ + OffsetRect(lpRect, -lpRect->left, -lpRect->top); + TRACE("%s\n", wine_dbgstr_rect(lpRect)); return TRUE; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 880ff69..5c5a8f8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -853,17 +853,28 @@ static void test_monthcal_unicode(void) static void test_monthcal_hittest(void) { + typedef struct hittest_test + { + UINT ht; + int todo; + } hittest_test_t; + + static const hittest_test_t title_hits[] = { + { MCHT_NOWHERE, 0 }, + { MCHT_TITLEBTNPREV, 0 }, + { MCHT_TITLEMONTH, 1 }, + { MCHT_TITLEYEAR, 1 }, + { MCHT_TITLEBTNNEXT, 0 }, + { MCHT_NOWHERE, 0 } + }; + MCHITTESTINFO mchit; - UINT res; + UINT res, old_res; SYSTEMTIME st; LONG x; UINT title_index; HWND hwnd; RECT r; - static const UINT title_hits[] = - { MCHT_NOWHERE, MCHT_TITLEBK, MCHT_TITLEBTNPREV, MCHT_TITLEBK, - MCHT_TITLEMONTH, MCHT_TITLEBK, MCHT_TITLEYEAR, MCHT_TITLEBK, - MCHT_TITLEBTNNEXT, MCHT_TITLEBK, MCHT_NOWHERE }; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -914,7 +925,7 @@ static void test_monthcal_hittest(void) expect(0, mchit.pt.x); expect(0, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_TITLE, res); + expect_hex(MCHT_TITLE, res); /* bottom right of the control and should not be active */ mchit.pt.x = r.right; @@ -950,7 +961,7 @@ static void test_monthcal_hittest(void) expect(r.right / 14, mchit.pt.x); expect(r.bottom / 2, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_CALENDARDATE, res); + expect_hex(MCHT_CALENDARDATE, res); /* in active area - date from prev month */ mchit.pt.x = r.right / 14; /* half of first day rect */ @@ -959,7 +970,7 @@ static void test_monthcal_hittest(void) expect(r.right / 14, mchit.pt.x); expect(6 * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - todo_wine expect_hex(MCHT_CALENDARDATEPREV, res); + expect_hex(MCHT_CALENDARDATEPREV, res); #if 0 /* (125, 115) is in active area - date from this month */ @@ -1040,8 +1051,10 @@ static void test_monthcal_hittest(void) /* The horizontal position of title bar elements depends on locale (y pos is constant), so we sample across a horizontal line and make sure we find all elements. */ + mchit.pt.x = 0; mchit.pt.y = (5/2) * r.bottom / 19; title_index = 0; + old_res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); for (x = 0; x < r.right; x++){ mchit.pt.x = x; @@ -1049,13 +1062,21 @@ static void test_monthcal_hittest(void) expect(x, mchit.pt.x); expect((5/2) * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - if (res != title_hits[title_index]){ + + if (res != MCHT_TITLEBK && res != old_res) { title_index++; + old_res = res; + if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) break; - todo_wine - expect_hex(title_hits[title_index], res); + if (title_hits[title_index].todo) { + todo_wine + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } + else ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); } }

1 0

Nikolay Sivov : comctl32/monthcal: Control elements should be centered in client area, and left/ top aligned if they don't.
by Alexandre Julliard 29 Sep '09

29 Sep '09

Module: wine Branch: master Commit: aadadd04fe5efd93d2007e1fe2f0e01ec15e6c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadadd04fe5efd93d2007e1fe… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 29 00:44:45 2009 +0400 comctl32/monthcal: Control elements should be centered in client area, and left/top aligned if they don't. --- dlls/comctl32/monthcal.c | 52 ++++++++++++++++++++++++++++++++------------- 1 files changed, 37 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6f60587..e0d5fcd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1763,7 +1763,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) SIZE size; TEXTMETRICW tm; HFONT currentFont; - int xdiv, left_offset; + INT xdiv, dx, dy; RECT rcClient; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -1781,22 +1781,21 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; - infoPtr->width_increment = size.cx * 2 + 4; + infoPtr->width_increment = size.cx * 2 + 4; infoPtr->height_increment = infoPtr->textHeight; - left_offset = (rcClient.right - rcClient.left) - (infoPtr->width_increment * xdiv); /* calculate title area */ - title->top = rcClient.top; - title->bottom = title->top + 3 * infoPtr->height_increment / 2; - title->left = left_offset; - title->right = rcClient.right; + title->top = 0; + title->bottom = 3 * infoPtr->height_increment / 2; + title->left = 0; + title->right = infoPtr->width_increment * xdiv; /* set the dimensions of the next and previous buttons and center */ /* the month text vertically */ prev->top = next->top = title->top + 4; prev->bottom = next->bottom = title->bottom - 4; prev->left = title->left + 4; - prev->right = prev->left + (title->bottom - title->top) ; + prev->right = prev->left + (title->bottom - title->top); next->right = title->right - 4; next->left = next->right - (title->bottom - title->top); @@ -1808,24 +1807,47 @@ 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; + weeknumrect->left = 0; + if(infoPtr->dwStyle & MCS_WEEKNUMBERS) - weeknumrect->right=prev->right; + weeknumrect->right = prev->right; else - weeknumrect->right=weeknumrect->left; + weeknumrect->right = weeknumrect->left; + wdays->left = days->left = weeknumrect->right; wdays->right = days->right = wdays->left + 7 * infoPtr->width_increment; - wdays->top = title->bottom ; + wdays->top = title->bottom; wdays->bottom = wdays->top + infoPtr->height_increment; - days->top = weeknumrect->top = wdays->bottom ; + days->top = weeknumrect->top = wdays->bottom; days->bottom = weeknumrect->bottom = days->top + 6 * infoPtr->height_increment; - todayrect->left = rcClient.left; - todayrect->right = rcClient.right; + todayrect->left = 0; + todayrect->right = title->right; todayrect->top = days->bottom; todayrect->bottom = days->bottom + infoPtr->height_increment; + /* offset all rectangles to center in client area */ + dx = (rcClient.right - title->right) / 2; + dy = (rcClient.bottom - todayrect->bottom) / 2; + + /* if calendar doesn't fit client area show it at left/top bounds */ + if (title->left + dx < 0) dx = 0; + if (title->top + dy < 0) dy = 0; + + if (dx != 0 || dy != 0) + { + OffsetRect(title, dx, dy); + OffsetRect(prev, dx, dy); + OffsetRect(next, dx, dy); + OffsetRect(titlemonth, dx, dy); + OffsetRect(titleyear, dx, dy); + OffsetRect(wdays, dx, dy); + OffsetRect(weeknumrect, dx, dy); + OffsetRect(days, dx, dy); + OffsetRect(todayrect, dx, dy); + } + TRACE("dx=%d dy=%d client[%s] title[%s] wdays[%s] days[%s] today[%s]\n", infoPtr->width_increment,infoPtr->height_increment, wine_dbgstr_rect(&rcClient),

1 0