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

Vincent Povirk : gdiplus: Apply page scale to pen thickness.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 6ee26aca16cdfdfa175108d28b49aca6aba7e1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee26aca16cdfdfa175108d28… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 15:05:25 2015 -0500 gdiplus: Apply page scale to pen thickness. --- dlls/gdiplus/graphics.c | 1 + dlls/gdiplus/tests/graphics.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7485a3c..34022cb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -251,6 +251,7 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres); + width *= graphics->scale; } if(pen->dash == DashStyleCustom){ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f237090..3ee3363 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3813,6 +3813,128 @@ static void test_transform(void) } } +static void test_pen_thickness(void) +{ + static const struct test_data + { + REAL res_x, res_y, scale; + GpUnit pen_unit, page_unit; + REAL pen_width; + INT cx, cy; + } td[] = + { + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2 }, + { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6 }, + { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20 }, + }; + GpStatus status; + int i, j; + GpGraphics *graphics; + union + { + GpBitmap *bitmap; + GpImage *image; + } u; + GpPen *pen; + GpPointF corner; + BitmapData bd; + INT min, max, size; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat24bppRGB, NULL, &u.bitmap); + expect(Ok, status); + + status = GdipBitmapSetResolution(u.bitmap, td[i].res_x, td[i].res_y); + expect(Ok, status); + + status = GdipGetImageGraphicsContext(u.image, &graphics); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, td[i].page_unit); + expect(Ok, status); + + status = GdipSetPageScale(graphics, td[i].scale); + expect(Ok, status); + + status = GdipCreatePen1(0xffffffff, td[i].pen_width, td[i].pen_unit, &pen); + expect(Ok, status); + + corner.X = corner.Y = 100.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &corner, 1); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, corner.X/2, 0, corner.X/2, corner.Y); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, 0, corner.Y/2, corner.X, corner.Y/2); + expect(Ok, status); + + status = GdipBitmapLockBits(u.bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, status); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + + status = GdipBitmapUnlockBits(u.bitmap, &bd); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + GdipDisposeImage(u.image); + } +} + /* Many people on the net ask why there is so much difference in rendered * text height between gdiplus and gdi32, this test suggests an answer to * that question. Important: this test assumes that font dpi == device dpi. @@ -5728,6 +5850,7 @@ START_TEST(graphics) test_measure_string(); test_font_height_scaling(); test_transform(); + test_pen_thickness(); test_GdipMeasureString(); test_constructor_destructor(); test_save_restore();

1 0

Piotr Caban : oleacc: Added client IEnumVARIANT::{Reset, Skip, Next} implementation.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 8c4a3f9fac5559e1ecd509c700cfd34bc79bacf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c4a3f9fac5559e1ecd509c70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 13:19:59 2015 +0100 oleacc: Added client IEnumVARIANT::{Reset,Skip,Next} implementation. --- dlls/oleacc/client.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 6 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 9409990..ddaa89d 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -33,6 +33,7 @@ typedef struct { LONG ref; HWND hwnd; + HWND enum_pos; } Client; static inline Client* impl_from_Client(IAccessible *iface) @@ -526,22 +527,82 @@ static HRESULT WINAPI Client_EnumVARIANT_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); - return E_NOTIMPL; + HWND cur = This->enum_pos, next; + ULONG fetched = 0; + HRESULT hr; + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgVar, pCeltFetched); + + if(!celt) { + if(pCeltFetched) + *pCeltFetched = 0; + return S_OK; + } + + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + + while(next) { + cur = next; + + V_VT(rgVar+fetched) = VT_DISPATCH; + hr = AccessibleObjectFromWindow(cur, OBJID_WINDOW, + &IID_IDispatch, (void**)&V_DISPATCH(rgVar+fetched)); + if(FAILED(hr)) { + V_VT(rgVar+fetched) = VT_EMPTY; + while(fetched > 0) { + VariantClear(rgVar+fetched-1); + fetched--; + } + if(pCeltFetched) + *pCeltFetched = 0; + return hr; + } + fetched++; + if(fetched == celt) + break; + + next = GetWindow(cur, GW_HWNDNEXT); + } + + This->enum_pos = cur; + if(pCeltFetched) + *pCeltFetched = fetched; + return celt == fetched ? S_OK : S_FALSE; } static HRESULT WINAPI Client_EnumVARIANT_Skip(IEnumVARIANT *iface, ULONG celt) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)->(%u)\n", This, celt); - return E_NOTIMPL; + HWND next; + + TRACE("(%p)->(%u)\n", This, celt); + + while(celt) { + if(!This->enum_pos) + next = GetWindow(This->hwnd, GW_CHILD); + else + next = GetWindow(This->enum_pos, GW_HWNDNEXT); + if(!next) + return S_FALSE; + + This->enum_pos = next; + celt--; + } + + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Reset(IEnumVARIANT *iface) { Client *This = impl_from_Client_EnumVARIANT(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->enum_pos = 0; + return S_OK; } static HRESULT WINAPI Client_EnumVARIANT_Clone(IEnumVARIANT *iface, IEnumVARIANT **ppEnum) @@ -578,6 +639,7 @@ HRESULT create_client_object(HWND hwnd, const IID *iid, void **obj) client->IEnumVARIANT_iface.lpVtbl = &ClientEnumVARIANTVtbl; client->ref = 1; client->hwnd = hwnd; + client->enum_pos = 0; hres = IAccessible_QueryInterface(&client->IAccessible_iface, iid, obj); IAccessible_Release(&client->IAccessible_iface);

1 0

Piotr Caban : oleacc: Added client IEnumVARIANT tests.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 15e13220f18ea68df4c7621fa9ce9ae6dc704f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e13220f18ea68df4c7621fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:03 2015 +0100 oleacc: Added client IEnumVARIANT tests. --- dlls/oleacc/tests/main.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 0a091df..d11c344 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -384,6 +384,7 @@ static void test_default_client_accessible_object(void) IAccessible *acc; IDispatch *disp; IOleWindow *ow; + IEnumVARIANT *ev; HWND chld, hwnd, hwnd2; HRESULT hr; VARIANT vid, v; @@ -391,6 +392,7 @@ static void test_default_client_accessible_object(void) POINT pt; RECT rect; LONG l, left, top, width, height; + ULONG fetched; hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, NULL, NULL); @@ -432,6 +434,31 @@ static void test_default_client_accessible_object(void) ok(hr == E_INVALIDARG, "get_accChild returned %x\n", hr); ok(disp == NULL, "disp = %p\n", disp); + hr = IAccessible_QueryInterface(acc, &IID_IEnumVARIANT, (void**)&ev); + ok(hr == S_OK, "got %x\n", hr); + + hr = IEnumVARIANT_Skip(ev, 100); + ok(hr == S_FALSE, "Skip returned %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 1; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_FALSE, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(fetched == 0, "fetched = %d\n", fetched); + + hr = IEnumVARIANT_Reset(ev); + ok(hr == S_OK, "got %x\n", hr); + + V_VT(&v) = VT_I4; + fetched = 2; + hr = IEnumVARIANT_Next(ev, 1, &v, &fetched); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(&v) = %d\n", V_VT(&v)); + IDispatch_Release(V_DISPATCH(&v)); + ok(fetched == 1, "fetched = %d\n", fetched); + IEnumVARIANT_Release(ev); + V_VT(&vid) = VT_I4; V_I4(&vid) = CHILDID_SELF; hr = IAccessible_get_accName(acc, vid, &str);

1 0

Piotr Caban : oleacc: Added AccessibleChildren implementation.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 88b5b6a51ed532214541bb8e097a5eba994064c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b5b6a51ed532214541bb8e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:09 2015 +0100 oleacc: Added AccessibleChildren implementation. --- dlls/oleacc/main.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/oleacc.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index fa7d592..4d9c55e 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -568,3 +568,50 @@ UINT WINAPI GetStateTextA(DWORD state_bit, CHAR *state_str, UINT state_str_len) return LoadStringA(oleacc_handle, state_id, tmp, sizeof(tmp)); } } + +HRESULT WINAPI AccessibleChildren(IAccessible *container, + LONG start, LONG count, VARIANT *children, LONG *children_cnt) +{ + IEnumVARIANT *ev; + LONG i, child_no; + HRESULT hr; + + TRACE("%p %d %d %p %p\n", container, start, count, children, children_cnt); + + if(!container || !children || !children_cnt) + return E_INVALIDARG; + + for(i=0; i<count; i++) + VariantInit(children+i); + + hr = IAccessible_QueryInterface(container, &IID_IEnumVARIANT, (void**)&ev); + if(SUCCEEDED(hr)) { + hr = IEnumVARIANT_Reset(ev); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Skip(ev, start); + if(SUCCEEDED(hr)) + hr = IEnumVARIANT_Next(ev, count, children, (ULONG*)children_cnt); + IEnumVARIANT_Release(ev); + return hr; + } + + hr = IAccessible_get_accChildCount(container, &child_no); + if(FAILED(hr)) + return hr; + + for(i=0; i<count && start+i+1<=child_no; i++) { + IDispatch *disp; + + V_VT(children+i) = VT_I4; + V_I4(children+i) = start+i+1; + + hr = IAccessible_get_accChild(container, children[i], &disp); + if(SUCCEEDED(hr) && disp) { + V_VT(children+i) = VT_DISPATCH; + V_DISPATCH(children+i) = disp; + } + } + + *children_cnt = i; + return i==count ? S_OK : S_FALSE; +} diff --git a/dlls/oleacc/oleacc.spec b/dlls/oleacc/oleacc.spec index 9f3a9a0..4cff0b8 100644 --- a/dlls/oleacc/oleacc.spec +++ b/dlls/oleacc/oleacc.spec @@ -1,4 +1,4 @@ -@ stub AccessibleChildren +@ stdcall AccessibleChildren(ptr long long ptr ptr) @ stub AccessibleObjectFromEvent @ stdcall AccessibleObjectFromPoint(int64 ptr ptr) @ stdcall AccessibleObjectFromWindow(ptr long ptr ptr)

1 0

Piotr Caban : oleacc: Added AccessibleChildren tests.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: cc737bd4606be9dae0f0dd79c446dca8324f60c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc737bd4606be9dae0f0dd79c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 21 11:26:23 2015 +0100 oleacc: Added AccessibleChildren tests. --- dlls/oleacc/tests/main.c | 351 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc737bd4606be9dae0f0d…

1 0

Nikolay Sivov : comctl32/listview: Update view on style change only if LVS_TYPEMASK styles have changed.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: b6dc726bbd4b9c9b64569744b9df01f503c20e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6dc726bbd4b9c9b64569744b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 01:19:41 2015 +0300 comctl32/listview: Update view on style change only if LVS_TYPEMASK styles have changed. --- dlls/comctl32/listview.c | 6 ++++-- dlls/comctl32/tests/listview.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 57f19e4..2653155 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11067,7 +11067,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; infoPtr->dwStyle = lpss->styleNew; - map_style_view(infoPtr); if (((lpss->styleOld & WS_HSCROLL) != 0)&& ((lpss->styleNew & WS_HSCROLL) == 0)) @@ -11080,7 +11079,10 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (uNewView != uOldView) { HIMAGELIST himl; - + + /* LVM_SETVIEW doesn't change window style bits within LVS_TYPEMASK, + changing style updates current view only when view bits change. */ + map_style_view(infoPtr); SendMessageW(infoPtr->hwndEdit, WM_KILLFOCUS, 0, 0); ShowWindow(infoPtr->hwndHeader, SW_HIDE); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0e3a5c9..3d439df 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -4554,6 +4554,12 @@ static void test_get_set_view(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_LIST, "Expected style to be preserved\n"); + /* now change window style to see if view is remapped */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SHOWSELALWAYS); + ret = SendMessageA(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_SMALLICON, ret); + DestroyWindow(hwnd); }

1 0

Dmitry Timoshkov : shell32: Update version information to match XP values.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 6e638d824b80e8a02cb830cd6bc25a7ef8507849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e638d824b80e8a02cb830cd6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 23 10:20:59 2015 +0800 shell32: Update version information to match XP values. --- dlls/shell32/shell32.rc | 7 ++++++- dlls/shell32/version.h | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 37acbe7..847d2ce 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -457,9 +457,14 @@ IDR_AVI_FILEDELETE AVI searching.avi /* @makedep: AUTHORS */ AUTHORS RCDATA AUTHORS -#include "version.h" +/* please keep in sync with version.h values */ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILENAME_STR "shell32.dll" +#define WINE_FILEVERSION 6,0,2900,6242 +#define WINE_FILEVERSION_STR "6.0.2900.6242" +#define WINE_PRODUCTVERSION 6,0,2900,6242 +#define WINE_PRODUCTVERSION_STR "6.0.2900.6242" #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h index aedf231..06f4871 100644 --- a/dlls/shell32/version.h +++ b/dlls/shell32/version.h @@ -18,7 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEVERSION_MAJOR 5 +/* please keep in sync with shell32.rc values */ +#define WINE_FILEVERSION_MAJOR 6 #define WINE_FILEVERSION_MINOR 0 -#define WINE_FILEVERSION_BUILD 3900 -#define WINE_FILEVERSION_PLATFORMID 6975 +#define WINE_FILEVERSION_BUILD 2900 +#define WINE_FILEVERSION_PLATFORMID 6242

1 0

Nikolay Sivov : user32/static: Allow setting NULL text.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: c5dda71cd472c3438e54d82ffe835876c160c8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5dda71cd472c3438e54d82ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:12:29 2015 +0300 user32/static: Allow setting NULL text. --- dlls/user32/static.c | 15 ++++++--------- dlls/user32/tests/static.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index ff5c77c..60fcb79 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -464,15 +464,12 @@ LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam case WM_SETTEXT: if (hasTextStyle( full_style )) { - if (HIWORD(lParam)) - { - if(unicode) - lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); - STATIC_TryPaintFcn( hwnd, full_style ); - } - } + if (unicode) + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + else + lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); + } break; case WM_SETFONT: diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index d4aa9b1..841889d 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -117,6 +117,21 @@ static void test_updates(int style, int flags) DestroyWindow(hStatic); } +static void test_set_text(void) +{ + HWND hStatic = build_static(SS_SIMPLE); + char buffA[10]; + + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(!strcmp(buffA, "Test"), "got wrong text %s\n", buffA); + + SetWindowTextA(hStatic, NULL); + GetWindowTextA(hStatic, buffA, sizeof(buffA)); + ok(buffA[0] == 0, "got wrong text %s\n", buffA); + + DestroyWindow(hStatic); +} + START_TEST(static) { static const char szClassName[] = "testclass"; @@ -148,6 +163,7 @@ START_TEST(static) test_updates(SS_WHITERECT, TODO_COUNT); test_updates(SS_ETCHEDHORZ, TODO_COUNT); test_updates(SS_ETCHEDVERT, TODO_COUNT); + test_set_text(); DestroyWindow(hMainWnd); }

1 0

Nikolay Sivov : scrrun: Added support for interface pointers as keys for dictionary.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 5189dc417aa2c4fb95c46a3446d2b69e03230ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5189dc417aa2c4fb95c46a344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 21 23:30:56 2015 +0300 scrrun: Added support for interface pointers as keys for dictionary. --- dlls/scrrun/dictionary.c | 34 ++++++- dlls/scrrun/tests/dictionary.c | 214 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 242 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5189dc417aa2c4fb95c46…

1 0

Nikolay Sivov : scrrun: Added support for VT_DATE keys, and BYREF float key types.
by Alexandre Julliard 23 Mar '15

23 Mar '15

Module: wine Branch: master Commit: 94a1838b7ebb416b1cbbf0adb20f3199a0bf5a30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94a1838b7ebb416b1cbbf0adb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 23 08:18:30 2015 +0300 scrrun: Added support for VT_DATE keys, and BYREF float key types. --- dlls/scrrun/dictionary.c | 38 +++++++++++++++----------- dlls/scrrun/tests/dictionary.c | 60 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 24ca094..2dc5d2c 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -761,6 +761,22 @@ static DWORD get_num_hash(FLOAT num) return (*((DWORD*)&num)) % DICT_HASH_MOD; } +static HRESULT get_flt_hash(FLOAT flt, LONG *hash) +{ + if (isinf(flt)) { + *hash = 0; + return S_OK; + } + else if (!isnan(flt)) { + *hash = get_num_hash(flt); + return S_OK; + } + + /* NaN case */ + *hash = ~0u; + return CTL_E_ILLEGALFUNCTIONCALL; +} + static DWORD get_ptr_hash(void *ptr) { return PtrToUlong(ptr) % DICT_HASH_MOD; @@ -810,23 +826,15 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V IUnknown_Release(unk); break; } + case VT_DATE|VT_BYREF: + case VT_DATE: + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_DATEREF(key) : V_DATE(key), &V_I4(hash)); + case VT_R4|VT_BYREF: case VT_R4: + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R4REF(key) : V_R4(key), &V_I4(hash)); + case VT_R8|VT_BYREF: case VT_R8: - { - FLOAT flt = V_VT(key) == VT_R4 ? V_R4(key) : V_R8(key); - - if (isinf(flt)) - { - V_I4(hash) = 0; - break; - } - else if (!isnan(flt)) - { - V_I4(hash) = get_num_hash(flt); - break; - } - /* fallthrough on NAN */ - } + return get_flt_hash(V_VT(key) & VT_BYREF ? *V_R8REF(key) : V_R8(key), &V_I4(hash)); case VT_INT: case VT_UINT: case VT_I1: diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index de65310..f53222f 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -499,6 +499,15 @@ static void test_hash_value(void) ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + V_VT(&key) = VT_DATE; + V_DATE(&key) = fx8.d; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == CTL_E_ILLEGALFUNCTIONCALL || broken(hr == S_OK) /* win2k, win2k3 */, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == ~0u || broken(V_I4(&hash) == 0 /* win2k */ || + V_I4(&hash) == 0x1f4 /* vista, win2k8 */), "got hash 0x%08x\n", V_I4(&hash)); + /* inf */ fx8.d = 10.0; fx8.i.m_lo = 0; @@ -513,7 +522,19 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + V_VT(&key) = VT_DATE; + V_DATE(&key) = fx8.d; + V_I4(&hash) = 10; + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == 0, "got hash 0x%08x\n", V_I4(&hash)); + for (i = 0; i < sizeof(float_hash_tests)/sizeof(float_hash_tests[0]); i++) { + double dbl; + FLOAT flt; + DATE date; + expected = get_num_hash(float_hash_tests[i]); V_VT(&key) = VT_R4; @@ -525,6 +546,16 @@ static void test_hash_value(void) ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + flt = float_hash_tests[i]; + V_VT(&key) = VT_R4|VT_BYREF; + V_R4REF(&key) = &flt; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + V_VT(&key) = VT_R8; V_R8(&key) = float_hash_tests[i]; VariantInit(&hash); @@ -533,6 +564,35 @@ static void test_hash_value(void) ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), expected); + + dbl = float_hash_tests[i]; + V_VT(&key) = VT_R8|VT_BYREF; + V_R8REF(&key) = &dbl; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_DATE; + V_DATE(&key) = float_hash_tests[i]; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); + + V_VT(&key) = VT_DATE|VT_BYREF; + date = float_hash_tests[i]; + V_DATEREF(&key) = &date; + VariantInit(&hash); + hr = IDictionary_get_HashVal(dict, &key, &hash); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&hash) == VT_I4, "got %d\n", V_VT(&hash)); + ok(V_I4(&hash) == expected, "%d: got hash 0x%08x, expected 0x%08x\n", i, V_I4(&hash), + expected); } /* interface pointers as keys */

1 0