Huw Davies : ole32: Move private data structure out of header file.

Alexandre Julliard julliard at winehq.org
Wed Jan 28 08:03:10 CST 2009


Module: wine
Branch: master
Commit: 70ee1123376cfd137ea778fbea225c780588765f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=70ee1123376cfd137ea778fbea225c780588765f

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Jan 27 15:27:08 2009 +0000

ole32: Move private data structure out of header file.

---

 dlls/ole32/stg_bigblockfile.c |   18 ++++++++++++++++++
 dlls/ole32/storage32.h        |   20 --------------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c
index a2ee1de..0d7b366 100644
--- a/dlls/ole32/stg_bigblockfile.c
+++ b/dlls/ole32/stg_bigblockfile.c
@@ -85,6 +85,8 @@ typedef struct
  * file this mapping represents. (The mappings are always
  * PAGE_SIZE-aligned.)
  */
+
+typedef struct MappedPage MappedPage;
 struct MappedPage
 {
     MappedPage *next;
@@ -99,6 +101,22 @@ struct MappedPage
     BlockBits writable_blocks;
 };
 
+struct BigBlockFile
+{
+    BOOL fileBased;
+    ULARGE_INTEGER filesize;
+    ULONG blocksize;
+    HANDLE hfile;
+    HANDLE hfilemap;
+    DWORD flProtect;
+    MappedPage *maplist;
+    MappedPage *victimhead, *victimtail;
+    ULONG num_victim_pages;
+    ILockBytes *pLkbyt;
+    HGLOBAL hbytearray;
+    LPVOID pbytearray;
+};
+
 /***********************************************************
  * Prototypes for private methods
  */
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index b358ed2..639ec6a 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -152,27 +152,7 @@ struct StgProperty
  * this section appear in stg_bigblockfile.c
  */
 
-/*
- * Declaration of the data structures
- */
 typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE;
-typedef struct MappedPage   MappedPage,*LPMAPPEDPAGE;
-
-struct BigBlockFile
-{
-  BOOL fileBased;
-  ULARGE_INTEGER filesize;
-  ULONG blocksize;
-  HANDLE hfile;
-  HANDLE hfilemap;
-  DWORD flProtect;
-  MappedPage *maplist;
-  MappedPage *victimhead, *victimtail;
-  ULONG num_victim_pages;
-  ILockBytes *pLkbyt;
-  HGLOBAL hbytearray;
-  LPVOID pbytearray;
-};
 
 /*
  * Declaration of the functions used to manipulate the BigBlockFile




More information about the wine-cvs mailing list