August 2007 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Make get_typeinfo thread safe.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 37e386279991f966281f92bdbe6a7c37c5715ecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=37e386279991f966281f92bdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:41:15 2007 +0200 mshtml: Make get_typeinfo thread safe. --- dlls/mshtml/main.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 6ed2549..e0645f8 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -63,19 +63,29 @@ HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) HRESULT hres; if(!typelib) { - hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + ITypeLib *tl; + + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres; } + + if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) + ITypeLib_Release(tl); } if(!typeinfos[tid]) { - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], typeinfos+tid); + ITypeInfo *typeinfo; + + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &typeinfo); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres; } + + if(InterlockedCompareExchangePointer((void**)(typeinfos+tid), typeinfo, NULL)) + ITypeInfo_Release(typeinfo); } *typeinfo = typeinfos[tid];

1 0

Jacek Caban : mshtml: Added IDM_SELECTALL implementation.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 50868fe75150b3f14e66a6c9c2b92b1d6266dc0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50868fe75150b3f14e66a6c9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:40:01 2007 +0200 mshtml: Added IDM_SELECTALL implementation. --- dlls/mshtml/editor.c | 24 ++++++++++++++++++++++++ dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 022f41d..a627077 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -62,6 +62,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_OL "cmd_ol" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_PASTE "cmd_paste" +#define NSCMD_SELECTALL "cmd_selectAll" #define NSCMD_SELECTBEGINLINE "cmd_selectBeginLine" #define NSCMD_SELECTBOTTOM "cmd_selectBottom" #define NSCMD_SELECTCHARNEXT "cmd_selectCharNext" @@ -778,6 +779,20 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return S_OK; } +static HRESULT exec_selectall(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)\n", This); + + if(in || out) + FIXME("unsupported args\n"); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_SELECTALL, NULL); + + update_doc(This, UPDATE_UI); + return S_OK; +} + static HRESULT exec_bold(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { TRACE("(%p)\n", This); @@ -1110,10 +1125,19 @@ static HRESULT query_edit_status(HTMLDocument *This, OLECMD *cmd) return S_OK; } +static HRESULT query_selall_status(HTMLDocument *This, OLECMD *cmd) +{ + TRACE("(%p)->(%p)\n", This, cmd); + + cmd->cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + return S_OK; +} + const cmdtable_t editmode_cmds[] = { {IDM_DELETE, query_edit_status, exec_delete}, {IDM_FONTNAME, query_edit_status, exec_fontname}, {IDM_FONTSIZE, query_edit_status, exec_fontsize}, + {IDM_SELECTALL, query_selall_status , exec_selectall}, {IDM_FORECOLOR, query_edit_status, exec_forecolor}, {IDM_BOLD, query_edit_status, exec_bold}, {IDM_ITALIC, query_edit_status, exec_italic}, diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 4379cdc..d54e7cc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2727,6 +2727,7 @@ static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_SELECTALL, cmdf|OLECMDF_ENABLED); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FORECOLOR, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER, cmdf);

1 0

Jacek Caban : mshtml: Use GetIsCollapsed in IHTMLSelectionObject::get_type.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: c1dc0e4192a9e47ad6a45a571e2f6438bcfcbc68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1dc0e4192a9e47ad6a45a571… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:40:36 2007 +0200 mshtml: Use GetIsCollapsed in IHTMLSelectionObject::get_type. --- dlls/mshtml/selection.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 79683f0..fe191f4 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -177,7 +177,7 @@ static HRESULT WINAPI HTMLSelectionObject_clear(IHTMLSelectionObject *iface) static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, BSTR *p) { HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); - PRInt32 range_cnt = 0; + PRBool collapsed = TRUE; static const WCHAR wszNone[] = {'N','o','n','e',0}; static const WCHAR wszText[] = {'T','e','x','t',0}; @@ -185,9 +185,10 @@ static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, TRACE("(%p)->(%p)\n", This, p); if(This->nsselection) - nsISelection_GetRangeCount(This->nsselection, &range_cnt); + nsISelection_GetIsCollapsed(This->nsselection, &collapsed); - *p = SysAllocString(range_cnt ? wszText : wszNone); /* FIXME: control */ + *p = SysAllocString(collapsed ? wszNone : wszText); /* FIXME: control */ + TRACE("ret %s\n", debugstr_w(*p)); return S_OK; }

1 0

Jacek Caban : mshtml: Don't mess with gecko specific protocols.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 464121bc003a3ea65c8943bff8eecdd51c5f4235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464121bc003a3ea65c8943bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:37:33 2007 +0200 mshtml: Don't mess with gecko specific protocols. --- dlls/mshtml/nsio.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1b50d2e..e94af28 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1945,13 +1945,25 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch return nsIIOService_GetProtocolFlags(nsio, aScheme, _retval); } +static BOOL is_gecko_special_uri(const char *spec) +{ + static const char chromeW[] = "chrome:"; + static const char jarW[] = "jar:"; + static const char resourceW[] = "resource:"; + static const char javascriptW[] = "javascript:"; + + return !strncasecmp(spec, chromeW, sizeof(chromeW)-1) + || !strncasecmp(spec, resourceW, sizeof(resourceW)-1) + || !strncasecmp(spec, jarW, sizeof(jarW)-1) + || !strncasecmp(spec, javascriptW, sizeof(javascriptW)-1); +} + static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { const char *spec = NULL; NSContainer *nscontainer = NULL; nsIURI *uri = NULL; - PRBool is_javascript = FALSE; LPCWSTR base_wine_url = NULL; nsIWineURI *base_wine_uri = NULL, *wine_uri; nsresult nsres; @@ -1961,13 +1973,13 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * TRACE("(%p(%s) %s %p %p)\n", aSpec, debugstr_a(spec), debugstr_a(aOriginCharset), aBaseURI, _retval); + if(is_gecko_special_uri(spec)) + return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); + if(aBaseURI) { nsACString base_uri_str; const char *base_uri = NULL; - static const char szChrome[] = "chrome:"; - static const char szResource[] = "resource:"; - nsACString_Init(&base_uri_str, NULL); nsres = nsIURI_GetSpec(aBaseURI, &base_uri_str); @@ -1979,25 +1991,12 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } nsACString_Finish(&base_uri_str); - - if(!strncmp(spec, szChrome, sizeof(szChrome)-1) - || !strncmp(spec, szResource, sizeof(szResource)-1)) - aBaseURI = NULL; } nsres = nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, &uri); if(NS_FAILED(nsres)) TRACE("NewURI failed: %08x\n", nsres); - if(uri) { - nsIURI_SchemeIs(uri, "javascript", &is_javascript); - if(is_javascript) { - TRACE("returning javascript uri: %p\n", uri); - *_retval = uri; - return NS_OK; - } - } - if(aBaseURI) { nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsIWineURI, (void**)&base_wine_uri); if(NS_SUCCEEDED(nsres)) {

1 0

Jacek Caban : urlmon: Wrap IBindCtx in CreateAsyncBindCtxEx.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 83a83880cdabe23b655971af45c852ea8c3a0a9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a83880cdabe23b655971af4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 12 17:39:22 2007 +0200 urlmon: Wrap IBindCtx in CreateAsyncBindCtxEx. --- dlls/urlmon/Makefile.in | 1 + dlls/urlmon/bindctx.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/url.c | 12 ++ dlls/urlmon/umon.c | 58 --------- 4 files changed, 320 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83a83880cdabe23b65597…

1 0

Detlef Riekenberg : user32: Call a 16-Bit winproc again.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 03cd5377512d0030ecde0b37f5f61f486c1d01d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cd5377512d0030ecde0b37f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Aug 11 22:45:28 2007 +0200 user32: Call a 16-Bit winproc again. --- dlls/user32/winproc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9745182..e58d1f0 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2209,15 +2209,19 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, { if (proc->procW) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procW ); - else + else if (proc->procA) WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procA ); + else + WINPROC_CallProcWtoA( call_window_proc_Ato16, hwnd, msg, wParam, lParam, result, proc->proc16 ); } else { if (proc->procA) call_window_proc( hwnd, msg, wParam, lParam, result, proc->procA ); - else + else if (proc->procW) WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procW, mapping ); + else + WINPROC_CallProc32ATo16( call_window_proc16, hwnd, msg, wParam, lParam, result, proc->proc16 ); } return TRUE; }

1 0

Stefan Dösinger : wined3d: Optimize render states in the stateblock.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 93155ea0873b5d53f427f28a4eda74e9cb96ad0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93155ea0873b5d53f427f28a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 31 15:04:56 2007 +0200 wined3d: Optimize render states in the stateblock. --- dlls/wined3d/device.c | 24 +++++++++++++++++++++--- dlls/wined3d/stateblock.c | 34 +++++++++++----------------------- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fcb1670..59bc35f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -466,6 +466,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, light->enabledChanged = TRUE; } } + for(j = 1; j <= WINEHIGHEST_RENDER_STATE; j++) { + object->contained_render_states[j - 1] = j; + } + object->num_contained_render_states = WINEHIGHEST_RENDER_STATE; + } else if (Type == WINED3DSBT_PIXELSTATE) { TRACE("PIXELSTATE => Pretend all pixel shates have changed\n"); @@ -480,10 +485,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->changed.pixelShaderConstantsB[i] = TRUE; for (i = 0; i < MAX_CONST_I; ++i) object->changed.pixelShaderConstantsI[i] = TRUE; - + for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { object->changed.renderState[SavedPixelStates_R[i]] = TRUE; + object->contained_render_states[i] = SavedPixelStates_R[i]; } + object->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { object->changed.textureState[j][SavedPixelStates_T[i]] = TRUE; @@ -510,10 +517,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, object->changed.vertexShaderConstantsB[i] = TRUE; for (i = 0; i < MAX_CONST_I; ++i) object->changed.vertexShaderConstantsI[i] = TRUE; - + for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; i++) { object->changed.renderState[SavedVertexStates_R[i]] = TRUE; + object->contained_render_states[i] = SavedVertexStates_R[i]; } + object->num_contained_render_states = NUM_SAVEDVERTEXSTATES_R; for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { object->changed.textureState[j][SavedVertexStates_T[i]] = TRUE; @@ -4301,6 +4310,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_BeginStateBlock(IWineD3DDevice *iface) static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IWineD3DStateBlock** ppStateBlock) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + unsigned int i; + IWineD3DStateBlockImpl *object = This->updateStateBlock; if (!This->isRecordingState) { FIXME("(%p) not recording! returning error\n", This); @@ -4308,7 +4319,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndStateBlock(IWineD3DDevice *iface, IW return WINED3DERR_INVALIDCALL; } - *ppStateBlock = (IWineD3DStateBlock*)This->updateStateBlock; + for(i = 1; i <= WINEHIGHEST_RENDER_STATE; i++) { + if(object->changed.renderState[i]) { + object->contained_render_states[object->num_contained_render_states] = i; + object->num_contained_render_states++; + } + } + + *ppStateBlock = (IWineD3DStateBlock*) object; This->isRecordingState = FALSE; This->updateStateBlock = This->stateBlock; IWineD3DStateBlock_AddRef((IWineD3DStateBlock*)This->updateStateBlock); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3fefc2f..79bfe56 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -566,12 +566,10 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Render */ - for (i = 1; i <= WINEHIGHEST_RENDER_STATE; i++) { - - if (This->changed.renderState[i] && (This->renderState[i] != targetStateBlock->renderState[i])) { - TRACE("Updating renderState %d to %d\n", i, targetStateBlock->renderState[i]); - This->renderState[i] = targetStateBlock->renderState[i]; - } + for (i = 0; i <= This->num_contained_render_states; i++) { + TRACE("Updating renderState %d to %d\n", + This->contained_render_states[i], targetStateBlock->renderState[This->contained_render_states[i]]); + This->renderState[This->contained_render_states[i]] = targetStateBlock->renderState[This->contained_render_states[i]]; } /* Texture states */ @@ -737,12 +735,6 @@ should really perform a delta so that only the changes get updated*/ } } - /* Render */ - for (i = 1; i <= WINEHIGHEST_RENDER_STATE; i++) { - if (This->changed.renderState[i]) - IWineD3DDevice_SetRenderState(pDevice, i, This->renderState[i]); - } - /* Texture states */ for (j = 0; j < MAX_TEXTURES; j++) { /* Set The texture first, just in case it resets the states? */ /* TODO: move over to memcpy */ @@ -778,12 +770,6 @@ should really perform a delta so that only the changes get updated*/ } else if (This->blockType == WINED3DSBT_PIXELSTATE) { - for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { - if (This->changed.renderState[SavedPixelStates_R[i]]) - IWineD3DDevice_SetRenderState(pDevice, SavedPixelStates_R[i], This->renderState[SavedPixelStates_R[i]]); - - } - for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDPIXELSTATES_T; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedPixelStates_T[i]] = This->textureState[j][SavedPixelStates_T[i]]; @@ -799,11 +785,6 @@ should really perform a delta so that only the changes get updated*/ } else if (This->blockType == WINED3DSBT_VERTEXSTATE) { - for (i = 0; i < NUM_SAVEDVERTEXSTATES_R; i++) { - if (This->changed.renderState[SavedVertexStates_R[i]]) - IWineD3DDevice_SetRenderState(pDevice, SavedVertexStates_R[i], This->renderState[SavedVertexStates_R[i]]); - } - for (j = 0; j < MAX_TEXTURES; j++) { for (i = 0; i < NUM_SAVEDVERTEXSTATES_T; i++) { ((IWineD3DDeviceImpl *)pDevice)->stateBlock->textureState[j][SavedVertexStates_T[i]] = This->textureState[j][SavedVertexStates_T[i]]; @@ -821,6 +802,13 @@ should really perform a delta so that only the changes get updated*/ } else { FIXME("Unrecognized state block type %d\n", This->blockType); } + + /* Render */ + for (i = 0; i <= This->num_contained_render_states; i++) { + IWineD3DDevice_SetRenderState(pDevice, This->contained_render_states[i], + This->renderState[This->contained_render_states[i]]); + } + stateblock_savedstates_copy(iface, &((IWineD3DDeviceImpl*)pDevice)->stateBlock->changed, &This->changed); ((IWineD3DDeviceImpl *)pDevice)->stateBlock->lowest_disabled_stage = MAX_TEXTURES - 1; for(j = 0; j < MAX_TEXTURES - 1; j++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55eabf8..b2fe145 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1356,6 +1356,10 @@ struct IWineD3DStateBlockImpl /* Scissor test rectangle */ RECT scissorRect; + + /* Contained state management */ + DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int num_contained_render_states; }; extern void stateblock_savedstates_set(

1 0

Stefan Dösinger : wined3d: Remove primary stateblock fixme.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: 28084c5f80af37e0d88182ac335bfb4edd711d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=28084c5f80af37e0d88182ac3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 11 17:43:30 2007 +0200 wined3d: Remove primary stateblock fixme. --- dlls/wined3d/stateblock.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0c3c3d2..3fefc2f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -249,8 +249,6 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { /* type 0 represents the primary stateblock, so free all the resources */ if (This->blockType == WINED3DSBT_INIT) { - FIXME("Releasing primary stateblock\n"); - /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { if (This->textures[counter]) {

1 0

Stefan Dösinger : wined3d: Remove stateblock::set.*.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: e7cbb340dcbd695aecdc6f15213ebc3a045f2940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7cbb340dcbd695aecdc6f152… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 19:28:33 2007 +0200 wined3d: Remove stateblock::set.*. --- dlls/wined3d/device.c | 30 ++----------- dlls/wined3d/glsl_shader.c | 8 ++-- dlls/wined3d/state.c | 40 ++++++----------- dlls/wined3d/stateblock.c | 98 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 - 5 files changed, 66 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7cbb340dcbd695aecdc6…

1 0

Stefan Dösinger : wined3d: Remove ugly code from stateblock init.
by Alexandre Julliard Aug. 13, 2007

Aug. 13, 2007

Module: wine Branch: master Commit: f41ab3be9b84f17798bf0d60158772b5d77ebc7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ab3be9b84f17798bf0d601… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 18:46:20 2007 +0200 wined3d: Remove ugly code from stateblock init. --- dlls/wined3d/stateblock.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 14c8533..b3700ee 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -914,15 +914,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILZFAIL, WINED3DSTENCILOP_KEEP); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILPASS, WINED3DSTENCILOP_KEEP); - - /* Setting stencil func also uses values for stencil ref/mask, so manually set defaults - * so only a single call performed (and ensure defaults initialized before making that call) - * - * IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILREF, 0); - * IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILMASK, 0xFFFFFFFF); - */ - This->renderState[WINED3DRS_STENCILREF] = 0; - This->renderState[WINED3DRS_STENCILMASK] = 0xFFFFFFFF; + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILREF, 0); + IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILFUNC, WINED3DCMP_ALWAYS); IWineD3DDevice_SetRenderState(device, WINED3DRS_STENCILWRITEMASK, 0xFFFFFFFF); IWineD3DDevice_SetRenderState(device, WINED3DRS_TEXTUREFACTOR, 0xFFFFFFFF);

1 0