November 2008 - Wine-commits

Kirill K. Smirnov : winecfg/audio: Fix uninitialized variable.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: d540cf3c80e9c0ff0e3a9c1a87df4ea1db04e400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d540cf3c80e9c0ff0e3a9c1a8… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Wed Nov 26 01:24:43 2008 +0300 winecfg/audio: Fix uninitialized variable. --- programs/winecfg/audio.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 3ce0e25..7f6cff8 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -304,6 +304,10 @@ static void initAudioDeviceTree(HWND hDlg) insert.u.item.pszText = text; insert.u.item.stateMask = TVIS_STATEIMAGEMASK; insert.u.item.lParam = i + DRIVER_MASK; + if (isDriverSet(pAudioDrv->szDriver)) + insert.u.item.state = INDEXTOSTATEIMAGEMASK(2); + else + insert.u.item.state = INDEXTOSTATEIMAGEMASK(1); driver[i] = (HTREEITEM)SendDlgItemMessageW (hDlg, IDC_AUDIO_TREE, TVM_INSERTITEMW, 0, (LPARAM)&insert); }

1 0

Andrew Riedi : user32: Make the hotspot ICON_HOTSPOT when loading icons.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 9726a7119b61aae27c6b9cd8a92354a0f989de18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9726a7119b61aae27c6b9cd8a… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Sun Nov 23 17:07:34 2008 -0800 user32: Make the hotspot ICON_HOTSPOT when loading icons. Based on patches by Henri Verbeet. --- dlls/user32/cursoricon.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 26676de..655a74a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1124,8 +1124,17 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if ( entry->dwDIBOffset + entry->dwDIBSize > filesize ) goto end; - hotspot.x = entry->xHotspot; - hotspot.y = entry->yHotspot; + /* Set the actual hotspot for cursors and ICON_HOTSPOT for icons. */ + if ( fCursor ) + { + hotspot.x = entry->xHotspot; + hotspot.y = entry->yHotspot; + } + else + { + hotspot.x = ICON_HOTSPOT; + hotspot.y = ICON_HOTSPOT; + } hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], hotspot, !fCursor, 0x00030000, width, height, loadflags );

1 0

Maarten Lankhorst : qmgrprxy: Fix building on wine64.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: bb7db79b0067315cad742339c2ede99f829754cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7db79b0067315cad742339c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 21 23:01:35 2008 +0100 qmgrprxy: Fix building on wine64. It uses some functions that are inlined in i386, but are explicitly linked on other architectures, which means that qmgrprxy should link to ntdll. --- dlls/qmgrprxy/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in index 18d7b11..e451566 100644 --- a/dlls/qmgrprxy/Makefile.in +++ b/dlls/qmgrprxy/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgrprxy.dll -IMPORTS = rpcrt4 kernel32 +IMPORTS = rpcrt4 kernel32 ntdll EXTRADEFS = -DREGISTER_PROXY_DLL IDL_I_SRCS = qmgrprxy.idl

1 0

Maarten Lankhorst : kernel32: Fix 64-bits error in profile.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 5f4275970e51b2fb91875cdd4a4b44d49e669e26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4275970e51b2fb91875cdd4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 21 23:24:51 2008 +0100 kernel32: Fix 64-bits error in profile. --- dlls/kernel32/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 90aefe5..8fe83bb 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1104,7 +1104,7 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, /* strip any trailing ' ' of def_val. */ if (def_val) { - LPCWSTR p = &def_val[strlenW(def_val) - 1]; + LPCWSTR p = def_val + strlenW(def_val) - 1; while (p > def_val && *p == ' ') p--;

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get_links.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 7b864afff0c1a77393846f912965af1a44a46343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b864afff0c1a77393846f912… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 23 21:02:17 2008 +1100 mshtml: Implement IHTMLDocument2 get_links. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 29 +++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 64efea8..28f6fa8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -402,8 +402,33 @@ static HRESULT WINAPI HTMLDocument_get_applets(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscoll = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetLinks(This->nsdoc, &nscoll); + if(NS_FAILED(nsres)) { + ERR("GetLinks failed: %08x\n", nsres); + return E_FAIL; + } + + if(nscoll) { + *p = create_collection_from_htmlcol(This, (IUnknown*)HTMLDOC(This), nscoll); + nsIDOMElement_Release(nscoll); + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ecb2f17..d22b22c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2801,6 +2801,17 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + hres = IHTMLDocument2_get_links(doc, NULL); + ok(hres == E_INVALIDARG, "hres %08x\n", hres); + + hres = IHTMLDocument2_get_links(doc, &collection); + ok(hres == S_OK, "get_links failed: %08x\n", hres); + if(hres == S_OK) + { + test_elem_collection((IUnknown*)collection, NULL, 0); + IHTMLElementCollection_Release(collection); + } + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); @@ -3081,7 +3092,7 @@ static void test_elems(IHTMLDocument2 *doc) IDispatch *disp; long type; HRESULT hres; - IHTMLElementCollection *colimages; + IHTMLElementCollection *collection; static const WCHAR imgidW[] = {'i','m','g','i','d',0}; static const WCHAR inW[] = {'i','n',0}; @@ -3130,14 +3141,24 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_col_item(col, xW, item_types, sizeof(item_types)/sizeof(item_types[0])); IHTMLElementCollection_Release(col); - hres = IHTMLDocument2_get_images(doc, &colimages); + hres = IHTMLDocument2_get_images(doc, &collection); ok(hres == S_OK, "get_images failed: %08x\n", hres); if(hres == S_OK) { static const elem_type_t images_types[] = {ET_IMG}; - test_elem_collection((IUnknown*)colimages, images_types, 1); + test_elem_collection((IUnknown*)collection, images_types, 1); + + IHTMLElementCollection_Release(collection); + } - IHTMLElementCollection_Release(colimages); + hres = IHTMLDocument2_get_links(doc, &collection); + ok(hres == S_OK, "get_links failed: %08x\n", hres); + if(hres == S_OK) + { + static const elem_type_t images_types[] = {ET_A}; + test_elem_collection((IUnknown*)collection, images_types, 1); + + IHTMLElementCollection_Release(collection); } elem = get_doc_elem(doc);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get_forms.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: e760812a62d7287769f7cff8ec79a0f3bc68b023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e760812a62d7287769f7cff8e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 23 21:02:49 2008 +1100 mshtml: Implement IHTMLDocument2 get_forms. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 11 +++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 28f6fa8..04ac847 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -434,8 +434,33 @@ static HRESULT WINAPI HTMLDocument_get_links(IHTMLDocument2 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscoll = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetForms(This->nsdoc, &nscoll); + if(NS_FAILED(nsres)) { + ERR("GetForms failed: %08x\n", nsres); + return E_FAIL; + } + + if(nscoll) { + *p = create_collection_from_htmlcol(This, (IUnknown*)HTMLDOC(This), nscoll); + nsIDOMElement_Release(nscoll); + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLElementCollection **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d22b22c..301ad71 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2812,6 +2812,17 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + hres = IHTMLDocument2_get_forms(doc, NULL); + ok(hres == E_INVALIDARG, "hres %08x\n", hres); + + hres = IHTMLDocument2_get_forms(doc, &collection); + ok(hres == S_OK, "get_forms failed: %08x\n", hres); + if(hres == S_OK) + { + test_elem_collection((IUnknown*)collection, NULL, 0); + IHTMLElementCollection_Release(collection); + } + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body);

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLDocument2 get_anchors.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 75b9c0508a49278d573be350b91fc8e624b8c8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b9c0508a49278d573be350b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Nov 23 21:03:55 2008 +1100 mshtml: Implement IHTMLDocument2 get_anchors. --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 04ac847..dc0d87a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -466,8 +466,33 @@ static HRESULT WINAPI HTMLDocument_get_forms(IHTMLDocument2 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument_get_anchors(IHTMLDocument2 *iface, IHTMLElementCollection **p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLCollection *nscoll = NULL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_INVALIDARG; + + *p = NULL; + + if(!This->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsres = nsIDOMHTMLDocument_GetAnchors(This->nsdoc, &nscoll); + if(NS_FAILED(nsres)) { + ERR("GetAnchors failed: %08x\n", nsres); + return E_FAIL; + } + + if(nscoll) { + *p = create_collection_from_htmlcol(This, (IUnknown*)HTMLDOC(This), nscoll); + nsIDOMElement_Release(nscoll); + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 301ad71..78e5c7b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2823,6 +2823,17 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + hres = IHTMLDocument2_get_anchors(doc, NULL); + ok(hres == E_INVALIDARG, "hres %08x\n", hres); + + hres = IHTMLDocument2_get_anchors(doc, &collection); + ok(hres == S_OK, "get_anchors failed: %08x\n", hres); + if(hres == S_OK) + { + test_elem_collection((IUnknown*)collection, NULL, 0); + IHTMLElementCollection_Release(collection); + } + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLBodyElement, (void**)&body); ok(hres == S_OK, "Could not get IHTMBodyElement: %08x\n", hres); test_default_body(body); @@ -3172,6 +3183,16 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(collection); } + hres = IHTMLDocument2_get_anchors(doc, &collection); + ok(hres == S_OK, "get_anchors failed: %08x\n", hres); + if(hres == S_OK) + { + static const elem_type_t anchor_types[] = {ET_A}; + test_elem_collection((IUnknown*)collection, anchor_types, 1); + + IHTMLElementCollection_Release(collection); + } + elem = get_doc_elem(doc); ok(hres == S_OK, "get_documentElement failed: %08x\n", hres); hres = IHTMLElement_get_all(elem, &disp);

1 0

Lei Zhang : comctl32: Process WM_CHAR instead of WM_KEYDOWN for numbers in datetime.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 40bbe3da6ffd68f584b441069197584029a4fd63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bbe3da6ffd68f584b441069… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 25 14:03:36 2008 -0800 comctl32: Process WM_CHAR instead of WM_KEYDOWN for numbers in datetime. --- dlls/comctl32/datetime.c | 165 ++++++++++++++++++++++++--------------------- 1 files changed, 88 insertions(+), 77 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2d44540..e953178 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -902,83 +902,6 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) FIXME ("Callbacks not implemented yet\n"); } - if (vkCode >= '0' && vkCode <= '9') { - /* this is a somewhat simplified version of what Windows does */ - SYSTEMTIME *date = &infoPtr->date; - switch (infoPtr->fieldspec[fieldNum]) { - case ONEDIGITYEAR: - case TWODIGITYEAR: - date->wYear = date->wYear - (date->wYear%100) + - (date->wYear%10)*10 + (vkCode-'0'); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case INVALIDFULLYEAR: - case FULLYEAR: - date->wYear = (date->wYear%1000)*10 + (vkCode-'0'); - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMONTH: - case TWODIGITMONTH: - if ((date->wMonth%10) > 1 || (vkCode-'0') > 2) - date->wMonth = vkCode-'0'; - else - date->wMonth = (date->wMonth%10)*10+vkCode-'0'; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITDAY: - case TWODIGITDAY: - /* probably better checking here would help */ - if ((date->wDay%10) >= 3 && (vkCode-'0') > 1) - date->wDay = vkCode-'0'; - else - date->wDay = (date->wDay%10)*10+vkCode-'0'; - date->wDayOfWeek = DATETIME_CalculateDayOfWeek( - date->wDay,date->wMonth,date->wYear); - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT12HOUR: - case TWODIGIT12HOUR: - if ((date->wHour%10) > 1 || (vkCode-'0') > 2) - date->wHour = vkCode-'0'; - else - date->wHour = (date->wHour%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGIT24HOUR: - case TWODIGIT24HOUR: - if ((date->wHour%10) > 2) - date->wHour = vkCode-'0'; - else if ((date->wHour%10) == 2 && (vkCode-'0') > 3) - date->wHour = vkCode-'0'; - else - date->wHour = (date->wHour%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITMINUTE: - case TWODIGITMINUTE: - if ((date->wMinute%10) > 5) - date->wMinute = vkCode-'0'; - else - date->wMinute = (date->wMinute%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - case ONEDIGITSECOND: - case TWODIGITSECOND: - if ((date->wSecond%10) > 5) - date->wSecond = vkCode-'0'; - else - date->wSecond = (date->wSecond%10)*10+vkCode-'0'; - DATETIME_SendDateTimeChangeNotify (infoPtr); - break; - } - } - switch (vkCode) { case VK_ADD: case VK_UP: @@ -1026,6 +949,91 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) static LRESULT +DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) +{ + int fieldNum = infoPtr->select & DTHT_DATEFIELD; + + if (vkCode >= '0' && vkCode <= '9') { + /* this is a somewhat simplified version of what Windows does */ + SYSTEMTIME *date = &infoPtr->date; + switch (infoPtr->fieldspec[fieldNum]) { + case ONEDIGITYEAR: + case TWODIGITYEAR: + date->wYear = date->wYear - (date->wYear%100) + + (date->wYear%10)*10 + (vkCode-'0'); + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case INVALIDFULLYEAR: + case FULLYEAR: + date->wYear = (date->wYear%1000)*10 + (vkCode-'0'); + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITMONTH: + case TWODIGITMONTH: + if ((date->wMonth%10) > 1 || (vkCode-'0') > 2) + date->wMonth = vkCode-'0'; + else + date->wMonth = (date->wMonth%10)*10+vkCode-'0'; + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITDAY: + case TWODIGITDAY: + /* probably better checking here would help */ + if ((date->wDay%10) >= 3 && (vkCode-'0') > 1) + date->wDay = vkCode-'0'; + else + date->wDay = (date->wDay%10)*10+vkCode-'0'; + date->wDayOfWeek = DATETIME_CalculateDayOfWeek( + date->wDay,date->wMonth,date->wYear); + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGIT12HOUR: + case TWODIGIT12HOUR: + if ((date->wHour%10) > 1 || (vkCode-'0') > 2) + date->wHour = vkCode-'0'; + else + date->wHour = (date->wHour%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGIT24HOUR: + case TWODIGIT24HOUR: + if ((date->wHour%10) > 2) + date->wHour = vkCode-'0'; + else if ((date->wHour%10) == 2 && (vkCode-'0') > 3) + date->wHour = vkCode-'0'; + else + date->wHour = (date->wHour%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITMINUTE: + case TWODIGITMINUTE: + if ((date->wMinute%10) > 5) + date->wMinute = vkCode-'0'; + else + date->wMinute = (date->wMinute%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + case ONEDIGITSECOND: + case TWODIGITSECOND: + if ((date->wSecond%10) > 5) + date->wSecond = vkCode-'0'; + else + date->wSecond = (date->wSecond%10)*10+vkCode-'0'; + DATETIME_SendDateTimeChangeNotify (infoPtr); + break; + } + } + return 0; +} + + +static LRESULT DATETIME_VScroll (DATETIME_INFO *infoPtr, WORD wScroll) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; @@ -1341,6 +1349,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_KEYDOWN: return DATETIME_KeyDown (infoPtr, wParam); + case WM_CHAR: + return DATETIME_Char (infoPtr, wParam, lParam); + case WM_KILLFOCUS: return DATETIME_KillFocus (infoPtr, (HWND)wParam);

1 0

Lei Zhang : comctl32: Do ascii to integer conversion only once.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 113a50a843ee7798a10d2120ce8569fb456336e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113a50a843ee7798a10d2120c… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 25 14:19:19 2008 -0800 comctl32: Do ascii to integer conversion only once. --- dlls/comctl32/datetime.c | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index e953178..de31fa0 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -954,30 +954,32 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) int fieldNum = infoPtr->select & DTHT_DATEFIELD; if (vkCode >= '0' && vkCode <= '9') { + int num = vkCode-'0'; + /* this is a somewhat simplified version of what Windows does */ SYSTEMTIME *date = &infoPtr->date; switch (infoPtr->fieldspec[fieldNum]) { case ONEDIGITYEAR: case TWODIGITYEAR: date->wYear = date->wYear - (date->wYear%100) + - (date->wYear%10)*10 + (vkCode-'0'); + (date->wYear%10)*10 + num; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case INVALIDFULLYEAR: case FULLYEAR: - date->wYear = (date->wYear%1000)*10 + (vkCode-'0'); + date->wYear = (date->wYear%1000)*10 + num; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGITMONTH: case TWODIGITMONTH: - if ((date->wMonth%10) > 1 || (vkCode-'0') > 2) - date->wMonth = vkCode-'0'; + if ((date->wMonth%10) > 1 || num > 2) + date->wMonth = num; else - date->wMonth = (date->wMonth%10)*10+vkCode-'0'; + date->wMonth = (date->wMonth%10)*10+num; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr); @@ -985,46 +987,46 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) case ONEDIGITDAY: case TWODIGITDAY: /* probably better checking here would help */ - if ((date->wDay%10) >= 3 && (vkCode-'0') > 1) - date->wDay = vkCode-'0'; + if ((date->wDay%10) >= 3 && num > 1) + date->wDay = num; else - date->wDay = (date->wDay%10)*10+vkCode-'0'; + date->wDay = (date->wDay%10)*10+num; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGIT12HOUR: case TWODIGIT12HOUR: - if ((date->wHour%10) > 1 || (vkCode-'0') > 2) - date->wHour = vkCode-'0'; + if ((date->wHour%10) > 1 || num > 2) + date->wHour = num; else - date->wHour = (date->wHour%10)*10+vkCode-'0'; + date->wHour = (date->wHour%10)*10+num; DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGIT24HOUR: case TWODIGIT24HOUR: if ((date->wHour%10) > 2) - date->wHour = vkCode-'0'; - else if ((date->wHour%10) == 2 && (vkCode-'0') > 3) - date->wHour = vkCode-'0'; + date->wHour = num; + else if ((date->wHour%10) == 2 && num > 3) + date->wHour = num; else - date->wHour = (date->wHour%10)*10+vkCode-'0'; + date->wHour = (date->wHour%10)*10+num; DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGITMINUTE: case TWODIGITMINUTE: if ((date->wMinute%10) > 5) - date->wMinute = vkCode-'0'; + date->wMinute = num; else - date->wMinute = (date->wMinute%10)*10+vkCode-'0'; + date->wMinute = (date->wMinute%10)*10+num; DATETIME_SendDateTimeChangeNotify (infoPtr); break; case ONEDIGITSECOND: case TWODIGITSECOND: if ((date->wSecond%10) > 5) - date->wSecond = vkCode-'0'; + date->wSecond = num; else - date->wSecond = (date->wSecond%10)*10+vkCode-'0'; + date->wSecond = (date->wSecond%10)*10+num; DATETIME_SendDateTimeChangeNotify (infoPtr); break; }

1 0

Lei Zhang : comctl32: Better day of the month input checking in datetime.
by Alexandre Julliard 26 Nov '08

26 Nov '08

Module: wine Branch: master Commit: 6f64338b9d2a403c8bbd7c084a8ddbd6ff64caae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f64338b9d2a403c8bbd7c084… Author: Lei Zhang <thestig(a)google.com> Date: Tue Nov 25 14:59:29 2008 -0800 comctl32: Better day of the month input checking in datetime. --- dlls/comctl32/datetime.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index de31fa0..34c750a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -955,6 +955,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) if (vkCode >= '0' && vkCode <= '9') { int num = vkCode-'0'; + int newDays; /* this is a somewhat simplified version of what Windows does */ SYSTEMTIME *date = &infoPtr->date; @@ -986,11 +987,11 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData) break; case ONEDIGITDAY: case TWODIGITDAY: - /* probably better checking here would help */ - if ((date->wDay%10) >= 3 && num > 1) + newDays = (date->wDay%10)*10+num; + if (newDays > MONTHCAL_MonthLength(date->wMonth, date->wYear)) date->wDay = num; else - date->wDay = (date->wDay%10)*10+num; + date->wDay = newDays; date->wDayOfWeek = DATETIME_CalculateDayOfWeek( date->wDay,date->wMonth,date->wYear); DATETIME_SendDateTimeChangeNotify (infoPtr);

1 0