May 2012 - Wine-Commits - list.winehq.org

Michael Stefaniuc : msxml3/tests: Check the correct return value.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: e86063d68603ba7c787ec84f422d05bf3d5f3f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86063d68603ba7c787ec84f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 10:40:14 2012 +0200 msxml3/tests: Check the correct return value. --- dlls/msxml3/tests/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2aa2906..d4ff6a2 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2656,7 +2656,7 @@ if (0) /* baseName */ str = (BSTR)0xdeadbeef; - IXMLDOMComment_get_baseName(node_comment, &str); + r = IXMLDOMComment_get_baseName(node_comment, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok(str == NULL, "Expected NULL\n");

1 0

Michael Stefaniuc : mstask: Actually run a test and fix the expected behaviour.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: f70181113f72bc2ed02d1cb6117a2a958d3a04e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70181113f72bc2ed02d1cb61… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 16 11:28:37 2012 +0200 mstask: Actually run a test and fix the expected behaviour. --- dlls/mstask/task_trigger.c | 2 -- dlls/mstask/tests/task_trigger.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 307a605..448cf08 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -138,8 +138,6 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger( if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval && pTrigger->MinutesInterval > 0) return E_INVALIDARG; - if (pTrigger->MinutesDuration > 0 && pTrigger->MinutesInterval == 0) - return E_INVALIDARG; tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration; tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval; diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index c64e1c5..0b64211 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -303,7 +303,8 @@ static void test_SetTrigger_GetTrigger(void) ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 0; - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); + ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 0;

1 0

Jacek Caban : ieframe: Added default action implementation for IDocHostUIHandler::GetExternal.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 8b4b8798359ad4b4dd9aa77696591014dc331380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4b8798359ad4b4dd9aa7769… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 16 13:21:02 2012 +0200 ieframe: Added default action implementation for IDocHostUIHandler::GetExternal. --- dlls/ieframe/Makefile.in | 1 + dlls/ieframe/dochost.c | 16 ++- dlls/ieframe/ieframe.h | 2 + dlls/ieframe/shelluihelper.c | 378 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 395 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b4b8798359ad4b4dd9aa…

1 0

Jacek Caban : ieframe: Added GetExternal tests.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: eb29e30188baf925a473ad75b770fa80838212fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb29e30188baf925a473ad75b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 16 13:21:12 2012 +0200 ieframe: Added GetExternal tests. --- dlls/ieframe/tests/webbrowser.c | 75 +++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4b2404a..12d2bba 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -140,6 +140,7 @@ DEFINE_EXPECT(OnInPlaceDeactivate); DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(ControlSite_TranslateAccelerator); DEFINE_EXPECT(OnFocus); +DEFINE_EXPECT(GetExternal); static const WCHAR wszItem[] = {'i','t','e','m',0}; static const WCHAR emptyW[] = {0}; @@ -149,7 +150,7 @@ static VARIANT_BOOL exvb; static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; -static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http; +static BOOL is_downloading, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; static const char *current_url; @@ -1571,8 +1572,9 @@ static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetExternal); + *ppDispatch = NULL; + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, @@ -1708,7 +1710,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &InPlaceSite; else if(IsEqualGUID(&IID_IDocHostUIHandler, riid) || IsEqualGUID(&IID_IDocHostUIHandler2, riid)) - *ppv = &DocHostUIHandler; + *ppv = use_container_dochostui ? &DocHostUIHandler : NULL; else if(IsEqualGUID(&IID_IDispatch, riid)) *ppv = &Dispatch; else if(IsEqualGUID(&IID_IServiceProvider, riid)) @@ -2550,12 +2552,15 @@ static void test_Navigate2(IUnknown *unk, const char *nav_url) SET_EXPECT(EnableModeless_FALSE); SET_EXPECT(Invoke_STATUSTEXTCHANGE); SET_EXPECT(SetStatusText); - SET_EXPECT(GetHostInfo); + if(use_container_dochostui) + SET_EXPECT(GetHostInfo); SET_EXPECT(Invoke_AMBIENT_DLCONTROL); SET_EXPECT(Invoke_AMBIENT_USERAGENT); SET_EXPECT(Invoke_AMBIENT_PALETTE); - SET_EXPECT(GetOptionKeyPath); - SET_EXPECT(GetOverridesKeyPath); + if(use_container_dochostui) { + SET_EXPECT(GetOptionKeyPath); + SET_EXPECT(GetOverridesKeyPath); + } if (use_container_olecmd) SET_EXPECT(QueryStatus_SETPROGRESSTEXT); if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSMAX); if (use_container_olecmd) SET_EXPECT(Exec_SETPROGRESSPOS); @@ -2579,12 +2584,15 @@ static void test_Navigate2(IUnknown *unk, const char *nav_url) CHECK_CALLED(EnableModeless_FALSE); CHECK_CALLED(Invoke_STATUSTEXTCHANGE); CHECK_CALLED(SetStatusText); - CHECK_CALLED(GetHostInfo); + if(use_container_dochostui) + CHECK_CALLED(GetHostInfo); CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* Not called by IE9 */ - CLEAR_CALLED(GetOptionKeyPath); - CHECK_CALLED(GetOverridesKeyPath); + if(use_container_dochostui) { + CLEAR_CALLED(GetOptionKeyPath); + CHECK_CALLED(GetOverridesKeyPath); + } if (use_container_olecmd) todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); if (use_container_olecmd) todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -3001,6 +3009,41 @@ static void test_UIActivate(IUnknown *unk, BOOL activate) IDispatch_Release(disp); } +static void test_external(IUnknown *unk) +{ + IDocHostUIHandler2 *dochost; + IOleClientSite *client; + IDispatch *disp; + HRESULT hres; + + client = get_dochost(unk); + + hres = IOleClientSite_QueryInterface(client, &IID_IDocHostUIHandler2, (void**)&dochost); + ok(hres == S_OK, "Could not get IDocHostUIHandler2 iface: %08x\n", hres); + IOleClientSite_Release(client); + + if(use_container_dochostui) + SET_EXPECT(GetExternal); + disp = (void*)0xdeadbeef; + hres = IDocHostUIHandler2_GetExternal(dochost, &disp); + if(use_container_dochostui) { + CHECK_CALLED(GetExternal); + ok(hres == S_FALSE, "GetExternal failed: %08x\n", hres); + ok(!disp, "disp = %p\n", disp); + }else { + IShellUIHelper *uihelper; + + ok(hres == S_OK, "GetExternal failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IShellUIHelper, (void**)&uihelper); + ok(hres == S_OK, "Could not get IShellUIHelper iface: %08x\n", hres); + IShellUIHelper_Release(uihelper); + } + + IDocHostUIHandler2_Release(dochost); +} + static void test_TranslateAccelerator(IUnknown *unk) { IOleClientSite *doc_clientsite; @@ -3240,6 +3283,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) is_downloading = FALSE; is_first_load = TRUE; use_container_olecmd = TRUE; + use_container_dochostui = TRUE; hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 iface: %08x\n", hres); @@ -3303,6 +3347,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_dochost_qs(unk); } + test_external(unk); + if(do_close) test_Close(wb, do_download); else @@ -3329,7 +3375,6 @@ static void test_WebBrowserV1(void) hres = CoCreateInstance(&CLSID_WebBrowser_V1, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get WebBrowserV1 instance: %08x\n", hres); - trace("%08x %p\n", hres, wb); test_QueryStatusWB(wb, FALSE, FALSE); test_ExecWB(wb, FALSE, FALSE); @@ -3342,7 +3387,7 @@ static void test_WebBrowserV1(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } -static void test_WebBrowser_NoContainerOlecmd(void) +static void test_WebBrowser_slim_container(void) { IUnknown *unk = NULL; HRESULT hres; @@ -3351,6 +3396,7 @@ static void test_WebBrowser_NoContainerOlecmd(void) is_downloading = FALSE; is_first_load = TRUE; use_container_olecmd = FALSE; + use_container_dochostui = FALSE; /* Setup stage */ if (FAILED(create_WebBrowser(&unk))) @@ -3367,6 +3413,7 @@ static void test_WebBrowser_NoContainerOlecmd(void) /* Tests of interest */ test_QueryStatusWB(wb, FALSE, TRUE); test_ExecWB(wb, FALSE, TRUE); + test_external(unk); /* Cleanup stage */ IWebBrowser2_Release(wb); @@ -3391,7 +3438,7 @@ static BOOL is_ie_hardened(void) type != REG_DWORD) { ie_harden = 0; } - RegCloseKey(zone_map); + RegCloseKey(zone_map); } return ie_harden != 0; @@ -3417,7 +3464,7 @@ START_TEST(webbrowser) trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); - test_WebBrowser_NoContainerOlecmd(); + test_WebBrowser_slim_container(); trace("Testing WebBrowserV1...\n"); test_WebBrowserV1();

1 0

Hans Leidekker : fusion: Make sure the assembly exists in IAssemblyCache:: QueryAssemblyInfo.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 0f82f72468dccc5655a39b733929012a08677af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f82f72468dccc5655a39b733… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 16 10:08:02 2012 +0200 fusion: Make sure the assembly exists in IAssemblyCache::QueryAssemblyInfo. --- dlls/fusion/asmcache.c | 13 +++++++++---- dlls/fusion/tests/asmcache.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index e6a2a65..c6f7ca9 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -308,11 +308,16 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface if (FAILED(hr)) goto done; - hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); - if (hr == S_FALSE) + for (;;) { - hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - goto done; + hr = IAssemblyEnum_GetNextAssembly(asmenum, NULL, &next, 0); + if (hr != S_OK) + { + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + goto done; + } + hr = IAssemblyName_IsEqual(asmname, next, ASM_CMPF_IL_ALL); + if (hr == S_OK) break; } if (!pAsmInfo) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 141e442..890bd9c 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1011,6 +1011,11 @@ static void test_QueryAssemblyInfo(void) '_','M','S','I','L','\\','w','i','n','e','\\', '1','.','0','.','0','.','0','_','_','2','d','0','3','6','1','7','b', '1','c','3','1','e','2','f','5','\\',0}; + static const WCHAR wine2[] = { + 'w','i','n','e',',','v','e','r','s','i','o','n','=','1','.','0','.','0','.','1',',', + 'p','u','b','l','i','c','K','e','y','T','o','k','e','n','=', + '2','d','0','3','6','1','7','b','1','c','3','1','e','2','f','5',',', + 'c','u','l','t','u','r','e','=','n','e','u','t','r','a','l',0}; size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, asmpath, &size); @@ -1363,6 +1368,24 @@ static void test_QueryAssemblyInfo(void) "Assembly path was changed\n"); ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "wine,version=1.0.0.1,publicKeyToken=2d03617b1c31e2f5,culture=neutral" */ + INIT_ASM_INFO(); + lstrcpyW(name, wine2); + hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, + name, &info); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), + "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); + ok(info.uliAssemblySizeInKB.u.HighPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); + ok(info.uliAssemblySizeInKB.u.LowPart == 0, + "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); + /* display name is "wine, Culture=neutral" */ INIT_ASM_INFO(); lstrcpyW(name, wine); @@ -1394,24 +1417,18 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, badculture); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - todo_wine - { - ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), - "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); - ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); - } + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "Expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got %08x\n", hr); + ok(info.dwAssemblyFlags == 0, "Expected 0, got %08x\n", info.dwAssemblyFlags); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(info.uliAssemblySizeInKB.u.LowPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.LowPart); - todo_wine - { - ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), - "Assembly path was changed\n"); - ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); - } + ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), + "Assembly path was changed\n"); + ok(info.cchBuf == MAX_PATH, "Expected MAX_PATH, got %d\n", info.cchBuf); /* display name is "wine, PublicKeyTokens=2d03617b1c31e2f5" */ INIT_ASM_INFO();

1 0

Matteo Bruni : d3dcompiler: Add a stub parser.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 949de2e520d25dd8c4fca5cad78346faed981199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949de2e520d25dd8c4fca5cad… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:56 2012 +0200 d3dcompiler: Add a stub parser. --- .gitignore | 2 + dlls/d3dcompiler_43/Makefile.in | 4 +- dlls/d3dcompiler_43/compiler.c | 7 -- dlls/d3dcompiler_43/d3dcompiler_private.h | 29 +++++++++ dlls/d3dcompiler_43/hlsl.y | 94 +++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 3b22ee6..7f4bb73 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ dlls/advapi32/svcctl_c.c dlls/d3dcompiler_43/asmshader.tab.c dlls/d3dcompiler_43/asmshader.tab.h dlls/d3dcompiler_43/asmshader.yy.c +dlls/d3dcompiler_43/hlsl.tab.c +dlls/d3dcompiler_43/hlsl.tab.h dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index f69eb77..15a9dc4 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -13,7 +13,9 @@ C_SRCS = \ utils.c LEX_SRCS = asmshader.l -BISON_SRCS = asmshader.y +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 8ed7be1..043d231 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,13 +490,6 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -static struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, - const char *entrypoint, char **messages) -{ - FIXME("\n"); - return NULL; -} - static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, ID3DBlob **shader_blob, ID3DBlob **error_messages) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index e64f4cf..2936077 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -573,6 +573,35 @@ struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLS HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; +enum hlsl_matrix_majority +{ + HLSL_COLUMN_MAJOR, + HLSL_ROW_MAJOR +}; + +struct hlsl_parse_ctx +{ + char *source_file; + unsigned int line_no; + enum parse_status status; + struct compilation_messages messages; + + struct hlsl_scope *cur_scope; + struct hlsl_scope *globals; + struct list scopes; + + struct list types; + struct list functions; + + enum hlsl_matrix_majority matrix_majority; +}; + +extern struct hlsl_parse_ctx hlsl_ctx DECLSPEC_HIDDEN; + +void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) DECLSPEC_HIDDEN; + #define MAKE_TAG(ch0, ch1, ch2, ch3) \ ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y new file mode 100644 index 0000000..2010f5f --- /dev/null +++ b/dlls/d3dcompiler_43/hlsl.y @@ -0,0 +1,94 @@ +/* + * HLSL parser + * + * Copyright 2008 Stefan Dösinger + * Copyright 2012 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +%{ +#include "config.h" +#include "wine/debug.h" + +#include <stdio.h> + +#include "d3dcompiler_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlsl_parser); + +int hlsl_lex(void) +{ + FIXME("Lexer.\n"); + return 0; +} + +struct hlsl_parse_ctx hlsl_ctx; + +void hlsl_message(const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + compilation_message(&hlsl_ctx.messages, fmt, args); + va_end(args); +} + +static void hlsl_error(const char *s) +{ + hlsl_message("Line %u: %s\n", hlsl_ctx.line_no, s); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); +} + +%} + +%error-verbose + +%union +{ + char *name; + INT intval; +} + +%token <intval> PRE_LINE + +%token <name> STRING +%% + +hlsl_prog: /* empty */ + { + } + | hlsl_prog preproc_directive + { + } + +preproc_directive: PRE_LINE STRING + { + TRACE("Updating line informations to file %s, line %u\n", debugstr_a($2), $1); + hlsl_ctx.line_no = $1 - 1; + d3dcompiler_free(hlsl_ctx.source_file); + hlsl_ctx.source_file = $2; + } + +%% + +struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, const char *entrypoint, char **messages) +{ + hlsl_ctx.line_no = 1; + hlsl_ctx.matrix_majority = HLSL_COLUMN_MAJOR; + + hlsl_parse(); + + return NULL; +}

1 0

Matteo Bruni : d3dcompiler: Trace compilation messages.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 47a7f7f13dbee2918a89b6d6c53a90066e07d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a7f7f13dbee2918a89b6d6c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:55 2012 +0200 d3dcompiler: Trace compilation messages. --- dlls/d3dcompiler_43/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index f6a0bcc..4cbad5b 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -753,6 +753,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, va_l } else { + TRACE("%s", msg->string + msg->size); msg->size += rc; return; }

1 0

Alexandre Julliard : winex11: Use the create_pixmap_from_image helper to create window icons.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: c2073b7ba2af154af0c10d528ad6bb98ada1aaad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2073b7ba2af154af0c10d528… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 20:58:39 2012 +0200 winex11: Use the create_pixmap_from_image helper to create window icons. --- dlls/winex11.drv/window.c | 110 +++++++++++++++++++++++++++++++++------------ dlls/winex11.drv/x11drv.h | 4 +- 2 files changed, 83 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 193a165..720a49c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -804,14 +804,14 @@ static void destroy_icon_window( Display *display, struct x11drv_win_data *data */ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, unsigned int *size ) { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; BITMAP bm; - BITMAPINFO *info; unsigned int *ptr, *bits = NULL; unsigned char *mask_bits = NULL; int i, j, has_alpha = 0; if (!GetObjectW( color, sizeof(bm), &bm )) return NULL; - if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return NULL; info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biWidth = bm.bmWidth; info->bmiHeader.biHeight = -bm.bmHeight; @@ -856,7 +856,6 @@ static unsigned long *get_bitmap_argb( HDC hdc, HBITMAP color, HBITMAP mask, uns return (unsigned long *)bits; failed: - HeapFree( GetProcessHeap(), 0, info ); HeapFree( GetProcessHeap(), 0, bits ); HeapFree( GetProcessHeap(), 0, mask_bits ); return NULL; @@ -864,6 +863,69 @@ failed: /*********************************************************************** + * create_icon_pixmaps + */ +static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, struct x11drv_win_data *data ) +{ + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + XVisualInfo vis; + struct gdi_image_bits bits; + Pixmap color_pixmap = 0, mask_pixmap = 0; + int i, lines; + + bits.ptr = NULL; + bits.free = NULL; + bits.is_copy = TRUE; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biBitCount = 0; + if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; + if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; + if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; + + vis.visual = visual; + vis.depth = screen_depth; + vis.visualid = visual->visualid; + vis.class = visual->class; + vis.red_mask = visual->red_mask; + vis.green_mask = visual->green_mask; + vis.blue_mask = visual->blue_mask; + color_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ); + HeapFree( GetProcessHeap(), 0, bits.ptr ); + bits.ptr = NULL; + if (!color_pixmap) goto failed; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biBitCount = 0; + if (!(lines = GetDIBits( hdc, icon->hbmMask, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; + if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; + if (!GetDIBits( hdc, icon->hbmMask, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; + + /* invert the mask */ + for (i = 0; i < info->bmiHeader.biSizeImage / sizeof(DWORD); i++) ((DWORD *)bits.ptr)[i] ^= ~0u; + + vis.depth = 1; + mask_pixmap = create_pixmap_from_image( hdc, &vis, info, &bits, DIB_RGB_COLORS ); + HeapFree( GetProcessHeap(), 0, bits.ptr ); + bits.ptr = NULL; + if (!mask_pixmap) goto failed; + + data->icon_pixmap = color_pixmap; + data->icon_mask = mask_pixmap; + return TRUE; + +failed: + wine_tsx11_lock(); + if (color_pixmap) XFreePixmap( gdi_display, color_pixmap ); + if (mask_pixmap) XFreePixmap( gdi_display, mask_pixmap ); + wine_tsx11_unlock(); + HeapFree( GetProcessHeap(), 0, bits.ptr ); + return FALSE; +} + + +/*********************************************************************** * set_icon_hints * * Set the icon wm hints @@ -884,10 +946,11 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, if (!icon_small) icon_small = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICONSM ); } - if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); - if (data->hWMIconMask) DeleteObject( data->hWMIconMask); - data->hWMIconBitmap = 0; - data->hWMIconMask = 0; + wine_tsx11_lock(); + if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); + if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); + data->icon_pixmap = data->icon_mask = 0; + wine_tsx11_unlock(); if (!icon_big) { @@ -897,9 +960,6 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, } else { - HBITMAP hbmOrig; - RECT rcMask; - BITMAP bm; ICONINFO ii, ii_small; HDC hDC; unsigned int size; @@ -907,12 +967,6 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, if (!GetIconInfo(icon_big, &ii)) return; - GetObjectW(ii.hbmMask, sizeof(bm), &bm); - rcMask.top = 0; - rcMask.left = 0; - rcMask.right = bm.bmWidth; - rcMask.bottom = bm.bmHeight; - hDC = CreateCompatibleDC(0); bits = get_bitmap_argb( hDC, ii.hbmColor, ii.hbmMask, &size ); if (bits && GetIconInfo( icon_small, &ii_small )) @@ -944,19 +998,17 @@ static void set_icon_hints( Display *display, struct x11drv_win_data *data, wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, bits ); - hbmOrig = SelectObject(hDC, ii.hbmMask); - InvertRect(hDC, &rcMask); - SelectObject(hDC, ii.hbmColor); /* force the color bitmap to x11drv mode too */ - SelectObject(hDC, hbmOrig); - - data->hWMIconBitmap = ii.hbmColor; - data->hWMIconMask = ii.hbmMask; - - hints->icon_pixmap = X11DRV_get_pixmap(data->hWMIconBitmap); - hints->icon_mask = X11DRV_get_pixmap(data->hWMIconMask); + if (create_icon_pixmaps( hDC, &ii, data )) + { + hints->icon_pixmap = data->icon_pixmap; + hints->icon_mask = data->icon_mask; + hints->flags |= IconPixmapHint | IconMaskHint; + } destroy_icon_window( display, data ); - hints->flags = (hints->flags & ~IconWindowHint) | IconPixmapHint | IconMaskHint; + hints->flags &= ~IconWindowHint; + DeleteObject( ii.hbmColor ); + DeleteObject( ii.hbmMask ); DeleteDC(hDC); } } @@ -1894,9 +1946,9 @@ void CDECL X11DRV_DestroyWindow( HWND hwnd ) if (thread_data->last_focus == hwnd) thread_data->last_focus = 0; if (thread_data->last_xic_hwnd == hwnd) thread_data->last_xic_hwnd = 0; - if (data->hWMIconBitmap) DeleteObject( data->hWMIconBitmap ); - if (data->hWMIconMask) DeleteObject( data->hWMIconMask); wine_tsx11_lock(); + if (data->icon_pixmap) XFreePixmap( gdi_display, data->icon_pixmap ); + if (data->icon_mask) XFreePixmap( gdi_display, data->icon_mask ); XDeleteContext( thread_data->display, (XID)hwnd, win_data_context ); wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7ed4bdd..9b05e3e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -592,8 +592,8 @@ struct x11drv_win_data DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ unsigned long configure_serial; /* serial number of last configure request */ - HBITMAP hWMIconBitmap; - HBITMAP hWMIconMask; + Pixmap icon_pixmap; + Pixmap icon_mask; }; extern struct x11drv_win_data *X11DRV_get_win_data( HWND hwnd ) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : d3dcompiler: Make SlWriteBytecode return the shader size.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: ddab7fcda9af2d880e2b8e77538f3eb6d2f242a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddab7fcda9af2d880e2b8e775… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:53 2012 +0200 d3dcompiler: Make SlWriteBytecode return the shader size. --- dlls/d3dcompiler_43/bytecodewriter.c | 26 ++++---------------------- dlls/d3dcompiler_43/compiler.c | 8 +++----- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 3 files changed, 8 insertions(+), 28 deletions(-) diff --git a/dlls/d3dcompiler_43/bytecodewriter.c b/dlls/d3dcompiler_43/bytecodewriter.c index 54321ed..5a3e7f2 100644 --- a/dlls/d3dcompiler_43/bytecodewriter.c +++ b/dlls/d3dcompiler_43/bytecodewriter.c @@ -2543,22 +2543,8 @@ static HRESULT call_instr_handler(struct bc_writer *writer, return E_INVALIDARG; } -/* SlWriteBytecode (wineshader.@) - * - * Writes shader version specific bytecode from the shader passed in. - * The returned bytecode can be passed to the Direct3D runtime like - * IDirect3DDevice9::Create*Shader. - * - * Parameters: - * shader: Shader to translate into bytecode - * version: Shader version to generate(d3d version token) - * dxversion: DirectX version the code targets - * result: the resulting shader bytecode - * - * Return values: - * S_OK on success - */ -DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result) { +HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) +{ struct bc_writer *writer; struct bytecode_buffer *buffer = NULL; HRESULT hr; @@ -2610,12 +2596,8 @@ DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD goto error; } - /* Cut off unneeded memory from the result buffer */ - *result = d3dcompiler_realloc(buffer->data, - sizeof(DWORD) * buffer->size); - if(!*result) { - *result = buffer->data; - } + *size = buffer->size * sizeof(DWORD); + *result = buffer->data; buffer->data = NULL; hr = S_OK; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 7f4ebdb..e273d6b 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -396,9 +396,8 @@ static HRESULT assemble_shader(const char *preproc_shader, struct bwriter_shader *shader; char *messages = NULL; HRESULT hr; - DWORD *res; - LPD3DBLOB buffer; - int size; + DWORD *res, size; + ID3DBlob *buffer; char *pos; shader = SlAssembleShader(preproc_shader, &messages); @@ -443,7 +442,7 @@ static HRESULT assemble_shader(const char *preproc_shader, return D3DXERR_INVALIDDATA; } - hr = SlWriteBytecode(shader, 9, &res); + hr = SlWriteBytecode(shader, 9, &res, &size); SlDeleteShader(shader); if (FAILED(hr)) { @@ -453,7 +452,6 @@ static HRESULT assemble_shader(const char *preproc_shader, if (shader_blob) { - size = HeapSize(GetProcessHeap(), 0, res); hr = D3DCreateBlob(size, &buffer); if (FAILED(hr)) { diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d719021..e64f4cf 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -570,7 +570,7 @@ typedef enum _BWRITERDECLUSAGE { #define T3_REG 5 struct bwriter_shader *SlAssembleShader(const char *text, char **messages) DECLSPEC_HIDDEN; -DWORD SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result) DECLSPEC_HIDDEN; +HRESULT SlWriteBytecode(const struct bwriter_shader *shader, int dxversion, DWORD **result, DWORD *size) DECLSPEC_HIDDEN; void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; #define MAKE_TAG(ch0, ch1, ch2, ch3) \

1 0

Matteo Bruni : d3dcompiler: Partially implement D3DCompile function.
by Alexandre Julliard May 16, 2012

May 16, 2012

Module: wine Branch: master Commit: 14ec785fc3b2c7fb5e7a7cc3ab9738b07354d533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ec785fc3b2c7fb5e7a7cc3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 15 16:12:54 2012 +0200 d3dcompiler: Partially implement D3DCompile function. --- dlls/d3dcompiler_43/compiler.c | 101 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 97 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index e273d6b..8ed7be1 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -490,21 +490,114 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } +static struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD version, + const char *entrypoint, char **messages) +{ + FIXME("\n"); + return NULL; +} + +static HRESULT compile_shader(const char *preproc_shader, const char *target, const char *entrypoint, + ID3DBlob **shader_blob, ID3DBlob **error_messages) +{ + struct bwriter_shader *shader; + char *messages = NULL; + HRESULT hr; + DWORD *res, size; + ID3DBlob *buffer; + char *pos; + + FIXME("Parse compilation target.\n"); + shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, entrypoint, &messages); + + if (messages) + { + TRACE("Compiler messages:\n"); + TRACE("%s", messages); + + TRACE("Shader source:\n"); + TRACE("%s\n", debugstr_a(preproc_shader)); + + if (error_messages) + { + const char *preproc_messages = *error_messages ? ID3D10Blob_GetBufferPointer(*error_messages) : NULL; + + size = strlen(messages) + (preproc_messages ? strlen(preproc_messages) : 0) + 1; + hr = D3DCreateBlob(size, &buffer); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, messages); + if (shader) SlDeleteShader(shader); + return hr; + } + pos = ID3D10Blob_GetBufferPointer(buffer); + if (preproc_messages) + { + memcpy(pos, preproc_messages, strlen(preproc_messages) + 1); + pos += strlen(preproc_messages); + } + memcpy(pos, messages, strlen(messages) + 1); + + if (*error_messages) ID3D10Blob_Release(*error_messages); + *error_messages = buffer; + } + HeapFree(GetProcessHeap(), 0, messages); + } + + if (!shader) + { + ERR("HLSL shader parsing failed.\n"); + return D3DXERR_INVALIDDATA; + } + + hr = SlWriteBytecode(shader, 9, &res, &size); + SlDeleteShader(shader); + if (FAILED(hr)) + { + ERR("SlWriteBytecode failed with error 0x%08x.\n", hr); + return D3DXERR_INVALIDDATA; + } + + if (shader_blob) + { + hr = D3DCreateBlob(size, &buffer); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, res); + return hr; + } + memcpy(ID3D10Blob_GetBufferPointer(buffer), res, size); + *shader_blob = buffer; + } + + HeapFree(GetProcessHeap(), 0, res); + + return S_OK; +} + HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { + HRESULT hr; + FIXME("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p stub!\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages); - TRACE("Shader source:\n%s\n", debugstr_an(data, data_size)); + if (shader) *shader = NULL; + if (error_messages) *error_messages = NULL; + + EnterCriticalSection(&wpp_mutex); - if (error_messages) - D3DCreateBlob(1, error_messages); /* zero fill used as string end */ + hr = preprocess_shader(data, data_size, defines, include, error_messages); + if (SUCCEEDED(hr)) + hr = compile_shader(wpp_output, target, entrypoint, shader, error_messages); - return D3DERR_INVALIDCALL; + HeapFree(GetProcessHeap(), 0, wpp_output); + LeaveCriticalSection(&wpp_mutex); + return hr; } HRESULT WINAPI D3DPreprocess(const void *data, SIZE_T size, const char *filename,

1 0