January 2009 - Wine-Commits

Juan Lang : cryptui: Add a do-nothing export wizard.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 0cac6977e6aa34214bbbbde5cbeb39abc10a0304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cac6977e6aa34214bbbbde5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 09:00:53 2009 -0800 cryptui: Add a do-nothing export wizard. --- dlls/cryptui/cryptui_En.rc | 68 ++++++++++++ dlls/cryptui/cryptuires.h | 23 ++++ dlls/cryptui/main.c | 260 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 349 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cac6977e6aa34214bbbb…

1 0

Juan Lang : cryptui: Add stub for CryptUIWizExport.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 787b4bcd52547694286d6ee2c9c5bcb4b5f44c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=787b4bcd52547694286d6ee2c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 23 08:56:52 2009 -0800 cryptui: Add stub for CryptUIWizExport. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index c8b161f..a60c2e6 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -31,7 +31,7 @@ 31 stub CryptUIWizCertRequest 32 stub CryptUIWizCreateCertRequestNoDS 33 stub CryptUIWizDigitalSign -34 stub CryptUIWizExport +34 stdcall CryptUIWizExport(long ptr wstr ptr ptr) 35 stub CryptUIWizFreeCertRequestNoDS 36 stub CryptUIWizFreeDigitalSignContext 37 stdcall CryptUIWizImport(long ptr wstr ptr ptr) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a5fb580..a3af7f4 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5435,3 +5435,11 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT return ret; } + +BOOL WINAPI CryptUIWizExport(DWORD dwFlags, HWND hwndParent, + LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_EXPORT_INFO pExportInfo, void *pvoid) +{ + FIXME("(%08x, %p, %s, %p, %p): stub\n", dwFlags, hwndParent, + debugstr_w(pwszWizardTitle), pExportInfo, pvoid); + return FALSE; +}

1 0

Austin English : configure.ac: Fix a couple more includes on NetBSD.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 0317393bf12827dbef9f3c5c07e3977ba38e3dd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0317393bf12827dbef9f3c5c0… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 23 13:29:42 2009 -0600 configure.ac: Fix a couple more includes on NetBSD. --- configure | 11 ++++++++++- configure.ac | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bf76813..b90bb7f 100755 --- a/configure +++ b/configure @@ -7965,6 +7965,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif @@ -8019,7 +8022,7 @@ done -for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h +for ac_header in netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -8046,6 +8049,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif @@ -8061,6 +8067,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> #endif + #ifdef HAVE_NETINET_TCP_TIMER_H + #include <netinet/tcp_timer.h> + #endif #include <$ac_header> _ACEOF diff --git a/configure.ac b/configure.ac index 66ad0ac..c2f4588 100644 --- a/configure.ac +++ b/configure.ac @@ -402,11 +402,14 @@ AC_CHECK_HEADERS(\ #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif]) -AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,, +AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h ],,, [#include <sys/types.h> #ifdef HAVE_ALIAS_H # include <alias.h> @@ -420,6 +423,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif + #ifdef HAVE_NETINET_IN_SYSTM_H + # include <netinet/in_systm.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif @@ -434,6 +440,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet #endif #ifdef HAVE_NETINET_TCP_H # include <netinet/tcp.h> + #endif + #ifdef HAVE_NETINET_TCP_TIMER_H + #include <netinet/tcp_timer.h> #endif]) AC_CHECK_HEADERS([linux/ipx.h],,,

1 0

Paul Vriens : user32: Allocate buffer on heap.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: fd3c7be0e0f7b3ea4936f647ca763c2b5eb6b1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3c7be0e0f7b3ea4936f647c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 23 18:07:09 2009 +0100 user32: Allocate buffer on heap. --- dlls/user32/message.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index aad6b75..27c4df7 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2028,9 +2028,10 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info info, *old_info; unsigned int hw_id = 0; /* id of previous hardware message */ - char local_buffer[256]; - void *buffer = local_buffer; - size_t buffer_size = sizeof(local_buffer); + void *buffer; + size_t buffer_size = 256; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; if (!first && !last) last = ~0; @@ -2070,7 +2071,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags if (res) { - if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); if (res != STATUS_BUFFER_OVERFLOW) return FALSE; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return FALSE; continue; @@ -2163,7 +2164,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags thread_info->GetMessagePosVal = MAKELONG( info.msg.pt.x, info.msg.pt.y ); thread_info->GetMessageTimeVal = info.msg.time; thread_info->GetMessageExtraInfoVal = msg_data->hardware.info; - if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return TRUE; } @@ -2194,7 +2195,7 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags msg->pt.y = (short)HIWORD( thread_info->GetMessagePosVal ); thread_info->GetMessageTimeVal = info.msg.time; thread_info->GetMessageExtraInfoVal = 0; - if (buffer != local_buffer) HeapFree( GetProcessHeap(), 0, buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); HOOK_CallHooks( WH_GETMESSAGE, HC_ACTION, flags & PM_REMOVE, (LPARAM)msg, TRUE ); return TRUE; }

1 0

Alexandre Julliard : userenv/tests: Don' t check for TEMP and TMP variables on NT4.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 950ad4efdb403d10d5822be135e6662b62eb09f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=950ad4efdb403d10d5822be13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:30:01 2009 +0100 userenv/tests: Don't check for TEMP and TMP variables on NT4. --- dlls/userenv/tests/userenv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 0b5e034..d782d2f 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -176,13 +176,13 @@ static void test_create_env(void) }; static const struct profile_item common_post_nt4_vars[] = { { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, + { "TEMP", { 1, 1, 0, 0 } }, + { "TMP", { 1, 1, 0, 0 } }, { "CommonProgramFiles", { 1, 1, 1, 1 } }, { "ProgramFiles", { 1, 1, 0, 0 } } }; static const struct profile_item htok_vars[] = { { "PATH", { 1, 1, 0, 0 } }, - { "TEMP", { 1, 1, 0, 0 } }, - { "TMP", { 1, 1, 0, 0 } }, { "USERPROFILE", { 1, 1, 0, 0 } } };

1 0

Alexandre Julliard : ws2_32/tests: Fix a test failure on WinME.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: a8a2ca72bd95cc05bb217ddc995eec94f07bb42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8a2ca72bd95cc05bb217ddc9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:30:14 2009 +0100 ws2_32/tests: Fix a test failure on WinME. --- dlls/ws2_32/tests/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0b5cb88..22455ef 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -852,7 +852,8 @@ static void Exit (void) ok ( ret == 0, "WSACleanup failed ret = %d GetLastError is %d\n", ret, err); ret = WSACleanup(); err = WSAGetLastError(); - ok ( ret == SOCKET_ERROR && err == WSANOTINITIALISED, + ok ( (ret == SOCKET_ERROR && err == WSANOTINITIALISED) || + broken(ret == 0), /* WinME */ "WSACleanup returned %d GetLastError is %d\n", ret, err); }

1 0

Alexandre Julliard : user32/tests: Make the traces less verbose in the window test.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 7cbe28541644c42c5852c5a87408e0c2ea1f704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbe28541644c42c5852c5a87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:29:32 2009 +0100 user32/tests: Make the traces less verbose in the window test. --- dlls/user32/tests/win.c | 204 ++++++++++++++++++++++++----------------------- 1 files changed, 104 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7cbe28541644c42c5852c…

1 0

Alexandre Julliard : user32/tests: Ignore some more messages.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 4909fe493bd0f891f4bdf91079d027fba68a5e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4909fe493bd0f891f4bdf9107… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:29:05 2009 +0100 user32/tests: Ignore some more messages. --- dlls/user32/tests/msg.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a3d1627..8edcc01 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3847,6 +3847,8 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam case WM_GETICON: case WM_GETOBJECT: case WM_MOUSEMOVE: + case WM_NCMOUSEMOVE: + case WM_NCMOUSELEAVE: case WM_SETCURSOR: case WM_DEVICECHANGE: return 0; @@ -6441,6 +6443,8 @@ static const struct message WmCtrlAltVkN[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 0x20000001 }, /* XP */ { WM_KEYDOWN, wparam|lparam, 'N', 0x20000001 }, { WM_KEYDOWN, sent|wparam|lparam, 'N', 0x20000001 }, + { WM_CHAR, optional }, + { WM_CHAR, sent|optional }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'N', 0xe0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, 'N', 0xe0000001 }, { WM_KEYUP, sent|wparam|lparam, 'N', 0xe0000001 }, @@ -6999,6 +7003,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return HTCLIENT; case WM_SETCURSOR: case WM_MOUSEMOVE: + case WM_NCMOUSEMOVE: return 0; case WM_ERASEBKGND: @@ -9690,7 +9695,7 @@ static void test_TrackMouseEvent(void) track_query(TME_HOVER, hwnd, default_hover_time); - pump_msg_loop_timeout(default_hover_time / 2, FALSE); + pump_msg_loop_timeout(default_hover_time, FALSE); ok_sequence(WmMouseHoverSeq, "WmMouseHoverSeq", FALSE); track_query(0, NULL, 0);

1 0

Alexandre Julliard : comcat/tests: Skip tests if we can' t create a test category.
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: 6996a9c83f365d110247ca6f494ebd6805c16490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6996a9c83f365d110247ca6f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:08:20 2009 +0100 comcat/tests: Skip tests if we can't create a test category. --- dlls/comcat/tests/comcat.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index 80f774c..49e5afe 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -31,19 +31,19 @@ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x \n", hr) -static void register_testentry(void) +static BOOL register_testentry(void) { - HKEY hkey,hkey2; - - RegCreateKeyA(HKEY_CLASSES_ROOT,"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}", - &hkey); - RegSetValueA(hkey,NULL,REG_SZ,"ComCat Test key",16); - RegCreateKeyA(hkey, - "Implemented Categories\\{deadcafe-0000-0000-0000-000000000000}", - &hkey2); - + HKEY hkey = 0, hkey2 = 0; + DWORD ret; + + ret = RegCreateKeyA(HKEY_CLASSES_ROOT,"CLSID\\{deadcafe-beed-bead-dead-cafebeaddead}", &hkey); + if (!ret) ret = RegSetValueA(hkey,NULL,REG_SZ,"ComCat Test key",16); + if (!ret) ret = RegCreateKeyA(hkey, + "Implemented Categories\\{deadcafe-0000-0000-0000-000000000000}", + &hkey2); RegCloseKey(hkey); RegCloseKey(hkey2); + return !ret; } static void unregister_testentry(void) @@ -106,19 +106,22 @@ static void do_enum(void) hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); ok (fetched == 0,"Fetched wrong number of guids %u\n",fetched); IEnumGUID_Release(pIEnum); - - register_testentry(); - hr = ICatInformation_EnumClassesOfCategories(pICat, 1, the_cat, -1, NULL, - &pIEnum); - ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); - hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); - ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); - ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n"); + if (register_testentry()) + { + hr = ICatInformation_EnumClassesOfCategories(pICat, 1, the_cat, -1, NULL, &pIEnum); + ok_ole_success(hr,"ICatInformation_EnumClassesOfCategories"); + + hr = IEnumGUID_Next(pIEnum,1,the_guid, &fetched); + ok (fetched == 1,"Fetched wrong number of guids %u\n",fetched); + ok (IsEqualGUID(the_guid,&wanted_guid),"Guids do not match\n"); + + IEnumGUID_Release(pIEnum); + unregister_testentry(); + } + else skip( "Could not register the test category\n" ); - IEnumGUID_Release(pIEnum); ICatInformation_Release(pICat); - unregister_testentry(); OleUninitialize(); }

1 0

Alexandre Julliard : gdi32/tests: Fix the mapping test to handle the more precise LOMETRIC settings on Vista .
by Alexandre Julliard Jan. 26, 2009

Jan. 26, 2009

Module: wine Branch: master Commit: cbe6e7177508b542dad5a90f14577216af179edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe6e7177508b542dad5a90f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:08:55 2009 +0100 gdi32/tests: Fix the mapping test to handle the more precise LOMETRIC settings on Vista. --- dlls/gdi32/tests/mapping.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7e85ca9..f3a92e5 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -75,8 +75,9 @@ static void test_world_transform(void) { BOOL is_win9x; HDC hdc; - INT ret, size_cx, size_cy, res_x, res_y; + INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; XFORM xform; + SIZE size; SetLastError(0xdeadbeef); GetWorldTransform(0, NULL); @@ -88,7 +89,10 @@ static void test_world_transform(void) size_cy = GetDeviceCaps(hdc, VERTSIZE); res_x = GetDeviceCaps(hdc, HORZRES); res_y = GetDeviceCaps(hdc, VERTRES); - trace("dc size %d x %d, resolution %d x %d\n", size_cx, size_cy, res_x, res_y); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + trace("dc size %d x %d, resolution %d x %d dpi %d x %d\n", + size_cx, size_cy, res_x, res_y, dpi_x, dpi_y ); expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); @@ -101,13 +105,19 @@ static void test_world_transform(void) if (is_win9x) { - expect_viewport_ext(hdc, GetDeviceCaps(hdc, LOGPIXELSX), GetDeviceCaps(hdc, LOGPIXELSY)); + expect_viewport_ext(hdc, dpi_x, dpi_y); expect_window_ext(hdc, 254, -254); } else { expect_viewport_ext(hdc, res_x, -res_y); - expect_window_ext(hdc, size_cx * 10, size_cy * 10); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( size.cx == size_cx * 10 || + size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( size.cy == size_cy * 10 || + size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } expect_world_trasform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); @@ -154,9 +164,15 @@ static void test_world_transform(void) ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); expect_viewport_ext(hdc, res_x, -res_y); - expect_window_ext(hdc, size_cx * 10, size_cy * 10); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( size.cx == size_cx * 10 || + size.cx == MulDiv( res_x, 254, dpi_x ), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( size.cy == size_cy * 10 || + size.cy == MulDiv( res_y, 254, dpi_y ), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_trasform(hdc, 20.0, 20.0); - expect_LPtoDP(hdc, MulDiv(1000 * 2, res_x, size_cx), -MulDiv(1000 * 2, res_y, size_cy)); + expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy)); SetLastError(0xdeadbeef); ret = SetMapMode(hdc, MM_TEXT);

1 0