January 2009 - Wine-Commits

Alexandre Julliard : advpack/tests: Add CDECL to the cabinet callback functions.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: d7ca3dd2003b538b6bca31f58e34729320bcaad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ca3dd2003b538b6bca31f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:12:26 2009 +0100 advpack/tests: Add CDECL to the cabinet callback functions. --- dlls/advpack/tests/files.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 9ddd3bc..611bbc4 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -174,33 +174,33 @@ static void test_AddDelBackupEntry(void) /* the FCI callbacks */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { return TRUE; } -static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int file_placed(PCCAB pccab, char *pszFile, long cbFile, - BOOL fContinuation, void *pv) +static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, + BOOL fContinuation, void *pv) { return 0; } -static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) { HANDLE handle; DWORD dwAccess = 0; @@ -224,7 +224,7 @@ static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) return (INT_PTR)handle; } -static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwRead; @@ -236,7 +236,7 @@ static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwRead; } -static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwWritten; @@ -248,7 +248,7 @@ static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwWritten; } -static int fci_close(INT_PTR hf, int *err, void *pv) +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) { HANDLE handle = (HANDLE)hf; ok(CloseHandle(handle), "Failed to CloseHandle\n"); @@ -256,7 +256,7 @@ static int fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; @@ -267,7 +267,7 @@ static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) return ret; } -static int fci_delete(char *pszFile, int *err, void *pv) +static int CDECL fci_delete(char *pszFile, int *err, void *pv) { BOOL ret = DeleteFileA(pszFile); ok(ret, "Failed to DeleteFile %s\n", pszFile); @@ -275,7 +275,7 @@ static int fci_delete(char *pszFile, int *err, void *pv) return 0; } -static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -294,8 +294,8 @@ static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) return FALSE; } -static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) { BY_HANDLE_FILE_INFORMATION finfo; FILETIME filetime;

1 0

Alexandre Julliard : cabinet/tests: Add CDECL to the cabinet callback functions.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 235ae035976d7dc9811dc7c88b984ba09e8687be URL: http://source.winehq.org/git/wine.git/?a=commit;h=235ae035976d7dc9811dc7c88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:12:39 2009 +0100 cabinet/tests: Add CDECL to the cabinet callback functions. --- dlls/cabinet/tests/extract.c | 30 +++++++++++++------------- dlls/cabinet/tests/fdi.c | 48 +++++++++++++++++++++--------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 156df17..b6b3cbb 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -111,33 +111,33 @@ static void delete_test_files(void) /* the FCI callbacks */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { return TRUE; } -static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int file_placed(PCCAB pccab, char *pszFile, long cbFile, - BOOL fContinuation, void *pv) +static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, + BOOL fContinuation, void *pv) { return 0; } -static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) { HANDLE handle; DWORD dwAccess = 0; @@ -161,7 +161,7 @@ static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) return (INT_PTR)handle; } -static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwRead; @@ -173,7 +173,7 @@ static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwRead; } -static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwWritten; @@ -185,7 +185,7 @@ static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwWritten; } -static int fci_close(INT_PTR hf, int *err, void *pv) +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) { HANDLE handle = (HANDLE)hf; ok(CloseHandle(handle), "Failed to CloseHandle\n"); @@ -193,7 +193,7 @@ static int fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; @@ -204,7 +204,7 @@ static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) return ret; } -static int fci_delete(char *pszFile, int *err, void *pv) +static int CDECL fci_delete(char *pszFile, int *err, void *pv) { BOOL ret = DeleteFileA(pszFile); ok(ret, "Failed to DeleteFile %s\n", pszFile); @@ -212,7 +212,7 @@ static int fci_delete(char *pszFile, int *err, void *pv) return 0; } -static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -231,8 +231,8 @@ static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) return FALSE; } -static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) { BY_HANDLE_FILE_INFORMATION finfo; FILETIME filetime; diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index e9765ad..058172f 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -32,22 +32,22 @@ CHAR CURR_DIR[MAX_PATH]; /* FDI callbacks */ -static void *fdi_alloc(ULONG cb) +static void * CDECL fdi_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void *fdi_alloc_bad(ULONG cb) +static void * CDECL fdi_alloc_bad(ULONG cb) { return NULL; } -static void fdi_free(void *pv) +static void CDECL fdi_free(void *pv) { HeapFree(GetProcessHeap(), 0, pv); } -static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) +static INT_PTR CDECL fdi_open(char *pszFile, int oflag, int pmode) { HANDLE handle; handle = CreateFileA(pszFile, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, @@ -57,7 +57,7 @@ static INT_PTR fdi_open(char *pszFile, int oflag, int pmode) return (INT_PTR) handle; } -static UINT fdi_read(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL fdi_read(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE) hf; DWORD dwRead; @@ -66,7 +66,7 @@ static UINT fdi_read(INT_PTR hf, void *pv, UINT cb) return 0; } -static UINT fdi_write(INT_PTR hf, void *pv, UINT cb) +static UINT CDECL fdi_write(INT_PTR hf, void *pv, UINT cb) { HANDLE handle = (HANDLE) hf; DWORD dwWritten; @@ -75,13 +75,13 @@ static UINT fdi_write(INT_PTR hf, void *pv, UINT cb) return 0; } -static int fdi_close(INT_PTR hf) +static int CDECL fdi_close(INT_PTR hf) { HANDLE handle = (HANDLE) hf; return CloseHandle(handle) ? 0 : -1; } -static long fdi_seek(INT_PTR hf, long dist, int seektype) +static long CDECL fdi_seek(INT_PTR hf, long dist, int seektype) { HANDLE handle = (HANDLE) hf; return SetFilePointer(handle, dist, NULL, seektype); @@ -315,33 +315,33 @@ static void delete_test_files(void) /* FCI callbacks */ -static void *mem_alloc(ULONG cb) +static void * CDECL mem_alloc(ULONG cb) { return HeapAlloc(GetProcessHeap(), 0, cb); } -static void mem_free(void *memory) +static void CDECL mem_free(void *memory) { HeapFree(GetProcessHeap(), 0, memory); } -static BOOL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) +static BOOL CDECL get_next_cabinet(PCCAB pccab, ULONG cbPrevCab, void *pv) { return TRUE; } -static long progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) +static long CDECL progress(UINT typeStatus, ULONG cb1, ULONG cb2, void *pv) { return 0; } -static int file_placed(PCCAB pccab, char *pszFile, long cbFile, - BOOL fContinuation, void *pv) +static int CDECL file_placed(PCCAB pccab, char *pszFile, long cbFile, + BOOL fContinuation, void *pv) { return 0; } -static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) +static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) { HANDLE handle; DWORD dwAccess = 0; @@ -365,7 +365,7 @@ static INT_PTR fci_open(char *pszFile, int oflag, int pmode, int *err, void *pv) return (INT_PTR)handle; } -static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwRead; @@ -377,7 +377,7 @@ static UINT fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwRead; } -static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) +static UINT CDECL fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD dwWritten; @@ -389,7 +389,7 @@ static UINT fci_write(INT_PTR hf, void *memory, UINT cb, int *err, void *pv) return dwWritten; } -static int fci_close(INT_PTR hf, int *err, void *pv) +static int CDECL fci_close(INT_PTR hf, int *err, void *pv) { HANDLE handle = (HANDLE)hf; ok(CloseHandle(handle), "Failed to CloseHandle\n"); @@ -397,7 +397,7 @@ static int fci_close(INT_PTR hf, int *err, void *pv) return 0; } -static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) +static long CDECL fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) { HANDLE handle = (HANDLE)hf; DWORD ret; @@ -408,7 +408,7 @@ static long fci_seek(INT_PTR hf, long dist, int seektype, int *err, void *pv) return ret; } -static int fci_delete(char *pszFile, int *err, void *pv) +static int CDECL fci_delete(char *pszFile, int *err, void *pv) { BOOL ret = DeleteFileA(pszFile); ok(ret, "Failed to DeleteFile %s\n", pszFile); @@ -416,7 +416,7 @@ static int fci_delete(char *pszFile, int *err, void *pv) return 0; } -static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) +static BOOL CDECL get_temp_file(char *pszTempName, int cbTempName, void *pv) { LPSTR tempname; @@ -435,8 +435,8 @@ static BOOL get_temp_file(char *pszTempName, int cbTempName, void *pv) return FALSE; } -static INT_PTR get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, - USHORT *pattribs, int *err, void *pv) +static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, + USHORT *pattribs, int *err, void *pv) { BY_HANDLE_FILE_INFORMATION finfo; FILETIME filetime; @@ -544,7 +544,7 @@ static void test_FDIIsCabinet(void) /* invalid file handle */ ZeroMemory(&cabinfo, sizeof(FDICABINETINFO)); SetLastError(0xdeadbeef); - ret = FDIIsCabinet(hfdi, (int)INVALID_HANDLE_VALUE, &cabinfo); + ret = FDIIsCabinet(hfdi, -1, &cabinfo); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());

1 0

Alexandre Julliard : msvcrt: Add missing __cdecl on some function pointers.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 558732ef098660ee47cf56659bb1b48a4bc68f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=558732ef098660ee47cf56659… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 18:43:00 2009 +0100 msvcrt: Add missing __cdecl on some function pointers. --- dlls/msvcrt/msvcrt.h | 2 +- include/msvcrt/process.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 1645570..28d8f54 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -598,7 +598,7 @@ struct MSVCRT__stat64 { #define MSVCRT_SIGABRT 22 #define MSVCRT_NSIG (MSVCRT_SIGABRT + 1) -typedef void (*MSVCRT___sighandler_t)(int); +typedef void (__cdecl *MSVCRT___sighandler_t)(int); #define MSVCRT_SIG_DFL ((MSVCRT___sighandler_t)0) #define MSVCRT_SIG_IGN ((MSVCRT___sighandler_t)1) diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h index c02dbcf..7530ab0 100644 --- a/include/msvcrt/process.h +++ b/include/msvcrt/process.h @@ -24,7 +24,7 @@ extern "C" { #endif -typedef void (*_beginthread_start_routine_t)(void *); +typedef void (__cdecl *_beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); uintptr_t __cdecl _beginthread(_beginthread_start_routine_t,unsigned int,void*);

1 0

Andrew Talbot : dsound: Declare some variables static.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 62d6a4e9f7d9659f8b575b533d16a9a006aba77a URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d6a4e9f7d9659f8b575b533… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 3 12:53:41 2009 +0000 dsound: Declare some variables static. --- dlls/dsound/dsound_main.c | 4 ++-- dlls/dsound/dsound_private.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 5ebf2e6..82f6a8c 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -95,10 +95,10 @@ int ds_snd_queue_max = 10; int ds_snd_queue_min = 6; int ds_snd_shadow_maxsize = 2; int ds_hw_accel = DS_HW_ACCEL_FULL; -int ds_default_playback = 0; -int ds_default_capture = 0; int ds_default_sample_rate = 44100; int ds_default_bits_per_sample = 16; +static int ds_default_playback; +static int ds_default_capture; /* * Get a config key from either the app-specific or the default config diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index c16f1c1..b23e242 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -37,8 +37,6 @@ extern int ds_snd_queue_max; extern int ds_snd_queue_min; extern int ds_snd_shadow_maxsize; extern int ds_hw_accel; -extern int ds_default_playback; -extern int ds_default_capture; extern int ds_default_sample_rate; extern int ds_default_bits_per_sample;

1 0

Andrew Talbot : dpnet: Declare a function static.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: bffe5016e04251dfddb0283e865923794885e970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffe5016e04251dfddb0283e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 3 12:53:38 2009 +0000 dpnet: Declare a function static. --- dlls/dpnet/address.c | 42 +++++++++++++++++++++--------------------- dlls/dpnet/dpnet_private.h | 5 ----- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index f39cf44..d6d1730 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -73,6 +73,27 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(PDIRECTPLAY8ADDRESS iface) { return refCount; } +/* returns name of given GUID */ +static const char *debugstr_SP(const GUID *id) { + static const guid_info guids[] = { + /* CLSIDs */ + GE(CLSID_DP8SP_IPX), + GE(CLSID_DP8SP_TCPIP), + GE(CLSID_DP8SP_SERIAL), + GE(CLSID_DP8SP_MODEM) + }; + unsigned int i; + + if (!id) return "(null)"; + + for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { + if (IsEqualGUID(id, guids[i].guid)) + return guids[i].name; + } + /* if we didn't find it, act like standard debugstr_guid */ + return debugstr_guid(id); +} + /* IDirectPlay8Address Interface follow: */ static HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromURLW(PDIRECTPLAY8ADDRESS iface, WCHAR* pwszSourceURL) { @@ -252,24 +273,3 @@ HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter client->ref = 0; /* will be inited with QueryInterface */ return IDirectPlay8AddressImpl_QueryInterface ((PDIRECTPLAY8ADDRESS)client, riid, ppobj); } - -/* returns name of given GUID */ -const char *debugstr_SP(const GUID *id) { - static const guid_info guids[] = { - /* CLSIDs */ - GE(CLSID_DP8SP_IPX), - GE(CLSID_DP8SP_TCPIP), - GE(CLSID_DP8SP_SERIAL), - GE(CLSID_DP8SP_MODEM) - }; - unsigned int i; - - if (!id) return "(null)"; - - for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) { - if (IsEqualGUID(id, guids[i].guid)) - return guids[i].name; - } - /* if we didn't find it, act like standard debugstr_guid */ - return debugstr_guid(id); -} diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index f75326a..bdd3f9d 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -111,11 +111,6 @@ extern HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN pu extern HRESULT DPNET_CreateDirectPlay8LobbiedApp(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); -/** - * debug - */ -extern const char *debugstr_SP(const GUID *id); - /* used for generic dumping (copied from ddraw) */ typedef struct { DWORD val;

1 0

Stefan Dösinger : include: Fix the EnumOverlayZOrders prototype.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 9a080691c6904c0da762690312cc86ee96326dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a080691c6904c0da76269031… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 17 17:47:24 2008 +0100 include: Fix the EnumOverlayZOrders prototype. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 8ecf7b8..a7648b1 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2275,7 +2275,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; - STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; + STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpfnCallback) PURE; STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE;

1 0

Andrew Talbot : dbghelp: Declare some functions static.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 4c92ba2270146957aba35461a951a5270854f990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c92ba2270146957aba35461a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 3 12:53:34 2009 +0000 dbghelp: Declare some functions static. --- dlls/dbghelp/dbghelp_private.h | 7 ------- dlls/dbghelp/module.c | 4 ++-- dlls/dbghelp/storage.c | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3eb420e..880aed9 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -91,7 +91,6 @@ void hash_table_init(struct pool* pool, struct hash_table* ht, void hash_table_destroy(struct hash_table* ht); void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt); void* hash_table_find(const struct hash_table* ht, const char* name); -unsigned hash_table_hash(const char* name, unsigned num_buckets); struct hash_table_iter { @@ -439,9 +438,6 @@ extern struct module* module_find_by_addr(const struct process* pcs, unsigned long addr, enum module_type type); extern struct module* - module_find_by_name(const struct process* pcs, - const WCHAR* name); -extern struct module* module_find_by_nameA(const struct process* pcs, const char* name); extern struct module* @@ -454,9 +450,6 @@ extern struct module* unsigned long addr, unsigned long size, unsigned long stamp, unsigned long checksum); extern struct module* - module_get_container(const struct process* pcs, - const struct module* inner); -extern struct module* module_get_containee(const struct process* pcs, const struct module* inner); extern enum module_type diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index ddc6d3d..49b7742 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -188,7 +188,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, * module_find_by_name * */ -struct module* module_find_by_name(const struct process* pcs, const WCHAR* name) +static struct module* module_find_by_name(const struct process* pcs, const WCHAR* name) { struct module* module; @@ -238,7 +238,7 @@ struct module* module_is_already_loaded(const struct process* pcs, const WCHAR* * module_get_container * */ -struct module* module_get_container(const struct process* pcs, +static struct module* module_get_container(const struct process* pcs, const struct module* inner) { struct module* module; diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 04ea378..ec8a37d 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -298,7 +298,7 @@ unsigned sparse_array_length(const struct sparse_array* sa) return sa->elements.num_elts; } -unsigned hash_table_hash(const char* name, unsigned num_buckets) +static unsigned hash_table_hash(const char* name, unsigned num_buckets) { unsigned hash = 0; while (*name)

1 0

Stefan Dösinger : include: Fix a IDirectDrawSurface4 method prototype.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 6bdaaa74f3310da48790c3122786aa764f4e221a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bdaaa74f3310da48790c3122… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Dec 17 17:37:03 2008 +0100 include: Fix a IDirectDrawSurface4 method prototype. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index da01512..8ecf7b8 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -2274,7 +2274,7 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; - STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpEnumSurfacesCallback) PURE; + STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK lpfnCallback) PURE; STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE;

1 0

Stefan Dösinger : include: Fix a typo in ddraw.h.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: c2e5752ac62e646bcb46c0741cd0083179e3c9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2e5752ac62e646bcb46c0741… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 16 23:31:12 2008 +0100 include: Fix a typo in ddraw.h. --- include/ddraw.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index f7d1d37..da01512 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1674,7 +1674,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) #define IDirectDraw4_GetAvailableVidMem(p,a,b,c) (p)->lpVtbl->GetAvailableVidMem(p,a,b,c) /*** IDirectDraw4 methods ***/ #define IDirectDraw4_GetSurfaceFromDC(p,a,b) (p)->lpVtbl->GetSurfaceFromDC(p,a,b) -#define IDirectDraw4_RestoreAllSurfaces(pc) (p)->lpVtbl->RestoreAllSurfaces(p) +#define IDirectDraw4_RestoreAllSurfaces(p) (p)->lpVtbl->RestoreAllSurfaces(p) #define IDirectDraw4_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p) #define IDirectDraw4_GetDeviceIdentifier(p,a,b) (p)->lpVtbl->GetDeviceIdentifier(p,a,b) #else

1 0

Stefan Dösinger : ddraw: Reject IDirectDraw3 QI in ddraw.dll.
by Alexandre Julliard Jan. 3, 2009

Jan. 3, 2009

Module: wine Branch: master Commit: 6ef2b65531688d87a11fa879bdd55080cffda429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef2b65531688d87a11fa879b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 16 20:56:41 2008 +0100 ddraw: Reject IDirectDraw3 QI in ddraw.dll. --- dlls/ddraw/ddraw.c | 7 +++++-- dlls/ddraw/tests/ddrawmodes.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7024a0f..286e4b3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -121,8 +121,11 @@ IDirectDrawImpl_QueryInterface(IDirectDraw7 *iface, } else if ( IsEqualGUID( &IID_IDirectDraw3, refiid ) ) { - *obj = ICOM_INTERFACE(This, IDirectDraw3); - TRACE("(%p) Returning IDirectDraw3 interface at %p\n", This, *obj); + /* This Interface exists in ddrawex.dll, it is implemented in a wrapper */ + WARN("IDirectDraw3 is not valid in ddraw.dll\n"); + *obj = NULL; + LeaveCriticalSection(&ddraw_cs); + return E_NOINTERFACE; } else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) { diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index d21c3b4..67dd9d4 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -385,6 +385,21 @@ static void testcooperativelevels_exclusive(void) /* All done */ } +static void testddraw3(void) +{ + const GUID My_IID_IDirectDraw3 = { + 0x618f8ad4, + 0x8b7a, + 0x11d0, + { 0x8f,0xcc,0x0,0xc0,0x4f,0xd9,0x18,0x9d } + }; + IDirectDraw3 *dd3; + HRESULT hr; + hr = IDirectDraw_QueryInterface(lpDD, &My_IID_IDirectDraw3, (void **) &dd3); + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectDraw3 returned 0x%08x, expected E_NOINTERFACE\n", hr); + if(SUCCEEDED(hr) && dd3) IDirectDraw3_Release(dd3); +} + START_TEST(ddrawmodes) { createwindow(); @@ -394,6 +409,7 @@ START_TEST(ddrawmodes) if (winetest_interactive) testdisplaymodes(); flushdisplaymodes(); + testddraw3(); releasedirectdraw(); createdirectdraw();

1 0