June 2006 - Wine-commits - list.winehq.org

Jason Green : wined3d: Map vertex shader instructions to GLSL generating functions.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: ca7976c34f280328e54a6632f28892ad2b70df77 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca7976c34f280328e54a663… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:36:16 2006 -0400 wined3d: Map vertex shader instructions to GLSL generating functions. --- dlls/wined3d/vertexshader.c | 64 ++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 908171e..6215aa4 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -489,30 +489,30 @@ CONST SHADER_OPCODE IWineD3DVertexShader /* Arithmetic */ {D3DSIO_NOP, "nop", "NOP", 0, vshader_nop, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_MOV, "mov", "MOV", 2, vshader_mov, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_ADD, "add", "ADD", 3, vshader_add, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_SUB, "sub", "SUB", 3, vshader_sub, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_MAD, "mad", "MAD", 4, vshader_mad, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_MUL, "mul", "MUL", 3, vshader_mul, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_RCP, "rcp", "RCP", 2, vshader_rcp, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_RSQ, "rsq", "RSQ", 2, vshader_rsq, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_DP3, "dp3", "DP3", 3, vshader_dp3, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_DP4, "dp4", "DP4", 3, vshader_dp4, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_MIN, "min", "MIN", 3, vshader_min, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_MAX, "max", "MAX", 3, vshader_max, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_SLT, "slt", "SLT", 3, vshader_slt, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_SGE, "sge", "SGE", 3, vshader_sge, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_ABS, "abs", "ABS", 2, vshader_abs, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_EXP, "exp", "EX2", 2, vshader_exp, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_LOG, "log", "LG2", 2, vshader_log, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_EXPP, "expp", "EXP", 2, vshader_expp, vshader_hw_map2gl, NULL, 0, 0}, + {D3DSIO_MOV, "mov", "MOV", 2, vshader_mov, vshader_hw_map2gl, shader_glsl_mov, 0, 0}, + {D3DSIO_ADD, "add", "ADD", 3, vshader_add, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, + {D3DSIO_SUB, "sub", "SUB", 3, vshader_sub, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, + {D3DSIO_MAD, "mad", "MAD", 4, vshader_mad, vshader_hw_map2gl, shader_glsl_mad, 0, 0}, + {D3DSIO_MUL, "mul", "MUL", 3, vshader_mul, vshader_hw_map2gl, shader_glsl_arith, 0, 0}, + {D3DSIO_RCP, "rcp", "RCP", 2, vshader_rcp, vshader_hw_map2gl, shader_glsl_rcp, 0, 0}, + {D3DSIO_RSQ, "rsq", "RSQ", 2, vshader_rsq, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_DP3, "dp3", "DP3", 3, vshader_dp3, vshader_hw_map2gl, shader_glsl_dot, 0, 0}, + {D3DSIO_DP4, "dp4", "DP4", 3, vshader_dp4, vshader_hw_map2gl, shader_glsl_dot, 0, 0}, + {D3DSIO_MIN, "min", "MIN", 3, vshader_min, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_MAX, "max", "MAX", 3, vshader_max, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_SLT, "slt", "SLT", 3, vshader_slt, vshader_hw_map2gl, shader_glsl_compare, 0, 0}, + {D3DSIO_SGE, "sge", "SGE", 3, vshader_sge, vshader_hw_map2gl, shader_glsl_compare, 0, 0}, + {D3DSIO_ABS, "abs", "ABS", 2, vshader_abs, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_EXP, "exp", "EX2", 2, vshader_exp, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_LOG, "log", "LG2", 2, vshader_log, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_EXPP, "expp", "EXP", 2, vshader_expp, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, {D3DSIO_LOGP, "logp", "LOG", 2, vshader_logp, vshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_LIT, "lit", "LIT", 2, vshader_lit, vshader_hw_map2gl, NULL, 0, 0}, {D3DSIO_DST, "dst", "DST", 3, vshader_dst, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_LRP, "lrp", "LRP", 4, vshader_lrp, NULL, NULL, 0, 0}, - {D3DSIO_FRC, "frc", "FRC", 2, vshader_frc, vshader_hw_map2gl, NULL, 0, 0}, - {D3DSIO_POW, "pow", "POW", 3, vshader_pow, NULL, NULL, 0, 0}, - {D3DSIO_CRS, "crs", "XPS", 3, vshader_crs, NULL, NULL, 0, 0}, + {D3DSIO_LRP, "lrp", "LRP", 4, vshader_lrp, NULL, shader_glsl_lrp, 0, 0}, + {D3DSIO_FRC, "frc", "FRC", 2, vshader_frc, vshader_hw_map2gl, shader_glsl_map2gl, 0, 0}, + {D3DSIO_POW, "pow", "POW", 3, vshader_pow, NULL, shader_glsl_map2gl, 0, 0}, + {D3DSIO_CRS, "crs", "XPS", 3, vshader_crs, NULL, shader_glsl_map2gl, 0, 0}, /* TODO: sng can possibly be performed a s RCP tmp, vec MUL out, tmp, vec*/ @@ -527,16 +527,16 @@ CONST SHADER_OPCODE IWineD3DVertexShader MUL vec, vec, tmp; */ - {D3DSIO_NRM, "nrm", NULL, 2, vshader_nrm, NULL, NULL, 0, 0}, + {D3DSIO_NRM, "nrm", NULL, 2, vshader_nrm, NULL, shader_glsl_map2gl, 0, 0}, {D3DSIO_SINCOS, "sincos", NULL, 4, vshader_sincos2, NULL, NULL, D3DVS_VERSION(2,0), D3DVS_VERSION(2,0)}, {D3DSIO_SINCOS, "sincos", NULL, 2, vshader_sincos3, NULL, NULL, D3DVS_VERSION(3,0), -1}, /* Matrix */ - {D3DSIO_M4x4, "m4x4", "undefined", 3, vshader_m4x4, vshader_hw_mnxn, NULL, 0, 0}, - {D3DSIO_M4x3, "m4x3", "undefined", 3, vshader_m4x3, vshader_hw_mnxn, NULL, 0, 0}, - {D3DSIO_M3x4, "m3x4", "undefined", 3, vshader_m3x4, vshader_hw_mnxn, NULL, 0, 0}, - {D3DSIO_M3x3, "m3x3", "undefined", 3, vshader_m3x3, vshader_hw_mnxn, NULL, 0, 0}, - {D3DSIO_M3x2, "m3x2", "undefined", 3, vshader_m3x2, vshader_hw_mnxn, NULL, 0, 0}, + {D3DSIO_M4x4, "m4x4", "undefined", 3, vshader_m4x4, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {D3DSIO_M4x3, "m4x3", "undefined", 3, vshader_m4x3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {D3DSIO_M3x4, "m3x4", "undefined", 3, vshader_m3x4, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {D3DSIO_M3x3, "m3x3", "undefined", 3, vshader_m3x3, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, + {D3DSIO_M3x2, "m3x2", "undefined", 3, vshader_m3x2, vshader_hw_mnxn, shader_glsl_mnxn, 0, 0}, /* Declare registers */ {D3DSIO_DCL, "dcl", NULL, 2, vshader_dcl, vshader_hw_dcl, NULL, 0, 0}, @@ -563,7 +563,7 @@ CONST SHADER_OPCODE IWineD3DVertexShader {D3DSIO_ENDLOOP, "endloop", GLNAME_REQUIRE_GLSL, 0, vshader_endloop, NULL, NULL, 0, 0}, {D3DSIO_LABEL, "label", GLNAME_REQUIRE_GLSL, 1, vshader_label, NULL, NULL, 0, 0}, - {D3DSIO_MOVA, "mova", GLNAME_REQUIRE_GLSL, 2, vshader_mova, NULL, NULL, 0, 0}, + {D3DSIO_MOVA, "mova", GLNAME_REQUIRE_GLSL, 2, vshader_mova, NULL, shader_glsl_mov, 0, 0}, {D3DSIO_SETP, "setp", GLNAME_REQUIRE_GLSL, 3, vshader_setp, NULL, NULL, 0, 0}, {D3DSIO_TEXLDL, "texdl", GLNAME_REQUIRE_GLSL, 2, vshader_texldl, NULL, NULL, 0, 0}, {0, NULL, NULL, 0, NULL, NULL, 0, 0} @@ -1446,7 +1446,13 @@ ULONG WINAPI IWineD3DVertexShaderImpl_Re ref = InterlockedDecrement(&This->ref); if (ref == 0) { if (This->vertexDeclaration) IWineD3DVertexDeclaration_Release(This->vertexDeclaration); - HeapFree(GetProcessHeap(), 0, This); + if (wined3d_settings.shader_mode == SHADER_GLSL && This->baseShader.prgId != 0) { + /* If this shader is still attached to a program, GL will perform a lazy delete */ + TRACE("Deleting shader object %u\n", This->baseShader.prgId); + GL_EXTCALL(glDeleteObjectARB(This->baseShader.prgId)); + checkGLcall("glDeleteObjectARB"); + } + HeapFree(GetProcessHeap(), 0, This); } return ref; }

1 0

Jason Green : wined3d: Map pixel shader instructions to GLSL generating functions.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 5798356d21d91e889c372ea9e72171ce33c1e476 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5798356d21d91e889c372ea… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:35:49 2006 -0400 wined3d: Map pixel shader instructions to GLSL generating functions. --- dlls/wined3d/pixelshader.c | 80 ++++++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5798356d21d91e889c3…

1 0

Jason Green : wined3d: Prototype the GLSL functions for use with pixel and vertex shaders.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: d59714b78c7bb136a6a8125b428b8d0e25a6635b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d59714b78c7bb136a6a8125… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:35:15 2006 -0400 wined3d: Prototype the GLSL functions for use with pixel and vertex shaders. --- dlls/wined3d/wined3d_private.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7cc07b3..31afe74 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1317,6 +1317,25 @@ extern const SHADER_OPCODE* shader_get_o /* ARB shader program Prototypes */ extern void shader_hw_def(SHADER_OPCODE_ARG *arg); +/** The following translate DirectX pixel/vertex shader opcodes to GLSL lines */ +extern void shader_glsl_map2gl(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_arith(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_mov(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_mad(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_mnxn(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_lrp(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_dot(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_rcp(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_cnd(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_compare(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_def(SHADER_OPCODE_ARG* arg); +extern void shader_glsl_cmp(SHADER_OPCODE_ARG* arg); +/** GLSL Pixel Shader Prototypes */ +extern void pshader_glsl_tex(SHADER_OPCODE_ARG* arg); +extern void pshader_glsl_texcoord(SHADER_OPCODE_ARG* arg); +extern void pshader_glsl_texm3x2pad(SHADER_OPCODE_ARG* arg); +extern void pshader_glsl_texm3x2tex(SHADER_OPCODE_ARG* arg); + /***************************************************************************** * IDirect3DBaseShader implementation structure */

1 0

Jason Green : wined3d: Added more declarations to GLSL.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 806aaa1287e0762ce29f8ef3e9102d182a6fad7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=806aaa1287e0762ce29f8ef… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:34:44 2006 -0400 wined3d: Added more declarations to GLSL. - Declare more variable names for GLSL programs. - Some of these won't need to be declared eventually, but it doesn't hurt to do it for now. - Correct output name for pixel shaders (gl_FragColor instead of glFragColor). --- dlls/wined3d/baseshader.c | 23 +++++++++++++++++++---- dlls/wined3d/pixelshader.c | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index da81351..8d1f759 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -575,16 +575,21 @@ void generate_glsl_declarations( /* Declare the constants (aka uniforms) */ shader_addline(buffer, "uniform vec4 C[%u];\n", This->baseShader.limits.constant_float); + /* Declare texture samplers + * TODO: Make this work for textures other than 2D */ + for (i = 0; i < This->baseShader.limits.texture; i++) { + shader_addline(buffer, "uniform sampler2D mytex%lu;\n", i); + } + /* Declare address variables */ for (i = 0; i < This->baseShader.limits.address; i++) { if (reg_maps->address & (1 << i)) shader_addline(buffer, "ivec4 A%ld;\n", i); } - /* Declare all named attributes (TODO: Add this to the reg_maps - * and only declare those that are needed) */ - for (i = 0; i < This->baseShader.limits.attributes; i++) { - shader_addline(buffer, "attribute vec4 attrib%i;\n", i); + /* Declare texture temporaries */ + for (i = 0; i < This->baseShader.limits.texture; i++) { + shader_addline(buffer, "vec4 T%lu = gl_TexCoord[%lu];\n", i, i); } /* Declare temporary variables */ @@ -593,6 +598,16 @@ void generate_glsl_declarations( shader_addline(buffer, "vec4 R%lu;\n", i); } + /* Declare all named attributes (TODO: Add this to the reg_maps + * and only declare those that are needed) */ + for (i = 0; i < This->baseShader.limits.attributes; i++) { + shader_addline(buffer, "attribute vec4 attrib%i;\n", i); + } + + /* Temporary variables for matrix operations */ + shader_addline(buffer, "vec4 tmp0;\n"); + shader_addline(buffer, "vec4 tmp1;\n"); + /* Start the main program */ shader_addline(buffer, "void main() {\n"); } diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 4c52a25..65a81c5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1290,7 +1290,7 @@ #endif /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (This->baseShader.hex_version < D3DPS_VERSION(2,0)) - shader_addline(&buffer, "glFragColor = R0;\n"); + shader_addline(&buffer, "gl_FragColor = R0;\n"); shader_addline(&buffer, "}\n\0"); TRACE("Compiling shader object %u\n", shader_obj);

1 0

Jason Green : wined3d: Unified float constant register mapping between ARB pixel and vertex shaders .
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: ca70d13af4710c0cb924638c224c0643caeb94e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca70d13af4710c0cb924638… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:33:33 2006 -0400 wined3d: Unified float constant register mapping between ARB pixel and vertex shaders. - Got rid of the separate constant maps. - Side effect of this is that the map is a bit larger for pixel shaders than it needs to be --- dlls/wined3d/baseshader.c | 20 +++++++++++++++++ dlls/wined3d/pixelshader.c | 46 +++++++++++----------------------------- dlls/wined3d/vertexshader.c | 42 ++++++++++++------------------------- dlls/wined3d/wined3d_private.h | 21 +++--------------- 4 files changed, 50 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ca70d13af4710c0cb92…

1 0

Jason Green : wined3d: Move constant loading out of DrawPrimDrawStrided() and enable
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 1f1057fc9b073ba50c1f101145d73e172c4c6e09 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f1057fc9b073ba50c1f101… Author: Jason Green <jave27(a)gmail.com> Date: Thu Jun 8 04:00:23 2006 -0400 wined3d: Move constant loading out of DrawPrimDrawStrided() and enable loading float constants for GLSL. - DrawPrim is just too big of a function. This separates the passing of constants to the shader into new functions. - Fixes an off-by-one error when loading vertex declaration constants (should be <, not <=) - Adds a function for GLSL loading of constants (aka Uniforms) - Adds a GLSL program variable to the stateblock and sets it to 0 (a future patch will actually create this program) --- dlls/wined3d/drawprim.c | 249 +++++++++++++++++++++++++++------------- dlls/wined3d/stateblock.c | 4 + dlls/wined3d/wined3d_private.h | 2 3 files changed, 176 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=1f1057fc9b073ba50c1…

1 0

Jason Green : wined3d: Add the bulk of the GLSL string generation functions .
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 0c59ca6448d680c67b51df96534e91804c6ee4f1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c59ca6448d680c67b51df9… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 03:33:01 2006 -0400 wined3d: Add the bulk of the GLSL string generation functions. - Add a new file glsl_shader.c which contains almost every GLSL specific function we'll need - Move print_glsl_info() into glsl_shader.c - Move the shader_reg_maps struct info into the private header, and make it part of SHADER_OPCODE_ARG. - Create a new shared ps/vs register map for float constants (future patch will make ARB programs use this, too) --- dlls/wined3d/Makefile.in | 1 dlls/wined3d/baseshader.c | 30 - dlls/wined3d/glsl_shader.c | 803 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 + 4 files changed, 829 insertions(+), 29 deletions(-) create mode 100644 dlls/wined3d/glsl_shader.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0c59ca6448d680c67b5…

1 0

Dmitry Timoshkov : comctl32: Return FALSE in the WM_CLOSE PROPSHEET_DialogProc handler.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 217dae68c52eb6e730aced11e38053113a464692 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=217dae68c52eb6e730aced1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 8 23:56:52 2006 +0900 comctl32: Return FALSE in the WM_CLOSE PROPSHEET_DialogProc handler. Return FALSE in the WM_CLOSE PROPSHEET_DialogProc handler in order to allow DefDlgProc to post us WM_COMMAND/IDCANCEL and unblock modal message loop. --- dlls/comctl32/propsheet.c | 107 ++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 64 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 9f3527d..66f88cc 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2862,6 +2862,42 @@ INT_PTR WINAPI PropertySheetW(LPCPROPSHE return bRet; } +static LPWSTR load_string( HINSTANCE instance, LPCWSTR str ) +{ + LPWSTR ret; + UINT len; + + if (IS_INTRESOURCE(str)) + { + HRSRC hrsrc; + HGLOBAL hmem; + WCHAR *ptr; + WORD i, id = LOWORD(str); + + if (!(hrsrc = FindResourceW( instance, MAKEINTRESOURCEW((id >> 4) + 1), (LPWSTR)RT_STRING ))) + return NULL; + if (!(hmem = LoadResource( instance, hrsrc ))) return NULL; + if (!(ptr = LockResource( hmem ))) return NULL; + for (i = id & 0x0f; i > 0; i--) ptr += *ptr + 1; + len = *ptr; + if (!len) return NULL; + ret = Alloc( (len + 1) * sizeof(WCHAR) ); + if (ret) + { + memcpy( ret, ptr + 1, len * sizeof(WCHAR) ); + ret[len] = 0; + } + } + else + { + int len = (strlenW(str) + 1) * sizeof(WCHAR); + ret = Alloc( len ); + if (ret) memcpy( ret, str, len ); + } + return ret; +} + + /****************************************************************************** * CreatePropertySheetPage (COMCTL32.@) * CreatePropertySheetPageA (COMCTL32.@) @@ -2906,12 +2942,7 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->pszTitle )) PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); else - { - UINT id = LOWORD(ppsp->pszTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); - } + ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); } else ppsp->pszTitle = NULL; @@ -2924,12 +2955,7 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->pszHeaderTitle )) PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); else - { - UINT id = LOWORD(ppsp->pszHeaderTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); - } + ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); } else ppsp->pszHeaderTitle = NULL; @@ -2939,12 +2965,7 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee if (HIWORD( ppsp->pszHeaderSubTitle )) PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); else - { - UINT id = LOWORD(ppsp->pszHeaderSubTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); - } + ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); } else ppsp->pszHeaderSubTitle = NULL; @@ -2986,21 +3007,7 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee } if (ppsp->dwFlags & PSP_USETITLE) - { - if (HIWORD( ppsp->pszTitle )) - { - int len = strlenW(lpPropSheetPage->pszTitle) + 1; - ppsp->pszTitle = Alloc( len * sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->pszTitle, lpPropSheetPage->pszTitle ); - } - else - { - UINT id = LOWORD(ppsp->pszTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszTitle, len ); - } - } + ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); else ppsp->pszTitle = NULL; @@ -3008,40 +3015,12 @@ HPROPSHEETPAGE WINAPI CreatePropertyShee ppsp->dwFlags &= ~(PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE); if (ppsp->dwFlags & PSP_USEHEADERTITLE) - { - if (HIWORD( ppsp->pszHeaderTitle )) - { - int len = strlenW(lpPropSheetPage->pszHeaderTitle) + 1; - ppsp->pszHeaderTitle = Alloc( len * sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle ); - } - else - { - UINT id = LOWORD(ppsp->pszHeaderTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszHeaderTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderTitle, len ); - } - } + ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); else ppsp->pszHeaderTitle = NULL; if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) - { - if (HIWORD( ppsp->pszHeaderSubTitle )) - { - int len = strlenW(lpPropSheetPage->pszHeaderSubTitle) + 1; - ppsp->pszHeaderSubTitle = Alloc( len * sizeof (WCHAR) ); - strcpyW( (WCHAR *)ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle ); - } - else - { - UINT id = LOWORD(ppsp->pszHeaderSubTitle); - int len = LoadStringW( ppsp->hInstance, id, NULL, 0 ) + 1; - ppsp->pszHeaderSubTitle = Alloc( len * sizeof(WCHAR) ); - LoadStringW( ppsp->hInstance, id, (LPWSTR)ppsp->pszHeaderSubTitle, len ); - } - } + ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); else ppsp->pszHeaderSubTitle = NULL; @@ -3533,7 +3512,7 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMs case WM_CLOSE: PROPSHEET_Cancel(hwnd, 1); - return TRUE; + return FALSE; /* let DefDlgProc post us WM_COMMAND/IDCANCEL */ case WM_COMMAND: if (!PROPSHEET_DoCommand(hwnd, LOWORD(wParam)))

1 0

Detlef Riekenberg : comdlg32: Rename finddlg.c to finddlg16.c.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 249fa5b7a2e57987b45599c809707699b25d334b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=249fa5b7a2e57987b45599c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 8 13:26:30 2006 +0200 comdlg32: Rename finddlg.c to finddlg16.c. --- dlls/comdlg32/Makefile.in | 2 dlls/comdlg32/finddlg.c | 496 --------------------------------------------- dlls/comdlg32/finddlg16.c | 496 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 497 insertions(+), 497 deletions(-) delete mode 100644 dlls/comdlg32/finddlg.c create mode 100644 dlls/comdlg32/finddlg16.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=249fa5b7a2e57987b45…

1 0

Detlef Riekenberg : cmdlgtst: Use standard debug functions.
by Alexandre Julliard 09 Jun '06

09 Jun '06

Module: wine Branch: refs/heads/master Commit: 5ea9e8224eaa0895533950090137ed0658376805 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ea9e8224eaa08955339500… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 9 01:47:06 2006 +0200 cmdlgtst: Use standard debug functions. --- programs/cmdlgtst/cmdlgtst.c | 58 ++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 27 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index f82388b..a8ce9ee 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -39,6 +39,10 @@ #include <stdio.h> #include <string.h> #include "cmdlgtst.h" +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(cmdlgtst); + /* * This structure is to set up flag / control associations for the custom * requesters. The ft_id is the id for the control (usually generated @@ -124,7 +128,7 @@ static UINT CALLBACK dummyfnHook(HWND hW (void) wParam; (void) lParam; - printf("dummyfnhook\n"); /* visible under Wine, but Windows probably won't see it! */ + WINE_TRACE("dummyfnhook\n"); /* visible under Wine, but Windows probably won't see it! */ return 0; } @@ -465,9 +469,9 @@ #endif #define OF(fn, fi, fl) \ if(dm->dmFields & fl){ \ - printf(" %s =%hd \n", (fn), dm->fi); \ + WINE_TRACE(" %s =%hd \n", (fn), dm->fi); \ } else \ - printf(" %s NOT SET!\n", fn); + WINE_TRACE(" %s NOT SET!\n", fn); static void mw_PageSetup(HWND hWnd) @@ -483,13 +487,13 @@ static void mw_PageSetup(HWND hWnd) if(PageSetupDlg(&psd)){ dm = GlobalLock(psd.hDevMode); if(dm) { - printf("dm != NULL\nDEVMODEA struct:\n"); - printf(" dmDeviceName ='%s' \n", dm->dmDeviceName); - printf(" dmSpecVersion =%#x \n", dm->dmSpecVersion); - printf(" dmDriverVersion =%#x \n", dm->dmDriverVersion); - printf(" dmSize =%#x \n", dm->dmSize); - printf(" dmDriverExtra =%#x \n", dm->dmDriverExtra); - printf(" dmFields =%#lx\n", dm->dmFields); + WINE_TRACE("dm != NULL\nDEVMODEA struct:\n"); + WINE_TRACE(" dmDeviceName ='%s' \n", dm->dmDeviceName); + WINE_TRACE(" dmSpecVersion =%#x \n", dm->dmSpecVersion); + WINE_TRACE(" dmDriverVersion =%#x \n", dm->dmDriverVersion); + WINE_TRACE(" dmSize =%#x \n", dm->dmSize); + WINE_TRACE(" dmDriverExtra =%#x \n", dm->dmDriverExtra); + WINE_TRACE(" dmFields =%#lx\n", dm->dmFields); OF("dmOrientation", u1.s1.dmOrientation, DM_ORIENTATION) OF("dmPaperSize", u1.s1.dmPaperSize, DM_PAPERSIZE); OF("dmPaperLength", u1.s1.dmPaperLength, DM_PAPERLENGTH); @@ -499,44 +503,44 @@ static void mw_PageSetup(HWND hWnd) OF("dmDefaultSource", dmDefaultSource,DM_DEFAULTSOURCE); OF("dmPrintQuality", dmPrintQuality, DM_PRINTQUALITY); if(dm->dmFields & DM_POSITION) - printf(" dmPosition(%ld, %ld)\n", dm->u1.dmPosition.x, dm->u1.dmPosition.y); + WINE_TRACE(" dmPosition(%ld, %ld)\n", dm->u1.dmPosition.x, dm->u1.dmPosition.y); else - printf(" dmPosition NOT SET!\n"); + WINE_TRACE(" dmPosition NOT SET!\n"); OF("dmColor", dmColor, DM_COLOR); OF("dmDuplex", dmDuplex, DM_DUPLEX); OF("dmYResolution", dmYResolution, DM_YRESOLUTION); OF("dmTTOption", dmTTOption, DM_TTOPTION); OF("dmCollate", dmCollate, DM_COLLATE); if(dm->dmFields & DM_FORMNAME) - printf(" dmFormName = '%s'\n", dm->dmFormName); + WINE_TRACE(" dmFormName = '%s'\n", dm->dmFormName); else - printf(" dmFormName NOT SET!\n"); + WINE_TRACE(" dmFormName NOT SET!\n"); if(dm->dmFields & DM_ICMMETHOD) - printf(" dmICMMethod = %#lx\n", dm->dmICMMethod); + WINE_TRACE(" dmICMMethod = %#lx\n", dm->dmICMMethod); else - printf(" dmICMMethod NOT SET!"); + WINE_TRACE(" dmICMMethod NOT SET!"); GlobalUnlock(psd.hDevMode); } else - printf("dm == NULL\n"); + WINE_TRACE("dm == NULL\n"); - printf("\nPAGESETUPDLG struct\n"); - printf(" ptPaperSize(%ld, %ld)\n", psd.ptPaperSize.x, psd.ptPaperSize.y); - printf(" rtMargin(%ld, %ld, %ld, %ld)\n", + WINE_TRACE("\nPAGESETUPDLG struct\n"); + WINE_TRACE(" ptPaperSize(%ld, %ld)\n", psd.ptPaperSize.x, psd.ptPaperSize.y); + WINE_TRACE(" rtMargin(%ld, %ld, %ld, %ld)\n", psd.rtMargin.left, psd.rtMargin.top, psd.rtMargin.right, psd.rtMargin.bottom); - printf("\nDEVNAMES struct\n"); + WINE_TRACE("\nDEVNAMES struct\n"); dn = GlobalLock(psd.hDevNames); if(dn){ - printf(" wDriverOffset='%s'\n", ((char*)dn+dn->wDriverOffset)); - printf(" wDeviceOffset='%s'\n", ((char*)dn+dn->wDeviceOffset)); - printf(" wOutputOffset='%s'\n", ((char*)dn+dn->wOutputOffset)); - printf(" wDefault ='%s'\n", ((char*)dn+dn->wDefault)); + WINE_TRACE(" wDriverOffset='%s'\n", ((char*)dn+dn->wDriverOffset)); + WINE_TRACE(" wDeviceOffset='%s'\n", ((char*)dn+dn->wDeviceOffset)); + WINE_TRACE(" wOutputOffset='%s'\n", ((char*)dn+dn->wOutputOffset)); + WINE_TRACE(" wDefault ='%s'\n", ((char*)dn+dn->wDefault)); GlobalUnlock(psd.hDevNames); }else - printf(" dn == NULL!\n"); - printf("End.\n"); + WINE_TRACE(" dn == NULL!\n"); + WINE_TRACE("End.\n"); if (psd.hDevMode != NULL) GlobalFree(psd.hDevMode);

1 0