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

Vitaly Budovski : wined3d: Added two sided stencil support to WINED3DRS_STENCILFUNC.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 196eaa674cf924145f903c27906a7d88c20c98f8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=196eaa674cf924145f903c2… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:53:50 2006 +1100 wined3d: Added two sided stencil support to WINED3DRS_STENCILFUNC. --- dlls/wined3d/device.c | 66 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 44 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 047b2b9..f7210f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3144,31 +3144,53 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen } break; - case WINED3DRS_STENCILFUNC : - { - int glParm = GL_ALWAYS; - int ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; - GLuint mask = This->stateBlock->renderState[WINED3DRS_STENCILMASK]; + case WINED3DRS_STENCILFUNC : + { + GLint func; + GLint ref = This->stateBlock->renderState[WINED3DRS_STENCILREF]; + GLuint mask = This->stateBlock->renderState[WINED3DRS_STENCILMASK]; - switch ((D3DCMPFUNC) Value) { - case D3DCMP_NEVER: glParm=GL_NEVER; break; - case D3DCMP_LESS: glParm=GL_LESS; break; - case D3DCMP_EQUAL: glParm=GL_EQUAL; break; - case D3DCMP_LESSEQUAL: glParm=GL_LEQUAL; break; - case D3DCMP_GREATER: glParm=GL_GREATER; break; - case D3DCMP_NOTEQUAL: glParm=GL_NOTEQUAL; break; - case D3DCMP_GREATEREQUAL: glParm=GL_GEQUAL; break; - case D3DCMP_ALWAYS: glParm=GL_ALWAYS; break; - default: - FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); - } - TRACE("glStencilFunc with Parm=%x, ref=%d, mask=%x\n", glParm, ref, mask); - This->stencilfunc = glParm; - glStencilFunc(glParm, ref, mask); - checkGLcall("glStencilFunc"); + func = GL_ALWAYS; + switch ((D3DCMPFUNC)Value) { + case D3DCMP_NEVER: func = GL_NEVER; break; + case D3DCMP_LESS: func = GL_LESS; break; + case D3DCMP_EQUAL: func = GL_EQUAL; break; + case D3DCMP_LESSEQUAL: func = GL_LEQUAL; break; + case D3DCMP_GREATER: func = GL_GREATER; break; + case D3DCMP_NOTEQUAL: func = GL_NOTEQUAL; break; + case D3DCMP_GREATEREQUAL: func = GL_GEQUAL; break; + case D3DCMP_ALWAYS: func = GL_ALWAYS; break; + default: + FIXME("Unrecognized/Unhandled D3DCMPFUNC value %ld\n", Value); + } + This->stencilfunc = func; + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + if(GL_EXTCALL(glStencilFuncSeparate)) { + GL_EXTCALL(glStencilFuncSeparate(GL_FRONT, func, ref, mask)); + checkGLcall("glStencilFuncSeparate(GL_FRONT,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + else if(GL_EXTCALL(glStencilFuncSeparateATI)) { + GL_EXTCALL(glStencilFuncSeparateATI(GL_FRONT, func, ref, mask)); + checkGLcall("glStencilFuncSeparateATI(GL_FRONT,...)"); + } else { + TRACE("Separate stencil function not supported on this version of opengl"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + } else { + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); } break; - + } case WINED3DRS_STENCILREF : { int glParm = This->stencilfunc;

1 0

Vitaly Budovski : wined3d: Implemented WINED3DRS_DEPTHBIAS.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: e5bad779d6c27db11bd3eab6d893935b7cd103d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5bad779d6c27db11bd3eab… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Wed Mar 1 23:37:58 2006 +1100 wined3d: Implemented WINED3DRS_DEPTHBIAS. --- dlls/wined3d/device.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f7210f0..800c630 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3866,7 +3866,24 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen case WINED3DRS_COLORWRITEENABLE3 : case WINED3DRS_BLENDFACTOR : case WINED3DRS_SRGBWRITEENABLE : + { + FIXME("(%p)->(%d,%ld) not handled yet\n", This, State, Value); + break; + } case WINED3DRS_DEPTHBIAS : + { + if(Value) { + tmpvalue.d = Value; + glEnable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); + glPolygonOffset(*((float*)&This->stateBlock->renderState[WINED3DRS_SLOPESCALEDEPTHBIAS]), tmpvalue.f); + checkGLcall("glPolygonOffset(...)"); + } else { + glDisable(GL_POLYGON_OFFSET_FILL); + checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL)"); + } + break; + } case WINED3DRS_WRAP8 : case WINED3DRS_WRAP9 : case WINED3DRS_WRAP10 :

1 0

Vitaly Budovski : wined3d: Implemented fallback for separate stencil function in WINED3DRS_CCW_STENCILFUNC .
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bf561b7ba1b1ae9ae22a1056c554ad8bce7f8bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bf561b7ba1b1ae9ae22a10… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:50:55 2006 +1100 wined3d: Implemented fallback for separate stencil function in WINED3DRS_CCW_STENCILFUNC. --- dlls/wined3d/device.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 174f975..894a70a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3817,8 +3817,23 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); - } else - WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } + else if(GL_EXTCALL(glStencilFuncSeparateATI)) { + GL_EXTCALL(glStencilFuncSeparateATI(GL_BACK, func, ref, mask)); + checkGLcall("glStencilFuncSeparateATI(GL_BACK,...)"); + } else { + TRACE("Separate stencil function not supported on this version of opengl"); + glStencilFunc(func, ref, mask); + checkGLcall("glStencilFunc(...)"); + } } else { glStencilFunc(func, ref, mask); checkGLcall("glStencilFunc(...)");

1 0

Vitaly Budovski : wined3d: Implemented fallback for separate stencil operation in WINED3DRS_CCW_STENCIL* .
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 7b55a0cff1773c9b2c887570fa44623b771ad67f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7b55a0cff1773c9b2c88757… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:49:05 2006 +1100 wined3d: Implemented fallback for separate stencil operation in WINED3DRS_CCW_STENCIL*. --- dlls/wined3d/device.c | 22 ++++++++++++++++++---- include/wine/wined3d_gl.h | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d27776c..174f975 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3752,9 +3752,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen GLint action = StencilOp(Value); - glGetIntegerv(GL_STENCIL_FAIL, &stencilFail); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &depthFail); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &stencilPass); + glGetIntegerv(GL_STENCIL_BACK_FAIL, &stencilFail); + glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_FAIL, &depthFail); + glGetIntegerv(GL_STENCIL_BACK_PASS_DEPTH_PASS, &stencilPass); if(WINED3DRS_CCW_STENCILFAIL == State) { stencilFail = action; @@ -3770,8 +3770,22 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(GL_EXTCALL(glStencilOpSeparate)) { GL_EXTCALL(glStencilOpSeparate(GL_BACK, stencilFail, depthFail, stencilPass)); checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + else if(GL_EXTCALL(glStencilOpSeparateATI)) { + GL_EXTCALL(glStencilOpSeparateATI(GL_BACK, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparateATI(GL_BACK,...)"); } else { - WARN("Unsupported in local OpenGL implementation: glStencilOpSeparate\n"); + TRACE("Separate stencil operation not supported on this version of opengl"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); } } else { glStencilOp(stencilFail, depthFail, stencilPass); diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index fa391ba..c4cd565 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -803,6 +803,23 @@ typedef void (APIENTRY * PGLFNBEGINOCCLU typedef void (APIENTRY * PGLFNENDOCCLUSIONQUERYNVPROC) (void); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); typedef void (APIENTRY * PGLFNGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); +/* GL_EXT_stencil_two_side */ +#ifndef GL_EXT_stencil_two_side +#define GL_EXT_stencil_two_side 1 +#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 +#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 +#endif +typedef void (APIENTRY * PGLFNACTIVESTENCILFACEEXTPROC) (GLenum face); +/* GL_ATI_separate_stencil */ +#ifndef GL_ATI_separate_stencil +#define GL_ATI_separate_stencil 1 +#define GL_STENCIL_BACK_FUNC_ATI 0x8800 +#define GL_STENCIL_BACK_FAIL_ATI 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 +#endif +typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEATIPROC) (GLenum, GLenum, GLenum, GLenum); +typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEATIPROC) (GLenum, GLenum, GLint, GLuint); /* OpenGL 2.0 */ typedef void (APIENTRY * PGLFNSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); typedef void (APIENTRY * PGLFNSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); @@ -1034,6 +1051,10 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNVERTEXATTRIBPOINTERARBPROC, glVertexAttribPointerARB); \ USE_GL_FUNC(PGLFNENABLEVERTEXATTRIBARRAYARBPROC, glEnableVertexAttribArrayARB); \ USE_GL_FUNC(PGLFNDISABLEVERTEXATTRIBARRAYARBPROC, glDisableVertexAttribArrayARB); \ + /* GL_EXT_stencil_two_side */ \ + USE_GL_FUNC(PGLFNACTIVESTENCILFACEEXTPROC, glActiveStencilFaceEXT); \ + USE_GL_FUNC(PGLFNSTENCILOPSEPARATEATIPROC, glStencilOpSeparateATI); \ + USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEATIPROC, glStencilFuncSeparateATI); \ /* OpenGL 2.0 */ \ USE_GL_FUNC(PGLFNSTENCILOPSEPARATEPROC, glStencilOpSeparate); \ USE_GL_FUNC(PGLFNSTENCILFUNCSEPARATEPROC, glStencilFuncSeparate); \

1 0

Detlef Riekenberg : wined3d: Fix cut&paste typo.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 858be437c5b1cc642ba841f4c3431870fb3ec712 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=858be437c5b1cc642ba841f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 3 22:40:22 2006 +0100 wined3d: Fix cut&paste typo. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7d8e4f2..d27776c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3802,7 +3802,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { if(GL_EXTCALL(glStencilFuncSeparate)) { GL_EXTCALL(glStencilFuncSeparate(GL_BACK, func, ref, mask)); - checkGLcall("glStencilOpSeparate(GL_BACK,...)"); + checkGLcall("glStencilFuncSeparate(GL_BACK,...)"); } else WARN("Unsupported in local OpenGL implementation: glStencilFuncSeparate\n"); } else {

1 0

Stefan Dösinger : wined3d: Add D3D7 render states.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: ecaf7729069819d47fe89abe5a032ebf516ace38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecaf7729069819d47fe89ab… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 3 13:25:22 2006 +0100 wined3d: Add D3D7 render states. --- include/wine/wined3d_types.h | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index f6ea234..65433f3 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -202,15 +202,27 @@ typedef enum _WINED3DFORMAT { typedef enum _WINED3DRENDERSTATETYPE { + WINED3DRS_TEXTUREHANDLE = 1, + WINED3DRS_ANTIALIAS = 2, + WINED3DRS_TEXTUREADDRESS = 3, + WINED3DRS_TEXTUREPERSPECTIVE = 4, + WINED3DRS_WRAPU = 5, + WINED3DRS_WRAPV = 6, WINED3DRS_ZENABLE = 7, WINED3DRS_FILLMODE = 8, WINED3DRS_SHADEMODE = 9, WINED3DRS_LINEPATTERN = 10, + WINED3DRS_MONOENABLE = 11, + WINED3DRS_ROP2 = 12, + WINED3DRS_PLANEMASK = 13, WINED3DRS_ZWRITEENABLE = 14, WINED3DRS_ALPHATESTENABLE = 15, WINED3DRS_LASTPIXEL = 16, + WINED3DRS_TEXTUREMAG = 17, + WINED3DRS_TEXTUREMIN = 18, WINED3DRS_SRCBLEND = 19, WINED3DRS_DESTBLEND = 20, + WINED3DRS_TEXTUREMAPBLEND = 21, WINED3DRS_CULLMODE = 22, WINED3DRS_ZFUNC = 23, WINED3DRS_ALPHAREF = 24, @@ -220,14 +232,26 @@ typedef enum _WINED3DRENDERSTATETYPE { WINED3DRS_FOGENABLE = 28, WINED3DRS_SPECULARENABLE = 29, WINED3DRS_ZVISIBLE = 30, + WINED3DRS_SUBPIXEL = 31, + WINED3DRS_SUBPIXELX = 32, + WINED3DRS_STIPPLEDALPHA = 33, WINED3DRS_FOGCOLOR = 34, WINED3DRS_FOGTABLEMODE = 35, WINED3DRS_FOGSTART = 36, WINED3DRS_FOGEND = 37, WINED3DRS_FOGDENSITY = 38, + WINED3DRS_STIPPLEENABLE = 39, WINED3DRS_EDGEANTIALIAS = 40, + WINED3DRS_COLORKEYENABLE = 41, + WINED3DRS_BORDERCOLOR = 43, + WINED3DRS_TEXTUREADDRESSU = 44, + WINED3DRS_TEXTUREADDRESSV = 45, + WINED3DRS_MIPMAPLODBIAS = 46, WINED3DRS_ZBIAS = 47, WINED3DRS_RANGEFOGENABLE = 48, + WINED3DRS_ANISOTROPY = 49, + WINED3DRS_FLUSHBATCH = 50, + WINED3DRS_TRANSLUCENTSORTINDEPENDENT = 51, WINED3DRS_STENCILENABLE = 52, WINED3DRS_STENCILFAIL = 53, WINED3DRS_STENCILZFAIL = 54, @@ -247,11 +271,13 @@ typedef enum _WINED3DRENDERSTATETYPE { WINED3DRS_WRAP7 = 135, WINED3DRS_CLIPPING = 136, WINED3DRS_LIGHTING = 137, + WINED3DRS_EXTENTS = 138, WINED3DRS_AMBIENT = 139, WINED3DRS_FOGVERTEXMODE = 140, WINED3DRS_COLORVERTEX = 141, WINED3DRS_LOCALVIEWER = 142, WINED3DRS_NORMALIZENORMALS = 143, + WINED3DRS_COLORKEYBLENDENABLE = 144, WINED3DRS_DIFFUSEMATERIALSOURCE = 145, WINED3DRS_SPECULARMATERIALSOURCE = 146, WINED3DRS_AMBIENTMATERIALSOURCE = 147,

1 0

Stefan Dösinger : wined3d: Add D3D7 texture stage types.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: a15280972bb706a8ac6f92102e63e734de71bca9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a15280972bb706a8ac6f921… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Mar 3 13:39:48 2006 +0100 wined3d: Add D3D7 texture stage types. --- include/wine/wined3d_types.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 65433f3..8735037 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -386,6 +386,16 @@ typedef enum _WINED3DTEXTURESTAGESTATETY WINED3DTSS_BUMPENVMAT10 = 9, WINED3DTSS_BUMPENVMAT11 = 10, WINED3DTSS_TEXCOORDINDEX = 11, + WINED3DTSS_ADDRESS = 12, + WINED3DTSS_ADDRESSU = 13, + WINED3DTSS_ADDRESSV = 14, + WINED3DTSS_BORDERCOLOR = 15, + WINED3DTSS_MAGFILTER = 16, + WINED3DTSS_MINFILTER = 17, + WINED3DTSS_MIPFILTER = 18, + WINED3DTSS_MIPMAPLODBIAS = 19, + WINED3DTSS_MAXMIPLEVEL = 20, + WINED3DTSS_MAXANISOTROPY = 21, WINED3DTSS_BUMPENVLSCALE = 22, WINED3DTSS_BUMPENVLOFFSET = 23, WINED3DTSS_TEXTURETRANSFORMFLAGS = 24,

1 0

Juan Lang : crypt32: Move serialization functions to serialize.c.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: c3a125179d98329c35c1027e603fd6c3fd4a8be6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c3a125179d98329c35c1027… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Mar 3 10:48:52 2006 -0800 crypt32: Move serialization functions to serialize.c. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/crypt32_private.h | 14 + dlls/crypt32/serialize.c | 515 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 434 ---------------------------------- 4 files changed, 530 insertions(+), 434 deletions(-) create mode 100644 dlls/crypt32/serialize.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c3a125179d98329c35c…

1 0

Mike McCormack : avifil32: Eliminate some gcc 4. 1 warnings caused by windowsx.h macros.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: 73bc4e6752cef032406f3cf08a55cc097bc0cb23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73bc4e6752cef032406f3cf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 4 14:13:05 2006 +0900 avifil32: Eliminate some gcc 4.1 warnings caused by windowsx.h macros. --- dlls/avifil32/acmstream.c | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 0dc068f..6ffe416 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" #include "msacm.h" @@ -177,20 +176,24 @@ static ULONG WINAPI ACMStream_fnRelease( This->has = NULL; } if (This->acmStreamHdr.pbSrc != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbSrc); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); This->acmStreamHdr.pbSrc = NULL; } if (This->acmStreamHdr.pbDst != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbDst); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); This->acmStreamHdr.pbDst = NULL; } if (This->lpInFormat != NULL) { - GlobalFreePtr(This->lpInFormat); + GlobalUnlock(GlobalHandle(This->lpInFormat)); + GlobalFree(GlobalHandle(This->lpInFormat)); This->lpInFormat = NULL; This->cbInFormat = 0; } if (This->lpOutFormat != NULL) { - GlobalFreePtr(This->lpOutFormat); + GlobalUnlock(GlobalHandle(This->lpOutFormat)); + GlobalFree(GlobalHandle(This->lpOutFormat)); This->lpOutFormat = NULL; This->cbOutFormat = 0; } @@ -250,7 +253,7 @@ static HRESULT WINAPI ACMStream_fnCreate else This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; @@ -383,7 +386,7 @@ static HRESULT WINAPI ACMStream_fnSetFor if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) return AVIERR_READONLY; - This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, formatsize); + This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, formatsize)); if (This->lpInFormat == NULL) return AVIERR_MEMORY; This->cbInFormat = formatsize; @@ -463,7 +466,8 @@ static HRESULT WINAPI ACMStream_fnRead(I /* Need to free destination buffer used for writing? */ if (This->acmStreamHdr.pbDst != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbDst); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); This->acmStreamHdr.pbDst = NULL; This->acmStreamHdr.dwDstUser = 0; } @@ -472,10 +476,13 @@ static HRESULT WINAPI ACMStream_fnRead(I if (This->acmStreamHdr.pbSrc == NULL || This->acmStreamHdr.dwSrcUser < size) { if (This->acmStreamHdr.pbSrc == NULL) - This->acmStreamHdr.pbSrc = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->acmStreamHdr.pbSrc = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); else - This->acmStreamHdr.pbSrc = GlobalReAllocPtr(This->acmStreamHdr.pbSrc, + { + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbSrc), size, GMEM_MOVEABLE); + } if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size; @@ -567,7 +574,8 @@ static HRESULT WINAPI ACMStream_fnWrite( /* Need to free source buffer used for reading? */ if (This->acmStreamHdr.pbSrc != NULL) { - GlobalFreePtr(This->acmStreamHdr.pbSrc); + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); + GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); This->acmStreamHdr.pbSrc = NULL; This->acmStreamHdr.dwSrcUser = 0; } @@ -576,10 +584,13 @@ static HRESULT WINAPI ACMStream_fnWrite( if (This->acmStreamHdr.pbDst == NULL || This->acmStreamHdr.dwDstUser < size) { if (This->acmStreamHdr.pbDst == NULL) - This->acmStreamHdr.pbDst = GlobalAllocPtr(GMEM_MOVEABLE, size); + This->acmStreamHdr.pbDst = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); else - This->acmStreamHdr.pbDst = GlobalReAllocPtr(This->acmStreamHdr.pbDst, + { + GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); + This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbDst), size, GMEM_MOVEABLE); + } if (This->acmStreamHdr.pbDst == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwDstUser = size; @@ -703,7 +714,7 @@ static HRESULT AVIFILE_OpenCompressor(IA hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); if (FAILED(hr)) return hr; - This->lpInFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GMEM_MOVEABLE, This->cbInFormat); + This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, This->cbInFormat)); if (This->lpInFormat == NULL) return AVIERR_MEMORY; @@ -715,7 +726,7 @@ static HRESULT AVIFILE_OpenCompressor(IA if (This->lpOutFormat == NULL) { /* we must decode to default format */ This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = (LPWAVEFORMATEX)GlobalAllocPtr(GHND, This->cbOutFormat); + This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); if (This->lpOutFormat == NULL) return AVIERR_MEMORY;

1 0

Byeong-Sik Jeon : user32: Fix the default height for CJK fonts.
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: bd82e82993841fbe9e25e743ce8ef0a768381ad4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd82e82993841fbe9e25e74… Author: Byeong-Sik Jeon <wjsqudtlr(a)gmail.com> Date: Sat Mar 4 17:13:32 2006 +0900 user32: Fix the default height for CJK fonts. --- dlls/user/sysparams.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index d678f43..769edd7 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1021,6 +1021,7 @@ static void load_nonclient_metrics(void) { HKEY hkey; NONCLIENTMETRICSW ncm; + INT r; if (RegOpenKeyExW (HKEY_CURRENT_USER, METRICS_REGKEY, 0, KEY_QUERY_VALUE, &hkey) != ERROR_SUCCESS) hkey = 0; @@ -1061,7 +1062,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfMenuFont, 0 ); GetProfileStringW( Desktop, MenuFont, ncm.lfCaptionFont.lfFaceName, ncm.lfMenuFont.lfFaceName, LF_FACESIZE ); - ncm.lfMenuFont.lfHeight = -GetProfileIntW( Desktop, MenuFontSize, 11 ); + r = GetProfileIntW( Desktop, MenuFontSize, 0 ); + if (r) + ncm.lfMenuFont.lfHeight = -r; ncm.lfMenuFont.lfWeight = FW_NORMAL; } @@ -1071,7 +1074,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfStatusFont, 0 ); GetProfileStringW( Desktop, StatusFont, ncm.lfCaptionFont.lfFaceName, ncm.lfStatusFont.lfFaceName, LF_FACESIZE ); - ncm.lfStatusFont.lfHeight = -GetProfileIntW( Desktop, StatusFontSize, 11 ); + r = GetProfileIntW( Desktop, StatusFontSize, 0 ); + if (r) + ncm.lfStatusFont.lfHeight = -r; ncm.lfStatusFont.lfWeight = FW_NORMAL; } @@ -1081,7 +1086,9 @@ static void load_nonclient_metrics(void) SystemParametersInfoW( SPI_GETICONTITLELOGFONT, 0, &ncm.lfMessageFont, 0 ); GetProfileStringW( Desktop, MessageFont, ncm.lfCaptionFont.lfFaceName, ncm.lfMessageFont.lfFaceName, LF_FACESIZE ); - ncm.lfMessageFont.lfHeight = -GetProfileIntW( Desktop, MessageFontSize, 11 ); + r = GetProfileIntW( Desktop, MessageFontSize, 0 ); + if (r) + ncm.lfMessageFont.lfHeight = -r; ncm.lfMessageFont.lfWeight = FW_NORMAL; } @@ -1414,6 +1421,8 @@ BOOL WINAPI SystemParametersInfoW( UINT if (!reg_get_logfont( SPI_SETICONTITLELOGFONT_REGKEY, SPI_SETICONTITLELOGFONT_VALNAME, &icon_metrics.lfFont )) { + INT r; + /* * The 'default GDI fonts' seems to be returned. * If a returned font is not a correct font in your environment, @@ -1425,7 +1434,13 @@ BOOL WINAPI SystemParametersInfoW( UINT lfDefault.lfFaceName, icon_metrics.lfFont.lfFaceName, LF_FACESIZE ); - icon_metrics.lfFont.lfHeight = -GetProfileIntW( Desktop, IconTitleSize, 11 ); + + r = GetProfileIntW( Desktop, IconTitleSize, 0 ); + if (r) + icon_metrics.lfFont.lfHeight = -r; + else + icon_metrics.lfFont.lfHeight = lfDefault.lfHeight; + icon_metrics.lfFont.lfWidth = 0; icon_metrics.lfFont.lfEscapement = icon_metrics.lfFont.lfOrientation = 0; icon_metrics.lfFont.lfWeight = FW_NORMAL;

1 0