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
This commit is contained in:
Gé van Geldorp 2005-09-05 20:07:46 +00:00
parent 5d793513d1
commit ae18f3a1cc
3 changed files with 20 additions and 20 deletions

View file

@ -324,15 +324,15 @@ typedef struct {
cab_ULONG cDataBlocks; cab_ULONG cDataBlocks;
cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */ cab_ULONG cbFileRemainer; /* uncompressed, yet to be written data */
/* of spanned file of a spanning folder of a spanning cabinet */ /* of spanned file of a spanning folder of a spanning cabinet */
cab_UBYTE szFileNameCFDATA1[CB_MAX_FILENAME]; char szFileNameCFDATA1[CB_MAX_FILENAME];
int handleCFDATA1; int handleCFDATA1;
cab_UBYTE szFileNameCFFILE1[CB_MAX_FILENAME]; char szFileNameCFFILE1[CB_MAX_FILENAME];
int handleCFFILE1; int handleCFFILE1;
cab_UBYTE szFileNameCFDATA2[CB_MAX_FILENAME]; char szFileNameCFDATA2[CB_MAX_FILENAME];
int handleCFDATA2; int handleCFDATA2;
cab_UBYTE szFileNameCFFILE2[CB_MAX_FILENAME]; char szFileNameCFFILE2[CB_MAX_FILENAME];
int handleCFFILE2; int handleCFFILE2;
cab_UBYTE szFileNameCFFOLDER[CB_MAX_FILENAME]; char szFileNameCFFOLDER[CB_MAX_FILENAME];
int handleCFFOLDER; int handleCFFOLDER;
cab_ULONG sizeFileCFDATA1; cab_ULONG sizeFileCFDATA1;
cab_ULONG sizeFileCFFILE1; cab_ULONG sizeFileCFFILE1;

View file

@ -1,14 +1,14 @@
1 stub GetDllVersion 1 stub GetDllVersion
2 stdcall DllGetVersion (ptr) CABINET_DllGetVersion 2 stdcall -private DllGetVersion (ptr)
3 stdcall Extract(ptr str) 3 stdcall Extract(ptr str)
4 stub DeleteExtractedFiles 4 stub DeleteExtractedFiles
10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) 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) 11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long)
12 cdecl FCIFlushFolder(long ptr ptr) 12 cdecl FCIFlushFolder(long ptr ptr)
13 cdecl FCIFlushCabinet(long long ptr ptr) 13 cdecl FCIFlushCabinet(long long ptr ptr)
14 cdecl FCIDestroy(long) 14 cdecl FCIDestroy(long)
20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr) 20 cdecl FDICreate(ptr ptr ptr ptr ptr ptr ptr long ptr)
21 cdecl FDIIsCabinet(long long ptr) 21 cdecl FDIIsCabinet(long long ptr)
22 cdecl FDICopy(long ptr ptr long ptr ptr ptr) 22 cdecl FDICopy(long ptr ptr long ptr ptr ptr)
23 cdecl FDIDestroy(long) 23 cdecl FDIDestroy(long)
24 cdecl FDITruncateCabinet(long ptr long) 24 cdecl FDITruncateCabinet(long ptr long)

View file

@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
* NOTES * NOTES
* Supposedly returns version from IE6SP1RP1 * 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"); WARN("hmmm... not right version number \"5.1.1106.1\"?\n");