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

Piotr Caban : msxml3: Added internal function for loading xml from IMoniker .
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 2cbd6a63dfb39052cd454ed3d67483885390ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbd6a63dfb39052cd454ed3d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 12 10:56:59 2012 +0100 msxml3: Added internal function for loading xml from IMoniker. --- dlls/msxml3/bsc.c | 32 +++++++++++++++++--------------- dlls/msxml3/domdoc.c | 14 +++++++++++--- dlls/msxml3/msxml_private.h | 4 +++- dlls/msxml3/saxreader.c | 10 ++++++++-- 4 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index a0b9022..580d509 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -242,12 +242,9 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), void *obj, bsc_t **ret) +HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) { WCHAR fileUrl[INTERNET_MAX_URL_LENGTH]; - bsc_t *bsc; - IBindCtx *pbc; - HRESULT hr; TRACE("%s\n", debugstr_w(url)); @@ -270,6 +267,18 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi url = fileUrl; } + return CreateURLMonikerEx(NULL, url, mon, 0); +} + +HRESULT bind_url(IMoniker *mon, HRESULT (*onDataAvailable)(void*,char*,DWORD), + void *obj, bsc_t **ret) +{ + bsc_t *bsc; + IBindCtx *pbc; + HRESULT hr; + + TRACE("%p\n", mon); + hr = CreateBindCtx(0, &pbc); if(FAILED(hr)) return hr; @@ -287,17 +296,10 @@ HRESULT bind_url(LPCWSTR url, HRESULT (*onDataAvailable)(void*,char*,DWORD), voi hr = RegisterBindStatusCallback(pbc, &bsc->IBindStatusCallback_iface, NULL, 0); if(SUCCEEDED(hr)) { - IMoniker *moniker; - - hr = CreateURLMoniker(NULL, url, &moniker); - if(SUCCEEDED(hr)) - { - IStream *stream; - hr = IMoniker_BindToStorage(moniker, pbc, NULL, &IID_IStream, (LPVOID*)&stream); - IMoniker_Release(moniker); - if(stream) - IStream_Release(stream); - } + IStream *stream; + hr = IMoniker_BindToStorage(mon, pbc, NULL, &IID_IStream, (LPVOID*)&stream); + if(stream) + IStream_Release(stream); IBindCtx_Release(pbc); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 64122ce..22a4191 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1996,12 +1996,13 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) return S_OK; } -static HRESULT doread( domdoc *This, LPWSTR filename ) +HRESULT domdoc_load_moniker(IXMLDOMDocument3 *iface, IMoniker *mon) { + domdoc *This = impl_from_IXMLDOMDocument3(iface); bsc_t *bsc; HRESULT hr; - hr = bind_url(filename, domdoc_onDataAvailable, This, &bsc); + hr = bind_url(mon, domdoc_onDataAvailable, This, &bsc); if(FAILED(hr)) return hr; @@ -2145,7 +2146,14 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { - hr = doread( This, filename ); + IMoniker *mon; + + hr = create_moniker_from_url( filename, &mon); + if ( SUCCEEDED(hr) ) + { + hr = domdoc_load_moniker( iface, mon ); + IMoniker_Release(mon); + } if ( FAILED(hr) ) This->error = E_FAIL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2e647d0..0bb243f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -487,8 +487,10 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; -HRESULT bind_url(LPCWSTR, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; +HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; +HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; +HRESULT domdoc_load_moniker(IXMLDOMDocument3*, IMoniker*) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b1508ca..0a2f346 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2423,13 +2423,19 @@ static HRESULT internal_parseURL( const WCHAR *url, BOOL vbInterface) { + IMoniker *mon; bsc_t *bsc; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_w(url)); - if(vbInterface) hr = bind_url(url, internal_vbonDataAvailable, This, &bsc); - else hr = bind_url(url, internal_onDataAvailable, This, &bsc); + hr = create_moniker_from_url(url, &mon); + if(FAILED(hr)) + return hr; + + if(vbInterface) hr = bind_url(mon, internal_vbonDataAvailable, This, &bsc); + else hr = bind_url(mon, internal_onDataAvailable, This, &bsc); + IMoniker_Release(mon); if(FAILED(hr)) return hr;

1 0

Owen Rudge : comctl32/tests: Add test for DTM_SETSYSTEMTIME outside range limit.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 300140e2cb51aae30849425f5ea3317aad06a1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300140e2cb51aae30849425f5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:08 2012 +0000 comctl32/tests: Add test for DTM_SETSYSTEMTIME outside range limit. --- dlls/comctl32/tests/datetime.c | 62 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 171da5c..8fb7d1f 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -121,6 +121,18 @@ static const struct message test_dtm_set_and_get_system_time_seq[] = { { 0 } }; +static const struct message test_dtm_set_and_get_systime_with_limits[] = { + { DTM_SETRANGE, sent|wparam, GDTR_MIN | GDTR_MAX }, + { DTM_GETRANGE, sent|wparam, 0 }, + { DTM_SETSYSTEMTIME, sent|wparam, 0 }, + { DTM_GETSYSTEMTIME, sent|wparam, 0 }, + { DTM_SETSYSTEMTIME, sent|wparam, 0 }, + { DTM_GETSYSTEMTIME, sent|wparam, 0 }, + { DTM_SETSYSTEMTIME, sent|wparam, 0 }, + { DTM_GETSYSTEMTIME, sent|wparam, 0 }, + { 0 } +}; + static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); @@ -660,6 +672,55 @@ static void test_dtm_set_and_get_system_time(void) expect(4, (LRESULT)getSt.wDayOfWeek); st.wDayOfWeek = 4; expect_systime(&st, &getSt); +} + +static void test_dtm_set_and_get_systemtime_with_limits(void) +{ + LRESULT r; + SYSTEMTIME st[2], getSt[2], refSt; + HWND hWnd; + + hWnd = create_datetime_control(DTS_SHOWNONE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* set range */ + fill_systime_struct(&st[0], 1980, 1, 3, 23, 14, 34, 37, 465); + fill_systime_struct(&st[1], 2007, 3, 2, 31, 23, 59, 59, 999); + + r = SendMessage(hWnd, DTM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st); + expect(1, r); + r = SendMessage(hWnd, DTM_GETRANGE, 0, (LPARAM)getSt); + ok(r == (GDTR_MIN | GDTR_MAX), "Expected %x, not %x(GDTR_MIN) or %x(GDTR_MAX), got %lx\n", (GDTR_MIN | GDTR_MAX), GDTR_MIN, GDTR_MAX, r); + expect_systime(&st[0], &getSt[0]); + expect_systime(&st[1], &getSt[1]); + + /* Initially set a valid time */ + fill_systime_struct(&refSt, 1999, 9, 4, 9, 19, 9, 9, 999); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&refSt); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt[0]); + ok(r == GDT_VALID, "Expected %d, not %d(GDT_NONE) or %d(GDT_ERROR), got %ld\n", GDT_VALID, GDT_NONE, GDT_ERROR, r); + expect_systime(&refSt, &getSt[0]); + + /* Now set an out-of-bounds time */ + fill_systime_struct(&st[0], 2010, 1, 0, 1, 0, 0, 0, 0); + + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st[0]); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt[0]); + ok(r == GDT_VALID, "Expected %d, not %d(GDT_NONE) or %d(GDT_ERROR), got %ld\n", GDT_VALID, GDT_NONE, GDT_ERROR, r); + todo_wine expect_systime(&refSt, &getSt[0]); + + fill_systime_struct(&st[0], 1977, 1, 0, 1, 0, 0, 0, 0); + + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st[0]); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt[0]); + ok(r == GDT_VALID, "Expected %d, not %d(GDT_NONE) or %d(GDT_ERROR), got %ld\n", GDT_VALID, GDT_NONE, GDT_ERROR, r); + todo_wine expect_systime(&refSt, &getSt[0]); + + ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_systime_with_limits, "test_dtm_set_and_get_systime_with_limits", FALSE); DestroyWindow(hWnd); } @@ -749,6 +810,7 @@ START_TEST(datetime) test_dtm_set_and_get_range(); test_dtm_set_range_swap_min_max(); test_dtm_set_and_get_system_time(); + test_dtm_set_and_get_systemtime_with_limits(); test_wm_set_get_text(); test_dts_shownone(); }

1 0

Owen Rudge : comctl32/datetime: Check dates are within range in SetSystemTime.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: c8c3c4be914481d95a9c2790716b9d973e697b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c3c4be914481d95a9c27907… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:13 2012 +0000 comctl32/datetime: Check dates are within range in SetSystemTime. --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/datetime.c | 46 +++++++++++++++++++++++++++++++++++++++- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/datetime.c | 4 +- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 7355e82..129ab0c 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -231,6 +231,7 @@ extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; +LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 785769a..1443c35 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -138,6 +138,9 @@ static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', 0}; static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; +/* valid date limits */ +static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; +static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; static DWORD DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *systime) @@ -153,6 +156,43 @@ DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *systime) return GDT_VALID; } +/* Checks value is within configured date range + * + * PARAMETERS + * + * [I] infoPtr : valid pointer to control data + * [I] date : pointer to valid date data to check + * + * RETURN VALUE + * + * TRUE - date within configured range + * FALSE - date is outside configured range + */ +static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYSTEMTIME *date) +{ + SYSTEMTIME range[2]; + DWORD limits; + + if ((MONTHCAL_CompareSystemTime(date, &max_allowed_date) == 1) || + (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) + return FALSE; + + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + + if (limits & GDTR_MAX) + { + if (MONTHCAL_CompareSystemTime(date, &range[1]) == 1) + return FALSE; + } + + if (limits & GDTR_MIN) + { + if (MONTHCAL_CompareSystemTime(date, &range[0]) == -1) + return FALSE; + } + + return TRUE; +} static BOOL DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *systime) @@ -164,7 +204,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy systime->wHour, systime->wMinute, systime->wSecond); if (flag == GDT_VALID) { - if (systime->wYear < 1601 || systime->wYear > 30827 || + if (systime->wYear == 0 || systime->wMonth < 1 || systime->wMonth > 12 || systime->wDay < 1 || systime->wDay > MONTHCAL_MonthLength(systime->wMonth, systime->wYear) || @@ -175,6 +215,10 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy ) return FALSE; + /* Windows returns true if the date is valid but outside the limits set */ + if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE) + return TRUE; + infoPtr->dateValid = TRUE; infoPtr->date = *systime; /* always store a valid day of week */ diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1c9572b..a7722ee 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -296,7 +296,7 @@ static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) * * Note that no date validation performed, already validated values expected. */ -static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) +LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) { FILETIME ft_first, ft_second; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8fb7d1f..24d339f 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -710,7 +710,7 @@ static void test_dtm_set_and_get_systemtime_with_limits(void) expect(1, r); r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt[0]); ok(r == GDT_VALID, "Expected %d, not %d(GDT_NONE) or %d(GDT_ERROR), got %ld\n", GDT_VALID, GDT_NONE, GDT_ERROR, r); - todo_wine expect_systime(&refSt, &getSt[0]); + expect_systime(&refSt, &getSt[0]); fill_systime_struct(&st[0], 1977, 1, 0, 1, 0, 0, 0, 0); @@ -718,7 +718,7 @@ static void test_dtm_set_and_get_systemtime_with_limits(void) expect(1, r); r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt[0]); ok(r == GDT_VALID, "Expected %d, not %d(GDT_NONE) or %d(GDT_ERROR), got %ld\n", GDT_VALID, GDT_NONE, GDT_ERROR, r); - todo_wine expect_systime(&refSt, &getSt[0]); + expect_systime(&refSt, &getSt[0]); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_systime_with_limits, "test_dtm_set_and_get_systime_with_limits", FALSE);

1 0

Owen Rudge : comctl32/datetime: Ensure up/down/home/ end increments remain within bounds.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 3f93230812f5db519d5aa11af039ff2b3b289a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f93230812f5db519d5aa11af… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:19 2012 +0000 comctl32/datetime: Ensure up/down/home/end increments remain within bounds. --- dlls/comctl32/datetime.c | 33 +++++++++++++++++++++++++++++++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 1443c35..3ad9204 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -506,6 +506,9 @@ static void DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) { SYSTEMTIME *date = &infoPtr->date; + SYSTEMTIME range[2]; + DWORD limits; + BOOL min; TRACE ("%d\n", number); if ((number > infoPtr->nrFields) || (number < 0)) return; @@ -516,7 +519,13 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) case ONEDIGITYEAR: case TWODIGITYEAR: case FULLYEAR: - date->wYear = wrap(date->wYear, delta, 1752, 9999); + if (delta == INT_MIN) + date->wYear = 1752; + else if (delta == INT_MAX) + date->wYear = 9999; + else + date->wYear = max(min(date->wYear + delta, 9999), 1752); + if (date->wDay > MONTHCAL_MonthLength(date->wMonth, date->wYear)) /* This can happen when moving away from a leap year. */ date->wDay = MONTHCAL_MonthLength(date->wMonth, date->wYear); @@ -573,8 +582,28 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) date->wMinute = 0; date->wHour = 0; } -} + /* Ensure time is within bounds */ + limits = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, 0, (LPARAM) &range); + min = ((delta < 0) ? TRUE : FALSE); + + if (limits & (min ? GDTR_MIN : GDTR_MAX)) + { + int i = (min ? 0 : 1); + + if (MONTHCAL_CompareSystemTime(date, &range[i]) == (min ? -1 : 1)) + { + date->wYear = range[i].wYear; + date->wMonth = range[i].wMonth; + date->wDayOfWeek = range[i].wDayOfWeek; + date->wDay = range[i].wDay; + date->wHour = range[i].wHour; + date->wMinute = range[i].wMinute; + date->wSecond = range[i].wSecond; + date->wMilliseconds = range[i].wMilliseconds; + } + } +} static void DATETIME_ReturnFieldWidth (const DATETIME_INFO *infoPtr, HDC hdc, int count, SHORT *width)

1 0

Owen Rudge : comctl32/datetime: Don't allow an invalid year to be typed in.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 9de240bd0ea38c1c23803c01c425cc0c57fe5cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de240bd0ea38c1c23803c01c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:23 2012 +0000 comctl32/datetime: Don't allow an invalid year to be typed in. --- dlls/comctl32/datetime.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 3ad9204..d67e6e3 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -847,6 +847,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) int fieldNum = infoPtr->select & DTHT_DATEFIELD; int i, val=0, clamp_day=0; SYSTEMTIME date = infoPtr->date; + int oldyear; if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) return; @@ -859,13 +860,25 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) switch (infoPtr->fieldspec[fieldNum]) { case ONEDIGITYEAR: case TWODIGITYEAR: + oldyear = date.wYear; date.wYear = date.wYear - (date.wYear%100) + val; - clamp_day = 1; + + if (DATETIME_IsDateInValidRange(infoPtr, &date)) + clamp_day = 1; + else + date.wYear = oldyear; + break; case INVALIDFULLYEAR: case FULLYEAR: + oldyear = date.wYear; date.wYear = val; - clamp_day = 1; + + if (DATETIME_IsDateInValidRange(infoPtr, &date)) + clamp_day = 1; + else + date.wYear = oldyear; + break; case ONEDIGITMONTH: case TWODIGITMONTH:

1 0

Owen Rudge : comctl32/datetime: Don't check box if no valid date set.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 9147e7fd2246da9ec8e698f00458d429e90ab573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9147e7fd2246da9ec8e698f00… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:28 2012 +0000 comctl32/datetime: Don't check box if no valid date set. --- dlls/comctl32/datetime.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d67e6e3..f29b2d2 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1402,7 +1402,7 @@ DATETIME_StyleChanged(DATETIME_INFO *infoPtr, WPARAM wStyleType, const STYLESTRU infoPtr->hwndCheckbut = CreateWindowExW (0, WC_BUTTONW, 0, WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 2, 2, 13, 13, infoPtr->hwndSelf, 0, (HINSTANCE)GetWindowLongPtrW (infoPtr->hwndSelf, GWLP_HINSTANCE), 0); - SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0); + SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, infoPtr->dateValid ? 1 : 0, 0); } if ( (lpss->styleOld & DTS_SHOWNONE) && !(lpss->styleNew & DTS_SHOWNONE) ) { DestroyWindow(infoPtr->hwndCheckbut);

1 0

Owen Rudge : comctl32/datetime: Allow entering 'AM' or 'PM' via keyboard.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 74d1c11684b91cb88c663b016f423876ab8c028f URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d1c11684b91cb88c663b016… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:33 2012 +0000 comctl32/datetime: Allow entering 'AM' or 'PM' via keyboard. --- dlls/comctl32/datetime.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f29b2d2..f65691e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -852,8 +852,13 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) return; - for (i=0; i<infoPtr->nCharsEntered; i++) - val = val * 10 + infoPtr->charsEntered[i] - '0'; + if ((infoPtr->fieldspec[fieldNum] == ONELETTERAMPM) || + (infoPtr->fieldspec[fieldNum] == TWOLETTERAMPM)) + val = infoPtr->charsEntered[0]; + else { + for (i=0; i<infoPtr->nCharsEntered; i++) + val = val * 10 + infoPtr->charsEntered[i] - '0'; + } infoPtr->nCharsEntered = 0; @@ -904,6 +909,16 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) case TWODIGITSECOND: date.wSecond = val; break; + case ONELETTERAMPM: + case TWOLETTERAMPM: + if (val == 'a' || val == 'A') { + if (date.wHour >= 12) + date.wHour -= 12; + } else if (val == 'p' || val == 'P') { + if (date.wHour < 12) + date.wHour += 12; + } + break; } if (clamp_day && date.wDay > MONTHCAL_MonthLength(date.wMonth, date.wYear)) @@ -1197,16 +1212,21 @@ DATETIME_KeyDown (DATETIME_INFO *infoPtr, DWORD vkCode) static LRESULT DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) { - int fieldNum = infoPtr->select & DTHT_DATEFIELD; + int fieldNum, fieldSpec; - if (vkCode >= '0' && vkCode <= '9') { + fieldNum = infoPtr->select & DTHT_DATEFIELD; + fieldSpec = infoPtr->fieldspec[fieldNum]; + + if (fieldSpec == ONELETTERAMPM || fieldSpec == TWOLETTERAMPM) { + infoPtr->charsEntered[0] = vkCode; + infoPtr->nCharsEntered = 1; + + DATETIME_ApplySelectedField(infoPtr); + } else if (vkCode >= '0' && vkCode <= '9') { int maxChars; - int fieldSpec; infoPtr->charsEntered[infoPtr->nCharsEntered++] = vkCode; - fieldSpec = infoPtr->fieldspec[fieldNum]; - if (fieldSpec == INVALIDFULLYEAR || fieldSpec == FULLYEAR) maxChars = 4; else @@ -1215,6 +1235,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) if (maxChars == infoPtr->nCharsEntered) DATETIME_ApplySelectedField(infoPtr); } + return 0; }

1 0

Owen Rudge : comctl32/datetime: Fix AM/PM handling with 12-hour fields.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: ffbdd27268f1b5c4bb1d57f1014f1512e4fc6cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbdd27268f1b5c4bb1d57f10… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Mar 8 11:34:38 2012 +0000 comctl32/datetime: Fix AM/PM handling with 12-hour fields. --- dlls/comctl32/datetime.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f65691e..bfd5d5e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -4,6 +4,7 @@ * Copyright 1998, 1999 Eric Kohl * Copyright 1999, 2000 Alex Priem <alexp(a)sci.kun.nl> * Copyright 2000 Chris Morgan <cmorgan(a)wpi.edu> + * Copyright 2012 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -896,9 +897,20 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) break; case ONEDIGIT12HOUR: case TWODIGIT12HOUR: + if (val >= 24) + val -= 20; + + if (val >= 13) + date.wHour = val; + else if (val != 0) { + if (date.wHour >= 12) /* preserve current AM/PM state */ + date.wHour = (val == 12 ? 12 : val + 12); + else + date.wHour = (val == 12 ? 0 : val); + } + break; case ONEDIGIT24HOUR: case TWODIGIT24HOUR: - /* FIXME: Preserve AM/PM for 12HOUR? */ date.wHour = val; break; case ONEDIGITMINUTE: @@ -1232,6 +1244,16 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode) else maxChars = 2; + if ((fieldSpec == ONEDIGIT12HOUR || + fieldSpec == TWODIGIT12HOUR || + fieldSpec == ONEDIGIT24HOUR || + fieldSpec == TWODIGIT24HOUR) && + (infoPtr->nCharsEntered == 1)) + { + if (vkCode >= '3') + maxChars = 1; + } + if (maxChars == infoPtr->nCharsEntered) DATETIME_ApplySelectedField(infoPtr); }

1 0

André Hentschel : kernel32: Forward RtlPcToFileHeader to ntdll also on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: e303fd5ebe8435e3a586ac07b53991ef1b3e1bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e303fd5ebe8435e3a586ac07b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:10:52 2012 +0100 kernel32: Forward RtlPcToFileHeader to ntdll also on ARM. --- dlls/kernel32/kernel32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index fb3f9c2..1c794c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1023,7 +1023,7 @@ @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory -@ stdcall -arch=x86_64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0

André Hentschel : kernel32: Forward RtlRaiseException to ntdll on ARM.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 58a50926eb6bca500d8022284b91dcb841117f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a50926eb6bca500d8022284… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:11:40 2012 +0100 kernel32: Forward RtlRaiseException to ntdll on ARM. --- dlls/kernel32/kernel32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1c794c9..e6baa38 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1024,6 +1024,7 @@ @ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader +@ stdcall -arch=arm -register RtlRaiseException(ptr) ntdll.RtlRaiseException @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind @ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr) ntdll.RtlUnwindEx @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind

1 0