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

Robert Shearman : oleaut32: We always pass in an IRpcChannelBuffer to IRpcStubBuffer::Invoke now,
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 70c34ccc47affe8df7d197c4342fc47658ee2881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70c34ccc47affe8df7d197c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 9 17:25:50 2006 +0100 oleaut32: We always pass in an IRpcChannelBuffer to IRpcStubBuffer::Invoke now, so remove the case for it being NULL. --- dlls/oleaut32/tmarshal.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 5523d28..12aef0d 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1820,23 +1820,9 @@ TMStubImpl_Invoke( HeapFree(GetProcessHeap(), 0, args); xmsg->cbBuffer = buf.curoff; - if (rpcchanbuf) - { - hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid); - if (hres != S_OK) - ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08lx\n", hres); - } - else - { - /* FIXME: remove this case when we start sending an IRpcChannelBuffer - * object with builtin OLE */ - RPC_STATUS status = I_RpcGetBuffer((RPC_MESSAGE *)xmsg); - if (status != RPC_S_OK) - { - ERR("I_RpcGetBuffer failed with error %ld\n", status); - hres = E_FAIL; - } - } + hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid); + if (hres != S_OK) + ERR("IRpcChannelBuffer_GetBuffer failed with error 0x%08lx\n", hres); if (hres == S_OK) memcpy(xmsg->Buffer, buf.base, buf.curoff);

1 0

Robert Shearman : ole32: If IRpcStubBuffer_Invoke fails, we should raise an exception to
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: c60c28cf0831d68ff257a7d93c540a1feb658383 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c60c28cf0831d68ff257a7d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 9 17:25:26 2006 +0100 ole32: If IRpcStubBuffer_Invoke fails, we should raise an exception to tell the RPC runtime that the call failed. --- dlls/ole32/rpc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 3617e50..e30989d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -569,9 +569,14 @@ static void __RPC_STUB dispatch_rpc(RPC_ } } + hr = params->hr; HeapFree(GetProcessHeap(), 0, params); apartment_release(apt); + + /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell + * the RPC runtime that the call failed */ + if (hr) RpcRaiseException(hr); } /* stub registration */

1 0

Robert Shearman : ole32: Register ISequentialStream for marshaling.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 3d4e9d6a71591b2088903565a1626999ed4b46bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d4e9d6a71591b208890356… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 9 17:24:57 2006 +0100 ole32: Register ISequentialStream for marshaling. --- dlls/ole32/regsvr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 03f0a06..7a35425 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -501,6 +501,7 @@ static const struct regsvr_interface int STD_INTERFACE_ENTRY(IRemUnknown), LCL_INTERFACE_ENTRY(IClientSecurity), LCL_INTERFACE_ENTRY(IServerSecurity), + STD_INTERFACE_ENTRY(ISequentialStream), { NULL } /* list terminator */ };

1 0

Robert Shearman : ole32: Implement CoQueryClientBlanket, CoImpersonateClient and
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 51e22f42bb95f8827b24e9860b8e5e57554ccaec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=51e22f42bb95f8827b24e98… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 9 17:24:39 2006 +0100 ole32: Implement CoQueryClientBlanket, CoImpersonateClient and CoRevertToSelf on top of CoGetCallContext, which is a stub. --- dlls/ole32/compobj.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +-- 2 files changed, 147 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d241bfb..796c4ab 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2641,6 +2641,149 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr } +/*********************************************************************** + * CoGetCallContext [OLE32.@] + * + * Gets the context of the currently executing server call in the current + * thread. + * + * PARAMS + * riid [I] Context interface to return. + * ppv [O] Pointer to memory that will receive the context on return. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + */ +HRESULT WINAPI CoGetCallContext(REFIID riid, void **ppv) +{ + FIXME("(%s, %p): stub\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + return E_NOINTERFACE; +} + +/*********************************************************************** + * CoQueryClientBlanket [OLE32.@] + * + * Retrieves the authentication information about the client of the currently + * executing server call in the current thread. + * + * PARAMS + * pAuthnSvc [O] Optional. The type of authentication service. + * pAuthzSvc [O] Optional. The type of authorization service. + * pServerPrincName [O] Optional. The server prinicple name. + * pAuthnLevel [O] Optional. The authentication level. + * pImpLevel [O] Optional. The impersonation level. + * pPrivs [O] Optional. Information about the privileges of the client. + * pCapabilities [IO] Optional. Flags affecting the security behaviour. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * SEE ALSO + * CoImpersonateClient, CoRevertToSelf, CoGetCallContext. + */ +HRESULT WINAPI CoQueryClientBlanket( + DWORD *pAuthnSvc, + DWORD *pAuthzSvc, + OLECHAR **pServerPrincName, + DWORD *pAuthnLevel, + DWORD *pImpLevel, + RPC_AUTHZ_HANDLE *pPrivs, + DWORD *pCapabilities) +{ + IServerSecurity *pSrvSec; + HRESULT hr; + + TRACE("(%p, %p, %p, %p, %p, %p, %p)\n", + pAuthnSvc, pAuthzSvc, pServerPrincName, pAuthnLevel, pImpLevel, + pPrivs, pCapabilities); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_QueryBlanket( + pSrvSec, pAuthnSvc, pAuthzSvc, pServerPrincName, pAuthnLevel, + pImpLevel, pPrivs, pCapabilities); + IServerSecurity_Release(pSrvSec); + } + + return hr; +} + +/*********************************************************************** + * CoImpersonateClient [OLE32.@] + * + * Impersonates the client of the currently executing server call in the + * current thread. + * + * PARAMS + * None. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * If this function fails then the current thread will not be impersonating + * the client and all actions will take place on behalf of the server. + * Therefore, it is important to check the return value from this function. + * + * SEE ALSO + * CoRevertToSelf, CoQueryClientBlanket, CoGetCallContext. + */ +HRESULT WINAPI CoImpersonateClient(void) +{ + IServerSecurity *pSrvSec; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_ImpersonateClient(pSrvSec); + IServerSecurity_Release(pSrvSec); + } + + return hr; +} + +/*********************************************************************** + * CoRevertToSelf [OLE32.@] + * + * Ends the impersonation of the client of the currently executing server + * call in the current thread. + * + * PARAMS + * None. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * SEE ALSO + * CoImpersonateClient, CoQueryClientBlanket, CoGetCallContext. + */ +HRESULT WINAPI CoRevertToSelf(void) +{ + IServerSecurity *pSrvSec; + HRESULT hr; + + TRACE("\n"); + + hr = CoGetCallContext(&IID_IServerSecurity, (void **)&pSrvSec); + if (SUCCEEDED(hr)) + { + hr = IServerSecurity_RevertToSelf(pSrvSec); + IServerSecurity_Release(pSrvSec); + } + + return hr; +} + static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { /* first try to retrieve messages for incoming COM calls to the apartment window */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 26f7c6f..74f2bfc 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -20,7 +20,7 @@ @ stdcall CoFreeAllLibraries() @ stdcall CoFreeLibrary(long) @ stdcall CoFreeUnusedLibraries() -@ stub CoGetCallContext #@ stdcall (ptr ptr) return 0,ERR_NOTIMPLEMENTED +@ stdcall CoGetCallContext(ptr ptr) @ stub CoGetCallerTID @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stub CoGetCurrentLogicalThreadId @@ -36,7 +36,7 @@ @ stdcall CoGetState(ptr) @ stub CoGetTIDFromIPID @ stdcall CoGetTreatAsClass(ptr ptr) -@ stub CoImpersonateClient +@ stdcall CoImpersonateClient() @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) @ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @@ -49,7 +49,7 @@ @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr) @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long) @ stub CoQueryAuthenticationServices -@ stub CoQueryClientBlanket +@ stdcall CoQueryClientBlanket(ptr ptr ptr ptr ptr ptr ptr) @ stdcall CoQueryProxyBlanket(ptr ptr ptr ptr ptr ptr ptr ptr) @ stub CoQueryReleaseObject @ stub CoRegisterChannelHook @@ -61,7 +61,7 @@ @ stdcall CoReleaseMarshalData(ptr) @ stdcall CoReleaseServerProcess() @ stdcall CoResumeClassObjects() -@ stub CoRevertToSelf #@ stdcall () return 0,ERR_NOTIMPLEMENTED +@ stdcall CoRevertToSelf() @ stdcall CoRevokeClassObject(long) @ stdcall CoRevokeMallocSpy() @ stdcall CoSetProxyBlanket(ptr long long wstr long long ptr long)

1 0

Robert Shearman : ole32: Implement FTMarshalImpl_GetMarshalSizeMax.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 42c39675eab96bab80581d00ebc76ec2ae35a107 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42c39675eab96bab80581d0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri Jun 9 17:24:32 2006 +0100 ole32: Implement FTMarshalImpl_GetMarshalSizeMax. --- dlls/ole32/ftmarshal.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index b9fd7da..7493bab 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -155,15 +155,14 @@ FTMarshalImpl_GetMarshalSizeMax (LPMARSH IMarshal *pMarshal = NULL; HRESULT hres; - FTMarshalImpl *This = impl_from_IMarshal(iface); - - FIXME ("(), stub!\n"); + TRACE("(%s, %p, 0x%lx, %p, 0x%lx, %p)\n", debugstr_guid(riid), pv, + dwDestContext, pvDestContext, mshlflags, pSize); /* if the marshalling happens inside the same process the interface pointer is copied between the apartments */ if (dwDestContext == MSHCTX_INPROC || dwDestContext == MSHCTX_CROSSCTX) { - *pSize = sizeof (This); - return S_OK; + *pSize = sizeof (mshlflags) + sizeof (pv) + sizeof (DWORD) + sizeof (GUID); + return S_OK; } /* use the standard marshaller to handle all other cases */

1 0

Alexandre Julliard : riched32: Use the standard DEFINE_GUID macro to define GUIDs.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 49b3837504258b7e2da295f30858a599a489c016 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49b3837504258b7e2da295f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 21:10:01 2006 +0200 riched32: Use the standard DEFINE_GUID macro to define GUIDs. --- dlls/riched20/richole.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 53ba711..497c0fc 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -36,23 +36,24 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); -typedef struct IRichEditOleImpl { - const IRichEditOleVtbl *lpVtbl; - LONG ref; - - ME_TextEditor *editor; -} IRichEditOleImpl; - /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ /* FIXME: the next 6 lines should be in textserv.h */ +#include "initguid.h" #define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \ - GUID name = { l, w1, w2, {b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5}} + DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5) TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d); TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); +typedef struct IRichEditOleImpl { + const IRichEditOleVtbl *lpVtbl; + LONG ref; + + ME_TextEditor *editor; +} IRichEditOleImpl; + static HRESULT WINAPI IRichEditOle_fnQueryInterface(IRichEditOle *me, REFIID riid, LPVOID *ppvObj) {

1 0

Alexandre Julliard : shell32: Use the standard DEFINE_GUID macro to define GUIDs.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: b4629addbd8e5fd6792db3aa54b5520309a101f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4629addbd8e5fd6792db3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 21:10:25 2006 +0200 shell32: Use the standard DEFINE_GUID macro to define GUIDs. --- dlls/shell32/regsvr.c | 3 ++- dlls/shell32/shfldr.h | 3 +++ dlls/shell32/shfldr_unixfs.c | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 5cf0dc7..1d37d4e 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -31,8 +31,9 @@ #include "winerror.h" #include "ole2.h" #include "shlguid.h" #include "shell32_main.h" -#include "shfldr.h" #include "shresdef.h" +#include "initguid.h" +#include "shfldr.h" #include "wine/debug.h" diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 8fd557a..74f59d8 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -71,3 +71,6 @@ static inline int SHELL32_GUIDToStringW void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); + +DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd ); +DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 ); diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 4d72f97..b74b458 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -163,9 +163,6 @@ #include "pidl.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); -const GUID CLSID_UnixFolder = {0xcc702eb2, 0x7dc5, 0x11d9, {0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd}}; -const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; - #define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) #define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl)

1 0

Alexandre Julliard : ole32: Use the standard DEFINE_OLEGUID macro to define GUIDs.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 32f57b02147383506c2c59e0ce6bd0859b2c7fc9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32f57b02147383506c2c59e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 21:09:49 2006 +0200 ole32: Use the standard DEFINE_OLEGUID macro to define GUIDs. --- dlls/ole32/antimoniker.c | 4 ---- dlls/ole32/classmoniker.c | 4 ---- dlls/ole32/compobj_private.h | 5 +++-- dlls/ole32/compositemoniker.c | 4 ---- dlls/ole32/filemoniker.c | 4 ---- dlls/ole32/ftmarshal.c | 2 -- dlls/ole32/itemmoniker.c | 4 ---- dlls/ole32/moniker.h | 32 +++++++++++++++++++++++++++----- dlls/ole32/oleproxy.c | 3 --- dlls/ole32/regsvr.c | 3 ++- dlls/ole32/stubmanager.c | 2 -- 11 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 25007c3..53a39f5 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -35,10 +35,6 @@ #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_AntiMoniker = { - 0x305, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - /* AntiMoniker data structure */ typedef struct AntiMonikerImpl{ diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index fdcb94b..e543a96 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -39,10 +39,6 @@ #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const GUID CLSID_ClassMoniker = { - 0x31A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - #define CHARS_IN_GUID 39 /* ClassMoniker data structure */ diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f9fac80..97519cf 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -41,8 +41,9 @@ #include "winternl.h" struct apartment; typedef struct apartment APARTMENT; -extern const CLSID CLSID_PSFactoryBuffer; -extern const CLSID CLSID_DfMarshal; +DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); +DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); +DEFINE_OLEGUID( CLSID_InProcFreeMarshaler, 0x0000033a, 0, 0 ); /* Thread-safety Annotation Legend: * diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 860e8d0..4a65277 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -37,10 +37,6 @@ #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_CompositeMoniker = { - 0x309, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - #define BLOCK_TAB_SIZE 5 /* represent the first size table and it's increment block size */ /* CompositeMoniker data structure */ diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index e251833..e9fb050 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -39,10 +39,6 @@ #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_FileMoniker = { - 0x303, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - /* filemoniker data structure */ typedef struct FileMonikerImpl{ diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index 9f41f65..b9fd7da 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -38,8 +38,6 @@ #include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_InProcFreeMarshaler = { 0x33A, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} }; - typedef struct _FTMarshalImpl { const IUnknownVtbl *lpVtbl; LONG ref; diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index b11c5f2..3a0b94d 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -38,10 +38,6 @@ #include "moniker.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_ItemMoniker = { - 0x304, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - /* ItemMoniker data structure */ typedef struct ItemMonikerImpl{ diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index e051541..fa009cf 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -1,11 +1,33 @@ +/* + * Monikers + * + * Copyright 1998 Marcus Meissner + * Copyright 1999 Noomen Hamza + * Copyright 2005 Robert Shearman (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 + */ + #ifndef __WINE_MONIKER_H__ #define __WINE_MONIKER_H__ -extern const CLSID CLSID_FileMoniker; -extern const CLSID CLSID_ItemMoniker; -extern const CLSID CLSID_AntiMoniker; -extern const CLSID CLSID_CompositeMoniker; -extern const CLSID CLSID_ClassMoniker; +DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 ); +DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 ); +DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); +DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); +DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv); diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 169dc4f..4e2ebb9 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -63,9 +63,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -const CLSID CLSID_DfMarshal = { 0x0000030b, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; -const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; - static ULONG WINAPI RURpcProxyBufferImpl_Release(LPRPCPROXYBUFFER iface); /* From: http://msdn.microsoft.com/library/en-us/com/cmi_m_4lda.asp diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index ff6aa85..03f0a06 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -30,9 +30,10 @@ #include "winreg.h" #include "winerror.h" #include "objbase.h" -#include "compobj_private.h" #include "ole2.h" #include "olectl.h" +#include "initguid.h" +#include "compobj_private.h" #include "moniker.h" #include "wine/debug.h" diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index f12ccdc..e5f8741 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -560,8 +560,6 @@ BOOL stub_manager_is_table_marshaled(str * interacts with stub managers. */ -const IID IID_IRemUnknown = { 0x00000131, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46} }; - typedef struct rem_unknown { const IRemUnknownVtbl *lpVtbl;

1 0

Alexandre Julliard : oleaut32: Use the standard DEFINE_OLEGUID macro to define GUIDs.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 707060913c4bc57582dbd6286e846ad059a5c1ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=707060913c4bc57582dbd62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 21:09:35 2006 +0200 oleaut32: Use the standard DEFINE_OLEGUID macro to define GUIDs. --- dlls/oleaut32/oleaut.c | 9 --------- dlls/oleaut32/regsvr.c | 18 ++---------------- dlls/oleaut32/typelib.c | 3 --- dlls/oleaut32/typelib.h | 8 ++++++++ dlls/oleaut32/usrmarshal.c | 7 +------ 5 files changed, 11 insertions(+), 34 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index da18610..95b5fe8 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -38,15 +38,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); -/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ -extern const GUID CLSID_PSOAInterface; - -extern const GUID CLSID_PSDispatch; -extern const GUID CLSID_PSEnumVariant; -extern const GUID CLSID_PSTypeInfo; -extern const GUID CLSID_PSTypeLib; -extern const GUID CLSID_PSTypeComp; - static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ HMODULE OLEAUT32_hModule = NULL; diff --git a/dlls/oleaut32/regsvr.c b/dlls/oleaut32/regsvr.c index 2437967..1fd61d7 100644 --- a/dlls/oleaut32/regsvr.c +++ b/dlls/oleaut32/regsvr.c @@ -30,6 +30,8 @@ #include "winerror.h" #include "ole2.h" #include "olectl.h" #include "oleauto.h" +#include "initguid.h" +#include "typelib.h" #include "wine/debug.h" @@ -443,22 +445,6 @@ static LONG recursive_delete_keyW(HKEY b static GUID const CLSID_RecordInfo = { 0x0000002F, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; -extern GUID const CLSID_PSDispatch; - -GUID const CLSID_PSEnumVariant = { - 0x00020421, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -GUID const CLSID_PSTypeInfo = { - 0x00020422, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -GUID const CLSID_PSTypeLib = { - 0x00020423, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -GUID const CLSID_PSTypeComp = { - 0x00020425, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; - -extern GUID const CLSID_PSOAInterface; - static GUID const CLSID_OldFont = { 0x46763EE0, 0xCAB2, 0x11CE, {0x8C,0x20,0x00,0xAA,0x00,0x51,0xE5,0xD4} }; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 21c69a9..619a286 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -82,9 +82,6 @@ #include "variant.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(typelib); -/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ -const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } }; - static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 534856e..2ab2ebc 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -607,5 +607,13 @@ extern void dump_Variant(const VARIANT * HRESULT TMARSHAL_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); +/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ +DEFINE_OLEGUID( CLSID_PSDispatch, 0x00020420, 0x0000, 0x0000 ); +DEFINE_OLEGUID( CLSID_PSEnumVariant, 0x00020421, 0x0000, 0x0000 ); +DEFINE_OLEGUID( CLSID_PSTypeInfo, 0x00020422, 0x0000, 0x0000 ); +DEFINE_OLEGUID( CLSID_PSTypeLib, 0x00020423, 0x0000, 0x0000 ); +DEFINE_OLEGUID( CLSID_PSOAInterface, 0x00020424, 0x0000, 0x0000 ); +DEFINE_OLEGUID( CLSID_PSTypeComp, 0x00020425, 0x0000, 0x0000 ); + /*---------------------------END--------------------------------------------*/ #endif diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index a2c81e5..90782c7 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -35,6 +35,7 @@ #include "winerror.h" #include "ole2.h" #include "oleauto.h" #include "rpcproxy.h" +#include "typelib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -44,12 +45,6 @@ #define ALIGNED_POINTER(_Ptr, _Align) (( #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) -/* FIXME: not supposed to be here */ - -const CLSID CLSID_PSDispatch = { - 0x20420, 0, 0, {0xC0, 0, 0, 0, 0, 0, 0, 0x46} -}; - static CStdPSFactoryBuffer PSFactoryBuffer; CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)

1 0

Jason Green : wined3d: GLSL shader cleanup patch.
by Alexandre Julliard June 9, 2006

June 9, 2006

Module: wine Branch: refs/heads/master Commit: 08295f4cfc3299f59be5959cb623a5399f5b07f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08295f4cfc3299f59be5959… Author: Jason Green <jave27(a)gmail.com> Date: Fri Jun 9 12:28:51 2006 -0400 wined3d: GLSL shader cleanup patch. - Based on comments from H. Verbeet - Changed the distinction from .rgba & .xyzw masks to only use .xyzw in GLSL shaders. They are interchangeable, and only served to make the trace look more intuitive, but they don't always apply as-is, so we'll just leave everything to .xyzw. - Got rid of the "UseProgramObjectARB(0)" call in drawprim. If there is no shader set on the next primitive, then that primitive will call UseProgramObjectARB(0) when it begins to draw. --- dlls/wined3d/drawprim.c | 23 +++++++---------------- dlls/wined3d/glsl_shader.c | 27 ++++++++------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f12e046..b3c719b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1922,17 +1922,14 @@ #endif /* Bind the correct GLSL shader program based on the currently set vertex & pixel shaders. */ if (wined3d_settings.shader_mode == SHADER_GLSL) { - GLhandleARB programId; - set_glsl_shader_program(iface); - programId = This->stateBlock->shaderPrgId; - - if (programId != 0) { - /* Start using this program ID */ - TRACE_(d3d_shader)("Using GLSL program %u\n", programId); - GL_EXTCALL(glUseProgramObjectARB(programId)); - checkGLcall("glUseProgramObjectARB"); - } + /* Start using this program ID (if it's 0, there is no shader program to use, so + * glUseProgramObjectARB(0) will disable the use of any shaders) */ + if (This->stateBlock->shaderPrgId) { + TRACE_(d3d_shader)("Using GLSL program %u\n", This->stateBlock->shaderPrgId); + } + GL_EXTCALL(glUseProgramObjectARB(This->stateBlock->shaderPrgId)); + checkGLcall("glUseProgramObjectARB"); } if (useVertexShaderFunction) { @@ -2017,12 +2014,6 @@ #endif if (usePixelShaderFunction && wined3d_settings.shader_mode == SHADER_ARB) { glDisable(GL_FRAGMENT_PROGRAM_ARB); } - - /* Cleanup GLSL program */ - if (wined3d_settings.shader_mode == SHADER_GLSL - && (useVertexShaderFunction || usePixelShaderFunction)) { - GL_EXTCALL(glUseProgramObjectARB(0)); - } } } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c2468e..f8385e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -271,34 +271,26 @@ void shader_glsl_get_register_name( /* Writes the GLSL writemask for the destination register */ void shader_glsl_get_output_register_swizzle( - IWineD3DBaseShader *shader, const DWORD param, char *write_mask) { - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl*) shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.hex_version); - *write_mask = 0; if ((param & D3DSP_WRITEMASK_ALL) != D3DSP_WRITEMASK_ALL) { strcat(write_mask, "."); - if (param & D3DSP_WRITEMASK_0) strcat(write_mask, pshader ? "r" : "x"); - if (param & D3DSP_WRITEMASK_1) strcat(write_mask, pshader ? "g" : "y"); - if (param & D3DSP_WRITEMASK_2) strcat(write_mask, pshader ? "b" : "z"); - if (param & D3DSP_WRITEMASK_3) strcat(write_mask, pshader ? "a" : "w"); + if (param & D3DSP_WRITEMASK_0) strcat(write_mask, "x"); + if (param & D3DSP_WRITEMASK_1) strcat(write_mask, "y"); + if (param & D3DSP_WRITEMASK_2) strcat(write_mask, "z"); + if (param & D3DSP_WRITEMASK_3) strcat(write_mask, "w"); } } void shader_glsl_get_input_register_swizzle( - IWineD3DBaseShader *shader, const DWORD param, BOOL is_color, char *reg_mask) { - IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl*) shader; - BOOL pshader = shader_is_pshader_version(This->baseShader.hex_version); - - char swizzle_reg_chars_color_fix[5]; - char swizzle_reg_chars[5]; + const char swizzle_reg_chars_color_fix[] = "zyxw"; + const char swizzle_reg_chars[] = "xyzw"; const char* swizzle_regs = NULL; /** operand input */ @@ -308,9 +300,6 @@ void shader_glsl_get_input_register_swiz DWORD swizzle_z = (swizzle >> 4) & 0x03; DWORD swizzle_w = (swizzle >> 6) & 0x03; - strcpy(swizzle_reg_chars_color_fix, pshader ? "bgra" : "zyxw"); - strcpy(swizzle_reg_chars, pshader ? "rgba" : "xyzw"); - if (is_color) { swizzle_regs = swizzle_reg_chars_color_fix; } else { @@ -363,10 +352,10 @@ void shader_glsl_add_param( shader_glsl_get_register_name(param, addr_token, reg_name, &is_color, arg); if (is_input) { - shader_glsl_get_input_register_swizzle(arg->shader, param, is_color, reg_mask); + shader_glsl_get_input_register_swizzle(param, is_color, reg_mask); shader_glsl_gen_modifier(param, reg_name, reg_mask, out_str); } else { - shader_glsl_get_output_register_swizzle(arg->shader, param, reg_mask); + shader_glsl_get_output_register_swizzle(param, reg_mask); sprintf(out_str, "%s%s", reg_name, reg_mask); } }

1 0