December 2012 - Wine-Devel - list.winehq.org

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

Dec. 15, 2012

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 Dec. 15, 2012

Dec. 15, 2012

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 Dec. 15, 2012

Dec. 15, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 14, 2012

Dec. 14, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

"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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 13, 2012

Dec. 13, 2012

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 Dec. 12, 2012

Dec. 12, 2012

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 Dec. 12, 2012

Dec. 12, 2012

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 Dec. 12, 2012

Dec. 12, 2012

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 Dec. 11, 2012

Dec. 11, 2012

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 Dec. 11, 2012

Dec. 11, 2012

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 Dec. 11, 2012

Dec. 11, 2012

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