Sync to Wine-20050830:

Alexandre Julliard <julliard@winehq.org>
- Don't prefix the functions DllCanUnloadNow, DllGetClassObject and
  Dll(Un)RegisterServer with the dll name so that the compiler can check
  the prototypes.
Mike McCormack <mike@codeweavers.com>
- Fix gcc 4.0 warnings.

svn path=/trunk/; revision=17662

diff --git a/reactos/lib/cabinet/cabinet.h b/reactos/lib/cabinet/cabinet.h
index bb18ae0..c70d639 100644 (file)
--- a/reactos/lib/cabinet/cabinet.h
+++ b/reactos/lib/cabinet/cabinet.h
@@ -324,15 +324,15 @@ typedef struct {
   cab_ULONG          cDataBlocks;
   cab_ULONG          cbFileRemainer; /* uncompressed, yet to be written data */
                /* of spanned file of a spanning folder of a spanning cabinet */
-  cab_UBYTE          szFileNameCFDATA1[CB_MAX_FILENAME];
+  char               szFileNameCFDATA1[CB_MAX_FILENAME];
   int                handleCFDATA1;
-  cab_UBYTE          szFileNameCFFILE1[CB_MAX_FILENAME];
+  char               szFileNameCFFILE1[CB_MAX_FILENAME];
   int                handleCFFILE1;
-  cab_UBYTE          szFileNameCFDATA2[CB_MAX_FILENAME];
+  char               szFileNameCFDATA2[CB_MAX_FILENAME];
   int                handleCFDATA2;
-  cab_UBYTE          szFileNameCFFILE2[CB_MAX_FILENAME];
+  char               szFileNameCFFILE2[CB_MAX_FILENAME];
   int                handleCFFILE2;
-  cab_UBYTE          szFileNameCFFOLDER[CB_MAX_FILENAME];
+  char               szFileNameCFFOLDER[CB_MAX_FILENAME];
   int                handleCFFOLDER;
   cab_ULONG          sizeFileCFDATA1;
   cab_ULONG          sizeFileCFFILE1;

diff --git a/reactos/lib/cabinet/cabinet.spec b/reactos/lib/cabinet/cabinet.spec
index ff50180..96127cf 100644 (file)
--- a/reactos/lib/cabinet/cabinet.spec
+++ b/reactos/lib/cabinet/cabinet.spec
@@ -1,14 +1,14 @@
-1 stub GetDllVersion\r
-2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion\r
-3 stdcall Extract(ptr str)\r
-4 stub DeleteExtractedFiles\r
-10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)\r
-11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long)\r
-12 cdecl FCIFlushFolder(long ptr ptr)\r
-13 cdecl FCIFlushCabinet(long long ptr ptr)\r
-14 cdecl FCIDestroy(long)\r
-20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr)\r
-21 cdecl FDIIsCabinet(long long ptr)\r
-22 cdecl FDICopy(long ptr ptr long ptr ptr ptr)\r
-23 cdecl FDIDestroy(long)\r
-24 cdecl FDITruncateCabinet(long ptr long)\r
+1 stub GetDllVersion
+2 stdcall -private DllGetVersion (ptr)
+3 stdcall Extract(ptr str)
+4 stub DeleteExtractedFiles
+10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr)
+11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long)
+12 cdecl FCIFlushFolder(long ptr ptr)
+13 cdecl FCIFlushCabinet(long long ptr ptr)
+14 cdecl FCIDestroy(long)
+20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr)
+21 cdecl FDIIsCabinet(long long ptr)
+22 cdecl FDICopy(long ptr ptr long ptr ptr ptr)
+23 cdecl FDIDestroy(long)
+24 cdecl FDITruncateCabinet(long ptr long)

diff --git a/reactos/lib/cabinet/cabinet_main.c b/reactos/lib/cabinet/cabinet_main.c
index cd92357..5d61324 100644 (file)
--- a/reactos/lib/cabinet/cabinet_main.c
+++ b/reactos/lib/cabinet/cabinet_main.c
@@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
  * NOTES
  *     Supposedly returns version from IE6SP1RP1
  */
-HRESULT WINAPI CABINET_DllGetVersion (DLLVERSIONINFO *pdvi)
+HRESULT WINAPI DllGetVersion (DLLVERSIONINFO *pdvi)
 {
   WARN("hmmm... not right version number \"5.1.1106.1\"?\n");