winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2009
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1348 discussions
Start a n
N
ew thread
Juan Lang : cryptui: Add a do-nothing export wizard.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Juan Lang : cryptui: Add stub for CryptUIWizExport.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Austin English : configure.ac: Fix a couple more includes on NetBSD.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Paul Vriens : user32: Allocate buffer on heap.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Alexandre Julliard : ws2_32/tests: Fix a test failure on WinME.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Alexandre Julliard : userenv/tests: Don' t check for TEMP and TMP variables on NT4.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Alexandre Julliard : user32/tests: Make the traces less verbose in the window test.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Alexandre Julliard : user32/tests: Ignore some more messages.
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
Alexandre Julliard : user32/tests: Fix various failures in the monitor test .
by Alexandre Julliard
26 Jan '09
26 Jan '09
Module: wine Branch: master Commit: 4bec383d9f0b462ca930834e0ec4ee7efe3b95c8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4bec383d9f0b462ca930834e0…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 25 17:28:39 2009 +0100 user32/tests: Fix various failures in the monitor test. --- dlls/user32/tests/monitor.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 3d03596..25c8867 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -240,7 +240,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmFields = vid_modes_test[i].fields; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); ok(vid_modes_test[i].must_succeed ? - (res == DISP_CHANGE_SUCCESSFUL) : + (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_BADMODE || res == DISP_CHANGE_BADPARAM), "Unexpected ChangeDisplaySettingsEx() return code for resolution[%d]: %d\n", i, res); @@ -257,7 +257,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); - ok(ClipCursor(NULL), "ClipCursor() failed\n"); + if (!ClipCursor(NULL)) continue; ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); @@ -368,7 +368,8 @@ static void test_work_area(void) wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); OffsetRect(&wp.rcNormalPosition, rc_work.left, rc_work.top); - if (!EqualRect(&mi.rcMonitor, &mi.rcWork)) /* FIXME: remove once Wine is fixed */ + if (mi.rcMonitor.left != mi.rcWork.left || + mi.rcMonitor.top != mi.rcWork.top) /* FIXME: remove once Wine is fixed */ todo_wine ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n"); else ok(EqualRect(&rc_normal, &wp.rcNormalPosition), "normal pos is different\n");
1
0
0
0
Alexandre Julliard : gdi32/tests: Fix the mapping test to handle the more precise LOMETRIC settings on Vista .
by Alexandre Julliard
26 Jan '09
26 Jan '09
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
0
0
← Newer
1
...
31
32
33
34
35
36
37
...
135
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
Results per page:
10
25
50
100
200