wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Henri Verbeet : ddraw: Do not unset the index buffer on D3D device destruction.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 024b5c2245c374bedc7685bd8539b7010bc38227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=024b5c2245c374bedc7685bd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 23:35:30 2011 +0200 ddraw: Do not unset the index buffer on D3D device destruction. --- dlls/ddraw/device.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 54e549f..9f8a6dd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -288,15 +288,13 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) DWORD i; EnterCriticalSection(&ddraw_cs); + + /* There is no need to unset any resources here, wined3d will take + * care of that on Uninit3D(). */ + /* Free the index buffer. */ - IWineD3DDevice_SetIndexBuffer(This->wineD3DDevice, NULL, WINED3DFMT_UNKNOWN); wined3d_buffer_decref(This->indexbuffer); - /* There is no need to unset the vertex buffer here, IWineD3DDevice_Uninit3D will do that when - * destroying the primary stateblock. If a vertex buffer is destroyed while it is bound - * IDirect3DVertexBuffer::Release will unset it. - */ - /* Set the device up to render to the front buffer since the back * buffer will vanish soon. */ IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0,

1 0

Henri Verbeet : ddraw: Get rid of the unused LoadWineD3D() declaration.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 973b56dc1c9e0699f71188bde261cd0ccca726d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=973b56dc1c9e0699f71188bde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 3 23:35:29 2011 +0200 ddraw: Get rid of the unused LoadWineD3D() declaration. --- dlls/ddraw/ddraw_private.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 720f819..aa6b2d5 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -573,9 +573,6 @@ void DDRAW_dump_cooperativelevel(DWORD cooplevel) DECLSPEC_HIDDEN; * IDirect3DExecuteBuffer isn't in WineD3D */ void multiply_matrix(LPD3DMATRIX dest, const D3DMATRIX *src1, const D3DMATRIX *src2) DECLSPEC_HIDDEN; -/* Helper function in main.c */ -BOOL LoadWineD3D(void) DECLSPEC_HIDDEN; - /* Used for generic dumping */ typedef struct {

1 0

Jacek Caban : wininet: Added more tests.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 7611d1073233d2e529d5558ce7b2dc2877bd82ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7611d1073233d2e529d5558ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 2 15:20:53 2011 +0200 wininet: Added more tests. --- dlls/wininet/tests/http.c | 42 +++++++++++++++++++++++++++++++----------- 1 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 477ae56..c8ac617 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -107,6 +107,7 @@ static HANDLE hCompleteEvent; #define TESTF_REDIRECT 0x01 #define TESTF_COMPRESSED 0x02 #define TESTF_ALLOW_COOKIE 0x04 +#define TESTF_CHUNKED 0x08 typedef struct { const char *url; @@ -121,6 +122,14 @@ typedef struct { static const test_data_t test_data[] = { { + "http://test.winehq.org/tests/data.php", + "http://test.winehq.org/tests/data.php", + "test.winehq.org", + "/tests/data.php", + "", + TESTF_CHUNKED + }, + { "http://test.winehq.org/tests/redirect", "http://test.winehq.org/tests/hello.html", "test.winehq.org", @@ -303,7 +312,7 @@ static VOID WINAPI callback( static void InternetReadFile_test(int flags, const test_data_t *test) { char *post_data = NULL; - BOOL res; + BOOL res, on_async = TRUE; CHAR buffer[4000]; DWORD length, post_len = 0; DWORD out; @@ -521,9 +530,6 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); res = InternetQueryDataAvailable(hor,&length,0x0,0x0); - ok(!(!res && length != 0),"InternetQueryDataAvailable failed with non-zero length\n"); - ok(res || ((flags & INTERNET_FLAG_ASYNC) && GetLastError() == ERROR_IO_PENDING), - "InternetQueryDataAvailable failed, error %d\n", GetLastError()); if (flags & INTERNET_FLAG_ASYNC) { if (res) @@ -532,11 +538,22 @@ static void InternetReadFile_test(int flags, const test_data_t *test) } else if (GetLastError() == ERROR_IO_PENDING) { + trace("PENDING\n"); + /* on some tests, InternetQueryDataAvailable returns non-zero length and ERROR_IO_PENDING */ + if(!(test->flags & TESTF_CHUNKED)) + ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); continue; + }else { + ok(0, "InternetQueryDataAvailable failed: %u\n", GetLastError()); } + }else { + ok(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); } + trace("LENGTH %d\n", length); + if(test->flags & TESTF_CHUNKED) + ok(length <= 8192, "length = %d, expected <= 8192\n", length); if (length) { char *buffer; @@ -551,9 +568,11 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if(test->content) ok(!strcmp(buffer, test->content), "buffer = '%s', expected '%s'\n", buffer, test->content); HeapFree(GetProcessHeap(),0,buffer); - } - if (length == 0) + }else { + ok(!on_async, "Returned zero size in response to request complete\n"); break; + } + on_async = FALSE; } if(test->flags & TESTF_REDIRECT) { CHECK_NOTIFIED2(INTERNET_STATUS_CLOSING_CONNECTION, 2); @@ -1851,7 +1870,7 @@ static void test_basic_request(int port, const char *verb, const char *url) r = InternetReadFile(hr, buffer, sizeof buffer, &count); ok(r, "InternetReadFile failed %u\n", GetLastError()); ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong, got: %s\n", buffer); InternetCloseHandle(hr); InternetCloseHandle(hc); @@ -3387,12 +3406,13 @@ START_TEST(http) pInternetSetStatusCallbackA = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackA"); init_status_tests(); - test_InternetCloseHandle(); + if(0)test_InternetCloseHandle(); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); - InternetReadFile_test(0, &test_data[0]); - first_connection_to_test_url = TRUE; InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[1]); InternetReadFile_test(0, &test_data[1]); + first_connection_to_test_url = TRUE; + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + InternetReadFile_test(0, &test_data[2]); InternetReadFileExA_test(INTERNET_FLAG_ASYNC); test_open_url_async(); test_async_HttpSendRequestEx(); @@ -3406,5 +3426,5 @@ START_TEST(http) test_bogus_accept_types_array(); InternetReadFile_chunked_test(); HttpSendRequestEx_test(); - InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[2]); + InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[3]); }

1 0

Jacek Caban : wininet: Abstract different transfer and content encoding reading to layered structures .
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: ccd11eb7d6720ee5242e619851f41908f285e8f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccd11eb7d6720ee5242e61985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Apr 2 15:20:33 2011 +0200 wininet: Abstract different transfer and content encoding reading to layered structures. --- dlls/wininet/http.c | 702 ++++++++++++++++++++++++++++++----------------- dlls/wininet/internet.h | 21 ++- 2 files changed, 473 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ccd11eb7d6720ee5242e6…

1 0

Nikolay Sivov : comctl32/monthcal: Some tests for MCM_SIZERECTTOMIN.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 0270e69b54d26708b3610174a63ba0fc389feace URL: http://source.winehq.org/git/wine.git/?a=commit;h=0270e69b54d26708b3610174a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 14:35:45 2011 +0400 comctl32/monthcal: Some tests for MCM_SIZERECTTOMIN. --- dlls/comctl32/tests/monthcal.c | 44 ++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ae6c7b5..f585376 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1756,6 +1756,49 @@ static void test_get_set_border(void) DestroyWindow(hwnd); } +static void test_MCM_SIZERECTTOMIN(void) +{ + HWND hwnd; + DWORD ret; + RECT r, r2; + + hwnd = create_monthcal_control(0); + + ret = SendMessageA(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&r2); + if (ret == 0) + { + win_skip("Message MCM_GETMINREQRECT unsupported. Skipping.\n"); + DestroyWindow(hwnd); + return; + } + + ret = SendMessageA(hwnd, MCM_SIZERECTTOMIN, 0, 0); + ok(ret == 0, "got %d\n", ret); + + r.left = r.right = r.top = r.bottom = 0; + ret = SendMessageA(hwnd, MCM_SIZERECTTOMIN, 0, (LPARAM)&r); + if (ret == 0) + { + skip("Message MCM_SIZERECTTOMIN unsupported. Skipping.\n"); + DestroyWindow(hwnd); + return; + } + ok(ret == 1, "got %d\n", ret); + ok(r.left == 0 && r.right > 0, "got %d, %d\n", r.left, r.right); + + r = r2; + ret = SendMessageA(hwnd, MCM_SIZERECTTOMIN, 0, (LPARAM)&r); + ok(ret == 1, "got %d\n", ret); + + r2.right = (r2.right - r2.left) * 3; + r2.bottom = (r2.bottom - r2.top) * 3; + r2.left = r2.top = 0; + ret = SendMessageA(hwnd, MCM_SIZERECTTOMIN, 0, (LPARAM)&r2); + ok(ret == 1, "got %d\n", ret); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -1822,6 +1865,7 @@ START_TEST(monthcal) test_hittest_v6(); test_get_set_border(); + test_MCM_SIZERECTTOMIN(); unload_v6_module(ctx_cookie, hCtx); diff --git a/include/commctrl.h b/include/commctrl.h index 9273d40..92f7274 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4689,6 +4689,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', #define MCM_GETMONTHDELTA (MCM_FIRST + 19) #define MCM_SETMONTHDELTA (MCM_FIRST + 20) #define MCM_GETMAXTODAYWIDTH (MCM_FIRST + 21) +#define MCM_SIZERECTTOMIN (MCM_FIRST + 29) #define MCM_SETCALENDARBORDER (MCM_FIRST + 30) #define MCM_GETCALENDARBORDER (MCM_FIRST + 31) #define MCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT

1 0

Nikolay Sivov : comctl32/monthcal: Get rid of empty slots in cached brushes array.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 6d43470600d06ddae84d5e3aec1c1aeed3e262ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d43470600d06ddae84d5e3ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 13:33:48 2011 +0400 comctl32/monthcal: Get rid of empty slots in cached brushes array. --- dlls/comctl32/monthcal.c | 57 ++++++++++++++++++++++++++++++--------------- 1 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index bdc6a45..586bd57 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -83,6 +83,14 @@ enum CachedPen PenLast }; +enum CachedBrush +{ + BrushTitle = 0, + BrushMonth, + BrushBackground, + BrushLast +}; + /* single calendar data */ typedef struct _CALENDAR_INFO { @@ -102,7 +110,7 @@ typedef struct DWORD dwStyle; /* cached GWL_STYLE */ COLORREF colors[MCSC_TRAILINGTEXT+1]; - HBRUSH brushes[MCSC_MONTHBK+1]; + HBRUSH brushes[BrushLast]; HPEN pens[PenLast]; HFONT hFont; @@ -694,7 +702,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM TRACE("%s\n", wine_dbgstr_rect(&r)); oldCol = SetTextColor(hdc, infoPtr->colors[MCSC_MONTHBK]); oldBk = SetBkColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); - FillRect(hdc, &r, infoPtr->brushes[MCSC_TITLEBK]); + FillRect(hdc, &r, infoPtr->brushes[BrushTitle]); selection = 1; } @@ -762,7 +770,7 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU SIZE sz; /* fill header box */ - FillRect(hdc, title, infoPtr->brushes[MCSC_TITLEBK]); + FillRect(hdc, title, infoPtr->brushes[BrushTitle]); /* month/year string */ SetBkColor(hdc, infoPtr->colors[MCSC_TITLEBK]); @@ -866,7 +874,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con r = infoPtr->calendars[calIdx].weeknums; /* erase whole week numbers area */ - FillRect(hdc, &r, infoPtr->brushes[MCSC_MONTHBK]); + FillRect(hdc, &r, infoPtr->brushes[BrushTitle]); SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]); /* reduce rectangle to one week number */ @@ -1008,7 +1016,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const fill_bk_rect.bottom = infoPtr->calendars[calIdx].days.bottom + (infoPtr->todayrect.bottom - infoPtr->todayrect.top); - FillRect(hdc, &fill_bk_rect, infoPtr->brushes[MCSC_MONTHBK]); + FillRect(hdc, &fill_bk_rect, infoPtr->brushes[BrushMonth]); /* draw line under day abbreviations */ old_pen = SelectObject(hdc, infoPtr->pens[PenText]); @@ -1133,6 +1141,7 @@ MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, UINT index) static LRESULT MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) { + enum CachedBrush type; COLORREF prev; TRACE("%p, %d: color %08x\n", infoPtr, index, color); @@ -1143,10 +1152,25 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) infoPtr->colors[index] = color; /* update cached brush */ - if (index == MCSC_BACKGROUND || index == MCSC_TITLEBK || index == MCSC_MONTHBK) + switch (index) + { + case MCSC_BACKGROUND: + type = BrushBackground; + break; + case MCSC_TITLEBK: + type = BrushTitle; + break; + case MCSC_MONTHBK: + type = BrushMonth; + break; + default: + type = BrushLast; + } + + if (type != BrushLast) { - DeleteObject(infoPtr->brushes[index]); - infoPtr->brushes[index] = CreateSolidBrush(color); + DeleteObject(infoPtr->brushes[type]); + infoPtr->brushes[type] = CreateSolidBrush(color); } /* update cached pen */ @@ -2261,8 +2285,7 @@ MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) if (!GetClipBox(hdc, &rc)) return FALSE; - /* fill background */ - FillRect(hdc, &rc, infoPtr->brushes[MCSC_BACKGROUND]); + FillRect(hdc, &rc, infoPtr->brushes[BrushBackground]); return TRUE; } @@ -2555,9 +2578,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->colors[MCSC_MONTHBK] = comctl32_color.clrWindow; infoPtr->colors[MCSC_TRAILINGTEXT] = comctl32_color.clrGrayText; - infoPtr->brushes[MCSC_BACKGROUND] = CreateSolidBrush(infoPtr->colors[MCSC_BACKGROUND]); - infoPtr->brushes[MCSC_TITLEBK] = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); - infoPtr->brushes[MCSC_MONTHBK] = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); + infoPtr->brushes[BrushBackground] = CreateSolidBrush(infoPtr->colors[MCSC_BACKGROUND]); + infoPtr->brushes[BrushTitle] = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); + infoPtr->brushes[BrushMonth] = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); infoPtr->pens[PenRed] = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); infoPtr->pens[PenText] = CreatePen(PS_SOLID, 1, infoPtr->colors[MCSC_TEXT]); @@ -2596,13 +2619,9 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); - - DeleteObject(infoPtr->brushes[MCSC_BACKGROUND]); - DeleteObject(infoPtr->brushes[MCSC_TITLEBK]); - DeleteObject(infoPtr->brushes[MCSC_MONTHBK]); - for (i = PenRed; i < PenLast; i++) - DeleteObject(infoPtr->pens[i]); + for (i = 0; i < BrushLast; i++) DeleteObject(infoPtr->brushes[i]); + for (i = 0; i < PenLast; i++) DeleteObject(infoPtr->pens[i]); Free(infoPtr); return 0;

1 0

Nikolay Sivov : comctl32/monthcal: Cache pens, fix line colour.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 41a113e0ce47055b7734413df81f99a6b3b5dc76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a113e0ce47055b7734413df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 13:15:42 2011 +0400 comctl32/monthcal: Cache pens, fix line colour. --- dlls/comctl32/monthcal.c | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 2fa1425..bdc6a45 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -76,6 +76,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); /* convert from days to 100 nanoseconds unit - used as FILETIME unit */ #define DAYSTO100NSECS(days) (((ULONGLONG)(days))*24*60*60*10000000) +enum CachedPen +{ + PenRed = 0, + PenText, + PenLast +}; + /* single calendar data */ typedef struct _CALENDAR_INFO { @@ -96,6 +103,7 @@ typedef struct COLORREF colors[MCSC_TRAILINGTEXT+1]; HBRUSH brushes[MCSC_MONTHBK+1]; + HPEN pens[PenLast]; HFONT hFont; HFONT hBoldFont; @@ -639,15 +647,13 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) /* draw today boundary box for specified rectangle */ static void MONTHCAL_Circle(const MONTHCAL_INFO *infoPtr, HDC hdc, const RECT *r) { - HPEN red_pen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); - HPEN old_pen = SelectObject(hdc, red_pen); + HPEN old_pen = SelectObject(hdc, infoPtr->pens[PenRed]); HBRUSH old_brush; old_brush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); Rectangle(hdc, r->left, r->top, r->right, r->bottom); SelectObject(hdc, old_brush); - DeleteObject(red_pen); SelectObject(hdc, old_pen); } @@ -788,6 +794,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con INT i, prev_month; SYSTEMTIME st; WCHAR buf[80]; + HPEN old_pen; RECT r; if (!(infoPtr->dwStyle & MCS_WEEKNUMBERS)) return; @@ -883,8 +890,10 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con } /* line separator for week numbers column */ + old_pen = SelectObject(hdc, infoPtr->pens[PenText]); MoveToEx(hdc, infoPtr->calendars[calIdx].weeknums.right, infoPtr->calendars[calIdx].weeknums.top + 3 , NULL); LineTo(hdc, infoPtr->calendars[calIdx].weeknums.right, infoPtr->calendars[calIdx].weeknums.bottom); + SelectObject(hdc, old_pen); } /* bottom today date */ @@ -991,6 +1000,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; + HPEN old_pen; int mask; /* fill whole days area - from week days area to today note rectangle */ @@ -1001,10 +1011,12 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const FillRect(hdc, &fill_bk_rect, infoPtr->brushes[MCSC_MONTHBK]); /* draw line under day abbreviations */ + old_pen = SelectObject(hdc, infoPtr->pens[PenText]); MoveToEx(hdc, infoPtr->calendars[calIdx].days.left + 3, infoPtr->calendars[calIdx].title.bottom + infoPtr->textHeight + 1, NULL); LineTo(hdc, infoPtr->calendars[calIdx].days.right - 3, infoPtr->calendars[calIdx].title.bottom + infoPtr->textHeight + 1); + SelectObject(hdc, old_pen); prev_month = date->wMonth - 1; if (prev_month == 0) prev_month = 12; @@ -1137,6 +1149,13 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) infoPtr->brushes[index] = CreateSolidBrush(color); } + /* update cached pen */ + if (index == MCSC_TEXT) + { + DeleteObject(infoPtr->pens[PenText]); + infoPtr->pens[PenText] = CreatePen(PS_SOLID, 1, infoPtr->colors[index]); + } + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); return prev; } @@ -2540,6 +2559,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->brushes[MCSC_TITLEBK] = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); infoPtr->brushes[MCSC_MONTHBK] = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); + infoPtr->pens[PenRed] = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); + infoPtr->pens[PenText] = CreatePen(PS_SOLID, 1, infoPtr->colors[MCSC_TEXT]); + infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; infoPtr->calendars[0].month = infoPtr->todaysDate; @@ -2566,6 +2588,8 @@ fail: static LRESULT MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) { + INT i; + /* free month calendar info data */ Free(infoPtr->monthdayState); Free(infoPtr->calendars); @@ -2577,6 +2601,9 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) DeleteObject(infoPtr->brushes[MCSC_TITLEBK]); DeleteObject(infoPtr->brushes[MCSC_MONTHBK]); + for (i = PenRed; i < PenLast; i++) + DeleteObject(infoPtr->pens[i]); + Free(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix today label position and text colour .
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 49088bf96d0bfbddac4bec38e4376b6fecc7929d URL: http://source.winehq.org/git/wine.git/?a=commit;h=49088bf96d0bfbddac4bec38e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 12:40:56 2011 +0400 comctl32/monthcal: Fix today label position and text colour. --- dlls/comctl32/monthcal.c | 84 +++++++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 37 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fc0cf3f..2fa1425 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -636,28 +636,33 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) return TRUE; } +/* draw today boundary box for specified rectangle */ +static void MONTHCAL_Circle(const MONTHCAL_INFO *infoPtr, HDC hdc, const RECT *r) +{ + HPEN red_pen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); + HPEN old_pen = SelectObject(hdc, red_pen); + HBRUSH old_brush; + + old_brush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); + Rectangle(hdc, r->left, r->top, r->right, r->bottom); + + SelectObject(hdc, old_brush); + DeleteObject(red_pen); + SelectObject(hdc, old_pen); +} + /* Draw today day mark rectangle * - * [I] hdc : context to draw in - * [I] day : day to mark with rectangle + * [I] hdc : context to draw in + * [I] date : day to mark with rectangle * */ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *date) { - HPEN hRedPen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); - HPEN hOldPen2 = SelectObject(hdc, hRedPen); - HBRUSH hOldBrush; RECT day_rect; - MONTHCAL_CalcPosFromDay(infoPtr, date, &day_rect); - - 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); + MONTHCAL_Circle(infoPtr, hdc, &day_rect); } static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *st, @@ -885,36 +890,41 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con /* bottom today date */ static void MONTHCAL_PaintTodayTitle(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) { - if(!(infoPtr->dwStyle & MCS_NOTODAY)) { + static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; + WCHAR buf_todayW[30], buf_dateW[20], buf[80]; + RECT text_rect, box_rect; + HFONT old_font; + INT col; + + if(infoPtr->dwStyle & MCS_NOTODAY) return; + + if (!LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW))) + { static const WCHAR todayW[] = { 'T','o','d','a','y',':',0 }; - static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; - WCHAR buf_todayW[30], buf_dateW[20], buf[80]; - RECT rtoday; + WARN("Can't load resource\n"); + strcpyW(buf_todayW, todayW); + } - if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { - SYSTEMTIME fake_st; + col = infoPtr->dwStyle & MCS_NOTODAYCIRCLE ? 0 : 1; + if (infoPtr->dwStyle & MCS_WEEKNUMBERS) col--; + MONTHCAL_CalcDayRect(infoPtr, &text_rect, col, 6); + box_rect = text_rect; - MONTHCAL_GetMaxDate(infoPtr, &fake_st); - /* this is always safe cause next month will never fully fit calendar */ - fake_st.wDay += 1; - MONTHCAL_CircleDay(infoPtr, hdc, &fake_st); - } - if (!LoadStringW(COMCTL32_hModule, IDM_TODAY, buf_todayW, countof(buf_todayW))) - { - WARN("Can't load resource\n"); - strcpyW(buf_todayW, todayW); - } - MONTHCAL_CalcDayRect(infoPtr, &rtoday, 1, 6); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &infoPtr->todaysDate, NULL, - buf_dateW, countof(buf_dateW)); - SelectObject(hdc, infoPtr->hBoldFont); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &infoPtr->todaysDate, NULL, + buf_dateW, countof(buf_dateW)); + old_font = SelectObject(hdc, infoPtr->hBoldFont); + SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); - wsprintfW(buf, fmt_todayW, buf_todayW, buf_dateW); - DrawTextW(hdc, buf, -1, &rtoday, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE); - DrawTextW(hdc, buf, -1, &rtoday, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + wsprintfW(buf, fmt_todayW, buf_todayW, buf_dateW); + DrawTextW(hdc, buf, -1, &text_rect, DT_CALCRECT | DT_LEFT | DT_VCENTER | DT_SINGLELINE); + DrawTextW(hdc, buf, -1, &text_rect, DT_LEFT | DT_VCENTER | DT_SINGLELINE); - SelectObject(hdc, infoPtr->hFont); + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { + OffsetRect(&box_rect, -infoPtr->width_increment, 0); + MONTHCAL_Circle(infoPtr, hdc, &box_rect); } + + SelectObject(hdc, old_font); } /* today mark + focus */

1 0

Nikolay Sivov : comctl32/monthcal: Week numbers use title colour.
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 5a8be0bc203b77095205d8942e59189fd77dfc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8be0bc203b77095205d8942… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 2 11:43:59 2011 +0400 comctl32/monthcal: Week numbers use title colour. --- dlls/comctl32/monthcal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index bae19f8..fc0cf3f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -6,7 +6,7 @@ * Copyright 1999 Chris Morgan <cmorgan(a)wpi.edu> and * James Abbatiello <abbeyj(a)wpi.edu> * Copyright 2000 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - * Copyright 2009, 2010 Nikolay Sivov + * Copyright 2009-2011 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -855,6 +855,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con /* erase whole week numbers area */ FillRect(hdc, &r, infoPtr->brushes[MCSC_MONTHBK]); + SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]); /* reduce rectangle to one week number */ r.bottom = r.top + infoPtr->height_increment;

1 0

Marcus Meissner : mscms: Added missing breaks (Coverity).
by Alexandre Julliard 04 Apr '11

04 Apr '11

Module: wine Branch: master Commit: 933b3af981d11628b2c5e98a6f97a74a529e830f URL: http://source.winehq.org/git/wine.git/?a=commit;h=933b3af981d11628b2c5e98a6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Apr 2 09:36:56 2011 +0200 mscms: Added missing breaks (Coverity). --- dlls/mscms/transform.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 49230ec..a5b3486 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -384,6 +384,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_Lab: { @@ -399,6 +400,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_GRAY: { @@ -414,6 +416,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_CMYK: { @@ -429,6 +432,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } case COLOR_XYZ: { @@ -444,6 +448,7 @@ BOOL WINAPI TranslateColors( HTRANSFORM handle, PCOLOR in, DWORD count, ret = FALSE; break; } + break; } default: FIXME("unhandled input/output pair: %d/%d\n", input_type, output_type);

1 0

← Newer
1
...
86
87
88
89
90
91
92
93
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011