mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 02:34:53 +00:00
[PROPSYS] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72302
This commit is contained in:
parent
c5ba8fbb12
commit
df418ff838
|
@ -135,7 +135,7 @@
|
||||||
@ stub PropVariantToInt64WithDefault
|
@ stub PropVariantToInt64WithDefault
|
||||||
@ stub PropVariantToStrRet
|
@ stub PropVariantToStrRet
|
||||||
@ stub PropVariantToString
|
@ stub PropVariantToString
|
||||||
@ stub PropVariantToStringAlloc
|
@ stdcall PropVariantToStringAlloc(ptr ptr)
|
||||||
@ stub PropVariantToStringVector
|
@ stub PropVariantToStringVector
|
||||||
@ stub PropVariantToStringVectorAlloc
|
@ stub PropVariantToStringVectorAlloc
|
||||||
@ stub PropVariantToStringWithDefault
|
@ stub PropVariantToStringWithDefault
|
||||||
|
|
|
@ -198,6 +198,43 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret)
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret)
|
||||||
|
{
|
||||||
|
WCHAR *res = NULL;
|
||||||
|
HRESULT hr = S_OK;
|
||||||
|
|
||||||
|
TRACE("%p,%p semi-stub\n", propvarIn, ret);
|
||||||
|
|
||||||
|
switch(propvarIn->vt)
|
||||||
|
{
|
||||||
|
case VT_NULL:
|
||||||
|
res = CoTaskMemAlloc(1*sizeof(WCHAR));
|
||||||
|
res[0] = '\0';
|
||||||
|
break;
|
||||||
|
case VT_LPSTR:
|
||||||
|
if(propvarIn->u.pszVal)
|
||||||
|
{
|
||||||
|
DWORD len;
|
||||||
|
|
||||||
|
len = MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, NULL, 0);
|
||||||
|
res = CoTaskMemAlloc(len*sizeof(WCHAR));
|
||||||
|
if(!res)
|
||||||
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
MultiByteToWideChar(CP_ACP, 0, propvarIn->u.pszVal, -1, res, len);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
FIXME("Unsupported conversion (%d)\n", propvarIn->vt);
|
||||||
|
hr = E_FAIL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
*ret = res;
|
||||||
|
|
||||||
|
return hr;
|
||||||
|
}
|
||||||
|
|
||||||
/******************************************************************
|
/******************************************************************
|
||||||
* PropVariantChangeType (PROPSYS.@)
|
* PropVariantChangeType (PROPSYS.@)
|
||||||
*/
|
*/
|
||||||
|
@ -209,6 +246,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p
|
||||||
FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc,
|
FIXME("(%p, %p, %d, %d, %d): semi-stub!\n", ppropvarDest, propvarSrc,
|
||||||
propvarSrc->vt, flags, vt);
|
propvarSrc->vt, flags, vt);
|
||||||
|
|
||||||
|
if(vt == propvarSrc->vt)
|
||||||
|
return PropVariantCopy(ppropvarDest, propvarSrc);
|
||||||
|
|
||||||
switch (vt)
|
switch (vt)
|
||||||
{
|
{
|
||||||
case VT_I2:
|
case VT_I2:
|
||||||
|
@ -277,6 +317,17 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p
|
||||||
}
|
}
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
case VT_LPWSTR:
|
||||||
|
{
|
||||||
|
WCHAR *res;
|
||||||
|
hr = PropVariantToStringAlloc(propvarSrc, &res);
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
ppropvarDest->vt = VT_LPWSTR;
|
||||||
|
ppropvarDest->u.pwszVal = res;
|
||||||
|
}
|
||||||
|
return hr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (propvarSrc->vt)
|
switch (propvarSrc->vt)
|
||||||
|
|
|
@ -154,7 +154,7 @@ reactos/dll/win32/pdh # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/win32/pidgen # Synced to WineStaging-1.9.11
|
reactos/dll/win32/pidgen # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
|
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
|
||||||
reactos/dll/win32/printui # Synced to WineStaging-1.9.11
|
reactos/dll/win32/printui # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/win32/propsys # Synced to WineStaging-1.9.11
|
reactos/dll/win32/propsys # Synced to WineStaging-1.9.16
|
||||||
reactos/dll/win32/pstorec # Synced to WineStaging-1.9.11
|
reactos/dll/win32/pstorec # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11
|
reactos/dll/win32/qmgr # Synced to WineStaging-1.9.11
|
||||||
reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.11
|
reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.11
|
||||||
|
|
Loading…
Reference in a new issue