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
May 2010
----- 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
955 discussions
Start a n
N
ew thread
Gerald Pfeifer : comctl32/tests: Remove variable hwndheader which is not really used from test_redraw.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 47fff748cc70095b3dcdb3c84f0c232d556ac29f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=47fff748cc70095b3dcdb3c84…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri May 7 20:40:02 2010 +0200 comctl32/tests: Remove variable hwndheader which is not really used from test_redraw. --- dlls/comctl32/tests/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0910b59..ecad7b1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1469,13 +1469,13 @@ static void test_create(void) static void test_redraw(void) { - HWND hwnd, hwndheader; + HWND hwnd; HDC hdc; BOOL res; DWORD r; hwnd = create_listview_control(LVS_REPORT); - hwndheader = subclass_header(hwnd); + subclass_header(hwnd); flush_sequences(sequences, NUM_MSG_SEQUENCES);
1
0
0
0
Damjan Jovanovic : winemenubuilder: Escape freedesktop exec keys properly.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 745747688d23d60afbb65d2df0b7d60cecbf0ee5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=745747688d23d60afbb65d2df…
Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 8 23:20:32 2010 +0200 winemenubuilder: Escape freedesktop exec keys properly. --- programs/winemenubuilder/winemenubuilder.c | 168 +++++++++++++++++----------- 1 files changed, 103 insertions(+), 65 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 6569c0d..0797ec8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -792,6 +792,36 @@ static BOOL create_directories(char *directory) return ret; } +static char* wchars_to_utf8_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UTF8, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + +static char* wchars_to_unix_chars(LPCWSTR string) +{ + char *ret; + INT size = WideCharToMultiByte(CP_UNIXCP, 0, string, -1, NULL, 0, NULL, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, size); + if (ret) + WideCharToMultiByte(CP_UNIXCP, 0, string, -1, ret, size, NULL, NULL); + return ret; +} + +static WCHAR* utf8_chars_to_wchars(LPCSTR string) +{ + WCHAR *ret; + INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); + return ret; +} + /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ static char *extract_icon( LPCWSTR path, int index, const char *destFilename, BOOL bWait ) { @@ -945,7 +975,7 @@ static BOOL write_desktop_entry(const char *unix_link, const char *location, con fprintf(file, "[Desktop Entry]\n"); fprintf(file, "Name=%s\n", linkname); - fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine \"%s\" %s\n", + fprintf(file, "Exec=env WINEPREFIX=\"%s\" wine %s %s\n", wine_get_config_dir(), path, args); fprintf(file, "Type=Application\n"); fprintf(file, "StartupNotify=true\n"); @@ -1154,35 +1184,63 @@ end: return ret; } -/* This escapes \ in filenames */ +/* This escapes reserved characters in .desktop files' Exec keys. */ static LPSTR escape(LPCWSTR arg) { - LPSTR narg, x; - LPCWSTR esc; - int len = 0, n; + int i, j; + WCHAR *escaped_string; + char *utf8_string; - esc = arg; - while((esc = strchrW(esc, '\\'))) + escaped_string = HeapAlloc(GetProcessHeap(), 0, (4 * strlenW(arg) + 1) * sizeof(WCHAR)); + if (escaped_string == NULL) return NULL; + for (i = j = 0; arg[i]; i++) { - esc++; - len++; + switch (arg[i]) + { + case '\\': + escaped_string[j++] = '\\'; + escaped_string[j++] = '\\'; + escaped_string[j++] = '\\'; + escaped_string[j++] = '\\'; + break; + case ' ': + case '\t': + case '\n': + case '"': + case '\'': + case '>': + case '<': + case '~': + case '|': + case '&': + case ';': + case '$': + case '*': + case '?': + case '#': + case '(': + case ')': + case '`': + escaped_string[j++] = '\\'; + escaped_string[j++] = '\\'; + /* fall through */ + default: + escaped_string[j++] = arg[i]; + break; + } } + escaped_string[j] = 0; - len += WideCharToMultiByte(CP_UNIXCP, 0, arg, -1, NULL, 0, NULL, NULL); - narg = HeapAlloc(GetProcessHeap(), 0, len); - - x = narg; - while (*arg) + utf8_string = wchars_to_utf8_chars(escaped_string); + if (utf8_string == NULL) { - n = WideCharToMultiByte(CP_UNIXCP, 0, arg, 1, x, len, NULL, NULL); - x += n; - len -= n; - if (*arg == '\\') - *x++='\\'; /* escape \ */ - arg++; + WINE_ERR("out of memory\n"); + goto end; } - *x = 0; - return narg; + +end: + HeapFree(GetProcessHeap(), 0, escaped_string); + return utf8_string; } /* Return a heap-allocated copy of the unix format difference between the two @@ -1424,36 +1482,6 @@ static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra) return value; } -static char* wchars_to_utf8_chars(LPCWSTR string) -{ - char *ret; - INT size = WideCharToMultiByte(CP_UTF8, 0, string, -1, NULL, 0, NULL, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - WideCharToMultiByte(CP_UTF8, 0, string, -1, ret, size, NULL, NULL); - return ret; -} - -static char* wchars_to_unix_chars(LPCWSTR string) -{ - char *ret; - INT size = WideCharToMultiByte(CP_UNIXCP, 0, string, -1, NULL, 0, NULL, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, size); - if (ret) - WideCharToMultiByte(CP_UNIXCP, 0, string, -1, ret, size, NULL, NULL); - return ret; -} - -static WCHAR* utf8_chars_to_wchars(LPCSTR string) -{ - WCHAR *ret; - INT size = MultiByteToWideChar(CP_UTF8, 0, string, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_UTF8, 0, string, -1, ret, size); - return ret; -} - static char *slashes_to_minuses(const char *string) { int i; @@ -2135,7 +2163,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package progIdW = reg_get_valW(HKEY_CLASSES_ROOT, extensionW, NULL); if (progIdW) { - progIdA = wchars_to_utf8_chars(progIdW); + progIdA = escape(progIdW); if (progIdA == NULL) { WINE_ERR("out of memory\n"); @@ -2187,7 +2215,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; - char *escaped_path = NULL, *escaped_args = NULL, *escaped_description = NULL; + char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; WCHAR szArgs[INFOTIPSIZE], szIconPath[MAX_PATH]; @@ -2311,7 +2339,12 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* escape the path and parameters */ escaped_path = escape(szPath); escaped_args = escape(szArgs); - escaped_description = escape(szDescription); + description = wchars_to_utf8_chars(szDescription); + if (escaped_path == NULL || escaped_args == NULL || description == NULL) + { + WINE_ERR("out of memory allocating/escaping parameters\n"); + goto cleanup; + } /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); @@ -2333,7 +2366,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); + r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name); if (r == 0) chmod(location, 0755); HeapFree(GetProcessHeap(), 0, location); @@ -2341,21 +2374,21 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) } else { - char *arg = heap_printf("/Unix \"%s\"", unix_link); - if (arg) + WCHAR *unix_linkW = utf8_chars_to_wchars(unix_link); + if (unix_linkW) { - WCHAR *warg = utf8_chars_to_wchars(arg); - if (warg) + char *escaped_lnk = escape(unix_linkW); + if (escaped_lnk) { - char *menuarg = escape(warg); + char *menuarg = heap_printf("/Unix %s", escaped_lnk); if (menuarg) { - r = !write_menu_entry(unix_link, link_name, "start", menuarg, escaped_description, work_dir, icon_name); + r = !write_menu_entry(unix_link, link_name, "start", menuarg, description, work_dir, icon_name); HeapFree(GetProcessHeap(), 0, menuarg); } - HeapFree(GetProcessHeap(), 0, warg); + HeapFree(GetProcessHeap(), 0, escaped_lnk); } - HeapFree(GetProcessHeap(), 0, arg); + HeapFree(GetProcessHeap(), 0, unix_linkW); } } @@ -2368,7 +2401,7 @@ cleanup: HeapFree( GetProcessHeap(), 0, link_name ); HeapFree( GetProcessHeap(), 0, escaped_args ); HeapFree( GetProcessHeap(), 0, escaped_path ); - HeapFree( GetProcessHeap(), 0, escaped_description ); + HeapFree( GetProcessHeap(), 0, description ); HeapFree( GetProcessHeap(), 0, unix_link); if (r && !bWait) @@ -2424,6 +2457,11 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link } escaped_urlPath = escape(urlPath); + if (escaped_urlPath == NULL) + { + WINE_ERR("couldn't escape url, out of memory\n"); + goto cleanup; + } hSem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); if( WAIT_OBJECT_0 != MsgWaitForMultipleObjects( 1, &hSem, FALSE, INFINITE, QS_ALLINPUT ) )
1
0
0
0
Alexandre Julliard : server: Return the cursor information for a thread input, and use it for GetCursorInfo.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: c5459824724660bcd0c0cdaabd096785dc4bb2ae URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c5459824724660bcd0c0cdaab…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 11 11:21:03 2010 +0200 server: Return the cursor information for a thread input, and use it for GetCursorInfo. --- dlls/user32/input.c | 17 ++++++++++++++--- include/wine/server_protocol.h | 6 ++++-- server/protocol.def | 2 ++ server/queue.c | 13 +++---------- server/request.h | 6 ++++-- server/trace.c | 2 ++ 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index f14590d..0dccf21 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -207,11 +207,22 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) */ BOOL WINAPI GetCursorInfo( PCURSORINFO pci ) { + BOOL ret; + if (!pci) return 0; - pci->hCursor = LoadCursorW( 0, (LPCWSTR)IDC_ARROW ); - pci->flags = CURSOR_SHOWING; + + SERVER_START_REQ( get_thread_input ) + { + req->tid = 0; + if ((ret = !wine_server_call( req ))) + { + pci->hCursor = wine_server_ptr_handle( reply->cursor ); + pci->flags = (reply->show_count >= 0) ? CURSOR_SHOWING : 0; + } + } + SERVER_END_REQ; GetCursorPos(&pci->ptScreenPos); - return 1; + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 24790a5..20bb4a2 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3697,8 +3697,10 @@ struct get_thread_input_reply user_handle_t menu_owner; user_handle_t move_size; user_handle_t caret; + user_handle_t cursor; + int show_count; rectangle_t rect; - char __pad_52[4]; + char __pad_60[4]; }; @@ -5483,6 +5485,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 400 +#define SERVER_PROTOCOL_VERSION 401 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 5015e97..e4e8ec3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2604,6 +2604,8 @@ enum message_type user_handle_t menu_owner; /* handle to the menu owner */ user_handle_t move_size; /* handle to the moving/resizing window */ user_handle_t caret; /* handle to the caret window */ + user_handle_t cursor; /* handle to the cursor */ + int show_count; /* cursor show count */ rectangle_t rect; /* caret rectangle */ @END diff --git a/server/queue.c b/server/queue.c index 4a06a73..d2090cd 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2055,18 +2055,11 @@ DECL_HANDLER(get_thread_input) reply->menu_owner = input->menu_owner; reply->move_size = input->move_size; reply->caret = input->caret; + reply->cursor = input->cursor; + reply->show_count = input->cursor_count; reply->rect = input->caret_rect; } - else - { - reply->focus = 0; - reply->capture = 0; - reply->active = 0; - reply->menu_owner = 0; - reply->move_size = 0; - reply->caret = 0; - reply->rect.left = reply->rect.top = reply->rect.right = reply->rect.bottom = 0; - } + /* foreground window is active window of foreground thread */ reply->foreground = foreground_input ? foreground_input->active : 0; if (thread) release_object( thread ); diff --git a/server/request.h b/server/request.h index 604d115..ef6adea 100644 --- a/server/request.h +++ b/server/request.h @@ -1712,8 +1712,10 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, foreground) == 20 ); C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, menu_owner) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, move_size) == 28 ); C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, caret) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, rect) == 36 ); -C_ASSERT( sizeof(struct get_thread_input_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, cursor) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, show_count) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_input_reply, rect) == 44 ); +C_ASSERT( sizeof(struct get_thread_input_reply) == 64 ); C_ASSERT( sizeof(struct get_last_input_time_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_last_input_time_reply, time) == 8 ); C_ASSERT( sizeof(struct get_last_input_time_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index c97bd70..ec87dab 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3076,6 +3076,8 @@ static void dump_get_thread_input_reply( const struct get_thread_input_reply *re fprintf( stderr, ", menu_owner=%08x", req->menu_owner ); fprintf( stderr, ", move_size=%08x", req->move_size ); fprintf( stderr, ", caret=%08x", req->caret ); + fprintf( stderr, ", cursor=%08x", req->cursor ); + fprintf( stderr, ", show_count=%d", req->show_count ); dump_rectangle( ", rect=", &req->rect ); }
1
0
0
0
Marcus Meissner : ntdll: Reimplement qsort() using generic mergesort.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 7642e03c6329868729254c4e3580a5037387734d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7642e03c6329868729254c4e3…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 9 13:09:47 2010 +0200 ntdll: Reimplement qsort() using generic mergesort. --- dlls/ntdll/misc.c | 43 ++++++++++++++++++++++++++++++++ dlls/ntdll/string.c | 10 ------- dlls/ntdll/tests/string.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index f4cef42..d09ceef 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -2,6 +2,7 @@ * Helper functions for ntdll * * Copyright 2000 Juergen Schmied + * Copyright 2010 Marcus Meissner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -250,3 +251,45 @@ double CDECL NTDLL_tan( double d ) { return tan( d ); } + + +/* Merge Sort. Algorithm taken from
http://www.linux-related.de/index.html?/coding/sort/sort_merge.htm
*/ +static void mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const void *, const void *), + int left, int right ) +{ + if(right>left) { + int i, j, k, m; + m=(right+left)/2; + mergesort( arr, barr, elemsize, compar, left, m); + mergesort( arr, barr, elemsize, compar, m+1, right); + +#define X(a,i) ((char*)a+elemsize*(i)) + for (i=m+1; i>left; i--) + memcpy (X(barr,(i-1)),X(arr,(i-1)),elemsize); + for (j=m; j<right; j++) + memcpy (X(barr,(right+m-j)),X(arr,(j+1)),elemsize); + + for (k=left; k<=right; k++) { + /*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/ + if (compar(X(barr,i),X(barr,j))<0) { + memcpy(X(arr,k),X(barr,i),elemsize); + i++; + } else { + memcpy(X(arr,k),X(barr,j),elemsize); + j--; + } + } + } +#undef X +} + +/********************************************************************* + * qsort (NTDLL.@) + */ +void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, + int(__cdecl *compar)(const void *, const void *) ) +{ + void *secondarr = RtlAllocateHeap (GetProcessHeap(), 0, nmemb*size); + mergesort( base, secondarr, size, compar, 0, nmemb-1 ); + RtlFreeHeap (GetProcessHeap(),0, secondarr); +} diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index c9ca3ce..d1178a7 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -93,16 +93,6 @@ void * __cdecl NTDLL_bsearch( const void *key, const void *base, size_t nmemb, /********************************************************************* - * qsort (NTDLL.@) - */ -void __cdecl NTDLL_qsort( void *base, size_t nmemb, size_t size, - int(*compar)(const void *, const void *) ) -{ - qsort( base, nmemb, size, compar ); -} - - -/********************************************************************* * _lfind (NTDLL.@) */ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index c1632f7..556db8e 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -57,6 +57,9 @@ static ULONG (WINAPIV *pwcstoul)(LPCWSTR, LPWSTR *, INT); static LPWSTR (WINAPIV *p_wcschr)(LPCWSTR, WCHAR); static LPWSTR (WINAPIV *p_wcsrchr)(LPCWSTR, WCHAR); +static void (__cdecl *p_qsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); + + static void InitFunctionPtrs(void) { hntdll = LoadLibraryA("ntdll.dll"); @@ -90,6 +93,7 @@ static void InitFunctionPtrs(void) p_wcschr= (void *)GetProcAddress(hntdll, "wcschr"); p_wcsrchr= (void *)GetProcAddress(hntdll, "wcsrchr"); + p_qsort= (void *)GetProcAddress(hntdll, "qsort"); } /* if */ } @@ -1137,6 +1141,59 @@ static void test_wcsrchr(void) "wcsrchr should have returned NULL\n"); } +static __cdecl int intcomparefunc(const void *a, const void*b) +{ + return (*(int*)a) - (*(int*)b); +} + +static __cdecl int charcomparefunc(const void *a, const void*b) +{ + return (*(char*)a) - (*(char*)b); +} + +static __cdecl int strcomparefunc(const void *a, const void*b) +{ + return lstrcmpA(*(char**)a,*(char**)b); +} + +static void test_qsort(void) +{ + int arr[5] = { 23, 42, 8, 4, 16 }; + char carr[5] = { 42, 23, 4, 8, 16 }; + const char *strarr[7] = { + "Hello", + "Wine", + "World", + "!", + "Hopefully", + "Sorted", + "." + }; + + p_qsort ((void*)arr, 5, sizeof(int), intcomparefunc); + ok(arr[0] == 4, "badly sorted, arr[0] is %d\n", arr[0]); + ok(arr[1] == 8, "badly sorted, arr[1] is %d\n", arr[1]); + ok(arr[2] == 16, "badly sorted, arr[2] is %d\n", arr[2]); + ok(arr[3] == 23, "badly sorted, arr[3] is %d\n", arr[3]); + ok(arr[4] == 42, "badly sorted, arr[4] is %d\n", arr[4]); + + p_qsort ((void*)carr, 5, sizeof(char), charcomparefunc); + ok(carr[0] == 4, "badly sorted, carr[0] is %d\n", carr[0]); + ok(carr[1] == 8, "badly sorted, carr[1] is %d\n", carr[1]); + ok(carr[2] == 16, "badly sorted, carr[2] is %d\n", carr[2]); + ok(carr[3] == 23, "badly sorted, carr[3] is %d\n", carr[3]); + ok(carr[4] == 42, "badly sorted, carr[4] is %d\n", carr[4]); + + p_qsort ((void*)strarr, 7, sizeof(char*), strcomparefunc); + ok(!strcmp(strarr[0],"!"), "badly sorted, strarr[0] is %s\n", strarr[0]); + ok(!strcmp(strarr[1],"."), "badly sorted, strarr[1] is %s\n", strarr[1]); + ok(!strcmp(strarr[2],"Hello"), "badly sorted, strarr[2] is %s\n", strarr[2]); + ok(!strcmp(strarr[3],"Hopefully"), "badly sorted, strarr[3] is %s\n", strarr[3]); + ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); + ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); + ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); +} + START_TEST(string) { InitFunctionPtrs(); @@ -1165,4 +1222,6 @@ START_TEST(string) test_atoi(); if (patol) test_atol(); + if (p_qsort) + test_qsort(); }
1
0
0
0
Thomas Mullaly : urlmon/tests: Added a new test file for testing the IUri interface.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 4f0a267dc81ee48c35b3e7f85e07e6e80ce5a5c9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4f0a267dc81ee48c35b3e7f85…
Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun May 9 21:23:34 2010 -0400 urlmon/tests: Added a new test file for testing the IUri interface. --- dlls/urlmon/tests/Makefile.in | 1 + dlls/urlmon/tests/uri.c | 99 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 3f621d6..10b26e5 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ protocol.c \ sec_mgr.c \ stream.c \ + uri.c \ url.c @MAKE_TEST_RULES@ diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c new file mode 100644 index 0000000..1a7effb --- /dev/null +++ b/dlls/urlmon/tests/uri.c @@ -0,0 +1,99 @@ +/* + * UrlMon IUri tests + * + * Copyright 2010 Thomas Mullaly + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * IUri testing framework goals: + * - Test invalid flags + * - Test parsing for components when no canonicalization occurs + * - Test parsing for components when canonicalization occurs. + * - More tests... + */ + +#include <wine/test.h> +#include <stdarg.h> +#include <stddef.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "urlmon.h" + +/** TODO: Work on this! +typedef struct _uri_component_test_str { + const char* uri; + DWORD create_flags; + HRESULT create_hres; + DWORD property; + DWORD property_flags; + HRESULT property_hres; + const char* expected; +} uri_component_test_str; + +static const uri_component_test_str URI_STR_PARSE_ONLY_TESTS[] = { + {"
http://www.winehq.org
", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "http"}, + {"file://c:/test/test.mp3", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "file"} +}; +*/ + + +typedef struct _uri_create_flag_test { + DWORD flags; + HRESULT expected; +} uri_create_flag_test; + +static const uri_create_flag_test URI_INVALID_CREATE_FLAGS[] = { + /* Set of invalid flag combinations to test for. */ + {Uri_CREATE_DECODE_EXTRA_INFO | Uri_CREATE_NO_DECODE_EXTRA_INFO, E_INVALIDARG}, + {Uri_CREATE_CANONICALIZE | Uri_CREATE_NO_CANONICALIZE, E_INVALIDARG}, + {Uri_CREATE_CRACK_UNKNOWN_SCHEMES | Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES, E_INVALIDARG}, + {Uri_CREATE_PRE_PROCESS_HTML_URI | Uri_CREATE_NO_PRE_PROCESS_HTML_URI, E_INVALIDARG}, + {Uri_CREATE_IE_SETTINGS | Uri_CREATE_NO_IE_SETTINGS, E_INVALIDARG} +}; + +static void test_create_flags(LPCWSTR uriW, uri_create_flag_test test) { + HRESULT hr; + IUri *uri = NULL; + + hr = CreateUri(uriW, test.flags, 0, &uri); + ok(hr == test.expected, "Error: CreateUri returned 0x%08x, expected 0x%08x", hr, test.expected); + + if(uri) { IUri_Release(uri); } +} + +/* + * Simple tests to make sure the CreateUri function handles invalid flag combinations + * correctly. + */ +static void test_CreateUri_InvalidFlags(void) { + static const WCHAR INVALID_URL[] = {'I','N','V','A','L','I','D',0}; + DWORD i; + + for(i = 0; i < sizeof(URI_INVALID_CREATE_FLAGS)/sizeof(URI_INVALID_CREATE_FLAGS[0]); ++i) { + test_create_flags(INVALID_URL, URI_INVALID_CREATE_FLAGS[i]); + } +} + +START_TEST(uri) { + todo_wine { + trace("test CreateUri invalid flags...\n"); + test_CreateUri_InvalidFlags(); + } +}
1
0
0
0
Katayama Hirofumi MZ : wordpad: Add units (in/inch/pt).
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: c92691e1f5c03a33d25c3f42c565a0a9333ad32c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c92691e1f5c03a33d25c3f42c…
Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Date: Sat May 8 10:23:06 2010 +0900 wordpad: Add units (in/inch/pt). --- programs/wordpad/En.rc | 3 + programs/wordpad/wordpad.c | 106 ++++++++++++++++++++++++++++++++------------ programs/wordpad/wordpad.h | 3 + 3 files changed, 83 insertions(+), 29 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=c92691e1f5c03a33d25c3…
1
0
0
0
Gerald Pfeifer : comctl32: Remove unused parameter bEnable from LISTVIEW_Enable.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 1bca01cbc1ac74f07ad80eeae4e5fcf23d379732 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1bca01cbc1ac74f07ad80eeae…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 15:06:02 2010 +0200 comctl32: Remove unused parameter bEnable from LISTVIEW_Enable. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9acf930..d9fb17f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9373,7 +9373,7 @@ static LRESULT LISTVIEW_Destroy(LISTVIEW_INFO *infoPtr) * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_Enable(const LISTVIEW_INFO *infoPtr, BOOL bEnable) +static BOOL LISTVIEW_Enable(const LISTVIEW_INFO *infoPtr) { if (infoPtr->dwStyle & LVS_OWNERDRAWFIXED) InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); @@ -11405,7 +11405,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_Destroy(infoPtr); case WM_ENABLE: - return LISTVIEW_Enable(infoPtr, (BOOL)wParam); + return LISTVIEW_Enable(infoPtr); case WM_ERASEBKGND: return LISTVIEW_EraseBkgnd(infoPtr, (HDC)wParam);
1
0
0
0
Gerald Pfeifer : comctl32: Remove unused parameter fwKeys from LISTVIEW_MouseHover.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 0453154d99e31bc5381aea452590b6cfe9d010b8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0453154d99e31bc5381aea452…
Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 15:05:51 2010 +0200 comctl32: Remove unused parameter fwKeys from LISTVIEW_MouseHover. --- dlls/comctl32/listview.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4c24a67..9acf930 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3669,7 +3669,7 @@ static inline BOOL LISTVIEW_IsHotTracking(const LISTVIEW_INFO *infoPtr) * over the item for a certain period of time. * */ -static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) +static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) { NMHDR hdr; @@ -11438,7 +11438,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_MouseMove (infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_MOUSEHOVER: - return LISTVIEW_MouseHover(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return LISTVIEW_MouseHover(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_NCDESTROY: return LISTVIEW_NCDestroy(infoPtr); @@ -11644,6 +11644,3 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP return 0; } - - -
1
0
0
0
Sven Baars : uninstaller: Fix Dutch translation.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: ac9c0b2169e2762af2f25ca261e96011e318ca74 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ac9c0b2169e2762af2f25ca26…
Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 11 00:28:15 2010 +0200 uninstaller: Fix Dutch translation. --- programs/uninstaller/Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc index 97d2184..c2cceea 100644 --- a/programs/uninstaller/Nl.rc +++ b/programs/uninstaller/Nl.rc @@ -24,5 +24,5 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_APPNAME, "Programma verwijderen" - IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit de registry?" + IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit het register?" }
1
0
0
0
Michael Stefaniuc : qedit: Avoid using long.
by Alexandre Julliard
11 May '10
11 May '10
Module: wine Branch: master Commit: 98fbcc4de2c86f770a9d2dace2fafebed724e97d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=98fbcc4de2c86f770a9d2dace…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 11 10:34:43 2010 +0200 qedit: Avoid using long. --- dlls/qedit/mediadet.c | 6 +++--- dlls/qedit/samplegrabber.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3a13f71..9aeb9c0 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -38,8 +38,8 @@ typedef struct MediaDetImpl { IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; - long num_streams; - long cur_stream; + LONG num_streams; + LONG cur_stream; IPin *cur_pin; } MediaDetImpl; @@ -168,7 +168,7 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) return S_OK; } -static HRESULT SetCurPin(MediaDetImpl *This, long strm) +static HRESULT SetCurPin(MediaDetImpl *This, LONG strm) { IEnumPins *pins; IPin *pin; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 78a7306..78979fe 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -489,7 +489,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) REFERENCE_TIME tStart, tEnd; if (This->bufferLen >= 0) { BYTE *data = 0; - long size = IMediaSample_GetActualDataLength(sample); + LONG size = IMediaSample_GetActualDataLength(sample); if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) { if (!data) size = 0; @@ -527,7 +527,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) case 1: { BYTE *data = 0; - long size = IMediaSample_GetActualDataLength(sample); + LONG size = IMediaSample_GetActualDataLength(sample); if (size && SUCCEEDED(IMediaSample_GetPointer(sample, &data)) && data) ISampleGrabberCB_BufferCB(This->grabberIface, time, data, size); } @@ -535,7 +535,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) case -1: break; default: - FIXME("unsupported method %ld\n", (long int)This->grabberMethod); + FIXME("unsupported method %d\n", This->grabberMethod); /* do not bother us again */ This->grabberMethod = -1; }
1
0
0
0
← Newer
1
...
59
60
61
62
63
64
65
...
96
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
Results per page:
10
25
50
100
200