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

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

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

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

Roderick Colenbrander : wined3d: Use surface_prepare_texture for surface allocation in read_from_framebuffer_texture .
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: b60961ae5573990432b0ba04826db6d7d950074d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60961ae5573990432b0ba048… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon May 10 15:36:31 2010 +0200 wined3d: Use surface_prepare_texture for surface allocation in read_from_framebuffer_texture. --- dlls/wined3d/surface.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bb18b95..db4a58b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1495,7 +1495,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) const struct wined3d_gl_info *gl_info; struct wined3d_context *context; GLint prevRead; - BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any @@ -1504,6 +1503,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) context = context_acquire(device, This); gl_info = context->gl_info; + surface_prepare_texture(This, gl_info, srgb); surface_bind_and_dirtify(This, srgb); ENTER_GL(); @@ -1536,12 +1536,6 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) LEAVE_GL(); } - if (!(This->Flags & alloc_flag)) - { - surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb); - This->Flags |= alloc_flag; - } - ENTER_GL(); /* If !SrcIsUpsideDown we should flip the surface. * This can be done using glCopyTexSubImage2D but this

1 0

André Hentschel : winedev: Fix user32 path.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 24868bf66b9b5570c63c94682a048c01032fa4d3 URL: http://source.winehq.org/git/docs.git/?a=commit;h=24868bf66b9b5570c63c94682… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:41 2010 +0200 winedev: Fix user32 path. --- en/winedev-testing.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 1fac42b..673ff4b 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -118,7 +118,7 @@ results using WM_GETTEXT. Similarly one could create a listbox and check the effect of LB_DELETESTRING on the list's number of items, selected items list, highlighted item, etc. For concrete examples, - see <filename>dlls/user/tests/win.c</> and the related tests. + see <filename>dlls/user32/tests/win.c</> and the related tests. </para> <para> However, undocumented behavior should not be tested for unless there

1 0

André Hentschel : winedev: Fix download description of winetest.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 73a9b96a3d01b5404c74676a787201cee41b95de URL: http://source.winehq.org/git/docs.git/?a=commit;h=73a9b96a3d01b5404c74676a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:44 2010 +0200 winedev: Fix download description of winetest. --- en/winedev-testing.sgml | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 673ff4b..7316560 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -249,9 +249,10 @@ thread.c: 86 tests executed, 5 marked as todo, 0 failures. <sect2> <title>Using pre-compiled binaries</title> <para> - The simplest solution is to download the - <ulink url="http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/winetest-latest.exe">latest - version of winetest</>. This executable contains all the Wine + The simplest solution is to visit + <ulink url="http://test.winehq.org">test.winehq.org</> and + download the latest version of winetest at the bottom of the page. + This executable contains all the Wine conformance tests, runs them and reports the results. </para> <para>

1 0

André Hentschel : winedev: There are no platform todos .
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 0d6504ece79ddc1ec020d4032373e1d3178b7e2b URL: http://source.winehq.org/git/docs.git/?a=commit;h=0d6504ece79ddc1ec020d4032… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:56 2010 +0200 winedev: There are no platform todos. --- en/winedev-testing.sgml | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/en/winedev-testing.sgml b/en/winedev-testing.sgml index 7316560..31f15f4 100644 --- a/en/winedev-testing.sgml +++ b/en/winedev-testing.sgml @@ -584,19 +584,7 @@ todo_wine { cause the test to fail, thus making it easy to detect when something has changed that fixes a bug. Also note that todo checks are accounted separately from regular checks so that the testing statistics remain - meaningful. Finally, note that todo sections can be nested so that if - a test only fails on the cygwin and reactos platforms, one would - write: -<screen> -todo("cygwin") { - todo("reactos") { - ... - } -} -</screen> -  - But specific platforms should not be nested inside a todo_wine section - since that would be redundant. + meaningful. </para> <para> When writing tests you will also encounter differences between Windows

1 0

André Hentschel : winedev: Fix a typo.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 1abcda28fb82d19861eccb8c59d4fff0dba2c6e7 URL: http://source.winehq.org/git/docs.git/?a=commit;h=1abcda28fb82d19861eccb8c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:07:08 2010 +0200 winedev: Fix a typo. --- en/winedev-otherdebug.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml index 95ba735..2aa4881 100644 --- a/en/winedev-otherdebug.sgml +++ b/en/winedev-otherdebug.sgml @@ -374,7 +374,7 @@ int main (void) <listitem> <para> Clone the <quote>Git</quote> repository from winehq. - It's more than 90Mb, so you it may take some time with + It's more than 100Mb, so it may take some time with a slow Internet connection. </para> </listitem>

1 0

André Hentschel : winedev: Fix a typo.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: 08fcaf1c4eb71c403d5203e7d2d044b924c4e114 URL: http://source.winehq.org/git/docs.git/?a=commit;h=08fcaf1c4eb71c403d5203e7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:10 2010 +0200 winedev: Fix a typo. --- en/winedev-architecture.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 09c4f96..d946f7d 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -207,7 +207,7 @@ <para> <command>winevdm</command> is the Wine process dedicated to running the Win16 processes. Note that several instances of this process could - exist, has Windows has support for different VDM (Virtual Dos + exist, as Windows has support for different VDM (Virtual Dos Machines) in order to have Win16 processes running in different address spaces. Wine also uses the same architecture to run DOS programs (in this case, the DOS emulation is provided by a Wine only

1 0

André Hentschel : winedev: Start the list smarter.
by Alexandre Julliard 11 May '10

11 May '10

Module: docs Branch: master Commit: c03ad604a455217fac2c2efa1e3e7b83962dd153 URL: http://source.winehq.org/git/docs.git/?a=commit;h=c03ad604a455217fac2c2efa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 21:06:20 2010 +0200 winedev: Start the list smarter. --- en/winedev-architecture.sgml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index d946f7d..92290f5 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -547,7 +547,7 @@ </para> <para> Once an application module wants to import a DLL, Wine - will look at: + will look: <itemizedlist> <listitem> <para>

1 0