wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Stefan Dösinger : d3d: Remove dependency on ddraw. h header.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 725057da47c9062483f3d4373b39f574bb78dbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=725057da47c9062483f3d4373… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 14 22:44:55 2007 +0200 d3d: Remove dependency on ddraw.h header. --- dlls/d3d8/d3d8_private.h | 1 - dlls/d3d8/device.c | 6 +- dlls/d3d9/d3d9_private.h | 1 - dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 21 ++-- dlls/ddraw/surface.c | 85 ++++++++++---- dlls/wined3d/device.c | 6 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/palette.c | 16 ++-- dlls/wined3d/query.c | 2 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 135 +++++++++++----------- dlls/wined3d/surface_gdi.c | 116 +++++++++--------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 15 +-- include/wine/wined3d_interface.h | 19 ++- include/wine/wined3d_types.h | 239 ++++++++++++++++++++++++++++++++------ 17 files changed, 448 insertions(+), 224 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=725057da47c9062483f3d…

1 0

Detlef Riekenberg : include/winspool: Declare missing function.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 7364aa49dd964a25c85de15a841f897c00d77605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7364aa49dd964a25c85de15a8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 00:47:22 2007 +0200 include/winspool: Declare missing function. --- include/winspool.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index 297cb22..a642eef 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -1389,6 +1389,10 @@ LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); #define StartDocDlg WINELIB_NAME_AW(StartDocDlg) +BOOL WINAPI XcvDataW(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, + DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, + PDWORD pcbOutputNeeded, PDWORD pdwStatus); + #ifdef __cplusplus } /* extern "C" */ #endif

1 0

Andrew Talbot : slwapi: Make function definitions and declarations agree.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: b84f51fc253e954b34faf248fb38fe44ca4877bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84f51fc253e954b34faf248f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 14 13:49:42 2007 +0100 slwapi: Make function definitions and declarations agree. --- dlls/shlwapi/ordinal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 2abee00..dd38eda 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3266,13 +3266,13 @@ HICON WINAPI ExtractIconWrapW(HINSTANCE hInstance, LPCWSTR lpszExeFileName, * PARAMS * new_mod [I] Library name * inst_hwnd [I] Module whose directory is to be used - * bCrossCodePage [I] Should be FALSE (currently ignored) + * dwCrossCodePage [I] Should be FALSE (currently ignored) * * RETURNS * Success: A handle to the loaded module * Failure: A NULL handle. */ -HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) +HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossCodePage) { /* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for * each call here. @@ -3296,7 +3296,7 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCode LPSTR ptr; DWORD len; - FIXME("(%s,%p,%d) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, bCrossCodePage); + FIXME("(%s,%p,%d) semi-stub!\n", debugstr_a(new_mod), inst_hwnd, dwCrossCodePage); len = GetModuleFileNameA(inst_hwnd, mod_path, sizeof(mod_path)); if (!len || len >= sizeof(mod_path)) return NULL; @@ -3314,13 +3314,13 @@ HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCode * * Unicode version of MLLoadLibraryA. */ -HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, BOOL bCrossCodePage) +HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwCrossCodePage) { WCHAR mod_path[2*MAX_PATH]; LPWSTR ptr; DWORD len; - FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, bCrossCodePage); + FIXME("(%s,%p,%d) semi-stub!\n", debugstr_w(new_mod), inst_hwnd, dwCrossCodePage); len = GetModuleFileNameW(inst_hwnd, mod_path, sizeof(mod_path) / sizeof(WCHAR)); if (!len || len >= sizeof(mod_path) / sizeof(WCHAR)) return NULL;

1 0

Andrew Talbot : slwapi: Make function definitions and declarations agree.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 0110f9ea0bd6313a5d82a926c72581391035abd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0110f9ea0bd6313a5d82a926c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 14 13:48:21 2007 +0100 slwapi: Make function definitions and declarations agree. --- dlls/shlwapi/reg.c | 2 +- dlls/shlwapi/thread.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index fe77ddb..bdfea24 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -54,7 +54,7 @@ typedef struct { WCHAR lpszPath[MAX_PATH]; } SHUSKEY, *LPSHUSKEY; -DWORD WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT); +INT WINAPI SHStringFromGUIDW(REFGUID,LPWSTR,INT); HRESULT WINAPI SHRegGetCLSIDKeyW(REFGUID,LPCWSTR,BOOL,BOOL,PHKEY); diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 335b8ab..1affb79 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); extern DWORD SHLWAPI_ThreadRef_index; /* Initialised in shlwapi_main.c */ -DWORD WINAPI SHStringFromGUIDA(REFGUID,LPSTR,INT); +INT WINAPI SHStringFromGUIDA(REFGUID,LPSTR,INT); /************************************************************************** * _CreateAllAccessSecurityAttributes [SHLWAPI.356]

1 0

Andrew Talbot : user32: Make function definitions and declarations agree.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: b0418622c8b462c0de6c241762a695751ef75c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0418622c8b462c0de6c24176… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 14 15:19:01 2007 +0100 user32: Make function definitions and declarations agree. --- dlls/user32/network.c | 4 ++-- include/wine/winnet16.h | 2 +- include/wine/winuser16.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/network.c b/dlls/user32/network.c index e9a9078..105d016 100644 --- a/dlls/user32/network.c +++ b/dlls/user32/network.c @@ -162,8 +162,8 @@ WORD WINAPI WNetUnlockQueueData16( LPSTR szQueue ) * Redirects a local device (either a disk drive or printer port) * to a shared device on a remote server. */ -WORD WINAPI WNetAddConnection16( LPSTR lpNetPath, LPSTR lpPassWord, - LPSTR lpLocalName ) +WORD WINAPI WNetAddConnection16( LPCSTR lpNetPath, LPCSTR lpPassWord, + LPCSTR lpLocalName ) { FIXME( "(%s, %p, %s): stub\n", debugstr_a(lpNetPath), lpPassWord, debugstr_a(lpLocalName) ); diff --git a/include/wine/winnet16.h b/include/wine/winnet16.h index 9ca3a65..8f04860 100644 --- a/include/wine/winnet16.h +++ b/include/wine/winnet16.h @@ -105,7 +105,7 @@ WORD WINAPI WNetUnlockQueueData16(LPSTR); * Connections */ -WORD WINAPI WNetAddConnection16(LPSTR,LPSTR,LPSTR); +WORD WINAPI WNetAddConnection16(LPCSTR,LPCSTR,LPCSTR); WORD WINAPI WNetCancelConnection16(LPSTR,BOOL16); WORD WINAPI WNetGetConnection16(LPSTR,LPSTR,UINT16 *); WORD WINAPI WNetRestoreConnection16(HWND16,LPSTR); diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index db936ef..0a05bdd 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -948,7 +948,7 @@ VOID WINAPI ValidateRgn16(HWND16,HRGN16); HWND16 WINAPI WindowFromDC16(HDC16); HWND16 WINAPI WindowFromPoint16(POINT16); BOOL16 WINAPI WinHelp16(HWND16,LPCSTR,UINT16,DWORD); -UINT16 WINAPI WNetAddConnection16(LPCSTR,LPCSTR,LPCSTR); +WORD WINAPI WNetAddConnection16(LPCSTR,LPCSTR,LPCSTR); INT16 WINAPI wvsprintf16(LPSTR,LPCSTR,VA_LIST16); BOOL16 WINAPI DrawState16A(HDC16,HBRUSH16,DRAWSTATEPROC16,LPARAM,WPARAM16,INT16,INT16,INT16,INT16,UINT16); BOOL16 WINAPI IsDialogMessage16(HWND16,MSG16*);

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 9f6a6427ef7aa88dcf92ec569c7aff6559bd2db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6a6427ef7aa88dcf92ec569… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 14 18:12:40 2007 +0100 crypt32: Constify some variables. --- dlls/crypt32/sip.c | 4 ++-- dlls/crypt32/store.c | 10 +++++----- dlls/crypt32/str.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 87fcc07..1e24455 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -76,7 +76,7 @@ static void CRYPT_guid2wstr( const GUID *guid, LPWSTR wstr ) * * Helper function for CryptSIPRemoveProvider */ -static LONG CRYPT_SIPDeleteFunction( LPGUID guid, LPCWSTR szKey ) +static LONG CRYPT_SIPDeleteFunction( const GUID *guid, LPCWSTR szKey ) { WCHAR szFullKey[ 0x100 ]; LONG r = ERROR_SUCCESS; @@ -150,7 +150,7 @@ BOOL WINAPI CryptSIPRemoveProvider(GUID *pgProv) * Add a registry key containing a dll name and function under * "Software\\Microsoft\\Cryptography\\OID\\EncodingType 0\\<func>\\<guid>" */ -static LONG CRYPT_SIPWriteFunction( LPGUID guid, LPCWSTR szKey, +static LONG CRYPT_SIPWriteFunction( const GUID *guid, LPCWSTR szKey, LPCWSTR szDll, LPCWSTR szFunction ) { WCHAR szFullKey[ 0x100 ]; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 1447d37..3b9bcb8 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -838,7 +838,7 @@ static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, } static PWINECRYPT_CERTSTORE CRYPT_ProvCreateStore(HCRYPTPROV hCryptProv, - DWORD dwFlags, PWINECRYPT_CERTSTORE memStore, PCERT_STORE_PROV_INFO pProvInfo) + DWORD dwFlags, PWINECRYPT_CERTSTORE memStore, const CERT_STORE_PROV_INFO *pProvInfo) { PWINE_PROVIDERSTORE ret = (PWINE_PROVIDERSTORE)CryptMemAlloc( sizeof(WINE_PROVIDERSTORE)); @@ -946,7 +946,7 @@ static PWINECRYPT_CERTSTORE CRYPT_ProvOpenStore(LPCSTR lpszStoreProvider, return ret; } -static void CRYPT_HashToStr(LPBYTE hash, LPWSTR asciiHash) +static void CRYPT_HashToStr(const BYTE *hash, LPWSTR asciiHash) { static const WCHAR fmt[] = { '%','0','2','X',0 }; DWORD i; @@ -964,7 +964,7 @@ static const WCHAR CRLsW[] = { 'C','R','L','s',0 }; static const WCHAR CTLsW[] = { 'C','T','L','s',0 }; static const WCHAR BlobW[] = { 'B','l','o','b',0 }; -static void CRYPT_RegReadSerializedFromReg(PWINE_REGSTOREINFO store, HKEY key, +static void CRYPT_RegReadSerializedFromReg(const WINE_REGSTOREINFO *store, HKEY key, DWORD contextType) { LONG rc; @@ -1057,7 +1057,7 @@ static void CRYPT_RegReadSerializedFromReg(PWINE_REGSTOREINFO store, HKEY key, } while (!rc); } -static void CRYPT_RegReadFromReg(PWINE_REGSTOREINFO store) +static void CRYPT_RegReadFromReg(const WINE_REGSTOREINFO *store) { static const WCHAR * const subKeys[] = { CertsW, CRLsW, CTLsW }; static const DWORD contextFlags[] = { CERT_STORE_CERTIFICATE_CONTEXT_FLAG, @@ -1080,7 +1080,7 @@ static void CRYPT_RegReadFromReg(PWINE_REGSTOREINFO store) } /* Hash is assumed to be 20 bytes in length (a SHA-1 hash) */ -static BOOL CRYPT_WriteSerializedToReg(HKEY key, LPBYTE hash, LPBYTE buf, +static BOOL CRYPT_WriteSerializedToReg(HKEY key, const BYTE *hash, const BYTE *buf, DWORD len) { WCHAR asciiHash[20 * 2 + 1]; diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index e74fc7d..a4e9e92 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -482,7 +482,7 @@ struct X500TokenW }; static void CRYPT_KeynameKeeperFromTokenW(struct KeynameKeeper *keeper, - struct X500TokenW *key) + const struct X500TokenW *key) { DWORD len = key->end - key->start; @@ -593,7 +593,7 @@ static DWORD CRYPT_GetNextValueW(LPCWSTR str, DWORD dwFlags, LPCWSTR separators, * output's pbData must be freed with LocalFree. */ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, - struct X500TokenW *value, PCERT_NAME_BLOB output, DWORD type, + const struct X500TokenW *value, PCERT_NAME_BLOB output, DWORD type, LPCWSTR *ppszError) { CERT_NAME_VALUE nameValue = { type, { 0, NULL } }; @@ -634,7 +634,7 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, } static BOOL CRYPT_EncodeValue(DWORD dwCertEncodingType, - struct X500TokenW *value, PCERT_NAME_BLOB output, const DWORD *types, + const struct X500TokenW *value, PCERT_NAME_BLOB output, const DWORD *types, LPCWSTR *ppszError) { DWORD i;

1 0

Andrew Talbot : crypt32: Constify some variables.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: fbbe0039c1a498731d805de4caf064e047d341e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbbe0039c1a498731d805de4c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 14 18:12:05 2007 +0100 crypt32: Constify some variables. --- dlls/crypt32/protectdata.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index 9cc8584..1957e7c 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -111,7 +111,7 @@ static const char crypt_magic_str[] = "Wine Crypt32 ok"; /* debugging tool to print strings of hex chars */ static const char * -hex_str(unsigned char *p, int n) +hex_str(const unsigned char *p, int n) { const char * ptr; char report[80]; @@ -146,7 +146,7 @@ void serialize_dword(DWORD value,BYTE ** ptr) } static -void serialize_string(BYTE * str,BYTE ** ptr,DWORD len, DWORD width, +void serialize_string(const BYTE *str, BYTE **ptr, DWORD len, DWORD width, BOOL prepend_len) { /*TRACE("called %ux%u\n",(unsigned int)len,(unsigned int)width);*/ @@ -160,7 +160,7 @@ void serialize_string(BYTE * str,BYTE ** ptr,DWORD len, DWORD width, } static -BOOL unserialize_dword(BYTE * ptr, DWORD *index, DWORD size, DWORD * value) +BOOL unserialize_dword(const BYTE *ptr, DWORD *index, DWORD size, DWORD *value) { /*TRACE("called\n");*/ @@ -178,7 +178,7 @@ BOOL unserialize_dword(BYTE * ptr, DWORD *index, DWORD size, DWORD * value) } static -BOOL unserialize_string(BYTE * ptr, DWORD *index, DWORD size, +BOOL unserialize_string(const BYTE *ptr, DWORD *index, DWORD size, DWORD len, DWORD width, BOOL inline_len, BYTE ** data, DWORD * stored) { @@ -212,7 +212,7 @@ BOOL unserialize_string(BYTE * ptr, DWORD *index, DWORD size, } static -BOOL serialize(struct protect_data_t * pInfo, DATA_BLOB * pSerial) +BOOL serialize(const struct protect_data_t *pInfo, DATA_BLOB *pSerial) { BYTE * ptr; DWORD dwStrLen; @@ -340,7 +340,7 @@ BOOL serialize(struct protect_data_t * pInfo, DATA_BLOB * pSerial) } static -BOOL unserialize(DATA_BLOB * pSerial, struct protect_data_t * pInfo) +BOOL unserialize(const DATA_BLOB *pSerial, struct protect_data_t *pInfo) { BYTE * ptr; DWORD index; @@ -484,7 +484,7 @@ BOOL unserialize(DATA_BLOB * pSerial, struct protect_data_t * pInfo) /* perform sanity checks */ static -BOOL valid_protect_data(struct protect_data_t * pInfo) +BOOL valid_protect_data(const struct protect_data_t *pInfo) { BOOL status=TRUE; @@ -681,7 +681,7 @@ BOOL convert_hash_to_blob(HCRYPTHASH hHash, DATA_BLOB * blob) /* test that a given hash matches an exported-to-blob hash value */ static -BOOL hash_matches_blob(HCRYPTHASH hHash, DATA_BLOB * two) +BOOL hash_matches_blob(HCRYPTHASH hHash, const DATA_BLOB *two) { BOOL rc = FALSE; DATA_BLOB one; @@ -704,8 +704,8 @@ BOOL hash_matches_blob(HCRYPTHASH hHash, DATA_BLOB * two) /* create an encryption key from a given salt and optional entropy */ static -BOOL load_encryption_key(HCRYPTPROV hProv, DATA_BLOB * salt, - DATA_BLOB * pOptionalEntropy, HCRYPTKEY * phKey) +BOOL load_encryption_key(HCRYPTPROV hProv, const DATA_BLOB *salt, + const DATA_BLOB *pOptionalEntropy, HCRYPTKEY *phKey) { BOOL rc = TRUE; HCRYPTHASH hSaltHash; @@ -768,7 +768,7 @@ BOOL load_encryption_key(HCRYPTPROV hProv, DATA_BLOB * salt, /* debugging tool to print the structures of a ProtectData call */ static void -report(DATA_BLOB* pDataIn, DATA_BLOB* pOptionalEntropy, +report(const DATA_BLOB* pDataIn, const DATA_BLOB* pOptionalEntropy, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags) { TRACE("pPromptStruct: %p\n", pPromptStruct);

1 0

Jason Edmeades : cmd.exe: Implement a basic 'more'.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: ce87522f84d80574c5c70f418ee9b976895d2002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce87522f84d80574c5c70f418… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Fri Apr 13 21:34:05 2007 +0100 cmd.exe: Implement a basic 'more'. This implements a basic more, eg 'dir | more' or 'more file.c' but it does not support the flags or keys which can control it. Basically its not worth implementing those, as in some modes we cannot read a single key, we have to wait for <enter> anyway. --- programs/cmd/Cs.rc | 4 ++ programs/cmd/De.rc | 4 ++ programs/cmd/En.rc | 4 ++ programs/cmd/Es.rc | 4 ++ programs/cmd/Fr.rc | 4 ++ programs/cmd/Ja.rc | 4 ++ programs/cmd/Ko.rc | 4 ++ programs/cmd/Nl.rc | 4 ++ programs/cmd/No.rc | 4 ++ programs/cmd/Pl.rc | 4 ++ programs/cmd/Pt.rc | 7 +++ programs/cmd/Ru.rc | 4 ++ programs/cmd/Si.rc | 4 ++ programs/cmd/Tr.rc | 4 ++ programs/cmd/builtins.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ programs/cmd/directory.c | 2 +- programs/cmd/wcmd.h | 7 ++- programs/cmd/wcmdmain.c | 14 ++++-- 18 files changed, 184 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce87522f84d80574c5c70…

1 0

Maarten Lankhorst : winmm: Implement CALLBACK_WINDOW.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 35a8ee9340ea1e92ffb6313fad6b406a111e209f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a8ee9340ea1e92ffb6313fa… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 13 18:34:35 2007 +0200 winmm: Implement CALLBACK_WINDOW. --- dlls/winmm/tests/mixer.c | 23 ++++++++++++++++++++++- dlls/winmm/winmm.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index bf27c77..0163537 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -378,8 +378,18 @@ static void mixer_test_deviceA(int device) rc=mixerOpen(&mix, device, 0, 0, 0); ok(rc==MMSYSERR_NOERROR, - "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc)); + "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { + rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); + ok(rc==MMSYSERR_INVALFLAG, + "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); + + /* Shouldn't open without a valid HWND */ + rc=mixerOpen(&mix, device, 0, 0, CALLBACK_WINDOW); + ok(rc==MMSYSERR_INVALPARAM, + "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); + + for (d=0;d<capsA.cDestinations;d++) { MIXERLINEA mixerlineA; mixerlineA.cbStruct = 0; @@ -757,10 +767,21 @@ static void mixer_test_deviceW(int device) szPname, capsW.vDriverVersion >> 8, capsW.vDriverVersion & 0xff,capsW.wMid,capsW.wPid); } + + rc=mixerOpen(&mix, device, 0, 0, 0); ok(rc==MMSYSERR_NOERROR, "mixerOpen: MMSYSERR_BADDEVICEID expected, got %s\n",mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { + rc=mixerOpen(&mix, device, 0, 0, CALLBACK_FUNCTION); + ok(rc==MMSYSERR_INVALFLAG, + "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); + + /* Shouldn't open without a valid HWND */ + rc=mixerOpen(&mix, device, 0, 0, CALLBACK_WINDOW); + ok(rc==MMSYSERR_INVALPARAM, + "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); + for (d=0;d<capsW.cDestinations;d++) { MIXERLINEW mixerlineW; mixerlineW.cbStruct = 0; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 7613277..f17ad7c 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -306,6 +306,16 @@ UINT WINAPI mixerGetDevCapsW(UINT_PTR uDeviceID, LPMIXERCAPSW lpCaps, UINT uSize return MMDRV_Message(wmld, MXDM_GETDEVCAPS, (DWORD_PTR)lpCaps, uSize, TRUE); } +static void CALLBACK MIXER_WCallback(HMIXEROBJ hmx, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam, DWORD_PTR param2) +{ + HWND hWnd = (HWND)dwInstance; + + if (!dwInstance) + return; + + PostMessageW(hWnd, MM_MIXM_CONTROL_CHANGE, (WPARAM)hmx, (LPARAM)dwParam); +} + UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen, BOOL bFrom32) { @@ -317,15 +327,36 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, TRACE("(%p, %d, %08lx, %08lx, %08x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); + mod.dwCallback = (DWORD_PTR)MIXER_WCallback; + mod.dwInstance = 0; + +/* If callback is a function, + * dwCallback contains function pointer + * dwInstance private data + * + * if callback is a window + * dwCallback contains a window handle + */ + switch (fdwOpen & CALLBACK_TYPEMASK) { + default: + return MMSYSERR_INVALFLAG; + + case CALLBACK_NULL: + break; + + case CALLBACK_WINDOW: + mod.dwInstance = dwCallback; + if (!IsWindow((HWND)dwCallback)) + return MMSYSERR_INVALPARAM; + break; + } + wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, &dwCallback, &dwInstance, bFrom32); - wmld->uDeviceID = uDeviceID; mod.hmx = (HMIXEROBJ)hMix; - mod.dwCallback = dwCallback; - mod.dwInstance = dwInstance; - dwRet = MMDRV_Open(wmld, MXDM_OPEN, (DWORD)&mod, fdwOpen); + dwRet = MMDRV_Open(wmld, MXDM_OPEN, (DWORD)&mod, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { MMDRV_Free(hMix, wmld);

1 0

Stefan Dösinger : d3d: Enumerate palettized formats for ddraw.
by Alexandre Julliard 16 Apr '07

16 Apr '07

Module: wine Branch: master Commit: 8a5b6df483fcd02734df77046b757957bbcbbbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5b6df483fcd02734df77046… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 13 16:38:10 2007 +0200 d3d: Enumerate palettized formats for ddraw. --- dlls/d3d9/directx.c | 10 +++++- dlls/ddraw/ddraw.c | 83 +++++++++++++++++++++++++++++++++--------------- dlls/wined3d/directx.c | 11 ++++++ 3 files changed, 76 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index f15aa4d..ec4f7aa 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -98,14 +98,20 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UIN static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + + /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */ + if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5 && Format != D3DFMT_UNKNOWN) { + return 0; + } + return IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, Format); } static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8. + /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8 or DDraw. It's supposed to fail anyway, so no harm returning failure. */ - if(Format == D3DFMT_UNKNOWN) + if(Format != WINED3DFMT_X8R8G8B8 && Format != WINED3DFMT_R5G6B5) return D3DERR_INVALIDCALL; return IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, Format, Mode, (WINED3DDISPLAYMODE *) pMode); } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ac95ddf..4255adb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1166,11 +1166,31 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, LPDDENUMMODESCALLBACK2 cb) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); - unsigned int modenum = 0; + unsigned int modenum, fmt; WINED3DFORMAT pixelformat = WINED3DFMT_UNKNOWN; WINED3DDISPLAYMODE mode; DDSURFACEDESC2 callback_sd; + WINED3DFORMAT checkFormatList[] = + { + WINED3DFMT_R8G8B8, + WINED3DFMT_A8R8G8B8, + WINED3DFMT_X8R8G8B8, + WINED3DFMT_R5G6B5, + WINED3DFMT_X1R5G5B5, + WINED3DFMT_A1R5G5B5, + WINED3DFMT_A4R4G4B4, + WINED3DFMT_R3G3B2, + WINED3DFMT_A8R3G3B2, + WINED3DFMT_X4R4G4B4, + WINED3DFMT_A2B10G10R10, + WINED3DFMT_A8B8G8R8, + WINED3DFMT_X8B8G8R8, + WINED3DFMT_A2R10G10B10, + WINED3DFMT_A8P8, + WINED3DFMT_P8 + }; + TRACE("(%p)->(%p,%p,%p): Relay\n", This, DDSD, Context, cb); /* This looks sane */ @@ -1182,41 +1202,52 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, pixelformat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); } - while(IWineD3D_EnumAdapterModes(This->wineD3D, - WINED3DADAPTER_DEFAULT, - pixelformat, - modenum++, - &mode) == WINED3D_OK) { - if(DDSD) + for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) + { + if(pixelformat != WINED3DFMT_UNKNOWN && checkFormatList[fmt] != pixelformat) { - if(DDSD->dwFlags & DDSD_WIDTH && mode.Width != DDSD->dwWidth) continue; - if(DDSD->dwFlags & DDSD_HEIGHT && mode.Height != DDSD->dwHeight) continue; + continue; } - memset(&callback_sd, 0, sizeof(callback_sd)); - callback_sd.dwSize = sizeof(callback_sd); - callback_sd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - - callback_sd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; - if(Flags & DDEDM_REFRESHRATES) + modenum = 0; + while(IWineD3D_EnumAdapterModes(This->wineD3D, + WINED3DADAPTER_DEFAULT, + checkFormatList[fmt], + modenum++, + &mode) == WINED3D_OK) { - callback_sd.dwFlags |= DDSD_REFRESHRATE; - callback_sd.u2.dwRefreshRate = mode.RefreshRate; - } + if(DDSD) + { + if(DDSD->dwFlags & DDSD_WIDTH && mode.Width != DDSD->dwWidth) continue; + if(DDSD->dwFlags & DDSD_HEIGHT && mode.Height != DDSD->dwHeight) continue; + } - callback_sd.dwWidth = mode.Width; - callback_sd.dwHeight = mode.Height; + memset(&callback_sd, 0, sizeof(callback_sd)); + callback_sd.dwSize = sizeof(callback_sd); + callback_sd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - PixelFormat_WineD3DtoDD(&callback_sd.u4.ddpfPixelFormat, mode.Format); + callback_sd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; + if(Flags & DDEDM_REFRESHRATES) + { + callback_sd.dwFlags |= DDSD_REFRESHRATE; + callback_sd.u2.dwRefreshRate = mode.RefreshRate; + } - TRACE("Enumerating %dx%d@%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount); + callback_sd.dwWidth = mode.Width; + callback_sd.dwHeight = mode.Height; - if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) - { - TRACE("Application asked to terminate the enumeration\n"); - return DD_OK; + PixelFormat_WineD3DtoDD(&callback_sd.u4.ddpfPixelFormat, mode.Format); + + TRACE("Enumerating %dx%d@%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount); + + if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) + { + TRACE("Application asked to terminate the enumeration\n"); + return DD_OK; + } } } + TRACE("End of enumeration\n"); return DD_OK; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e90e2ce..8f9998c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1117,6 +1117,7 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad switch (Format) { case WINED3DFMT_UNKNOWN: + /* This is for D3D8, do not enumerate P8 here */ if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) i++; break; @@ -1126,6 +1127,9 @@ static UINT WINAPI IWineD3DImpl_GetAdapterModeCount(IWineD3D *iface, UINT Ad case WINED3DFMT_R5G6B5: if (DevModeW.dmBitsPerPel == 16) i++; break; + case WINED3DFMT_P8: + if (DevModeW.dmBitsPerPel == 8) i++; + break; default: /* Skip other modes as they do not match the requested format */ break; @@ -1169,6 +1173,7 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte switch (Format) { case WINED3DFMT_UNKNOWN: + /* This is D3D8. Do not enumerate P8 here */ if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) i++; break; @@ -1178,6 +1183,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte case WINED3DFMT_R5G6B5: if (DevModeW.dmBitsPerPel == 16) i++; break; + case WINED3DFMT_P8: + if (DevModeW.dmBitsPerPel == 8) i++; + break; default: /* Modes that don't match what we support can get an early-out */ TRACE_(d3d_caps)("Searching for %s, returning D3DERR_INVALIDCALL\n", debug_d3dformat(Format)); @@ -1203,6 +1211,9 @@ static HRESULT WINAPI IWineD3DImpl_EnumAdapterModes(IWineD3D *iface, UINT Adapte { switch (DevModeW.dmBitsPerPel) { + case 8: + pMode->Format = WINED3DFMT_P8; + break; case 16: pMode->Format = WINED3DFMT_R5G6B5; break;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
69
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2007