wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Francois Gouget : advapi32: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 393c2271453d3226cb808ae6c6552585addd3495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c2271453d3226cb808ae6c… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 11 13:13:40 2007 +0200 advapi32: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9460244..1039cbd 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -46,6 +46,7 @@ NTSTATUS POLICY_INFORMATION_CLASS POLICY_NOTIFICATION_INFORMATION_CLASS REGSAM +SC_ENUM_TYPE SC_HANDLE SC_STATUS_TYPE SE_OBJECT_TYPE @@ -96,8 +97,6 @@ LPQUERY_SERVICE_LOCK_STATUSA LPQUERY_SERVICE_LOCK_STATUSW LPSECURITY_ATTRIBUTES LPSERVICE_STATUS -LPSERVICE_TABLE_ENTRYA -LPSERVICE_TABLE_ENTRYW LPSTARTUPINFOA LPSTARTUPINFOW LPSTR * @@ -152,13 +151,15 @@ PTRUSTEEA PTRUSTEEW PUCHAR PULONG -PUNICODE_STRING PVALENTA PVALENTW PVOID PVOID * SC_LOCK SECURITY_ATTRIBUTES * +SERVICE_TABLE_ENTRYA * +SERVICE_TABLE_ENTRYW * +UNICODE_STRING * WMIDPREQUEST struct ustring * unsigned char *

1 0

Francois Gouget : winapi_check: Also warn about 'unsigned long' s Win64 compatibility problems.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 4e07863184c9b47ba219d02e9e39bd739e726d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e07863184c9b47ba219d02e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 11 13:13:49 2007 +0200 winapi_check: Also warn about 'unsigned long's Win64 compatibility problems. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 5bf4ce6..8c552e5 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -192,7 +192,7 @@ sub parse_api_file($$) { } } elsif(defined($kind)) { my $type = $_; - if ($type =~ /^long\b/) + if ($type =~ /\blong\b/) { $output->write("$file:$linenum: type ($type) is not Win64 compatible\n"); }

1 0

Francois Gouget : ntdll: Improve the prototypes Win64 compatibility by replacing long with LONG.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 6936bb100f1c17f58ba847cff9e983d6c81f88a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6936bb100f1c17f58ba847cff… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 11 13:13:32 2007 +0200 ntdll: Improve the prototypes Win64 compatibility by replacing long with LONG. --- dlls/ntdll/misc.c | 2 +- dlls/ntdll/string.c | 12 ++++++------ dlls/ntdll/wcstring.c | 10 +++++----- tools/winapi/win32.api | 2 -- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2f63ebb..d5e8c1d 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -149,7 +149,7 @@ int CDECL NTDLL_abs( int i ) /********************************************************************* * labs (NTDLL.@) */ -long CDECL NTDLL_labs( long i ) +LONG CDECL NTDLL_labs( LONG i ) { return labs( i ); } diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index ae56aae..ebfa6fb 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -449,7 +449,7 @@ int __cdecl NTDLL_isxdigit( int c ) /********************************************************************* * strtol (NTDLL.@) */ -long __cdecl NTDLL_strtol( const char *nptr, char **endptr, int base ) +LONG __cdecl NTDLL_strtol( const char *nptr, char **endptr, int base ) { return strtol( nptr, endptr, base ); } @@ -458,7 +458,7 @@ long __cdecl NTDLL_strtol( const char *nptr, char **endptr, int base ) /********************************************************************* * strtoul (NTDLL.@) */ -unsigned long __cdecl NTDLL_strtoul( const char *nptr, char **endptr, int base ) +ULONG __cdecl NTDLL_strtoul( const char *nptr, char **endptr, int base ) { return strtoul( nptr, endptr, base ); } @@ -476,7 +476,7 @@ int __cdecl NTDLL_atoi( const char *nptr ) /********************************************************************* * atol (NTDLL.@) */ -long __cdecl NTDLL_atol( const char *nptr ) +LONG __cdecl NTDLL_atol( const char *nptr ) { return atol( nptr ); } @@ -497,7 +497,7 @@ long __cdecl NTDLL_atol( const char *nptr ) * - If str is NULL it crashes, as the native function does. */ char * __cdecl _ultoa( - unsigned long value, /* [I] Value to be converted */ + ULONG value, /* [I] Value to be converted */ char *str, /* [O] Destination for the converted value */ int radix) /* [I] Number base for conversion */ { @@ -539,11 +539,11 @@ char * __cdecl _ultoa( * - If str is NULL it crashes, as the native function does. */ char * __cdecl _ltoa( - long value, /* [I] Value to be converted */ + LONG value, /* [I] Value to be converted */ char *str, /* [O] Destination for the converted value */ int radix) /* [I] Number base for conversion */ { - unsigned long val; + ULONG val; int negative; char buffer[33]; char *pos; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 23fc5e8..9d1dc4d 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -278,7 +278,7 @@ INT __cdecl NTDLL_mbstowcs( LPWSTR dst, LPCSTR src, INT n ) /********************************************************************* * wcstol (NTDLL.@) */ -long __cdecl NTDLL_wcstol(LPCWSTR s,LPWSTR *end,INT base) +LONG __cdecl NTDLL_wcstol(LPCWSTR s, LPWSTR *end, INT base) { return strtolW( s, end, base ); } @@ -287,7 +287,7 @@ long __cdecl NTDLL_wcstol(LPCWSTR s,LPWSTR *end,INT base) /********************************************************************* * wcstoul (NTDLL.@) */ -unsigned long __cdecl NTDLL_wcstoul(LPCWSTR s,LPWSTR *end,INT base) +ULONG __cdecl NTDLL_wcstoul(LPCWSTR s, LPWSTR *end, INT base) { return strtoulW( s, end, base ); } @@ -392,7 +392,7 @@ INT __cdecl NTDLL_iswxdigit( WCHAR wc ) * If str is NULL it just returns NULL. */ LPWSTR __cdecl _ultow( - unsigned long value, /* [I] Value to be converted */ + ULONG value, /* [I] Value to be converted */ LPWSTR str, /* [O] Destination for the converted value */ INT radix) /* [I] Number base for conversion */ { @@ -436,11 +436,11 @@ LPWSTR __cdecl _ultow( * If str is NULL it just returns NULL. */ LPWSTR __cdecl _ltow( - long value, /* [I] Value to be converted */ + LONG value, /* [I] Value to be converted */ LPWSTR str, /* [O] Destination for the converted value */ INT radix) /* [I] Number base for conversion */ { - unsigned long val; + ULONG val; int negative; WCHAR buffer[33]; PWCHAR pos; diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index f9762d3..9460244 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -2818,11 +2818,9 @@ ULONG WCHAR WORD int -long obj_handle_t size_t unsigned int -unsigned long %long --pointer

1 0

Vedran Rodic : winmm: Fix PlaySound so it doesn' t block when another sound is already playing.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: f44bc89bc41b2b8d75eeb4fc02f5aa587d84c13c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44bc89bc41b2b8d75eeb4fc0… Author: Vedran Rodic <vrodic(a)gmail.com> Date: Sat Jun 9 21:04:16 2007 +0200 winmm: Fix PlaySound so it doesn't block when another sound is already playing. --- dlls/winmm/playsound.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a048b51..96d3249 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -45,6 +45,7 @@ typedef struct tagWINE_PLAYSOUND HMODULE hMod; DWORD fdwSound; HANDLE hThread; + HWAVEOUT hWave; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -268,7 +269,6 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) MMCKINFO ckMainRIFF; MMCKINFO mmckInfo; LPWAVEFORMATEX lpWaveFormat = NULL; - HWAVEOUT hWave = 0; LPWAVEHDR waveHdr = NULL; INT count, bufsize, left, index; struct playsound_data s; @@ -367,7 +367,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, + if (waveOutOpen(&wps->hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, (DWORD)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; @@ -381,8 +381,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) waveHdr[0].dwLoops = waveHdr[1].dwLoops = 0L; waveHdr[0].dwFlags = waveHdr[1].dwFlags = 0L; waveHdr[0].dwBufferLength = waveHdr[1].dwBufferLength = bufsize; - if (waveOutPrepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)) || - waveOutPrepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR))) { + if (waveOutPrepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)) || + waveOutPrepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR))) { goto errCleanUp; } @@ -405,7 +405,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) left -= count; waveHdr[index].dwBufferLength = count; waveHdr[index].dwFlags &= ~WHDR_DONE; - if (waveOutWrite(hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { + if (waveOutWrite(wps->hWave, &waveHdr[index], sizeof(WAVEHDR)) == MMSYSERR_NOERROR) { index ^= 1; PlaySound_WaitDone(&s); } @@ -415,17 +415,17 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } while (wps->bLoop); PlaySound_WaitDone(&s); /* for last buffer */ - waveOutReset(hWave); + waveOutReset(wps->hWave); - waveOutUnprepareHeader(hWave, &waveHdr[0], sizeof(WAVEHDR)); - waveOutUnprepareHeader(hWave, &waveHdr[1], sizeof(WAVEHDR)); + waveOutUnprepareHeader(wps->hWave, &waveHdr[0], sizeof(WAVEHDR)); + waveOutUnprepareHeader(wps->hWave, &waveHdr[1], sizeof(WAVEHDR)); errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); CloseHandle(s.hEvent); HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); - if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + if (wps->hWave) while (waveOutClose(wps->hWave) == WAVERR_STILLPLAYING) Sleep(100); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -464,6 +464,7 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo * NULL... as of today, we stop all playing instances */ SetEvent(psStopEvent); + waveOutReset(PlaySoundList->hWave); LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs);

1 0

Alexandre Julliard : winmm: Initialize the timer critical section statically.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 86b40413fed80f9d34db3891fcf5a64409bbd37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b40413fed80f9d34db3891f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 18:13:06 2007 +0200 winmm: Initialize the timer critical section statically. --- dlls/winmm/time.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 8ef4b4e..827f87a 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -63,8 +63,16 @@ typedef struct tagWINE_TIMERENTRY { static struct list timer_list = LIST_INIT(timer_list); +static CRITICAL_SECTION TIME_cbcrst; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &TIME_cbcrst, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": TIME_cbcrst") } +}; +static CRITICAL_SECTION TIME_cbcrst = { &critsect_debug, -1, 0, 0, 0, 0 }; + static HANDLE TIME_hMMTimer; -static CRITICAL_SECTION TIME_cbcrst; static BOOL TIME_TimeToDie = TRUE; static int TIME_fdWake[2] = { -1, -1 }; @@ -243,8 +251,6 @@ static void TIME_MMTimeStart(void) TIME_TimeToDie = FALSE; TIME_hMMTimer = CreateThread(NULL, 0, TIME_MMSysTimeThread, NULL, 0, NULL); SetThreadPriority(TIME_hMMTimer, THREAD_PRIORITY_TIME_CRITICAL); - InitializeCriticalSection(&TIME_cbcrst); - TIME_cbcrst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINMM.TIME_cbcrst"); } } @@ -265,7 +271,6 @@ void TIME_MMTimeStop(void) TIME_fdWake[0] = TIME_fdWake[1] = -1; CloseHandle(TIME_hMMTimer); TIME_hMMTimer = 0; - TIME_cbcrst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&TIME_cbcrst); } }

1 0

Alexandre Julliard : winmm: Maintain the timer list sorted by expiration time.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: 3f20252e5eb6606abc950152c465847193a726ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f20252e5eb6606abc950152c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 18:11:03 2007 +0200 winmm: Maintain the timer list sorted by expiration time. --- dlls/winmm/time.c | 157 +++++++++++++++++++---------------------------------- 1 files changed, 56 insertions(+), 101 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 790e2a2..8ef4b4e 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -68,6 +68,17 @@ static CRITICAL_SECTION TIME_cbcrst; static BOOL TIME_TimeToDie = TRUE; static int TIME_fdWake[2] = { -1, -1 }; +/* link timer at the appropriate spot in the list */ +static inline void link_timer( WINE_TIMERENTRY *timer ) +{ + WINE_TIMERENTRY *next; + + LIST_FOR_EACH_ENTRY( next, &timer_list, WINE_TIMERENTRY, entry ) + if ((int)(next->dwTriggerTime - timer->dwTriggerTime) >= 0) break; + + list_add_before( &next->entry, &timer->entry ); +} + /* * Some observations on the behavior of winmm on Windows. * First, the call to timeBeginPeriod(xx) can never be used @@ -98,50 +109,13 @@ static int TIME_fdWake[2] = { -1, -1 }; #define MMSYSTIME_MAXINTERVAL (65535) -static void TIME_TriggerCallBack(LPWINE_TIMERENTRY lpTimer) -{ - TRACE("%04x:CallBack => lpFunc=%p wTimerID=%04X dwUser=%08X dwTriggerTime %d(delta %d)\n", - GetCurrentThreadId(), lpTimer->lpFunc, lpTimer->wTimerID, lpTimer->dwUser, - lpTimer->dwTriggerTime, GetTickCount() - lpTimer->dwTriggerTime); - - /* - TimeProc callback that is called here is something strange, under Windows 3.1x it is called - * during interrupt time, is allowed to execute very limited number of API calls (like - * PostMessage), and must reside in DLL (therefore uses stack of active application). So I - * guess current implementation via SetTimer has to be improved upon. - */ - switch (lpTimer->wFlags & 0x30) { - case TIME_CALLBACK_FUNCTION: - if (lpTimer->wFlags & WINE_TIMER_IS32) - (lpTimer->lpFunc)(lpTimer->wTimerID, 0, lpTimer->dwUser, 0, 0); - else if (pFnCallMMDrvFunc16) - pFnCallMMDrvFunc16((DWORD)lpTimer->lpFunc, lpTimer->wTimerID, 0, - lpTimer->dwUser, 0, 0); - break; - case TIME_CALLBACK_EVENT_SET: - SetEvent((HANDLE)lpTimer->lpFunc); - break; - case TIME_CALLBACK_EVENT_PULSE: - PulseEvent((HANDLE)lpTimer->lpFunc); - break; - default: - FIXME("Unknown callback type 0x%04x for mmtime callback (%p), ignored.\n", - lpTimer->wFlags, lpTimer->lpFunc); - break; - } -} - /************************************************************************** * TIME_MMSysTimeCallback */ static int TIME_MMSysTimeCallback(void) { -static int nSizeLpTimers; -static LPWINE_TIMERENTRY lpTimers; - - WINE_TIMERENTRY *timer, *next; - int idx; - DWORD cur_time; - int delta_time, ret_time = -1; + WINE_TIMERENTRY *timer, *to_free; + int delta_time; /* since timeSetEvent() and timeKillEvent() can be called * from 16 bit code, there are cases where win16 lock is @@ -153,80 +127,61 @@ static LPWINE_TIMERENTRY lpTimers; * To cope with that, we just copy the WINE_TIMERENTRY struct * that need to trigger the callback, and call it without the * mm timer crit sect locked. - * the hKillTimeEvent is used to mark the section where we - * handle the callbacks so we can do synchronous kills. - * EPP 99/07/13, updated 04/01/10 */ - idx = 0; - cur_time = GetTickCount(); EnterCriticalSection(&WINMM_cs); - LIST_FOR_EACH_ENTRY_SAFE( timer, next, &timer_list, WINE_TIMERENTRY, entry ) + for (;;) { - delta_time = timer->dwTriggerTime - cur_time; - if (delta_time <= 0) + struct list *ptr = list_head( &timer_list ); + if (!ptr) { - if (timer->lpFunc) { - if (idx == nSizeLpTimers) { - if (lpTimers) - lpTimers = (LPWINE_TIMERENTRY) - HeapReAlloc(GetProcessHeap(), 0, lpTimers, - ++nSizeLpTimers * sizeof(WINE_TIMERENTRY)); - else - lpTimers = (LPWINE_TIMERENTRY) - HeapAlloc(GetProcessHeap(), 0, - ++nSizeLpTimers * sizeof(WINE_TIMERENTRY)); - } - lpTimers[idx++] = *timer; + delta_time = -1; + break; + } - } + timer = LIST_ENTRY( ptr, WINE_TIMERENTRY, entry ); + delta_time = timer->dwTriggerTime - GetTickCount(); + if (delta_time > 0) break; - /* Update the time after we make the copy to preserve - the original trigger time */ + list_remove( &timer->entry ); + if (timer->wFlags & TIME_PERIODIC) + { timer->dwTriggerTime += timer->wDelay; + link_timer( timer ); /* restart it */ + to_free = NULL; + } + else to_free = timer; - /* TIME_ONESHOT is defined as 0 */ - if (!(timer->wFlags & TIME_PERIODIC)) + switch(timer->wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE)) + { + case TIME_CALLBACK_EVENT_SET: + SetEvent((HANDLE)timer->lpFunc); + break; + case TIME_CALLBACK_EVENT_PULSE: + PulseEvent((HANDLE)timer->lpFunc); + break; + case TIME_CALLBACK_FUNCTION: { - list_remove( &timer->entry ); - HeapFree(GetProcessHeap(), 0, timer); + DWORD user = timer->dwUser; + UINT16 id = timer->wTimerID; + UINT16 flags = timer->wFlags; + LPTIMECALLBACK func = timer->lpFunc; - /* We don't need to trigger oneshots again */ - delta_time = -1; - } - else - { - /* Compute when this event needs this function - to be called again */ - delta_time = timer->dwTriggerTime - cur_time; - if (delta_time < 0) delta_time = 0; - } - } + if (flags & TIME_KILL_SYNCHRONOUS) EnterCriticalSection(&TIME_cbcrst); + LeaveCriticalSection(&WINMM_cs); - /* Determine when we need to return to this function */ - if (delta_time != -1) - { - if (ret_time == -1 || ret_time > delta_time) ret_time = delta_time; + if (flags & WINE_TIMER_IS32) func(id, 0, user, 0, 0); + else if (pFnCallMMDrvFunc16) pFnCallMMDrvFunc16((DWORD)func, id, 0, user, 0, 0); + + EnterCriticalSection(&WINMM_cs); + if (flags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst); + } + break; } + HeapFree( GetProcessHeap(), 0, to_free ); } LeaveCriticalSection(&WINMM_cs); - - EnterCriticalSection(&TIME_cbcrst); - while (idx > 0) TIME_TriggerCallBack(&lpTimers[--idx]); - LeaveCriticalSection(&TIME_cbcrst); - - /* Finally, adjust the recommended wait time downward - by the amount of time the processing routines - actually took */ - if (ret_time != -1) - { - ret_time -= GetTickCount() - cur_time; - if (ret_time < 0) ret_time = 0; - } - - /* We return the amount of time our caller should sleep - before needing to check in on us again */ - return ret_time; + return delta_time; } /************************************************************************** @@ -350,8 +305,6 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, if (lpNewTimer == NULL) return 0; - TIME_MMTimeStart(); - lpNewTimer->wDelay = wDelay; lpNewTimer->dwTriggerTime = GetTickCount() + wDelay; @@ -367,9 +320,11 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, LIST_FOR_EACH_ENTRY( lpTimer, &timer_list, WINE_TIMERENTRY, entry ) wNewID = max(wNewID, lpTimer->wTimerID); - list_add_head( &timer_list, &lpNewTimer->entry ); + link_timer( lpNewTimer ); lpNewTimer->wTimerID = wNewID + 1; + TIME_MMTimeStart(); + LeaveCriticalSection(&WINMM_cs); /* Wake the service thread in case there is work to be done */

1 0

Alexandre Julliard : winmm: Convert the timer list to a standard Wine list.
by Alexandre Julliard 12 Jun '07

12 Jun '07

Module: wine Branch: master Commit: e8af10e6b055a30ea485e4756d2297c0a8ea3cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8af10e6b055a30ea485e4756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 11 17:35:04 2007 +0200 winmm: Convert the timer list to a standard Wine list. --- dlls/winmm/time.c | 41 +++++++++++++++++------------------------ dlls/winmm/winemm.h | 1 - 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 211ca50..790e2a2 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -45,11 +45,13 @@ #include "winemm.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mmtime); typedef struct tagWINE_TIMERENTRY { + struct list entry; UINT wDelay; UINT wResol; LPTIMECALLBACK lpFunc; /* can be lots of things */ @@ -57,12 +59,11 @@ typedef struct tagWINE_TIMERENTRY { UINT16 wFlags; UINT16 wTimerID; DWORD dwTriggerTime; - struct tagWINE_TIMERENTRY* lpNext; } WINE_TIMERENTRY, *LPWINE_TIMERENTRY; +static struct list timer_list = LIST_INIT(timer_list); static HANDLE TIME_hMMTimer; -static LPWINE_TIMERENTRY TIME_TimersList; static CRITICAL_SECTION TIME_cbcrst; static BOOL TIME_TimeToDie = TRUE; static int TIME_fdWake[2] = { -1, -1 }; @@ -137,7 +138,7 @@ static int TIME_MMSysTimeCallback(void) static int nSizeLpTimers; static LPWINE_TIMERENTRY lpTimers; - LPWINE_TIMERENTRY timer, *ptimer, *next_ptimer; + WINE_TIMERENTRY *timer, *next; int idx; DWORD cur_time; int delta_time, ret_time = -1; @@ -160,9 +161,8 @@ static LPWINE_TIMERENTRY lpTimers; cur_time = GetTickCount(); EnterCriticalSection(&WINMM_cs); - for (ptimer = &TIME_TimersList; *ptimer != NULL; ) { - timer = *ptimer; - next_ptimer = &timer->lpNext; + LIST_FOR_EACH_ENTRY_SAFE( timer, next, &timer_list, WINE_TIMERENTRY, entry ) + { delta_time = timer->dwTriggerTime - cur_time; if (delta_time <= 0) { @@ -188,8 +188,7 @@ static LPWINE_TIMERENTRY lpTimers; /* TIME_ONESHOT is defined as 0 */ if (!(timer->wFlags & TIME_PERIODIC)) { - /* unlink timer from timers list */ - *ptimer = *next_ptimer; + list_remove( &timer->entry ); HeapFree(GetProcessHeap(), 0, timer); /* We don't need to trigger oneshots again */ @@ -209,8 +208,6 @@ static LPWINE_TIMERENTRY lpTimers; { if (ret_time == -1 || ret_time > delta_time) ret_time = delta_time; } - - ptimer = next_ptimer; } LeaveCriticalSection(&WINMM_cs); @@ -277,10 +274,9 @@ static DWORD CALLBACK TIME_MMSysTimeThread(LPVOID arg) /************************************************************************** * TIME_MMTimeStart */ -void TIME_MMTimeStart(void) +static void TIME_MMTimeStart(void) { if (!TIME_hMMTimer) { - TIME_TimersList = NULL; if (pipe(TIME_fdWake) < 0) { TIME_fdWake[0] = TIME_fdWake[1] = -1; @@ -316,7 +312,6 @@ void TIME_MMTimeStop(void) TIME_hMMTimer = 0; TIME_cbcrst.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&TIME_cbcrst); - TIME_TimersList = NULL; } } @@ -369,12 +364,10 @@ WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, EnterCriticalSection(&WINMM_cs); - for (lpTimer = TIME_TimersList; lpTimer != NULL; lpTimer = lpTimer->lpNext) { - wNewID = max(wNewID, lpTimer->wTimerID); - } + LIST_FOR_EACH_ENTRY( lpTimer, &timer_list, WINE_TIMERENTRY, entry ) + wNewID = max(wNewID, lpTimer->wTimerID); - lpNewTimer->lpNext = TIME_TimersList; - TIME_TimersList = lpNewTimer; + list_add_head( &timer_list, &lpNewTimer->entry ); lpNewTimer->wTimerID = wNewID + 1; LeaveCriticalSection(&WINMM_cs); @@ -405,16 +398,16 @@ MMRESULT WINAPI timeSetEvent(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, */ MMRESULT WINAPI timeKillEvent(UINT wID) { - LPWINE_TIMERENTRY lpSelf = NULL, *lpTimer; + WINE_TIMERENTRY *lpSelf = NULL, *lpTimer; TRACE("(%u)\n", wID); EnterCriticalSection(&WINMM_cs); /* remove WINE_TIMERENTRY from list */ - for (lpTimer = &TIME_TimersList; *lpTimer; lpTimer = &(*lpTimer)->lpNext) { - if (wID == (*lpTimer)->wTimerID) { - lpSelf = *lpTimer; - /* unlink timer of id 'wID' */ - *lpTimer = (*lpTimer)->lpNext; + LIST_FOR_EACH_ENTRY( lpTimer, &timer_list, WINE_TIMERENTRY, entry ) + { + if (wID == lpTimer->wTimerID) { + lpSelf = lpTimer; + list_remove( &lpTimer->entry ); break; } } diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index ed9e9f3..72de79a 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -241,7 +241,6 @@ LPWINE_MMIO MMIO_Get(HMMIO h); WORD TIME_SetEventInternal(UINT wDelay, UINT wResol, LPTIMECALLBACK lpFunc, DWORD dwUser, UINT wFlags); -void TIME_MMTimeStart(void); void TIME_MMTimeStop(void); /* Global variables */

1 0

appdb/include objectManager.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31191 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 20:28:59 Modified files: include : objectManager.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix incorrect member variable, its $bIsQueue, not $bIsQueued. Fixes the number of items on a multi-page queue Patch: http://cvs.winehq.org/patch.py?id=31191 Old revision New revision Changes Path 1.25 1.26 +3 -3 appdb/include/objectManager.php Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.25 appdb/include/objectManager.php:1.26 --- appdb/include/objectManager.php:1.25 12 Jun 2007 1:28:59 -0000 +++ appdb/include/objectManager.php 12 Jun 2007 1:28:59 -0000 @@ -566,7 +566,7 @@ class ObjectManager $sControls .= "   <input type=\"submit\" value=\"Update\" />"; $sControls .= "</form></p>"; - $iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueued, $this->bIsRejected); + $iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected); $iNumPages = ceil($iTotalEntries / $iItemsPerPage); /* Check current page value */ @@ -581,8 +581,8 @@ class ObjectManager /* Page controls */ $iPageRange = 7; // the number of page links we want to display - display_page_range($iPage, $iPageRange, $iNumPages, $this->makeUrl()."&iItemsPerPage=". - "$iItemsPerPage"); + display_page_range($iPage, $iPageRange, $iNumPages, + $this->makeUrl()."&iItemsPerPage=$iItemsPerPage"); echo $sControls;

1 0

appdb/cron cleanup.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31190 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 20:05:32 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Standardize the subject of the cron cleanup emails Patch: http://cvs.winehq.org/patch.py?id=31190 Old revision New revision Changes Path 1.36 1.37 +9 -7 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.36 appdb/cron/cleanup.php:1.37 --- appdb/cron/cleanup.php:1.36 12 Jun 2007 1: 5:32 -0000 +++ appdb/cron/cleanup.php 12 Jun 2007 1: 5:32 -0000 @@ -9,6 +9,8 @@ require("path.php"); require(BASE."include/incl.php"); require_once(BASE."include/mail.php"); +$sEmailSubject = "[Cron maintenance] - "; + inactiveUserCheck(); /* check to see if there are orphaned versions in the database */ @@ -128,7 +130,7 @@ function warnUserDeleted($sEmail) function notifyAdminsOfCleanupStart() { - $sSubject = "Cleanup script starting\r\n"; + $sSubject = $sEmailSubject."Cleanup script starting\r\n"; $sMsg = "Appdb cleanup cron script started.\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) @@ -142,8 +144,8 @@ function notifyAdminsOfCleanupExecution( { $warnedUsers = User::get_inactive_users_pending_deletion(); - $sSubject = "Cleanup script summary\r\n"; - $sMsg = "Appdb cleanup cron script executed.\r\n"; + $sSubject = $sEmailSubject."Inactive users\r\n"; + $sMsg = "Appdb inactive users cleanup executed.\r\n"; $sMsg .= "Status\r\n"; $sMsg .= "--------------------------\r\n"; $sMsg .= "Users warned:".$usersWarned."\r\n"; @@ -177,7 +179,7 @@ function orphanVersionCheck() $sMsg .= $oRow->versionId."/".$oRow->versionName."\r\n"; } - $sSubject = "Versions orphaned in the database\r\n"; + $sSubject = $sEmailSubject."Orphan version cleanup\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) @@ -202,7 +204,7 @@ function orphanSessionMessagesCheck() $sMsg = "Found ".$iMessages." that have been orphaned in the sessionMessages table for longer than ".$iSessionMessageDayLimit." days\r\n"; $sMsg.= " Purging these messages.\r\n"; - $sSubject = "Messages orphaned in sessionMessages\r\n"; + $sSubject = $sEmailSubject."Orphaned session messages cleanup\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) @@ -228,7 +230,7 @@ function orphanSessionListCheck() $sMsg = "Found ".$iMessages." sessions that have expired after ".(SESSION_DAYS_TO_EXPIRE + 2)." days\r\n"; $sMsg.= " Purging these sessions.\r\n"; - $sSubject = "Sessions expired\r\n"; + $sSubject = $sEmailSubject."Orphan sessions being expired\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ if($sEmail) @@ -294,7 +296,7 @@ function removeScreenshotsWithMissingFil $sMsg.=$iScreenshotId."\r\n"; } - $sSubject = "Screenshots deleted\r\n"; + $sSubject = $sEmailSubject."Missing screenshot cleanup\r\n"; $sEmail = User::get_notify_email_address_list(null, null); /* get list admins */ if($sEmail)

1 0

appdb/include testData.php
by WineHQ 12 Jun '07

12 Jun '07

ChangeSet ID: 31189 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/11 19:40:20 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Enable multi-page support for unqueued testData Patch: http://cvs.winehq.org/patch.py?id=31189 Old revision New revision Changes Path 1.60 1.61 +0 -3 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.60 appdb/include/testData.php:1.61 --- appdb/include/testData.php:1.60 12 Jun 2007 0:40:20 -0000 +++ appdb/include/testData.php 12 Jun 2007 0:40:20 -0000 @@ -1064,9 +1064,6 @@ class testData{ function objectGetItemsPerPage($bQueued = false) { - if($bQueued) - return FALSE; - $aItemsPerPage = array(25, 50, 100, 200); $iDefaultPerPage = 25; return array($aItemsPerPage, $iDefaultPerPage);

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
86
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 2007