November 2012 - Wine-commits

Jacek Caban : ieframe: Added IWebBrowser2::Refresh tests.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 8b1bd3e5bfe8e3951e19a3063942d1d0cce8cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bd3e5bfe8e3951e19a3063… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:33 2012 +0100 ieframe: Added IWebBrowser2::Refresh tests. --- dlls/ieframe/tests/webbrowser.c | 43 +++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 213e43d..25cce8a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -126,6 +126,7 @@ DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(Exec_STOP); DEFINE_EXPECT(Exec_IDM_STOP); +DEFINE_EXPECT(Exec_DocHostCommandHandler_2300); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(QueryStatus_IDM_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); @@ -160,6 +161,7 @@ static int wb_version; #define DWL_FROM_PUT_HREF 0x02 #define DWL_FROM_GOBACK 0x04 #define DWL_HTTP 0x08 +#define DWL_REFRESH 0x10 static DWORD dwl_flags; @@ -453,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 105: /* TODO */ case 138: /* TODO */ case 140: /* TODO (Win7) */ + case 144: /* TODO */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -468,6 +471,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case 6041: /* TODO */ break; + case 2300: + CHECK_EXPECT(Exec_DocHostCommandHandler_2300); + return E_NOTIMPL; default: ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); } @@ -2697,14 +2703,15 @@ static void test_ExecWB(IWebBrowser2 *webbrowser, BOOL use_custom_target, BOOL h static void test_download(DWORD flags) { + BOOL *b = (flags & DWL_REFRESH) ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Invoke_DOCUMENTCOMPLETE; MSG msg; is_downloading = TRUE; dwl_flags = flags; - test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2727,11 +2734,13 @@ static void test_download(DWORD flags) SET_EXPECT(GetHostInfo); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Invoke_TITLECHANGE); - SET_EXPECT(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_NAVIGATECOMPLETE2); if(is_first_load) SET_EXPECT(GetDropTarget); SET_EXPECT(Invoke_PROGRESSCHANGE); - SET_EXPECT(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_DOCUMENTCOMPLETE); if(flags & DWL_HTTP) SET_EXPECT(Exec_SETTITLE); @@ -2739,12 +2748,12 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); - while(!called_Invoke_DOCUMENTCOMPLETE && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2773,11 +2782,13 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(GetHostInfo); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); - CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) todo_wine CHECK_CALLED(GetDropTarget); todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); - CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); is_downloading = FALSE; @@ -2795,6 +2806,20 @@ static void test_download(DWORD flags) CLEAR_CALLED(QueryStatus_STOP); } +static void test_Refresh(IWebBrowser2 *webbrowser) +{ + HRESULT hres; + + trace("Refresh...\n"); + + SET_EXPECT(Exec_DocHostCommandHandler_2300); + hres = IWebBrowser2_Refresh(webbrowser); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + CHECK_CALLED(Exec_DocHostCommandHandler_2300); + + test_download(DWL_REFRESH); +} + static void test_olecmd(IWebBrowser2 *unk, BOOL loaded) { IOleCommandTarget *cmdtrg; @@ -3336,6 +3361,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Navigate2(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_EXPECT_BEFORE_NAVIGATE|DWL_HTTP); + test_Refresh(webbrowser); + trace("put_href http URL...\n"); test_put_href(webbrowser, "http://www.winehq.org/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP);

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: c27d20902aaf25ea803fbf49853e375b331ef506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27d20902aaf25ea803fbf498… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Nov 12 11:18:56 2012 +0900 po: Update Korean translation. --- po/ko.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0ccb19b..a0bd4b9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8241,44 +8241,36 @@ msgid "Security Warning" msgstr "보안 경고" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "그래도 계속 진행하겠습니까?" +msgstr "이 소프트웨어를 설치하기를 원합니까?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "위치:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "설치/삭제" +msgstr "설치 안 함" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"설치할 때,ActiveX는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니다. 당신이" +"이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "설치 변환 실패가 추가됨.\n" +msgstr "구성요소 설치가 실패함: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "설치(&I)" +msgstr "설치 (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "설치(&I)" +msgstr "설치" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Detlef Riekenberg : advapi32/tests: Fix a failure on 64bit NT 5.x.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: aaad900d1edaba58d6073e5082530e42958a2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaad900d1edaba58d6073e508… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 12 05:50:13 2012 +0100 advapi32/tests: Fix a failure on 64bit NT 5.x. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ba0750b..f5fc4e2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4294,7 +4294,7 @@ static void test_TokenIntegrityLevel(void) res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); /* not supported before Vista */ - if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) + if (!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || GetLastError() == ERROR_INVALID_FUNCTION)) { win_skip("TokenIntegrityLevel not supported\n"); CloseHandle(token);

1 0

Alexandre Julliard : user32: Add helper functions to get and set dword registry values in SystemParametersInfo .
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: b5d96da32f955357b7d9341ee9fca68108078dce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d96da32f955357b7d9341ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 12 16:35:05 2012 +0100 user32: Add helper functions to get and set dword registry values in SystemParametersInfo. --- dlls/user32/sysparams.c | 122 ++++++++++++++++--------------------- dlls/user32/tests/sysparams.c | 137 ++++++++++++++++++++++++++++++++++------- 2 files changed, 166 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b5d96da32f955357b7d93…

1 0

Frédéric Delanoy : ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3cdd1abd09b0292955730dac2e03a831cffa0b5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdd1abd09b0292955730dac2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 10 10:33:49 2012 +0100 ole32: Avoid erroneously freeing a variable in ReadFmtUserTypeStg. --- dlls/ole32/storage32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8498eaf..3bf3216 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8771,7 +8771,10 @@ HRESULT WINAPI ReadFmtUserTypeStg (LPSTORAGE pstg, CLIPFORMAT* pcf, LPOLESTR* lp *pcf = RegisterClipboardFormatW( szOleTypeName ); if( lplpszUserType ) + { *lplpszUserType = szCLSIDName; + szCLSIDName = NULL; + } end: CoTaskMemFree( szCLSIDName );

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DTEXTURE.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 2445ff616e02c2735296e107c8cb37e3d765cf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2445ff616e02c2735296e107c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:35 2012 +0100 ddraw: Avoid LPDIRECT3DTEXTURE. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index fe79711..4cdfe2d 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -573,7 +573,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; - STDMETHOD(Load)(THIS_ LPDIRECT3DTEXTURE lpD3DTexture) PURE; + STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; }; #undef INTERFACE @@ -938,7 +938,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; - STDMETHOD(SwapTextureHandles)(THIS_ LPDIRECT3DTEXTURE lpD3Dtex1, LPDIRECT3DTEXTURE lpD3DTex2) PURE; + STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL3.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 3a32ecd90fd8fb4e36fd8c4a5fa3c3d750ecde5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a32ecd90fd8fb4e36fd8c4a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:36 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL3. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4cdfe2d..f05f690b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -308,7 +308,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface,

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DMATERIAL2.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 67886fed9291e379765e8d6f9ef2e036ed10d9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67886fed9291e379765e8d6f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:37 2012 +0100 ddraw: Avoid LPDIRECT3DMATERIAL2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f05f690b..3746b4b 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -260,7 +260,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; - STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL2 *lplpDirect3DMaterial2, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT2 *lplpD3DViewport2, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface,

1 0

Henri Verbeet : wined3d: Add support for GLSL based fixed function fragment shaders.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 10d46bc042696bb9e5c45ac88af332c957bbff03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d46bc042696bb9e5c45ac88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:38 2012 +0100 wined3d: Add support for GLSL based fixed function fragment shaders. --- dlls/wined3d/arb_program_shader.c | 14 - dlls/wined3d/directx.c | 18 +- dlls/wined3d/glsl_shader.c | 1068 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 14 + dlls/wined3d/wined3d_private.h | 3 + 5 files changed, 1049 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10d46bc042696bb9e5c45…

1 0

Henri Verbeet : wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name ().
by Alexandre Julliard 12 Nov '12

12 Nov '12

Module: wine Branch: master Commit: 0a7b32e3f08d68feddd563afca3c03416cc4cb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7b32e3f08d68feddd563afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:39 2012 +0100 wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e09c9e..66cee1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1378,7 +1378,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); + struct glsl_src_param rel_param0, rel_param1; + if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); + if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); *is_color = FALSE; switch (reg->type) @@ -1406,24 +1411,20 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); - - /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP - * operation there */ + /* Removing a + 0 would be an obvious optimization, but + * OS X doesn't see the NOP operation there. */ if (idx) { if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", - rel_param.param_str, idx, in_count - 1, rel_param.param_str, idx, in_count, - prefix, rel_param.param_str, idx); + rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, + prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param.param_str, idx); + sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -1431,12 +1432,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", - rel_param.param_str, in_count - 1, rel_param.param_str, in_count, - prefix, rel_param.param_str); + rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, + prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } @@ -1462,12 +1463,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param.param_str, reg->idx[0].offset); + sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { @@ -1606,16 +1605,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); sprintf(register_name, "%s_cb%u[%s + %u]", - prefix, reg->idx[0].offset, rel_param.param_str, reg->idx[1].offset); - } + prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - { sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); - } break; case WINED3DSPR_PRIMID:

1 0