January 2006 - Wine-commits

Vitaliy Margolen : user: Remove duplicate code.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 70fcfa755c81405ecb2ca1a11fddb32f4c953d0b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70fcfa755c81405ecb2ca1a… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Jan 30 14:56:25 2006 +0100 user: Remove duplicate code. --- dlls/user/hook.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/user/hook.c b/dlls/user/hook.c index 2533347..b871615 100644 --- a/dlls/user/hook.c +++ b/dlls/user/hook.c @@ -142,12 +142,6 @@ static HHOOK set_windows_hook( INT id, H return 0; } - if (!proc) - { - SetLastError( ERROR_INVALID_FILTER_PROC ); - return 0; - } - /* FIXME: what if the tid belongs to another process? */ if (tid) /* thread-local hook */ {

1 0

Juan Lang : wincrypt.h: Add more missing defines.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: ecc984997455f0e9407b7b7f8120c9f2ae7bacee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ecc984997455f0e9407b7b7… Author: Juan Lang <juan(a)codeweavers.com> Date: Mon Jan 30 14:56:38 2006 +0100 wincrypt.h: Add more missing defines. --- include/wincrypt.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 82a058b..bf2b467 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -872,6 +872,18 @@ typedef const CRYPT_OID_INFO CCRYPT_OID_ typedef BOOL (WINAPI *PFN_CRYPT_ENUM_OID_INFO)(PCCRYPT_OID_INFO pInfo, void *pvArg); +typedef struct _CRYPT_URL_ARRAY { + DWORD cUrl; + LPWSTR *rgwszUrl; +} CRYPT_URL_ARRAY, *PCRYPT_URL_ARRAY; + +typedef struct _CRYPT_URL_INFO { + DWORD cbSize; + DWORD dwSyncDeltaTime; + DWORD cGroup; + DWORD *rgcGroupEntry; +} CRYPT_URL_INFO, *PCRYPT_URL_INFO; + /* OID group IDs */ #define CRYPT_HASH_ALG_OID_GROUP_ID 1 #define CRYPT_ENCRYPT_ALG_OID_GROUP_ID 2 @@ -2252,6 +2264,25 @@ static const WCHAR CERT_PHYSICAL_STORE_A #define CRYPT_VERIFY_CERT_SIGN_ISSUER_CHAIN 3 #define CRYPT_VERIFY_CERT_SIGN_ISSUER_NULL 4 +#define CRYPT_GET_URL_FROM_PROPERTY 0x00000001 +#define CRYPT_GET_URL_FROM_EXTENSION 0x00000002 +#define CRYPT_GET_URL_FROM_UNAUTH_ATTRIBUTE 0x00000004 +#define CRYPT_GET_URL_FROM_AUTH_ATTRIBUTE 0x00000008 + +/* Certificate name string types and flags */ +#define CERT_SIMPLE_NAME_STR 1 +#define CERT_OID_NAME_STR 2 +#define CERT_X500_NAME_STR 3 +#define CERT_NAME_STR_SEMICOLON_FLAG 0x40000000 +#define CERT_NAME_STR_NO_PLUS_FLAG 0x20000000 +#define CERT_STR_NO_QUOTING_FLAG 0x10000000 +#define CERT_NAME_STR_CRLF_FLAG 0x08000000 +#define CERT_NAME_STR_COMMA_FLAG 0x04000000 +#define CERT_NAME_STR_REVERSE_FLAG 0x02000000 +#define CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG 0x00040000 +#define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG 0x00020000 +#define CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG 0x00010000 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -2611,6 +2642,31 @@ BOOL WINAPI CryptUnprotectData( DATA_BLO DATA_BLOB* pOptionalEntropy, PVOID pvReserved, CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut ); +DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, + LPSTR psz, DWORD csz); +DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, + LPWSTR psz, DWORD csz); +#define CertRDNValueToStr WINELIB_NAME_AW(CertRDNValueToStr) + +DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, + DWORD dwStrType, LPSTR psz, DWORD csz); +DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, + DWORD dwStrType, LPWSTR psz, DWORD csz); +#define CertNameToStr WINELIB_NAME_AW(CertNameToStr) + +BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, + DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, + LPCSTR *ppszError); +BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, + DWORD dwStrType, void *pvReserved, BYTE *pbEncoded, DWORD *pcbEncoded, + LPCWSTR *ppszError); +#define CertStrToName WINELIB_NAME_AW(CertStrToName) + +/* cryptnet.dll functions */ +BOOL WINAPI CryptGetObjectUrl(LPCSTR pszUrlOid, LPVOID pvPara, DWORD dwFlags, + PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, + DWORD *pcbUrlInfo, LPVOID pvReserved); + #ifdef __cplusplus } #endif

1 0

Robert Shearman : rpcrt4: Fill in the IRpcStubBuffer vtables for interfaces that don't
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: b670ec83fd8486052a9ed2478217146ea9a3122f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b670ec83fd8486052a9ed24… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 30 14:56:07 2006 +0100 rpcrt4: Fill in the IRpcStubBuffer vtables for interfaces that don't already have them filled in. --- dlls/rpcrt4/cpsf.c | 15 +++++++++++++++ dlls/rpcrt4/cpsf.h | 2 ++ dlls/rpcrt4/cstub.c | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 78ac681..44bb5a9 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -137,9 +137,24 @@ HRESULT WINAPI NdrDllGetClassObject(REFC *ppv = NULL; if (!pPSFactoryBuffer->lpVtbl) { + const ProxyFileInfo **pProxyFileList2; pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl; pPSFactoryBuffer->RefCount = 0; pPSFactoryBuffer->pProxyFileList = pProxyFileList; + for (pProxyFileList2 = pProxyFileList; *pProxyFileList2; pProxyFileList2++) { + int i; + for (i = 0; i < (*pProxyFileList2)->TableSize; i++) { + /* FIXME: i think that different vtables should be copied for + * async interfaces */ + void * const *pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Vtbl; + void **pRpcStubVtbl = (void **)&(*pProxyFileList2)->pStubVtblList[i]->Vtbl; + int j; + + for (j = 0; j < sizeof(IRpcStubBufferVtbl)/sizeof(void *); j++) + if (!pRpcStubVtbl[j]) + pRpcStubVtbl[j] = pSrcRpcStubVtbl[j]; + } + } } if (IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 0c6d067..cf1572b 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -42,4 +42,6 @@ HRESULT WINAPI CStdStubBuffer_Construct( const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); +const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; + #endif /* __WINE_CPSF_H */ diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index a2c62c0..41c0943 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -181,6 +181,20 @@ void WINAPI CStdStubBuffer_DebugServerRe TRACE("(%p)->DebugServerRelease(%p)\n",This,pv); } +const IRpcStubBufferVtbl CStdStubBuffer_Vtbl = +{ + CStdStubBuffer_QueryInterface, + CStdStubBuffer_AddRef, + NULL, + CStdStubBuffer_Connect, + CStdStubBuffer_Disconnect, + CStdStubBuffer_Invoke, + CStdStubBuffer_IsIIDSupported, + CStdStubBuffer_CountRefs, + CStdStubBuffer_DebugServerQueryInterface, + CStdStubBuffer_DebugServerRelease +}; + const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface) { CStdStubBuffer *This = (CStdStubBuffer *)iface;

1 0

Vitaliy Margolen : user/tests: Add test for low level mouse hooks.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 6c64b74a7cdddf0456f592f8db8f97882f34590c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c64b74a7cdddf0456f592f… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Jan 30 14:56:17 2006 +0100 user/tests: Add test for low level mouse hooks. --- dlls/user/tests/msg.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c index 2495df7..dd671d7 100644 --- a/dlls/user/tests/msg.c +++ b/dlls/user/tests/msg.c @@ -5659,6 +5659,13 @@ static const struct message WmGlobalHook { 0 } }; +static const struct message WmMouseLLHookSeq[] = { + { WM_MOUSEMOVE, hook }, + { WM_LBUTTONDOWN, hook }, + { WM_LBUTTONUP, hook }, + { 0 } +}; + static void CALLBACK win_event_global_hook_proc(HWINEVENTHOOK hevent, DWORD event, HWND hwnd, @@ -5710,6 +5717,21 @@ static LRESULT CALLBACK cbt_global_hook_ return CallNextHookEx(hCBT_global_hook, nCode, wParam, lParam); } + /* WH_MOUSE_LL hook */ + if (nCode == HC_ACTION) + { + struct message msg; + MSLLHOOKSTRUCT *mhll = (MSLLHOOKSTRUCT *)lParam; + + /* we can't test for real mouse events */ + if (mhll->flags & LLMHF_INJECTED) + { + msg.message = wParam; + msg.flags = hook; + add_message(&msg); + } + return CallNextHookEx(hCBT_global_hook, nCode, wParam, lParam); + } /* Log also SetFocus(0) calls */ hwnd = wParam ? (HWND)wParam : (HWND)lParam; @@ -5798,6 +5820,33 @@ static DWORD WINAPI cbt_global_hook_thre return 0; } +static DWORD WINAPI mouse_ll_global_thread_proc(void *param) +{ + HWND hwnd; + MSG msg; + HANDLE hevent = *(HANDLE *)param; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); + assert(hwnd); + trace("created thread window %p\n", hwnd); + + *(HWND *)param = hwnd; + + flush_sequence(); + + mouse_event(MOUSEEVENTF_MOVE, 100, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + + SetEvent(hevent); + while (GetMessage(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + return 0; +} + static void test_winevents(void) { BOOL ret; @@ -5960,6 +6009,39 @@ static void test_winevents(void) ok(!IsWindow(hwnd2), "window should be destroyed on thread exit\n"); /****** end of out of context event test *************/ + /****** start of MOUSE_LL hook test *************/ + hCBT_global_hook = SetWindowsHookExA(WH_MOUSE_LL, cbt_global_hook_proc, GetModuleHandleA(0), 0); + assert(hCBT_global_hook); + + hevent = CreateEventA(NULL, 0, 0, NULL); + assert(hevent); + hwnd2 = (HWND)hevent; + + hthread = CreateThread(NULL, 0, mouse_ll_global_thread_proc, &hwnd2, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %ld\n", GetLastError()); + + while (WaitForSingleObject(hevent, 100) == WAIT_TIMEOUT) + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + + ok_sequence(WmMouseLLHookSeq, "MOUSE_LL hook other thread", FALSE); + flush_sequence(); + + mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0); + mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); + + ok_sequence(WmMouseLLHookSeq, "MOUSE_LL hook same thread", FALSE); + + ret = UnhookWindowsHookEx(hCBT_global_hook); + ok( ret, "UnhookWindowsHookEx error %ld\n", GetLastError()); + + PostThreadMessageA(tid, WM_QUIT, 0, 0); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + CloseHandle(hevent); + ok(!IsWindow(hwnd2), "window should be destroyed on thread exit\n"); + /****** end of MOUSE_LL hook test *************/ + ok(DestroyWindow(hwnd), "failed to destroy window\n"); }

1 0

Michael Stefaniuc : kernel: Remove bogus breaks in tape.c
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: b94ceeeb7cb24fce57844a2e97eb94bfd0d17b02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b94ceeeb7cb24fce57844a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 30 14:55:47 2006 +0100 kernel: Remove bogus breaks in tape.c --- dlls/ntdll/tape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index 3a336fb..9925832 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -480,7 +480,7 @@ NTSTATUS TAPE_DeviceIoControl( HANDLE de case IOCTL_TAPE_GET_MEDIA_PARAMS: status = TAPE_GetMediaParams( fd, (TAPE_GET_MEDIA_PARAMETERS *)out_buffer ); break; - case IOCTL_TAPE_GET_POSITION: break; + case IOCTL_TAPE_GET_POSITION: status = TAPE_GetPosition( fd, ((TAPE_GET_POSITION *)in_buffer)->Type, (TAPE_GET_POSITION *)out_buffer ); break; @@ -496,7 +496,7 @@ NTSTATUS TAPE_DeviceIoControl( HANDLE de case IOCTL_TAPE_SET_MEDIA_PARAMS: status = TAPE_SetMediaParams( fd, (TAPE_SET_MEDIA_PARAMETERS *)in_buffer ); break; - case IOCTL_TAPE_SET_POSITION: break; + case IOCTL_TAPE_SET_POSITION: status = TAPE_SetPosition( fd, (TAPE_SET_POSITION *)in_buffer ); break; case IOCTL_TAPE_WRITE_MARKS:

1 0

Robert Shearman : oleaut: Fix the order of parameters passed into DispCallFunc.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: be13d154c64581f3aa6b9e6ada8c72dd79bf3001 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be13d154c64581f3aa6b9e6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 30 14:55:57 2006 +0100 oleaut: Fix the order of parameters passed into DispCallFunc. --- dlls/oleaut32/typelib.c | 71 +++++++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 64ae776..2dbbd34 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5101,10 +5101,9 @@ static HRESULT typedescvt_to_variantvt(I *|CC_MPWCDECL *|CC_MPWPASCAL * - * BUGS - * Native accepts arguments in the reverse order. I.e. the first item in the - * prgpvarg array is the last argument in the C/C++ declaration of the - * function to be called. + * The rgpvarg array contains the parameters, but in the opposite order to + * what is usually assumed. The first parameter in rgpvarg is the last + * parameter in the function call and vice-versa. */ HRESULT WINAPI DispCallFunc( @@ -5138,10 +5137,11 @@ DispCallFunc( argspos++; } - for (i=0;i<cActuals;i++) + for (i = cActuals - 1; i >= 0; i--) { VARIANT *arg = prgpvarg[i]; - TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); + TRACE("Storing arg %d from left (%d as %d)\n", cActuals - 1 - i, + V_VT(arg), prgvt[i]); memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); argspos += _argsize(prgvt[i]); } @@ -5228,8 +5228,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke hres = S_OK; for (i = 0; i < func_desc->cParams; i++) { + UINT varindex = func_desc->cParams - 1 - i; TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &rgvt[i]); + hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &rgvt[varindex]); if (FAILED(hres)) goto func_fail; } @@ -5238,6 +5239,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + UINT varindex = func_desc->cParams - 1 - i; if (wParamFlags & PARAMFLAG_FRETVAL) { @@ -5247,9 +5249,9 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (i == func_desc->cParams - 1) { VARIANTARG *arg; - arg = prgpvarg[i] = &rgvarg[i]; + arg = prgpvarg[varindex] = &rgvarg[varindex]; memset(arg, 0, sizeof(*arg)); - V_VT(arg) = rgvt[i]; + V_VT(arg) = rgvt[varindex]; memset(&retval, 0, sizeof(retval)); V_BYREF(arg) = &retval; } @@ -5263,35 +5265,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke else if (i < pDispParams->cArgs) { VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; - V_VT(&rgvarg[i]) = V_VT(src_arg); + V_VT(&rgvarg[varindex]) = V_VT(src_arg); dump_Variant(src_arg); /* FIXME: this doesn't work for VT_BYREF arguments if * they are not the same type as in the paramdesc */ - if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) + if ((rgvt[varindex] & VT_BYREF) && !V_ISBYREF(src_arg)) { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); - V_VT(&missing_arg[i]) = V_VT(src_arg); - hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); - V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + V_VT(&missing_arg[varindex]) = V_VT(src_arg); + hres = VariantChangeType(&missing_arg[varindex], + src_arg, 0, + rgvt[varindex] & ~VT_BYREF); + V_BYREF(&rgvarg[varindex]) = &V_NONE(&missing_arg[varindex]); } else - hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + hres = VariantChangeType(&rgvarg[varindex], src_arg, + 0, rgvt[varindex]); if (FAILED(hres)) { ERR("failed to convert param %d to %s%s from %s%s\n", i, - debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), + debugstr_vt(rgvt[varindex]), debugstr_vf(rgvt[varindex]), debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } - V_VT(&rgvarg[i]) = rgvt[i]; - prgpvarg[i] = &rgvarg[i]; + V_VT(&rgvarg[varindex]) = rgvt[varindex]; + prgpvarg[varindex] = &rgvarg[varindex]; } else if (wParamFlags & PARAMFLAG_FOPT) { VARIANTARG *arg; - arg = prgpvarg[i] = &rgvarg[i]; + arg = prgpvarg[varindex] = &rgvarg[varindex]; if (wParamFlags & PARAMFLAG_FHASDEFAULT) { hres = VariantCopy(arg, &func_desc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue); @@ -5302,7 +5307,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); V_VT(arg) = VT_VARIANT | VT_BYREF; - V_VARIANTREF(arg) = &missing_arg[i]; + V_VARIANTREF(arg) = &missing_arg[varindex]; V_VT(V_VARIANTREF(arg)) = VT_ERROR; V_ERROR(V_VARIANTREF(arg)) = DISP_E_PARAMNOTFOUND; } @@ -5331,38 +5336,44 @@ static HRESULT WINAPI ITypeInfo_fnInvoke for (i = 0; i < func_desc->cParams; i++) { + UINT varindex = func_desc->cParams - 1 - i; USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; if (wParamFlags & PARAMFLAG_FRETVAL) { if (TRACE_ON(ole)) { TRACE("[retval] value: "); - dump_Variant(prgpvarg[i]); + dump_Variant(prgpvarg[varindex]); } if (pVarResult) + { /* deref return value */ - hres = VariantCopyInd(pVarResult, prgpvarg[i]); + hres = VariantCopyInd(pVarResult, prgpvarg[varindex]); + TRACE("derefed [retval] value: "); + dump_Variant(pVarResult); + } /* free data stored in varresult. Note that * VariantClear doesn't do what we want because we are * working with byref types. */ /* FIXME: clear safearrays, bstrs, records and * variants here too */ - if ((V_VT(prgpvarg[i]) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(prgpvarg[i]) == (VT_DISPATCH | VT_BYREF))) + if ((V_VT(prgpvarg[varindex]) == (VT_UNKNOWN | VT_BYREF)) || + (V_VT(prgpvarg[varindex]) == (VT_DISPATCH | VT_BYREF))) { - if(*V_UNKNOWNREF(prgpvarg[i])) - IUnknown_Release(*V_UNKNOWNREF(prgpvarg[i])); + if(*V_UNKNOWNREF(prgpvarg[varindex])) + IUnknown_Release(*V_UNKNOWNREF(prgpvarg[varindex])); } break; } - else if (i < pDispParams->cArgs) + + if (i < pDispParams->cArgs) { if (wParamFlags & PARAMFLAG_FOUT) { hres = VariantChangeType(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i], - &rgvarg[i], 0, + &rgvarg[varindex], 0, V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i])); if (FAILED(hres)) { @@ -5371,12 +5382,12 @@ static HRESULT WINAPI ITypeInfo_fnInvoke break; } } - VariantClear(&rgvarg[i]); + VariantClear(&rgvarg[varindex]); } else if (wParamFlags & PARAMFLAG_FOPT) { if (wParamFlags & PARAMFLAG_FHASDEFAULT) - VariantClear(&rgvarg[i]); + VariantClear(&rgvarg[varindex]); } }

1 0

lostwages/wwn wn20060129_304.xml
by WineHQ 30 Jan '06

30 Jan '06

ChangeSet ID: 22589 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/01/30 01:27:23 Modified files: wwn : wn20060129_304.xml Log message: update WWN with the correct section Patch: http://cvs.winehq.org/patch.py?id=22589 Old revision New revision Changes Path 1.1 1.2 +66 -85 lostwages/wwn/wn20060129_304.xml Index: lostwages/wwn/wn20060129_304.xml diff -u -p lostwages/wwn/wn20060129_304.xml:1.1 lostwages/wwn/wn20060129_304.xml:1.2 --- lostwages/wwn/wn20060129_304.xml:1.1 30 Jan 2006 7:27:23 -0000 +++ lostwages/wwn/wn20060129_304.xml 30 Jan 2006 7:27:23 -0000 @@ -356,103 +356,84 @@ and after that the patches did get commi </section> <section - title="Hook Problems" - subject="Global hooks problems (WH_MOUSE_LL)" - archive="http://www.winehq.com/pipermail/wine-devel/2006-January/044395.html" - posts="8" + title="JACK Audio Driver" + subject="wine and jack => segfault? / wine and OSS not working" + archive="http://www.winehq.com/pipermail/wine-devel/2006-January/044324.html" + posts="7" > -Windows has a concept of hooks that allow an application to monitor -the system for various events that might occur. For example, you can use -the <tt>WH_MOUSE</tt> hook to intercept mouse messages before they're -normally processed. Vitaliy Margolen noticed a problem last week with -Wine's implementation: -<quote who="Vitaliy Margolen"> - Trying to track down the problem with our DInput implementation I found -some interesting stuff - our global hooks don't work correctly because -hook callbacks are never called if event is generated in the different -thread. I don't think this is a revelation to number of people who knew -that before. But how do we fix it? +<topic>Multimedia</topic> +Wine has a lot of audio drivers, but some of them don't get used +very often and might not work at all. This week Joachim Förster +posted a problem about the low-latency audio server +<a href="http://jackit.sourceforge.net/">JACK</a>: +<quote who="Joachim Forster"> + +some days ago I sent some mails to the wine-users list. My problem: the +JACK output driver of wine does not work => wine segfaults; and the OSS +output driver does not work, too. Windows Media Player (used for +testing) says, it cannot find the audio hardware. + +Since then, nobody on the wine-users list had any idea what could be +wrong, so now I am posting this here: + +I am new to this list and just wanted to ask a question regarding Wine +and JACK: + +I'm running JACK as my sound daemon and today I installed Wine (from the +APT-Repository). I setup my .wine directory with the help of winetools. +So far everything works fine, except sound output (tested with wmplayer +and a simple wav file). So I selected "jack" as Audio driver. -Here is what I dug up so far: -<ol> -<li> Installing global hook we setting it as WINEVENT_INCONTEXT while msdn - and tests indicate that it qualifies as WINEVENT_OUTOFCONTEXT instead. - Unless of course we don't want to call post_win_event in step 5 and go - to step 6 instead.</li> -<li> All HW mouse messages start here: - <ul><a href="http://source.winehq.org/source/dlls/x11drv/mouse.c#L191"> - http://source.winehq.org/source/dlls/x11drv/mouse.c#L191</a></ul> - From looking at it I assume that all the HW mouse hooks should be - handled by HOOK_CallHooks function. This is because there are no code - related to hooks in send_message server call.</li> -<li> First thing that HOOK_CallHooks does is calling HOOK_IsHooked with - checks only current thread for installed hooks. So this is first place - that is wrong. Let's comment that check out for now. I think we need - to move that check farther down, after the call to server.</li> -<li> We call start_hook_chain - <a href="http://source.winehq.org/source/server/hook.c#L468"> - http://source.winehq.org/source/server/hook.c#L468</a> - to start hook callback chain. There we call get_first_valid_hook on local - and then global if no local hooks exist. But there again we check for - <a href="http://source.winehq.org/source/server/hook.c#L211"> - http://source.winehq.org/source/server/hook.c#L211</a> - the hook callback thread being local (which is again not the case for global - hooks). This is problem #2.</li> -<li> Now we have post_win_event of but right before it we hitting an assert - so this is not the right way?</li> -<li> Say we returned with success and back to HOOK_CallHooks that now tries - to call MSG_SendInternalMessageTimeout. Which for some reason fails to - deliver message to our global hook.</li> -</ol> +But wine segfaults with wmplayer as soon as opening the wav file: +<ul><code> +$ wine .wine/c/Programme/Windows\ Media\ Player/mplayer2.exe +fixme:process:SetProcessPriorityBoost (0xffffffff,1): stub +fixme:powermgnt:SetThreadExecutionState (0x2): stub, harmless. +fixme:powermgnt:SetThreadExecutionState (0x80000000): stub, harmless. +This sound card's driver does not support direct access +The (slower) DirectSound HEL mode will be used instead. +Segmentation fault</code></ul> - -So my question is to anyone who knows. What is the proper way to deliver -these messages to global hooks that are in a different thread/process? -</quote> - -Rolf Kalbermatter added to it: -<quote who="Rolf Kalbermatter"> - - -Just an observation I did in a Windows program running under WinXP. -Not sure if this is related somehow but it seems quite like the opposite -of what you describe here although with windows message hooks. +I started qjackctl to see what the JACK says: +<ul><code> +20:01:39.052 Audio connection graph change. +20:01:39.136 Audio connection change. +20:01:39.314 XRUN callback (1). +20:01:39.317 Audio connection graph change.</code></ul> -I had a program that was hooking window messages for a particular window. -When using SendMessage from the same thread as in which the Windows message -loop was running (doesn't make much sense of course but it was just for -testing purposes) I could not receive any events above WM_USER, lower -events did seem to get received properly though. When placing SendMessage -in a different thread the events did come through. +So, I assume there was an "connection" established between Wine and JACK? -Not exactly sure yet what this is all about but message handling and -especially hooking in Windows for sure can be a tricky business.</quote> - -Alexandre replied and outlined what was going on: -<quote who="Alexandre Julliard"> -That's because the new win event code changed the meaning of the -thread field, and the low-level hooks haven't been updated for it. Try -something like <a href="http://www.winehq.com/pipermail/wine-devel/2006-January/044439.html">this</a>. +Does anybody know something about this problem? Tell me if I have to +provide more (log/debug) output etc. ... + +I am running Ubuntu Breezy (breezy kernel 2.6.12-10-686). + +PS: Direct output to ALSA works (with jackd not running). </quote> -Vitaliy reported it worked: -<quote who="Vitaliy Margolen"> +Eric Pouech asked for a <tt>+winmm,+oss,+wave</tt> trace to see if he +could figure out where the problem was. Joachim did and noted it was +<quote who="Joachim Forster"> +using OSS-output driver and oss2jack</quote>. Eric replied, +<quote who="Eric Pouech"> +oss2jack doesn't provide a proper mixer interface +does the attached patch help ?</quote> Joachim reported it did and +noted a few issues: +<quote who="Joachim Forster"> -It does work thank you. The only question I have : does that cover -WINEVENT_OUTOFCONTEXT hooks too? + +Yes. Great, thank you very much :-) ! -I'm working on a test to test hooks. Hopefully there will be a way to -test it. +BTW: I had to set "Hardware Acceleration" to "Emulation" (instead of +"Full", but did not try other levels) to make mplayer2.exe play all my +test wave files _right_. -And it looks like we will have to rethink our DInput - the game still -doesn't work. It seems that the thread which acquired mouse doesn't -have a message loop. -</quote> +I used the c:/Windows/Media/*.wav files. And the strange thing was, that +mplayer2.exe (with "Full") played some of them right and others wrong (= +sounds like sampling freq. (transformation) issue).</quote> -Regarding Vitaliy's question about WINEEVENT_OUTOFCONTEXT hooks, -Alexandre asked if he knew they were broken. Vitaliy replied that he -was just asking. +Eric submitted another patch to wine-patches later to address the issue. </section> <section title="Overriding Executables With Winecfg"

1 0

lostwages/ news/2006012901.xml wwn/wn20060129_ ...
by WineHQ 30 Jan '06

30 Jan '06

ChangeSet ID: 22588 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/01/29 19:10:31 Added files: news : 2006012901.xml wwn : wn20060129_304.xml Log message: WWN #304 Patch: http://cvs.winehq.org/patch.py?id=22588 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006012901.xml Added 1.1 +0 -0 lostwages/wwn/wn20060129_304.xml

1 0

appdb/ ./appview.php include/version.php inclu ...
by WineHQ 29 Jan '06

29 Jan '06

ChangeSet ID: 22587 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 22:04:46 Modified files: . : appview.php include : version.php application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move html output of application and version into the application and version classes Patch: http://cvs.winehq.org/patch.py?id=22587 Old revision New revision Changes Path 1.78 1.79 +4 -361 appdb/appview.php 1.46 1.47 +219 -0 appdb/include/version.php 1.41 1.42 +138 -0 appdb/include/application.php

1 0

appdb/include util.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22586 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 17:06:53 Modified files: include : util.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Prevent the choice of unspecified Wine versions Patch: http://cvs.winehq.org/patch.py?id=22586 Old revision New revision Changes Path 1.50 1.51 +10 -4 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.50 appdb/include/util.php:1.51 --- appdb/include/util.php:1.50 28 Jan 2006 23: 6:53 -0000 +++ appdb/include/util.php 28 Jan 2006 23: 6:53 -0000 @@ -120,10 +120,16 @@ function make_bugzilla_version_list($var echo "<option value=\"\">Choose ...</option>\n"; while(list($value) = mysql_fetch_row($result)) { - if($value == $cvalue) - echo "<option value=$value selected>$value\n"; - else - echo "<option value=$value>$value\n"; + if($value == "unspecified") + { + // We do not unspecified versions!!! + } else + { + if($value == $cvalue) + echo "<option value=$value selected>$value\n"; + else + echo "<option value=$value>$value\n"; + } } echo "</select>\n"; }

1 0