wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Marcus Meissner : ws2_32: Fixed select() number of fds (Coverity).
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: f50b8b8ac1daff210ebc0749875be801d51d3801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b8b8ac1daff210ebc07498… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Jun 16 13:58:12 2011 +0200 ws2_32: Fixed select() number of fds (Coverity). --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index de9c400..29c97e2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2958,7 +2958,7 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) fd_set readset; FD_ZERO(&readset); FD_SET(sock, &readset); - select(0, &readset, NULL, NULL, NULL); + select(sock+1, &readset, NULL, NULL, NULL); while (drain_pause) Sleep(100); }

1 0

Alexandre Julliard : rpcrt4: Add a wrapper for NdrAsyncClientCall too.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: a75402af9643065b648e906ca9a5301e276864fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a75402af9643065b648e906ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 17:30:49 2011 +0200 rpcrt4: Add a wrapper for NdrAsyncClientCall too. --- dlls/rpcrt4/ndr_stubless.c | 43 ++++++++++++++++++++++++++++++++++--------- dlls/rpcrt4/ndr_stubless.h | 2 ++ 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 1f34b76..bbc9c19 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1773,8 +1773,7 @@ struct async_call_data ULONG_PTR NdrCorrCache[256]; }; -CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, - PFORMAT_STRING pFormat, ...) +LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) { /* pointer to start of stack where arguments start */ PRPC_MESSAGE pRpcMsg; @@ -1793,8 +1792,6 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, const NDR_PROC_HEADER * pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; /* -Oif or -Oicf generated format */ BOOL bV2Format = FALSE; - LONG_PTR RetVal; - __ms_va_list args; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -1847,9 +1844,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, /* needed for conformance of top-level objects */ pStubMsg->StackTop = I_RpcAllocate(async_call_data->stack_size); - __ms_va_start( args, pFormat ); - memcpy(pStubMsg->StackTop, va_arg( args, unsigned char * ), async_call_data->stack_size); - __ms_va_end( args ); + memcpy(pStubMsg->StackTop, stack_top, async_call_data->stack_size); pAsync = *(RPC_ASYNC_STATE **)pStubMsg->StackTop; pAsync->StubInfo = async_call_data; @@ -1984,8 +1979,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, done: TRACE("returning 0\n"); - RetVal = 0; - return *(CLIENT_CALL_RETURN *)&RetVal; + return 0; } RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) @@ -2087,6 +2081,37 @@ cleanup: return status; } +#ifdef __x86_64__ + +__ASM_GLOBAL_FUNC( NdrAsyncClientCall, + "movq %r8,0x18(%rsp)\n\t" + "movq %r9,0x20(%rsp)\n\t" + "leaq 0x18(%rsp),%r8\n\t" + "subq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "call " __ASM_NAME("ndr_async_client_call") "\n\t" + "addq $0x28,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "ret" ); + +#else /* __x86_64__ */ + +/*********************************************************************** + * NdrAsyncClientCall [RPCRT4.@] + */ +CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall( PMIDL_STUB_DESC desc, PFORMAT_STRING format, ... ) +{ + __ms_va_list args; + LONG_PTR ret; + + __ms_va_start( args, format ); + ret = ndr_async_client_call( desc, format, va_arg( args, void ** )); + __ms_va_end( args ); + return *(CLIENT_CALL_RETURN *)&ret; +} + +#endif /* __x86_64__ */ + RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, struct IRpcChannelBuffer* pChannel, PRPC_MESSAGE pRpcMsg, DWORD * pdwStubPhase) diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 3fa0922..942c007 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -238,6 +238,8 @@ typedef struct _NDR_EHD_CONTEXT LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top, void **fpu_stack ) DECLSPEC_HIDDEN; +LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top ) DECLSPEC_HIDDEN; void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc,

1 0

Alexandre Julliard : rpcrt4: Add support for float parameters in client calls on x86_64.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: ffb8f4bedf709dd63f6f9ec1569dc99873021a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb8f4bedf709dd63f6f9ec15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 13:39:21 2011 +0200 rpcrt4: Add support for float parameters in client calls on x86_64. --- dlls/rpcrt4/cproxy.c | 12 ++++++--- dlls/rpcrt4/ndr_stubless.c | 54 +++++++++++++++++++++++++++++++------------- dlls/rpcrt4/ndr_stubless.h | 2 +- 3 files changed, 47 insertions(+), 21 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b5be7ae..b1acbb0 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -131,11 +131,15 @@ __ASM_GLOBAL_FUNC(call_stubless_func, "movzwq (%rdx,%r10,2),%rdx\n\t" /* FormatStringOffset[index] */ "addq 8(%rcx),%rdx\n\t" /* info->ProcFormatString + offset */ "movq (%rcx),%rcx\n\t" /* info->pStubDesc */ - "subq $0x28,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "subq $0x38,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 0x38\n\t") + "movq %xmm1,0x20(%rsp)\n\t" + "movq %xmm2,0x28(%rsp)\n\t" + "movq %xmm3,0x30(%rsp)\n\t" + "leaq 0x18(%rsp),%r9\n\t" /* fpu_args */ "call " __ASM_NAME("ndr_client_call") "\n\t" - "addq $0x28,%rsp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t") + "addq $0x38,%rsp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -0x38\n\t") "ret" ); #include "pshpack1.h" diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 7fd7e6a..1f34b76 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -285,8 +285,8 @@ static void client_free_handle( } static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, - int phase, unsigned char *args, unsigned short number_of_params, - unsigned char *pRetVal) + int phase, unsigned char *args, void **fpu_args, + unsigned short number_of_params, unsigned char *pRetVal) { /* current format string offset */ int current_offset = 0; @@ -314,6 +314,14 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, const unsigned char * pTypeFormat = &pParam->type_format_char; +#ifdef __x86_64__ /* floats are passed as doubles through varargs functions */ + float f; + if (*pTypeFormat == RPC_FC_FLOAT && !pParam->param_attributes.IsSimpleRef && !fpu_args) + { + f = *(double *)pArg; + pArg = (unsigned char *)&f; + } +#endif if (pParam->param_attributes.IsSimpleRef) { pArg = *(unsigned char **)pArg; @@ -565,7 +573,8 @@ void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, } } -LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) +LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, + void **stack_top, void **fpu_stack ) { /* pointer to start of stack where arguments start */ RPC_MESSAGE rpcMsg; @@ -652,16 +661,28 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma number_of_params = pOIFHeader->number_of_params; pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); - } - TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); + TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); - if (Oif_flags.HasExtensions) - { - const NDR_PROC_HEADER_EXTS *pExtensions = - (const NDR_PROC_HEADER_EXTS *)pFormat; - ext_flags = pExtensions->Flags2; - pFormat += pExtensions->Size; + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = (const NDR_PROC_HEADER_EXTS *)pFormat; + ext_flags = pExtensions->Flags2; + pFormat += pExtensions->Size; +#ifdef __x86_64__ + if (pExtensions->Size > sizeof(*pExtensions) && fpu_stack) + { + int i; + unsigned short fpu_mask = *(unsigned short *)(pExtensions + 1); + for (i = 0; i < 4; i++, fpu_mask >>= 2) + switch (fpu_mask & 3) + { + case 1: *(float *)&stack_top[i] = *(float *)&fpu_stack[i]; break; + case 2: *(double *)&stack_top[i] = *(double *)&fpu_stack[i]; break; + } + } +#endif + } } stubMsg.BufferLength = 0; @@ -766,7 +787,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma case PROXY_MARSHAL: case PROXY_UNMARSHAL: if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, + client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, fpu_stack, number_of_params, (unsigned char *)&RetVal); else client_do_args_old_format(&stubMsg, pFormat, phase, @@ -870,7 +891,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma case PROXY_MARSHAL: case PROXY_UNMARSHAL: if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, + client_do_args(&stubMsg, pFormat, phase, stubMsg.StackTop, fpu_stack, number_of_params, (unsigned char *)&RetVal); else client_do_args_old_format(&stubMsg, pFormat, phase, @@ -919,6 +940,7 @@ __ASM_GLOBAL_FUNC( NdrClientCall2, "movq %r8,0x18(%rsp)\n\t" "movq %r9,0x20(%rsp)\n\t" "leaq 0x18(%rsp),%r8\n\t" + "xorq %r9,%r9\n\t" "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "call " __ASM_NAME("ndr_client_call") "\n\t" @@ -937,7 +959,7 @@ CLIENT_CALL_RETURN WINAPIV NdrClientCall2( PMIDL_STUB_DESC desc, PFORMAT_STRING LONG_PTR ret; __ms_va_start( args, format ); - ret = ndr_client_call( desc, format, va_arg( args, void ** )); + ret = ndr_client_call( desc, format, va_arg( args, void ** ), NULL ); __ms_va_end( args ); return *(CLIENT_CALL_RETURN *)&ret; } @@ -1947,7 +1969,7 @@ CLIENT_CALL_RETURN WINAPIV NdrAsyncClientCall(PMIDL_STUB_DESC pStubDesc, case PROXY_CALCSIZE: case PROXY_MARSHAL: if (bV2Format) - client_do_args(pStubMsg, pFormat, phase, pStubMsg->StackTop, + client_do_args(pStubMsg, pFormat, phase, pStubMsg->StackTop, NULL, async_call_data->number_of_params, NULL); else client_do_args_old_format(pStubMsg, pFormat, phase, @@ -2032,7 +2054,7 @@ RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) case PROXY_UNMARSHAL: if (bV2Format) client_do_args(pStubMsg, async_call_data->pParamFormat, phase, pStubMsg->StackTop, - async_call_data->number_of_params, Reply); + NULL, async_call_data->number_of_params, Reply); else client_do_args_old_format(pStubMsg, async_call_data->pParamFormat, phase, pStubMsg->StackTop, async_call_data->stack_size, Reply, FALSE, FALSE); diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index baa1f3e..3fa0922 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -237,7 +237,7 @@ typedef struct _NDR_EHD_CONTEXT #include "poppack.h" LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pFormat, - void **stack_top ) DECLSPEC_HIDDEN; + void **stack_top, void **fpu_stack ) DECLSPEC_HIDDEN; void client_do_args_old_format(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, int phase, unsigned char *args, unsigned short stack_size, unsigned char *pRetVal, BOOL object_proc,

1 0

Alexandre Julliard : kernel32: Implement DebugBreak directly in assembly.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 5f06809ab3339e2001de57f18be988146915bb7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06809ab3339e2001de57f18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 15 20:04:27 2011 +0200 kernel32: Implement DebugBreak directly in assembly. --- dlls/kernel32/debugger.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 3abffdf..4ac0a72 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdio.h> #include <string.h> @@ -363,15 +364,15 @@ void WINAPI OutputDebugStringW( LPCWSTR str ) * * Raises an exception so that a debugger (if attached) * can take some action. - * - * PARAMS - * - * RETURNS */ +#if defined(__i386__) || defined(__x86_64__) +__ASM_STDCALL_FUNC( DebugBreak, 0, "int $3; ret" ) +#else void WINAPI DebugBreak(void) { DbgBreakPoint(); } +#endif /*********************************************************************** * DebugBreakProcess (KERNEL32.@)

1 0

Alexandre Julliard : ntdll: Fetch the windows directory from the shared user data.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: f4024eaa49bfd6ecbbd96ae4deb97efa3691754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4024eaa49bfd6ecbbd96ae4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 12:27:01 2011 +0200 ntdll: Fetch the windows directory from the shared user data. --- dlls/ntdll/actctx.c | 8 +++++--- dlls/ntdll/directory.c | 9 ++++----- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/ntdll_misc.h | 1 - 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index a1b1e3b..80f69a8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -32,6 +32,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "ddk/wdm.h" #include "ntdll_misc.h" #include "wine/exception.h" #include "wine/debug.h" @@ -1877,11 +1878,12 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit if (!ai->arch || !ai->name || !ai->public_key) return STATUS_NO_SUCH_FILE; - if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, windows_dir.Length + sizeof(manifest_dirW) ))) + if (!(path = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(manifest_dirW) + + strlenW(user_shared_data->NtSystemRoot) * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; - memcpy( path, windows_dir.Buffer, windows_dir.Length ); - memcpy( path + windows_dir.Length/sizeof(WCHAR), manifest_dirW, sizeof(manifest_dirW) ); + strcpyW( path, user_shared_data->NtSystemRoot ); + memcpy( path + strlenW(path), manifest_dirW, sizeof(manifest_dirW) ); if (!RtlDosPathNameToNtPathName_U( path, &path_us, NULL, NULL )) { diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b57741a..42b3639 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -77,6 +77,7 @@ #include "windef.h" #include "winnt.h" #include "winternl.h" +#include "ddk/wdm.h" #include "ntdll_misc.h" #include "wine/unicode.h" #include "wine/server.h" @@ -161,7 +162,6 @@ static int show_dot_files = -1; /* at some point we may want to allow Winelib apps to set this */ static const int is_case_sensitive = FALSE; -UNICODE_STRING windows_dir = { 0, 0, NULL }; /* windows directory */ UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ static struct file_identity curdir; @@ -2282,16 +2282,16 @@ static void init_redirects(void) struct stat st; unsigned int i; - if (!RtlDosPathNameToNtPathName_U( windows_dir.Buffer, &nt_name, NULL, NULL )) + if (!RtlDosPathNameToNtPathName_U( user_shared_data->NtSystemRoot, &nt_name, NULL, NULL )) { - ERR( "can't convert %s\n", debugstr_us(&windows_dir) ); + ERR( "can't convert %s\n", debugstr_w(user_shared_data->NtSystemRoot) ); return; } status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF, FALSE ); RtlFreeUnicodeString( &nt_name ); if (status) { - ERR( "cannot open %s (%x)\n", debugstr_us(&windows_dir), status ); + ERR( "cannot open %s (%x)\n", debugstr_w(user_shared_data->NtSystemRoot), status ); return; } if (!stat( unix_name.Buffer, &st )) @@ -2389,7 +2389,6 @@ void DIR_init_windows_dir( const WCHAR *win, const WCHAR *sys ) { /* FIXME: should probably store paths as NT file names */ - RtlCreateUnicodeString( &windows_dir, win ); RtlCreateUnicodeString( &system_dir, sys ); #ifndef _WIN64 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4c8d727..5ee7d0a 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1753,16 +1753,16 @@ static NTSTATUS find_actctx_dll( LPCWSTR libname, LPWSTR *fullname ) } } - needed = (windows_dir.Length + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + - nameW.Length + 2*sizeof(WCHAR)); + needed = (strlenW(user_shared_data->NtSystemRoot) * sizeof(WCHAR) + + sizeof(winsxsW) + info->ulAssemblyDirectoryNameLength + nameW.Length + 2*sizeof(WCHAR)); if (!(*fullname = p = RtlAllocateHeap( GetProcessHeap(), 0, needed ))) { status = STATUS_NO_MEMORY; goto done; } - memcpy( p, windows_dir.Buffer, windows_dir.Length ); - p += windows_dir.Length / sizeof(WCHAR); + strcpyW( p, user_shared_data->NtSystemRoot ); + p += strlenW(p); memcpy( p, winsxsW, sizeof(winsxsW) ); p += sizeof(winsxsW) / sizeof(WCHAR); memcpy( p, info->lpAssemblyDirectoryName, info->ulAssemblyDirectoryNameLength ); @@ -2812,8 +2812,8 @@ void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) PLIST_ENTRY mark, entry; LPWSTR buffer, p; - DIR_init_windows_dir( windir, sysdir ); strcpyW( user_shared_data->NtSystemRoot, windir ); + DIR_init_windows_dir( windir, sysdir ); /* prepend the system dir to the name of the already created modules */ mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 77f8603..4956537 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -107,7 +107,6 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY FARPROC origfun, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; -extern UNICODE_STRING windows_dir DECLSPEC_HIDDEN; extern UNICODE_STRING system_dir DECLSPEC_HIDDEN; typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS);

1 0

Jörg Höhle : strmbase: Use !list_empty() instead of list_count() > 0.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 155e4fb6d340fd84b66ada46574c429b3fe47bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=155e4fb6d340fd84b66ada465… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 15 22:21:50 2011 +0200 strmbase: Use !list_empty() instead of list_count() > 0. --- dlls/strmbase/outputqueue.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 4f4ecf8..88a49f8 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -171,10 +171,10 @@ HRESULT WINAPI OutputQueue_ReceiveMultiple(OutputQueue *pOutputQueue, IMediaSamp list_add_tail(pOutputQueue->SampleList, &qev->entry); (*nSamplesProcessed)++; } - LeaveCriticalSection(&pOutputQueue->csQueue); if (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize) SetEvent(pOutputQueue->hProcessQueue); + LeaveCriticalSection(&pOutputQueue->csQueue); } return hr; } @@ -190,7 +190,7 @@ VOID WINAPI OutputQueue_SendAnyway(OutputQueue *pOutputQueue) if (pOutputQueue->hThread) { EnterCriticalSection(&pOutputQueue->csQueue); - if (list_count(pOutputQueue->SampleList) > 0) + if (!list_empty(pOutputQueue->SampleList)) { pOutputQueue->bSendAnyway = TRUE; SetEvent(pOutputQueue->hProcessQueue); @@ -235,14 +235,14 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) do { EnterCriticalSection(&pOutputQueue->csQueue); - if (list_count(pOutputQueue->SampleList) > 0 && + if (!list_empty(pOutputQueue->SampleList) && (!pOutputQueue->bBatchExact || list_count(pOutputQueue->SampleList) >= pOutputQueue->lBatchSize || pOutputQueue->bSendAnyway ) ) { - while (list_count(pOutputQueue->SampleList) > 0) + while (!list_empty(pOutputQueue->SampleList)) { IMediaSample **ppSamples; LONG nSamples; @@ -278,28 +278,25 @@ DWORD WINAPI OutputQueueImpl_ThreadProc(OutputQueue *pOutputQueue) HeapFree(GetProcessHeap(),0,ppSamples); /* Process Non-Samples */ - if (list_count(pOutputQueue->SampleList) > 0) + LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) { - LIST_FOR_EACH_SAFE(cursor, cursor2, pOutputQueue->SampleList) + QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); + if (qev->type == EOS_PACKET) { - QueuedEvent *qev = LIST_ENTRY(cursor, QueuedEvent, entry); - if (qev->type == EOS_PACKET) + IPin* ppin = NULL; + IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); + if (ppin) { - IPin* ppin = NULL; - IPin_ConnectedTo((IPin*)pOutputQueue->pInputPin, &ppin); - if (ppin) - { - IPin_EndOfStream(ppin); - IPin_Release(ppin); - } + IPin_EndOfStream(ppin); + IPin_Release(ppin); } - else if (qev->type == SAMPLE_PACKET) - break; - else - FIXME("Unhandled Event type %i\n",qev->type); - list_remove(cursor); - HeapFree(GetProcessHeap(),0,qev); } + else if (qev->type == SAMPLE_PACKET) + break; + else + FIXME("Unhandled Event type %i\n",qev->type); + list_remove(cursor); + HeapFree(GetProcessHeap(),0,qev); } } pOutputQueue->bSendAnyway = FALSE;

1 0

Jörg Höhle : ntdll: Use list_empty() instead of list_count() == 0.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: bcd2d0ec5b58849ba66c5cf9a28f1be201fa66e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd2d0ec5b58849ba66c5cf9a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jun 15 20:25:56 2011 +0200 ntdll: Use list_empty() instead of list_count() == 0. --- dlls/ntdll/threadpool.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 1a10240..547e6eb 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -577,7 +577,7 @@ static void queue_remove_timer(struct queue_timer *t) NtSetEvent(t->event, NULL); RtlFreeHeap(GetProcessHeap(), 0, t); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) NtSetEvent(q->event, NULL); } @@ -725,7 +725,7 @@ static void WINAPI timer_queue_thread_proc(LPVOID p) timer got put at the head of the list so we need to adjust our timeout. */ RtlEnterCriticalSection(&q->cs); - if (q->quit && list_count(&q->timers) == 0) + if (q->quit && list_empty(&q->timers)) done = TRUE; RtlLeaveCriticalSection(&q->cs); }

1 0

Gerald Pfeifer : d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: c69331c84a8951fcb13494fc01525f355cb022ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69331c84a8951fcb13494fc0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 15 13:01:22 2011 -0600 d3dx9_36: Fix the return value in error cases in d3dx9_parse_resource. --- dlls/d3dx9_36/effect.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 271594c..3265037 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4733,12 +4733,14 @@ static HRESULT d3dx9_parse_resource(struct ID3DXBaseEffectImpl *base, const char default: FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); + hr=E_FAIL; break; } break; default: FIXME("Unknown usage %x\n", usage); + hr=E_FAIL; break; }

1 0

Andrew Eikum : msacm32: Also load ACM drivers from key values.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: e532c55995989f9ad4625e876fe93b71d6b476f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e532c55995989f9ad4625e876… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 15:22:39 2011 -0500 msacm32: Also load ACM drivers from key values. --- dlls/msacm32/internal.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index feb6e9cb..239f4d3 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -360,8 +360,8 @@ void MSACM_RegisterAllDrivers(void) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'D','r','i','v','e','r','s','3','2','\0'}; - DWORD i, cnt = 0, bufLen, lRet; - WCHAR buf[2048], *name, *s; + DWORD i, cnt, bufLen, lRet, type; + WCHAR buf[2048], valname[64], *name, *s; FILETIME lastWrite; HKEY hKey; @@ -381,6 +381,15 @@ void MSACM_RegisterAllDrivers(void) *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } + i = 0; + cnt = sizeof(valname) / sizeof(*valname); + bufLen = sizeof(buf); + while(RegEnumValueW(hKey, i, valname, &cnt, 0, + &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ + if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + MSACM_RegisterDriver(valname, buf, 0); + ++i; + } RegCloseKey( hKey ); }

1 0

Henri Verbeet : wined3d: Check the correct debug class in checkGLcall.
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 26eb6c8eeae6ba8c24f001edb94b2e6e9cf7c4a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26eb6c8eeae6ba8c24f001edb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:32 2011 +0200 wined3d: Check the correct debug class in checkGLcall. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d20800a..52af441 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -816,7 +816,7 @@ extern int num_lock DECLSPEC_HIDDEN; #define checkGLcall(A) \ do { \ GLint err; \ - if(!__WINE_IS_DEBUG_ON(_FIXME, __wine_dbch___default)) break; \ + if (!__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default)) break; \ err = glGetError(); \ if (err == GL_NO_ERROR) { \ TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
81
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 June 2011