26 Apr
2014
26 Apr
'14
5:56 p.m.
Author: akhaldi
Date: Sat Apr 26 17:56:51 2014
New Revision: 62995
URL: http://svn.reactos.org/svn/reactos?rev=62995&view=rev
Log:
[PROPSYS]
* Sync with Wine 1.7.17.
CORE-8080
Modified:
trunk/reactos/dll/win32/propsys/propstore.c
trunk/reactos/dll/win32/propsys/propsys.spec
trunk/reactos/dll/win32/propsys/propsys_classes.idl
trunk/reactos/dll/win32/propsys/propsys_main.c
trunk/reactos/dll/win32/propsys/propvar.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/propsys/propstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propstor…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propstore.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propstore.c [iso-8859-1] Sat Apr 26 17:56:51 2014
@@ -190,7 +190,7 @@
}
static HRESULT PropertyStore_LookupValue(PropertyStore *This, REFPROPERTYKEY key,
- int insert, propstore_value **result)
+ BOOL insert, propstore_value **result)
{
propstore_format *format=NULL, *format_candidate;
propstore_value *value=NULL, *value_candidate;
@@ -268,7 +268,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 0, &value);
+ hr = PropertyStore_LookupValue(This, key, FALSE, &value);
if (SUCCEEDED(hr))
hr = PropVariantCopy(pv, &value->propvar);
@@ -295,7 +295,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 1, &value);
+ hr = PropertyStore_LookupValue(This, key, TRUE, &value);
if (SUCCEEDED(hr))
hr = PropVariantCopy(&temp, propvar);
@@ -328,7 +328,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 0, &value);
+ hr = PropertyStore_LookupValue(This, key, FALSE, &value);
if (SUCCEEDED(hr))
*pstate = value->state;
@@ -352,7 +352,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 0, &value);
+ hr = PropertyStore_LookupValue(This, key, FALSE, &value);
if (SUCCEEDED(hr))
hr = PropVariantCopy(ppropvar, &value->propvar);
@@ -382,7 +382,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 0, &value);
+ hr = PropertyStore_LookupValue(This, key, FALSE, &value);
if (SUCCEEDED(hr))
value->state = pstate;
@@ -404,7 +404,7 @@
EnterCriticalSection(&This->lock);
- hr = PropertyStore_LookupValue(This, key, 1, &value);
+ hr = PropertyStore_LookupValue(This, key, TRUE, &value);
if (SUCCEEDED(hr))
hr = PropVariantCopy(&temp, ppropvar);
Modified: trunk/reactos/dll/win32/propsys/propsys.spec
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys.…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys.spec [iso-8859-1] Sat Apr 26 17:56:51 2014
@@ -82,7 +82,7 @@
@ stub PSGetNamedPropertyFromPropertyStorage
@ stdcall PSGetPropertyDescription(ptr ptr ptr)
@ stub PSGetPropertyDescriptionByName
-@ stub PSGetPropertyDescriptionListFromString
+@ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr)
@ stub PSGetPropertyFromPropertyStorage
@ stub PSGetPropertyKeyFromName
@ stub PSGetPropertySystem
Modified: trunk/reactos/dll/win32/propsys/propsys_classes.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys_classes.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys_classes.idl [iso-8859-1] Sat Apr 26 17:56:51
2014
@@ -18,6 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#pragma makedep register
+
[
helpstring("Packed Property Storage Object"),
threading(both),
Modified: trunk/reactos/dll/win32/propsys/propsys_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys_main.c [iso-8859-1] Sat Apr 26 17:56:51 2014
@@ -146,6 +146,12 @@
return E_NOTIMPL;
}
+HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID riid, void
**ppv)
+{
+ FIXME("%s, %p, %p\n", debugstr_w(proplist), riid, ppv);
+ return E_NOTIMPL;
+}
+
HRESULT WINAPI PSRefreshPropertySchema(void)
{
FIXME("\n");
@@ -302,7 +308,7 @@
HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey)
{
- int has_minus = 0, has_comma = 0;
+ BOOL has_minus = FALSE, has_comma = FALSE;
TRACE("(%s, %p)\n", debugstr_w(pszString), pkey);
@@ -328,7 +334,7 @@
if (has_comma)
return S_OK;
else
- has_comma = 1;
+ has_comma = TRUE;
}
pszString++;
}
@@ -344,7 +350,7 @@
{
if (*pszString == '-')
{
- has_minus = 1;
+ has_minus = TRUE;
pszString++;
}
}
@@ -359,7 +365,7 @@
if (*pszString == '-')
{
- has_minus = 1;
+ has_minus = TRUE;
pszString++;
}
Modified: trunk/reactos/dll/win32/propsys/propvar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propvar.…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propvar.c [iso-8859-1] Sat Apr 26 17:56:51 2014
@@ -58,46 +58,46 @@
}
static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits,
- int dest_signed, LONGLONG *res)
-{
- int src_signed;
+ BOOL dest_signed, LONGLONG *res)
+{
+ BOOL src_signed;
switch (pv->vt)
{
case VT_I1:
- src_signed = 1;
+ src_signed = TRUE;
*res = pv->u.cVal;
break;
case VT_UI1:
- src_signed = 0;
+ src_signed = FALSE;
*res = pv->u.bVal;
break;
case VT_I2:
- src_signed = 1;
+ src_signed = TRUE;
*res = pv->u.iVal;
break;
case VT_UI2:
- src_signed = 0;
+ src_signed = FALSE;
*res = pv->u.uiVal;
break;
case VT_I4:
- src_signed = 1;
+ src_signed = TRUE;
*res = pv->u.lVal;
break;
case VT_UI4:
- src_signed = 0;
+ src_signed = FALSE;
*res = pv->u.ulVal;
break;
case VT_I8:
- src_signed = 1;
+ src_signed = TRUE;
*res = pv->u.hVal.QuadPart;
break;
case VT_UI8:
- src_signed = 0;
+ src_signed = FALSE;
*res = pv->u.uhVal.QuadPart;
break;
case VT_EMPTY:
- src_signed = 0;
+ src_signed = FALSE;
*res = 0;
break;
default:
@@ -133,7 +133,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 16, 1, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 16, TRUE, &res);
if (SUCCEEDED(hr)) *ret = (SHORT)res;
return hr;
}
@@ -145,7 +145,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 32, 1, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 32, TRUE, &res);
if (SUCCEEDED(hr)) *ret = (LONG)res;
return hr;
}
@@ -157,7 +157,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 64, 1, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 64, TRUE, &res);
if (SUCCEEDED(hr)) *ret = (LONGLONG)res;
return hr;
}
@@ -169,7 +169,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 16, 0, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 16, FALSE, &res);
if (SUCCEEDED(hr)) *ret = (USHORT)res;
return hr;
}
@@ -181,7 +181,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 32, 0, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 32, FALSE, &res);
if (SUCCEEDED(hr)) *ret = (ULONG)res;
return hr;
}
@@ -193,7 +193,7 @@
TRACE("%p,%p\n", propvarIn, ret);
- hr = PROPVAR_ConvertNumber(propvarIn, 64, 0, &res);
+ hr = PROPVAR_ConvertNumber(propvarIn, 64, FALSE, &res);
if (SUCCEEDED(hr)) *ret = (ULONGLONG)res;
return hr;
}
@@ -486,10 +486,10 @@
}
}
-static int isemptyornull(const PROPVARIANT *propvar)
+static BOOL isemptyornull(const PROPVARIANT *propvar)
{
if (propvar->vt == VT_EMPTY || propvar->vt == VT_NULL)
- return 1;
+ return TRUE;
if ((propvar->vt & VT_ARRAY) == VT_ARRAY)
{
int i;
@@ -501,7 +501,7 @@
return i == propvar->u.parray->cDims;
}
/* FIXME: vectors, byrefs, errors? */
- return 0;
+ return FALSE;
}
INT WINAPI PropVariantCompareEx(REFPROPVARIANT propvar1, REFPROPVARIANT propvar2,
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Apr 26 17:56:51 2014
@@ -157,7 +157,7 @@
reactos/dll/win32/pidgen # Synced to Wine-1.7.1
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
reactos/dll/win32/printui # Synced to Wine-1.7.1
-reactos/dll/win32/propsys # Synced to Wine-1.7.1
+reactos/dll/win32/propsys # Synced to Wine-1.7.17
reactos/dll/win32/pstorec # Synced to Wine-1.7.1
reactos/dll/win32/qmgr # Synced to Wine-1.7.1
reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.1
3853
days inactive
3853
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org