September 2007 - Wine-Commits

Stefan Leichter : browseui: Remove 'recursive registry key delete' function .
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: fcec1b3651927b16bb14325ce96527c8c3fc8285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcec1b3651927b16bb14325ce… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Sep 26 20:51:05 2007 +0200 browseui: Remove 'recursive registry key delete' function. --- dlls/browseui/regsvr.c | 79 +++++------------------------------------------- 1 files changed, 8 insertions(+), 71 deletions(-) diff --git a/dlls/browseui/regsvr.c b/dlls/browseui/regsvr.c index 34a434e..889acde 100644 --- a/dlls/browseui/regsvr.c +++ b/dlls/browseui/regsvr.c @@ -116,9 +116,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -207,7 +204,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -314,16 +312,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -436,70 +437,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Anatoly Lyutin : gdi32: printdrv: Use umask for creating a spool file.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 7a67035a44e43dba82a717a45365fb3452f51e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a67035a44e43dba82a717a45… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Wed Sep 26 18:28:59 2007 +0400 gdi32: printdrv: Use umask for creating a spool file. --- dlls/gdi32/printdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index bdd754f..16b3fe3 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -522,7 +522,7 @@ static int CreateSpoolFile(LPCSTR pszOutput) MultiByteToWideChar(CP_ACP, 0, psCmdP, -1, psCmdPW, MAX_PATH); if ((buffer = wine_get_unix_file_name(psCmdPW))) { - if ((fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY , 0600)) < 0) + if ((fd = open(buffer, O_CREAT | O_TRUNC | O_WRONLY, 0666)) < 0) { ERR("Failed to create spool file '%s' ('%s'). (error %s)\n", buffer, psCmdP, strerror(errno));

1 0

Chris Robinson : winex11: Be compatible with older XComposite headers.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 909f7ffcb951fc3433e2526ed3fa8f72a61c3bfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=909f7ffcb951fc3433e2526ed… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Sep 26 08:21:07 2007 -0700 winex11: Be compatible with older XComposite headers. --- dlls/winex11.drv/x11drv_main.c | 4 ---- dlls/winex11.drv/xcomposite.h | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 0f91b6e..f56d4e2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -386,8 +386,6 @@ MAKE_FUNCPTR(XCompositeUnredirectWindow) MAKE_FUNCPTR(XCompositeUnredirectSubwindows) MAKE_FUNCPTR(XCompositeCreateRegionFromBorderClip) MAKE_FUNCPTR(XCompositeNameWindowPixmap) -MAKE_FUNCPTR(XCompositeGetOverlayWindow) -MAKE_FUNCPTR(XCompositeReleaseOverlayWindow) #undef MAKE_FUNCPTR static int xcomp_event_base; @@ -415,8 +413,6 @@ static void X11DRV_XComposite_Init(void) LOAD_FUNCPTR(XCompositeUnredirectSubwindows) LOAD_FUNCPTR(XCompositeCreateRegionFromBorderClip) LOAD_FUNCPTR(XCompositeNameWindowPixmap) - LOAD_FUNCPTR(XCompositeGetOverlayWindow) - LOAD_FUNCPTR(XCompositeReleaseOverlayWindow) #undef LOAD_FUNCPTR if(!pXCompositeQueryExtension(gdi_display, &xcomp_event_base, diff --git a/dlls/winex11.drv/xcomposite.h b/dlls/winex11.drv/xcomposite.h index 307c0ef..82e8440 100644 --- a/dlls/winex11.drv/xcomposite.h +++ b/dlls/winex11.drv/xcomposite.h @@ -37,8 +37,6 @@ MAKE_FUNCPTR(XCompositeUnredirectWindow) MAKE_FUNCPTR(XCompositeUnredirectSubwindows) MAKE_FUNCPTR(XCompositeCreateRegionFromBorderClip) MAKE_FUNCPTR(XCompositeNameWindowPixmap) -MAKE_FUNCPTR(XCompositeGetOverlayWindow) -MAKE_FUNCPTR(XCompositeReleaseOverlayWindow) #undef MAKE_FUNCPTR #endif /* defined(SONAME_LIBXCOMPOSITE) */

1 0

Stefan Dösinger : wined3d: Implement the nrm instruction in arb.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: daf2290ea4d92a2e4f11f16ddc4a69cb9e1ae064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf2290ea4d92a2e4f11f16dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 20:09:06 2007 +0200 wined3d: Implement the nrm instruction in arb. --- dlls/wined3d/arb_program_shader.c | 22 ++++++++++++++++++++++ dlls/wined3d/baseshader.c | 5 ++++- dlls/wined3d/pixelshader.c | 11 +---------- dlls/wined3d/vertexshader.c | 16 ++++++---------- dlls/wined3d/wined3d_private.h | 4 ++++ 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4d7dd58..8bc458f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1477,6 +1477,28 @@ void vshader_hw_rsq_rcp(SHADER_OPCODE_ARG* arg) { shader_addline(buffer, "%s;\n", tmpLine); } +void shader_hw_nrm(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + char dst_name[50]; + char src_name[50]; + char dst_wmask[20]; + DWORD shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + BOOL sat = (arg->dst & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + + pshader_get_register_name(arg->dst, dst_name); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name); + shader_addline(buffer, "DP3 TMP, %s, %s;\n", src_name, src_name); + shader_addline(buffer, "RSQ TMP, TMP.x;\n"); + /* dst.w = src[0].w * 1 / (src.x^2 + src.y^2 + src.z^2)^(1/2) according to msdn*/ + shader_addline(buffer, "MUL%s %s%s, %s, TMP;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + src_name); + + if (shift != 0) + pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); +} + /* TODO: merge with pixel shader */ /* Map the opcode 1-to-1 to the GL code */ void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index df9c3e5..555929c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -381,6 +381,9 @@ HRESULT shader_get_registers_used( } } } + if(WINED3DSIO_NRM == curOpcode->opcode) { + reg_maps->usesnrm = 1; + } /* This will loop over all the registers and try to * make a bitmask of the ones we're interested in. @@ -416,7 +419,7 @@ HRESULT shader_get_registers_used( else if (WINED3DSPR_RASTOUT == regtype && reg == 1) reg_maps->fog = 1; - } + } } } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 10fb732..0c18b26 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -177,16 +177,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_CMP, "cmp", NULL, 1, 4, pshader_hw_cmp, shader_glsl_cmp, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(3,0)}, {WINED3DSIO_POW, "pow", "POW", 1, 3, pshader_hw_map2gl, shader_glsl_pow, 0, 0}, {WINED3DSIO_CRS, "crs", "XPD", 1, 3, pshader_hw_map2gl, shader_glsl_cross, 0, 0}, - /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, - DP3 tmp , vec, vec; - RSQ tmp, tmp.x; - MUL vec.xyz, vec, tmp; - but I think this is better because it accounts for w properly. - DP3 tmp , vec, vec; - RSQ tmp, tmp.x; - MUL vec, vec, tmp; - */ - {WINED3DSIO_NRM, "nrm", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_NRM, "nrm", NULL, 1, 2, shader_hw_nrm, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, {WINED3DSIO_DP2ADD, "dp2add", NULL, 1, 4, pshader_hw_dp2add, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 3f8f5bf..8564c06 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -114,16 +114,7 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { RCP tmp, vec MUL out, tmp, vec*/ {WINED3DSIO_SGN, "sgn", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, - /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, - DP3 tmp , vec, vec; - RSQ tmp, tmp.x; - MUL vec.xyz, vec, tmp; - but I think this is better because it accounts for w properly. - DP3 tmp , vec, vec; - RSQ tmp, tmp.x; - MUL vec, vec, tmp; - */ - {WINED3DSIO_NRM, "nrm", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, + {WINED3DSIO_NRM, "nrm", NULL, 1, 2, shader_hw_nrm, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DVS_VERSION(3,0), -1}, /* Matrix */ @@ -382,6 +373,11 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( This->baseShader.limits.constant_float = min(95, This->baseShader.limits.constant_float); + /* Some instructions need a temporary register. Add it if needed, but only if it is really needed */ + if(reg_maps->usesnrm) { + shader_addline(&buffer, "TEMP TMP;\n"); + } + /* Base Declarations */ shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70d44e4..a5aa8e3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1652,6 +1652,7 @@ typedef struct shader_reg_maps { * Use 0 as default (bit 31 is always 1 on a valid token) */ DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)]; char bumpmat, luminanceparams; + char usesnrm; /* Whether or not a loop is used in this shader */ char loop; @@ -1788,6 +1789,9 @@ extern void pshader_hw_texm3x3(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg); extern void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg); +/* ARB vertex / pixel shader common prototypes */ +extern void shader_hw_nrm(SHADER_OPCODE_ARG* arg); + /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg); extern void vshader_hw_mnxn(SHADER_OPCODE_ARG* arg);

1 0

Stefan Dösinger : wined3d: Add sincos support to arb shaders.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 20872abc9cc702ac264a8bd45132a9ab47f1af08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20872abc9cc702ac264a8bd45… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 26 22:09:59 2007 +0200 wined3d: Add sincos support to arb shaders. --- dlls/wined3d/arb_program_shader.c | 24 ++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 4 ++-- dlls/wined3d/vertexshader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8bc458f..62b5c74 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1499,6 +1499,30 @@ void shader_hw_nrm(SHADER_OPCODE_ARG* arg) { pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); } +void shader_hw_sincos(SHADER_OPCODE_ARG* arg) { + /* This instruction exists in ARB, but the d3d instruction takes two extra parameters which + * must contain fixed constants. So we need a separate functin to filter those constants and + * can't use map2gl + */ + SHADER_BUFFER* buffer = arg->buffer; + char dst_name[50]; + char src_name[50]; + char dst_wmask[20]; + DWORD shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + BOOL sat = (arg->dst & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + + pshader_get_register_name(arg->dst, dst_name); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name); + shader_addline(buffer, "SCS%s %s%s, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, + src_name); + + if (shift != 0) + pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); + +} + /* TODO: merge with pixel shader */ /* Map the opcode 1-to-1 to the GL code */ void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 0c18b26..ad9b11d 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -178,8 +178,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_POW, "pow", "POW", 1, 3, pshader_hw_map2gl, shader_glsl_pow, 0, 0}, {WINED3DSIO_CRS, "crs", "XPD", 1, 3, pshader_hw_map2gl, shader_glsl_cross, 0, 0}, {WINED3DSIO_NRM, "nrm", NULL, 1, 2, shader_hw_nrm, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, + {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, shader_hw_sincos, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, + {WINED3DSIO_SINCOS, "sincos", "SCS", 1, 2, shader_hw_sincos, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, {WINED3DSIO_DP2ADD, "dp2add", NULL, 1, 4, pshader_hw_dp2add, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, /* Matrix */ {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 8564c06..e4b8088 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -115,8 +115,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { MUL out, tmp, vec*/ {WINED3DSIO_SGN, "sgn", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_NRM, "nrm", NULL, 1, 2, shader_hw_nrm, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,1)}, - {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DVS_VERSION(3,0), -1}, + {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, shader_hw_sincos, shader_glsl_sincos, WINED3DVS_VERSION(2,0), WINED3DVS_VERSION(2,1)}, + {WINED3DSIO_SINCOS, "sincos", "SCS", 1, 2, shader_hw_sincos, shader_glsl_sincos, WINED3DVS_VERSION(3,0), -1}, /* Matrix */ {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a5aa8e3..68fc646 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1791,6 +1791,7 @@ extern void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg); /* ARB vertex / pixel shader common prototypes */ extern void shader_hw_nrm(SHADER_OPCODE_ARG* arg); +extern void shader_hw_sincos(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg);

1 0

Stefan Dösinger : wined3d: Add dp2add support to arb shaders.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 1407bdb2cfa05cf1985066f1570d2c7a718c837c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1407bdb2cfa05cf1985066f15… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 16:46:12 2007 +0200 wined3d: Add dp2add support to arb shaders. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 3 +-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 419d485..4d7dd58 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -878,6 +878,33 @@ void pshader_hw_cmp(SHADER_OPCODE_ARG* arg) { pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); } +/** Process the WINED3DSIO_DP2ADD instruction in ARB. + * dst = dot2(src0, src1) + src2 */ +void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg) { + SHADER_BUFFER* buffer = arg->buffer; + char dst_wmask[20]; + char dst_name[50]; + char src_name[3][50]; + DWORD shift = (arg->dst & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + BOOL sat = (arg->dst & WINED3DSP_DSTMOD_MASK) & WINED3DSPDM_SATURATE; + + pshader_get_register_name(arg->dst, dst_name); + shader_arb_get_write_mask(arg, arg->dst, dst_wmask); + + pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src_name[0]); + pshader_gen_input_modifier_line(buffer, arg->src[1], 1, src_name[1]); + pshader_gen_input_modifier_line(buffer, arg->src[2], 2, src_name[2]); + + /* Emulate a DP2 with a DP3 and 0.0 */ + shader_addline(buffer, "MOV TMP, %s;\n", src_name[0]); + shader_addline(buffer, "MOV TMP.z, 0.0;\n"); + shader_addline(buffer, "DP3 TMP2, TMP, %s;\n", src_name[1]); + shader_addline(buffer, "ADD%s %s%s, TMP2, %s;\n", sat ? "_SAT" : "", dst_name, dst_wmask, src_name[2]); + + if (shift != 0) + pshader_gen_output_modifier_line(buffer, FALSE, dst_wmask, shift, dst_name); +} + /* Map the opcode 1-to-1 to the GL code */ void pshader_hw_map2gl(SHADER_OPCODE_ARG* arg) { diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 2d89bad..10fb732 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -189,8 +189,7 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_NRM, "nrm", NULL, 1, 2, NULL, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 4, NULL, shader_glsl_sincos, WINED3DPS_VERSION(2,0), WINED3DPS_VERSION(2,1)}, {WINED3DSIO_SINCOS, "sincos", NULL, 1, 2, NULL, shader_glsl_sincos, WINED3DPS_VERSION(3,0), -1}, - /* TODO: dp2add can be made out of multiple instuctions */ - {WINED3DSIO_DP2ADD, "dp2add", GLNAME_REQUIRE_GLSL, 1, 4, NULL, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, + {WINED3DSIO_DP2ADD, "dp2add", NULL, 1, 4, pshader_hw_dp2add, pshader_glsl_dp2add, WINED3DPS_VERSION(2,0), -1}, /* Matrix */ {WINED3DSIO_M4x4, "m4x4", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, {WINED3DSIO_M4x3, "m4x3", "undefined", 1, 3, NULL, shader_glsl_mnxn, 0, 0}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8844ffa..70d44e4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1786,6 +1786,7 @@ extern void pshader_hw_texdp3tex(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texdp3(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x3(SHADER_OPCODE_ARG* arg); extern void pshader_hw_texm3x2depth(SHADER_OPCODE_ARG* arg); +extern void pshader_hw_dp2add(SHADER_OPCODE_ARG* arg); /* ARB vertex shader prototypes */ extern void vshader_hw_map2gl(SHADER_OPCODE_ARG* arg);

1 0

Jacek Caban : mshtml: Added generic get_nsinterface function and use it in get_ns_command_state.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: fa58e6ce5d276149a979e948f239214e2e5ea294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa58e6ce5d276149a979e948f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:46:37 2007 +0200 mshtml: Added generic get_nsinterface function and use it in get_ns_command_state. --- dlls/mshtml/editor.c | 12 +----------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 6cfd20b..000299a 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -114,19 +114,9 @@ static void do_ns_editor_command(NSContainer *This, const char *cmd) static nsresult get_ns_command_state(NSContainer *This, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; - nsIInterfaceRequestor *iface_req; nsresult nsres; - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return nsres; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, - (void**)&cmdmgr); - nsIInterfaceRequestor_Release(iface_req); + nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr); if(NS_FAILED(nsres)) { ERR("Could not get nsICommandManager: %08x\n", nsres); return nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 54eb810..5a547d4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -398,6 +398,7 @@ nsIWritableVariant *create_nsvariant(void); void nsnode_to_nsstring(nsIDOMNode*,nsAString*); void get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); +nsresult get_nsinterface(nsISupports*,REFIID,void**); BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2a6628b..4fcaf7c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -523,6 +523,21 @@ nsICommandParams *create_nscommand_params(void) return ret; } +nsresult get_nsinterface(nsISupports *iface, REFIID riid, void **ppv) +{ + nsIInterfaceRequestor *iface_req; + nsresult nsres; + + nsres = nsISupports_QueryInterface(iface, &IID_nsIInterfaceRequestor, (void**)&iface_req); + if(NS_FAILED(nsres)) + return nsres; + + nsres = nsIInterfaceRequestor_GetInterface(iface_req, riid, ppv); + nsIInterfaceRequestor_Release(iface_req); + + return nsres; +} + static void nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNode *nsnode, nsAString *str) { nsIDOMNodeList *node_list = NULL;

1 0

Jacek Caban : mshtml: Use get_nsinterface in exec_print and do_ns_command.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: cf403fa484f7ff7166ac0091ee607c18f17bdc71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf403fa484f7ff7166ac0091e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:46:14 2007 +0200 mshtml: Use get_nsinterface in exec_print and do_ns_command. --- dlls/mshtml/olecmd.c | 23 ++--------------------- 1 files changed, 2 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 458209c..595107a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -61,21 +61,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) { nsICommandManager *cmdmgr; - nsIInterfaceRequestor *iface_req; nsresult nsres; TRACE("(%p)\n", This); - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsICommandManager, - (void**)&cmdmgr); - nsIInterfaceRequestor_Release(iface_req); + nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsICommandManager, (void**)&cmdmgr); if(NS_FAILED(nsres)) { ERR("Could not get nsICommandManager: %08x\n", nsres); return; @@ -241,7 +231,6 @@ static void set_default_templates(nsIPrintSettings *settings) static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - nsIInterfaceRequestor *iface_req; nsIWebBrowserPrint *nsprint; nsIPrintSettings *settings; nsresult nsres; @@ -254,16 +243,8 @@ static HRESULT exec_print(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, if(!This->nscontainer) return S_OK; - nsres = nsIWebBrowser_QueryInterface(This->nscontainer->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return S_OK; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIWebBrowserPrint, + nsres = get_nsinterface((nsISupports*)This->nscontainer->webbrowser, &IID_nsIWebBrowserPrint, (void**)&nsprint); - nsIInterfaceRequestor_Release(iface_req); if(NS_FAILED(nsres)) { ERR("Could not get nsIWebBrowserPrint: %08x\n", nsres); return S_OK;

1 0

Stefan Dösinger : wined3d: Add crs and pow instruction support.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: 09fa208d7a84537637e8b4b52b8d50680b2c13cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=09fa208d7a84537637e8b4b52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 16:27:10 2007 +0200 wined3d: Add crs and pow instruction support. --- dlls/wined3d/pixelshader.c | 4 ++-- dlls/wined3d/vertexshader.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 24c025d..2d89bad 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -175,8 +175,8 @@ CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {WINED3DSIO_FRC, "frc", "FRC", 1, 2, pshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {WINED3DSIO_CND, "cnd", NULL, 1, 4, pshader_hw_cnd, shader_glsl_cnd, WINED3DPS_VERSION(1,0), WINED3DPS_VERSION(1,4)}, {WINED3DSIO_CMP, "cmp", NULL, 1, 4, pshader_hw_cmp, shader_glsl_cmp, WINED3DPS_VERSION(1,2), WINED3DPS_VERSION(3,0)}, - {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_pow, 0, 0}, - {WINED3DSIO_CRS, "crs", "XPS", 1, 3, NULL, shader_glsl_cross, 0, 0}, + {WINED3DSIO_POW, "pow", "POW", 1, 3, pshader_hw_map2gl, shader_glsl_pow, 0, 0}, + {WINED3DSIO_CRS, "crs", "XPD", 1, 3, pshader_hw_map2gl, shader_glsl_cross, 0, 0}, /* TODO: xyz normalise can be performed as VS_ARB using one temporary register, DP3 tmp , vec, vec; RSQ tmp, tmp.x; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index b478b5c..3f8f5bf 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -108,8 +108,8 @@ CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {WINED3DSIO_DST, "dst", "DST", 1, 3, vshader_hw_map2gl, shader_glsl_dst, 0, 0}, {WINED3DSIO_LRP, "lrp", "LRP", 1, 4, NULL, shader_glsl_lrp, 0, 0}, {WINED3DSIO_FRC, "frc", "FRC", 1, 2, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, - {WINED3DSIO_POW, "pow", "POW", 1, 3, NULL, shader_glsl_pow, 0, 0}, - {WINED3DSIO_CRS, "crs", "XPS", 1, 3, NULL, shader_glsl_cross, 0, 0}, + {WINED3DSIO_POW, "pow", "POW", 1, 3, vshader_hw_map2gl, shader_glsl_pow, 0, 0}, + {WINED3DSIO_CRS, "crs", "XPD", 1, 3, vshader_hw_map2gl, shader_glsl_cross, 0, 0}, /* TODO: sng can possibly be performed a s RCP tmp, vec MUL out, tmp, vec*/

1 0

Jacek Caban : mshtml: Use get_nsinterface in set_ns_editmode and get_editor_controller.
by Alexandre Julliard Sept. 27, 2007

Sept. 27, 2007

Module: wine Branch: master Commit: e65e53488e154bb56b344424a42156be7e953727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e65e53488e154bb56b344424a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 26 20:47:02 2007 +0200 mshtml: Use get_nsinterface in set_ns_editmode and get_editor_controller. --- dlls/mshtml/nsembed.c | 26 ++++---------------------- 1 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 4fcaf7c..19bf85c 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -647,7 +647,6 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) void get_editor_controller(NSContainer *This) { nsIEditingSession *editing_session = NULL; - nsIInterfaceRequestor *iface_req; nsIControllerContext *ctrlctx; nsresult nsres; @@ -661,16 +660,8 @@ void get_editor_controller(NSContainer *This) This->editor_controller = NULL; } - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, - (void**)&editing_session); - nsIInterfaceRequestor_Release(iface_req); + nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession, + (void**)&editing_session); if(NS_FAILED(nsres)) { ERR("Could not get nsIEditingSession: %08x\n", nsres); return; @@ -702,22 +693,13 @@ void get_editor_controller(NSContainer *This) void set_ns_editmode(NSContainer *This) { - nsIInterfaceRequestor *iface_req; nsIEditingSession *editing_session = NULL; nsIURIContentListener *listener = NULL; nsIDOMWindow *dom_window = NULL; nsresult nsres; - nsres = nsIWebBrowser_QueryInterface(This->webbrowser, - &IID_nsIInterfaceRequestor, (void**)&iface_req); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIInterfaceRequestor: %08x\n", nsres); - return; - } - - nsres = nsIInterfaceRequestor_GetInterface(iface_req, &IID_nsIEditingSession, - (void**)&editing_session); - nsIInterfaceRequestor_Release(iface_req); + nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession, + (void**)&editing_session); if(NS_FAILED(nsres)) { ERR("Could not get nsIEditingSession: %08x\n", nsres); return;

1 0