February 2007 - Wine-commits

Damjan Jovanovic : libwine_port: Added interlocked_cmpxchg64.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 7e7ff4076956b41ae5d02c47373e7e3cbf673357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e7ff4076956b41ae5d02c473… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Feb 2 16:35:15 2007 +0200 libwine_port: Added interlocked_cmpxchg64. --- include/wine/port.h | 10 ++++++++ libs/port/interlocked.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index c7a9e36..8861408 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -50,6 +50,14 @@ * Type definitions */ +#if !defined(_MSC_VER) && !defined(__int64) +# if defined(__x86_64__) || defined(_WIN64) +# define __int64 long +# else +# define __int64 long long +# endif +#endif + #ifndef HAVE_MODE_T typedef int mode_t; #endif @@ -359,6 +367,7 @@ extern int spawnvp(int mode, const char extern inline int interlocked_cmpxchg( int *dest, int xchg, int compare ); extern inline void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern inline int interlocked_xchg( int *dest, int val ); extern inline void *interlocked_xchg_ptr( void **dest, void *val ); extern inline int interlocked_xchg_add( int *dest, int incr ); @@ -407,6 +416,7 @@ extern inline int interlocked_xchg_add( extern int interlocked_cmpxchg( int *dest, int xchg, int compare ); extern void *interlocked_cmpxchg_ptr( void **dest, void *xchg, void *compare ); +extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ); extern int interlocked_xchg( int *dest, int val ); extern void *interlocked_xchg_ptr( void **dest, void *val ); extern int interlocked_xchg_add( int *dest, int incr ); diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index ea32cef..6e49437 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #ifdef __i386__ @@ -37,6 +38,18 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "movl 4(%esp),%edx\n\t" "lock; cmpxchgl %ecx,(%edx)\n\t" "ret") + __ASM_GLOBAL_FUNC(interlocked_cmpxchg64, + "push %ebx\n\t" + "push %esi\n\t" + "movl 12(%esp),%esi\n\t" + "movl 16(%esp),%ebx\n\t" + "movl 20(%esp),%ecx\n\t" + "movl 24(%esp),%eax\n\t" + "movl 28(%esp),%edx\n\t" + "lock; cmpxchg8b (%esi)\n\t" + "pop %esi\n\t" + "pop %ebx\n\t" + "ret"); __ASM_GLOBAL_FUNC(interlocked_xchg, "movl 8(%esp),%eax\n\t" "movl 4(%esp),%edx\n\t" @@ -73,6 +86,21 @@ __declspec(naked) void *interlocked_cmpx __asm ret; } +__declspec(naked) __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + __asm push ebx; + __asm push esi; + __asm mov esi, 12[esp]; + __asm mov ebx, 16[esp]; + __asm mov ecx, 20[esp]; + __asm mov eax, 24[esp]; + __asm mov edx, 28[esp]; + __asm lock cmpxchg8b [esi]; + __asm pop esi; + __asm pop ebx; + __asm ret; +} + __declspec(naked) int interlocked_xchg( int *dest, int val ) { __asm mov eax, 8[esp]; @@ -113,6 +141,11 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "mov %rdx, %rax\n\t" "lock cmpxchgq %rsi,(%rdi)\n\t" "ret") +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} __ASM_GLOBAL_FUNC(interlocked_xchg, "mov %esi, %eax\n\t" "lock xchgl %eax, (%rdi)\n\t" @@ -149,6 +182,12 @@ void* interlocked_cmpxchg_ptr( void **de return ret; } +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} + int interlocked_cmpxchg( int *dest, int xchg, int compare) { int ret = 0; @@ -244,6 +283,15 @@ void *interlocked_cmpxchg_ptr( void **de return compare; } +__int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) +{ + _lwp_mutex_lock( &interlocked_mutex ); + if (*dest == compare) *dest = xchg; + else compare = *dest; + _lwp_mutex_unlock( &interlocked_mutex ); + return compare; +} + int interlocked_xchg( int *dest, int val ) { int retv; @@ -300,6 +348,12 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_pt "L1cmpxchg_ptr:\n\t" "mb") +__int64 interlocked_cmpxchg64(__int64 *dest, __int64 xchg, __int64 compare) +{ + /* FIXME: add code */ + assert(0); +} + __ASM_GLOBAL_FUNC(interlocked_xchg, "L0xchg:\n\t" "ldl_l $0,0($16)\n\t"

1 0

Alexandre Julliard : winnt.h: Avoid warnings on Mac OS X.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 0c3f12154cd0ad88abbfaade29fb2aeb86161913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c3f12154cd0ad88abbfaade2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 18:04:24 2007 +0100 winnt.h: Avoid warnings on Mac OS X. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 58c76e2..1aeb72a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -607,6 +607,7 @@ typedef struct _SLIST_HEADER { #else +#undef SLIST_ENTRY /* for Mac OS */ #define SLIST_ENTRY SINGLE_LIST_ENTRY #define _SLIST_ENTRY _SINGLE_LIST_ENTRY #define PSLIST_ENTRY PSINGLE_LIST_ENTRY

1 0

Alexandre Julliard : server: Clear the thread wait before releasing objects to avoid nested calls.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 49868e3c93a613f50ce3a746d0276b86ecdd27c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49868e3c93a613f50ce3a746d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 5 18:05:03 2007 +0100 server: Clear the thread wait before releasing objects to avoid nested calls. Reported by Misha Koshelev. --- server/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/thread.c b/server/thread.c index b4a16cd..030ee20 100644 --- a/server/thread.c +++ b/server/thread.c @@ -447,10 +447,10 @@ static void end_wait( struct thread *thr int i; assert( wait ); + thread->wait = wait->next; for (i = 0, entry = wait->queues; i < wait->count; i++, entry++) entry->obj->ops->remove_queue( entry->obj, entry ); if (wait->user) remove_timeout_user( wait->user ); - thread->wait = wait->next; free( wait ); }

1 0

Misha Koshelev : kernel32: Added conformance test for nested thread wakeups in the server.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: d6d6ce299f3558a30cc5e09c8fe669f1be45a330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d6ce299f3558a30cc5e09c8… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sat Feb 3 13:26:29 2007 -0600 kernel32: Added conformance test for nested thread wakeups in the server. --- dlls/kernel32/tests/change.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index bf7cdc1..0774caf 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -317,6 +317,48 @@ static void test_ffcn(void) ok( r == TRUE, "failed to remove dir\n"); } +/* this test concentrates on the wait behavior when multiple threads are + * waiting on a change notification handle. */ +static void test_ffcnMultipleThreads() +{ + LONG r; + DWORD filter, threadId, status, exitcode; + HANDLE handles[2]; + char path[MAX_PATH]; + + r = GetTempPathA(MAX_PATH, path); + ok(r, "GetTempPathA error: %d\n", GetLastError()); + + lstrcatA(path, "ffcnTestMultipleThreads"); + + RemoveDirectoryA(path); + + r = CreateDirectoryA(path, NULL); + ok(r, "CreateDirectoryA error: %d\n", GetLastError()); + + filter = FILE_NOTIFY_CHANGE_FILE_NAME; + filter |= FILE_NOTIFY_CHANGE_DIR_NAME; + + handles[0] = FindFirstChangeNotificationA(path, FALSE, filter); + ok(handles[0] != INVALID_HANDLE_VALUE, "FindFirstChangeNotification error: %d\n", GetLastError()); + + /* Test behavior if a waiting thread holds the last reference to a change + * directory object with an empty wine user APC queue for this thread (bug #7286) */ + + /* Create our notification thread */ + handles[1] = CreateThread(NULL, 0, NotificationThread, (LPVOID)handles[0], + 0, &threadId); + ok(handles[1] != NULL, "CreateThread error: %d\n", GetLastError()); + + status = WaitForMultipleObjects(2, handles, FALSE, 5000); + ok(status == WAIT_OBJECT_0 || status == WAIT_OBJECT_0+1, "WaitForMultipleObjects status %d error %d\n", status, GetLastError()); + ok(GetExitCodeThread(handles[1], &exitcode), "Could not retrieve thread exit code\n"); + + /* Clean up */ + r = RemoveDirectoryA( path ); + ok( r == TRUE, "failed to remove dir\n"); +} + typedef BOOL (WINAPI *fnReadDirectoryChangesW)(HANDLE,LPVOID,DWORD,BOOL,DWORD, LPDWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); fnReadDirectoryChangesW pReadDirectoryChangesW; @@ -708,6 +750,10 @@ START_TEST(change) pReadDirectoryChangesW = (fnReadDirectoryChangesW) GetProcAddress(hkernel32, "ReadDirectoryChangesW"); + test_ffcnMultipleThreads(); + /* The above function runs a test that must occur before FindCloseChangeNotification is run in the + current thread to preserve the emptiness of the wine user APC queue. To ensure this it should be + placed first. */ test_FindFirstChangeNotification(); test_ffcn(); test_readdirectorychanges();

1 0

Andrew Talbot : winedos: Declare some items static.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: bf98c9d18241bf74f590e273cb4bc2a7e7f40974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf98c9d18241bf74f590e273c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Feb 2 14:38:45 2007 +0000 winedos: Declare some items static. --- dlls/winedos/devices.c | 2 +- dlls/winedos/dosaspi.c | 2 +- dlls/winedos/dosmem.c | 2 +- dlls/winedos/int09.c | 2 +- dlls/winedos/int21.c | 3 ++- dlls/winedos/int31.c | 16 ++++++++-------- dlls/winedos/int67.c | 4 ++-- dlls/winedos/interrupts.c | 2 +- dlls/winedos/soundblaster.c | 2 +- dlls/winedos/vga.c | 4 ++-- dlls/winedos/vga.h | 2 -- dlls/winedos/vxd.c | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index bf6e0ba..368f8e5 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -110,7 +110,7 @@ typedef struct #define DOS_DATASEG_OFF(xxx) FIELD_OFFSET(DOS_DATASEG, xxx) -DWORD DOS_LOLSeg; +static DWORD DOS_LOLSeg; static struct _DOS_LISTOFLISTS * DOSMEM_LOL(void) { diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c index f1ff1ca..019cf07 100644 --- a/dlls/winedos/dosaspi.c +++ b/dlls/winedos/dosaspi.c @@ -175,7 +175,7 @@ DWORD ASPI_SendASPIDOSCommand(DWORD ptrS return retval; } -void WINAPI ASPI_DOS_func(CONTEXT86 *context) +static void WINAPI ASPI_DOS_func(CONTEXT86 *context) { WORD *stack = CTX_SEG_OFF_TO_LIN(context, context->SegSs, context->Esp); DWORD ptrSRB = *(DWORD *)&stack[2]; diff --git a/dlls/winedos/dosmem.c b/dlls/winedos/dosmem.c index e16fd94..2c3c2ca 100644 --- a/dlls/winedos/dosmem.c +++ b/dlls/winedos/dosmem.c @@ -236,7 +236,7 @@ void BiosTick( WORD timer ) * Helper function for internal use only. * Atach all following free blocks to this one, even if this one is not free. */ -void DOSMEM_Collapse( MCB* mcb ) +static void DOSMEM_Collapse( MCB* mcb ) { MCB* next = MCB_NEXT( mcb ); diff --git a/dlls/winedos/int09.c b/dlls/winedos/int09.c index 0c7fea9..f9a5436 100644 --- a/dlls/winedos/int09.c +++ b/dlls/winedos/int09.c @@ -46,7 +46,7 @@ static struct * so we might be out of sync with the real current system status of these keys. * Probably doesn't matter too much, though. */ -void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA *data, BOOL *modifier) +static void DOSVM_Int09UpdateKbdStatusFlags(BYTE scan, BOOL extended, BIOSDATA *data, BOOL *modifier) { BYTE realscan = scan & 0x7f; /* remove 0x80 make/break flag */ BYTE bit1 = 255, bit2 = 255; diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 86224ae..c4b8f4f 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2427,7 +2427,8 @@ static void CreateBPB(int drive, BYTE *d } } -inline DWORD INT21_Ioctl_CylHeadSect2Lin(DWORD cyl, WORD head, WORD sec, WORD cyl_cnt, WORD head_cnt, WORD sec_cnt) +static inline DWORD INT21_Ioctl_CylHeadSect2Lin(DWORD cyl, WORD head, WORD sec, WORD cyl_cnt, + WORD head_cnt, WORD sec_cnt) { DWORD res = (cyl * head_cnt*sec_cnt + head * sec_cnt + sec); return res; diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index a61044e..4bf16a9 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -517,9 +517,9 @@ callrmproc_again: /********************************************************************** - * CallRMInt (WINEDOS.@) + * CallRMInt */ -void WINAPI DOSVM_CallRMInt( CONTEXT86 *context ) +static void DOSVM_CallRMInt( CONTEXT86 *context ) { CONTEXT86 realmode_ctx; FARPROC16 rm_int = DOSVM_GetRMHandler( BL_reg(context) ); @@ -546,9 +546,9 @@ void WINAPI DOSVM_CallRMInt( CONTEXT86 * /********************************************************************** - * CallRMProc (WINEDOS.@) + * CallRMProc */ -void WINAPI DOSVM_CallRMProc( CONTEXT86 *context, int iret ) +static void DOSVM_CallRMProc( CONTEXT86 *context, int iret ) { REALMODECALL *p = CTX_SEG_OFF_TO_LIN( context, context->SegEs, @@ -775,9 +775,9 @@ void WINAPI DOSVM_RawModeSwitchHandler( /********************************************************************** - * AllocRMCB (WINEDOS.@) + * AllocRMCB */ -void WINAPI DOSVM_AllocRMCB( CONTEXT86 *context ) +static void DOSVM_AllocRMCB( CONTEXT86 *context ) { RMCB *NewRMCB = DPMI_AllocRMCB(); @@ -801,9 +801,9 @@ void WINAPI DOSVM_AllocRMCB( CONTEXT86 * /********************************************************************** - * FreeRMCB (WINEDOS.@) + * FreeRMCB */ -void WINAPI DOSVM_FreeRMCB( CONTEXT86 *context ) +static void DOSVM_FreeRMCB( CONTEXT86 *context ) { FIXME("callback address: %04x:%04x\n", CX_reg(context), DX_reg(context)); diff --git a/dlls/winedos/int67.c b/dlls/winedos/int67.c index a1ec54f..a35e809 100644 --- a/dlls/winedos/int67.c +++ b/dlls/winedos/int67.c @@ -54,7 +54,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(int); * FIXME: Missing lots of fields, packing is not correct. */ -struct { +static struct { struct { UCHAR hindex; /* handle number */ BYTE flags; /* bit 0: normal handle rather than system handle */ @@ -79,7 +79,7 @@ struct { WORD logical_page; /* logical page */ } mapping_save_area[EMS_MAX_HANDLES][4]; -} *EMS_record = 0; +} *EMS_record; /********************************************************************** * EMS_init diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index d704b0e..3b5d09c 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -115,7 +115,7 @@ static BOOL DOSVM_IsIRQ( BYTE intnum ) * Default interrupt handler. This will be used to emulate all * interrupts that don't have their own interrupt handler. */ -void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context ) +static void WINAPI DOSVM_DefaultHandler( CONTEXT86 *context ) { } diff --git a/dlls/winedos/soundblaster.c b/dlls/winedos/soundblaster.c index a69f0dc..ff40c41 100644 --- a/dlls/winedos/soundblaster.c +++ b/dlls/winedos/soundblaster.c @@ -63,7 +63,7 @@ static BYTE dma_buffer[DMATRFSIZE*2]; /* Direct Sound playback stuff */ static HMODULE hmodule; typedef HRESULT (WINAPI* fnDirectSoundCreate) (LPGUID,LPDIRECTSOUND*,LPUNKNOWN); -fnDirectSoundCreate lpDirectSoundCreate; +static fnDirectSoundCreate lpDirectSoundCreate; static LPDIRECTSOUND lpdsound; static LPDIRECTSOUNDBUFFER lpdsbuf; static DSBUFFERDESC buf_desc; diff --git a/dlls/winedos/vga.c b/dlls/winedos/vga.c index c77efc3..dcf68dd 100644 --- a/dlls/winedos/vga.c +++ b/dlls/winedos/vga.c @@ -595,7 +595,7 @@ void VGA_SetQuadPalette(RGBQUAD*color,in IDirectDrawPalette_SetEntries(lpddpal,0,start,len,pal); } -LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth) +static LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth) { if (!lpddraw) return NULL; if (!lpddsurf) return NULL; @@ -610,7 +610,7 @@ LPSTR VGA_Lock(unsigned*Pitch,unsigned*H return sdesc.lpSurface; } -void VGA_Unlock(void) +static void VGA_Unlock(void) { IDirectDrawSurface_Unlock(lpddsurf,sdesc.lpSurface); } diff --git a/dlls/winedos/vga.h b/dlls/winedos/vga.h index 25e3f7f..36646a1 100644 --- a/dlls/winedos/vga.h +++ b/dlls/winedos/vga.h @@ -36,8 +36,6 @@ char VGA_GetColor16(int reg); void VGA_Set16Palette(char *Table); void VGA_Get16Palette(char *Table); void VGA_SetQuadPalette(RGBQUAD*color,int start,int len); -LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth); -void VGA_Unlock(void); void VGA_SetWindowStart(int start); int VGA_GetWindowStart(void); void VGA_ShowMouse(BOOL show); diff --git a/dlls/winedos/vxd.c b/dlls/winedos/vxd.c index 9a4f1cd..4e83327 100644 --- a/dlls/winedos/vxd.c +++ b/dlls/winedos/vxd.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); CX_reg(context), DX_reg(context), SI_reg(context), \ DI_reg(context), (WORD)context->SegDs, (WORD)context->SegEs ) -UINT W32S_offset = 0; +static UINT W32S_offset; static WORD VXD_WinVersion(void) {

1 0

John Klehm : ras.h: Added additional szDeviceType defines.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: c34bbbe7f6816264b4720574fbb1f3657e76b5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c34bbbe7f6816264b4720574f… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed Jan 31 23:47:39 2007 -0600 ras.h: Added additional szDeviceType defines. --- include/ras.h | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/ras.h b/include/ras.h index c1f6d5c..82efcda 100644 --- a/include/ras.h +++ b/include/ras.h @@ -39,10 +39,21 @@ extern "C" { #define RAS_MaxDnsSuffix 256 /* szDeviceType strings for RASDEVINFO */ -#define RASDT_Direct "direct" -#define RASDT_Modem "modem" -#define RASDT_Isdn "isdn" -#define RASDT_X25 "x25" +#define RASDT_Direct "direct" +#define RASDT_Modem "modem" +#define RASDT_Isdn "isdn" +#define RASDT_X25 "x25" +#define RASDT_Vpn "vpn" +#define RASDT_Pad "pad" +#define RASDT_Generic "GENERIC" +#define RASDT_Serial "SERIAL" +#define RASDT_FrameRelay "FRAMERELAY" +#define RASDT_Atm "ATM" +#define RASDT_Sonet "SONET" +#define RASDT_SW56 "SW56" +#define RASDT_Irda "IRDA" +#define RASDT_Parallel "PARALLEL" +#define RASDT_PPPoE "PPPoE" #define RASBASE 600 #define ERROR_BUFFER_TOO_SMALL (RASBASE+3)

1 0

John Klehm : rasapi32: RasEnumConnections now returns correct buffer size ( zero) when there are zero connections available.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 69a9621b2095dc3d0888d8b0438d47cb8de27760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a9621b2095dc3d0888d8b04… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Thu Feb 1 16:36:52 2007 -0600 rasapi32: RasEnumConnections now returns correct buffer size (zero) when there are zero connections available. --- dlls/rasapi32/rasapi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index a2dae0c..0977ffe 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -102,6 +102,7 @@ DWORD WINAPI RasEnumConnectionsA( LPRASC /* Remote Access Service stuff is done by underlying OS anyway */ FIXME("(%p,%p,%p),stub!\n",rca,lpcb,lpcConnections); FIXME("RAS support is not implemented! Configure program to use LAN connection/winsock instead!\n"); + *lpcb = 0; /* size of buffer needed to enumerate connections */ *lpcConnections = 0; /* no RAS connections available */ return 0; @@ -114,6 +115,7 @@ DWORD WINAPI RasEnumConnectionsW( LPRASC /* Remote Access Service stuff is done by underlying OS anyway */ FIXME("(%p,%p,%p),stub!\n",rcw,lpcb,lpcConnections); FIXME("RAS support is not implemented! Configure program to use LAN connection/winsock instead!\n"); + *lpcb = 0; /* size of buffer needed to enumerate connections */ *lpcConnections = 0; /* no RAS connections available */ return 0;

1 0

Maarten Lankhorst : winealsa: Cosmetic stuff.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 2db89f8fa5d5c718da596ebe9979b5de987fab9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db89f8fa5d5c718da596ebe9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 29 16:27:14 2007 +0100 winealsa: Cosmetic stuff. --- dlls/winealsa.drv/alsa.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 4e4b503..1a1fd19 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -44,12 +44,13 @@ #include "wine/unicode.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(wave); - +WINE_DEFAULT_DEBUG_CHANNEL(alsa); /* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ #define USE_PIPE_SYNC #ifdef USE_PIPE_SYNC +#define INIT_OMR(omr) do { if (pipe(omr->msg_pipe) < 0) { omr->msg_pipe[0] = omr->msg_pipe[1] = -1; } } while (0) +#define CLOSE_OMR(Omr) do { close(omr->msg_pipe[0]); close(omr->msg_pipe[1]); } while (0) #define SIGNAL_OMR(omr) do { int x = 0; write((omr)->msg_pipe[1], &x, sizeof(x)); } while (0) #define CLEAR_OMR(omr) do { int x = 0; read((omr)->msg_pipe[0], &x, sizeof(x)); } while (0) #define RESET_OMR(omr) do { } while (0) @@ -57,6 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); do { struct pollfd pfd; pfd.fd = (omr)->msg_pipe[0]; \ pfd.events = POLLIN; poll(&pfd, 1, sleep); } while (0) #else +#define INIT_OMR(omr) do { omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); } while (0) +#define CLOSE_OMR(omr) do { CloseHandle(omr->msg_event); } while (0) #define SIGNAL_OMR(omr) do { SetEvent((omr)->msg_event); } while (0) #define CLEAR_OMR(omr) do { } while (0) #define RESET_OMR(omr) do { ResetEvent((omr)->msg_event); } while (0) @@ -76,15 +79,7 @@ int ALSA_InitRingMessage(ALSA_MSG_RING* { omr->msg_toget = 0; omr->msg_tosave = 0; -#ifdef USE_PIPE_SYNC - if (pipe(omr->msg_pipe) < 0) { - omr->msg_pipe[0] = -1; - omr->msg_pipe[1] = -1; - ERR("could not create pipe, error=%s\n", strerror(errno)); - } -#else - omr->msg_event = CreateEventW(NULL, FALSE, FALSE, NULL); -#endif + INIT_OMR(omr); omr->ring_buffer_size = ALSA_RING_BUFFER_INCREMENT; omr->messages = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,omr->ring_buffer_size * sizeof(ALSA_MSG)); @@ -99,12 +94,7 @@ int ALSA_InitRingMessage(ALSA_MSG_RING* */ int ALSA_DestroyRingMessage(ALSA_MSG_RING* omr) { -#ifdef USE_PIPE_SYNC - close(omr->msg_pipe[0]); - close(omr->msg_pipe[1]); -#else - CloseHandle(omr->msg_event); -#endif + CLOSE_OMR(omr); HeapFree(GetProcessHeap(),0,omr->messages); omr->ring_buffer_size = 0; omr->msg_crst.DebugInfo->Spare[0] = 0; @@ -144,7 +134,6 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* o { int old_ring_buffer_size = omr->ring_buffer_size; omr->ring_buffer_size += ALSA_RING_BUFFER_INCREMENT; - TRACE("omr->ring_buffer_size=%d\n",omr->ring_buffer_size); omr->messages = HeapReAlloc(GetProcessHeap(),0,omr->messages, omr->ring_buffer_size * sizeof(ALSA_MSG)); /* Now we need to rearrange the ring buffer so that the new buffers just allocated are in between omr->msg_tosave and

1 0

Maarten Lankhorst : winealsa: Use a helper thread instead of asynchronous callbacks.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: d2f29311caa8041bd992a3867d71d6311c7ff8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f29311caa8041bd992a3867… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 29 16:33:24 2007 +0100 winealsa: Use a helper thread instead of asynchronous callbacks. --- dlls/winealsa.drv/dsoutput.c | 360 +++++++++++++++++++++--------------------- 1 files changed, 183 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2f29311caa8041bd992a…

1 0

Maarten Lankhorst : winealsa: Split driver up in tiny pieces.
by Alexandre Julliard 05 Feb '07

05 Feb '07

Module: wine Branch: master Commit: 2d2feb0700bbf2d14c2e371a732d295b728b21df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2feb0700bbf2d14c2e371a7… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 29 16:26:23 2007 +0100 winealsa: Split driver up in tiny pieces. --- dlls/winealsa.drv/Makefile.in | 7 +- dlls/winealsa.drv/alsa.c | 724 +++++++- dlls/winealsa.drv/alsa.h | 174 ++- dlls/winealsa.drv/audio.c | 4464 ----------------------------------------- dlls/winealsa.drv/dsoutput.c | 659 ++++++ dlls/winealsa.drv/wavein.c | 903 +++++++++ dlls/winealsa.drv/waveinit.c | 990 +++++++++ dlls/winealsa.drv/waveout.c | 1293 ++++++++++++ 8 files changed, 4736 insertions(+), 4478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d2feb0700bbf2d14c2e3…

1 0