Author: akhaldi
Date: Sun Jan 29 22:24:35 2012
New Revision: 55297
URL: http://svn.reactos.org/svn/reactos?rev=55297&view=rev
Log:
[PSTOREC]
* Sync to Wine 1.3.37.
Added:
trunk/reactos/dll/win32/pstorec/pstorec.rgs (with props)
Modified:
trunk/reactos/dll/win32/pstorec/pstorec.c
trunk/reactos/dll/win32/pstorec/rsrc.rc
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/pstorec/pstorec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.c?rev=55297&r1=55296&r2=55297&view=diff
==============================================================================
--- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sun Jan 29 22:24:35
2012
@@ -33,9 +33,14 @@
typedef struct
{
- const IPStoreVtbl *lpVtbl;
+ IPStore IPStore_iface;
LONG ref;
} PStore_impl;
+
+static inline PStore_impl *impl_from_IPStore(IPStore *iface)
+{
+ return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface);
+}
BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
{
@@ -62,7 +67,7 @@
REFIID riid,
LPVOID *ppvObj)
{
- PStore_impl *This = (PStore_impl *)iface;
+ PStore_impl *This = impl_from_IPStore(iface);
TRACE("%p %s\n",This,debugstr_guid(riid));
@@ -87,7 +92,7 @@
*/
static ULONG WINAPI PStore_fnAddRef(IPStore* iface)
{
- PStore_impl *This = (PStore_impl *)iface;
+ PStore_impl *This = impl_from_IPStore(iface);
TRACE("%p %u\n", This, This->ref);
@@ -99,7 +104,7 @@
*/
static ULONG WINAPI PStore_fnRelease(IPStore* iface)
{
- PStore_impl *This = (PStore_impl *)iface;
+ PStore_impl *This = impl_from_IPStore(iface);
LONG ref;
TRACE("%p %u\n", This, This->ref);
@@ -359,7 +364,7 @@
if( !ips )
return E_OUTOFMEMORY;
- ips->lpVtbl = &pstores_vtbl;
+ ips->IPStore_iface.lpVtbl = &pstores_vtbl;
ips->ref = 1;
*ppProvider = (IPStore*) ips;
Added: trunk/reactos/dll/win32/pstorec/pstorec.rgs
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.rgs?rev=55297&view=auto
==============================================================================
--- trunk/reactos/dll/win32/pstorec/pstorec.rgs (added)
+++ trunk/reactos/dll/win32/pstorec/pstorec.rgs [iso-8859-1] Sun Jan 29
22:24:35 2012
@@ -1,0 +1,20 @@
+HKCR
+{
+ NoRemove Typelib
+ {
+ NoRemove '{5A6F1EBD-2DB1-11D0-8C39-00C04FD9126B}'
+ {
+ '1.0' = s 'PStore 1.0 Type Library'
+ {
+ '0' { win32 = s '%MODULE%' }
+ FLAGS = s '0'
+ }
+ }
+ }
+ NoRemove Interface
+ {
+ }
+ NoRemove CLSID
+ {
+ }
+}
Propchange: trunk/reactos/dll/win32/pstorec/pstorec.rgs
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/pstorec/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/rsrc.rc?rev=55297&r1=55296&r2=55297&view=diff
==============================================================================
--- trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] Sun Jan 29 22:24:35
2012
@@ -27,3 +27,5 @@
/* @makedep: pstorec_tlb.tlb */
1 TYPELIB pstorec_tlb.tlb
+
+2 WINE_REGISTRY pstorec.rgs
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=55297&r1=55296&r2=55297&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jan 29 22:24:35 2012
@@ -134,7 +134,7 @@
reactos/dll/win32/pidgen # Autosync
reactos/dll/win32/powrprof # Forked at Wine-1.0rc5
reactos/dll/win32/printui # Synced to Wine-1.3.37
-reactos/dll/win32/pstorec # Autosync
+reactos/dll/win32/pstorec # Synced to Wine-1.3.37
reactos/dll/win32/query # Autosync
reactos/dll/win32/rasapi32 # Autosync
reactos/dll/win32/resutils # Autosync
