June 2007 - Wine-commits - list.winehq.org

appdb/include filter.php
by WineHQ 29 Jun '07

29 Jun '07

ChangeSet ID: 31232 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/28 21:20:11 Modified files: include : filter.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Exclude 'XinhaColorPicker' get/post/cookie variable from normal filtering. Fixes a bug where using the color picker resulted in an appdb error message until the cookie was removed. Patch: http://cvs.winehq.org/patch.py?id=31232 Old revision New revision Changes Path 1.13 1.14 +2 -1 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.13 appdb/include/filter.php:1.14 --- appdb/include/filter.php:1.13 29 Jun 2007 2:20:11 -0000 +++ appdb/include/filter.php 29 Jun 2007 2:20:11 -0000 @@ -34,7 +34,8 @@ function filter_gpc() // NOTE: we must use === when comparing the return value of strpos // against a value, otherwise if strpos() returns false indicating that // the value wasn't found strpos(something) == 0 will still be true - if(strpos($aKeys[$i], "Dialog") === 0) // Xinha variables + if((strpos($aKeys[$i], "Dialog") === 0) || + (strpos($aKeys[$i], "XinhaColorPicker") === 0)) // Xinha variables { // copy the key over to the clean array // NOTE: we do not strip html tags or trim any Xinha variables

1 0

Hans Leidekker : pdh: Implement PdhCollectQueryData.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 4727bec54c3325d31d262d95e16ff1e81b1f7560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4727bec54c3325d31d262d95e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 25 21:11:02 2007 +0200 pdh: Implement PdhCollectQueryData. --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 3bfae97..42a66ed 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -12,7 +12,7 @@ @ stub PdhCalculateCounterFromRawValue @ stub PdhCloseLog @ stdcall PdhCloseQuery(ptr) -@ stub PdhCollectQueryData +@ stdcall PdhCollectQueryData(ptr) @ stub PdhCollectQueryDataEx @ stub PdhComputeCounterStatistics @ stub PdhConnectMachineA diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 2dc7b8b..b21391a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -246,6 +246,31 @@ PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) } /*********************************************************************** + * PdhCollectQueryData (PDH.@) + */ +PDH_STATUS WINAPI PdhCollectQueryData( PDH_HQUERY handle ) +{ + struct query *query = handle; + struct list *item; + + TRACE("%p\n", handle); + + if (!query || (query->magic != PDH_MAGIC_QUERY)) return PDH_INVALID_HANDLE; + + LIST_FOR_EACH( item, &query->counters ) + { + SYSTEMTIME time; + struct counter *counter = LIST_ENTRY( item, struct counter, entry ); + + counter->collect( counter ); + + GetLocalTime( &time ); + SystemTimeToFileTime( &time, &counter->stamp ); + } + return ERROR_SUCCESS; +} + +/*********************************************************************** * PdhOpenQueryA (PDH.@) */ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY *query )

1 0

Hans Leidekker : pdh: Implement PdhAddCounter{A, W} and PdhRemoveCounter.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 0718c11ee16d7e81e46bcfd4710b4563e554c6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0718c11ee16d7e81e46bcfd47… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 25 21:10:19 2007 +0200 pdh: Implement PdhAddCounter{A, W} and PdhRemoveCounter. --- dlls/pdh/pdh.spec | 6 ++-- dlls/pdh/pdh_main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 26494cd..3bfae97 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -1,8 +1,8 @@ 1 stub PdhPlaGetLogFileNameA @ stub PdhAdd009CounterA @ stub PdhAdd009CounterW -@ stub PdhAddCounterA -@ stub PdhAddCounterW +@ stdcall PdhAddCounterA(ptr str long ptr) +@ stdcall PdhAddCounterW(ptr wstr long ptr) @ stub PdhBindInputDataSourceA @ stub PdhBindInputDataSourceW @ stub PdhBrowseCountersA @@ -120,7 +120,7 @@ @ stub PdhReadRawLogRecord @ stub PdhRelogA @ stub PdhRelogW -@ stub PdhRemoveCounter +@ stdcall PdhRemoveCounter(ptr) @ stub PdhSelectDataSourceA @ stub PdhSelectDataSourceW @ stub PdhSetCounterScaleFactor diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 1531b94..2dc7b8b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -111,6 +111,14 @@ struct counter } two; /* second value */ }; +static struct counter *create_counter( void ) +{ + struct counter *counter; + + if ((counter = pdh_alloc_zero( sizeof(struct counter) ))) return counter; + return NULL; +} + #define PDH_MAGIC_QUERY 0x50444830 /* 'PDH0' */ struct query @@ -142,6 +150,74 @@ struct source LONGLONG base; /* samples per second */ }; +/* counter source registry */ +static const struct source counter_sources[] = +{ + { NULL, NULL, 0, 0, 0 } +}; + +/*********************************************************************** + * PdhAddCounterA (PDH.@) + */ +PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *counter ) +{ + PDH_STATUS ret; + WCHAR *pathW; + + TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + if (!(pathW = pdh_strdup_aw( path ))) + return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhAddCounterW( query, pathW, userdata, counter ); + + pdh_free( pathW ); + return ret; +} + +/*********************************************************************** + * PdhAddCounterW (PDH.@) + */ +PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *hcounter ) +{ + struct query *query = hquery; + struct counter *counter; + unsigned int i; + + TRACE("%p %s %lx %p\n", hquery, debugstr_w(path), userdata, hcounter); + + if (!path || !hcounter) return PDH_INVALID_ARGUMENT; + if (!query || (query->magic != PDH_MAGIC_QUERY)) return PDH_INVALID_HANDLE; + + *hcounter = NULL; + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + { + if (strstrW( path, counter_sources[i].path )) + { + if ((counter = create_counter())) + { + counter->path = pdh_strdup( counter_sources[i].path ); + counter->collect = counter_sources[i].collect; + counter->type = counter_sources[i].type; + counter->defaultscale = counter_sources[i].scale; + counter->base = counter_sources[i].base; + counter->queryuser = query->user; + counter->user = userdata; + + list_add_tail( &query->counters, &counter->entry ); + + *hcounter = counter; + return ERROR_SUCCESS; + } + return PDH_MEMORY_ALLOCATION_FAILURE; + } + } + return PDH_CSTATUS_NO_COUNTER; +} /*********************************************************************** * PdhCloseQuery (PDH.@) @@ -212,3 +288,22 @@ PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY } return PDH_MEMORY_ALLOCATION_FAILURE; } + +/*********************************************************************** + * PdhRemoveCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhRemoveCounter( PDH_HCOUNTER handle ) +{ + struct counter *counter = handle; + + TRACE("%p\n", handle); + + if (!counter) return PDH_INVALID_HANDLE; + + list_remove( &counter->entry ); + + pdh_free( counter->path ); + pdh_free( counter ); + + return ERROR_SUCCESS; +}

1 0

Hans Leidekker : pdh: Add public headers.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 24a1ae11fb759b342987398310eec59c7d2e41ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=24a1ae11fb759b34298739831… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 25 21:09:48 2007 +0200 pdh: Add public headers. --- include/Makefile.in | 3 + include/pdh.h | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/pdhmsg.h | 32 +++++++++ include/winperf.h | 65 ++++++++++++++++++ 4 files changed, 286 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24a1ae11fb759b3429873…

1 0

Hans Leidekker : pdh: Implement PdhOpenQuery{A, W} and PdhCloseQuery.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 3f1142e3bfe15b7931976b40d7e0fe2ab7c1ffe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f1142e3bfe15b7931976b40d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jun 25 21:10:11 2007 +0200 pdh: Implement PdhOpenQuery{A, W} and PdhCloseQuery. --- dlls/pdh/pdh.spec | 6 +- dlls/pdh/pdh_main.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 3bea949..26494cd 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -11,7 +11,7 @@ @ stub PdhBrowseCountersW @ stub PdhCalculateCounterFromRawValue @ stub PdhCloseLog -@ stub PdhCloseQuery +@ stdcall PdhCloseQuery(ptr) @ stub PdhCollectQueryData @ stub PdhCollectQueryDataEx @ stub PdhComputeCounterStatistics @@ -81,9 +81,9 @@ @ stub PdhOpenLogA @ stub PdhOpenLogW @ stub PdhOpenQuery -@ stub PdhOpenQueryA +@ stdcall PdhOpenQueryA(str long ptr) @ stub PdhOpenQueryH -@ stub PdhOpenQueryW +@ stdcall PdhOpenQueryW(wstr long ptr) @ stub PdhParseCounterPathA @ stub PdhParseCounterPathW @ stub PdhParseInstanceNameA diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index cbc1991..1531b94 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -20,12 +20,56 @@ #include <stdarg.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" + +#include "pdh.h" +#include "pdhmsg.h" +#include "winperf.h" + #include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); +static inline void *pdh_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *pdh_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void pdh_free( LPVOID mem ) +{ + HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *pdh_strdup( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + if ((dst = pdh_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +} + +static inline WCHAR *pdh_strdup_aw( const char *src ) +{ + int len; + WCHAR *dst; + + if (!src) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = pdh_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + return dst; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); @@ -39,3 +83,132 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +struct counter +{ + struct list entry; + WCHAR *path; /* identifier */ + DWORD type; /* counter type */ + DWORD status; /* update status */ + LONG scale; /* scale factor */ + LONG defaultscale; /* default scale factor */ + DWORD_PTR user; /* user data */ + DWORD_PTR queryuser; /* query user data */ + LONGLONG base; /* samples per second */ + FILETIME stamp; /* time stamp */ + void (CALLBACK *collect)( struct counter * ); /* collect callback */ + union + { + LONG longvalue; + double doublevalue; + LONGLONG largevalue; + } one; /* first value */ + union + { + LONG longvalue; + double doublevalue; + LONGLONG largevalue; + } two; /* second value */ +}; + +#define PDH_MAGIC_QUERY 0x50444830 /* 'PDH0' */ + +struct query +{ + DWORD magic; /* signature */ + DWORD_PTR user; /* user data */ + struct list counters; /* counter list */ +}; + +static struct query *create_query( void ) +{ + struct query *query; + + if ((query = pdh_alloc_zero( sizeof(struct query) ))) + { + query->magic = PDH_MAGIC_QUERY; + list_init( &query->counters ); + return query; + } + return NULL; +} + +struct source +{ + const WCHAR *path; /* identifier */ + void (CALLBACK *collect)( struct counter * ); /* collect callback */ + DWORD type; /* counter type */ + LONG scale; /* default scale factor */ + LONGLONG base; /* samples per second */ +}; + + +/*********************************************************************** + * PdhCloseQuery (PDH.@) + */ +PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) +{ + struct query *query = handle; + struct list *item; + + TRACE("%p\n", handle); + + if (!query || (query->magic != PDH_MAGIC_QUERY)) return PDH_INVALID_HANDLE; + + LIST_FOR_EACH( item, &query->counters ) + { + struct counter *counter = LIST_ENTRY( item, struct counter, entry ); + + list_remove( &counter->entry ); + + pdh_free( counter->path ); + pdh_free( counter ); + } + + pdh_free( query ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhOpenQueryA (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY *query ) +{ + PDH_STATUS ret; + WCHAR *sourceW = NULL; + + TRACE("%s %lx %p\n", debugstr_a(source), userdata, query); + + if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhOpenQueryW( sourceW, userdata, query ); + pdh_free( sourceW ); + + return ret; +} + +/*********************************************************************** + * PdhOpenQueryW (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY *handle ) +{ + struct query *query; + + TRACE("%s %lx %p\n", debugstr_w(source), userdata, handle); + + if (!handle) return PDH_INVALID_ARGUMENT; + + if (source) + { + FIXME("log file data source not supported\n"); + return PDH_INVALID_ARGUMENT; + } + if ((query = create_query())) + { + query->user = userdata; + *handle = query; + + return ERROR_SUCCESS; + } + return PDH_MEMORY_ALLOCATION_FAILURE; +}

1 0

Alexandre Julliard : wrc: Strip C code based on the name of the include file.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 549351ab09c2173d067b3a6eeee5b45bf6098ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549351ab09c2173d067b3a6ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 14:10:07 2007 +0200 wrc: Strip C code based on the name of the include file. Get rid of the old C code stripping support that wasn't used anymore. --- tools/wrc/parser.l | 74 +++++++++++---------------------------------------- 1 files changed, 16 insertions(+), 58 deletions(-) diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f9034a5..4b0a7db 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -76,10 +76,7 @@ /* Exclusive comment eating... */ %x comment /* Set when stripping c-junk */ -%x pp_stripe -%x pp_strips -%x pp_stripp -%x pp_stripp_final +%x pp_cstrip /* Set when scanning #line style directives */ %x pp_line /* Set when scanning #pragma */ @@ -87,7 +84,7 @@ %x pp_code_page %option stack -%option nounput noyy_top_state +%option nounput noyy_top_state noyywrap %option 8bit never-interactive %option prefix="parser_" @@ -128,9 +125,6 @@ static int cbufalloc = 0; static WCHAR *wbuffer; static int wbufidx; static int wbufalloc = 0; -static int stripslevel = 0; /* Count {} during pp_strips/pp_stripe mode */ -static int stripplevel = 0; /* Count () during pp_strips mode */ -static int cjunk_tagline; /* Where did we start stripping (helps error tracking) */ static int current_codepage = -1; /* use language default */ @@ -321,10 +315,10 @@ static struct keyword *iskeyword(char *kw) * because we only want to know the linenumber and * filename. */ -<INITIAL,pp_strips,pp_stripp>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(pp_pragma); -<INITIAL,pp_strips,pp_stripp>^{ws}*\#{ws}* yy_push_state(pp_line); +<INITIAL,pp_cstrip>^{ws}*\#{ws}*pragma{ws}+ yy_push_state(pp_pragma); +<INITIAL,pp_cstrip>^{ws}*\#{ws}* yy_push_state(pp_line); <pp_line>[^\n]* { - int lineno; + int lineno, len; char *cptr; char *fname; yy_pop_state(); @@ -341,6 +335,12 @@ static struct keyword *iskeyword(char *kw) *cptr = '\0'; line_number = lineno - 1; /* We didn't read the newline */ input_name = xstrdup(fname); + /* ignore contents of C include files */ + len = strlen(input_name); + if (len > 1 && !strcasecmp( input_name + len - 2, ".h" )) + BEGIN(pp_cstrip); + else + BEGIN(INITIAL); } <pp_pragma>code_page[^\n]* yyless(9); yy_pop_state(); yy_push_state(pp_code_page); @@ -366,30 +366,8 @@ static struct keyword *iskeyword(char *kw) * into account braces {} for structures, * classes and enums. */ -<pp_strips>\{ stripslevel++; -<pp_strips>\} stripslevel--; -<pp_strips>; if(!stripslevel) yy_pop_state(); -<pp_strips>\/[^*\n] ; /* To catch comments */ -<pp_strips>[^\{\};\n#/]* ; /* Ignore rest */ -<pp_strips>\n line_number++; char_number = 1; - -<pp_stripp>$ stripplevel++; -<pp_stripp>$ { - stripplevel--; - if(!stripplevel) - { - yy_pop_state(); - yy_push_state(pp_stripp_final); - } - } -<pp_stripp>\/[^*\n] ; /* To catch comments */ -<pp_stripp>[^;\n#/]* ; /* Ignore rest */ -<pp_stripp>\n line_number++; char_number = 1; - -<pp_stripp_final>{ws}* ; /* Ignore */ -<pp_stripp_final>; yy_pop_state(); /* Kill the semicolon */ -<pp_stripp_final>\n line_number++; char_number = 1; yy_pop_state(); -<pp_stripp_final>. yyless(0); yy_pop_state(); +<pp_cstrip>\n line_number++; char_number = 1; +<pp_cstrip>. ; /* ignore */ \{ return tBEGIN; \} return tEND; @@ -546,7 +524,7 @@ L\" { * Comment stripping * Should never occur after preprocessing */ -<INITIAL,pp_stripp,pp_strips>"/*" { +<INITIAL,pp_cstrip>"/*" { yy_push_state(comment); save_wanted_id = wanted_id; if(!no_preprocess) @@ -574,13 +552,6 @@ L\" { <INITIAL>. return yytext[0]; -<<EOF>> { - if(YY_START == pp_strips || YY_START == pp_stripe || YY_START == pp_stripp || YY_START == pp_stripp_final) - parser_error("Unexpected end of file during c-junk scanning (started at %d)", cjunk_tagline); - else - yyterminate(); - } - <*>.|\n { /* Catch all rule to find any unmatched text */ if(*yytext == '\n') @@ -588,25 +559,12 @@ L\" { line_number++; char_number = 1; } - parser_warning("Unmatched text '%c' (0x%02x) YY_START=%d stripslevel=%d", - isprint(*yytext & 0xff) ? *yytext : '.', *yytext, YY_START,stripslevel); + parser_warning("Unmatched text '%c' (0x%02x) YY_START=%d", + isprint(*yytext & 0xff) ? *yytext : '.', *yytext, YY_START); } %% -#ifndef parser_wrap -int parser_wrap(void) -{ -#if 0 - if(bufferstackidx > 0) - { - return 0; - } -#endif - return 1; -} -#endif - /* These dup functions copy the enclosed '\0' from * the resource string. */

1 0

Maarten Lankhorst : dsound/winealsa: Remove writelead for alsa directsound.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: f4d5f127dda38bc4db46f0a904645d1c82150b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d5f127dda38bc4db46f0a90… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Jun 23 20:40:35 2007 +0200 dsound/winealsa: Remove writelead for alsa directsound. --- dlls/dsound/primary.c | 5 ++++- dlls/winealsa.drv/dsoutput.c | 2 +- include/dsdriver.h | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 39c097a..d8d7dc6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -64,8 +64,11 @@ static void DSOUND_RecalcPrimary(DirectSoundDevice *device) device->fraglen = fraglen; TRACE("fraglen=%d\n", device->fraglen); } + if (device->hwbuf && device->drvdesc.dwFlags & DSDDESC_DONTNEEDWRITELEAD) + device->writelead = 0; + else /* calculate the 10ms write lead */ - device->writelead = (device->pwfx->nSamplesPerSec / 100) * nBlockAlign; + device->writelead = (device->pwfx->nSamplesPerSec / 100) * nBlockAlign; } static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 2e8d1f3..2879d2e 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -596,7 +596,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); memcpy(pDesc, &(WOutDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC)); - pDesc->dwFlags = DSDDESC_DONTNEEDPRIMARYLOCK | DSDDESC_DONTNEEDSECONDARYLOCK; + pDesc->dwFlags = DSDDESC_DONTNEEDPRIMARYLOCK | DSDDESC_DONTNEEDSECONDARYLOCK | DSDDESC_DONTNEEDWRITELEAD; pDesc->dnDevNode = WOutDev[This->wDevID].waveDesc.dnDevNode; pDesc->wVxdId = 0; pDesc->wReserved = 0; diff --git a/include/dsdriver.h b/include/dsdriver.h index db48167..bb7f4c6 100644 --- a/include/dsdriver.h +++ b/include/dsdriver.h @@ -52,6 +52,7 @@ typedef struct IDsCaptureDriverBuffer *PIDSCDRIVERBUFFER; #define DSDDESC_USESYSTEMMEMORY 0x00000004 #define DSDDESC_DONTNEEDPRIMARYLOCK 0x00000008 #define DSDDESC_DONTNEEDSECONDARYLOCK 0x00000010 +#define DSDDESC_DONTNEEDWRITELEAD 0x00000020 #define DSDHEAP_NOHEAP 0 #define DSDHEAP_CREATEHEAP 1

1 0

Alexandre Julliard : wpp: Don't suppress output from C include files, that' s up to the user.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 49a3d4371dd16296822e73bb237257a7543c39cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a3d4371dd16296822e73bb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 14:10:42 2007 +0200 wpp: Don't suppress output from C include files, that's up to the user. --- libs/wpp/ppl.l | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 58fda7b..eae5465 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -200,7 +200,6 @@ typedef struct bufferstackentry { /* Include management */ include_state_t incl; char *include_filename; - int pass_data; } bufferstackentry_t; #define ALLOCBLOCKSIZE (1 << 10) /* Allocate these chunks at a time for string-buffers */ @@ -233,7 +232,6 @@ typedef struct macexpstackentry { static void newline(int); static int make_number(int radix, YYSTYPE *val, const char *str, int len); static void put_buffer(const char *s, int len); -static int is_c_h_include(char *fname, int quoted); /* Buffer management */ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop); static bufferstackentry_t *pop_buffer(void); @@ -272,8 +270,6 @@ static int macexpstackidx = 0; static bufferstackentry_t bufferstack[MAXBUFFERSTACK]; static int bufferstackidx = 0; -static int pass_data=1; - /* * Global variables */ @@ -559,8 +555,6 @@ includelogicentry_t *pp_includelogiclist = NULL; return tDQSTRING; case pp_line: ppy_lval.cptr = get_string(); - if (is_c_h_include(ppy_lval.cptr, 1)) pass_data=0; - else pass_data=1; return tDQSTRING; default: put_string(); @@ -1191,7 +1185,6 @@ static void push_buffer(pp_entry_t *ppp, char *filename, char *incname, int pop) bufferstack[bufferstackidx].ncontinuations = ncontinuations; bufferstack[bufferstackidx].incl = pp_incl_state; bufferstack[bufferstackidx].include_filename = incname; - bufferstack[bufferstackidx].pass_data = pass_data; if(ppp) ppp->expanding = 1; @@ -1254,7 +1247,6 @@ static bufferstackentry_t *pop_buffer(void) } free(pp_incl_state.ppp); pp_incl_state = bufferstack[bufferstackidx].incl; - pass_data = bufferstack[bufferstackidx].pass_data; } } @@ -1410,10 +1402,8 @@ static void put_buffer(const char *s, int len) { if(top_macro()) add_text_to_macro(s, len); - else { - if(pass_data) + else fwrite(s, 1, len, ppy_out); - } } @@ -1422,15 +1412,6 @@ static void put_buffer(const char *s, int len) * Include management *------------------------------------------------------------------------- */ -static int is_c_h_include(char *fname, int quoted) -{ - int sl=strlen(fname); - if (sl < 2 + 2 * quoted) return 0; - if ((toupper(fname[sl-1-quoted])!='H') && (toupper(fname[sl-1-quoted])!='C')) return 0; - if (fname[sl-2-quoted]!='.') return 0; - return 1; -} - void pp_do_include(char *fname, int type) { char *newpath; @@ -1466,12 +1447,10 @@ void pp_do_include(char *fname, int type) pp_incl_state.seen_junk = 0; pp_incl_state.state = 0; pp_incl_state.ppp = NULL; - if (is_c_h_include(newpath, 0)) pass_data=0; - else pass_data=1; if(pp_status.debug) - fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d ,pass_data=%d\n", - pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth, pass_data); + fprintf(stderr, "pp_do_include: %s:%d: include_state=%d, include_ppp='%s', include_ifdepth=%d\n", + pp_status.input, pp_status.line_number, pp_incl_state.state, pp_incl_state.ppp, pp_incl_state.ifdepth); ppy__switch_to_buffer(ppy__create_buffer(ppy_in, YY_BUF_SIZE)); fprintf(ppy_out, "# 1 \"%s\" 1%s\n", newpath, type ? "" : " 3");

1 0

Misha Koshelev : winemenubuilder: Wait for parent process to finish instead of creating RunOnce entry that may never run .
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: 5e28f7ad92e39bdd75cf291e22b7ebae00032e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e28f7ad92e39bdd75cf291e2… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 27 20:23:33 2007 -0500 winemenubuilder: Wait for parent process to finish instead of creating RunOnce entry that may never run. --- dlls/shell32/shelllink.c | 7 +- programs/winemenubuilder/winemenubuilder.c | 140 ++++++++++++++-------------- 2 files changed, 71 insertions(+), 76 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index aa21a4a..5f99c9d 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -399,7 +399,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) { static const WCHAR szFormat[] = { 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','r',' ','"','%','s','"',0 }; + ' ','-','w',' ','"','%','s','"',0 }; LONG len; LPWSTR buffer; STARTUPINFOW si; @@ -417,11 +417,6 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) memset(&si, 0, sizeof(si)); si.cb = sizeof(si); if (!CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return FALSE; - - /* wait for a while to throttle the creation of linker processes */ - if( WAIT_OBJECT_0 != WaitForSingleObject( pi.hProcess, 10000 ) ) - WARN("Timed out waiting for shell linker\n"); - CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index cac3abf..a8ee4b1 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -33,11 +33,11 @@ * interface, then invoke wineshelllink with the appropriate arguments * to create a KDE/Gnome menu entry for the shortcut. * - * winemenubuilder [ -r ] <shortcut.lnk> + * winemenubuilder [ -w ] <shortcut.lnk> * - * If the -r parameter is passed, and the shortcut cannot be created, - * this program will add a RunOnce entry to invoke itself at the next - * reboot. This covers the case when a ShortCut is created before the + * If the -w parameter is passed, and the shortcut cannot be created, + * this program will wait for the parent process to finish and then try + * again. This covers the case when a ShortCut is created before the * executable containing its icon. * * TODO @@ -72,6 +72,7 @@ #include <objidl.h> #include <shlguid.h> #include <appmgmt.h> +#include <tlhelp32.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -466,9 +467,8 @@ static unsigned short crc16(const char* string) } /* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */ -static char *extract_icon( LPCWSTR path, int index) +static char *extract_icon( LPCWSTR path, int index, BOOL bWait ) { - int nodefault = 1; unsigned short crc; char *iconsdir, *ico_path, *ico_name, *xpm_path; char* s; @@ -520,13 +520,6 @@ static char *extract_icon( LPCWSTR path, int index) return NULL; /* No icon created */ } - /* If icon path begins with a '*' then this is a deferred call */ - if (path[0] == '*') - { - path++; - nodefault = 0; - } - /* Determine the icon base name */ n = WideCharToMultiByte(CP_UNIXCP, 0, path, -1, NULL, 0, NULL, NULL); ico_path = HeapAlloc(GetProcessHeap(), 0, n); @@ -558,7 +551,7 @@ static char *extract_icon( LPCWSTR path, int index) sprintf(xpm_path,"%s/%04x_%s.xpm",iconsdir,crc,ico_name); if (ExtractFromICO( path, xpm_path)) goto end; - if (!nodefault) + if (!bWait) if (create_default_icon( xpm_path, ico_path )) goto end; @@ -571,46 +564,6 @@ static char *extract_icon( LPCWSTR path, int index) return xpm_path; } -static BOOL DeferToRunOnce(LPWSTR link) -{ - HKEY hkey; - LONG r, len; - static const WCHAR szRunOnce[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'R','u','n','O','n','c','e',0 - }; - static const WCHAR szFormat[] = { '%','s',' ','"','%','s','"',0 }; - LPWSTR buffer; - WCHAR szExecutable[MAX_PATH]; - - WINE_TRACE( "Deferring icon creation to reboot.\n"); - - len = GetModuleFileNameW( 0, szExecutable, MAX_PATH ); - if (!len || len >= MAX_PATH) return FALSE; - - len = ( lstrlenW( link ) + lstrlenW( szExecutable ) + 4)*sizeof(WCHAR); - buffer = HeapAlloc( GetProcessHeap(), 0, len ); - if( !buffer ) - return FALSE; - - wsprintfW( buffer, szFormat, szExecutable, link ); - - r = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szRunOnce, 0, - NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); - if ( r == ERROR_SUCCESS ) - { - r = RegSetValueExW(hkey, link, 0, REG_SZ, - (LPBYTE) buffer, (lstrlenW(buffer) + 1)*sizeof(WCHAR)); - RegCloseKey(hkey); - } - HeapFree(GetProcessHeap(), 0, buffer); - - return ! r; -} - /* This escapes \ in filenames */ static LPSTR escape(LPCWSTR arg) { @@ -897,7 +850,7 @@ static HRESULT get_cmdline( IShellLinkW *sl, LPWSTR szPath, DWORD pathSize, return hr; } -static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain ) +static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', '\\','s','t','a','r','t','.','e','x','e',0}; @@ -953,14 +906,14 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain ) /* extract the icon */ if( szIconPath[0] ) - icon_name = extract_icon( szIconPath , iIconId ); + icon_name = extract_icon( szIconPath , iIconId, bWait ); else - icon_name = extract_icon( szPath, iIconId ); + icon_name = extract_icon( szPath, iIconId, bWait ); - /* fail - try once again at reboot time */ + /* fail - try once again after parent process exit */ if( !icon_name ) { - if (bAgain) + if (bWait) { WINE_WARN("Unable to extract icon, deferring.\n"); goto cleanup; @@ -1049,8 +1002,54 @@ cleanup: return TRUE; } +static BOOL WaitForParentProcess( void ) +{ + PROCESSENTRY32 procentry; + HANDLE hsnapshot = NULL, hprocess = NULL; + DWORD ourpid = GetCurrentProcessId(); + BOOL ret = FALSE, rc; + + WINE_TRACE("Waiting for parent process\n"); + if ((hsnapshot = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 )) == + INVALID_HANDLE_VALUE) + { + WINE_ERR("CreateToolhelp32Snapshot failed, error %d\n", GetLastError()); + goto done; + } + + procentry.dwSize = sizeof(PROCESSENTRY32); + rc = Process32First( hsnapshot, &procentry ); + while (rc) + { + if (procentry.th32ProcessID == ourpid) break; + rc = Process32Next( hsnapshot, &procentry ); + } + if (!rc) + { + WINE_WARN("Unable to find current process id %d when listing processes\n", ourpid); + goto done; + } + + if ((hprocess = OpenProcess( SYNCHRONIZE, FALSE, procentry.th32ParentProcessID )) == + NULL) + { + WINE_WARN("OpenProcess failed pid=%d, error %d\n", procentry.th32ParentProcessID, + GetLastError()); + goto done; + } + + if (WaitForSingleObject( hprocess, INFINITE ) == WAIT_OBJECT_0) + ret = TRUE; + else + WINE_ERR("Unable to wait for parent process, error %d\n", GetLastError()); + +done: + if (hprocess) CloseHandle( hprocess ); + if (hsnapshot) CloseHandle( hsnapshot ); + return ret; +} -static BOOL Process_Link( LPCWSTR linkname, BOOL bAgain ) +static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) { IShellLinkW *sl; IPersistFile *pf; @@ -1058,7 +1057,7 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bAgain ) WCHAR fullname[MAX_PATH]; DWORD len; - WINE_TRACE("%s, again %d\n", wine_dbgstr_w(linkname), bAgain); + WINE_TRACE("%s, wait %d\n", wine_dbgstr_w(linkname), bWait); if( !linkname[0] ) { @@ -1099,12 +1098,13 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bAgain ) if( SUCCEEDED( r ) ) { /* If something fails (eg. Couldn't extract icon) - * defer this menu entry to reboot via runonce + * wait for parent process and try again */ - if( ! InvokeShellLinker( sl, fullname, bAgain ) && bAgain ) - DeferToRunOnce( fullname ); - else - WINE_TRACE("Success.\n"); + if( ! InvokeShellLinker( sl, fullname, bWait ) && bWait ) + { + WaitForParentProcess(); + InvokeShellLinker( sl, fullname, FALSE ); + } } IPersistFile_Release( pf ); @@ -1159,7 +1159,7 @@ static CHAR *next_token( LPSTR *p ) int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { LPSTR token = NULL, p; - BOOL bAgain = FALSE; + BOOL bWait = FALSE; int ret = 0; for( p = cmdline; p && *p; ) @@ -1167,8 +1167,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show token = next_token( &p ); if( !token ) break; - if( !lstrcmpA( token, "-r" ) ) - bAgain = TRUE; + if( !lstrcmpA( token, "-w" ) ) + bWait = TRUE; else if( token[0] == '-' ) { WINE_ERR( "unknown option %s\n",token); @@ -1178,7 +1178,7 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show WCHAR link[MAX_PATH]; MultiByteToWideChar( CP_ACP, 0, token, -1, link, sizeof(link)/sizeof(WCHAR) ); - if( !Process_Link( link, bAgain ) ) + if( !Process_Link( link, bWait ) ) { WINE_ERR( "failed to build menu item for %s\n",token); ret = 1;

1 0

Maarten Lankhorst : winealsa: Optimize GetPosition() more in dsalsa.
by Alexandre Julliard 28 Jun '07

28 Jun '07

Module: wine Branch: master Commit: bfda5d6fbc3e2819db83e8c3d2a9ca81cdd1a253 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfda5d6fbc3e2819db83e8c3d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jun 27 23:37:26 2007 +0200 winealsa: Optimize GetPosition() more in dsalsa. --- dlls/winealsa.drv/dsoutput.c | 110 +++++++++++++++++++++++++----------------- 1 files changed, 65 insertions(+), 45 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index e4c7d3f..2e8d1f3 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -88,42 +88,46 @@ struct IDsDriverBufferImpl snd_pcm_t *pcm; snd_pcm_hw_params_t *hw_params; snd_pcm_sw_params_t *sw_params; - snd_pcm_uframes_t mmap_buflen_frames, mmap_pos, mmap_writeahead; + snd_pcm_uframes_t mmap_buflen_frames, mmap_pos, mmap_commitahead, mmap_writeahead; }; /** Fill buffers, for starting and stopping * Alsa won't start playing until everything is filled up * This also updates mmap_pos + * + * Returns: Amount of periods in use so snd_pcm_avail_update + * doesn't have to be called up to 4x in GetPosition() */ -static void CommitAll(IDsDriverBufferImpl *This) +static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) { const snd_pcm_channel_area_t *areas; snd_pcm_uframes_t used; - const snd_pcm_uframes_t writeahead = This->mmap_writeahead; + const snd_pcm_uframes_t commitahead = This->mmap_commitahead; - TRACE("%p want to %ld\n", This, writeahead); used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); - if (used < writeahead) + TRACE("%p needs to commit to %lu, used: %lu\n", This, commitahead, used); + if (used < commitahead) { - snd_pcm_uframes_t putin = writeahead - used; + snd_pcm_uframes_t done, putin = commitahead - used; snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); - This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + This->mmap_pos += done; + used += done; + putin = commitahead - used; - used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); - if (This->mmap_pos == This->mmap_buflen_frames) + if (This->mmap_pos == This->mmap_buflen_frames && (snd_pcm_sframes_t)putin > 0) { - putin = writeahead; - used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); - putin -= used; - - if ((snd_pcm_sframes_t)putin > 0) - { - snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); - This->mmap_pos += snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); - } + snd_pcm_mmap_begin(This->pcm, &areas, &This->mmap_pos, &putin); + done = snd_pcm_mmap_commit(This->pcm, This->mmap_pos, putin); + This->mmap_pos += done; + used += done; } - } + + if (This->mmap_pos == This->mmap_buflen_frames) + This->mmap_pos = 0; + + return used; } static void CheckXRUN(IDsDriverBufferImpl* This) @@ -175,9 +179,11 @@ static int DSDB_CreateMMAP(IDsDriverBufferImpl* pdbi) mmap_mode = snd_pcm_type(pcm); if (mmap_mode == SND_PCM_TYPE_HW) - TRACE("mmap'd buffer is a hardware buffer.\n"); + TRACE("mmap'd buffer is a direct hardware buffer.\n"); + else if (mmap_mode == SND_PCM_TYPE_DMIX) + TRACE("mmap'd buffer is an ALSA dmix buffer\n"); else - TRACE("mmap'd buffer is an ALSA emulation of hardware buffer.\n"); + TRACE("mmap'd buffer is an ALSA type %d buffer\n", mmap_mode); err = snd_pcm_hw_params_get_period_size(hw_params, &psize, NULL); @@ -375,16 +381,23 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo err = snd_pcm_hw_params_get_period_size(hw_params, &psize, NULL); TRACE("Period size is: %lu\n", psize); - if (psize > 512) + /* If period size is 'high', try to commit less + * dmix needs at least 2 buffers to work succesfully but prefers 3 + * however it seems to work ok if I just commit 2 1/2 buffers + */ + if (psize >= 512) { - if (++warnonce == 1) + if (psize > 512 && ++warnonce == 1) FIXME("Your alsa dmix period size is excessively high, unfortunately this is alsa default, try decreasing it to 512 or 256 (but double the amount of periods) if possible\n"); - This->mmap_writeahead = 3 * psize; + This->mmap_commitahead = 2 * psize + psize/2; + This->mmap_writeahead = 2 * psize; } - else + else { - This->mmap_writeahead = 3 * psize; - while (This->mmap_writeahead <= 512) This->mmap_writeahead += psize; + This->mmap_commitahead = 3 * psize; + while (This->mmap_commitahead <= 512) + This->mmap_commitahead += psize; + This->mmap_writeahead = This->mmap_commitahead; } if (This->pcm) @@ -405,6 +418,11 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo if (err < 0) WARN("Failed to apply changes: %s\n", snd_strerror(err)); + if (!This->pcm) + This->pcm = pcm; + else + snd_pcm_close(pcm); + if (This->pcm) snd_pcm_hw_params_current(This->pcm, This->hw_params); @@ -468,21 +486,24 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, } state = snd_pcm_state(This->pcm); - if (state == SND_PCM_STATE_RUNNING) + + if (state != SND_PCM_STATE_RUNNING) + CheckXRUN(This); + else { - snd_pcm_uframes_t avail; - avail = snd_pcm_avail_update(This->pcm); - hw_pptr = This->mmap_pos + avail; - hw_pptr %= This->mmap_buflen_frames; - hw_wptr = hw_pptr + This->mmap_writeahead - 512; + snd_pcm_uframes_t used = CommitAll(This); + + if (This->mmap_pos > used) + hw_pptr = This->mmap_pos - used; + else + hw_pptr = This->mmap_buflen_frames - used + This->mmap_pos; + + hw_wptr = hw_pptr + (This->mmap_writeahead > used ? used : This->mmap_writeahead); hw_wptr %= This->mmap_buflen_frames; - WARN("At position: %ld (%ld) - Avail %ld\n", hw_pptr, This->mmap_pos, avail); - assert((snd_pcm_sframes_t)hw_pptr >= 0); - } - else WARN("%p: State = %d\n", lpdwPlay, state); + hw_pptr %= This->mmap_buflen_frames; - CheckXRUN(This); - CommitAll(This); + TRACE("At position: %ld (%ld) - Used %ld\n", hw_pptr, This->mmap_pos, used); + } LeaveCriticalSection(&This->pcm_crst); @@ -738,16 +759,15 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) TRACE("driver created\n"); /* the HAL isn't much better than the HEL if we can't do mmap() */ - if (!(WOutDev[wDevID].outcaps.dwSupport & WAVECAPS_DIRECTSOUND)) { - ERR("DirectSound flag not set\n"); - MESSAGE("This sound card's driver does not support direct access\n"); - MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n"); - return MMSYSERR_NOTSUPPORTED; + if (!(WOutDev[wDevID].outcaps.dwSupport & WAVECAPS_DIRECTSOUND)) + { + WARN("MMAP not supported for this device, falling back to waveout, should be harmless\n"); + return MMSYSERR_NOTSUPPORTED; } *idrv = HeapAlloc(GetProcessHeap(),0,sizeof(IDsDriverImpl)); if (!*idrv) - return MMSYSERR_NOMEM; + return MMSYSERR_NOMEM; (*idrv)->lpVtbl = &dsdvt; (*idrv)->ref = 1;

1 0