March 2011 - Wine-commits - list.winehq.org

André Hentschel : winhttp: Port numbers are unsigned.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 1bf001cf0b4d536eafcbc4fccd2d8f481f74789f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf001cf0b4d536eafcbc4fcc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 27 15:26:26 2011 +0200 winhttp: Port numbers are unsigned. --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f6fc577..2c3d534 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -502,7 +502,7 @@ static WCHAR *build_request_path( request_t *request ) sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { - static const WCHAR colonFmt[] = { ':','%','d',0 }; + static const WCHAR colonFmt[] = { ':','%','u',0 }; sprintfW( ret + strlenW( ret ), colonFmt, request->connect->hostport ); @@ -868,7 +868,7 @@ static BOOL read_reply( request_t *request ); static BOOL secure_proxy_connect( request_t *request ) { static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR fmt[] = {'%','s',':','%','d',0}; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; BOOL ret = FALSE; LPWSTR path; connect_t *connect = request->connect;

1 0

André Hentschel : wininet: Port numbers are unsigned.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 1a39e29c3b405768d8f8192df8dcc1fc407f212f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a39e29c3b405768d8f8192df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 27 15:27:46 2011 +0200 wininet: Port numbers are unsigned. --- dlls/wininet/http.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9444f08..b78fec4 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1437,8 +1437,8 @@ static WCHAR *HTTP_BuildProxyRequestUrl(http_request_t *req) else { static const WCHAR slash[] = { '/',0 }; - static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','d',0 }; - static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','d',0 }; + static const WCHAR format[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 }; + static const WCHAR formatSSL[] = { 'h','t','t','p','s',':','/','/','%','s',':','%','u',0 }; http_session_t *session = req->session; size = 16; /* "https://" + sizeof(port#) + ":/\0" */ @@ -3424,7 +3424,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) urlComponents.nPort != INTERNET_DEFAULT_HTTPS_PORT) { int len; - static const WCHAR fmt[] = {'%','s',':','%','i',0}; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; len = lstrlenW(hostName); len += 7; /* 5 for strlen("65535") + 1 for ":" + 1 for '\0' */ session->hostName = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); @@ -3530,7 +3530,7 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) char *ascii_req; DWORD res; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR szFormat[] = {'%','s',':','%','d',0}; + static const WCHAR szFormat[] = {'%','s',':','%','u',0}; http_session_t *session = request->session; TRACE("\n");

1 0

David Hedberg : mspatcha: New dll stub.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 21085edb51fdbab4b256ecb96c0d2849263fac2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=21085edb51fdbab4b256ecb96… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Tue Mar 22 04:16:56 2011 +0100 mspatcha: New dll stub. --- configure | 1 + configure.ac | 1 + dlls/mspatcha/Makefile.in | 6 ++++ dlls/mspatcha/mspatcha.spec | 12 ++++++++ dlls/mspatcha/mspatcha_main.c | 62 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index ea86547..3b5e8bd 100755 --- a/configure +++ b/configure @@ -15174,6 +15174,7 @@ wine_fn_config_dll msimtf enable_msimtf wine_fn_config_dll msisip enable_msisip wine_fn_config_dll msisys.ocx enable_msisys_ocx wine_fn_config_dll msnet32 enable_msnet32 +wine_fn_config_dll mspatcha enable_mspatcha wine_fn_config_dll msrle32 enable_msrle32 po wine_fn_config_dll mssign32 enable_mssign32 wine_fn_config_dll mssip32 enable_mssip32 diff --git a/configure.ac b/configure.ac index 448975e..326aa30 100644 --- a/configure.ac +++ b/configure.ac @@ -2636,6 +2636,7 @@ WINE_CONFIG_DLL(msimtf) WINE_CONFIG_DLL(msisip) WINE_CONFIG_DLL(msisys.ocx) WINE_CONFIG_DLL(msnet32) +WINE_CONFIG_DLL(mspatcha) WINE_CONFIG_DLL(msrle32,,[po]) WINE_CONFIG_DLL(mssign32) WINE_CONFIG_DLL(mssip32) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in new file mode 100644 index 0000000..23663eb --- /dev/null +++ b/dlls/mspatcha/Makefile.in @@ -0,0 +1,6 @@ +MODULE = mspatcha.dll + +C_SRCS = \ + mspatcha_main.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/mspatcha/mspatcha.spec b/dlls/mspatcha/mspatcha.spec new file mode 100644 index 0000000..ca9bc7d --- /dev/null +++ b/dlls/mspatcha/mspatcha.spec @@ -0,0 +1,12 @@ +1 stub ApplyPatchToFileA +2 stub ApplyPatchToFileByHandles +3 stub ApplyPatchToFileByHandlesEx +4 stub ApplyPatchToFileExA +5 stub ApplyPatchToFileExW +6 stdcall ApplyPatchToFileW(wstr wstr wstr long) +7 stub GetFilePatchSignatureA +8 stub GetFilePatchSignatureByHandle +9 stub GetFilePatchSignatureW +10 stub TestApplyPatchToFileA +11 stub TestApplyPatchToFileByHandles +12 stub TestApplyPatchToFileW diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c new file mode 100644 index 0000000..0110a41 --- /dev/null +++ b/dlls/mspatcha/mspatcha_main.c @@ -0,0 +1,62 @@ +/* + * PatchAPI + * + * Copyright 2011 David Hedberg for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mspatcha); + +/***************************************************** + * DllMain (MSPATCHA.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + +/***************************************************** + * ApplyPatchToFileW (MSPATCHA.6) + */ +BOOL WINAPI ApplyPatchToFileW(LPCWSTR patch_file, LPCWSTR old_file, LPCWSTR new_file, ULONG apply_flags) +{ + FIXME("stub - %s, %s, %s, %08x\n", debugstr_w(patch_file), debugstr_w(old_file), + debugstr_w(new_file), apply_flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Eric Pouech : include: Added missing no return attribute.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 394feff361423443f48b9cb16121b983a9975bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=394feff361423443f48b9cb16… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 26 19:43:28 2011 +0100 include: Added missing no return attribute. --- include/winbase.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 1222bec..2752e12 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1578,7 +1578,7 @@ WINBASEAPI BOOL WINAPI FreeEnvironmentStringsA(LPSTR); WINBASEAPI BOOL WINAPI FreeEnvironmentStringsW(LPWSTR); #define FreeEnvironmentStrings WINELIB_NAME_AW(FreeEnvironmentStrings) WINBASEAPI BOOL WINAPI FreeLibrary(HMODULE); -WINBASEAPI VOID WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); +WINBASEAPI VOID DECLSPEC_NORETURN WINAPI FreeLibraryAndExitThread(HINSTANCE,DWORD); #define FreeModule(handle) FreeLibrary(handle) #define FreeProcInstance(proc) /*nothing*/ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL);

1 0

André Hentschel : ntdll: Add check for DragonFly BSD.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: f73ee0a249423c5ed1076d8fbac3341195c8e470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73ee0a249423c5ed1076d8fb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 26 17:28:50 2011 +0100 ntdll: Add check for DragonFly BSD. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 13444ae..6c8e8e2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -208,7 +208,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include <machine/trap.h>

1 0

Nikolay Sivov : comctl32/monthcal: Remove outdated comment.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: ddab5d8548d4ada5c2b945a6a115c45f953c91fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddab5d8548d4ada5c2b945a6a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 25 22:54:26 2011 +0300 comctl32/monthcal: Remove outdated comment. --- dlls/comctl32/monthcal.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1cc64db..b973ff9 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -33,7 +33,6 @@ * * TODO: * -- MCM_[GS]ETUNICODEFORMAT - * -- MONTHCAL_GetMonthRange * -- handle resources better (doesn't work now); * -- take care of internationalization. * -- keyboard handling. @@ -1265,8 +1264,6 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) } case GMR_DAYSTATE: { - /*FIXME: currently multicalendar feature isn't implemented, - min date from previous month and max date from next one returned */ MONTHCAL_GetMinDate(infoPtr, &st[0]); MONTHCAL_GetMaxDate(infoPtr, &st[1]); break;

1 0

Nikolay Sivov : comctl32/monthcal: Move partially visible months painting outside of calendar loop.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 2f65a83370b7f1e99f86ef71a7fccb0f9219293b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f65a83370b7f1e99f86ef71a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 02:23:01 2011 +0300 comctl32/monthcal: Move partially visible months painting outside of calendar loop. --- dlls/comctl32/monthcal.c | 87 ++++++++++++++++++++++++---------------------- 1 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b973ff9..745ccbd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -946,6 +946,46 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, } } +/* months before first calendar month and after last calendar month */ +static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) +{ + INT prev_month, mask, length; + SYSTEMTIME st_max, st; + + if (infoPtr->dwStyle & MCS_NOTRAILINGDATES) return; + + SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); + + prev_month = infoPtr->calendars[0].month.wMonth - 1; + + /* draw prev month */ + MONTHCAL_GetMinDate(infoPtr, &st); + mask = 1 << (st.wDay-1); + /* December and January both 31 days long, so no worries if wrapped */ + length = MONTHCAL_MonthLength(infoPtr->calendars[0].month.wMonth - 1, + infoPtr->calendars[0].month.wYear); + while(st.wDay <= length) + { + MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[0] & mask, ps); + mask <<= 1; + st.wDay++; + } + + /* draw next month */ + st = infoPtr->calendars[infoPtr->cal_num-1].month; + st.wDay = 1; + MONTHCAL_GetNextMonth(&st); + MONTHCAL_GetMaxDate(infoPtr, &st_max); + mask = 1; + + while(st.wDay <= st_max.wDay) + { + MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[2] & mask, ps); + mask <<= 1; + st.wDay++; + } +} + /* paint a calendar area */ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { @@ -978,7 +1018,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const infoPtr->calendars[calIdx].wdays.left = infoPtr->calendars[calIdx].days.left = infoPtr->calendars[calIdx].weeknums.right; - /* 1. draw day abbreviations */ + /* draw day abbreviations */ SelectObject(hdc, infoPtr->hFont); SetBkColor(hdc, infoPtr->colors[MCSC_MONTHBK]); SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); @@ -993,47 +1033,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const OffsetRect(&r, infoPtr->width_increment, 0); } - /* 2. previous and next months */ - if (!(infoPtr->dwStyle & MCS_NOTRAILINGDATES) && (calIdx == 0 || calIdx == infoPtr->cal_num - 1)) - { - SYSTEMTIME st_max; - - SetTextColor(hdc, infoPtr->colors[MCSC_TRAILINGTEXT]); - - /* draw prev month */ - if (calIdx == 0) - { - MONTHCAL_GetMinDate(infoPtr, &st); - mask = 1 << (st.wDay-1); - length = MONTHCAL_MonthLength(prev_month, date->wYear); - - while(st.wDay <= length) - { - MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[0] & mask, ps); - mask <<= 1; - st.wDay++; - } - } - - /* draw next month */ - if (calIdx == infoPtr->cal_num - 1) - { - st = *date; - st.wDay = 1; - MONTHCAL_GetNextMonth(&st); - MONTHCAL_GetMaxDate(infoPtr, &st_max); - mask = 1; - - while(st.wDay <= st_max.wDay) - { - MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[2] & mask, ps); - mask <<= 1; - st.wDay++; - } - } - } - - /* 3. current month */ + /* draw current month */ SetTextColor(hdc, infoPtr->colors[MCSC_TEXT]); st = *date; st.wDay = 1; @@ -1075,6 +1075,9 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT MONTHCAL_PaintWeeknumbers(infoPtr, hdc, ps, i); } + /* partially visible months */ + MONTHCAL_PaintLeadTrailMonths(infoPtr, hdc, ps); + /* focus and today rectangle */ MONTHCAL_PaintFocusAndCircle(infoPtr, hdc, ps);

1 0

Nikolay Sivov : comctl32/monthcal: Fix hit test for previous month.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: eb2dc5c900e7b7a54105e159d5f3932cac507a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2dc5c900e7b7a54105e159d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 04:05:59 2011 +0300 comctl32/monthcal: Fix hit test for previous month. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 745ccbd..28af051 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1727,7 +1727,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) { htinfo.uHit = MCHT_CALENDARDATEPREV; MONTHCAL_GetPrevMonth(&htinfo.st); - htinfo.st.wDay = MONTHCAL_MonthLength(lpht->st.wMonth, lpht->st.wYear) + day; + htinfo.st.wDay = MONTHCAL_MonthLength(htinfo.st.wMonth, htinfo.st.wYear) + day; } else if (day > MONTHCAL_MonthLength(ht_month.wMonth, ht_month.wYear)) {

1 0

Nikolay Sivov : comctl32/monthcal: Cache brush handles.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 6d4b96020e2f8e9cff19b16a67f6ed11d9263435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4b96020e2f8e9cff19b16a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 26 15:58:59 2011 +0300 comctl32/monthcal: Cache brush handles. --- dlls/comctl32/monthcal.c | 36 ++++++++++++++++++++---------------- 1 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 28af051..b750a18 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -95,6 +95,7 @@ typedef struct DWORD dwStyle; /* cached GWL_STYLE */ COLORREF colors[MCSC_TRAILINGTEXT+1]; + HBRUSH brushes[MCSC_MONTHBK+1]; HFONT hFont; HFONT hBoldFont; @@ -754,13 +755,10 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; WCHAR buf_month[80], buf_fmt[80]; - HBRUSH hbr; SIZE sz; /* fill header box */ - hbr = CreateSolidBrush(infoPtr->colors[MCSC_TITLEBK]); - FillRect(hdc, title, hbr); - DeleteObject(hbr); + FillRect(hdc, title, infoPtr->brushes[MCSC_TITLEBK]); /* month/year string */ SetBkColor(hdc, infoPtr->colors[MCSC_TITLEBK]); @@ -792,7 +790,6 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con INT i, prev_month; SYSTEMTIME st; WCHAR buf[80]; - HBRUSH hbr; RECT r; if (!(infoPtr->dwStyle & MCS_WEEKNUMBERS)) return; @@ -864,9 +861,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con r = infoPtr->calendars[calIdx].weeknums; /* erase whole week numbers area */ - hbr = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); - FillRect(hdc, &r, hbr); - DeleteObject(hbr); + FillRect(hdc, &r, infoPtr->brushes[MCSC_MONTHBK]); /* reduce rectangle to one week number */ r.bottom = r.top + infoPtr->height_increment; @@ -994,7 +989,6 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; - HBRUSH hbr; int mask; /* fill whole days area - from week days area to today note rectangle */ @@ -1002,9 +996,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); - hbr = CreateSolidBrush(infoPtr->colors[MCSC_MONTHBK]); - FillRect(hdc, &fill_bk_rect, hbr); - DeleteObject(hbr); + FillRect(hdc, &fill_bk_rect, infoPtr->brushes[MCSC_MONTHBK]); /* draw line under day abbreviations */ MoveToEx(hdc, infoPtr->calendars[calIdx].days.left + 3, @@ -1136,6 +1128,13 @@ MONTHCAL_SetColor(MONTHCAL_INFO *infoPtr, UINT index, COLORREF color) prev = infoPtr->colors[index]; infoPtr->colors[index] = color; + /* update cached brush */ + if (index == MCSC_BACKGROUND || index == MCSC_TITLEBK || index == MCSC_MONTHBK) + { + DeleteObject(infoPtr->brushes[index]); + infoPtr->brushes[index] = CreateSolidBrush(color); + } + InvalidateRect(infoPtr->hwndSelf, NULL, index == MCSC_BACKGROUND ? TRUE : FALSE); return prev; } @@ -2237,15 +2236,12 @@ MONTHCAL_Paint(MONTHCAL_INFO *infoPtr, HDC hdc_paint) static LRESULT MONTHCAL_EraseBkgnd(const MONTHCAL_INFO *infoPtr, HDC hdc) { - HBRUSH hbr; RECT rc; if (!GetClipBox(hdc, &rc)) return FALSE; /* fill background */ - hbr = CreateSolidBrush (infoPtr->colors[MCSC_BACKGROUND]); - FillRect(hdc, &rc, hbr); - DeleteObject(hbr); + FillRect(hdc, &rc, infoPtr->brushes[MCSC_BACKGROUND]); return TRUE; } @@ -2538,6 +2534,10 @@ 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->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; infoPtr->calendars[0].month = infoPtr->todaysDate; @@ -2571,6 +2571,10 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); + DeleteObject(infoPtr->brushes[MCSC_BACKGROUND]); + DeleteObject(infoPtr->brushes[MCSC_TITLEBK]); + DeleteObject(infoPtr->brushes[MCSC_MONTHBK]); + Free(infoPtr); return 0; }

1 0

Dan Kegel : urlmon: IsValidUrl should not fail if first parameter is not NULL.
by Alexandre Julliard 28 Mar '11

28 Mar '11

Module: wine Branch: master Commit: 6bbd0b87d5e9a7568f42ee7e90c299ac836a70ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd0b87d5e9a7568f42ee7e9… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Mar 21 01:45:51 2011 +0000 urlmon: IsValidUrl should not fail if first parameter is not NULL. --- dlls/urlmon/tests/misc.c | 11 +++++++++++ dlls/urlmon/urlmon_main.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index cd3372c..fc1ba53 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1454,9 +1454,20 @@ static void test_MkParseDisplayNameEx(void) static void test_IsValidURL(void) { HRESULT hr; + IBindCtx *bctx = NULL; hr = IsValidURL(NULL, 0, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IsValidURL(NULL, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + CreateBindCtx(0, &bctx); + + hr = IsValidURL(bctx, wszHttpWineHQ, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + IBindCtx_Release(bctx); } START_TEST(misc) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 57eeaf9..01442c1 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -426,7 +426,7 @@ HRESULT WINAPI DllRegisterServerEx(void) * Determines if a specified string is a valid URL. * * PARAMS - * pBC [I] ignored, must be NULL. + * pBC [I] ignored, should be NULL. * szURL [I] string that represents the URL in question. * dwReserved [I] reserved and must be zero. * @@ -442,7 +442,7 @@ HRESULT WINAPI IsValidURL(LPBC pBC, LPCWSTR szURL, DWORD dwReserved) { FIXME("(%p, %s, %d): stub\n", pBC, debugstr_w(szURL), dwReserved); - if (pBC || dwReserved || !szURL) + if (dwReserved || !szURL) return E_INVALIDARG; return S_OK;

1 0