- wine-devel - winehq.org

Re: [PATCH 1/2] kernel32: refine conditional variable test
by Marvin 29 Dec '12

29 Dec '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=23659 Your paranoid android. === WXPPROSP3 (32 bit sync) === sync.c:948: Test failed: ChangeTimerQueueTimer

1 0

Re: [PATCH] gdi32: Ensure a fixed-pitch full-width character has double width of a half-width character.
by Alexandre Julliard 28 Dec '12

28 Dec '12

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > --- > dlls/gdi32/freetype.c | 20 +++++++++-- > dlls/gdi32/tests/font.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 102 insertions(+), 3 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok font.c:3755: Test failed: expected 19, got 0 (charset 128) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [3/9] server: Use the same object type for both ends of a named pipe. (try 2)
by Alexandre Julliard 28 Dec '12

28 Dec '12

Adam Martinson <adam.r.martinson(a)gmail.com> writes: > From 8eb230b505ddd986b689caf96510fbe016d721a7 Mon Sep 17 00:00:00 2001 > From: Adam Martinson <adam.r.martinson(a)gmail.com> > Date: Thu, 20 Dec 2012 19:55:13 -0600 > Subject: [PATCH 3/9] server: Use the same object type for both ends of a named pipe. > > Makes either end of a named pipe is readable after the other has been closed. > (If the pipe has not been disconnected) This is still changing way too many things at once. Also, using an array for pipe ends doesn't make much sense, just use two variables. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] advapi32: do not use invalid pSD value (Coverity)
by Marvin 28 Dec '12

28 Dec '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=23641 Your paranoid android. === WNT4WSSP6 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 87 === W2KPROSP4 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === WXPPROSP3 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0 === W2K3R2SESP2 (32 bit service) === service.c:1859: Test failed: Expected ERROR_INSUFFICIENT_BUFFER, got 487 service.c:1862: Test failed: Expected QueryServiceObjectSecurity to succeed: result 0

1 0

Re: [9/9] server: Add support for named pipe message mode.
by Daniel Jelinski 27 Dec '12

27 Dec '12

Hello, FWIW, Adam Martinson's named pipe series looks good to me. I tested it with MS SQL Server, which uses message mode pipes, and did not run into any problems. In current git I can't connect to server using named pipes, because as soon as SetNamedPipeHandleState returns false, client application aborts. (However, just changing SNPHS to return true is enough to get it working). I don't think patches 3 and 9 of this series can be split much more, except maybe for moving asserts into a separate file. Yes, reviewing them may cause headaches. The series is supposed to fix bugs 17273 (patch 8/9) and 17195 (patch 9/9). AFAICT the author is willing to make any adjustments necessary to get the patches merged. Patches 1-5 should not cause any problems if applied without the following. Patches 6-8 may cause regressions if applied without patch 9. Regards, Daniel

1 0

Re: netstat: Initial implementation
by Alexandre Julliard 27 Dec '12

27 Dec '12

André Hentschel <nerv(a)dawncrow.de> writes: > + __ms_va_start(parms, format); > + len = vsprintfW(output_bufW, format, parms); > + __ms_va_end(parms); You can't mix vsprintfW and ms_va_list. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] windowscodecs: Implement ComponentFactory_CreateBitmapFromMemory.
by Vincent Povirk 27 Dec '12

27 Dec '12

I'm pretty sure CreateBitmapFromMemory copies the data rather than referencing existing data. On Thu, Dec 27, 2012 at 3:29 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/windowscodecs/bitmap.c | 31 +++++++++++++++++++++---------- > dlls/windowscodecs/imgfactory.c | 18 +++++++++++------- > dlls/windowscodecs/tests/bitmap.c | 5 ----- > dlls/windowscodecs/wincodecs_private.h | 1 + > 4 files changed, 33 insertions(+), 22 deletions(-) > > diff --git a/dlls/windowscodecs/bitmap.c b/dlls/windowscodecs/bitmap.c > index 520fdef..4d48651 100644 > --- a/dlls/windowscodecs/bitmap.c > +++ b/dlls/windowscodecs/bitmap.c > @@ -40,6 +40,7 @@ typedef struct BitmapImpl { > int palette_set; > LONG lock; /* 0 if not locked, -1 if locked for writing, count if locked for reading */ > BYTE *data; > + BOOL owndata; > UINT width, height; > UINT stride; > UINT bpp; > @@ -260,7 +261,8 @@ static ULONG WINAPI BitmapImpl_Release(IWICBitmap *iface) > if (This->palette) IWICPalette_Release(This->palette); > This->cs.DebugInfo->Spare[0] = 0; > DeleteCriticalSection(&This->cs); > - HeapFree(GetProcessHeap(), 0, This->data); > + if (This->owndata) > + HeapFree(GetProcessHeap(), 0, This->data); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -447,28 +449,37 @@ static const IWICBitmapVtbl BitmapImpl_Vtbl = { > }; > > HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) > { > HRESULT hr; > BitmapImpl *This; > - UINT bpp, stride, datasize; > - BYTE *data; > + UINT bpp; > > hr = get_pixelformat_bpp(pixelFormat, &bpp); > if (FAILED(hr)) return hr; > > - stride = (((bpp*uiWidth)+31)/32)*4; > - datasize = stride * uiHeight; > + if (!stride) stride = (((bpp*uiWidth)+31)/32)*4; > + if (!datasize) datasize = stride * uiHeight; > + > + if (datasize < stride * uiHeight) return WINCODEC_ERR_INSUFFICIENTBUFFER; > + if (stride < (((bpp*uiWidth)+31)/32)*4) return E_INVALIDARG; > > This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapImpl)); > - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > - if (!This || !data) > + if (!This) return E_OUTOFMEMORY; > + if (!data) > { > - HeapFree(GetProcessHeap(), 0, This); > - HeapFree(GetProcessHeap(), 0, data); > - return E_OUTOFMEMORY; > + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, datasize); > + if (!data) > + { > + HeapFree(GetProcessHeap(), 0, This); > + return E_OUTOFMEMORY; > + } > + This->owndata = TRUE; > } > + else > + This->owndata = FALSE; > > This->IWICBitmap_iface.lpVtbl = &BitmapImpl_Vtbl; > This->ref = 1; > diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c > index 54b390b..1d05ef5 100644 > --- a/dlls/windowscodecs/imgfactory.c > +++ b/dlls/windowscodecs/imgfactory.c > @@ -1,5 +1,6 @@ > /* > * Copyright 2009 Vincent Povirk for CodeWeavers > + * Copyright 2012 Dmitry Timoshkov > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -459,7 +460,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmap(IWICComponentFactory *iface, > { > TRACE("(%p,%u,%u,%s,%u,%p)\n", iface, uiWidth, uiHeight, > debugstr_guid(pixelFormat), option, ppIBitmap); > - return BitmapImpl_Create(uiWidth, uiHeight, pixelFormat, option, ppIBitmap); > + return BitmapImpl_Create(uiWidth, uiHeight, 0, 0, NULL, pixelFormat, option, ppIBitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFactory *iface, > @@ -506,7 +507,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto > } > > if (SUCCEEDED(hr)) > - hr = BitmapImpl_Create(width, height, &pixelformat, option, &result); > + hr = BitmapImpl_Create(width, height, 0, 0, NULL, &pixelformat, option, &result); > > if (SUCCEEDED(hr)) > { > @@ -576,12 +577,15 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSourceRect(IWICComponentF > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromMemory(IWICComponentFactory *iface, > - UINT uiWidth, UINT uiHeight, REFWICPixelFormatGUID pixelFormat, UINT cbStride, > - UINT cbBufferSize, BYTE *pbBuffer, IWICBitmap **ppIBitmap) > + UINT width, UINT height, REFWICPixelFormatGUID format, UINT stride, > + UINT size, BYTE *buffer, IWICBitmap **bitmap) > { > - FIXME("(%p,%u,%u,%s,%u,%u,%p,%p): stub\n", iface, uiWidth, uiHeight, > - debugstr_guid(pixelFormat), cbStride, cbBufferSize, pbBuffer, ppIBitmap); > - return E_NOTIMPL; > + TRACE("(%p,%u,%u,%s,%u,%u,%p,%p\n", iface, width, height, > + debugstr_guid(format), stride, size, buffer, bitmap); > + > + if (!stride || !size || !buffer || !bitmap) return E_INVALIDARG; > + > + return BitmapImpl_Create(width, height, stride, size, buffer, format, WICBitmapCacheOnLoad, bitmap); > } > > static HRESULT WINAPI ComponentFactory_CreateBitmapFromHBITMAP(IWICComponentFactory *iface, > diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c > index cec714b..3cdbffd 100644 > --- a/dlls/windowscodecs/tests/bitmap.c > +++ b/dlls/windowscodecs/tests/bitmap.c > @@ -436,27 +436,22 @@ static void test_CreateBitmapFromMemory(void) > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, 0, NULL, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 0, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 6, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 12, sizeof(data3x3), data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > 9, sizeof(data3x3) - 1, data3x3, &bitmap); > -todo_wine > ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "expected WINCODEC_ERR_INSUFFICIENTBUFFER, got %#x\n", hr); > > hr = IWICImagingFactory_CreateBitmapFromMemory(factory, 3, 3, &GUID_WICPixelFormat24bppBGR, > diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h > index 6857176..508bb2c 100644 > --- a/dlls/windowscodecs/wincodecs_private.h > +++ b/dlls/windowscodecs/wincodecs_private.h > @@ -45,6 +45,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* > extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; > > extern HRESULT BitmapImpl_Create(UINT uiWidth, UINT uiHeight, > + UINT stride, UINT datasize, BYTE *data, > REFWICPixelFormatGUID pixelFormat, WICBitmapCreateCacheOption option, > IWICBitmap **ppIBitmap) DECLSPEC_HIDDEN; > extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; > -- > 1.8.0.2 > > >

2 3

Re: netstat: Initial implementation
by Alexandre Julliard 27 Dec '12

27 Dec '12

André Hentschel <nerv(a)dawncrow.de> writes: > +STRINGTABLE > +{ > + IDS_TCP_UNKNOWN, "???" > + IDS_TCP_CLOSED, "CLOSED" > + IDS_TCP_LISTENING, "LISTENING" > + IDS_TCP_SYN_SENT, "SYN_SENT" > + IDS_TCP_SYN_RCVD, "SYN_RCVD" > + IDS_TCP_ESTABLISHED, "ESTABLISHED" > + IDS_TCP_FIN_WAIT1, "FIN_WAIT1" > + IDS_TCP_FIN_WAIT2, "FIN_WAIT2" > + IDS_TCP_CLOSE_WAIT, "CLOSE_WAIT" > + IDS_TCP_CLOSING, "CLOSING" > + IDS_TCP_LAST_ACK, "LAST_ACK" > + IDS_TCP_TIME_WAIT, "TIME_WAIT" > + IDS_TCP_DELETE_TCB, "DELETE_TCB" It's not useful to put these in resources, we don't want to have to translate them. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: msvcrt: Return error in stat function when path is specified with trailing slash character
by Marvin 27 Dec '12

27 Dec '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=23632 Your paranoid android. === WNT4WSSP6 (32 bit file) === file.c:1449: Test failed: stat returned 0 file.c:1450: Test failed: errno = -559038737 file.c:1514: Test failed: stat returned 0 file.c:1515: Test failed: errno = -559038737

1 0

Re: [PATCH] loader: Build with -fno-builtin.
by Austin English 26 Dec '12

26 Dec '12

On Mon, Dec 24, 2012 at 10:38 AM, Charles Davis <cdavis5x(a)gmail.com> wrote: > This prevents Clang from optimizing wld_memset() into a memset(3) call. > --- > loader/Makefile.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/loader/Makefile.in b/loader/Makefile.in > index 41d69c7..ece07c3 100644 > --- a/loader/Makefile.in > +++ b/loader/Makefile.in > @@ -1,4 +1,5 @@ > DEFS = -D__WINESRC__ $(EXTRADEFS) > +MODCFLAGS = -fno-builtin > > C_SRCS = \ > main.c \ > -- > 1.7.12.4 I can confirm it works. -- -Austin

1 0

Re: Aw: Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Dmitry Timoshkov 26 Dec '12

26 Dec '12

"Detlef Riekenberg" <wine.dev(a)web.de> wrote: > >> + /* win8: E_NOTIMPL */ > >> + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > > >A usual form for such comparisons is > >ok(hr == E_FAIL || hr == E_NOTIMPL /* win8 */, "got 0x%08x.\n", hr); > I disagree! > > Comments at the end of a line are ok, > but a comment in the middle /* broken */ of a line decrease /* ugly by design */ the readability > of the code /* not compiler related */ for humans/developers a lot and should be allowed > only for backwards compatibility. You are confusing a sentence and a set of statements. -- Dmitry.

1 0

Re: oledb32: Partial implementation of GetDataSource()
by Marvin 24 Dec '12

24 Dec '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=23600 Your paranoid android. === WVISTAADM (32 bit database) === database: unhandled exception c000001d at 0075006C === W2K8SE (32 bit database) === database: unhandled exception c0000005 at 00750064 === W7PRO (32 bit database) === database: unhandled exception c0000005 at 007500A7 === W7PROX64 (32 bit database) === database: unhandled exception c0000005 at 00750064 === TEST64_W7SP1 (32 bit database) === database: unhandled exception c0000005 at 00750064 === W7PROX64 (64 bit database) === Timeout === TEST64_W7SP1 (64 bit database) === Timeout

1 0

Re: msvcrt: Added _stricmp_l implementation
by Marvin 24 Dec '12

24 Dec '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=23596 Your paranoid android. === WNT4WSSP6 (32 bit string) === string.c:2462: Test failed: _stricmp returned -1 string.c:2464: Test failed: _stricmp returned 1 === W7PROX64 (64 bit string) === string.c:2448: Test failed: _stricmp returned -25 string.c:2450: Test failed: _stricmp returned 25 string.c:2452: Test failed: _stricmp returned -20 === TEST64_W7SP1 (64 bit string) === string.c:2448: Test failed: _stricmp returned -25 string.c:2450: Test failed: _stricmp returned 25 string.c:2452: Test failed: _stricmp returned -20

1 0

re: Clang static analyzer results / wine-1.5.19-186-g1cd0c4a
by Dan Kegel 22 Dec '12

22 Dec '12

I had a look at a couple warnings, e.g. file:///home/dank/Downloads/scan-build-2012-12-18-1/report-z07lcL.html#EndPath file:///home/dank/Downloads/scan-build-2012-12-18-1/report-9D2p5I.html#EndPath They're hard to follow, but mostly look like garbage :-( Too bad there's no web interface for marking them as checked. This one's real, but only affects a trace, and only if send fails: file:///home/dank/Downloads/scan-build-2012-12-18-1/report-RBGMAQ.html#EndPath

1 0

dsound: use event based threads, v2
by Joerg-Cyril.Hoehle＠t-systems.com 22 Dec '12

22 Dec '12

Maarten, > + hres = IAudioClient_GetStreamLatency(device->client, &period); > + device->sleeptime = period_ms * 5 / 2; > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); Although it's a minor point, as we're solely discussing the case of the timeout when mmdevapi doesn't call SetEvent, I wonder why you insist on using GetStreamLatency as the basis of your timeout computations instead of GetDevicePeriod. You know that wineXYZ.drv use the device period as the basis for their SetEvent, thus IMHO the timeout too should be based on it, instead of a GetStreamLatency we know next to nothing about. If you visit testbot jobs 23521 and 23514, you'll see that I've measured the event rates. Sadly, all testbot VMs report a GetStreamLatency of 10.6666ms too close to the DefaultPeriod of 10.0000ms to tell for sure which is used as the average period. W7 and w2k8 machines seem to use DefaultPeriod: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 10.004ms render.c:2206: event average 9.992ms sigma 0.447 Vista may use its reported StreamLatency as period: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 10.697ms render.c:2206: event average 10.736ms sigma 0.834 The one w2k8 machine is peculiar as it appears to use the 15.600ms (or 15.625ms?) timers well known from pre-Vista times: render.c:185: Returned periods: 10.0000 ms 3.0000 ms render.c:333: Returned latency: 10.6666 ms render.c:626: event after Start average 15.547ms render.c:2206: event average 15.625ms sigma 5.625 However, the rate is certainly not the 20-30ms StreamLatency that e.g. winealsa returns. Regards, Jörg Höhle

2 3

Need help to install Xlib/xfree86 devlopnemt packeg in ubuntu 10 LTS
by Hamid Lohar 21 Dec '12

21 Dec '12

Dear sir, I am installing wine 1.3 from source file but i getting fail to install beacose of Xlib/xfree86 devlopnemt packeg so i neet that packege please help me.

2 3

Re: msvcrt: fix prototypes ov _execvp, _wexecvp, _execvpe and _wexecvpe
by Alexandre Julliard 21 Dec '12

21 Dec '12

Jérôme Gardou <jerome.gardou(a)reactos.org> writes: > --- > dlls/msvcrt/process.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) You should also fix the corresponding headers and remove the typecasts. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: jscript: Added null and undefined values support to to_object
by Marvin 21 Dec '12

21 Dec '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=23578 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/2] msvcr100: Added _aligned_msize implementation
by Marvin 21 Dec '12

21 Dec '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=23573 Your paranoid android. === W7PROX64 (64 bit msvcr100) === msvcr100.c:344: Test failed: _aligned_msize returned 23 msvcr100.c:346: Test failed: _aligned_msize returned 23 msvcr100.c:348: Test failed: _aligned_msize returned 23 msvcr100.c:350: Test failed: _aligned_msize returned 24 msvcr100.c:357: Test failed: _aligned_msize returned 3 === TEST64_W7SP1 (64 bit msvcr100) === msvcr100.c:344: Test failed: _aligned_msize returned 23 msvcr100.c:346: Test failed: _aligned_msize returned 23 msvcr100.c:348: Test failed: _aligned_msize returned 23 msvcr100.c:350: Test failed: _aligned_msize returned 24 msvcr100.c:357: Test failed: _aligned_msize returned 3

1 0

Re: [1/2] wineps.drv: Add an ability to select device resolution from UI.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -224,10 +229,13 @@ typedef struct > static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, > WPARAM wParam, LPARAM lParam) > { > + static const WCHAR resW[] = {'%','d',' ','d','p','i',0}; > + static const WCHAR resxyW[] = {'%','d','x','%','d',' ','d','p','i',0}; The "dpi" string needs to be loaded from resources. > @@ -267,6 +275,59 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, > } > SendDlgItemMessageA(hwnd, IDD_DUPLEX, CB_SETCURSEL, Cursel, 0); > } > + > + if (list_empty( &di->pi->ppd->Resolutions )) > + { > + WCHAR buf[64]; > + struct item_res_data *data; > + > + sprintfW(buf, resW, di->pi->ppd->DefaultResolution); > + SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); > + > + data = HeapAlloc(GetProcessHeap(), 0, sizeof(*data)); > + data->resx = data->resy = di->pi->ppd->DefaultResolution; > + SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, 0, (LPARAM)data); > + Cursel = 0; You don't need a data structure, you can store the values directly with something like MAKELONG. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] loader: Use a volatile pointer in wld_memset().
by Alexandre Julliard 21 Dec '12

21 Dec '12

Charles Davis <cdavis5x(a)gmail.com> writes: > This prevents Clang from optimizing the loop into a memset(3) call. Something like -fno-builtin would be preferable. -- Alexandre Julliard julliard(a)winehq.org

1 0

mmdevapi: Avoid lock contention after SetEvent.
by Joerg-Cyril.Hoehle＠t-systems.com 21 Dec '12

21 Dec '12

Hi, what's up with this patch? I wrote: >SetEvent is one of those calls with a high probability that the >Linux scheduler will switch to another thread, e.g. the one receiving >the event. As the critical section is still hold, it'll prevent the >receiver from invoking mmdevapi, e.g. GetCurrentPadding, without two >more thread switches (forth and back). We don't need that. Now that This->event is constant between IAC_Start and IAC_Release, thanks to my "SetEventHandle is allowed once only" patch, it's safe to move SetEvent(This->event) outside of the CS. Unlike the rejected patch about a CreateTimerQueue race condition internal to Wine (and only relevant in lock-less mode), this one is between the driver and the client app that blocks when calling e.g. GetCurrentPadding, what almost all apps will do, including our DSound http://source.winehq.org/source/dlls/dsound/mixer.c#L679 Regards, Jörg Höhle

2 2

Re: oleaut32: Indentation fix (Try 2)
by Andrew Talbot 20 Dec '12

20 Dec '12

Sorry, I should have labelled this patch as "Try 2". -- Andy.

1 0

Fwd: [PATCH 3/8] winemac: Implement GetDeviceCaps().
by Per Johansson 20 Dec '12

20 Dec '12

Forgot to include list somehow... On Mon, Dec 17, 2012 at 9:16 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > > My main reason for using it is to test the Mac builds before pushing > commits, so not being able to build the Mac driver on it is a serious > problem (and no, it can't be upgraded apparently). I'll let you guys decide on 10.5 or 10.6, but I'd like to note that all intel Mac should be able to run 10.6, as per Apple's website <http://support.apple.com/kb/SP575>. Regards, -- Per Johansson

1 0

Re: [PATCH 2/2] gdi32: Ensure a fixed-pitch full-width character has double width of a half-width character.
by Alexandre Julliard 20 Dec '12

20 Dec '12

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -5866,10 +5867,22 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, > return GDI_ERROR; > } > > + if (!font->orientation) { > + TEXTMETRICW tm; > + double advance = (ft_face->glyph->metrics.horiAdvance + 63) >> 6; > + get_text_metrics(incoming_font, &tm); > + if (!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH) && > + (tm.tmAveCharWidth * 2) != (INT)(advance * widthRatio) && > + (tm.tmAveCharWidth * 2) == (INT)((advance + 1.0) * widthRatio)) { > + TRACE("add fullwidth character padding\n"); > + padding = 1 << 6; > + } > + } Is it really limited to orientation==0? A test case with a different orientation would be useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dsound: use event based threads, v2
by Andrew Eikum 20 Dec '12

20 Dec '12

Looks good to me, no problems with any of the drivers. I think it'd be good to get it in on Monday, as release day is tomorrow, but that's not my call. Andrew On Wed, Dec 19, 2012 at 10:30:04AM +0100, Maarten Lankhorst wrote: > Use a thread instead of a timer for greater precision. > > Changes since v1: > - Add WARN on failure of Start or GetStreamLatency > - Set lower bound of sleep time to 5 ms > - Change upper bound of sleep time to 2.5x period > - Fixup comment > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)ubuntu.com> > --- > I like how the most useful part of the changelog always gets stripped out. > What's the point of even adding this info here? > > Obligatory "Yes I know the error handling I added isn't perfect, and I did fix that in my failure rework patch" here.. > > --- > dlls/dsound/dsound.c | 21 +++++++++++---------- > dlls/dsound/dsound_private.h | 7 ++++--- > dlls/dsound/mixer.c | 39 +++++++++++++++++++++++---------------- > dlls/dsound/primary.c | 27 ++++++++++++++++++++++++--- > 4 files changed, 62 insertions(+), 32 deletions(-) > > diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c > index ac85ba2..381d0e1 100644 > --- a/dlls/dsound/dsound.c > +++ b/dlls/dsound/dsound.c > @@ -670,14 +670,13 @@ ULONG DirectSoundDevice_Release(DirectSoundDevice * device) > TRACE("(%p) ref was %u\n", device, ref + 1); > if (!ref) { > int i; > - timeKillEvent(device->timerID); > - timeEndPeriod(DS_TIME_RES); > > - /* The kill event should have allowed the timer process to expire > - * but try to grab the lock just in case. Can't hold lock because > - * secondarybuffer_destroy also grabs the lock */ > - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); > - RtlReleaseResource(&(device->buffer_list_lock)); > + SetEvent(device->sleepev); > + if (device->thread) { > + WaitForSingleObject(device->thread, INFINITE); > + CloseHandle(device->thread); > + } > + CloseHandle(device->sleepev); > > EnterCriticalSection(&DSOUND_renderers_lock); > list_remove(&device->entry); > @@ -813,6 +812,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > > device->mmdevice = mmdevice; > device->guid = devGUID; > + device->sleepev = CreateEventW(0, 0, 0, 0); > > hr = DSOUND_ReopenDevice(device, FALSE); > if (FAILED(hr)) > @@ -869,9 +869,10 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG > ZeroMemory(&device->volpan, sizeof(device->volpan)); > > hr = DSOUND_PrimaryCreate(device); > - if (hr == DS_OK) > - device->timerID = DSOUND_create_timer(DSOUND_timer, (DWORD_PTR)device); > - else > + if (hr == DS_OK) { > + device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); > + SetThreadPriority(device->thread, THREAD_PRIORITY_TIME_CRITICAL); > + } else > WARN("DSOUND_PrimaryCreate failed: %08x\n", hr); > > *ppDevice = device; > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 62656a5..1a3900c 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -68,9 +68,9 @@ struct DirectSoundDevice > > GUID guid; > DSCAPS drvcaps; > - DWORD priolevel; > + DWORD priolevel, sleeptime; > PWAVEFORMATEX pwfx, primary_pwfx; > - UINT timerID, playing_offs_bytes, in_mmdev_bytes, prebuf; > + UINT playing_offs_bytes, in_mmdev_bytes, prebuf; > DWORD fraglen; > LPBYTE buffer; > DWORD writelead, buflen, state, playpos, mixpos; > @@ -97,6 +97,7 @@ struct DirectSoundDevice > IAudioStreamVolume *volume; > IAudioRenderClient *render; > > + HANDLE sleepev, thread; > struct list entry; > }; > > @@ -226,7 +227,7 @@ void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN; > void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) DECLSPEC_HIDDEN; > DWORD DSOUND_secpos_to_bufpos(const IDirectSoundBufferImpl *dsb, DWORD secpos, DWORD secmixpos, float *overshot) DECLSPEC_HIDDEN; > > -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, DWORD_PTR dw2) DECLSPEC_HIDDEN; > +DWORD CALLBACK DSOUND_mixthread(void *ptr) DECLSPEC_HIDDEN; > > /* sound3d.c */ > > diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c > index 84e029b..282808e 100644 > --- a/dlls/dsound/mixer.c > +++ b/dlls/dsound/mixer.c > @@ -820,7 +820,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > DSOUND_PrimaryStop(device); > } > > - } else { > + } else if (device->state != STATE_STOPPED) { > > DSOUND_WaveQueue(device, TRUE); > > @@ -843,22 +843,29 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > /* **** */ > } > > -void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD_PTR dwUser, > - DWORD_PTR dw1, DWORD_PTR dw2) > +DWORD CALLBACK DSOUND_mixthread(void *p) > { > - DirectSoundDevice * device = (DirectSoundDevice*)dwUser; > - DWORD start_time = GetTickCount(); > - DWORD end_time; > - TRACE("(%d,%d,0x%lx,0x%lx,0x%lx)\n",timerID,msg,dwUser,dw1,dw2); > - TRACE("entering at %d\n", start_time); > - > - RtlAcquireResourceShared(&(device->buffer_list_lock), TRUE); > - > - if (device->ref) > - DSOUND_PerformMix(device); > + DirectSoundDevice *dev = p; > + TRACE("(%p)\n", dev); > > - RtlReleaseResource(&(device->buffer_list_lock)); > + while (dev->ref) { > + DWORD ret; > > - end_time = GetTickCount(); > - TRACE("completed processing at %d, duration = %d\n", end_time, end_time - start_time); > + /* > + * Some audio drivers are retarded and won't fire after being > + * stopped, add a timeout to handle this. > + */ > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); > + if (ret == WAIT_FAILED) > + WARN("wait returned error %u %08x!\n", GetLastError(), GetLastError()); > + else if (ret != WAIT_OBJECT_0) > + WARN("wait returned %08x!\n", ret); > + if (!dev->ref) > + break; > + > + RtlAcquireResourceShared(&(dev->buffer_list_lock), TRUE); > + DSOUND_PerformMix(dev); > + RtlReleaseResource(&(dev->buffer_list_lock)); > + } > + return 0; > } > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 3ac928b..dd810fd 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -152,6 +152,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > REFERENCE_TIME prebuf_rt; > WAVEFORMATEX *wfx = NULL; > HRESULT hres; > + REFERENCE_TIME period; > + DWORD period_ms; > > TRACE("(%p, %d)\n", device, forcewave); > > @@ -192,14 +194,15 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; > > hres = IAudioClient_Initialize(device->client, > - AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, > - prebuf_rt, 0, device->pwfx, NULL); > + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST | > + AUDCLNT_STREAMFLAGS_EVENTCALLBACK, prebuf_rt, 0, device->pwfx, NULL); > if(FAILED(hres)){ > IAudioClient_Release(device->client); > device->client = NULL; > WARN("Initialize failed: %08x\n", hres); > return hres; > } > + IAudioClient_SetEventHandle(device->client, device->sleepev); > > hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, > (void**)&device->render); > @@ -234,6 +237,24 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > return hres; > } > > + /* Now kick off the timer so the event fires periodically */ > + hres = IAudioClient_Start(device->client); > + if (FAILED(hres)) > + WARN("starting failed with %08x\n", hres); > + > + hres = IAudioClient_GetStreamLatency(device->client, &period); > + if (FAILED(hres)) { > + WARN("GetStreamLatency failed with %08x\n", hres); > + period_ms = 10; > + } else > + period_ms = (period + 9999) / 10000; > + TRACE("period %u ms fraglen %u prebuf %u\n", period_ms, device->fraglen, device->prebuf); > + > + if (period_ms < 3) > + device->sleeptime = 5; > + else > + device->sleeptime = period_ms * 5 / 2; > + > return S_OK; > } > > @@ -379,7 +400,7 @@ HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) > TRACE("(%p)\n", device); > > hr = IAudioClient_Start(device->client); > - if(FAILED(hr)){ > + if(FAILED(hr) && hr != AUDCLNT_E_NOT_STOPPED){ > WARN("Start failed: %08x\n", hr); > return hr; > } > -- > 1.8.0 > > > >

1 0

Re: [PATCH 3/3] usp10: Add support for format 2 pair adjustments.
by Dmitry Timoshkov 20 Dec '12

20 Dec '12

Huw Davies <huw(a)codeweavers.com> wrote: > typedef struct { > + WORD PosFormat; > + WORD Coverage; > + WORD ValueFormat1; > + WORD ValueFormat2; > + WORD ClassDef1; > + WORD ClassDef2; > + WORD Class1Count; > + WORD Class2Count; > + WORD Class1Record[1]; > +} GPOS_PairPosFormat2; Shouldn't this structure be 2 bytes aligned? -- Dmitry.

3 6

winepulse test data review
by Joerg-Cyril.Hoehle＠t-systems.com 20 Dec '12

20 Dec '12

Hi, Maarten Lankhorst wrote: >Actually in winepulse, sleep / 12000 (8 ms I guess?) ms would work, no sleep at all works too, Yes, I wanted to go no further than 8ms below the 10ms period limit. > it was just the mixing of various levels of sleep that was failing. Not sure why though, > might be something about the scheduling throwing it off. There's a perfectly simple explanation of this that applies to both winepulse and winecoreaudio. It goes as follows. IOW, there's a bug in winecoreaudio. It may explain why the test stutters on my MacOS 10.5.8 machine, regardless of how accurate or "improved" GetPosition is. winecoreaudio's IAC_ReleaseBuffer sends packets off as soon as it receives data, unlike winealsa/wineoss. Consider the sleep sequence 0 5 8 0 5 ms... + The transition 8 -> 0ms sleep is fine, as data is sent 2ms after the prior packet - The transition 0 -> 5 is most problematic, as it means that 2 ReleaseBuffer will be 15ms apart, even though only 10ms of data was sent. I believe winepulse is affected by this too, like winecoreaudio. The stable sequences "always 0" or "always 8ms sleep" are paced regularly, so underruns are avoided as long as the OS schedules the threads soon enough. Winealsa and wineOSS are not affected, as they write data on the 10ms period boundaries, -- like native presumably does. winecoreaudio solution paths: - write packets on period tick, not at release time - or add silence lead-in - or delay first packet until period tick only (if small) - or ... I think it should be possible to produce reliable continuous sound in winepulse and winecoreaudio yet maintain their current "send packet" codebase instead of transitioning to a separate buffer that winealsa and wineoss use. Regards, Jörg Höhle

3 2

Re: msxml3: Add custom handling for DISPID_VALUE for node map
by Jacek Caban 20 Dec '12

20 Dec '12

On 12/19/12 08:24, Nikolay Sivov wrote: > Add custom handling for DISPID_VALUE for node map If this has to be done for all IDispatchEx objects with DISPID_VALUE, it may be worth considering changing dispex.c. Something like: if(id == DISPID_VALUE && wFlags == DISPATCH_METHOD) wFlags |= DISPATCH_PROPERTYGET; before ITypeInfo::Invoke call should do the trick and replace both this patch and already committed node list patch. Cheers, Jacek

2 3

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib (Try 3, resend)
by Nikolay Sivov 20 Dec '12

20 Dec '12

On 12/20/2012 14:50, Tatyana Fokina wrote: Hi, Tatyana. Main problem is that your test will crash if run without patch 2/2, that's not how it should be done. You need to merge these patches together to keep tests working or send implementation fix first, so next test patch will work. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(hr == S_OK, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(tl) ITypeLib_Release(tl); You don't need a cast here. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, NULL, &Index); > + ok(hr == S_OK, " ITypeInfo2_GetContainingTypeLib failed on ITypeLib = NULL\n"); Please test index value here and above to make sure it really returns something.

1 0

Re: oleaut32: Indentation Fix
by Alexandre Julliard 20 Dec '12

20 Dec '12

Andrew Talbot <andrew.talbot(a)talbotville.com> writes: > Changelog: > oleaut32: Indentation Fix. Please avoid reformatting hundreds of lines for no reason. Only fix the parts where the indentation is actually incorrect. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: windowscodecs: Adjust a type in PngDecoder_Frame_GetColorContexts.
by Alexandre Julliard 19 Dec '12

19 Dec '12

Gerald Pfeifer <gerald(a)pfeifer.com> writes: > Current snapshots of GCC 4.8.0 issue a warning about some of the > new code in windowscodecs/pngformat.c: > > pngformat.c: In function 'PngDecoder_Frame_GetColorContexts': > pngformat.c:882:5: warning: passing argument 5 of 'ppng_get_iCCP' from > incompatible pointer type [enabled by default] > if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type,&profile, &len)) > pngformat.c:882:5: note: expected 'png_bytepp' but argument is of type 'char **' > > The patch below addresses this. That will break on older libpng. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 0/5] Moving bare consoles to wineconsole (try #2)
by Alexandre Julliard 19 Dec '12

19 Dec '12

Eric Pouech <eric.pouech(a)orange.fr> writes: > The following series implements a new scheme for managing 'bare' consoles. > We now force every program started without a wine parent to be run under > wineconsole (transparently for the user). > This is done using a new backend in wineconsole called 'line'. This backend > only takes care of input; output is kept as a client side operation. > All terminal related code is moved from dlls/kernel32 to programs/wineconsole. > > This basically ensures that: > - Only wineconsole reads from standard input (and writes into input queue). > This fixes bug reported by Jason when $CONIN is opened with read access only. > - It also enforces that wineconsole always has control of the unix terminal, > hence ensuring that we properly reset the terminal settings upon exit. > > Code looks way cleaner now. > > Try #2 (changes from previous patch) > - fix changelog of first patch (was WineHelp...) > - fix date in header for new file > - remove setting title code (will be fixed in later patch) Actually the problem is not only the title. For instance it's still sending escape sequences when stdout is redirected. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: wininet: Map socket errors to ERROR_INTERNET_CANNOT_CONNECT in create_netconn_socket.
by Marvin 19 Dec '12

19 Dec '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=23542 Your paranoid android. === W7PRO (32 bit http) === http.c:3337: Test failed: HttpSendRequest failed: 12002

2 1

Re: dsound: change mix rate of primary buffer
by Andrew Eikum 18 Dec '12

18 Dec '12

On Tue, Dec 18, 2012 at 08:08:03PM +0100, sebastien chev wrote: > Thank you for the tips. I will look at these. > I guess you're probably also thinking about the mix buffer in dsound itself. That does always mix to float, and there isn't a way to change it right now. What are you planning to use this for? We could support different mix buffer formats, but I'm not sure this use case is worth the effort. Andrew

1 0

Clang static analyzer results / wine-1.5.19-186-g1cd0c4a
by Austin English 18 Dec '12

18 Dec '12

Now that http://source.winehq.org/git/wine.git/commitdiff/4adfb787f4e8c36a37ce1d53a7… is in (and clang has improved), several wine/clang bugs are fixed. For those curious, there is one remaining test failure on my machine, with clang instead of gcc: http://bugs.winehq.org/show_bug.cgi?id=25828 The static analyzer results were made with: llvm: git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170295 91177308-0d34-0410-b5e6-96231b3b80d8 clang: git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170294 91177308-0d34-0410-b5e6-96231b3b80d8 wine: wine-1.5.19-186-g1cd0c4a ./configure --disable-tests was used to reduce noise austin@debian-home:~$ du -h wine-1.5.19-186-g1cd0c4a.tar.bz2 39M wine-1.5.19-186-g1cd0c4a.tar.bz2 austin@debian-home:~$ sha1sum wine-1.5.19-186-g1cd0c4a.tar.bz2 bf86469ab3929faf996b76d4a8e533edcf24fd29 wine-1.5.19-186-g1cd0c4a.tar.bz2 Available at http://www.mediafire.com/?0gioifbgw363az3 -- -Austin

1 0

winealsa: Separate read and write pointers.
by Joerg-Cyril.Hoehle＠t-systems.com 18 Dec '12

18 Dec '12

Andrew Eikum wrote: >This [lock-less] seems to be the main goal of the patch. It'll not be bad to fix the capture bug independently. >and maybe we can get that into Wine after the next release? That requires agreement on the lock-less protocol. Basis: atomic 32bit updates. Do we want distinguished alignment declarations for e.g. This->held_frames? Write: InterlockedExchange/Increment/etc. is clear Read: Open for discussion Basically, all I need is a snapshot of a 32bit entity, i.e. an atomic read. The code doesn't bother whether that value is stale or not. It works in either case. All that is required is that it's updated some time eventually (i.e. not running off local cache for hours). Back in the old days, people used foo = (volatile X) bar; or even volatile X bar; ... foo=bar; Such code has been present e.g. in mciseq for the last 10 years. Currently, this has my preference for Intel: foo = bar; // e.g. held = This->held_frames; __asm__ __volatile__("":::"memory"); /* compiler barrier is enough for x86 */ I wouldn't be opposed to held = (volatile DWORD) This->held_frames; Purists spit at volatile for threading, but that's what has been used for decades and continues to be used (just google some random threading app...) I've also suggested InterlockedExchange(&held, This->held_frames) but that's just wasting a read of the obsolete value of held. So why use that form? Do we need to care for anything else than Intel? One may envision other approaches, e.g. a second critical section for the callback and Start/Stop only. But This->held_frames is updated within IAC_Get/ReleaseBuffer, so that doesn't solve the issue. POSIX purists would say that a protocol is needed between the two communicating threads (the Get/Release one and the cb, not the Start/Stop thread). But I don't care about POSIX requirements imposed by weird 8/16/24/32/40/64 bit HW and strange non-UNIX systems when the target is Wine-Is-Not-an-Emulator. Regards, Jörg Höhle

1 0

Re: winealsa: Separate read and write pointers.
by Andrew Eikum 18 Dec '12

18 Dec '12

On Mon, Dec 17, 2012 at 05:01:29PM +0100, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Furthermore, this patch eases integration of my lock-less code, which > I'll not release for now, by cleanly separating read and write > pointers during playback and capture. No more adding of two volatile > entities moving in opposite directions! > This seems to be the main goal of the patch. I tested it against my usual set of applications both with and without PulseAudio. This patch seems fine to me. I'll take a look at your lockless patch on bug 29531, and maybe we can get that into Wine after the next release? Andrew

1 0

dsound: change mix rate of primary buffer
by sebastien chev 18 Dec '12

18 Dec '12

It seems that no matter what the Windows side program choose for DirectSoundCreate, the DSound subsystem initialize itself with the higher spec sound available (for example 48Khz Float32, or 48kHz Int16 if no Float32 available). While not a big deal on current linux PC, using this on ARM device kill performance. A DirectSound subsystem for ARM, with Integer only for the mixbuffer (as most ARM still use softfloat) and 22kHz should be less taxing for performances.

2 1

Re: mmdevapi: Prevent race condition upon Start.
by Alexandre Julliard 18 Dec '12

18 Dec '12

<Joerg-Cyril.Hoehle(a)t-systems.com> writes: > What happened every so often, even on a single-core machine(!), is > that CreateTimerQueue(dueTime=0=immediate) would see the timer thread > created and the callback invoked before the function returns. Since > This->started was not set yet, our callback would return immediately, > in effect causing sound to start only one 10ms period later. > That's obviously was not intended by the author. > So let's set This->started before CTQ. This doesn't make sense, there's a critical section. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: oleaut32: Dont output an error when the typelib cannot be found
by Alexandre Julliard 18 Dec '12

18 Dec '12

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c > index fa9b050..04914e0 100644 > --- a/dlls/oleaut32/typelib.c > +++ b/dlls/oleaut32/typelib.c > @@ -2544,9 +2544,11 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p > return S_OK; > } > } > - > - hr = E_FAIL; > } > + > + TRACE("No TYPELIB resource found\n"); > + hr = E_FAIL; > + SetLastError(0); Setting last error to 0 is almost always wrong. In this case it's most likely just a side effect of CreateFile, and shouldn't need to be done explicitly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Does Wine benefit from libtiff5 over libtiff4?
by Scott Ritchie 18 Dec '12

18 Dec '12

I'm trying to manage building for 3 different Ubuntu releases now for our 1.5 releases, and the main delta between them is libtiff 12.04: libtiff4 available 12.10: libtiff4 and libtiff 5 available 13.04: libtiff4 and libtiff 5 available It's much simpler if I can build on 12.04 and copy the binary packages, however this means I can't use libtiff5 if I do so. Is there any benefit in doing a separate build just for this? *note that in 12.10/13.04 official archive we build seperately and just use libtiff5. Thanks, Scott Ritchie

3 3

Call for papers - FOSDEM 2013
by Jeremy White 17 Dec '12

17 Dec '12

Alright folks, We need to put together a schedule for our room at FOSDEM. So I would like to formally 'call for papers' for FOSDEM. Please email suggested topics to wineconf(a)winehq.org, where I'll collate them and piece them into a schedule. A 'paper' can be a talk you wish to give, or a topic you think we should discuss. As always, they should be relatively brief, and should emphasize discussion and collaboration. This year it probably makes sense to imagine a few talks aimed at developers outside the Wine community. After all, the hope is that a few bored non Wine developers may wander by from time to time. Perhaps we can suck them in <grin>. Cheers, Jeremy

5 7

Re: [PATCH 3/8] winemac: Implement GetDeviceCaps().
by Alexandre Julliard 17 Dec '12

17 Dec '12

Ken Thomases <ken(a)codeweavers.com> writes: > --- > dlls/winemac.drv/Makefile.in | 1 + > dlls/winemac.drv/gdi.c | 321 ++++++++++++++++++++++++++++++++++++++++- > dlls/winemac.drv/macdrv.h | 101 +++++++++++++ > 3 files changed, 415 insertions(+), 8 deletions(-) > create mode 100644 dlls/winemac.drv/macdrv.h It doesn't build here on OS X 10.5.8: gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes -Wwrite-strings -gstabs+ -fno-omit-frame-pointer -Wpointer-arith -I/usr/local/include/freetype2 -I/usr/local/include -g -O2 -o gdi.o gdi.c gdi.c: In function 'device_init': gdi.c:143: error: 'CGDisplayModeRef' undeclared (first use in this function) gdi.c:143: error: (Each undeclared identifier is reported only once gdi.c:143: error: for each function it appears in.) gdi.c:143: error: syntax error before 'mode' gdi.c:160: error: 'mode' undeclared (first use in this function) gdi.c:162: warning: implicit declaration of function 'CGDisplayModeCopyPixelEncoding' gdi.c:162: warning: initialization makes pointer from integer without a cast gdi.c:164: warning: implicit declaration of function 'CGDisplayModeGetWidth' gdi.c:165: warning: implicit declaration of function 'CGDisplayModeGetHeight' gdi.c:178: warning: implicit declaration of function 'CGDisplayModeRelease' make[1]: *** [gdi.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 6

[PATCH 0/3] Add O_DENY* flags to fcntl and cifs
by Pavel Shilovsky 17 Dec '12

17 Dec '12

Network filesystems CIFS, SMB2.0, SMB3.0 and NFSv4 have such flags - this change can benefit cifs and nfs modules. While this change is ok for network filesystems, itsn't not targeted for local filesystems due security problems (e.g. when a user process can deny root to delete a file). Share flags are used by Windows applications and WINE have to deal with them too. While WINE can process open share flags itself on local filesystems, it can't do it if a file stored on a network share and is used by several clients. This patchset makes it possible for CIFS/SMB2.0/SMB3.0. Pavel Shilovsky (3): fcntl: Introduce new O_DENY* open flags for network filesystems CIFS: Add O_DENY* open flags support CIFS: Use NT_CREATE_ANDX command for forcemand mounts fs/cifs/cifsacl.c | 10 ++++---- fs/cifs/cifsglob.h | 11 ++++++++- fs/cifs/cifsproto.h | 9 ++++---- fs/cifs/cifssmb.c | 47 ++++++++++++++++++++------------------ fs/cifs/dir.c | 14 ++++++++---- fs/cifs/file.c | 18 ++++++++++----- fs/cifs/inode.c | 11 +++++---- fs/cifs/link.c | 10 ++++---- fs/cifs/readdir.c | 2 +- fs/cifs/smb1ops.c | 15 ++++++------ fs/cifs/smb2file.c | 10 ++++---- fs/cifs/smb2inode.c | 4 ++-- fs/cifs/smb2ops.c | 10 ++++---- fs/cifs/smb2pdu.c | 6 ++--- fs/cifs/smb2proto.h | 14 +++++++----- fs/fcntl.c | 5 ++-- include/uapi/asm-generic/fcntl.h | 11 +++++++++ 17 files changed, 125 insertions(+), 82 deletions(-) -- 1.7.10.4

11 28

Re: [PATCH 3/6] jscript: Fixed deleting nonexistent identifiers
by Marvin 17 Dec '12

17 Dec '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=23454 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 2/6] jscript: Fixed deleting nonexisting properties from member expression
by Marvin 17 Dec '12

17 Dec '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=23453 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Fixed Number.toFixed for value 0 with 0 precision
by Marvin 17 Dec '12

17 Dec '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=23452 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: msvcrt: implement _strxfrm_l
by Piotr Caban 17 Dec '12

17 Dec '12

On 12/14/12 10:28, Jérôme Gardou wrote: > --- > dlls/msvcrt/msvcrt.spec | 2 +- > dlls/msvcrt/string.c | 26 ++++++++++++++++++++++++-- > 2 files changed, 25 insertions(+), 3 deletions(-) > Please add parameters validation. The function also behaves differently with native msvcrt when output buffer is to small. This function should return data that keeps sorting order. It should use LCMAP_SORTKEY flag. Cheers, Piotr

1 0

Re: winex11.drv: give a better warning for broken drivers on 64-bit OS's
by Austin English 17 Dec '12

17 Dec '12

On Sun, Dec 16, 2012 at 2:31 PM, Austin English <austinenglish(a)gmail.com> wrote: > -- > -Austin Wrong macro, please ignore. -- -Austin

1 0

Re: [PATCH 2/3] [resend] [cmd] Add more tests for set /a
by Marvin 17 Dec '12

17 Dec '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=23440 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6@or_broken@ERROR: WINE_baz incorrectly [7]')

1 0

cmd patches - please ignore them
by Ann and Jason Edmeades 17 Dec '12

17 Dec '12

Dont know what's happened, need to investigate further - Had 100% pass rate in job 23438 only to fail on submission... Needs some investigation so will work on it later in the week Jason

1 0

Re: [PATCH 1/3] [try2] [cmd] Convert the set /a tests to validate better
by Marvin 17 Dec '12

17 Dec '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=23439 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3@or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19')

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by Bruno Jesus 16 Dec '12

16 Dec '12

On Fri, Dec 14, 2012 at 2:01 PM, Caron Jensen <caron(a)codeweavers.com> wrote: > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, Accoding to the similar patch from Jiang Yike "GTX660 Ti" is 0x1183, I looked for GTX660 and found different PCI ID's like 0x1185 or 0x110C but I could not find this information in NVIDIA site, only in other sites: https://fah-web.stanford.edu/file-releases/public/GPUs.txt http://pciids.sourceforge.net/pci.ids http://www.techpowerup.com/vgabios/126661/Asus.GTX660.2048.120810.html http://foldingforum.org/viewtopic.php?f=83&t=22477 Best wishes, Bruno

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by futureway＠asia.com 16 Dec '12

16 Dec '12

Hello, Caron! GTX 660 and GTX 660 Ti are different cards, and 0x1183 is the device code of GTX 660 Ti. You may view my patch: http://source.winehq.org/patches/data/92545 . Best regards! Jiang Yike > ----- Original Message ----- > From: Caron Jensen > Sent: 12/15/12 12:01 AM > To: wine-patches > Subject: wined3d: Recognize Nvidia GTX660 cards. > > --- > dlls/wined3d/directx.c | 3 +++ > dlls/wined3d/wined3d_private.h | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 15ac2ea..386c87a 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -1095,6 +1095,7 @@ static const struct gpu_description gpu_description_table[] = > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, > > @@ -1495,6 +1496,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl > { > {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ > {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ > + {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend */ > {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ > {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ > {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ > @@ -2018,6 +2020,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i > { > /* Kepler */ > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE7", CARD_NVIDIA_GEFORCE_GTX660}, > /* Fermi */ > {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, > {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 0bb3f27..13f9285 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1425,6 +1425,7 @@ enum wined3d_pci_device > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, > > -- > 1.7.9.5 >

1 0

Re: [PATCH 1/3] [cmd] Convert the set /a tests to validate better
by Frédéric Delanoy 15 Dec '12

15 Dec '12

On Thu, Dec 13, 2012 at 10:59 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > The tests previously set a variable which was not checked until > the subsequent test completed (as env vars are expanded as the > line is read, meaning a sequence of set /a var=x & echo %var% > echos the contents before the set is executed). In addition when > multiple variables are involved in the calculation, only the > first one was being checked, and this is changed to check all > variables involved in the calculation. > + +REM Check the variables are set to the expected value and clear their contents +:check_vars +if not "%1"=="" ( + if "%1"=="%WINE_var1%" ( + echo WINE_var1 correctly %1 + ) else ( + echo ERROR: WINE_var1 incorrectly %WINE_var1% [%1] + ) +) +if not "%2"=="" ( + if "%2"=="%WINE_var2%" ( + echo WINE_var2 correctly %2 + ) else ( + echo ERROR: WINE_var2 incorrectly %WINE_var2% [%2] + ) +) +if not "%3"=="" ( + if "%3"=="%WINE_var3%" ( + echo WINE_var3 correctly %1 + ) else ( + echo ERROR: WINE_var3 incorrectly %WINE_var3% [%3] + ) +) A couple comments: 1. I don't really like hardcoding a variable name in a function... Why not using something like: set /a var=1 +2 & call :compute var set /a foo=8, bar=foo+1 & call :compute foo bar goto :end :compute set %1 set %1= // to clear the contents if not "%2" == "" ( set %2 set %2= // clearing here as well ) goto :eof :end which prints the variable(s) name and value, without hardcoding? var=3 foo=8 bar=9 2. The check for the presence of the first parameter is unneeded since you always call with at least one param (you control all calls) 3. When only 1 variable is used, no need to add a '1' suffix as in 'foo1' or 'WINE_foo1': the '1' doesn't help/add useful information 4. Ideally, for clarity, one would use delayed expansion instead, such as setlocal EnableDelayedExpansion set /a var=1 +2 & echo !var! endlocal but this isn't implemented yet, so adding a preliminary comment like "REM FIXME Simplify tests when EnableDelayedExpansion is supported" would be good IMO 5. You could even simplify the above function (making it more generic, instead of testing for up to 3 arguments) by using SHIFT and an additional label, like :compute :comploop if not "%1" == "" ( set %1 set %1= shift ) else ( goto :eof ) goto :comploop goto :eof Or even better (if NT4 allows): :compute for %%i in (%*) do ( set %%i set %%i= ) goto :eof Frédéric

2 4

Re: gdi32: Indentation fix
by Dmitry Timoshkov 15 Dec '12

15 Dec '12

Andrew Talbot <andrew.talbot(a)talbotville.com> wrote: > Changelog: > gdi32: Indentation fix. Please keep 4 spaces indentation without tabs. -- Dmitry.

2 1

Re: [2/2] gdi32/tests: Added tests for GetFontResourceInfoW
by Dmitry Timoshkov 15 Dec '12

15 Dec '12

Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > + pCopyFileW = (void *)GetProcAddress(hkernel32, "CopyFileW"); > + pExpandEnvironmentStringsW = (void *)GetProcAddress(hkernel32, "ExpandEnvironmentStringsW"); > + pGetCurrentDirectoryW = (void *)GetProcAddress(hkernel32, "GetCurrentDirectoryW"); There is no reason to import these APIs using GetProcAddress. Also testing GetFontResourceInfo without checking actual buffer contents is not very useful. Google points to http://www.undocprint.org/winspool/getfontresourceinfo which seems to have some description of this API, with symbolic names of the type parameter, so testing something besides type == 1 would be a good idea as well. -- Dmitry.

2 4

Sponsorship to FOSDEM's Wine room
by Jeremy White 14 Dec '12

14 Dec '12

The Wine project has a limited fund to sponsor travel to the Wine conference. If you are interested in attending the Wine DevRoom at FOSDEM, but could only do so with financial assistance, we may be able to help! To apply, simply email me a request and indicate if you need help with transportation costs, lodging costs, or both. If you need help with transportation costs, please provide an estimate of your travel costs. Funding decisions will be made by a five member committee including myself, Alexandre, Michael Stefaniuc, Austin English, and Marcus Meissner. Priority will be given to those that have contributed to the Wine project in some form (not necessarily patches). Please send your request to me no later than December 31, 2012. We will try to communicate decisions on or before January 5th, 2013. Cheers, Jeremy

1 0

We're in at FOSDEM!
by Jeremy White 14 Dec '12

14 Dec '12

I'm stoked - we've been approved for a dev room at FOSDEM on Saturday, February 2nd, in Brussels. It is just the one day, but I figure we can find ways to gather on Friday night and/or Sunday as well. I really think this will be a fun change of pace for us. If it doesn't work out, we'll just go camp out in Marcus's back yard instead <evil grin>. One thing they require from us is a pre set schedule, so I'll be asking people to suggest topics, and then we'll have to weed through them to figure out what makes the most sense. Cheers, Jeremy

4 5

Re: wined3d: Recognize Nvidia GTX660 cards.
by Henri Verbeet 14 Dec '12

14 Dec '12

On 14 December 2012 17:01, Caron Jensen <caron(a)codeweavers.com> wrote: > @@ -2018,6 +2020,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i > { > /* Kepler */ > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE7", CARD_NVIDIA_GEFORCE_GTX660}, > /* Fermi */ > {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, > {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, That's ok in principle, but please keep the table ordered, so NVE7 above NVE4.

1 0

Re: oleaut32: Added a test for prop getter invocation with different flags
by Marvin 14 Dec '12

14 Dec '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=23397 Your paranoid android. === WINEBUILD (build) === Make failed

3 3

Use software vertex processing instead of mixed?
by Francois Gouget 14 Dec '12

14 Dec '12

A lot of tests get skipped on my Windows XP EeePC just because the Direct3D 9 device creation fails. And apparently that's just because we ask for mixed vertex processing instead of software vertex processing. How important is it to use mixed mode instead of software, at least for these tests? It does not seem to make any difference to the test results on my HD4000 graphics card (that one is on Windows 8 and accepts both mixed and software vertex processing unlike the GMA950). diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ba0f065..e25a5d3 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1240,7 +1240,7 @@ START_TEST(core) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8e12b74..7f238be 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -2686,7 +2686,7 @@ START_TEST(effect) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index b9eacee..89e4fc6 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -138,7 +138,7 @@ START_TEST(line) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 35e38e4..0218000 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -129,7 +129,7 @@ static struct test_context *new_test_context(void) d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, - D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Couldn't create IDirect3DDevice9 object %#x\n", hr); @@ -1183,7 +1183,7 @@ static void D3DXCreateMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -1390,7 +1390,7 @@ static void D3DXCreateMeshFVFTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2263,7 +2263,7 @@ static void D3DXLoadMeshTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2462,7 +2462,7 @@ static void D3DXCreateBoxTest(void) memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -2760,7 +2760,7 @@ static void D3DXCreateSphereTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -3004,7 +3004,7 @@ static void D3DXCreateCylinderTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4004,7 +4004,7 @@ static void D3DXCreateTextTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); @@ -4298,7 +4298,7 @@ static void D3DXGenerateAdjacencyTest(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 75139b1..223bebf 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -1370,7 +1370,7 @@ static void test_setting_constants(void) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 84a70cf..7ae7df9 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1230,7 +1230,7 @@ START_TEST(surface) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 2b17f64..9972571 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1803,7 +1803,7 @@ START_TEST(texture) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if (FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 35cd509..f3976c0 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -284,7 +284,7 @@ START_TEST(volume) ZeroMemory(&d3dpp, sizeof(d3dpp)); d3dpp.Windowed = TRUE; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); if(FAILED(hr)) { skip("Failed to create IDirect3DDevice9 object %#x\n", hr); -- 1.7.10.4

2 3

FindFirstVolume crash
by Michael Ost 14 Dec '12

14 Dec '12

Hi list, Can someone help me get through the wineserver code for passing data through a buffer in response to an ioctl? Our (slightly out of date 1.3.24 version of) Wine is getting INVALID_HANDLE_VALUE returned for FindFirstVolume. The problem is that the FindNextVolume call inside FindFirstVolume fails because it is told there are no mount points. I have tracked the code through FindFirstVolume through NtDeviceIoControlFile to server_ioctl_file on the app side. On the wineserver side I can see the wineserver fielding the ioctl request, and mountmgr.sys filling a buffer with 5 mount points. But this information is being written into a buffer (address 0x12510) by the wineserver that is not making it back to FindNextVolume buffer (address 0x29820) on the app side. Where do these buffers come from? Do they use shared memory? Or is the info passed through a pipe? I'm having trouble making my way through the wineserver code, so any tips or pointers would be appreciated! Thank you, Michael Ost Muse Research, Inc.

2 1

Re: ole32: fix compilation with mingw32-gcc >= 4.6.0
by Marvin 14 Dec '12

14 Dec '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=23392 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH] msxml3: skip a possible BOM in doparse
by Nikolay Sivov 14 Dec '12

14 Dec '12

Actually libxml2 is supposed to take care of that. Relevant code from xmlSwitchInputEncodingInt() : --- /* * Specific handling of the Byte Order Mark for * UTF-16 */ if ((handler->name != NULL) && (!strcmp(handler->name, "UTF-16LE") || !strcmp(handler->name, "UTF-16")) && (input->cur[0] == 0xFF) && (input->cur[1] == 0xFE)) { input->cur += 2; } if ((handler->name != NULL) && (!strcmp(handler->name, "UTF-16BE")) && (input->cur[0] == 0xFE) && (input->cur[1] == 0xFF)) { input->cur += 2; } --- So we need to figure out what's broken and where before skipping it on our side. On Fri, Dec 14, 2012 at 1:34 AM, Marcus Meissner <marcus(a)jet.franken.de>wrote: > Hi, > > Issue encountered in Corel X4 installer. (see bug 11747), > it gets a UTF16 document with BOM in front. > > trace:msxml:domdoc_load (0x131d10)->({VT_BSTR: > L"C:\\users\\marcus\\Temp\\{180A87F9-82B9-42A6-8F0E-3AC30A58AC8C}\\{5A51C731-A877-4C6E-8D51-CD16CDC46C9B}\\CorelDRAW > Graphics Suite X4 Setup Files\\Setup.xml"}) > trace:msxml:create_moniker_from_url > L"C:\\users\\marcus\\Temp\\{180A87F9-82B9-42A6-8F0E-3AC30A58AC8C}\\{5A51C731-A877-4C6E-8D51-CD16CDC46C9B}\\CorelDRAW > Graphics Suite X4 Setup Files\\Setup.xml" > trace:msxml:bind_url 0x131570 > trace:msxml:bsc_AddRef (0x138da0) ref=2 > trace:msxml:bsc_QueryInterface interface > {6d5140c1-7436-11ce-8034-00aa006009fa} not implemented > trace:msxml:bsc_QueryInterface interface > {aaa74ef9-8ee7-4659-88d9-f8c504da73cc} not implemented > trace:msxml:bsc_OnStartBinding (0x138da0)->(ff 0x13a238) > trace:msxml:bsc_QueryInterface interface > {79eac9e4-baf9-11ce-8c82-00aa004ba90b} not implemented > trace:msxml:bsc_OnDataAvailable (0x138da0)->(5 36572 0x33e908 0x33e8fc) > trace:msxml:bsc_OnStopBinding (0x138da0)->(00000000 (null)) > fixme:msxml:doparse start of xml is ffffffff fffffffe 3c 00 49 00 43 > > Bug is only fixed partially by this. > > Ciao, Marcus > --- > dlls/msxml3/domdoc.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c > index 49e6168..3504204 100644 > --- a/dlls/msxml3/domdoc.c > +++ b/dlls/msxml3/domdoc.c > @@ -486,6 +486,16 @@ static xmlDocPtr doparse(domdoc* This, char const* > ptr, int len, xmlCharEncoding > sax_serror /* serror */ > }; > > + /* UTF-16 BOM at start of data */ > + if ((len > 2) && (ptr[0] == (char)0xff) && (ptr[1] == (char)0xfe)) { > + ptr += 2; > + len -= 2; > + if (encoding == XML_CHAR_ENCODING_NONE) > + encoding = XML_CHAR_ENCODING_UTF16LE; > + else > + FIXME("Not changing xml encoding type from %d to > XML_CHAR_ENCODING_UTF16LE.\n", encoding); > + } > + > pctx = xmlCreateMemoryParserCtxt(ptr, len); > if (!pctx) > { > -- > 1.7.10.4 > > > >

1 0

Re: msvcrt: implement _ftol in msvcrt instead of forwarding to ntdll (1/2)
by Alexandre Julliard 13 Dec '12

13 Dec '12

Austin English <austinenglish(a)gmail.com> writes: > On Wed, Dec 12, 2012 at 5:57 PM, Austin English <austinenglish(a)gmail.com> wrote: >> From the keeping Focht happy team >> >> This patch series fixes http://bugs.winehq.org/show_bug.cgi?id=13401 >> >> -- >> -Austin > > Only export the symbol on 32-bit. This should be properly integrated with the rest of the math functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/7] advapi32: Support service objects in GetSecurityInfo (try 4).
by Alexandre Julliard 13 Dec '12

13 Dec '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > + /* Test using GetSecurityInfo to obtain security information */ > + SetLastError(0xdeadbeef); > + retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, &sidOwner, > + &sidGroup, &dacl, &sacl, &pSD); > + error = GetLastError(); > + LocalFree(pSD); > + ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); > + todo_wine ok(error == ERROR_INSUFFICIENT_BUFFER || broken(error == ERROR_SUCCESS) /* W2K3 */ > + || broken(error == ERROR_IO_PENDING) /* W2K */ || broken(error == ERROR_NONE_MAPPED) /* NT4 */, > + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); Testing last error on success is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] [WineHelp]: added basic infrastructure for a new wineconsole mode: line
by Alexandre Julliard 13 Dec '12

13 Dec '12

Eric Pouech <eric.pouech(a)orange.fr> writes: > +/****************************************************************** > + * WCLINE_SetTitle > + * > + * Sets the title to the wine console > + */ > +static void WCLINE_SetTitle(const struct inner_data* data) > +{ > + WCHAR wbuf[256]; > + > + if (WINECON_GetConsoleTitle(data->hConIn, wbuf, sizeof(wbuf)/sizeof(WCHAR))) > + { > + char buffer[256]; > + > + WideCharToMultiByte(CP_UNIXCP, 0, wbuf, -1, buffer, sizeof(buffer), > + NULL, NULL); > + fputs("\033]2;", stdout); > + fputs(buffer, stdout); > + fputc('\a', stdout); > + fflush(stdout); > + } > +} I don't think you want to do that. You would need at least to check the terminal type, and make sure that stdout is actually going to the terminal. I'm not sure it's worth the trouble. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msvcrt: implement _ftol in msvcrt instead of forwarding to ntdll (1/2)
by Piotr Caban 13 Dec '12

13 Dec '12

On 12/13/12 02:57, Austin English wrote: + * Based on MSVCRT__ftol in dlls/ntdll/misc.c + */ +#if defined(__GNUC__) && defined(__i386__) +LONGLONG CDECL MSVCRT__ftol(void) +{ +@ cdecl -ret64 _ftol() MSVCRT__ftol +@ cdecl -ret64 _ftol2() MSVCRT__ftol This will not work on 64-bit build or when __GNUC__ is not defined. I don't see _ftol function in native 64-bit msvcrt, maybe it should not be exported there.

2 1

Re: [PATCH 2/4] msvcrt: Support expand_wildcards parameter in __getmainargs function
by Alexandre Julliard 13 Dec '12

13 Dec '12

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -359,6 +360,51 @@ void msvcrt_free_args(void) > HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); > HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); > HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); > + HeapFree(GetProcessHeap(), 0, argv_expand); > +} > + > +static int build_expanded_argv(int *argc, char **argv) > +{ > + int i, size=0, args_no=0; > + HANDLE h; > + > + args_no = 0; > + for(i=0; i<__wine_main_argc; i++) { > + WIN32_FIND_DATAA data; > + int len = 0; > + > + h = FindFirstFileA(__wine_main_argv[i], &data); > + if(h != INVALID_HANDLE_VALUE) { > + do { > + if(data.cFileName[0]=='.' && (data.cFileName[1]=='\0' || > + (data.cFileName[1]=='.' && data.cFileName[2]=='\0'))) > + continue; > + > + len = strlen(data.cFileName)+1; > + if(argv) { > + argv[args_no] = (char*)(argv+*argc)+size; > + memcpy(argv[args_no], data.cFileName, len*sizeof(char)); > + } That won't work if the wildcard contains a path. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Dmitry Timoshkov 13 Dec '12

13 Dec '12

Detlef Riekenberg <wine.dev(a)web.de> wrote: > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); A usual form for such comparisons is ok(hr == E_FAIL || hr == E_NOTIMPL /* win8 */, "got 0x%08x.\n", hr); that helps to avoid redundant and duplicating information. -- Dmitry.

1 0

Re: [PATCH] comdlg32/tests: Accept win8 failure-code
by Nikolay Sivov 13 Dec '12

13 Dec '12

It probably makes sense to marking old one as broken, as E_NOTIMPL sounds better in this case. This could potentially break things of course if application checks for strict equality of the error code. On Thu, Dec 13, 2012 at 8:02 AM, Detlef Riekenberg <wine.dev(a)web.de> wrote: > winetestbot crash sometimes in comdlg32:itemdlg on win7 or win2008, > but that is independant from this win8 fix. > > http://test.winehq.org/data/tests/comdlg32:itemdlg.html > > > -- > By by ... Detlef > --- > dlls/comdlg32/tests/itemdlg.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c > index ce05ed8..7bffcbd 100644 > --- a/dlls/comdlg32/tests/itemdlg.c > +++ b/dlls/comdlg32/tests/itemdlg.c > @@ -278,13 +278,16 @@ static BOOL test_instantiation(void) > IShellBrowser *psb; > > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_IExplorerBrowser, (void**)&peb); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb); > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_IShellBrowser, (void**)&psb); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IShellBrowser_Release(psb); > hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, > &IID_ICommDlgBrowser, (void**)&punk); > - ok(hr == E_FAIL, "got 0x%08x.\n", hr); > + /* win8: E_NOTIMPL */ > + ok(hr == E_FAIL || hr == E_NOTIMPL, "got 0x%08x.\n", hr); > if(SUCCEEDED(hr)) IUnknown_Release(punk); > hr = IServiceProvider_QueryService(psp, > &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); > ok(hr == S_OK, "got 0x%08x.\n", hr); > -- > 1.7.5.4 > > > >

1 0

RFC: Remove auto-scan of ALSA devices from winealsa.drv
by Joerg-Cyril.Hoehle＠t-systems.com 13 Dec '12

13 Dec '12

Hi, Here's my proposal: winealsa shall stop enumerating ALSA devices. By default, it should solely provide access to ALSA's default device adequately named "default". The code that currently scans the registry Software\Wine\Drivers\winealsa.drv\devices=... shall remain in place, allowing a comma-separated list of alternate ALSA device names for those setups where "default" is not the preferred ALSA choice. Rationale: ALSA front-ends (pulse, dmix etc.) compete for the few back-ends (one or 2 sound cards or audio plugs). Some front-ends cling to the back ends even when unused. This has been known to cause random bugs. - Test suites failing randomly ("resource temporarily unavailable") e.g. bug #28109, #28048 or randomly performing more or less tests, depending on whether the app managed to open the device or not. - Sound stopping in apps (I believe when transitioning from intros to the main menu or game, at which time a rescan of all audio devices happens as mmdevapi is reopened). Nobody found an elegant way to robustly enumerate ALSA devices (some apps hard-wire common names...), so let's simply avoid the issue entirely. On many systems, the current code enumerates a quite uninteresting set of devices, e.g. "default", "plughw:0" and "plughw:4". These days, who wants hw:0 without mixing? I never heard any sound from "hw:4". The current code fails to enumerate some existing devices like "plug:dmix". OTOH, enumerating solely "default" or the user's hand-edited list of devices is expected to provide repeatable and best results. Cost to users: Users with a working ALSA device "default" should experience no drawback, only benefits. I believe this is the vast majority of users. Users that edit their ~/.asoundrc to define other devices without simultaneously overriding !default will have to additionally edit the Wine registry to name their working ALSA capture and render devices, e.g. "asnoop" and "amix". winecfg may or may not provide a GUI for editing this. This would be similar to most multimedia players allowing some way to change the ALSA device to use. It's a pity that the registry scheme AFAIK does not allow per-app audio settings, but that's a completely unrelated issue. Cost of non-adoption: Users and audio devs remain annoyed. Bug reports remain open. Unpredictable and erratic loss of sound possible each time mmdevapi rescans the ALSA devices. Please comment, Jörg Höhle

6 13

Announcing the Mac driver
by Ken Thomases 12 Dec '12

12 Dec '12

Greetings Wine community, As many of you may be aware, CodeWeavers just released CrossOver 12. We're pleased to announce that CrossOver 12 includes the long-awaited Mac driver. If you're not familiar with it, the Mac driver is an alternative to Wine's X11 driver for use on Mac OS X. It allows Wine to present windows, receive input from the keyboard and mouse, and interact with system facilities like the clipboard using Cocoa and other Mac-native APIs. That allows for superior integration into the Mac UI and eliminates the need for the foreign X11 middleware. The Mac driver is not yet complete but it's pretty far along. In CrossOver 12, it's described as an "experimental" feature and is disabled by default. We're aware of chunks of functionality, both big and small, that are simply not implemented yet and there are surely many bugs in need of squashing. You can take a look at the source in CodeWeavers' usual Wine source tarball at <http://www.codeweavers.com/products/faq/source/>. The Mac driver lives in dlls/winemac.drv. Because it was under (somewhat chaotic) development right up until the release of CrossOver 12, we do not yet have a series of clean patches for it to submit to Wine. In the coming days and weeks, I will be reconstructing the Mac driver as just such a patch series and submitting it. Mind you, those patches will face the same demanding scrutiny from Alexandre as everything else, so that process may be slow and painful. I'm SO looking forward to that! Thank you to everyone who contributes to Wine for making this possible. It will be fun to work with you on continuing development of the Mac driver. Cheers, Ken

5 6

Re: wininet: Don't perform revocation checks when verifying a certificate.
by Jacek Caban 12 Dec '12

12 Dec '12

Hi Hans, On 12/11/12 09:45, Hans Leidekker wrote: > https://testbot.winehq.org/JobDetails.pl?Key=23300 is a test which shows that > revocation checks fail for the certificate on outlook.com when passed straight > to CertVerifyRevocation. The reason is that a CRL link specified in the > certificate does not resolve. > > https://testbot.winehq.org/JobDetails.pl?Key=23301 is a test which makes > a secure connection to outlook.com from wininet and shows that this succeeds. > > My conclusion is that native wininet doesn't perform revocation checks. Your tests prove that we should relax our verification on CERT_TRUST_IS_OFFLINE_REVOCATION or something similar. To prove that revocation checks are not made, a test with truly revoked cert would be needed. Jacek

3 6

Re: [PATCH 1/3] jscript: Throw an error if return statement is in eval code
by Marvin 12 Dec '12

12 Dec '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=23356 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: d3d11: add a stub dll
by Henri Verbeet 11 Dec '12

11 Dec '12

On 11 December 2012 04:16, Austin English <austinenglish(a)gmail.com> wrote: > + * Copyright 2012 The Wine Project I don't think that kind of thing really makes sense unless you also define "The Wine Project" as some kind of legal entity somewhere. > + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); 0x%p is just wrong, and %d is at least questionable for a DWORD. I suspect this was just copied from somewhere else though.

2 1

Re: testbot: Fix the ConfigLocal.pl include path.
by Alexandre Julliard 11 Dec '12

11 Dec '12

Francois Gouget <fgouget(a)codeweavers.com> writes: > @@ -88,12 +88,11 @@ $JobArchiveDays = 0; > if (!$::BuildEnv) > { > $::BuildEnv = 0; > - eval 'require "$::RootDir/ConfigLocal.pl";'; > + eval 'require "$::RootDir/lib/WineTestBot/ConfigLocal.pl"'; > if ($@) > { > - print STDERR "Please create a valid $::RootDir/ConfigLocal.pl, " . > - "use $::RootDir/lib/WineTestBot/ConfigLocalTemplate.pl as template\n"; > - exit; > + print STDERR "Please create a valid $::RootDir/lib/WineTestBot/ConfigLocal.pl file, use ConfigLocalTemplate.pl as template\n"; > + exit(1); I had changed it because we don't want to have local config files inside the git checkout. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/3] include: Define FIELD_OFFSET to the standard offsetof macro
by Michael Stefaniuc 11 Dec '12

11 Dec '12

On 12/10/2012 07:37 PM, Amine Khaldi wrote: > This prevents the undefined behavior (null pointer dereference) > diagnostics (clang with ubsan checks for example). This is a bug in clang. There is no null pointer dereference. Afair gcc tried to pull this trick too but got educated about their error. > > --- > include/winnt.h | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/winnt.h b/include/winnt.h > index 207adaa..a3b996a 100644 > --- a/include/winnt.h > +++ b/include/winnt.h > @@ -746,8 +746,12 @@ typedef struct _MEMORY_BASIC_INFORMATION > > #define UNICODE_STRING_MAX_CHARS 32767 > > +#if defined(__GNUC__) || defined(__clang__) > +#define FIELD_OFFSET(type, field) offsetof(type, field) > +#else > #define FIELD_OFFSET(type, field) \ > ((LONG)(INT_PTR)&(((type *)0)->field)) > +#endif > > #define CONTAINING_RECORD(address, type, field) \ > ((type *)((PCHAR)(address) - (PCHAR)(&((type *)0)->field))) bye michael

2 2

Re: [PATCH 1/3] atl: Allow version-based differences in struct layouts
by Marvin 10 Dec '12

10 Dec '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=23310 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH] ntdll/tests: Accept larger SYSTEM_CACHE_INFORMATION on win8
by Marvin 10 Dec '12

10 Dec '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=23306 Your paranoid android. === W2KPROSP4 (32 bit info) === info.c:515: Test failed: Inconsistent length 0 info.c:522: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:527: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:532: Test failed: Inconsistent length 36 === WXPPROSP3 (32 bit info) === info.c:515: Test failed: Inconsistent length 0 info.c:522: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:527: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:532: Test failed: Inconsistent length 36 === W2K3R2SESP2 (32 bit info) === info.c:515: Test failed: Inconsistent length 0 info.c:522: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:527: Test failed: Expected STATUS_SUCCESS, got c0000004 info.c:532: Test failed: Inconsistent length 36 === WVISTAADM (32 bit info) === info.c:515: Test failed: Inconsistent length 12 info.c:532: Test failed: Inconsistent length 36 === W2K8SE (32 bit info) === info.c:515: Test failed: Inconsistent length 12 info.c:532: Test failed: Inconsistent length 36 === W7PRO (32 bit info) === info.c:515: Test failed: Inconsistent length 12 info.c:532: Test failed: Inconsistent length 36 === W7PROX64 (32 bit info) === info.c:515: Test failed: Inconsistent length -16 info.c:523: Test failed: Inconsistent length 36 info.c:528: Test failed: Inconsistent length 36 info.c:532: Test failed: Inconsistent length 36 === TEST64_W7SP1 (32 bit info) === info.c:515: Test failed: Inconsistent length -16 info.c:523: Test failed: Inconsistent length 36 info.c:528: Test failed: Inconsistent length 36 info.c:532: Test failed: Inconsistent length 36 === W7PROX64 (64 bit info) === info.c:532: Test failed: Inconsistent length 64 === TEST64_W7SP1 (64 bit info) === info.c:532: Test failed: Inconsistent length 64

1 0

[PATCH] dsound: Use event based threads
by Joerg-Cyril.Hoehle＠t-systems.com 10 Dec '12

10 Dec '12

Hi, Maarten Lankhorst queried: >Bump, anything wrong with this patch? Here's my 0.0$ ... (standard DSound disclaimer here...) Using mmdevapi's events in DSound is basically TRT. Then, the DSound mixer will be synchronized with mmdevapi writes. >+ /* ALSA is retarded, add a timeout.. */ >+ ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); How does that comment help the reader of the code? >+ if (period_ms <= 15) >+ device->sleeptime = period_ms * 5 / 2; >+ else >+ device->sleeptime = period_ms * 3 / 2; I expect such threshold functions to be continuous or at least monotonic. A sawtooth is certainly unexpected. What is its purpose? What I would understand is a comment in the code saying that as of 2012, all 3 wine*.drv mmdevapi drivers have a bug that they stop sending events after IAudioClient_Stop. Therefore add a short timeout to the wait. If that's the reason for the timeout, then period_ms * 1.5 is perfectly fine. There's no reason for a particular threshold. Note that neither 1.5 nor 2.5 give you regular spacing around the time of transition from playing to stopped. + IAudioClient_GetStreamLatency(device->client, &period); + period_ms = (period + 9999) / 10000; If IAC_Stop is the reason for the sleep time out, then it's obvious that GetStreamLatency has no business here, rather than the device period. I could understand a use of GetStreamLatency when it comes to computing a reasonable size of the primary buffer. + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); + ... if (ret) WaitFor* return values are defined in terms of WAIT_OBJECT_0, WAIT_TIMEOUT and WAIT_FAILED etc., not zero or non-zero. >+ device->sleepev = CreateEventW(0, 0, 0, 0); >+ device->thread = CreateThread(0, 0, DSOUND_mixthread, device, 0, 0); I haven't checked the overall style of DSound, but I prefer FALSE and TRUE be used for things advertised as BOOL. (I tend to write NULL for null pointer initialisation. Note that I easily read "if (foo) ..." for boolean and pointer types; I don't expect "if (foo == TRUE) or (foo != NULL) ...") BTW, I still believe that mixing and resampling would find their best place in mmdevapi, not DSound. Regards, Jörg Höhle

3 5

Re: msi: Fix logical expressions that always evaluate to FALSE
by Hans Leidekker 10 Dec '12

10 Dec '12

On Sat, 2012-12-08 at 21:59 +0000, Andrew Talbot wrote: > diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index 076d1b3..677a43f 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -6763,7 +6763,7 @@ static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) > #define ENV_MOD_PREFIX 0x80000000 > #define ENV_MOD_MASK 0xC0000000 > > -#define check_flag_combo(x, y) ((x) & ~(y)) == (y) > +#define check_flag_combo(x, y) ((x) & (y)) == (y) > > static UINT env_parse_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) > { It makes the tests fail here: err:msi:env_parse_flags Invalid flags: 00000007 err:msi:ITERATE_Actions Execution halted, action L"RemoveEnvironmentStrings" returned 1627 err:msi:env_parse_flags Invalid flags: 00000007 action.c:5899: Test failed: Expected ERROR_SUCCESS, got 1627 action.c:5905: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0 action.c:5908: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0 action.c:5920: Test failed: Expected ERROR_FILE_NOT_FOUND, got 0 I'd suggest to simply remove these checks.

1 0

Re: [PATCH 1/4] kernel32: Support UTF-7 in MultiByteToWideChar.
by Dmitry Timoshkov 10 Dec '12

10 Dec '12

Alex Henrie <alexhenrie24(a)gmail.com> wrote: > I came back to the problem of UTF-7 support and made some improvements > to my previous submission. The tests are now more stringent, especially > in regard to null terminator checking, and they test the srclen > parameter more thoroughly now as well. > > I also noticed that a related test for error checking was marked > todo_wine. The fix was trivial and is included as a fourth patch. > > Please let me know what you think. I'm willing to put some more effort > into this. Why don't you put it in libs/wine where other unicode conversion routines are implemented? Also you probably need to add support for composition/ surrogates like other implementations do. -- Dmitry.

5 12

Re: [PATCH 4/6] server: Store and return security attributes with extended file attributes (try 5).
by Anssi Hannula 09 Dec '12

09 Dec '12

Hi, 27.11.2012 00:45, Erich E. Hoover kirjoitti: > This patch adds the ability to store and retrieve the security > attributes of a file by turning them into extended file attributes (if > available). These attributes are stored in the attribute > "user.WINEACL" in the form: > <ACE1>;<ACE2>;...;<ACEN> > where each ACE takes the form: > <Type>,<Flags>,<Mask>,<SID> > With this information it is possible to more accurately store the ACL > information files, and also allows patch 5 to tell whether it's > necessary for an ACL to be inherited by a contained file in a folder. I don't see the need for an uppercase "WINEACL" in the attribute name, especially since all the examples in e.g. attr(5) are lowercase. Moreover, [1] recommends using application specific namespaces in the attribute name, so IMHO a better attribute name would be "user.wine.acl". </bikeshedding> Thanks for your work on this :) [1] http://www.freedesktop.org/wiki/CommonExtendedAttributes -- Anssi Hannula

2 2

Re: [2/3] xmllite: Support comment nodes
by Marvin 09 Dec '12

09 Dec '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=23296 Your paranoid android. === W7PROX64 (64 bit reader) === reader.c:571: Test failed: Expected S_OK, got 80070057 Timeout === TEST64_W7SP1 (64 bit reader) === reader.c:571: Test failed: Expected S_OK, got 80070057 Timeout

1 0

Re: [1/3] xmllite: Track internal parser state to select expected node type
by Marvin 09 Dec '12

09 Dec '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=23295 Your paranoid android. === W7PROX64 (64 bit reader) === reader.c:571: Test failed: Expected S_OK, got 80070057 Timeout === TEST64_W7SP1 (64 bit reader) === reader.c:571: Test failed: Expected S_OK, got 80070057 Timeout

1 0

Re: [PATCH] gdi32: Don't enumerate fonts when OpenFontFace fails (try 2).
by Alexandre Julliard 07 Dec '12

07 Dec '12

Qian Hong <fracting(a)gmail.com> writes: > dlls/gdi32/freetype.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) It's causing a test failure: ../../../tools/runtest -q -P wine -M gdiplus.dll -T ../../.. -p gdiplus_test.exe.so font.c && touch font.ok font.c:400: Test failed: Expected 0, got 3 font.c:401: Test failed: got NULL font collection make[1]: *** [font.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 3/3] msxml3: Tests code clean up
by Marvin 07 Dec '12

07 Dec '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=23267 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 2/3] msxml3: Added URL validation tests
by Marvin 07 Dec '12

07 Dec '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=23266 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH] gdi32: Don't enumerate font when OpenFontFace fails.
by Dmitry Timoshkov 06 Dec '12

06 Dec '12

Qian Hong <fracting(a)gmail.com> wrote: > - GetEnumStructs( face, &elf, &ntm, &type ); > + if (!get_enum_structs( face, &elf, &ntm, &type )) return FALSE; > free_family( family ); 'face' and 'family' are leaked here. Also returning FALSE at this point is too late since both 'face' and 'family' are already in the linked lists. -- Dmitry.

2 2

Re: [1/2] schannel/tests: Fix test on win8
by Hans Leidekker 06 Dec '12

06 Dec '12

On Thu, 2012-12-06 at 12:56 +0100, André Hentschel wrote: > diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c > index b576848..9c28e8b 100644 > --- a/dlls/schannel/tests/main.c > +++ b/dlls/schannel/tests/main.c > @@ -179,8 +179,8 @@ static void testGetInfo(void) > /* First package: Unified */ > status = pTables->GetInfo(&PackageInfo); > ok(status == STATUS_SUCCESS, "status: 0x%x\n", status); > - ok(PackageInfo.fCapabilities == 0x107b3, "fCapabilities: 0x%x\n", > - PackageInfo.fCapabilities); > + ok((PackageInfo.fCapabilities & ~SECPKG_FLAG_APPCONTAINER_PASSTHROUGH) == 0x107b3, > + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); > ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); > ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); > ok(PackageInfo.cbMaxToken == 0x4000 || A nicer fix would be to use a disjunction of or-ed symbolic constants, just like the negotiate test.

1 0

[3/4] gdiplus: Always use AlphaBlend to draw to 32-bit DIB's.
by Vincent Povirk 05 Dec '12

05 Dec '12

1 0

Re: [PATCH] winmm: Don't mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound
by Dmitry Timoshkov 05 Dec '12

05 Dec '12

Andrew Eikum <aeikum(a)codeweavers.com> wrote: > + br = sndPlaySoundA((LPCSTR)SND_ALIAS_SYSTEMASTERISK, SND_ALIAS_ID|SND_SYNC); > + ok(br == TRUE || br == FALSE, "sndPlaySound gave strange return: %u\n", br); This kind of test is broken. -- Dmitry.

3 9

Re: testbot/build: Chdir to the Wine source directory before calling 'git apply'.
by Henri Verbeet 05 Dec '12

05 Dec '12

On 5 December 2012 05:35, Francois Gouget <fgouget(a)codeweavers.com> wrote: > The --directory option is not meant to specify where the Git repository lives. > --- > > I'm not sure how it worked before. Maybe this use of the --directory > option worked by chance but git changed and broke it. > Alternatively you could set GIT_DIR, although I'm not quite familiar enough with the code to know if there's a reason to prefer one over the other.

1 0

d3dx9_36 [patch 1/3]: Implement D3DXSHEvalHemisphereLight
by Nozomi Kodama 05 Dec '12

05 Dec '12

Hello any problems with the patches http://source.winehq.org/patches/data/91986 http://source.winehq.org/patches/data/91985 http://source.winehq.org/patches/data/91984 Best regards, Nozomi

2 1

Re: [2/3] gdiplus: If a 32-bit dib is selected in an hdc, use the dib directly.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Vincent Povirk <madewokherd(a)gmail.com> writes: > @@ -2264,6 +2266,41 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra > if(graphics == NULL) > return InvalidParameter; > > + hbm = GetCurrentObject(hdc, OBJ_BITMAP); > + if (hbm && GetObjectW(hbm, sizeof(dib), &dib) && dib.dsBm.bmBitsPixel == 32) > + { > + /* Make a bitmap object so we can use the alpha channel */ > + GpBitmap *bitmap; > + DWORD height, stride; > + BYTE *bits; > + > + height = abs(dib.dsBmih.biHeight); > + stride = dib.dsBmih.biWidth * 4; > + > + if(dib.dsBmih.biHeight > 0) /* bottom-up */ > + { > + bits = (BYTE*)dib.dsBm.bmBits + (height - 1) * stride; > + stride = -dib.dsBmih.biWidth * 4; > + } > + else > + bits = dib.dsBm.bmBits; > + > + retval = GdipCreateBitmapFromScan0(dib.dsBmih.biWidth, height, stride, > + PixelFormat32bppPARGB, bits, &bitmap); This won't work, you won't get a negative height with GetObject, and you won't get DIB info at all for DDBs. Also not all DIBs are in PARGB format. -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: mshtml: Added support for converting (some) argument types in builtin function calls using script engine
by Marvin 04 Dec '12

04 Dec '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=23216 Your paranoid android. === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

2 1

Re: DSound/winepulse review
by Maarten Lankhorst 04 Dec '12

04 Dec '12

Added wine-devel to cc Op 26-10-12 13:12, Joerg-Cyril.Hoehle(a)t-systems.com schreef: > Maarten, > > I'll try and come up with a review of your winepulse patches yet I'm not familiar with the PA API. > > Regarding your dsound ones, I'm sorry I've not enough experience > with the DSound API to be really useful. I was happy that Alexey Loukianov and A.Eikum > worked on DSound. > > One issue that struck me is the 5ms period downgrade in winepulse. > I advise you keep that as a separate patch. Halving the externally visible SetEVentHandle rate > is certainly not something that should be in the one big core patch introducing winepulse. Yeah this was explicitly to make skyrim work better, I return the updated latency in GetStreamLatency, and with the fixes wine dsound uses that value for calculating mixing fraglen. > Even if it causes no test failure, that trick would certainly be visible in the log lines. Native shows: > render.c:2084: Should play 1000ms continuous tone with fragment size 480. > render.c:2136: Released 48000=100x480 -960 frames at 48000 worth 980ms in 1008ms Yeah I seem to fire more events, so less data gets played. This requires some rethinking though, winepulse doesn't attempt to hide latency at all, and so far the mmdevapi tests have failed on my usb headphones because it didn't always have a smooth buffer increment. The tests don't fail, but because of the extra firing processing sometimes gets skipped.. Woops, some more digging revealed I also seemed to have done a SetEvent in pulse_started_callback, which is entirely bogus, presumably a leftover from before I hooked up the latency callback for when in underrun mode. With that SetEvent part of the latency hack disabled and the bogus SetEvent removed, I get: render.c:2127: Released 44541=101x441 -441 frames at 44100 worth 1000ms in 1003ms Can't get better than that. :-) I disabled the exclusive mode on winepulse because I felt that mode was sufficiently different in behavior, and I don't think the mmdevapi tests cover it properly. I'll do some more digging if the SetEvent is still needed for the hack, or if the period lowering is enough. I would suspect lowering the period is sufficient now. Quick testing of skyrim seems to indicate I can leave the SetEvent part out, so I pass all tests properly again. :-) > BTW, I'd still be pleased if you could upload somewhere to bugzilla results from > runtest -v -i mmdevapi/render and capture > from your winepulse driver. I think I asked you that favour already but found nothing. My tree removes todo_wine from the tests, but anyway: capture.c:501: Returned periods: 10.0000 ms 0.4988 ms capture.c:513: pwfx: 0xdccb0 capture.c:514: Tag: fffe capture.c:515: bits: 32 capture.c:516: chan: 2 capture.c:517: rate: 44100 capture.c:518: align: 8 capture.c:519: extra: 22 capture.c:524: Res: 32 capture.c:525: Mask: 3 capture.c:526: Alg: FLOAT capture.c:585: Returned latency: 10.0000 ms capture.c:185: Wait'ed position 0 pad 0 flags 0, amount of frames locked: 441 capture.c:247: Sleep.1 position 441 pad 15435 flags 0, amount of frames locked: 441 capture.c:291: GetBufferSize 22050 period size 441 capture.c:301: Overrun position 1323 pad 22050 flags 1, amount of frames locked: 441 capture.c:328: Cont'ed position 1764 pad 21609 flags 0, amount of frames locked: 441 capture.c:352: Restart position 2205 pad 21168 flags 0, amount of frames locked: 441 capture.c:383: Reset position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:409: Running position 23373 pad 7938 flags 0, amount of frames locked: 441 capture: 255 tests executed (0 marked as todo, 0 failures), 0 skipped. render.c:185: Returned periods: 10.0000 ms 2.0000 ms render.c:197: pwfx: 0xdccb0 render.c:198: Tag: fffe render.c:199: bits: 32 render.c:200: chan: 6 render.c:201: rate: 48000 render.c:202: align: 24 render.c:203: extra: 22 render.c:208: Res: 32 render.c:209: Mask: 3f render.c:210: Alg: FLOAT render.c:268: Initialize(duration=0) GetBufferSize is 192 render.c:333: Returned latency: 10.0000 ms render.c:411: IsSupported(shared , 8000x 8x1) render.c:411: IsSupported(shared , 8000x 8x2) render.c:411: IsSupported(shared , 8000x16x1) render.c:411: IsSupported(shared , 8000x16x2) render.c:411: IsSupported(shared , 11025x 8x1) render.c:411: IsSupported(shared , 11025x 8x2) render.c:411: IsSupported(shared , 11025x16x1) render.c:411: IsSupported(shared , 11025x16x2) render.c:411: IsSupported(shared , 12000x 8x1) render.c:411: IsSupported(shared , 12000x 8x2) render.c:411: IsSupported(shared , 12000x16x1) render.c:411: IsSupported(shared , 12000x16x2) render.c:411: IsSupported(shared , 16000x 8x1) render.c:411: IsSupported(shared , 16000x 8x2) render.c:411: IsSupported(shared , 16000x16x1) render.c:411: IsSupported(shared , 16000x16x2) render.c:411: IsSupported(shared , 22050x 8x1) render.c:411: IsSupported(shared , 22050x 8x2) render.c:411: IsSupported(shared , 22050x16x1) render.c:411: IsSupported(shared , 22050x16x2) render.c:411: IsSupported(shared , 44100x 8x1) render.c:411: IsSupported(shared , 44100x 8x2) render.c:411: IsSupported(shared , 44100x16x1) render.c:411: IsSupported(shared , 44100x16x2) render.c:411: IsSupported(shared , 48000x 8x1) render.c:411: IsSupported(shared , 48000x 8x2) render.c:411: IsSupported(shared , 48000x16x1) render.c:411: IsSupported(shared , 48000x16x2) render.c:411: IsSupported(shared , 96000x 8x1) render.c:411: IsSupported(shared , 96000x 8x2) render.c:411: IsSupported(shared , 96000x16x1) render.c:411: IsSupported(shared , 96000x16x2) render.c:2174: Output to a MS-DOS console is particularly slow and disturbs timing. render.c:2175: Please redirect output to a file. render.c:870: Testing shared mode render.c:902: Latency: 10.0000 ms render.c:921: BufferSize 24000 estimated fragment 480 x 50 = 24000 render.c:945: Clock Frequency 1152000 render.c:974: data at 0x530030 render.c:1023: padding 14302 past sleep #2 render.c:1042: padding 14302 position 232752 past stop #2 render.c:1076: data at 0x530030 render.c:1100: position 115416 past 100ms sleep #3 render.c:1117: padding 18711 position 126936 past stop #3 render.c:1145: data at 0x530030 for prefill 22500 render.c:1175: hpctime 381 after 370ms render.c:1194: hpctime 481 pcpos 492 render.c:1199: padding 1250 position 510000/21250 slept 470ms iteration 0 render.c:1227: data at 0x530030 render.c:1194: hpctime 589 pcpos 599 render.c:1199: padding 18551 position 634776/26449 slept 570ms iteration 1 render.c:1232: data at 0x530030 (small 5449) render.c:1194: hpctime 691 pcpos 701 render.c:1199: padding 19321 position 747072/31128 slept 670ms iteration 2 render.c:1232: data at 0x530030 (small 4679) render.c:1194: hpctime 793 pcpos 803 render.c:1199: padding 18727 position 873624/36401 slept 770ms iteration 3 render.c:1232: data at 0x530030 (small 5273) render.c:1194: hpctime 895 pcpos 905 render.c:1199: padding 19089 position 991488/41312 slept 870ms iteration 4 render.c:1232: data at 0x530030 (small 4911) render.c:1194: hpctime 996 pcpos 1007 render.c:1199: padding 19279 position 1104792/46033 slept 970ms iteration 5 render.c:1232: data at 0x530030 (small 4721) render.c:1194: hpctime 1098 pcpos 1109 render.c:1199: padding 18961 position 1225728/51072 slept 1070ms iteration 6 render.c:1232: data at 0x530030 (small 5039) render.c:1194: hpctime 1200 pcpos 1211 render.c:1199: padding 19326 position 1337904/55746 slept 1170ms iteration 7 render.c:1232: data at 0x530030 (small 4674) render.c:1194: hpctime 1302 pcpos 1312 render.c:1199: padding 18970 position 1458624/60776 slept 1270ms iteration 8 render.c:1232: data at 0x530030 (small 5030) render.c:1248: position 1458624 render.c:1257: position 2034624 past underrun, 0 padding left, 84776 frames written render.c:1279: hpctime 2304 after underrun render.c:882: Testing exclusive mode at 48000 render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1002ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1004ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 1003ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1007ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1002ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -480 frames at 48000 worth 1000ms in 1005ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 997ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 999ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -330 frames at 48000 worth 1003ms in 1009ms render.c:2075: Should play 1000ms continuous tone with fragment size 480. render.c:2127: Released 48480=101x480 -960 frames at 48000 worth 990ms in 1003ms render: 4996 tests executed (0 marked as todo, 0 failures), 0 skipped. Sometimes up to 2 tests fail due to position updates not being regular, as you can see from this line: render.c:2127: Released 48480=101x480 -330 frames at 48000 worth 1003ms in 1009ms I suspect this is because it's nearly done playing though, but it can get worse when you use usb headphones, not much I can do about that though, except if I started lying, but it's so far been much simpler when I don't.. Exclusive mode tests aren't done, I disabled exclusive mode because I felt tests were insufficient. If you can point me to an application using it I'll work on it though, but I didn't feel mmdevapi tests were complete enough for handling this. *BONUS* My favorite capture results (a2dp phone as "microphone"): capture.c:501: Returned periods: 135.2834 ms 135.2834 ms capture.c:513: pwfx: 0xdccb0 capture.c:514: Tag: fffe capture.c:515: bits: 32 capture.c:516: chan: 2 capture.c:517: rate: 44100 capture.c:518: align: 8 capture.c:519: extra: 22 capture.c:524: Res: 32 capture.c:525: Mask: 3 capture.c:526: Alg: FLOAT capture.c:585: Returned latency: 135.2834 ms capture.c:168: Test failed: Waiting on event handle failed! capture.c:185: Wait'ed position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:217: Test failed: GetNextPacketSize 0 vs. GCP 0 capture.c:220: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:247: Sleep.1 position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:286: Test failed: GetNextPacketSize 0 vs. GetDevicePeriod 5966 capture.c:291: GetBufferSize 23864 period size 5966 capture.c:299: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:301: Overrun position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:326: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:328: Cont'ed position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:347: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:352: Restart position -559038737 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:354: Test failed: restarted GCP 0 capture.c:383: Reset position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:408: Test failed: Valid IAudioCaptureClient_GetBuffer returns 08890001 capture.c:409: Running position -1 pad 0 flags abadcafe, amount of frames locked: 0 capture.c:426: Test failed: Wait(event) after Stop gave 102 capture.c:434: Test failed: Wait(event) after Reset gave 102 capture.c:440: Test failed: Wait(NULL event) gave 102 capture: 224 tests executed (0 marked as todo, 12 failures), 0 skipped. I love this one because it shows that when you have a source that's not capturing, winepulse still gets the correct results. Even though obviously the tests completely fail because there's no data. ;-) ~Maarten

2 3

Re: [PATCH 1/5] [WineHelp]: added basic infrastructure for a new wineconsole mode: line
by Frédéric Delanoy 04 Dec '12

04 Dec '12

On Mon, Dec 3, 2012 at 10:12 PM, Eric Pouech <eric.pouech(a)orange.fr> wrote: > diff --git a/programs/wineconsole/line.c b/programs/wineconsole/line.c > new file mode 100644 > index 0000000..4b7fd29 > --- /dev/null > +++ b/programs/wineconsole/line.c > @@ -0,0 +1,334 @@ > +/* > + * a GUI application for displaying a console > + * Line back end > + * > + * Copyright 2002 Eric Pouech Guess that should be 2012 ;) Frédéric

1 0

Re: wshom: Basic support for REG_SZ values in RegRead() (try2)
by Jacek Caban 04 Dec '12

04 Dec '12

Hi Nikolay, On 12/04/12 10:33, Nikolay Sivov wrote: > + if (name[len] != '\\') > + return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); > + /* skip '\' after root name */ > + len++; > + > + /* at this point we have at least one '\' in path */ > + val = strrchrW(name, '\\'); > + keyname = SysAllocStringLen(&name[len], val-&name[len]); It's better, but now if there is only one backslash, you will have val-&name[len] == -1. Thanks, Jacek

1 0

Re: wshom: Basic support for REG_SZ values in RegRead()
by Jacek Caban 04 Dec '12

04 Dec '12

Hi Nikolay, On 12/03/12 12:29, Nikolay Sivov wrote: > + /* skip '\' after root name */ > + if (name[len] == '\\') len++; It looks like if name[len] != '\\', then name should be considered invalid. > + > + val = strlenW(name); > + while (name[--val] != '\\' && val) > + ; > + keyname = SysAllocStringLen(&name[len], val-len); This won't work if name has no backslashes. > + /* skip leading '\' */ > + val++; > + > + type = REG_NONE; > + datalen = 0; > + ret = RegGetValueW(root, keyname, &name[val], RRF_RT_ANY, &type, NULL, &datalen); > + if (ret == ERROR_SUCCESS) > + { > + if (type == REG_SZ) > + { > + V_VT(value) = VT_BSTR; > + V_BSTR(value) = SysAllocStringLen(NULL, datalen-1); > + ret = RegGetValueW(root, keyname, &name[val], RRF_RT_ANY, &type, V_BSTR(value), &datalen); > + } > + else > + FIXME("type %d not handled\n", type); This should return an error. Jacek

2 1

Re: [PATCH] ddraw: Create a dynamic buffer if DDLOCK_DISCARDCONTENTS is used
by Rico Schüller 04 Dec '12

04 Dec '12

On 03.12.2012 23:11, Stefan Dösinger wrote: > + DWORD pool = buffer->Caps & D3DVBCAPS_SYSTEMMEMORY ? WINED3D_POOL_SYSTEM_MEM : WINED3D_POOL_DEFAULT; ... > + return wined3d_buffer_create_vb(buffer->ddraw->wined3d_device, > + buffer->size, usage, pool, buffer, &ddraw_null_wined3d_parent_ops, > + wined3d_buffer); Is there a reason why you don't use "enum wined3d_pool" for pool? Cheers Rico

1 0

Re: [3/3] gdiplus: Bitmaps created from a 32-bit dib should be PARGB.
by Dmitry Timoshkov 04 Dec '12

04 Dec '12

Vincent Povirk <madewokherd(a)gmail.com> wrote: > case 32: > - format = PixelFormat32bppRGB; > + if (bm.bmBits) > + format = PixelFormat32bppPARGB; > + else > + format = PixelFormat32bppRGB; Besides the test failure, to my eyes format = bm.bmBits ? PixelFormat32bppPARGB : PixelFormat32bppRGB; looks shorter and clearer. -- Dmitry.

2 1

Re: [3/3] gdiplus: Bitmaps created from a 32-bit dib should be PARGB.
by Marvin 03 Dec '12

03 Dec '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=23202 Your paranoid android. === WXPPROSP3 (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === W2K3R2SESP2 (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === WVISTAADM (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === W2K8SE (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === W7PRO (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === W7PROX64 (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === TEST64_W7SP1 (32 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === W7PROX64 (64 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273 === TEST64_W7SP1 (64 bit image) === image.c:962: Test failed: Expected 925707, got 139273 image.c:1075: Test failed: Expected 925707, got 139273

1 0

Re: kernel32: Implement SetFileValidData. (try 2)
by Alexandre Julliard 03 Dec '12

03 Dec '12

Hans Leidekker <hans(a)codeweavers.com> writes: > QuickBooks 2008 calls this function. > --- > configure.ac | 1 + > dlls/kernel32/file.c | 12 +++- > dlls/kernel32/tests/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/ntdll/file.c | 28 +++++++++ > include/ddk/ntddk.h | 5 ++ > include/winbase.h | 1 + > 6 files changed, 181 insertions(+), 2 deletions(-) Still no luck: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so file.c && touch file.ok file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\removeme\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for \\?\C:\ err=5 should be 3 file.c:3528: Test succeeded inside todo block: SetFileValidData succeeded file.c:3532: Test failed: SetFileValidData failed 50 file.c:3548: Test succeeded inside todo block: SetFileValidData succeeded file.c:3552: Test failed: SetFileValidData failed 50 file.c:3555: Test failed: SetFileValidData failed 50 file.c:3559: Test succeeded inside todo block: SetFileValidData succeeded file.c:3563: Test failed: SetFileValidData failed 50 make: *** [file.ok] Error 7 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/3] shell32/tests: Add tests for DoEnvironmentSubstA/W
by Alexandre Julliard 03 Dec '12

03 Dec '12

Detlef Riekenberg <wine.dev(a)web.de> writes: > + /* Not all variables are supported before vista */ > + if (broken(*bufferA == '%')) > + trace("%d: %s not supported\n", i, bufferA); > + else > + { > + if (i < 3) todo_wine > + ok(HIWORD(res) && (LOWORD(res) == (lstrlenA(bufferA)+1)) && (*bufferA != '%'), > + "%d: got %d/%d and %s (len %d)\n", > + i, HIWORD(res), LOWORD(res), bufferA, lstrlenA(bufferA)); > + > + if (i < 3) todo_wine > + ok(HIWORD(res2) && (LOWORD(res2) == (lstrlenW(bufferW)+1)) && (*bufferW != '%'), > + "%d: got %d/%d and %s (len %d)\n", > + i, HIWORD(res2), LOWORD(res2), wine_dbgstr_w(bufferW), lstrlenW(bufferW)); > + } > + } This doesn't make sense, you are only testing the cases that don't work. You should pick a few variables that work everywhere, and test them properly, including the resulting buffer contents. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wshom: Basic support for REG_SZ values in RegRead()
by Marvin 03 Dec '12

03 Dec '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=23189 Your paranoid android. === WINEBUILD (build) === Can't determine base name

2 1

Re: comdlg32: Resize Find dialog to fit translations
by Dmitry Timoshkov 03 Dec '12

03 Dec '12

Aurimas Fišeras <aurimas(a)gmail.com> wrote: > Controls resized to fit translations for more languages. Tested with > resource editor. Did you see a comment in that file just before dialog templates? -- Dmitry.

2 4

testbot failures in advapi32 (security)
by Detlef Riekenberg 02 Dec '12

02 Dec '12

2 2

Small patch to make Adobe Lightroom 4.x work with wine 1.5.17
by Roland Baudin 02 Dec '12

02 Dec '12

Hi, here is a small patch that allows me to make Adobe Photoshop Lightroom 4.x work very well with wine 1.5.17. First let me recall that Adobe Photoshop Lightroom is *the* catalog and raw development application for professional photographers and hobbyists. The patch has two parts. The first part essentially modifies the file sync.c from the kernel32 dll and implements some functions related to Condition Variables. I found an original patch by Marcus Meissner and I fixed it because it led to a 100% CPU load. I tried to contact Marcus to discuss my changes with him, but he didn't answer and so I submit my changes to this list, otherwise my work would be lost... The second part modifies the file menu.c from the user32 dll. It allows the menu bar to appear in Lightroom when the windows version is set to winxp. I'm not the author of this patch but if I remember well, I found it several monthes ago somewhere in the wine patch list. With the patch applied, I was able to run Lightroom 4.2 flawessly, and it's very stable. I (and other users) have found only minor bugs (like a limitation of the number of shown thumbnails to 455 per folder on a 22 inches display) but the patch is a huge step forward for Lightroom. Here is a link where I explain the whole installation procedure (message #34) : http://www.pentaxforums.com/forums/digital-processing-software-printing/159… I apologize because I don't have the skills to write a test for the functions of this patch... Have a nice day, RB -- X File Explorer http://roland65.free.fr/xfe TexMaths http://roland65.free.de/texmaths Toutes Choses http://roland65.free.fr/ttc

2 1

Re: [Patch] wined3d: Add Recognition of NVIDIA GeForce GTX 660 Ti (Modified)
by Henri Verbeet 02 Dec '12

02 Dec '12

On 2 December 2012 01:10, Jiang Yike <futureway(a)asia.com> wrote: > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE4", CARD_NVIDIA_GEFORCE_GTX660Ti}, This makes no sense.

1 0

Invitation to connect on LinkedIn
by Yaron Shahrabani via LinkedIn 02 Dec '12

02 Dec '12

LinkedIn ------------ Yaron Shahrabani requested to add you as a connection on LinkedIn: ------------------------------------------ Simone, I'd like to add you to my professional network on LinkedIn. - Yaron Accept invitation from Yaron Shahrabani http://www.linkedin.com/e/-e2qz00-ha7yijh5-6t/qmvMTRNX8e7GRhbvVrqMlEBXQ4T3A… View profile of Yaron Shahrabani http://www.linkedin.com/e/-e2qz00-ha7yijh5-6t/rso/218721533/9a-d/name/16348… ------------------------------------------ You are receiving Invitation emails. This email was intended for Simone Giustetti. Learn why this is included: http://www.linkedin.com/e/-e2qz00-ha7yijh5-6t/plh/http%3A%2F%2Fhelp%2Elinke… (c) 2012, LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA.

1 0

Re: [PATCH] cabarc: Display message when extracting cab like in native.
by Alexandre Julliard 01 Dec '12

01 Dec '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -713,9 +716,16 @@ int wmain( int argc, WCHAR *argv[] ) > argv[--argc] = NULL; > } > } > - return extract_cabinet( buffer ); > + WINE_MESSAGE("Extracting file(s) from cabinet %s\n", wine_dbgstr_a(cab_file)); > + ret = extract_cabinet( buffer ); > + break; > default: > usage(); > - return 1; > + ret = 1; > + break; > } > + > + cab_free(cab_file); > + > + return ret; I don't think that's very useful. And freeing memory on process exit is even less useful. -- Alexandre Julliard julliard(a)winehq.org

2 5

wine-patches mailinglist problem
by André Hentschel 01 Dec '12

01 Dec '12

Hi, The wine-patches mailing list seems to stopped working. As you can see at http://www.winehq.org/pipermail/wine-patches/ there's no December 2012, but i sent a patch hours ago. I'm not aware of a "mailing list memberships reminder" from that list. -- Best Regards, André Hentschel

1 0

license build-index/summary.css
by marc bessieres 01 Dec '12

01 Dec '12

Hello, I'd like to create a similar web pages for the valgrind test results as the ones for wine(test.winehq.org). For that I'd like to use some part of the code from http://sources.winehq.org/git/tools.git/history/HEAD:/winetest namely build-index and summary.css. But I cannot find their licence, even if most other scripts there are LGPL2+. Could you please tell me what is their license? Kind regards, Marc Bessières

2 2

Re: kernel32: Implement SetFileValidData.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Hans Leidekker <hans(a)codeweavers.com> writes: > --- > configure.ac | 1 + > dlls/kernel32/file.c | 12 +++- > dlls/kernel32/tests/file.c | 136 ++++++++++++++++++++++++++++++++++++++++++++ > dlls/ntdll/file.c | 27 +++++++++ > include/ddk/ntddk.h | 5 ++ > include/winbase.h | 1 + > 6 files changed, 180 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so file.c && touch file.ok file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\users\julliard\Temp\removeme\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for C:\ err=5 should be 3 file.c:940: Tests skipped: Either no authority to volume, or is todo_wine for \\?\C:\ err=5 should be 3 file.c:3528: Test succeeded inside todo block: SetFileValidData succeeded file.c:3532: Test failed: SetFileValidData failed 50 file.c:3548: Test succeeded inside todo block: SetFileValidData succeeded file.c:3552: Test failed: SetFileValidData failed 50 file.c:3555: Test failed: SetFileValidData failed 50 file.c:3559: Test succeeded inside todo block: SetFileValidData succeeded file.c:3563: Test failed: SetFileValidData failed 50 make: *** [file.ok] Error 7 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] dsound: Use event based threads
by Maarten Lankhorst 30 Nov '12

30 Nov '12

Op 21-11-12 19:16, Maarten Lankhorst schreef: > Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)ubuntu.com> > Bump, anything wrong with this patch?

2 1

Re: [PATCH 6/6] jscript: Added support for indexed string access
by Marvin 30 Nov '12

30 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=23169 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Added support for DontDelete attribute and use it for arguments object
by Marvin 30 Nov '12

30 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=23168 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6 try2] jscript: Alias arguments properties to real values
by Marvin 30 Nov '12

30 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=23167 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 0/3] Add O_DENY* flags to fcntl and cifs
by Pavel Shilovsky 30 Nov '12

30 Nov '12

2012/11/30 Pavel Shilovsky <piastry(a)etersoft.ru>: > Network filesystems CIFS, SMB2.0, SMB3.0 and NFSv4 have such flags - this change can benefit cifs and nfs modules. While this change is ok for network filesystems, itsn't not targeted for local filesystems due security problems (e.g. when a user process can deny root to delete a file). > > Share flags are used by Windows applications and WINE have to deal with them too. While WINE can process open share flags itself on local filesystems, it can't do it if a file stored on a network share and is used by several clients. This patchset makes it possible for CIFS/SMB2.0/SMB3.0. > > Pavel Shilovsky (3): > fcntl: Introduce new O_DENY* open flags for network filesystems > CIFS: Add O_DENY* open flags support > CIFS: Use NT_CREATE_ANDX command for forcemand mounts > > fs/cifs/cifsacl.c | 10 ++++---- > fs/cifs/cifsglob.h | 11 ++++++++- > fs/cifs/cifsproto.h | 9 ++++---- > fs/cifs/cifssmb.c | 47 ++++++++++++++++++++------------------ > fs/cifs/dir.c | 14 ++++++++---- > fs/cifs/file.c | 18 ++++++++++----- > fs/cifs/inode.c | 11 +++++---- > fs/cifs/link.c | 10 ++++---- > fs/cifs/readdir.c | 2 +- > fs/cifs/smb1ops.c | 15 ++++++------ > fs/cifs/smb2file.c | 10 ++++---- > fs/cifs/smb2inode.c | 4 ++-- > fs/cifs/smb2ops.c | 10 ++++---- > fs/cifs/smb2pdu.c | 6 ++--- > fs/cifs/smb2proto.h | 14 +++++++----- > fs/fcntl.c | 5 ++-- > include/uapi/asm-generic/fcntl.h | 11 +++++++++ > 17 files changed, 125 insertions(+), 82 deletions(-) > > -- > 1.7.10.4 > CC'ing wine-devel@. -- Best regards, Pavel Shilovsky.

1 0

Re: wined3d: Add some 'fall through' comments (coverity)
by Henri Verbeet 30 Nov '12

30 Nov '12

On 29 November 2012 17:04, Frédéric Delanoy <frederic.delanoy(a)gmail.com> wrote: > case WINED3D_TOP_BUMPENVMAP_LUMINANCE: > lum_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BUMPENVMAP: > bump_map |= 1 << stage; > + /* fall through */ > case WINED3D_TOP_BLEND_TEXTURE_ALPHA: > case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: > tex_map |= 1 << stage; I'm not opposed to these if they make it easier to find real bugs inside the noise with Coverity, but I would also note that it should be pretty obvious to anyone actually touching this code that the fall through is intentional.

2 1

Re: [PATCH] ntdll: Fix existing conftests for nanosecond precision time fields.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Charles Davis <cdavis5x(a)gmail.com> writes: > From: Charles Davis <cdavis(a)mymail.mines.edu> > > Autoconf checks for a field of a struct by using it in an if() > expression. Of course, you can't do this for an aggregate field, so you > must instead check a field of that aggregate instead. Up until now, the > conftests for the st_?tim fields were all failing, even on systems that > had them, because of this. It does a sizeof, which should work just fine. On what system do you see a problem? -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Alexandre Julliard 29 Nov '12

29 Nov '12

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/jscript/dispex.c | 36 ++++++++++++++-- > dlls/jscript/function.c | 98 > ++++++++++++++++++++++++++++++++----------- > dlls/jscript/jscript.h | 3 + > dlls/jscript/tests/lang.js | 8 ++++ > 4 files changed, 116 insertions(+), 29 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M ieframe.dll -T ../../.. -p ieframe_test.exe.so webbrowser.c && touch webbrowser.ok wine: Unhandled page fault on read access to 0x06c238cc at address 0x564c09e3 (thread 003a), starting debugger... Unhandled exception: page fault on read access to 0x06c238cc in 32-bit code (0x564c09e3). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:564c09e3 ESP:0032d1d0 EBP:0032d218 EFLAGS:00210246( R- -- I Z- -P- ) EAX:0214bdec EBX:564f89dc ECX:02a7d2f0 EDX:02a7d2f0 ESI:02c8ef58 EDI:012b5eb8 Stack dump: 0x0032d1d0: 00000008 00000000 00000000 00000004 0x0032d1e0: 00000000 02c8ef58 4d430003 020cf1b0 0x0032d1f0: 00000000 00000001 00000030 00000060 0x0032d200: 00000000 00000003 0000006c 564f89dc 0x0032d210: 020cf210 02c8ef58 0032d278 564b3397 0x0032d220: 02c8ef58 012b5eb8 02a7d2f0 02a7d2f0 Backtrace: =>0 0x564c09e3 Arguments_idx_get+0x73(jsdisp=0x2c8ef58, idx=0x12b5eb8, res=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript (0x0032d218) 1 0x564b3397 prop_get+0xd6(This=0x2c8ef58, prop=0x20cf210, dp=0x32d2a8, r=0x2a7d2f0, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:450] in jscript (0x0032d278) 2 0x564b72aa jsdisp_get_idx+0xc9(obj=0x2c8ef58, idx=0, r=0x2a7d2f0) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1399] in jscript (0x0032d2e8) 3 0x564c1c48 Function_apply+0x2e7(ctx=0x1fe13f0, jsthis=0x32d388, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568) [/home/julliard/wine/wine/dlls/jscript/function.c:411] in jscript (0x0032d348) 4 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d3a8) 5 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2d7cce0, flags=0x1, argc=0x2, argv=0x2ab0f00, r=0x32d568, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d408) 6 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a7d2a8, id=0x4, flags=0x1, argc=0x2, argv=0x2ab0f00, ret=0x32d568) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d518) 7 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d588) 8 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032d628) 9 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032d6c8) 10 0x564c1a0c Function_apply+0xab(ctx=0x1fe13f0, jsthis=0x32d768, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948) [/home/julliard/wine/wine/dlls/jscript/function.c:470] in jscript (0x0032d728) 11 0x564b5f1c invoke_prop_func+0x1ab(This=0x1fd66f8, jsthis=<is not available>, prop=0x1fdbeb8, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:384] in jscript (0x0032d788) 12 0x564b5f78 invoke_prop_func+0x207(This=<is not available>, jsthis=<is not available>, prop=0x2a96888, flags=0x1, argc=0x2, argv=0x2ab1c78, r=0x32d948, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:393] in jscript (0x0032d7e8) 13 0x564b63a7 disp_call+0xe6(ctx=0x1fe13f0, disp=0x2a96800, id=0x2, flags=0x1, argc=0x2, argv=0x2ab1c78, ret=0x32d948) [/home/julliard/wine/wine/dlls/jscript/dispex.c:1103] in jscript (0x0032d8f8) 14 0x564b8a48 interp_call_member+0x117(ctx=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:1032] in jscript (0x0032d968) 15 0x564beee9 exec_source+0x1d8(ctx=<is not available>, code=<is not available>, func=<is not available>, from_eval=<is not available>, ret=<is not available>) [/home/julliard/wine/wine/dlls/jscript/engine.c:2485] in jscript (0x0032da08) 16 0x564c12d0 invoke_source+0x3cf() in jscript (0x0032daa8) 17 0x564c1f3a Function_invoke+0xb9(func_this=0x2aa4268, jsthis=(nil), flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8) [/home/julliard/wine/wine/dlls/jscript/function.c:346] in jscript (0x0032db08) 18 0x564b60f5 invoke_prop_func+0x384(This=0x2aa4268, jsthis=<is not available>, prop=0x2aa42b0, flags=0x1, argc=0x1, argv=0x32dbd0, r=0x32dbc8, caller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:388] in jscript (0x0032db68) 19 0x564b6b69 DispatchEx_InvokeEx+0x398(iface=0x2aa4268, id=0, lcid=0x409, wFlags=0x1, pdp=0x32dd30, pvarRes=0x32dd10, pei=0x32dc60, pspCaller=(nil)) [/home/julliard/wine/wine/dlls/jscript/dispex.c:693] in jscript (0x0032dc18) 20 0x55bb08d6 call_disp_func+0xf5(disp=<is not available>, dp=0x32dd30, retv=0x32dd10) [/home/julliard/wine/wine/dlls/mshtml/../../include/dispex.h:299] in mshtml (0x0032dc98) 21 0x55bb0cd3 call_event_handlers.isra+0x1d2() in mshtml (0x0032dd68) 22 0x55bb165b fire_event_obj+0x35a(doc=0x1fdb738, eid=EVENTID_LOAD, event_obj=0x1f51d28, target=0x2bc32fc, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1073] in mshtml (0x0032ddf8) 23 0x55bb1c8d fire_event+0x8c(doc=0x1fdb738, eid=EVENTID_LOAD, set_event=0x1, target=0x2bc32fc, nsevent=0x2c6ef48, script_this=0x1fd2700) [/home/julliard/wine/wine/dlls/mshtml/htmlevent.c:1188] in mshtml (0x0032de28) 24 0x55bfe7cb handle_load+0xda(iface=0x1fdb958, event=0x2c6ef48) [/home/julliard/wine/wine/dlls/mshtml/nsevents.c:274] in mshtml (0x0032de98) 25 0x6a6184f8 in xul (+0x9d84f7) (0x01fdb978) 26 0x00000002 (0x6af902f8) 27 0x6a61a05c in xul (+0x9da05b) (0x6a61a078) 0x564c09e3 Arguments_idx_get+0x73 [/home/julliard/wine/wine/dlls/jscript/function.c:108] in jscript: movl 0x0(%eax,%edi,4),%eax 108 return jsdisp_propget_name(arguments->var_obj, arguments->function->func_code->params[idx], res); -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 6/6] jscript: Added support for indexed string access
by Marvin 29 Nov '12

29 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=23153 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 4/6] jscript: Added support for DontDelete attribute and use it for arguments object
by Marvin 29 Nov '12

29 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=23152 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [PATCH 1/6] jscript: Alias arguments properties to real values
by Marvin 29 Nov '12

29 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=23151 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: wshom.ocx: Properly update typeinfo refcount
by Alexandre Julliard 28 Nov '12

28 Nov '12

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -137,8 +137,13 @@ static HRESULT WINAPI WshCollection_GetTypeInfoCount(IWshCollection *iface, UINT > static HRESULT WINAPI WshCollection_GetTypeInfo(IWshCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) > { > WshCollection *This = impl_from_IWshCollection(iface); > + HRESULT hr; > + > TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); > - return get_typeinfo(IWshCollection_tid, ppTInfo); > + > + hr = get_typeinfo(IWshCollection_tid, ppTInfo); > + ITypeInfo_AddRef(*ppTInfo); > + return hr; You'd need to check for error first, but the AddRef should really be in get_typeinfo(). -- Alexandre Julliard julliard(a)winehq.org

2 4

Wine Gecko versioning
by Jacek Caban 27 Nov '12

27 Nov '12

Hi all, Since Wine Gecko 1.9 branching, the tip should bump to 1.10, but I think it's time to clean up the situation a bit. Such things usually don't bring much attention, but it should be decided in public. Right now we have three versioning schemes involved in Wine Gecko: - Wine version that applies to Gecko - Gecko version (since Firefox 5 and Mozilla's rapid releases it's the same as Firefox version) - Wine Gecko version, which is just a growing number, not really connected with any of above. These numbers currently have no meaning other that being different for different Wine Gecko releases. The idea is that Wine Gecko version could be just something based on other versions, that are more informative. It's not really possible to use Wine version, because the first version of Wine that will use new Gecko is not ultimately when Wine Gecko branches. Also multiple Wine versions use the same Wine Gecko. That leaves us with Gecko (Firefox version). We don't release on every Firefox release (every 6 weeks), so if we just used Firefox version, that would look strange (like Wine Gecko 18 followed by Wine Gecko 20). That can be mitigated by using it as a minor version. So the next few release would look like: - 1.9 (that's already in beta and will be the last release using old scheme) - 2.20 (assuming the next update will be 3 months from 1.9, which means Firefox 20) - 2.22 (assuming another 3 moths for the update). Any suggestions/comments welcomed. Cheers, Jacek

4 6

Re: [PATCH] d3dx9_36/tests: Fix broken line test
by Matteo Bruni 27 Nov '12

27 Nov '12

2012/11/27 Detlef Riekenberg <wine.dev(a)web.de>: > While inspecting a test failure, i found only > 3 possible results for the line test: > - d3dx9_36.dll not present > - all tests skipped > line.c:146: Tests skipped: Failed to create IDirect3DDevice9 object 0x8876086c > - refcount test failed > line.c:113: Test failed: Got 5 references to device 0023EA60, expected 2 > (of course with different device pointer) > > See: http://test.winehq.org/data/tests/d3dx9_36:line.html > > I prefer to mark the refcount as implementation detail and remove the refcount test. > > My second way to fix the test failure is the attached patch. > Since the test was accepted to wine, there must be a machine somewhere > with a refcount of 2, so i marked that result as broken. > I think the test was accepted simply because it passed on Wine while it wasn't actually executed on WineTestBot. So yeah, removing the refcount test or adding a todo_wine is probably the way to go, adding a broken(ref == 2) doesn't seem to make much sense. Thanks for bringing this up. > d3d is not my area, so please comment. > > -- > By by ... Detlef > --- > dlls/d3dx9_36/tests/line.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c > index dc0c747..6ed508b 100644 > --- a/dlls/d3dx9_36/tests/line.c > +++ b/dlls/d3dx9_36/tests/line.c > @@ -110,7 +110,9 @@ static void test_create_line(IDirect3DDevice9* device) > expect_mat(&world, &result); > > ref = IDirect3DDevice9_Release(return_device); > - ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); > + todo_wine > + ok(broken(ref == 2) || ref == 5, > + "Got %x references to device %p, expected 5\n", ref, return_device); > > ref = ID3DXLine_Release(line); > ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); > -- > 1.7.5.4 > > >

1 0

Re: [PATCH] cabinet: Turn some ERR into WARN and improved or fix messages.
by Nikolay Sivov 27 Nov '12

27 Nov '12

On 11/27/2012 11:14, Christian Costa wrote: > --- > dlls/cabinet/fdi.c | 15 ++++++--------- > 1 file changed, 6 insertions(+), 9 deletions(-) > > diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c > index 0690b38..809a5c0 100644 > --- a/dlls/cabinet/fdi.c > +++ b/dlls/cabinet/fdi.c > @@ -710,7 +710,7 @@ static BOOL FDI_read_entries( > } > > /*********************************************************************** > - * FDIIsCabinet (CABINET.21) > + * FDIIsCabinet (CABINET.21) > * > * Informs the caller as to whether or not the provided file handle is > * really a cabinet or not, filling out the provided PFDICABINETINFO > @@ -725,7 +725,7 @@ static BOOL FDI_read_entries( > * be filled out with information about the cabinet > * file indicated by hf if, indeed, it is determined > * to be a cabinet. > - * > + * > * RETURNS > * TRUE if the file is a cabinet. The info pointed to by pfdici will > * be provided. > @@ -736,10 +736,7 @@ static BOOL FDI_read_entries( > * INCLUDES > * fdi.c > */ > -BOOL __cdecl FDIIsCabinet( > - HFDI hfdi, > - INT_PTR hf, > - PFDICABINETINFO pfdici) > +BOOL __cdecl FDIIsCabinet(HFDI hfdi, INT_PTR hf, PFDICABINETINFO pfdici) > { > BOOL rv; > FDI_Int *fdi = get_fdi_ptr( hfdi ); > @@ -749,13 +746,13 @@ BOOL __cdecl FDIIsCabinet( > if (!fdi) return FALSE; > > if (!hf) { > - ERR("(!hf)!\n"); > + WARN("No file handle\n"); > SetLastError(ERROR_INVALID_HANDLE); > return FALSE; > } > > if (!pfdici) { > - ERR("(!pfdici)!\n"); > + WARN("No cab info pointer\n"); > SetLastError(ERROR_BAD_ARGUMENTS); > return FALSE; > } This call already has a TRACE earlier, I don't see a point in tracing input parameters multiple times. > @@ -2532,7 +2529,7 @@ BOOL __cdecl FDICopy( > > /* check if it's really a cabfile. Note that this doesn't implement the bug */ > if (!FDI_read_entries(fdi, cabhf, &fdici, &(CAB(mii)))) { > - ERR("FDIIsCabinet failed: %u.\n", fdi->perf->erfOper); > + WARN("FDI_read_entries failed: %u\n", fdi->perf->erfOper); > fdi->free(decomp_state); > fdi->close(cabhf); > return FALSE; > > > >

2 1

Re: msvcp60: Remove superfluous semicolons
by Jacek Caban 27 Nov '12

27 Nov '12

On 11/26/12 8:42 PM, Andrew Talbot wrote: > Changelog: > msvcp60: Remove superfluous semicolons. > > diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c > index 761075e..b8c6921 100644 > --- a/dlls/msvcp60/exception.c > +++ b/dlls/msvcp60/exception.c > @@ -137,7 +137,7 @@ void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flag > } > > DEFINE_RTTI_DATA0(exception, 0, ".?AVexception@std@@"); > -DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor); > +DEFINE_CXX_DATA0(exception, MSVCP_exception_dtor) It's probably better to change the macro to require the semicolon. Jacek

2 2

Re: winex11: Add a few 'fall through' comments.
by Dmitry Timoshkov 27 Nov '12

27 Nov '12

Huw Davies <huw(a)codeweavers.com> wrote: > case DirectColor: > X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; > - case GrayScale: > + case GrayScale: /* fall through */ case DirectColor: X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_VIRTUAL; /* fall through */ case GrayScale: would be more clear IMHO. Right now it's not obvious to which case statement 'fall through' belongs to. Same for other changes. -- Dmitry.

2 1

Explicit fall-through in switch statements?
by Frédéric Delanoy 27 Nov '12

27 Nov '12

For every wine version, static checkers (like coverity) detect cases where a switch case automatically falls-through to the next case. Shouldn't be there a rule that such cases are always marked with a "fall-through comment"? With the possible exception of case with no statement? like 'case FOO: case BAR: do_something();...'? This would probably help IMHO, especially when people refactor old code. Frédéric

4 5

Re: ntdll/tests: Mark win8 behaviour as broken
by Dmitry Timoshkov 27 Nov '12

27 Nov '12

André Hentschel <nerv(a)dawncrow.de> wrote: > diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c > index c670731..f66d858 100644 > --- a/dlls/ntdll/tests/info.c > +++ b/dlls/ntdll/tests/info.c > @@ -1336,7 +1336,8 @@ static void test_mapprotection(void) > status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); > ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); > ok( retlen == sizeof(info), "Expected STATUS_SUCCESS, got %08x\n", status); > - ok(info.Protect == PAGE_READWRITE, "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); > + ok(info.Protect == PAGE_READWRITE || broken(info.Protect == PAGE_NOCACHE | PAGE_READWRITE /* win8 */), > + "addr.Protect is not PAGE_READWRITE, but 0x%x\n", info.Protect); This is not broken. You should either mask PAGE_NOCACHE out before the comparison, or accept both values. Same applies to other your patches. -- Dmitry.

1 0

Re: [PATCH 1/5] advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo (try 2).
by Alexandre Julliard 26 Nov '12

26 Nov '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This particular patch implements SetNamedSecurityInfoW by layering it > on top of SetSecurityInfo, which permits the creation of tests for > part 2 (GetNamedSecurityInfoW). This version has been updated to fix > a bad return value and includes a test indicating the correct value > (ERROR_FILE_NOT_FOUND). That doesn't mean you can hardcode that specific error. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/2] ole32: Add helper for string table memory freeing
by Nikolay Sivov 26 Nov '12

26 Nov '12

On 11/26/2012 01:01, Frédéric Delanoy wrote: > --- > dlls/ole32/filemoniker.c | 44 ++++++++++++++++++-------------------------- > 1 file changed, 18 insertions(+), 26 deletions(-) > > diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c > index b3a5cc2..688f6b8 100644 > --- a/dlls/ole32/filemoniker.c > +++ b/dlls/ole32/filemoniker.c > @@ -657,6 +657,16 @@ FileMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, > return MK_S_REDUCED_TO_SELF; > } > > +static void > +FileMonikerImpl_FreeStringTable(LPOLESTR* stringTable) > +{ > + int i; > + > + for (i=0; stringTable[i]!=NULL; i++) > + CoTaskMemFree(stringTable[i]); > + CoTaskMemFree(stringTable); > +} > + Could you please adjust a naming for that to something like free_stringtable() cause it doesn't really access file moniker in this helper. Also stringTable[i]!=NULL could be shortened to stringTable[i]. > > > CoTaskMemFree(str1); > CoTaskMemFree(str2); > @@ -1004,17 +1010,9 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p > { > for(i=0;i<sameIdx;i++) > strcatW(commonPath,stringTable1[i]); > - > - for(i=0;i<nb1;i++) > - CoTaskMemFree(stringTable1[i]); > - > - CoTaskMemFree(stringTable1); > - > - for(i=0;i<nb2;i++) > - CoTaskMemFree(stringTable2[i]); > - > - CoTaskMemFree(stringTable2); > - > + > + FileMonikerImpl_FreeStringTable(stringTable1); > + FileMonikerImpl_FreeStringTable(stringTable2); You sure it's an equivalent change? I mean regarding index boundaries above. Also while you're at it FileMonikerImpl_DecomposePath() needs to be properly fixed - it returns HRESULT, not it. And surrounding code relies on FAILED() mask to get this index boundary from return value, this is really broken.

2 1

re: [PATCH 5/5] winex11: Detect broken NVIDIA RandR setups.
by Dan Kegel 24 Nov '12

24 Nov '12

Henri wrote: >+ /* Recent (304.64, possibly earlier) versions of the nvidia driver only >+ * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes >+ * are only listed through RandR 1.0 / 1.1. This is completely useless, >+ * but NVIDIA considers this a feature, so it's unlikely to change Do you happen to have a link to discussion about this, or an nvidia bug number? Thanks!

2 1

Re: [1/2] widl: Fix enum entries output based on previous entry value
by Alexandre Julliard 23 Nov '12

23 Nov '12

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > Apparently this is how midl works I'm not sure that's an improvement, it makes it harder to figure out the actual value. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [02/10] windowscodecs: Reimplement QueryCapability of the BMP decoder.
by Vincent Povirk 23 Nov '12

23 Nov '12

Does QueryCapability really initialize the decoder? Can you get a frame out of it? I guess it never occurred to me to try. I was OK with this for the other implementations because I figured it'd be easy enough to invalidate the decoder after successfully calling Initialize, if that turned out to be a problem.

2 1

Wine Gecko 1.9-beta1
by Jacek Caban 22 Nov '12

22 Nov '12

Hi all, Firefox 17 was released lately, meaning that Firefox 18 goes to beta channel and it's the next target for out Gecko package update. I've uploaded new Gecko builds to SourceForge [1]. To test them, you need recent Wine Git version with the attached patch. As usually, grab the build from SourceForge, put it in the right place [2] and run patched Wine. All help with testing is appreciated! Thanks, Jacek [1] http://sourceforge.net/projects/wine/files/Wine%20Gecko/1.9-beta1/ [2] http://wiki.winehq.org/Gecko

1 0

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

Re: [PATCH 2/4] [cmd] Prevent external env vars causing tests to fail
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=23015 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x68 position 0 in line 860 (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 862 (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 863 (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 864 (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 865 (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

Re: [PATCH 1/4] [cmd] Add support for tokens= (for /f)
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=23014 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x68 position 0 in line 860 (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 862 (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 863 (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 864 (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 865 (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

Re: [PATCH 4/4] [kernel] Support opening of console for read
by Christian Costa 19 Nov '12

19 Nov '12

+ * write_console_input + * + * Helper function for bare_console_fetch_input calling WriteConsoleInput + * The handle passed to ReadConsole etc may not have been opened for write, + * and hence the calls to WriteConsoleInput may fail. This routine handles such + * a failure, and retries the write by opening the console for write, using + * it and then closing it again. + * + * Returns as per WriteConsoleInputW (TRUE on success) + */ +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); + } + } + + return result; +} Hi Jason, That would be better to use 4 spaces identation as the rest of the file. Christian

1 0

Re: [PATCH 1/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida (try 4).
by Alexandre Julliard 19 Nov '12

19 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > @@ -813,6 +926,12 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) > return E_INVALIDARG; > } > sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); > + > + set_cache_blank_char(hdc, sc); > + set_cache_default_char(hdc, sc); > + set_cache_invalid_char(hdc, sc); > + set_cache_kashida_char(hdc, sc); > + > *psc = sc; > TRACE("<- %p\n", sc); > return S_OK; > @@ -1063,12 +1182,11 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR > if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) > return E_INVALIDARG; > > - /* return something sensible? */ > - sfp->wgBlank = 0; > + sfp->wgBlank = get_cache_blank_char(psc); > sfp->wgDefault = get_cache_default_char(psc); > - sfp->wgInvalid = 0; > - sfp->wgKashida = 0xffff; > - sfp->iKashidaWidth = 0; > + sfp->wgInvalid = get_cache_invalid_char(psc); > + sfp->wgKashida = get_cache_kashida_char(psc); > + sfp->iKashidaWidth = 0; /* TODO */ It doesn't seem useful to have all these separate set and get functions, particularly since their implementation is very similar. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/5] windowscodecs: Implement QueryCapability in the PNG decoder.
by Vincent Povirk 19 Nov '12

19 Nov '12

You should at least look at the stream and check that it looks like an image in a format the decoder can read. For PNG, you could maybe argue that given a correct magic number and a correctly-working decoder, the decoder must be able to read all the images or either the decoder or image is broken. Then again, you're not even checking the magic number.. For TGA, though, we don't have an exact magic number. It's entirely possible that we our TGA magic number matches some files that aren't really TGA images but are images in some other format that we can decode. We need QueryCapabilities to disambiguate the decoders in these cases. For JPEG and TIFF, which are extensible formats, there's also the possibility that an image has something in it that we don't support (and that the corresponding decoder on Windows doesn't support) but some other decoder on the system can. The method should also invalidate the decoder object, so we don't accidentally introduce code that reuses it.

2 3

Ubuntu 12.10 - anyone?
by Daniel Jelinski 19 Nov '12

19 Nov '12

Hello, Is it possible to compile 32bit wine in 64bit ubuntu 12.10? I heard there were problems in 12.04 - were they resolved? Regards, Daniel

7 11

Re: [PATCH] regedit: fixed a fclose(stdin) issue (Coverity)
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 9:28 PM, Marcus Meissner <meissner(a)suse.de> wrote: > Hi, > > If we have multiple filenames on the commandline, and the second one is -, > we would fclose(stdin) as realname is not NULL. > > (And also double free realname.) > > So set it back to NULL after free and in the stdin case. > > Ciao, Marcus > --- > programs/regedit/regedit.c | 1 + > 1 Datei geändert, 1 Zeile hinzugefügt(+) > > diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c > index acff701..b6f74ee 100644 > --- a/programs/regedit/regedit.c > +++ b/programs/regedit/regedit.c > @@ -143,6 +143,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) > if (strcmp(filename, "-") == 0) > { > reg_file = stdin; > + realname = NULL; > } > else > { realname is set to NULL at the start of every iteration, so this is not useful. Frédéric

1 0

Re: cmd: Fix possible NULL pointer access in heap_strdupW
by Frédéric Delanoy 19 Nov '12

19 Nov '12

On Sat, Nov 17, 2012 at 10:52 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > we already do that (ieframe,vbscript,wininet,.. are good examples), but not consistent all over the place > --- > programs/cmd/wcmd.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h > index 3cc4c0b..303d260 100644 > --- a/programs/cmd/wcmd.h > +++ b/programs/cmd/wcmd.h > @@ -142,7 +142,8 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) > > size = (strlenW(str)+1)*sizeof(WCHAR); > ret = heap_alloc(size); > - memcpy(ret, str, size); > + if(ret) > + memcpy(ret, str, size); > } > > return ret; > -- > 1.8.0 heap_alloc is cmd was made infallible, so this isn't necessary (c6d24089dbc284f0fef5e1ce37b75ac04c6ebd94) Frédéric

1 0

Re: [PATCH 1/2] usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida (try 3).
by Alexandre Julliard 18 Nov '12

18 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > - Merge tests functions. > > --- > dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 156 insertions(+) > The test fails: ../../../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 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 usp10.c:1958: Test failed: wgBlank 0000 tmBreakChar 0020 etc. -- Alexandre Julliard julliard(a)winehq.org

2 3

certificate problem accessing https://source.winehq.org ?
by Dan Kegel 17 Nov '12

17 Nov '12

$ git clone https://source.winehq.org/git/wine.git newwine-git Cloning into 'newwine-git'... error: server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none while accessing https://source.winehq.org/git/wine.git/info/refs Maybe that's related to the big fat red warning Chrome gives when visiting https://source.winehq.org/ Happily, just leaving off the 's' is a workaround.

2 2

Re: [PATCH 2/7] advapi: Implement SetNamedSecurityInfoW on top of SetSecurityInfo (resend 3).
by Alexandre Julliard 16 Nov '12

16 Nov '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > + hfile = CreateFileW( pObjectName, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, > + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); > + if (hfile == INVALID_HANDLE_VALUE) > + return FALSE; FALSE doesn't do what you want here. -- Alexandre Julliard julliard(a)winehq.org

1 0

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

16 Nov '12

This breaks the Giants: Citizen Kabuto demo on coreaudio: http://www.fileplanet.com/55371/download/Giants:-Citizen-Kabuto-Demo I've attached a +dsound,+coreaudio,+tid log (could certainly be a winecoreaudio bug, but I don't have time to analyze right now). Also, > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 8da12e2..ff4598c 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -85,11 +174,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > + if (FAILED(hres))) { Fails to compile. Andrew

1 0

Re: [2/2] msxml3: Stub support for external entity resolver
by Marvin 16 Nov '12

16 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=22981 Your paranoid android. === WXPPROSP3 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === WVISTAADM (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W2K8SE (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PRO (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PROX64 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === TEST64_W7SP1 (32 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === W7PROX64 (64 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000 === TEST64_W7SP1 (64 bit saxreader) === saxreader.c:2230: Test failed: got 0x00000000

1 0

Re: msi: Fix a couple of leaks (coverity)
by Hans Leidekker 16 Nov '12

16 Nov '12

On Fri, 2012-11-16 at 11:50 +0100, Frédéric Delanoy wrote: > diff --git a/dlls/msi/files.c b/dlls/msi/files.c > index 11913ef..98d7513 100644 > --- a/dlls/msi/files.c > +++ b/dlls/msi/files.c > @@ -336,6 +336,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) > if (rc != ERROR_SUCCESS) > { > ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); > + msi_free(mi); > return ERROR_FUNCTION_FAILED; This is a loop, so you should instead call msi_free_media_info to also free any strings allocated in a previous call to msi_load_media_info.

1 0

Re: [PATCH 2/4] kernel32: Partial implement CreateHardLinkTransactedA/W
by Alexandre Julliard 16 Nov '12

16 Nov '12

Detlef Riekenberg <wine.dev(a)web.de> writes: > transaction is ignored for now I don't think that's a good idea, particularly not for DeleteFile. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] amstream: Initialize correctly AM_MEDIA_TYPE struct.
by Michael Stefaniuc 16 Nov '12

16 Nov '12

Hello Christian, On 11/15/2012 09:43 AM, Christian Costa wrote: > Fixes bug 32185. > --- > dlls/amstream/mediastreamfilter.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c > index 9b2bd8e..d5388e5 100644 > --- a/dlls/amstream/mediastreamfilter.c > +++ b/dlls/amstream/mediastreamfilter.c > @@ -132,6 +132,8 @@ static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA > MSPID purpose_id; > int i; > > + ZeroMemory(amt, sizeof(*amt)); > + this looks "odd". There is no check if amt is NULL, at least that's what caught my attention. So I've looked around and stumbled upon the AM_MEDIA_TYPE structure documentation http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%… "pUnk Not used. Set to NULL." Setting that to NULL in amstream's BasePinImp_GetMediaType() fixes the crash for me. But who's responsibility is to set / check that? That function or the caller aka test_media_streams() ? bye michael

2 1

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

15 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > @@ -3038,6 +3203,7 @@ START_TEST(usp10) > test_ScriptPlace(hdc); > > test_ScriptGetFontProperties(hdc); > + test_ScriptGetFontProperties2(hdc); There's no need to have two separate tests functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: advapi32: fix a too small buffer in CredUnmarshalCredentialW [try2]
by Hans Leidekker 15 Nov '12

15 Nov '12

On Wed, 2012-11-14 at 16:28 +0100, Stefan Leichter wrote: > @@ -2053,6 +2053,8 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) > char c0, c1, c2, c3; > const WCHAR *p = cred; > > + TRACE("%s\n", debugstr_wn(cred,len)); This string is already traced in CredUnmarshalCredentialW. > @@ -2134,6 +2136,7 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO > case UsernameTargetCredential: > { > USERNAME_TARGET_CREDENTIAL_INFO *target; > + ULONGLONG size = 0; > > if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) > { You should also perform a sanity check on 'size' to avoid overflow in calculations that follow.

2 3

Re: wined3d: Use backup swapchain DC for devices created with desktop window. (try 2)
by Stefan Dösinger 14 Nov '12

14 Nov '12

Am Montag, 3. September 2012, 04:06:01 schrieb Adam Jakubek: > Previous version failed on test bots. > Added test case skipping when no device can be created with normal > (non-desktop) window. I skimmed bug #18490, and I'm wondering about two things: Does the app create a D3DDEVTYPE_REF or D3DDEVTYPE_NULLREF device? Once the device is created, what does it to with it? A +d3d log would provide some answers. This is some guesswork: I don't think the game creates a _REF device because REF devices require the user to install the reference rasterizer dll, as Matteo already mentioned. If it's a NULLREF device I wonder what the game is able to do with it. The bug report has a link which promises some clues, but the link is dead. Stefan

3 2

Re: fix a too small buffer in CredUnmarshalCredentialW
by Hans Leidekker 14 Nov '12

14 Nov '12

On Wed, 2012-11-14 at 09:48 +0100, Stefan Leichter wrote: > + char buffer[6]; > + unsigned int buflen, *size = (unsigned int*) buffer; > > - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) > + if (len < 9 || !cred_decode( cred + 3, 6, buffer ) || !*size || *size % sizeof(WCHAR)) You're still truncating the decoded size. You should instead make 'size' a ULONGLONG and initialize it to 0. Is this little-endian ARM?

2 1

Implementation of PNG 'Get Count' and indexed reads...
by Max TenEyck Woodbury 14 Nov '12

14 Nov '12

These are currently returning 'not implemented'. Would it make sense to have 'GetCount' always return '1' and have the indexed read simply read in the whole thing?

2 6

Re: [PATCH] netapi32/tests: Fix workstation test failures on XP
by Saulius Krasuckas 14 Nov '12

14 Nov '12

* On Tue, 13 Nov 2012, Detlef Riekenberg wrote: > The workstation service might not running > > http://test.winehq.org/data/b5d96da32f955357b7d9341ee9fca68108078dce/xp_s2-… Indeed it isn't. I've disabled serveral services on this box. > --- a/dlls/netapi32/tests/wksta.c > +++ b/dlls/netapi32/tests/wksta.c > @@ -79,12 +79,17 @@ static void run_wkstausergetinfo_tests(void) > LPWKSTA_USER_INFO_1 ui1 = NULL; > LPWKSTA_USER_INFO_1101 ui1101 = NULL; > DWORD dwSize; > + NET_API_STATUS rc; > > /* Level 0 */ > - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, > - "NetWkstaUserGetInfo is unsuccessful\n"); > + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); > + if (rc == NERR_WkstaNotStarted) > + { > + skip("Workstation service not running\n"); > + return; > + } > + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); No to blame you, this is just generic inquiry for developers. Won't it be better to check service status directly in such case? S.

1 0

Re: [PATCH 1/2] user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. (try 3)
by Marvin 13 Nov '12

13 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=22927 Your paranoid android. === WXPPROSP3 (32 bit win) === win.c:881: Test failed: wrong dwStyle: 84cb0000 != 94cb0000 for 000E0138 in hook HCBT_ACTIVATE

2 1

Re: [PATCH 2/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Nikolay Sivov 13 Nov '12

13 Nov '12

On 11/13/2012 18:20, Qian Hong wrote: > Thanks Aric! > > --- > dlls/usp10/usp10.c | 133 +++++++++++++++++++++++++++++++++++++++++-- > dlls/usp10/usp10_internal.h | 1 + > 2 files changed, 128 insertions(+), 6 deletions(-) I think it's better to avoid macros if possible. > + if (!sc->sfnt) > + { > + if (GetTextMetricsW(hdc, &tmW)) > + sc->sfp.wgBlank = tmW.tmBreakChar; > + else > + { > + ERR("Get wgBlank failed, fallback to Numeric_space.\n"); > + sc->sfp.wgBlank = Numeric_space; > + } If it's a normal fallback case it's not an error I guess. > +{ > +#define Zero_width_space 0x200b /* Zero Width Space */ > +#define Invalid_char3 0xf71b /* Unknow, found by black box testing */ > +#define NON_EXIST_INDEX 0xffff /* Default non exist char index */ > + WCHAR invalid_chars[3] = {Numeric_space, Zero_width_space, Invalid_char3}; I don't see why this can't be hardcoded without macros and one line comment about meaning of this. > +#define Kashida_char 0x0640 /* Kashida */ > + WCHAR kashida_chars[] = {Kashida_char}; Same here, also naming is a bit strange. I think it's enough to name it 'kashida' and make it 'static const WCHAR'.

2 1

Re: [PATCH 2/2] usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 13 Nov '12

13 Nov '12

Qian Hong <fracting(a)gmail.com> writes: > +static inline void set_cache_invalid_char(const HDC hdc, ScriptCache *sc) > +{ > +#define Zero_width_space 0x200b /* Zero Width Space */ > +#define Invalid_char3 0xf71b /* Unknow, found by black box testing */ > +#define NON_EXIST_INDEX 0xffff /* Default non exist char index */ > + WCHAR invalid_chars[3] = {Numeric_space, Zero_width_space, Invalid_char3}; There's no reason to add #defines for that kind of thing, just put the values in the string directly. -- Alexandre Julliard julliard(a)winehq.org

2 1

Missing dependencies on static libraries
by Francois Gouget 13 Nov '12

13 Nov '12

strmbase is a static library which is used by amstream, qcap, quartz and others. This means functions defined in strmbase end up being included in amstream.dll.so and other places. However modifying the strmbase code does not result in a relink of the dlls that depend on it. Note that this is true even if running make from the top-level directory. That makes it very painful to work with it. Note that the same issue could happen with other static libraries like dxguid, uuid, etc, though those don't contain code and have little reason to change so that that's probably why the problem did not surface until now. How should we fix this? Having amstream recusively run make in strmbase would break parallel builds (the top-level Makefile enforces ordering by having __builddeps__ depend on dlls/strmbase). Would somthing like the patch below be acceptable? Should it be generalized to all the dependencies on uuid, dxguid, etc? commit 0a6764918f743912a1f76ca004ec6d9f0d679b2a Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 9 19:45:21 2012 +0100 strmbase: Relink the dlls that depend on the strmbase static library when it changes. diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 35cfae1..5e96f1a 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -12,4 +12,8 @@ IDL_R_SRCS = amstream_classes.idl RC_SRCS = version.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index 3abc295..5f4078d 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -11,4 +11,8 @@ C_SRCS = \ RC_SRCS = version.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 24be02e..2cbcfe6 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -36,4 +36,9 @@ IDL_TLB_SRCS = control_tlb.idl EXTRA_OBJS = dlldata.o +$(MODULE).so: $(top_builddir)/dlls/dxguid/libdxguid.a \ + $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index f6695be..cbf1986 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -12,4 +12,8 @@ C_SRCS = \ RC_SRCS = \ rsrc.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index 52ee03b..762f837 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -12,4 +12,8 @@ C_SRCS = \ RC_SRCS = \ rsrc.rc +$(MODULE).so: $(top_builddir)/dlls/strmbase/libstrmbase.a \ + $(top_builddir)/dlls/strmiids/libstrmiids.a \ + $(top_builddir)/dlls/uuid/libuuid.a + @MAKE_DLL_RULES@ -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Utilisateur" (nom commun) : Mot utilisé par les informaticiens en lieu et place d'"idiot".

2 3

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour (try3)
by Dmitry Timoshkov 13 Nov '12

13 Nov '12

Piotr Caban <piotr(a)codeweavers.com> wrote: > create mode 100644 dlls/gdi32/tests/test_empty_contour.sfd > create mode 100644 dlls/gdi32/tests/test_empty_contour.ttf Is it possible to add the desired glyph to an already existing test font? -- Dmitry.

3 2

Re: [PATCH 3/6] dsound: create a primary_pwfx separately from pwfx
by Andrew Eikum 13 Nov '12

13 Nov '12

Patches 1 and 2 in this series look fine. I have a series of patches similar to this one in my dsound multichannel branch. This patch seems to do too much at once. When I did this cleanup, I split it up into four patches: 1) Allocate the device format in the Device struct 2) Load the default format from the IAC, not hard-coded in dsound 3) Put SetFormat() calls into their own WFX that we don't really care about 4) Always use WAVE_FORMAT_EXTENSIBLE for the device format Much more bisect-able that way. I've attached a tarball here. It's not submission-quality yet (I haven't reviewed it lately; it might not even work), but it should show you what I had in mind for this kind of cleanup. I can bump those up in priority, but I don't think this blocks patches 4-6 in this series anyway. Andrew

3 3

Any advice please... Console input issue
by Ann and Jason Edmeades 13 Nov '12

13 Nov '12

Hello, I've been looking at a patch which sorts out NUL and CON handling in a part of the command shell, and have stumbled upon a problem I am not sure how to fix because I really dont understand the underlying console handling, and would appreciate someone pointing me in a direction. For simplicity sake I've cut this down to a tiny test program, which works on windows and fails on wine which does the following: Opens the device ("\\.\CON") with CreateFile with GENERIC_READ rights (which internally opens a CONIN$ device with the same access rights) Reads from the device with ReadFile - Because its a console device, this drops through to ReadConsoleW, which creates a CONOUT$ and then waits on a keystroke - Once the key is pressed (WCEL_Get) the key is 'inserted' into the input buffer by calling WriteConsoleInputW The issue is that WriteConsoleInputW requires GENERIC_WRITE access, but the CON device (\\.\CON) was opened as GENERIC_READ (and in fact fails if I try to open it with GENERIC_WRITE). CreateFile("CONIN$"...) will let me open in GENERIC_READ/GENERIC_WRITE mode and the program works on both windows and wine, but if you open CONIN$ GENERIC_READ only then it fails on wine and works on windows, with the same issue. Now on windows, this works... the question is how to make it work on wine... My gut feeling, with nothing backing this at all, is that WCEL_Get should not use WriteConsoleInputW to inject the values into the input buffer, instead making the server call directly, but passing through to the server call something to indicate that it is ok to add the data to the buffer, but I'm fast getting out of my depth! Thanks for any help! I'll file a bug with my analysis and testcase, but would rather fix the thing! Jason

2 3

Re: [PATCH] wininet: handle failing create_netconn_socket (Coverity)
by Alexandre Julliard 13 Nov '12

13 Nov '12

Marcus Meissner <marcus(a)jet.franken.de> writes: > A failing here will free the netconn structure and we should > not use it afterwards. It probably shouldn't free it, this can break in other places too. -- Alexandre Julliard julliard(a)winehq.org

1 0

gdiplus image blitting performance status
by Dmitry Timoshkov 13 Nov '12

13 Nov '12

Hi all, I've written a simple test application to measure gdiplus performace. Although currently it tests only GdipDrawImage() it could be easily extended to test anything else if desired. I'm attaching the test source with results running 32-bit test binary with gdiplus=b and gdiplus=n (taken from win7). As could be observed, currently built-in gdiplus performs up to 17 times worse even in identity case in comparison with native gdiplus. With a scale/rotate graphics transform the results are up to 20 times slower. Considerig that built-n gdiplus status regarding support for various complex things is pretty good, perhaps it's time to spend some time optimizing its performans. -- Dmitry.

2 3

Re: [PATCH 7/9] ieframe: Forward more DocHost::Exec calls to embedders
by Marvin 12 Nov '12

12 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=22897 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3289: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3428: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040810F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2596: Test failed: expected GetOverridesKeyPath webbrowser.c:2601: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2602: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3015: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21

4 3

Re: wine.inf: Set the FontSmoothingGamma value.
by Alexandre Julliard 12 Nov '12

12 Nov '12

Hans Leidekker <hans(a)codeweavers.com> writes: > Fixes a crash in the .NET 4 runtime which queries this value via > SystemParametersInfo(SPI_GETFONTSMOOTHINGCONTRAST). It shouldn't need the registry key to behave sanely. Does b5d96da32f help? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [advapi32/tests] fix possible NULL pointer dereference
by Alexandre Julliard 12 Nov '12

12 Nov '12

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > fixes the crash > http://test.winehq.org/data/1262f07609e6722a841f511445f145d941848800/linux_… > sle85276/advapi32:cred.html That's not supposed to happen, please fix the code instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour (try2)
by Alexandre Julliard 12 Nov '12

12 Nov '12

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -23,6 +23,8 @@ > /* @makedep: wine_test.ttf */ > wine_test.ttf RCDATA wine_test.ttf > > - > /* @makedep: vertical.ttf */ > vertical.ttf RCDATA vertical.ttf > + > +/* @makedep: test_ttf.ttf */ > +test_ttf.ttf RCDATA test_ttf.ttf Please choose a more meaningful name for that file, particularly since there's already a wine_test.ttf. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mciavi: Fix player deadlock when starting to play.
by Andrew Eikum 12 Nov '12

12 Nov '12

Seems reasonable to me. Thanks for working on this old code. On Thu, Nov 08, 2012 at 10:51:08AM +0100, Joerg-Cyril.Hoehle(a)t-systems.com wrote: >

1 0

Re: [PATCH 9/9] ieframe: Added IWebBrowser2::Refresh tests
by Marvin 12 Nov '12

12 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=22898 Your paranoid android. === WNT4WSSP6 (32 bit webbrowser) === webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3314: Test failed: Creating WebBrowser object failed: 80040154 webbrowser.c:3455: Test failed: Creating WebBrowser object failed: 80040154 webbrowser: unhandled exception c0000005 at 0040816F === W2KPROSP4 (32 bit webbrowser) === webbrowser.c:2602: Test failed: expected GetOverridesKeyPath webbrowser.c:2607: Test failed: expected Invoke_SETSECURELOCKICON webbrowser.c:2608: Test failed: expected Invoke_FILEDOWNLOAD webbrowser.c:3040: Test failed: doc_disp == NULL webbrowser: unhandled exception c0000005 at 00402F21 === TEST64_W7SP1 (64 bit webbrowser) === Timeout

1 0

Re: user32: Initialize string buffer
by Nikolay Sivov 12 Nov '12

12 Nov '12

On 11/12/2012 11:33, Alistair Leslie-Hughes wrote: > Hi, > > Should fix http://bugs.winehq.org/show_bug.cgi?id=28797 > > > Changelog: > user32: Initialize string buffer I think it could be GetWindowText problem actually, if it succeeded and left buffer uninitialized that could be a real bug here, so needs tests. > > > Best Regards > Alistair Leslie-Hughes > >

2 1

Re: [PATCH] includes: always add __force_align_arg_pointer__ for i386
by Dmitry Timoshkov 12 Nov '12

12 Nov '12

Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > Fixes flstudio installer on my system, which breaks otherwise in strcasestr_sse42_nonascii > due to stack being misaligned. That's a compiler bug: http://bugs.winehq.org/show_bug.cgi?id=22316 -- Dmitry.

2 1

Question on debugging wineboot..
by Roger Cruz 12 Nov '12

12 Nov '12

What is the proper way to debug wineboot and services.exe in order to find out what is causing the error outputted by wineserver below? err:wineboot:start_services_process Couldn't start services.exe: error 1359 wine: failed to update /winearm/winehome with /winearm/bin/../share/wine/wine.inf: No such file or directory My problem is that doing: gdb /winearm/bin/wine C:\\windows\\system32\\wineboot.exe --init will yield the code flow to start_wineboot() again because peb->ProcessParameters->ImagePathName.Buffer is NULL if (peb->ProcessParameters->ImagePathName.Buffer) { strcpyW( main_exe_name, peb->ProcessParameters->ImagePathName.Buffer ); } else { <deleted code> start_wineboot( boot_events ); } So it looks like running GDB on wineboot by itself is not good enough because something from the original process is missing, causing it to think it needs to start wineboot again. The reason I had to start it under its own GDB process is because the original GDB process will not follow the fork() in start_wineboot. How do you guys debug all the processes being fork'ed off when GDB can't follow to the child process? Thanks in advance Roger R. Cruz

1 0

Re: [PATCH] tools/widl/header.c: Add a way to declare interface data members.
by Michael Stefaniuc 12 Nov '12

12 Nov '12

You can't do that as the COM standard specifies also the ABI. A COM interface is a pointer to a virtual table; it is *not* a struct. That's just an implementation detail in C. On 11/10/2012 08:48 PM, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> > > --- > tools/widl/header.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 2f275c7..965dcbc 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1159,6 +1159,17 @@ static void write_com_interface_start(FILE *header, const type_t *iface) > fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); > } > > +static void write_interface_data_macro(FILE *header, const type_t *iface) > +{ > + > + if (type_iface_get_inherit(iface)) > + write_interface_data_macro(header, type_iface_get_inherit(iface)); > + > + fprintf(header, "#ifdef %s_IFACE_DATA\n", iface->name); > + fprintf(header, " %s_IFACE_DATA\n", iface->name); > + fprintf(header, "#endif /* defined %s */\n", iface->name); > +} > + > static void write_com_interface_end(FILE *header, type_t *iface) > { > int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); > @@ -1214,6 +1225,9 @@ static void write_com_interface_end(FILE *header, type_t *iface) > fprintf(header, "} %sVtbl;\n", iface->name); > fprintf(header, "interface %s {\n", iface->name); > fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); > + > + write_interface_data_macro(header, iface); > + > fprintf(header, "};\n"); > fprintf(header, "\n"); > fprintf(header, "#ifdef COBJMACROS\n"); bye michael

3 6

How to tell Mac from Linux wine within a Wine app? (steam hardware survey)
by Scott Ritchie 10 Nov '12

10 Nov '12

Is there an easy way for the steam hardware survey to tell whether it's running under Mac or Linux Wine? I remember discussing this issue with an engineer from Valve after asking they make the % of Wine users public again.

3 3

Re: [PATCH] tools/widl/header.c: Add a way to declare interface data members.
by Nikolay Sivov 10 Nov '12

10 Nov '12

On 11/10/2012 22:48, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max+git(a)mtew.isa-geek.net> > > --- > tools/widl/header.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/tools/widl/header.c b/tools/widl/header.c > index 2f275c7..965dcbc 100644 > --- a/tools/widl/header.c > +++ b/tools/widl/header.c > @@ -1159,6 +1159,17 @@ static void write_com_interface_start(FILE *header, const type_t *iface) > fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->name, dispinterface ? "DISP" : ""); > } > > +static void write_interface_data_macro(FILE *header, const type_t *iface) > +{ > + > + if (type_iface_get_inherit(iface)) > + write_interface_data_macro(header, type_iface_get_inherit(iface)); > + > + fprintf(header, "#ifdef %s_IFACE_DATA\n", iface->name); > + fprintf(header, " %s_IFACE_DATA\n", iface->name); > + fprintf(header, "#endif /* defined %s */\n", iface->name); > +} > + > static void write_com_interface_end(FILE *header, type_t *iface) > { > int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); > @@ -1214,6 +1225,9 @@ static void write_com_interface_end(FILE *header, type_t *iface) > fprintf(header, "} %sVtbl;\n", iface->name); > fprintf(header, "interface %s {\n", iface->name); > fprintf(header, " CONST_VTBL %sVtbl* lpVtbl;\n", iface->name); > + > + write_interface_data_macro(header, iface); > + > fprintf(header, "};\n"); > fprintf(header, "\n"); > fprintf(header, "#ifdef COBJMACROS\n"); What is this?

1 0

Re: ole32: Fix outstanding memory leak (coverity)
by Frédéric Delanoy 10 Nov '12

10 Nov '12

On Sat, Nov 10, 2012 at 3:57 PM, André Hentschel <nerv(a)dawncrow.de> wrote: > --- > dlls/ole32/storage32.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 8498eaf..4099df6 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -9067,17 +9067,16 @@ static HRESULT OLECONVERT_GetOLE10ProgID(LPSTORAGE pStorage, char *strProgID, DW > else > { > STATSTG stat; > - LPOLESTR wstrProgID; > + LPOLESTR wstrProgID = NULL; > > /* Get the OleType from the registry */ > REFCLSID clsid = &(stat.clsid); > IStorage_Stat(pStorage, &stat, STATFLAG_NONAME); > hRes = ProgIDFromCLSID(clsid, &wstrProgID); > if(hRes == S_OK) > - { > *dwSize = WideCharToMultiByte(CP_ACP, 0, wstrProgID, -1, strProgID, *dwSize, NULL, FALSE); > + if(wstrProgID) > CoTaskMemFree(wstrProgID); > - } CoTaskMemFree is no-op when given NULL argument so "if(wstrProgID)" is not necessary (since you initialize it to NULL) Frédéric

1 0

Re: [PATCH 1/2] msvcp90: Free memory allocated by _get_current_locale function
by Marvin 09 Nov '12

09 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=22858 Your paranoid android. === WVISTAADM (32 bit misc) === misc: unhandled exception c0000005 at 77496739 === W2K8SE (32 bit misc) === misc: unhandled exception c0000005 at 778A59C3 === W7PRO (32 bit misc) === misc: unhandled exception c0000005 at 772D1FFE === W7PROX64 (32 bit misc) === misc: unhandled exception c0000005 at 77DFE23E === TEST64_W7SP1 (32 bit misc) === misc: unhandled exception c0000005 at 7758E39E === W7PROX64 (64 bit misc) === Timeout === TEST64_W7SP1 (64 bit misc) === Timeout

1 0

The EFF is asking for our help explaining why APIs should not be copyrightable
by Scott Ritchie 09 Nov '12

09 Nov '12

https://www.eff.org/deeplinks/2012/11/no-copyrights-apis-help-us-make-case There are court cases pending that are very, very relevant to what we do here. It would help the EFF very much if a few engineers could send them a short email statement explaining how Wine's reimplementation of the API is good for interoperability and competition. Thanks, Scott Ritchie

2 1

[PATCH 1/2] winmm/tests: Add more mmioSeek tests.
by Joerg-Cyril.Hoehle＠t-systems.com 09 Nov '12

09 Nov '12

Sagawa San, it's nice to see somebody contribute to winmm! + return; +} That return is line noise. + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + if (hmmio == NULL) { + win_skip("mmioOpen error %u\n", mmio.wErrorRet); + return; + } AFAIK mmioOpen has always been present, so there's no reason for a win_skip. An error should be flagged in all cases, Wine or native. Furthermore, the early return prevents execution of the other groups of tests. Hence I suggest: + hmmio = mmioOpen(NULL, &mmio, MMIO_READ); + ok(hmmio != NULL, "mmioOpen error %u\n", mmio.wErrorRet); + if (hmmio) { mmioSeek ... mmioClose } However, the 2nd and 3rd mmioOpen may fail if the test file could not be created, so you may want a different treatment there. Perhaps add a boolean result to create_test_file? >[PATCH 2/2] winmm: Fix SEEK_END direction of mmio files without buffering. It's always good in a patch submission to mention what bug it fixes. Does yours fix bug 19566? I seem to remember that there was an entry in bugzilla about MMIO and seeking... Oh yes, you may look at bug 28982, perhaps your patch fixes that too. Regards, Jörg Höhle

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel