Author: cwittich Date: Sat Mar 6 12:53:27 2010 New Revision: 45921
URL: http://svn.reactos.org/svn/reactos?rev=45921&view=rev Log: [PSTOREC] sync pstorec to wine 1.1.40
Added: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl (with props) trunk/reactos/dll/win32/pstorec/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/dll/win32/pstorec/pstorec.rbuild trunk/reactos/include/psdk/pstore.idl
Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.c... ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -388,6 +388,5 @@
HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("\n"); return S_OK; }
Modified: trunk/reactos/dll/win32/pstorec/pstorec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.r... ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,8 +1,18 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="pstorec_tlb" type="embeddedtypelib"> + <dependency>stdole2</dependency> + <file>pstorec_tlb.idl</file> +</module> <module name="pstorec" type="win32dll" baseaddress="${BASEADDRESS_PSTOREC}" installbase="system32" installname="pstorec.dll"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="pstorec.spec" /> - <include base="pstorec">.</include> + <include base="pstorec" root="intermediate">.</include> + <dependency>pstorec_tlb</dependency> <library>wine</library> <library>uuid</library> <file>pstorec.c</file> + <file>rsrc.rc</file> </module> +</group>
Added: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec_t... ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl (added) +++ trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,0 +1,21 @@ +/* + * Typelib for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "pstore.idl"
Propchange: trunk/reactos/dll/win32/pstorec/pstorec_tlb.idl ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/win32/pstorec/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/rsrc.rc?r... ============================================================================== --- trunk/reactos/dll/win32/pstorec/rsrc.rc (added) +++ trunk/reactos/dll/win32/pstorec/rsrc.rc [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -1,0 +1,29 @@ +/* + * Resource file for pstorec + * + * Copyright 2009 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: pstorec_tlb.tlb */ +1 TYPELIB LOADONCALL DISCARDABLE pstorec_tlb.tlb
Propchange: trunk/reactos/dll/win32/pstorec/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/include/psdk/pstore.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pstore.idl?rev... ============================================================================== --- trunk/reactos/include/psdk/pstore.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/pstore.idl [iso-8859-1] Sat Mar 6 12:53:27 2010 @@ -34,6 +34,18 @@ typedef DWORD PST_PROVIDERCAPABILITIES; typedef GUID PST_PROVIDERID, *PPST_PROVIDERID;
+/***************************************************************************** + * PSTOREC library + */ +[ + uuid(5a6f1ebd-2db1-11d0-8c39-00c04fd9126b), + version(1.0), + helpstring("PStore 1.0 Type Library") +] +library PSTORECLib +{ + importlib("stdole2.tlb"); + typedef struct _PST_PROVIDERINFO { DWORD cbSize; @@ -50,27 +62,27 @@ LPCWSTR szPrompt; } PST_PROMPTINFO, *PPST_PROMPTINFO;
-typedef struct { +typedef struct _PST_ACCESSCLAUSE { DWORD cbSize; PST_ACCESSCLAUSETYPE ClauseType; DWORD cbClauseData; BYTE* pbClauseData; } PST_ACCESSCLAUSE, *PPST_ACCESSCLAUSE;
-typedef struct { +typedef struct _PST_ACCESSRULE { DWORD cbSize; PST_ACCESSMODE AccessModeFlags; DWORD cClauses; PST_ACCESSCLAUSE* rgClauses; } PST_ACCESSRULE, *PPST_ACCESSRULE;
-typedef struct { +typedef struct _PST_ACCESSRULESET { DWORD cbSize; DWORD cClause; PST_ACCESSRULE* rgRules; } PST_ACCESSRULESET, *PPST_ACCESSRULESET;
-typedef struct { +typedef struct _PST_TYPEINFO { DWORD cbSize; LPWSTR szDisplayName; } PST_TYPEINFO, *PPST_TYPEINFO; @@ -259,3 +271,5 @@ [in] DWORD dwFlags, [in] IEnumPStoreItems** ppenum ); } + +};
-
cwittich＠svn.reactos.org