Author: akhaldi
Date: Wed Apr 15 18:10:40 2015
New Revision: 67206
URL:
http://svn.reactos.org/svn/reactos?rev=67206&view=rev
Log:
[PROPSYS] Sync with Wine Staging 1.7.37. CORE-9246
Modified:
trunk/reactos/dll/win32/propsys/propsys_main.c
trunk/reactos/media/doc/README.WINE
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] Wed Apr 15 18:10:40 2015
@@ -280,12 +280,12 @@
/* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */
if (cch <= GUIDSTRING_MAX + 1)
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ return E_NOT_SUFFICIENT_BUFFER;
if (!pkey)
{
psz[0] = '\0';
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ return E_NOT_SUFFICIENT_BUFFER;
}
sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2,
@@ -323,7 +323,7 @@
*p++ = *ptr--;
}
- return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ return E_NOT_SUFFICIENT_BUFFER;
}
}
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] Wed Apr 15 18:10:40 2015
@@ -157,7 +157,7 @@
reactos/dll/win32/pidgen # Synced to Wine-1.7.27
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
reactos/dll/win32/printui # Synced to Wine-1.7.27
-reactos/dll/win32/propsys # Synced to Wine-1.7.27
+reactos/dll/win32/propsys # Synced to WineStaging-1.7.37
reactos/dll/win32/pstorec # Synced to Wine-1.7.27
reactos/dll/win32/qmgr # Synced to Wine-1.7.27
reactos/dll/win32/qmgrprxy # Synced to Wine-1.7.27