March 2006 - Wine-commits - list.winehq.org

Robert Shearman : oleaut: Fix VarFormat for VT_NULL variants.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 93acfeb7f0d4c332c62765888f323524c0eb87db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93acfeb7f0d4c332c627658… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:56 2006 +0000 oleaut: Fix VarFormat for VT_NULL variants. --- dlls/oleaut32/tests/vartest.c | 2 -- dlls/oleaut32/varformat.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2da6371..2d60b86 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1785,10 +1785,8 @@ static void test_VarFormat(void) /* VT_NULL */ V_VT(&in) = VT_NULL; hres = pVarFormat(&in,NULL,fd,fw,0,&out); - todo_wine { ok(hres == S_OK, "VarFormat failed with 0x%08lx\n", hres); ok(out == NULL, "expected NULL formatted string\n"); - } /* Invalid args */ hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 29bf3a7..f0d3b09 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -2007,6 +2007,9 @@ HRESULT WINAPI VarFormatFromTokens(LPVAR if (!pVarIn || !rgbTok) return E_INVALIDARG; + if (V_VT(pVarIn) == VT_NULL) + return S_OK; + if (*rgbTok == FMT_TO_STRING || header->type == FMT_TYPE_GENERAL) { /* According to MSDN, general format acts somewhat like the 'Str'

1 0

Robert Shearman : ole: Implement IRpcChannelBuffer:: GetDestCtx on the client side.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 7406cc210bd27015629d781bacb63c91bacd5872 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7406cc210bd27015629d781… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:34 2006 +0000 ole: Implement IRpcChannelBuffer::GetDestCtx on the client side. --- dlls/ole32/compobj_private.h | 4 +++- dlls/ole32/marshal.c | 5 ++++- dlls/ole32/rpc.c | 26 ++++++++++++++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8aeb0e0..66a7c1c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -201,7 +201,9 @@ HRESULT marshal_object(APARTMENT *apt, S struct dispatch_params; void RPC_StartRemoting(struct apartment *apt); -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **pipebuf); +HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan); HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan); void RPC_ExecuteCall(struct dispatch_params *params); HRESULT RPC_RegisterInterface(REFIID riid); diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 95ff257..684d93d 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1094,7 +1094,10 @@ static HRESULT unmarshal_object(const ST if (hr == E_NOINTERFACE) { IRpcChannelBuffer *chanbuf; - hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, &chanbuf); + hr = RPC_CreateClientChannel(&stdobjref->oxid, &stdobjref->ipid, + proxy_manager->dest_context, + proxy_manager->dest_context_data, + &chanbuf); if (hr == S_OK) hr = proxy_manager_create_ifproxy(proxy_manager, stdobjref, riid, chanbuf, &ifproxy); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 806c323..3c5f3ea 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -100,6 +100,8 @@ typedef struct RPC_BINDING_HANDLE bind; /* handle to the remote server */ OXID oxid; /* apartment in which the channel is valid */ + DWORD dest_context; /* returned from GetDestCtx */ + LPVOID dest_context_data; /* returned from GetDestCtx */ } ClientRpcChannelBuffer; struct dispatch_params @@ -379,7 +381,19 @@ static HRESULT WINAPI ClientRpcChannelBu return HRESULT_FROM_WIN32(status); } -static HRESULT WINAPI RpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +{ + ClientRpcChannelBuffer *This = (ClientRpcChannelBuffer *)iface; + + TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); + + *pdwDestContext = This->dest_context; + *ppvDestContext = This->dest_context_data; + + return S_OK; +} + +static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); return E_FAIL; @@ -400,7 +414,7 @@ static const IRpcChannelBufferVtbl Clien ClientRpcChannelBuffer_GetBuffer, ClientRpcChannelBuffer_SendReceive, ClientRpcChannelBuffer_FreeBuffer, - RpcChannelBuffer_GetDestCtx, + ClientRpcChannelBuffer_GetDestCtx, RpcChannelBuffer_IsConnected }; @@ -412,12 +426,14 @@ static const IRpcChannelBufferVtbl Serve ServerRpcChannelBuffer_GetBuffer, ServerRpcChannelBuffer_SendReceive, ServerRpcChannelBuffer_FreeBuffer, - RpcChannelBuffer_GetDestCtx, + ServerRpcChannelBuffer_GetDestCtx, RpcChannelBuffer_IsConnected }; /* returns a channel buffer for proxies */ -HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, IRpcChannelBuffer **chan) +HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, + DWORD dest_context, void *dest_context_data, + IRpcChannelBuffer **chan) { ClientRpcChannelBuffer *This; WCHAR endpoint[200]; @@ -470,6 +486,8 @@ HRESULT RPC_CreateClientChannel(const OX This->super.refs = 1; This->bind = bind; apartment_getoxid(COM_CurrentApt(), &This->oxid); + This->dest_context = dest_context; + This->dest_context_data = dest_context_data; *chan = (IRpcChannelBuffer*)This;

1 0

Robert Shearman : include: Add more definitions and types to olectl.h.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 47d7bd7ae11a8e4682e328866bf9a754cbb1b5ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=47d7bd7ae11a8e4682e3288… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:38:01 2006 +0000 include: Add more definitions and types to olectl.h. --- include/olectl.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 76 insertions(+), 4 deletions(-) diff --git a/include/olectl.h b/include/olectl.h index 37a9b9a..1231ad6 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -42,6 +42,9 @@ DEFINE_GUID(CLSID_StdFont, DEFINE_GUID(CLSID_StdPicture, 0x0be35204,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51); +DEFINE_GUID(IID_IPropertyFrame, + 0xb196b28a,0xbab4,0x101a,0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07); + DEFINE_GUID(CLSID_CFontPropPage, 0x0be35200,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51); DEFINE_GUID(CLSID_CColorPropPage, @@ -70,6 +73,30 @@ DEFINE_GUID(GUID_XSIZE, DEFINE_GUID(GUID_YSIZE, 0x66504309,0xBE0F,0x101A,0x8B,0xBB,0x00,0xAA,0x00,0x30,0x0C,0xAB); +#ifndef __CGUID_H__ +DEFINE_GUID(GUID_TRISTATE, + 0x6650430a,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +#endif + +DEFINE_GUID(GUID_OPTIONVALUEEXCLUSIVE, + 0x6650430b,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_CHECKVALUEEXCLUSIVE, + 0x6650430c,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTNAME, + 0x6650430d,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTSIZE, + 0x6650430e,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTBOLD, + 0x6650430f,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTITALIC, + 0x66504310,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTUNDERSCORE, + 0x66504311,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_FONTSTRIKETHROUGH, + 0x66504312,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); +DEFINE_GUID(GUID_HANDLE, + 0x66504313,0xbe0f,0x101a,0x8b,0xbb,0x00,0xaa,0x00,0x30,0x0c,0xab); + typedef struct tagOCPFIPARAMS { ULONG cbStructSize; @@ -150,6 +177,12 @@ typedef VARIANT_BOOL OLE_OPTEXCLUSIVE; typedef VARIANT_BOOL OLE_CANCELBOOL; typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; +/* flags for OleLoadPictureEx and OleLoadPictureFileEx */ +#define LP_DEFAULT 0x0 +#define LP_MONOCHROME 0x1 +#define LP_VGACOLOR 0x2 +#define LP_COLOR 0x4 + HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon); HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams); @@ -167,6 +200,13 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREA REFIID riid, DWORD xSizeDesired, DWORD ySizeDesired, DWORD dwFlags, LPVOID *lplpvObj ); +HRESULT WINAPI OleLoadPictureFile( VARIANT varFilename, IDispatch **ppdispPicture ); + +HRESULT WINAPI OleLoadPictureFileEx( VARIANT varFilename, DWORD xSizeDesired, + DWORD ySizeDesired, DWORD dwFlags, IDispatch **ppdispPicture ); + +HRESULT WINAPI OleSavePictureFile( IDispatch *pdispPicture, BSTR bstrFilename ); + HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid, LPVOID *ppvRet ); @@ -265,12 +305,31 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define CTL_E_SEARCHTEXTNOTFOUND STD_CTL_SCODE(744) #define CTL_E_REPLACEMENTSTOOLONG STD_CTL_SCODE(746) +#define CUSTOM_CTL_SCODE(n) MAKE_SCODE(SEVERITY_ERROR, FACILITY_CONTROL, n) +#define CTL_E_CUSTOM_FIRST CUSTOM_CTL_SCODE(600) + #define VT_COLOR VT_I4 +#define VT_XPOS_PIXELS VT_I4 +#define VT_YPOS_PIXELS VT_I4 +#define VT_XSIZE_PIXELS VT_I4 +#define VT_YSIZE_PIXELS VT_I4 +#define VT_XPOS_HIMETRIC VT_I4 +#define VT_YPOS_HIMETRIC VT_I4 +#define VT_XSIZE_HIMETRIC VT_I4 +#define VT_YSIZE_HIMETRIC VT_I4 +#define VT_TRISTATE VT_I2 +#define VT_OPTEXCLUSIVE VT_BOOL #define VT_FONT VT_DISPATCH -#define VT_STREAMED_PROPSET 73 /* [P] Stream contains a property set */ -#define VT_STORED_PROPSET 74 /* [P] Storage contains a property set */ -#define VT_BLOB_PROPSET 75 /* [P] Blob contains a property set */ -#define VT_VERBOSE_ENUM 76 /* [P] Enum value with text string */ +#define VT_PICTURE VT_DISPATCH + +#define VT_STREAMED_PROPSET 73 +#define VT_STORED_PROPSET 74 +#define VT_BLOB_PROPSET 75 +#define VT_VERBOSE_ENUM 76 + +#ifndef OLEIVERB_PROPERTIES +#define OLEIVERB_PROPERTIES (-7L) +#endif #define PERPROP_E_FIRST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x0200) #define PERPROP_E_LAST MAKE_SCODE(SEVERITY_ERROR, FACILITY_ITF, 0x020F) @@ -316,6 +375,9 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_REFRESH (-550) #define DISPID_DOCLICK (-551) #define DISPID_ABOUTBOX (-552) +#define DISPID_ADDITEM (-553) +#define DISPID_CLEAR (-554) +#define DISPID_REMOVEITEM (-555) #define DISPID_CLICK (-600) #define DISPID_DBLCLICK (-601) @@ -327,6 +389,10 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_MOUSEUP (-607) #define DISPID_ERROREVENT (-608) #define DISPID_READYSTATECHANGE (-609) +#define DISPID_CLICK_VALUE (-610) +#define DISPID_RIGHTTOLEFT (-611) +#define DISPID_TOPTOBOTTOM (-612) +#define DISPID_THIS (-613) #define DISPID_AMBIENT_BACKCOLOR (-701) #define DISPID_AMBIENT_DISPLAYNAME (-702) @@ -344,9 +410,15 @@ HRESULT WINAPI OleTranslateColor( OLE_CO #define DISPID_AMBIENT_SUPPORTSMNEMONICS (-714) #define DISPID_AMBIENT_AUTOCLIP (-715) #define DISPID_AMBIENT_APPEARANCE (-716) + +#define DISPID_AMBIENT_CODEPAGE (-725) #define DISPID_AMBIENT_PALETTE (-726) +#define DISPID_AMBIENT_CHARSET (-727) #define DISPID_AMBIENT_TRANSFERPRIORITY (-728) +#define DISPID_AMBIENT_RIGHTTOLEFT (-732) +#define DISPID_AMBIENT_TOPTOBOTTOM (-733) + #define DISPID_Name (-800) #define DISPID_Delete (-801) #define DISPID_Object (-802)

1 0

Robert Shearman : ole: Store the destination context and the destination context data in
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 92a1f52b4d8dea527abc0b037b50a10a70237cc8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92a1f52b4d8dea527abc0b0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:37:22 2006 +0000 ole: Store the destination context and the destination context data in the proxy manager when unmarshaling. --- dlls/ole32/compobj_private.h | 2 + dlls/ole32/marshal.c | 83 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index caa84de..8aeb0e0 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -127,6 +127,8 @@ struct proxy_manager ULONG sorflags; /* STDOBJREF flags (RO) */ IRemUnknown *remunk; /* proxy to IRemUnknown used for lifecycle management (CS cs) */ HANDLE remoting_mutex; /* mutex used for synchronizing access to IRemUnknown */ + MSHCTX dest_context; /* context used for activating optimisations (LOCK) */ + void *dest_context_data; /* reserved context value (LOCK) */ }; /* this needs to become a COM object that implements IRemUnknown */ diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 8f952f9..95ff257 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -56,7 +56,9 @@ extern const CLSID CLSID_DfMarshal; * when the proxy disconnects or is destroyed */ #define SORFP_NOLIFETIMEMGMT SORF_OXRES1 -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, REFIID riid, void **object); +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, + MSHCTX dest_context, void *dest_context_data, + REFIID riid, void **object); /* Marshalling just passes a unique identifier to the remote client, * that makes it possible to find the passed interface again. @@ -300,6 +302,8 @@ static HRESULT WINAPI ClientIdentity_Que HRESULT hrobj = qiresults[i].hResult; if (hrobj == S_OK) hrobj = unmarshal_object(&qiresults[i].std, This->parent, + This->dest_context, + This->dest_context_data, pMQIs[index].pIID, (void **)&pMQIs[index].pItf); @@ -586,6 +590,11 @@ static HRESULT proxy_manager_construct( /* we create the IRemUnknown proxy on demand */ This->remunk = NULL; + /* initialise these values to the weakest values and they will be + * overwritten in proxy_manager_set_context */ + This->dest_context = MSHCTX_INPROC; + This->dest_context_data = NULL; + EnterCriticalSection(&apt->cs); /* FIXME: we are dependent on the ordering in here to make sure a proxy's * IRemUnknown proxy doesn't get destroyed before the regual proxy does @@ -602,6 +611,63 @@ static HRESULT proxy_manager_construct( return S_OK; } +static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX dest_context, void *dest_context_data) +{ + MSHCTX old_dest_context = This->dest_context; + MSHCTX new_dest_context; + + do + { + new_dest_context = old_dest_context; + /* "stronger" values overwrite "weaker" values. stronger values are + * ones that disable more optimisations */ + switch (old_dest_context) + { + case MSHCTX_INPROC: + new_dest_context = dest_context; + break; + case MSHCTX_CROSSCTX: + switch (dest_context) + { + case MSHCTX_INPROC: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_LOCAL: + switch (dest_context) + { + case MSHCTX_INPROC: + case MSHCTX_CROSSCTX: + break; + default: + new_dest_context = dest_context; + } + break; + case MSHCTX_NOSHAREDMEM: + switch (dest_context) + { + case MSHCTX_DIFFERENTMACHINE: + new_dest_context = dest_context; + break; + default: + break; + } + break; + default: + break; + } + + if (old_dest_context == new_dest_context) break; + + old_dest_context = InterlockedCompareExchange((PLONG)&This->dest_context, new_dest_context, old_dest_context); + } while (new_dest_context != old_dest_context); + + if (dest_context_data) + InterlockedExchangePointer(&This->dest_context_data, dest_context_data); +} + static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv) { HRESULT hr; @@ -799,7 +865,9 @@ static HRESULT proxy_manager_get_remunkn memcpy(&stdobjref.ipid.Data4, &stdobjref.oxid, sizeof(OXID)); /* do the unmarshal */ - hr = unmarshal_object(&stdobjref, This->parent, &IID_IRemUnknown, (void**)&This->remunk); + hr = unmarshal_object(&stdobjref, This->parent, This->dest_context, + This->dest_context_data, &IID_IRemUnknown, + (void**)&This->remunk); if (hr == S_OK) *remunk = This->remunk; } @@ -990,7 +1058,9 @@ StdMarshalImpl_MarshalInterface( /* helper for StdMarshalImpl_UnmarshalInterface - does the unmarshaling with * no questions asked about the rules surrounding same-apartment unmarshals * and table marshaling */ -static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, REFIID riid, void **object) +static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, + MSHCTX dest_context, void *dest_context_data, + REFIID riid, void **object) { struct proxy_manager *proxy_manager = NULL; HRESULT hr = S_OK; @@ -1017,6 +1087,9 @@ static HRESULT unmarshal_object(const ST if (hr == S_OK) { struct ifproxy * ifproxy; + + proxy_manager_set_context(proxy_manager, dest_context, dest_context_data); + hr = proxy_manager_find_ifproxy(proxy_manager, riid, &ifproxy); if (hr == E_NOINTERFACE) { @@ -1043,6 +1116,7 @@ static HRESULT unmarshal_object(const ST static HRESULT WINAPI StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv) { + StdMarshalImpl *This = (StdMarshalImpl *)iface; struct stub_manager *stubmgr; STDOBJREF stdobjref; ULONG res; @@ -1112,7 +1186,8 @@ StdMarshalImpl_UnmarshalInterface(LPMARS wine_dbgstr_longlong(stdobjref.oxid)); if (hres == S_OK) - hres = unmarshal_object(&stdobjref, apt, riid, ppv); + hres = unmarshal_object(&stdobjref, apt, This->dwDestContext, + This->pvDestContext, riid, ppv); if (hres) WARN("Failed with error 0x%08lx\n", hres); else TRACE("Successfully created proxy %p\n", *ppv);

1 0

Robert Shearman : oleaut: Split OLEPictureImpl_Load.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: 08764dde8abf964ce99780a56b72622774086fe1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=08764dde8abf964ce99780a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:34:31 2006 +0000 oleaut: Split OLEPictureImpl_Load. Split OLEPictureImpl_Load into separate functions for the different file types. --- dlls/oleaut32/olepicture.c | 305 +++++++++++++++++++++++--------------------- 1 files changed, 162 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=08764dde8abf964ce99…

1 0

Robert Shearman : oleaut: Add some more VarFormat tests and fix the VarMod decimal test.
by Alexandre Julliard 06 Mar '06

06 Mar '06

Module: wine Branch: refs/heads/master Commit: e5b2c146657c9e0f1b2489feb9da8b0bcdc17858 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5b2c146657c9e0f1b2489f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Sun Mar 5 13:36:39 2006 +0000 oleaut: Add some more VarFormat tests and fix the VarMod decimal test. --- dlls/oleaut32/tests/vartest.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 65c5cfd..2da6371 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1731,6 +1731,9 @@ static void test_VarFormat(void) VARFMT(VT_I4,V_I4,1,"000###",S_OK,"000001"); VARFMT(VT_I4,V_I4,1,"#00##00#0",S_OK,"00000001"); VARFMT(VT_I4,V_I4,1,"1#####0000",S_OK,"10001"); + todo_wine { + VARFMT(VT_I4,V_I4,100000,"#,###,###,###",S_OK,"100,000"); + } VARFMT(VT_R8,V_R8,1.23456789,"0#.0#0#0#0#0",S_OK,"01.234567890"); VARFMT(VT_R8,V_R8,1.2,"0#.0#0#0#0#0",S_OK,"01.200000000"); VARFMT(VT_R8,V_R8,9.87654321,"#0.#0#0#0#0#",S_OK,"9.87654321"); @@ -1779,6 +1782,14 @@ static void test_VarFormat(void) pVarFormat(&in,NULL,fd,fw,flags,&out); /* Would crash if out is cleared */ out = NULL; + /* VT_NULL */ + V_VT(&in) = VT_NULL; + hres = pVarFormat(&in,NULL,fd,fw,0,&out); + todo_wine { + ok(hres == S_OK, "VarFormat failed with 0x%08lx\n", hres); + ok(out == NULL, "expected NULL formatted string\n"); + } + /* Invalid args */ hres = pVarFormat(&in,NULL,fd,fw,flags,NULL); ok(hres == E_INVALIDARG, "Null out: expected E_INVALIDARG, got 0x%08lx\n", hres); @@ -2450,6 +2461,25 @@ static void test_VarMod(void) ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + /* some decimals */ + todo_wine { + V_VT(&v1) = VT_DECIMAL; + V_VT(&v2) = VT_DECIMAL; + VarDecFromI4(100, &V_DECIMAL(&v1)); + VarDecFromI4(10, &V_DECIMAL(&v2)); + hres = pVarMod(&v1,&v2,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, + "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + + V_VT(&v1) = VT_I4; + V_VT(&v2) = VT_DECIMAL; + V_I4(&v1) = 100; + VarDecFromI4(10, &V_DECIMAL(&v2)); + hres = pVarMod(&v1,&v2,&vDst); + ok(hres == S_OK && V_VT(&vDst) == VT_I4 && V_I4(&vDst) == 0, + "VarMod: expected 0x%lx,%d,%d, got 0x%lX,%d,%ld\n", S_OK, VT_I4, 0, hres, V_VT(&vDst), V_I4(&vDst)); + } + VARMOD2(UINT,I4,100,10,I4,0,S_OK); /* test that an error results in the type of the result changing but not its value */ @@ -2473,7 +2503,6 @@ static void test_VarMod(void) VARMOD2(ERROR,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); VARMOD2(VARIANT,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); VARMOD2(UNKNOWN,I4,100,10,EMPTY,0,DISP_E_TYPEMISMATCH); - VARMOD2(DECIMAL,I4,100,10,EMPTY,0,DISP_E_OVERFLOW); VARMOD2(VOID,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE); VARMOD2(HRESULT,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE); VARMOD2(PTR,I4,100,10,EMPTY,0,DISP_E_BADVARTYPE);

1 0

lostwages/news 2006030301.xml
by WineHQ 06 Mar '06

06 Mar '06

ChangeSet ID: 23400 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/05 23:39:14 Modified files: news : 2006030301.xml Log message: Fix malformed xml in news article. Patch: http://cvs.winehq.org/patch.py?id=23400 Old revision New revision Changes Path 1.1 1.2 +1 -2 lostwages/news/2006030301.xml Index: lostwages/news/2006030301.xml diff -u -p lostwages/news/2006030301.xml:1.1 lostwages/news/2006030301.xml:1.2 --- lostwages/news/2006030301.xml:1.1 6 Mar 2006 5:39:14 -0000 +++ lostwages/news/2006030301.xml 6 Mar 2006 5:39:14 -0000 @@ -6,7 +6,6 @@ Wine 0.9.9 was released yesterday. Quite a few major additions appeared in this release, including: <ul> - <li> <li> Many new features and improvements in Richedit.</li> <li> More Web browser support.</li> <li> Recursive directory change notifications.</li> @@ -14,7 +13,7 @@ in this release, including: <li> Direct3D 8 and 9 now use the same code.</li> <li> Many debugger improvements.</li> <li> Systray is now handled by the explorer process.</li> -</ul> +</ul></p> <p> Binary packages are in the process of being built, but the source is <a href="http://prdownloads.sourceforge.net/wine/wine-0.9.9.tar.bz2">available

1 0

lostwages/ news/2006030501.xml wwn/wn20060305_ ...
by WineHQ 06 Mar '06

06 Mar '06

ChangeSet ID: 23399 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/03/05 23:23:34 Added files: news : 2006030501.xml wwn : wn20060305_307.xml Log message: WWN #307 Patch: http://cvs.winehq.org/patch.py?id=23399 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006030501.xml Added 1.1 +0 -0 lostwages/wwn/wn20060305_307.xml

1 0

Mike McCormack : winecfg: Fix a typo (LVM_ -> TVM_).
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: e06b046f59f4144319e5fa59fd5c7c1cfb41e184 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e06b046f59f4144319e5fa5… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sun Mar 5 00:58:44 2006 +0900 winecfg: Fix a typo (LVM_ -> TVM_). --- programs/winecfg/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 490e05a..b677c2a 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -205,7 +205,7 @@ static void initAudioDeviceTree(HWND hDl hBitMap = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(IDB_CHECKBOX)); ImageList_Add(hImageList, hBitMap, NULL); DeleteObject(hBitMap); - SendMessageW( tree, LVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); + SendMessageW( tree, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)hImageList ); /* root item */ insert.hParent = TVI_ROOT;

1 0

Vitaly Budovski : wined3d: Added two sided stencil support to WINED3DRS_STENCILFAIL,
by Alexandre Julliard 04 Mar '06

04 Mar '06

Module: wine Branch: refs/heads/master Commit: f2f59cae61c7017e22c6121c5a74d93ffb7eb46c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f2f59cae61c7017e22c6121… Author: Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> Date: Sat Mar 4 17:52:24 2006 +1100 wined3d: Added two sided stencil support to WINED3DRS_STENCILFAIL, WINED3DRS_STENCILZFAIL and WINED3DRS_STENCILPASS. --- dlls/wined3d/device.c | 93 ++++++++++++++++++++++++------------------------- 1 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 894a70a..047b2b9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3195,57 +3195,56 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetRen break; case WINED3DRS_STENCILFAIL : - { - GLenum fail ; - GLint zpass ; - GLint zfail ; - - fail = StencilOp(Value); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);"); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);"); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); - } - break; case WINED3DRS_STENCILZFAIL : - { - GLint fail ; - GLint zpass ; - GLenum zfail ; - - glGetIntegerv(GL_STENCIL_FAIL, &fail); - checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);"); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &zpass);"); - zfail = StencilOp(Value); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); - } - break; case WINED3DRS_STENCILPASS : - { - GLint fail ; - GLenum zpass ; - GLint zfail ; - - glGetIntegerv(GL_STENCIL_FAIL, &fail); - checkGLcall("glGetIntegerv(GL_STENCIL_FAIL, &fail);"); - zpass = StencilOp(Value); - glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail); - checkGLcall("glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &zfail);"); - - TRACE("StencilOp fail=%x, zfail=%x, zpass=%x\n", fail, zfail, zpass); - glStencilOp(fail, zfail, zpass); - checkGLcall("glStencilOp(fail, zfail, zpass);"); + { + GLint stencilFail; + GLint depthFail; + GLint stencilPass; + + GLint action = StencilOp(Value); + + glGetIntegerv(GL_STENCIL_FAIL, &stencilFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_FAIL, &depthFail); + glGetIntegerv(GL_STENCIL_PASS_DEPTH_PASS, &stencilPass); + + if(WINED3DRS_STENCILFAIL == State) { + stencilFail = action; + } + else if(WINED3DRS_STENCILZFAIL == State) { + depthFail = action; + } + else if(WINED3DRS_STENCILPASS == State) { + stencilPass = action; } - break; + if(!This->stateBlock->renderState[WINED3DRS_TWOSIDEDSTENCILMODE]) { + if(GL_EXTCALL(glStencilOpSeparate)) { + GL_EXTCALL(glStencilOpSeparate(GL_FRONT, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparate(GL_FRONT,...)"); + } + else if(GL_EXTCALL(glActiveStencilFaceEXT)) { + glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT); + checkGLcall("glEnable(GL_STENCIL_TEST_TWO_SIDE_EXT)"); + GL_EXTCALL(glActiveStencilFaceEXT(GL_FRONT)); + checkGLcall("glActiveStencilFaceEXT(GL_FRONT)"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + else if(GL_EXTCALL(glStencilOpSeparateATI)) { + GL_EXTCALL(glStencilOpSeparateATI(GL_FRONT, stencilFail, depthFail, stencilPass)); + checkGLcall("glStencilOpSeparateATI(GL_FRONT,...)"); + } else { + TRACE("Separate stencil operation not supported on this version of opengl"); + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + } else { + glStencilOp(stencilFail, depthFail, stencilPass); + checkGLcall("glStencilOp(...)"); + } + break; + } case WINED3DRS_STENCILWRITEMASK : { glStencilMask(Value);

1 0