[ros-diffs] [gvg] 17662: Sync to Wine-20050830:

Sync to Wine-20050830:
Alexandre Julliard <julliard(a)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(a)codeweavers.com>
- Fix gcc 4.0 warnings.
Modified: trunk/reactos/lib/cabinet/cabinet.h
Modified: trunk/reactos/lib/cabinet/cabinet.spec
Modified: trunk/reactos/lib/cabinet/cabinet_main.c
  _____  

Modified: trunk/reactos/lib/cabinet/cabinet.h
--- trunk/reactos/lib/cabinet/cabinet.h	2005-09-05 20:03:06 UTC (rev
17661)
+++ trunk/reactos/lib/cabinet/cabinet.h	2005-09-05 20:07:46 UTC (rev
17662)
@@ -324,15 +324,15 @@

   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;
  _____  

Modified: trunk/reactos/lib/cabinet/cabinet.spec
--- trunk/reactos/lib/cabinet/cabinet.spec	2005-09-05 20:03:06 UTC
(rev 17661)
+++ trunk/reactos/lib/cabinet/cabinet.spec	2005-09-05 20:07:46 UTC
(rev 17662)
@@ -1,14 +1,14 @@

-1 stub GetDllVersion
-2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion
-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)
+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)
Property changes on: trunk/reactos/lib/cabinet/cabinet.spec
___________________________________________________________________
Name: svn:eol-style
   + native
  _____  

Modified: trunk/reactos/lib/cabinet/cabinet_main.c
--- trunk/reactos/lib/cabinet/cabinet_main.c	2005-09-05 20:03:06 UTC
(rev 17661)
+++ trunk/reactos/lib/cabinet/cabinet_main.c	2005-09-05 20:07:46 UTC
(rev 17662)
@@ -52,7 +52,7 @@

  * 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");