May 2007 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: CGID_Undocumented is CGID_DocHostCmdPriv.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 700ccaf7677f0b50d19f7b66ce0c3f06591fa2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=700ccaf7677f0b50d19f7b66c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 00:34:55 2007 +0200 mshtml: CGID_Undocumented is CGID_DocHostCmdPriv. --- dlls/mshtml/tests/htmldoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 3872062..730833c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -35,7 +35,7 @@ #include "shlguid.h" #include "initguid.h" -DEFINE_SHLGUID(CGID_Undocumented, 0x000214D4L, 0, 0); +DEFINE_SHLGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -1841,7 +1841,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }; } - if(IsEqualGUID(&CGID_Undocumented, pguidCmdGroup)) + if(IsEqualGUID(&CGID_DocHostCmdPriv, pguidCmdGroup)) return E_FAIL; /* TODO */ ok(0, "unexpected call\n");

1 0

Jacek Caban : mshtml: Added IHTMLBodyElement:: CreateTextRange implementation.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 12aa9e33c532a77bedfc5ad570cef5e56110e56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=12aa9e33c532a77bedfc5ad57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 01:13:13 2007 +0200 mshtml: Added IHTMLBodyElement::CreateTextRange implementation. --- dlls/mshtml/htmlbody.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/nsiface.idl | 10 ++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 6c7c48a..ee23922 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -395,8 +395,33 @@ static HRESULT WINAPI HTMLBodyElement_get_onbeforeunload(IHTMLBodyElement *iface static HRESULT WINAPI HTMLBodyElement_createTextRange(IHTMLBodyElement *iface, IHTMLTxtRange **range) { HTMLBodyElement *This = HTMLBODY_THIS(iface); - FIXME("(%p)->(%p)\n", This, range); - return E_NOTIMPL; + nsIDOMRange *nsrange = NULL; + + TRACE("(%p)->(%p)\n", This, range); + + if(This->element->node->doc->nscontainer) { + nsIDOMDocument *nsdoc; + nsIDOMDocumentRange *nsdocrange; + nsresult nsres; + + nsIWebNavigation_GetDocument(This->element->node->doc->nscontainer->navigation, &nsdoc); + nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void**)&nsdocrange); + nsIDOMDocument_Release(nsdoc); + + nsres = nsIDOMDocumentRange_CreateRange(nsdocrange, &nsrange); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMRange_SelectNodeContents(nsrange, This->element->node->nsnode); + if(NS_FAILED(nsres)) + ERR("SelectNodeContents failed: %08x\n", nsres); + }else { + ERR("CreateRange failed: %08x\n", nsres); + } + + nsIDOMDocumentRange_Release(nsdocrange); + } + + *range = HTMLTxtRange_Create(nsrange); + return S_OK; } static void HTMLBodyElement_destructor(IUnknown *iface) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index a4c3fcc..85b0e30 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -687,6 +687,16 @@ interface nsIDOMRange : nsISupports [ object, + uuid(7b9badc6-c9bc-447a-8670-dbd195aed24b) + /* FROZEN */ +] +interface nsIDOMDocumentRange : nsISupports +{ + nsresult CreateRange(nsIDOMRange **_retval); +} + +[ + object, uuid(b2c7ed59-8634-4352-9e37-5484c8b6e4e1) /* FROZEN */ ]

1 0

Rob Shearman : ole32: Move the logic in StgCreateDocfile for " if no share mode given then DENY_NONE is the default" to before the validateSTGM check.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: b005e9ed0dfe9c4398c8ea609bc7083768bd0d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b005e9ed0dfe9c4398c8ea609… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed May 9 23:31:08 2007 +0100 ole32: Move the logic in StgCreateDocfile for "if no share mode given then DENY_NONE is the default" to before the validateSTGM check. Add a test that shows this behaviour is correct. Remove a test on the access mode that is redundant because it is already done in validateSTGM. --- dlls/ole32/storage32.c | 12 ++++-------- dlls/ole32/tests/storage32.c | 6 ++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5b4314f..623516e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5680,6 +5680,10 @@ HRESULT WINAPI StgCreateDocfile( if (reserved != 0) return STG_E_INVALIDPARAMETER; + /* if no share mode given then DENY_NONE is the default */ + if (STGM_SHARE_MODE(grfMode) == 0) + grfMode |= STGM_SHARE_DENY_NONE; + /* * Validate the STGM flags */ @@ -5696,14 +5700,6 @@ HRESULT WINAPI StgCreateDocfile( goto end; } - /* if no share mode given then DENY_NONE is the default */ - if (STGM_SHARE_MODE(grfMode) == 0) - grfMode |= STGM_SHARE_DENY_NONE; - - /* must have at least one access mode */ - if (STGM_ACCESS_MODE(grfMode) == 0) - goto end; - /* in direct mode, can only use SHARE_EXCLUSIVE */ if (!(grfMode & STGM_TRANSACTED) && (STGM_SHARE_MODE(grfMode) != STGM_SHARE_EXCLUSIVE)) goto end; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d96a7ed..e6c3542 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -163,6 +163,12 @@ static void test_create_storage_modes(void) ok(r == 0, "storage not released\n"); ok(DeleteFileW(filename), "failed to delete file\n"); + r = StgCreateDocfile( filename, STGM_CREATE | STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + r = IStorage_Release(stg); + ok(r == 0, "storage not released\n"); + ok(DeleteFileW(filename), "failed to delete file\n"); + /* test the way excel uses StgCreateDocFile */ r = StgCreateDocfile( filename, STGM_TRANSACTED|STGM_CREATE|STGM_SHARE_DENY_WRITE|STGM_READWRITE, 0, &stg); ok(r==S_OK, "StgCreateDocfile the excel way failed\n");

1 0

Alexandre Julliard : psapi: Don't print output parameters as strings.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 276ba12dab55e30b5a2b17d49ba85253cbe606fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=276ba12dab55e30b5a2b17d49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 10 12:15:48 2007 +0200 psapi: Don't print output parameters as strings. --- dlls/psapi/psapi.spec | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec index e9bc146..0ae008d 100644 --- a/dlls/psapi/psapi.spec +++ b/dlls/psapi/psapi.spec @@ -4,16 +4,16 @@ @ stdcall EnumPageFilesW(ptr ptr) @ stdcall EnumProcessModules(long ptr long ptr) @ stdcall EnumProcesses(ptr long ptr) -@ stdcall GetDeviceDriverBaseNameA(ptr str long) -@ stdcall GetDeviceDriverBaseNameW(ptr wstr long) -@ stdcall GetDeviceDriverFileNameA(ptr str long) -@ stdcall GetDeviceDriverFileNameW(ptr wstr long) -@ stdcall GetMappedFileNameA(long ptr str long) -@ stdcall GetMappedFileNameW(long ptr wstr long) +@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) +@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) +@ stdcall GetDeviceDriverFileNameA(ptr ptr long) +@ stdcall GetDeviceDriverFileNameW(ptr ptr long) +@ stdcall GetMappedFileNameA(long ptr ptr long) +@ stdcall GetMappedFileNameW(long ptr ptr long) @ stdcall GetModuleBaseNameA(long long ptr long) @ stdcall GetModuleBaseNameW(long long ptr long) -@ stdcall GetModuleFileNameExA(long long str long) -@ stdcall GetModuleFileNameExW(long long wstr long) +@ stdcall GetModuleFileNameExA(long long ptr long) +@ stdcall GetModuleFileNameExW(long long ptr long) @ stdcall GetModuleInformation(long long ptr long) @ stdcall GetPerformanceInfo(ptr long) @ stdcall GetProcessImageFileNameA(long ptr long)

1 0

Andrew Talbot : mcicda: Exclude unused headers.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: e6b430c14e1ebcdf9b3d65f6e90661784f901b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b430c14e1ebcdf9b3d65f6e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 8 23:13:21 2007 +0100 mcicda: Exclude unused headers. --- dlls/mcicda/mcicda.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 5ec14e8..66acc5b 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -25,7 +25,6 @@ #include <stdio.h> #include <string.h> -#include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" @@ -34,7 +33,6 @@ #include "wownt32.h" #include "mmddk.h" #include "winioctl.h" -#include "ntddstor.h" #include "ntddcdrm.h" #include "winternl.h" #include "wine/debug.h"

1 0

Paul Vriens : msi/tests: Properly cleanup after each test.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: a543e60dc9aef92837b71432dbd816560d8a104f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a543e60dc9aef92837b71432d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 9 20:13:45 2007 +0200 msi/tests: Properly cleanup after each test. --- dlls/msi/tests/install.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d349371..b0bccf9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1406,7 +1406,10 @@ static void test_setdirproperty(void) ok(delete_pf("Common Files\\msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("Common Files\\msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); } static void test_cabisextracted(void) @@ -1435,8 +1438,14 @@ static void test_cabisextracted(void) ok(delete_pf("msitest\\gaius", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ delete_cab_files(); DeleteFile(msifile); + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile("caesar"); + DeleteFile("msitest\\gaius"); + RemoveDirectory("msitest"); } static void test_concurrentinstall(void) @@ -1463,7 +1472,13 @@ static void test_concurrentinstall(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile(path); + DeleteFile("msitest\\msitest\\augustus"); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest\\msitest"); + RemoveDirectory("msitest"); } static void test_setpropertyfolder(void) @@ -1483,7 +1498,10 @@ static void test_setpropertyfolder(void) ok(delete_pf("msitest\\added", FALSE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); + /* Delete the files in the temp (current) folder */ DeleteFile(msifile); + DeleteFile("msitest\\maximus"); + RemoveDirectory("msitest"); } START_TEST(install)

1 0

Jacek Caban : mshtml: Reimplement IHTMTxtRange on top of nsIDOMRange.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 573d612de46b665081f7ea01ccf21b1d6243bc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573d612de46b665081f7ea01c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 00:32:48 2007 +0200 mshtml: Reimplement IHTMTxtRange on top of nsIDOMRange. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/selection.c | 16 +++++++++++++- dlls/mshtml/txtrange.c | 48 +++++++++++++++++++++++++---------------- 3 files changed, 45 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6d8e154..432df7e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -351,7 +351,7 @@ void set_document_bscallback(HTMLDocument*,BSCallback*); IHlink *Hlink_Create(void); IHTMLSelectionObject *HTMLSelectionObject_Create(nsISelection*); -IHTMLTxtRange *HTMLTxtRange_Create(nsISelection*); +IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange*); IHTMLStyle *HTMLStyle_Create(nsIDOMCSSStyleDeclaration*); IHTMLStyleSheet *HTMLStyleSheet_Create(void); diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index f5cc5aa..79683f0 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -139,10 +139,24 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + nsIDOMRange *nsrange = NULL; TRACE("(%p)->(%p)\n", This, range); - *range = (IDispatch*)HTMLTxtRange_Create(This->nsselection); + if(This->nsselection) { + PRInt32 nsrange_cnt = 0; + nsresult nsres; + + nsISelection_GetRangeCount(This->nsselection, &nsrange_cnt); + if(nsrange_cnt != 1) + FIXME("range_cnt = %d\n", nsrange_cnt); + + nsres = nsISelection_GetRangeAt(This->nsselection, 0, &nsrange); + if(NS_FAILED(nsres)) + ERR("GetRangeAt failed: %08x\n", nsres); + } + + *range = (IDispatch*)HTMLTxtRange_Create(nsrange); return S_OK; } diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index eb83fd0..70fb1f9 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -41,7 +41,7 @@ typedef struct { LONG ref; - nsISelection *nsselection; + nsIDOMRange *nsrange; } HTMLTxtRange; #define HTMLTXTRANGE(x) ((IHTMLTxtRange*) &(x)->lpHTMLTxtRangeVtbl) @@ -92,8 +92,8 @@ static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - if(This->nsselection) - nsISelection_Release(This->nsselection); + if(This->nsrange) + nsISelection_Release(This->nsrange); mshtml_free(This); } @@ -152,25 +152,35 @@ static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v) static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - PRUnichar *nstext = NULL; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->nsselection) { - static const WCHAR empty[] = {0}; - *p = SysAllocString(empty); - return S_OK; + *p = NULL; + + if(This->nsrange) { + nsAString text_str; + nsresult nsres; + + nsAString_Init(&text_str, NULL); + + nsres = nsIDOMRange_ToString(This->nsrange, &text_str); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *nstext; + + nsAString_GetData(&text_str, &nstext, NULL); + *p = SysAllocString(nstext); + }else { + ERR("ToString failed: %08x\n", nsres); + } + + nsAString_Finish(&text_str); } - nsres = nsISelection_ToString(This->nsselection, &nstext); - if(NS_FAILED(nsres) || !nstext) { - ERR("toString failed: %08x\n", nsres); - return E_FAIL; + if(!*p) { + static const WCHAR empty[] = {0}; + *p = SysAllocString(empty); } - *p = SysAllocString(nstext); - nsfree(nstext); return S_OK; } @@ -422,16 +432,16 @@ static const IHTMLTxtRangeVtbl HTMLTxtRangeVtbl = { HTMLTxtRange_execCommandShowHelp }; -IHTMLTxtRange *HTMLTxtRange_Create(nsISelection *nsselection) +IHTMLTxtRange *HTMLTxtRange_Create(nsIDOMRange *nsrange) { HTMLTxtRange *ret = mshtml_alloc(sizeof(HTMLTxtRange)); ret->lpHTMLTxtRangeVtbl = &HTMLTxtRangeVtbl; ret->ref = 1; - if(nsselection) - nsISelection_AddRef(nsselection); - ret->nsselection = nsselection; + if(nsrange) + nsIDOMRange_AddRef(nsrange); + ret->nsrange = nsrange; return HTMLTXTRANGE(ret); }

1 0

Jacek Caban : mshtml: Added IHTMLTxtRange::get_htmlText implementation.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: f0649f3731bfd02c348d46876543425b67283cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0649f3731bfd02c348d46876… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 10 00:34:05 2007 +0200 mshtml: Added IHTMLTxtRange::get_htmlText implementation. --- dlls/mshtml/nsiface.idl | 10 +++++++++- dlls/mshtml/txtrange.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2d662d1..a4c3fcc 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -97,7 +97,6 @@ typedef nsISupports nsIDOMNamedNodeMap; typedef nsISupports nsIDOMAttr; typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; -typedef nsISupports nsIDOMDocumentFragment; typedef nsISupports nsIDOMComment; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; @@ -588,6 +587,15 @@ interface nsIDOMText : nsIDOMCharacterData [ object, + uuid(a6cf9076-15b3-11d2-932e-00805f8add32) + /* NOT_FROZEN */ +] +interface nsIDOMDocumentFragment : nsIDOMNode +{ +} + +[ + object, uuid(a6cf9075-15b3-11d2-932e-00805f8add32) /* FROZEN */ ] diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index 70fb1f9..5b54451 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -138,8 +138,38 @@ static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMem static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) { HTMLTxtRange *This = HTMLTXTRANGE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(This->nsrange) { + nsIDOMDocumentFragment *fragment; + nsresult nsres; + + nsres = nsIDOMRange_CloneContents(This->nsrange, &fragment); + if(NS_SUCCEEDED(nsres)) { + const PRUnichar *nstext; + nsAString nsstr; + + nsAString_Init(&nsstr, NULL); + nsnode_to_nsstring((nsIDOMNode*)fragment, &nsstr); + nsIDOMDocumentFragment_Release(fragment); + + nsAString_GetData(&nsstr, &nstext, NULL); + *p = SysAllocString(nstext); + + nsAString_Finish(&nsstr); + } + } + + if(!*p) { + const WCHAR emptyW[] = {0}; + *p = SysAllocString(emptyW); + } + + TRACE("return %s\n", debugstr_w(*p)); + return S_OK; } static HRESULT WINAPI HTMLTxtRange_put_text(IHTMLTxtRange *iface, BSTR v)

1 0

Stefan Dösinger : wined3d: Unload vertex weight data in unloadVertexData.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 4a8b55d456f4df544875baf0eabe765a7c96918b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8b55d456f4df544875baf0e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 6 23:47:20 2007 +0200 wined3d: Unload vertex weight data in unloadVertexData. --- dlls/wined3d/state.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1b5115c..8d571a6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2472,6 +2472,9 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); } + if (GL_SUPPORT(ARB_VERTEX_BLEND)) { + glDisableClientState(GL_WEIGHT_ARRAY_ARB); + } for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); glDisableClientState(GL_TEXTURE_COORD_ARRAY);

1 0

Stefan Dösinger : wined3d: Support bump environment mapping using GL_NV_texture_shader.
by Alexandre Julliard 10 May '07

10 May '07

Module: wine Branch: master Commit: 81504d6a2d2d5aa06e7f26e46b4afeb13a082eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=81504d6a2d2d5aa06e7f26e46… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 7 21:08:14 2007 +0200 wined3d: Support bump environment mapping using GL_NV_texture_shader. --- dlls/wined3d/context.c | 24 +++++++ dlls/wined3d/directx.c | 31 ++++++++- dlls/wined3d/state.c | 132 +++++++++++++++++++++++++++++---------- dlls/wined3d/utils.c | 28 +++++++-- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 173 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81504d6a2d2d5aa06e7f2…

1 0