November 2008 - Wine-Commits

Paul Vriens : rsaenh/tests: Use a 40-bit session key instead of 56-bit.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 5da0debbe6d0806506fdb3d0239496ea720e2ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da0debbe6d0806506fdb3d02… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 16:45:12 2008 +0100 rsaenh/tests: Use a 40-bit session key instead of 56-bit. --- dlls/rsaenh/tests/rsaenh.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 9ef443c..1bb4ad2 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -736,9 +736,9 @@ static void test_aes(int keylen) static void test_rc2(void) { - static const BYTE rc2encrypted[16] = { - 0x02, 0x34, 0x7d, 0xf6, 0x1d, 0xc5, 0x9b, 0x8b, - 0x2e, 0x0d, 0x63, 0x80, 0x72, 0xc1, 0xc2, 0xb1 }; + static const BYTE rc2_40_encrypted[16] = { + 0xc0, 0x9a, 0xe4, 0x2f, 0x0a, 0x47, 0x67, 0x11, + 0xfb, 0x18, 0x87, 0xce, 0x0c, 0x75, 0x07, 0xb1 }; static const BYTE rc2_128_encrypted[] = { 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c,0x2a,0x2a,0xc0,0xce,0x4c,0x89, 0xb6,0x66 }; @@ -766,7 +766,7 @@ static void test_rc2(void) result = CryptGetHashParam(hHash, HP_HASHVAL, pbHashValue, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - result = CryptDeriveKey(hProv, CALG_RC2, hHash, 56 << 16, &hKey); + result = CryptDeriveKey(hProv, CALG_RC2, hHash, 40 << 16, &hKey); ok(result, "%08x\n", GetLastError()); dwLen = sizeof(DWORD); @@ -811,7 +811,7 @@ static void test_rc2(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); - ok(!memcmp(pbData, rc2encrypted, 8), "RC2 encryption failed!\n"); + ok(!memcmp(pbData, rc2_40_encrypted, 16), "RC2 encryption failed!\n"); result = CryptGetKeyParam(hKey, KP_IV, NULL, &dwLen, 0); ok(result, "%08x\n", GetLastError());

1 0

Paul Vriens : rsaenh/tests: Fix a test failure on W2K and below.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 6a8d623a5669f2e18493d6fa56eb3f4044cf71f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8d623a5669f2e18493d6fa5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 25 16:01:02 2008 +0100 rsaenh/tests: Fix a test failure on W2K and below. --- dlls/rsaenh/tests/rsaenh.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 1f05ed1..9ef443c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -982,8 +982,11 @@ static void test_rc4(void) ok(result, "setting salt failed for size %d: %08x\n", i, GetLastError()); } salt.cbData = 25; + SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_SALT_EX, (BYTE *)&salt, 0); - ok(!result, "%08x\n", GetLastError()); + ok(!result || + broken(result), /* Win9x, WinMe, NT4, W2K */ + "%08x\n", GetLastError()); result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError());

1 0

Francois Gouget : quartz: Remove CALLBACK on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 57908f889a80501c0fd71b7df4617ff96fa66904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57908f889a80501c0fd71b7df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:43:07 2008 +0100 quartz: Remove CALLBACK on static functions where not needed. --- dlls/quartz/pin.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 5689015..2d63064 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1460,7 +1460,7 @@ ULONG WINAPI PullPin_Release(IPin *iface) return refCount; } -static void CALLBACK PullPin_Flush(PullPin *This) +static void PullPin_Flush(PullPin *This) { IMediaSample *pSample; TRACE("Flushing!\n"); @@ -1488,7 +1488,7 @@ static void CALLBACK PullPin_Flush(PullPin *This) } } -static void CALLBACK PullPin_Thread_Process(PullPin *This) +static void PullPin_Thread_Process(PullPin *This) { HRESULT hr; IMediaSample * pSample = NULL; @@ -1568,7 +1568,7 @@ static void CALLBACK PullPin_Thread_Process(PullPin *This) TRACE("End: %08x, %d\n", hr, This->stop_playback); } -static void CALLBACK PullPin_Thread_Pause(PullPin *This) +static void PullPin_Thread_Pause(PullPin *This) { PullPin_Flush(This); @@ -1578,7 +1578,7 @@ static void CALLBACK PullPin_Thread_Pause(PullPin *This) LeaveCriticalSection(This->pin.pCritSec); } -static void CALLBACK PullPin_Thread_Stop(PullPin *This) +static void PullPin_Thread_Stop(PullPin *This) { TRACE("(%p)->()\n", This);

1 0

Francois Gouget : rpcrt4: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: bbc4413548c78ee145dd0ecc1d1c6f406313017f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc4413548c78ee145dd0ecc1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:43:14 2008 +0100 rpcrt4: Remove WINAPI on static functions where not needed. --- dlls/rpcrt4/cproxy.c | 2 +- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/ndr_stubless.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 7979c0e..6c26d18 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -193,7 +193,7 @@ HRESULT WINAPI StdProxy_Construct(REFIID riid, return S_OK; } -static void WINAPI StdProxy_Destruct(LPRPCPROXYBUFFER iface) +static void StdProxy_Destruct(LPRPCPROXYBUFFER iface) { ICOM_THIS_MULTI(StdProxyImpl,lpVtbl,iface); diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 3be736d..9608f1e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -391,7 +391,7 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, SIZE_T len) return p; } -static void WINAPI NdrFree(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *Pointer) +static void NdrFree(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *Pointer) { TRACE("(%p, %p)\n", pStubMsg, Pointer); diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 0daf22e..9833483 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -107,7 +107,7 @@ void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) #endif } -static void WINAPI dump_RPC_FC_PROC_PF(PARAM_ATTRIBUTES param_attributes) +static void dump_RPC_FC_PROC_PF(PARAM_ATTRIBUTES param_attributes) { if (param_attributes.MustSize) TRACE(" MustSize"); if (param_attributes.MustFree) TRACE(" MustFree"); @@ -123,7 +123,7 @@ static void WINAPI dump_RPC_FC_PROC_PF(PARAM_ATTRIBUTES param_attributes) if (param_attributes.ServerAllocSize) TRACE(" ServerAllocSize = %d", param_attributes.ServerAllocSize * 8); } -static void WINAPI dump_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags) +static void dump_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags) { if (Oi2Flags.ServerMustSize) TRACE(" ServerMustSize"); if (Oi2Flags.ClientMustSize) TRACE(" ClientMustSize");

1 0

Francois Gouget : quartz: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 9517637eb4540e5c82821eedd454ba99129a36df URL: http://source.winehq.org/git/wine.git/?a=commit;h=9517637eb4540e5c82821eedd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:43:00 2008 +0100 quartz: Remove WINAPI on static functions where not needed. --- dlls/quartz/control.c | 6 +++--- dlls/quartz/filtergraph.c | 22 +++++++++++----------- dlls/quartz/tests/filtergraph.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index a2db24b..36a610e 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -103,7 +103,7 @@ static const IUnknownVtbl IInner_VTable = }; /* Generic functions for aggregation */ -static HRESULT WINAPI SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv) +static HRESULT SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv) { if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -131,14 +131,14 @@ static HRESULT WINAPI SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); } -static ULONG WINAPI SeekOuter_AddRef(PassThruImpl *This) +static ULONG SeekOuter_AddRef(PassThruImpl *This) { if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_AddRef(This->pUnkOuter); return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); } -static ULONG WINAPI SeekOuter_Release(PassThruImpl *This) +static ULONG SeekOuter_Release(PassThruImpl *This) { if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_Release(This->pUnkOuter); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c53771e..ff185ce 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -207,10 +207,10 @@ typedef struct _IFilterGraphImpl { LONG recursioncount; } IFilterGraphImpl; -static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, - REFIID riid, LPVOID * ppv); -static ULONG WINAPI Filtergraph_AddRef(IFilterGraphImpl *This); -static ULONG WINAPI Filtergraph_Release(IFilterGraphImpl *This); +static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, + REFIID riid, LPVOID * ppv); +static ULONG Filtergraph_AddRef(IFilterGraphImpl *This); +static ULONG Filtergraph_Release(IFilterGraphImpl *This); static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, REFIID riid, @@ -585,7 +585,7 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, /* Don't allow a circular connection to form, return VFW_E_CIRCULAR_GRAPH if this would be the case. * A circular connection will be formed if from the filter of the output pin, the input pin can be reached */ -static HRESULT WINAPI CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *in) +static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *in) { #if 1 HRESULT hr; @@ -1105,7 +1105,7 @@ out: return SUCCEEDED(hr) ? S_OK : hr; } -static HRESULT WINAPI FilterGraph2_RenderRecurse(IFilterGraphImpl *This, IPin *ppinOut) +static HRESULT FilterGraph2_RenderRecurse(IFilterGraphImpl *This, IPin *ppinOut) { /* This pin has been connected now, try to call render on all pins that aren't connected */ IPin *to = NULL; @@ -5356,9 +5356,9 @@ static const IUnknownVtbl IInner_VTable = FilterGraphInner_Release }; -static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, - REFIID riid, - LPVOID * ppv) { +static HRESULT Filtergraph_QueryInterface(IFilterGraphImpl *This, + REFIID riid, + LPVOID * ppv) { if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -5385,13 +5385,13 @@ static HRESULT WINAPI Filtergraph_QueryInterface(IFilterGraphImpl *This, return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); } -static ULONG WINAPI Filtergraph_AddRef(IFilterGraphImpl *This) { +static ULONG Filtergraph_AddRef(IFilterGraphImpl *This) { if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_AddRef(This->pUnkOuter); return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); } -static ULONG WINAPI Filtergraph_Release(IFilterGraphImpl *This) { +static ULONG Filtergraph_Release(IFilterGraphImpl *This) { if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_Release(This->pUnkOuter); return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e273136..f56e722 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -772,7 +772,7 @@ static HRESULT WINAPI TestFilter_OutputPin_ReceiveConnection(IPin * iface, IPin } /* Private helper function */ -static HRESULT WINAPI TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +static HRESULT TestFilter_OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { ITestPinImpl *This = (ITestPinImpl *)iface; HRESULT hr;

1 0

Francois Gouget : shdocvw: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 2a2387b984e01dba4e86860cc900b96009362b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2387b984e01dba4e86860cc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:42:43 2008 +0100 shdocvw: Remove WINAPI on static functions where not needed. --- dlls/shdocvw/intshcut.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index fd5e5bf..86bc543 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -103,7 +103,7 @@ static BOOL StartLinkProcessor(LPCOLESTR szLink) /* interface functions */ -static HRESULT WINAPI Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID *ppvObject) +static HRESULT Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID *ppvObject) { TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); *ppvObject = NULL; @@ -134,13 +134,13 @@ static HRESULT WINAPI Unknown_QueryInterface(InternetShortcut *This, REFIID riid return S_OK; } -static ULONG WINAPI Unknown_AddRef(InternetShortcut *This) +static ULONG Unknown_AddRef(InternetShortcut *This) { TRACE("(%p)\n", This); return InterlockedIncrement(&This->refCount); } -static ULONG WINAPI Unknown_Release(InternetShortcut *This) +static ULONG Unknown_Release(InternetShortcut *This) { ULONG count; TRACE("(%p)\n", This);

1 0

Francois Gouget : opengl32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 822ab7b404b24e1134273b272a73a4f459b756a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=822ab7b404b24e1134273b272… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:42:36 2008 +0100 opengl32: Remove WINAPI on static functions where not needed. --- dlls/opengl32/wgl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index a07fcf3..b73cf60 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -394,7 +394,7 @@ static void tess_callback_end(void) /*********************************************************************** * wglUseFontOutlines_common */ -static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, +static BOOL wglUseFontOutlines_common(HDC hdc, DWORD first, DWORD count, DWORD listBase, @@ -560,7 +560,7 @@ error_in_list: #else /* SONAME_LIBGLU */ -static BOOL WINAPI wglUseFontOutlines_common(HDC hdc, +static BOOL wglUseFontOutlines_common(HDC hdc, DWORD first, DWORD count, DWORD listBase,

1 0

Francois Gouget : oleaut32: Remove WINAPI on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: cc42922e08b1751039b0e64de3c0a9facc9431e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc42922e08b1751039b0e64de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:42:23 2008 +0100 oleaut32: Remove WINAPI on static functions where not needed. --- dlls/oleaut32/dispatch.c | 4 ++-- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 057e39a..4dfc470 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static IDispatch * WINAPI StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); +static IDispatch * StdDispatch_Construct(IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo); /****************************************************************************** * DispInvoke (OLEAUT32.30) @@ -425,7 +425,7 @@ static const IDispatchVtbl StdDispatch_VTable = StdDispatch_Invoke }; -static IDispatch * WINAPI StdDispatch_Construct( +static IDispatch * StdDispatch_Construct( IUnknown * punkOuter, void * pvThis, ITypeInfo * pTypeInfo) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index bbdebae..8e4745b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1036,7 +1036,7 @@ static inline ITypeInfoImpl *info_impl_from_ITypeComp( ITypeComp *iface ) static const ITypeInfo2Vtbl tinfvt; static const ITypeCompVtbl tcompvt; -static ITypeInfo2 * WINAPI ITypeInfo_Constructor(void); +static ITypeInfo2 * ITypeInfo_Constructor(void); typedef struct tagTLBContext { @@ -4805,7 +4805,7 @@ static const ITypeCompVtbl tlbtcvt = }; /*================== ITypeInfo(2) Methods ===================================*/ -static ITypeInfo2 * WINAPI ITypeInfo_Constructor(void) +static ITypeInfo2 * ITypeInfo_Constructor(void) { ITypeInfoImpl * pTypeInfoImpl;

1 0

Francois Gouget : ole32: Remove __RPC_USER on static functions where not needed.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: c584c2d12c3db8ec50386c03e812c6f0ece4dfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c584c2d12c3db8ec50386c03e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Nov 25 16:42:07 2008 +0100 ole32: Remove __RPC_USER on static functions where not needed. --- dlls/ole32/usrmarshal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index e504485..4997ee1 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -260,7 +260,7 @@ void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF) * so nothing to do */ } -static ULONG __RPC_USER handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) +static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) { if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) { @@ -271,7 +271,7 @@ static ULONG __RPC_USER handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDL return StartingSize + sizeof(RemotableHandle); } -static unsigned char * __RPC_USER handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) @@ -285,7 +285,7 @@ static unsigned char * __RPC_USER handle_UserMarshal(ULONG *pFlags, unsigned cha return pBuffer + sizeof(RemotableHandle); } -static unsigned char * __RPC_USER handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) +static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { RemotableHandle *remhandle = (RemotableHandle *)pBuffer; if (remhandle->fContext != WDT_INPROC_CALL) @@ -294,7 +294,7 @@ static unsigned char * __RPC_USER handle_UserUnmarshal(ULONG *pFlags, unsigned c return pBuffer + sizeof(RemotableHandle); } -static void __RPC_USER handle_UserFree(ULONG *pFlags, HANDLE *phMenu) +static void handle_UserFree(ULONG *pFlags, HANDLE *phMenu) { /* nothing to do */ }

1 0

Huw Davies : oleaut32: Add support for loading typelibs from NE files.
by Alexandre Julliard Nov. 26, 2008

Nov. 26, 2008

Module: wine Branch: master Commit: 49368cb14bd5d627f8bd8a6abca59951f5501876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49368cb14bd5d627f8bd8a6ab… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 25 13:52:24 2008 +0000 oleaut32: Add support for loading typelibs from NE files. --- dlls/oleaut32/typelib.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f807c05..bbdebae 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -64,7 +64,9 @@ #include "winnls.h" #include "winreg.h" #include "winuser.h" +#include "lzexpand.h" +#include "wine/winbase16.h" #include "wine/unicode.h" #include "objbase.h" #include "typelib.h" @@ -2326,6 +2328,220 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return TYPE_E_CANTLOADLIBRARY; } +typedef struct TLB_NEFile +{ + const IUnknownVtbl *lpvtbl; + LONG refs; + LPVOID typelib_base; +} TLB_NEFile; + +static HRESULT WINAPI TLB_NEFile_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI TLB_NEFile_AddRef(IUnknown *iface) +{ + TLB_NEFile *This = (TLB_NEFile *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI TLB_NEFile_Release(IUnknown *iface) +{ + TLB_NEFile *This = (TLB_NEFile *)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + { + HeapFree(GetProcessHeap(), 0, This->typelib_base); + HeapFree(GetProcessHeap(), 0, This); + } + return refs; +} + +static const IUnknownVtbl TLB_NEFile_Vtable = +{ + TLB_NEFile_QueryInterface, + TLB_NEFile_AddRef, + TLB_NEFile_Release +}; + +/*********************************************************************** + * read_xx_header [internal] + */ +static int read_xx_header( HFILE lzfd ) +{ + IMAGE_DOS_HEADER mzh; + char magic[3]; + + LZSeek( lzfd, 0, SEEK_SET ); + if ( sizeof(mzh) != LZRead( lzfd, (LPSTR)&mzh, sizeof(mzh) ) ) + return 0; + if ( mzh.e_magic != IMAGE_DOS_SIGNATURE ) + return 0; + + LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + if ( 2 != LZRead( lzfd, magic, 2 ) ) + return 0; + + LZSeek( lzfd, mzh.e_lfanew, SEEK_SET ); + + if ( magic[0] == 'N' && magic[1] == 'E' ) + return IMAGE_OS2_SIGNATURE; + if ( magic[0] == 'P' && magic[1] == 'E' ) + return IMAGE_NT_SIGNATURE; + + magic[2] = '\0'; + WARN("Can't handle %s files.\n", magic ); + return 0; +} + + +/*********************************************************************** + * find_ne_resource [internal] + */ +static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, + DWORD *resLen, DWORD *resOff ) +{ + IMAGE_OS2_HEADER nehd; + NE_TYPEINFO *typeInfo; + NE_NAMEINFO *nameInfo; + DWORD nehdoffset; + LPBYTE resTab; + DWORD resTabSize; + int count; + + /* Read in NE header */ + nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + + resTabSize = nehd.ne_restab - nehd.ne_rsrctab; + if ( !resTabSize ) + { + TRACE("No resources in NE dll\n" ); + return FALSE; + } + + /* Read in resource table */ + resTab = HeapAlloc( GetProcessHeap(), 0, resTabSize ); + if ( !resTab ) return FALSE; + + LZSeek( lzfd, nehd.ne_rsrctab + nehdoffset, SEEK_SET ); + if ( resTabSize != LZRead( lzfd, (char*)resTab, resTabSize ) ) + { + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + } + + /* Find resource */ + typeInfo = (NE_TYPEINFO *)(resTab + 2); + + if (HIWORD(typeid) != 0) /* named type */ + { + BYTE len = strlen( typeid ); + while (typeInfo->type_id) + { + if (!(typeInfo->type_id & 0x8000)) + { + BYTE *p = resTab + typeInfo->type_id; + if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; + } + typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + + typeInfo->count * sizeof(NE_NAMEINFO)); + } + } + else /* numeric type id */ + { + WORD id = LOWORD(typeid) | 0x8000; + while (typeInfo->type_id) + { + if (typeInfo->type_id == id) goto found_type; + typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + + typeInfo->count * sizeof(NE_NAMEINFO)); + } + } + TRACE("No typeid entry found for %p\n", typeid ); + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + + found_type: + nameInfo = (NE_NAMEINFO *)(typeInfo + 1); + + if (HIWORD(resid) != 0) /* named resource */ + { + BYTE len = strlen( resid ); + for (count = typeInfo->count; count > 0; count--, nameInfo++) + { + BYTE *p = resTab + nameInfo->id; + if (nameInfo->id & 0x8000) continue; + if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; + } + } + else /* numeric resource id */ + { + WORD id = LOWORD(resid) | 0x8000; + for (count = typeInfo->count; count > 0; count--, nameInfo++) + if (nameInfo->id == id) goto found_name; + } + TRACE("No resid entry found for %p\n", typeid ); + HeapFree( GetProcessHeap(), 0, resTab ); + return FALSE; + + found_name: + /* Return resource data */ + if ( resLen ) *resLen = nameInfo->length << *(WORD *)resTab; + if ( resOff ) *resOff = nameInfo->offset << *(WORD *)resTab; + + HeapFree( GetProcessHeap(), 0, resTab ); + return TRUE; +} + +static HRESULT TLB_NEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile){ + + HFILE lzfd = -1; + OFSTRUCT ofs; + HRESULT hr = TYPE_E_CANTLOADLIBRARY; + TLB_NEFile *This = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + + This->lpvtbl = &TLB_NEFile_Vtable; + This->refs = 1; + This->typelib_base = NULL; + + lzfd = LZOpenFileW( (LPWSTR)path, &ofs, OF_READ ); + if ( lzfd >= 0 && read_xx_header( lzfd ) == IMAGE_OS2_SIGNATURE ) + { + DWORD reslen, offset; + if( find_ne_resource( lzfd, "TYPELIB", MAKEINTRESOURCEA(index), &reslen, &offset ) ) + { + This->typelib_base = HeapAlloc(GetProcessHeap(), 0, reslen); + if( !This->typelib_base ) + hr = E_OUTOFMEMORY; + else + { + LZSeek( lzfd, offset, SEEK_SET ); + reslen = LZRead( lzfd, This->typelib_base, reslen ); + LZClose( lzfd ); + *ppBase = This->typelib_base; + *pdwTLBLength = reslen; + *ppFile = (IUnknown *)&This->lpvtbl; + return S_OK; + } + } + } + + if( lzfd >= 0) LZClose( lzfd ); + TLB_NEFile_Release((IUnknown *)&This->lpvtbl); + return hr; +} typedef struct TLB_Mapping { @@ -2486,6 +2702,8 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TLB_PEFile_Open(pszPath, index, &pBase, &dwTLBLength, &pFile); if (ret == TYPE_E_CANTLOADLIBRARY) + ret = TLB_NEFile_Open(pszPath, index, &pBase, &dwTLBLength, &pFile); + if (ret == TYPE_E_CANTLOADLIBRARY) ret = TLB_Mapping_Open(pszPath, &pBase, &dwTLBLength, &pFile); if (SUCCEEDED(ret)) {

1 0