Fix some problems found while compiling and linking Wine under
Cygwin.
This commit is contained in:
parent
70c47b668f
commit
2d55e0484c
|
@ -3,7 +3,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = comdlg32.dll
|
MODULE = comdlg32.dll
|
||||||
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32
|
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
|
||||||
ALTNAMES = commdlg.dll
|
ALTNAMES = commdlg.dll
|
||||||
EXTRALIBS = $(LIBUUID)
|
EXTRALIBS = $(LIBUUID)
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ MODULE = kernel32.dll
|
||||||
IMPORTS = ntdll
|
IMPORTS = ntdll
|
||||||
ALTNAMES = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll
|
ALTNAMES = krnl386.exe comm.dll stress.dll system.dll toolhelp.dll windebug.dll win87em.dll wprocs.dll
|
||||||
LDIMPORTS = ntdll.dll
|
LDIMPORTS = ntdll.dll
|
||||||
|
EXTRALIBS = $(LIBUNICODE)
|
||||||
DLLMAIN = MAIN_KernelInit
|
DLLMAIN = MAIN_KernelInit
|
||||||
|
|
||||||
SPEC_SRCS16 = \
|
SPEC_SRCS16 = \
|
||||||
|
|
|
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = oleaut32.dll
|
MODULE = oleaut32.dll
|
||||||
IMPORTS = ole32 user32 gdi32 advapi32 kernel32
|
IMPORTS = ole32 user32 gdi32 advapi32 kernel32 ntdll
|
||||||
DELAYIMPORTS = comctl32
|
DELAYIMPORTS = comctl32
|
||||||
ALTNAMES = ole2disp.dll typelib.dll
|
ALTNAMES = ole2disp.dll typelib.dll
|
||||||
EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
|
EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
|
||||||
|
|
|
@ -897,7 +897,7 @@ HRESULT WINAPI CoInternetGetSession(DWORD dwSessionMode, /*IInternetSession*/voi
|
||||||
* INET_E_QUERYOPTIONUNKNOWN invalid option
|
* 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 dwQueryFlags, LPVOID pvBuffer, DWORD cbBuffer, DWORD * pcbBuffer,
|
||||||
DWORD dwReserved)
|
DWORD dwReserved)
|
||||||
{
|
{
|
||||||
|
|
|
@ -95,7 +95,7 @@ BOOL WINAPI SetUrlCacheEntryGroup(LPCSTR lpszUrlName, DWORD dwFlags,
|
||||||
BOOL WINAPI CommitUrlCacheEntryA(LPCSTR lpszUrl, LPCSTR lpszLocalName,
|
BOOL WINAPI CommitUrlCacheEntryA(LPCSTR lpszUrl, LPCSTR lpszLocalName,
|
||||||
FILETIME ExpireTime, FILETIME lastModified, DWORD cacheEntryType,
|
FILETIME ExpireTime, FILETIME lastModified, DWORD cacheEntryType,
|
||||||
LPBYTE lpHeaderInfo, DWORD headerSize, LPCSTR fileExtension,
|
LPBYTE lpHeaderInfo, DWORD headerSize, LPCSTR fileExtension,
|
||||||
DWORD originalUrl)
|
LPCSTR originalUrl)
|
||||||
{
|
{
|
||||||
FIXME("stub\n");
|
FIXME("stub\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
@ stdcall InternetInitializeAutoProxyDll(long)
|
@ stdcall InternetInitializeAutoProxyDll(long)
|
||||||
@ stub ShowCertificate
|
@ stub ShowCertificate
|
||||||
@ stdcall CommitUrlCacheEntryA(str str long long long str long str str)
|
@ stdcall CommitUrlCacheEntryA(str str double double long str long str str)
|
||||||
@ stub CommitUrlCacheEntryW
|
@ stub CommitUrlCacheEntryW
|
||||||
@ stub CreateUrlCacheContainerA
|
@ stub CreateUrlCacheContainerA
|
||||||
@ stub CreateUrlCacheContainerW
|
@ stub CreateUrlCacheContainerW
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
@ stub DeleteUrlCacheContainerA
|
@ stub DeleteUrlCacheContainerA
|
||||||
@ stub DeleteUrlCacheContainerW
|
@ stub DeleteUrlCacheContainerW
|
||||||
@ stdcall DeleteUrlCacheEntry(str)
|
@ stdcall DeleteUrlCacheEntry(str)
|
||||||
@ stdcall DeleteUrlCacheGroup(long long ptr)
|
@ stdcall DeleteUrlCacheGroup(double long ptr) DeleteUrlCacheGroup
|
||||||
@ stdcall DllInstall(long ptr) WININET_DllInstall
|
@ stdcall DllInstall(long ptr) WININET_DllInstall
|
||||||
@ stub FindCloseUrlCache
|
@ stub FindCloseUrlCache
|
||||||
@ stub FindFirstUrlCacheContainerA
|
@ stub FindFirstUrlCacheContainerA
|
||||||
|
@ -153,7 +153,7 @@
|
||||||
@ stub RunOnceUrlCache
|
@ stub RunOnceUrlCache
|
||||||
@ stub SetUrlCacheConfigInfoA
|
@ stub SetUrlCacheConfigInfoA
|
||||||
@ stub SetUrlCacheConfigInfoW
|
@ stub SetUrlCacheConfigInfoW
|
||||||
@ stdcall SetUrlCacheEntryGroup(str long long ptr long ptr)
|
@ stdcall SetUrlCacheEntryGroup(str long double ptr long ptr)
|
||||||
@ stub SetUrlCacheEntryInfoA
|
@ stub SetUrlCacheEntryInfoA
|
||||||
@ stub SetUrlCacheEntryInfoW
|
@ stub SetUrlCacheEntryInfoW
|
||||||
@ stub SetUrlCacheHeaderData
|
@ stub SetUrlCacheHeaderData
|
||||||
|
|
|
@ -4,7 +4,7 @@ TOPOBJDIR = ../..
|
||||||
SRCDIR = @srcdir@
|
SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
MODULE = winspool.drv
|
MODULE = winspool.drv
|
||||||
IMPORTS = advapi32 kernel32
|
IMPORTS = advapi32 kernel32 ntdll
|
||||||
|
|
||||||
LDDLLFLAGS = @LDDLLFLAGS@
|
LDDLLFLAGS = @LDDLLFLAGS@
|
||||||
SYMBOLFILE = $(MODULE).tmp.o
|
SYMBOLFILE = $(MODULE).tmp.o
|
||||||
|
|
|
@ -1337,8 +1337,8 @@ BOOLAPI CreateUrlCacheEntryA(LPCSTR ,DWORD ,LPCSTR ,LPSTR ,DWORD);
|
||||||
BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD);
|
BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD);
|
||||||
#define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry)
|
#define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry)
|
||||||
|
|
||||||
BOOLAPI CommitUrlCacheEntryA(LPCSTR ,LPCSTR ,FILETIME ,FILETIME ,DWORD ,LPBYTE ,DWORD ,LPCSTR ,DWORD);
|
BOOLAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCSTR,LPCSTR);
|
||||||
BOOLAPI CommitUrlCacheEntryW(LPCWSTR ,LPCWSTR ,FILETIME ,FILETIME ,DWORD ,LPBYTE ,DWORD ,LPCWSTR ,DWORD);
|
BOOLAPI CommitUrlCacheEntryW(LPCSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPWSTR,DWORD,LPCWSTR,LPCWSTR);
|
||||||
#define CommitUrlCacheEntry WINELIB_NAME_AW(CommitUrlCacheEntry)
|
#define CommitUrlCacheEntry WINELIB_NAME_AW(CommitUrlCacheEntry)
|
||||||
|
|
||||||
BOOLAPI RetrieveUrlCacheEntryFileA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,DWORD);
|
BOOLAPI RetrieveUrlCacheEntryFileA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,DWORD);
|
||||||
|
|
Loading…
Reference in New Issue