April 2011 - Wine-Commits - list.winehq.org

Nikolay Sivov : urlmon: Fix parameter validation in BindToStorage().
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: b26aa09f58d7f015a061e73db0b43ebbf6539fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26aa09f58d7f015a061e73db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 10:57:12 2011 +0400 urlmon: Fix parameter validation in BindToStorage(). --- dlls/urlmon/binding.c | 4 +--- dlls/urlmon/tests/url.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/umon.c | 4 ++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index be72ee1..6f96dc0 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -907,7 +907,7 @@ static Binding *get_bctx_binding(IBindCtx *bctx) if(FAILED(hres)) return NULL; - hres = IUnknown_QueryInterface(unk, &IID_IBinding, (void*)&binding); + hres = IUnknown_QueryInterface(unk, &IID_IBinding, (void**)&binding); IUnknown_Release(unk); if(FAILED(hres)) return NULL; @@ -1539,8 +1539,6 @@ HRESULT bind_to_storage(IUri *uri, IBindCtx *pbc, REFIID riid, void **ppv) Binding *binding = NULL, *binding_ctx; HRESULT hres; - *ppv = NULL; - binding_ctx = get_bctx_binding(pbc); hres = start_binding(NULL, binding_ctx, uri, pbc, FALSE, riid, &binding); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index b606b90..6c1c7c6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -308,7 +308,51 @@ static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) static void test_create(void) { + static const WCHAR relativeW[] = {'a','/','b','.','t','x','t',0}; + IStream *stream; + IMoniker *mon; + IBindCtx *bctx; + HRESULT hr; + test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1); + + mon = (void*)0xdeadbeef; + hr = CreateURLMoniker(NULL, relativeW, &mon); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CreateBindCtx(0, &bctx); + + stream = (void*)0xdeadbeef; + hr = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&stream); + todo_wine ok(hr == INET_E_UNKNOWN_PROTOCOL, "got 0x%08x\n", hr); + ok(stream == NULL, "got %p\n", stream); + + hr = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + stream = (void*)0xdeadbeef; + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IStream, (void**)&stream); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(stream == NULL || broken(stream == (void*)0xdeadbeef) /* starting XP SP3 it's set to null */, + "got %p\n", stream); + + IMoniker_Release(mon); + + mon = (void*)0xdaedbeef; + hr = CreateURLMoniker(NULL, TEST_URL_1, &mon); + ok(hr == S_OK, "got 0x%08x\n", hr); + + stream = (void*)0xdeadbeef; + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IStream, (void**)&stream); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(stream == NULL || broken(stream == (void*)0xdeadbeef) /* starting XP SP3 it's set to null */, + "got %p\n", stream); + + hr = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + IMoniker_Release(mon); + IBindCtx_Release(bctx); } static HRESULT WINAPI Priority_QueryInterface(IInternetPriority *iface, REFIID riid, void **ppv) @@ -3378,9 +3422,11 @@ static void test_BindToStorage_fail(void) hres = pCreateAsyncBindCtxEx(NULL, 0, NULL, NULL, &bctx, 0); ok(hres == S_OK, "CreateAsyncBindCtxEx failed: %08x\n", hres); + unk = (void*)0xdeadbeef; hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); ok(hres == MK_E_SYNTAX || hres == INET_E_DATA_NOT_AVAILABLE, "hres=%08x, expected MK_E_SYNTAX or INET_E_DATA_NOT_AVAILABLE\n", hres); + ok(unk == NULL, "got %p\n", unk); IBindCtx_Release(bctx); diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index b13c9c3..8ef740f 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -237,6 +237,10 @@ static HRESULT WINAPI URLMoniker_BindToStorage(IMoniker* iface, IBindCtx* pbc, TRACE("(%p)->(%p %p %s %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObject); + if(ppvObject) *ppvObject = NULL; + + if(!pbc || !ppvObject) return E_INVALIDARG; + if(pmkToLeft) FIXME("Unsupported pmkToLeft\n");

1 0

Piotr Caban : msvcp90/tests: Added operator+ tests (basic_string<char>).
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 223ac3cc09d1b160098877649feda498f113b28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=223ac3cc09d1b160098877649… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 1 02:01:16 2011 +0200 msvcp90/tests: Added operator+ tests (basic_string<char>). --- dlls/msvcp90/tests/string.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 3147018..4f84264 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -49,6 +49,8 @@ typedef struct _basic_string_wchar } basic_string_wchar; static void* (__cdecl *p_set_invalid_parameter_handler)(void*); +static basic_string_char* (WINAPI *p_basic_string_char_concatenate)(basic_string_char*, const basic_string_char*, const basic_string_char*); +static basic_string_char* (WINAPI *p_basic_string_char_concatenate_cstr)(basic_string_char*, const basic_string_char*, const char*); #ifdef __i386__ static basic_string_char* (WINAPI *p_basic_string_char_ctor)(void); @@ -375,6 +377,10 @@ static BOOL init(void) "?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0AEBV12(a)00@Z"); p_basic_string_char_compare_substr_cstr_len = (void*)GetProcAddress(msvcp, "?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAH_K0PEBD0(a)Z"); + p_basic_string_char_concatenate = (void*)GetProcAddress(msvcp, + "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@0(a)Z"); + p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, + "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)AEBV10@PEBD(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAA(a)XZ"); @@ -429,6 +435,10 @@ static BOOL init(void) "?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIABV12(a)II@Z"); p_basic_string_char_compare_substr_cstr_len = (void*)GetProcAddress(msvcp, "?compare@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEHIIPBDI(a)Z"); + p_basic_string_char_concatenate = (void*)GetProcAddress(msvcp, + "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@0(a)Z"); + p_basic_string_char_concatenate_cstr = (void*)GetProcAddress(msvcp, + "??$?HDU?$char_traits(a)D@std@@V?$allocator(a)D@1@@std@@YA?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@0(a)ABV10@PBD(a)Z"); p_basic_string_wchar_ctor = (void*)GetProcAddress(msvcp, "??0?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAE(a)XZ"); @@ -644,6 +654,34 @@ static void test_basic_string_char_compare(void) { call_func1(p_basic_string_char_dtor, &str2); } +static void test_basic_string_char_concatenate(void) { + basic_string_char str, ret; + const char *cstr; + + if(!p_basic_string_char_ctor_cstr || !p_basic_string_char_concatenate + || !p_basic_string_char_concatenate_cstr || !p_basic_string_char_cstr + || !p_basic_string_char_dtor) { + win_skip("basic_string<wchar> unavailable\n"); + return; + } + + call_func2(p_basic_string_char_ctor_cstr, &str, "test "); + /* CDECL calling convention with return bigger than 8 bytes */ + p_basic_string_char_concatenate(&ret, &str, &str); + cstr = call_func1(p_basic_string_char_cstr, &ret); + ok(cstr != NULL, "cstr = NULL\n"); + ok(!strcmp(cstr, "test test "), "cstr = %s\n", cstr); + call_func1(p_basic_string_char_dtor, &ret); + + p_basic_string_char_concatenate_cstr(&ret, &str, "passed"); + cstr = call_func1(p_basic_string_char_cstr, &ret); + ok(cstr != NULL, "cstr = NULL\n"); + ok(!strcmp(cstr, "test passed"), "cstr = %s\n", cstr); + call_func1(p_basic_string_char_dtor, &ret); + + call_func1(p_basic_string_char_dtor, &str); +} + static void test_basic_string_wchar(void) { static const wchar_t test[] = { 't','e','s','t',0 }; @@ -768,6 +806,7 @@ START_TEST(string) test_basic_string_char_swap(); test_basic_string_char_append(); test_basic_string_char_compare(); + test_basic_string_char_concatenate(); test_basic_string_wchar(); test_basic_string_wchar_swap();

1 0

Piotr Caban : msvcp: Added basic_string<wchar> operator+ implementations.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: bc86fccc365d1d5dfee15f575398c12ffcf17987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc86fccc365d1d5dfee15f575… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 1 02:00:38 2011 +0200 msvcp: Added basic_string<wchar> operator+ implementations. --- dlls/msvcp80/msvcp80.spec | 20 +++++----- dlls/msvcp90/msvcp90.spec | 20 +++++----- dlls/msvcp90/string.c | 83 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc86fccc365d1d5dfee15…

1 0

Piotr Caban : msvcp: Added basic_string<char> operator+ implementations.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 055dcbc4b2235d29038dcb1499757b2ebb1e6bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=055dcbc4b2235d29038dcb149… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 1 02:00:24 2011 +0200 msvcp: Added basic_string<char> operator+ implementations. --- dlls/msvcp80/msvcp80.spec | 20 +++++----- dlls/msvcp90/msvcp90.spec | 20 +++++----- dlls/msvcp90/string.c | 81 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 98 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=055dcbc4b2235d29038dc…

1 0

Nikolay Sivov : urlmon/tests: Test for return value directly, without macros.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 69b5fc4e198c6fc3c8c4c52fcebca5b03dc43104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b5fc4e198c6fc3c8c4c52fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 1 11:07:31 2011 +0400 urlmon/tests: Test for return value directly, without macros. --- dlls/urlmon/tests/url.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6c1c7c6..f236fa1 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -297,10 +297,10 @@ static void test_CreateURLMoniker(LPCWSTR url1, LPCWSTR url2) if(mon1) IMoniker_Release(mon1); hr = CreateURLMoniker(NULL, url1, &mon1); - ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr); - if(SUCCEEDED(hr)) { + ok(hr == S_OK, "failed to create moniker: 0x%08x\n", hr); + if(hr == S_OK) { hr = CreateURLMoniker(mon1, url2, &mon2); - ok(SUCCEEDED(hr), "failed to create moniker: 0x%08x\n", hr); + ok(hr == S_OK, "failed to create moniker: 0x%08x\n", hr); } if(mon1) IMoniker_Release(mon1); if(mon2) IMoniker_Release(mon2); @@ -2277,7 +2277,7 @@ static void test_CreateAsyncBindCtx(void) bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); + ok(hres == S_OK, "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), @@ -2318,7 +2318,7 @@ static void test_CreateAsyncBindCtxEx(void) if(SUCCEEDED(hres)) { bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); + ok(hres == S_OK, "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), @@ -2337,7 +2337,7 @@ static void test_CreateAsyncBindCtxEx(void) if(SUCCEEDED(hres)) { bindopts.cbStruct = sizeof(bindopts); hres = IBindCtx_GetBindOptions(bctx, &bindopts); - ok(SUCCEEDED(hres), "IBindCtx_GetBindOptions failed: %08x\n", hres); + ok(hres == S_OK, "IBindCtx_GetBindOptions failed: %08x\n", hres); ok(bindopts.grfFlags == BIND_MAYBOTHERUSER, "bindopts.grfFlags = %08x, expected: BIND_MAYBOTHERUSER\n", bindopts.grfFlags); ok(bindopts.grfMode == (STGM_READWRITE | STGM_SHARE_EXCLUSIVE), @@ -3024,13 +3024,13 @@ static void test_BindToObject(int protocol, DWORD flags) SET_EXPECT(QueryInterface_IServiceProvider); hres = CreateAsyncBindCtx(0, (IBindStatusCallback*)&objbsc, NULL, &bctx); - ok(SUCCEEDED(hres), "CreateAsyncBindCtx failed: %08x\n\n", hres); + ok(hres == S_OK, "CreateAsyncBindCtx failed: %08x\n\n", hres); CHECK_CALLED(QueryInterface_IServiceProvider); if(FAILED(hres)) return; hres = CreateURLMoniker(NULL, test_protocol == FILE_TEST ? file_url : urls[test_protocol], &mon); - ok(SUCCEEDED(hres), "failed to create moniker: %08x\n", hres); + ok(hres == S_OK, "failed to create moniker: %08x\n", hres); if(FAILED(hres)) { IBindCtx_Release(bctx); return;

1 0

Gerald Pfeifer : comctl32: Simplify MONTHCAL_PaintLeadTrailMonths.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 1e74b6379c11719ee1b31504db888573ee7d17ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e74b6379c11719ee1b31504d… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Mar 31 20:21:25 2011 +0200 comctl32: Simplify MONTHCAL_PaintLeadTrailMonths. --- dlls/comctl32/monthcal.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 58afc97..bae19f8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -937,15 +937,13 @@ 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; + INT 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);

1 0

Vincent Povirk : comctl32: Validate the day of month when scrolling through years.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: ae608e6ec3c940e09fb709847454c3df501defde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae608e6ec3c940e09fb709847… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 31 14:41:00 2011 -0500 comctl32: Validate the day of month when scrolling through years. --- dlls/comctl32/datetime.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index fd97fdd..abfef58 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -474,6 +474,9 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta) case TWODIGITYEAR: case FULLYEAR: date->wYear = wrap(date->wYear, delta, 1752, 9999); + 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); MONTHCAL_CalculateDayOfWeek(date, TRUE); break; case ONEDIGITMONTH:

1 0

Gerald Pfeifer : dbghelp: Add a return statement for the default/ assert case in elf_map_file.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: d93b6c0aa2b90f85fb2fd21417bdf60bab9ec7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93b6c0aa2b90f85fb2fd2141… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Mar 31 20:21:17 2011 +0200 dbghelp: Add a return statement for the default/assert case in elf_map_file. --- dlls/dbghelp/elf_module.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 4ea27f6..8d06065 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -294,6 +294,7 @@ static BOOL elf_map_file(struct elf_map_file_data* emfd, struct image_file_map* filename = NULL; break; default: assert(0); + return FALSE; } elf_reset_file_map(fmap);

1 0

Vincent Povirk : gdiplus: Add basic implementation of GdipDrawDriverString.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 15140a722e2b4c82452e2045e96a5b82e31f4049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15140a722e2b4c82452e2045e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 31 17:39:30 2011 -0500 gdiplus: Add basic implementation of GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 85 ++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 163aaac..4fdfa9c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5587,6 +5587,68 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT return NotImplemented; } +static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, + GDIPCONST GpMatrix *matrix ) +{ + static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance); + INT save_state; + GpPointF pt[4]; + REAL angle, rel_width, rel_height; + LOGFONTW lfw; + HFONT unscaled_font, hfont; + TEXTMETRICW textmet; + + if (flags & unsupported_flags) + FIXME("Ignoring flags %x\n", flags & unsupported_flags); + + if (matrix) + FIXME("Ignoring matrix\n"); + + save_state = SaveDC(graphics->hdc); + SetBkMode(graphics->hdc, TRANSPARENT); + SetTextColor(graphics->hdc, brush->lb.lbColor); + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + pt[3] = positions[0]; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 4); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + unscaled_font = CreateFontIndirectW(&font->lfw); + + SelectObject(graphics->hdc, unscaled_font); + GetTextMetricsW(graphics->hdc, &textmet); + + lfw = font->lfw; + lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); + lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); + lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); + + hfont = CreateFontIndirectW(&lfw); + SelectObject(graphics->hdc, hfont); + DeleteObject(unscaled_font); + + SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); + + ExtTextOutW(graphics->hdc, roundr(pt[3].X), roundr(pt[3].Y), ETO_GLYPH_INDEX, NULL, text, length, NULL); + + RestoreDC(graphics->hdc, save_state); + + DeleteObject(hfont); + + return Ok; +} + /***************************************************************************** * GdipDrawDriverString [GDIPLUS.@] */ @@ -5595,8 +5657,27 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix ) { - FIXME("(%p %p %d %p %p %p %d %p): stub\n", graphics, text, length, font, brush, positions, flags, matrix); - return NotImplemented; + GpStatus stat=NotImplemented; + + TRACE("(%p %s %p %p %p %d %p)\n", graphics, debugstr_wn(text, length), font, brush, positions, flags, matrix); + + if (!graphics || !text || !font || !brush || !positions) + return InvalidParameter; + + if (length == -1) + length = strlenW(text); + + if (graphics->hdc && + ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && + brush->bt == BrushTypeSolidColor && + (((GpSolidFill*)brush)->color & 0xff000000) == 0xff000000) + stat = GDI32_GdipDrawDriverString(graphics, text, length, font, brush, + positions, flags, matrix); + + if (stat == NotImplemented) + FIXME("Not fully implemented\n"); + + return stat; } GpStatus WINGDIPAPI GdipRecordMetafile(HDC hdc, EmfType type, GDIPCONST GpRectF *frameRect, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 3adf6c6..9f5449a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1990,7 +1990,6 @@ static void test_GdipDrawString(void) status = GdipCreateMatrix(&matrix); expect(Ok, status); -todo_wine { status = GdipDrawDriverString(NULL, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); expect(InvalidParameter, status); @@ -2006,6 +2005,7 @@ todo_wine { status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix); expect(InvalidParameter, status); +todo_wine { status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix); expect(Ok, status);

1 0

Vincent Povirk : comctl32: When entering a month or year, keep the day in range.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 0d8775c9f990766f915d45065796d8fdd2866ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8775c9f990766f915d45065… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 31 14:04:15 2011 -0500 comctl32: When entering a month or year, keep the day in range. --- dlls/comctl32/datetime.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index bc643eb..fd97fdd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -770,7 +770,7 @@ static void DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) { int fieldNum = infoPtr->select & DTHT_DATEFIELD; - int i, val=0; + int i, val=0, clamp_day=0; SYSTEMTIME date = infoPtr->date; if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0) @@ -785,14 +785,17 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) case ONEDIGITYEAR: case TWODIGITYEAR: date.wYear = date.wYear - (date.wYear%100) + val; + clamp_day = 1; break; case INVALIDFULLYEAR: case FULLYEAR: date.wYear = val; + clamp_day = 1; break; case ONEDIGITMONTH: case TWODIGITMONTH: date.wMonth = val; + clamp_day = 1; break; case ONEDIGITDAY: case TWODIGITDAY: @@ -815,6 +818,9 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr) break; } + if (clamp_day && date.wDay > MONTHCAL_MonthLength(date.wMonth, date.wYear)) + date.wDay = MONTHCAL_MonthLength(date.wMonth, date.wYear); + if (DATETIME_SetSystemTime(infoPtr, GDT_VALID, &date)) DATETIME_SendDateTimeChangeNotify (infoPtr); }

1 0