Fix some problems found while compiling and linking Wine under Cygwin

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

Changelog:
    Fix some problems found while compiling and linking Wine under Cygwin.

diff -u cvs/hq/wine/dlls/commdlg/Makefile.in wine/dlls/commdlg/Makefile.in
--- cvs/hq/wine/dlls/commdlg/Makefile.in	Fri Dec 13 06:12:34 2002
+++ wine/dlls/commdlg/Makefile.in	Wed Feb 05 01:16:34 2003
@@ -3,7 +3,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = comdlg32.dll
-IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32
+IMPORTS   = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
 ALTNAMES  = commdlg.dll
 EXTRALIBS = $(LIBUUID)
 
diff -u cvs/hq/wine/dlls/gdi/Makefile.in wine/dlls/gdi/Makefile.in
--- cvs/hq/wine/dlls/gdi/Makefile.in	Thu Jan 09 04:41:30 2003
+++ wine/dlls/gdi/Makefile.in	Wed Feb 05 02:33:46 2003
@@ -4,7 +4,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = gdi32.dll
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 ALTNAMES  = gdi.exe dispdib.dll wing.dll
 EXTRAINCL = @FREETYPEINCL@
 EXTRALIBS = $(LIBUNICODE)
diff -u cvs/hq/wine/dlls/kernel/Makefile.in wine/dlls/kernel/Makefile.in
--- cvs/hq/wine/dlls/kernel/Makefile.in	Thu Jan 09 04:41:30 2003
+++ wine/dlls/kernel/Makefile.in	Wed Feb 05 03:05:08 2003
@@ -7,6 +7,7 @@
 IMPORTS   = ntdll
 ALTNAMES  = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll
 LDIMPORTS = ntdll.dll
+EXTRALIBS = $(LIBUNICODE)
 DLLMAIN   = MAIN_KernelInit
 
 C_SRCS = \
diff -u cvs/hq/wine/dlls/oleaut32/Makefile.in wine/dlls/oleaut32/Makefile.in
--- cvs/hq/wine/dlls/oleaut32/Makefile.in	Thu Jan 16 01:36:54 2003
+++ wine/dlls/oleaut32/Makefile.in	Wed Feb 05 03:17:04 2003
@@ -4,7 +4,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = oleaut32.dll
-IMPORTS   = ole32 user32 gdi32 advapi32 kernel32
+IMPORTS   = ole32 user32 gdi32 advapi32 kernel32 ntdll
 DELAYIMPORTS = comctl32
 ALTNAMES  = ole2disp.dll typelib.dll
 EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
diff -u cvs/hq/wine/dlls/urlmon/umon.c wine/dlls/urlmon/umon.c
--- cvs/hq/wine/dlls/urlmon/umon.c	Thu Jan 16 01:36:56 2003
+++ wine/dlls/urlmon/umon.c	Wed Feb 05 03:41:28 2003
@@ -890,7 +890,7 @@
  *    INET_E_QUERYOPTIONUNKNOWN	invalid option
  *
  */
-HRESULT CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption,
+HRESULT WINAPI CoInternetQueryInfo(LPCWSTR pwzUrl, QUERYOPTION QueryOption,
   DWORD dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD * pcbBuffer,
   DWORD dwReserved)
 {
diff -u cvs/hq/wine/dlls/user/Makefile.in wine/dlls/user/Makefile.in
--- cvs/hq/wine/dlls/user/Makefile.in	Thu Jan 09 04:41:30 2003
+++ wine/dlls/user/Makefile.in	Wed Feb 05 03:45:24 2003
@@ -4,7 +4,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = user32.dll
-IMPORTS   = gdi32 advapi32 kernel32
+IMPORTS   = gdi32 advapi32 kernel32 ntdll
 ALTNAMES  = user.exe keyboard.dll ddeml.dll display.dll mouse.dll
 EXTRALIBS = $(LIBUNICODE)
 DLLMAIN   = UserClientDllInitialize
diff -u cvs/hq/wine/dlls/wininet/urlcache.c wine/dlls/wininet/urlcache.c
--- cvs/hq/wine/dlls/wininet/urlcache.c	Sat Dec 07 07:28:56 2002
+++ wine/dlls/wininet/urlcache.c	Wed Feb 05 05:18:16 2003
@@ -95,7 +95,7 @@
 BOOL WINAPI CommitUrlCacheEntryA(LPCSTR lpszUrl, LPCSTR lpszLocalName,
     FILETIME ExpireTime, FILETIME lastModified, DWORD cacheEntryType,
     LPBYTE lpHeaderInfo, DWORD headerSize, LPCSTR fileExtension,
-    DWORD originalUrl)
+    LPCSTR originalUrl)
 {
     FIXME("stub\n");
     return FALSE;
diff -u cvs/hq/wine/dlls/wininet/wininet.spec wine/dlls/wininet/wininet.spec
--- cvs/hq/wine/dlls/wininet/wininet.spec	Fri Jan 31 11:07:10 2003
+++ wine/dlls/wininet/wininet.spec	Wed Feb 05 04:53:12 2003
@@ -1,6 +1,6 @@
 @ stdcall InternetInitializeAutoProxyDll(long) InternetInitializeAutoProxyDll
 @ stub ShowCertificate
-@ stdcall CommitUrlCacheEntryA(str str long long long str long str str) CommitUrlCacheEntryA
+@ stdcall CommitUrlCacheEntryA(str str double double long str long str str) CommitUrlCacheEntryA
 @ stub CommitUrlCacheEntryW
 @ stub CreateUrlCacheContainerA
 @ stub CreateUrlCacheContainerW
@@ -11,7 +11,7 @@
 @ stub DeleteUrlCacheContainerA
 @ stub DeleteUrlCacheContainerW
 @ stdcall DeleteUrlCacheEntry(str) DeleteUrlCacheEntry
-@ stdcall DeleteUrlCacheGroup(long long ptr) DeleteUrlCacheGroup
+@ stdcall DeleteUrlCacheGroup(double long ptr) DeleteUrlCacheGroup
 @ stdcall DllInstall(long ptr) WININET_DllInstall
 @ stub FindCloseUrlCache
 @ stub FindFirstUrlCacheContainerA
@@ -151,7 +151,7 @@
 @ stub RunOnceUrlCache
 @ stub SetUrlCacheConfigInfoA
 @ stub SetUrlCacheConfigInfoW
-@ stdcall SetUrlCacheEntryGroup(str long long ptr long ptr) SetUrlCacheEntryGroup
+@ stdcall SetUrlCacheEntryGroup(str long double ptr long ptr) SetUrlCacheEntryGroup
 @ stub SetUrlCacheEntryInfoA
 @ stub SetUrlCacheEntryInfoW
 @ stub SetUrlCacheHeaderData
diff -u cvs/hq/wine/dlls/winmm/Makefile.in wine/dlls/winmm/Makefile.in
--- cvs/hq/wine/dlls/winmm/Makefile.in	Tue Nov 05 04:20:20 2002
+++ wine/dlls/winmm/Makefile.in	Wed Feb 05 01:04:54 2003
@@ -4,7 +4,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winmm.dll
-IMPORTS   = user32 advapi32 kernel32
+IMPORTS   = user32 advapi32 kernel32 ntdll
 ALTNAMES  = mmsystem.dll sound.dll
 
 LDDLLFLAGS = @LDDLLFLAGS@
diff -u cvs/hq/wine/dlls/winspool/Makefile.in wine/dlls/winspool/Makefile.in
--- cvs/hq/wine/dlls/winspool/Makefile.in	Thu Jan 16 01:36:58 2003
+++ wine/dlls/winspool/Makefile.in	Wed Feb 05 04:23:20 2003
@@ -4,7 +4,7 @@
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winspool.drv
-IMPORTS   = advapi32 kernel32
+IMPORTS   = advapi32 kernel32 ntdll
 
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
diff -u cvs/hq/wine/include/wininet.h wine/include/wininet.h
--- cvs/hq/wine/include/wininet.h	Fri Jan 31 11:07:20 2003
+++ wine/include/wininet.h	Wed Feb 05 05:18:00 2003
@@ -1329,8 +1329,8 @@
 BOOLAPI CreateUrlCacheEntryW(LPCSTR ,DWORD ,LPCSTR ,LPWSTR ,DWORD);
 #define CreateUrlCacheEntry  WINELIB_NAME_AW(CreateUrlCacheEntry)
 
-BOOLAPI CommitUrlCacheEntryA(LPCSTR ,LPCSTR ,FILETIME ,FILETIME ,DWORD ,LPBYTE ,DWORD ,LPCSTR ,DWORD);
-BOOLAPI CommitUrlCacheEntryW(LPCSTR ,LPCWSTR ,FILETIME ,FILETIME ,DWORD ,LPBYTE ,DWORD ,LPCWSTR ,DWORD);
+BOOLAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCSTR,LPCSTR);
+BOOLAPI CommitUrlCacheEntryW(LPCSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPWSTR,DWORD,LPCWSTR,LPCWSTR);
 #define CommitUrlCacheEntry  WINELIB_NAME_AW(CommitUrlCacheEntry)
 
 BOOLAPI RetrieveUrlCacheEntryFileA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,DWORD);
diff -u cvs/hq/wine/library/Makefile.in wine/library/Makefile.in
--- cvs/hq/wine/library/Makefile.in	Sat Jan 04 08:06:40 2003
+++ wine/library/Makefile.in	Wed Feb 05 05:12:36 2003
@@ -32,8 +32,9 @@
 	$(AR) $@ $(OBJS)
 	$(RANLIB) $@
 
-libwine.dll: $(OBJS)
-	$(DLLWRAP) --export-all --implib libwine.a -o libwine.dll $(OBJS) $(EXTRALIBS)
+# --export-all doesn't work correctly because of dllwrap's bug
+libwine.dll: $(OBJS) wine.def
+	$(DLLWRAP) --def $(SRCDIR)/wine.def --implib libwine.a -o libwine.dll $(OBJS) $(EXTRALIBS)
 
 .PHONY: install_so install_a install_dll
 
diff -u /dev/null wine/library/wine.def
--- /dev/null	Thu Jan 01 08:00:00 1970
+++ wine/library/wine.def	Wed Feb 05 03:00:44 2003
@@ -0,0 +1,53 @@
+EXPORTS
+	__h_errno_location
+	__wine_dbg_register
+	__wine_dbg_unregister
+	__wine_dbg_vlog
+	__wine_dbg_vprintf
+	__wine_dbg_vsprintf
+	__wine_dbgstr_an
+	__wine_dbgstr_wn
+	__wine_dll_register
+	__wine_main_argc
+	__wine_main_argv
+	__wine_main_wargv
+	interlocked_cmpxchg
+	interlocked_cmpxchg_ptr
+	interlocked_xchg
+	interlocked_xchg_add
+	interlocked_xchg_ptr
+	pread
+	pwrite
+	wine_anon_mmap
+	wine_dbg_add_option
+	wine_dbg_log
+	wine_dbg_parse_options
+	wine_dbg_printf
+	wine_dbg_sprintf
+	wine_dbgstr_a
+	wine_dbgstr_an
+	wine_dbgstr_w
+	wine_dbgstr_wn
+	wine_dlclose
+	wine_dll_load
+	wine_dll_load_main_exe
+	wine_dll_set_callback
+	wine_dll_unload
+	wine_dlopen
+	wine_dlsym
+	wine_errno_location
+	wine_get_config_dir
+	wine_get_cs
+	wine_get_ds
+	wine_get_es
+	wine_get_fs
+	wine_get_gs
+	wine_get_server_dir
+	wine_get_ss
+	wine_get_user_name
+	wine_h_errno_location
+	wine_ldt_copy
+	wine_ldt_get_entry
+	wine_ldt_set_entry
+	wine_set_fs
+	wine_set_gs






[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux