July 2008 - Wine-commits - list.winehq.org

Aric Stewart : mlang: Basic implementation of fnIMultiLanguage2_GetCodePageDescription.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 36a1ee762fda3065b72a2c48688cf29e363898cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a1ee762fda3065b72a2c486… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jul 15 16:57:46 2008 +0900 mlang: Basic implementation of fnIMultiLanguage2_GetCodePageDescription. --- dlls/mlang/mlang.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 14f881e..8bc11b5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2423,8 +2423,25 @@ static HRESULT WINAPI fnIMultiLanguage2_GetCodePageDescription( LPWSTR lpWideCharStr, int cchWideChar) { - FIXME("%u, %04x, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); - return E_NOTIMPL; + /* Find first instance */ + unsigned int i,n; + + TRACE ("%u, %04x, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + for (n = 0; n < mlang_data[i].number_of_cp; n++) + { + if (mlang_data[i].mime_cp_info[n].cp == uiCodePage) + { + MultiByteToWideChar(CP_ACP, 0, + mlang_data[i].mime_cp_info[n].description, + -1, lpWideCharStr, cchWideChar); + return S_OK; + } + } + } + + return S_FALSE; } static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable(

1 0

Mikołaj Zalewski : comctl32: statusbar: Don' t issue a WM_PAINT during a WM_CREATE.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: f7cda904cd7b3fcd37aa2b42bd43ba5553b894f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7cda904cd7b3fcd37aa2b42b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 17:47:29 2008 +0200 comctl32: statusbar: Don't issue a WM_PAINT during a WM_CREATE. --- dlls/comctl32/status.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 33ffcbf..3744280 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -934,15 +934,13 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) STATUSBAR_NotifyFormat(infoPtr, infoPtr->Notify, NF_REQUERY); - GetClientRect (hwnd, &rect); - InvalidateRect (hwnd, &rect, 0); - UpdateWindow(hwnd); - ZeroMemory (&nclm, sizeof(nclm)); nclm.cbSize = sizeof(nclm); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, nclm.cbSize, &nclm, 0); infoPtr->hDefaultFont = CreateFontIndirectW (&nclm.lfStatusFont); + GetClientRect (hwnd, &rect); + /* initialize simple case */ infoPtr->part0.bound = rect; infoPtr->part0.text = 0;

1 0

Stefan Dösinger : wined3d: Test for multisampling in the template.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: d247953687fd657cb7b27564b3a9a4cf4a1f984b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d247953687fd657cb7b27564b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:59:21 2008 -0500 wined3d: Test for multisampling in the template. --- dlls/wined3d/state.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 93ce543..9caa24b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1633,19 +1633,19 @@ static void state_wrap(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC } } -static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - if( GL_SUPPORT(ARB_MULTISAMPLE) ) { - if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - glEnable(GL_MULTISAMPLE_ARB); - checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); - } else { - glDisable(GL_MULTISAMPLE_ARB); - checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); - } +static void state_msaa_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + WARN("Multisample antialiasing not supported by gl\n"); + } +} + +static void state_msaa(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { + glEnable(GL_MULTISAMPLE_ARB); + checkGLcall("glEnable(GL_MULTISAMPLE_ARB)"); } else { - if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - WARN("Multisample antialiasing not supported by gl\n"); - } + glDisable(GL_MULTISAMPLE_ARB); + checkGLcall("glDisable(GL_MULTISAMPLE_ARB)"); } } @@ -3940,7 +3940,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation }, 0 }, - { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, 0 }, + { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa }, ARB_MULTISAMPLE }, + { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_msaa_w }, 0 }, { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX },

1 0

Stefan Dösinger : wined3d: Move the point sprite support test into the template.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 9c1b6581c660b9147b94cdfd46ee4faf3ad3f7e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1b6581c660b9147b94cdfd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:49:50 2008 -0500 wined3d: Move the point sprite support test into the template. --- dlls/wined3d/state.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 69bbb50..93ce543 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1586,13 +1586,14 @@ static void state_lastpixel(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } -static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_pointsprite_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { /* TODO: NV_POINT_SPRITE */ - if (!GL_SUPPORT(ARB_POINT_SPRITE)) { + if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { TRACE("Point sprites not supported\n"); - return; } +} +static void state_pointsprite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if (stateblock->renderState[WINED3DRS_POINTSPRITEENABLE]) { glEnable(GL_POINT_SPRITE_ARB); checkGLcall("glEnable(GL_POINT_SPRITE_ARB)"); @@ -4334,7 +4335,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, ARB_POINT_SPRITE }, + { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite_w }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 },

1 0

Stefan Dösinger : wined3d: Split the psizemax state handler.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 94e455343d12802d5a712d224781aaa41a65650e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e455343d12802d5a712d224… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:47:59 2008 -0500 wined3d: Split the psizemax state handler. --- dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f4f5959..69bbb50 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1433,21 +1433,36 @@ static void state_psizemin_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, checkGLcall("glPointParameterfARB(...)"); } -static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_psizemax_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; float f; } tmpvalue; tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; - if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); - checkGLcall("glPointParameterfARB(...)"); - } - else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...)"); - } else if(tmpvalue.f != 64.0) { + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MAX_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(...)"); +} + +static void state_psizemax_ext(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MAX_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...)"); +} + +static void state_psizemax_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MAX]; + if(tmpvalue.f != 64.0) { FIXME("WINED3DRS_POINTSIZE_MAX not supported on this opengl, value is %f\n", tmpvalue.f); } } @@ -4324,7 +4339,9 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_B), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_C), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_arb }, ARB_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_ext }, EXT_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_w }, 0 }, /* Samplers for NP2 texture matrix adjustions */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texmatrix }, 0 }, { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texmatrix }, 0 },

1 0

Stefan Dösinger : wined3d: Move a few extension checks into the state template.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: df4dcc34aacd172b66be19487e87f1e3cfdbd1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4dcc34aacd172b66be19487… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:35:53 2008 -0500 wined3d: Move a few extension checks into the state template. --- dlls/wined3d/state.c | 53 +++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index bbd8a1d..529d33e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -451,14 +451,13 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D } } +static void state_blendfactor_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); +} + static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { float col[4]; - if(!GL_SUPPORT(EXT_BLEND_COLOR)) { - WARN("Unsupported in local OpenGL implementation: glBlendColorEXT\n"); - return; - } - TRACE("Setting BlendFactor to %d\n", stateblock->renderState[WINED3DRS_BLENDFACTOR]); D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_BLENDFACTOR], col); GL_EXTCALL(glBlendColorEXT (col[0],col[1],col[2],col[3])); @@ -594,15 +593,14 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine } } +static void state_blendop_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); +} + static void state_blendop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { int blendEquation = GL_FUNC_ADD; int blendEquationAlpha = GL_FUNC_ADD; - if(!GL_SUPPORT(EXT_BLEND_MINMAX)) { - WARN("Unsupported in local OpenGL implementation: glBlendEquation\n"); - return; - } - /* BLENDOPALPHA requires GL_EXT_blend_equation_separate, so make sure it is around */ if(stateblock->renderState[WINED3DRS_BLENDOPALPHA] && !GL_SUPPORT(EXT_BLEND_EQUATION_SEPARATE)) { WARN("Unsupported in local OpenGL implementation: glBlendEquationSeparateEXT\n"); @@ -868,7 +866,7 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *c } } -static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_stencilwrite2s(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD mask; if(stateblock->wineD3DDevice->stencilBufferTarget) { @@ -877,17 +875,25 @@ static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, mask = 0; } - if(GL_SUPPORT(EXT_STENCIL_TWO_SIDE)) { - GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); - checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); - glStencilMask(mask); - checkGLcall("glStencilMask"); - GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); - checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); - glStencilMask(mask); + GL_EXTCALL(glActiveStencilFaceEXT(GL_BACK)); + checkGLcall("glActiveStencilFaceEXT(GL_BACK)"); + glStencilMask(mask); + checkGLcall("glStencilMask"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilMask(mask); +} + +static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + DWORD mask; + + if(stateblock->wineD3DDevice->stencilBufferTarget) { + mask = stateblock->renderState[WINED3DRS_STENCILWRITEMASK]; } else { - glStencilMask(mask); + mask = 0; } + + glStencilMask(mask); checkGLcall("glStencilMask"); } @@ -3867,6 +3873,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_STENCILREF), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_STENCILMASK), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, + { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite2s}, EXT_STENCIL_TWO_SIDE }, { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), { STATE_RENDER(WINED3DRS_STENCILWRITEMASK), state_stencilwrite }, 0 }, { STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, { STATE_RENDER(WINED3DRS_CCW_STENCILFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }, 0 }, @@ -3905,13 +3912,15 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), { STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, 0 }, { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), { STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, - { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, 0 }, + { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop }, EXT_BLEND_MINMAX }, + { STATE_RENDER(WINED3DRS_BLENDOP), { STATE_RENDER(WINED3DRS_BLENDOP), state_blendop_w }, 0 }, { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), { STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor }, 0 }, { STATE_RENDER(WINED3DRS_SLOPESCALEDEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE1), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE2), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }, 0 }, - { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, 0 }, + { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }, EXT_BLEND_COLOR }, + { STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor_w }, 0 }, { STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, 0 }, /* Samplers */ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }, 0 },

1 0

Stefan Dösinger : wined3d: Move the range fog support test to the template.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 710b9a76b3469fa65ccf80ecca6e90b69e293472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=710b9a76b3469fa65ccf80ecc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:38:43 2008 -0500 wined3d: Move the range fog support test to the template. --- dlls/wined3d/state.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 529d33e..34950cc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1186,19 +1186,19 @@ static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCo } } +static void state_rangefog_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) { + WARN("Range fog enabled, but not supported by this opengl implementation\n"); + } +} + static void state_rangefog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { if(stateblock->renderState[WINED3DRS_RANGEFOGENABLE]) { - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); - } else { - WARN("Range fog enabled, but not supported by this opengl implementation\n"); - } + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); } else { - if (GL_SUPPORT(NV_FOG_DISTANCE)) { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); - } + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); } } @@ -4286,7 +4286,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGCOLOR), { STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, 0 }, { STATE_RENDER(WINED3DRS_FOGDENSITY), { STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, 0 }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, 0 }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, NV_FOG_DISTANCE }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w }, 0 }, { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, 0 }, { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, 0 }, { STATE_RENDER(WINED3DRS_LIGHTING), { STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, 0 },

1 0

Stefan Dösinger : wined3d: Split the psizemin handler.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 7740dda1dac182f3f8dbe7b3b915f220b45949cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7740dda1dac182f3f8dbe7b3b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:45:39 2008 -0500 wined3d: Split the psizemin handler. --- dlls/wined3d/state.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 34950cc..f4f5959 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1399,25 +1399,40 @@ static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } -static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void state_psizemin_w(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; float f; } tmpvalue; tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; - if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); - checkGLcall("glPointParameterfARB(...)"); - } - else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { - GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); - checkGLcall("glPointParameterfEXT(...)"); - } else if(tmpvalue.f != 1.0) { + if(tmpvalue.f != 1.0) { FIXME("WINED3DRS_POINTSIZE_MIN not supported on this opengl, value is %f\n", tmpvalue.f); } } +static void state_psizemin_ext(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfEXT)(GL_POINT_SIZE_MIN_EXT, tmpvalue.f); + checkGLcall("glPointParameterfEXT(...)"); +} + +static void state_psizemin_arb(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE_MIN]; + GL_EXTCALL(glPointParameterfARB)(GL_POINT_SIZE_MIN_ARB, tmpvalue.f); + checkGLcall("glPointParameterfARB(...)"); +} + static void state_psizemax(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; @@ -4301,7 +4316,9 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_EMISSIVEMATERIALSOURCE), { STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, 0 }, { STATE_RENDER(WINED3DRS_VERTEXBLEND), { STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, 0 }, { STATE_RENDER(WINED3DRS_POINTSIZE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, - { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, 0 }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_arb }, ARB_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_ext }, EXT_POINT_PARAMETERS }, + { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), { STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin_w }, 0 }, { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), { STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 }, { STATE_RENDER(WINED3DRS_POINTSCALE_A), { STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, 0 },

1 0

James Hawkins : kernel32: Return the default value if lpKeyName is empty.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 3fb196fb57fadc94979f8354e2603a38d5b08708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fb196fb57fadc94979f8354e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Jul 16 16:27:17 2008 -0500 kernel32: Return the default value if lpKeyName is empty. --- dlls/kernel32/profile.c | 4 ++-- dlls/kernel32/tests/profile.c | 24 ++++++------------------ 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index ad43677..8209a2a 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -964,8 +964,8 @@ static INT PROFILE_GetString( LPCWSTR section, LPCWSTR key_name, { if (!key_name[0]) { - /* Win95 returns 0 on keyname "". Tested with Likse32 bon 000227 */ - return 0; + PROFILE_CopyEntry(buffer, def_val, len, TRUE); + return strlenW(buffer); } key = PROFILE_Find( &CurProfile->section, section, key_name, FALSE, FALSE); PROFILE_CopyEntry( buffer, (key && key->value) ? key->value : def_val, diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 414b596..91ff982 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -447,11 +447,8 @@ static void test_GetPrivateProfileString(void) lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "default", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); /* lpKeyName is missing */ lstrcpyA(buf, "kumquat"); @@ -465,30 +462,21 @@ static void test_GetPrivateProfileString(void) ret = GetPrivateProfileStringA("section1", "", NULL, buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - todo_wine - { - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* lpKeyName is empty, lpDefault is empty */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "", buf, MAX_PATH, filename); ok(ret == 0, "Expected 0, got %d\n", ret); - todo_wine - { - ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); - } + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); /* lpKeyName is empty, lpDefault has trailing blank characters */ lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA("section1", "", "default ", buf, MAX_PATH, filename); - todo_wine - { - ok(ret == 7, "Expected 7, got %d\n", ret); - ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); - } + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); if (0) /* crashes */ {

1 0

Stefan Dösinger : wined3d: Add extension information to the states.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 35f33ef4091ec81995bc8bb340ee24932d709548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f33ef4091ec81995bc8bb34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 5 15:04:16 2008 -0500 wined3d: Add extension information to the states. This patch adds a new field to the state templates. If this extension field is != 0, then the line is only applied to the final state table if the extension is supported. Once a line is applied to the final table, all further templates for this state from the same pipeline part are ignored. This allows removing some extension checks from the state handlers, which cleans them up and saves a few CPU cycles when applying the states. --- dlls/wined3d/ati_fragment_shader.c | 228 +++--- dlls/wined3d/directx.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 464 ++++++------ dlls/wined3d/state.c | 1349 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 1037 insertions(+), 1008 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=35f33ef4091ec81995bc8…

1 0