May 2011 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] mountmgr: Populate HKLM\HARDWARE\DEVICEMAP\Scsi here instead of in kernel32. (try 4)
by Alexandre Julliard May 5, 2011

May 5, 2011

Charles Davis <cdavis(a)mymail.mines.edu> writes: > + case 0x05: > + data = "CdRomPeripheral"; > + snprintf(buffer, sizeof(buffer), "Cdrom%d", cdrom_no++); > + break; This needs to be set to the device name that mountmgr has assigned to it. That's the point of doing this in mountmgr: making sure that all the information derives from a single source. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH try3] wininet: Added support for persistent HTTP connections
by Alexandre Julliard May 5, 2011

May 5, 2011

Jacek Caban <jacek(a)codeweavers.com> writes: > try3: I've included better content draining in this patch (that I was > hoping to do as follow-up previously, due to already big size of the > patch). That fixes observed test failures. Older wininet implementations > don't have it, so the test fails for them. I'm getting a different failure now: ../../../tools/runtest -q -P wine -M wininet.dll -T ../../.. -p wininet_test.exe.so http.c && touch http.ok http.c:1074: Test failed: Read 0 bytes instead of 13 make: *** [http.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/2] msxml3/domdoc: Add support for VT_ARRAY|VT_UI1 in domdoc_load().
by Nikolay Sivov May 4, 2011

May 4, 2011

On 5/3/2011 08:07, Adam Martinson wrote: > > Fixes bug 14864. > --- > dlls/msxml3/domdoc.c | 255 > ++++++++++++++++++++++++++------------------------ > 1 files changed, 134 insertions(+), 121 deletions(-) > > + case VT_ARRAY|VT_UI1: > + { > + SAFEARRAY* psa; > + BSTR bstr; > + psa = V_ARRAY(&source); > + bstr = bstr_from_xmlChar(psa->pvData); > + hr = domdoc_loadXML(iface, bstr, isSuccessful); > + SysFreeString(bstr); > + return hr; > + } > + break; Is it really supposed to be utf8 array? Or this will work cause one-byte chars match utf8? Also I don't like this method dependency, I think the proper way is to call IXMLDOMDocument3_loadXML(iface...) here. Or another way to avoid call through vtable - introduce something called domdoc_load_xml(This...) and use it in both places, but I think it's not worth it.

2 5

Re: [PATCH 2/2 try2] wininet: Added support for persistent HTTP connections
by Alexandre Julliard May 4, 2011

May 4, 2011

Jacek Caban <jacek(a)codeweavers.com> writes: > try2: Using GetTickCount64() for timestamps > > --- > dlls/urlmon/tests/protocol.c | 2 +- > dlls/urlmon/tests/url.c | 20 +- > dlls/wininet/http.c | 567 > ++++++++++++++++++++++++------------------ > dlls/wininet/internet.c | 2 +- > dlls/wininet/internet.h | 42 +++- > dlls/wininet/netconnection.c | 138 ++++------- > dlls/wininet/tests/http.c | 32 +-- > 7 files changed, 427 insertions(+), 376 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M wininet.dll -T ../../.. -p wininet_test.exe.so http.c && touch http.ok http.c:2621: Test failed: expected 1 retrievals, got 0 http.c:2628: Test failed: count was wrong http.c:2629: Test failed: http data wrong http.c:2649: Test succeeded inside todo block: expected 1 retrievals make: *** [http.ok] Error 4 -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: winscard/tests: Add test base functions of winscard.dll
by Marvin May 4, 2011

May 4, 2011

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=10722 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

FAQ translation possible?
by Frédéric Delanoy May 4, 2011

May 4, 2011

Hi, I'm currently revising/translating WineHQ's website French translation. Translating the help, I remarked the FAQ is maintained in the wiki section. Wouldn't it make sense to move the FAQ to the wine website repository so as to ease translation? FAQ is probably one of the most important things to translate IMO. Is the wiki page somehow translatable (preferably using WineHQ's language cookie setting)? Or is it more important to remain it to the wiki for quick update/review? Frédéric Delanoy

3 5

signal(SIGCHLD,SIG_DFL) before exec()
by Ilya Basin May 4, 2011

May 4, 2011

Hi list. I suffer from this bug: http://bugs.winehq.org/show_bug.cgi?id=27014 In wine sources there're not so many places where exec(3) family is used. In some places SIGCHLD and SIGPIPE are restored to default before calling exec(), in others they aren't. What's the difference? Can anyone explain me the why SIGCHLD not restored to default before calling execvp() here: http://source.winehq.org/source/libs/port/spawn.c?v=wine-1.3.19#L42 int spawnvp(int mode, const char *cmdname, const char *const argv[]) { ... if (mode == _P_OVERLAY) { execvp(cmdname, (char **)argv); /* if we get here it failed */ #ifdef ENOTSUP if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */ #endif return -1; } Because it's not forked and if execvp() fails, we end up with the default handler?

1 0

Re: [PATCH 2/2] wininet: Added support for persistent HTTP connections
by Alexandre Julliard May 3, 2011

May 3, 2011

Jacek Caban <jacek(a)codeweavers.com> writes: > +static DWORD64 collector_timeout; > + > +static DWORD64 current_time(void) > +{ > + ULARGE_INTEGER timeout; > + SYSTEMTIME st; > + FILETIME ft; > + > + GetSystemTime(&st); > + SystemTimeToFileTime(&st, &ft); > + > + timeout.u.LowPart = ft.dwLowDateTime; > + timeout.u.HighPart = ft.dwHighDateTime; > + > + return timeout.QuadPart; > +} That's a lot of complexity for a timestamp, GetTickCount() would work just as well, as long as you do the comparisons correctly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] d3d8/tests: Fix some failure messages in test_depth_stencil_size().
by Marvin May 3, 2011

May 3, 2011

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=10709 Your paranoid android. === WXPPROSP3 (32 bit device) === TestLauncher.c:89: Test failed: Can't open test executable C:\winetest\d3d8_test.exe, error 32

2 1

Re: [PATCH 4/5] d3d8/tests: Add a Reset test.
by Marvin May 3, 2011

May 3, 2011

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=10710 Your paranoid android. === WXPPROSP3 (32 bit device) === TestLauncher.c:89: Test failed: Can't open test executable C:\winetest\d3d8_test.exe, error 32

1 0

msvcrt: Add tests to show that utime() can take a NULL-pointer for the utimbuf structure field
by Joerg-Cyril.Hoehle＠t-systems.com May 3, 2011

May 3, 2011

Louis, >Anything i could do to improve to get it in? Perhaps http://source.winehq.org/patches/ shows that you should get rid of the one apply failure. Basically, your patch does the right thing, as MSDN says "If times is a NULL pointer, the modification time is set to the current local time." -- like POSIX. >-#if(0) /* FIXME: this test crashes wine, remove this line when wine is fixed */ People here prefer if(0) so that the compiler can still validate the form of the code. I've been even been using if (winetest_debug>1) so I can direct testbot to run the additional test. Finally, why not merge the two? After all, it's one change, and several tests. Why do you call it test_utime() since you don't verify the effects of utime()? Regards, Jörg Höhle

1 0

Re: [PATCH 2/4] wintrust: Added CryptSIPPutSignedDataMsg implementation (for PE files)
by Piotr Caban May 3, 2011

May 3, 2011

On 05/03/11 13:07, Piotr Caban wrote: > --- > dlls/wintrust/crypt.c | 66 ++++++++++++++++++++++++++++++++++++++++++------ > 1 files changed, 57 insertions(+), 9 deletions(-) Patches 2 and 3 in this series are not correct. Please ignore them.

1 0

Re: [PATCH 3/4] d3dx9: Implement ID3DXBaseEffect::GetPixelShader().
by Henri Verbeet May 3, 2011

May 3, 2011

2011/5/3 Rico Schüller <kgbricola(a)web.de>: > +#define SAFE_ADDREF(x) if(x) IUnknown_AddRef(x) > +#define SAFE_RELEASE(x) if(x) IUnknown_Release(x) That's not so safe, actually. Consider e.g. what happens when "x" has side effects, or when you write something like "if (cond) SAFE_ADDREF(x); else return;". If you really want this an inline function should do just as well, but for the handful of uses I see in this series it just obfuscates the code.

1 0

msvcrt: Add tests to show that utime() can take a NULL-pointer for the utimbuf structure field
by Louis Lenders May 3, 2011

May 3, 2011

See http://www.winehq.org/pipermail/wine-patches/2011-April/101371.html Anything i could do to improve to get it in?

1 0

Re: ddraw (try 2): Add a few tests for Setcooperativelevel
by Marvin May 3, 2011

May 3, 2011

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=10695 Your paranoid android. === WNT4WSSP6 (32 bit ddrawmodes) === ddrawmodes.c:800: Test failed: SetCooperativelevel(DDSCL_SETFOCUSWINDOW) returned: 80070057 ddrawmodes.c:803: Test failed: SetCooperativelevel(DDSCL_CREATEDEVICEWINDOW | DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN) returned: 80070057 ddrawmodes.c:828: Test failed: SetCooperativelevel(DDSCL_SETFOCUSWINDOW) returned: 80070057 === W7PROX64 (64 bit ddrawmodes) === Timeout

1 0

Re: [PATCH 1/2] d3d9/tests: Added a test for resetting an invisible, inactive window to fullscreen mode.
by Marvin May 2, 2011

May 2, 2011

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=10677 Your paranoid android. === WXPPROSP3 (32 bit device) === device: unhandled exception c0000005 at 0040320F === W2K3R2SESP2 (32 bit device) === device: unhandled exception c0000005 at 0040320F === WVISTAADM (32 bit device) === device: unhandled exception c0000005 at 0040320F === W2K8SE (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PRO (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PROX64 (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PROX64 (64 bit device) === Timeout

2 1

Re: [PATCH 2/2] wined3d: Turn off message filtering temporarily in the Reset() method to allow certain messages (e.g. WM_ACTIVATEAPP) through.
by Henri Verbeet May 2, 2011

May 2, 2011

On 2 May 2011 13:18, John Edmonds <pocketcookies2(a)gmail.com> wrote: > Toki Tori and RUSH both depend on receing WM_ACTIVATEAPP before they will start. These messages are currently getting filtered out. > This resolves bug #25640. It doesn't look right to me to filter messages during IWineD3DDevice_ReleaseFocusWindow() but not IWineD3DDevice_AcquireFocusWindow(). Maybe it just shouldn't filter at all.

2 2

Working on UpdateSemantics or D3DXWeldVertices in D3DX9?
by Michael Mc Donnell May 2, 2011

May 2, 2011

Hi Guys! I'm doing Google Summer of Code 2011 and found out that some of the functions I was to implement have been implemented while my application was being processed. This means I have to find some other functions in D3DX9 to implement. I see that UpdateSemantics and D3DXWeldVertices are unimplemented in D3DX9, and was wondering if anyone is working on these? Cheers, Michael

1 0

Re: comctl32: avoid using ZeroMemory()
by Marcus Meissner May 2, 2011

May 2, 2011

On Mon, May 02, 2011 at 10:52:50AM -0500, Austin English wrote: > Avoids a Clang bug: > http://bugs.winehq.org/show_bug.cgi?id=26754 clang cannot even survive a simple memset() to 0? Ciao, Marcus

2 1

Re: [2/2] comctl32/mru: Ignore size field when creating with -W calls
by Alexandre Julliard May 2, 2011

May 2, 2011

Nikolay Sivov <nsivov(a)codeweavers.com> writes: > @@ -210,11 +210,11 @@ typedef INT (CALLBACK *MRUStringCmpFnA)(LPCSTR lhs, LPCSTR rhs); > typedef INT (CALLBACK *MRUStringCmpFnW)(LPCWSTR lhs, LPCWSTR rhs); > typedef INT (CALLBACK *MRUBinaryCmpFn)(LPCVOID lhs, LPCVOID rhs, DWORD length); > > -typedef struct tagCREATEMRULISTA > +typedef struct tagMRUINFOA > { > DWORD cbSize; > - DWORD nMaxItems; > - DWORD dwFlags; > + UINT uMax; > + UINT fFlags; > HKEY hKey; > LPSTR lpszSubKey; > union Please do the renamings as a separate patch. -- Alexandre Julliard julliard(a)winehq.org

2 1

D3D performance debugging report
by Stefan Dösinger May 2, 2011

May 2, 2011

Hi, I spent a few hours debugging wined3d performance today. No, I found no magic fix for the slowness, just some semi-usable data. First I wrote a hacky patch to avoid redundant FBO applications. This gave a tiny, tiny performance increase, see http://www.winehq.org/pipermail/wine- devel/2011-April/089832.html. The main investigation concerned redundant shader applications. The aim was to find out how many of our glBindProgramARB calls are re-binding the same program, and how much this costs. Depending on the game between 20% to 90% of all BindProgram calls are redundant. I'll attach my debug hack so others can test their own apps. I used ARB shaders for testing because they can apply vertex and fragment programs separately. This brings up two questions: (a) How much does this cost (b) Why does this happen The costs: In my draw overhead tester hacking out the redundant apply calls improved performance a lot, from about 101 fps to 157 fps. The biggest part of that are the GL calls. Without them but the remaining shader logic I get 144 fps. Unfortunately this does not translate to any performance gains in real apps. I tried to filter out the redundant apply calls in the simplest way possible: Track the current value per wined3d_context and check before calling glBindProgramARB. This gave the 144 fps in the draw overhead tester, but no measurable increase in any other apps(I tested StarCraft 2, HL2, Team Fortress 2, World in Conflict and a few others) Given the amount of redundant apply calls and the cost of them in the draw overlay tester I have expected at least some improvement. Certainly not a 50% performance increase(the draw overlay tester performs no shader changes at all in the draw loop), but at least a 2-3% gain. So far I have no explanation why I didn't see that. But why do those redundant apply calls happen? It seems like the state dirtification comes all the way from the stream sources and/or vertex declaration. STREAMSRC is linked to VDECL, which is linked to VERTEXSHADER, which in turn reapplies the pixel shader. This means redundant vertex and pixel shader applications. Separating those states will be a major challenge. The vdecl<->vshader link shouldn't be needed any more, except in rare cases where GL_ARB_vertex_array_bgra is not supported and the application switches one attribute from D3DDECL_D3DCOLOR to a non-d3dcolor attribute. If the vertex shader changes we still have to reparse the vertex declaraion and reapply the stream sources because the vshader determines the stream numbers. Maybe we can reduce the number of times this happens by ordering stream usages and indices to make sure shaders with compatible input get the same stream ordering. vdecl and streamsrc are pretty related. If the vdecl is changed we have to reapply the stream sources. The other way around shouldn't cause problems though. There's no need to reapply every stream except the changed ones and there's no need to reapply the vertex shader. The vertex and pixel shader are linked for a few reasons: The shader backend API offers only a function to set both. Basic GLSL only offers a function to set both at once(GL_ARB_separate_shader_objects changes that). And even in ARB the pixel shader input may require some changes in the vertex shader output to get Shader Model 3.0 varyings right. The shader backend API can be changed, but it has to be done in a way that doesn't hurt GLSL without ARB_separate_shader_objects. If we have classic GLSL we have to keep the link. With ARB we can conditionally reapply the vertex shader if the ps_input_signature is changed. To complicate matters there are additional states that affect the shaders, like fog, textures, clipping. We don't keep track of those dependencies. So it's a lot of work to clean up these state dependencies and we don't know how much it'll gain us :-( Stefan

4 8

Re: [PATCH 1/2] d3d9/tests: Added a test for resetting an invisible, inactive window to fullscreen mode.
by Henri Verbeet May 2, 2011

May 2, 2011

On 2 May 2011 13:18, John Edmonds <pocketcookies2(a)gmail.com> wrote: > + /*Pull all currently available messages. We don't care about messages generated after this loop exits.*/ > + while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) > + { > + TranslateMessage(&msg); > + DispatchMessage(&msg); > + } You should probably use flush_events() for that.

1 0

Re: [PATCH 2/2] wined3d: Turn off message filtering temporarily in the Reset() method to allow certain messages (e.g. WM_ACT
by Marvin May 2, 2011

May 2, 2011

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=10678 Your paranoid android. === WXPPROSP3 (32 bit device) === device: unhandled exception c0000005 at 0040320F === W2K3R2SESP2 (32 bit device) === device: unhandled exception c0000005 at 0040320F === WVISTAADM (32 bit device) === device: unhandled exception c0000005 at 0040320F === W2K8SE (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PRO (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PROX64 (32 bit device) === device: unhandled exception c0000005 at 0040320F === W7PROX64 (64 bit device) === Timeout

1 0

Re: wininet: Use test.winehq.org for post tests
by Marvin May 2, 2011

May 2, 2011

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=10676 Your paranoid android. === WVISTAADM (32 bit http) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: [PATCH 1/5] mmdevapi: Add InitializeDriver() method to drivers
by Alexandre Julliard May 2, 2011

May 2, 2011

Andrew Eikum <aeikum(a)codeweavers.com> writes: > @@ -72,11 +73,19 @@ static BOOL load_driver(const WCHAR *name) > } > > #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ > - if(!drvs.p##n) return FALSE; } while(0); > + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); > + LDFC(InitializeDriver); > LDFC(GetEndpointIDs); > LDFC(GetAudioEndpoint); > #undef LDFC > > + hr = drvs.pInitializeDriver(); > + if(FAILED(hr)){ > + TRACE("Driver initialization failed: %08x\n", hr); > + FreeLibrary(drvs.module); > + return hr; > + } If you are going to call it on load, you could just as well do the init in the driver on DLL_PROCESS_ATTACH and avoid the extra method. -- Alexandre Julliard julliard(a)winehq.org

2 2