July 2005 - wine-devel

The status of the wintab dll
by Robert North 24 Dec '07

24 Dec '07

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I think after the 10 or more patches to the Wintab dll that I submitted last month, I should say something about it's status... And of course thank Alexandre for applying those patches. P.S. I won't be available from the 15th for about a week or so. So, if you have any questions, I'm afraid you might have to be patient. Hope this is of interest to someone -Rob. ******Applications: Current status*********** ***In Painter 5 *Cursor pressure works. (Therefore is usable by most) *Cursor orientation is a little odd: The orientation maths needs to be re-done. *No eraser. Haven't yet cracked what enables the eraser. *Doesn't work in desktop mode: Need to map to desktop coordinates. *Repeats windows bugs where cursor looses pressure/orientation info almost bug for bug (Is this a feature? ;-) *Cannot detect pressure/orientation int the "Brush Tracking" window: The tablet context is attached to the main window, so no events get to the popup, even if they overlap. This is not how windows wintab functions. ***In Photoshop 6. *Can only get tablet data in desktop mode: This is because the tablet context is attached to the desktop. Which generates/receives no wine events outside desktop mode. * Eraser and pen pressure working. *But* to get them working, you must have 3 XInput devices listed in your XF86Config file, They need to be the last entries in the "ServerLayout" section and the following order: eraser, tablet mouse. This is a far from ideal way of specifying the devices Wintab should use :-/ I'll document this if someone can point me to a good place to put the docs. *******To Do************* 1. Look at X11 errors. There appear to be some errors that deny some users the ability to access Wintab enabled apps. (I think I know how to fix this) 2. Improve orientation data. Orientation comes in as X-Y coords (Implicit Z), and has to leave as spherical coords. This calculation needs to be re-done. 3. When tablet context is on top, let it read XInput events from all the app's top-level windows. (This simulates the fact that the context is usually designed to cover the whole screen) 4. When tablet context is attached to desktop, read XInput events from all the app's top-level windows. 5. Tests ~ --My current philosophy on tests is... ~ Use Photoshop & Painter, any formal tests ~ can be written if anyone else gets involved in patching Wintab, to avoid regressions, and conflict. **********Long term to do (Anyone interested?):********* There's a lot of work that could be done here, but what gets done and who does it probably depends upon whether anyone finds an app that needs these features. I'd love to implement these, but realistically, I don't foresee doing this unless someone hires me to do so ;) 1. Improve configuration of wintab. Wintab could probably do with some information entered into the config file, to avoid the user having to hack their Xfree86cfg file. 2. Handle Z-Order of context properly. This entails *sharing Z-Order between apps. *Working out exactly what role windows have in determining tablet context z-orders. *Allow tablet contexts that don't cover the whole screen/tablet. *Handle inter-application clipping of tablet contexts *Allow all application's windows to receive tablet events when tablet context is on top 3. Implement non-system tablet contexts (Where system cursor not moved by pen or mouse) 4. Unicodify 5. Implement various wintab extensions. 6. Implement wintab manager functions. 7. Tests. *********Unknowns********* 1. How are wintab contexts are raised lowered? Contexts have their own z-order independent of windows, and their own viewport concept, based upon the tablet's coordinate system, not that of the OS. It appears that entering, or clicking on the window the tablet context is attached to will raise/lower the context. But I haven't done much testing on this. In particular, what happens if more than one app request their tablet context is attached to the desktop? 2. How Painter detects the eraser. Have 3 possibilities i. Windows can detect an eraser, and sends specific messages. (I'm sure I've seen this, but can't work out where!) ii. Only works if tablet and cursors are named correctly. (Probably linked to wacom tablets only). iii. I've missed something 3. Requirements of other applications -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2-rc1-SuSE (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCC8zI2vfwxdLxwWYRAsisAJ4q2gAYTgRc6f9wDI+Ruv943eDxOQCfcl3s /ZKMUGwQOuw/SIIbOkIUbd0= =R4M7 -----END PGP SIGNATURE-----

2 1

Window geometry problem
by Pavel Troller 28 Nov '05

28 Nov '05

Hi! I would like to report a long lasting problem with an application, which renders its main window incorrectly in wine. The app is "iRiver caption editor" and it can be freely downloaded at http://www.iriveramerica.com/download/ce.zip . Installation of the program is easy and proceeds and the program itself runs well, but its window looks like a total mess. For a snapshot, look at http://www.sinus.cz/~patrol/ircape.png . I think it's not necessary to write more, what's wrong, simply the widgets are misplaced, incorrectly sized, the window has scrollbars, which it IMHO shouldn't have etc. The window is not resizable. It's the only app known to me which exhibits such a behaviour. I don't have a possibility to test it on a real windoze system, I don't have it. I'm about to file a bug for it, but I'm asking first here to verify that it's not an easily resolvable problem with my setup etc., and also whether a similar (or the same) behaviour isn't already registered. With regards, Pavel Troller

3 2

Half-Life 2 / Counter-Strike: Source under Wine
by James Liggett 31 Oct '05

31 Oct '05

Hi, Out of curiosity, has anyone successfully been able to play HL2 or CS:S under wine? Today I finally worked out the kinks getting the original HL to work, and I know some people have been playing around with this stuff. Currently, HL2 and CS:S freeze over on startup. Has anyone even gotten it to start or even play? James Liggett

9 24

App db not accepting screen shots....
by Oliver Stieber 03 Oct '05

03 Oct '05

Hi, The application DB won't let me upload a screen shot, I get 'connection to host was lost' or 'page contains no data'. ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

7 17

More debugger quesions
by Robert Lunnon 04 Sep '05

04 Sep '05

Well we are getting somewhere When my test application segfaults the debugger attaches and runs through a number of debug events eventually ariving at a segfault strace:winedbg:dbg_handle_debug_event 00000008:00000009: loads DLL c: \windows\system\imm32.dll @7f440000 (0<0>) trace:winedbg:dbg_handle_debug_event 00000008:00000009: exception code=80000003 Now I added some instrumentation and find the following happens IE trace:winedbg:dbg_handle_debug_event Continue on first exception is true trace:winedbg:dbg_handle_debug_event Breaking switch trace:winedbg:dbg_handle_debug_event Call ContinueDebugEvent trace:winedbg:dbg_handle_debug_event Continuing executio trace:winedbg:dbg_main_loop Wait for next debug event... In this code at the top of dbg_main_loop if (dbg_curr_process) dbg_printf("WineDbg starting on pid 0x%lx\n", dbg_curr_pid); /* wait for first exception */ while (WaitForDebugEvent(&de, INFINITE)) { WINE_TRACE("Calling handle_debug_event 2\n"); if (dbg_handle_debug_event(&de)) {WINE_TRACE("Event handled\n");break;} WINE_TRACE("Wait for next debug event...\n"); } Problem is that the client program is stopped, probably on a segfault trace because I enable tracing (stops) on all machine faults and signals when I attached it (this allows my replacement for wait4 to find out if a fault or signal happened in the debuggee). Everything deadlocks then since the debugger never continues the program after the exception (Or perhaps the wineserver never gets a message to restart it) Perhaps I don't understand the semantics of PTRACE wait4 interactions. Should I just let the app trap machine faults ? All help appreciated Bob

3 4

wined3d - d3d9 regression testing
by Oliver Stieber 03 Sep '05

03 Sep '05

Hi, Wined3d in CVS is now in a reasonable state to start regression testing new changes against. I usually regression test against a few game demos and DirectX 9 tutorials, I'm going to list the DirectX 9 tutorials as they start to work (there are 68 tutorials that work with the big patch). The current list of working DirectX 9 demos is: from http://www.codesampler.com/dx9src.htm dx9_1pass_emboss_bump_mapping dx9_2pass_emboss_bump_mapping dx9_alpha_blending_texture dx9_multiple_vertex_buffers dx9_texture_dot3_blending dx9_texture_filtering dx9_texture_mipmapping dx9_texture_subloading dx9_tokamak_chain dx9_transforms dx9_vertex_data dx9_view_matrix dx9_view_ports dx9_spot_light dx9_texture dx9_texture_addressing (has a mipmapping error with ATI's drivers) dx9_primitive_types dx9_point_light dx9_dot3_bump_mapping dx9_effect_simple dx9_fonts dx9_indexed_geometry dx9_initialization dx9_lighting (has a slight artifact) dx9_material dx9_multitexture dx9_offscreen_rendering (faked) dx9_2d_demo_game (text for non-power2 textures, ship doesn't animate yet) from http://triplebuffer.devmaster.net/tutorials.php BumpMapping tb_dx9_03 tb_dx9_04 tb_dx9_05 (sort of) tb_dx9_06 tb_dx9_07 tb_dx9_08 tb_dx9_09 tb_dx9_10 from http://www.clootie.ru/delphi/download_dx90.html#Direct3D Tut01_CreateDevice Tut02_Vertices Tut03_Matrices Tut04_Lights Tut05_Textures Tut06_Meshes cull ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

5 12

Re: Software patents
by gslink 24 Aug '05

24 Aug '05

The whole business of software patents is very likely to explode at any time. There are several software patents on cds and dvds which are so vague that it is impossible to tell exactly what is going on. The licenses to use these patents allow the company issuing the patent to control cd content and to examine it. The first time one of these companies tries to use the license to access DOD classified information there will be a resolution. The easiest way to resolve this business with Borland is to contact Borland. They may also have an interest in Wine. If they have no objection to what Wine wants to do then there is no one else to complain. They might even help Wine. Borland probably doesn't even realize that Wine exists although some of the people in Borland are probably very familiar with it. I think you will find this to be true of all big software companies such as IBM and Microsoft.

8 10

Automatic ANSI<>Unicode message translation
by Phil Krylov 23 Aug '05

23 Aug '05

Hi, I am having a problem with an app of mine. It posts WM_CHAR messages to a ANSI window with Unicode value in LOWORD(wParam). Wine automatically translates the character code to ANSI (producing a "?" when there is no such code in CP_ACP). Windows does not do it (contrary to documentation). Here is attached (source and binary) a quick and dirty sample application which shows the problem. I could remove map_wparam_AtoW() and map_wparam_WtoA() from dlls/user/message.c, but probably somebody needs that translation. Does anybody have an idea of a better fix for that bug? -- Ph.

5 29

Mouse-buttons swapped after winetest
by Paul Vriens 19 Aug '05

19 Aug '05

Hi, with the latest winetest http://www.astro.gla.ac.uk/users/paulm/WRT/CrossBuilt/winetest-200506211000… my mouse-buttons (left and right) are swapped after the test. Any idea?? Cheers, Paul.

4 6

Frequent and annoying Wine bug
by Robbert Xerox 15 Aug '05

15 Aug '05

Hi , i know this is not a wine-bug channel, but this bug is affecting quite some apps, and seems to affect more and more ... At least five apps from wine-bug mailinglist throw up an exception which either reads: "Assertion Failed !bogus context in Local_Unwind()" or "in Exception_Handler". As a reference a filed 2 bugs, and commented another one where you can read the +relay,+seh logs: Bug 3097 Bug 3127 Bug 3139 Some googling around makes me believe that this is a Borland specific error. I tried to install Demo Borland compiler in wine to see if i could reproduce this error, but unfortunately it fails with exactly the same error. all programs show the same pattern before an exception is thrown: they call LoadstringA() ,with something like L"Failed to get data for '%s'" or L"Access violation at address %p in module '%s'. %s of address %p" See the bugs for more info. I think this bug is really affecting quite some more apps then the ones mentioned in wine-bugs so would be great if anyone could shine a light on this, as of how to solve the bug. Regards ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

3 3

World of Warcraft
by cyrix12＠cox.net 13 Aug '05

13 Aug '05

It's me again. The latest WoW patch (1.5.1) broke stuff again, and now I'm unable to click on anything outside of menu items in game. The issue seems to be related to camera angle, as I am able to click on items/people when I have my camera positioned just right. It's basically unplayable at the moment though. Anyway, I'd appreciate it if one of the OpenGL/D3D guys (it's most likely something that would be easily fixed by one of you) could take a look at it if they have some free time. Thanks again, Darckness

10 21

[OLE #98] Re: By-pass RPC Runtime If Possible When Calling An STA
by Saulius Krasuckas 12 Aug '05

12 Aug '05

* The log message from [1] says: > > By-pass the RPC runtime if possible when calling an STA by posting a > message directly to the apartment window for it to process. Fixes a > deadlock in InstallShield caused by having to create a thread when > freeing an object that comes from an STA apartment. Added tests that > fail without this fix. After the change [2] running ole32 marshal test makes the process unkillable on my winME. If I change the code, things get running OK: | static DWORD CALLBACK no_couninitialize_client_proc(LPVOID p) | { | struct ncu_params *ncu_params = (struct ncu_params *)p; | HRESULT hr; | IUnknown *pProxy = NULL; | | pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); | | hr = CoUnmarshalInterface(ncu_params->stream, &IID_IClassFactory, (void **)&pProxy); | ok_ole_success(hr, CoUnmarshalInterface); | | ok_more_than_one_lock(); | | /* die without calling CoUninitialize */ | + CoUninitialize(); | | return 0; | } | | /* tests STA -> STA call during DLL_THREAD_DETACH doesn't deadlock */ It seems call deadlocks only on my machine. Rob, can you tell me, please, how can I find out, is there some problem with my box setup or is this a bug in test-code? [1] http://cvs.winehq.org/cvsweb/wine/dlls/ole32/tests/marshal.c [2] http://cvs.winehq.org/cvsweb/wine/dlls/ole32/tests/marshal.c.diff?r1=1.24&r…

2 3

ownerdraw paint recursion in listbox
by Alexander Yaworsky 04 Aug '05

04 Aug '05

Hello, recently i tried to install some application and it hung when i tried to select options. It uses listbox with ownerdraw items with checkboxes. When listbox is initially painted everything is ok. But when i try to select other item, an extra WM_PAINT is sent to listbox when application draws item. This causes infinite recursion. I've been implemented a simple workaround adding boolean to listbox structure but i have doubts. I briefly looked at some other controls and had not noticed similar countermeasures. Have somebody ever seen such behaviour? It would be interesting to test other controls sending WM_PAINT from ownerdraw handler but i'm short of time to do it soon. Should this workaround implemented in this way or something is wrong deeper with WM_PAINT handling? Thanks.

2 7

Benchmark's on the Wiki
by Tom Wickline 03 Aug '05

03 Aug '05

Hello, I put the Benchmark results that I posted to wine-devel back in April on the Wiki. http://wiki.winehq.org/BenchMark I would appreciate any constitutive criticism to improve this page. Tom

14 35

How to turn off Anti-aliasing
by George Lober 01 Aug '05

01 Aug '05

I have just updated my install of Wine and I notice that the config file is now deprecated, it doesn't get used. I want to turn off Wine Anti-aliasing. I was able to do it in the config file, but now I don't know. 'winecfg' doesn't have any such setting. Can it be turned off in the registry ? If so what is the setting ? Thankyou, George

3 3

Half-Life 2 Regression
by James Liggett 01 Aug '05

01 Aug '05

Hi, On July 25 I updated my Wine CVS copy and tried to test HL2. My machine hard-locked at the loading screen. Two days ago I updated and the problem still exists. It gives me an error about a swap chain: fixme:d3d:IWineD3DDeviceImpl_GetSwapChain (0x7b946e8) unable to find swapchain 0 I didn't notice this problem before. Anyone else notice it? Thanks a lot, James Liggett

3 3

wine on FreeBSD
by jean-marc DETREZ 01 Aug '05

01 Aug '05

Hi, With the differents mails i receive from users or wine's developers, i think that: - Dislike OpenBSD or SRV4, mincore did'nt fail if the page is not mapped no [ENOMEM] error condition. - the FreeBSD man pages say that mmap would fail with [ENOMEM] error condition if address is in use but in the reality it seems always return the start address. So for to use wine on FreeBSD before doing a more clean patch i propose to add this to mmap . I know that it would map memory pages without verify before that the pages is'nt already map but the man pages say it must failed so I'm just verify that the result is equal to start address the mmap call asking for. I do that only when creating System heap because requesting mmap for 0x800000 start address (without MAP_FIXED) always fail and prevent wine running on FreeBSD. I'll do more test to implement a try_mmap_fixed function working on FreeBSD like this done for SRV4,NetBSD and DARWIN. Jean-marc

3 2

Re: Flush serial port
by Alexandre Julliard 01 Aug '05

01 Aug '05

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > Changelog: > wine/server/file.c: create_file() > If we open a serial device, flush it This should be done in serial.c, but could you please explain why this is necessary? -- Alexandre Julliard julliard(a)winehq.org

3 4

LoadString problems
by James Hawkins 01 Aug '05

01 Aug '05

Hey, I'm trying to load strings from the hhctrl.ocx resource file to use as the text for tabs and toolbar buttons, but I can't get it to work. I've tried to get LoadString to work a couple ways, but it just won't work for me. I've attached the resource files and Makefile.in. Maybe something is wrong with the way those are set up. The following code is one of the (failing) places where I call LoadString: TCITEMA tie; char text[MAX_PATH]; LoadStringA(NULL, IDS_CONTENTS, text, MAX_PATH); /* text should be '&Contents', but we get a GetLastError() */ tie.mask = TCIF_TEXT; tie.pszText = text; TabCtrl_InsertItemA(hwndTabCtrl, dwIndex, &tie); I should note that the code works when compiled with Visual Studio and run on Windows. -- James Hawkins

4 8

Re:winecfg in 640x480
by Joe Baker 31 Jul '05

31 Jul '05

On 7/28/05, Oliver Stieber <oliver_stieber(a)yahoo.co.uk> wrote: > I know this isn't going to be too big an issue with many people but it would be nice if winecfg > was usable with a 640x480 desktop, at the moment it's 20 or so pixels to tall and you can't see > the ok/cancel buttons. > > I agree, although you can hit enter to close out the window and save changes. Well, in KDE use the Alt key and the left mouse to click and drag the window from anywhere in the window to move it higher. I think that blackbox supports this style of Window movement as well if you're on a lighter resource computer as your resolution suggests. -Joe Baker

5 4

Re: [usp10] Add stubbed support for ScriptGetFontProperties
by Felix Nawothnig 31 Jul '05

31 Jul '05

Oliver Stieber wrote: > +HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) { > + FIXME("%p,%p,%p\n", hdc, psc, sfp); > + /* return something sensible? */ > + if (NULL != sfp) { > + sfp->cBytes = sizeof(SCRIPT_FONTPROPERTIES); > + sfp->wgBlank = 0; > + sfp->wgDefault = 0; > + sfp->wgInvalid = 0; > + sfp->wgKashida = 1; > + sfp->iKashidaWidth = 0; > + } > + > +} You forgot the return value... Felix

2 1

usp10.dll regression
by Oliver Stieber 31 Jul '05

31 Jul '05

Hi, Reciently I've been getting a lot of applications failing with 'unimplemented function usp10.dll.ScriptGetFontProperties' and I've had to use native usp10.dll which I didn't need to before. ___________________________________________________________ To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com

3 3

Re: wine/dlls/ntdll loadorder.c
by Rein Klazes 30 Jul '05

30 Jul '05

On Thu, 7 Jul 2005 13:26:11 -0500, you wrote: > ChangeSet ID: 18748 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2005/07/07 13:26:11 > > Modified files: > dlls/ntdll : loadorder.c > > Log message: > Use the same defaults for modules with and without an explicit path. Girotel uses a 32 bit comm.dll located in the programs directory, which is also the current directory. After this change I need to add an dll override to load the program's comm.dll and not attempt the built-in comm.drv, which of course is not needed in Windows. Is this a regression or an intentional change in behavior? Rein.

3 8

Re: Add KERNEL32.SetThreadUILanguage() stub
by Thomas Weidenmueller 30 Jul '05

30 Jul '05

Andreas Mohr wrote: > Hello all, > > this one is needed by XP's ping.exe and a reworked ReactOS version. > > Andreas Mohr This prototype is outdated. MS has documented this function in the meanwhile: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/mui_s… Best Regards, Thomas Weidenmueller

3 2

[AppDB] Regression: Editing notes doesn't work anymore
by Jonathan Ernst 29 Jul '05

29 Jul '05

Didn't had time to investigate yet. -- Jonathan Ernst <Jonathan(a)ErnstFamily.ch>

1 0

TR: wine on FreeBSD with patch
by jean-marc DETREZ 29 Jul '05

29 Jul '05

_____ De : jean-marc DETREZ [mailto:jm.detrez@cegetel.net] Envoyé : vendredi 29 juillet 2005 20:28 À : 'Alexandre Julliard' Cc : 'barner(a)FreeBSD.org'; 'wine-devel(a)winehq.com'; 'emulation(a)freebsd.org'; 'Dmitry Timoshkov'; 'Gerald Pfeifer' Objet : TR: wine on FreeBSD with patch _____ De : jean-marc DETREZ [mailto:jm.detrez@cegetel.net] Envoyé : vendredi 29 juillet 2005 20:18 À : 'Alexandre Julliard' Cc : 'barner(a)FreeBSD.org'; 'Gerald Pfeifer'; 'wine-devel(a)winehq.com'; 'emulation(a)freebsd.org'; 'Dmitry Timoshkov' Objet : wine on FreeBSD Hi, With the differents mails i receive from users or wines developers, i think that: - Dislike OpenBSD or SRV4, mincore didnt fail if the page is not mapped no [ENOMEM] error condition. - the FreeBSD man pages say that mmap would fail with [ENOMEM] error condition if address is in use but in the reality it seems always return the start address. So for to use wine on FreeBSD before doing a more clean patch i propose to add this to mmap . I know that it would map memory pages without verify before that the pages isnt already map but the man pages say it must failed so Im just verify that the result is equal to start address the mmap call asking for. I do that only when creating System heap because requesting mmap for 0x800000 start address (without MAP_FIXED) always fail and prevent wine running on FreeBSD. Ill do more test to implement a try_mmap_fixed function working on FreeBSD like this done for SRV4,NetBSD and DARWIN. Jean-marc

1 0

[Fwd: Re: [Fwd: Re: [Wine]wine-20050725 feedback : lots of graphical glitches]]
by Vincent Rubiolo 29 Jul '05

29 Jul '05

Sending to the devel-list as suggested by people on wine-users. Just wasn't sure whther those kind of reports would be welcome on the devel ML. The issues mentioned below seem to be regressions. Thanks for your attention, I am willing to help but am just beginning to grasp everything wine-related. Vincent -------- Original Message -------- Subject: Re: [Fwd: Re: [Wine]wine-20050725 feedback : lots of graphical glitches] Date: Fri, 29 Jul 2005 14:03:50 +0200 From: Vincent Rubiolo <vincent.rubiolo(a)free.fr> To: wine-users(a)winehq.org References: <42E9DEFD.6090508(a)free.fr> Hello, I have submitted three bugs relative to these problems : + http://bugs.winehq.org/show_bug.cgi?id=3169 + http://bugs.winehq.org/show_bug.cgi?id=3170 + http://bugs.winehq.org/show_bug.cgi?id=3171 Vincent Vincent Rubiolo wrote: > Ths list was forgotten. Forwarding. > > Vincent > > -------- Original Message -------- > Subject: Re: [Wine]wine-20050725 feedback : lots of graphical glitches > Date: Thu, 28 Jul 2005 17:45:44 -0700 > From: George Lober <glober(a)telus.net> > To: Vincent Rubiolo <vincent.rubiolo(a)free.fr> > References: <42E8D1CC.5010006(a)free.fr> > > Vincent Rubiolo wrote: > >> Hello wine-users, >> >> I built and installed (with wineinstall) wine-20050725 [see system >> info at end of mail]. >> While it works OK for most of the applications that I use (I still >> have some crashes, I will investigate them), I have lots of graphical >> glitches, some of which greatly reduce the usability of the >> applications : >> >> Firefox : >> ---------- >> + Installation problems, esp. with respect to icons and text. I am >> attaching small screenshots for you to see the problems. During the >> installation, the console returns : >> fixme:win:SetWindowTextW setting text L"Extracting" of other process >> window 0x10022 should not use SendMessage >> err:static:STATIC_SetIcon huh? hicon!=0, but info=0??? >> >> + Main page display problem. Black boxes in rendered page (which is >> perfect on native Linux FF). Menubar scrambled. It clears up a little >> (not perfect though) when my mouse passes over it. Console says : >> err:ole:CoGetClassObject class {4955dd33-b159-11d0-8fcf-00aa006bcc59} >> not registered >> fixme:ole:CoCreateInstance no classfactory created for CLSID >> {4955dd33-b159-11d0-8fcf-00aa006bcc59}, hres is 0x80040154 >> err:clipboard:CLIPBOARD_CloseClipboard Failed to set clipboard. >> >> 7-Zip: >> ------ >> The combo box under the icons is almost not appearing at all, making >> it impossible to navigate in directories (see small screenshot). >> >> >> This is just to show the problems I am encountering. I tried searching >> in the Bugzilla but the search (keyword firefox) returned no replies. >> I have to say that the search is quite cumbersome. I use Bugzilla >> almost daily (Mozilla project for instance), and searches are a lot >> easier because there is a simple search box, instead of having >> everyone to use the advanced search function. >> >> I also have opened an account on the AppDB. Should I report these >> problems to the apps maintainers instead (it seems so)? >> There is so much documentation that I don't know what to do : you seem >> to welcome bug reports but I am not sure whether apps bugs are helpful >> to you. Are they? >> >> Could you give me some pointers please? >> >> Thank you. I am willing to participate and help but don't know what to >> report exactly as I am not familiar with Wine internals. >> >> Vincent >> >> System information as requested on >> http://www.winehq.com/site/docs/wine-user/bug-reporting : >> --------------------------------------------------------- >> + Wine 20050725 (note that wine -v does not work anymore, contrary to >> what the page says) >> + kernel : i686 GNU/Linux 2.4.21-27.0.1.EL (this is Redhat Entreprise >> WS3) >> + compiler : gcc (GCC) 3.4.3 >> + windows : no windows installed or used >> + program : firefox 1.0.5, available at www.mozilla.org >> + cmdline : wine firefox.exe (in fake_c\Program Files\Mozilla Firefox) >> + X server : 4.3.0 shipped by Redhat >> + steps to reproduce : simply start firefox after installing. Same for >> 7zip. >> > > Hello, > > I would also like to add that I am having similar problem with my > install of wine-20050725, where the Toolbar buttons of an application > called DietPower are incorrectly sized smaller (about 26pix compared to > normal size of about 37pix). The Toolbutton Images are sized correctly > resulting in a mess. Version 20050628 and previous versions don't have > this problem. Would it help to post this on the bug-tracker ? > > Regards, George > -- Reclaim Your Inbox! http://www.mozilla.org/products/thunderbird -- Reclaim Your Inbox! http://www.mozilla.org/products/thunderbird

1 0

Re: [wined3d] tidy up draw prim and add strided data new to d3d9
by Felix Nawothnig 29 Jul '05

29 Jul '05

Oliver Stieber wrote: > use ++x instead of x++ since x++ potentially requires a temporary variable. I seriously doubt this will actually have an effect on the resulting assembly code generated by any semi-serious compiler (regardless of the -O level) as for(i = 0; i < x; i++) is a quite common idiom... Felix

1 0

Impressive! Installshield actually almost worked!
by Hans Kristian Rosbach 29 Jul '05

29 Jul '05

For the very first time I the AltiAgent 5.0 installer actually managed to show a spash screen and even a progress bar that shows the loading of Installshield. I think the progressbar got to 100%, but then wine crashed. Good work, I'm seriously impressed and will be testing a few other installers too now. Btw, anyone know a good IE5/5.5/6 installer? One of my other programs depends on it beeing installed. I'm running a cvs checkout of about an hour old. This is the complete unedited output (ignore the libGL warnings): [root@linux AltiAgent 5.0]# wine setup.exe libGL warning: 3D driver claims to not support visual 0x23 libGL warning: 3D driver claims to not support visual 0x24 libGL warning: 3D driver claims to not support visual 0x27 libGL warning: 3D driver claims to not support visual 0x28 libGL warning: 3D driver claims to not support visual 0x2b libGL warning: 3D driver claims to not support visual 0x2c libGL warning: 3D driver claims to not support visual 0x2f libGL warning: 3D driver claims to not support visual 0x30 fixme:msi:MsiGetProductInfoW L"{87E06BA6-48C0-4793-9382-6945EF684D96}" L"PackageCode" 0x6e4ac070 0x7fddd884 fixme:msi:MsiInstallProductW L"Z:\\home\\hk\\.wine\\drive_c\\AltiAgent 5.0\\ISScript9.Msi" L"REBOOT=ReallySuppress ADDLOCAL=All" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"SelfUnregModules" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFiles" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"MoveFiles" fixme:msi:ACTION_InstallFiles Write DiskPrompt fixme:msi:ITERATE_DuplicateFiles We should track these duplicate files as well fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveRegistryValues" fixme:msi:ACTION_HandleStandardAction UNHANDLED Standard Action L"RemoveFolders" libGL warning: 3D driver claims to not support visual 0x23 libGL warning: 3D driver claims to not support visual 0x24 libGL warning: 3D driver claims to not support visual 0x27 libGL warning: 3D driver claims to not support visual 0x28 libGL warning: 3D driver claims to not support visual 0x2b libGL warning: 3D driver claims to not support visual 0x2c libGL warning: 3D driver claims to not support visual 0x2f libGL warning: 3D driver claims to not support visual 0x30 fixme:msi:MsiInstallProductW L"Z:\\home\\hk\\.wine\\drive_c\\AltiAgent 5.0\\AltiAgent 5.0.msi" L" REINSTALLMODE=vemus REINSTALL=ALL SETUPEXEDIR=\"Z:\\home\\hk\\.wine\\drive_c\\AltiAgent 5.0\"" libGL warning: 3D driver claims to not support visual 0x23 libGL warning: 3D driver claims to not support visual 0x24 libGL warning: 3D driver claims to not support visual 0x27 libGL warning: 3D driver claims to not support visual 0x28 libGL warning: 3D driver claims to not support visual 0x2b libGL warning: 3D driver claims to not support visual 0x2c libGL warning: 3D driver claims to not support visual 0x2f libGL warning: 3D driver claims to not support visual 0x30 fixme:ole:RpcChannelBuffer_GetDestCtx (0x19445734,0x19445738), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x19445730,0x19445734), stub! fixme:win:SetWindowTextA setting text "TITLE_CAPTIONBAR" of other process window (nil) should not use SendMessage fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fdcef00,0x7fdcef04), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fdcee04,0x7fdcee08), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fdcee88,0x7fdcee8c), stub! [root@linux AltiAgent 5.0]# wine: Unhandled exception (thread 000c), starting debugger... WineDbg starting on pid 0xa Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00000000). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:11ff GS:0033 EIP:00000000 ESP:5a9ec654 EBP:5a9edb24 EFLAGS:00210202( - 00 - -RI1) EAX:7c47a010 EBX:00000000 ECX:00010020 EDX:006486ee ESI:10014d10 EDI:7cfb0fe0 Stack dump: 0x5a9ec654: 10005639 7c47a010 10017b48 10003baf 0x5a9ec664: 10014d10 5a9edb18 5a9edb24 10011a00 0x5a9ec674: 5a9edb18 10003a03 10017b48 7be3e1a0 0x5a9ec684: 0017b1d8 00175720 00000000 00000000 0x5a9ec694: 00000000 00000000 00000000 00000000 0x5a9ec6a4: 00000000 00000000 00000000 00000000 023f: sel=11ff base=7d50e000 limit=00001fff 32-bit rw- Backtrace: =>1 0x00000000 (0x5a9edb24) 2 0x0013fc44 DllThread+0x280(info=0x7be52270) [/usr/src/wine-cvs/wine/dlls/msi/custom.c:442] in msi (0x5a9edb48) 3 0x00b7ce85 THREAD_Start+0xd1(ptr=0x7be52c80) [/usr/src/wine-cvs/wine/dlls/kernel/thread.c:108] in kernel32 (0x5a9edc14) 4 0x006287ee start_thread+0x12e(info=0x7be53028) [/usr/src/wine-cvs/wine/dlls/ntdll/thread.c:235] in ntdll (0x5a9ee458) 5 0x00440b80 start_thread+0x80 in libpthread.so.0 (0x5a9ee4c8) 6 0x00398dee __clone+0x5e in libc.so.6 (0x00000000) 0x00000000: addb %al,0x0(%eax) Modules: Module Address Debug info Name (71 modules) ELF 0x00111000-0017c000 Stabs msi<elf> \-PE 0x00130000-0017c000 \ msi ELF 0x0017c000-00233000 Deferred shell32<elf> \-PE 0x001a0000-00233000 \ shell32 ELF 0x00233000-00287000 Deferred shlwapi<elf> \-PE 0x00250000-00287000 \ shlwapi ELF 0x00287000-002a1000 Deferred version<elf> \-PE 0x00290000-002a1000 \ version ELF 0x002b0000-002cc000 Deferred ld-linux.so.2 ELF 0x002cc000-002ce000 Deferred xlcutf8load.so.2 ELF 0x002ce000-003f8000 Export libc.so.6 ELF 0x003fa000-0041e000 Deferred libm.so.6 ELF 0x00420000-00424000 Deferred libdl.so.2 ELF 0x00424000-00437000 Deferred libz.so.1 ELF 0x0043b000-0044d000 Export libpthread.so.0 ELF 0x0044d000-00489000 Deferred advapi32<elf> \-PE 0x00460000-00489000 \ advapi32 ELF 0x0044f000-00523000 Deferred libx11.so.6 ELF 0x0044f000-00523000 Deferred libx11.so.6 ELF 0x0044f000-00523000 Deferred libx11.so.6 PE 0x004c0000-0051e000 Deferred ole32 ELF 0x0052e000-00544000 Deferred msiexec<elf> \-PE 0x00530000-00544000 \ msiexec ELF 0x00544000-005c2000 Deferred gdi32<elf> \-PE 0x00560000-005c2000 \ gdi32 ELF 0x005d9000-0064b000 Stabs ntdll<elf> \-PE 0x005f0000-0064b000 \ ntdll \-PE 0x005f0000-0064b000 \ ntdll \-PE 0x005f0000-0064b000 \ ntdll ELF 0x00628000-00690000 Deferred libfreetype.so.6 ELF 0x0064b000-00655000 Deferred libgcc_s.so.1 ELF 0x00751000-00860000 Deferred user32<elf> \-PE 0x00770000-00860000 \ user32 \-PE 0x00770000-00860000 \ user32 ELF 0x00860000-008a7000 Deferred rpcrt4<elf> \-PE 0x00880000-008a7000 \ rpcrt4 ELF 0x008a7000-0094e000 Deferred comctl32<elf> \-PE 0x008c0000-0094e000 \ comctl32 \-PE 0x008c0000-0094e000 \ comctl32 \-PE 0x008c0000-0094e000 \ comctl32 ELF 0x00952000-0095a000 Deferred libxrender.so.1 ELF 0x0095c000-00960000 Deferred libxrandr.so.2 ELF 0x009b9000-009cd000 Deferred lz32<elf> \-PE 0x009c0000-009cd000 \ lz32 ELF 0x009d1000-009dc000 Deferred libnss_files.so.2 ELF 0x00a25000-00a44000 Deferred ximcp.so.2 ELF 0x00a46000-00a6e000 Deferred cabinet<elf> \-PE 0x00a50000-00a6e000 \ cabinet \-PE 0x00a50000-00a6e000 \ cabinet ELF 0x00a57000-00ad2000 Deferred libgl.so.1 PE 0x00a90000-00af4000 Deferred oleaut32 ELF 0x00afc000-00bf6000 Stabs kernel32<elf> \-PE 0x00b20000-00bf6000 \ kernel32 \-PE 0x00b20000-00bf6000 \ kernel32 ELF 0x00bf6000-00c70000 Deferred winex11.drv<elf> \-PE 0x00c10000-00c70000 \ winex11.drv ELF 0x00c70000-00c8c000 Deferred imm32<elf> \-PE 0x00c80000-00c8c000 \ imm32 ELF 0x00c8c000-00cca000 Deferred riched20<elf> \-PE 0x00ca0000-00cca000 \ riched20 PE 0x00cf0000-00d0d000 Deferred msi1450.tmp ELF 0x00d24000-00d29000 Deferred libxxf86vm.so.1 ELF 0x00d35000-00d4f000 Deferred libice.so.6 ELF 0x00d66000-00d70000 Deferred libxcursor.so.1 ELF 0x00e0d000-00e2d000 Deferred iphlpapi<elf> \-PE 0x00e20000-00e2d000 \ iphlpapi ELF 0x00f01000-010ee000 Deferred mga_dri.so PE 0x10000000-1001d000 Deferred msi144a.tmp ELF 0x57908000-57963000 Deferred winedos<elf> \-PE 0x57910000-57963000 \ winedos ELF 0x7bf00000-7bf03000 Deferred <wine-loader> Threads: process tid prio (all id:s are in hex) 0000000e 0000002e 0 0000000a (D) C:\windows\system\msiexec.exe 0000002b 0 0000000e 0000002a 0 0000000a (D) C:\windows\system\msiexec.exe 00000023 0 0000000e 00000020 0 0000000a (D) C:\windows\system\msiexec.exe 0000001f 0 0000001e 0 0000000e 0000001d 0 00000016 0 00000013 0 00000012 0 00000011 0 00000010 0 0000000f 0 0000000a (D) C:\windows\system\msiexec.exe 0000000d 0 0000000c 0 <== 0000000b 0 WineDbg terminated on pid 0xa err:ole:xCall RpcChannelBuffer SendReceive failed, 800706c0 fixme:ole:RpcChannelBuffer_GetDestCtx (0x19445794,0x19445798), stub! wine: Unhandled exception (thread 000f), starting debugger... WineDbg starting on pid 0xe Unhandled exception: page fault on read access to 0x00000024 in 32-bit code (0x7ce87d20). In 32 bit mode. Register dump: CS:0073 SS:007b DS:007b ES:007b FS:1007 GS:0033 EIP:7ce87d20 ESP:7fdcf38c EBP:7fdcf3e0 EFLAGS:00210206( - 00 - RIP1) EAX:00000024 EBX:00000000 ECX:00000000 EDX:7ce87e88 ESI:7be9f330 EDI:7fdcf3d0 Stack dump: 0x7fdcf38c: 00451111 7be9f330 00000000 00000000 0x7fdcf39c: 00000000 00000000 7d4a5040 00496030 0x7fdcf3ac: 0044ffe0 7be9f330 00496030 7fdcf3d0 0x7fdcf3bc: 0082928c 7d4a5040 00000000 00000000 0x7fdcf3cc: 7fdcf3ec 00000000 7fdcfc48 00478ee4 0x7fdcf3dc: 00000001 7fdcfc54 0045374d 7fdcfc64 0200: sel=1007 base=7befe000 limit=00001f97 32-bit rw- Backtrace: =>1 0x7ce87d20 (0x7fdcf3e0) 2 0x0045374d in idriver (+0x5374d) (0x7fdcfc54) 3 0x006da18e _invoke+0x16e(func=0x453337, callconv=0x4, nrargs=0x3, args=0x7ce8a190) [/usr/src/wine-cvs/wine/dlls/oleaut32/typelib.c:4480] in oleaut32 (0x7fdcfc7c) 4 0x006d890f TMStubImpl_Invoke+0x5a3(iface=0x7be9e640, xmsg=0x7ce8c340, rpcchanbuf=0x0) [/usr/src/wine-cvs/wine/dlls/oleaut32/tmarshal.c:2145] in oleaut32 (0x7fdcfd58) 5 0x0028091f RPC_ExecuteCall+0x23(params=0x7ce8a6a8) [/usr/src/wine-cvs/wine/dlls/ole32/rpc.c:439] in ole32 (0x7fdcfd78) 6 0x00262de2 apartment_wndproc+0x3a(hWnd=0x2002e, msg=0x400, wParam=0x0, lParam=0x7ce8a6a8) [/usr/src/wine-cvs/wine/dlls/ole32/compobj.c:426] in ole32 (0x7fdcfd88) 7 0x0056e5ef WINPROC_wrapper+0x17 in user32 (0x7fdcfdac) 8 0x0056f003 WINPROC_CallWndProc+0x57(wParam=0x0, lParam=0x7ce8a6a8) [/usr/src/wine-cvs/wine/dlls/user/winproc.c:415] in user32 (0x7fdcfddc) 9 0x00571e1c CallWindowProcA+0x180(func=0x5cde48, hwnd=0x2002e, msg=0x400, wParam=0x0, lParam=0x7ce8a6a8) [/usr/src/wine-cvs/wine/dlls/user/winproc.c:2958] in user32 (0x7fdcfe04) 10 0x00548fc3 DispatchMessageA+0x127(msg=0x7fdcfe60) [/usr/src/wine-cvs/wine/dlls/user/message.c:2910] in user32 (0x7fdcfe48) 11 0x00449ac3 in idriver (+0x49ac3) (0x7fdcfea0) 12 0x00467bd8 EntryPoint+0xe0 in idriver (0x7fdcff2c) 13 0x00818012 start_process+0xb6(arg=0x0) [/usr/src/wine-cvs/wine/dlls/kernel/process.c:996] in kernel32 (0x7fdcfff4) 14 0x00ce3939 wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) 0x7ce87d20: addb 0x0(%eax),%al Modules: Module Address Debug info Name (78 modules) ELF 0x0014b000-00192000 Deferred rpcrt4<elf> \-PE 0x00160000-00192000 \ rpcrt4 ELF 0x00192000-001b2000 Deferred iphlpapi<elf> \-PE 0x001a0000-001b2000 \ iphlpapi ELF 0x001b2000-00230000 Deferred gdi32<elf> \-PE 0x001d0000-00230000 \ gdi32 ELF 0x00230000-002ac000 Stabs ole32<elf> \-PE 0x00250000-002ac000 \ ole32 ELF 0x002b0000-002cc000 Deferred ld-linux.so.2 ELF 0x002cc000-002ce000 Deferred xlcutf8load.so.2 ELF 0x002ce000-003f8000 Deferred libc.so.6 ELF 0x003fa000-0041e000 Deferred libm.so.6 PE 0x00400000-004cf000 Export idriver PE 0x00400000-004cf000 Export idriver PE 0x00400000-004cf000 Export idriver PE 0x00400000-004cf000 Export idriver ELF 0x0044f000-00523000 Export libx11.so.6 PE 0x004f0000-005de000 DIA user32 ELF 0x005de000-00695000 Deferred shell32<elf> \-PE 0x00600000-00695000 \ shell32 \-PE 0x00600000-00695000 \ shell32 \-PE 0x00600000-00695000 \ shell32 ELF 0x00695000-0071b000 Stabs oleaut32<elf> \-PE 0x006b0000-0071b000 \ oleaut32 ELF 0x0071b000-00786000 Deferred msi<elf> \-PE 0x00730000-00786000 \ msi ELF 0x00786000-007ae000 Deferred cabinet<elf> \-PE 0x00790000-007ae000 \ cabinet \-PE 0x00790000-007ae000 \ cabinet ELF 0x00795000-007bf000 Export libfontconfig.so.1 PE 0x007d0000-008a8000 DIA kernel32 ELF 0x008a8000-008c2000 Deferred version<elf> \-PE 0x008b0000-008c2000 \ version ELF 0x008dd000-009d2000 Deferred libwine_unicode.so.1 ELF 0x00936000-00945000 Deferred libxext.so.6 ELF 0x00947000-00950000 Deferred libsm.so.6 ELF 0x00952000-0095a000 Deferred libxrender.so.1 ELF 0x0095c000-00960000 Deferred libxrandr.so.2 ELF 0x00a30000-00a44000 Deferred lz32<elf> \-PE 0x00a40000-00a44000 \ lz32 ELF 0x00a57000-00ad2000 Deferred libgl.so.1 ELF 0x00a57000-00ad2000 Deferred libgl.so.1 ELF 0x00a5e000-00a7d000 Deferred ximcp.so.2 ELF 0x00afd000-00b19000 Deferred imm32<elf> \-PE 0x00b10000-00b19000 \ imm32 ELF 0x00b19000-00b57000 Deferred riched20<elf> \-PE 0x00b30000-00b57000 \ riched20 ELF 0x00b62000-00c09000 Deferred comctl32<elf> \-PE 0x00b70000-00c09000 \ comctl32 \-PE 0x00b70000-00c09000 \ comctl32 ELF 0x00c09000-00c83000 Deferred winex11.drv<elf> \-PE 0x00c20000-00c83000 \ winex11.drv ELF 0x00caa000-00cc2000 Deferred msacm.drv<elf> \-PE 0x00cb0000-00cc2000 \ msacm.drv ELF 0x00cc2000-00cd7000 Deferred midimap<elf> \-PE 0x00cd0000-00cd7000 \ midimap ELF 0x00cdf000-00cf7000 DIA libwine.so.1 ELF 0x00cf7000-00d18000 Deferred msacm32<elf> \-PE 0x00d00000-00d18000 \ msacm32 ELF 0x00d24000-00d29000 Deferred libxxf86vm.so.1 ELF 0x00d24000-00d29000 Deferred libxxf86vm.so.1 ELF 0x00d35000-00d4f000 Deferred libice.so.6 PE 0x00d40000-00d78000 Deferred shlwapi PE 0x00d40000-00d78000 Deferred shlwapi PE 0x00d90000-00d98000 Deferred objpscnv ELF 0x00d99000-00e0b000 Deferred ntdll<elf> \-PE 0x00db0000-00e0b000 \ ntdll PE 0x00e10000-00e40000 Deferred iusercnv ELF 0x00e86000-00e99000 Deferred libz.so.1 ELF 0x00f91000-00fcd000 Deferred advapi32<elf> \-PE 0x00fa0000-00fcd000 \ advapi32 ELF 0x068a7000-06920000 Deferred winmm<elf> \-PE 0x068c0000-06920000 \ winmm PE 0x10000000-10042000 Deferred iscrcnv ELF 0x4607e000-4626b000 Deferred mga_dri.so ELF 0x549ff000-54a3f000 Deferred wineoss.drv<elf> \-PE 0x54a10000-54a3f000 \ wineoss.drv ELF 0x7bf00000-7bf03000 Deferred <wine-loader> Threads: process tid prio (all id:s are in hex) 0000000e (D) C:\Program Files\Common Files\InstallShield\Driver\9\Intel 32\IDriver.exe 0000002e 0 0000001d 0 00000016 0 00000013 0 00000012 0 00000011 0 00000010 0 0000000f 0 <== WineDbg terminated on pid 0xe -HK

2 1

Re: WLDAP32: implement ldap_err2string
by Dmitry Timoshkov 29 Jul '05

29 Jul '05

"Hans Leidekker" <hans(a)it.vu.nl> wrote: > +static const char *errorstring[] = { > + "Success", ... > +static const WCHAR error00[] = { 'S','u','c','c','e','s','s',0 }; I'd suggest to move all strings into a stringtable and load them by LoadStringA/W. That way you get internationalization for free. -- Dmitry.

3 4

Theming & code duplication
by Frank Richter 29 Jul '05

29 Jul '05

Hi, somewhat recently I sent some code to wine-patches to add button theming; if you have glanced at it, despite utilizing subclassing, code was duplicated from the button code in user. In particular, the themed button does its own state management. The reason is that upon state changes, the user32 button control does some repaints internally, ie calling the paint function directly - those can't obviously be hooked by subclassing alone. In early versions I had the themed button painted over after state-changing messages, but that causes visible flickering (since the button is first painted in "classic" style and the themed style is painted above that). The basic problem - painting that is hard to hook into - will probably also arise on other controls. There are some ideas and approaches to deal with the problem that came up (and the results from discussion with Kevin): - Ignore. Have ugly flickering. - Change the classic controls to use InvalidateRect() instead when internal painting functions are called, so painting messages can be hooked. That would deviate from native behaviour, though (and also occasionally less efficient when the control just paints some change). - Use some magic message the control sends to itself to do some painting which is then hooked. Makes things more complex, could cause compatibility issues with apps that may not handle this message and is incompatible with native. - Code duplication - e.g. in the case of buttons, do state management in the themed class as well. - Static libraries - implement the standard controls in a static library and allow for hooks to override painting (in C++ you'd use virtual methods). Both user32 and comctl32 would link against that lib, and the latter would provide alternative painting functions. Binarily equivalent to code duplication, but not that bad in the source code. For me it looks like a good compromise, though, Kevin noted that "Historically static libs have not gone over very well". I don't like the current code duplication for theming that much, but I'm a bit unsure what else could be done. Perhaps you have some comments or suggestions, and hopefully there will be some consent of what approach would be best for Wine. Thanks for reading, -f.r.

2 4

Re: DINPUT: Detect force feedback joysticks (FF #1)
by Alexandre Julliard 29 Jul '05

29 Jul '05

Daniel Remenak <dtremenak(a)gmail.com> writes: > 1. Configure checks for the availability of a new enough linux/input.h > to support force feedback. This pretty much means any kernel 2.6 or > kernel 2.4.x with the ff patchset found at > http://sourceforge.net/projects/libff/. Some of the structures were > changed without changing the version define, so this check is > necessary. Why do you need to check the structure since you are not using it? Shouldn't you simply do a #ifdef on the ioctl code or whatever else that you use and may not be defined? -- Alexandre Julliard julliard(a)winehq.org

3 4

Another AppDB screenshot problem...
by James Liggett 28 Jul '05

28 Jul '05

Hi, Tonight I tried to submit a shot for Palm Desktop 4.1 and it gave me this error: Unable to move screenshot from to data/screenshots/originals/781 What's going on? Thanks a lot, James Liggett

3 5

Re: KERNEL32: Re: Fix thread tests on WinME
by Saulius Krasuckas 28 Jul '05

28 Jul '05

* On Fri, 22 Jul 2005, Saulius Krasuckas wrote: > * Felix Nawothnig wrote: > > > > Tested on Wine and WinXP. I couldn't verify it on WinME since I don't > > have it but since this is quite trivial... *crosses fingers* > > Though three tests are still failing: > > | thread.c:293:not restricted, assuming consistent behaviour > | thread.c:412: Test failed: access restrictions obeyed > | thread.c:414: Test failed: access restrictions obeyed > | thread.c:488: Test failed: access restrictions obeyed Felix, I have reverted part of your patch and tested this. Reversion is doing fine on WinME -- zero failed tests. Didn't tested on XP or so. Is this acceptable? If so, feel free to submit it under own name. Or correct the code. :-) Index: dlls/kernel/tests/thread.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/tests/thread.c,v retrieving revision 1.22 diff -p -u -r1.22 thread.c --- dlls/kernel/tests/thread.c 25 Jul 2005 11:07:54 -0000 1.22 +++ dlls/kernel/tests/thread.c 28 Jul 2005 21:55:41 -0000 @@ -409,9 +409,11 @@ static VOID test_thread_priority(void) obey_ar(SetThreadPriority(access_thread,1)==0); obey_ar(GetThreadPriority(access_thread)==THREAD_PRIORITY_ERROR_RETURN); if (pSetThreadPriorityBoost) - obey_ar(pSetThreadPriorityBoost(access_thread,1)==0); + ok(pSetThreadPriorityBoost(access_thread,1)==0, + "SetThreadPriorityBoost did not obey access restrictions\n"); if (pGetThreadPriorityBoost) - obey_ar(pGetThreadPriorityBoost(access_thread,&disabled)==0); + ok(pGetThreadPriorityBoost(access_thread,&disabled)==0, + "GetThreadPriorityBoost did not obey access restrictions\n"); obey_ar(GetExitCodeThread(access_thread,&exitCode)==0); ok(CloseHandle(access_thread),"Error Closing thread handle\n"); } @@ -485,7 +487,7 @@ static VOID test_GetThreadTimes(void) if(access_thread!=NULL) { error=GetThreadTimes(access_thread,&creationTime,&exitTime, &kernelTime,&userTime); - obey_ar(error==0); + ok(error==0, "GetThreadTimes did not obey access restrictions\n"); ok(CloseHandle(access_thread)!=0,"CloseHandle Failed\n"); } creationTime.dwLowDateTime=99; creationTime.dwHighDateTime=99;

2 1

Const Function Parameters?
by Michael Carlson 28 Jul '05

28 Jul '05

I've been doing some oprofille tests with wine running fce ultra, the 8-bit Nintendo emulator. I found that when running a rom for 60 seconds, more than 99% of the CPU utilization for winex11drv (which uses the most of all components of wine in this case) is in the same function : convert_888_to_0888_asis (in dlls/x11drv/dib_convert.c). I've also found that marking a couple of parameters of that function const (that I believe should be marked const anyways), CPU usage in that function drops measurably with oprofile. As far as I know, parameters that aren't modified in a function should be marked const anyways, to send the right hint to the compiler. Since it actually turns out to be faster too, it seems worth it to me. Here are the results from oprofile before the change: 21982 99.2012 convert_888_to_0888_asis 22078 99.1735 convert_888_to_0888_asis 22207 99.1605 convert_888_to_0888_asis 22161 99.1544 convert_888_to_0888_asis 22158 99.2253 convert_888_to_0888_asis and after: 21828 99.1731 convert_888_to_0888_asis 21769 99.2296 convert_888_to_0888_asis 21835 99.3313 convert_888_to_0888_asis 21868 99.1027 convert_888_to_0888_asis 21601 99.1508 convert_888_to_0888_asis On average, it went from 22117 (context switches I believe?) to 21780, about a 1.5% improvement. The same test was run with a script each time (run fceu with the same rom, kill it after 60 seconds). I'm assuming the percentages (the second column in this chart) don't matter much, because this function we're examining takes up an overwhelming amount of the function's CPU (> 99%), so its percentage depends largely on how many context switches other functions took up. I've taken the liberty of providing a diff that patches all the functions in this file to use const parameters where appropriate. I don't get any compiler warnings with this compiling with gcc 4.0.1. Should I submit this to wine-patches? This would be my first patch to wine (or any open-source project, period). I'd appreciate some feedback before I try for it. Thanks in advance!

5 6

More insatllers
by Oliver Stieber 28 Jul '05

28 Jul '05

Hi, The axis and allies 2 demo installer requires native ole to install. (http://www.atari.com.au/games/downloads.do?id=24) On the up side, The bards Tale and Juiced demos now install more-or-less correctly. The Bards Tale uses a WISE + MSI installer and has some problems with labels being prefixes with things like {Arial_80} which is a little annoying.(http://www.download.com/The-Bard-s-Tale-updated-demo/3000-8024_4-… Juiced has some problems with bitmaps in the installer. (http://www.download.com/Juiced-final-demo/3000-7534_4-10302658.html?tag=lst…) ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

1 0

Use Gecko to render HTML
by Jacek Caban 28 Jul '05

28 Jul '05

Hello. I've sent a patch that makes MSHTML use Gecko to render HTML. Unfortunately, it uses Windows Gecko, not Linux one. Alexandre wrote me that it's impossible to get perfect support for XEmbed container, so, although my implementation was enough for Gecko, it can't go to CVS and I should use Windows one. So, as of now, support for the Linux version went into trash and I've sent this patch. Well, I don't give up with Linux version, I have an other idea, but that's not for the nearest future. One plus is that the Windows version is much simpler... Now it's time to write about this patch. For now it can use Gecko installed with Mozilla Suite or Mozilla ActiveX Control - it could use any Gecko-based product, but we have to be able to search for it (every Gecko-based product has its own registry settings for Gecko path). I'm planning to add Firefox support, but it doesn't work yet and I have to find why. If you think there should be support for any other application, please let me know. As our shdocvw still uses Mozilla ActiveX Control, I think it should be preferred (it's the first one on the search list and it's smallest). In future, when we'll implement shdocvw on top on MSHTML and get rid of Mozilla ActiveX Control dependency, I think it will be better to have a package like wine-gecko with an installer, downloaded automatically when needed (well, not automatically in MS sens, user will be informed about it ;-) ). We need a very limited version of Gecko, so it will be just small package. What does this patch change? You may see IE working on Gecko engine! Not much of its functionality is implemented yet, but a HTML document is displayed. Soon there will be more! To see how it works for your program, probably you will have to set shdocvw to native (and usually urlmon, maybe wininet) and mshtml as builtin. Thanks, Jacek

1 0

[WINEHQ] Lots of buggy < and >
by Francois Gouget 28 Jul '05

28 Jul '05

Reading WWN 284 I noticed the following line: > stabilizing for release &. And sure enough the source XML is buggy: > stabilizing for release &<g&>. I believe the intent was the following to deal with the double parsing: > stabilizing for release &lt;g&gt;. But really this double parsing is a major pain. Can't we get rid of it? Because it's causing a lot of bugs: $ egrep "<.*>" wwn/*.sgml | grep -v "who=" | wc -l 190 And it's not just missing grins either. For instance in WWN 125: > gdb <gdb remote protocol> winedbg <Win32 debug API> wineserver and all the reader sees is: > gdb winedbg wineserver which is totally wrong of course. And in WWN 149: > #include <comcat.h> <br /> > #include <oaidl.h><br /> > #include <objbase.h><br /> > #include <objidl.h><br /> ... all the reader sees is: > #include > #include > #include > #include ... Not very informative! -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Hiroshima '45 - Czernobyl '86 - Windows '95

2 1

Re: patch for libs/wine/mmap.c making wine running on FreeBSD 5.x
by Alexandre Julliard 28 Jul '05

28 Jul '05

"jean-marc DETREZ" <jm.detrez(a)cegetel.net> writes: > I made a little correction of "try_mmap_fixed" because it's seems to me > that the function didn't really test the result (vec). That's the way it should be, we don't care if the page is in core or not, we only want to know if something is mapped there. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [wined3d] repack nonpower2 textures
by Lionel Ulmer 28 Jul '05

28 Jul '05

On Thu, Jul 28, 2005 at 01:13:02PM +0100, Oliver Stieber wrote: > repacking can be quite CPU intensive and warhammer 40k is the only game so far > that needs nonpower2 texture repacking so it's turned off by default but can be turned > on via the following registry key: > HKEY_CURRENT_USER/Software/Wine/Direct3D Nonpower2Mode [repack] Is there a way to automagically detect the need for this feature ? If not, how are we going to maintain the list of 'game-specific' WineD3D configurations ? Should we ship this as part of 'wine.inf' or create a new .inf that would install automatically the correct keys ? Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

Process Explorer and 16-bit windows applications
by Paul Vriens 28 Jul '05

28 Jul '05

Hi, I've reported before that I still had an issue with the version of 16bit windows applications (and hence 16bit resource) reported by Process Explorer. I've emailed the developer about this. His answer: On Thu, 2005-07-21 at 00:20, Mark Russinovich wrote: > Hi Paul, > > I make no effort to support 16-bit programs in Process Explorer. On Windows > NT-based OSes the run within Ntvdm.exe processes and not as "real" > processes. > > -Mark So there was no issue after all. All other version information tools I've used so far, show the correct versions for both win16 and win32 resources. Just to let you know (if you're interested at all in this :-) ) Cheers, Paul.

1 0

Re: ntdll: Try2: Fix IOCTL_SCSI_GET_ADDRESS and HKLM\HARDWARE\DEVICEMAP\Scsi entries
by Alexandre Julliard 28 Jul '05

28 Jul '05

Vitaliy Margolen <wine-patch(a)kievinfo.com> writes: > @@ -235,14 +249,18 @@ static void create_hardware_branch(void) > int i; > HANDLE handle; > char drive[] = "\\\\.\\A:"; > + char drive1[] = "A:\\"; > + UINT uNumber = 0; > > /* create entries for cdroms (skipping A: and B:) */ > for (i = 2; i < 26; i++) > { > drive[4] = 'A' + i; > + drive1[0] = 'A' + i; > + if (GetDriveTypeA(drive1) != DRIVE_CDROM) continue; > handle = CreateFileA( drive, 0, 0, NULL, OPEN_EXISTING, 0, 0 ); > if (handle == INVALID_HANDLE_VALUE) continue; You shouldn't use GetDriveType here, you should determine the device type from the ioctls you do on the handle. The GetDriveType result doesn't necessarily correspond to the device since it can be changed in the registry. -- Alexandre Julliard julliard(a)winehq.org

1 0

winecfg in 640x480
by Oliver Stieber 28 Jul '05

28 Jul '05

I know this isn't going to be too big an issue with many people but it would be nice if winecfg was usable with a 640x480 desktop, at the moment it's 20 or so pixels to tall and you can't see the ok/cancel buttons. ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

2 1

Wine compatibility sponsoring
by Christian Siegert 28 Jul '05

28 Jul '05

Hi *, although I am not quite sure if this is the right list for my question, I will try it anyway as I did not find a better list (e.g. jobs)... Being a software development company with limited wine know-how, we are would like to request if there is any interest at any of the developers around to assist us in a wine-customization related project. For one of our customers, we will have to customize a wine system to support a special windows application (a rather complex one from the finance sector) which is currently not *fully* supported (This is the results of recent tests with standard-wine). The results of this special cutomization will be GPLed again, so this could be integrated in the next wine release if wanted by the project. The project will be split in three phases: - Testing of earlier results of wine/application interaction in cooperation with our customer - Modification of wine - Packaging to single launchable application Payment will be subject of negotiation. Anyone of the developers who is interested should contact me directly via phone or mail. -- Viele Grueße / Best regards, Christian Siegert Geschaeftsfuehrer / Executive director ___________________________________________________ Open Source Factory GmbH Stefan-George-Ring 8 81929 Muenchen GERMANY Tel.: +49 (0)89 99 34 13-50 Fax: +49 (0)89 99 34 13-69 E-Mail: info(a)opensourcefactory.com www: http://www.opensourcefactory.com

1 0

Re: Fix Using DDraw to Access the Desktop
by Alexandre Julliard 28 Jul '05

28 Jul '05

Robert Shearman <rob(a)codeweavers.com> writes: > Previously, using ddraw to write to a small area of the desktop (or > even none at all) would cause the screen to go black because the > contents of the screen wasn't copied to the surface before the surface > was copied back to the screen. This patch fixes that. Of course it's still corrupting the screen, it's just less obvious... -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: Try 2:Implement IOCTL_SCSI_GET_INQUIRY_DATA
by Dmitry Timoshkov 28 Jul '05

28 Jul '05

"Vitaliy Margolen" <wine-patch(a)kievinfo.com> wrote: > Check for HAVE_SG_IO_HDR_T_INTERFACE_ID instead of defined Linux > +static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize) > +{ > + PSCSI_INQUIRY_DATA inquirydata = NULL; > + sg_io_hdr_t iocmd; ^^^^^^^^^^^^^^^^^ > + UCHAR inquiry[INQ_CMD_LEN] = {INQUIRY, 0, 0, 0, INQ_REPLY_LEN, 0}; > + UCHAR sense_buffer[32]; > + struct hd_driveid; > + int iochk, version; > + > +#ifdef HAVE_SG_IO_HDR_T_INTERFACE_ID > + /* Check we have a SCSI device and a supported driver */ > + if(ioctl(fd, SG_GET_VERSION_NUM, &version) != 0) This won't compile if sg_io_hdr_t doesn't present. Underlined structure declaration needs to be protected as well. Just add '#undef HAVE_SG_IO_HDR_T_INTERFACE_ID' after config.h include and try to compile. -- Dmitry.

1 0

Version
by jstrupeni 28 Jul '05

28 Jul '05

Hello, I'm using a Novell Linux Desktop Version 9 and I don't know which version of Wine I should install. Thank you very much in advance, Juan

2 1

Re: patch for libs/wine/mmap.c making wine running on FreeBSD 5.x
by Dmitry Timoshkov 28 Jul '05

28 Jul '05

"jean-marc DETREZ" <jm.detrez(a)cegetel.net> wrote: > @@ -207,6 +207,13 @@ void *wine_anon_mmap( void *start, size_ > #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) > if ( try_mmap_fixed( start, size, prot, flags, fdzero, 0 ) ) > return start; > +#elif defined(__FreeBSD__) > + /*for FreeBSD assure system heap adress of 0x80000000*/ > + if (start == (void *)0x80000000) > + { > + if (try_mmap_fixed( start, size, prot, flags, fdzero, 0 ) ) > + return start; > + } > #endif > } > return mmap( start, size, prot, flags, fdzero, 0 ); Why didn't you simply add __FreeBSD__ to the '#elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__)' case? -- Dmitry.

1 0

Re: Implement IOCTL_SCSI_GET_INQUIRY_DATA
by Dmitry Timoshkov 28 Jul '05

28 Jul '05

"Vitaliy Margolen" <wine-patch(a)kievinfo.com> wrote: > +static NTSTATUS GetInquiryData(int fd, PSCSI_ADAPTER_BUS_INFO BufferOut, DWORD OutBufferSize) > +{ > + PSCSI_INQUIRY_DATA inquirydata = NULL; > + sg_io_hdr_t iocmd; > + UCHAR inquiry[INQ_CMD_LEN] = {INQUIRY, 0, 0, 0, INQ_REPLY_LEN, 0}; > + UCHAR sense_buffer[32]; > + struct hd_driveid; > + int iochk, version; > + > +#if defined(linux) > + /* Check we have a SCSI device and a supported driver */ Please use appropriate configure checks instead of a blind '#if defined(linux)'. -- Dmitry.

1 0

Re: [wined3d] support get vertexdeclaration with pnumelements set to zero
by Oliver Stieber 27 Jul '05

27 Jul '05

With the patch this time --- Oliver Stieber <oliver_stieber(a)yahoo.co.uk> wrote: > Hi, > This patch returns all elements when getDeclaration is called with > pnumelements set to 0. This fixes bugs in Teeage mutant ninja turtles and The > Increadibles. > > > > > > ___________________________________________________________ > Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail > http://uk.messenger.yahoo.com > > ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

2 1

How to pass / convert file names?
by Christian Britz 27 Jul '05

27 Jul '05

Hi, I discovered only recently a problem which is probably quite prevalent, but I could not find the answer on the web. Example: I want to configure Mozilla for opening .DOC files with the free Word Viewer that can be downloaded at http://www.microsoft.com. To do so I go to Edit -> Preferences -> Navigator -> "Helper Applications" and create a new MIME-Type "application/msword", extensions "doc dot" and tell the beast to open such files with /home/cbritz/.wine/drive_c/Programme/Microsoft Office/WORDVIEW.EXE (I have configured binfmt support, so I can call the EXE directly) Expected behaviour: The viewer program starts, opens the doc file and displays it. What happens: The viewer program starts and does not open any file. I must manually select Z:\tmp\Example.doc from the application. Next try from command line: .wine/drive_c/Programme/Microsoft\ Office/WORDVIEW.EXE /tmp/Example.doc - Again the doc file doesn't open. It DOES WORK when I manually translate the path name to: .wine/drive_c/Programme/Microsoft\ Office/WORDVIEW.EXE Z:\tmp\Example.doc first. I expected naively that wine automatically translates the Unix scheme to it's own convention but this doesn's seem to be true. Is it possible to instruct wine to translate the path string before it passes it to the windows binary? If not, is there a workaround to do that trick? One solution would probably be to write a wrapper script that translates the path name before it is passed to wine. One discussion board entry I found indicates the CrossOver plugin does it that way. I might even volunteer for trying to write a patch to wine if someone could tell me where to start to look at in the code ;) But probably the solution is already out there and I just don't see it. Any help would be much appreciated! Regards Christian

2 4

bugs #3148 - Still in wine-20050725
by Hiji 27 Jul '05

27 Jul '05

Can anyone help out with this bug? It's still in existence in the July Wine release. Basically, I select 3 files, and I click on the highlighted files to try to drag all 3. However, as soon as I click on them, they deselect, and one file is now selected. If I attempt to click+drag the one file, it gets stuck on the click+drag -- that is, I let get go of the mouse button and the highlighted file is still attached to the mouse arrow. Help! I want to use the latest Wine, but it's useless to me if I can't get proper mouse behavior. :S (I'm still stuck on wine-20041201 otherwise.) Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 2

Re: hhctrl: Add the WebBrowser implementation
by James Hawkins 27 Jul '05

27 Jul '05

On 7/27/05, James Hawkins <truiken(a)gmail.com> wrote: > Hey, > > This patch includes these changes: > * no more HH_* macros, no more hhctrl.h > * uses proper ref counting > * stores pointers instead of using ptr arithmetic > * IOleClientSiteImpl frees itself so there is no mem leak > * uses the ICOM_THIS_MULTI macro > * misc cleanups > > Changelog > * Add the WebBrowser implementation. > Can you tell me what needs to be fixed to get this accepted? This is a bare-bones implementation of a embedded web browser, so the S_OKs and the E_NOTIMPL are necessary to make shdocvw happy, but we really don't need those particular api in HTML Help. -- James Hawkins

1 0

Re: hhctrl: Add the WebBrowser implementation
by Dmitry Timoshkov 27 Jul '05

27 Jul '05

"James Hawkins" <truiken(a)gmail.com> wrote: > +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) IMO using 'const' before the type looks more natural. Also adding 'const' to all type conversions wouldn't hurt: const impl* This = (const impl*)((const char*)(iface) - offsetof(impl,field)) > +static HRESULT STDMETHODCALLTYPE Site_SaveObject(IOleClientSite *iface) > +{ > + return E_NOTIMPL; > +} Any chance to add a FIXME to all not implemented interfaces even if you return S_OK in them? > +static IOleClientSiteVtbl MyIOleClientSiteTable = Please make all OLE vtables const and use const keyword for pointers to them in the structures of interface implementations. > + switch (dwAction) > + { > + case WB_GOBACK: > + IWebBrowser2_GoBack(pWebBrowser2); > + break; > + case WB_GOFORWARD: > + IWebBrowser2_GoForward(pWebBrowser2); > + break; > + case WB_GOHOME: > + IWebBrowser2_GoHome(pWebBrowser2); > + break; > + case WB_SEARCH: > + IWebBrowser2_GoSearch(pWebBrowser2); > + break; > + case WB_REFRESH: > + IWebBrowser2_Refresh(pWebBrowser2); If it's intented to not use 'break;' here a comment telling that wouldn't hurt. > + case WB_STOP: > + IWebBrowser2_Stop(pWebBrowser2); > + } default: here wouldn't hurt as well and would show some not expected/implemented cases with a FIXME message. -- Dmitry.

2 3

Re: dlls/winmm/winealsa/midi.c: Bug in MIDI_CMD_BENDER fixed
by Marcus Meissner 27 Jul '05

27 Jul '05

On Tue, Jul 26, 2005 at 11:52:55PM +0200, Johannes Koch wrote: > The pitch value was wrongly converted and has to be centered around zero. > > Changelog > Fixed pitch bending in the alsa midi driver. > > ? patch.diff > Index: dlls/winmm/winealsa/midi.c > =================================================================== > RCS file: /home/wine/wine/dlls/winmm/winealsa/midi.c,v > retrieving revision 1.16 > diff -u -p -r1.16 midi.c > --- dlls/winmm/winealsa/midi.c 27 Apr 2005 09:39:56 -0000 1.16 > +++ dlls/winmm/winealsa/midi.c 26 Jul 2005 21:31:05 -0000 > @@ -833,7 +833,7 @@ static DWORD modData(WORD wDevID, DWORD > snd_seq_ev_set_controller(&event, evt&0x0F, d1, d2); > break; > case MIDI_CMD_BENDER: > - snd_seq_ev_set_pitchbend(&event, evt&0x0F, ((WORD)d1 << 7) | (WORD)d2); > + snd_seq_ev_set_pitchbend(&event, evt&0x0F, ((WORD)d2 << 7 | (WORD)d1) - 0x2000); This is not correct, you need extra ( ) around the << 7, like this perhaps: > + snd_seq_ev_set_pitchbend(&event, evt&0x0F, (((WORD)d2 << 7) | (WORD)d1) - 0x2000); Ciao, Marcus

3 2

Re: RICHED20: TODO list additions
by Dmitry Timoshkov 27 Jul '05

27 Jul '05

"Phil Krylov" <phil(a)newstar.rinet.ru> wrote: > Added some missing but useful items to the RichEdit TODO list. > + * - full justification > + * - hyphenation > + * - tables What kind of hyphenation richedit needs? Would an automatic, not dictionary based algorithm suffice? In 1996-97 I've developed and implemented that kind of algorithm for russian language and MS Word/Pagemaker. It produces much better results than Ventura Publisher for DOS and similar results to (released later) builtin automatic hyphenation in Pagemaker 6.0 (russian edition). The code has been written for TurboC/DOS but should be easy enough to port), and I would be happy if it could be handy for Wine's richedit. Just let me know and I'll send the sources. -- Dmitry.

3 2

Re: Reimplement EnumDateFormats, make it work for all available locales
by Paul Vriens 27 Jul '05

27 Jul '05

> Hello, > > Changelog: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > - Reimplement EnumDateFormats, make it work for all available locales. > - Add a test for EnumDateFormats > ... > -BOOL WINAPI EnumDateFormatsA( DATEFMT_ENUMPROCA lpDateFmtEnumProc, LCID > Locale, DWORD dwFlags) > +BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA proc, LCID lcid, DWORD > flags) Why did you change the names ? I thought we sticked to the MSDN ones ? Paul.

2 1

crypt32: Re: exception handling, part 2
by Saulius Krasuckas 27 Jul '05

27 Jul '05

* Log message from [1]: > > Juan Lang <juan_lang(a)yahoo.com> > - fix decoding of long-form data lengths > - use exception handling in decoding > - tests for these changes One of added tests in the patch fails on winME: | encode.c:313: Test failed: Expected CRYPT_E_ASN1_LARGE, got c0000005 But the bad thing is that after running small code chunk another calls to CryptEncodeObjectEx() starts generating exceptions here. Mentioned code: + /* Try to decode some bogus large items */ + /* The buffer size is smaller than the encoded length, so this should fail + * with CRYPT_E_ASN1_EOD if it's being decoded. It's failing with + * CRYPT_E_ASN1_LARGE, meaning there's a limit on the size decoded. + * The magic limit under XP seems to be 0x061a8000 bytes--more than this + * fails with CRYPT_E_ASN1_LARGE. + */ + ret = CryptDecodeObjectEx(dwEncoding, X509_MULTI_BYTE_INTEGER, tooBig, + 0x7fffffff, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); + ok(!ret && GetLastError() == CRYPT_E_ASN1_LARGE, + "Expected CRYPT_E_ASN1_LARGE, got %08lx\n", GetLastError()); And example of parameters for the mentioned call (which after throws an exception of "Access violation" in another tests): CryptEncodeObjectEx( X509_ASN_ENCODING, X509_ENUMERATED, 1, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize ); HTH to fix exceptions. If that informations is not enough, I will be glad to debug this via e-mail, Juan. :-) [1] http://www.winehq.org/hypermail/wine-cvs/2005/06/0683.html

3 6

Re: Add ShellExecute() conformance tests
by Saulius Krasuckas 27 Jul '05

27 Jul '05

* On Fri, 22 Jul 2005, Francois Gouget wrote: > > So the goal of this conformance test is to at least get things started > and to test a few sticking points like putting quotes around the One test fails on my box: | $ make -C dlls/shell32/tests/ test | make: Entering directory `/mnt/antras/usr/src/wine-cvs/wine/dlls/shell32/tests' | ../../../tools/runtest -q -P wine -M shell32.dll -T ../../.. -p shell32_test.exe.so shlexec.c && touch shlexec.ok | shlexec.c:275: Test failed: ShellExecute(null, "C:\windows\temp\\test_shortcut_shlexec.lnk", null, null) failed: rc=31 err=0 | make: *** [shlexec.ok] Error 1 Any ideas?

3 2

Version
by jstrupeni 27 Jul '05

27 Jul '05

Hello, I have a Novell Linux Desktop Version 9 and I don't know what version of Wine I should install. Thank you very much in advance. Juan

1 0

Report request. Wine20050725 Configuration error
by Ivan Lezhnev, Jr. 27 Jul '05

27 Jul '05

> configure: WARNING: GL/glx.h: present but cannot be compiled > configure: WARNING: GL/glx.h: check for missing prerequisite headers? > configure: WARNING: GL/glx.h: see the Autoconf documentation > configure: WARNING: GL/glx.h: section "Present But Cannot Be Compiled" > configure: WARNING: GL/glx.h: proceeding with the preprocessor's result > configure: WARNING: GL/glx.h: in the future, the compiler will take > precedence > configure: WARNING: ## ------------------------------------ ## > configure: WARNING: ## Report this to wine-devel(a)winehq.org ## > configure: WARNING: ## ------------------------------------ ## Slackware GNU\Linux 10.0.0, kernel 2.6.10 #2 -- Ivan Lezhnev, Jr. Ukraine. Simferopol. Local Time: Wed Jul 27 13:16:15 EEST 2005 Using: Slackware GNU\Linux | Kernel 2.6.10 #2 Disassemble to assemble something pure

1 0

Re: [wined3d] pbuffer support
by Ivan Gyurdiev 27 Jul '05

27 Jul '05

On Mon, 2005-07-18 at 19:02 +0100, Oliver Stieber wrote: > Hi, > > This patch implements the use of PBuffers for offscreen textures. > The fads in Pirates should now appear fullscreen, the dx9_offscreen_rendering > tutorial has an odd problem with ATI's drivers, clicking the window and moving > the mouse will cause the tutorial to render properly, I haven't found anything > else with this problem yet and I don't currently have a workaround. > > Registry entries and options in winecfg to change to enable and disable > pbuffers will be added in a later patch. Regression in HL2: http://ivan.ivg2.net/scr.png Screen is almost completely white - no textures. New messages (maybe?): ... fixme:d3d9:IDirect3DDevice9Impl_CreateSurface (0x7ff6b940) call to IWineD3DDevice_CreateSurface failed fixme:d3d9:D3D9CB_CreateSurface (0x7ff6b940) IDirect3DDevice9_CreateSurface failed fixme:d3d:IWineD3DDeviceImpl_CreateTexture Failed to create surface 0x7d161620 fixme:d3d9:IDirect3DDevice9Impl_CreateTexture (0x7ff6b940) call to IWineD3DDevice_CreateTexture failed .... fixme:d3d_shader:IDirect3DDevice9Impl_SetVertexShader Disabled 0x7ff6b940

3 4

cross-compiling for ARM
by John Connor 26 Jul '05

26 Jul '05

Has anyone tried to cross-compile Wine for the ARM platform or is there any documentation on how to do this? -------------------------------------------------------- This is an e-mail from General Dynamics Robotic Systems. It is for the intended recipient only and may contain confidential and privileged information. No one else may read, print, store, copy, forward or act in reliance on it or its attachments. If you are not the intended recipient, please return this message to the sender and delete the message and any attachments from your computer. Your cooperation is appreciated.

2 1

How to test a win16 application in our test-suite
by Paul Vriens 26 Jul '05

26 Jul '05

Hi, I'm busy fixing up version.dll, and I want to create some tests to read resources from win16 applications. I currently have a fixed .exe in my tests directory, but I'd like to create a 16bit .exe (or .dll) during the creation of the tests. Any idea's ? Paul Vriens.

4 3

Re: commctrl: modularize progress drawing
by Dimi Paun 26 Jul '05

26 Jul '05

From: "Frank Richter" <frank.richter(a)gmail.com> > Frank Richter <frank.richter(a)gmail.com> > Split up the drawing code into a set of smaller functions and also moved > some common computations into helper functions. All that to facilitate > the implementation of the forthcoming theming support. > +static inline int PROGRESS_GetLedSize( PROGRESS_INFO *infoPtr, LONG style, It has become the norm lately to not have the ALLCAPS_ prefix for internal static functions, but rather have names_with_underscores to easily tell them apart from Win32 APIs. So for the above, I guess get_led_size() would be preferable. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 2

Adding a new include file (softpub.h)
by Paul Vriens 26 Jul '05

26 Jul '05

Hi, for a patch to wintrust_main.c I need to define a GUID (WINTRUST_ACTION_GENERIC_VERIFY_V2). This GUID is present in softpub.h. The include file is not included in Wine right now. What are the 'rules' to add a new include file? Is it ok that have only this GUID in there ? Cheers, Paul. P.S. If somebody already has this one lying around, be my guest :-)

1 0

Re: [wintrust] Return TRUST_E_PROVIDER_UNKNOWN for WinVerifyTrust
by Rein Klazes 26 Jul '05

26 Jul '05

On Thu, 14 Jul 2005 13:37:53 +0200 (CEST), you wrote: > Hi, > > currently we return ERROR_SUCCESS for WinVerifyTrust. Process Explorer > expects some data because of this. > > As no trust provider is implemented yet, return TRUST_E_PROVIDER_UNKNOWN > instead. Paul, Girotel was perfectly happy with the ERROR_SUCCESS without anymore "data" (none is actually returned), now it fails. I think that in this case ERROR_SUCCESS should be the default. If you cannot figure out what data your program expects, perhaps you can single out the specific ActionID to return a failure. Rein.

2 3

Re: [wined3d] per app settings regression
by Raphael 26 Jul '05

26 Jul '05

On Monday 25 July 2005 20:41, Oliver Stieber wrote: > Hi, > This patch corrects a regression issue in > http://www.winehq.org/hypermail/wine-patches/2005/07/0575.html > Hi You just sent the sme patch :) Maybe you forgot to attach the good one Regards, Raphael

2 1

[wined3d] regression
by Oliver Stieber 26 Jul '05

26 Jul '05

Following this patch http://www.winehq.org/hypermail/wine-patches/2005/07/0575.html wined3d SegV's every time the dll is loaded. ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

3 4

Re: objsel: Add stubs for objsel.dll and objsel.h
by Thomas Weidenmueller 26 Jul '05

26 Jul '05

Thomas Weidenmueller wrote: > The attached archive contains a stubbed objsel.dll and it's public > header file objsel.h Any comments why it got rejected? Best Regards, Thomas

2 1

Windows API
by Bennie Kahler-Venter 26 Jul '05

26 Jul '05

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Anyone saw the article in June's Dr. Dobb's Journal, July 95 titled "Finding Binary Clones with Opstrings & Function Digests: Part I" by Andrew Schulman http://www.undoc.com Although just the first article, It already shows promise from wine's perspective. Generating hashes on the functions in the DLL's & EXE's while taking into consideration not to be fooled by the pointer diffs because of different positions in the binaries, Huge potential to find similar functions in all dll's instead of recoding them all. According to the article something Windows suffers from quite a bit... Just my 2c Tnx & Bi Bennie Kahler-Venter -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (GNU/Linux) iD8DBQFC5fc7jrc/ZmvwnjARAgsyAJ9EGFZjvY+bvS4MuUJuS9IZ9WZ59ACgkAr1 ynML4cy/z/JKviK17RrwiOE= =TlTz -----END PGP SIGNATURE-----

1 0

Re: hhctrl: Add the WebBrowser implementation
by Dmitry Timoshkov 26 Jul '05

26 Jul '05

"James Hawkins" <truiken(a)gmail.com> wrote: > +#define HH_Alloc(size) ((LPVOID)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size)) > + > +#define HH_Free(buffer) \ > + if (buffer) \ > + HeapFree(GetProcessHeap(), 0, (HLOCAL)buffer); Alot of work has been done to avoid tests for NULL before HeapFree call, please do not introduce them again. Personally I don't see the point of HH_Alloc and HH_Free macros at all. > +#define HH_SafeRelease(x) \ > + if (x) \ > + { \ > + x->lpVtbl->Release(x); \ > + x = NULL; \ > + } Again, a direct access to a vtable. There is no much point in that macro either, do that check directly instead and get rid of hhctrl.h completely. -- Dmitry.

1 0

Bug in native user32
by Jacek Caban 26 Jul '05

26 Jul '05

Hello. Fixing MSHTML tests I found a bug in Windows. In tests I passed const WNDCLASSEX, to RegisterClassEx what should work as its declaration is: ATOM WINAPI RegisterClassExW(const WNDCLASSEXW *); Changing passed WNDCLASS to nonconst makes it works. I wrote small tests (attached) showing that if hInstance of WNDCLASSEX is NULL, RegisterClassEx sets it to GetModuleHandle(NULL). It, of course, couses segmentation fault in case CMASSWNDEX is const. This problem seams to happen on XP, NT 4, 2k and 2k3. So the question is if we should clone this bug? Some applications may expect it, but other may crash. They will crash on Windows anyway... Or we should mark test as todo_wine and change it if we found application that depend on it? Thanks, Jacek Index: dlls/user/tests/class.c =================================================================== RCS file: /home/wine/wine/dlls/user/tests/class.c,v retrieving revision 1.19 diff -u -p -r1.19 class.c --- dlls/user/tests/class.c 15 Jun 2005 10:21:19 -0000 1.19 +++ dlls/user/tests/class.c 25 Jul 2005 16:14:10 -0000 @@ -301,6 +301,15 @@ static void test_instances(void) HINSTANCE user32 = GetModuleHandleA("user32"); HINSTANCE main_module = GetModuleHandleA(NULL); + WNDCLASSEXA clsex = { + sizeof(WNDCLASSEXW), + 0, + ClassTest_WndProc, + 0, 0, NULL, NULL, NULL, NULL, NULL, + "const_test", + NULL + }; + memset( &cls, 0, sizeof(cls) ); cls.style = CS_HREDRAW | CS_VREDRAW; cls.lpfnWndProc = ClassTest_WndProc; @@ -436,6 +445,10 @@ static void test_instances(void) ok( !GetClassInfo( 0, name, &wc ), "Class found with null instance\n" ); ok( GetLastError() == ERROR_CLASS_DOES_NOT_EXIST, "Wrong error code %ld\n", GetLastError() ); ok( UnregisterClassA( name, 0 ), "Unregister failed for null instance\n" ); + + ok( RegisterClassExA( &clsex), "RegisterClassExA failed\n"); + ok( clsex.hInstance == GetModuleHandle(NULL), "hInstance=%08lx\n, expected %08lx\n", + clsex.hInstance, GetModuleHandle(NULL)); /* registering for user32 always fails */ cls.lpszMenuName = "user32";

3 3

Re: [AppDB] fix situation when AppDB is not at DocumentRoot (patch 1 of 3) (gah! resend)
by Chris Morgan 26 Jul '05

26 Jul '05

I ran into the same issue and was in the process of trying to fix it up. Maybe this is a better approach because it doesn't require any user intervention? The idea was to pass the relative path through that function to get the full local path. I can attach the rest of the patch if you'd like but it isn't in a finished state. Chris On 7/23/05, Tony Lambregts <tony.lambregts(a)gmail.com> wrote: > These patch are to meant address situations like mine when the AppDB is located > a http://localhost/appdb instead of http://localhost/. These patches can be > applied independatly from my other patches. > > Change Log: fix situation when AppDB is not at DocumentRoot. > > Files Changed: include/config.php.sample > > > > > > > > Index: include/config.php.sample > =================================================================== > RCS file: /home/wine/appdb/include/config.php.sample,v > retrieving revision 1.11 > diff -u -r1.11 config.php.sample > --- include/config.php.sample 23 Apr 2005 02:24:35 -0000 1.11 > +++ include/config.php.sample 23 Jul 2005 22:28:16 -0000 > @@ -17,6 +17,11 @@ > define("APPDB_OWNER_URL","http://www.winehq.org/"); // website of this product/company > define("APPDB_OWNER_EMAIL","appdb(a)winehq.org"); // e-mail of this product/company > define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla > +// the following is usefull if the location of your appdb is offset from the > +// DocumentRoot defined in httpd.config > +// For example: If you access the appdb from http://localhost/appdb > +// uncomment the following line . > +//define("APPDB_OFFSET","/appdb"); > > > /* > > >

1 0

Installer hangs with no output :S
by Hiji 25 Jul '05

25 Jul '05

I'm trying out this month's release. I'm trying to install AbsoluteFTP which previous installed fine, but now I try to install, the install shield begins, but just sits there. There's not even any output... How can I get something together to report to you guys? Hijinio ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

1 0

change in dlls/version/info.c breaks IBM Translation Manager
by Phil Krylov 25 Jul '05

25 Jul '05

Hello, http://cvs.winehq.org/cvsweb/wine/dlls/version/info.c.diff?r1=1.47&r2=1.48&… This recent change in dlls/version/info.c breaks IBM Translation Manager on startup: > wine: Unhandled exception (thread 0009), starting debugger... > WineDbg starting on pid 0x8 > Unhandled exception: page fault on read access to 0x7bb0f4ac in 32-bit code (0x7b4ce282). > In 32 bit mode. > Register dump: > CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 > EIP:7b4ce282 ESP:7baff860 EBP:7baff8b0 EFLAGS:00010283( - 00 -RIS1C) > EAX:7bb0fa58 EBX:7b4d37dc ECX:0000fd34 EDX:7bb0f4ac > ESI:7baffb24 EDI:7baffb40 > Stack dump: > 0x7baff860: 7baffb28 00000000 7baffd4c ffffffff > 0x7baff870: 7baffb3c 00000002 00000000 00000000 > 0x7baff880: 7baff9da 7bb0fa58 7b4d3ae0 7bb0f4ac > 0x7baff890: 7baffd4c 00001794 7baf0000 00007baf > 0x7baff8a0: 0000fd34 7b4d37dc 7bb0fa58 7baffb24 > 0x7baff8b0: 7baff908 7b4ce2ad 7baffd24 7baffb24 > Backtrace: > =>1 0x7b4ce282 ConvertVersionInfo32To16+0x172(info32=0x7baffd24, info16=0x7baffb24) [/home/phil/build/wine/dlls/version/info.c:267] in version (0x7baff8b0) > 2 0x7b4ce2ad ConvertVersionInfo32To16+0x19d(info32=0x7baff9d4, info16=0x7baff9d4) [/home/phil/build/wine/dlls/version/info.c:273] in version (0x7baff908) > 3 0x7b4cf64c VerQueryValueA(pBlock=0x7baff9d4, lpSubBlock=0x569214, lplpBuffer=0x7baff9cc, puLen=0x7baff9d0) [/home/phil/build/wine/dlls/version/info.c:772] in version (0x7baff93c) > fixme:dbghelp:sffip_cb NIY on 'P:\EQFD\BINNTCVP\EQFD.pdb' > 4 0x00401bb6 in eqfd (+0x1bb6) (0x7baffdb8) > 5 0x004aa8e7 in eqfd (+0xaa8e7) (0x7baffddc) > 6 0x004745c8 in eqfd (+0x745c8) (0x7baffdf4) > 7 0x0044ef54 EntryPoint+0x1a4 in eqfd (0x7bafff2c) > 8 0x7bbb3f48 start_process+0x8d(arg=0x0) [/home/phil/build/wine/dlls/kernel/process.c:996] in kernel32 (0x7baffff4) > 9 0xb7fab48d wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) > 0x7b4ce282 ConvertVersionInfo32To16+0x172 [/home/phil/build/wine/dlls/version/info.c:267] in version: movzwl 0x0(%edx),%eax > 267 while ( (DWORD)child32 < (DWORD)info32 + wLength && child32->wLength != 0 ) > Wine-dbg> -- Ph.

2 7

Re: [wined3d] resource object tracking.
by Raphael 25 Jul '05

25 Jul '05

On Monday 25 July 2005 20:31, Oliver Stieber wrote: > Hi, > This patch implements resource tracking, require for reset and evict > managed resources and provides extra sanity checks. > > I've had to test with an older version of wine-cvs since head doesn't seem > to compile cleanly or run at the moment, but there aren't otherwise any > changes in wine-cvs that would affect this patch. > Why you need 2 breaks here ? + case D3DRTYPE_VOLUME: + break; + + /* TODO: nothing really? */ + break; Regards, Raphael PS: its better to use unsigned for indexes and counts :)

1 0

wine installation for Debian
by Khe Siang Tan 25 Jul '05

25 Jul '05

Hi just wondering if someone could help me....i am running Debian operating system....and i am trying to install/run WINE.....i have typed the command $apt-get install wine in root user. KHE:/home/zhe# apt-get install wine Reading Package Lists... Done Building Dependency Tree... Done wine is already the newest version. 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. it seems to have installed but it has not appeared on my programs list....how do i get it running.... i have also tried this command: KHE:/home/zhe# dpkg -i wine_0.0.20030115-1.deb dpkg: error processing wine_0.0.20030115-1.deb (--install): cannot access archive: No such file or directory Errors were encountered while processing: wine_0.0.20030115-1.deb how do i get WINE running thx Cheers K-Si Send instant messages to your online friends http://au.messenger.yahoo.com

3 2

Re: ALSA: Call snd_pcm_drain instead of a buggy homegrown version
by Vitaliy Margolen 25 Jul '05

25 Jul '05

Isn't WODM_RESET should stop playback/recording immediately? In which case shouldn't we use snd_pcm_drop instead? I'm guessing here. I have that loop disabled here for some time now. And I can't hear any artifacts. PS: If we drop that loop we should remove all associated stuff as well. Vitaliy Margolen Monday, July 25, 2005, 9:27:42, Robert Shearman wrote: > Changelog: > wait_for_poll can go into an infinite loop. Remove it and replace it > with snd_pcm_drain which is more likely to do what the original author > intended.

2 2

Exception Handling with a "bad" ESP
by Glenn Wurster 25 Jul '05

25 Jul '05

I've been doing some debugging of the exception handler and have come across a problem for which I'm not sure what the best solution is. It involves an application using the ESP for something other than the stack. The current DIB code uses protection to detect when the application modifies the DIB bits and respond accordingly. It does this by disabling read and/or write access to pages and then catching exceptions when they are thrown so that it can keep the X11 and windows versions of the DIB seporate but reflect changes appropriately (There may be other pieces of Wine which use similar tactics). The application I am debugging, however, uses the ESP as a counter/memory offset in it's updating of the DIB. While not the best selection of registers, the application relies on ESP not being used for anything else while the DIB updates take place (In Windows this assumption is true). A made-up example of assembly code is as follows: mov esp, [0x12345678] ; Save the ESP mov 0x128796, esp ; Set up ESP for the DIB modification mov 0, ebp loop: mov ebp, [sp + bp] ; Write out the byte to the DIB inc ebp sub esp, 0x10000 ; The high word is a counter jns loop mov [0x12345678], esp ; Restore the ESP Now, one of the first things our exception handler in signal_i386.c does is set up the stack layout to deliver the exception to the application (see the setup_exception function), but in this case ESP definately does not point to the stack (and the application never intended for an exception to occurr). It instead contains a counter in the high word, and a memory offset in the low word. Because of this, there is a double fault which happens and Wine actually Segfaults as opposed to breaking into the debugger. So, what I'm wondering is if anyone who has experiance with the exception handling code has any thoughts on how this problem can be fixed. If your interested in actual application code which does this, Alpha Centauri is what I found the initial problem with. You can download the demo at http://www.firaxis.com/downloads/Demo/smac_demo1_1.exe. The assembly code in the application which causes the crash is located starting at around offset 0x0060d954. As an interesting side-effect, if there are other applications which are using ESP in a "bad" manor, then we may be corrupting memory whenever we generate an exception within Wine. This issue would be very hard to track down, which makes me think that only exceptions which would normally be generated in Windows should cause Wine to modify the application stack. Comments? Suggestions? Glenn.

6 13

Re: WLDAP32: improve error handling for the bind functions
by Dimi Paun 25 Jul '05

25 Jul '05

From: "Hans Leidekker" <hans(a)it.vu.nl> > > - credW = strAtoW( cred ); > - if (!credW) return LDAP_NO_MEMORY; > + if (dn) { > + dnW = strAtoW( dn ); > + if (!dnW) return LDAP_NO_MEMORY; > + } > + if (cred) { > + credW = strAtoW( cred ); > + if (!credW) return LDAP_NO_MEMORY; > + } This leaks memory, if credW fails to allocate. Something like this would work: + WCHAR *dnW = NULL, *credW = NULL; + int ret = LDAP_NO_MEMORY; + + if (dn) { + dnW = strAtoW( dn ); + if (!dnW) goto exit; + } + if (cred) { + credW = strAtoW( cred ); + if (!credW) goto exit; + } + ret = ldap_bindW( ld, dnW, credW, method ); + exit: + free dnW, credW + return ret;

1 0

rpc problems with kohan2 installer.
by Oliver Stieber 25 Jul '05

25 Jul '05

Hi, I picked up a copy of Kohan 2, but I can't get it to install it looks like an RPC error. trace:rpc:I_RpcSend (0x7bc84e18) trace:rpc:RPCRT4_OpenBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_Receive buffer length = 12 trace:rpc:I_RpcGetBuffer (0x7ba8a6e4): BufferLength=12 trace:rpc:I_RpcGetBuffer Buffer=0x7bc44978 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bc84e50) trace:rpc:RPCRT4_process_packet freeing Buffer=0x7bc84ed8 trace:rpc:RPCRT4_DestroyBinding binding: 0x7bc84e50 trace:rpc:I_RpcFreeBuffer (0x7bc84e18) Buffer=0x7bc850d0 trace:rpc:RPCRT4_CloseBinding (Binding == ^0x7bcae5f8) trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc36cf0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc36cf0) warn:rpc:RPCRT4_Receive Short read of header, 0/16 bytes warn:rpc:RPCRT4_io_thread receive failed with error 6c0 trace:rpc:RPCRT4_DestroyConnection connection: 0x7bc435d0 trace:rpc:RPCRT4_CloseConnection (Connection == ^0x7bc435d0) trace:ole:rpc_sendreceive_thread completed with status 0x0 trace:ole:DllMain 0x7b7c0000 0x3 (nil) trace:ole:DllMain 0x7b570000 0x3 (nil) trace:ole:CoWaitForMultipleHandles waiting for rpc completion or window message trace:ole:CoWaitForMultipleHandles -- 0x00000000 trace:ole:RpcChannelBuffer_SendReceive RPC call status: 0x0 trace:ole:RpcChannelBuffer_SendReceive -- 0x00000000 trace:ole:deserialize_param vt 26 at 0x7ba8a760 trace:ole:deserialize_param vt 3 at 0x7ba8c3d0 trace:ole:ITypeInfo_fnRelease (0x7bc880c0)->(6) trace:ole:ITypeLib2_fnRelease (0x7bc39748)->(8) ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

2 2

Re: hhctrl: Add the WebBrowser implementation [take 5]
by Alexandre Julliard 25 Jul '05

25 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > +typedef struct IOleInPlaceFrameImpl > +{ > + IOleInPlaceFrame frame; > + HWND window; > +} IOleInPlaceFrameImpl; > + > +typedef struct IOleInPlaceSiteImpl > +{ > + IOleInPlaceSite inplace; > + IOleInPlaceFrameImpl frame; > +} IOleInPlaceSiteImpl; > + > +typedef struct IOleClientSiteImpl > +{ > + IOleClientSite client; > + IOleInPlaceSiteImpl inplace; > + IDocHostUIHandler ui; > +} IOleClientSiteImpl; You should define a single structure with multiple vtbl pointers, and compute the This pointer based on structure offsets. Look at how this is done in other places, like shelllink.c for instance. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hhctrl: Add the remaining commands to HtmlHelp
by Alexandre Julliard 25 Jul '05

25 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > Hey, > > Changelog > * Add the remaining commands to HtmlHelp. That switch is not supposed to list all the commands, it's here to only display the message box on calls caused by direct user action, to avoid spamming the user with message boxes. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: theming "framework"
by Frank Richter 25 Jul '05

25 Jul '05

On 16.07.2005 01:13, Frank Richter wrote: > Frank Richter <frank.richter(a)gmail.com> > Added some generic code to allow subclassing(for the purpose of theming) > of standard controls. What are the issues with this one? -f.r.

2 1

Re: hhctrl: Add the CHM implemenation
by Dmitry Timoshkov 25 Jul '05

25 Jul '05

"James Hawkins" <truiken(a)gmail.com> wrote: > --- /dev/null 2005-07-23 07:02:07.637731864 -0500 > +++ dlls/hhctrl.ocx/itss.h 2005-07-25 01:09:16.000000000 -0500 > @@ -0,0 +1,302 @@ > +/*** Autogenerated by WIDL 0.1 from itss.idl - Do not edit ***/ Probably we need to move itss.idl to include/ so that a generated itss.h could be accessed globally. > + hr = pStorage->lpVtbl->OpenStream(pStorage, stringsW, NULL, STGM_READ, 0, &pStream); Please use IStorage_OpenStream macro here and similar macros instead of accessing vtable directly. -- Dmitry.

2 2

Writing tests when creating patches
by Paul Vriens 24 Jul '05

24 Jul '05

Hi, I've noticed that in the past weeks there were several patches that contained a remark like: - checked on on windows - compared with native - ... Wouldn't it be nice if tests accompanied these fixes? Do we have some guidelines in this? I know that writing tests is not everybody's hobby. Cheers, Paul.

2 1

Wine causing strange messages in Linux dmesg log
by Chris Rankin 24 Jul '05

24 Jul '05

Hi, Ever since (approx) when the winecfg tool became active, a Windows tool that examined IDE capabilities has stopped working. Instead, the following messages are being written into the dmesg log: hdc: write_intr: wrong transfer direction! hdd: write_intr: wrong transfer direction! hdc is a DVD-ROM drive, whereas hdd is a CD-RW drive, and the tool (DiscInfo.exe v1.5.5) tries to use SPTI. However, the tool identified both as hard disks. Does anyone have any ideas what's broken, please? Cheers, Chris ___________________________________________________________ How much free photo storage do you get? Store your holiday snaps for FREE with Yahoo! Photos http://uk.photos.yahoo.com

1 0

QuickTime Problems
by Andrew Neil Ramage 24 Jul '05

24 Jul '05

I installed the latest RPM release for SuSE 9.3 on my new laptop. Having installed Quick Time, I tried to view some .mov files (trailers) Anyone know what is wrong ? The output to the command window I started wine from is below. andrew@apollo:~/.wine/drive_c/Program Files/QuickTime> wine QuickTimePlayer.exe Sample.mov fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x403bf200)->(00000000,00000008) fixme:font:CreateScalableFontResourceA (0,"c:\\windows\\QTFont.for","c:\\windows\\QTFont.qfn",(null)): stub fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented fixme:system:SystemParametersInfoW Unimplemented action: 4122 (SPI_GETCURSORSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4132 (SPI_GETDROPSHADOW) fixme:system:SystemParametersInfoW Unimplemented action: 4116 (SPI_GETSELECTIONFADE) fixme:menu:TrackPopupMenuEx not fully implemented X Error of failed request: BadDrawable (invalid Pixmap or Window parameter) Major opcode of failed request: 67 (X_PolyRectangle) Resource id in failed request: 0x4200007 Serial number of failed request: 13172 Current serial number in output stream: 13199 andrew@apollo:~/.wine/drive_c/Program Files/QuickTime> -- Andrew You can be the captain I will draw the chart Sailing into destiny Closer to the heart Closer to the Heart by Rush (A Farewell to Kings, 1977) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

Re: Treat LDAP as X for macro detection in winapi_check
by Alexandre Julliard 24 Jul '05

24 Jul '05

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > Since we don't use HAVE_LDAP_H, it's an exception as well. There's no reason not to use HAVE_LDAP_H for header checks. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: opengl32: fix lots of missings-declarations warnings (reworked)
by Alexandre Julliard 24 Jul '05

24 Jul '05

Stefan Huehner <stefan(a)huehner.org> writes: > [old message] > this patch adds prototypes for the functions in opengl_norm.c which are > prefixed with 'wine_'. As this file is generated from the make_opengl > script this was also modified to emit this additional lines as it > already did for opengl_ext.c. This patch fixes 374 missing-declarations > warnings. At the cost of adding 374 useless prototypes... We really don't want to do that, it's perfectly legitimate in that case that the functions don't have a declaration, that's why the warning is not turned on by default. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Just a couple of queries.. Why are you passing the offset to GetMemory? I can't see there ever being a need for it IWineD3DVertexBufferImpl_GetMemory(foo) + offset should be fine > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs I should have added, this patch is good to go in though.... > > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: [WineD3D] prepare VBO
by Oliver Stieber 23 Jul '05

23 Jul '05

--- Raphael <fenix(a)club-internet.fr> wrote: > Hi, > > Changelog: > - add a new settings for vbo support > - use a struct to handle wined3d settings > - prepare VBO using some abstraction APIs > Hi, I've got debugged and tested VBO support with full support for vertex shaders to go in soon, but I'm trying to stabilize d3d before pushing performance features. > Regards, > Raphael > > ? wined3d.spec.def > Index: directx.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/directx.c,v > retrieving revision 1.41 > diff -u -r1.41 directx.c > --- directx.c 13 Jul 2005 19:38:40 -0000 1.41 > +++ directx.c 22 Jul 2005 19:52:14 -0000 > @@ -1455,7 +1455,7 @@ > *pCaps->MaxStreams = MAX_STREAMS; > *pCaps->MaxStreamStride = 1024; > > - if (((vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || (vs_mode == VS_SW) || > (DeviceType == D3DDEVTYPE_REF)) { > + if (((wined3d_settings.vs_mode == VS_HW) && GL_SUPPORT(ARB_VERTEX_PROGRAM)) || > (wined3d_settings.vs_mode == VS_SW) || (DeviceType == D3DDEVTYPE_REF)) { > *pCaps->VertexShaderVersion = D3DVS_VERSION(1,1); > > if (This->gl_info.gl_vendor == VENDOR_MESA || > @@ -1469,7 +1469,7 @@ > *pCaps->MaxVertexShaderConst = 0; > } > > - if ((ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType != > D3DDEVTYPE_REF)) { > + if ((wined3d_settings.ps_mode == PS_HW) && GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && (DeviceType > != D3DDEVTYPE_REF)) { > *pCaps->PixelShaderVersion = D3DPS_VERSION(1,4); > *pCaps->PixelShader1xMaxValue = 1.0; > } else { > Index: drawprim.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v > retrieving revision 1.20 > diff -u -r1.20 drawprim.c > --- drawprim.c 22 Jul 2005 18:27:04 -0000 1.20 > +++ drawprim.c 22 Jul 2005 19:52:19 -0000 > @@ -365,8 +365,8 @@ > TRACE("Stream is up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > data = (BYTE *)This->stateBlock->streamSource[element->Stream]; > } else { > - TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[element->Stream])->resource.allocatedMemory; > + TRACE("Stream isn't up %d, %p\n", element->Stream, > This->stateBlock->streamSource[element->Stream]); > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0); > } > stride = This->stateBlock->streamStride[element->Stream]; > data += (BaseVertexIndex * stride); > @@ -571,12 +571,12 @@ > if (This->stateBlock->streamIsUP) { > data = (BYTE *)This->stateBlock->streamSource[nStream]; > } else { > - data = ((IWineD3DVertexBufferImpl > *)This->stateBlock->streamSource[nStream])->resource.allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > } > } else { > #if 0 /* TODO: Vertex shader support */ > thisFVF = This->stateBlock->vertexShaderDecl->fvf[nStream]; > - data = ((IDirect3DVertexBuffer8Impl > *)This->stateBlock->streamSource[nStream])->allocatedMemory; > + data = > IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0); > #endif > } > VTRACE(("FVF for stream %d is %lx\n", nStream, thisFVF)); > Index: vertexbuffer.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/vertexbuffer.c,v > retrieving revision 1.13 > diff -u -r1.13 vertexbuffer.c > --- vertexbuffer.c 13 Jul 2005 14:15:54 -0000 1.13 > +++ vertexbuffer.c 22 Jul 2005 19:52:19 -0000 > @@ -1,8 +1,8 @@ > /* > * IWineD3DVertexBuffer Implementation > * > - * Copyright 2002-2004 Jason Edmeades > - * Copyright 2003-2004 Raphael Junqueira > + * Copyright 2002-2005 Jason Edmeades > + * Raphael Junqueira > * Copyright 2004 Christian Costa > * > * This library is free software; you can redistribute it and/or > @@ -149,3 +149,13 @@ > IWineD3DVertexBufferImpl_Unlock, > IWineD3DVertexBufferImpl_GetDesc > }; > + > +BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD iOffset) { > + IWineD3DVertexBufferImpl *This = (IWineD3DVertexBufferImpl *)iface; > + > + return This->resource.allocatedMemory + iOffset; > +} > + > +HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface) { > + return D3D_OK; > +} > Index: wined3d_main.c > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_main.c,v > retrieving revision 1.11 > diff -u -r1.11 wined3d_main.c > --- wined3d_main.c 22 Jul 2005 18:26:05 -0000 1.11 > +++ wined3d_main.c 22 Jul 2005 19:52:19 -0000 > @@ -30,8 +30,14 @@ > int num_lock = 0; > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > -int vs_mode = VS_HW; /* Hardware by default */ > -int ps_mode = PS_NONE; /* Disabled by default */ > + > + > +wined3d_settings_t wined3d_settings = > +{ > + VS_HW, /* Hardware by default */ > + PS_NONE, /* Disabled by default */ > + VBO_HW /* Hardware by default */ > +}; > > WineD3DGlobalStatistics *wineD3DGlobalStatistics = NULL; > CRITICAL_SECTION resourceStoreCriticalSection; > @@ -128,12 +134,12 @@ > if (!strcmp(buffer,"none")) > { > TRACE("Disable vertex shaders\n"); > - vs_mode = VS_NONE; > + wined3d_settings.vs_mode = VS_NONE; > } > else if (!strcmp(buffer,"emulation")) > { > TRACE("Force SW vertex shaders\n"); > - vs_mode = VS_SW; > + wined3d_settings.vs_mode = VS_SW; > } > } > if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) > @@ -141,14 +147,34 @@ > if (!strcmp(buffer,"enabled")) > { > TRACE("Allow pixel shaders\n"); > - ps_mode = PS_HW; > + wined3d_settings.ps_mode = PS_HW; > + } > + if (!strcmp(buffer,"disabled")) > + { > + TRACE("Disable pixel shaders\n"); > + wined3d_settings.ps_mode = PS_NONE; > + } > + } > + if ( !get_config_key( hkey, appkey, "VertexBufferMode", buffer, size) ) > + { > + if (!strcmp(buffer,"none")) > + { > + TRACE("Disable Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_NONE; > + } > + else if (!strcmp(buffer,"hardware")) > + { > + TRACE("Allow Vertex Buffer Hardware support\n"); > + wined3d_settings.vbo_mode = VS_HW; > } > } > } > - if (vs_mode == VS_HW) > + if (wined3d_settings.vs_mode == VS_HW) > TRACE("Allow HW vertex shaders\n"); > - if (ps_mode == PS_NONE) > + if (wined3d_settings.ps_mode == PS_NONE) > TRACE("Disable pixel shaders\n"); > + if (wined3d_settings.vbo_mode == VBO_NONE) > + TRACE("Disable Vertex Buffer Hardware support\n"); > > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > Index: wined3d_private.h > =================================================================== > RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v > retrieving revision 1.42 > diff -u -r1.42 wined3d_private.h > --- wined3d_private.h 22 Jul 2005 09:06:03 -0000 1.42 > +++ wined3d_private.h 22 Jul 2005 19:52:20 -0000 > @@ -69,16 +69,28 @@ > extern const DWORD SavedVertexStates_T[NUM_SAVEDVERTEXSTATES_T]; > extern const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S]; > > -/* vertex and pixel shader modes */ > -extern int vs_mode; > +/** > + * Settings > + */ > #define VS_NONE 0 > #define VS_HW 1 > #define VS_SW 2 > > -extern int ps_mode; > #define PS_NONE 0 > #define PS_HW 1 > > +#define VBO_NONE 0 > +#define VBO_HW 1 > + > +typedef struct wined3d_settings_s { > +/* vertex and pixel shader modes */ > + int vs_mode; > + int ps_mode; > + int vbo_mode; > +} wined3d_settings_t; > + > +extern wined3d_settings_t wined3d_settings; > + > /* X11 locking */ > > extern void (*wine_tsx11_lock_ptr)(void); > @@ -979,6 +991,9 @@ > extern void WINAPI IWineD3DBaseTextureImpl_GenerateMipSubLevels(IWineD3DBaseTexture > *iface); > extern BOOL WINAPI IWineD3DBaseTextureImpl_SetDirty(IWineD3DBaseTexture *iface, BOOL); > extern BOOL WINAPI IWineD3DBaseTextureImpl_GetDirty(IWineD3DBaseTexture *iface); > + > + extern BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWORD > iOffset); > + extern HRESULT WINAPI IWineD3DVertexBufferImpl_ReleaseMemory(IWineD3DVertexBuffer* iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_BindTexture(IWineD3DBaseTexture *iface); > extern HRESULT WINAPI IWineD3DBaseTextureImpl_UnBindTexture(IWineD3DBaseTexture *iface); > /*** class static members ***/ > ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

1 0

Re: glu32: fix some of -Wmissing-declarations warinings
by Vincent Béron 23 Jul '05

23 Jul '05

Le sam 23/07/2005 à 12:06, Stefan Huehner a écrit : [snip] 2 small nits: > --- /dev/null 2005-03-29 14:09:30.000000000 +0200 > +++ dlls/glu32/glu_local.h 2005-07-23 16:55:03.000000000 +0200 > @@ -0,0 +1,104 @@ > +/* A line indicating what this file is for, along with a copyright assignment, would be good. > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. [snip] How about a double include protection? (I know there's only one .c file in which it is included and that it's not likely to change, but I still recommend using one.) Vincent

1 0

Re: Move 16bit header to include/wine
by Francois Gouget 23 Jul '05

23 Jul '05

On Fri, 22 Jul 2005, Vincent Béron wrote: > Similar to previous one, only this time it's a whole file. I don't know > if current PSDK still carry it, in which case maybe we want to keep it > where it is? It's still present in the main directory of the XP-SP2 PSDK. So I think it should remain where it is. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ In theory, theory and practice are the same, but in practice they're different.

1 0

Thought you all should know....
by Dustin Navea 23 Jul '05

23 Jul '05

To the PC reporters and journalists that this email gets sent to, this should probably be sent to people on your lists, pending further research on your part. I got this from the EFF (for those that dont know, thats the Electronic Frontires Foundation, the guys that monitor your privacy), and for those that dont care, just delete this.. I just figured you all should know.. ---Contents of the message below--- * Is Your Printer Spying On You? Help EFF Watch the Watchers Imagine that every time you printed a document, it automatically included a secret code that could be used to identify the printer - and potentially, the person who used it. Sounds like something from an episode of "Alias," right? Unfortunately, the scenario isn't fictional. In an effort to identify counterfeiters, the US government has succeeded in persuading some color laser printer manufacturers to encode each page with identifying information. That means that without your knowledge or consent, an act you assume is private could become public. A communication tool you're using in everyday life could become a tool for government surveillance. And what's worse, there are no laws to prevent abuse. The ACLU recently issued a report revealing that the FBI has amassed more than 1,100 pages of documents on the organization since 2001, as well as documents concerning other non-violent groups, including Greenpeace and United for Peace and Justice. In the current political climate, it's not hard to imagine the government using the ability to determine who may have printed what document for purposes other than identifying counterfeiters. Yet there are no laws to stop the Secret Service - or for that matter, any other governmental agency or private company - from using printer codes to secretly trace the origin of non-currency documents. We're unaware of any printer manufacturer that has a privacy policy that would protect you, and no law regulates what people can do with the information once it's turned over. And that doesn't even reach the issue of how such a privacy-invasive tool could be developed and implemented in printers without the public becoming aware of it in the first place. With nothing on the books, we lack tools to stop the privacy and anonymity violations this technology enables. For this reason, EFF is gathering information about what printers are revealing and how - a necessary precursor to any legal challenge or new legislation to protect your privacy. And we could use your help. In the preliminary research paper linked below, we explain what we've observed so far, briefly explore the privacy implications, and ask you to print and send us test sheets from your color laser printer and/or a color laser printer at your local print shop. That way, we can watch the watchers and ensure that your privacy isn't compromised in ways that harm your fundamental constitutional rights. In addition to documenting what printers are revealing, EFF is filing a Freedom of Information Act (FOIA) request, and we will keep you updated on what we discover. In the meantime, we urge you to participate in this research project and pass the word along. Thank you for your support! EFF paper: "Investigating Machine Identification Code Technology in Color Laser Printers": <http://www.eff.org/Privacy/printers/wp.php> Directions for printing test sheets: <http://www.eff.org/Privacy/printers/wp.php#testsheets> PC World: "Government Uses Color Laser Printer Technology to Track Documents": <http://www.pcworld.com/news/article/0,aid,118664,00.asp> ACLU: "FBI Is Keeping Documents on ACLU and Other Peaceful Groups": <http://www.aclu.org/SafeandFree/SafeandFree.cfm?ID=18784&c=206>

1 0

Re: RICHED20: EM_SETZOOM / EM_GETZOOM implementation
by Dimi Paun 22 Jul '05

22 Jul '05

From: "Phil Krylov" <phil(a)newstar.rinet.ru> > Added EM_GETZOOM and EM_SETZOOM RichEdit message handlers. > + case EM_GETZOOM: > + if (!wParam || !lParam) > + return FALSE; > + *(int *)wParam = editor->nZoomNumerator; > + *(int *)lParam = editor->nZoomDenominator; > + return TRUE; I don't know what Windows does, but it may also do: + case EM_GETZOOM: + if (wParam) *(int *)wParam = editor->nZoomNumerator; + if (lParam) *(int *)lParam = editor->nZoomDenominator; + return TRUE; Have you checked? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 1

Re: Fix the ldap_search_sA/W prototypes
by Hans Leidekker 22 Jul '05

22 Jul '05

On Friday 22 July 2005 19:34, Francois Gouget wrote: @ cdecl ldap_search_s(ptr str long str ptr long) ldap_search_sA -@ cdecl ldap_search_sA(ptr str long str ptr long) -@ cdecl ldap_search_sW(ptr wstr long wstr ptr long) +@ cdecl ldap_search_sA(ptr str long str ptr long ptr) +@ cdecl ldap_search_sW(ptr wstr long wstr ptr long ptr) ldap_search_s also needs the extra argument. -Hans

1 0

Re: [wined3d] drawprint tidyup initilization of strided data.
by Dimi Paun 22 Jul '05

22 Jul '05

> +#define SET_STRIDED (_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ > +break; > + > +#define SET_STRIDED_(_usage, _name) \ > +case _usage: \ > +strided->u.s._name.lpData = data; \ > +strided->u.s._name.dwType = element->Type; \ > +strided->u.s._name.dwStride = stride; \ This is pretty ugly: the resulting code doesn't look like C. In fact, it looks rather magical.For example, why pass in _usage as a param to the macro, just to get rid of the case _usage: which you actually want outside the macro for readability. Also, accessing the magic strided, data, element, stride directly is very weird, and problematic. The casual user wouldn't know what hit him :) I say let it be as is. If you really want the macro, something like this would be better: +#define SET_STRIDED_(_strided, _name, _data, _element, _stride) \ +_strided->u.s._name.lpData = _data; \ +_strided->u.s._name.dwType = _element->Type; \ +_strided->u.s._name.dwStride = _stride; -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 4

Re: [HHCTRL #2] Add the WebBrowser implementation [RESEND]
by Alexandre Julliard 22 Jul '05

22 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > Hey, > > Is there anything wrong with this? > > Changelog > * Add the WebBrowser implementation. Yes, it doesn't build because of some missing header (hhctrl.h IIRC). Also, splitting patches is good, but don't overdo it, if you have a C file and its associated header it makes no sense to send them as two separate patches, each one is useless without the other. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Move mcicda to the top-level dlls directory
by Eric Pouech 22 Jul '05

22 Jul '05

check out the http://wiki.winehq.org/FlattenDllDirectories page on Wine wiki, you'll get all the correct names (in some cases, windows changed from 16 bit drivers to 32 bit drivers) btw, our default settings should also be changed accordingly A+ ----- Original Message ----- From: Rémi Assailly To: wine-patches(a)winehq.org Sent: Friday, July 22, 2005 3:43 PM Subject: Move mcicda to the top-level dlls directory Hi all I saw that WinXP kept mciseq.drv, mciwave.drv and mciavi.drv. Should we do the same thing or just keep the dlls files ? Changelog: Moved mcicda to the top-level dlls directory. ------------------------------------------------------------------------------ diff -Nru wine/configure winedev/configure --- wine/configure 2005-07-21 20:36:42.000000000 +0200 +++ winedev/configure 2005-07-22 14:45:10.000000000 +0200 @@ -20203,7 +20203,7 @@ MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/hhctrl.ocx/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mcicda/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msacm/tests/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/rasapi32/Makefile dlls/riched20/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/secur32/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wldap32/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile dlls/x11drv/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/hh/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -20816,6 +20816,7 @@ "dlls/lzexpand/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/lzexpand/tests/Makefile" ;; "dlls/mapi32/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/Makefile" ;; "dlls/mapi32/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mapi32/tests/Makefile" ;; + "dlls/mcicda/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mcicda/Makefile" ;; "dlls/midimap/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/midimap/Makefile" ;; "dlls/mlang/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mlang/Makefile" ;; "dlls/mlang/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/mlang/tests/Makefile" ;; @@ -20926,7 +20927,6 @@ "dlls/winmm/joystick/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/joystick/Makefile" ;; "dlls/winmm/mcianim/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mcianim/Makefile" ;; "dlls/winmm/mciavi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciavi/Makefile" ;; - "dlls/winmm/mcicda/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mcicda/Makefile" ;; "dlls/winmm/mciseq/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciseq/Makefile" ;; "dlls/winmm/mciwave/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/mciwave/Makefile" ;; "dlls/winmm/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; diff -Nru wine/configure.ac winedev/configure.ac --- wine/configure.ac 2005-07-21 20:36:42.000000000 +0200 +++ winedev/configure.ac 2005-07-22 14:44:01.000000000 +0200 @@ -1612,6 +1612,7 @@ dlls/lzexpand/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile +dlls/mcicda/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile @@ -1722,7 +1723,6 @@ dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile -dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/tests/Makefile diff -Nru wine/dlls/Makefile.in winedev/dlls/Makefile.in --- wine/dlls/Makefile.in 2005-07-21 20:36:42.000000000 +0200 +++ winedev/dlls/Makefile.in 2005-07-22 14:43:11.000000000 +0200 @@ -70,6 +70,7 @@ kernel \ lzexpand \ mapi32 \ + mcicda \ midimap \ mlang \ mmdevldr.vxd \ @@ -154,7 +155,6 @@ winmm/joystick \ winmm/mcianim \ winmm/mciavi \ - winmm/mcicda \ winmm/mciseq \ winmm/mciwave \ winmm/wavemap \ @@ -316,7 +316,7 @@ mapi32.dll.so \ mcianim.drv.so \ mciavi.drv.so \ - mcicda.drv.so \ + mcicda.dll.so \ mciseq.drv.so \ mciwave.drv.so \ midimap.dll.so \ @@ -647,8 +647,8 @@ mciavi.drv.so: winmm/mciavi/mciavi.drv.so $(RM) $@ && $(LN_S) winmm/mciavi/mciavi.drv.so $@ -mcicda.drv.so: winmm/mcicda/mcicda.drv.so - $(RM) $@ && $(LN_S) winmm/mcicda/mcicda.drv.so $@ +mcicda.dll.so: winmm/mcicda/mcicda.dll.so + $(RM) $@ && $(LN_S) winmm/mcicda/mcicda.dll.so $@ mciseq.drv.so: winmm/mciseq/mciseq.drv.so $(RM) $@ && $(LN_S) winmm/mciseq/mciseq.drv.so $@ @@ -1717,7 +1717,7 @@ mapi32/mapi32.dll.so: mapi32 winmm/mcianim/mcianim.drv.so: winmm/mcianim winmm/mciavi/mciavi.drv.so: winmm/mciavi -winmm/mcicda/mcicda.drv.so: winmm/mcicda +mcicda/mcicda.dll.so: mcicda winmm/mciseq/mciseq.drv.so: winmm/mciseq winmm/mciwave/mciwave.drv.so: winmm/mciwave midimap/midimap.dll.so: midimap diff -Nru wine/dlls/mcicda/.cvsignore winedev/dlls/mcicda/.cvsignore --- wine/dlls/mcicda/.cvsignore 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/.cvsignore 2005-07-22 14:41:22.000000000 +0200 @@ -0,0 +1,2 @@ +Makefile +mcicda.dll.dbg.c diff -Nru wine/dlls/mcicda/Makefile.in winedev/dlls/mcicda/Makefile.in --- wine/dlls/mcicda/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/Makefile.in 2005-07-22 14:41:07.000000000 +0200 @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = mcicda.dll +IMPORTS = winmm user32 kernel32 +EXTRALIBS = $(LIBUNICODE) + +C_SRCS = \ + mcicda.c + +@MAKE_DLL_RULES@ + +### Dependencies: diff -Nru wine/dlls/mcicda/mcicda.c winedev/dlls/mcicda/mcicda.c --- wine/dlls/mcicda/mcicda.c 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/mcicda.c 2005-02-09 23:26:26.000000000 +0100 @@ -0,0 +1,1053 @@ +/* -*- tab-width: 8; c-basic-offset: 4 -*- */ +/* + * MCI driver for audio CD (MCICDA) + * + * Copyright 1994 Martin Ayotte + * Copyright 1998-99 Eric Pouech + * Copyright 2000 Andreas Mohr + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "ntstatus.h" +#include "wownt32.h" +#include "mmddk.h" +#include "winioctl.h" +#include "ntddstor.h" +#include "ntddcdrm.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mcicda); + +#define CDFRAMES_PERSEC 75 +#define CDFRAMES_PERMIN (CDFRAMES_PERSEC * 60) +#define FRAME_OF_ADDR(a) ((a)[1] * CDFRAMES_PERMIN + (a)[2] * CDFRAMES_PERSEC + (a)[3]) +#define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address) + +typedef struct { + UINT wDevID; + int nUseCount; /* Incremented for each shared open */ + BOOL fShareable; /* TRUE if first open was shareable */ + WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ + HANDLE hCallback; /* Callback handle for pending notification */ + DWORD dwTimeFormat; + HANDLE handle; +} WINE_MCICDAUDIO; + +/*-----------------------------------------------------------------------*/ + +/************************************************************************** + * MCICDA_drvOpen [internal] + */ +static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) +{ + WINE_MCICDAUDIO* wmcda; + + if (!modp) return 0xFFFFFFFF; + + wmcda = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCICDAUDIO)); + + if (!wmcda) + return 0; + + wmcda->wDevID = modp->wDeviceID; + mciSetDriverData(wmcda->wDevID, (DWORD)wmcda); + modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; + modp->wType = MCI_DEVTYPE_CD_AUDIO; + return modp->wDeviceID; +} + +/************************************************************************** + * MCICDA_drvClose [internal] + */ +static DWORD MCICDA_drvClose(DWORD dwDevID) +{ + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); + + if (wmcda) { + HeapFree(GetProcessHeap(), 0, wmcda); + mciSetDriverData(dwDevID, 0); + } + return (dwDevID == 0xFFFFFFFF) ? 1 : 0; +} + +/************************************************************************** + * MCICDA_GetOpenDrv [internal] + */ +static WINE_MCICDAUDIO* MCICDA_GetOpenDrv(UINT wDevID) +{ + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); + + if (wmcda == NULL || wmcda->nUseCount == 0) { + WARN("Invalid wDevID=%u\n", wDevID); + return 0; + } + return wmcda; +} + +/************************************************************************** + * MCICDA_GetStatus [internal] + */ +static DWORD MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda) +{ + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + DWORD br; + DWORD mode = MCI_MODE_NOT_READY; + + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; + } else { + switch (data.CurrentPosition.Header.AudioStatus) + { + case AUDIO_STATUS_IN_PROGRESS: mode = MCI_MODE_PLAY; break; + case AUDIO_STATUS_PAUSED: mode = MCI_MODE_PAUSE; break; + case AUDIO_STATUS_NO_STATUS: + case AUDIO_STATUS_PLAY_COMPLETE: mode = MCI_MODE_STOP; break; + case AUDIO_STATUS_PLAY_ERROR: + case AUDIO_STATUS_NOT_SUPPORTED: + default: + break; + } + } + return mode; +} + +/************************************************************************** + * MCICDA_GetError [internal] + */ +static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) +{ + switch (GetLastError()) + { + case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; + case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; + default: + FIXME("Unknown mode %lx\n", GetLastError()); + } + return MCIERR_DRIVER_INTERNAL; +} + +/************************************************************************** + * MCICDA_CalcFrame [internal] + */ +static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime) +{ + DWORD dwFrame = 0; + UINT wTrack; + CDROM_TOC toc; + DWORD br; + BYTE* addr; + + TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime); + + switch (wmcda->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + dwFrame = ((dwTime - 1) * CDFRAMES_PERSEC + 500) / 1000; + TRACE("MILLISECONDS %lu\n", dwFrame); + break; + case MCI_FORMAT_MSF: + TRACE("MSF %02u:%02u:%02u\n", + MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), MCI_MSF_FRAME(dwTime)); + dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime); + dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime); + dwFrame += MCI_MSF_FRAME(dwTime); + break; + case MCI_FORMAT_TMSF: + default: /* unknown format ! force TMSF ! ... */ + wTrack = MCI_TMSF_TRACK(dwTime); + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) + return 0; + if (wTrack < toc.FirstTrack || wTrack > toc.LastTrack) + return 0; + TRACE("MSF %02u-%02u:%02u:%02u\n", + MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime), + MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime)); + addr = toc.TrackData[wTrack - toc.FirstTrack].Address; + TRACE("TMSF trackpos[%u]=%d:%d:%d\n", + wTrack, addr[1], addr[2], addr[3]); + dwFrame = CDFRAMES_PERMIN * (addr[1] + MCI_TMSF_MINUTE(dwTime)) + + CDFRAMES_PERSEC * (addr[2] + MCI_TMSF_SECOND(dwTime)) + + addr[3] + MCI_TMSF_FRAME(dwTime); + break; + } + return dwFrame; +} + +/************************************************************************** + * MCICDA_CalcTime [internal] + */ +static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LPDWORD lpRet) +{ + DWORD dwTime = 0; + UINT wTrack; + UINT wMinutes; + UINT wSeconds; + UINT wFrames; + CDROM_TOC toc; + DWORD br; + + TRACE("(%p, %08lX, %lu);\n", wmcda, tf, dwFrame); + + switch (tf) { + case MCI_FORMAT_MILLISECONDS: + dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC + 1; + TRACE("MILLISECONDS %lu\n", dwTime); + *lpRet = 0; + break; + case MCI_FORMAT_MSF: + wMinutes = dwFrame / CDFRAMES_PERMIN; + wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; + wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; + dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); + TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n", + wMinutes, wSeconds, wFrames, dwTime); + *lpRet = MCI_COLONIZED3_RETURN; + break; + case MCI_FORMAT_TMSF: + default: /* unknown format ! force TMSF ! ... */ + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) + return 0; + if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || + dwFrame > FRAME_OF_TOC(toc, toc.LastTrack + 1)) { + ERR("Out of range value %lu [%u,%u]\n", + dwFrame, FRAME_OF_TOC(toc, toc.FirstTrack), + FRAME_OF_TOC(toc, toc.LastTrack + 1)); + *lpRet = 0; + return 0; + } + for (wTrack = toc.FirstTrack; wTrack <= toc.LastTrack; wTrack++) { + if (FRAME_OF_TOC(toc, wTrack) > dwFrame) + break; + } + wTrack--; + dwFrame -= FRAME_OF_TOC(toc, wTrack); + wMinutes = dwFrame / CDFRAMES_PERMIN; + wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; + wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; + dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames); + TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); + *lpRet = MCI_COLONIZED4_RETURN; + break; + } + return dwTime; +} + +static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms); +static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); + +/************************************************************************** + * MCICDA_Open [internal] + */ +static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) +{ + DWORD dwDeviceID; + DWORD ret = MCIERR_HARDWARE; + WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); + WCHAR root[7], drive = 0; + int count; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); + + if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + dwDeviceID = lpOpenParms->wDeviceID; + + if (wmcda->nUseCount > 0) { + /* The driver is already open on this channel */ + /* If the driver was opened shareable before and this open specifies */ + /* shareable then increment the use count */ + if (wmcda->fShareable && (dwFlags & MCI_OPEN_SHAREABLE)) + ++wmcda->nUseCount; + else + return MCIERR_MUST_USE_SHAREABLE; + } else { + wmcda->nUseCount = 1; + wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE; + } + if (dwFlags & MCI_OPEN_ELEMENT) { + if (dwFlags & MCI_OPEN_ELEMENT_ID) { + WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort\n", (DWORD)lpOpenParms->lpstrElementName); + return MCIERR_NO_ELEMENT_ALLOWED; + } + TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); + if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || + (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) + { + WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", + debugstr_w(lpOpenParms->lpstrElementName)); + ret = MCIERR_NO_ELEMENT_ALLOWED; + goto the_error; + } + drive = toupper(lpOpenParms->lpstrElementName[0]); + root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; + if (GetDriveTypeW(root) != DRIVE_CDROM) + { + ret = MCIERR_INVALID_DEVICE_NAME; + goto the_error; + } + } + else + { + /* drive letter isn't passed... get the dwDeviceID'th cdrom in the system */ + root[0] = 'A'; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; + for (count = 0; root[0] <= 'Z'; root[0]++) + { + if (GetDriveTypeW(root) == DRIVE_CDROM && ++count >= dwDeviceID) + { + drive = root[0]; + break; + } + } + if (!drive) + { + ret = MCIERR_INVALID_DEVICE_ID; + goto the_error; + } + } + + wmcda->wNotifyDeviceID = dwDeviceID; + wmcda->dwTimeFormat = MCI_FORMAT_MSF; + + /* now, open the handle */ + root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; + wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + if (wmcda->handle != INVALID_HANDLE_VALUE) + return 0; + + the_error: + --wmcda->nUseCount; + return ret; +} + +/************************************************************************** + * MCICDA_Close [internal] + */ +static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (--wmcda->nUseCount == 0) { + CloseHandle(wmcda->handle); + } + return 0; +} + +/************************************************************************** + * MCICDA_GetDevCaps [internal] + */ +static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, + LPMCI_GETDEVCAPS_PARMS lpParms) +{ + DWORD ret = 0; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + if (dwFlags & MCI_GETDEVCAPS_ITEM) { + TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); + + switch (lpParms->dwItem) { + case MCI_GETDEVCAPS_CAN_RECORD: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_HAS_AUDIO: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_HAS_VIDEO: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_DEVICE_TYPE: + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_CD_AUDIO, MCI_DEVTYPE_CD_AUDIO); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_USES_FILES: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_COMPOUND_DEVICE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_EJECT: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_PLAY: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_GETDEVCAPS_CAN_SAVE: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + ret = MCI_RESOURCE_RETURNED; + break; + default: + ERR("Unsupported %lx devCaps item\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } else { + TRACE("No GetDevCaps-Item !\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); + return ret; +} + +static DWORD CDROM_Audio_GetSerial(CDROM_TOC* toc) +{ + unsigned long serial = 0; + int i; + WORD wMagic; + DWORD dwStart, dwEnd; + + /* + * wMagic collects the wFrames from track 1 + * dwStart, dwEnd collect the beginning and end of the disc respectively, in + * frames. + * There it is collected for correcting the serial when there are less than + * 3 tracks. + */ + wMagic = toc->TrackData[0].Address[3]; + dwStart = FRAME_OF_TOC(*toc, toc->FirstTrack); + + for (i = 0; i <= toc->LastTrack - toc->FirstTrack; i++) { + serial += (toc->TrackData[i].Address[1] << 16) | + (toc->TrackData[i].Address[2] << 8) | toc->TrackData[i].Address[3]; + } + dwEnd = FRAME_OF_TOC(*toc, toc->LastTrack + 1); + + if (toc->LastTrack - toc->FirstTrack + 1 < 3) + serial += wMagic + (dwEnd - dwStart); + + return serial; +} + + +/************************************************************************** + * MCICDA_Info [internal] + */ +static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) +{ + LPCWSTR str = NULL; + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD ret = 0; + WCHAR buffer[16]; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL || lpParms->lpstrReturn == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); + + if (dwFlags & MCI_INFO_PRODUCT) { + static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; + str = wszAudioCd; + } else if (dwFlags & MCI_INFO_MEDIA_UPC) { + ret = MCIERR_NO_IDENTITY; + } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { + DWORD res = 0; + CDROM_TOC toc; + DWORD br; + static const WCHAR wszLu[] = {'%','l','u',0}; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + + res = CDROM_Audio_GetSerial(&toc); + sprintfW(buffer, wszLu, res); + str = buffer; + } else { + WARN("Don't know this info command (%lu)\n", dwFlags); + ret = MCIERR_UNRECOGNIZED_COMMAND; + } + if (str) { + if (lpParms->dwRetSize <= strlenW(str)) { + lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); + ret = MCIERR_PARAM_OVERFLOW; + } else { + strcpyW(lpParms->lpstrReturn, str); + } + } else { + *lpParms->lpstrReturn = 0; + } + TRACE("=> %s (%ld)\n", debugstr_w(lpParms->lpstrReturn), ret); + return ret; +} + +/************************************************************************** + * MCICDA_Status [internal] + */ +static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD idx; + DWORD ret = 0; + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + CDROM_TOC toc; + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + if (dwFlags & MCI_STATUS_ITEM) { + TRACE("dwItem = %lx\n", lpParms->dwItem); + switch (lpParms->dwItem) { + case MCI_STATUS_CURRENT_TRACK: + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) + { + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = data.CurrentPosition.TrackNumber; + TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn); + break; + case MCI_STATUS_LENGTH: + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (dwFlags & MCI_TRACK) { + TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + return MCIERR_OUTOFRANGE; + idx = lpParms->dwTrack - toc.FirstTrack; + lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - + FRAME_OF_TOC(toc, lpParms->dwTrack); + /* Windows returns one frame less than the total track length for the + last track on the CD. See CDDB HOWTO. Verified on Win95OSR2. */ + if (lpParms->dwTrack == toc.LastTrack) + lpParms->dwReturn--; + } else { + /* Sum of the lengths of all of the tracks. Inherits the + 'off by one frame' behavior from the length of the last track. + See above comment. */ + lpParms->dwReturn = FRAME_OF_TOC(toc, toc.LastTrack + 1) - + FRAME_OF_TOC(toc, toc.FirstTrack) - 1; + } + lpParms->dwReturn = MCICDA_CalcTime(wmcda, + (wmcda->dwTimeFormat == MCI_FORMAT_TMSF) + ? MCI_FORMAT_MSF : wmcda->dwTimeFormat, + lpParms->dwReturn, + &ret); + TRACE("LENGTH=%lu !\n", lpParms->dwReturn); + break; + case MCI_STATUS_MODE: + lpParms->dwReturn = MCICDA_GetStatus(wmcda); + TRACE("MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn); + lpParms->dwReturn = MAKEMCIRESOURCE(lpParms->dwReturn, lpParms->dwReturn); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_MEDIA_PRESENT: + lpParms->dwReturn = (MCICDA_GetStatus(wmcda) == MCI_MODE_OPEN) ? + MAKEMCIRESOURCE(FALSE, MCI_FALSE) : MAKEMCIRESOURCE(TRUE, MCI_TRUE); + TRACE("MCI_STATUS_MEDIA_PRESENT =%c!\n", LOWORD(lpParms->dwReturn) ? 'Y' : 'N'); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_NUMBER_OF_TRACKS: + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; + TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn); + if (lpParms->dwReturn == (WORD)-1) + return MCICDA_GetError(wmcda); + break; + case MCI_STATUS_POSITION: + if (dwFlags & MCI_STATUS_START) { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack); + TRACE("get MCI_STATUS_START !\n"); + } else if (dwFlags & MCI_TRACK) { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + return MCIERR_OUTOFRANGE; + lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); + TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); + } else { + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + lpParms->dwReturn = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); + } + lpParms->dwReturn = MCICDA_CalcTime(wmcda, wmcda->dwTimeFormat, lpParms->dwReturn, &ret); + TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn); + break; + case MCI_STATUS_READY: + TRACE("MCI_STATUS_READY !\n"); + switch (MCICDA_GetStatus(wmcda)) + { + case MCI_MODE_NOT_READY: + case MCI_MODE_OPEN: + lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); + break; + default: + lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); + break; + } + TRACE("MCI_STATUS_READY=%u!\n", LOWORD(lpParms->dwReturn)); + ret = MCI_RESOURCE_RETURNED; + break; + case MCI_STATUS_TIME_FORMAT: + lpParms->dwReturn = MAKEMCIRESOURCE(wmcda->dwTimeFormat, MCI_FORMAT_RETURN_BASE + wmcda->dwTimeFormat); + TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn)); + ret = MCI_RESOURCE_RETURNED; + break; + case 4001: /* FIXME: for bogus FullCD */ + case MCI_CDA_STATUS_TYPE_TRACK: + if (!(dwFlags & MCI_TRACK)) + ret = MCIERR_MISSING_PARAMETER; + else { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) + ret = MCIERR_OUTOFRANGE; + else + lpParms->dwReturn = (toc.TrackData[lpParms->dwTrack - toc.FirstTrack].Control & 0x04) ? + MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO; + } + TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%ld\n", lpParms->dwTrack, lpParms->dwReturn); + break; + default: + FIXME("unknown command %08lX !\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + } else { + WARN("not MCI_STATUS_ITEM !\n"); + } + return ret; +} + +/************************************************************************** + * MCICDA_SkipDataTracks [internal] + */ +static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame) +{ + int i; + DWORD br; + CDROM_TOC toc; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + /* Locate first track whose starting frame is bigger than frame */ + for(i=toc.FirstTrack;i<=toc.LastTrack+1;i++) + if ( FRAME_OF_TOC(toc, i) > *frame ) break; + if (i <= toc.FirstTrack && i>toc.LastTrack+1) { + i = 0; /* requested address is out of range: go back to start */ + *frame = FRAME_OF_TOC(toc,toc.FirstTrack); + } + else + i--; + /* i points to last track whose start address is not greater than frame. + * Now skip non-audio tracks */ + for(;i<=toc.LastTrack+1;i++) + if ( ! (toc.TrackData[i-toc.FirstTrack].Control & 4) ) + break; + /* The frame will be an address in the next audio track or + * address of lead-out. */ + if ( FRAME_OF_TOC(toc, i) > *frame ) + *frame = FRAME_OF_TOC(toc, i); + return 0; +} + +/************************************************************************** + * MCICDA_Play [internal] + */ +static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD ret = 0, start, end; + DWORD br; + CDROM_PLAY_AUDIO_MSF play; + CDROM_SUB_Q_DATA_FORMAT fmt; + SUB_Q_CHANNEL_DATA data; + CDROM_TOC toc; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; + + if (wmcda == NULL) + return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_FROM) { + start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) + return ret; + TRACE("MCI_FROM=%08lX -> %lu \n", lpParms->dwFrom, start); + } else { + fmt.Format = IOCTL_CDROM_CURRENT_POSITION; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), + &data, sizeof(data), &br, NULL)) { + return MCICDA_GetError(wmcda); + } + start = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) + return ret; + } + if (dwFlags & MCI_TO) { + end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); + TRACE("MCI_TO=%08lX -> %lu \n", lpParms->dwTo, end); + } else { + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + end = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; + } + TRACE("Playing from %lu to %lu\n", start, end); + play.StartingM = start / CDFRAMES_PERMIN; + play.StartingS = (start / CDFRAMES_PERSEC) % 60; + play.StartingF = start % CDFRAMES_PERSEC; + play.EndingM = end / CDFRAMES_PERMIN; + play.EndingS = (end / CDFRAMES_PERSEC) % 60; + play.EndingF = end % CDFRAMES_PERSEC; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), + NULL, 0, &br, NULL)) { + ret = MCIERR_HARDWARE; + } else if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + /* + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + */ + } + return ret; +} + +/************************************************************************** + * MCICDA_Stop [internal] + */ +static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Pause [internal] + */ +static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Resume [internal] + */ +static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (lpParms && (dwFlags & MCI_NOTIFY)) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_Seek [internal] + */ +static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) +{ + DWORD at; + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + CDROM_SEEK_AUDIO_MSF seek; + DWORD br, ret; + CDROM_TOC toc; + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, + &toc, sizeof(toc), &br, NULL)) { + WARN("error reading TOC !\n"); + return MCICDA_GetError(wmcda); + } + switch (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)) { + case MCI_SEEK_TO_START: + TRACE("Seeking to start\n"); + at = FRAME_OF_TOC(toc,toc.FirstTrack); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + case MCI_SEEK_TO_END: + TRACE("Seeking to end\n"); + at = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + case MCI_TO: + TRACE("Seeking to %lu\n", lpParms->dwTo); + at = MCICDA_CalcFrame(wmcda, lpParms->dwTo); + if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) + return ret; + break; + default: + TRACE("Unknown seek action %08lX\n", + (dwFlags & ~(MCI_NOTIFY|MCI_WAIT))); + return MCIERR_UNSUPPORTED_FUNCTION; + } + seek.M = at / CDFRAMES_PERMIN; + seek.S = (at / CDFRAMES_PERSEC) % 60; + seek.F = at % CDFRAMES_PERSEC; + if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), + NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * MCICDA_SetDoor [internal] + */ +static DWORD MCICDA_SetDoor(UINT wDevID, BOOL open) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + DWORD br; + + TRACE("(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE"); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (!DeviceIoControl(wmcda->handle, + (open) ? IOCTL_STORAGE_EJECT_MEDIA : IOCTL_STORAGE_LOAD_MEDIA, + NULL, 0, NULL, 0, &br, NULL)) + return MCIERR_HARDWARE; + + return 0; +} + +/************************************************************************** + * MCICDA_Set [internal] + */ +static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) +{ + WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); + + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); + + if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; + + if (dwFlags & MCI_SET_DOOR_OPEN) { + MCICDA_SetDoor(wDevID, TRUE); + } + if (dwFlags & MCI_SET_DOOR_CLOSED) { + MCICDA_SetDoor(wDevID, FALSE); + } + + /* only functions which require valid lpParms below this line ! */ + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + /* + TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat); + TRACE("dwAudio=%08lX\n", lpParms->dwAudio); + */ + if (dwFlags & MCI_SET_TIME_FORMAT) { + switch (lpParms->dwTimeFormat) { + case MCI_FORMAT_MILLISECONDS: + TRACE("MCI_FORMAT_MILLISECONDS !\n"); + break; + case MCI_FORMAT_MSF: + TRACE("MCI_FORMAT_MSF !\n"); + break; + case MCI_FORMAT_TMSF: + TRACE("MCI_FORMAT_TMSF !\n"); + break; + default: + WARN("bad time format !\n"); + return MCIERR_BAD_TIME_FORMAT; + } + wmcda->dwTimeFormat = lpParms->dwTimeFormat; + } + if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_NOTIFY) { + TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", + lpParms->dwCallback); + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), + wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); + } + return 0; +} + +/************************************************************************** + * DriverProc (MCICDA.@) + */ +LONG CALLBACK MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, + DWORD dwParam1, DWORD dwParam2) +{ + switch(wMsg) { + case DRV_LOAD: return 1; + case DRV_FREE: return 1; + case DRV_OPEN: return MCICDA_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); + case DRV_CLOSE: return MCICDA_drvClose(dwDevID); + case DRV_ENABLE: return 1; + case DRV_DISABLE: return 1; + case DRV_QUERYCONFIGURE: return 1; + case DRV_CONFIGURE: MessageBoxA(0, "MCI audio CD driver !", "Wine Driver", MB_OK); return 1; + case DRV_INSTALL: return DRVCNF_RESTART; + case DRV_REMOVE: return DRVCNF_RESTART; + } + + if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; + + switch (wMsg) { + case MCI_OPEN_DRIVER: return MCICDA_Open(dwDevID, dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); + case MCI_CLOSE_DRIVER: return MCICDA_Close(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_GETDEVCAPS: return MCICDA_GetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); + case MCI_INFO: return MCICDA_Info(dwDevID, dwParam1, (LPMCI_INFO_PARMSW)dwParam2); + case MCI_STATUS: return MCICDA_Status(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); + case MCI_SET: return MCICDA_Set(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2); + case MCI_PLAY: return MCICDA_Play(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2); + case MCI_STOP: return MCICDA_Stop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_PAUSE: return MCICDA_Pause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_RESUME: return MCICDA_Resume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); + case MCI_SEEK: return MCICDA_Seek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); + /* commands that should report an error as they are not supported in + * the native version */ + case MCI_SET_DOOR_CLOSED: + case MCI_SET_DOOR_OPEN: + case MCI_LOAD: + case MCI_SAVE: + case MCI_FREEZE: + case MCI_PUT: + case MCI_REALIZE: + case MCI_UNFREEZE: + case MCI_UPDATE: + case MCI_WHERE: + case MCI_STEP: + case MCI_SPIN: + case MCI_ESCAPE: + case MCI_COPY: + case MCI_CUT: + case MCI_DELETE: + case MCI_PASTE: + case MCI_WINDOW: + TRACE("Unsupported command [0x%lx]\n", wMsg); + break; + case MCI_OPEN: + case MCI_CLOSE: + ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n"); + break; + default: + TRACE("Sending msg [0x%lx] to default driver proc\n", wMsg); + return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); + } + return MCIERR_UNRECOGNIZED_COMMAND; +} + +/*-----------------------------------------------------------------------*/ diff -Nru wine/dlls/mcicda/mcicda.spec winedev/dlls/mcicda/mcicda.spec --- wine/dlls/mcicda/mcicda.spec 1970-01-01 01:00:00.000000000 +0100 +++ winedev/dlls/mcicda/mcicda.spec 2002-06-21 21:15:50.000000000 +0200 @@ -0,0 +1 @@ +@ stdcall DriverProc(long long long long long) MCICDA_DriverProc diff -Nru wine/dlls/winmm/mcicda/.cvsignore winedev/dlls/winmm/mcicda/.cvsignore --- wine/dlls/winmm/mcicda/.cvsignore 2004-03-24 04:36:45.000000000 +0100 +++ winedev/dlls/winmm/mcicda/.cvsignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Makefile -mcicda.drv.dbg.c diff -Nru wine/dlls/winmm/mcicda/Makefile.in winedev/dlls/winmm/mcicda/Makefile.in --- wine/dlls/winmm/mcicda/Makefile.in 2005-02-09 23:26:26.000000000 +0100 +++ winedev/dlls/winmm/mcicda/Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = mcicda.drv -IMPORTS = winmm user32 kernel32 -EXTRALIBS = $(LIBUNICODE) - -C_SRCS = \ - mcicda.c - -@MAKE_DLL_RULES@ - -### Dependencies: diff -Nru wine/dlls/winmm/mcicda/mcicda.c winedev/dlls/winmm/mcicda/mcicda.c --- wine/dlls/winmm/mcicda/mcicda.c 2005-02-09 23:26:26.000000000 +0100 +++ winedev/dlls/winmm/mcicda/mcicda.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1053 +0,0 @@ -/* -*- tab-width: 8; c-basic-offset: 4 -*- */ -/* - * MCI driver for audio CD (MCICDA) - * - * Copyright 1994 Martin Ayotte - * Copyright 1998-99 Eric Pouech - * Copyright 2000 Andreas Mohr - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "ntstatus.h" -#include "wownt32.h" -#include "mmddk.h" -#include "winioctl.h" -#include "ntddstor.h" -#include "ntddcdrm.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mcicda); - -#define CDFRAMES_PERSEC 75 -#define CDFRAMES_PERMIN (CDFRAMES_PERSEC * 60) -#define FRAME_OF_ADDR(a) ((a)[1] * CDFRAMES_PERMIN + (a)[2] * CDFRAMES_PERSEC + (a)[3]) -#define FRAME_OF_TOC(toc, idx) FRAME_OF_ADDR((toc).TrackData[idx - (toc).FirstTrack].Address) - -typedef struct { - UINT wDevID; - int nUseCount; /* Incremented for each shared open */ - BOOL fShareable; /* TRUE if first open was shareable */ - WORD wNotifyDeviceID; /* MCI device ID with a pending notification */ - HANDLE hCallback; /* Callback handle for pending notification */ - DWORD dwTimeFormat; - HANDLE handle; -} WINE_MCICDAUDIO; - -/*-----------------------------------------------------------------------*/ - -/************************************************************************** - * MCICDA_drvOpen [internal] - */ -static DWORD MCICDA_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) -{ - WINE_MCICDAUDIO* wmcda; - - if (!modp) return 0xFFFFFFFF; - - wmcda = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WINE_MCICDAUDIO)); - - if (!wmcda) - return 0; - - wmcda->wDevID = modp->wDeviceID; - mciSetDriverData(wmcda->wDevID, (DWORD)wmcda); - modp->wCustomCommandTable = MCI_NO_COMMAND_TABLE; - modp->wType = MCI_DEVTYPE_CD_AUDIO; - return modp->wDeviceID; -} - -/************************************************************************** - * MCICDA_drvClose [internal] - */ -static DWORD MCICDA_drvClose(DWORD dwDevID) -{ - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(dwDevID); - - if (wmcda) { - HeapFree(GetProcessHeap(), 0, wmcda); - mciSetDriverData(dwDevID, 0); - } - return (dwDevID == 0xFFFFFFFF) ? 1 : 0; -} - -/************************************************************************** - * MCICDA_GetOpenDrv [internal] - */ -static WINE_MCICDAUDIO* MCICDA_GetOpenDrv(UINT wDevID) -{ - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); - - if (wmcda == NULL || wmcda->nUseCount == 0) { - WARN("Invalid wDevID=%u\n", wDevID); - return 0; - } - return wmcda; -} - -/************************************************************************** - * MCICDA_GetStatus [internal] - */ -static DWORD MCICDA_GetStatus(WINE_MCICDAUDIO* wmcda) -{ - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - DWORD br; - DWORD mode = MCI_MODE_NOT_READY; - - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - if (GetLastError() == STATUS_NO_MEDIA_IN_DEVICE) mode = MCI_MODE_OPEN; - } else { - switch (data.CurrentPosition.Header.AudioStatus) - { - case AUDIO_STATUS_IN_PROGRESS: mode = MCI_MODE_PLAY; break; - case AUDIO_STATUS_PAUSED: mode = MCI_MODE_PAUSE; break; - case AUDIO_STATUS_NO_STATUS: - case AUDIO_STATUS_PLAY_COMPLETE: mode = MCI_MODE_STOP; break; - case AUDIO_STATUS_PLAY_ERROR: - case AUDIO_STATUS_NOT_SUPPORTED: - default: - break; - } - } - return mode; -} - -/************************************************************************** - * MCICDA_GetError [internal] - */ -static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) -{ - switch (GetLastError()) - { - case STATUS_NO_MEDIA_IN_DEVICE: return MCIERR_DEVICE_NOT_READY; - case STATUS_IO_DEVICE_ERROR: return MCIERR_HARDWARE; - default: - FIXME("Unknown mode %lx\n", GetLastError()); - } - return MCIERR_DRIVER_INTERNAL; -} - -/************************************************************************** - * MCICDA_CalcFrame [internal] - */ -static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime) -{ - DWORD dwFrame = 0; - UINT wTrack; - CDROM_TOC toc; - DWORD br; - BYTE* addr; - - TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime); - - switch (wmcda->dwTimeFormat) { - case MCI_FORMAT_MILLISECONDS: - dwFrame = ((dwTime - 1) * CDFRAMES_PERSEC + 500) / 1000; - TRACE("MILLISECONDS %lu\n", dwFrame); - break; - case MCI_FORMAT_MSF: - TRACE("MSF %02u:%02u:%02u\n", - MCI_MSF_MINUTE(dwTime), MCI_MSF_SECOND(dwTime), MCI_MSF_FRAME(dwTime)); - dwFrame += CDFRAMES_PERMIN * MCI_MSF_MINUTE(dwTime); - dwFrame += CDFRAMES_PERSEC * MCI_MSF_SECOND(dwTime); - dwFrame += MCI_MSF_FRAME(dwTime); - break; - case MCI_FORMAT_TMSF: - default: /* unknown format ! force TMSF ! ... */ - wTrack = MCI_TMSF_TRACK(dwTime); - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) - return 0; - if (wTrack < toc.FirstTrack || wTrack > toc.LastTrack) - return 0; - TRACE("MSF %02u-%02u:%02u:%02u\n", - MCI_TMSF_TRACK(dwTime), MCI_TMSF_MINUTE(dwTime), - MCI_TMSF_SECOND(dwTime), MCI_TMSF_FRAME(dwTime)); - addr = toc.TrackData[wTrack - toc.FirstTrack].Address; - TRACE("TMSF trackpos[%u]=%d:%d:%d\n", - wTrack, addr[1], addr[2], addr[3]); - dwFrame = CDFRAMES_PERMIN * (addr[1] + MCI_TMSF_MINUTE(dwTime)) + - CDFRAMES_PERSEC * (addr[2] + MCI_TMSF_SECOND(dwTime)) + - addr[3] + MCI_TMSF_FRAME(dwTime); - break; - } - return dwFrame; -} - -/************************************************************************** - * MCICDA_CalcTime [internal] - */ -static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LPDWORD lpRet) -{ - DWORD dwTime = 0; - UINT wTrack; - UINT wMinutes; - UINT wSeconds; - UINT wFrames; - CDROM_TOC toc; - DWORD br; - - TRACE("(%p, %08lX, %lu);\n", wmcda, tf, dwFrame); - - switch (tf) { - case MCI_FORMAT_MILLISECONDS: - dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC + 1; - TRACE("MILLISECONDS %lu\n", dwTime); - *lpRet = 0; - break; - case MCI_FORMAT_MSF: - wMinutes = dwFrame / CDFRAMES_PERMIN; - wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; - wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); - TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n", - wMinutes, wSeconds, wFrames, dwTime); - *lpRet = MCI_COLONIZED3_RETURN; - break; - case MCI_FORMAT_TMSF: - default: /* unknown format ! force TMSF ! ... */ - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) - return 0; - if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || - dwFrame > FRAME_OF_TOC(toc, toc.LastTrack + 1)) { - ERR("Out of range value %lu [%u,%u]\n", - dwFrame, FRAME_OF_TOC(toc, toc.FirstTrack), - FRAME_OF_TOC(toc, toc.LastTrack + 1)); - *lpRet = 0; - return 0; - } - for (wTrack = toc.FirstTrack; wTrack <= toc.LastTrack; wTrack++) { - if (FRAME_OF_TOC(toc, wTrack) > dwFrame) - break; - } - wTrack--; - dwFrame -= FRAME_OF_TOC(toc, wTrack); - wMinutes = dwFrame / CDFRAMES_PERMIN; - wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; - wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; - dwTime = MCI_MAKE_TMSF(wTrack, wMinutes, wSeconds, wFrames); - TRACE("%02u-%02u:%02u:%02u\n", wTrack, wMinutes, wSeconds, wFrames); - *lpRet = MCI_COLONIZED4_RETURN; - break; - } - return dwTime; -} - -static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms); -static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); - -/************************************************************************** - * MCICDA_Open [internal] - */ -static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenParms) -{ - DWORD dwDeviceID; - DWORD ret = MCIERR_HARDWARE; - WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); - WCHAR root[7], drive = 0; - int count; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); - - if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - dwDeviceID = lpOpenParms->wDeviceID; - - if (wmcda->nUseCount > 0) { - /* The driver is already open on this channel */ - /* If the driver was opened shareable before and this open specifies */ - /* shareable then increment the use count */ - if (wmcda->fShareable && (dwFlags & MCI_OPEN_SHAREABLE)) - ++wmcda->nUseCount; - else - return MCIERR_MUST_USE_SHAREABLE; - } else { - wmcda->nUseCount = 1; - wmcda->fShareable = dwFlags & MCI_OPEN_SHAREABLE; - } - if (dwFlags & MCI_OPEN_ELEMENT) { - if (dwFlags & MCI_OPEN_ELEMENT_ID) { - WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort\n", (DWORD)lpOpenParms->lpstrElementName); - return MCIERR_NO_ELEMENT_ALLOWED; - } - TRACE("MCI_OPEN_ELEMENT element name: %s\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (!isalpha(lpOpenParms->lpstrElementName[0]) || lpOpenParms->lpstrElementName[1] != ':' || - (lpOpenParms->lpstrElementName[2] && lpOpenParms->lpstrElementName[2] != '\\')) - { - WARN("MCI_OPEN_ELEMENT unsupported format: %s\n", - debugstr_w(lpOpenParms->lpstrElementName)); - ret = MCIERR_NO_ELEMENT_ALLOWED; - goto the_error; - } - drive = toupper(lpOpenParms->lpstrElementName[0]); - root[0] = drive; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; - if (GetDriveTypeW(root) != DRIVE_CDROM) - { - ret = MCIERR_INVALID_DEVICE_NAME; - goto the_error; - } - } - else - { - /* drive letter isn't passed... get the dwDeviceID'th cdrom in the system */ - root[0] = 'A'; root[1] = ':'; root[2] = '\\'; root[3] = '\0'; - for (count = 0; root[0] <= 'Z'; root[0]++) - { - if (GetDriveTypeW(root) == DRIVE_CDROM && ++count >= dwDeviceID) - { - drive = root[0]; - break; - } - } - if (!drive) - { - ret = MCIERR_INVALID_DEVICE_ID; - goto the_error; - } - } - - wmcda->wNotifyDeviceID = dwDeviceID; - wmcda->dwTimeFormat = MCI_FORMAT_MSF; - - /* now, open the handle */ - root[0] = root[1] = '\\'; root[2] = '.'; root[3] = '\\'; root[4] = drive; root[5] = ':'; root[6] = '\0'; - wmcda->handle = CreateFileW(root, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); - if (wmcda->handle != INVALID_HANDLE_VALUE) - return 0; - - the_error: - --wmcda->nUseCount; - return ret; -} - -/************************************************************************** - * MCICDA_Close [internal] - */ -static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (--wmcda->nUseCount == 0) { - CloseHandle(wmcda->handle); - } - return 0; -} - -/************************************************************************** - * MCICDA_GetDevCaps [internal] - */ -static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, - LPMCI_GETDEVCAPS_PARMS lpParms) -{ - DWORD ret = 0; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - - if (dwFlags & MCI_GETDEVCAPS_ITEM) { - TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); - - switch (lpParms->dwItem) { - case MCI_GETDEVCAPS_CAN_RECORD: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_AUDIO: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_HAS_VIDEO: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_DEVICE_TYPE: - lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_CD_AUDIO, MCI_DEVTYPE_CD_AUDIO); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_USES_FILES: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_COMPOUND_DEVICE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_EJECT: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_PLAY: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_GETDEVCAPS_CAN_SAVE: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - ret = MCI_RESOURCE_RETURNED; - break; - default: - ERR("Unsupported %lx devCaps item\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - TRACE("No GetDevCaps-Item !\n"); - return MCIERR_UNRECOGNIZED_COMMAND; - } - TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); - return ret; -} - -static DWORD CDROM_Audio_GetSerial(CDROM_TOC* toc) -{ - unsigned long serial = 0; - int i; - WORD wMagic; - DWORD dwStart, dwEnd; - - /* - * wMagic collects the wFrames from track 1 - * dwStart, dwEnd collect the beginning and end of the disc respectively, in - * frames. - * There it is collected for correcting the serial when there are less than - * 3 tracks. - */ - wMagic = toc->TrackData[0].Address[3]; - dwStart = FRAME_OF_TOC(*toc, toc->FirstTrack); - - for (i = 0; i <= toc->LastTrack - toc->FirstTrack; i++) { - serial += (toc->TrackData[i].Address[1] << 16) | - (toc->TrackData[i].Address[2] << 8) | toc->TrackData[i].Address[3]; - } - dwEnd = FRAME_OF_TOC(*toc, toc->LastTrack + 1); - - if (toc->LastTrack - toc->FirstTrack + 1 < 3) - serial += wMagic + (dwEnd - dwStart); - - return serial; -} - - -/************************************************************************** - * MCICDA_Info [internal] - */ -static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) -{ - LPCWSTR str = NULL; - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD ret = 0; - WCHAR buffer[16]; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL || lpParms->lpstrReturn == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); - - if (dwFlags & MCI_INFO_PRODUCT) { - static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; - str = wszAudioCd; - } else if (dwFlags & MCI_INFO_MEDIA_UPC) { - ret = MCIERR_NO_IDENTITY; - } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { - DWORD res = 0; - CDROM_TOC toc; - DWORD br; - static const WCHAR wszLu[] = {'%','l','u',0}; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - - res = CDROM_Audio_GetSerial(&toc); - sprintfW(buffer, wszLu, res); - str = buffer; - } else { - WARN("Don't know this info command (%lu)\n", dwFlags); - ret = MCIERR_UNRECOGNIZED_COMMAND; - } - if (str) { - if (lpParms->dwRetSize <= strlenW(str)) { - lstrcpynW(lpParms->lpstrReturn, str, lpParms->dwRetSize - 1); - ret = MCIERR_PARAM_OVERFLOW; - } else { - strcpyW(lpParms->lpstrReturn, str); - } - } else { - *lpParms->lpstrReturn = 0; - } - TRACE("=> %s (%ld)\n", debugstr_w(lpParms->lpstrReturn), ret); - return ret; -} - -/************************************************************************** - * MCICDA_Status [internal] - */ -static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD idx; - DWORD ret = 0; - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - CDROM_TOC toc; - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - if (dwFlags & MCI_STATUS_ITEM) { - TRACE("dwItem = %lx\n", lpParms->dwItem); - switch (lpParms->dwItem) { - case MCI_STATUS_CURRENT_TRACK: - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) - { - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = data.CurrentPosition.TrackNumber; - TRACE("CURRENT_TRACK=%lu!\n", lpParms->dwReturn); - break; - case MCI_STATUS_LENGTH: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (dwFlags & MCI_TRACK) { - TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - return MCIERR_OUTOFRANGE; - idx = lpParms->dwTrack - toc.FirstTrack; - lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - - FRAME_OF_TOC(toc, lpParms->dwTrack); - /* Windows returns one frame less than the total track length for the - last track on the CD. See CDDB HOWTO. Verified on Win95OSR2. */ - if (lpParms->dwTrack == toc.LastTrack) - lpParms->dwReturn--; - } else { - /* Sum of the lengths of all of the tracks. Inherits the - 'off by one frame' behavior from the length of the last track. - See above comment. */ - lpParms->dwReturn = FRAME_OF_TOC(toc, toc.LastTrack + 1) - - FRAME_OF_TOC(toc, toc.FirstTrack) - 1; - } - lpParms->dwReturn = MCICDA_CalcTime(wmcda, - (wmcda->dwTimeFormat == MCI_FORMAT_TMSF) - ? MCI_FORMAT_MSF : wmcda->dwTimeFormat, - lpParms->dwReturn, - &ret); - TRACE("LENGTH=%lu !\n", lpParms->dwReturn); - break; - case MCI_STATUS_MODE: - lpParms->dwReturn = MCICDA_GetStatus(wmcda); - TRACE("MCI_STATUS_MODE=%08lX !\n", lpParms->dwReturn); - lpParms->dwReturn = MAKEMCIRESOURCE(lpParms->dwReturn, lpParms->dwReturn); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_MEDIA_PRESENT: - lpParms->dwReturn = (MCICDA_GetStatus(wmcda) == MCI_MODE_OPEN) ? - MAKEMCIRESOURCE(FALSE, MCI_FALSE) : MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_STATUS_MEDIA_PRESENT =%c!\n", LOWORD(lpParms->dwReturn) ? 'Y' : 'N'); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_NUMBER_OF_TRACKS: - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu !\n", lpParms->dwReturn); - if (lpParms->dwReturn == (WORD)-1) - return MCICDA_GetError(wmcda); - break; - case MCI_STATUS_POSITION: - if (dwFlags & MCI_STATUS_START) { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = FRAME_OF_TOC(toc, toc.FirstTrack); - TRACE("get MCI_STATUS_START !\n"); - } else if (dwFlags & MCI_TRACK) { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - return MCIERR_OUTOFRANGE; - lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); - TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); - } else { - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - lpParms->dwReturn = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); - } - lpParms->dwReturn = MCICDA_CalcTime(wmcda, wmcda->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("MCI_STATUS_POSITION=%08lX !\n", lpParms->dwReturn); - break; - case MCI_STATUS_READY: - TRACE("MCI_STATUS_READY !\n"); - switch (MCICDA_GetStatus(wmcda)) - { - case MCI_MODE_NOT_READY: - case MCI_MODE_OPEN: - lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - break; - default: - lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - break; - } - TRACE("MCI_STATUS_READY=%u!\n", LOWORD(lpParms->dwReturn)); - ret = MCI_RESOURCE_RETURNED; - break; - case MCI_STATUS_TIME_FORMAT: - lpParms->dwReturn = MAKEMCIRESOURCE(wmcda->dwTimeFormat, MCI_FORMAT_RETURN_BASE + wmcda->dwTimeFormat); - TRACE("MCI_STATUS_TIME_FORMAT=%08x!\n", LOWORD(lpParms->dwReturn)); - ret = MCI_RESOURCE_RETURNED; - break; - case 4001: /* FIXME: for bogus FullCD */ - case MCI_CDA_STATUS_TYPE_TRACK: - if (!(dwFlags & MCI_TRACK)) - ret = MCIERR_MISSING_PARAMETER; - else { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) - ret = MCIERR_OUTOFRANGE; - else - lpParms->dwReturn = (toc.TrackData[lpParms->dwTrack - toc.FirstTrack].Control & 0x04) ? - MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO; - } - TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%ld\n", lpParms->dwTrack, lpParms->dwReturn); - break; - default: - FIXME("unknown command %08lX !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; - } - } else { - WARN("not MCI_STATUS_ITEM !\n"); - } - return ret; -} - -/************************************************************************** - * MCICDA_SkipDataTracks [internal] - */ -static DWORD MCICDA_SkipDataTracks(WINE_MCICDAUDIO* wmcda,DWORD *frame) -{ - int i; - DWORD br; - CDROM_TOC toc; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - /* Locate first track whose starting frame is bigger than frame */ - for(i=toc.FirstTrack;i<=toc.LastTrack+1;i++) - if ( FRAME_OF_TOC(toc, i) > *frame ) break; - if (i <= toc.FirstTrack && i>toc.LastTrack+1) { - i = 0; /* requested address is out of range: go back to start */ - *frame = FRAME_OF_TOC(toc,toc.FirstTrack); - } - else - i--; - /* i points to last track whose start address is not greater than frame. - * Now skip non-audio tracks */ - for(;i<=toc.LastTrack+1;i++) - if ( ! (toc.TrackData[i-toc.FirstTrack].Control & 4) ) - break; - /* The frame will be an address in the next audio track or - * address of lead-out. */ - if ( FRAME_OF_TOC(toc, i) > *frame ) - *frame = FRAME_OF_TOC(toc, i); - return 0; -} - -/************************************************************************** - * MCICDA_Play [internal] - */ -static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD ret = 0, start, end; - DWORD br; - CDROM_PLAY_AUDIO_MSF play; - CDROM_SUB_Q_DATA_FORMAT fmt; - SUB_Q_CHANNEL_DATA data; - CDROM_TOC toc; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) - return MCIERR_NULL_PARAMETER_BLOCK; - - if (wmcda == NULL) - return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_FROM) { - start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) - return ret; - TRACE("MCI_FROM=%08lX -> %lu \n", lpParms->dwFrom, start); - } else { - fmt.Format = IOCTL_CDROM_CURRENT_POSITION; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), - &data, sizeof(data), &br, NULL)) { - return MCICDA_GetError(wmcda); - } - start = FRAME_OF_ADDR(data.CurrentPosition.AbsoluteAddress); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) - return ret; - } - if (dwFlags & MCI_TO) { - end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); - TRACE("MCI_TO=%08lX -> %lu \n", lpParms->dwTo, end); - } else { - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - end = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; - } - TRACE("Playing from %lu to %lu\n", start, end); - play.StartingM = start / CDFRAMES_PERMIN; - play.StartingS = (start / CDFRAMES_PERSEC) % 60; - play.StartingF = start % CDFRAMES_PERSEC; - play.EndingM = end / CDFRAMES_PERMIN; - play.EndingS = (end / CDFRAMES_PERSEC) % 60; - play.EndingF = end % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PLAY_AUDIO_MSF, &play, sizeof(play), - NULL, 0, &br, NULL)) { - ret = MCIERR_HARDWARE; - } else if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - /* - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - */ - } - return ret; -} - -/************************************************************************** - * MCICDA_Stop [internal] - */ -static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_STOP_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Pause [internal] - */ -static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_PAUSE_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Resume [internal] - */ -static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_RESUME_AUDIO, NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_Seek [internal] - */ -static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) -{ - DWORD at; - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - CDROM_SEEK_AUDIO_MSF seek; - DWORD br, ret; - CDROM_TOC toc; - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, - &toc, sizeof(toc), &br, NULL)) { - WARN("error reading TOC !\n"); - return MCICDA_GetError(wmcda); - } - switch (dwFlags & ~(MCI_NOTIFY|MCI_WAIT)) { - case MCI_SEEK_TO_START: - TRACE("Seeking to start\n"); - at = FRAME_OF_TOC(toc,toc.FirstTrack); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - case MCI_SEEK_TO_END: - TRACE("Seeking to end\n"); - at = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - case MCI_TO: - TRACE("Seeking to %lu\n", lpParms->dwTo); - at = MCICDA_CalcFrame(wmcda, lpParms->dwTo); - if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) - return ret; - break; - default: - TRACE("Unknown seek action %08lX\n", - (dwFlags & ~(MCI_NOTIFY|MCI_WAIT))); - return MCIERR_UNSUPPORTED_FUNCTION; - } - seek.M = at / CDFRAMES_PERMIN; - seek.S = (at / CDFRAMES_PERSEC) % 60; - seek.F = at % CDFRAMES_PERSEC; - if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_SEEK_AUDIO_MSF, &seek, sizeof(seek), - NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * MCICDA_SetDoor [internal] - */ -static DWORD MCICDA_SetDoor(UINT wDevID, BOOL open) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD br; - - TRACE("(%04x, %s) !\n", wDevID, (open) ? "OPEN" : "CLOSE"); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (!DeviceIoControl(wmcda->handle, - (open) ? IOCTL_STORAGE_EJECT_MEDIA : IOCTL_STORAGE_LOAD_MEDIA, - NULL, 0, NULL, 0, &br, NULL)) - return MCIERR_HARDWARE; - - return 0; -} - -/************************************************************************** - * MCICDA_Set [internal] - */ -static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) -{ - WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - - TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - - if (dwFlags & MCI_SET_DOOR_OPEN) { - MCICDA_SetDoor(wDevID, TRUE); - } - if (dwFlags & MCI_SET_DOOR_CLOSED) { - MCICDA_SetDoor(wDevID, FALSE); - } - - /* only functions which require valid lpParms below this line ! */ - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - /* - TRACE("dwTimeFormat=%08lX\n", lpParms->dwTimeFormat); - TRACE("dwAudio=%08lX\n", lpParms->dwAudio); - */ - if (dwFlags & MCI_SET_TIME_FORMAT) { - switch (lpParms->dwTimeFormat) { - case MCI_FORMAT_MILLISECONDS: - TRACE("MCI_FORMAT_MILLISECONDS !\n"); - break; - case MCI_FORMAT_MSF: - TRACE("MCI_FORMAT_MSF !\n"); - break; - case MCI_FORMAT_TMSF: - TRACE("MCI_FORMAT_TMSF !\n"); - break; - default: - WARN("bad time format !\n"); - return MCIERR_BAD_TIME_FORMAT; - } - wmcda->dwTimeFormat = lpParms->dwTimeFormat; - } - if (dwFlags & MCI_SET_VIDEO) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_ON) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_SET_OFF) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", - lpParms->dwCallback); - mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wmcda->wNotifyDeviceID, MCI_NOTIFY_SUCCESSFUL); - } - return 0; -} - -/************************************************************************** - * DriverProc (MCICDA.@) - */ -LONG CALLBACK MCICDA_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) -{ - switch(wMsg) { - case DRV_LOAD: return 1; - case DRV_FREE: return 1; - case DRV_OPEN: return MCICDA_drvOpen((LPCWSTR)dwParam1, (LPMCI_OPEN_DRIVER_PARMSW)dwParam2); - case DRV_CLOSE: return MCICDA_drvClose(dwDevID); - case DRV_ENABLE: return 1; - case DRV_DISABLE: return 1; - case DRV_QUERYCONFIGURE: return 1; - case DRV_CONFIGURE: MessageBoxA(0, "MCI audio CD driver !", "Wine Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; - } - - if (dwDevID == 0xFFFFFFFF) return MCIERR_UNSUPPORTED_FUNCTION; - - switch (wMsg) { - case MCI_OPEN_DRIVER: return MCICDA_Open(dwDevID, dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); - case MCI_CLOSE_DRIVER: return MCICDA_Close(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_GETDEVCAPS: return MCICDA_GetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); - case MCI_INFO: return MCICDA_Info(dwDevID, dwParam1, (LPMCI_INFO_PARMSW)dwParam2); - case MCI_STATUS: return MCICDA_Status(dwDevID, dwParam1, (LPMCI_STATUS_PARMS)dwParam2); - case MCI_SET: return MCICDA_Set(dwDevID, dwParam1, (LPMCI_SET_PARMS)dwParam2); - case MCI_PLAY: return MCICDA_Play(dwDevID, dwParam1, (LPMCI_PLAY_PARMS)dwParam2); - case MCI_STOP: return MCICDA_Stop(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_PAUSE: return MCICDA_Pause(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_RESUME: return MCICDA_Resume(dwDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - case MCI_SEEK: return MCICDA_Seek(dwDevID, dwParam1, (LPMCI_SEEK_PARMS)dwParam2); - /* commands that should report an error as they are not supported in - * the native version */ - case MCI_SET_DOOR_CLOSED: - case MCI_SET_DOOR_OPEN: - case MCI_LOAD: - case MCI_SAVE: - case MCI_FREEZE: - case MCI_PUT: - case MCI_REALIZE: - case MCI_UNFREEZE: - case MCI_UPDATE: - case MCI_WHERE: - case MCI_STEP: - case MCI_SPIN: - case MCI_ESCAPE: - case MCI_COPY: - case MCI_CUT: - case MCI_DELETE: - case MCI_PASTE: - case MCI_WINDOW: - TRACE("Unsupported command [0x%lx]\n", wMsg); - break; - case MCI_OPEN: - case MCI_CLOSE: - ERR("Shouldn't receive a MCI_OPEN or CLOSE message\n"); - break; - default: - TRACE("Sending msg [0x%lx] to default driver proc\n", wMsg); - return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); - } - return MCIERR_UNRECOGNIZED_COMMAND; -} - -/*-----------------------------------------------------------------------*/ diff -Nru wine/dlls/winmm/mcicda/mcicda.drv.spec winedev/dlls/winmm/mcicda/mcicda.drv.spec --- wine/dlls/winmm/mcicda/mcicda.drv.spec 2002-06-21 21:15:50.000000000 +0200 +++ winedev/dlls/winmm/mcicda/mcicda.drv.spec 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -@ stdcall DriverProc(long long long long long) MCICDA_DriverProc diff -Nru wine/tools/winapi/win32.api winedev/tools/winapi/win32.api --- wine/tools/winapi/win32.api 2005-07-21 20:36:44.000000000 +0200 +++ winedev/tools/winapi/win32.api 2005-07-22 14:47:09.000000000 +0200 @@ -1806,7 +1806,7 @@ HDRVR LONG -%%mcicda.drv +%%mcicda.dll %long diff -Nru wine/tools/wine.inf winedev/tools/wine.inf --- wine/tools/wine.inf 2005-06-29 20:29:00.000000000 +0200 +++ winedev/tools/wine.inf 2005-07-22 14:46:50.000000000 +0200 @@ -208,7 +208,7 @@ [MCI] HKLM,%Mci32Str%,"AVIVideo",,"mciavi.drv" -HKLM,%Mci32Str%,"CDAudio",,"mcicda.drv" +HKLM,%Mci32Str%,"CDAudio",,"mcicda.dll" HKLM,%Mci32Str%,"Sequencer",,"mciseq.drv" HKLM,%Mci32Str%,"WaveAudio",,"mciwave.drv" @@ -2065,7 +2065,7 @@ system.ini, mci,,"MPEGVideo=mciqtz.drv" system.ini, mci,,"MPEGVideo2=mciqtz.drv" system.ini, mci,,"avivideo=mciavi.drv" -system.ini, mci,,"cdaudio=mcicda.drv" +system.ini, mci,,"cdaudio=mcicda.dll" system.ini, mci,,"sequencer=mciseq.drv" system.ini, mci,,"vcr=mcivisca.drv" system.ini, mci,,"; videodisc=mcipionr.drv"

1 0

Re: [ntdll/tests/info.c] Skip test if needed
by Felix Nawothnig 22 Jul '05

22 Jul '05

Paul Vriens wrote: > every now and then one of the tests failed. Probably because a process is > not longer there. You could spawn a child-process in the test which would be more reliable (or you could query the current process - that's what I do in the psapi tests)... Felix

2 1

Re: PATCH: EnumProps16 do not enumerate non strings
by Alexandre Julliard 22 Jul '05

22 Jul '05

Marcus Meissner <meissner(a)suse.de> writes: > In 2001 when windows/property.c moved to dlls/user/property.c additionaly > EnumProps16 gained the ability to enumerate non-string atoms. > > This brings a 16 bit application I have here to crash in > repne scansb es:(di), so it clearly expects get only strings. > > Ciao, Marcus > > Changelog: > Do not enumerate non-strings in EnumProp16. That ability was added specifically for 16-bit apps, so I don't think it should be removed. Probably the problem is because of some Wine internal property. Can you find out which property is causing trouble? -- Alexandre Julliard julliard(a)winehq.org

2 1

winrash and ntservice
by Paul Walker 22 Jul '05

22 Jul '05

I just joined this list and noticed the nt service messages (below) I haven't investigated what winrash is, but _assuming_ that you need it as a service on NT, then the problem appears to be that it needs to display windows (or interact with the user somehow). The main problem will be that services run on their own desktop (unique to the service, not the logon, screensaver or iteractive desktops). A message box can be displayed on the interactive desktop by using the MB_SERVICE_NOTIFICATION flag with MessageBox(). To actually display some more complex UI, you need to create the window on the correct desktop. Check MSDN (msdn.microsoft.com) for details, but the following is what is probably required: 1. Call OpenInputDesktop(). 2. Call SetThreadDesktop() to allow the current thread to use that desktop. 3. Create your windows etc. Note the security risk msdn notes for SetThreadDesktop. This is because the service is probably running as a priviledged user (the LocalSystem account unless specified otherwise). It will need the elevated priviledges to attach to the desktop which will have an ACL that only allows the current logged in user). Hope that's enough to get someone working on this (sorry, I'm not volunteering :-( Robert Shearman wrote: >> >> >> Only on Win95/98/ME. > > > > I thought we'd fixed the problems with running it as a service on NT > so that it could again be run automatically? > Not as far as i know. It was recommended to mark the winrash service as "allowed to interact with desktop" or some such. It didn't help though. //Jakob

2 1

Changing DLL imports in wine
by Damjan Jovanovic 22 Jul '05

22 Jul '05

I'd like to know if there are any functions in Wine for changing the function pointer values in a DLL's (or, for that matter, an executable's) import table at the time it is loaded. ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

3 6

Buttons in window title bar
by Michael Jung 22 Jul '05

22 Jul '05

Hi, since this patch (http://www.winehq.org/hypermail/wine-cvs/2005/07/0168.html) was applied, the buttons in the window title bars are plain squares on my system. I'm wondering if I have a problem with my font setup. Do other people have this problem (You will only see it in desktop mode or in MDI applications though)? Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

5 7

Re: SETUPAPI: Fix whitespace handling in the INF parser.
by Alexandre Julliard 22 Jul '05

22 Jul '05

Matthew Davison <mjd77(a)cam.ac.uk> writes: > Without this patch, the INF parser in setupapi will strip any spaces > which are not inside quotes from an INF file. Windows will only strip > spaces at the start and end of each field/line. This is supposed to be handled by the TRAILING_SPACES state already. Do you have a test case demonstrating the problem? -- Alexandre Julliard julliard(a)winehq.org

2 4

D3DCMPFUNC fix
by Paul Walker 22 Jul '05

22 Jul '05

A tried to run Morrowind (it fails loading the outdoors). I saw a message of unsupported D3DCMPFUNC. So I looked up MSDN and it mentioned defaults, so I've added them. Not sure if they also need to be in the d3d8/ directory too? It didn't fix my problem, but it is probably still useful to have.

1 0

dlls/wined3d/drawprim.c warnings
by Gerald Pfeifer 22 Jul '05

22 Jul '05

I'm currently seeing the following, new warnings for dlls/wined3d/drawprim.c: drawprim.c: In function `primitiveConvertToStridedData': drawprim.c:540: warning: unused variable `canDoViaGLPointers' drawprim.c: At top level: drawprim.c:702: warning: `draw_vertex' defined but not used The former is fixed by the patch below (the variable not being used anywhere). The latter has been introduced by the following cleanup patch: revision 1.16 date: 2005/07/14 12:19:53; author: julliard; state: Exp; lines: +9 -9 Stefan Huehner <stefan(a)huehner.org> Fix some missing-declarations warnings. Gerald ChangeLog: Remove unused variable in primitiveConvertToStridedData(). Index: drawprim.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v retrieving revision 1.19 diff -u -3 -p -r1.19 drawprim.c --- drawprim.c 21 Jul 2005 11:01:19 -0000 1.19 +++ drawprim.c 22 Jul 2005 06:41:51 -0000 @@ -537,7 +537,6 @@ static void primitiveConvertToStridedDat short LoopThroughTo = 0; short nStream; - BOOL canDoViaGLPointers = TRUE; int numBlends; int numTextures; int textureNo;

1 0

Re: HHCTRL.OCX: fix W to A call
by Dmitry Timoshkov 21 Jul '05

21 Jul '05

"Saulius Krasuckas" <saulius2(a)ar.fi.lt> wrote: > ChangeLog: > Saulius Krasuckas <saulius.krasuckas(a)ieee.org> > Fix W to A call. I don't see much point in such a "fix". It actually fixes nothing, and removes a readability of the message. -- Dmitry.

6 6

Re: Update win32.api
by Vincent Béron 21 Jul '05

21 Jul '05

Le jeu 21/07/2005 à 12:17, Francois Gouget a écrit : [snip] > Index: dlls/secur32/secur32.c > =================================================================== > RCS file: /var/cvs/wine/dlls/secur32/secur32.c,v > retrieving revision 1.7 > diff -u -p -r1.7 secur32.c > --- dlls/secur32/secur32.c 18 Jul 2005 09:11:14 -0000 1.7 > +++ dlls/secur32/secur32.c 19 Jul 2005 13:26:26 -0000 > @@ -958,7 +958,7 @@ BOOLEAN WINAPI GetUserNameExW( > NTSTATUS WINAPI LsaCallAuthenticationPackage( > HANDLE LsaHandle, ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer, > ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength, > - NTSTATUS *ProtocolStatus) > + PNTSTATUS ProtocolStatus) This causes a compilation error, PNTSTATUS isn't defined anywhere else. Or do you have an as of yet unsent patch adding it? :) Vincent

1 0

printing problems
by josie＠mbstemps.com 21 Jul '05

21 Jul '05

Hi I've been running Delphi executables off of Wine and I just installed a default printer to my linux system. It's a miracle but I could print off of my Delphi executable on the first try. The only problem is the margins and page layout are little off. Nothing drastic, but the margins cutoff the first line and about half a character on the left margin. I was wondering if this is a postscript problem and what I could do to fix it? -Josie

1 0

wow32 forwards going into the void?
by Marcus Meissner 21 Jul '05

21 Jul '05

Hi, dlls/wow32/wow32.spec forwards into our kernel32.dll by named imports. However, the referenced functions are no longer exported by name. Also jsut replacing the function by a number does not seem to work. How to fix? Ciao, Marcus

1 0

Re: [wined3d] numblends
by Raphael 21 Jul '05

21 Jul '05

On Wednesday 20 July 2005 20:18, you wrote: > Hi, > This patch corrects a problem with the way that FVF vertex arrays > containing blends or orthographic is calcualted. > > This patch should get Axis and Allies and Kohan 2 started > Good catch :) Regards, Raphael

2 1

Re: foward declare interfaces in stdole2
by Huw D M Davies 21 Jul '05

21 Jul '05

On Thu, Jul 21, 2005 at 12:06:15PM +0530, Vijay Kiran Kamuju wrote: > This fixes the below problem, same problem i faced with msxml > interfaces and forward declarations fixed it. > > ChangeLog > ---------------- > Forward declare interfaces This isn't what we want anyway, since it changes the order of the typeinfos in the typelib. Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Run-time error '13'
by Savio Ramos 21 Jul '05

21 Jul '05

Hi, I am using wine without problems but after upgrade for release 0.0.20050628-2, this error appeared in a window after SISUPFOR.exe started: Run-time error '13' Type mismatch Any help? Thanks. -- Savio Martins Ramos - Arquiteto Rio de Janeiro ICQ 174972645 Pirataria não! Seja livre: Linux http://www.debian.org _______________________________________________________ Yahoo! Acesso Grátis - Internet rápida e grátis. Instale o discador agora! http://br.acesso.yahoo.com/

3 5

std* streams in MSVC
by Saulius Krasuckas 21 Jul '05

21 Jul '05

I am testing code: | #include <stdio.h> | | void main( void ) | { | printf( "The file handle for stdin is %p %d\n", stdin, _fileno( stdin )); | printf( "The file handle for stdout is %p %d\n", stdout, _fileno( stdout )); | printf( "The file handle for stderr is %p %d\n", stderr, _fileno( stderr )); | } I link with no libraries and get following output: | The file handle for stdin is 00424A30 0 | The file handle for stdout is 00424A50 1 | The file handle for stderr is 00424A70 2 If I link with msvcrtd.lib, then output is: | The file handle for stdin is 004150B0 270578480 | The file handle for stdout is 004150D0 270608264 | The file handle for stderr is 004150F0 0 And this I get with msvcrt.lib: | The file handle for stdin is 004150B0 2013313950 | The file handle for stdout is 004150D0 2013328746 | The file handle for stderr is 004150F0 0 Calls to freopen(), fprintf(), setvbuf() using any std* stream throws an exception in last two cases (msvcrtd.lib and msvcrt.lib). I guess pointers are left uninitialized. Anybody knows why and how to make this code work in all three cases?

1 0

Re: stdole2.tlb
by Ivan Gyurdiev 21 Jul '05

21 Jul '05

> I've not tested this with an InstallShield installer - feedback > welcome. Thank you very much - GTA will now begin installing, will get through all the InstallShield screens, and then it gets to the last one where it should begin installing, and it freezes and nothing happens. fixme:font:load_VDMX Failed to retrieve vTable fixme:font:load_VDMX Failed to retrieve vTable fixme:font:load_VDMX Failed to retrieve vTable fixme:system:SystemParametersInfoW Unimplemented action: 8202 (SPI_GETFONTSMOOTHINGTYPE) fixme:system:SystemParametersInfoW Unimplemented action: 8202 (SPI_GETFONTSMOOTHINGTYPE) fixme:system:SystemParametersInfoW Unimplemented action: 8202 (SPI_GETFONTSMOOTHINGTYPE) fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects ... (more of this) fixme:win:SetWindowTextA setting text "TITLE_CAPTIONBAR" of other process window (nil) should not use SendMessage fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:win:SetWindowTextA setting text "GTA San Andreas - InstallShield Wizard" of other process window (nil) should not use SendMessage fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff .... fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad3f8,0x7fcad3fc), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad2f8,0x7fcad2fc), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad37c,0x7fcad380), stub! fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:_copy_arg Should not use VariantChangeType here. (conversion from 0x4003 -> 0xb) 0000ffff fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad8e4,0x7fcad8e8), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad7e4,0x7fcad7e8), stub! fixme:ole:RpcChannelBuffer_GetDestCtx (0x7fcad868,0x7fcad86c), stub! ... (more of this)

1 0

Re: headers: handle sizeof(long)==8
by Raphael 21 Jul '05

21 Jul '05

On Wednesday 20 July 2005 05:00, Kevin Koltzau wrote: > Changelog > If sizeof(long)==8, define DWORD and LONG as 32bit int Hi, Why not using basetsd.h defines instead ? Regards, Raphael

2 1

Re: File dialogs *should* browse to the directory when a directory name is typed in and the "Open" button or save button is clicked
by Huw D M Davies 20 Jul '05

20 Jul '05

On Wed, Jul 20, 2005 at 04:18:55PM +1000, Troy Rollo wrote: > This patch reverses the change made by change set 17928 > <http://cvs.winehq.org/patch.py?id=17928>. Under windows if you type in the > name of a directory these dialogs do browse to that directory. As far as I > can tell 17928 does nothing other than make the Wine dialog's behaviour > diverge from native Windows behaviour. > > ChangeLog: > Reverse change set 17928 - the correct behaviour in Windows is to > browse to the directory if a directory name is typed into the edit box > of a file dialog and the confirmation button (or Enter key) is hit. Hmm, there's clearly something else going on here as I didn't just make up this behaviour. Huw. -- Huw Davies huw(a)codeweavers.com

2 1

Today's winetest build?
by Paul Millar 20 Jul '05

20 Jul '05

Hi, I've noticed that the test site (test.winehq.org/data) has no mention of today's cron-build of winetest. Having monkeyed about with the build process over the weekend (but, I thought, not that part) I'm a little worried I might have inadvertently upset the part that registers a new cron-build. Could someone check that test.winehq.org/service received a (http) hit today? Cheers, Paul.

5 6

Celebrating some hard work
by Jeremy White 20 Jul '05

20 Jul '05

Hi folks, You may have noticed Rob submitting a long string of OLE patches. That is formally the last set of 'hard work' we planned to do as part of our work on our 5.0 release. Now we just have to do the 'easy part' - stabilizing for release <g>. The big picture items included the window manager rewrite, the OLE/COM work, and the work on MSI. I'd like to take a minute to thank all the people, both inside and outside CodeWeavers, that helped to work on these projects. I think that these tasks represent a fairly signficant milestone for Wine - we seem to have enough working that Alexandre is willing to contemplate a non alpha release; that's a pretty big deal. (Another 11 years, and maybe 1.0 will actually happen :-/). At any rate, this work has been a bit hard on us, because it's largely been under the hood, unsexy work that tends to cause regressions. So from a customer perspective, the rational analysis is: "you did all that work and now my windows don't scroll right? Morons!" But one of the key benefits that the OLE/MSI work gives us, in particular, is that we can now intelligently debug issues with COM, which was always a nightmare to debug before. And, as you all probably know, many installers rely heavily on both COM and MSI to do their work. So we now believe that many, many more installers will 'just work' than before. And we further believe that those that don't work can be fixed in a much more straightforward way. Thus, I am now making good on my promise to lock Rob and Aric in a room and make installers go. We've announced a formal, CrossOver based program over on our web site. However, I wanted to let you know that we'll do the same on an informal basis, particularly for known Wine developers. I'm hoping that as a result of this work we'll soon be able to claim with a straight face: "Most things install." So, if you have an app that doesn't install, post a message to wine-devel, and let's see if we can't make some lemonade and have a party! Cheers, Jeremy

9 9

Re: WLDAP32: implement ldap_simple_bind* and ldap_unbind* functions
by Felix Nawothnig 20 Jul '05

20 Jul '05

Hans Leidekker wrote: > Although not strictly necessary, I did the ldap_unbind functions > as wrappers because I'd like the debug logging to show ldap_bind > and matching ldap_unbind calls. Does +relay not work here? Felix

1 0

Re: [HHCTRL #1] Add the WebBrowser header
by Alexandre Julliard 20 Jul '05

20 Jul '05

James Hawkins <truiken(a)gmail.com> writes: > +HRESULT STDMETHODCALLTYPE Storage_QueryInterface(IStorage *This, REFIID riid, LPVOID *ppvObj); > +ULONG STDMETHODCALLTYPE Storage_AddRef(IStorage *This); > +ULONG STDMETHODCALLTYPE Storage_Release(IStorage *This); > +HRESULT STDMETHODCALLTYPE Storage_CreateStream(IStorage *This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStream **ppstm); > +HRESULT STDMETHODCALLTYPE Storage_OpenStream(IStorage *This, const WCHAR * pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm); > +HRESULT STDMETHODCALLTYPE Storage_CreateStorage(IStorage *This, const WCHAR *pwcsName, DWORD grfMode, DWORD reserved1, DWORD reserved2, IStorage **ppstg); > +HRESULT STDMETHODCALLTYPE Storage_OpenStorage(IStorage *This, const WCHAR * pwcsName, IStorage * pstgPriority, DWORD grfMode, SNB snbExclude, DWORD reserved, IStorage **ppstg); > +HRESULT STDMETHODCALLTYPE Storage_CopyTo(IStorage *This, DWORD ciidExclude, IID const *rgiidExclude, SNB snbExclude,IStorage *pstgDest); > +HRESULT STDMETHODCALLTYPE Storage_MoveElementTo(IStorage *This, const OLECHAR *pwcsName,IStorage * pstgDest, const OLECHAR *pwcsNewName, DWORD grfFlags); > +HRESULT STDMETHODCALLTYPE Storage_Commit(IStorage *This, DWORD grfCommitFlags); > +HRESULT STDMETHODCALLTYPE Storage_Revert(IStorage *This); > +HRESULT STDMETHODCALLTYPE Storage_EnumElements(IStorage *This, DWORD reserved1, void * reserved2, DWORD reserved3, IEnumSTATSTG ** ppenum); > +HRESULT STDMETHODCALLTYPE Storage_DestroyElement(IStorage *This, const OLECHAR *pwcsName); > +HRESULT STDMETHODCALLTYPE Storage_RenameElement(IStorage *This, const WCHAR *pwcsOldName, const WCHAR *pwcsNewName); > +HRESULT STDMETHODCALLTYPE Storage_SetElementTimes(IStorage *This, const WCHAR *pwcsName, FILETIME const *pctime, FILETIME const *patime, FILETIME const *pmtime); > +HRESULT STDMETHODCALLTYPE Storage_SetClass(IStorage *This, REFCLSID clsid); > +HRESULT STDMETHODCALLTYPE Storage_SetStateBits(IStorage *This, DWORD grfStateBits, DWORD grfMask); > +HRESULT STDMETHODCALLTYPE Storage_Stat(IStorage *This, STATSTG * pstatstg, DWORD grfStatFlag); Functions that are not used in other files should be declared static, you should only export functions that really have to be used somewhere else. That will save Mike some trouble... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: difference with long datatype in 64bit gcc and msvc++
by Juan Lang 20 Jul '05

20 Jul '05

Kevin wrote: > Binary compatibility with win64 will be just about impossible as the > long datatype is used extensively throughout the headers and code > > doing -Dlong=int works in simple cases, but not as a general rule Can you give an example of a non-simple case? What about defining LONG as int in win64? --Juan ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

4 3

[AppDB] Fix app and version links in adminBugs.php
by Tony Lambregts 20 Jul '05

20 Jul '05

Change Log: Fix application and version links (Doh!) Files Changed: admin/adminBugs.php Index: admin/adminBugs.php =================================================================== RCS file: /home/wine/appdb/admin/adminBugs.php,v retrieving revision 1.1 diff -u -r1.1 adminBugs.php --- admin/adminBugs.php 20 Jul 2005 02:29:17 -0000 1.1 +++ admin/adminBugs.php 20 Jul 2005 04:08:30 -0000 @@ -145,11 +145,11 @@ echo ' <td align=center>'.$oRow->bug_status.'</td>',"\n"; echo ' <td>'.$oRow->short_desc.'</td>',"\n"; echo ' <td>',"\n"; - echo ' <a href="appview.php?appId='.$oRow->appId.'">'.$oRow->appName.'</a>',"\n"; + echo ' <a href="'.apidb_fullurl('appview.php?appId='.$oRow->appId).'">'.$oRow->appName.'</a>',"\n"; echo ' </td>',"\n"; echo ' <td>'.$oRow->appDescription.'</td>',"\n"; echo ' <td>',"\n"; - echo ' <a href="appview.php?versionId='.$oRow->versionId.'">'.$oRow->versionName.'</a>',"\n"; + echo ' <a href="'.apidb_fullurl('appview.php?versionId='.$oRow->versionId).'">'.$oRow->versionName.'</a>',"\n"; echo ' </td>',"\n"; echo ' <td align=center>[<a href="adminBugs.php?sub=delete',"\n"; echo '&buglinkId='.$oRow->linkId,"\n";

1 0

FreeBSD and wine DVD/CD read errors
by Jeffrey Zellman 20 Jul '05

20 Jul '05

Hi, I am currently running FreeBSD 5.4 and Wine 20050310. When I startup Wine with DVDShrink, I get the following output to the terminal: fixme:file:get_default_drive_device auto detection of DOS devices not supported on this platform fixme:cdrom:CDROM_GetInterfaceInfo not implemented for BSD fixme:ntdll:NtQueryVolumeInformationFile device info not properly supported on this platform Please use the registry key HKEY_CURRENT_CONFIG\Software\Fonts\LogPixels to set the screen resolution and remove the "Resolution" entry in the config file fixme:ole:CoRegisterMessageFilter stub err:x11drv:X11DRV_CreateWindow invalid window height 3339982 err:x11drv:X11DRV_CreateWindow invalid window height 3339982 err:listview:LISTVIEW_WindowProc unknown msg 1044 wp=00000000 lp=0033e5a0 fixme:ole:CoCreateInstance no classfactory created for CLSID {e436ebb2-524f-11ce-9f53-0020af0ba770}, hres is 0x80040154 err:quartz:FILTERGRAPH_create Unable to create filter mapper (80040154) fixme:ole:CoCreateInstance no instance created for interface {56a868a9-0ad4-11ce-b03a-0020af0ba770} of class {e436ebb3-524f-11ce-9f53-0020af0ba770}, hres is 0x80040154 When I try to read a DVD with DVDShrink I get an error message in DVDShrink: "DVD Shrink encountered an error and cannot continue. Failed to read file "D:\" Not Ready I also get some more output to the terminal: fixme:cdrom:DVD_ReadStructure fixme:cdrom:DVD_ReadStructure I guess my question is, has anyone had success working with wine, *BSD and DVD Shrink or any other program that uses CD/DVD devices? I've had success with wine under linux, but I am more comfortable under *BSD. thanks, Jeff

1 0

[AppDB] Use display_page_range() in admin/adminCommentView.php
by Tony Lambregts 20 Jul '05

20 Jul '05

Change Log: Use display_page_range() Files Changed: admin/adminCommentView.php Index: admin/adminCommentView.php =================================================================== RCS file: /home/wine/appdb/admin/adminCommentView.php,v retrieving revision 1.7 diff -u -r1.7 adminCommentView.php --- admin/adminCommentView.php 9 Feb 2005 23:49:21 -0000 1.7 +++ admin/adminCommentView.php 20 Jul 2005 02:16:56 -0000 @@ -10,91 +10,54 @@ apidb_header("Comments"); -function display_range($currentPage, $pageRange, $totalPages, $commentsPerPage) -{ - /* display the links to each of these pages */ - if($currentPage != 0) - { - $previousPage = $currentPage - 1; - echo "<a href='adminCommentView.php?page=$previousPage&commentsPerPage=$commentsPerPage'>Previous</a> "; - } else - echo "Previous "; - - /* display the next 10 and previous 10 pages */ - $pageRange = 10; +/* display a range of 10 pages */ +$pageRange = 10; - if($currentPage > $pageRange) - $startPage = $currentPage - $pageRange; - else - $startPage = 0; - - if($currentPage + $pageRange < $totalPages) - $endPage = $currentPage + $pageRange; - else - $endPage = $totalPages; - - /* display the desired range */ - for($x = $startPage; $x <= $endPage; $x++) - { - if($x != $currentPage) - echo "<a href='adminCommentView.php?page=$x&commentsPerPage=$commentsPerPage'>$x</a> "; - else - echo "$x "; - } - - if($currentPage < $totalPages) - { - $nextPage = $currentPage + 1; - echo "<a href='adminCommentView.php?page=$nextPage&commentsPerPage=$commentsPerPage'>Next</a> "; - } else - echo "Next "; -} - -$commentsPerPage = 10; -$currentPage = 0; +$ItemsPerPage = 10; +$currentPage = 1; +if($_REQUEST['ItemsPerPage']) + $ItemsPerPage = $_REQUEST['ItemsPerPage']; if($_REQUEST['page']) $currentPage = $_REQUEST['page']; -if($_REQUEST['commentsPerPage']) - $commentsPerPage = $_REQUEST['commentsPerPage']; +$totalPages = ceil(getNumberOfComments()/$ItemsPerPage); -$totalPages = floor(getNumberOfComments()/$commentsPerPage); +if($ItemsPerPage > 100) $ItemsPerPage = 100; -if($commentsPerPage > 100) $commentsPerPage = 100; /* display page selection links */ echo "<center>"; echo "<b>Page $currentPage of $totalPages</b><br />"; -display_range($currentPage, $pageRange, $totalPages, $commentsPerPage); +display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?ItemsPerPage=".$ItemsPerPage); echo "<br />"; echo "<br />"; /* display the option to choose how many comments per-page to display */ echo "<form method=\"get\" name=\"message\" action=\"".$_SERVER['PHP_SELF']."\">"; echo "<b>Number of comments per page:</b>"; -echo "<select name='commentsPerPage'>"; +echo "&nbsp<select name='ItemsPerPage'>"; -$commentsPerPageArray = array(10, 20, 50, 100); -foreach($commentsPerPageArray as $i => $value) +$ItemsPerPageArray = array(10, 20, 50, 100, 500); +foreach($ItemsPerPageArray as $i => $value) { - if($commentsPerPageArray[$i] == $commentsPerPage) - echo "<option value='$commentsPerPageArray[$i]' SELECTED>$commentsPerPageArray[$i]"; + if($ItemsPerPageArray[$i] == $ItemsPerPage) + echo "<option value='$ItemsPerPageArray[$i]' SELECTED>$ItemsPerPageArray[$i]"; else - echo "<option value='$commentsPerPageArray[$i]'>$commentsPerPageArray[$i]"; + echo "<option value='$ItemsPerPageArray[$i]'>$ItemsPerPageArray[$i]"; } echo "</select>"; echo "<input type=hidden name=page value=$currentPage>"; -echo "<input type=submit value='Refresh'>"; +echo "&nbsp<input type=submit value='Refresh'>"; echo "</form>"; echo "</center>"; /* query for all of the commentId's, ordering by their time in reverse order */ -$offset = $currentPage * $commentsPerPage; +$offset = (($currentPage-1) * $ItemsPerPage); $commentIds = query_appdb("SELECT commentId from appComments ORDER BY ". - "appComments.time ASC LIMIT $offset, $commentsPerPage;"); + "appComments.time ASC LIMIT $offset, $ItemsPerPage;"); while ($ob = mysql_fetch_object($commentIds)) { $qstring = "SELECT from_unixtime(unix_timestamp(time), \"%W %M %D %Y, %k:%i\") as time, ". @@ -107,8 +70,9 @@ } /* display page selection links */ + echo "<center>"; -display_range($currentPage, $pageRange, $totalPages, $commentsPerPage); +display_page_range($currentPage, $pageRange, $totalPages, $_SERVER['PHP_SELF']."?ItemsPerPage=".$ItemsPerPage); echo "</center>"; apidb_footer();

1 0

Re: [version/info.c] Don't always convert win32 to win16 structure
by Steven Edwards 19 Jul '05

19 Jul '05

Hi Paul, On Tue, 2005-07-19 at 22:34 +0200, Paul Vriens wrote: > I have to find a better way to retrieve the strings from the unicode > structure in VerQueryValueA (instead of converting the whole structure) > though. > > I do still have a small issue with a 16bit windows application. It seems > that the version is wrong here. But hey, Process Explorer on Windows > doesn't show the process at all :-). While you are working on this could you look at moving the 16bit version resouce stuff to shell32.ExtractVersionResource16W. Its undocumented but according to my tests native version.dll uses it when doing 16bit resource lookups. Thanks Steven

1 0

difference with long datatype in 64bit gcc and msvc++
by Kevin Koltzau 19 Jul '05

19 Jul '05

gcc and msvc++ have different opinions on the size of a long in 64bit code, gcc has sizeof(long)==8 while msvc++ has sizeof(long)==4 Binary compatibility with win64 will be just about impossible as the long datatype is used extensively throughout the headers and code doing -Dlong=int works in simple cases, but not as a general rule I'm at a loss as to where to go from here, suggestions are most welcome.

1 0

Installing Palm Desktop
by James Liggett 19 Jul '05

19 Jul '05

Hi Uwe, I figured out how to install Palm Desktop, perhaps this might prove useful to someone: 1. Install native Windows Installer manually. To do this, install dcom98 first. Then run instmsia.exe. The install will complain, but it will leave behind all the files you need in Windows\Installer\InstMsi0. Copy all the files in there to Windows\system, and set msi.dll and msiexec.exe to native. 2. Install Windows Script 5.6. You can download it from here: http://www.microsoft.com/downloads/details.aspx?FamilyID=0a8a18f6-249c-4a72… Keep in mind that it's the English version though. To install it, set setupapi to builtin and run the file. 3. Run Palm Desktop setup like normal, and it will install everything you need. Of course, running palm desktop is a different story (there is a crash in WinMM that stops it from running.) I'm currently working on getting Hotsync to work with my USB cradle using the visor driver, but there's some problems with that. I'll post a dump of the messages I get and see if I can make something happen. Thanks for the help :). James

7 15

Using a private itss.dll header
by James Hawkins 19 Jul '05

19 Jul '05

Hi, I need access to the definition of the IITStorage interface which is only defined in dlls/itss/itss.h. This interface is used to gain access to CHM help files. The Win32 public headers don't have this interface publicly available, so would that restrict us from moving itss.h to wine/include? Another solution would be to copy itss.h to dlls/hhctrl.ocx and use that, but that seems like a waste to me. Anyone have any ideas? -- James Hawkins

1 0

Proper way to test a specific locale
by Alex Villacís Lasso 19 Jul '05

19 Jul '05

Could somebody indicate me on the proper way to write a test for one specific locale? By this I mean, even if the user has LANG=en defined in the environment, the test should (temporarily) force the code path taken as if LANG=es_EC was defined in the environment. I am asking this because I want to write a test that demonstrates a difference between floating-point formatting in native oleaut32 versus builtin, that only shows up when a locale other than LANG=en is used, and I want this test to actually test the difference even for US/UK testers. Feel free to ask me for any clarifications. Thanks for your attention. Alex Villacís Lasso

1 0

include/msvcrt/crtdbg.h
by Saulius Krasuckas 19 Jul '05

19 Jul '05

I am trying to extend functionality of the MSVCRTD_operator_new_dbg(), so did #include "msvcrt/crtdbg.h" in the file dlls/msvcrtd/debug.c . Is that OK? I have found some differences in used parameter types of some functions, like: int <-> long int. void (*) <-> void (__cdecl *_CRT_DUMP_CLIENT) (void *, size_t) Then I see all the declared function are defined to be non-operational: | #endif /* _DEBUG */ | | #define _CrtCheckMemory() ((int)1) | #define _CrtDbgReport(...) ((int)0) | #define _CrtDoForAllClientObjects(f,c) ((void)0) | #define _CrtDumpMemoryLeaks() ((int)0) Yet then I see lots of declared functions are prefixed with __cdecl and _CRTIMP prefixes. | #ifndef _CRTIMP | #ifdef _DLL | #define _CRTIMP __declspec(dllimport) | #else /* ndef _DLL */ | #define _CRTIMP | #endif /* _DLL */ | #endif /* _CRTIMP */ Do we need to sync crtdbg.h with native one? What parts then, all mentioned? (Maybe I should direct this q exceptionally to Alexandre)

2 3

wine/dlls/mscms build failures
by Gerald Pfeifer 19 Jul '05

19 Jul '05

I started getting the following failures about two days ago: ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./mscms.spec handle.o icc.o mscms_main.o profile.o stub.o transform.o mscms.dll.dbg.o version.res -o mscms.dll.so -L../../dlls -L../../dlls/kernel32 -L../../dlls/ntdll -lkernel32 -lntdll -L../../libs/wine -lwine -L../../libs/port -lwine_port profile.o: In function `OpenColorProfileW': /test/wine/dlls/mscms/profile.c:786: undefined reference to `cmsOpenProfileFromMem' /test/wine/dlls/mscms/profile.c:835: undefined reference to `cmsOpenProfileFromMem' profile.o: In function `CloseColorProfile': /test/wine/dlls/mscms/profile.c:2246: undefined reference to `cmsCloseProfile' transform.o: In function `CreateColorTransformW': /test/wine/dlls/mscms/transform.c:72: undefined reference to `cmsCreate_sRGBProfile' /test/wine/dlls/mscms/transform.c:85: undefined reference to `cmsCreateMultiprofileTransform' /test/wine/dlls/mscms/transform.c:82: undefined reference to `cmsCreateTransform' transform.o: In function `CreateMultiProfileTransform': /test/wine/dlls/mscms/transform.c:2246: undefined reference to `cmsCreateMultiprofileTransform' transform.o: In function `DeleteColorTransform': /test/wine/dlls/mscms/transform.c:133: undefined reference to `cmsDeleteTransform' transform.o: In function `TranslateBitmapBits': /test/wine/dlls/mscms/transform.c:159: undefined reference to `cmsDoTransform' collect2: ld returned 1 exit status winegcc: /sw/gcc-3.3.4/bin/gcc failed. gmake: *** [mscms.dll.so] Error 2 The last change to transform.c was the following: revision 1.3 date: 2005/07/15 10:09:43; author: julliard; state: Exp; lines: +1 -3 Hans Leidekker <hans(a)it.vu.nl> Link directly to liblcms. Fix typo in test. This is on FreeBSD 4.10, but I expect it may be more related to the system still running XFree86 4.3? Is some configure check missing somewhere? Gerald

2 2

Altiagent systray problem
by Hans Kristian Rosbach 19 Jul '05

19 Jul '05

Altiagent from Altigen (control-panel for "real" IP-telephones) is now working mostly like I'd expect it to work, except when I minimize the window. It disappears from the taskbar and is supposed to have an icon in the systray, but the systray is empty so I cannot retrieve the window again. Also the systray is in a separate window, not attached to gnome's applet bar. Is this how it should be? I'm running: wine-cvs 20050628 FC4 w/Gnome Output messages from wine: fixme:ole:CoInitializeSecurity ((nil),-1,(nil),(nil),1,3,(nil),0,(nil)) - stub! err:ole:CoGetClassObject class {5fca6a47-ce12-45f5-89aa-c79d804e9f68} not registered err:ole:create_server class {5fca6a47-ce12-45f5-89aa-c79d804e9f68} not registered fixme:ole:CoCreateInstance no classfactory created for CLSID {5fca6a47-ce12-45f5-89aa-c79d804e9f6 8}, hres is 0x80040150 err:ole:marshal_object couldn't get IPSFactory buffer for interface {00000131-0000-0000-c000-0000 00000046} err:ole:marshal_object couldn't get IPSFactory buffer for interface {00000001-0000-0000-c000-0000 00000046} err:ole:StdMarshalImpl_MarshalInterface Failed to create ifstub, hres=0x80040155 err:ole:CoMarshalInterface Failed to marshal the interface {00000001-0000-0000-c000-000000000046} , 80040155 fixme:ole:CoRegisterClassObject CoMarshalInterface failed, 80040155! err:ole:CoGetClassObject class {a3faf082-99e5-426f-8f31-cd14a0bc3da8} not registered fixme:ole:CoCreateInstance no classfactory created for CLSID {a3faf082-99e5-426f-8f31-cd14a0bc3da 8}, hres is 0x80040154 err:ole:CoGetClassObject class {a3faf082-99e5-426f-8f31-cd14a0bc3da8} not registered fixme:ole:CoCreateInstance no classfactory created for CLSID {a3faf082-99e5-426f-8f31-cd14a0bc3da 8}, hres is 0x80040154 err:ole:CoGetClassObject class {a3faf082-99e5-426f-8f31-cd14a0bc3da8} not registered fixme:ole:CoCreateInstance no classfactory created for CLSID {a3faf082-99e5-426f-8f31-cd14a0bc3da 8}, hres is 0x80040154 More information available on request w/details on how to get them. -HK

2 2

pointer to __cdecl function
by Saulius Krasuckas 19 Jul '05

19 Jul '05

I am trying to sync w/ native crtdbg.h file, which defines: | typedef void (__cdecl *_CRT_DUMP_CLIENT) (void *, size_t); This doesn't compile with my gcc: | gcc -c -I. -I. -I../../../include -I../../../include -I../../../include/msvcrt -I./.. -D_REENTRANT -fPIC -Wall -pipe | -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o headers.o headers.c | In file included from headers.c:35: | ../../../include/msvcrt/crtdbg.h:52: parse error before '*' token Does anyone know a way to workaround this?

3 3

GetOpenFileName and typing directory names into the edit box
by Troy Rollo 19 Jul '05

19 Jul '05

About a month and a half ago the following change was committed to CVS: r20659 (orig r20659): troy | 2005-06-06 09:20:44 +1000 Huw Davies <huw(a)codeweavers.com> If a folder is selected on Open then browse into it, otherwise we should return the path in the edit box whether that be a folder or a file. Don't add extensions to a folder. One of the effects of this appears to be that when browsing for a file, you can no longer type in the name of an existing directory and be taken straight to that directory. Since Windows allows this, this seems to be somewhat less than desirable. Additionally it seems a lot of the code for FILEDLG95_OnOpen makes direct calls to the API in cases where the IShellFolder interface could provide the same information. It seems to me that the IShellFolder interfaces should be preferred in such situations because the IShellFolder object is best positioned to know how to process a path given the current context. For instance, if we are browsing the Unix heirarchy then the UNIXFS implementation of IShellFolder might want to allow the user to enter UNIX directory paths (and probably *should*, since that's the type of path we are effectively presenting to the user).

1 0

FWIW, news of SFU and wine
by Wesley Parish 19 Jul '05

19 Jul '05

I've installed MS SFU successfully. I can now use gcc under wine on Linux to compile source for Linux under wine on Linux ... ;) A bit bizarre, and a decidedly roundabout way of doing things, but what's a challenge for? I had a go at installing the x-window-system-on-MS-Windows package shown but it halted with these error messages: [wparish@localhost sfu+X]$ wine x-win612LX.exe fixme:win:SetWindowTextA cannot set text "InstallShield Wizard" of other process window (nil) fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet. fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet. fixme:shell:SHELL32_DllCanUnloadNow (void): stub [wparish@localhost sfu+X]$ So at the moment I can't run X under wine on Linux just for the fun of it and the delight of saying I can ... ;( Anyone got any ideas? Thanks Wesley Parish file:/home/wparish/wine-hdd/sfu+X/SFU35SEL_EN.exe file:/home/wparish/wine-hdd/sfu+X/x-win612LX.exe -- Clinersterton beademung, with all of love - RIP James Blish ----- Mau e ki, he aha te mea nui? You ask, what is the most important thing? Maku e ki, he tangata, he tangata, he tangata. I reply, it is people, it is people, it is people.

3 3

file locking
by Brian Vincent 18 Jul '05

18 Jul '05

I've been playing around with file locking and Wine, namely the fact that Wine doesn't have any. Is there any way around this, maybe placing the burden on a filesystem? If I wanted to share files between two different users (say with something dumb like file permissions 666), is there any way to prevent the two people from stomping on each other? -Brian

5 7

Failed to find a suitable visual
by Saulius Krasuckas 18 Jul '05

18 Jul '05

Since the patch [1] every time I run any larger app I get this in wine output: | fixme:opengl:X11DRV_setup_opengl_visual Failed to find a suitable visual Does this mean some misconfiguration on my box? How can it be described in simpler words? [1] http://cvs.winehq.org/patch.py?id=18642

4 12

Re: Implement GdiGetCharDimensions
by Alexandre Julliard 18 Jul '05

18 Jul '05

Robert Shearman <rob(a)codeweavers.com> writes: > +LONG WINAPI GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) > +{ > + SIZE sz; > + static const WCHAR alphabet[] = { > + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q', > + 'r','s','t','u','v','w','x','y','z','A','B','C','D','E','F','G','H', > + 'I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',0}; > + > + if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; > + > + if(!GetTextExtentPointW(hdc, alphabet, 52, &sz)) return 0; > + > + if (height) *height = sz.cy; > + return (sz.cx / 26 + 1) / 2; > +} Again I think you should be using tmHeight instead of sz.cy for the height. Some fonts may well have characters larger than the alphabet ones, and the current behavior is always to use tmHeight. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: WLDAP32: implement ber_* functions
by Alexandre Julliard 18 Jul '05

18 Jul '05

Hans Leidekker <hans(a)it.vu.nl> writes: > > This won't work I'm afraid, you would need a ber_vprintf. Though it > > seems to me you could link directly to the Unix lib from the spec file > > and avoid all the wrappers. > > Indeed, I can. Unlike with the ldap_* functions there are no encoding > differences to account for here. However you will still need to provide dummy functions when the library is missing, otherwise it won't link. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: WLDAP32: implement ber_* functions
by Alexandre Julliard 18 Jul '05

18 Jul '05

Hans Leidekker <hans(a)it.vu.nl> writes: > +INT WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... ) > +{ > + INT ret = LBER_ERROR; > +#ifdef HAVE_LBER_H > + va_list valist; > + > + TRACE( "(%p, %p)\n", berelement, fmt ); > + > + va_start( valist, fmt ); > + ret = ber_printf( berelement, fmt, valist ); > + va_end( valist ); This won't work I'm afraid, you would need a ber_vprintf. Though it seems to me you could link directly to the Unix lib from the spec file and avoid all the wrappers. -- Alexandre Julliard julliard(a)winehq.org

1 0

Keyboard Layout
by Altan Íz³dogru 18 Jul '05

18 Jul '05

My computer works with Linux 8.2. I have tried to install (to execute) a Windows Program on my Computer. The wine-program started and the windows sreen appeared. Suddenly the programm stopped and I got the message: Your keyboard layout was not found! Using closest match instead (German keyboard layout without dead keys) for scancode mapping. Please define your layout in windows/x11drv/keyboard.c and submit them to us for inclusion into future Wine releases. I don´t know how to define my keyboard layout. It would be very nice, when you could explain me how to define my keyboard layout. Thank You

2 1

Did I do something wrong?
by Vikram Kumar 18 Jul '05

18 Jul '05

Hi, Any particular reason this patch didn't get commited? http://www.winehq.org/hypermail/wine-patches/2005/07/0361.html It's only a stub but I need it for an app to run.... Shall I just resubmit? Cheers Vik

1 0

Re: MSCMS: Use lcms only if both library and headers are detected
by Alexandre Julliard 18 Jul '05

18 Jul '05

Jacek Caban <jack(a)itma.pwr.wroc.pl> writes: > --- dlls/mscms/mscms_priv.h 21 Feb 2005 18:38:15 -0000 1.7 > +++ dlls/mscms/mscms_priv.h 16 Jul 2005 16:12:03 -0000 > @@ -22,7 +22,11 @@ > #define HAVE_LCMS_H 1 > #endif > > -#ifdef HAVE_LCMS_H > +#if defined(HAVE_LCMS_H) && defined(HAVE_LCMS) > +#define USE_LCMS > +#endif Checking HAVE_LCMS should be enough, there's no need to define a new symbol for the same thing. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: unixfs and CP_ACP versus CP_UNIXCP
by Michael Jung 18 Jul '05

18 Jul '05

Hi Troy, On Monday 18 July 2005 09:37, you wrote: > I just noticed that your unixfs code appears to be using CP_ACP for all > conversions between wide characters and multi byte characters. This is OK > for multi byte display names, but for file names being used in or received > from the UNIX file system, CP_UNIXCP is probably more appropriate. See > wcstoumbs in ntdll, which uses unix_cptable, set by kernel32, which uses > the same table for CP_UNIXCP Thanks for the tip! I'll fix this. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

operating with non-existent files
by Saulius Krasuckas 18 Jul '05

18 Jul '05

When I operate with "c:\nonexist_subdir" and "c:\\nonexist_subdir" filenames in Wine and in NT5, most of API functions set the same LastError. That functions are: OpenFile() CreateFileA() SetCurrentDirectoryA() FindFirstFileA() GetFileAttributesA() But if I call this: IShellFolder_ParseDisplayName(IDesktopFolder, NULL, NULL, cNonExistDirW, NULL, &newPIDL, 0) then I get two different codes: * for the first one HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), * for the second one E_FAIL. This is true for winME and win2k (and not for Wine). Do we need to distinguish between these two filenames in Wine? If so, on top of what functions should it be implemented? Do someone know, how native IShellFolder_ParseDisplayName works in the case of IDesktopFolder? I think the double-slash in the filename has something to do with object names, but I have no ground here.

1 1

Re: win64: x86_64 context
by Chris Morgan 18 Jul '05

18 Jul '05

I'd argue that the correct naming is "AMD64" as Amd created that architecture and named it like that. In this case Intel happens to be AMD64 compatible. Chris On 7/17/05, Kevin Koltzau <kevin(a)plop.org> wrote: > Microsoft incorrectly calls their x86_64 context "AMD64" however it applies to > Intels x86_64 processor also > > Changelog > Define x86_64 context > > >

1 0

stdole2.tlb
by Ivan Gyurdiev 17 Jul '05

17 Jul '05

I was wondering what the status is of stdole2.tlb in wine. GTA: San Andreas will not install without it.. http://bugs.winehq.org/show_bug.cgi?id=3108

4 4

Water effect demo patch...
by Nick Burns 16 Jul '05

16 Jul '05

I got Water demo working -- whew thats all of my lil demos here (crap gotta get some more...) So heres the deal Water should have worked with wined3d -- but it was crashing on me due to the following... (the patch is attached -- you may have to use fromdos (for formatting newline issues)) ...drawprim.c : drawStridedSlow : ~1210... int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); /*INSTA-CRASH(tm) location*/ float s = 0.0, t = 0.0, r = 0.0, q = 0.0; if (coordIdx > 7) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); continue; } else if (sd->u.s.texCoords[coordIdx].lpData == NULL) {/*NOTICE pointer validity check here*/ TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); continue; } else { /*pointer safety*/ float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); -------------------the fix-use pointer after check(not before)------------------ int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; /*former INSTA-CRASH(tm) location*/ float s = 0.0, t = 0.0, r = 0.0, q = 0.0; if (coordIdx > 7) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); continue; } else if (sd->u.s.texCoords[coordIdx].lpData == NULL) {/*NOTICE pointer validity check here*/ TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); continue; } else { /*pointer safety*/ float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); --------------------------------- patch version -- also attached -- dunno if the below will even format correctly --------------------------------- cvs -z4 diff -u -wb -d -p drawprim.c (in directory C:\cvs_stuff\wine\dlls\wined3d\) Index: drawprim.c =================================================================== RCS file: /home/wine/wine/dlls/wined3d/drawprim.c,v retrieving revision 1.16 diff -u -w -b -d -p -r1.16 drawprim.c --- drawprim.c 14 Jul 2005 12:19:53 -0000 1.16 +++ drawprim.c 16 Jul 2005 21:08:45 -0000 @@ -1207,7 +1207,9 @@ static void drawStridedSlow(IWineD3DDevi if (This->stateBlock->textures[textureNo] != NULL) { int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; +#if 0 float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); +#endif float s = 0.0, t = 0.0, r = 0.0, q = 0.0; if (coordIdx > 7) { @@ -1218,6 +1220,8 @@ static void drawStridedSlow(IWineD3DDevi continue; } else { +/*pointer safety*/ +float *ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); int coordsToUse = sd->u.s.texCoords[coordIdx].dwType + 1; /* 0 == D3DDECLTYPE_FLOAT1 etc */ /* The coords to supply depend completely on the fvf / vertex shader */

1 0

Status of HTML Help
by James Hawkins 16 Jul '05

16 Jul '05

Hey, In light of a recent wine-users' query about wine's help system, I've decided to shed some light on the status of wine's HTML Help implementation. I decided not to send patches till I had the base interfaces fleshed out, and this process is almost complete. As of now you can pass a .chm file to hh.exe which will bring up the help viewer. The toolbar with the Back, Stop, Refresh etc buttons is complete (minus correct icons..I can't draw), and the user can browse through the contents of the help file (the most important part). I still have to implement the navigator pane, but that's really secondary to the browser. I have a working .exe and visual studio project if anyone wants to take a look at it before I start submitting patches; just reply and I'll send it to you. For more information on what's left TODO with the project, check out my wiki page: wiki.winehq.org/JamesHawkins Thanks, James Hawkins

1 0

Re: setup_exception nested exception on signal stack
by Eric Pouech 16 Jul '05

16 Jul '05

>>sounds like the same error we got from David Hemmo a while back. which OS >>are you using ? (distro version and kernel version) >>A+ > > > I am running Fedora Core 4 kernel 2.6.12-1.1390_FC4 amd64 but it happens also > with vanilla 2.6.12 kernel. > Thanks Normally, fixes for ptrace in kernel have been included in 2.6.12 for x86_64... Sounds like it still doesn't work as expected... This should be reported to LKML IMO. A+ -- Eric Pouech

1 0

Re: wined3d - d3d9 regression testing 7_12_2005
by Jesse Allen 16 Jul '05

16 Jul '05

On 7/16/05, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Hi, > > > Thanks, I've got the game running how Battlefront looked. Fonts are > > messed up, and some rendering problems, but it does run for me. > > Battlefront has a crashing problem I know Oliver knows how to fix. > Isn't Battlefront an OpenGL game(Quake3 based)? I allways thought it was. > Obviously not... Even if it was Quake 3 based, the OpenGL mode is not apparent. Jedi Academy is Quake 3 based and does run in OpenGL. > > I'm looking forward to seeing the rendering problems fixed. Fow ~A week they > were fixed by a patch in wine CVS, but I think it was a patch that broke some > functionality which broke the textures. > About the fonts: The game looks for a font called 'System' on startup, which > doesn't exists. I didn't find such a font file on my Windows system(where > BF1942 runs), does anyone know what this is? > > Stefan >

1 0

fr-025-final2 doesn't work
by Oliver Stieber 16 Jul '05

16 Jul '05

With the last two patches I sent fr-025-final2 is working again for me.. There's still one other problem with a tiger print texture appearing in a few of the scenes. The patch to fix this problem is a couple of patches down the line. If anyone has any games or applications they would like to see working than it would be really handy if you could add them to the Bugs DB blocking bug 1434 it would be great. http://bugs.winehq.org/query.cgi?query_format=&short_desc_type=allwordssubs… ___________________________________________________________ Yahoo! Messenger - NEW crystal clear PC to PC calling worldwide with voicemail http://uk.messenger.yahoo.com

3 4

Updated GLX -> WGL d3d9 patch
by Nick Burns 16 Jul '05

16 Jul '05

--As promised on the a few days ago-- NOTE: you may want to run "fromdos" on these to convert the new line characters Initial window resizing implemented (incorrect but at least does something) Initial vsync choosing (PresentationInterval) implemented Initial swap effects (SwapEffects) implemented Synced with wine HEAD (thats the fun part...) GLX is still supported #define __WIN32_OPENGL__ to use WGL instead of GLX (this is done automatically if either __CYGWIN__ or WIN32 is defined) Makefile.in and Makefile have been modified for cimpiling (under cygwin -- dunno about any other)... needs "/usr/include/w32api" to exist and have "/usr/include/w32api/GL/gl.h", "/usr/include/w32api/GL/glext.h" this has to be done manually now (link to opengl32 instead of using the GLX libs) configure would have to be changed to accomadate this patch... (kind of annoying I think...) As such the Makefile has been included with this patch (for people with Cygwin/MinGW32? to build) (if this patch is too large tell me and I will not post large patches (80KB) ... or instead I will Zip it ... or just email to people interested...) Nick

1 0

Wierd multi-file "selection" & mouse drag behavior
by Hiji 16 Jul '05

16 Jul '05

Trying out both June's and May's release of Wine, I noticed that there is some wierd behavior when selecting multiple files and dragging within an application. It basically makes the ability to select and drag files unusable. In my case, I am using AbsoluteFTP; as you guessed, its an FTP app. If you can imagine, within it, there are two windows that look like the file Explorer on Windows. On the left, is the local machine and the right is the box you've FTPed into. On wine-20041201, I can hold down shift and select >2 files on the remote box. Then using my mouse, drag them to my localbox. On (at least), these last two releases, I select multiple-files, and the moment I try to drag, the multi-select turns into a one file select. Furthermore, the app enters into a state where it thinks I am holding the mouse down dragging the one file around. Minimizing and maximizng the app doesn't work either; in previous versions, when I couldn't drag a file from one window to the other, I'd minimize/ maximize the app (which would "reset" things), and I could drag files once again. Also, on my CodeWright application, I can no longer highlight text by dragging the mouse across code. Any ideas? I'm sure it will ring a bell for someone who may have been working towards improving the mouse dragging capabilities. Thanks! Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 1

Black Boxes on Apps
by Hiji 16 Jul '05

16 Jul '05

Reading tonight through some of the old CXOffice threads, I noticed some people were having issues running apps likes Illustrator because the panel buttons would be black. This is the same thing that happens on ImageReady. I also saw this: http://www.codeweavers.com/site/compatibility/browse/name?app_id=369;issues… The only "apparent" way to fix this is to change your XF86Config file so the screen depth is 16 and not 24. Is there a way around this since (I'm guessing) apps which run fine at 16bit (like Photoshop) do not have this issue. I'm assuming Adobe products carry a lot of the same codebase. Any ideas? Thanks again, Hiji ____________________________________________________ Start your day with Yahoo! - make it your home page http://www.yahoo.com/r/hs

1 1

Compiling Wine test under Windows with MinGW?
by Mitchell Mebane 15 Jul '05

15 Jul '05

I currently am not running a Linux distro. I'm stuck with Windows for a couple of apps, that's why I'm interested in Wine. ;) I plan on trying Linux again once I find a good distro, but that's not the point of this message. The point is, can I compile the Wine tests under Windows XP with MinGW? If so, where can I find instructions? Thanks, Mitchell Mebane -- I find that a great part of the information I have was acquired by looking up something and finding something else on the way. -- Franklin P. Adams

2 1

Lotus Notes 6.51 Full Text Index
by Kevin DeKorte 15 Jul '05

15 Jul '05

Hi All, Any idea what could be causing this message from Notes 6.51 running under Wine CVS (7/15/05) Thanks, Kevin 07/15/2005 11:48:14 AM Index update process started fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored 07/15/2005 11:48:31 AM Full Text message: Index file integrity has been lost. errcode = 512 07/15/2005 11:48:31 AM Error full text indexing document NT0003F86E C: \lotus\notes\data\kdekorte.ft (rc=3879) Full text index Corrupt, Try to Delete and Re-add Index fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored fixme:msvcrt:MSVCRT__sopen : pmode 0x01b6 ignored 07/15/2005 11:48:40 AM Full Text message: Index file integrity has been lost. errcode = 512 07/15/2005 11:48:40 AM Error full text indexing document NT0003F86E C: \lotus\notes\data\kdekorte.ft (rc=3879) Full text index Corrupt, Try to Delete and Re-add Index 07/15/2005 11:48:40 AM Error full text indexing kdekorte.nsf: Full text index Corrupt, Try to Delete and Re-add Index 07/15/2005 11:48:50 AM Index update process shutdown

1 1

Re: user: test: LoadImage() alpha handling
by Alexandre Julliard 15 Jul '05

15 Jul '05

Frank Richter <frank.richter(a)gmail.com> writes: > +static void test_LoadImage(void) > +{ > + HINSTANCE hInst = GetModuleHandle (NULL); > + HBITMAP bmp = LoadImage (hInst, MAKEINTRESOURCE(1), IMAGE_BITMAP, > + 0, 0, LR_CREATEDIBSECTION|LR_SHARED); > + DIBSECTION ds; > + > + GetObject (bmp, sizeof(ds), &ds); > + > + todo_wine ok (((BYTE*)ds.dsBm.bmBits)[3] == 0x7f, "alpha value %x != 0x7f\n", > + ((BYTE*)ds.dsBm.bmBits)[3]); Is this really supposed to fail on Wine? It works fine here... -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: comctl32: uxtheme wrapper
by Robert Shearman 15 Jul '05

15 Jul '05

Frank Richter wrote: >Frank Richter <frank.richter(a)gmail.com> >Added a wrapper to delay-load uxtheme.dll, as needed by future theming >changes. > > Hey Frank, You don't need any code for this. Just add uxtheme to DELAYIMPORTS in the Makefile.in and it will be done automagically for you. -- Rob Shearman

2 1

New OLEAUT32 test on numeric format
by Alex Villacís Lasso 15 Jul '05

15 Jul '05

Could somebody with access to a Windows machine please test the attached patch for an oleaut32 test? This test checks for the output format of a negative number, and I have reason to believe that at least one VB application fails because native and builtin oleaut32 differ on the tested behavior. Alex Villacís Lasso

2 2

Re: [wined3d] color fill
by Alexandre Julliard 15 Jul '05

15 Jul '05

Oliver Stieber <oliver_stieber(a)yahoo.co.uk> writes: > Hi, > This patch implements IWineD3Device_ColorFill, > the fr-30 candytron demo ( > http://www.scene.org/file.php?file=/demos/groups/farb-rausch/fr-030_candytr… > ) makes use of this function. I get a warning with this patch: device.c:5013: warning: suggest parentheses around && within || and it isn't clear to me what you are trying to do here. The whole handling of the container variable looks suspicious, at some places you check it against NULL even though it has already been dereferenced, and it's not released properly, so it looks like the warning is a symptom of a deeper problem with that function. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wine/programs/rundll32 (how to make good Patches for wine ?)
by Detlef Riekenberg 15 Jul '05

15 Jul '05

Am Donnerstag, den 14.07.2005, 07:34 -0500 schrieb Alexandre Julliard: > ChangeSet ID: 18925 > Patch: http://cvs.winehq.org/patch.py?id=18925 > > Old revision New revision Changes Path > 1.11 1.12 +4 -2 wine/programs/rundll32/rundll32.c I try to learn, how to make good Patches for wine, but sometimes, it's difficult for me to understand: Why not being nice and Free the allocated Memory as in my Patch? 1) Just Save some Bytes of Code 2) This is done automatic, when the Program exit's 3) We are nice, and Free all our Resources. If we are not nice, we can also: Index: programs/rundll32/rundll32.c =================================================================== RCS file: /home/wine/wine/programs/rundll32/rundll32.c,v retrieving revision 1.12 diff -u -r1.12 rundll32.c --- programs/rundll32/rundll32.c 14 Jul 2005 12:34:04 -0000 1.12 +++ programs/rundll32/rundll32.c 14 Jul 2005 18:35:27 -0000 @@ -321,6 +321,5 @@ DestroyWindow(hWnd); if (hDll) FreeLibrary(hDll); - HeapFree(GetProcessHeap(),0,szDllName); return 0; /* rundll32 always returns 0! */ } If we are nice, we need to insert : Index: programs/rundll32/rundll32.c =================================================================== RCS file: /home/wine/wine/programs/rundll32/rundll32.c,v retrieving revision 1.12 diff -u -r1.12 rundll32.c --- programs/rundll32/rundll32.c 14 Jul 2005 12:34:04 -0000 1.12 +++ programs/rundll32/rundll32.c 14 Jul 2005 18:44:15 -0000 @@ -307,6 +307,8 @@ if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 ); if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow ); + + FreeLibrary(shell); } else { -- By By ... ... Detlef

2 1

Wine CVS configure error (July 14)
by James Liggett 15 Jul '05

15 Jul '05

Hi, I just updated my CVS tree and tried to reconfigure it, but I got this error about a missing Makefile.in: config.status: error: cannot find input file: dlls/wldap32/Makefile.in Is this going to screw up my build? Thanks, James Liggett

2 1

[AppDB] and [Bugzilla] Integration
by Tony Lambregts 15 Jul '05

15 Jul '05

I think it's safe to say that the Appdb has come a long way and that it is continually improving. I have been working on better integration with Bugzilla (on and off) now for quite a while and I am closer to getting out something but it would really help me if I could have a copy of the bugzilla database similar to the one for the appdb IE: ftp://ftp.winehq.org/pub/wine/wine-appdb-20050703.tar.gz That way I can do some _real_ testing. -- Tony Lambregts

3 3

Re: Add new "nrelay" debug channel - useful for debugging GPFs in target applications
by Alexandre Julliard 14 Jul '05

14 Jul '05

Troy Rollo <wine(a)troy.rollo.name> writes: > Activate by setting WINEDEBUG=relay,nrelay > > Alternatives considered but rejected: > > - Having a config file option. When the config file options are read it is > already too late to prevent calls by and between kernel32.dll and > ntdll.dll from being logged. This option clearly belongs with the similar ones in the config file, probably even as a special case of RelayFromExclude. The fact that it doesn't work properly on startup is not a reason to invent a new mechanism, the other config options don't work on startup either, and this needs to be fixed. -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: winspool: (wiki about Native Printer Drivers)
by Detlef Riekenberg 14 Jul '05

14 Jul '05

Am Dienstag, den 12.07.2005, 10:18 +0100 schrieb Huw D M Davies: > Huw Davies <huw(a)codeweavers.com> > ScheduleJob for 'file' ports. Thanks for working on winspool.drv. Any Suggestions for this Wiki-Page ? http://wiki.winehq.org/PrinterDrivers -- By By ... ... Detlef

1 0

Re: Managementness of borderless windows
by Stefan Dösinger 14 Jul '05

14 Jul '05

Hi, > well, you might as well redirect this bug to anybody who might be > concerned. btw. in my case, window also does not have a minimize button, > and in this output WS_MINIMIZEBOX is mentioned? just pointing out the > obvious :) Well, I didn't look at the minimize box, but this is clearly a different bug, as the window has WM_CAPTION set. That doesn't say we shouldn't solve it. ;-) To Address the unmanaged window problem, I'll send a patch which makes WS_SYSMENU windows managed soon(Have to recompile and test again first). I think this solution is better than a half-correct hack(getParent()==NULL), as windows with MS_SYSMENU should have WS_CAPTION set according to MSDN, so if they were setup correctly, they would be managed right away. Stefan Dösinger

1 0

setup_exception nested exception on signal stack
by Jose Alberto Reguero 14 Jul '05

14 Jul '05

I had the foloowing error when I run a program: warn:seh:setup_exception exception outside of stack limits in thread 000c eip 7bed9651 esp 7f9510f4 stack 0x7f950000-0x7fa50000 err:seh:setup_exception nested exception on signal stack in thread 000c eip 7bed99fd esp 7ffffcd0 stack 0x7f950000-0x7fa50000 Any Idea? Thanks. Jose Alberto

3 4

WINMM/tests: failures in mixer.c
by Saulius Krasuckas 14 Jul '05

14 Jul '05

| $ wine dlls/winmm/tests/winmm_test.exe.so mixer | fixme:opengl:X11DRV_setup_opengl_visual Failed to find a suitable visual | mixer.c:962:--- Testing ASCII functions --- | mixer.c:965:found 1 Mixer devices | mixer.c:374: 0: "mad16 WSS (82C930)" 1.0 (170:85) | mixer.c:240: Test failed: Couldn't change value from 153354 to 152698, returned 153354 | mixer.c:988:--- Testing WCHAR functions --- | mixer.c:991:found 1 Mixer devices | mixer.c:756: 0: "mad16 WSS (82C930)" 1.0 (170:85) | mixer.c:617: Test failed: Couldn't change value from 153354 to 152698, returned 153354 | mixer: 144 tests executed, 0 marked as todo, 2 failures. Any ideas on what could be wrong?

1 0

[comp.emulators.ms-windows.wine] compile error with today's cvs
by Ferenc Wagner 14 Jul '05

14 Jul '05

FYI: From: "Eike Lantzsch, ZP6CGE" <eikelan(a)gmx.net> Date: Wed, 13 Jul 2005 11:59:36 -0400 Message-ID: <slrnddaej8.4fh.eikelan(a)ID-77364.user.individual.net> I get errors when compiling current cvs. .../wine# /wine/dlls/crypt32/tests/main.c:148: undefined reference to `CertFindAttribute' .../wine/dlls/crypt32/tests/encode.c:541: undefined reference to `CryptDecodeObjectEx' I'm trying on Debian Sid with stock 2.6.11 kernel. Am I missing some kernel headers? -- Feri.

2 1

Re: [wined3d] basic memory mamagement
by Ivan Gyurdiev 14 Jul '05

14 Jul '05

> This patch should hopefully get Half Life 2, Axis and > Allies and Kohan 2 working. I can confirm that this patch gets HL2 past the login screen, and I can actually start the game! Thanks for all of your work, it is much appreciated. However, HL2 is still awfully slow, and unplayable. It seems like it runs at .5 fps or so at the moment. I didn't have the patience to wait for it to get past the initial G-man sequence (which by the way, is still not shown, like in Cedega - it's a white screen). I tried turning down the resolution to 640x480, but that actually seemed to make it worse (different res. from desktop). DirectX is detected at 6.0 by the game (9.0 hardware), and I think it hardcodes the memory to 64MB of video ram (see messages). Anyway, it seems to constantly be calling this - there are thousands of those, and this is by far the most common message: fixme:d3d_draw:drawStridedSlow Blending not supported yet fixme:d3d_draw:drawStridedSlow Blending not supported yet fixme:d3d_draw:drawStridedSlow Blending not supported yet fixme:d3d_draw:drawStridedSlow Blending not supported yet If I filter those out, I can see the SetRenderState unimplemented messages again (see d3d bug), and also: fixme:d3d:IWineD3DImpl_GetDeviceCaps Caps support for directx9 is nonexistent at the moment! fixme:d3d:IWineD3DImpl_GetDeviceCaps Caps support for directx9 is nonexistent at the moment! fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x7ff6bc30) : stub, emulating 64Mib for now, returning 64Mib .... fixme:d3d:IWineD3DDeviceImpl_EvictManagedResources (0x7ff6bc30) : stub fixme:wave:DSD_CreateSecondaryBuffer (0x7c939db8,0x7fcae404,8,0,0x7c949fd4,0x7c94a0c4,0x7c949fb0): stub fixme:font:WineEngAddFontResourceEx Ignoring flags 10 fixme:font:WineEngAddFontResourceEx Ignoring flags 10 fixme:d3d_decl:IWineD3DVertexDeclarationImpl_SetDeclaration Parsing declatation 9 fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:vxd:VXD_Open Unknown/unsupported VxD L"gdperf.vxd". Try setting Windows version to 'nt40' or 'win31'. fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:d3d:IWineD3DDeviceImpl_EvictManagedResources (0x7ff6bc30) : stub fixme:d3d:IWineD3DResourceImpl_SetPriority (0x741ec4b0) : stub fixme:d3d:IWineD3DDeviceImpl_EvictManagedResources (0x7ff6bc30) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x7ffc9978) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x7ffc9978) : stub fixme:d3d_decl:IWineD3DVertexDeclarationImpl_SetDeclaration Parsing declatation 9 fixme:d3d_decl:IWineD3DVertexDeclarationImpl_SetDeclaration Parsing declatation 9 fixme:d3d_decl:IWineD3DVertexDeclarationImpl_SetDeclaration Parsing declatation 9 fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x7ffc9978) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x7ffc9978) : stub fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x7ffc9978) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x7ffc9978) : stub fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6bc30) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x7ffc9978) : stub ============= I also left it playing the initial sequence and went to sleep .. and now I see it has crashed (runtime error dialog box) with the following messages: ... fixme:d3d_draw:drawStridedSlow Blending not supported yet fixme:d3d_draw:drawStridedSlow Blending not supported yet fixme:d3d:IWineD3DQueryImpl_GetData (0x74c6f350) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x74c6f540) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74c6f350) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74c6f350) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74e985f8) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74e985f8) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74c6f540) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x74c6f540) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x70c862b0) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x70c862b0) : stub err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 07f5, blocked by 07f4, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7c9fe8e0 "DSOUND_mixlock" wait timed out in thread 0031, blocked by 0038, retrying (60 sec) fixme:d3d:IWineD3DDeviceImpl_TestCooperativeLevel (0x7ff6be70) : stub fixme:d3d:IWineD3DQueryImpl_GetData (0x7ffc9bb8) : stub fixme:d3d:IWineD3DQueryImpl_Issue (0x7ffc9bb8) : stub err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 07f6, blocked by 07f5, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x7c9fe8e0 "DSOUND_mixlock" wait timed out in thread 0031, blocked by 0038, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 07f7, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x762200 "x11drv_main.c: X11DRV_CritSection" wait timed out in thread 07f6, blocked by 0031, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x762200 "x11drv_main.c: X11DRV_CritSection" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) wine: Unhandled exception (thread 07f7), starting debugger... err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:seh:start_debugger Couldn't start debugger ("winedbg --auto 48 8444") (31) Read the Wine Developers Guide on how to set up winedbg or another debugger err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) /home/phantom/bin/steam: line 7: 4303 Killed wine Steam.exe err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0031, blocked by 07f6, retrying (60 sec) [phantom@cobra ~]$ client callback thread error client callback thread error err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 006a, blocked by 07f6, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x325184 "loader.c: loader_section" wait timed out in thread 0034, blocked by 07f6, retrying (60 sec)

2 1

Re: WLDAP32: dynamically load ldap libraries
by Alexandre Julliard 14 Jul '05

14 Jul '05

Hans Leidekker <hans(a)it.vu.nl> writes: > Changelog > Dynamically load ldap libraries. If the dll refuses to load if the libraries are missing then there isn't any point in loading them dynamically, you might just as well link to them directly. -- Alexandre Julliard julliard(a)winehq.org

2 1

Problems with file creation, what means L"\\??\\C:\\" vs. L"C:\\"
by Tobias Burnus 14 Jul '05

14 Jul '05

Hello, I try to create a file with Origin 6.0 and saving (only) in Origin's internal format fails. Writing other file types (in Origin) to that directory works flawlessly. (Below the output using +file,+ntdll) First, kernel/file.c's CreateFileW is called ------------- trace:file:CreateFileW L"C:\\Program Files\\origin6.0\\UNTITLED.OPJ" GENERIC_READ GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WRITE creation 5 attributes 0x80 ------------- (creation 5 = TRUNCATE_EXISTING; attributes 0x80 = FILE_ATTRIBUTE_NORMAL) which then calls NtCreateFile: ------------- trace:ntdll:NtCreateFile handle=0x406de164 access=c0000000 name=L"\\??\\C:\\Program Files\\origin6.0\\UNTITLED.OPJ" objattr=00000040 root=(nil) sec=(nil) io=0x406de168 alloc_size=(nil)attr=00000080 sharing=00000001 disp=1 options=00000050 ea=(nil).0x00000000 ------------- (access=c0000000 = GENERIC_READ|GENERIC_WRITE = 0x80000000|0x40000000 objattr=00000040 = OBJ_CASE_INSENSITIVE) Which fails then with: ------------- warn:file:wine_nt_to_unix_file_name L"UNTITLED.OPJ" not found in /home/wine/.wine/dosdevices/c:/Program Files/origin6.0 warn:ntdll:NtCreateFile L"\\??\\C:\\Program Files\\origin6.0\\UNTITLED.OPJ" not found (c0000034) warn:file:CreateFileW Unable to create file L"C:\\Program Files\\origin6.0\\UNTITLED.OPJ" (status c0000034) trace:file:CreateFileW returning 0xffffffff ----------- Except for the L"\\??\\" whick looks odd to me, I frankly have no idea what's going wrong. Any tips welcome. (Details can be found from line 675 on in http://bugs.winehq.org/attachment.cgi?id=958 of Bug http://bugs.winehq.org/show_bug.cgi?id=3115 ) Tobias

2 1

Good testcase for comctl32.dll
by Joël Bourquard 14 Jul '05

14 Jul '05

Hi, I think I've found a good testcase for comctl32.dll. The application is Ilium eWallet 4.0.0 (www.iliumsoft.com) with Wine 20050628 (running on Gentoo). There is also a 30-day trial of eWallet, which exhibits the problem as well. Icons don't look good, and it is worked around by using a native comctl32.dll (md5sum 0b5d337119929505ee72d4e4a41ed1fd). Can something be done to fix the icons without using a native comctl32 ? PNG screenshots of eWallet attached. Thanks, Joël

2 1

Civilization 2
by R.T. 14 Jul '05

14 Jul '05

I've been using wine for a couple of years now, but I still couldn't play my favorite game, civ2, so I decided to give it a try and see if I could fix anything. I'm new to wine development and its hard to get my bearings, so I'm hoping to get some hints from any knowledgeable persons, as to how I might tackle this problem. The problem I (and some other people as well, from what I gathered from the archives) am having with civ2 is that the game is incredibly slow. More precisely, it seems to have serious perfomance issues while rendering, which makes the game unplayable, although the graphics look good overall. So I started inverstigating, running oprofile with default settings turned up that wine spends a lot of time in * X11DRV_DIB_SetImageBits_8 * MapColor * GetImageBits_8 Besides actually writing pixels on the screen, these functions also convert between X's internal representation which is 24 bit in my case, since I am running X in 24 bits, and 8 bit as required for the DIB. So, I tried setting X's display depth to 8 bit, which actually made the game playable. This leads me to conclude that the conversion between 8 and 24 bits, ties up many resources. I'm not quite sure how to proceed from here on though. __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

5 6

Ditching the config file
by James Liggett 14 Jul '05

14 Jul '05

Hi all, Now that we've ditched the config file, I'm finding myself migrating all of my DllOverride settings to Winecfg. I have a lot of them, so this is getting very tedious. So, I was wondering, why don't we just make it so that if a config file is found it will read the existing overrides into the new location, and then delete the config file? Where is the code for reading the config file located? I'd like to get started on it--I think it could make upgrades a lot easier. Regards, James Liggett

2 1

WoW
by Tom Wickline 13 Jul '05

13 Jul '05

Has anyone tried the 1.6.0 patch? Tom

2 2

Redraw problem with comboboxes on tab controls
by Michael Jung 13 Jul '05

13 Jul '05

Hi, I do have a couple of windows programs that have comboboxes in tab controls, which have redraw problems. There's a small test-program appended to this mail, which exhibits this problem. It's probably a very simple problem, but I have no experience with wine's GUI code. So if someone who is familiar with the combobox code could have a look at it, that would be nice. Bye, -- Michael Jung mjung(a)iss.tu-darmstadt.de

1 0

Re: file locking
by jakov＠vmlinux.org 13 Jul '05

13 Jul '05

Brian Vincent wrote: >I've been playing around with file locking and Wine, namely the fact >that Wine doesn't have any. > >Is there any way around this, maybe placing the burden on a >filesystem? If I wanted to share files between two different users >(say with something dumb like file permissions 666), is there any way >to prevent the two people from stomping on each other? > > This could almost be FAQ? I think the discussions always boiled down to that integratation with Samba and/or DCE would be that best way. (But perfect is the enemy of good.) http://us1.samba.org/samba/ http://www.opengroup.org/dce/download/ //Jakob

1 0

Recent wine and valgrind, possible?
by Peter Zelezny 13 Jul '05

13 Jul '05

Hi All, I'm trying to get valgrind and wine working, that is to debug the exe wine itself is running. So far I've failed, so if anyone has any information or patches to get this working, I'd appreciate it. Firstly I applied this patch to Wine-20050628: http://www.winehq.org/hypermail/wine-patches/2004/09/0067.html (this applied cleanly, you have to edit one header file to change the prototype for wine_init(), but this is obvious from the gcc error). Second, I tried to use valgrind-wine over here: http://valgrind.org/downloads/valgrind-20031012-wine.tar.bz2 After encouraging it to use LinuxThreads, I gave up, this is too old and just won't build on a modern Linux distro. --- gcc -Winline -Wall -Wshadow -O -fomit-frame-pointer -mpreferred-stack-boundary=2 -g -Wno-pointer-sign -I/usr/include/linuxthreads -mpreferred-stack-boundary=2 -o libpthread.so -Werror -fno-omit-frame-pointer -UVG_LIBDIR -shared -fpic -Wl,-version-script ./vg_libpthread.vs -Wl,-z,nodelete,-z,initfirst -Wl,--soname=libpthread.so.0 vg_libpthread.o vg_libpthread_unimp.o /usr/bin/ld: errno: TLS definition in /lib/libc.so.6 section .tbss mismatches non-TLS reference in vg_libpthread.o /lib/libc.so.6: could not read symbols: Bad value collect2: ld returned 1 exit status make[1]: *** [libpthread.so] Error 1 make[1]: Leaving directory `/home/pz/down/valgrind-20031012-wine/coregrind' --- So I went to a vanilla valgrind 2.4.0. $ valgrind wine-pthread app.exe Executable range 0x7bf00000-0x7bf02394 is outside the acceptable range (nil)-0x52c00000 valgrind: do_exec(/usr/local/bin/wine-pthread) failed: Cannot allocate memory Thanks in advance for any info. -Peter.

1 0

Question about Wine tests
by Mitchell Mebane 13 Jul '05

13 Jul '05

I've been running the Wine test from http://test.winehq.com/data/ for a while now. I usually run them in batches. It suddenly struck me that maybe I should be restarting Windows between each test. Should I do this for best results, or is it OK to run them back to back? --Mitchell -- I find that a great part of the information I have was acquired by looking up something and finding something else on the way. -- Franklin P. Adams

2 1

Installer: How is the progress coming along?
by Hiji 13 Jul '05

13 Jul '05

How are things coming along with the application installer? I remember at one point reading that "person A" was going to lock "person B" in some room until work on it was completed. >:) Right now, many us wine users can't install a lot of apps on newer versions of Wine. So, either we're stuck on an earlier version of Wine, or we have to do wacky things like install an app on an old version and then move the install files to a newer version. (The latter only works in some instances like Flash MX.) Certain workarounds we used in the past for installing apps don't work with the current state of the installer; i.e. utilizing stdole32.tlb I want to get an idea of how long I/ we need to hold my breath for. :) Thanks! Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

2 2

Re: commctrl.h: Add WC_STATIC
by Felix Nawothnig 13 Jul '05

13 Jul '05

Frank Richter wrote: > +#define WC_STATICA "Static" > +#if defined(__GNUC__) > +# define WC_STATICW (const WCHAR []){ 'S','t','a', 't','i','c',0 } > +#elif defined(_MSC_VER) > +# define WC_STATICW L"Static" > +#else > +static const WCHAR WC_STATICW[] = { 'S','t','a','t','i','c',0 }; > +#endif > +#define WC_STATIC WINELIB_NAME_AW(WC_STATIC) > + I'm curious, what is the reason for the special case handling for MSVC and GCC when we have to do the portable way anyway? Felix

3 5

AppDB screenshots and color problems
by James Liggett 12 Jul '05

12 Jul '05

Hi all, I just looked at some screenshots I sent in for Steam: http://appdb.winehq.org/screenshots.php?appId=1163&versionId= (the HL Multiplayer Shot.) If you look at it, you'll notice the color depth is screwed up. What's going on? Thanks, James Liggett

3 2

Re: msi: use SourceLIst Functions
by Mike McCormack 12 Jul '05

12 Jul '05

Aric Stewart wrote: > + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, > + MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEstringW, sourcepath, > + &sz); Hi Aric, Seeing that you've gone to the trouble to define INSTALLPROPERTY_LASTUSEDSOURCE(A/W) in msi.h, which not use that define, rather than a non-standard one suffixed with stringW ? The definition of INSTALLPROPERTY_LASTUSEDSOURCE means that a number of static string will be created everywhere msi.h is included. There's a little bit more complicated but slightly better way of doing this used elsewhere in Wine, (eg. definition of STATUSCLASSNAME in include/commctrl.h). Could you please update the strings defined in msi.h like those? thanks, Mike

1 0

Palm Hotsync and usbserial: New Findings
by James Liggett 12 Jul '05

12 Jul '05

Hello all, I have been working on getting Hotsync to sync to a USB cradle using usbserial. I did some research, and as it turns out, the functions that wine uses to poll normal serial ports (like ioctl and tcgetattr) don't like usbserial devices very much. In fact, when I query my USB cradle using setserial, it gives me the same "Invalid Arguement" error that GetCommState does. Additionally, pilot-link doesn't even use these functions to communicate with a usbserial connected palm. The question now is, can we get tcgetattr to play nice with usbserial? Best Regards, James Liggett

5 17

Re: [Wine]june 2005 release and 'registry' ?
by gslink 11 Jul '05

11 Jul '05

Mike Hearn wrote: >> Eventually nobody should have to use winecfg for anything. Let's spend our >> time fixing the bugs and increasing automation rather than arguing about >> the best way to represent a list of hacks in the UI :) I think the reality is that winecfg is going to hang round for a while. I only see patches adding to its functionality, and nobody is removing config options. Having a configurationless Wine is a lofty goal, but not one that's achieveable in the short term. It would be nice to spend a little bit of time to fix up the usability issues that Felix has pointed out. Opening a new window for app specific overrides might be hard, but it would make alot more sense. Mike The big problem with Wine is that every time something gets improved something quits running. This is normal for any development and can't be helped. If there were 10 times the effort put into Wine we might be able to get rid of winecfg but not as things are. There simply isn't the manpower.

2 1

Re: [kernel/module.c] Return ERROR_PROC_NOT_FOUND for NULL hModule
by Dmitry Timoshkov 11 Jul '05

11 Jul '05

"Paul Vriens" <paul.vriens(a)xs4all.nl> wrote: > Process Explorer tries to load a dll with LoadLibraryA. This fails and > NULL is returned. PE is however still trying to do GetProcAddress on this > (not loaded) dll. Windows returns ERROR_PROC_NOT_FOUND, we get into an > exception. > > I will send a test tonight that confirms the above. > > Changelog > Return ERROR_PROC_NOT_FOUND if hModule is NULL Probably the test also should confirm whether it's a responsibility of dlls/ntdll/loader.c,LdrGetProcedureAddress() to return STATUS_ENTRYPOINT_NOT_FOUND which will be converted by GetProcAddress to ERROR_PROC_NOT_FOUND. -- Dmitry.

3 4

Re: ListBox: Fix LB_SETTABSTOPS (Resend)
by Vitaly Lipatov 11 Jul '05

11 Jul '05

В сообщении от 10 Июль 2005 02:53 Robert Shearman написал(a): > This time with the correct patch. > > Changelog: > The units passed into LB_SETTABSTOPS are dialog units, not logical units. Why you do not use DIALOG_GetCharSize function from user/dialog.c ? I think the magic with averaging sizes of 52 symbols have to be in one instance only. -- Vitaly Lipatov, ALT Linux Team Russia, Saint-Petersburg, www.etersoft.ru

2 1

Re: [Resent] Disable CopyImage for IMAGE_BITMAP for now
by Alexandre Julliard 11 Jul '05

11 Jul '05

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > Changelog: > dlls/user/cursoricon.c: CopyImage() for IMAGE_BITMAP > Disable for now, code causes memory corruption Then it should be fixed, not disabled. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: msi: source one off error correction
by Mike McCormack 11 Jul '05

11 Jul '05

Aric Stewart wrote: > rc = RegQueryValueExW(sourcekey, INSTALLPROPERTY_LASTUSEDSOURCEstringW, > 0, 0, (LPBYTE)buffer,&size); > ptr = strchrW(buffer,';'); > + ptr ++; > ptr = strchrW(ptr,';'); > if (!ptr) > rc = ERROR_UNKNOWN_PROPERTY; This will crash immediately if there's anything other than a string with ;; in it in the registry. Mike

2 1

Re: [kernel/module.c] Return ERROR_PROC_NOT_FOUND for NULL hModule
by Paul Vriens 11 Jul '05

11 Jul '05

> "Paul Vriens" <paul.vriens(a)xs4all.nl> wrote: > >> Process Explorer tries to load a dll with LoadLibraryA. This fails and >> NULL is returned. PE is however still trying to do GetProcAddress on >> this >> (not loaded) dll. Windows returns ERROR_PROC_NOT_FOUND, we get into an >> exception. >> >> I will send a test tonight that confirms the above. >> >> Changelog >> Return ERROR_PROC_NOT_FOUND if hModule is NULL > > Probably the test also should confirm whether it's a responsibility of > dlls/ntdll/loader.c,LdrGetProcedureAddress() to return > STATUS_ENTRYPOINT_NOT_FOUND > which will be converted by GetProcAddress to ERROR_PROC_NOT_FOUND. > > -- > Dmitry. > > Hi Dmitry, how do I make sure that's the case. Obviously a seperate test case for LdrGetProcedureAddress can be made but that doesn't prove your question. Cheers, Paul.

2 1

Re: commctrl: initial button theming support
by Jonathan Wilson 11 Jul '05

11 Jul '05

Frank Richter wrote: > Frank Richter <frank.richter(a)gmail.com> > Add theming support. When comctl32.dll is attached to a thread, a CBT > hook is set up for the current thread which intercepts all window > creations. There, the class name of the window is checked. In case of a > known class, the window is subclassed, and the subclass is handling the > theming-related stuff. > Add initial theming support for the "Button" class. Not that I am any kind of expert here but would it not make sense to implement things the way windows does it? From what I know, windows implements it via activation contexts and manifests.

2 1

Re: [Wine]june 2005 release and 'registry' ?
by Hiji 11 Jul '05

11 Jul '05

--- Dan Sawyer <dansawyer(a)earthlink.net> wrote: > All, > > I am testing with the wine 2005 release. The release > notes state config > file control has been moved to the registry and that > winecfg is active. > winecfg does not seem to recognize dll overrides. > Has anyone else seen > this? If so were you able to work around it? > > Thanks, > Dan I'd be interested to know as well! I could not find how to do DLL overrides with winecfg. I believe that some portions of the config file will still work, but I didn't know what parts were referred to. I'm adding the wine-devel alias to this email; maybe someone there can help. How are DLL overrides done in winecfg? Hiji __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

11 11

Did anything happen with WINEDLLOVERRIDES?
by Uwe Bonnes 11 Jul '05

11 Jul '05

hertz:/spare/bon/Wine/drive_c/Programme/GALEP32> env WINEDEBUG=+loaddll WINEDLLOVERRIDES=msvcrt=n /spare/bon/wine-realclean/wine/wine Galep32.exe trace:loaddll:load_builtin_dll Loaded module L"kernel32.dll" : builtin trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system\\msvcrt.dll" : builtin Also explicitly requested, msvcrt is loaded as builtin. native msvcrt.dll is available in the system directory and the application directory (where Galep32.exe resides) -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 1

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 July 2005