Alexandre Julliard : version: Moved GetFileResourceSize16/ GetFileResource16 to ver16.c.
Alexandre Julliard
julliard at winehq.org
Thu Oct 1 09:48:19 CDT 2009
Module: wine
Branch: master
Commit: dbbc40affa69a66d2f0993492e5e910210835ceb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbc40affa69a66d2f0993492e5e910210835ceb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Oct 1 13:56:13 2009 +0200
version: Moved GetFileResourceSize16/GetFileResource16 to ver16.c.
---
dlls/version/resource.c | 58 ---------------------------------------------
dlls/version/ver16.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 58 deletions(-)
diff --git a/dlls/version/resource.c b/dlls/version/resource.c
index 2523aaa..0f8e086 100644
--- a/dlls/version/resource.c
+++ b/dlls/version/resource.c
@@ -408,61 +408,3 @@ DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *o
}
return magic;
}
-
-
-/*************************************************************************
- * GetFileResourceSize [VER.2]
- */
-DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
- LPCSTR lpszResId, LPDWORD lpdwFileOffset )
-{
- HFILE lzfd;
- OFSTRUCT ofs;
- DWORD reslen = 0;
-
- TRACE("(%s,type=%p,id=%p,off=%p)\n",
- debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId );
-
- lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
- if (lzfd >= 0)
- {
- if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0;
- LZClose( lzfd );
- }
- return reslen;
-}
-
-
-/*************************************************************************
- * GetFileResource [VER.3]
- */
-DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
- LPCSTR lpszResId, DWORD dwFileOffset,
- DWORD dwResLen, LPVOID lpvData )
-{
- HFILE lzfd;
- OFSTRUCT ofs;
- DWORD reslen = dwResLen;
-
- TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n",
- debugstr_a(lpszFileName), lpszResType, lpszResId,
- dwFileOffset, dwResLen, lpvData );
-
- lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
- if ( lzfd < 0 ) return 0;
-
- if ( !dwFileOffset )
- {
- if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset ))
- {
- LZClose( lzfd );
- return 0;
- }
- }
-
- LZSeek( lzfd, dwFileOffset, SEEK_SET );
- reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) );
- LZClose( lzfd );
-
- return reslen;
-}
diff --git a/dlls/version/ver16.c b/dlls/version/ver16.c
index 3ffb920..f399cd2 100644
--- a/dlls/version/ver16.c
+++ b/dlls/version/ver16.c
@@ -23,11 +23,71 @@
#include "windef.h"
#include "wine/winbase16.h"
#include "winver.h"
+#include "lzexpand.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(ver);
+extern DWORD find_resource( HFILE lzfd, LPCSTR type, LPCSTR id, DWORD *reslen, DWORD *offset );
+
+/*************************************************************************
+ * GetFileResourceSize [VER.2]
+ */
+DWORD WINAPI GetFileResourceSize16( LPCSTR lpszFileName, LPCSTR lpszResType,
+ LPCSTR lpszResId, LPDWORD lpdwFileOffset )
+{
+ HFILE lzfd;
+ OFSTRUCT ofs;
+ DWORD reslen = 0;
+
+ TRACE("(%s,type=%p,id=%p,off=%p)\n",
+ debugstr_a(lpszFileName), lpszResType, lpszResId, lpszResId );
+
+ lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
+ if (lzfd >= 0)
+ {
+ if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, lpdwFileOffset )) reslen = 0;
+ LZClose( lzfd );
+ }
+ return reslen;
+}
+
+
+/*************************************************************************
+ * GetFileResource [VER.3]
+ */
+DWORD WINAPI GetFileResource16( LPCSTR lpszFileName, LPCSTR lpszResType,
+ LPCSTR lpszResId, DWORD dwFileOffset,
+ DWORD dwResLen, LPVOID lpvData )
+{
+ HFILE lzfd;
+ OFSTRUCT ofs;
+ DWORD reslen = dwResLen;
+
+ TRACE("(%s,type=%p,id=%p,off=%d,len=%d,data=%p)\n",
+ debugstr_a(lpszFileName), lpszResType, lpszResId,
+ dwFileOffset, dwResLen, lpvData );
+
+ lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
+ if ( lzfd < 0 ) return 0;
+
+ if ( !dwFileOffset )
+ {
+ if (!find_resource( lzfd, lpszResType, lpszResId, &reslen, &dwFileOffset ))
+ {
+ LZClose( lzfd );
+ return 0;
+ }
+ }
+
+ LZSeek( lzfd, dwFileOffset, 0 /* SEEK_SET */ );
+ reslen = LZRead( lzfd, lpvData, min( reslen, dwResLen ) );
+ LZClose( lzfd );
+
+ return reslen;
+}
+
/*************************************************************************
* GetFileVersionInfoSize [VER.6]
*/
More information about the wine-cvs
mailing list