From 14428cf22f5bd8ae96223e196585d562d65c3c3f Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 24 Sep 2009 13:14:55 +0200
Subject: [PATCH] pstorec: Add a typelib resource.

---
 .gitignore                   |  1 +
 dlls/pstorec/Makefile.in     |  4 ++++
 dlls/pstorec/pstorec_tlb.idl | 21 +++++++++++++++++++++
 dlls/pstorec/rsrc.rc         | 29 +++++++++++++++++++++++++++++
 include/pstore.idl           | 22 ++++++++++++++++++----
 tools/wine.inf.in            |  1 +
 6 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 dlls/pstorec/pstorec_tlb.idl
 create mode 100644 dlls/pstorec/rsrc.rc

diff --git a/.gitignore b/.gitignore
index 5bff9b0a6ed..418244e96b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,6 +102,7 @@ dlls/oledb32/convert.h
 dlls/oledb32/convert_i.c
 dlls/oledb32/tests/convert.h
 dlls/oledb32/tests/convert_i.c
+dlls/pstorec/pstorec_tlb.tlb
 dlls/qmgr/qmgr_local.h
 dlls/qmgr/qmgr_local_i.c
 dlls/qmgrprxy/qmgrprxy.h
diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in
index 4ffedc8f10c..c754081be13 100644
--- a/dlls/pstorec/Makefile.in
+++ b/dlls/pstorec/Makefile.in
@@ -8,6 +8,10 @@ IMPORTS   = uuid kernel32
 C_SRCS = \
 	pstorec.c
 
+RC_SRCS = rsrc.rc
+
+IDL_TLB_SRCS = pstorec_tlb.idl
+
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/pstorec/pstorec_tlb.idl b/dlls/pstorec/pstorec_tlb.idl
new file mode 100644
index 00000000000..dff2e9fcb3b
--- /dev/null
+++ b/dlls/pstorec/pstorec_tlb.idl
@@ -0,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"
diff --git a/dlls/pstorec/rsrc.rc b/dlls/pstorec/rsrc.rc
new file mode 100644
index 00000000000..85b6205eec8
--- /dev/null
+++ b/dlls/pstorec/rsrc.rc
@@ -0,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
diff --git a/include/pstore.idl b/include/pstore.idl
index 62ce00b8da1..590b905df3d 100644
--- a/include/pstore.idl
+++ b/include/pstore.idl
@@ -34,6 +34,18 @@ typedef DWORD PST_KEY;
 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 @@ typedef struct _PST_PROMPTINFO
     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 @@ interface IPStore : IUnknown
         [in] DWORD dwFlags,
         [in] IEnumPStoreItems** ppenum );
 }
+
+};
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index aedf14e1819..633d8079917 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2497,6 +2497,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,opengl32.dll
 11,,progman.exe
 11,,psapi.dll
+11,,pstorec.dll
 11,,quartz.dll
 11,,regsvr32.exe
 11,,reg.exe