- wine-devel - winehq.org

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

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