mirror of
https://github.com/reactos/reactos.git
synced 2025-05-31 06:58:10 +00:00
[OLEAUT32]
* Sync with Wine 1.7.1. CORE-7469 svn path=/trunk/; revision=60356
This commit is contained in:
Amine Khaldi
parent
4fddbeb50b
commit
17427e7cae
8 changed files with 3997 additions and 6091 deletions
|
|
@ -29,7 +29,6 @@ list(APPEND SOURCE
|
|||
safearray.c
|
||||
tmarshal.c
|
||||
typelib.c
|
||||
typelib2.c
|
||||
usrmarshal.c
|
||||
varformat.c
|
||||
variant.c
|
||||
|
|
|
|||
|
|
@ -544,13 +544,13 @@ ULONG WINAPI LHashValOfNameSysA( SYSKIND skind, LCID lcid, LPCSTR lpStr)
|
|||
case LANG_SWEDISH: case LANG_SYRIAC: case LANG_TAMIL:
|
||||
case LANG_TATAR: case LANG_TELUGU: case LANG_THAI:
|
||||
case LANG_UKRAINIAN: case LANG_URDU: case LANG_UZBEK:
|
||||
case LANG_VIETNAMESE: case LANG_GAELIC: case LANG_MALTESE:
|
||||
case LANG_VIETNAMESE: case LANG_SCOTTISH_GAELIC: case LANG_MALTESE:
|
||||
case LANG_MAORI: case LANG_ROMANSH: case LANG_IRISH:
|
||||
case LANG_SAMI: case LANG_UPPER_SORBIAN: case LANG_SUTU:
|
||||
case LANG_TSONGA: case LANG_TSWANA: case LANG_VENDA:
|
||||
case LANG_XHOSA: case LANG_ZULU: case LANG_ESPERANTO:
|
||||
case LANG_WALON: case LANG_CORNISH: case LANG_WELSH:
|
||||
case LANG_BRETON:
|
||||
case LANG_BRETON: case LANG_MANX_GAELIC:
|
||||
nOffset = 16;
|
||||
pnLookup = Lookup_16;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -742,7 +742,6 @@ extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DEC
|
|||
extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
|
||||
extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN;
|
||||
extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN;
|
||||
extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN;
|
||||
|
||||
extern void _get_STDFONT_CF(LPVOID *);
|
||||
extern void _get_STDPIC_CF(LPVOID *);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -100,12 +100,12 @@ typedef struct tagMSFT_SegDir {
|
|||
/*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */
|
||||
/*3*/MSFT_pSeg pImpFiles; /* import libraries */
|
||||
/*4*/MSFT_pSeg pRefTab; /* References table */
|
||||
/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */
|
||||
/* hash table w offsets to guid????? */
|
||||
/*5*/MSFT_pSeg pGuidHashTab; /* always exists, always same size (0x80) */
|
||||
/* hash table with offsets to guid */
|
||||
/*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */
|
||||
/* offset in some table???? */
|
||||
/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */
|
||||
/* purpose largely unknown */
|
||||
/*7*/MSFT_pSeg pNameHashTab; /* always created, always same size (0x200) */
|
||||
/* hash table with offsets to names */
|
||||
/*8*/MSFT_pSeg pNametab; /* name tables */
|
||||
/*9*/MSFT_pSeg pStringtab; /* string table */
|
||||
/*A*/MSFT_pSeg pTypdescTab; /* table with type descriptors */
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1073,15 +1073,16 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B
|
|||
Buffer += sizeof(wiresab[0]) * wiresa->cDims;
|
||||
|
||||
if(vt)
|
||||
{
|
||||
*ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL);
|
||||
if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY);
|
||||
}
|
||||
else
|
||||
{
|
||||
SafeArrayAllocDescriptor(wiresa->cDims, ppsa);
|
||||
if(*ppsa)
|
||||
memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims);
|
||||
if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa)))
|
||||
RpcRaiseException(E_OUTOFMEMORY);
|
||||
memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims);
|
||||
}
|
||||
if (!*ppsa)
|
||||
RpcRaiseException(E_OUTOFMEMORY);
|
||||
|
||||
/* be careful about which flags we set since they could be a security
|
||||
* risk */
|
||||
|
|
@ -2245,8 +2246,17 @@ HRESULT CALLBACK IClassFactory2_CreateInstanceLic_Proxy(
|
|||
BSTR bstrKey,
|
||||
PVOID *ppvObj)
|
||||
{
|
||||
FIXME("not implemented\n");
|
||||
return E_NOTIMPL;
|
||||
TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppvObj);
|
||||
|
||||
*ppvObj = NULL;
|
||||
|
||||
if (pUnkOuter)
|
||||
{
|
||||
ERR("aggregation is not allowed on remote objects\n");
|
||||
return CLASS_E_NOAGGREGATION;
|
||||
}
|
||||
|
||||
return IClassFactory2_RemoteCreateInstanceLic_Proxy(This, riid, bstrKey, (IUnknown**)ppvObj);
|
||||
}
|
||||
|
||||
HRESULT __RPC_STUB IClassFactory2_CreateInstanceLic_Stub(
|
||||
|
|
@ -2255,8 +2265,8 @@ HRESULT __RPC_STUB IClassFactory2_CreateInstanceLic_Stub(
|
|||
BSTR bstrKey,
|
||||
IUnknown **ppvObj)
|
||||
{
|
||||
FIXME("not implemented\n");
|
||||
return E_NOTIMPL;
|
||||
TRACE("(%s, %p)\n", debugstr_guid(riid), ppvObj);
|
||||
return IClassFactory2_CreateInstanceLic(This, NULL, NULL, riid, bstrKey, (void**)ppvObj);
|
||||
}
|
||||
|
||||
HRESULT CALLBACK IEnumConnections_Next_Proxy(
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC.
|
|||
reactos/dll/win32/odbccp32 # Synced to Wine-1.5.19
|
||||
reactos/dll/win32/ole32 # Synced to Wine-1.7.1
|
||||
reactos/dll/win32/oleacc # Autosync
|
||||
reactos/dll/win32/oleaut32 # Synced to Wine-1.5.26
|
||||
reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1
|
||||
reactos/dll/win32/olecli32 # Synced to Wine-1.5.19
|
||||
reactos/dll/win32/oledlg # Autosync
|
||||
reactos/dll/win32/olepro32 # Autosync
|
||||
|
|
|
|||
Loading…
Reference in a new issue