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

Jacek Caban : shdocvw: Added GetExternal implementation.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: e23c5083f52229cdd0a41b1c532a1f3e4ec641ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23c5083f52229cdd0a41b1c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 01:00:27 2007 +0200 shdocvw: Added GetExternal implementation. --- dlls/shdocvw/dochost.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index f26447d..1637cc3 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -406,7 +406,13 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { DocHost *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDispatch); + + TRACE("(%p)->(%p)\n", This, ppDispatch); + + if(This->hostui) + return IDocHostUIHandler_GetExternal(This->hostui, ppDispatch); + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Juan Lang : crypt32: Use the outer content' s signature algorithm rather than the public key's embedded algorithm.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: e25b81fd9c7679a2bf7bfa632992855655767915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25b81fd9c7679a2bf7bfa632… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 31 14:58:26 2007 -0700 crypt32: Use the outer content's signature algorithm rather than the public key's embedded algorithm. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 94859ca..de1d5e0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1352,7 +1352,7 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv, ALG_ID pubKeyID, hashID; info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, - pubKeyInfo->Algorithm.pszObjId, 0); + signedCert->SignatureAlgorithm.pszObjId, 0); if (!info || (info->dwGroupId != CRYPT_PUBKEY_ALG_OID_GROUP_ID && info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID)) {

1 0

Alexandre Julliard : advapi32/tests: Don' t test the contents of an uninitialized buffer.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: a0dd646eef0fa7ab83f44642e209160d4e8f7398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0dd646eef0fa7ab83f44642e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 22:35:30 2007 +0200 advapi32/tests: Don't test the contents of an uninitialized buffer. --- dlls/advapi32/tests/service.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 48e2f79..76d147f 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -685,11 +685,11 @@ static void test_get_servicekeyname(void) GetLastError() == ERROR_IO_PENDING /* W2K */ || GetLastError() == 0xdeadbeef /* NT4, XP, Vista */, "Expected ERROR_SUCCESS, ERROR_IO_PENDING or 0xdeadbeef, got %d\n", GetLastError()); - todo_wine + if (ret) { - ok(lstrlen(servicename) == tempsize/2, - "Expected the buffer to be twice the length of the string\n") ; - ok(!lstrcmpi(servicename, spooler), "Expected %s, got %s\n", spooler, servicename); + ok(lstrlen(servicename) == tempsize/2, + "Expected the buffer to be twice the length of the string\n") ; + ok(!lstrcmpi(servicename, spooler), "Expected %s, got %s\n", spooler, servicename); } CloseServiceHandle(scm_handle);

1 0

Paul Vriens : advapi32/service: Cater better for domain in test.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 0900c72bef08a4dd55d688eed7bc6ef135fbc57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0900c72bef08a4dd55d688eed… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 31 13:06:53 2007 +0200 advapi32/service: Cater better for domain in test. --- dlls/advapi32/tests/service.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 76d147f..7aea906 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -140,8 +140,8 @@ static void test_open_svc(void) static void test_create_delete_svc(void) { SC_HANDLE scm_handle, svc_handle1; - CHAR username[UNLEN + 1], *domain; - DWORD user_size = UNLEN + 1, domain_size = 0; + CHAR username[UNLEN + 1], domain[MAX_PATH]; + DWORD user_size = UNLEN + 1; CHAR account[UNLEN + 3]; static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -155,14 +155,10 @@ static void test_create_delete_svc(void) /* Get the username and turn it into an account to be used in some tests */ GetUserNameA(username, &user_size); /* Get the domainname to cater for that situation */ - GetComputerNameEx(ComputerNameDnsDomain, NULL, &domain_size); - domain = HeapAlloc(GetProcessHeap(), 0, domain_size); - GetComputerNameEx(ComputerNameDnsDomain, domain, &domain_size); - if (domain_size > 1) + if (GetEnvironmentVariableA("USERDOMAIN", domain, MAX_PATH)) sprintf(account, "%s\\%s", domain, username); else sprintf(account, ".\\%s", username); - HeapFree(GetProcessHeap(), 0, domain); /* All NULL */ SetLastError(0xdeadbeef);

1 0

Andrew Talbot : oleaut32: Constify some variables.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 4ed64d381c72b741e39ffadd4e0cbe662e29c47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed64d381c72b741e39ffadd4… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jul 31 20:10:39 2007 +0100 oleaut32: Constify some variables. --- dlls/oleaut32/typelib.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab1d2d0..bf8673d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2711,7 +2711,8 @@ typedef struct HREFTYPE refs[1]; } sltg_ref_lookup_t; -static HRESULT sltg_get_typelib_ref(sltg_ref_lookup_t *table, DWORD typeinfo_ref, HREFTYPE *typelib_ref) +static HRESULT sltg_get_typelib_ref(const sltg_ref_lookup_t *table, DWORD typeinfo_ref, + HREFTYPE *typelib_ref) { if(typeinfo_ref < table->num) { @@ -2724,7 +2725,7 @@ static HRESULT sltg_get_typelib_ref(sltg_ref_lookup_t *table, DWORD typeinfo_ref return E_FAIL; } -static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD, sltg_ref_lookup_t *ref_lookup) +static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD, const sltg_ref_lookup_t *ref_lookup) { BOOL done = FALSE; @@ -2790,7 +2791,8 @@ static WORD *SLTG_DoType(WORD *pType, char *pBlk, TYPEDESC *pTD, sltg_ref_lookup return pType; } -static WORD *SLTG_DoElem(WORD *pType, char *pBlk, ELEMDESC *pElem, sltg_ref_lookup_t *ref_lookup) +static WORD *SLTG_DoElem(WORD *pType, char *pBlk, + ELEMDESC *pElem, const sltg_ref_lookup_t *ref_lookup) { /* Handle [in/out] first */ if((*pType & 0xc000) == 0xc000) @@ -2899,7 +2901,7 @@ static sltg_ref_lookup_t *SLTG_DoRefs(SLTG_RefInfo *pRef, ITypeLibImpl *pTL, } static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI, - BOOL OneOnly, sltg_ref_lookup_t *ref_lookup) + BOOL OneOnly, const sltg_ref_lookup_t *ref_lookup) { SLTG_ImplInfo *info; TLBImplType **ppImplType = &pTI->impltypelist; @@ -2929,7 +2931,8 @@ static char *SLTG_DoImpls(char *pBlk, ITypeInfoImpl *pTI, return (char*)info; } -static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cVars, char *pNameTable, sltg_ref_lookup_t *ref_lookup) +static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cVars, + const char *pNameTable, const sltg_ref_lookup_t *ref_lookup) { TLBVarDesc **ppVarDesc = &pTI->varlist; BSTR bstrPrevName = NULL; @@ -3003,7 +3006,8 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign pTI->TypeAttr.cVars = cVars; } -static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsigned short cFuncs, char *pNameTable, sltg_ref_lookup_t *ref_lookup) +static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, + unsigned short cFuncs, char *pNameTable, const sltg_ref_lookup_t *ref_lookup) { SLTG_Function *pFunc; unsigned short i; @@ -3138,7 +3142,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const SLTG_TypeInfoTail *pTITail) { char *pFirstItem, *pNextItem; sltg_ref_lookup_t *ref_lookup = NULL; @@ -3164,15 +3168,15 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI, } static void SLTG_ProcessRecord(char *pBlk, ITypeInfoImpl *pTI, - char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, + const SLTG_TypeInfoTail *pTITail) { SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, NULL); } static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const SLTG_TypeInfoTail *pTITail) { WORD *pType; sltg_ref_lookup_t *ref_lookup = NULL; @@ -3198,7 +3202,7 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI, static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const SLTG_TypeInfoTail *pTITail) { sltg_ref_lookup_t *ref_lookup = NULL; if (pTIHeader->href_table != 0xffffffff) @@ -3222,15 +3226,15 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI, } static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI, - char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, + const SLTG_TypeInfoTail *pTITail) { SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, NULL); } static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI, char *pNameTable, SLTG_TypeInfoHeader *pTIHeader, - SLTG_TypeInfoTail *pTITail) + const SLTG_TypeInfoTail *pTITail) { sltg_ref_lookup_t *ref_lookup = NULL; if (pTIHeader->href_table != 0xffffffff)

1 0

Francois Gouget : winapi: Remove some dead code.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 088c30c79a68a2c77bd82a9b5e11ab835fde9865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=088c30c79a68a2c77bd82a9b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:03:33 2007 +0200 winapi: Remove some dead code. --- tools/winapi/c_parser.pm | 39 --------------------------------------- 1 files changed, 0 insertions(+), 39 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 270334f..37f0db3 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -2090,45 +2090,6 @@ sub parse_c_variable($$$$$$$) { # $output->write("$type: $name: '$_'\n"); - if(1 || $finished) { - # Nothing - } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$.*?$', \$_, \$line, \$column, \$match)) { - $type = "<type>"; - $name = "<name>"; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s* - (?:\*\s*)*(\w+|\s*\*?\s*\w+\s*\))\s*(?:\[[^\]]*\]|$[^$]*\))? - (?:,\s*(?:\*\s*)*(\w+)\s*(?:\[[^\]]*\])?)* - \s*(?:=|$)//sx) - { - $self->_update_c_position($&, \$line, \$column); - - $type = $1; - $name = $2; - - $type =~ s/\s//g; - $type =~ s/^struct/struct /; - } elsif(/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*((?:\*\s*)*)(\w+)\s*(?:=|$)/s) { - $self->_update_c_position($&, \$line, \$column); - - my $kind = $1; - my $_name= $2; - my $stars = $3; - $name = $4; - - if(defined($_name)) { - $type = "struct $_name { }"; - } else { - $type = "struct { }"; - } - - $stars =~ s/\s//g; - if($stars) { - $type .= " $type"; - } - } else { - return 0; - } - $$refcurrent = $_; $$refline = $line; $$refcolumn = $column;

1 0

Francois Gouget : atl: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 4eebfa5da9cb38887601dcddf045bcd870a46e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eebfa5da9cb38887601dcddf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 19:03:14 2007 +0200 atl: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9ce60f7..af42177 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -255,6 +255,7 @@ _ATL_OBJMAP_ENTRYW * _ATL_TERMFUNC * _ATL_WNDCLASSINFOW * _AtlCreateWndData * +ATL_PROPMAP_ENTRY * BSTR * CLSID * DLGPROC @@ -266,6 +267,7 @@ ITypeLib ** IUnknown * IUnknown ** LPDWORD +LPSTREAM LPVOID * REFCLSID REFIID

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 5266e579751664cbe341e46f65342ffe572fe6b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5266e579751664cbe341e46f6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 31 18:57:34 2007 +0200 Assorted spelling fixes. --- dlls/advapi32/tests/security.c | 2 +- dlls/advapi32/tests/service.c | 14 +++++++------- dlls/comdlg32/filedlg31.c | 2 +- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/viewport.c | 8 ++++---- dlls/gdi32/tests/font.c | 6 +++--- dlls/kernel32/tests/path.c | 4 ++-- dlls/netapi32/access.c | 2 +- dlls/shell32/shlfileop.c | 8 ++++---- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/winecoreaudio.drv/audio.c | 2 +- dlls/wined3d/drawprim.c | 4 ++-- 12 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5266e579751664cbe341e…

1 0

Maarten Lankhorst : dsound: Add a registry setting for hel buffer length.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 7fcce036daa5514162d15fa33ffde255c6301977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcce036daa5514162d15fa33… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 30 16:20:08 2007 +0200 dsound: Add a registry setting for hel buffer length. --- dlls/dsound/dsound_main.c | 7 +++++++ dlls/dsound/dsound_private.h | 2 +- dlls/dsound/primary.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index de849fe..497fa15 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +#define DS_HEL_BUFLEN 0x8000 /* HEL: The buffer length of the emulated buffer */ #define DS_SND_QUEUE_MAX 10 /* max number of fragments to prebuffer, each fragment is approximately 10 ms long */ DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS]; @@ -87,6 +88,7 @@ HRESULT mmErr(UINT err) } int ds_emuldriver = 0; +int ds_hel_buflen = DS_HEL_BUFLEN; int ds_snd_queue_max = DS_SND_QUEUE_MAX; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; @@ -144,6 +146,9 @@ void setup_dsound_options(void) if (!get_config_key( hkey, appkey, "EmulDriver", buffer, MAX_PATH )) ds_emuldriver = strcmp(buffer, "N"); + if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) + ds_hel_buflen = atoi(buffer); + if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) ds_snd_queue_max = atoi(buffer); @@ -175,6 +180,8 @@ void setup_dsound_options(void) if (ds_emuldriver) WARN("ds_emuldriver = %d (default=0)\n",ds_emuldriver); + if (ds_hel_buflen != DS_HEL_BUFLEN) + WARN("ds_hel_buflen = %d (default=%d)\n",ds_hel_buflen ,DS_HEL_BUFLEN); if (ds_snd_queue_max != DS_SND_QUEUE_MAX) WARN("ds_snd_queue_max = %d (default=%d)\n",ds_snd_queue_max ,DS_SND_QUEUE_MAX); if (ds_hw_accel != DS_HW_ACCEL_FULL) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index f55f46d..98575e3 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -23,7 +23,6 @@ #define DS_TIME_RES 2 /* Resolution of multimedia timer */ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ -#define DS_HEL_BUFLEN 0x8000 /* HEL: The buffer length of the emulated buffer */ #define DS_HEL_FRAGS 0x10 /* HEL only: number of waveOut fragments in primary buffer * (changing this won't help you) */ @@ -34,6 +33,7 @@ #define DS_HW_ACCEL_EMULATION 3 extern int ds_emuldriver; +extern int ds_hel_buflen; extern int ds_snd_queue_max; extern int ds_hw_accel; extern int ds_default_playback; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7b7b464..dfcf107 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -88,7 +88,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* on original windows, the buffer it set to a fixed size, no matter what the settings are. on windows this size is always fixed (tested on win-xp) */ - buflen = DS_HEL_BUFLEN; + buflen = ds_hel_buflen; TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer);

1 0

Maarten Lankhorst : dsound: Get rid of DS_HEL_FRAGS.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 60f4db034521c57ce7d418511cd604849d0f72c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60f4db034521c57ce7d418511… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 30 16:44:50 2007 +0200 dsound: Get rid of DS_HEL_FRAGS. --- dlls/dsound/dsound_private.h | 7 +-- dlls/dsound/mixer.c | 8 ++-- dlls/dsound/primary.c | 113 ++++++++++++++++++++--------------------- 3 files changed, 61 insertions(+), 67 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 98575e3..91ac107 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -23,9 +23,6 @@ #define DS_TIME_RES 2 /* Resolution of multimedia timer */ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ -#define DS_HEL_FRAGS 0x10 /* HEL only: number of waveOut fragments in primary buffer - * (changing this won't help you) */ - /* direct sound hardware acceleration levels */ #define DS_HW_ACCEL_FULL 0 /* default on Windows 98 */ #define DS_HW_ACCEL_STANDARD 1 /* default on Windows 2000 */ @@ -83,8 +80,8 @@ struct DirectSoundDevice DWORD priolevel; PWAVEFORMATEX pwfx; HWAVEOUT hwo; - LPWAVEHDR pwave[DS_HEL_FRAGS]; - UINT timerID, pwplay, pwqueue, prebuf; + LPWAVEHDR pwave; + UINT timerID, pwplay, pwqueue, prebuf, helfrags; DWORD fraglen; PIDSDRIVERBUFFER hwbuf; LPBYTE buffer; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index d927df9..6390584 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -753,7 +753,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) TRACE("(%p)\n", device); /* calculate the current wave frag position */ - wave_fragpos = (device->pwplay + device->pwqueue) % DS_HEL_FRAGS; + wave_fragpos = (device->pwplay + device->pwqueue) % device->helfrags; /* calculte the current wave write position */ wave_writepos = wave_fragpos * device->fraglen; @@ -787,9 +787,9 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) /* queue up the new buffers */ for(i=0; i<prebuf_frags; i++){ TRACE("queueing wave buffer %i\n", wave_fragpos); - waveOutWrite(device->hwo, device->pwave[wave_fragpos], sizeof(WAVEHDR)); + waveOutWrite(device->hwo, &device->pwave[wave_fragpos], sizeof(WAVEHDR)); wave_fragpos++; - wave_fragpos %= DS_HEL_FRAGS; + wave_fragpos %= device->helfrags; } /* **** */ @@ -1030,7 +1030,7 @@ void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, D /* update playpos */ device->pwplay++; - device->pwplay %= DS_HEL_FRAGS; + device->pwplay %= device->helfrags; /* sanity */ if(device->pwqueue == 0){ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index dfcf107..0b7986f 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -39,31 +39,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); static void DSOUND_RecalcPrimary(DirectSoundDevice *device) { DWORD nBlockAlign; + DWORD fraglen; TRACE("(%p)\n", device); nBlockAlign = device->pwfx->nBlockAlign; - if (device->hwbuf) { - DWORD fraglen; - /* Alsa doesn't have continuous buffers, instead it has buffers with power of 2, - * If DS_TIME_DEL is about 10 ms, 512 * nBlockAlign is roughly correct */ - fraglen = 512 * nBlockAlign; - - /* Compensate for only being roughly accurate */ - if (device->pwfx->nSamplesPerSec <= 26000) - fraglen /= 2; - - if (device->pwfx->nSamplesPerSec <= 12000) - fraglen /= 2; - - if (device->pwfx->nSamplesPerSec >= 80000) - fraglen *= 2; - - /* reduce fragment size until an integer number of them fits in the buffer */ - /* (FIXME: this may or may not be a good idea) */ - while (device->buflen % fraglen) fraglen -= nBlockAlign; - device->fraglen = fraglen; - TRACE("fraglen=%d\n", device->fraglen); - } + /* Alsa doesn't have continuous buffers, instead it has buffers with power of 2, + * If DS_TIME_DEL is about 10 ms, 512 * nBlockAlign is roughly correct */ + fraglen = 512 * nBlockAlign; + + /* Compensate for only being roughly accurate */ + if (device->pwfx->nSamplesPerSec <= 26000) + fraglen /= 2; + + if (device->pwfx->nSamplesPerSec <= 12000) + fraglen /= 2; + + if (device->pwfx->nSamplesPerSec >= 80000) + fraglen *= 2; + + /* If in emulation mode, reduce fragment size until an integer number of them fits in the buffer */ + if (!device->driver) + while (device->buflen % fraglen) + fraglen -= nBlockAlign; + device->fraglen = fraglen; + device->helfrags = device->buflen / fraglen; + TRACE("fraglen=%d helfrags=%d\n", device->fraglen, device->helfrags); + if (device->hwbuf && device->drvdesc.dwFlags & DSDDESC_DONTNEEDWRITELEAD) device->writelead = 0; else @@ -79,6 +80,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* are we using waveOut stuff? */ if (!device->driver) { LPBYTE newbuf; + LPWAVEHDR headers = NULL; DWORD buflen; HRESULT merr = DS_OK; /* Start in pause mode, to allow buffers to get filled */ @@ -89,6 +91,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) /* on original windows, the buffer it set to a fixed size, no matter what the settings are. on windows this size is always fixed (tested on win-xp) */ buflen = ds_hel_buflen; + buflen -= ds_hel_buflen % device->pwfx->nBlockAlign; TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); @@ -98,6 +101,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) else newbuf = HeapAlloc(GetProcessHeap(),0,buflen); + if (newbuf == NULL) { ERR("failed to allocate primary buffer\n"); merr = DSERR_OUTOFMEMORY; @@ -108,27 +112,38 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->buffer = newbuf; device->buflen = buflen; } - if (device->buffer) { + + DSOUND_RecalcPrimary(device); + if (device->pwave) + headers = HeapReAlloc(GetProcessHeap(),0,device->pwave, device->helfrags * sizeof(WAVEHDR)); + else + headers = HeapAlloc(GetProcessHeap(),0,device->helfrags * sizeof(WAVEHDR)); + + if (!headers) { + ERR("failed to allocate wave headers\n"); + merr = DSERR_OUTOFMEMORY; + } + else if (device->buffer) { unsigned c; - device->fraglen = device->buflen / DS_HEL_FRAGS; + device->pwave = headers; /* sanity */ - if(device->buflen % DS_HEL_FRAGS){ - ERR("Bad DS_HEL_FRAGS resolution\n"); + if(device->buflen % device->helfrags){ + ERR("Bad helfrags resolution\n"); } /* prepare fragment headers */ - for (c=0; c<DS_HEL_FRAGS; c++) { - device->pwave[c]->lpData = (char*)device->buffer + c*device->fraglen; - device->pwave[c]->dwBufferLength = device->fraglen; - device->pwave[c]->dwUser = (DWORD)device; - device->pwave[c]->dwFlags = 0; - device->pwave[c]->dwLoops = 0; - err = mmErr(waveOutPrepareHeader(device->hwo,device->pwave[c],sizeof(WAVEHDR))); + for (c=0; c<device->helfrags; c++) { + device->pwave[c].lpData = (char*)device->buffer + c*device->fraglen; + device->pwave[c].dwBufferLength = device->fraglen; + device->pwave[c].dwUser = (DWORD)device; + device->pwave[c].dwFlags = 0; + device->pwave[c].dwLoops = 0; + err = mmErr(waveOutPrepareHeader(device->hwo,&device->pwave[c],sizeof(WAVEHDR))); if (err != DS_OK) { while (c--) - waveOutUnprepareHeader(device->hwo,device->pwave[c],sizeof(WAVEHDR)); + waveOutUnprepareHeader(device->hwo,&device->pwave[c],sizeof(WAVEHDR)); break; } } @@ -160,6 +175,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) device->mixpos = 0; FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); } + DSOUND_RecalcPrimary(device); return err; } @@ -178,8 +194,8 @@ static void DSOUND_PrimaryClose(DirectSoundDevice *device) /* **** */ device->pwqueue = (DWORD)-1; /* resetting queues */ waveOutReset(device->hwo); - for (c=0; c<DS_HEL_FRAGS; c++) - waveOutUnprepareHeader(device->hwo, device->pwave[c], sizeof(WAVEHDR)); + for (c=0; c<device->helfrags; c++) + waveOutUnprepareHeader(device->hwo, &device->pwave[c], sizeof(WAVEHDR)); /* **** */ EnterCriticalSection(&(device->mixlock)); @@ -212,21 +228,6 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) return err; } } - if (!device->hwbuf) { - /* Allocate memory for HEL buffer headers */ - unsigned c; - for (c=0; c<DS_HEL_FRAGS; c++) { - device->pwave[c] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEHDR)); - if (!device->pwave[c]) { - /* Argh, out of memory */ - while (c--) { - HeapFree(GetProcessHeap(),0,device->pwave[c]); - } - WARN("out of memory\n"); - return DSERR_OUTOFMEMORY; - } - } - } err = DSOUND_PrimaryOpen(device); @@ -235,8 +236,6 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) return err; } - /* calculate fragment size and write lead */ - DSOUND_RecalcPrimary(device); device->state = STATE_STOPPED; return DS_OK; } @@ -255,10 +254,8 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) device->hwbuf = 0; } } else { - unsigned c; - for (c=0; c<DS_HEL_FRAGS; c++) { - HeapFree(GetProcessHeap(),0,device->pwave[c]); - } + if (device->pwave) + HeapFree(GetProcessHeap(),0,device->pwave); } HeapFree(GetProcessHeap(),0,device->pwfx); device->pwfx=NULL; @@ -459,8 +456,8 @@ HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) goto done; } /* FIXME: should we set err back to DS_OK in all cases ? */ + DSOUND_RecalcPrimary(device); } - DSOUND_RecalcPrimary(device); if (nSamplesPerSec != device->pwfx->nSamplesPerSec) { IDirectSoundBufferImpl** dsb = device->buffers;

1 0