February 2006 - Wine-commits

Robert Shearman : widl: Write out TYPEFLAG_FDUAL, TYPEFLAG_FDISPATCHABLE and
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 649d5d0e8e8b7aab4f03f427328c80e7a5497b1f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=649d5d0e8e8b7aab4f03f42… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu Feb 9 12:09:44 2006 +0100 widl: Write out TYPEFLAG_FDUAL, TYPEFLAG_FDISPATCHABLE and TYPEFLAG_FOLEAUTOMATION typelib flags. --- tools/widl/write_msft.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index ac67500..f749542 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1676,6 +1676,11 @@ static msft_typeinfo_t *create_msft_type typeinfo->datatype1 = offset; break; } + + case ATTR_DUAL: + typeinfo->flags |= 0x40; /* TYPEFLAG_FDUAL */ + break; + case ATTR_HELPCONTEXT: { expr_t *expr = (expr_t*)attr->u.pval; @@ -1706,6 +1711,10 @@ static msft_typeinfo_t *create_msft_type case ATTR_ODL: break; + case ATTR_OLEAUTOMATION: + typeinfo->flags |= 0x100; /* TYPEFLAG_FOLEAUTOMATION */ + break; + case ATTR_PUBLIC: break; @@ -1824,6 +1833,7 @@ static void add_interface_typeinfo(msft_ msft_typeinfo_t *msft_typeinfo; int num_parents = 0, num_funcs = 0; const attr_t *attr; + const type_t *derived; for(attr = interface->attrs; attr; attr = NEXT_LINK(attr)) if(attr->type == ATTR_DISPINTERFACE) @@ -1841,6 +1851,14 @@ static void add_interface_typeinfo(msft_ msft_typeinfo->typeinfo->size = 4; msft_typeinfo->typeinfo->typekind |= 0x2200; + for (derived = interface->ref; derived; derived = derived->ref) + if (derived->name && !strcmp(derived->name, "IDispatch")) + msft_typeinfo->typeinfo->flags |= 0x1000; /* TYPEFLAG_FDISPATCHABLE */ + + /* can't be dual if it doesn't derive from IDispatch */ + if (!(msft_typeinfo->typeinfo->flags & 0x1000)) /* TYPEFLAG_FDISPATCHABLE */ + msft_typeinfo->typeinfo->flags &= 0x40; /* TYPEFLAG_FDUAL */ + if(interface->ref) add_impl_type(msft_typeinfo, interface->ref);

1 0

Juan Lang : crypt32: Fix up decoding.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 69698f9b44ce78b6e60e91e9664779e8a0e5383b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69698f9b44ce78b6e60e91e… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 9 12:09:28 2006 +0100 crypt32: Fix up decoding. - don't use the no copy flag when decoding, the lifetime of the buffer to decode isn't guaranteed - remove some extraneous ternary comparisons - fix a comment --- dlls/crypt32/cert.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 346d898..52cd987 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -552,7 +552,7 @@ static void CRYPT_MemEmptyStore(PWINE_ME PWINE_CERT_LIST_ENTRY cert, next; EnterCriticalSection(&store->cs); - /* Note that CertFreeCertificateContext calls HeapFree on the passed-in + /* Note that CertFreeCertificateContext calls CryptMemFree on the passed-in * pointer if its ref-count reaches zero. That's okay here because there * aren't any allocated data outside of the WINE_CERT_CONTEXT_REF portion * of the CertListEntry. @@ -1939,15 +1939,13 @@ static PWINE_CERT_CONTEXT CRYPT_CreateCe /* First try to decode it as a signed cert. */ ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT, pbCertEncoded, - cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&signedCert, &size); + cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCert, &size); if (ret) { size = 0; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&certInfo, &size); + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&certInfo, &size); LocalFree(signedCert); } /* Failing that, try it as an unsigned cert */ @@ -2241,7 +2239,7 @@ static BOOL CRYPT_SaveCertificateContext { CryptMemFree(prop->pbData); prop->hdr.cb = cbData; - prop->pbData = cbData ? data : NULL; + prop->pbData = data; ret = TRUE; } else @@ -2253,7 +2251,7 @@ static BOOL CRYPT_SaveCertificateContext prop->hdr.unknown = 1; prop->hdr.cb = cbData; list_init(&prop->entry); - prop->pbData = cbData ? data : NULL; + prop->pbData = data; list_add_tail(&context->extendedProperties, &prop->entry); ret = TRUE; }

1 0

Juan Lang : crypt32: Fix a fixme, and remove an old comment.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 02c4956157033896077b4027834f11f8dcdb56f3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02c4956157033896077b402… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 9 12:09:01 2006 +0100 crypt32: Fix a fixme, and remove an old comment. --- dlls/crypt32/encode.c | 71 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index b0a7196..7b4da1c 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -84,10 +84,6 @@ typedef BOOL (WINAPI *CryptDecodeObjectE * built-in functions, but the parameters are retained to simplify * CryptEncodeObjectEx/CryptDecodeObjectEx, since they must call functions in * external DLLs that follow these signatures. - * FIXME: some built-in functions are suitable to be called directly by - * CryptEncodeObjectEx/CryptDecodeObjectEx (they implement exception handling - * and memory allocation if requested), others are only suitable to be called - * internally. Comment which are which. */ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, @@ -126,7 +122,7 @@ static BOOL WINAPI CRYPT_AsnEncodeChoice static BOOL WINAPI CRYPT_AsnDecodeChoiceOfTime(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); -static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnDecodePubKeyInfoInternal(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo); /* Like CRYPT_AsnDecodeExtensions, except assumes rgExtension is set ahead of @@ -3067,12 +3063,9 @@ static BOOL WINAPI CRYPT_AsnDecodeCertIn { 0, offsetof(CERT_INFO, Subject), CRYPT_AsnDecodeDerBlob, sizeof(CRYPT_DER_BLOB), FALSE, TRUE, offsetof(CERT_INFO, Subject.pbData) }, - /* jil FIXME: shouldn't this have an internal version, which expects - * the pbData to be set? - */ { ASN_SEQUENCEOF, offsetof(CERT_INFO, SubjectPublicKeyInfo), - CRYPT_AsnDecodePubKeyInfo, sizeof(CERT_PUBLIC_KEY_INFO), FALSE, - TRUE, offsetof(CERT_INFO, + CRYPT_AsnDecodePubKeyInfoInternal, sizeof(CERT_PUBLIC_KEY_INFO), + FALSE, TRUE, offsetof(CERT_INFO, SubjectPublicKeyInfo.Algorithm.Parameters.pbData), 0 }, { ASN_BITSTRING, offsetof(CERT_INFO, IssuerUniqueId), CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE, @@ -3690,6 +3683,29 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgori return ret; } +static BOOL WINAPI CRYPT_AsnDecodePubKeyInfoInternal(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = TRUE; + struct AsnDecodeSequenceItem items[] = { + { ASN_SEQUENCEOF, offsetof(CERT_PUBLIC_KEY_INFO, Algorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CERT_PUBLIC_KEY_INFO, + Algorithm.pszObjId) }, + { ASN_BITSTRING, offsetof(CERT_PUBLIC_KEY_INFO, PublicKey), + CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE, + offsetof(CERT_PUBLIC_KEY_INFO, PublicKey.pbData) }, + }; + PCERT_PUBLIC_KEY_INFO info = (PCERT_PUBLIC_KEY_INFO)pvStructInfo; + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, info ? + info->Algorithm.Parameters.pbData : NULL); + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -3698,19 +3714,30 @@ static BOOL WINAPI CRYPT_AsnDecodePubKey __TRY { - struct AsnDecodeSequenceItem items[] = { - { ASN_SEQUENCEOF, offsetof(CERT_PUBLIC_KEY_INFO, Algorithm), - CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), - FALSE, TRUE, offsetof(CERT_PUBLIC_KEY_INFO, - Algorithm.pszObjId) }, - { ASN_BITSTRING, offsetof(CERT_PUBLIC_KEY_INFO, PublicKey), - CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE, - offsetof(CERT_PUBLIC_KEY_INFO, PublicKey.pbData) }, - }; + DWORD bytesNeeded; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + if ((ret = CRYPT_AsnDecodePubKeyInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded))) + { + if (!pvStructInfo) + *pcbStructInfo = bytesNeeded; + else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, + pvStructInfo, pcbStructInfo, bytesNeeded))) + { + PCERT_PUBLIC_KEY_INFO info; + + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = (PCERT_PUBLIC_KEY_INFO)pvStructInfo; + info->Algorithm.Parameters.pbData = (BYTE *)pvStructInfo + + sizeof(CERT_PUBLIC_KEY_INFO); + ret = CRYPT_AsnDecodePubKeyInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + &bytesNeeded); + } + } } __EXCEPT_PAGE_FAULT {

1 0

Aric Stewart : advapi32: Fix for RegNotifyChangeKeyValue.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 910806393dbffc77094652cb7dfff93217e3e4eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=910806393dbffc77094652c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 9 12:08:47 2006 +0100 advapi32: Fix for RegNotifyChangeKeyValue. Flip fAsync and fWatchSubTree into their proper places. --- dlls/advapi32/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4cb6add..df56997 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2337,8 +2337,8 @@ LONG WINAPI RegNotifyChangeKeyValue( HKE hEvent, fAsync); status = NtNotifyChangeKey( hkey, hEvent, NULL, NULL, &iosb, - fdwNotifyFilter, fWatchSubTree, NULL, 0, - fAsync ); + fdwNotifyFilter, fAsync, NULL, 0, + fWatchSubTree); if (status && status != STATUS_TIMEOUT) return RtlNtStatusToDosError( status );

1 0

Gerald Pfeifer : ntdll: Take into account that FreeBSD and others have MTSETBSIZ
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: ba9ec9e23368c099efb0b7abba502045a0695808 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba9ec9e23368c099efb0b7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Feb 9 12:08:32 2006 +0100 ntdll: Take into account that FreeBSD and others have MTSETBSIZ instead of MTSETBLK. --- dlls/ntdll/tape.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index b9ca48d..32f2684 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -30,10 +30,12 @@ #include <sys/mtio.h> #endif -/* FreeBSD, for example, has MTCOMP instead of MTCOMPRESSION. */ #if !defined(MTCOMPRESSION) && defined(MTCOMP) #define MTCOMPRESSION MTCOMP #endif +#if !defined(MTSETBLK) && defined(MTSETBSIZ) +#define MTSETBLK MTSETBSIZ +#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT

1 0

Dmitry Timoshkov : x11drv: Update Swiss French keyboard layout to better match the X11 one.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 44b335a9e0c7c87e00de524ccba6739bd0642d8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=44b335a9e0c7c87e00de524… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 9 12:08:19 2006 +0100 x11drv: Update Swiss French keyboard layout to better match the X11 one. --- dlls/x11drv/keyboard.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 92ae311..78ff47c 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -351,14 +351,14 @@ static const char main_key_SG[MAIN_LEN][ "<>" }; -/*** Swiss French keyboard layout (contributed by Philippe Froidevaux) */ +/*** Swiss French keyboard layout (setxkbmap ch -variant fr) */ static const char main_key_SF[MAIN_LEN][4] = { - "��","1+|","2\"@","3*#","4�","5%","6&�","7/�","8(�","9)","0=","'?�","^`~", - "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��[","�!]", - "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��{","$�}", + "��","1+","2\"","3*","4�","5%","6&","7/","8(","9)","0=","'?","^`", + "qQ","wW","eE","rR","tT","zZ","uU","iI","oO","pP","��","�!", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","��","��","$�", "yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", - "<>\\" + "<>" }; /*** Norwegian keyboard layout (contributed by Ove K�ven) */

1 0

Robert Reif : dsound: Fix duplex test.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 64841caba83059c430f3ef4dbe9a93e8b1b41f7f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64841caba83059c430f3ef4… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Feb 9 12:08:05 2006 +0100 dsound: Fix duplex test. --- dlls/dsound/tests/duplex.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 2833d35..45acdff 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -123,12 +123,15 @@ static void IDirectSoundFullDuplex_tests rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, (void**)&dsfdo); - ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG, + ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG||rc==CLASS_E_CLASSNOTAVAILABLE, "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n", DXGetErrorString8(rc), rc); if (rc==REGDB_E_CLASSNOTREG) { trace(" Class Not Registered\n"); return; + } else if (rc==CLASS_E_CLASSNOTAVAILABLE) { + trace(" Class Not Available\n"); + return; } if (dsfdo) IDirectSoundFullDuplex_test(dsfdo, FALSE, NULL, NULL);

1 0

Christoph Frick : dinput: Dynamic handling of buttons of a device.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 094e85398b999f016a71df20c0ce54816702bf72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=094e85398b999f016a71df2… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Feb 9 12:07:55 2006 +0100 dinput: Dynamic handling of buttons of a device. --- dlls/dinput/joystick_linuxinput.c | 171 ++++++------------------------------- 1 files changed, 29 insertions(+), 142 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index b1c5558..5f3be50 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -120,7 +120,9 @@ struct JoystickImpl int ff_state; /* data returned by the EVIOCGABS() ioctl */ - int axes[ABS_MAX+1][5]; + int axes[ABS_MAX][5]; + /* LUT for KEY_ to offset in rgbButtons */ + BYTE buttons[KEY_MAX]; #define AXE_ABS 0 #define AXE_ABSMIN 1 @@ -457,7 +459,7 @@ static HRESULT WINAPI JoystickAImpl_SetD */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) { - int i; + int i,buttons; JoystickImpl *This = (JoystickImpl *)iface; char buf[200]; BOOL readonly = TRUE; @@ -529,7 +531,7 @@ static HRESULT WINAPI JoystickAImpl_Acqu if (test_bit(This->absbits,i)) { if (-1==ioctl(This->joyfd,EVIOCGABS(i),&(This->axes[i]))) continue; - FIXME("axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", + TRACE("axe %d: cur=%d, min=%d, max=%d, fuzz=%d, flat=%d\n", i, This->axes[i][AXE_ABS], This->axes[i][AXE_ABSMIN], @@ -541,7 +543,14 @@ static HRESULT WINAPI JoystickAImpl_Acqu This->havemax[i] = This->axes[i][AXE_ABSMAX]; } } - MESSAGE("\n"); + buttons = 0; + for (i=0;i<KEY_MAX;i++) { + if (test_bit(This->keybits,i)) { + TRACE("button %d: %d\n", i, buttons); + This->buttons[i] = 0x80 | buttons; + buttons++; + } + } fake_current_js_state(This); @@ -661,6 +670,7 @@ static void joy_polldev(JoystickImpl *Th struct timeval tv; fd_set readfds; struct input_event ie; + int btn; if (This->joyfd==-1) return; @@ -680,76 +690,14 @@ static void joy_polldev(JoystickImpl *Th TRACE("input_event: type %d, code %d, value %d\n",ie.type,ie.code,ie.value); switch (ie.type) { case EV_KEY: /* button */ - switch (ie.code) { - case BTN_TRIGGER: /* normal flight stick */ - case BTN_A: /* gamepad */ - case BTN_1: /* generic */ - This->js.rgbButtons[0] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(0),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_THUMB: - case BTN_B: - case BTN_2: - This->js.rgbButtons[1] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(1),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_THUMB2: - case BTN_C: - case BTN_3: - This->js.rgbButtons[2] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(2),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_TOP: - case BTN_X: - case BTN_4: - This->js.rgbButtons[3] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(3),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_TOP2: - case BTN_Y: - case BTN_5: - This->js.rgbButtons[4] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(4),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_PINKIE: - case BTN_Z: - case BTN_6: - This->js.rgbButtons[5] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(5),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + btn = This->buttons[ie.code]; + TRACE("(%p) %d -> %d\n", This, ie.code, btn); + if (btn&0x80) { + btn &= 0x7F; + This->js.rgbButtons[btn] = ie.value?0x80:0x00; + GEN_EVENT(DIJOFS_BUTTON(btn),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); + } break; - case BTN_BASE: - case BTN_TL: - case BTN_7: - This->js.rgbButtons[6] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(6),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_BASE2: - case BTN_TR: - case BTN_8: - This->js.rgbButtons[7] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(7),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_BASE3: - case BTN_TL2: - case BTN_9: - This->js.rgbButtons[8] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(8),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_BASE4: - case BTN_TR2: - This->js.rgbButtons[9] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(9),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - case BTN_BASE5: - case BTN_SELECT: - This->js.rgbButtons[10] = ie.value?0x80:0x00; - GEN_EVENT(DIJOFS_BUTTON(10),ie.value?0x80:0x0,ie.time.tv_usec,(This->dinput->evsequence)++); - break; - default: - FIXME("unhandled joystick button %x, value %d\n",ie.code,ie.value); - break; - } - break; case EV_ABS: switch (ie.code) { case ABS_X: @@ -794,6 +742,9 @@ static void joy_polldev(JoystickImpl *Th This->ff_state = ie.value; break; #endif + case EV_SYN: + /* there is nothing to do */ + break; default: FIXME("joystick cannot handle type %d event (code %d)\n",ie.type,ie.code); break; @@ -1141,7 +1092,7 @@ static HRESULT WINAPI JoystickAImpl_Enum if ((dwFlags == DIDFT_ALL) || (dwFlags & DIDFT_BUTTON)) { - int i; + int i, btncount=0; /*The DInput SDK says that GUID_Button is only for mouse buttons but well*/ @@ -1149,74 +1100,10 @@ static HRESULT WINAPI JoystickAImpl_Enum for (i = 0; i < KEY_MAX; i++) { if (!test_bit(This->keybits,i)) continue; - - switch (i) { - case BTN_TRIGGER: - case BTN_A: - case BTN_1: - ddoi.dwOfs = DIJOFS_BUTTON(0); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 0) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_THUMB: - case BTN_B: - case BTN_2: - ddoi.dwOfs = DIJOFS_BUTTON(1); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 1) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_THUMB2: - case BTN_C: - case BTN_3: - ddoi.dwOfs = DIJOFS_BUTTON(2); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 2) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_TOP: - case BTN_X: - case BTN_4: - ddoi.dwOfs = DIJOFS_BUTTON(3); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 3) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_TOP2: - case BTN_Y: - case BTN_5: - ddoi.dwOfs = DIJOFS_BUTTON(4); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 4) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_PINKIE: - case BTN_Z: - case BTN_6: - ddoi.dwOfs = DIJOFS_BUTTON(5); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 5) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_BASE: - case BTN_TL: - case BTN_7: - ddoi.dwOfs = DIJOFS_BUTTON(6); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 6) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_BASE2: - case BTN_TR: - case BTN_8: - ddoi.dwOfs = DIJOFS_BUTTON(7); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 7) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_BASE3: - case BTN_TL2: - case BTN_9: - ddoi.dwOfs = DIJOFS_BUTTON(8); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 8) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_BASE4: - case BTN_TR2: - ddoi.dwOfs = DIJOFS_BUTTON(9); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 9) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - case BTN_BASE5: - case BTN_SELECT: - ddoi.dwOfs = DIJOFS_BUTTON(10); - ddoi.dwType = DIDFT_MAKEINSTANCE((0x0001 << 10) << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; - break; - } - sprintf(ddoi.tszName, "%d-Button", i); + ddoi.dwOfs = DIJOFS_BUTTON(btncount); + ddoi.dwType = DIDFT_MAKEINSTANCE(btncount << WINE_JOYSTICK_BUTTON_BASE) | DIDFT_PSHBUTTON; + sprintf(ddoi.tszName, "%d-Button", btncount); + btncount++; _dump_OBJECTINSTANCEA(&ddoi); if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) { /* return to unaquired state if that's where we were */

1 0

Christoph Frick : wined3d: Support for WINED3DFMT_A8B8G8R8.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: c99cab705e6e9183ebd278949d54d32fd5c8adcd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c99cab705e6e9183ebd2789… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Feb 9 12:07:40 2006 +0100 wined3d: Support for WINED3DFMT_A8B8G8R8. --- dlls/wined3d/utils.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1d7421f..961c2bb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -35,6 +35,7 @@ const char* debug_d3dformat(WINED3DFORMA FMT_TO_STR(WINED3DFMT_UNKNOWN); FMT_TO_STR(WINED3DFMT_R8G8B8); FMT_TO_STR(WINED3DFMT_A8R8G8B8); + FMT_TO_STR(WINED3DFMT_A8B8G8R8); FMT_TO_STR(WINED3DFMT_X8R8G8B8); FMT_TO_STR(WINED3DFMT_R5G6B5); FMT_TO_STR(WINED3DFMT_X1R5G5B5); @@ -1611,6 +1612,7 @@ GLint D3DFmt2GLIntFmt(IWineD3DDeviceImpl case WINED3DFMT_A4R4G4B4: retVal = GL_RGBA4; break; case WINED3DFMT_X4R4G4B4: retVal = GL_RGB4; break; case WINED3DFMT_A8R8G8B8: retVal = GL_RGBA8; break; + case WINED3DFMT_A8B8G8R8: retVal = GL_RGBA8; break; case WINED3DFMT_A2R10G10B10: retVal = GL_RGBA8; break; case WINED3DFMT_X8R8G8B8: retVal = GL_RGB; break; /* to see */ @@ -1676,6 +1678,7 @@ GLenum D3DFmt2GLFmt(IWineD3DDeviceImpl* case WINED3DFMT_A4R4G4B4: retVal = GL_BGRA; break; case WINED3DFMT_X4R4G4B4: retVal = GL_BGRA; break; case WINED3DFMT_A8R8G8B8: retVal = GL_BGRA; break; + case WINED3DFMT_A8B8G8R8: retVal = GL_RGBA; break; case WINED3DFMT_A2R10G10B10: retVal = GL_BGRA; break; case WINED3DFMT_X8R8G8B8: retVal = GL_BGRA; break; /* to see */ @@ -1738,6 +1741,7 @@ GLenum D3DFmt2GLType(IWineD3DDeviceImpl* case WINED3DFMT_A4R4G4B4: retVal = GL_UNSIGNED_SHORT_4_4_4_4_REV; break; case WINED3DFMT_X4R4G4B4: retVal = GL_UNSIGNED_SHORT_4_4_4_4_REV; break; case WINED3DFMT_A8R8G8B8: retVal = GL_UNSIGNED_INT_8_8_8_8_REV; break; + case WINED3DFMT_A8B8G8R8: retVal = GL_UNSIGNED_INT_8_8_8_8_REV; break; case WINED3DFMT_A2R10G10B10: retVal = GL_UNSIGNED_INT_2_10_10_10_REV; break; case WINED3DFMT_X8R8G8B8: retVal = GL_UNSIGNED_INT_8_8_8_8_REV; break; /* to see */ @@ -1781,6 +1785,7 @@ SHORT D3DFmtGetBpp(IWineD3DDeviceImpl* T case WINED3DFMT_A4R4G4B4: retVal = 2; break; case WINED3DFMT_X4R4G4B4: retVal = 2; break; case WINED3DFMT_A8R8G8B8: retVal = 4; break; + case WINED3DFMT_A8B8G8R8: retVal = 4; break; case WINED3DFMT_A2R10G10B10: retVal = 4; break; case WINED3DFMT_X8R8G8B8: retVal = 4; break; /* Paletted */

1 0

Christoph Frick : wined3d: Better warn/fixme for query handling.
by Alexandre Julliard 09 Feb '06

09 Feb '06

Module: wine Branch: refs/heads/master Commit: 61f8ef7936533ffb05e34311e6981b214f07d81d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61f8ef7936533ffb05e3431… Author: Christoph Frick <frick(a)sc-networks.de> Date: Thu Feb 9 12:07:30 2006 +0100 wined3d: Better warn/fixme for query handling. --- dlls/wined3d/device.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aff60cf..a642f79 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1095,8 +1095,14 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create if (NULL == ppQuery) { /* Just a check to see if we support this type of query */ HRESULT hr = D3DERR_NOTAVAILABLE; - /* Lie and say everything is good (we can return ok fake data from a stub) */ switch(Type) { + case WINED3DQUERYTYPE_OCCLUSION: + TRACE("(%p) occlusion query\n", This); + if (GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY)) + hr = D3D_OK; + else + WARN("Unsupported in local OpenGL implementation: ARB_OCCLUSION_QUERY/NV_OCCLUSION_QUERY\n"); + break; case WINED3DQUERYTYPE_VCACHE: case WINED3DQUERYTYPE_RESOURCEMANAGER: case WINED3DQUERYTYPE_VERTEXSTATS: @@ -1110,16 +1116,9 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create case WINED3DQUERYTYPE_PIXELTIMINGS: case WINED3DQUERYTYPE_BANDWIDTHTIMINGS: case WINED3DQUERYTYPE_CACHEUTILIZATION: - break; - case WINED3DQUERYTYPE_OCCLUSION: - TRACE("(%p) occlusion query\n", This); - if (GL_SUPPORT(ARB_OCCLUSION_QUERY) || GL_SUPPORT(NV_OCCLUSION_QUERY)) - hr = D3D_OK; - break; default: - FIXME("(%p) Unhandled query type %d\n",This , Type); + FIXME("(%p) Unhandled query type %d\n", This, Type); } - FIXME("(%p) : Stub request for query type %d returned %ld\n", This, Type, hr); return hr; }

1 0