October 2009 - Wine-Commits

Stefan Dösinger : user32: Make some functions hookable .
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: acebc001b724870629db681cbd5e19d98ab4b9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=acebc001b724870629db681cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:10:56 2009 +0200 user32: Make some functions hookable. --- dlls/user32/cursoricon.c | 8 ++++---- dlls/user32/input.c | 18 +++++++++--------- dlls/user32/message.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 2ed1138..1ae33aa 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1803,7 +1803,7 @@ DWORD WINAPI DumpIcon16( SEGPTR pInfo, WORD *lpLen, * RETURNS * A handle to the previous cursor shape. */ -HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) +HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) { struct user_thread_info *thread_info = get_user_thread_info(); HCURSOR hOldCursor; @@ -1824,7 +1824,7 @@ HCURSOR WINAPI SetCursor( HCURSOR hCursor /* [in] Handle of cursor to show */ ) /*********************************************************************** * ShowCursor (USER32.@) */ -INT WINAPI ShowCursor( BOOL bShow ) +INT WINAPI DECLSPEC_HOTPATCH ShowCursor( BOOL bShow ) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -1858,7 +1858,7 @@ HCURSOR WINAPI GetCursor(void) /*********************************************************************** * ClipCursor (USER32.@) */ -BOOL WINAPI ClipCursor( const RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) { RECT virt; @@ -1881,7 +1881,7 @@ BOOL WINAPI ClipCursor( const RECT *rect ) /*********************************************************************** * GetClipCursor (USER32.@) */ -BOOL WINAPI GetClipCursor( RECT *rect ) +BOOL WINAPI DECLSPEC_HOTPATCH GetClipCursor( RECT *rect ) { /* If this is first time - initialize the rect */ if (IsRectEmpty( &CURSOR_ClipRect )) ClipCursor( NULL ); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dc0ce56..bfe80c4 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -192,7 +192,7 @@ void WINAPI mouse_event( DWORD dwFlags, DWORD dx, DWORD dy, /*********************************************************************** * GetCursorPos (USER32.@) */ -BOOL WINAPI GetCursorPos( POINT *pt ) +BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) { if (!pt) return FALSE; return USER_Driver->pGetCursorPos( pt ); @@ -215,7 +215,7 @@ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) /*********************************************************************** * SetCursorPos (USER32.@) */ -BOOL WINAPI SetCursorPos( INT x, INT y ) +BOOL WINAPI DECLSPEC_HOTPATCH SetCursorPos( INT x, INT y ) { return USER_Driver->pSetCursorPos( x, y ); } @@ -224,7 +224,7 @@ BOOL WINAPI SetCursorPos( INT x, INT y ) /********************************************************************** * SetCapture (USER32.@) */ -HWND WINAPI SetCapture( HWND hwnd ) +HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { HWND previous; @@ -236,7 +236,7 @@ HWND WINAPI SetCapture( HWND hwnd ) /********************************************************************** * ReleaseCapture (USER32.@) */ -BOOL WINAPI ReleaseCapture(void) +BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) { BOOL ret = set_capture_window( 0, 0, NULL ); @@ -271,7 +271,7 @@ HWND WINAPI GetCapture(void) * bit set to 1 if currently pressed, low-order bit set to 1 if key has * been pressed. */ -SHORT WINAPI GetAsyncKeyState(INT nKey) +SHORT WINAPI DECLSPEC_HOTPATCH GetAsyncKeyState(INT nKey) { if (nKey < 0 || nKey > 256) return 0; @@ -370,7 +370,7 @@ UINT WINAPI GetRawInputDeviceList(PRAWINPUTDEVICELIST pRawInputDeviceList, PUINT /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); @@ -393,7 +393,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, P /****************************************************************** * GetRawInputBuffer (USER32.@) */ -UINT WINAPI GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) +UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, UINT cbSizeHeader) { FIXME("(pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n", pData, pcbSize, cbSizeHeader); @@ -474,7 +474,7 @@ BOOL WINAPI AttachThreadInput( DWORD from, DWORD to, BOOL attach ) * keyboard-input message. This function retrieves the state of the key * at the time the input message was generated. */ -SHORT WINAPI GetKeyState(INT vkey) +SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { SHORT retval = 0; @@ -493,7 +493,7 @@ SHORT WINAPI GetKeyState(INT vkey) /********************************************************************** * GetKeyboardState (USER32.@) */ -BOOL WINAPI GetKeyboardState( LPBYTE state ) +BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4e9a62c..80eadec 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3059,7 +3059,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) * * See DispatchMessageW. */ -LRESULT WINAPI DispatchMessageA( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) { LRESULT retval; @@ -3130,7 +3130,7 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) * ECMA-234, Win32 * */ -LRESULT WINAPI DispatchMessageW( const MSG* msg ) +LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) { LRESULT retval;

1 0

Alexander Kochetkov : oleaut32: Fix null terminator in SysReAllocStringLen.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: ae4de9d6956a18b2e8bff0cfd2a3122e30e05fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae4de9d6956a18b2e8bff0cfd… Author: Alexander Kochetkov <al.kochet(a)gmail.com> Date: Wed Oct 14 11:37:20 2009 +0400 oleaut32: Fix null terminator in SysReAllocStringLen. --- dlls/oleaut32/oleaut.c | 15 ++++++--------- dlls/oleaut32/tests/vartype.c | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 896d6d4..72b70e2 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -298,15 +298,12 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); *old = (BSTR)(ptr+1); *ptr = newbytelen; - if (str) { - memmove(*old, str, newbytelen); - (*old)[len] = 0; - } else { - /* Subtle hidden feature: The old string data is still there - * when 'in' is NULL! - * Some Microsoft program needs it. - */ - } + /* Subtle hidden feature: The old string data is still there + * when 'in' is NULL! + * Some Microsoft program needs it. + */ + if (str) memmove(*old, str, newbytelen); + (*old)[len] = 0; } else { /* * Allocate the new string diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b50a673..87f2901 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5422,7 +5422,7 @@ static void test_SysReAllocStringLen(void) if (str) { ok (str == oldstr, "Expected reuse of the old string memory\n"); - todo_wine ok (str[STRING_SIZE] == 0, + ok (str[STRING_SIZE] == 0, "Expected null terminator, got 0x%04X\n", str[STRING_SIZE]); SysFreeString(str); }

1 0

Maarten Lankhorst : winealsa.drv: Remove call to snd_pcm_drain.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: d7a9e2d275fbc044eced7f705dcb1d879b4336af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a9e2d275fbc044eced7f705… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 13 20:04:22 2009 +0200 winealsa.drv: Remove call to snd_pcm_drain. snd_pcm_drain can cause a deadlock if in the wrong state, and snd_pcm_drop below does the same thing. --- dlls/winealsa.drv/waveout.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 24207ec..25a1618 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -322,9 +322,6 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) int err; TRACE("(%p)\n", wwo); - /* flush all possible output */ - snd_pcm_drain(wwo->pcm); - wodUpdatePlayedTotal(wwo, NULL); /* updates current notify list */ wodPlayer_NotifyCompletions(wwo, FALSE);

1 0

Piotr Caban : jscript: Added Global.encodeURIComponent implementation.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: daf4da06461ebc6e323a207b123f9ee94b5dd688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf4da06461ebc6e323a207b1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 13 22:39:20 2009 +0200 jscript: Added Global.encodeURIComponent implementation. --- dlls/jscript/global.c | 90 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 21 ++++++++++ 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 4282d06..9670949 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -334,8 +334,10 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D } ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } len = 0; for(ptr=str; *ptr; ptr++) { @@ -357,6 +359,8 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D } } + SysFreeString(str); + if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; @@ -690,8 +694,10 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } len = 0; for(ptr=str; *ptr; ptr++) { @@ -715,6 +721,8 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, len++; } + SysFreeString(str); + if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; @@ -802,6 +810,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags }else { i = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; if(!i) { + SysFreeString(str); FIXME("throw URIError\n"); return E_FAIL; } @@ -811,8 +820,10 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } rptr = ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } for(ptr = str; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { @@ -827,6 +838,8 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } } + SysFreeString(str); + TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret)); if(retv) { V_VT(retv) = VT_BSTR; @@ -847,8 +860,75 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret; + char buf[4]; + const WCHAR *ptr; + DWORD len = 0, size, i; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr=str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr)) + len++; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL); + if(!size) { + SysFreeString(str); + FIXME("throw Error\n"); + return E_FAIL; + } + len += size*3; + } + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) { + SysFreeString(str); + return E_OUTOFMEMORY; + } + + len = 0; + for(ptr=str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr)) + ret[len++] = *ptr; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + for(i=0; i<size; i++) { + ret[len++] = '%'; + ret[len++] = int_to_char((BYTE)buf[i] >> 4); + ret[len++] = int_to_char(buf[i] & 0x0f); + } + } + } + + SysFreeString(str); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } else { + SysFreeString(ret); + } + + return S_OK; } static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7963016..d7626f1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,27 @@ ok(tmp === "undefined", "encodeURI() = " + tmp); tmp = encodeURI("abc", "test"); ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = encodeURIComponent("abc"); +ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +tmp = encodeURIComponent("{abc}"); +ok(tmp === "%7Babc%7D", "encodeURIComponent('{abc}') = " + tmp); +tmp = encodeURIComponent(""); +ok(tmp === "", "encodeURIComponent('') = " + tmp); +tmp = encodeURIComponent("\01\02\03\04"); +ok(tmp === "%01%02%03%04", "encodeURIComponent('\\01\\02\\03\\04') = " + tmp); +tmp = encodeURIComponent("{#@}"); +ok(tmp === "%7B%23%40%7D", "encodeURIComponent('{#@}') = " + tmp); +tmp = encodeURIComponent("\xa1 "); +ok(tmp === "%C2%A1%20", "encodeURIComponent(\\xa1 ) = " + tmp); +tmp = encodeURIComponent("\xffff"); +ok(tmp.length === 8, "encodeURIComponent('\\xffff').length = " + tmp.length); +tmp = encodeURIComponent("abcABC123;/?:@&=+$,-_.!~*'()"); +ok(tmp === "abcABC123%3B%2F%3F%3A%40%26%3D%2B%24%2C-_.!~*'()", "encodeURIComponent('abcABC123;/?:@&=+$,-_.!~*'()') = " + tmp); +tmp = encodeURIComponent(); +ok(tmp === "undefined", "encodeURIComponent() = " + tmp); +tmp = encodeURIComponent("abc", "test"); +ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); + tmp = escape("abc"); ok(tmp === "abc", "escape('abc') = " + tmp); tmp = escape("");

1 0

Piotr Caban : jscript: Fixed Global functions lengths.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 662a8525f4bae53789608a6f532605b9cd9e638c URL: http://source.winehq.org/git/wine.git/?a=commit;h=662a8525f4bae53789608a6f5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 13 22:08:43 2009 +0200 jscript: Fixed Global functions lengths. --- dlls/jscript/activex.c | 3 +- dlls/jscript/array.c | 2 +- dlls/jscript/bool.c | 3 +- dlls/jscript/date.c | 3 +- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 56 ++++++++++++++++++++++---------------------- dlls/jscript/number.c | 3 +- dlls/jscript/regexp.c | 3 +- dlls/jscript/string.c | 2 +- dlls/jscript/tests/api.js | 39 +++++++++++++++++++++++++++++++ 11 files changed, 81 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662a8525f4bae53789608…

1 0

Jörg Höhle : winmm: MCI notification is controlled by keyword only.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: d48d923df302274bf457a7ebe61aab3fd90dc4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48d923df302274bf457a7ebe… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 13 08:00:03 2009 +0200 winmm: MCI notification is controlled by keyword only. --- dlls/winmm/mci.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 216fb2a..32204a0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1433,12 +1433,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, goto errCleanUp; } - /* set up call back */ - if (hwndCallback != 0) { - dwFlags |= MCI_NOTIFY; - data[0] = (DWORD)hwndCallback; - } - /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; @@ -1454,6 +1448,11 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if ((dwRet = MCI_ParseOptArgs(data, offset, lpCmd, args, &dwFlags))) goto errCleanUp; + /* set up call back */ + if (dwFlags & MCI_NOTIFY) { + data[0] = (DWORD)hwndCallback; + } + /* FIXME: the command should get it's own notification window set up and * ask for device closing while processing the notification mechanism */

1 0

Nikolay Sivov : comctl32/monthcal: Reduce update rectangle after updating current selection.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: 2cc98ef94abd6ece5fd02d0b915aa14dd7269ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc98ef94abd6ece5fd02d0b9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 23:35:19 2009 +0400 comctl32/monthcal: Reduce update rectangle after updating current selection. --- dlls/comctl32/monthcal.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed0f6fe..ee7dc4e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -174,7 +174,7 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) /* january is 1, december is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; + const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */ @@ -813,7 +813,8 @@ static void MONTHCAL_PaintWeeknumbers(MONTHCAL_INFO *infoPtr, HDC hdc, const PAI WARN("Unknown LOCALE_IFIRSTWEEKOFYEAR value %d, defaulting to 0\n", weeknum); mindays = 0; } - if (infoPtr->curSel.wMonth < 2) + + if (infoPtr->curSel.wMonth == 1) { /* calculate all those exceptions for january */ st.wDay = st.wMonth = 1; @@ -1366,6 +1367,8 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { + SYSTEMTIME prev = infoPtr->curSel; + TRACE("%p\n", curSel); if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; @@ -1379,10 +1382,23 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; - infoPtr->curSel = *curSel; + /* if selection is still in current month, reduce rectangle */ + prev.wDay = curSel->wDay; + if (MONTHCAL_IsDateEqual(&prev, curSel)) + { + RECT r_prev, r_new; - /* FIXME: it's possible to reduce rectangle here */ - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + /* note that infoPtr->curSel isn't updated yet */ + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->curSel, &r_prev); + MONTHCAL_CalcPosFromDay(infoPtr, curSel, &r_new); + + InvalidateRect(infoPtr->hwndSelf, &r_prev, FALSE); + InvalidateRect(infoPtr->hwndSelf, &r_new, FALSE); + } + else + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + + infoPtr->curSel = *curSel; return TRUE; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix painting selected day, remove unneeded operations.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: ca579f7c6101474c6166a451f52baf03a3d158b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca579f7c6101474c6166a451f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 22:06:48 2009 +0400 comctl32/monthcal: Fix painting selected day, remove unneeded operations. --- dlls/comctl32/monthcal.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 67a0363..ed0f6fe 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -650,10 +650,11 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; - static BOOL haveBoldFont, haveSelectedDay = FALSE; + static BOOL bold_selected; + BOOL selected_day = FALSE; HBRUSH hbr; COLORREF oldCol = 0; - COLORREF oldBk = 0; + COLORREF oldBk = 0; /* No need to check styles: when selection is not valid, it is set to zero. * 1<day<31, so everything is OK. @@ -664,7 +665,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { - RECT r2; TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); @@ -673,34 +673,23 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM 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 */ - r2.left = r.left - 0.25 * infoPtr->textWidth; - r2.top = r.top; - r2.right = r.left + 0.5 * infoPtr->textWidth; - r2.bottom = r.bottom; - if(haveSelectedDay) FillRect(hdc, &r2, hbr); - haveSelectedDay = TRUE; - } else { - haveSelectedDay = FALSE; + selected_day = TRUE; } - /* need to add some code for multiple selections */ - - if((bold) &&(!haveBoldFont)) { + if(bold && !bold_selected) { SelectObject(hdc, infoPtr->hBoldFont); - haveBoldFont = TRUE; + bold_selected = TRUE; } - if((!bold) &&(haveBoldFont)) { + if(!bold && bold_selected) { SelectObject(hdc, infoPtr->hFont); - haveBoldFont = FALSE; + bold_selected = FALSE; } SetBkMode(hdc,TRANSPARENT); wsprintfW(buf, fmtW, st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); - if(haveSelectedDay) { + if(selected_day) { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); } @@ -1374,7 +1363,6 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) return TRUE; } -/* FIXME: if the specified date is not visible, make it visible */ static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) {

1 0

Nikolay Sivov : comctl32/comboex: Handle NULL item text case to avoid crash .
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: e1de222e4ebbf183089928d12352c059a511f3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1de222e4ebbf183089928d12… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 20:59:39 2009 +0400 comctl32/comboex: Handle NULL item text case to avoid crash. --- dlls/comctl32/comboex.c | 11 +++++++++++ dlls/comctl32/tests/comboex.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index d67b918..a2361fd 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -510,6 +510,17 @@ static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWST return 0; str = COMBOEX_GetText(infoPtr, item); + if (!str) + { + if (buf) + { + if (infoPtr->unicode) + buf[0] = 0; + else + *((LPSTR)buf) = 0; + } + return 0; + } if (infoPtr->unicode) { diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 1e74192..8a1e253 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -288,6 +288,41 @@ static void test_WM_LBUTTONDOWN(void) DestroyWindow(hComboEx); } +static void test_CB_GETLBTEXT(void) +{ + HWND hCombo; + CHAR buff[1]; + COMBOBOXEXITEMA item; + LRESULT ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + /* set text to null */ + addItem(hCombo, 0, NULL); + + buff[0] = 'a'; + item.mask = CBEIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = 1; + ret = SendMessage(hCombo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(ret != 0, "CBEM_GETITEM failed\n"); + ok(buff[0] == 0, "\n"); + + ret = SendMessage(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + ret = SendMessage(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + buff[0] = 'a'; + ret = SendMessage(hCombo, CB_GETLBTEXT, 0, (LPARAM)buff); + ok(ret == 0, "Expected zero length\n"); + ok(buff[0] == 0, "Expected null terminator as a string, got %s\n", buff); + + DestroyWindow(hCombo); +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -362,6 +397,7 @@ START_TEST(comboex) test_comboboxex(); test_WM_LBUTTONDOWN(); + test_CB_GETLBTEXT(); cleanup(); }

1 0

Henri Verbeet : wined3d: Merge some bitfields in struct SAVEDSTATES.
by Alexandre Julliard Oct. 14, 2009

Oct. 14, 2009

Module: wine Branch: master Commit: bac64865206a23eaa9aeb40b4a095beb917ae5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac64865206a23eaa9aeb40b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:19 2009 +0200 wined3d: Merge some bitfields in struct SAVEDSTATES. --- dlls/wined3d/wined3d_private.h | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 69467e0..c9097cf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2079,7 +2079,6 @@ typedef struct SAVEDSTATES { DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD textures; /* MAX_COMBINED_SAMPLERS, 20 */ DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ WORD pixelShaderConstantsB; /* MAX_CONST_B, 16 */ WORD pixelShaderConstantsI; /* MAX_CONST_I, 16 */ @@ -2087,15 +2086,16 @@ typedef struct SAVEDSTATES { WORD vertexShaderConstantsB; /* MAX_CONST_B, 16 */ WORD vertexShaderConstantsI; /* MAX_CONST_I, 16 */ BOOL *vertexShaderConstantsF; - WORD primitive_type : 1; - WORD indices : 1; - WORD material : 1; - WORD viewport : 1; - WORD vertexDecl : 1; - WORD pixelShader : 1; - WORD vertexShader : 1; - WORD scissorRect : 1; - WORD padding : 1; + DWORD textures : 20; /* MAX_COMBINED_SAMPLERS, 20 */ + DWORD primitive_type : 1; + DWORD indices : 1; + DWORD material : 1; + DWORD viewport : 1; + DWORD vertexDecl : 1; + DWORD pixelShader : 1; + DWORD vertexShader : 1; + DWORD scissorRect : 1; + DWORD padding : 4; } SAVEDSTATES; struct StageState {

1 0