wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

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 +++++--- … [View More]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]; [View Less]

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(-) … [View More]

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 … [View More]

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/… [View More]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; [View Less]

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 … [View More]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, [View Less]

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 +… [View More]

1 0

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/… [View More]

1 0

Henri Verbeet : wined3d: Remove unused wined3d_shader_limits fields.
by Alexandre Julliard 09 Oct '12

09 Oct '12

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 … [View More]--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__ [View Less]

1 0

Henri Verbeet : wined3d: Fix the SM3 int and bool vs constant limits.
by Alexandre Julliard 09 Oct '12

09 Oct '12

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 … [View More]

1 0

Henri Verbeet : wined3d: wined3d_surface_set_palette() never fails.
by Alexandre Julliard 09 Oct '12

09 Oct '12

Module: wine Branch: master Commit: 9d127a4d36939079c264ada932863d840b719b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d127a4d36939079c264ada93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 8 21:32:40 2012 +0200 wined3d: wined3d_surface_set_palette() never fails. --- dlls/ddraw/surface.c | 7 ++----- dlls/wined3d/surface.c | 6 ++---- include/wine/wined3d.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/… [View More]ddraw/surface.c b/dlls/ddraw/surface.c index 8f68425..1f64a18 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4712,11 +4712,8 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir /* Update the wined3d frontbuffer if this is the frontbuffer. */ if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) && This->ddraw->wined3d_frontbuffer) - { - hr = wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, palette_impl ? palette_impl->wineD3DPalette : NULL); - if (FAILED(hr)) - ERR("Failed to set frontbuffer palette, hr %#x.\n", hr); - } + wined3d_surface_set_palette(This->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); /* If this is a front buffer, also update the back buffers * TODO: How do things work for palettized cube textures? diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 71beb51..7dae771 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3150,14 +3150,14 @@ HRESULT CDECL wined3d_surface_restore(struct wined3d_surface *surface) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) +void CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette) { TRACE("surface %p, palette %p.\n", surface, palette); if (surface->palette == palette) { TRACE("Nop palette change.\n"); - return WINED3D_OK; + return; } if (surface->palette && (surface->resource.usage & WINED3DUSAGE_RENDERTARGET)) @@ -3172,8 +3172,6 @@ HRESULT CDECL wined3d_surface_set_palette(struct wined3d_surface *surface, struc surface->surface_ops->surface_realize_palette(surface); } - - return WINED3D_OK; } HRESULT CDECL wined3d_surface_set_color_key(struct wined3d_surface *surface, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 42b21e6..c15b25b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2344,7 +2344,7 @@ HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); -HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); +void __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_desc(struct wined3d_surface *surface, [View Less]

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012