November 2012 - Wine-devel - list.winehq.org

Why is services.exe crashing like this?
by Roger Cruz 22 Nov '12

22 Nov '12

I finally was able to figure out how to attach the debugger to determine why services.exe did not start and I can clearly see now that the oem_table is NULL. It should have been set by LOCALE_Init() when called from kernel32's init function. However, if you look at the stack trace here, Wine hasn't even gotten to that point. As part of NTDLL's init, it is setting the DLL callback function which causes it to invoke the callback right away..as seen in the stack trace, it is making a function call which requires the oem_table to be set. Does anyone have any ideas why this is happening? Why doesn't it happen when other programs such as wineboot and explorer.exe are started? It only happens with services.exe. I am using Wine 1.4.2 Roger R. Cruz Program received signal SIGSEGV, Segmentation fault. 0x4003c304 in wine_cp_wcstombs (table=0x0, flags=0x0, src=0xbecc5648, srclen=0xc, dst=0x0, dstlen=0x0, defchar=0x0, used=0x0) at /home/rcruz/sandbox/wine.git/libs/wine/wctomb.c:447 447 if (table->info.char_size == 1) #0 0x4003c304 in wine_cp_wcstombs (table=0x0, flags=0x0, src=0xbecc5648, srclen=0xc, dst=0x0, dstlen=0x0, defchar=0x0, used=0x0) at /home/rcruz/sandbox/wine.git/libs/wine/wctomb.c:447 #1 0x7bc76f94 in RtlUnicodeStringToOemSize (str=0xbecc5688) at /home/rcruz/sandbox/wine.git/dlls/ntdll/rtlstr.c:1356 #2 0x7bc76a18 in RtlUpcaseUnicodeStringToCountedOemString (oem=0xbecc56b0, uni=0xbecc5784, doalloc=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/rtlstr.c:1161 #3 0x7bc65604 in RtlIsNameLegalDOS8Dot3 (unicode=0xbecc5784, oem=0xbecc56b0, spaces=0xbecc5783 "{\030") at /home/rcruz/sandbox/wine.git/dlls/ntdll/path.c:888 #4 0x7bc361bc in find_file_in_dir ( unix_name=0x42952ae0 "/data/winehome/dosdevices/c:/windows/system32", pos=0x36, name=0x42952aa8, length=0xc, check_case=0x0, is_win_dir=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2125 #5 0x7bc3856c in lookup_unix_name (name=0x42952aa8, name_len=0x0, buffer=0xbecc5cac, unix_len=0x145, pos=0x35, disposition=0x1, check_case=0x0) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2753 #6 0x7bc393b4 in wine_nt_to_unix_file_name (nameW=0xbecc5ed4, unix_name_ret=0xbecc5e5c, disposition=0x1, check_case=0x0) ---Type <return> to continue, or q <return> to quit--- at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2978 #7 0x7bc3888c in nt_to_unix_file_name_attr (attr=0xbecc5e90, unix_name_ret=0xbecc5e5c, disposition=0x1) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:2817 #8 0x7bc43120 in NtQueryAttributesFile (attr=0xbecc5e90, info=0xbecc5ea8) at /home/rcruz/sandbox/wine.git/dlls/ntdll/file.c:2250 #9 0x7bc397b8 in RtlDoesFileExists_U (file_name=0x42952a20) at /home/rcruz/sandbox/wine.git/dlls/ntdll/directory.c:3040 #10 0x7bc6412c in RtlDosSearchPath_U (paths=0x42a704ba, search=0xbecc62e4, ext=0x0, buffer_size=0x40, buffer=0xbecc60c0, file_part=0xbecc5fc4) at /home/rcruz/sandbox/wine.git/dlls/ntdll/path.c:490 #11 0x7bc54848 in find_dll_file (load_path=0x42a704ba, libname=0xbecc62e4, filename=0xbecc60c0, size=0xbecc60bc, pwm=0xbecc6330, handle=0xbecc60b8) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:2251 #12 0x7bc550c8 in load_dll (load_path=0x42a704ba, libname=0xbecc62e4, flags=0x0, pwm=0xbecc6330) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:2354 #13 0x7bc4f1c0 in import_dll (module=0x7bc10000, descr=0x7bcca5dc, load_path=0x42a704ba) at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:807 #14 0x7bc502d0 in fixup_imports (wm=0x42952970, load_path=0x42a704ba) ---Type <return> to continue, or q <return> to quit--- at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:1057 #15 0x7bc52c34 in load_builtin_callback (module=0x7bc10000, filename=0x7bca58b0 "ntdll.dll") at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:1836 #16 0x40034008 in wine_dll_set_callback ( load=0x7bc527e8 <load_builtin_callback>) at /home/rcruz/sandbox/wine.git/libs/wine/loader.c:537 #17 0x7bc5874c in __wine_process_init () at /home/rcruz/sandbox/wine.git/dlls/ntdll/loader.c:3353 #18 0x40034694 in wine_init (argc=0x2, argv=0xbecc6b84, error=0xbecc6620 "", error_size=0x400) at /home/rcruz/sandbox/wine.git/libs/wine/loader.c:831 #19 0x00008870 in main (argc=0x2, argv=0xbecc6b84) at /home/rcruz/sandbox/wine.git/loader/main.c:230

1 1

Re: [PATCH v4] dsound: create a primary_pwfx separately from pwfx
by Andrew Eikum 21 Nov '12

21 Nov '12

Yeah, that fixes the problem. This patch looks good to me now. Andrew On Fri, Nov 16, 2012 at 08:35:51PM +0100, Maarten Lankhorst wrote: > I promised I would never touch it, but then I wanted to play skyrim > > V2: Limit channels to 2 in primary if not in writeprimary mode > V3: Split off DSOUND_WaveFormat to its own function sooner. > V4: Fix accidental revert of device->buflen increase. It was supposed to wait until rework in patch 3. > --- > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index e5b0e3c..ac85ba2 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -305,21 +305,36 @@ static HRESULT WINAPI IDirectSound8Impl_SetCooperativeLevel(IDirectSound8 *iface > DWORD level) > { > IDirectSoundImpl *This = impl_from_IDirectSound8(iface); > + DirectSoundDevice *device = This->device; > + DWORD oldlevel; > + HRESULT hr = S_OK; > > TRACE("(%p,%p,%s)\n", This, hwnd, dumpCooperativeLevel(level)); > > - if (!This->device) { > + if (!device) { > WARN("not initialized\n"); > return DSERR_UNINITIALIZED; > } > > if (level == DSSCL_PRIORITY || level == DSSCL_EXCLUSIVE) { > WARN("level=%s not fully supported\n", > - level == DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); > + level==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); > } > > - This->device->priolevel = level; > - return DS_OK; > + RtlAcquireResourceExclusive(&device->buffer_list_lock, TRUE); > + EnterCriticalSection(&device->mixlock); > + oldlevel = device->priolevel; > + device->priolevel = level; > + if ((level == DSSCL_WRITEPRIMARY) != (oldlevel == DSSCL_WRITEPRIMARY)) { > + hr = DSOUND_ReopenDevice(device, level == DSSCL_WRITEPRIMARY); > + if (FAILED(hr)) > + device->priolevel = oldlevel; > + else > + DSOUND_PrimaryOpen(device); > + } > + LeaveCriticalSection(&device->mixlock); > + RtlReleaseResource(&device->buffer_list_lock); > + return hr; > } > > static HRESULT WINAPI IDirectSound8Impl_Compact(IDirectSound8 *iface) > @@ -612,20 +627,24 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) > device->guid = GUID_NULL; > > /* Set default wave format (may need it for waveOutOpen) */ > - device->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEX)); > - if (device->pwfx == NULL) { > + device->pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEXTENSIBLE)); > + device->primary_pwfx = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(WAVEFORMATEXTENSIBLE)); > + if (!device->pwfx || !device->primary_pwfx) { > WARN("out of memory\n"); > + HeapFree(GetProcessHeap(),0,device->primary_pwfx); > + HeapFree(GetProcessHeap(),0,device->pwfx); > HeapFree(GetProcessHeap(),0,device); > return DSERR_OUTOFMEMORY; > } > > device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > - device->pwfx->nSamplesPerSec = ds_default_sample_rate; > - device->pwfx->wBitsPerSample = ds_default_bits_per_sample; > + device->pwfx->nSamplesPerSec = 22050; > + device->pwfx->wBitsPerSample = 8; > device->pwfx->nChannels = 2; > device->pwfx->nBlockAlign = device->pwfx->wBitsPerSample * device->pwfx->nChannels / 8; > device->pwfx->nAvgBytesPerSec = device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign; > device->pwfx->cbSize = 0; > + memcpy(device->primary_pwfx, device->pwfx, sizeof(*device->pwfx)); > > InitializeCriticalSection(&(device->mixlock)); > device->mixlock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": DirectSoundDevice.mixlock"); > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..3c47423 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -93,8 +93,6 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; > /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -151,19 +149,11 @@ void setup_dsound_options(void) > ds_snd_queue_max = atoi(buffer); > > > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 247f229..62656a5 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -32,9 +32,6 @@ > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > /***************************************************************************** > * Predeclare the interface implementation structures > @@ -72,8 +69,8 @@ struct DirectSoundDevice > GUID guid; > DSCAPS drvcaps; > DWORD priolevel; > - PWAVEFORMATEX pwfx; > - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf, helfrags; > + PWAVEFORMATEX pwfx, primary_pwfx; > + UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; > DWORD fraglen; > LPBYTE buffer; > DWORD writelead, buflen, state, playpos, mixpos; > @@ -211,6 +208,7 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos) DECLSPEC_HIDDEN; > LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; > HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; > +HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, > const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; > void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; > diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c > index 264d64d..84e029b 100644 > --- a/dlls/dsound/mixer.c > +++ b/dlls/dsound/mixer.c > @@ -112,6 +112,7 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) > TRACE("(%p)\n",dsb); > > pwfxe = (WAVEFORMATEXTENSIBLE *) dsb->pwfx; > + dsb->freqAdjust = (float)dsb->freq / dsb->device->pwfx->nSamplesPerSec; > > if ((pwfxe->Format.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) || ((pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) > && (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)))) > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 8da12e2..bf76dec 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -58,10 +58,99 @@ static DWORD DSOUND_fraglen(DirectSoundDevice *device) > return ret; > } > > +static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, > + BOOL forcewave, WAVEFORMATEX **wfx) > +{ > + WAVEFORMATEXTENSIBLE *retwfe = NULL; > + WAVEFORMATEX *w; > + HRESULT hr; > + > + if (!forcewave) { > + WAVEFORMATEXTENSIBLE *mixwfe; > + hr = IAudioClient_GetMixFormat(client, (WAVEFORMATEX**)&mixwfe); > + > + if (FAILED(hr)) > + return hr; > + > + if (mixwfe->Format.nChannels > 2) { > + static int once; > + if (!once++) > + FIXME("Limiting channels to 2 due to lack of multichannel support\n"); > + > + mixwfe->Format.nChannels = 2; > + mixwfe->Format.nBlockAlign = mixwfe->Format.nChannels * mixwfe->Format.wBitsPerSample / 8; > + mixwfe->Format.nAvgBytesPerSec = mixwfe->Format.nSamplesPerSec * mixwfe->Format.nBlockAlign; > + } > + > + if (!IsEqualGUID(&mixwfe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)) { > + WAVEFORMATEXTENSIBLE testwfe = *mixwfe; > + > + testwfe.SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + testwfe.Format.wBitsPerSample = 32; > + testwfe.Format.nBlockAlign = testwfe.Format.nChannels * testwfe.Format.wBitsPerSample / 8; > + testwfe.Format.nAvgBytesPerSec = testwfe.Format.nSamplesPerSec * testwfe.Format.nBlockAlign; > + testwfe.Samples.wValidBitsPerSample = 0; > + > + if (FAILED(IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, &testwfe.Format, (WAVEFORMATEX**)&retwfe))) > + w = DSOUND_CopyFormat(&mixwfe->Format); > + else if (retwfe) > + w = DSOUND_CopyFormat(&retwfe->Format); > + else > + w = DSOUND_CopyFormat(&testwfe.Format); > + CoTaskMemFree(retwfe); > + retwfe = NULL; > + } else > + w = DSOUND_CopyFormat(&mixwfe->Format); > + CoTaskMemFree(mixwfe); > + } else if (device->primary_pwfx->wFormatTag == WAVE_FORMAT_PCM || > + device->primary_pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + WAVEFORMATEX *wi = device->primary_pwfx; > + WAVEFORMATEXTENSIBLE *wfe; > + > + /* Convert to WAVEFORMATEXTENSIBLE */ > + w = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); > + wfe = (WAVEFORMATEXTENSIBLE*)w; > + if (!wfe) > + return DSERR_OUTOFMEMORY; > + > + wfe->Format = *wi; > + w->wFormatTag = WAVE_FORMAT_EXTENSIBLE; > + w->cbSize = sizeof(*wfe) - sizeof(*w); > + w->nBlockAlign = w->nChannels * w->wBitsPerSample / 8; > + w->nAvgBytesPerSec = w->nSamplesPerSec * w->nBlockAlign; > + > + wfe->dwChannelMask = 0; > + wfe->Samples.wValidBitsPerSample = 0; > + if (wi->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + w->wBitsPerSample = 32; > + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; > + } else > + wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > + } else > + w = DSOUND_CopyFormat(device->primary_pwfx); > + > + if (!w) > + return DSERR_OUTOFMEMORY; > + > + hr = IAudioClient_IsFormatSupported(client, AUDCLNT_SHAREMODE_SHARED, w, (WAVEFORMATEX**)&retwfe); > + if (retwfe) { > + memcpy(w, retwfe, sizeof(WAVEFORMATEX) + retwfe->Format.cbSize); > + CoTaskMemFree(retwfe); > + } > + if (FAILED(hr)) { > + WARN("IsFormatSupported failed: %08x\n", hr); > + HeapFree(GetProcessHeap(), 0, w); > + return hr; > + } > + *wfx = w; > + return S_OK; > +} > + > HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > { > UINT prebuf_frames; > REFERENCE_TIME prebuf_rt; > + WAVEFORMATEX *wfx = NULL; > HRESULT hres; > > TRACE("(%p, %d)\n", device, forcewave); > @@ -85,11 +174,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > > hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, > CLSCTX_INPROC_SERVER, NULL, (void **)&device->client); > - if(FAILED(hres)){ > + if(FAILED(hres)) { > WARN("Activate failed: %08x\n", hres); > return hres; > } > > + hres = DSOUND_WaveFormat(device, device->client, forcewave, &wfx); > + if (FAILED(hres)) { > + IAudioClient_Release(device->client); > + device->client = NULL; > + return hres; > + } > + HeapFree(GetProcessHeap(), 0, device->pwfx); > + device->pwfx = wfx; > + > prebuf_frames = device->prebuf * DSOUND_fraglen(device) / device->pwfx->nBlockAlign; > prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; > > @@ -139,9 +237,11 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > return S_OK; > } > > -static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > +HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > { > + IDirectSoundBufferImpl** dsb = device->buffers; > LPBYTE newbuf; > + DWORD i; > > TRACE("(%p)\n", device); > > @@ -157,9 +257,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > device->buflen -= device->buflen % device->pwfx->nBlockAlign; > } > > - device->helfrags = device->buflen / device->fraglen; > - > - device->mix_buffer_len = ((device->prebuf * device->fraglen) / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); > + HeapFree(GetProcessHeap(), 0, device->mix_buffer); > + device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float); > device->mix_buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device->mix_buffer_len); > if (!device->mix_buffer) > return DSERR_OUTOFMEMORY; > @@ -183,8 +282,8 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > > device->buffer = newbuf; > > - TRACE("buflen: %u, fraglen: %u, helfrags: %u, mix_buffer_len: %u\n", > - device->buflen, device->fraglen, device->helfrags, device->mix_buffer_len); > + TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n", > + device->buflen, device->fraglen, device->mix_buffer_len); > > if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > @@ -196,8 +295,22 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) > > FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0); > FillMemory(device->mix_buffer, device->mix_buffer_len, 0); > - device->playing_offs_bytes = device->in_mmdev_bytes = device->playpos = device->mixpos = 0; > - return DS_OK; > + device->playpos = 0; > + > + if (device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > + (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) > + device->normfunction = normfunctions[4]; > + else > + device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; > + > + for (i = 0; i < device->nrofbuffers; i++) { > + RtlAcquireResourceExclusive(&dsb[i]->lock, TRUE); > + DSOUND_RecalcFormat(dsb[i]); > + RtlReleaseResource(&dsb[i]->lock); > + } > + > + return DS_OK; > } > > > @@ -249,6 +362,7 @@ HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) > HeapFree(GetProcessHeap(), 0, device->primary); > device->primary = NULL; > > + HeapFree(GetProcessHeap(),0,device->primary_pwfx); > HeapFree(GetProcessHeap(),0,device->pwfx); > device->pwfx=NULL; > > @@ -338,8 +452,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) > > HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passed_fmt) > { > - HRESULT err = DSERR_BUFFERLOST; > - int i; > + HRESULT err = S_OK; > WAVEFORMATEX *old_fmt; > WAVEFORMATEXTENSIBLE *fmtex, *passed_fmtex = (WAVEFORMATEXTENSIBLE*)passed_fmt; > BOOL forced = (device->priolevel == DSSCL_WRITEPRIMARY); > @@ -377,169 +490,68 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe > RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); > EnterCriticalSection(&(device->mixlock)); > > - old_fmt = device->pwfx; > - device->pwfx = DSOUND_CopyFormat(passed_fmt); > - fmtex = (WAVEFORMATEXTENSIBLE *)device->pwfx; > - if (device->pwfx == NULL) { > - device->pwfx = old_fmt; > - old_fmt = NULL; > - err = DSERR_OUTOFMEMORY; > - goto done; > - } > + if (device->priolevel == DSSCL_WRITEPRIMARY) { > + old_fmt = device->primary_pwfx; > + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); > + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; > + if (device->primary_pwfx == NULL) { > + err = DSERR_OUTOFMEMORY; > + goto out; > + } > > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ > - if(fmtex->Samples.wValidBitsPerSample == 0){ > + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && > + fmtex->Samples.wValidBitsPerSample == 0) { > TRACE("Correcting 0 valid bits per sample\n"); > fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; > } > - } > - > - DSOUND_PrimaryClose(device); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - /* requested format failed, so try others */ > - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT){ > - device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - } > - > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > - IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)){ > - fmtex->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - } > > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 16; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 8; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->nChannels = (passed_fmt->nChannels == 2) ? 1 : 2; > - device->pwfx->wBitsPerSample = passed_fmt->wBitsPerSample; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 32; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 16; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - device->pwfx->wBitsPerSample = 8; > - device->pwfx->nAvgBytesPerSec = passed_fmt->nSamplesPerSec * device->pwfx->nBlockAlign; > - device->pwfx->nBlockAlign = passed_fmt->nChannels * (device->pwfx->wBitsPerSample / 8); > - if(device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) > - fmtex->Samples.wValidBitsPerSample = device->pwfx->wBitsPerSample; > - err = DSOUND_ReopenDevice(device, FALSE); > - if(SUCCEEDED(err)) > - goto opened; > - > - WARN("No formats could be opened\n"); > - goto done; > - > -opened: > - err = DSOUND_PrimaryOpen(device); > - if (err != DS_OK) { > - WARN("DSOUND_PrimaryOpen failed\n"); > - goto done; > - } > - > - if (passed_fmt->nSamplesPerSec/100 != device->pwfx->nSamplesPerSec/100 && forced && device->buffer) > - { > DSOUND_PrimaryClose(device); > - device->pwfx->nSamplesPerSec = passed_fmt->nSamplesPerSec; > - err = DSOUND_ReopenDevice(device, TRUE); > - if (FAILED(err)) > - WARN("DSOUND_ReopenDevice(2) failed: %08x\n", err); > - else if (FAILED((err = DSOUND_PrimaryOpen(device)))) > - WARN("DSOUND_PrimaryOpen(2) failed: %08x\n", err); > - } > - > > - if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || > - (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && > - IsEqualGUID(&((WAVEFORMATEXTENSIBLE*)device->pwfx)->SubFormat, > - &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))) > - device->normfunction = normfunctions[4]; > - else > - device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1]; > - > - if (old_fmt->nSamplesPerSec != device->pwfx->nSamplesPerSec || > - old_fmt->wBitsPerSample != device->pwfx->wBitsPerSample || > - old_fmt->nChannels != device->pwfx->nChannels) { > - IDirectSoundBufferImpl** dsb = device->buffers; > - for (i = 0; i < device->nrofbuffers; i++, dsb++) { > - /* **** */ > - RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE); > + err = DSOUND_ReopenDevice(device, forced); > + if (FAILED(err)) { > + ERR("No formats could be opened\n"); > + goto done; > + } > > - (*dsb)->freqAdjust = (*dsb)->freq / (float)device->pwfx->nSamplesPerSec; > - DSOUND_RecalcFormat((*dsb)); > + err = DSOUND_PrimaryOpen(device); > + if (err != DS_OK) { > + ERR("DSOUND_PrimaryOpen failed\n"); > + goto done; > + } > > - RtlReleaseResource(&(*dsb)->lock); > - /* **** */ > +done: > + if (err != DS_OK) > + device->primary_pwfx = old_fmt; > + else > + HeapFree(GetProcessHeap(), 0, old_fmt); > + } else if (passed_fmt->wFormatTag == WAVE_FORMAT_PCM || > + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + /* Fill in "real" values to primary_pwfx */ > + WAVEFORMATEX *fmt = device->primary_pwfx; > + > + *fmt = *device->pwfx; > + fmtex = (void*)device->pwfx; > + > + if (IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT) && > + passed_fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT) { > + fmt->wFormatTag = WAVE_FORMAT_IEEE_FLOAT; > + } else { > + fmt->wFormatTag = WAVE_FORMAT_PCM; > + fmt->wBitsPerSample = 16; > } > + fmt->nBlockAlign = fmt->nChannels * fmt->wBitsPerSample / 8; > + fmt->nAvgBytesPerSec = fmt->nBlockAlign * fmt->nSamplesPerSec; > + fmt->cbSize = 0; > + } else { > + device->primary_pwfx = HeapReAlloc(GetProcessHeap(), 0, device->primary_pwfx, sizeof(*fmtex)); > + memcpy(device->primary_pwfx, device->pwfx, sizeof(*fmtex)); > } > > -done: > +out: > LeaveCriticalSection(&(device->mixlock)); > RtlReleaseResource(&(device->buffer_list_lock)); > /* **** */ > > - HeapFree(GetProcessHeap(), 0, old_fmt); > return err; > } > > @@ -834,11 +846,11 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV > DirectSoundDevice *device = This->device; > TRACE("(%p,%p,%d,%p)\n", iface, lpwf, wfsize, wfwritten); > > - size = sizeof(WAVEFORMATEX) + device->pwfx->cbSize; > + size = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize; > > if (lpwf) { /* NULL is valid */ > if (wfsize >= size) { > - CopyMemory(lpwf,device->pwfx,size); > + CopyMemory(lpwf,device->primary_pwfx,size); > if (wfwritten) > *wfwritten = size; > } else { > @@ -849,7 +861,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFormat(IDirectSoundBuffer *iface, WAV > } > } else { > if (wfwritten) > - *wfwritten = sizeof(WAVEFORMATEX) + device->pwfx->cbSize; > + *wfwritten = sizeof(WAVEFORMATEX) + device->primary_pwfx->cbSize; > else { > WARN("invalid parameter: wfwritten == NULL\n"); > return DSERR_INVALIDPARAM; > > >

1 0

Re: [1/2] windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream.
by Vincent Povirk 21 Nov '12

21 Nov '12

Series looks good to me.

1 0

Re: [PATCH 4/5] [kernel] Support opening of console for read (try 2)
by Alexandre Julliard 21 Nov '12

21 Nov '12

Ann and Jason Edmeades <jason(a)edmeades.me.uk> writes: > +BOOL WINAPI write_console_input( HANDLE handle, const INPUT_RECORD *buffer, > + DWORD count, LPDWORD written ) > +{ > + BOOL result = WriteConsoleInputW(handle, buffer, count, written); > + > + /* If this fails with access denied */ > + if (!result && GetLastError() == ERROR_ACCESS_DENIED) > + { > + HANDLE hConRW = CreateFileW(coninW, GENERIC_READ | GENERIC_WRITE, > + FILE_SHARE_READ, NULL, OPEN_EXISTING, > + FILE_ATTRIBUTE_NORMAL, 0); > + if (hConRW != INVALID_HANDLE_VALUE) > + { > + result = WriteConsoleInputW(hConRW, buffer, count, written); > + CloseHandle(hConRW); > + } That doesn't look right. There's no guarantee that the handle is for the current process console. -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: imm32: use SendMessage not PostMessage for the Default IME winproc
by Henri Verbeet 20 Nov '12

20 Nov '12

On 6 November 2012 15:41, Aric Stewart <aric(a)codeweavers.com> wrote: > > This allows the calling program to properly get the return codes from the messages when they need them. > Also prevent all of the calls for IME messages in that windproc from falling back through to DefWindowProc. > > for bug 32101 Can we have some tests for this, please? We already have a couple of known deadlocks involving imm32 message processing, and based on the amount of tests I'm not sure most of it is based on anything other than "It seemed like a good idea at the time.".

2 1

Re: [PATCH 2/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > - No change from try 4. > > --- > dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 156 insertions(+) Still no luck I'm afraid: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f usp10.c:1958: Test failed: wgBlank 0001 tmBreakChar 0020 usp10.c:1960: Test failed: wgDefault 0000, tmDefaultChar 001f etc. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail
by Frédéric Delanoy 20 Nov '12

20 Nov '12

On Mon, Nov 19, 2012 at 10:03 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > Existance of external environment variables should not cause > make test to fail, but it can cause extra lines in some of the > set commands if the test does not first clear them out. > > [Fixes bug 32087] > diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd > index a1a3c4a..3efcd2a 100644 > --- a/programs/cmd/tests/test_builtins.cmd > +++ b/programs/cmd/tests/test_builtins.cmd > @@ -239,6 +239,9 @@ set FOO= > > echo ------------ Testing 'set' ------------ > call :setError 0 > +rem Remove any FOO* BA* environment variables from shell before proceeding > +for /f "delims==" %%i in ('set ba') do set %%i= > +for /f "delims==" %%i in ('set foo') do set %%i= > set FOOBAR 2> nul > nul > echo %ErrorLevel% > set FOOBAR = baz IMHO it might be better to use variable names like WINE_xxx for tests involving "enumerations" to avoid needlessly altering the environment. (not that BAR, FOO or FOOBAR are likely to be already used environment variables) Frédéric

4 5

Re: wineqtdecoder: properly clean up splitter and loader threads on QTSplitter destruction
by Alexandre Julliard 20 Nov '12

20 Nov '12

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -495,9 +518,14 @@ static DWORD WINAPI QTSplitter_loading_thread(LPVOID data) > to try to minimize that. > */ > > - while(GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) > + while(This->pQTMovie && GetMovieLoadState(This->pQTMovie) < kMovieLoadStateComplete) > { > EnterCriticalSection(&This->csReceive); > + if (!This || !This->pQTMovie) > + { > + LeaveCriticalSection(&This->csReceive); > + return 0; > + } This doesn't make sense. The this pointer cannot become NULL, and the whole thing should most likely be inside the critical section. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 2/2] winmm: Fix handling of mmio file buffers.
by Alexandre Julliard 20 Nov '12

20 Nov '12

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > This fix bug 19566 and 32013. > --- > dlls/winmm/mmio.c | 31 +++++++++++++------------------ > dlls/winmm/tests/mmio.c | 16 ++++++++-------- > 2 files changed, 21 insertions(+), 26 deletions(-) It doesn't work on 64-bit: ../../../../wine/tools/runtest -q -P wine -M avifil32.dll -T ../../.. -p avifil32_test.exe.so ../../../../wine/dlls/avifil32/tests/api.c && touch api.ok wine: Unhandled page fault on read access to 0x00040000 at address 0x2b088aa9b1cb (thread 0022), starting debugger... Unhandled exception: page fault on read access to 0x00040000 in 64-bit code (0x00002b088aa9b1cb). Register dump: rip:00002b088aa9b1cb rsp:000000000022ef58 rbp:0000000000000000 eflags:00010216 ( R- -- I -A-P- ) rax:0000000000340270 rbx:000000000003c100 rcx:0000000000000d04 rdx:0000000045455246 rsi:0000000000040000 rdi:0000000000341a50 r8:0000000045455246 r9:0000000000000000 r10:0000000000340030 r11:0000000000008000 r12:0000000045455246 r13:00000000457954b6 r14:0000000045455246 r15:000000000003bfe0 Stack dump: 0x000000000022ef58: 00002b088c7d1cfb 0000000000000000 0x000000000022ef68: 0000000000000001 0000000000000005 0x000000000022ef78: 00002b088c7d19bd 5b5b5b5b5b5b5b5b 0x000000000022ef88: 5b5b5b5b5b5b5b5b 2020202020202020 0x000000000022ef98: 2020202020202020 0000000000202020 0x000000000022efa8: 0000000000000000 ffffffffffffffff 0x000000000022efb8: ffffffffffffffff 0000000000202020 0x000000000022efc8: 0000000020000000 000000ffffffffff 0x000000000022efd8: ff000000ffffff00 0000000000000000 0x000000000022efe8: 0000000000000000 0000000000000000 0x000000000022eff8: 0000000000000000 0000000000000000 0x000000000022f008: 0000000000000000 0000000000000000 Backtrace: =>0 0x00002b088aa9b1cb in libc.so.6 (+0x881cb) (0x0000000000000000) 1 0x00002b088c7d1cfb mmioRead+0x11a(hmmio=0x1, pch="", cch=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/winmm/../../../wine/dlls/winmm/mmio.c:779] in winmm (0x0000000000000000) 2 0x00002b088c35d774 ReadChunkIntoExtra+0xf3(extra=<is not available>, hmmio=0x1, lpck=0x22f1f0) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/extrachunk.c:134] in avifil32 (0x0000000000000000) 3 0x00002b088c35d8ce FindChunkAndKeepExtras+0xcd(extra=0x3bfe0, hmmio=0x1, lpck=0x22f1f0, lpckParent=0x22f190, flags=0x10) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/extrachunk.c:197] in avifil32 (0x0000000000000001) 4 0x00002b088c356037 IPersistFile_fnLoad+0xee6(iface=<is not available>, pszFileName=<is not available>, dwMode=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/avifile.c:1871] in avifil32 (0x000000000003bfe0) 5 0x00002b088c34a597 AVIFileOpenW+0x156(ppfile=0x22f6c8, szFile="C:\users\julliard\Temp\wine_avifil32_test.avi", uMode=0x20, lpHandler=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../include/objidl.h:5274] in avifil32 (0x000000000022f6c8) 6 0x00002b088c34a942 AVIFileOpenA+0x131(ppfile=0x22f6c8, szFile="C:\users\julliard\Temp\wine_avifil32_test.avi", uMode=0x20, lpHandler=(nil)) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/../../../wine/dlls/avifil32/api.c:218] in avifil32 (0x0000000000000000) 7 0x00002b088c12ea01 test_default_data+0xd0() [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/dlls/avifil32/tests/api.c:374] in avifil32_test (0x0000000000000000) 8 0x00002b088c12fd2e func_api+0x29d() [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/dlls/avifil32/tests/api.c:552] in avifil32_test (0x0000000000000000) 9 0x00002b088c130055 run_test+0x114(name=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/include/wine/test.h:557] in avifil32_test (0x00002b088c3320e0) 10 0x00002b088c12d101 main+0x110(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/avifil32/tests/../../../../wine/include/wine/test.h:627] in avifil32_test (0x00002b088ad94d90) 11 0x00002b088c130ae2 __wine_spec_exe_entry+0xa1(peb=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/winecrt0/../../../wine/dlls/winecrt0/exe_entry.c:36] in avifil32_test (0x00002b088a7c78f0) 12 0x000000007b874171 start_process+0xb0(peb=0x7fffffbef000) [/home/julliard/wine/build/obj-elf64/dlls/kernel32/../../../wine/dlls/kernel32/process.c:1052] in kernel32 (0x00002b088c130a40) 13 0x00002b088b02d9ae call_thread_func+0x6d(entry=0x7b8740c0, arg=0x7fffffbef000, frame=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/signal_x86_64.c:3230] in ntdll (0x00007fff7d40bed0) 14 0x00002b088b02709a call_thread_entry_point+0x29() in ntdll (0x00007fff7d40bed0) 15 0x00002b088aff8a66 start_process+0x15(kernel_start=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2653] in ntdll (0x00007fff7d40bed0) 16 0x00002b088a4a1283 wine_call_on_stack+0x12() in libwine.so.1 (0x00007fff7d40bed0) 17 0x00002b088a4a12d9 wine_switch_to_stack+0x8(func=<is not available>, arg=<is not available>, stack=<is not available>) [/home/julliard/wine/build/obj-elf64/libs/wine/../../../wine/libs/wine/port.c:59] in libwine.so.1 (0x00007fffffbef000) 18 0x00002b088affe510 LdrInitializeThunk+0x45f(kernel_start=0x7b8740c0, unknown2=<is not available>, unknown3=<is not available>, unknown4=<is not available>) [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2709] in ntdll (0x00007fffffbef000) 19 0x000000007b87a5fd __wine_kernel_init+0x90c() [/home/julliard/wine/build/obj-elf64/dlls/kernel32/../../../wine/dlls/kernel32/process.c:1255] in kernel32 (0x00002b088b28f980) 20 0x00002b088affed84 __wine_process_init+0x143() [/home/julliard/wine/build/obj-elf64/dlls/ntdll/../../../wine/dlls/ntdll/loader.c:2918] in ntdll (0x00007fff7d40d180) 21 0x00002b088a49f488 wine_init+0x297(argc=0x3, argv=0x7fff7d40d678, error="", error_size=0x400) [/home/julliard/wine/build/obj-elf64/libs/wine/../../../wine/libs/wine/loader.c:831] in libwine.so.1 (0x00007fff7d40d180) 22 0x000000007bf00da2 main+0x71(argc=0x3, argv=0x7fff7d40d678) [/home/julliard/wine/build/obj-elf64/loader/../../wine/loader/main.c:237] in <wine-loader> (0x00007fff7d40d678) 23 0x00002b088aa31ead __libc_start_main+0xfc(main=<is not available>, argc=<is not available>, ubp_av=<is not available>, init=<is not available>, fini=<is not available>, rtld_fini=<is not available>, stack_end=0x7fff7d40d668) [/home/aurel32/eglibc-sid/eglibc-2.13/csu/libc-start.c:228] in libc.so.6 (0x0000000000000000) 24 0x000000007bf00e9d _start+0x28() in <wine-loader> (0x0000000000000000) 0x00002b088aa9b1cb: repe movsq (%rsi),%es:(%rdi) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/4] [cmd] Add support for NUL in copy
by Marvin 19 Nov '12

19 Nov '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23016 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x53 position 0 in line 419 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 420 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 421 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 422 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on b.b [8]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 423 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on a.a [7]') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 424 (got 'Skipping file size check on NT4', wanted 'Passed: file size check on subdir\a.a [8]') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 866 (got 'h=%h i=a j=b k=c l=e m= o=%o', wanted 'h=%h i=a j=b k=c l=e m=%m o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 868 (got 'h=%h i=a j=b k=c l=d e f g m= n=%n o=%o', wanted 'h=%h i=a j=b k=c l=d e f g m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 869 (got 'h=%h i=a j=c k= l= m= n=%n o=%o', wanted 'h=%h i=a j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 870 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o') batch.c:312: Test failed: unexpected char 0x68 position 0 in line 871 (got 'h=%h i=b j=c k= l= m= n=%n o=%o', wanted 'h=%h i=b j=c k= l= m=%m n=%n o=%o')

1 0