October 2012 - Wine-commits

André Hentschel : winemaker: Always use parent project for project files.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 2c3121d5335055eb545f306a882fe61c585e5bee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3121d5335055eb545f306a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 8 23:45:27 2012 +0200 winemaker: Always use parent project for project files. --- tools/winemaker | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 58d6bfe..d23418d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -562,15 +562,7 @@ sub source_scan_project_file($$$) $path.="/"; } - if (defined $opt_single_target or $is_sub_project == 0) { - # Either there is a single target and thus a single project, - # or we are a single project-file for which a project - # already exists - $project=$parent_project; - } else { - $project=[]; - project_init($project, $path, \@global_settings); - } + $project=$parent_project; my $project_settings=@$project[$P_SETTINGS]; if ($filename =~ /.dsp$/i) {

1 0

André Hentschel : winemaker: Include the target specific dll path when linking.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 9b2eb6e6ea7296cc79e3917ce831927142adc0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2eb6e6ea7296cc79e3917ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 8 23:48:27 2012 +0200 winemaker: Include the target specific dll path when linking. --- tools/winemaker | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d23418d..4e32fc1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -2589,7 +2589,7 @@ sub generate_project_files($) } else { print FILEO "\t\$(CC)"; } - print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; + print FILEO " \$(${canon}_LDFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_LIBRARY_PATH) \$(${canon}_DLL_PATH) \$(DEFLIB) \$(${canon}_DLLS:%=-l%) \$(${canon}_LIBRARIES:%=-l%)\n"; } print FILEO "\n\n"; }

1 0

Francois Gouget : shell32/tests: Fix test_one_cmdline() and add a few more tests.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 1e3834aa14a17233c23ac3033481992c9402632b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3834aa14a17233c23ac3033… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 8 23:56:08 2012 +0200 shell32/tests: Fix test_one_cmdline() and add a few more tests. test_one_cmdline() did not check the last parameter. --- dlls/shell32/tests/shlexec.c | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index de5c477..adcd957 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -979,6 +979,9 @@ typedef struct static const cmdline_tests_t cmdline_tests[] = { + {"exe", + {"exe", NULL}, 0}, + {"exe arg1 arg2 \"arg three\" 'four five` six\\ $even)", {"exe", "arg1", "arg2", "arg three", "'four", "five`", "six\\", "$even)", NULL}, 0}, @@ -988,6 +991,13 @@ static const cmdline_tests_t cmdline_tests[] = {"exe arg\"one\" \"second\"arg thirdarg ", {"exe", "argone", "secondarg", "thirdarg", NULL}, 0}, + /* Don't lose unclosed quoted arguments */ + {"exe arg1 \"unclosed", + {"exe", "arg1", "unclosed", NULL}, 0}, + + {"exe arg1 \"", + {"exe", "arg1", "", NULL}, 0}, + /* cmd's metacharacters have no special meaning */ {"exe \"one^\" \"arg\"&two three|four", {"exe", "one^", "arg&two", "three|four", NULL}, 0}, @@ -1073,6 +1083,10 @@ static const cmdline_tests_t cmdline_tests[] = {"exe \"twelve\"\"\"\"\"\"\"\"\"\"\"\" quotes\" next 13%3=1", {"exe", "twelve\"\"\"\" quotes", "next", "13%3=1", NULL}, 0x20}, + /* Escaped consecutive quotes are fun */ + {"exe \"the crazy \\\\\"\"\"\\\\\" quotes", + {"exe", "the crazy \\\"\\", "quotes", NULL}, 0x21}, + /* The executable path has its own rules!!! * - Backslashes have no special meaning. * - If the first character is a quote, then the second quote ends the @@ -1085,7 +1099,10 @@ static const cmdline_tests_t cmdline_tests[] = * argument, the latter is parsed using the regular rules. */ {"exe\"file\"path arg1", - {"exe\"file\"path", "arg1", NULL}, 0x30}, + {"exe\"file\"path", "arg1", NULL}, 0x10}, + + {"exe\"file\"path\targ1", + {"exe\"file\"path", "arg1", NULL}, 0x10}, {"exe\"path\\ arg1", {"exe\"path\\", "arg1", NULL}, 0x31}, @@ -1096,6 +1113,9 @@ static const cmdline_tests_t cmdline_tests[] = {"\"spaced exe\" \"next arg\"", {"spaced exe", "next arg", NULL}, 0}, + {"\"spaced exe\"\t\"next arg\"", + {"spaced exe", "next arg", NULL}, 0}, + {"\"exe\"arg\" one\" argtwo", {"exe", "arg one", "argtwo", NULL}, 0x31}, @@ -1103,13 +1123,13 @@ static const cmdline_tests_t cmdline_tests[] = {"spaced exe\\", "arg1", "arg2", NULL}, 0x11}, {"\"two\"\" arg1 ", - {"two", " arg1 ", NULL}, 0x21}, + {"two", " arg1 ", NULL}, 0x11}, {"\"three\"\"\" arg2", {"three", "", "arg2", NULL}, 0x61}, {"\"four\"\"\"\"arg1", - {"four", "\"arg1", NULL}, 0x21}, + {"four", "\"arg1", NULL}, 0x11}, /* If the first character is a space then the executable path is empty */ {" \"arg\"one argtwo", @@ -1143,9 +1163,9 @@ static BOOL test_one_cmdline(const cmdline_tests_t* test) else todo_wine ok(cl2a_count == count, "%s: expected %d arguments, but got %d\n", test->cmd, count, cl2a_count); - for (i = 0; i < cl2a_count - 1; i++) + for (i = 0; i < cl2a_count; i++) { - if (test->args[i]) + if (i < count) { MultiByteToWideChar(CP_ACP, 0, test->args[i], -1, argW, sizeof(argW)/sizeof(*argW)); if ((test->todo & (1 << (i+4))) == 0) @@ -1250,7 +1270,7 @@ static const argify_tests_t argify_tests[] = /* Only (double-)quotes have a special meaning. */ {"Params23456", "'p2 p3` p4\\ $even", 0x40, {" \"'p2\" \"p3`\" \"p4\\\" \"$even\" \"\"", - {"", "'p2", "p3`", "p4\" $even \"", NULL}, 0}}, + {"", "'p2", "p3`", "p4\" $even \"", NULL}, 0x80}}, {"Params23456", "p=2 p-3 p4\tp4\rp4\np4", 0x1c2, {" \"p=2\" \"p-3\" \"p4\tp4\rp4\np4\" \"\" \"\"", @@ -1272,7 +1292,7 @@ static const argify_tests_t argify_tests[] = {"Params23456789", "three\"\"\"quotes \"p four\" three\"\"\"quotes p6", 0xff3, {" \"three\"\" \"quotes\" \"p four\" \"three\"\" \"quotes\" \"p6\" \"\" \"\"", - {"", "three\"", "quotes", "p four", "three\"", "quotes", "p6", "", "", NULL}, 0x3e1}}, + {"", "three\"", "quotes", "p four", "three\"", "quotes", "p6", "", "", NULL}, 0x7e1}}, {"Params23456789", "four\"\"\"\"quotes \"p three\" four\"\"\"\"quotes p5", 0xf3, {" \"four\"\"quotes\" \"p three\" \"four\"\"quotes\" \"p5\" \"\" \"\" \"\" \"\"", @@ -1319,7 +1339,7 @@ static const argify_tests_t argify_tests[] = {"Params23456789", "\"\"\"\"fourquotes \"p four\" \"\"\"\"fourquotes p7", 0xbf3, {" \"\"\" \"fourquotes\" \"p four\" \"\"\" \"fourquotes\" \"p7\" \"\" \"\"", - {"", "\"", "fourquotes", "p four", "\"", "fourquotes", "p7", "", "", NULL}, 0x3e1}}, + {"", "\"", "fourquotes", "p four", "\"", "fourquotes", "p7", "", "", NULL}, 0x7e1}}, /* An unclosed quoted string gets lost! */ {"Params23456", "p2 \"p3\" \"p4 is lost", 0x1c3,

1 0

Francois Gouget : shell32: Simplify CommandLineToArgvW() a bit.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 35004f84a27aa00e107b3de06a6db3dd9db871b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35004f84a27aa00e107b3de06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 9 00:13:35 2012 +0200 shell32: Simplify CommandLineToArgvW() a bit. --- dlls/shell32/shell32_main.c | 80 ++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 5553e55..827cbfc 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -76,19 +76,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); * - '\' that are not followed by a '"' are copied literally * 'a\b' -> 'a\b' * 'a\\b' -> 'a\\b' - * - * Note: - * '\t' == 0x0009 - * ' ' == 0x0020 - * '"' == 0x0022 - * '\\' == 0x005c */ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) { DWORD argc; LPWSTR *argv; - LPCWSTR cs; - LPWSTR arg,s,d; + LPCWSTR s; + LPWSTR d; LPWSTR cmdline; int in_quotes,bcount; @@ -124,32 +118,29 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) return argv; } - /* to get a writable copy */ - argc=0; + /* --- First count the arguments */ + argc=1; bcount=0; in_quotes=0; - cs=lpCmdline; - while (1) + s=lpCmdline; + while (*s) { - if (*cs==0 || ((*cs==0x0009 || *cs==0x0020) && !in_quotes)) + if (((*s==' ' || *s=='\t') && !in_quotes)) { - /* space */ - argc++; - /* skip the remaining spaces */ - while (*cs==0x0009 || *cs==0x0020) { - cs++; - } - if (*cs==0) - break; + /* skip to the next argument and count it if any */ + while (*s==' ' || *s=='\t') + s++; + if (*s) + argc++; bcount=0; continue; } - else if (*cs==0x005c) + else if (*s=='\\') { /* '\', count them */ bcount++; } - else if ((*cs==0x0022) && ((bcount & 1)==0)) + else if ((*s=='"') && ((bcount & 1)==0)) { /* unescaped '"' */ in_quotes=!in_quotes; @@ -160,10 +151,12 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* a regular character */ bcount=0; } - cs++; + s++; } - /* Allocate in a single lump, the string array, and the strings that go with it. - * This way the caller can make a single GlobalFree call to free both, as per MSDN. + + /* Allocate in a single lump, the string array, and the strings that go + * with it. This way the caller can make a single LocalFree() call to free + * both, as per MSDN. */ argv=LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(strlenW(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) @@ -171,36 +164,33 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) cmdline=(LPWSTR)(argv+argc); strcpyW(cmdline, lpCmdline); - argc=0; + /* --- Then split and copy the arguments */ + argc=1; bcount=0; in_quotes=0; - arg=d=s=cmdline; + s=argv[0]=d=cmdline; while (*s) { - if ((*s==0x0009 || *s==0x0020) && !in_quotes) + if ((*s==' ' || *s=='\t') && !in_quotes) { - /* Close the argument and copy it */ - *d=0; - argv[argc++]=arg; + /* close the argument */ + *d++=0; + bcount=0; - /* skip the remaining spaces */ + /* skip to the next one and initialize it if any */ do { s++; - } while (*s==0x0009 || *s==0x0020); - - /* Start with a new argument */ - arg=d=s; - bcount=0; + } while (*s==' ' || *s=='\t'); + if (*s) + argv[argc++]=d; } - else if (*s==0x005c) + else if (*s=='\\') { - /* '\\' */ *d++=*s++; bcount++; } - else if (*s==0x0022) + else if (*s=='"') { - /* '"' */ if ((bcount & 1)==0) { /* Preceded by an even number of '\', this is half that @@ -228,11 +218,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) bcount=0; } } - if (*arg) - { - *d='\0'; - argv[argc++]=arg; - } + *d='\0'; *numargs=argc; return argv;

1 0

Francois Gouget : shell32: Fix CommandLineToArgvW()' s handling of the executable path and consecutive quotes.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 40b01c1bfc6635775c2a13485d31340062423356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b01c1bfc6635775c2a13485… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 9 00:13:48 2012 +0200 shell32: Fix CommandLineToArgvW()'s handling of the executable path and consecutive quotes. --- dlls/shell32/shell32_main.c | 134 +++++++++++++++++++++++++++++++++-------- dlls/shell32/tests/shlexec.c | 64 ++++++++++---------- 2 files changed, 140 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b01c1bfc6635775c2a1…

1 0

Francois Gouget : shell32: Don' t expand environment variables in ShellExecute()'s parameters argument.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 0c989fb078666064728af78b4973fcd96361f814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c989fb078666064728af78b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Oct 9 00:13:54 2012 +0200 shell32: Don't expand environment variables in ShellExecute()'s parameters argument. --- dlls/shell32/shlexec.c | 17 ----------------- dlls/shell32/tests/shlexec.c | 2 +- 2 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index de6c0f9..a714fe8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1740,23 +1740,6 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) sei_tmp.lpFile = wszApplicationName; } - if (*sei_tmp.lpParameters) - { - len = ExpandEnvironmentStringsW(sei_tmp.lpParameters, NULL, 0); - if (len > 0) - { - LPWSTR buf; - len++; - buf = HeapAlloc(GetProcessHeap(),0,len*sizeof(WCHAR)); - ExpandEnvironmentStringsW(sei_tmp.lpParameters, buf, len); - if (wszParameters != parametersBuffer) - HeapFree(GetProcessHeap(), 0, wszParameters); - wszParameters = buf; - parametersLen = len; - sei_tmp.lpParameters = wszParameters; - } - } - if (*sei_tmp.lpDirectory) { len = ExpandEnvironmentStringsW(sei_tmp.lpDirectory, NULL, 0); diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ac68ad0..69b466e 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -1354,7 +1354,7 @@ static const argify_tests_t argify_tests[] = {"", "\" p\\three pfour\"", "pfive", "", NULL}, 0}}, /* Environment variables are left untouched. */ - {"Params23456", "%TMPDIR% %t %c", 0x12, + {"Params23456", "%TMPDIR% %t %c", 0, {" \"%TMPDIR%\" \"%t\" \"%c\" \"\" \"\"", {"", "%TMPDIR%", "%t", "%c", "", "", NULL}, 0}},

1 0

Alexandre Julliard : server: Add flags in the set_window_pos request to inform the server about the window surface .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 20768173baa713719640c4be96fc083d11a2ba27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20768173baa713719640c4be9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 11:32:38 2012 +0200 server: Add flags in the set_window_pos request to inform the server about the window surface. --- dlls/user32/winpos.c | 5 ++++- dlls/winex11.drv/window.c | 2 +- include/wine/server_protocol.h | 8 +++++--- server/protocol.def | 6 ++++-- server/request.h | 3 ++- server/trace.c | 3 ++- server/window.c | 20 ++++++++++++++------ 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index c866a5d..7a0d8f9 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1978,7 +1978,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, { req->handle = wine_server_user_handle( hwnd ); req->previous = wine_server_user_handle( insert_after ); - req->flags = swp_flags; + req->swp_flags = swp_flags; req->window.left = window_rect->left; req->window.top = window_rect->top; req->window.right = window_rect->right; @@ -1993,6 +1993,9 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!IsRectEmpty( &valid_rects[0] )) wine_server_add_data( req, valid_rects, 2 * sizeof(*valid_rects) ); } + if (new_surface) req->paint_flags |= SET_WINPOS_PAINT_SURFACE; + if (win->pixel_format) req->paint_flags |= SET_WINPOS_PIXEL_FORMAT; + if ((ret = !wine_server_call( req ))) { win->dwStyle = reply->new_style; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7c8f391..386db2c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1608,7 +1608,7 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) { req->handle = wine_server_user_handle( hwnd ); req->previous = 0; - req->flags = SWP_NOZORDER; + req->swp_flags = SWP_NOZORDER; req->window.left = virtual_screen_rect.left; req->window.top = virtual_screen_rect.top; req->window.right = virtual_screen_rect.right; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index db9c60b..5d8ac26 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3312,7 +3312,8 @@ struct get_window_tree_reply struct set_window_pos_request { struct request_header __header; - unsigned int flags; + unsigned short swp_flags; + unsigned short paint_flags; user_handle_t handle; user_handle_t previous; rectangle_t window; @@ -3325,7 +3326,8 @@ struct set_window_pos_reply unsigned int new_style; unsigned int new_ex_style; }; - +#define SET_WINPOS_PAINT_SURFACE 0x01 +#define SET_WINPOS_PIXEL_FORMAT 0x02 struct get_window_rectangles_request @@ -5690,6 +5692,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 435 +#define SERVER_PROTOCOL_VERSION 436 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index a4bb626..6403338 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2391,7 +2391,8 @@ enum message_type /* Set the position and Z order of a window */ @REQ(set_window_pos) - unsigned int flags; /* SWP_* flags */ + unsigned short swp_flags; /* SWP_* flags */ + unsigned short paint_flags; /* paint flags (see below) */ user_handle_t handle; /* handle to the window */ user_handle_t previous; /* previous window in Z order */ rectangle_t window; /* window rectangle (in parent coords) */ @@ -2401,7 +2402,8 @@ enum message_type unsigned int new_style; /* new window style */ unsigned int new_ex_style; /* new window extended style */ @END - +#define SET_WINPOS_PAINT_SURFACE 0x01 /* window has a paintable surface */ +#define SET_WINPOS_PIXEL_FORMAT 0x02 /* window has a custom pixel format */ /* Get the window and client rectangles of a window */ @REQ(get_window_rectangles) diff --git a/server/request.h b/server/request.h index 7ec16cf..c36fd16 100644 --- a/server/request.h +++ b/server/request.h @@ -1588,7 +1588,8 @@ C_ASSERT( FIELD_OFFSET(struct get_window_tree_reply, last_sibling) == 28 ); C_ASSERT( FIELD_OFFSET(struct get_window_tree_reply, first_child) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_window_tree_reply, last_child) == 36 ); C_ASSERT( sizeof(struct get_window_tree_reply) == 40 ); -C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, flags) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, swp_flags) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, paint_flags) == 14 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, handle) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, previous) == 20 ); C_ASSERT( FIELD_OFFSET(struct set_window_pos_request, window) == 24 ); diff --git a/server/trace.c b/server/trace.c index b7b3b10..f781a00 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2815,7 +2815,8 @@ static void dump_get_window_tree_reply( const struct get_window_tree_reply *req static void dump_set_window_pos_request( const struct set_window_pos_request *req ) { - fprintf( stderr, " flags=%08x", req->flags ); + fprintf( stderr, " swp_flags=%04x", req->swp_flags ); + fprintf( stderr, ", paint_flags=%04x", req->paint_flags ); fprintf( stderr, ", handle=%08x", req->handle ); fprintf( stderr, ", previous=%08x", req->previous ); dump_rectangle( ", window=", &req->window ); diff --git a/server/window.c b/server/window.c index a5a8853..a7ac05c 100644 --- a/server/window.c +++ b/server/window.c @@ -93,10 +93,15 @@ struct window char extra_bytes[1]; /* extra bytes storage */ }; -#define PAINT_INTERNAL 0x01 /* internal WM_PAINT pending */ -#define PAINT_ERASE 0x02 /* needs WM_ERASEBKGND */ -#define PAINT_NONCLIENT 0x04 /* needs WM_NCPAINT */ -#define PAINT_DELAYED_ERASE 0x08 /* still needs erase after WM_ERASEBKGND */ +/* flags that can be set by the client */ +#define PAINT_HAS_SURFACE SET_WINPOS_PAINT_SURFACE +#define PAINT_HAS_PIXEL_FORMAT SET_WINPOS_PIXEL_FORMAT +#define PAINT_CLIENT_FLAGS (PAINT_HAS_SURFACE | PAINT_HAS_PIXEL_FORMAT) +/* flags only manipulated by the server */ +#define PAINT_INTERNAL 0x0010 /* internal WM_PAINT pending */ +#define PAINT_ERASE 0x0020 /* needs WM_ERASEBKGND */ +#define PAINT_NONCLIENT 0x0040 /* needs WM_NCPAINT */ +#define PAINT_DELAYED_ERASE 0x0080 /* still needs erase after WM_ERASEBKGND */ /* growable array of user handles */ struct user_handle_array @@ -920,7 +925,8 @@ static void set_region_client_rect( struct region *region, struct window *win ) /* get the top-level window to clip against for a given window */ static inline struct window *get_top_clipping_window( struct window *win ) { - while (win->parent && !is_desktop_window(win->parent)) win = win->parent; + while (!(win->paint_flags & PAINT_HAS_SURFACE) && win->parent && !is_desktop_window(win->parent)) + win = win->parent; return win; } @@ -2102,7 +2108,7 @@ DECL_HANDLER(set_window_pos) rectangle_t window_rect, client_rect, visible_rect; struct window *previous = NULL; struct window *win = get_window( req->handle ); - unsigned int flags = req->flags; + unsigned int flags = req->swp_flags; if (!win) return; if (!win->parent) flags |= SWP_NOZORDER; /* no Z order for the desktop */ @@ -2157,6 +2163,8 @@ DECL_HANDLER(set_window_pos) mirror_rect( &win->parent->client_rect, &client_rect ); } + win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); + if (get_req_data_size() >= 3 * sizeof(rectangle_t)) { rectangle_t valid_rects[2];

1 0

Alexandre Julliard : server: Add a request to compute the clipping region of a window surface.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: a52ebb158ef036f131a2386b0703896933840e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52ebb158ef036f131a2386b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 11:47:50 2012 +0200 server: Add a request to compute the clipping region of a window surface. --- include/wine/server_protocol.h | 23 +++++++++- server/protocol.def | 11 ++++ server/request.h | 10 ++++- server/trace.c | 16 ++++++ server/window.c | 99 +++++++++++++++++++++++++++++++++++++++- 5 files changed, 156 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a52ebb158ef036f131a23…

1 0

Alexandre Julliard : server: Add a heuristic to avoid computing surface regions when no pixel format has been set .
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: d0c9d223713044aee3e5515f199920b7c7ec6fec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0c9d223713044aee3e5515f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 15:17:57 2012 +0200 server: Add a heuristic to avoid computing surface regions when no pixel format has been set. --- server/window.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/server/window.c b/server/window.c index 9943452..2b4bc50 100644 --- a/server/window.c +++ b/server/window.c @@ -102,6 +102,7 @@ struct window #define PAINT_ERASE 0x0020 /* needs WM_ERASEBKGND */ #define PAINT_NONCLIENT 0x0040 /* needs WM_NCPAINT */ #define PAINT_DELAYED_ERASE 0x0080 /* still needs erase after WM_ERASEBKGND */ +#define PAINT_PIXEL_FORMAT_CHILD 0x0100 /* at least one child has a custom pixel format */ /* growable array of user handles */ struct user_handle_array @@ -165,6 +166,14 @@ static inline struct window *get_last_child( struct window *win ) return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; } +/* set the PAINT_PIXEL_FORMAT_CHILD flag on all the parents */ +/* note: we never reset the flag, it's just a heuristic */ +static inline void update_pixel_format_flags( struct window *win ) +{ + for (win = win->parent; win && win->parent; win = win->parent) + win->paint_flags |= PAINT_PIXEL_FORMAT_CHILD; +} + /* link a window at the right place in the siblings list */ static void link_window( struct window *win, struct window *previous ) { @@ -244,6 +253,8 @@ static int set_parent_window( struct window *win, struct window *parent ) /* top-level, attach the two threads */ if (parent->thread && parent->thread != win->thread && !is_desktop_window(parent)) attach_thread_input( win->thread, parent->thread ); + + if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); } else /* move it to parent unlinked list */ { @@ -1038,6 +1049,7 @@ static struct region *clip_pixel_format_children( struct window *parent, struct offset_region( clip, offset_x, offset_y ); if (!intersect_region( clip, clip, parent_clip )) break; if (!union_region( region, region, clip )) break; + if (!(ptr->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD))) continue; /* subtract the client rect if it uses a custom pixel format */ set_region_rect( clip, &ptr->client_rect ); @@ -2238,6 +2250,7 @@ DECL_HANDLER(set_window_pos) } win->paint_flags = (win->paint_flags & ~PAINT_CLIENT_FLAGS) | (req->paint_flags & PAINT_CLIENT_FLAGS); + if (win->paint_flags & PAINT_HAS_PIXEL_FORMAT) update_pixel_format_flags( win ); if (get_req_data_size() >= 3 * sizeof(rectangle_t)) { @@ -2256,7 +2269,10 @@ DECL_HANDLER(set_window_pos) reply->new_ex_style = win->ex_style; top = get_top_clipping_window( win ); - if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) reply->surface_win = top->handle; + if (is_visible( top ) && + (top->paint_flags & PAINT_HAS_SURFACE) && + (top->paint_flags & PAINT_PIXEL_FORMAT_CHILD)) + reply->surface_win = top->handle; }

1 0

Alexandre Julliard : user32: Add support for setting the window surface visible region.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: cc7bf355c50b17b2e04f754c80464289df2a9ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7bf355c50b17b2e04f754c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 9 15:21:21 2012 +0200 user32: Add support for setting the window surface visible region. --- dlls/user32/win.c | 6 +++++ dlls/user32/winpos.c | 55 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/bitblt.c | 23 ++++++++++++++++++ include/wine/gdi_driver.h | 1 + 4 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7da4972..66eaf09 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -539,6 +539,11 @@ static RECT *dummy_surface_get_bounds( struct window_surface *window_surface ) return &dummy_bounds; } +static void dummy_surface_set_region( struct window_surface *window_surface, HRGN region ) +{ + /* nothing to do */ +} + static void dummy_surface_flush( struct window_surface *window_surface ) { /* nothing to do */ @@ -555,6 +560,7 @@ static const struct window_surface_funcs dummy_surface_funcs = dummy_surface_unlock, dummy_surface_get_bitmap_info, dummy_surface_get_bounds, + dummy_surface_set_region, dummy_surface_flush, dummy_surface_destroy }; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 7a0d8f9..a04bf2c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1941,6 +1941,57 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) /*********************************************************************** + * update_surface_region + */ +static void update_surface_region( HWND hwnd ) +{ + NTSTATUS status; + HRGN region = 0; + RGNDATA *data; + size_t size = 256; + WND *win = WIN_GetPtr( hwnd ); + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; + if (!win->surface) goto done; + + do + { + if (!(data = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( RGNDATA, Buffer[size] )))) goto done; + + SERVER_START_REQ( get_surface_region ) + { + req->window = wine_server_user_handle( hwnd ); + wine_server_set_reply( req, data->Buffer, size ); + if (!(status = wine_server_call( req ))) + { + size_t reply_size = wine_server_reply_size( reply ); + if (reply_size) + { + data->rdh.dwSize = sizeof(data->rdh); + data->rdh.iType = RDH_RECTANGLES; + data->rdh.nCount = reply_size / sizeof(RECT); + data->rdh.nRgnSize = reply_size; + region = ExtCreateRegion( NULL, size, data ); + OffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); + } + } + else size = reply->total_size; + } + SERVER_END_REQ; + HeapFree( GetProcessHeap(), 0, data ); + } while (status == STATUS_BUFFER_OVERFLOW); + + if (status) goto done; + + win->surface->funcs->set_region( win->surface, region ); + if (region) DeleteObject( region ); + +done: + WIN_ReleasePtr( win ); +} + + +/*********************************************************************** * set_window_pos * * Backend implementation of SetWindowPos. @@ -1949,7 +2000,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) { WND *win; - HWND parent = GetAncestor( hwnd, GA_PARENT ); + HWND surface_win = 0, parent = GetAncestor( hwnd, GA_PARENT ); BOOL ret; int old_width; RECT visible_rect, old_visible_rect, old_window_rect; @@ -2005,6 +2056,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, win->visible_rect = visible_rect; old_surface = win->surface; win->surface = new_surface; + surface_win = wine_server_ptr_handle( reply->surface_win ); if (GetWindowLongW( win->parent, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) { RECT client; @@ -2022,6 +2074,7 @@ BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, if (ret) { + if (surface_win) update_surface_region( surface_win ); if (old_surface != new_surface || ((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) || (swp_flags & (SWP_HIDEWINDOW | SWP_SHOWWINDOW | SWP_STATECHANGED | SWP_FRAMECHANGED))) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index e1812cd..c3cf056 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1848,6 +1848,28 @@ static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface ) } /*********************************************************************** + * x11drv_surface_set_region + */ +static void x11drv_surface_set_region( struct window_surface *window_surface, HRGN region ) +{ + RGNDATA *data; + struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + + TRACE( "updating surface %p with %p\n", surface, region ); + + if (!region) + { + XSetClipMask( gdi_display, surface->gc, None ); + } + else if ((data = X11DRV_GetRegionData( region, 0 ))) + { + XSetClipRectangles( gdi_display, surface->gc, 0, 0, + (XRectangle *)data->Buffer, data->rdh.nCount, YXBanded ); + HeapFree( GetProcessHeap(), 0, data ); + } +} + +/*********************************************************************** * x11drv_surface_flush */ static void x11drv_surface_flush( struct window_surface *window_surface ) @@ -1945,6 +1967,7 @@ static const struct window_surface_funcs x11drv_surface_funcs = x11drv_surface_unlock, x11drv_surface_get_bitmap_info, x11drv_surface_get_bounds, + x11drv_surface_set_region, x11drv_surface_flush, x11drv_surface_destroy }; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index c58803d..e942ed9 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -233,6 +233,7 @@ struct window_surface_funcs void (*unlock)( struct window_surface *surface ); void* (*get_info)( struct window_surface *surface, BITMAPINFO *info ); RECT* (*get_bounds)( struct window_surface *surface ); + void (*set_region)( struct window_surface *surface, HRGN region ); void (*flush)( struct window_surface *surface ); void (*destroy)( struct window_surface *surface ); };

1 0