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

Alexandre Julliard : winex11: Make the cursor window global instead of per-thread, and send it a message when the cursor changes.
by Alexandre Julliard April 29, 2010

April 29, 2010

Module: wine Branch: master Commit: 6551553fe6393f02787c73e7e1c35c45bd6aafba URL: http://source.winehq.org/git/wine.git/?a=commit;h=6551553fe6393f02787c73e7e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 28 19:23:05 2010 -0500 winex11: Make the cursor window global instead of per-thread, and send it a message when the cursor changes. --- dlls/user32/tests/cursoricon.c | 15 +++++-------- dlls/winex11.drv/mouse.c | 42 +++++++++++++++++++++++---------------- dlls/winex11.drv/window.c | 3 ++ dlls/winex11.drv/x11drv.h | 5 ++- 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c1da70d..2a4100e 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1639,13 +1639,12 @@ static void test_DestroyCursor(void) * ERROR_INVALID_CURSOR_HANDLE. This happens because we called * DestroyCursor() 2+ times after calling SetCursor(). The calls to * GetCursor() and SetCursor(NULL) in between make no difference. */ + SetLastError(0xdeadbeef); ret = DestroyCursor(cursor); - todo_wine { - ok(!ret, "DestroyCursor succeeded.\n"); - error = GetLastError(); - ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ - "Last error: 0x%08x\n", error); - } + todo_wine ok(!ret, "DestroyCursor succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_CURSOR_HANDLE || error == 0xdeadbeef, /* vista */ + "Last error: 0x%08x\n", error); } DeleteObject(cursorInfo.hbmMask); @@ -1664,9 +1663,7 @@ static void test_DestroyCursor(void) SetLastError(0xdeadbeef); SetCursor(cursor); error = GetLastError(); - todo_wine { - ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); - } + ok(error == 0xdeadbeef, "Last error: 0x%08x\n", error); /* Check if LoadCursor() returns the same handle with the same icon. */ cursor2 = LoadCursor(NULL, IDC_ARROW); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index e0e6bb1..5a1a09f 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -86,6 +86,7 @@ static const UINT button_up_flags[NB_BUTTONS] = }; POINT cursor_pos; +static HWND cursor_window; static DWORD last_time_modified; static RECT cursor_clip; /* Cursor clipping rect */ static XContext cursor_context; @@ -206,6 +207,28 @@ Cursor get_x11_cursor( HCURSOR handle ) } /*********************************************************************** + * set_window_cursor + */ +void set_window_cursor( HWND hwnd, HCURSOR handle ) +{ + struct x11drv_win_data *data; + Cursor cursor; + + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + wine_tsx11_lock(); + if ((cursor = get_x11_cursor( handle ))) + { + TRACE( "%p xid %lx\n", handle, cursor ); + XDefineCursor( gdi_display, data->whole_window, cursor ); + /* Make the change take effect immediately */ + XFlush( gdi_display ); + data->cursor = handle; + } + wine_tsx11_unlock(); +} + +/*********************************************************************** * update_mouse_state * * Update the various window states on a mouse event. @@ -216,7 +239,7 @@ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned get_coords( hwnd, window, x, y, pt ); - data->cursor_window = hwnd; + cursor_window = hwnd; /* update the wine server Z-order */ @@ -1012,22 +1035,7 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle ) { - struct x11drv_thread_data *thread_data = x11drv_init_thread_data(); - struct x11drv_win_data *data; - Cursor cursor; - - if (!(data = X11DRV_get_win_data( thread_data->cursor_window ))) return; - - wine_tsx11_lock(); - if ((cursor = get_x11_cursor( handle ))) - { - TRACE( "%p xid %lx\n", handle, cursor ); - XDefineCursor( gdi_display, data->whole_window, cursor ); - /* Make the change take effect immediately */ - XFlush( gdi_display ); - data->cursor = handle; - } - wine_tsx11_unlock(); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 831b7c9..8cd3bf3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2493,6 +2493,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_RESIZE_DESKTOP: X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; + case WM_X11DRV_SET_CURSOR: + set_window_cursor( hwnd, (HCURSOR)lp ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a3f8b7..13afe78 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -546,7 +546,6 @@ struct x11drv_thread_data { Display *display; XEvent *current_event; /* event currently being processed */ - HWND cursor_window; /* current window that contains the cursor */ Window grab_window; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ @@ -714,7 +713,8 @@ enum x11drv_window_messages WM_X11DRV_ACQUIRE_SELECTION = 0x80001000, WM_X11DRV_SET_WIN_FORMAT, WM_X11DRV_SET_WIN_REGION, - WM_X11DRV_RESIZE_DESKTOP + WM_X11DRV_RESIZE_DESKTOP, + WM_X11DRV_SET_CURSOR }; /* _NET_WM_STATE properties that we keep track of */ @@ -782,6 +782,7 @@ extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor get_x11_cursor( HCURSOR handle ); +extern void set_window_cursor( HWND hwnd, HCURSOR handle ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time,

1 0

Matteo Bruni : d3dx9: Add source register modifiers (sm 2+) support to the shader assembler.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: ce3c1dfcb600334ddd8ffb90a23c75b8002b8b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3c1dfcb600334ddd8ffb90a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Apr 21 16:15:46 2010 +0200 d3dx9: Add source register modifiers (sm 2+) support to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 2 ++ dlls/d3dx9_36/asmshader.y | 38 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 31 +++++++++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 1 + dlls/d3dx9_36/d3dx9_36_private.h | 4 ++++ dlls/d3dx9_36/tests/asm.c | 6 +++--- 6 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index a292505..65ecfa5 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -129,6 +129,8 @@ ps_3_0 {return VER_PS30; } $ {return yytext[0]; } $ {return yytext[0]; } +\_abs {return SMOD_ABS; } + {PREPROCESSORDIRECTIVE} { /* TODO: update current line information */ TRACE("line info update: %s", yytext); diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index 18d497e..2c801fc 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -45,6 +45,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %union { unsigned int regnum; struct shader_reg reg; + DWORD srcmod; DWORD writemask; struct { DWORD writemask; @@ -93,6 +94,9 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token MOD_PP %token MOD_CENTROID +/* Source register modifiers */ +%token SMOD_ABS + /* Misc stuff */ %token <component> COMPONENT @@ -100,6 +104,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %type <reg> dreg %type <reg> sreg_name %type <reg> sreg +%type <srcmod> smod %type <writemask> writemask %type <wm_components> wm_components %type <swizzle> swizzle @@ -372,6 +377,34 @@ sreg: sreg_name rel_reg swizzle $$.srcmod = BWRITERSPSM_NONE; set_rel_reg(&$$, &$2); } + | sreg_name rel_reg smod swizzle + { + $$.type = $1.type; + $$.regnum = $1.regnum; + set_rel_reg(&$$, &$2); + $$.srcmod = $3; + $$.swizzle = $4; + } + | '-' sreg_name rel_reg swizzle + { + $$.type = $2.type; + $$.regnum = $2.regnum; + $$.srcmod = BWRITERSPSM_NEG; + set_rel_reg(&$$, &$3); + $$.swizzle = $4; + } + | '-' sreg_name rel_reg smod swizzle + { + $$.type = $2.type; + $$.regnum = $2.regnum; + set_rel_reg(&$$, &$3); + switch($4) { + case BWRITERSPSM_ABS: $$.srcmod = BWRITERSPSM_ABSNEG; break; + default: + FIXME("Unhandled combination of NEGATE and %u\n", $4); + } + $$.swizzle = $5; + } rel_reg: /* empty */ { @@ -379,6 +412,11 @@ rel_reg: /* empty */ $$.additional_offset = 0; } +smod: SMOD_ABS + { + $$ = BWRITERSPSM_ABS; + } + sreg_name: REG_TEMP { $$.regnum = $1; $$.type = BWRITERSPR_TEMP; diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index c3b1737..6a366a4 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -68,6 +68,18 @@ DWORD d3d9_writemask(DWORD bwriter_writemask) { return ret; } +DWORD d3d9_srcmod(DWORD bwriter_srcmod) { + switch(bwriter_srcmod) { + case BWRITERSPSM_NONE: return D3DSPSM_NONE; + case BWRITERSPSM_NEG: return D3DSPSM_NEG; + case BWRITERSPSM_ABS: return D3DSPSM_ABS; + case BWRITERSPSM_ABSNEG: return D3DSPSM_ABSNEG; + default: + FIXME("Unhandled BWRITERSPSM token %u\n", bwriter_srcmod); + return 0; + } +} + DWORD d3d9_dstmod(DWORD bwriter_mod) { DWORD ret = 0; @@ -99,6 +111,16 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { } } +/* Debug print functions */ +const char *debug_print_srcmod(DWORD mod) { + switch(mod) { + case BWRITERSPSM_NEG: return "D3DSPSM_NEG"; + case BWRITERSPSM_ABS: return "D3DSPSM_ABS"; + case BWRITERSPSM_ABSNEG: return "D3DSPSM_ABSNEG"; + default: return "Unknown source modifier\n"; + } +} + const char *debug_print_dstmod(DWORD mod) { switch(mod) { case 0: @@ -196,6 +218,15 @@ const char *debug_print_srcreg(const struct shader_reg *reg, shader_type st) { case BWRITERSPSM_NONE: return wine_dbg_sprintf("%s%s", get_regname(reg, st), debug_print_swizzle(reg->swizzle)); + case BWRITERSPSM_NEG: + return wine_dbg_sprintf("-%s%s", get_regname(reg, st), + debug_print_swizzle(reg->swizzle)); + case BWRITERSPSM_ABS: + return wine_dbg_sprintf("%s_abs%s", get_regname(reg, st), + debug_print_swizzle(reg->swizzle)); + case BWRITERSPSM_ABSNEG: + return wine_dbg_sprintf("-%s_abs%s", get_regname(reg, st), + debug_print_swizzle(reg->swizzle)); } return "Unknown modifier"; } diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index edd3f0f..caf2c4b 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -217,6 +217,7 @@ static void sm_3_srcreg(struct bc_writer *This, token |= reg->regnum & D3DSP_REGNUM_MASK; token |= d3d9_swizzle(reg->swizzle) & D3DVS_SWIZZLE_MASK; + token |= d3d9_srcmod(reg->srcmod); put_dword(buffer, token); } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 00b43c4..dc8c5ad 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -350,6 +350,7 @@ const char *debug_print_opcode(DWORD opcode); /* Utilities for internal->d3d constant mapping */ DWORD d3d9_swizzle(DWORD bwriter_swizzle); DWORD d3d9_writemask(DWORD bwriter_writemask); +DWORD d3d9_srcmod(DWORD bwriter_srcmod); DWORD d3d9_dstmod(DWORD bwriter_mod); DWORD d3d9_register(DWORD bwriter_register); DWORD d3d9_opcode(DWORD bwriter_opcode); @@ -388,6 +389,9 @@ typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { BWRITERSPSM_NONE = 0, + BWRITERSPSM_NEG, + BWRITERSPSM_ABS, + BWRITERSPSM_ABSNEG, } BWRITERSHADER_PARAM_SRCMOD_TYPE; #define BWRITER_SM1_VS 0xfffe diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 6cf8e08..7056ef5 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1053,11 +1053,11 @@ static void vs_3_0_test(void) { "add_sat r0, r0, r1\n", {0xfffe0300, 0x03000002, 0x801f0000, 0x80e40000, 0x80e40001, 0x0000ffff} },*/ -/* {*/ /* shader 8 */ -/* "vs_3_0\n" + { /* shader 8 */ + "vs_3_0\n" "mov r2, r1_abs\n", {0xfffe0300, 0x02000001, 0x800f0002, 0x8be40001, 0x0000ffff} - },*/ + }, { /* shader 9 */ "vs_3_0\n" "mov r2, r1.xygb\n",

1 0

Matteo Bruni : d3dx9: Add instruction modifiers (sm 2.0+) support to the shader assembler.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 004a30a5c3d5608ef6d168a350f30d843051244c URL: http://source.winehq.org/git/wine.git/?a=commit;h=004a30a5c3d5608ef6d168a35… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Apr 21 16:15:46 2010 +0200 d3dx9: Add instruction modifiers (sm 2.0+) support to the shader assembler. --- dlls/d3dx9_36/asmparser.c | 3 ++- dlls/d3dx9_36/asmshader.l | 5 +++++ dlls/d3dx9_36/asmshader.y | 34 ++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 2 ++ dlls/d3dx9_36/d3dx9_36_private.h | 9 +++++++++ 6 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index 1af001b..c810cbb 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -50,7 +50,8 @@ static void asmparser_instr(struct asm_parser *This, DWORD opcode, if(!This->shader) return; - TRACE_(parsed_shader)("%s ", debug_print_opcode(opcode)); + TRACE_(parsed_shader)("%s%s ", debug_print_opcode(opcode), + debug_print_dstmod(mod)); if(dst) { TRACE_(parsed_shader)("%s", debug_print_dstreg(dst, This->shader->type)); firstreg = FALSE; diff --git a/dlls/d3dx9_36/asmshader.l b/dlls/d3dx9_36/asmshader.l index ad1efab..a292505 100644 --- a/dlls/d3dx9_36/asmshader.l +++ b/dlls/d3dx9_36/asmshader.l @@ -119,6 +119,11 @@ ps_3_0 {return VER_PS30; } return COMPONENT; } + /* Output modifiers */ +\_sat {return MOD_SAT; } +\_pp {return MOD_PP; } +\_centroid {return MOD_CENTROID; } + {COMMA} {return yytext[0]; } - {return yytext[0]; } \( {return yytext[0]; } diff --git a/dlls/d3dx9_36/asmshader.y b/dlls/d3dx9_36/asmshader.y index e0117c6..18d497e 100644 --- a/dlls/d3dx9_36/asmshader.y +++ b/dlls/d3dx9_36/asmshader.y @@ -88,6 +88,11 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %token VER_PS2X %token VER_PS30 +/* Output modifiers */ +%token MOD_SAT +%token MOD_PP +%token MOD_CENTROID + /* Misc stuff */ %token <component> COMPONENT @@ -100,6 +105,7 @@ void set_rel_reg(struct shader_reg *reg, struct rel_reg *rel) { %type <swizzle> swizzle %type <sw_components> sw_components %type <modshift> omods +%type <modshift> omodifier %type <rel_reg> rel_reg %type <sregs> sregs @@ -313,6 +319,34 @@ omods: /* Empty */ $$.mod = 0; $$.shift = 0; } + | omods omodifier + { + $$.mod = $1.mod | $2.mod; + if($1.shift && $2.shift) { + asmparser_message(&asm_ctx, "Line %u: More than one shift flag\n", + asm_ctx.line_no); + set_parse_status(&asm_ctx, PARSE_ERR); + $$.shift = $1.shift; + } else { + $$.shift = $1.shift | $2.shift; + } + } + +omodifier: MOD_SAT + { + $$.mod = BWRITERSPDM_SATURATE; + $$.shift = 0; + } + | MOD_PP + { + $$.mod = BWRITERSPDM_PARTIALPRECISION; + $$.shift = 0; + } + | MOD_CENTROID + { + $$.mod = BWRITERSPDM_MSAMPCENTROID; + $$.shift = 0; + } sregs: sreg { diff --git a/dlls/d3dx9_36/asmutils.c b/dlls/d3dx9_36/asmutils.c index 6fd186a..c3b1737 100644 --- a/dlls/d3dx9_36/asmutils.c +++ b/dlls/d3dx9_36/asmutils.c @@ -68,6 +68,16 @@ DWORD d3d9_writemask(DWORD bwriter_writemask) { return ret; } +DWORD d3d9_dstmod(DWORD bwriter_mod) { + DWORD ret = 0; + + if(bwriter_mod & BWRITERSPDM_SATURATE) ret |= D3DSPDM_SATURATE; + if(bwriter_mod & BWRITERSPDM_PARTIALPRECISION) ret |= D3DSPDM_PARTIALPRECISION; + if(bwriter_mod & BWRITERSPDM_MSAMPCENTROID) ret |= D3DSPDM_MSAMPCENTROID; + + return ret; +} + DWORD d3d9_register(DWORD bwriter_register) { if(bwriter_register == BWRITERSPR_TEMP) return D3DSPR_TEMP; if(bwriter_register == BWRITERSPR_CONST) return D3DSPR_CONST; @@ -89,6 +99,33 @@ DWORD d3d9_opcode(DWORD bwriter_opcode) { } } +const char *debug_print_dstmod(DWORD mod) { + switch(mod) { + case 0: + return ""; + + case BWRITERSPDM_SATURATE: + return "_sat"; + case BWRITERSPDM_PARTIALPRECISION: + return "_pp"; + case BWRITERSPDM_MSAMPCENTROID: + return "_centroid"; + + case BWRITERSPDM_SATURATE | BWRITERSPDM_PARTIALPRECISION: + return "_sat_pp"; + case BWRITERSPDM_SATURATE | BWRITERSPDM_MSAMPCENTROID: + return "_sat_centroid"; + case BWRITERSPDM_PARTIALPRECISION | BWRITERSPDM_MSAMPCENTROID: + return "_pp_centroid"; + + case BWRITERSPDM_SATURATE | BWRITERSPDM_PARTIALPRECISION | BWRITERSPDM_MSAMPCENTROID: + return "_sat_pp_centroid"; + + default: + return "Unexpected modifier\n"; + } +} + static const char *get_regname(const struct shader_reg *reg, shader_type st) { switch(reg->type) { case BWRITERSPR_TEMP: diff --git a/dlls/d3dx9_36/bytecodewriter.c b/dlls/d3dx9_36/bytecodewriter.c index f97d2cc..edd3f0f 100644 --- a/dlls/d3dx9_36/bytecodewriter.c +++ b/dlls/d3dx9_36/bytecodewriter.c @@ -233,6 +233,8 @@ static void sm_3_dstreg(struct bc_writer *This, token |= (d3d9reg << D3DSP_REGTYPE_SHIFT2) & D3DSP_REGTYPE_MASK2; token |= reg->regnum & D3DSP_REGNUM_MASK; /* No shift */ + token |= d3d9_dstmod(mod); + token |= d3d9_writemask(reg->writemask); put_dword(buffer, token); } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 7146f99..00b43c4 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -340,6 +340,7 @@ struct bc_writer { }; /* Debug utility routines */ +const char *debug_print_dstmod(DWORD mod); const char *debug_print_dstreg(const struct shader_reg *reg, shader_type st); const char *debug_print_srcreg(const struct shader_reg *reg, shader_type st); const char *debug_print_swizzle(DWORD swizzle); @@ -349,6 +350,7 @@ const char *debug_print_opcode(DWORD opcode); /* Utilities for internal->d3d constant mapping */ DWORD d3d9_swizzle(DWORD bwriter_swizzle); DWORD d3d9_writemask(DWORD bwriter_writemask); +DWORD d3d9_dstmod(DWORD bwriter_mod); DWORD d3d9_register(DWORD bwriter_register); DWORD d3d9_opcode(DWORD bwriter_opcode); @@ -377,6 +379,13 @@ typedef enum _BWRITERSHADER_PARAM_REGISTER_TYPE { #define BWRITERSP_WRITEMASK_3 0x8 /* .w a */ #define BWRITERSP_WRITEMASK_ALL 0xf /* all */ +typedef enum _BWRITERSHADER_PARAM_DSTMOD_TYPE { + BWRITERSPDM_NONE = 0, + BWRITERSPDM_SATURATE = 1, + BWRITERSPDM_PARTIALPRECISION = 2, + BWRITERSPDM_MSAMPCENTROID = 4, +} BWRITERSHADER_PARAM_DSTMOD_TYPE; + typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { BWRITERSPSM_NONE = 0, } BWRITERSHADER_PARAM_SRCMOD_TYPE;

1 0

Hans Leidekker : msi: Move all file comparisons to CostFinalize.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 82fdc926a2cdbc518e7e78c1f02f08c3ab583e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82fdc926a2cdbc518e7e78c1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:30:32 2010 +0200 msi: Move all file comparisons to CostFinalize. File costing can't be done correctly on upgrades unless we know which files are going to be overwritten. --- dlls/msi/action.c | 74 ++++++++++++++++++++++++++++++++++++++--------------- dlls/msi/files.c | 29 -------------------- 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5168cf9..0b23656 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1909,7 +1909,7 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } -static LPWSTR msi_get_disk_file_version( LPCWSTR filename ) +static LPWSTR get_disk_file_version( LPCWSTR filename ) { static const WCHAR name_fmt[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; @@ -1947,7 +1947,36 @@ static LPWSTR msi_get_disk_file_version( LPCWSTR filename ) return strdupW( filever ); } -static UINT msi_check_file_install_states( MSIPACKAGE *package ) +static DWORD get_disk_file_size( LPCWSTR filename ) +{ + HANDLE file; + DWORD size; + + TRACE("%s\n", debugstr_w(filename)); + + file = CreateFileW( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); + if (file == INVALID_HANDLE_VALUE) + return INVALID_FILE_SIZE; + + size = GetFileSize( file, NULL ); + CloseHandle( file ); + return size; +} + +static BOOL hash_matches( MSIFILE *file ) +{ + UINT r; + MSIFILEHASHINFO hash; + + hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); + r = MsiGetFileHashW( file->TargetPath, 0, &hash ); + if (r != ERROR_SUCCESS) + return FALSE; + + return !memcmp( &hash, &file->hash, sizeof(MSIFILEHASHINFO) ); +} + +static UINT set_file_install_states( MSIPACKAGE *package ) { LPWSTR file_version; MSIFILE *file; @@ -1955,6 +1984,7 @@ static UINT msi_check_file_install_states( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { MSICOMPONENT* comp = file->Component; + DWORD file_size; LPWSTR p; if (!comp) @@ -1978,41 +2008,43 @@ static UINT msi_check_file_install_states( MSIPACKAGE *package ) TRACE("file %s resolves to %s\n", debugstr_w(file->File), debugstr_w(file->TargetPath)); - /* don't check files of components that aren't installed */ - if (comp->Installed == INSTALLSTATE_UNKNOWN || - comp->Installed == INSTALLSTATE_ABSENT) - { - file->state = msifs_missing; /* assume files are missing */ - continue; - } - if (GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { file->state = msifs_missing; comp->Cost += file->FileSize; continue; } - - if (file->Version && - (file_version = msi_get_disk_file_version( file->TargetPath ))) + if (file->Version && (file_version = get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), - debugstr_w(file_version)); - /* FIXME: seems like a bad way to compare version numbers */ - if (lstrcmpiW(file_version, file->Version)<0) + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(file_version)); + + if (strcmpiW(file_version, file->Version) < 0) { file->state = msifs_overwrite; comp->Cost += file->FileSize; } else + { + TRACE("Destination file version equal or greater, not overwriting\n"); file->state = msifs_present; + } msi_free( file_version ); + continue; } - else + if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) { file->state = msifs_overwrite; - comp->Cost += file->FileSize; + comp->Cost += file->FileSize - file_size; + continue; + } + if (file->hash.dwFileHashInfoSize && hash_matches( file )) + { + TRACE("File hashes match, not overwriting\n"); + file->state = msifs_present; + continue; } + file->state = msifs_overwrite; + comp->Cost += file->FileSize - file_size; } return ERROR_SUCCESS; @@ -2057,8 +2089,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) ACTION_GetComponentInstallStates(package); ACTION_GetFeatureInstallStates(package); - TRACE("File calculations\n"); - msi_check_file_install_states( package ); + TRACE("Calculating file install states\n"); + set_file_install_states( package ); if (!process_overrides( package, msi_get_property_int( package->db, szlevel, 1 ) )) { diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 14366f4..4445773 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -175,22 +175,6 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) return gle; } -static BOOL check_dest_hash_matches(MSIFILE *file) -{ - MSIFILEHASHINFO hash; - UINT r; - - if (!file->hash.dwFileHashInfoSize) - return FALSE; - - hash.dwFileHashInfoSize = sizeof(MSIFILEHASHINFO); - r = MsiGetFileHashW(file->TargetPath, 0, &hash); - if (r != ERROR_SUCCESS) - return FALSE; - - return !memcmp(&hash, &file->hash, sizeof(MSIFILEHASHINFO)); -} - static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -258,19 +242,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; - if (check_dest_hash_matches(file)) - { - TRACE("File hashes match, not overwriting\n"); - continue; - } - - if (MsiGetFileVersionW(file->TargetPath, NULL, NULL, NULL, NULL) == ERROR_SUCCESS && - msi_compare_file_version(file) >= 0) - { - TRACE("Destination file version greater, not overwriting\n"); - continue; - } - if (file->Sequence > mi->last_sequence || mi->is_continuous || (file->IsCompressed && !mi->is_extracted)) {

1 0

Matteo Bruni : d3dx9: Add swizzle and writemask support to the shader assembler.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 9019267bfaffff28da02cb0dc87a5fc7f2b0168c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9019267bfaffff28da02cb0dc… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Apr 21 16:15:46 2010 +0200 d3dx9: Add swizzle and writemask support to the shader assembler. --- dlls/d3dx9_36/asmshader.l | 30 +++++++++++ dlls/d3dx9_36/asmshader.y | 100 ++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/asmutils.c | 56 ++++++++++++++++++++- dlls/d3dx9_36/d3dx9_36_private.h | 10 ++++ dlls/d3dx9_36/tests/asm.c | 11 ++++ 5 files changed, 202 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9019267bfaffff28da02c…

1 0

Hans Leidekker : msi: Always evaluate component conditions.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 9af488d236beb6291134243de3fe3b1660ba7669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9af488d236beb6291134243de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:30:10 2010 +0200 msi: Always evaluate component conditions. Fixes a regression caused by 0d770c96fe3172a7db64d7efb7819a70a6352370. --- dlls/msi/action.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7f2fd7e..5168cf9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2062,7 +2062,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) if (!process_overrides( package, msi_get_property_int( package->db, szlevel, 1 ) )) { - TRACE("Evaluating Condition Table\n"); + TRACE("Evaluating feature conditions\n"); rc = MSI_DatabaseOpenViewW( package->db, ConditionQuery, &view ); if (rc == ERROR_SUCCESS) @@ -2070,18 +2070,18 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) rc = MSI_IterateRecords( view, NULL, ITERATE_CostFinalizeConditions, package ); msiobj_release( &view->hdr ); } + } + TRACE("Evaluating component conditions\n"); - TRACE("Enabling or Disabling Components\n"); - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) + { + if (MSI_EvaluateConditionW( package, comp->Condition ) == MSICONDITION_FALSE) { - if (MSI_EvaluateConditionW( package, comp->Condition ) == MSICONDITION_FALSE) - { - TRACE("Disabling component %s\n", debugstr_w(comp->Component)); - comp->Enabled = FALSE; - } - else - comp->Enabled = TRUE; + TRACE("Disabling component %s\n", debugstr_w(comp->Component)); + comp->Enabled = FALSE; } + else + comp->Enabled = TRUE; } msi_set_property( package->db, szCosting, szOne );

1 0

Hans Leidekker : msi/tests: Return INVALID_FILE_SIZE from get_pf_file_size if the file can't be opened .
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: f23bf7a460c559e567015a06c7f315599fff28ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23bf7a460c559e567015a06c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:29:14 2010 +0200 msi/tests: Return INVALID_FILE_SIZE from get_pf_file_size if the file can't be opened. So we can distinguish a zero-sized file from a file that doesn't exist. --- dlls/msi/tests/install.c | 2 +- dlls/msi/tests/patch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0bf7a6a..da4e383 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -7207,7 +7207,7 @@ static DWORD get_pf_file_size(LPCSTR file) hfile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hfile == INVALID_HANDLE_VALUE) - return 0; + return INVALID_FILE_SIZE; size = GetFileSize(hfile, NULL); CloseHandle(hfile); diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 41651ab..ff6d399 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -213,7 +213,7 @@ static DWORD get_pf_file_size( const char *filename ) file = CreateFileA( path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ); if (file == INVALID_HANDLE_VALUE) - return 0; + return INVALID_FILE_SIZE; size = GetFileSize( file, NULL ); CloseHandle( file );

1 0

Hans Leidekker : msi: Only set the property in the Reinstall event.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: d9510f5962560a122e3ac93073c32a7d0ee8be85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9510f5962560a122e3ac9307… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:29:31 2010 +0200 msi: Only set the property in the Reinstall event. --- dlls/msi/events.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/msi/events.c b/dlls/msi/events.c index 190fea3..4ed395b 100644 --- a/dlls/msi/events.c +++ b/dlls/msi/events.c @@ -386,19 +386,7 @@ static UINT ControlEvent_ReinstallMode(MSIPACKAGE *package, LPCWSTR argument, static UINT ControlEvent_Reinstall( MSIPACKAGE *package, LPCWSTR argument, msi_dialog *dialog ) { - static const WCHAR szReinstallEq[] = {'R','E','I','N','S','T','A','L','L','=',0}; - UINT r = ERROR_OUTOFMEMORY; - WCHAR *cmd; - - cmd = msi_alloc( (strlenW( szReinstallEq ) + strlenW( argument ) + 1) * sizeof(WCHAR) ); - if (cmd) - { - strcpyW( cmd, szReinstallEq ); - strcatW( cmd, argument ); - r = MsiConfigureProductExW( package->ProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, cmd ); - msi_free( cmd ); - } - return r; + return msi_set_property( package->db, szReinstall, argument ); } static UINT ControlEvent_ValidateProductID(MSIPACKAGE *package, LPCWSTR argument,

1 0

Hans Leidekker : msi/tests: Use a unique product code when testing MsiConfigureFeature parameter validation .
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 43f7bc86875f5dae8f3f21bcc8e4d80b5c8d3617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f7bc86875f5dae8f3f21bcc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 27 13:29:49 2010 +0200 msi/tests: Use a unique product code when testing MsiConfigureFeature parameter validation. This is to avoid ERROR_INSTALL_ALREADY_RUNNING errors on Windows. --- dlls/msi/tests/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 4bc59ac..a05abeb 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -247,10 +247,10 @@ static void test_null(void) r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", NULL, 0); ok( r == ERROR_INVALID_PARAMETER, "wrong error\n"); - r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", "foo", 0); + r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000001}", "foo", 0); ok( r == ERROR_INVALID_PARAMETER, "wrong error %d\n", r); - r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000000}", "foo", INSTALLSTATE_DEFAULT); + r = MsiConfigureFeatureA("{00000000-0000-0000-0000-000000000002}", "foo", INSTALLSTATE_DEFAULT); ok( r == ERROR_UNKNOWN_PRODUCT, "wrong error %d\n", r); /* make sure empty string to MsiGetProductInfo is not a handle to default registry value, saving and restoring the

1 0

Detlef Riekenberg : msvcrt: Fix wrong msvcr90 in comments.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: 1ac16331611827bdd7c72779b9c9747e85e9c346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac16331611827bdd7c72779b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 28 17:44:51 2010 +0200 msvcrt: Fix wrong msvcr90 in comments. --- dlls/msvcrt/string.c | 8 ++++---- dlls/msvcrt/wcs.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 7d578a3..35f44ed 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -472,7 +472,7 @@ MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen) } /********************************************************************* - * _strtoi64_l (MSVCR90.@) + * _strtoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */ @@ -544,7 +544,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, MSVCR } /********************************************************************* - * _strtoi64 (MSVCR90.@) + * _strtoi64 (MSVCRT.@) */ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) { @@ -552,7 +552,7 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) } /********************************************************************* - * _strtoui64_l (MSVCR90.@) + * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */ @@ -618,7 +618,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b } /********************************************************************* - * _strtoui64 (MSVCR90.@) + * _strtoui64 (MSVCRT.@) */ unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int base) { diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ddeb999..5334115 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1486,7 +1486,7 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ } /********************************************************************* - * _wctoi64_l (MSVCR90.@) + * _wctoi64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */ @@ -1559,7 +1559,7 @@ __int64 CDECL MSVCRT__wcstoi64_l(const MSVCRT_wchar_t *nptr, } /********************************************************************* - * _wcstoi64 (MSVCR90.@) + * _wcstoi64 (MSVCRT.@) */ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base) @@ -1568,7 +1568,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, } /********************************************************************* - * _wcstoui64_l (MSVCR90.@) + * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored */ @@ -1635,7 +1635,7 @@ unsigned __int64 CDECL MSVCRT__wcstoui64_l(const MSVCRT_wchar_t *nptr, } /********************************************************************* - * _wcstoui64 (MSVCR90.@) + * _wcstoui64 (MSVCRT.@) */ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, MSVCRT_wchar_t **endptr, int base)

1 0