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

Paul Vriens : wintrust: Add framework and initial tests.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 95bb90326a038e707eae155f1072e322667c34fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95bb90326a038e707eae155… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Tue Aug 29 10:25:47 2006 +0200 wintrust: Add framework and initial tests. --- configure | 3 - configure.ac | 1 dlls/Makefile.in | 1 dlls/wintrust/tests/Makefile.in | 13 +++ dlls/wintrust/tests/register.c | 176 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + 6 files changed, 196 insertions(+), 1 deletions(-) create mode 100644 dlls/wintrust/tests/Makefile.in create mode 100644 dlls/wintrust/tests/register.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=95bb90326a038e707ea…

1 0

Paul Vriens : wintrust: Add some register stubs.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: fc3c9c5ee6badb4cd28295ff98d175f19db2ab0c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc3c9c5ee6badb4cd28295f… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Aug 28 16:53:01 2006 +0200 wintrust: Add some register stubs. --- dlls/wintrust/register.c | 62 ++++++++++++++++++++++++++++++++++++++++--- dlls/wintrust/wintrust.spec | 12 ++++---- 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index b2e883b..928d9e9 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -54,8 +54,8 @@ BOOL WINAPI WintrustRemoveActionID( GUID } /*********************************************************************** - * DllRegisterServer (WINTRUST.@) - */ + * DllRegisterServer (WINTRUST.@) + */ HRESULT WINAPI DllRegisterServer(void) { FIXME("stub\n"); @@ -63,10 +63,64 @@ HRESULT WINAPI DllRegisterServer(void) } /*********************************************************************** - * DllUnregisterServer (WINTRUST.@) - */ + * DllUnregisterServer (WINTRUST.@) + */ HRESULT WINAPI DllUnregisterServer(void) { FIXME("stub\n"); return S_OK; } + +/*********************************************************************** + * SoftpubDllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI SoftpubDllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * SoftpubDllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI SoftpubDllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mscat32DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI mscat32DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mscat32DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI mscat32DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mssip32DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI mssip32DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * mssip32DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI mssip32DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 58f5267..f7a4221 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -60,8 +60,8 @@ @ stub SoftpubCheckCert @ stub SoftpubCleanup @ stub SoftpubDefCertInit -@ stub SoftpubDllRegisterServer -@ stub SoftpubDllUnregisterServer +@ stdcall SoftpubDllRegisterServer() +@ stdcall SoftpubDllUnregisterServer() @ stub SoftpubDumpStructure @ stub SoftpubFreeDefUsageCallData @ stub SoftpubInitialize @@ -118,7 +118,7 @@ @ stdcall WintrustLoadFunctionPointers(ptr ptr) @ stdcall WintrustRemoveActionID(ptr) @ stdcall WintrustSetRegPolicyFlags(long) -@ stub mscat32DllRegisterServer -@ stub mscat32DllUnregisterServer -@ stub mssip32DllRegisterServer -@ stub mssip32DllUnregisterServer +@ stdcall mscat32DllRegisterServer() +@ stdcall mscat32DllUnregisterServer() +@ stdcall mssip32DllRegisterServer() +@ stdcall mssip32DllUnregisterServer()

1 0

Paul Vriens : wintrust: Move register related functions to a separate file.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 8170d885091973c185f5747c62375ee702354e1d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8170d885091973c185f5747… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Aug 28 16:52:38 2006 +0200 wintrust: Move register related functions to a separate file. --- dlls/wintrust/Makefile.in | 4 ++ dlls/wintrust/register.c | 72 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 39 ---------------------- 3 files changed, 75 insertions(+), 40 deletions(-) create mode 100644 dlls/wintrust/register.c diff --git a/dlls/wintrust/Makefile.in b/dlls/wintrust/Makefile.in index de2b25e..153c7c1 100644 --- a/dlls/wintrust/Makefile.in +++ b/dlls/wintrust/Makefile.in @@ -6,7 +6,9 @@ MODULE = wintrust.dll IMPORTLIB = libwintrust.$(IMPLIBEXT) IMPORTS = crypt32 kernel32 -C_SRCS = wintrust_main.c +C_SRCS = \ + register.c \ + wintrust_main.c RC_SRCS = \ version.rc diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c new file mode 100644 index 0000000..b2e883b --- /dev/null +++ b/dlls/wintrust/register.c @@ -0,0 +1,72 @@ +/* + * Register related wintrust functions + * + * Copyright 2006 Paul Vriens + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "guiddef.h" +#include "wintrust.h" +#include "softpub.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/*********************************************************************** + * WintrustAddActionID (WINTRUST.@) + */ +BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, + CRYPT_REGISTER_ACTIONID* psProvInfo) +{ + FIXME("%p %lx %p\n", pgActionID, fdwFlags, psProvInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * WintrustRemoveActionID (WINTRUST.@) + */ +BOOL WINAPI WintrustRemoveActionID( GUID* pgActionID ) +{ + FIXME("(%s)\n", debugstr_guid(pgActionID)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * DllRegisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (WINTRUST.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index d3b4dab..8a9a2f5 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -188,27 +188,6 @@ CRYPT_PROVIDER_DATA * WINAPI WTHelperPro } /*********************************************************************** - * WintrustAddActionID (WINTRUST.@) - */ -BOOL WINAPI WintrustAddActionID( GUID* pgActionID, DWORD fdwFlags, - CRYPT_REGISTER_ACTIONID* psProvInfo) -{ - FIXME("%p %lx %p\n", pgActionID, fdwFlags, psProvInfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** - * WintrustRemoveActionID (WINTRUST.@) - */ -BOOL WINAPI WintrustRemoveActionID( GUID* pgActionID ) -{ - FIXME("(%s)\n", debugstr_guid(pgActionID)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/*********************************************************************** * WintrustLoadFunctionPointers (WINTRUST.@) */ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, @@ -236,21 +215,3 @@ BOOL WINAPI WintrustSetRegPolicyFlags( D FIXME("stub: %lx\n", dwPolicyFlags); return TRUE; } - -/*********************************************************************** - * DllRegisterServer (WINTRUST.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - FIXME("stub\n"); - return S_OK; -} - -/*********************************************************************** - * DllUnregisterServer (WINTRUST.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - FIXME("stub\n"); - return S_OK; -}

1 0

Dan Hipschman : widl: Add the rest of the pointer types to write_type.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 04a15af5dc9e0f68b1ee0cad2dbf8b9d642b35e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04a15af5dc9e0f68b1ee0ca… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Mon Aug 28 18:30:16 2006 -0700 widl: Add the rest of the pointer types to write_type. --- tools/widl/header.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 1503d33..3a4cea9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -253,7 +253,10 @@ void write_type(FILE *h, type_t *t, cons } else fprintf(h, "union %s", t->name); break; + case RPC_FC_RP: + case RPC_FC_UP: case RPC_FC_FP: + case RPC_FC_OP: if (t->ref) write_type(h, t->ref, NULL, t->name); fprintf(h, "*"); break;

1 0

Huw Davies : rpcrt4: Add a test for IRpcStubBuffer_Connect on a delegated stub.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: d28698dd7352dae4306e7309af8b5a169290172c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d28698dd7352dae4306e730… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Aug 26 18:20:44 2006 +0100 rpcrt4: Add a test for IRpcStubBuffer_Connect on a delegated stub. This shows that we have a vtbl ptr at (void**)This-2 that is passed to the base interface's IRpcStubBuffer_Connect. This vtbl should presumably forward calls to the real object's vtbl. We can't simply pass the real object to the base interface's stub, as the real object's QI may not provide us with the base interface. --- dlls/rpcrt4/tests/cstub.c | 55 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 53261fd..733acc4 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -631,7 +631,8 @@ static void test_CreateStub(IPSFactoryBu static HRESULT WINAPI connect_test_orig_QI(IUnknown *This, REFIID iid, void **ppv) { - ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + ok(IsEqualIID(iid, &IID_if1) || + IsEqualIID(iid, &IID_if2), "incorrect iid\n"); *ppv = (void*)This; return S_OK; } @@ -652,7 +653,8 @@ static IUnknownVtbl connect_test_orig_vt static HRESULT WINAPI connect_test_new_QI(IUnknown *This, REFIID iid, void **ppv) { - ok(IsEqualIID(iid, &IID_if1), "incorrect iid\n"); + ok(IsEqualIID(iid, &IID_if1) || + IsEqualIID(iid, &IID_if2), "incorrect iid\n"); *ppv = (void*)0xcafebabe; return S_OK; } @@ -678,6 +680,27 @@ static IUnknownVtbl connect_test_new_fai NULL }; +static int connect_test_base_Connect_called; +static HRESULT WINAPI connect_test_base_Connect(IRpcStubBuffer *pstub, IUnknown *obj) +{ + connect_test_base_Connect_called++; + ok(*(void**)obj == (void*)0xbeefcafe, "unexpected obj %p\n", obj); + return S_OK; +} + +static IRpcStubBufferVtbl connect_test_base_stub_buffer_vtbl = +{ + (void*)0xcafebab0, + (void*)0xcafebab1, + (void*)0xcafebab2, + connect_test_base_Connect, + (void*)0xcafebab4, + (void*)0xcafebab5, + (void*)0xcafebab6, + (void*)0xcafebab7, + (void*)0xcafebab8, + (void*)0xcafebab9 +}; static void test_Connect(IPSFactoryBuffer *ppsf) { @@ -685,8 +708,9 @@ static void test_Connect(IPSFactoryBuffe IUnknownVtbl *new_vtbl = &connect_test_new_vtbl; IUnknownVtbl *new_fail_vtbl = &connect_test_new_fail_vtbl; IUnknown *obj = (IUnknown*)&orig_vtbl; - IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); + IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; + IRpcStubBufferVtbl *base_stub_buf_vtbl = &connect_test_base_stub_buffer_vtbl; HRESULT r; obj = (IUnknown*)&new_vtbl; @@ -701,6 +725,31 @@ static void test_Connect(IPSFactoryBuffe ok(r == E_NOINTERFACE, "r %08lx\n", r); ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(connect_test_orig_release_called == 2, "release called %d\n", connect_test_orig_release_called); + + /* Now use a delegated stub. + + We know from the NdrStubForwardFunction test that + (void**)pstub-1 is the base interface stub buffer. This shows + that (void**)pstub-2 contains the address of a vtable that gets + passed to the base interface's Connect method. Note that + (void**)pstub-2 itself gets passed to Connect and not + *((void**)pstub-2), so it should contain the vtable ptr and not + an interface ptr. */ + + obj = (IUnknown*)&orig_vtbl; + pstub = create_stub(ppsf, &IID_if2, obj, S_OK); + *((void**)pstub-1) = &base_stub_buf_vtbl; + *((void**)pstub-2) = (void*)0xbeefcafe; + + obj = (IUnknown*)&new_vtbl; + r = IRpcStubBuffer_Connect(pstub, obj); +todo_wine { + ok(connect_test_base_Connect_called == 1, "connect_test_bsae_Connect called %d times\n", + connect_test_base_Connect_called); + } + ok(connect_test_orig_release_called == 3, "release called %d\n", connect_test_orig_release_called); + cstd_stub = (CStdStubBuffer*)pstub; + ok(cstd_stub->pvServerObject == (void*)0xcafebabe, "pvServerObject %p\n", cstd_stub->pvServerObject); } static void test_Disconnect(IPSFactoryBuffer *ppsf)

1 0

Marcus Meissner : Remove some more unused debugging channels.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: b3a72ad1dd6649f7474375119ada2525a6494faf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3a72ad1dd6649f74743751… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Aug 28 08:31:06 2006 +0200 Remove some more unused debugging channels. --- programs/explorer/explorer.c | 3 --- programs/regedit/hexedit.c | 4 ---- programs/regedit/listview.c | 4 ---- programs/winedbg/display.c | 3 --- programs/winedbg/source.c | 3 --- programs/winedbg/stack.c | 3 --- 6 files changed, 0 insertions(+), 20 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 021259f..0f7c257 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -22,11 +22,8 @@ #include <windows.h> #include <ctype.h> -#include <wine/debug.h> #include "explorer_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(explorer); - typedef struct parametersTAG { BOOL explorer_mode; WCHAR root[MAX_PATH]; diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index cfef5b2..3fb927b 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -36,10 +36,6 @@ #include "commctrl.h" #include "main.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(regedit); - /* spaces dividing hex and ASCII */ #define DIV_SPACES 4 diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a57a3c6..bddc2b6 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -26,11 +26,7 @@ #include <stdio.h> #include "main.h" -#include "wine/debug.h" #include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(regedit); - static INT Image_String; static INT Image_Binary; diff --git a/programs/winedbg/display.c b/programs/winedbg/display.c index f2bfa61..a1fa89e 100644 --- a/programs/winedbg/display.c +++ b/programs/winedbg/display.c @@ -23,9 +23,6 @@ #include <stdlib.h> #include <string.h> #include "debugger.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); /* needs to be power of 2, search for MARK to see why :) */ #define DISPTAB_DELTA 8 diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index 500dd94..8c6e955 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -27,9 +27,6 @@ #define PATH_MAX MAX_PATH #endif #include "debugger.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); struct search_list { diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index dd0877e..14d4df5 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -28,11 +28,8 @@ #include <stdio.h> #include "debugger.h" #include "winbase.h" #include "wine/winbase16.h" -#include "wine/debug.h" #include "tlhelp32.h" -WINE_DEFAULT_DEBUG_CHANNEL(winedbg); - /*********************************************************************** * stack_info *

1 0

Huw Davies : rpcrt4: Add a helper function to create a stub.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 161f60071e652f9083a63b01297a3552f58994e7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=161f60071e652f9083a63b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 28 19:05:36 2006 +0100 rpcrt4: Add a helper function to create a stub. --- dlls/rpcrt4/cpsf.h | 2 ++ dlls/rpcrt4/ndr_ole.c | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index df8aced..9c3d917 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -44,4 +44,6 @@ const MIDL_SERVER_INFO *CStdStubBuffer_G const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; +HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub); + #endif /* __WINE_CPSF_H */ diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 0f64edd..2e4c67b 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -39,7 +39,9 @@ #include "objbase.h" #include "ndr_misc.h" #include "rpcndr.h" +#include "rpcproxy.h" #include "wine/rpcfc.h" +#include "cpsf.h" #include "wine/debug.h" @@ -364,3 +366,27 @@ void WINAPI NdrOleFree(void *NodeToFree) if (!LoadCOM()) return; COM_MemFree(NodeToFree); } + +/*********************************************************************** + * Helper function to create a stub. + * This probably looks very much like NdrpCreateStub. + */ +HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub) +{ + CLSID clsid; + IPSFactoryBuffer *psfac; + HRESULT r; + + if(!LoadCOM()) return E_FAIL; + + r = COM_GetPSClsid( iid, &clsid ); + if(FAILED(r)) return r; + + r = COM_GetClassObject( &clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (void**)&psfac ); + if(FAILED(r)) return r; + + r = IPSFactoryBuffer_CreateStub(psfac, iid, pUnk, ppstub); + + IPSFactoryBuffer_Release(psfac); + return r; +}

1 0

Stefan Dösinger : wined3d: Apply the half pixel correction for shaders too.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: bc449ca31fbd4a97ef1a06cabbfb2787e2ea6ca1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc449ca31fbd4a97ef1a06c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 28 23:46:00 2006 +0200 wined3d: Apply the half pixel correction for shaders too. --- dlls/wined3d/vertexshader.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 2f3de86..9719264 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -735,8 +735,18 @@ #endif } /* Write the final position. - * Account for any inverted textures (render to texture case) by reversing the y coordinate - * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. For that reason a translation is done with the projection matrix, + * which sets the offsets to move in the w coords of the matrix(see glTranslate manpage) + * Add the w coordinates to x and y, this avoids the need for a full matrix + * multiplication. The matrix is set up in drawprim.c, primitiveInitState. + */ + shader_addline(&buffer, "gl_Position.x = gl_Position.x + gl_ProjectionMatrix[3][0];\n"); + shader_addline(&buffer, "gl_Position.y = gl_Position.y + gl_ProjectionMatrix[3][1];\n"); + /* Account for any inverted textures (render to texture case) by reversing the y coordinate + * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) + */ shader_addline(&buffer, "gl_Position.y = gl_Position.y * gl_ProjectionMatrix[1][1];\n"); shader_addline(&buffer, "}\n\0"); @@ -763,7 +773,8 @@ #endif shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION); /* We need the projection matrix to correctly render upside-down objects (render to texture) */ - shader_addline(&buffer, "PARAM PROJECTION = state.matrix.projection.row[1];\n"); + shader_addline(&buffer, "PARAM PROJECTIONX = state.matrix.projection.row[0];\n"); + shader_addline(&buffer, "PARAM PROJECTIONY = state.matrix.projection.row[1];\n"); if (reg_maps->fog) { This->usesFog = 1; @@ -777,11 +788,21 @@ #endif if (reg_maps->fog) shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); - /* Write the final position. - * Account for any inverted textures (render to texture case) by reversing the y coordinate - * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) */ shader_addline(&buffer, "MOV result.position, TMP_OUT;\n"); - shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, PROJECTION.y;\n"); + /* Write the final position. + * + * OpenGL coordinates specify the center of the pixel while d3d coords specify + * the corner. For that reason a translation is done with the projection matrix, + * which sets the offsets to move in the w coords of the matrix(see glTranslate manpage) + * Add the w coordinates to x and y, this avoids the need for a full matrix + * multiplication. The matrix is set up in drawprim.c, primitiveInitState. + */ + shader_addline(&buffer, "ADD result.position.x, TMP_OUT.x, PROJECTIONX.w;\n"); + shader_addline(&buffer, "ADD result.position.y, TMP_OUT.y, PROJECTIONY.w;\n"); + /* Account for any inverted textures (render to texture case) by reversing the y coordinate + * (this is handled in drawPrim() when it sets the MODELVIEW and PROJECTION matrices) + */ + shader_addline(&buffer, "MUL result.position.y, TMP_OUT.y, PROJECTIONY.y;\n"); shader_addline(&buffer, "END\n\0");

1 0

James Hawkins : msi: Use msi_dialog_dup_property where appropriate.
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 20d98e81eda835a91524f2585f3253a806b968a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=20d98e81eda835a91524f25… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 28 17:55:30 2006 -0700 msi: Use msi_dialog_dup_property where appropriate. --- dlls/msi/dialog.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index db1e9f5..f509655 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1396,18 +1396,14 @@ static LPWSTR msi_get_window_text( HWND static UINT msi_dialog_pathedit_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) { - LPCWSTR prop; - LPWSTR buf, indirect = NULL; + LPWSTR buf, prop; + BOOL indirect; if( HIWORD(param) != EN_KILLFOCUS ) return ERROR_SUCCESS; - prop = control->property; - if ( control->attributes & msidbControlAttributesIndirect ) - { - indirect = msi_dup_property( dialog->package, control->property ); - prop = indirect; - } + indirect = control->attributes & msidbControlAttributesIndirect; + prop = msi_dialog_dup_property( dialog, control->property, indirect ); /* FIXME: verify the new path */ buf = msi_get_window_text( control->hwnd ); @@ -1417,7 +1413,7 @@ static UINT msi_dialog_pathedit_handler( debugstr_w(prop)); msi_free( buf ); - msi_free( indirect ); + msi_free( prop ); return ERROR_SUCCESS; } @@ -1449,10 +1445,8 @@ static UINT msi_dialog_pathedit_control( WS_BORDER | WS_TABSTOP ); control->handler = msi_dialog_pathedit_handler; control->attributes = MSI_RecordGetInteger( rec, 8 ); - prop = MSI_RecordGetString( rec, 9 ); - if ( prop ) - control->property = strdupW( prop ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); msi_dialog_update_pathedit( dialog );

1 0

James Hawkins : msi: Use the respective update functions when creating the Browse dialog control .
by Alexandre Julliard Aug. 29, 2006

Aug. 29, 2006

Module: wine Branch: master Commit: 2a09d4f6c722e400a0fc7473d8c7ff1c792e3b07 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a09d4f6c722e400a0fc747… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 28 17:55:10 2006 -0700 msi: Use the respective update functions when creating the Browse dialog control. --- dlls/msi/dialog.c | 31 +++---------------------------- 1 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 0e19cf0..db1e9f5 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1434,6 +1434,7 @@ static void msi_dialog_update_pathedit( path = msi_dup_property( dialog->package, prop ); SetWindowTextW( control->hwnd, path ); + SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); msi_free( path ); msi_free( prop ); @@ -1443,7 +1444,6 @@ static UINT msi_dialog_pathedit_control( { msi_control *control; LPCWSTR prop; - LPWSTR val, indirect = NULL; control = msi_dialog_add_control( dialog, rec, szEdit, WS_BORDER | WS_TABSTOP ); @@ -1454,19 +1454,7 @@ static UINT msi_dialog_pathedit_control( if ( prop ) control->property = strdupW( prop ); - if ( control->attributes & msidbControlAttributesIndirect ) - { - indirect = msi_dup_property( dialog->package, control->property ); - prop = indirect; - } - - val = msi_dup_property( dialog->package, prop ); - SetWindowTextW( control->hwnd, val ); - - SendMessageW( control->hwnd, EM_SETSEL, 0, -1 ); - - msi_free( val ); - msi_free( indirect ); + msi_dialog_update_pathedit( dialog ); return ERROR_SUCCESS; } @@ -2003,8 +1991,6 @@ static void msi_dialog_update_directory_ static UINT msi_dialog_directory_combo( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - LPWSTR path, propval; - BOOL indirect; LPCWSTR prop; DWORD style; @@ -2019,19 +2005,8 @@ static UINT msi_dialog_directory_combo( prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); - indirect = control->attributes & msidbControlAttributesIndirect; - propval = msi_dialog_dup_property( dialog, prop, indirect ); - path = msi_dup_property( dialog->package, propval ); - - PathStripPathW( path ); - PathRemoveBackslashW( path ); - - /* FIXME: Add whole directory structure to combo box */ - SendMessageW( control->hwnd, CB_ADDSTRING, 0, (LPARAM)path ); - SendMessageW( control->hwnd, CB_SETCURSEL, 0, 0 ); + msi_dialog_update_directory_combo( dialog ); - msi_free( path ); - msi_free( propval ); return ERROR_SUCCESS; }

1 0