October 2012 - Wine-Commits

Jason Edmeades : cmd: Change command line parsing away from argv/argc.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: f252e9dfc85303d645ec545f238fd8ee11ff2497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f252e9dfc85303d645ec545f2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Oct 3 00:50:13 2012 +0100 cmd: Change command line parsing away from argv/argc. --- programs/cmd/tests/test_builtins.cmd | 7 +- programs/cmd/tests/test_builtins.cmd.exp | 22 ++-- programs/cmd/wcmdmain.c | 185 +++++++++--------------------- 3 files changed, 76 insertions(+), 138 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3e064b9..bdd6cd0 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1861,7 +1861,12 @@ cmd.exe /c " echo passed2 " echo --- Test 14 cmd.exe /c "dir /ad ..\fooba* /b" echo --- Test 15 - +cmd.exe /cecho No whitespace +echo --- Test 16 +cmd.exe /c +echo --- Test 17 +cmd.exe /c(a)space@ +echo --- Test 18 rem Ensure no interactive prompting when cmd.exe /c or /k echo file2 > file2 cmd.exe /c copy file1 file2 >nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6483f1e..1d004b7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -910,23 +910,23 @@ value1 ------------ cmd.exe command lines ------------ --- Test 1 Line1 -(a)todo_wine@"Line2" +"Line2" --- Test 2 -(a)todo_wine@Test quotes "&" work +Test quotes "&" work --- Test 3 -(a)todo_wine@"&" +"&" --- Test 4 -(a)todo_wine@"<" +"<" --- Test 5 -(a)todo_wine@">" +">" --- Test 6 -(a)todo_wine@"\" +"\" --- Test 7 -(a)todo_wine@"|" +"|" --- Test 8 -(a)todo_wine@"`" +"`" --- Test 9 -(a)todo_wine@""" +""" --- Test 10 --- Test 11 --- Test 12 @@ -936,6 +936,10 @@ passed2(a)space@ --- Test 14 foobar --- Test 15 +No whitespace +--- Test 16 +--- Test 17 +--- Test 18 No prompts or I would not get here1 No prompts or I would not get here2 %hello1% diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 675256b..3c18356 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2300,7 +2300,9 @@ void WCMD_free_commands(CMD_LIST *cmds) { int wmain (int argc, WCHAR *argvW[]) { int args; - WCHAR *cmd; + WCHAR *cmdLine = NULL; + WCHAR *cmd = NULL; + WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; BOOL opt_q; @@ -2318,19 +2320,26 @@ int wmain (int argc, WCHAR *argvW[]) LocalFree(cmd); cmd = NULL; - args = argc; + /* Can't use argc/argv as it will have stripped quotes from parameters + * meaning cmd.exe /C echo "quoted string" is impossible + */ + cmdLine = GetCommandLineW(); + WINE_TRACE("Full commandline '%s'\n", wine_dbgstr_w(cmdLine)); + args = 1; /* start at first arg, skipping cmd.exe itself */ + opt_c = opt_k = opt_q = opt_s = FALSE; - while (args > 0) + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); + while (argPos && argPos[0] != 0x00) { WCHAR c; - WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(*argvW)); - if ((*argvW)[0]!='/' || (*argvW)[1]=='\0') { - argvW++; - args--; + WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(argPos)); + if (argPos[0]!='/' || argPos[1]=='\0') { + args++; + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); continue; } - c=(*argvW)[1]; + c=argPos[1]; if (tolowerW(c)=='c') { opt_c = TRUE; } else if (tolowerW(c)=='q') { @@ -2343,19 +2352,20 @@ int wmain (int argc, WCHAR *argvW[]) unicodeOutput = FALSE; } else if (tolowerW(c)=='u') { unicodeOutput = TRUE; - } else if (tolowerW(c)=='t' && (*argvW)[2]==':') { - opt_t=strtoulW(&(*argvW)[3], NULL, 16); + } else if (tolowerW(c)=='t' && argPos[2]==':') { + opt_t=strtoulW(&argPos[3], NULL, 16); } else if (tolowerW(c)=='x' || tolowerW(c)=='y') { /* Ignored for compatibility with Windows */ } - if ((*argvW)[2]==0) { - argvW++; - args--; + if (argPos[2]==0 || argPos[2]==' ' || argPos[2]=='\t') { + args++; + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); } else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ { - *argvW+=2; + /* Do not step to next paramater, instead carry on parsing this one */ + argPos+=2; } if (opt_c || opt_k) /* break out of parsing immediately after c or k */ @@ -2371,64 +2381,50 @@ int wmain (int argc, WCHAR *argvW[]) interactive = FALSE; if (opt_c || opt_k) { - int len,qcount; - WCHAR** arg; - int argsLeft; - WCHAR* p; + int len; + WCHAR *q1 = NULL,*q2 = NULL,*p; + + /* Handle very edge case error scenarion, "cmd.exe /c" ie when there are no + * parameters after the /C or /K by pretending there was a single space */ + if (argPos == NULL) argPos = (WCHAR *)spaceW; + + /* Build the command to execute - It is what is left in argPos */ + len = strlenW(argPos); + + /* Take a copy */ + cmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!cmd) + exit(1); + strcpyW(cmd, argPos); /* opt_s left unflagged if the command starts with and contains exactly * one quoted string (exactly two quote characters). The quoted string * must be an executable name that has whitespace and must not have the * following characters: &<>()@^| */ - /* Build the command to execute */ - len = 0; - qcount = 0; - argsLeft = args; - for (arg = argvW; argsLeft>0; arg++,argsLeft--) - { - BOOL has_space = FALSE; - int bcount; - WCHAR* a; - - bcount=0; - a=*arg; - if( !*a ) has_space = TRUE; - while (*a!='\0') { - if (*a=='\\') { - bcount++; - } else { - if (*a==' ' || *a=='\t') { - has_space = TRUE; - } else if (*a=='"') { - /* doubling of '\' preceding a '"', - * plus escaping of said '"' - */ - len+=2*bcount+1; - qcount++; - } - bcount=0; - } - a++; - } - len+=(a-*arg) + 1; /* for the separating space */ - if (has_space) - { - len+=2; /* for the quotes */ - qcount+=2; - } + if (!opt_s) { + /* 1. Confirm there is at least one quote */ + q1 = strchrW(argPos, '"'); + if (!q1) opt_s=1; } - /* If there is not exactly 2 quote characters, then /S (old behaviour) is enabled */ - if (qcount!=2) - opt_s = TRUE; + if (!opt_s) { + /* 2. Confirm there is a second quote */ + q2 = strchrW(q1+1, '"'); + if (!q2) opt_s=1; + } - /* check argvW[0] for a space and invalid characters. There must not be any invalid - * characters, but there must be one or more whitespace */ + if (!opt_s) { + /* 3. Ensure there are no more quotes */ + if (strchrW(q2+1, '"')) opt_s=1; + } + + /* check first parameter for a space and invalid characters. There must not be any + * invalid characters, but there must be one or more whitespace */ if (!opt_s) { opt_s = TRUE; - p=*argvW; - while (*p!='\0') { + p=q1; + while (p!=q2) { if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')' || *p=='@' || *p=='^' || *p=='|') { opt_s = TRUE; @@ -2440,73 +2436,6 @@ int wmain (int argc, WCHAR *argvW[]) } } - cmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmd) - exit(1); - - p = cmd; - argsLeft = args; - for (arg = argvW; argsLeft>0; arg++,argsLeft--) - { - BOOL has_space = FALSE, has_quote = FALSE; - WCHAR* a; - - /* Check for quotes and spaces in this argument */ - a=*arg; - if( !*a ) has_space = TRUE; - while (*a!='\0') { - if (*a==' ' || *a=='\t') { - has_space = TRUE; - if (has_quote) - break; - } else if (*a=='"') { - has_quote = TRUE; - if (has_space) - break; - } - a++; - } - - /* Now transfer it to the command line */ - if (has_space) - *p++='"'; - if (has_quote) { - int bcount; - WCHAR* a; - - bcount=0; - a=*arg; - while (*a!='\0') { - if (*a=='\\') { - *p++=*a; - bcount++; - } else { - if (*a=='"') { - int i; - - /* Double all the '\\' preceding this '"', plus one */ - for (i=0;i<=bcount;i++) - *p++='\\'; - *p++='"'; - } else { - *p++=*a; - } - bcount=0; - } - a++; - } - } else { - strcpyW(p,*arg); - p+=strlenW(*arg); - } - if (has_space) - *p++='"'; - *p++=' '; - } - if (p > cmd) - p--; /* remove last space */ - *p = '\0'; - WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); /* Finally, we only stay in new mode IF the first parameter is quoted and

1 0

André Hentschel : inetcpl.cpl: Reuse Internet icon.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: a2db974d191f404ac3651f22bdb01a8ac51513c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2db974d191f404ac3651f22b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 01:17:49 2012 +0200 inetcpl.cpl: Reuse Internet icon. --- dlls/inetcpl.cpl/inetcpl.h | 1 + dlls/inetcpl.cpl/inetcpl.rc | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index bd1e55a..4aae292 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -54,6 +54,7 @@ static inline BOOL heap_free( void *mem ) /* icons */ #define ICO_MAIN 100 +#define ICO_INTERNET 1313 /* strings */ #define IDS_CPL_NAME 1 diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 8ba7b4b..d666b65 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -129,3 +129,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: inetcpl.ico */ ICO_MAIN ICON "inetcpl.ico" +ICO_INTERNET ICON "inetcpl.ico"

1 0

André Hentschel : winedbg: Add special register processing operators to Thumb2 disassembler.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 60af8659c99d9d13bf3be1f7d4b16100f3475c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60af8659c99d9d13bf3be1f7d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 3 00:21:17 2012 +0200 winedbg: Add special register processing operators to Thumb2 disassembler. --- programs/winedbg/be_arm.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index c7acfee..a045e49 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -92,6 +92,11 @@ static char const tbl_width_t2[][2] = { "b", "h", "", "?" }; +static char const tbl_special_regs_t2[][12] = { + "apsr", "iapsr", "eapsr", "xpsr", "rsvd", "ipsr", "epsr", "iepsr", "msp", "psp", "rsvd", "rsvd", + "rsvd", "rsvd", "rsvd", "rsvd", "primask", "basepri", "basepri_max", "faultmask", "control" +}; + static UINT db_get_inst(void* addr, int size) { UINT result = 0; @@ -661,6 +666,26 @@ static UINT thumb2_disasm_branch(UINT inst, ADDRESS64 *addr) return 0; } +static UINT thumb2_disasm_srtrans(UINT inst, ADDRESS64 *addr) +{ + UINT fromsr = (inst >> 21) & 0x03; + UINT sysreg = inst & 0xff; + + if (fromsr == 3 && get_nibble(inst,4) == 0x0f && sysreg <= 20) + { + dbg_printf("\n\tmrs\t%s, %s", tbl_regs[get_nibble(inst, 2)], tbl_special_regs_t2[sysreg]); + return 0; + } + + if (fromsr == 0 && sysreg <= 20) + { + dbg_printf("\n\tmsr\t%s, %s", tbl_special_regs_t2[sysreg], tbl_regs[get_nibble(inst, 4)]); + return 0; + } + + return inst; +} + static UINT thumb2_disasm_misc(UINT inst, ADDRESS64 *addr) { WORD op1 = (inst >> 20) & 0x03; @@ -965,6 +990,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { static const struct inst_arm tbl_thumb32[] = { { 0xf800f000, 0xf0008000, thumb2_disasm_branch }, + { 0xff90f000, 0xf3808000, thumb2_disasm_srtrans }, { 0xffc0f0c0, 0xfa80f080, thumb2_disasm_misc }, { 0xff80f000, 0xfa00f000, thumb2_disasm_dataprocessingreg }, { 0xff8000c0, 0xfb000000, thumb2_disasm_mul },

1 0

Henri Verbeet : wined3d: Handle WINED3DSPR_CONSTBUFFER registers in the GLSL shader backend.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 4d39cb56fccaa45a9c9d4be7711a28865091acb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d39cb56fccaa45a9c9d4be77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:40 2012 +0200 wined3d: Handle WINED3DSPR_CONSTBUFFER registers in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 21 ++++++++++++++++++++- dlls/wined3d/shader.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d344bfa..bc262ec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -994,6 +994,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (shader->limits.constant_bool > 0 && reg_maps->boolean_constants) shader_addline(buffer, "uniform bool %s_b[%u];\n", prefix, shader->limits.constant_bool); + for (i = 0; i < WINED3D_MAX_CBS; ++i) + { + if (reg_maps->cb_sizes[i]) + shader_addline(buffer, "uniform vec4 %s_cb%u[%u];\n", prefix, i, reg_maps->cb_sizes[i]); + } + if (!pshader) { shader_addline(buffer, "uniform vec4 posFixup;\n"); @@ -1530,8 +1536,21 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * } break; + case WINED3DSPR_CONSTBUFFER: + if (reg->rel_addr) + { + struct glsl_src_param rel_param; + shader_glsl_add_src_param(ins, reg->rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); + sprintf(register_name, "%s_cb%u[%s + %u]", prefix, reg->idx, rel_param.param_str, reg->array_idx); + } + else + { + sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx, reg->array_idx); + } + break; + default: - FIXME("Unhandled register name Type(%d)\n", reg->type); + FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); break; } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d07809b..9223dce 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -533,6 +533,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st break; } } + else if (ins.handler_idx == WINED3DSIH_DCL_CONSTANT_BUFFER) + { + struct wined3d_shader_register *reg = &ins.declaration.src.reg; + if (reg->idx >= WINED3D_MAX_CBS) + ERR("Invalid CB index %u.\n", reg->idx); + else + reg_maps->cb_sizes[reg->idx] = reg->array_idx; + } else if (ins.handler_idx == WINED3DSIH_DEF) { struct wined3d_shader_lconst *lconst = HeapAlloc(GetProcessHeap(), 0, sizeof(*lconst)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b14e85d..b5f0f4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -409,6 +409,7 @@ enum wined3d_shader_rel_op #define MAX_REG_OUTPUT 32 #define MAX_CONST_I 16 #define MAX_CONST_B 16 +#define WINED3D_MAX_CBS 15 /* FIXME: This needs to go up to 2048 for * Shader model 3 according to msdn (and for software shaders) */ @@ -571,6 +572,7 @@ struct wined3d_shader_reg_maps WORD boolean_constants; /* MAX_CONST_B, 16 */ WORD local_int_consts; /* MAX_CONST_I, 16 */ WORD local_bool_consts; /* MAX_CONST_B, 16 */ + UINT cb_sizes[WINED3D_MAX_CBS]; enum wined3d_sampler_texture_type sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; BYTE bumpmat; /* MAX_TEXTURES, 8 */

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMGetDepthStencilState().
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: e4df956f95484d0193172199d73c459c7284b260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4df956f95484d0193172199d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:37 2012 +0200 d3d10core: Implement d3d10_device_OMGetDepthStencilState(). --- dlls/d3d10core/device.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 78d930b..ae3b865 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -572,8 +572,15 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device *iface, ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); + + if ((*depth_stencil_state = device->depth_stencil_state + ? &device->depth_stencil_state->ID3D10DepthStencilState_iface : NULL)) + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + *stencil_ref = device->stencil_ref; } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_OMSetDepthStencilState().
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: a78fa408165886b2cc7fc9c962b01f91b026d804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78fa408165886b2cc7fc9c96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 2 22:15:36 2012 +0200 d3d10core: Implement d3d10_device_OMSetDepthStencilState(). --- dlls/d3d10core/d3d10core_private.h | 4 ++++ dlls/d3d10core/device.c | 7 ++++++- dlls/d3d10core/state.c | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4f98c93..2dcd89a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -226,6 +226,8 @@ struct d3d10_depthstencil_state }; HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN; +struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( + ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; /* ID3D10RasterizerState */ struct d3d10_rasterizer_state @@ -267,6 +269,8 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct d3d10_depthstencil_state *depth_stencil_state; + UINT stencil_ref; struct d3d10_rasterizer_state *rasterizer_state; }; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index eaf0793..78d930b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -325,8 +325,13 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_OMSetDepthStencilState(ID3D10Device *iface, ID3D10DepthStencilState *depth_stencil_state, UINT stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %u stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); + + device->depth_stencil_state = unsafe_impl_from_ID3D10DepthStencilState(depth_stencil_state); + device->stencil_ref = stencil_ref; } static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3b5c45f..1d927ce 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -256,6 +256,15 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) return S_OK; } +struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_depthstencil_state_vtbl); + + return impl_from_ID3D10DepthStencilState(iface); +} + static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface);

1 0

Alexandre Julliard : winex11: Don' t try to change the window visual if we don't have a valid ARGB visual.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 37f36b732652db23abd4a16a2850ad6852653711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f36b732652db23abd4a16a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 09:59:00 2012 +0200 winex11: Don't try to change the window visual if we don't have a valid ARGB visual. --- dlls/winex11.drv/window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ad18eff..052eafa 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2371,7 +2371,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(data = get_win_data( hwnd ))) return FALSE; - if (!data->embedded) set_window_visual( data, &argb_visual ); + if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual ); rect = *window_rect; OffsetRect( &rect, -window_rect->left, -window_rect->top );

1 0

Nozomi Kodama : d3dx9_36: Implement D3DXSHMultiply4.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: b8cfe42326f19c87af7cd944a5918521e4c70d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cfe42326f19c87af7cd944a… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:10:17 2012 +0800 d3dx9_36: Implement D3DXSHMultiply4. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 288 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 50 ++++++++ include/d3dx9math.h | 1 + 4 files changed, 340 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8cfe42326f19c87af7cd…

1 0

Alexandre Julliard : winex11: Fix a typo in the surface region computation with an alpha channel.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 6f3b097a203d9ca248732cb45eed462599ca3af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3b097a203d9ca248732cb45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 00:09:01 2012 +0200 winex11: Fix a typo in the surface region computation with an alpha channel. --- dlls/winex11.drv/bitblt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index ceecb0c..36e3ac9 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1676,8 +1676,8 @@ static void update_surface_region( struct x11drv_window_surface *surface ) (surface->is_argb && !(bits[x] & 0xff000000)))) x++; start = x; while (x < width && - ((bits[x] & 0xffffff) != surface->color_key || - !(surface->is_argb && !(bits[x] & 0xff000000)))) x++; + !((bits[x] & 0xffffff) == surface->color_key || + (surface->is_argb && !(bits[x] & 0xff000000)))) x++; add_row( rgn, data, surface->header.rect.left + start, y, x - start ); } }

1 0

Alexandre Julliard : winex11: Copy the existing surface bits when a dirty rectangle is specified in UpdateLayeredWindow .
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: dbff4f422c943a837f0098e921f831eb4a94ac11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbff4f422c943a837f0098e92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 00:08:30 2012 +0200 winex11: Copy the existing surface bits when a dirty rectangle is specified in UpdateLayeredWindow. --- dlls/winex11.drv/window.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5d7e315..ad18eff 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2398,17 +2398,26 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(hdc = CreateCompatibleDC( 0 ))) goto done; SelectObject( hdc, dib ); - if (!(ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, - info->hdcSrc, - rect.left + (info->pptSrc ? info->pptSrc->x : 0), - rect.top + (info->pptSrc ? info->pptSrc->y : 0), - rect.right - rect.left, rect.bottom - rect.top, - (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ))) - goto done; surface->funcs->lock( surface ); - memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); - add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + + if (info->prcDirty) + { + memcpy( src_bits, dst_bits, bmi->bmiHeader.biSizeImage ); + PatBlt( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, BLACKNESS ); + } + ret = GdiAlphaBlend( hdc, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, + info->hdcSrc, + rect.left + (info->pptSrc ? info->pptSrc->x : 0), + rect.top + (info->pptSrc ? info->pptSrc->y : 0), + rect.right - rect.left, rect.bottom - rect.top, + (info->dwFlags & ULW_ALPHA) ? *info->pblend : blend ); + if (ret) + { + memcpy( dst_bits, src_bits, bmi->bmiHeader.biSizeImage ); + add_bounds_rect( surface->funcs->get_bounds( surface ), &rect ); + } + surface->funcs->unlock( surface ); surface->funcs->flush( surface );

1 0