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

Henri Verbeet : ddraw: Use a less offensive handle table implementation for matrices.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 941aeade01caa4fcd177c4f303ad98b90c8f3526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941aeade01caa4fcd177c4f30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:58 2010 +0200 ddraw: Use a less offensive handle table implementation for matrices. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 95 +++++++++++++++++++------------------------ dlls/ddraw/executebuffer.c | 72 +++++++++++++++++---------------- 3 files changed, 80 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=941aeade01caa4fcd177c…

1 0

Huw Davies : oleaut32: Don' t invoke a function that has the restricted attribute or is part of an interface that 's marked as restricted.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: baef9a7e92d93bde21303d8f81c7d80dee9b1780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baef9a7e92d93bde21303d8f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 29 13:20:21 2010 +0100 oleaut32: Don't invoke a function that has the restricted attribute or is part of an interface that's marked as restricted. --- dlls/oleaut32/typelib.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 7fac039..81d0ae0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6017,13 +6017,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( unsigned int var_index; TYPEKIND type_kind; HRESULT hres; - const TLBFuncDesc *pFuncInfo = This->funclist; + const TLBFuncDesc *pFuncInfo; TRACE("(%p)(%p,id=%d,flags=0x%08x,%p,%p,%p,%p)\n", This,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr ); - if( pFuncInfo->funcdesc.wFuncFlags == FUNCFLAG_FRESTRICTED ) + if( This->TypeAttr.wTypeFlags & TYPEFLAG_FRESTRICTED ) return DISP_E_MEMBERNOTFOUND; if (!pDispParams) @@ -6045,7 +6045,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) if ((memid == pFuncInfo->funcdesc.memid) && - (wFlags & pFuncInfo->funcdesc.invkind)) + (wFlags & pFuncInfo->funcdesc.invkind) && + (pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED) == 0) break; if (pFuncInfo) {

1 0

Jacek Caban : wscript.exe: Added IHost typelib.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 0a4e40ba3d4a7706ed743fea1f903c904e0b977b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4e40ba3d4a7706ed743fea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 14:47:22 2010 +0200 wscript.exe: Added IHost typelib. --- .gitignore | 1 + programs/wscript/Makefile.in | 5 + programs/wscript/ihost.idl | 186 +++++++++++++++++++++++++++++++++++++++ programs/wscript/ihost_dispid.h | 56 ++++++++++++ programs/wscript/rsrc.rc | 20 ++++ 5 files changed, 268 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a4e40ba3d4a7706ed743…

1 0

Jacek Caban : wscript.exe: Added IHost stub implementation.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: d83a08c4292a9843e0af6f28298a27f2e82eaaf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83a08c4292a9843e0af6f282… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 29 14:58:38 2010 +0200 wscript.exe: Added IHost stub implementation. --- .gitignore | 1 + programs/wscript/Makefile.in | 2 + programs/wscript/host.c | 263 ++++++++++++++++++++++++++++++++++++++++++ programs/wscript/main.c | 27 ++++- programs/wscript/wscript.h | 21 ++++ 5 files changed, 309 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d83a08c4292a9843e0af6…

1 0

Alexander Nicolaysen Sørnes : shdocvw: Add DocHostContainer interface to interact with WB2/IE.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: fbf91383336249494565f94d41b0623b7b804881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf91383336249494565f94d4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 29 10:28:02 2010 +0200 shdocvw: Add DocHostContainer interface to interact with WB2/IE. --- dlls/shdocvw/dochost.c | 7 ++++--- dlls/shdocvw/frame.c | 4 ++-- dlls/shdocvw/iexplore.c | 26 +++++++++++++++++++++++++- dlls/shdocvw/navigate.c | 2 ++ dlls/shdocvw/shdocvw.h | 11 ++++++++++- dlls/shdocvw/webbrowser.c | 23 ++++++++++++++++++++++- 6 files changed, 65 insertions(+), 8 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 4978989..edf569e 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -311,8 +311,7 @@ void create_doc_view_hwnd(DocHost *This) doc_view_atom = RegisterClassExW(&wndclass); } - GetClientRect(This->frame_hwnd, &rect); - adjust_ie_docobj_rect(This->frame_hwnd, &rect); + This->container_vtbl->GetDocObjRect(This, &rect); This->hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, @@ -784,7 +783,7 @@ static const IPropertyNotifySinkVtbl PropertyNotifySinkVtbl = { PropertyNotifySink_OnRequestEdit }; -void DocHost_Init(DocHost *This, IDispatch *disp) +void DocHost_Init(DocHost *This, IDispatch *disp, const IDocHostContainerVtbl* container) { This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; @@ -792,6 +791,8 @@ void DocHost_Init(DocHost *This, IDispatch *disp) This->disp = disp; + This->container_vtbl = container; + This->client_disp = NULL; This->document = NULL; diff --git a/dlls/shdocvw/frame.c b/dlls/shdocvw/frame.c index eeff20a..150ca93 100644 --- a/dlls/shdocvw/frame.c +++ b/dlls/shdocvw/frame.c @@ -135,8 +135,8 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLESTR pszStatusText) { DocHost *This = INPLACEFRAME_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); + return This->container_vtbl->SetStatusText(This, pszStatusText); } static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index d81e8f1..e98b74c 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -344,6 +344,30 @@ static IWebBrowser2 *create_ie_window(LPCSTR cmdline) return wb; } +static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +{ + GetClientRect(This->frame_hwnd, rc); + adjust_ie_docobj_rect(This->frame_hwnd, rc); +} + +static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text) +{ + FIXME("(%p)->(%s)\n", This, debugstr_w(text)); + + return E_NOTIMPL; +} + +static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) +{ + +} + +static const IDocHostContainerVtbl DocHostContainerVtbl = { + DocHostContainer_GetDocObjRect, + DocHostContainer_SetStatusText, + DocHostContainer_SetURL +}; + HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) { InternetExplorer *ret; @@ -355,7 +379,7 @@ HRESULT InternetExplorer_Create(IUnknown *pOuter, REFIID riid, void **ppv) ret->ref = 0; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); - DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); + DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret), &DocHostContainerVtbl); InternetExplorer_WebBrowser_Init(ret); diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 5550387..368a3c3 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -125,6 +125,8 @@ static HRESULT set_dochost_url(DocHost *This, const WCHAR *url) heap_free(This->url); This->url = new_url; + + This->container_vtbl->SetURL(This, This->url); return S_OK; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 44919a5..2d7f03b 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -82,6 +82,13 @@ typedef struct _task_header_t { task_proc_t proc; } task_header_t; +typedef struct _IDocHostContainerVtbl +{ + void (WINAPI* GetDocObjRect)(DocHost*,RECT*); + HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); + void (WINAPI* SetURL)(DocHost*,LPCWSTR); +} IDocHostContainerVtbl; + struct DocHost { const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; @@ -105,6 +112,8 @@ struct DocHost { IOleDocumentView *view; IUnknown *doc_navigate; + const IDocHostContainerVtbl *container_vtbl; + HWND hwnd; HWND frame_hwnd; @@ -220,7 +229,7 @@ void WebBrowser_ClassInfo_Init(WebBrowser*); void WebBrowser_OleObject_Destroy(WebBrowser*); -void DocHost_Init(DocHost*,IDispatch*); +void DocHost_Init(DocHost*,IDispatch*,const IDocHostContainerVtbl*); void DocHost_ClientSite_Init(DocHost*); void DocHost_Frame_Init(DocHost*); void release_dochost_client(DocHost*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 217c9da..5115de7 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -1126,6 +1126,27 @@ static const IServiceProviderVtbl ServiceProviderVtbl = WebBrowser_IServiceProvider_QueryService }; +static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +{ + GetClientRect(This->frame_hwnd, rc); +} + +static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text) +{ + return E_NOTIMPL; +} + +static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) +{ + +} + +static const IDocHostContainerVtbl DocHostContainerVtbl = { + DocHostContainer_GetDocObjRect, + DocHostContainer_SetStatusText, + DocHostContainer_SetURL +}; + static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, void **ppv) { WebBrowser *ret; @@ -1140,7 +1161,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi ret->ref = 1; ret->version = version; - DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret)); + DocHost_Init(&ret->doc_host, (IDispatch*)WEBBROWSER2(ret), &DocHostContainerVtbl); ret->visible = VARIANT_TRUE; ret->menu_bar = VARIANT_TRUE;

1 0

Alexander Nicolaysen Sørnes : shdocvw: Update the address bar when URL changes.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 75909f215855059ae5ca47329593ff9fb3c0ecfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=75909f215855059ae5ca47329… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Jul 27 14:23:14 2010 +0200 shdocvw: Update the address bar when URL changes. --- dlls/shdocvw/iexplore.c | 20 +++++++++++++++----- dlls/shdocvw/shdocvw.h | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index e98b74c..b2359ca 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -179,7 +179,6 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar if(info->fChanged && info->iWhy == CBENF_RETURN && info->szText) { VARIANT vt; - HWND hwndEdit = (HWND)SendMessageW(hdr->hwndFrom, CBEM_GETEDITCONTROL, 0, 0); V_VT(&vt) = VT_BSTR; V_BSTR(&vt) = SysAllocString(info->szText); @@ -188,9 +187,6 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar SysFreeString(V_BSTR(&vt)); - /* Clear the address bar, as we don't change it when - the user navigates to a new page */ - SendMessageW(hwndEdit, WM_SETTEXT, 0, 0); return 0; } } @@ -240,6 +236,18 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT return 0; } +static LRESULT CALLBACK update_addrbar(InternetExplorer *This, LPARAM lparam) +{ + HWND hwndRebar = GetDlgItem(This->frame_hwnd, IDC_BROWSE_REBAR); + HWND hwndAddress = GetDlgItem(hwndRebar, IDC_BROWSE_ADDRESSBAR); + HWND hwndEdit = (HWND)SendMessageW(hwndAddress, CBEM_GETEDITCONTROL, 0, 0); + LPCWSTR url = (LPCWSTR)lparam; + + SendMessageW(hwndEdit, WM_SETTEXT, 0, (LPARAM)url); + + return 0; +} + static LRESULT CALLBACK ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -259,6 +267,8 @@ ie_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return iewnd_OnNotify(This, wparam, lparam); case WM_DOCHOSTTASK: return process_dochost_task(&This->doc_host, lparam); + case WM_UPDATEADDRBAR: + return update_addrbar(This, lparam); } return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -359,7 +369,7 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) { - + SendMessageW(This->frame_hwnd, WM_UPDATEADDRBAR, 0, (LPARAM)url); } static const IDocHostContainerVtbl DocHostContainerVtbl = { diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 2d7f03b..2bdf436 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -43,6 +43,8 @@ #include "resource.h" +#define WM_UPDATEADDRBAR (WM_APP+1) + /********************************************************************** * Shell Instance Objects */

1 0

Matteo Bruni : d3dx9: Handle parent_data parameter of D3DXInclude.Open() function.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 2a62616ac7301b20edd9e6cc20eecb740ed08ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a62616ac7301b20edd9e6cc2… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 17:32:42 2010 +0200 d3dx9: Handle parent_data parameter of D3DXInclude.Open() function. --- dlls/d3dx9_36/shader.c | 70 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/asm.c | 59 ++++++++++++++++++++++++++++++++++--- 2 files changed, 123 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 2c21773..ba23f07 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -181,6 +181,19 @@ struct mem_file_desc struct mem_file_desc current_shader; LPD3DXINCLUDE current_include; + +#define INCLUDES_INITIAL_CAPACITY 4 + +struct loaded_include +{ + const char *name; + const char *data; +}; + +struct loaded_include *includes; +int includes_capacity, includes_size; +const char *parent_include; + char *wpp_output; int wpp_output_capacity, wpp_output_size; @@ -275,6 +288,25 @@ static char *wpp_lookup_mem(const char *filename, const char *parent_name, { /* Here we return always ok. We will maybe fail on the next wpp_open_mem */ char *path; + int i; + + parent_include = NULL; + if(parent_name[0] != '\0') + { + for(i = 0; i < includes_size; i++) + { + if(!strcmp(parent_name, includes[i].name)) + { + parent_include = includes[i].data; + break; + } + } + if(parent_include == NULL) + { + ERR("Parent include file missing\n"); + return NULL; + } + } path = malloc(strlen(filename) + 1); if(!path) return NULL; @@ -302,15 +334,50 @@ static void *wpp_open_mem(const char *filename, int type) } hr = ID3DXInclude_Open(current_include, type ? D3DXINC_SYSTEM : D3DXINC_LOCAL, - filename, NULL, (LPCVOID *)&desc->buffer, + filename, parent_include, (LPCVOID *)&desc->buffer, &desc->size); if(FAILED(hr)) { HeapFree(GetProcessHeap(), 0, desc); return NULL; } + + if(includes_capacity == includes_size) + { + if(includes_capacity == 0) + { + includes = HeapAlloc(GetProcessHeap(), 0, INCLUDES_INITIAL_CAPACITY); + if(includes == NULL) + { + ERR("Error allocating memory for the loaded includes structure\n"); + goto error; + } + includes_capacity = INCLUDES_INITIAL_CAPACITY; + } + else + { + int newcapacity = includes_capacity * 2; + struct loaded_include *newincludes = + HeapReAlloc(GetProcessHeap(), 0, includes, newcapacity); + if(newincludes == NULL) + { + ERR("Error reallocating memory for the loaded includes structure\n"); + goto error; + } + includes = newincludes; + includes_capacity = newcapacity; + } + } + includes[includes_size].name = filename; + includes[includes_size++].data = desc->buffer; + desc->pos = 0; return desc; + +error: + ID3DXInclude_Close(current_include, desc->buffer); + HeapFree(GetProcessHeap(), 0, desc); + return NULL; } static void wpp_close_mem(void *file) @@ -505,6 +572,7 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, } } current_include = include; + includes_size = 0; if(shader) *shader = NULL; if(error_messages) *error_messages = NULL; diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 5f7e776..388e74e 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1500,14 +1500,33 @@ static HRESULT WINAPI testD3DXInclude_open(ID3DXInclude *iface, LPCSTR filename, LPCVOID parent_data, LPCVOID *data, UINT *bytes) { char *buffer; - char include[] = "#define REGISTER r0\nvs.1.1\n"; - - trace("filename = %s\n",filename); - - buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); - CopyMemory(buffer, include, sizeof(include)); + const char include[] = "#define REGISTER r0\nvs.1.1\n"; + const char include2[] = "#include \"incl3.vsh\"\n"; + const char include3[] = "vs.1.1\n"; + + trace("filename = %s\n", filename); + trace("parent_data = (%p) -> %s\n", parent_data, (char *)parent_data); + + if(!strcmp(filename,"incl.vsh")) { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include)); + CopyMemory(buffer, include, sizeof(include)); + *bytes = sizeof(include); + /* Also check for the correct parent_data content */ + ok(parent_data == NULL, "wrong parent_data value\n"); + } + else if(!strcmp(filename,"incl3.vsh")) { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include3)); + CopyMemory(buffer, include3, sizeof(include3)); + *bytes = sizeof(include3); + /* Also check for the correct parent_data content */ + ok(parent_data != NULL && !strncmp(include2, parent_data, strlen(include2)), "wrong parent_data value\n"); + } + else { + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(include2)); + CopyMemory(buffer, include2, sizeof(include2)); + *bytes = sizeof(include2); + } *data = buffer; - *bytes = sizeof(include); return S_OK; } @@ -1538,6 +1557,10 @@ static void assembleshader_test(void) { "#include \"incl.vsh\"\n" "mov REGISTER, v0\n" }; + const char testshader2[] = { + "#include \"incl2.vsh\"\n" + "mov REGISTER, v0\n" + }; HRESULT hr; LPD3DXBUFFER shader, messages; D3DXMACRO defines[] = { @@ -1600,6 +1623,32 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); + /* "unexpected #include file from memory" test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader, strlen(testshader), + NULL, NULL, D3DXSHADER_SKIPVALIDATION, + &shader, &messages); + ok(hr == D3DXERR_INVALIDDATA, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(messages) { + trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if(shader) ID3DXBuffer_Release(shader); + + /* recursive #include test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShader(testshader2, strlen(testshader2), + NULL, (LPD3DXINCLUDE)&include, D3DXSHADER_SKIPVALIDATION, + &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShader test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(messages) { + trace("recursive D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if(shader) ID3DXBuffer_Release(shader); + todo_wine { shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader));

1 0

Matteo Bruni : d3dx9: Implement D3DXAssembleShaderFromFile.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 1b3376982d3019b09080bb55a1ec7531242b3f6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3376982d3019b09080bb55a… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed Jul 28 17:32:42 2010 +0200 d3dx9: Implement D3DXAssembleShaderFromFile. --- dlls/d3dx9_36/shader.c | 98 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/asm.c | 79 +++++++++++++++++++++++++----------- 2 files changed, 148 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index ba23f07..f5ba7aa 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -309,8 +309,8 @@ static char *wpp_lookup_mem(const char *filename, const char *parent_name, } path = malloc(strlen(filename) + 1); - if(!path) return NULL; - memcpy(path, filename, strlen(filename) + 1); + if(path) + memcpy(path, filename, strlen(filename) + 1); return path; } @@ -636,6 +636,79 @@ cleanup: return hr; } +/* D3DXInclude private implementation, used to implement + D3DXAssembleShaderFromFile from D3DXAssembleShader */ +/* To be able to correctly resolve include search paths we have to store + the pathname of each include file. We store the pathname pointer right + before the file data. */ +static HRESULT WINAPI d3dincludefromfile_open(ID3DXInclude *iface, + D3DXINCLUDE_TYPE include_type, + LPCSTR filename, LPCVOID parent_data, + LPCVOID *data, UINT *bytes) { + const char *p, *parent_name = ""; + char *pathname = NULL; + char **buffer = NULL; + HANDLE file; + UINT size; + + if(parent_data != NULL) + parent_name = *((const char **)parent_data - 1); + + TRACE("Looking up for include file %s, parent %s\n", debugstr_a(filename), debugstr_a(parent_name)); + + if ((p = strrchr(parent_name, '\\')) || (p = strrchr(parent_name, '/'))) p++; + else p = parent_name; + pathname = HeapAlloc(GetProcessHeap(), 0, (p - parent_name) + strlen(filename) + 1); + if(!pathname) + return HRESULT_FROM_WIN32(GetLastError()); + + memcpy(pathname, parent_name, p - parent_name); + strcpy(pathname + (p - parent_name), filename); + + file = CreateFileA(pathname, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if(file == INVALID_HANDLE_VALUE) + goto error; + + TRACE("Include file found at pathname = %s\n", debugstr_a(pathname)); + + size = GetFileSize(file, NULL); + if(size == INVALID_FILE_SIZE) + goto error; + + buffer = HeapAlloc(GetProcessHeap(), 0, size + sizeof(char *)); + if(!buffer) + goto error; + *buffer = pathname; + if(!ReadFile(file, buffer + 1, size, bytes, NULL)) + goto error; + + *data = buffer + 1; + + CloseHandle(file); + return S_OK; + +error: + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, pathname); + HeapFree(GetProcessHeap(), 0, buffer); + return HRESULT_FROM_WIN32(GetLastError()); +} + +static HRESULT WINAPI d3dincludefromfile_close(ID3DXInclude *iface, LPCVOID data) { + HeapFree(GetProcessHeap(), 0, *((char **)data - 1)); + HeapFree(GetProcessHeap(), 0, (char **)data - 1); + return S_OK; +} + +static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { + d3dincludefromfile_open, + d3dincludefromfile_close +}; + +struct D3DXIncludeImpl { + const ID3DXIncludeVtbl *lpVtbl; +}; + HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, CONST D3DXMACRO* defines, LPD3DXINCLUDE include, @@ -667,8 +740,25 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, LPD3DXBUFFER* shader, LPD3DXBUFFER* error_messages) { - FIXME("(%s, %p, %p, %x, %p, %p): stub\n", debugstr_w(filename), defines, include, flags, shader, error_messages); - return D3DERR_INVALIDCALL; + void *buffer; + DWORD len; + HRESULT hr; + struct D3DXIncludeImpl includefromfile; + + if(FAILED(map_view_of_file(filename, &buffer, &len))) + return D3DXERR_INVALIDDATA; + + if(!include) + { + includefromfile.lpVtbl = &D3DXInclude_Vtbl; + include = (LPD3DXINCLUDE)&includefromfile; + } + + hr = D3DXAssembleShader(buffer, len, defines, include, flags, + shader, error_messages); + + UnmapViewOfFile(buffer); + return hr; } HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 388e74e..9c8d2e0 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1561,6 +1561,19 @@ static void assembleshader_test(void) { "#include \"incl2.vsh\"\n" "mov REGISTER, v0\n" }; + const char testshader3[] = { + "#include \"include/incl3.vsh\"\n" + "mov REGISTER, v0\n" + }; + const char testincl3[] = { + "#include \"incl4.vsh\"\n" + }; + const char testincl4_ok[] = { + "vs.1.1\n" + }; + const char testincl4_wrong[] = { + "#error \"wrong include\"\n" + }; HRESULT hr; LPD3DXBUFFER shader, messages; D3DXMACRO defines[] = { @@ -1575,7 +1588,7 @@ static void assembleshader_test(void) { } }; struct D3DXIncludeImpl include; - HRESULT shader_vsh_res, incl_vsh_res; + HRESULT shader_vsh_res; /* pDefines test */ shader = NULL; @@ -1649,25 +1662,22 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - todo_wine { - shader_vsh_res = create_file("shader.vsh", testshader, sizeof(testshader)); if(SUCCEEDED(shader_vsh_res)) { - incl_vsh_res = create_file("incl.vsh", testincl, sizeof(testincl)); - if(SUCCEEDED(incl_vsh_res)) { - /* D3DXAssembleShaderFromFile + #include test */ - shader = NULL; - messages = NULL; - hr = D3DXAssembleShaderFromFileA("shader.vsh", - NULL, NULL, D3DXSHADER_SKIPVALIDATION, - &shader, &messages); - ok(hr == D3D_OK, "D3DXAssembleShaderFromFile test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); - if(messages) { - trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); - ID3DXBuffer_Release(messages); - } - if(shader) ID3DXBuffer_Release(shader); - } else skip("Couldn't create \"incl.vsh\"\n"); + create_file("incl.vsh", testincl, sizeof(testincl)); + + /* D3DXAssembleShaderFromFile + #include test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShaderFromFileA("shader.vsh", + NULL, NULL, D3DXSHADER_SKIPVALIDATION, + &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShaderFromFile test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(messages) { + trace("D3DXAssembleShader messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if(shader) ID3DXBuffer_Release(shader); /* D3DXAssembleShaderFromFile + pInclude test */ shader = NULL; @@ -1681,9 +1691,27 @@ static void assembleshader_test(void) { ID3DXBuffer_Release(messages); } if(shader) ID3DXBuffer_Release(shader); - } else skip("Couldn't create \"shader.vsh\"\n"); - } /* todo_wine */ + create_file("shader3.vsh", testshader3, sizeof(testshader3)); + create_file("incl4.vsh", testincl4_wrong, sizeof(testincl4_wrong)); + if(CreateDirectoryA("include", NULL)) { + create_file("include/incl3.vsh", testincl3, sizeof(testincl3)); + create_file("include/incl4.vsh", testincl4_ok, sizeof(testincl4_ok)); + + /* path search #include test */ + shader = NULL; + messages = NULL; + hr = D3DXAssembleShaderFromFileA("shader3.vsh", NULL, NULL, + D3DXSHADER_SKIPVALIDATION, + &shader, &messages); + ok(hr == D3D_OK, "D3DXAssembleShaderFromFile path search test failed with error 0x%x - %d\n", hr, hr & 0x0000FFFF); + if(messages) { + trace("D3DXAssembleShaderFromFile path search messages:\n%s", (char *)ID3DXBuffer_GetBufferPointer(messages)); + ID3DXBuffer_Release(messages); + } + if(shader) ID3DXBuffer_Release(shader); + } else skip("Couldn't create \"include\" directory\n"); + } else skip("Couldn't create \"shader.vsh\"\n"); /* NULL shader tests */ shader = NULL; @@ -1698,8 +1726,6 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - todo_wine { - shader = NULL; messages = NULL; hr = D3DXAssembleShaderFromFileA("nonexistent.vsh", @@ -1714,8 +1740,6 @@ static void assembleshader_test(void) { } if(shader) ID3DXBuffer_Release(shader); - } /* end of todo_wine */ - /* D3DXAssembleShaderFromResource test */ shader = NULL; messages = NULL; @@ -1745,7 +1769,12 @@ static void assembleshader_test(void) { /* cleanup */ if(SUCCEEDED(shader_vsh_res)) { DeleteFileA("shader.vsh"); - if(SUCCEEDED(incl_vsh_res)) DeleteFileA("incl.vsh"); + DeleteFileA("incl.vsh"); + DeleteFileA("shader3.vsh"); + DeleteFileA("incl4.vsh"); + DeleteFileA("include/incl3.vsh"); + DeleteFileA("include/incl4.vsh"); + RemoveDirectoryA("include"); } }

1 0

Henri Verbeet : wined3d: Unify vertex shader output handling between shader models.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 2114a369360bd49a1d89f1b344a83fcc8601c1a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2114a369360bd49a1d89f1b34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:53 2010 +0200 wined3d: Unify vertex shader output handling between shader models. --- dlls/wined3d/glsl_shader.c | 170 +++++++++----------------------------------- dlls/wined3d/shader.c | 83 ++++++++++++++++++++-- 2 files changed, 111 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2114a369360bd49a1d89f…

1 0

Henri Verbeet : wined3d: Clamp vertex shader outputs.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 4936e71828669ef084f9cf243f924a11a2cdce50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4936e71828669ef084f9cf243… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 29 12:56:54 2010 +0200 wined3d: Clamp vertex shader outputs. To avoid having to interpolate infinities over fragments. --- dlls/wined3d/glsl_shader.c | 57 +++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 42e4311..7f772a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1180,8 +1180,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } - shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); - /* Start the main program */ shader_addline(buffer, "void main() {\n"); if(pshader && reg_maps->vpos) { @@ -2206,13 +2204,13 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) if (dst_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? 0.0 : pow(abs(%s), %s)));\n", - dst_size, src0_param.param_str, src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "vec%u(pow(abs(%s), %s)));\n", + dst_size, src0_param.param_str, src1_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? 0.0 : pow(abs(%s), %s));\n", - src0_param.param_str, src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "pow(abs(%s), %s));\n", + src0_param.param_str, src1_param.param_str); } } @@ -2233,13 +2231,13 @@ static void shader_glsl_log(const struct wined3d_shader_instruction *ins) if (dst_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? -FLT_MAX : log2(abs(%s))));\n", - dst_size, src0_param.param_str, src0_param.param_str); + shader_addline(buffer, "vec%u(log2(abs(%s))));\n", + dst_size, src0_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? -FLT_MAX : log2(abs(%s)));\n", - src0_param.param_str, src0_param.param_str); + shader_addline(buffer, "log2(abs(%s)));\n", + src0_param.param_str); } } @@ -2367,13 +2365,13 @@ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(%s == 0.0 ? FLT_MAX : 1.0 / %s));\n", - mask_size, src_param.param_str, src_param.param_str); + shader_addline(ins->ctx->buffer, "vec%u(1.0 / %s));\n", + mask_size, src_param.param_str); } else { - shader_addline(ins->ctx->buffer, "%s == 0.0 ? FLT_MAX : 1.0 / %s);\n", - src_param.param_str, src_param.param_str); + shader_addline(ins->ctx->buffer, "1.0 / %s);\n", + src_param.param_str); } } @@ -2391,13 +2389,13 @@ static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) if (mask_size > 1) { - shader_addline(buffer, "vec%d(%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s))));\n", - mask_size, src_param.param_str, src_param.param_str); + shader_addline(buffer, "vec%u(inversesqrt(abs(%s))));\n", + mask_size, src_param.param_str); } else { - shader_addline(buffer, "%s == 0.0 ? FLT_MAX : inversesqrt(abs(%s)));\n", - src_param.param_str, src_param.param_str); + shader_addline(buffer, "inversesqrt(abs(%s)));\n", + src_param.param_str); } } @@ -3772,7 +3770,7 @@ static void handle_ps3_input(struct wined3d_shader_buffer *buffer, const struct set[in_idx] = mask; shader_glsl_write_mask_to_str(mask, reg_mask); - shader_addline(buffer, "%s%s = OUT[%u]%s;\n", + shader_addline(buffer, "%s%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", destination, reg_mask, j, reg_mask); } } @@ -3822,6 +3820,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer shader_buffer_clear(buffer); shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "const float FLT_MAX = 1e38;\n"); if (ps_major < 3) { @@ -3841,13 +3840,16 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_COLOR)) { if (semantic_idx == 0) - shader_addline(buffer, "gl_FrontColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_FrontColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); else if (semantic_idx == 1) - shader_addline(buffer, "gl_FrontSecondaryColor%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_FrontSecondaryColor%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_TEXCOORD)) { @@ -3856,7 +3858,7 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (!(gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) || ps_major > 0) write_mask |= WINED3DSP_WRITEMASK_3; - shader_addline(buffer, "gl_TexCoord[%u]%s = OUT[%u]%s;\n", + shader_addline(buffer, "gl_TexCoord[%u]%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", semantic_idx, reg_mask, i, reg_mask); if (!(write_mask & WINED3DSP_WRITEMASK_3)) shader_addline(buffer, "gl_TexCoord[%u].w = 1.0;\n", semantic_idx); @@ -3864,11 +3866,11 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_FOG)) { - shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_FogFragCoord = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } } shader_addline(buffer, "}\n"); @@ -3890,11 +3892,12 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_POSITION)) { - shader_addline(buffer, "gl_Position%s = OUT[%u]%s;\n", reg_mask, i, reg_mask); + shader_addline(buffer, "gl_Position%s = clamp(OUT[%u]%s, -FLT_MAX, FLT_MAX);\n", + reg_mask, i, reg_mask); } else if (shader_match_semantic(semantic_name, WINED3DDECLUSAGE_PSIZE)) { - shader_addline(buffer, "gl_PointSize = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_PointSize = clamp(OUT[%u].%c, -FLT_MAX, FLT_MAX);\n", i, reg_mask[1]); } }

1 0