May 2010 - Wine-Commits - list.winehq.org

Gerald Pfeifer : comctl32/tests: Remove variable hwndheader which is not really used from test_redraw.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Damjan Jovanovic : winemenubuilder: Escape freedesktop exec keys properly.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Alexandre Julliard : server: Return the cursor information for a thread input, and use it for GetCursorInfo.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Marcus Meissner : ntdll: Reimplement qsort() using generic mergesort.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Thomas Mullaly : urlmon/tests: Added a new test file for testing the IUri interface.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Katayama Hirofumi MZ : wordpad: Add units (in/inch/pt).
by Alexandre Julliard May 11, 2010

May 11, 2010

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

André Hentschel : winemaker: Clean up target type handling.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: ebde80574d6249550151802edbc6c920d86e8c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebde80574d6249550151802ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 19:59:01 2010 +0200 winemaker: Clean up target type handling. --- tools/winemaker | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d07c97f..4bd42a4 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -543,7 +543,7 @@ sub source_scan_project_file($$$) my $prj_name; my $found_cfg=0; my $prj_cfg; - my $prj_target_type=1; + my $prj_target_type=$TT_GUIEXE; my @prj_target_options; if (!($path=~/\/$/)) { @@ -591,16 +591,16 @@ sub source_scan_project_file($$$) next; } elsif (/^# TARGTYPE/) { if (/[[:space:]]0x0101$/) { - # Win32 (x86) Application - $prj_target_type=1; + # Application + $prj_target_type=$TT_GUIEXE; }elsif (/[[:space:]]0x0102$/) { - # Win32 (x86) Dynamic-Link Library - $prj_target_type=3; + # Dynamic-Link Library + $prj_target_type=$TT_DLL; }elsif (/[[:space:]]0x0103$/) { - # Win32 (x86) Console Application - $prj_target_type=2; + # Console Application + $prj_target_type=$TT_CUIEXE; }elsif (/[[:space:]]0x0104$/) { - # Win32 (x86) Static Library + # Static Library } next; } elsif (/^# ADD CPP(.*)/ && $found_cfg==1) { @@ -743,7 +743,7 @@ sub source_scan_project_file($$$) # Generate Debug Info } elsif (/^dll$/) { # Build a DLL - $prj_target_type=3; + $prj_target_type=$TT_DLL; } elsif (/^incremental:[[:alpha:]]+$/) { # Link Incrmentally } elsif (/^implib:/) { @@ -898,9 +898,9 @@ sub source_scan_project_file($$$) foreach my $vc_configuration_attr ($vc_configuration->attributes) { if ($vc_configuration_attr->getName eq "ConfigurationType") { if ($vc_configuration_attr->getValue==1) { - $prj_target_type=1; # Win32 (x86) Application + $prj_target_type=$TT_GUIEXE; # Application } elsif ($vc_configuration_attr->getValue==2) { - $prj_target_type=3; # Win32 (x86) Dynamic-Link Library + $prj_target_type=$TT_DLL; # Dynamic-Link Library } } } @@ -994,7 +994,7 @@ sub source_scan_project_file($$$) my $target=[]; target_init($target); - if ($prj_target_type!=3) { + if ($prj_target_type!=$TT_DLL) { $prj_name=lc($prj_name.".exe"); @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target;

1 0

André Hentschel : winemaker: Check for more project files.
by Alexandre Julliard May 11, 2010

May 11, 2010

Module: wine Branch: master Commit: bb8f2c4b17eb10d42106a548708bf54293c4637d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8f2c4b17eb10d42106a5487… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 19:58:12 2010 +0200 winemaker: Check for more project files. --- tools/winemaker | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 60fe31f..d07c97f 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1231,7 +1231,7 @@ sub source_scan_directory($$$$) # If we don't find any executable/library then we might make up targets # from the list of .dsp/.mak files we find since they usually have the # same name as their target. - my @dsp_files=(); + my @prj_files=(); my @mak_files=(); if (defined $opt_single_target or $dirname eq "") { @@ -1291,8 +1291,8 @@ sub source_scan_directory($$$$) if ($dentry =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @$project_settings[$T_FLAGS]|=$TF_MFC; } - } elsif ($dentry =~ /\.dsp$/i) { - push @dsp_files,"$dentry"; + } elsif ($dentry =~ /\.(dsp|vcproj)$/i) { + push @prj_files,"$dentry"; $has_win_project=1; } elsif ($dentry =~ /\.mak$/i) { push @mak_files,"$dentry"; @@ -1353,13 +1353,14 @@ sub source_scan_directory($$$$) if ($target_count == 0) { # Try to come up with a target list based on .dsp/.mak files my $prj_list; - if (@dsp_files > 0) { - $prj_list=\@dsp_files; + if (@prj_files > 0) { + print "Projectfile found! You might want to try using it directly."; + $prj_list=\@prj_files; } else { - $prj_list=\@mak_files; + $prj_list=\@mak_files; } foreach my $filename (@$prj_list) { - $filename =~ s/\.(dsp|mak)$//i; + $filename =~ s/\.(dsp|vcproj|mak)$//i; if ($opt_target_type == $TT_DLL) { $filename = "$filename.dll"; }

1 0

Gerald Pfeifer : comctl32: Remove unused parameter bEnable from LISTVIEW_Enable.
by Alexandre Julliard May 11, 2010

May 11, 2010

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

Gerald Pfeifer : comctl32: Remove unused parameter fwKeys from LISTVIEW_MouseHover.
by Alexandre Julliard May 11, 2010

May 11, 2010

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