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

Re: USB Osciloscope

by Archie Robertson

> Hello, > > What WINE version do you try to use? > What do you put to the WINE registry? > Could you send me ezusb.sys and a starting WINE log with > WINEDEBUG=+winedevice,+ntoskrnl,+usbhub ? > > Thanks, > Alexander Here is the information you have requested. I had trouble emailing the driver, so I put them on my web server at www.robertsonrobots.com/ezusb.sys Thanks for the help, Archie wine-1.0.1 REGEDIT4 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1] "Capabilities"=dword:00000084 "Class"="DSO" "ClassGUID"="{4C696E6B-2049-6E73-7472-756D656E7473}" "CompatibleIDs"=hex(7):55,53,42,5c,43,6c,61,73,73,5f,66,65,26,53,75,62,43,6c,61,\ 73,73,5f,30,33,26,50,72,6f,74,5f,30,30,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,26,53,75,62,43,6c,61,73,73,5f,30,33,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,00,00 "ConfigFlags"=dword:00000000 "DeviceDesc"="Link Instruments DSO-8502" "Driver"="{4C696E6B-2049-6E73-7472-756D656E7473}\\0001" "HardwareID"=hex(7):55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,69,64,5f,30,30,30,\ 34,26,52,65,76,5f,30,30,30,35,00,55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,\ 69,64,5f,30,30,30,34,00,00 "LocationInformation"="DSO-8502" "Mfg"="Link Instruments" "Service"="ezusb" "UINumber"=dword:00000000 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1\Device Parameters] "SymbolicName"="\\??\\USB#Vid_3195&Pid_0004#5&c1e6cce&0&1#{a5dcbf10-6530-11d2-901f-00c04fb951ed}" [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&1\LogConf] [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2] "Capabilities"=dword:00000084 "Class"="DSO" "ClassGUID"="{4C696E6B-2049-6E73-7472-756D656E7473}" "CompatibleIDs"=hex(7):55,53,42,5c,43,6c,61,73,73,5f,66,65,26,53,75,62,43,6c,61,\ 73,73,5f,30,33,26,50,72,6f,74,5f,30,30,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,26,53,75,62,43,6c,61,73,73,5f,30,33,00,55,53,42,5c,43,6c,61,73,73,5f,66,\ 65,00,00 "ConfigFlags"=dword:00000000 "DeviceDesc"="Link Instruments DSO-8502" "Driver"="{4C696E6B-2049-6E73-7472-756D656E7473}\\0000" "HardwareID"=hex(7):55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,69,64,5f,30,30,30,\ 34,26,52,65,76,5f,30,30,30,35,00,55,53,42,5c,56,69,64,5f,33,31,39,35,26,50,\ 69,64,5f,30,30,30,34,00,00 "LocationInformation"="DSO-8502" "Mfg"="Link Instruments" "Service"="ezusb" "UINumber"=dword:00000000 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2\Device Parameters] "SymbolicName"="\\??\\USB#Vid_3195&Pid_0004#5&c1e6cce&0&2#{a5dcbf10-6530-11d2-901f-00c04fb951ed}" [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Enum\USB\Vid_3195&Pid_0004\5&c1e6cce&0&2\LogConf] REGEDIT4 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\ezusb] "ErrorControl"=dword:00000001 "ImagePath"="\"system32\\\\driver\\\\ezusb.sys\"" "Start"=dword:00000003 "Type"=dword:00000001 [HKEY_LOCAL_MACHINE\System\CurrentControlSet\Services\ezusb\Security] "Security"=hex:01,00,14,80,a0,00,00,00,ac,00,00,00,14,00,00,00,30,00,00,00,02,\ 00,1c,00,01,00,00,00,02,80,14,00,ff,01,0f,00,01,01,00,00,00,00,00,01,00,00,\ 00,00,02,00,70,00,04,00,00,00,00,00,18,00,fd,01,02,00,01,01,00,00,00,00,00,\ 05,12,00,00,00,00,00,00,00,00,00,1c,00,ff,01,0f,00,01,02,00,00,00,00,00,05,\ 20,00,00,00,20,02,00,00,00,00,00,00,00,00,18,00,8d,01,02,00,01,01,00,00,00,\ 00,00,05,0b,00,00,00,20,02,00,00,00,00,1c,00,fd,01,02,00,01,02,00,00,00,00,\ 00,05,20,00,00,00,23,02,00,00,00,00,00,00,01,01,00,00,00,00,00,05,12,00,00,\ 00,01,01,00,00,00,00,00,05,12,00,00,00 phoenox(a)firebird:~/.wine/drive_c/DSO8000$ WINEDEBUG=+winedevice, +ntoskrnl,+usbhub wine ezusb.sys trace:winedevice:ServiceMain starting service L"MountMgr" trace:winedevice:load_driver loading driver L"C:\\windows\\system32\ \drivers\\mountmgr.sys" trace:ntoskrnl:IoCreateDevice (0x7ee8c480, 0, L"\\Device\ \MountPointManager", 0, 0, 0, 0x7ec048ac) trace:ntoskrnl:IoCreateSymbolicLink L"\\??\\MountPointManager" -> L"\ \Device\\MountPointManager" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\\Harddisk0", 0, 0, 0, 0x7ec047f8) trace:ntoskrnl:IoCreateSymbolicLink L"\\??\\PhysicalDrive0" -> L"\ \Device\\Harddisk0" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a540) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\C:" -> L"\\Device\ \HarddiskVolume1" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000043}" -> L"\\Device\ \HarddiskVolume1" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a568) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a568) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\D:" -> L"\\Device\ \HarddiskVolume2" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000044}" -> L"\\Device\ \HarddiskVolume2" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume3", 0, 0, 0, 0x7ec3a590) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\H:" -> L"\\Device\ \HarddiskVolume3" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-000000000048}" -> L"\\Device\ \HarddiskVolume3" trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume1", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume2", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume3", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateDevice (0x1117b0, 20, L"\\Device\ \HarddiskVolume4", 0, 0, 0, 0x7ec3a5b8) trace:ntoskrnl:IoCreateSymbolicLink L"\\DosDevices\\Z:" -> L"\\Device\ \HarddiskVolume4" trace:ntoskrnl:IoCreateSymbolicLink L"\\??\ \Volume{00000000-0000-0000-0000-00000000005a}" -> L"\\Device\ \HarddiskVolume4" trace:winedevice:init_driver init done for L"MountMgr" obj 0x7ee8c480 trace:winedevice:init_driver - DriverInit = 0x7ec383c0 trace:winedevice:init_driver - DriverStartIo = (nil) trace:winedevice:init_driver - DriverUnload = (nil) trace:winedevice:init_driver - MajorFunction[0] = (nil) trace:winedevice:init_driver - MajorFunction[1] = (nil) trace:winedevice:init_driver - MajorFunction[2] = (nil) trace:winedevice:init_driver - MajorFunction[3] = (nil) trace:winedevice:init_driver - MajorFunction[4] = (nil) trace:winedevice:init_driver - MajorFunction[5] = (nil) trace:winedevice:init_driver - MajorFunction[6] = (nil) trace:winedevice:init_driver - MajorFunction[7] = (nil) trace:winedevice:init_driver - MajorFunction[8] = (nil) trace:winedevice:init_driver - MajorFunction[9] = (nil) trace:winedevice:init_driver - MajorFunction[10] = (nil) trace:winedevice:init_driver - MajorFunction[11] = (nil) trace:winedevice:init_driver - MajorFunction[12] = (nil) trace:winedevice:init_driver - MajorFunction[13] = (nil) trace:winedevice:init_driver - MajorFunction[14] = 0x7ec37630 trace:winedevice:init_driver - MajorFunction[15] = (nil) trace:winedevice:init_driver - MajorFunction[16] = (nil) trace:winedevice:init_driver - MajorFunction[17] = (nil) trace:winedevice:init_driver - MajorFunction[18] = (nil) trace:winedevice:init_driver - MajorFunction[19] = (nil) trace:winedevice:init_driver - MajorFunction[20] = (nil) trace:winedevice:init_driver - MajorFunction[21] = (nil) trace:winedevice:init_driver - MajorFunction[22] = (nil) trace:winedevice:init_driver - MajorFunction[23] = (nil) trace:winedevice:init_driver - MajorFunction[24] = (nil) trace:winedevice:init_driver - MajorFunction[25] = (nil) trace:winedevice:init_driver - MajorFunction[26] = (nil) trace:winedevice:init_driver - MajorFunction[27] = (nil) err:module:attach_process_dlls "USBD.SYS" failed to initialize, aborting err:module:LdrInitializeThunk Main exe initialization for L"C:\\DSO8000\ \ezusb.sys" failed, status c0000142

March 9, 2011

Re: wininet: Reimplement IsUrlCacheEntryExpired

by Marvin

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

March 9, 2011

d3dxcreatebox patch

by David Adam

Hello, is there any problem with my d3dxcreatebox patch? Thanks in advance for any feedback. A+ David

March 9, 2011

Re: mshtml: avoid shadowing a parameter (2/2)

by Jacek Caban

Hi Austin, On 3/9/11 10:07 AM, Austin English wrote: > diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c > index d0d378f..9948a02 100644 > --- a/dlls/mshtml/htmlwindow.c > +++ b/dlls/mshtml/htmlwindow.c > @@ -2141,22 +2141,22 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD > > switch(prop->type) { > case GLOBAL_SCRIPTVAR: { > - IDispatchEx *dispex; > + IDispatchEx *dpex; How about renaming argument name to 'iface'? It's not really an interface, but its purpose in this context is like iface arguments in regular COM objects. Jacek

March 9, 2011

Re: [2/5] d3dx9: Support triangulation of complex glyphs in D3DXCreateText.

by Dylan Smith

On Wed, Mar 9, 2011 at 8:02 AM, Alexandre Julliard <julliard(a)winehq.org>wrote: > > Is there a reason for not using qsort? > > No. I didn't realize the function existed in the c standard library.

March 9, 2011

Re: [2/5] d3dx9: Support triangulation of complex glyphs in D3DXCreateText.

by Alexandre Julliard

Dylan Smith <dylan.ah.smith(a)gmail.com> writes: > +static void sort_vertex_indices(struct point2d_index *start, int count) > +{ > + struct point2d_index *current, *middle_value, *last; > + int below_count; > + > + if (count <= 1) > + return; > + > + /* quick sort */ > + last = start + count - 1; > + middle_value = last--; > + current = start; > + while (current <= last) > + { > + if (compare_vertex_indices(current, middle_value) < 0) { > + current++; > + } else { > + swap_vertex_indices(current, last); > + last--; > + } > + } > + swap_vertex_indices(current, middle_value); > + > + below_count = current - start; > + sort_vertex_indices(start, below_count); > + sort_vertex_indices(current + 1, count - below_count - 1); > +} Is there a reason for not using qsort? -- Alexandre Julliard julliard(a)winehq.org

March 9, 2011

Re: Make sure This->bsc.doc will be initialized while opening a zero byte html file, fix bug 25999 . modified: dlls/mshtml/navigate.c

by Saulius Krasuckas

* On Tue, 8 Mar 2011, Jacek Caban wrote: > > What's the exact problem you're trying to fix? AFAIK, builtin IE crashes on loading empty file: http://bugs.winehq.org/show_bug.cgi?id=25999 S.

March 9, 2011

Re: [PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

by Henri Verbeet

On 8 March 2011 23:48, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm) > It's not working very well then, surfaces really do always have D3DRTYPE_SURFACE as resource type in Wine. Note that returning D3DRTYPE_TEXTURE for surfaces that are part of a texture would also imply that you can't distinguish between a surface and a texture IDirect3DResource9 pointer without doing QueryInterface() calls.

March 8, 2011

Re: [PATCH 4/4] d3d9: Surfaces always have resource type WINED3DRTYPE_SURFACE.

by Stefan Dösinger

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually I think we have a test that shows that if the surface is part of a texture it has resource type WINED3DRTYPE_TEXTURE. (Unverified, it's too late so I am too lazy to look for the exact test atm) Am 08.03.2011 um 19:41 schrieb Henri Verbeet: > --- > dlls/d3d9/device.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 1dd6895..e008b31 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -1081,8 +1081,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, > > /* This method is only allowed with surfaces that are render targets, or > * offscreen plain surfaces in D3DPOOL_DEFAULT. */ > - if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) > - && (desc.pool != WINED3DPOOL_DEFAULT || desc.resource_type != WINED3DRTYPE_SURFACE)) > + if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3DPOOL_DEFAULT) > { > wined3d_mutex_unlock(); > WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); > -- > 1.7.3.4 > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) iQIcBAEBAgAGBQJNdrJeAAoJEN0/YqbEcdMwx3kP/0FGwYvZM7+YUz1atAfcpTQH mFsaWRKCMac9FHWHsoK++HyeN0R0F69NMnJzH33u2xxhrM6DvPfHsDrP0kcySHDN 3sVP/87U1cdHaVmURjnx6o0+3elj/IikmM0rGkTT3eityItp5hgj+OiizuD+wwQ5 jxrcsvI1tS4iZe+j+2s8zt1zJYhGNhJRI5n8IFCpPP3MXFqDPxxiUwua7MRweWx3 MRZQVkmJ4/3Jy5rTKjf4LROBqY2ZLP8Yeyo0jgAS3Wn+1LEJqKtgEhz03/rxGNPQ Lwpx+1gLsl2XonbZMPUXfhoE4ETi70S7OC2Z3EVOBY+XbEPRdEq6qIsoAQwFfHFQ AVo8qjSndjcd9sxQ4MQyarxHfRuL9OlCnO+WKfMOHo1WFdBg7I8uPrYKuZmlDZ2c lEwSOgh2Td0PCs0Gha0uqt8Gav5t1M40zKoGE2Lmd8gKAu4+Ot1IwbhU0tebaKMC JUD0d83oNgxbPsoKUdbbnq4oeDBMNnnFKQ18m9H7N1LABe9hzE13IfcxCfVLWfzk CtJlYWBeqa5hD5Chf1eNMuZEHyooaRhgy6Q0Vd5DVVpTMj9JzURIo7Mnb43GG9QT H7EkmVR2Ivn8ZHzF7nqeAJxqcWQKPmpn5/RTqapPbVx5mN7CYIICj5pvkJi8A0Zs Qvn8oiJ+qivoIPKlIyTP =Pm4w -----END PGP SIGNATURE-----

March 8, 2011

Re: winegcc preprocessor macro containing wine version?

by Roderick Colenbrander

On Tue, Mar 8, 2011 at 10:03 PM, Dan Kegel <dank(a)kegel.com> wrote: > Robert McDonald asked: >> I want to be able to define a structure if I'm compiling with Wine 1.2.2 >> but not with Wine 1.3.15, since the structure definition exists in the >> latter but not the former. Is there a preprocessor macro pre-defined by >> winegcc that holds the Wine version? > > #include "config.h" > gives you PACKAGE_VERSION, but that's a string. > > Looking at 'git blame commctrl.h, I see that MCM_SETCALENDARBORDER > is a preprocessor symbol of similar vintage to TASKDIALOG_BUTTON, > testing for that should suffice. > > (But Wine doesn't implement task dialogs, hope you're not expecting > them to work. There has been some interest in implementing it, > and some code is floating around, but I haven't heard anything concrete yet.) > - Dan > > > I'm not familiar with your build system, but what a lot of projects do (including Wine) to check if a function is present is to perform a tiny compile test during 'configure'. That's also the type of solution I would try to search for instead of relying on a number. Roderick

March 8, 2011

re: winegcc preprocessor macro containing wine version?

by Dan Kegel

Robert McDonald asked: > I want to be able to define a structure if I'm compiling with Wine 1.2.2 > but not with Wine 1.3.15, since the structure definition exists in the > latter but not the former. Is there a preprocessor macro pre-defined by > winegcc that holds the Wine version? #include "config.h" gives you PACKAGE_VERSION, but that's a string. Looking at 'git blame commctrl.h, I see that MCM_SETCALENDARBORDER is a preprocessor symbol of similar vintage to TASKDIALOG_BUTTON, testing for that should suffice. (But Wine doesn't implement task dialogs, hope you're not expecting them to work. There has been some interest in implementing it, and some code is floating around, but I haven't heard anything concrete yet.) - Dan

March 8, 2011

Re: winealsa.drv: Waveout rewrite to allow multiple waveopens

by Maarten Lankhorst

Hi Joerg, Op 08-03-11 12:36, Joerg-Cyril.Hoehle(a)t-systems.com schreef: > Maarten, > > let me apologize for barely taking the time to look at the extra patches > you write outside of the main git tree. I hope other people find more time > to try them out with real apps and report on their findings. > > Here are a few comments of mine on your winealsa rewrite (beside bug #22261, comment #6). > > - It's been a pleasure to hear mciwave+winealsa open multiple devices concurrently > with dmix mixing all playing sounds thanks to this rewrite. > > > - wodNotifyDoneList is called from within a critical section in wodTick(). > This may break havoc with DCB_FUNCTION callbacks, as the driver > does not appear to be re-entrant. > > EnterCriticalSection offers no protection from within the same thread. > Some apps are known to call waveOutClose() from within the DONE callback. > Didn't check yet. Maybe useful for the winmm->mmdevapi stuff. > Of course you may delegate this issue to a solution to bug #3930. I'd be curious > if you have any ideas about how to delay notification to a later point > in time, "until it is safe to do" -- native appears to delay as well. > > > - You may wish to look into bug #22880. > Lemmix is a small (143KB) downloadable application that opens two waveout devices. > It plays both music and sound effects on Mac OS using the winecoreaudio > driver, but fails to do so with your ALSA driver, although both devices open > and WINEDEBUG=+wave shows calls to waveOutWrite. I could not figure out > what goes wrong. @@ -488,8 +488,9 @@ static DWORD wodReset(waveimpl *dev, wavestreamimpl *wwo) { savedqueue = wwo->queue; wwo->queue = wwo->loop = NULL; wwo->ofs = 0; - wwo->stopped = 1; snd_pcm_drop(wwo->pcm); + snd_pcm_prepare(wwo->pcm); + snd_pcm_start(wwo->pcm); LeaveCriticalSection(&dev->crst); wodNotifyDoneList(wwo, savedqueue); Cheers, Maarten

March 8, 2011

winegcc preprocessor macro containing wine version?

by Robert McDonald

I want to be able to define a structure if I'm compiling with Wine 1.2.2 but not with Wine 1.3.15, since the structure definition exists in the latter but not the former. Is there a preprocessor macro pre-defined by winegcc that holds the Wine version? Maybe that's not the best long-term solution but that will help for awhile. #if defined ...? typedef struct tagTASKDIALOG_BUTTON { int nButtonID; ctstr pszButtonText; } TASKDIALOG_BUTTON, MsgBoxOption; #else typedef TASKDIALOG_BUTTON MsgBoxOption; #endif -- Robert McDonald BitTorrent, Inc.

March 8, 2011

Re: Make sure This->bsc.doc will be initialized while opening a zero byte html file, fix bug 25999 . modified: dlls/mshtml/navigate.c

by Jacek Caban

Hi Zuno, I don't think that's the right place for the fix. What's the exact problem you're trying to fix? AFAICS the only important difference your patch makes is that on_start_nsrequest will be always called in read_stream_data (possibly many times), but it's also called in on_stop_nsrequest if no data was read. Jacek

March 8, 2011

Re: widl: Pass the switchtype attribute from an alias to the base type

by Alexandre Julliard

Eric Kohl <eric.kohl(a)t-online.de> writes: > Hi, > > this patch ensures that client and server code for non-encapsulated > unions is generated correctly. The switchtype attribute must be passed > to from a type alias to the base type in order to get recognized by > write_union_tfs(). Modifying the base type doesn't seem right. You should add some test cases. -- Alexandre Julliard julliard(a)winehq.org

March 8, 2011

Re: [1/2] wininet: Partially implement FreeUrlCacheSpaceW.

by Alexandre Julliard

Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> writes: > + if (file == INVALID_HANDLE_VALUE) > + { > + if (GetLastError() == ERROR_SHARING_VIOLATION) > + { > + WCHAR title[128]; > + LoadStringW(WININET_hModule, IDS_CACHE_IN_USE, message, sizeof(message)/sizeof(*message)); > + LoadStringW(WININET_hModule, IDS_WARNING, title, sizeof(title)/sizeof(*title)); > + MessageBoxW(NULL, message, title, MB_OK); > + } I don't think you want to show message boxes, particularly not for such harmless errors. -- Alexandre Julliard julliard(a)winehq.org

March 8, 2011

Re: wininet(3/7): Account for disk space used by cache

by Alexandre Julliard

Juan Lang <juan.lang(a)gmail.com> writes: > +{ > + ULARGE_INTEGER currentSize, addedSize, limit; > + > + currentSize.u.LowPart = pHeader->dwCacheUsageLow; > + currentSize.u.HighPart = pHeader->dwCacheUsageHigh; > + addedSize.u.HighPart = fileSizeHigh; > + addedSize.u.LowPart = fileSizeLow; > + currentSize.QuadPart += addedSize.QuadPart; > + limit.u.LowPart = pHeader->dwCacheLimitLow; > + limit.u.HighPart = pHeader->dwCacheLimitHigh; > + if (commit) > + { > + pHeader->dwCacheUsageLow = currentSize.u.LowPart; > + pHeader->dwCacheUsageHigh = currentSize.u.HighPart; > + } > + return currentSize.QuadPart > limit.QuadPart; You should store the fields as large integer in the header structure, that would save a lot of redundant manipulations. -- Alexandre Julliard julliard(a)winehq.org

March 8, 2011

winealsa.drv: Waveout rewrite to allow multiple waveopens

by Joerg-Cyril.Hoehle＠t-systems.com

Maarten, let me apologize for barely taking the time to look at the extra patches you write outside of the main git tree. I hope other people find more time to try them out with real apps and report on their findings. Here are a few comments of mine on your winealsa rewrite (beside bug #22261, comment #6). - It's been a pleasure to hear mciwave+winealsa open multiple devices concurrently with dmix mixing all playing sounds thanks to this rewrite. - wodNotifyDoneList is called from within a critical section in wodTick(). This may break havoc with DCB_FUNCTION callbacks, as the driver does not appear to be re-entrant. EnterCriticalSection offers no protection from within the same thread. Some apps are known to call waveOutClose() from within the DONE callback. Of course you may delegate this issue to a solution to bug #3930. I'd be curious if you have any ideas about how to delay notification to a later point in time, "until it is safe to do" -- native appears to delay as well. - You may wish to look into bug #22880. Lemmix is a small (143KB) downloadable application that opens two waveout devices. It plays both music and sound effects on Mac OS using the winecoreaudio driver, but fails to do so with your ALSA driver, although both devices open and WINEDEBUG=+wave shows calls to waveOutWrite. I could not figure out what goes wrong. - I've seen old apps ask for ~7000 samples per second. Your limit of 8000 is too high. Here's a patch to use DSBFREQUENCY_* like the other devices do. Lemmix needs it (although I did not investigate why the msacm/pcmconverter did not kick in and resample to a higher frequency). >From 54224dbf35354036934d7791acafe0353cbef7bc Mon Sep 17 00:00:00 2001 From: =?utf-8?q?J=C3=B6rg=20H=C3=B6hle?= <hoehle(a)users.sourceforge.net> Date: Sat, 5 Mar 2011 19:28:00 +0100 Subject: winealsa: Use DSBFREQUENCY_* as lower and upper bounds. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 23560cc..b15164b 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -225,7 +225,7 @@ static DWORD wodGetDevCaps(waveimpl *dev, LPWAVEOUTCAPSW lpCaps, DWORD dwSize) { static snd_pcm_format_t get_format(WAVEFORMATEX *wfx) { WAVEFORMATEXTENSIBLE *wfe = (WAVEFORMATEXTENSIBLE *)wfx; - if (!wfx->nChannels || wfx->nSamplesPerSec < 8000 || wfx->nSamplesPerSec > 192000) + if (!wfx->nChannels || wfx->nSamplesPerSec < DSBFREQUENCY_MIN || wfx->nSamplesPerSec > DSBFREQUENCY_MAX) return SND_PCM_FORMAT_UNKNOWN; if (wfx->wFormatTag == WAVE_FORMAT_PCM) { -- 1.5.6.3 Regards, Jörg Höhle

March 8, 2011

Re: [3/3] msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verif

by Marvin

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=9778 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5993: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

March 8, 2011

Re: [2/3] msi: Load media info even if there's no file to install.

by Marvin

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=9777 Your paranoid android. === WNT4WSSP6 (32 bit install) === install.c:5958: Test failed: Per-user icon file isn't where it's expected (C:\WINNT\Profiles\Default User\Application Data\Microsoft\Installer\{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\testicon)

March 8, 2011

Re: New winetricks-alpha 20110306: new game Crysis 2 Demo and seven others, new dll dinput, lots of bug fixes; ie8 now works

by Vitaliy Margolen

On 03/07/2011 08:06 AM, Dan Kegel wrote: > On Mon, Mar 7, 2011 at 6:51 AM, Vitaliy Margolen > <wine-devel(a)kievinfo.com> wrote: >> I think it's a good idea to warn them about consequences of using native >> dinput. > > I'll add a warning. > >>> Are there others in particular that you have seen cause grief? >> >> Mostly complete DX. Users install that and expect Wine to have flawless d3d, >> including Intel/ATI GPUs. > > I already have a warning there, but maybe it's not visible enough, > I'll make it more obvious. Thanks, that should do it. Vitaliy.

March 8, 2011

Try to fix bug 25999 , patch for dlls/mshtml/navigate.c

by Qian Hong

Hi Jacek, It seems http://bugs.winehq.org/show_bug.cgi?id=25999 has no update from Wine developers, my friend Zhuo Wei has write a patch for it, tests in dlls/mshtml/tests are run on Wine, ( according to http://www.winehq.org/docs/winedev-guide/testing-wine ), every test passes successfully, could you help to review it ? Thanks a lot! >From c5ee98396123c6cccdd295025a6b5aceb87dc0f7 Mon Sep 17 00:00:00 2001 From: Zhuo Wei <zhuo.wei.math(a)gmail.com> Date: Mon, 7 Mar 2011 23:58:09 +0800 Subject: Make sure This->bsc.doc will be initialized while opening a zero byte html file, fix bug 25999 . modified: dlls/mshtml/navigate.c --- dlls/mshtml/navigate.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bb71c79..0e7a298 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -985,8 +985,6 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) read = 0; hres = IStream_Read(stream, This->nsstream->buf+This->nsstream->buf_size, sizeof(This->nsstream->buf)-This->nsstream->buf_size, &read); - if(!read) - break; This->nsstream->buf_size += read; @@ -1014,6 +1012,9 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) on_start_nsrequest(This); } + if(!read) + break; + This->bsc.readed += This->nsstream->buf_size; nsres = nsIStreamListener_OnDataAvailable(This->nslistener, -- 1.7.1 -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

March 7, 2011

Re: [5/5] msi: Manage one assembly cache per major version of the .NET runtime.

by Hans Leidekker

On Mon, 2011-03-07 at 08:57 -0600, Vincent Povirk wrote: > > + static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; > > + static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; > > No v4.0.30319 ? Not yet. It doesn't install so I can't test it.

March 7, 2011

Re: New winetricks-alpha 20110306: new game Crysis 2 Demo and seven others, new dll dinput, lots of bug fixes; ie8 now works

by Dan Kegel

On Mon, Mar 7, 2011 at 6:51 AM, Vitaliy Margolen <wine-devel(a)kievinfo.com> wrote: > I think it's a good idea to warn them about consequences of using native > dinput. I'll add a warning. >> Are there others in particular that you have seen cause grief? > > Mostly complete DX. Users install that and expect Wine to have flawless d3d, > including Intel/ATI GPUs. I already have a warning there, but maybe it's not visible enough, I'll make it more obvious. Thanks, Dan

March 7, 2011

Re: [5/5] msi: Manage one assembly cache per major version of the .NET runtime.

by Vincent Povirk

> + static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; > + static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; No v4.0.30319 ?

March 7, 2011