October 2012 - Wine-Commits

Alexandre Julliard : server: Add a request to compute the clipping region of a window surface.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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 flags in the set_window_pos request to inform the server about the window surface .
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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

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

Oct. 9, 2012

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

Francois Gouget : shell32: Simplify CommandLineToArgvW() a bit.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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/tests: Fix test_one_cmdline() and add a few more tests.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

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

Henri Verbeet : wined3d: Fix the SM3 int and bool vs constant limits.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: eedbdded236727ae3302085ffad527601b2cfeeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eedbdded236727ae3302085ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:41 2012 +0200 wined3d: Fix the SM3 int and bool vs constant limits. Reported by Eduard Munteanu. --- dlls/wined3d/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9223dce..aac19ae 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1796,8 +1796,8 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(3, 0): shader->limits.temporary = 32; - shader->limits.constant_bool = 32; - shader->limits.constant_int = 32; + shader->limits.constant_bool = 16; + shader->limits.constant_int = 16; shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 4;

1 0

Christian Costa : quartz: Fill right RECT structure in SetDefaultTargetRec.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 03086e87ffbf8a59f7a0a71e45fba35e810ef3b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03086e87ffbf8a59f7a0a71e4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 7 22:01:08 2012 +0200 quartz: Fill right RECT structure in SetDefaultTargetRec. --- dlls/quartz/videorenderer.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a045ba8..5e78c55 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -599,10 +599,10 @@ static HRESULT WINAPI VideoRenderer_SetDefaultTargetRect(BaseControlVideo* iface if (!GetClientRect(This->baseControlWindow.baseWindow.hWnd, &rect)) return E_FAIL; - This->SourceRect.left = 0; - This->SourceRect.top = 0; - This->SourceRect.right = rect.right; - This->SourceRect.bottom = rect.bottom; + This->DestRect.left = 0; + This->DestRect.top = 0; + This->DestRect.right = rect.right; + This->DestRect.bottom = rect.bottom; return S_OK; }

1 0

Jacek Caban : mshtml: Wine Gecko 1.8 release.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 0ae458cc94fec9cda7736faf7bd4a2c119c5f717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ae458cc94fec9cda7736faf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 11:26:18 2012 +0200 mshtml: Wine Gecko 1.8 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/nsiface.idl | 175 ++++++++++++++++++++++++++++++----------- dlls/mshtml/script.c | 4 + 4 files changed, 136 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ae458cc94fec9cda7736…

1 0

Jacek Caban : appwiz.cpl: Cache downloaded addon MSI files.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: d18465088705bfbb39e5ee50bd7660773c9de51f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18465088705bfbb39e5ee50b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 9 15:48:47 2012 +0200 appwiz.cpl: Cache downloaded addon MSI files. --- dlls/appwiz.cpl/addons.c | 126 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 111 insertions(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 82a6797..efb6cf0 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -17,10 +17,12 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <fcntl.h> #include <stdio.h> +#include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -105,6 +107,10 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; +static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); +static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; + + /* SHA definitions are copied from advapi32. They aren't available in headers. */ typedef struct { @@ -153,13 +159,7 @@ static BOOL sha_check(const WCHAR *file_name) sprintf(buf + i*2, "%02x", *((unsigned char*)sha+i)); if(strcmp(buf, addon->sha)) { - WCHAR message[256]; - WARN("Got %s, expected %s\n", buf, addon->sha); - - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) - MessageBoxW(NULL, message, NULL, MB_ICONERROR); - return FALSE; } @@ -201,9 +201,6 @@ static enum install_res install_from_unix_file(const char *dir, const char *subd int fd, len; enum install_res ret; - static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); - static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; - len = strlen(dir); file_path = heap_alloc(len+strlen(subdir)+strlen(file_name)+3); if(!file_path) @@ -228,11 +225,8 @@ static enum install_res install_from_unix_file(const char *dir, const char *subd close(fd); - if(!wine_get_dos_file_name) - wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32W), "wine_get_dos_file_name"); - - if(wine_get_dos_file_name) { /* Wine UNIX mode */ - dos_file_name = wine_get_dos_file_name(file_path); + if(p_wine_get_dos_file_name) { /* Wine UNIX mode */ + dos_file_name = p_wine_get_dos_file_name(file_path); if(!dos_file_name) { ERR("Could not get dos file name of %s\n", debugstr_a(file_path)); heap_free(file_path); @@ -334,6 +328,90 @@ static enum install_res install_from_default_dir(void) return ret; } +static WCHAR *get_cache_file_name(BOOL ensure_exists) +{ + const char *home_dir = NULL, *xdg_cache_dir; + size_t len, size = strlen(addon->file_name) + 7; /* strlen("/wine/"), '\0' */ + char *cache_file_name; + WCHAR *ret; + + /* non-Wine (eg. Windows) cache is currently not supported */ + if(!p_wine_get_dos_file_name) + return NULL; + + xdg_cache_dir = getenv("XDG_CACHE_HOME"); + if(xdg_cache_dir && *xdg_cache_dir) { + size += strlen(xdg_cache_dir); + }else { + home_dir = getenv("HOME"); + if(!home_dir) + return NULL; + + size += strlen(home_dir) + 8; /* strlen("/.cache/") */ + } + + cache_file_name = heap_alloc(size); + if(!cache_file_name) + return NULL; + + if(xdg_cache_dir && *xdg_cache_dir) { + len = strlen(xdg_cache_dir); + if(len > 1 && xdg_cache_dir[len-1] == '/') + len--; + memcpy(cache_file_name, xdg_cache_dir, len); + cache_file_name[len] = 0; + }else { + len = strlen(home_dir); + memcpy(cache_file_name, home_dir, len); + strcpy(cache_file_name+len, "/.cache"); + len += 7; + } + + if(ensure_exists && mkdir(cache_file_name, 0777) && errno != EEXIST) { + WARN("%s does not exist and could not be created: %s\n", cache_file_name, strerror(errno)); + heap_free(cache_file_name); + return NULL; + } + + strcpy(cache_file_name+len, "/wine"); + len += 5; + + if(ensure_exists && mkdir(cache_file_name, 0777) && errno != EEXIST) { + WARN("%s does not exist and could not be created: %s\n", cache_file_name, strerror(errno)); + return NULL; + } + + cache_file_name[len++] = '/'; + strcpy(cache_file_name+len, addon->file_name); + ret = p_wine_get_dos_file_name(cache_file_name); + + TRACE("%s -> %s\n", cache_file_name, debugstr_w(ret)); + + heap_free(cache_file_name); + return ret; +} + +static enum install_res install_from_cache(void) +{ + WCHAR *cache_file_name; + enum install_res res; + + cache_file_name = get_cache_file_name(FALSE); + if(!cache_file_name) + return INSTALL_NEXT; + + if(!sha_check(cache_file_name)) { + WARN("could not validate check sum\n"); + DeleteFileW(cache_file_name); + heap_free(cache_file_name); + return INSTALL_NEXT; + } + + res = install_file(cache_file_name); + heap_free(cache_file_name); + return res; +} + static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { @@ -501,8 +579,23 @@ static DWORD WINAPI download_proc(PVOID arg) return 0; } - if(sha_check(tmp_file)) + if(sha_check(tmp_file)) { + WCHAR *cache_file_name; + install_file(tmp_file); + + cache_file_name = get_cache_file_name(TRUE); + if(cache_file_name) { + MoveFileW(tmp_file, cache_file_name); + heap_free(cache_file_name); + } + }else { + WCHAR message[256]; + + if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + MessageBoxW(NULL, message, NULL, MB_ICONERROR); + } + DeleteFileW(tmp_file); EndDialog(install_dialog, 0); return 0; @@ -589,6 +682,8 @@ BOOL install_addon(addon_t addon_type) addon = addons_info+addon_type; + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleW(kernel32_dllW), "wine_get_dos_file_name"); + /* * Try to find addon .msi file in following order: * - directory stored in $dir_config_key value of HKCU/Wine/Software/$config_key key @@ -599,6 +694,7 @@ BOOL install_addon(addon_t addon_type) */ if (install_from_registered_dir() == INSTALL_NEXT && install_from_default_dir() == INSTALL_NEXT + && install_from_cache() == INSTALL_NEXT && (url = get_url())) DialogBoxW(hInst, addon->dialog_template, 0, installer_proc);

1 0

Henri Verbeet : wined3d: Remove unused wined3d_shader_limits fields.
by Alexandre Julliard Oct. 9, 2012

Oct. 9, 2012

Module: wine Branch: master Commit: 07203fa4654b492fbff9e535600bffe48250bf25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07203fa4654b492fbff9e5356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:42 2012 +0200 wined3d: Remove unused wined3d_shader_limits fields. --- dlls/wined3d/shader.c | 46 ---------------------------------------- dlls/wined3d/wined3d_private.h | 5 ---- 2 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index aac19ae..a388606 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1761,21 +1761,16 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) shader->reg_maps.shader_version.minor); struct wined3d_device *device = shader->device; - shader->limits.texcoord = 0; - shader->limits.attributes = 16; shader->limits.packed_input = 0; switch (shader_version) { case WINED3D_SHADER_VERSION(1, 0): case WINED3D_SHADER_VERSION(1, 1): - shader->limits.temporary = 12; shader->limits.constant_bool = 0; shader->limits.constant_int = 0; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 0; /* TODO: vs_1_1 has a minimum of 96 constants. What happens when * a vs_1_1 shader is used on a vs_3_0 capable card that has 256 * constants? */ @@ -1784,24 +1779,18 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(2, 0): case WINED3D_SHADER_VERSION(2, 1): - shader->limits.temporary = 12; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 16; shader->limits.constant_float = min(256, device->d3d_vshader_constantF); break; case WINED3D_SHADER_VERSION(3, 0): - shader->limits.temporary = 32; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 4; - shader->limits.label = 16; /* FIXME: 2048 */ /* DX10 cards on Windows advertise a d3d9 constant limit of 256 * even though they are capable of supporting much more (GL * drivers advertise 1024). d3d9.dll and d3d8.dll clamp the @@ -1811,26 +1800,19 @@ static void vertexshader_set_limits(struct wined3d_shader *shader) break; case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_output = 16; shader->limits.packed_input = 0; - shader->limits.attributes = 16; - shader->limits.label = 16; break; default: - shader->limits.temporary = 12; shader->limits.constant_bool = 16; shader->limits.constant_int = 16; - shader->limits.address = 1; shader->limits.packed_output = 12; shader->limits.sampler = 0; - shader->limits.label = 16; shader->limits.constant_float = min(256, device->d3d_vshader_constantF); FIXME("Unrecognized vertex shader version \"%u.%u\".\n", shader->reg_maps.shader_version.major, @@ -1896,17 +1878,12 @@ static void geometryshader_set_limits(struct wined3d_shader *shader) switch (shader_version) { case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ - shader->limits.texcoord = 0; shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_output = 32; shader->limits.packed_input = 16; - shader->limits.attributes = 0; - shader->limits.label = 16; break; default: @@ -2094,8 +2071,6 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) DWORD shader_version = WINED3D_SHADER_VERSION(shader->reg_maps.shader_version.major, shader->reg_maps.shader_version.minor); - shader->limits.attributes = 0; - shader->limits.address = 0; shader->limits.packed_output = 0; switch (shader_version) @@ -2104,81 +2079,60 @@ static void pixelshader_set_limits(struct wined3d_shader *shader) case WINED3D_SHADER_VERSION(1, 1): case WINED3D_SHADER_VERSION(1, 2): case WINED3D_SHADER_VERSION(1, 3): - shader->limits.temporary = 2; shader->limits.constant_float = 8; shader->limits.constant_int = 0; shader->limits.constant_bool = 0; - shader->limits.texcoord = 4; shader->limits.sampler = 4; shader->limits.packed_input = 0; - shader->limits.label = 0; break; case WINED3D_SHADER_VERSION(1, 4): - shader->limits.temporary = 6; shader->limits.constant_float = 8; shader->limits.constant_int = 0; shader->limits.constant_bool = 0; - shader->limits.texcoord = 6; shader->limits.sampler = 6; shader->limits.packed_input = 0; - shader->limits.label = 0; break; /* FIXME: Temporaries must match D3DPSHADERCAPS2_0.NumTemps. */ case WINED3D_SHADER_VERSION(2, 0): - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; break; case WINED3D_SHADER_VERSION(2, 1): - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; - shader->limits.label = 16; break; case WINED3D_SHADER_VERSION(3, 0): - shader->limits.temporary = 32; shader->limits.constant_float = 224; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 0; shader->limits.sampler = 16; shader->limits.packed_input = 12; - shader->limits.label = 16; /* FIXME: 2048 */ break; case WINED3D_SHADER_VERSION(4, 0): - shader->limits.temporary = 32; /* FIXME: 4096 */ - shader->limits.texcoord = 0; shader->limits.sampler = 16; /* FIXME: 128 resources, 16 sampler states */ shader->limits.constant_int = 0; shader->limits.constant_float = 0; shader->limits.constant_bool = 0; - shader->limits.address = 1; shader->limits.packed_input = 32; - shader->limits.label = 16; break; default: - shader->limits.temporary = 32; shader->limits.constant_float = 32; shader->limits.constant_int = 16; shader->limits.constant_bool = 16; - shader->limits.texcoord = 8; shader->limits.sampler = 16; shader->limits.packed_input = 0; - shader->limits.label = 0; FIXME("Unrecognized pixel shader version %u.%u\n", shader->reg_maps.shader_version.major, shader->reg_maps.shader_version.minor); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5f0f4d..09dbb83 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2553,17 +2553,12 @@ struct wined3d_shader_lconst struct wined3d_shader_limits { - unsigned int temporary; - unsigned int texcoord; unsigned int sampler; unsigned int constant_int; unsigned int constant_float; unsigned int constant_bool; - unsigned int address; unsigned int packed_output; unsigned int packed_input; - unsigned int attributes; - unsigned int label; }; #ifdef __GNUC__

1 0