- wine-devel - winehq.org

Re: Re: Getopt - was Re: problem on the Cygwin port
by Christian Costa 14 Feb '04

14 Feb '04

Hi, I've done some further checks and it appears that getopt_long is not broken... It seems to have a conflict with the definition of our own implementation in libwine_port (file getopt1.c). If I rename the latter, glibc's getopt_long works fine again. So I guess it's more a linking issue. Bye, Christian > Message du 13/02/04 16:28 > De : Steven Edwards > A : Dimitrie O. Paun > Copie à : Christian Costa , wine-devel(a)winehq.com > Objet : Re: Getopt - was Re: problem on the Cygwin port > --- "Dimitrie O. Paun" wrote: > > > -#ifndef HAVE_GETOPT_LONG > > > +#if !defined(HAVE_GETOPT_LONG) || defined (__CYGWIN__) > > > > Shouldn't we check in configure if the getopt_long is broken, > > and if so, not use it? > > Yes we should I just didnt have time to do the proper check and rerun > configure. I am going to try to find time to do this soon if no one > beats me to it. > > Thanks > Steven > > __________________________________ > Do you Yahoo!? > Yahoo! Finance: Get your refund fast by filing online. > http://taxes.yahoo.com/filing.html > >

2 2

JOB POSTING - VSTs and Wine
by Michael Ost 13 Feb '04

13 Feb '04

Our Menlo Park, CA based startup is looking for someone with strong Wine skills to help us support VST plugins in a Wine environment. Plugin compatibility issues need to be tracked down and solved, either by patching Wine or our hosting environment. Deep experience in Wine configuration and development are important. Strong Windows API skills are important too. An interest in digital music, soft synths and digital effects would be helpful. The position is available immediately. Telecommuting is available. The position would initially be on a contractor basis, but could lead to a full time position. The rate will be based on experience, and the terms are negotiable. If you are interested and qualified, please send an email to jobs(a)museresearch.com with WINE CONTRACTOR in the subject line. Include your resume in the body of the email, and attach it as a separate file as well.

1 0

Re: RSABASE: enough implementation to get Steam to login
by Geoff Thorpe 13 Feb '04

13 Feb '04

On February 13, 2004 12:15 pm, Mike McCormack wrote: > This patch allows steam to login. It also provides a framework for > implementing the rest of rsabase.dll correctly using libcrypto.so Cool, I've been looking for an excuse to do something useful on Wine, and as one of the developers of libcrypto.so (www.openssl.org) perhaps this might be the place? Does anyone have good refs/links to the corresponding win32 side of this? Cheers, Geoff -- Geoff Thorpe geoff(a)geoffthorpe.net http://www.geoffthorpe.net/

2 1

Re: Is there an opensource MIDL?
by Rolf Kalbermatter 13 Feb '04

13 Feb '04

Kuba Ober <kuba(a)mareimbrium.org> wrote: >Do you folks, by any chance, know of an opensource midl compiler that I could >use in my packages? Or is there something at least semi-functional in the >works somewhere? What is about the widl tool in the wine sources? It's by far not complete but maybe it could be useful for your purposes. Rolf Kalbermatter

1 0

Re: Re: Question about system.ini and win.ini
by Christian Costa 13 Feb '04

13 Feb '04

> Message du 13/02/04 02:51 > De : Alexandre Julliard > A : Christian Costa > Copie à : wine-devel(a)winehq.com > Objet : Re: Question about system.ini and win.ini > Christian Costa writes: > > > I've just figured out that system.ini and win.ini are no more > > accessible from my ~/.wine directory. > > I had to copy them in the windows directory to make things work. > > Is it a recent change in wine or just a regression? > > It's a side effect of the changes in the profile code to make it use > standard file I/O APIs. I guess you can call it a feature ;-) > > -- > Alexandre Julliard > julliard(a)winehq.com > > ;-) Thanks for the info, Alexandre. Bye, Christian

1 0

Re: Shlwapi: Add IntlStrEqWorker Functions and StrCmp Tests
by Alexandre Julliard 13 Feb '04

13 Feb '04

Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > +void test_StrCmpA(void) > +{ > + static const char str1[] = {'a','b','c','d','e','f',0x81,'a',0}; > + static const char str2[] = {'a','b','c','d','e','f',0x81,'b',0}; > + static const char str3[] = {'a','B','c','d','e','f',0x81,'a',0}; > + WORD dbcs1 = 0x81 | 'a' << 8; > + WORD dbcs2 = 0x81 | 'b' << 8; DBCS chars depend on the locale, you cannot hardcode them in the test. -- Alexandre Julliard julliard(a)winehq.com

3 3

DLL Version Stamp Problem
by Mike Kost 13 Feb '04

13 Feb '04

Framemaker 7.0 installs fine on Wine but pops up an error message that it can't properly determine the version of one of it's dll's (actual error message = "The version stamp is missing from the Framemaker resource file C:\Program Files\Adobe\FrameMaker7.0\fminit\fmres.dll"). After poking at the specific dll (fmres.dll), it has no version information. Does anyone have experience with the Wine/Windows version stamp reading functions (I've seen code references to 'GetFileVersionInfo(<stuff>)') or any advice on debugging further. I've hit the limits of my knowledge. Thanks, Mike K mike at tashcorp dot net

2 4

Getopt - was Re: problem on the Cygwin port
by Steven Edwards 13 Feb '04

13 Feb '04

Hi Christian, --- Christian Costa <titan.costa(a)wanadoo.fr> wrote: > I'm not sure but I remember I had a similar problem when I tried to > compile wine on cygwin. > In my case, the get_opt_long function seemed broken and I modified > the > config.h to force the use > our own implementation of this function. This has fixed my problem. Thanks that fixed it. I doubt Alexandre will accept this as its a cygwin problem but here is a patch in any case. Changelog: Work around broken getopt implementation on Cygwin Index: wine/include/wine/port.h =================================================================== RCS file: /home/wine/wine/include/wine/port.h,v retrieving revision 1.46 diff -u -r1.46 port.h --- wine/include/wine/port.h 8 Jan 2004 05:07:06 -0000 1.46 +++ wine/include/wine/port.h 12 Feb 2004 21:23:22 -0000 @@ -199,7 +199,7 @@ #ifndef NO_LIBWINE_PORT -#ifndef HAVE_GETOPT_LONG +#if !defined(HAVE_GETOPT_LONG) || defined (__CYGWIN__) extern char *optarg; extern int optind; extern int opterr; __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

2 2

Darwine Update, Question
by ATMRD＠aol.com 13 Feb '04

13 Feb '04

Hey All, I have updated Darwine binary to version 1.06 and it is being released as a Developer Preview. It does not yet support the running of x86 exe's, however we are begging to work on this feature. The binary should be downloaded from either the home page link here http://darwine.sourceforge.net/download.php or the projects file release page here http://sourceforge.net/project/showfiles.php?group_id=69890 to insure that the latest version is being used. The binary requires Mac OS X 10.3 or higher and for the X11 SDK to be installed. The new installer checks for these before installs, fixes a numerous amount of bugs, including installation of default configuration that were present with the first release and now includes the wine headers. The darwine team is begging to test out libwine on the OS X platform. One error that comes up during compile is the "checking for wrc... /usr/local/bin/wrc checking for atldef.h header... configure: error: Could not find the ATL includes". I found a ATL version 2.0 from microsoft's website and downloaded these. However, it does not contain atldef.h. Though it does contain altbase.h, altcom.h, atlconv.h to name a few. I read that the ATL includes are part of MFC is this correct? How would one go about finding the source and compiling these headers using the ppc native - libwine, so that the altdef.h headers can be used? Thanks, ~Sanjay Connare

2 1

Re: winewrap: fix uuid support
by Alexandre Julliard 13 Feb '04

13 Feb '04

"Dimitrie O. Paun" <dimi(a)intelliware.ca> writes: > I haven't tried with any real life application if this > patch is needed, but it seems to. Without it, we will > determine that uuid is a .so, which is not what we want. I think it's the search algorithm that's broken. We should check every lib path directory for both .so and .a before moving on to the next one. -- Alexandre Julliard julliard(a)winehq.com

2 1

skipped patches?
by Leonardo Quijano Vincenzi 13 Feb '04

13 Feb '04

Seems like one of my patches (keyboard.c - bug #1981) got ignored. I don't know if I should wait more (it was submitted on February 2), but just in case I make this post ;). Should I submit it again, or just wait longer? Thanks -- Leonardo Quijano Vincenzi <lquijano(a)hotpop.com>

2 1

Question about system.ini and win.ini
by Christian Costa 13 Feb '04

13 Feb '04

Hi, I've just figured out that system.ini and win.ini are no more accessible from my ~/.wine directory. I had to copy them in the windows directory to make things work. Is it a recent change in wine or just a regression? Thanks in advance, Christian

2 1

Re: deliver full path by argv[0] and GetCommandLine for win9x
by Dmitry Timoshkov 13 Feb '04

13 Feb '04

"Frank Schruefer" <frank.schruefer(a)t-online.de> wrote: > Was this patch forgotten/rejected? Did you consider to provide a test suite as well to justify the change? -- Dmitry.

5 4

Re: PATCH: virtual fixes for native mode
by Alexandre Julliard 12 Feb '04

12 Feb '04

Marcus Meissner <marcus(a)jet.franken.de> writes: > This is the next try for assisting loading NT native dlls. > > We need non-page aligned access for those drvs, which have sections > that are not page aligned. > > Also some bad magic tries to write the import thunks into thefirst > page, so we need to map the header r/w too. I still think you need a separate loading code for these, it makes no sense to try to mmap sections that aren't page aligned. You should either mmap the whole file at once if all the sections file offsets are equal to their virtual address, or else read the sections in by hand; and you shouldn't try to set memory protections on unaligned sections, this cannot work. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: deliver full path by argv[0] and GetCommandLine for win9x
by Juan Lang 12 Feb '04

12 Feb '04

Okay, here's a test program: #include <windows.h> #include <stdio.h> int main(int argc, const char *argv[]) { LPCSTR cmd; printf("argv[0] is %s\n", argv[0]); cmd = GetCommandLineA(); printf("GetCommandLine returns %s\n", cmd); return strcmp(argv[0], cmd); } Under Windows 2000, cmd.exe, run from the current directory, I get: argv[0] is cmdlinetest.exe GetCommandLine returns cmdlinetest.exe Under Windows 2000, command.com, run from the current directory, I get: argv[0] is CMDLIN~1.exe GetCommandLine returns CMDLIN~1.exe Under Windows 2000, run from the debugger, I get: argv[0] is c:\src\cmdlinetest\Debug\cmdlinetest.exe GetCommandLineA returns "c:\src\cmdlinetest\Debug\cmdlinetest.exe" (This case is interesting because it shows argv[0] and GetCommandLineA can be different even without arguments.) Under Windows ME, command.com, run from the current directory, I get: argv[0] is C:\SRC\CMDLIN~1\DEBUG\CMDLIN~1.EXE GetCommandLine returns C:\SRC\CMDLIN~1\DEBUG\CMDLIN~1.EXE This is the same executable, so it isn't a different _CRTMainStartup. I think this supports Frank's assertion. --Juan __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

2 2

problem on the Cygwin port
by Steven Edwards 12 Feb '04

12 Feb '04

Hello, When trying to build anything on Cygwin I am getting the following error from Winebuild. $ make ../../tools/winebuild/winebuild -DNO_LIBWINE_PORT -o regedit.exe.dbg.c --debug - C. about.c childwnd.c edit.c framewnd.c listview.c main.c regedit.c regproc.c tr eeview.c Unable to create output file '(null)' make: *** [regedit.exe.dbg.c] Error 1 I have not been able to find a patch or something that caused this problem so it may be my cygwin enviroment. Everything works fine for me on mingw. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

1 0

Re: deliver full path by argv[0] and GetCommandLine for win9x
by Juan Lang 12 Feb '04

12 Feb '04

Sorry, forgot to mention, under Win9x in the debugger the output is the same as under the Win2k debugger: argv[0] is c:\src\cmdlinetest\Debug\cmdlinetest.exe GetCommandLine returns "c:\src\cmdlinetest\Debug\cmdlinetest.exe" Hmm.. that contradicts what I said, doesn't it? Ain't Windows the best? :) --Juan __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

1 0

Can't get a minimal Windows app running with winelib
by Chris Seaton 12 Feb '04

12 Feb '04

I can't get a minimal Windows app to run with winelib (it compiles fine). I'm compiling ----------------------------------- #include <stdlib.h> #include <windows.h> int WINAPI WinMain(HINSTANCE Instance, HINSTANCE PreviousInstance, LPSTR CommandLine, int ComandShow) { return EXIT_SUCCESS; } ----------------------------------- With winegcc -mwindows -o test.exe -Iwine/windows test.c -lwine -lkernel32.dll -luser32.dll Which succeeds but when I run ./test I get err:heap:HEAP_GetPtr Invalid heap (nil)! Segmentation fault Any ideas, anyone? Chris Seaton

2 2

mistake in wine user guide
by lazybones 12 Feb '04

12 Feb '04

section 2.2.2.3 - getting wine for freebsd http://www.winehq.com/site/docs/wine-user/getting-wine-package#GETTING-FREE… $ su - # cd /usr/port/emulators/ (should be /usr/ports/emulators/wine/) # make # make install # make clean lazybones

1 0

LOCAL: Not enough space in GDI heap
by Fabian Cenedese 12 Feb '04

12 Feb '04

Hi When trying to run a program I get these messages: trace:font:GetTextMetricsW text metrics: Weight = 400 FirstChar = 32 AveCharWidth = 6 Italic = 0 LastChar = 65532 MaxCharWidth = 35 UnderLined = 0 DefaultChar = 0 Overhang = 0 StruckOut = 0 BreakChar = 32 CharSet = 0 PitchAndFamily = 27 -------------------- InternalLeading = 3 Ascent = 13 Descent = 3 Height = 16 trace:font:X11DRV_SelectFont hdc=0x74, hfont=0xa6 trace:font:X11DRV_SelectFont dc->gdiFont = 0x40378f28 trace:ole:OLEFontImpl_SetRatio (0x47d85a60)->(96, 2540) trace:ole:OLEFontImpl_get_hFont (0x47d85a60)->(0x408bf0bc) trace:ole:OLEFontImpl_get_Size (0x47d85a60)->(0x408bf034) err:local:LOCAL_GetBlock not enough space in GDI heap 10c7 for 116 bytes trace:ole:OLEFontImpl_get_hFont Returning (nil) wine: Unhandled exception (thread 0009), starting debugger... I had a look at this LOCAL_GetBlock function. There is already code with some FIXME comments, but it's all #ifdef 0'd out. So that means it's not tested or not even supposed to work. Is there something else I could do to increase my GDI heap? Thanks bye Fabi

3 9

Compatability problem in wineps driver
by gslink 12 Feb '04

12 Feb '04

It appears that a check needs to be made in ps.c. The method PSDRV_WriteSetFont passes the parameter size. In some early Win 95 versions there was a bug that required that parameter to be negative and some early windows programs make size negative. This produces garbage. It appears that Windows checks and if that parameter is negative that it is changed to posative. I put a patch to make this check into our copies of Wine without any problem but I do not suggest a patch. I would like the maintainer of the Postscript driver to do that as there is a possibility of other consequences. It may be that this change can be made in ps.c or it may be that it must be accompanied by a flag in the config file also. One program that will not run without the patch is DeScribe but I know there are others.

2 2

Re: SelectionMark
by Dimitrie O. Paun 12 Feb '04

12 Feb '04

On February 11, 2004 02:07 pm, Aric Stewart wrote: > + if (bResult && lvItem.stateMask & LVIS_SELECTED && > + lvItem.state&LVIS_SELECTED && ((infoPtr->nSelectionMark > + == -1) || (lvItem.iItem <= infoPtr->nSelectionMark))) That's some funky indentation here :) > + { > + infoPtr->nSelectionMark = -1; > + int i = 0; > + for (i = 0; i < infoPtr->nItemCount; i++) > + { > + if (infoPtr->uCallbackMask & LVIS_SELECTED) > + { > + if (LISTVIEW_GetItemState(infoPtr, i, LVIS_SELECTED)) ^^^^^^^ here as well, any particular reason? -- Dimi.

3 2

Re: Fix Potential Deadlock in LdrLoadDll
by Alexandre Julliard 12 Feb '04

12 Feb '04

Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > This patch fixes a potential deadlock in LdrLoadDll as it tries to call > LdrUnloadDll with the loader lock held, resulting in deadlock once > LdrUnloadDll also tries to enter the loader critical section. > This only happens on process_attach failure. This cannot deadlock, a critical section is reentrant. There must be some other issue here. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: widl function pointers
by Alexandre Julliard 12 Feb '04

12 Feb '04

Ove Kaaven <ovek(a)arcticnet.no> writes: > Incidentally, that means I also reversed his indentation suppression of > the arguments of these function pointers, but I don't see the "old" > indentation as a problem - after all, MIDL does not suppress indentation > of function pointer arguments, why should widl? > > But I could probably submit a patch with Alexandre's indentation changes > preserved if he's really attached to it. I don't really care about the indentation, but the reason for the change was so that we could use the proper type in the METHODS macro without having to add special support for escaping EOLs. Your patch avoids this issue by declaring function pointers as void*, but I'm not sure I agree that this is the right thing to do. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: Resend of Update to heap.c
by Alexandre Julliard 11 Feb '04

11 Feb '04

jeffl <jeffl(a)defcen.gov.au> writes: > When browsing ntdll/heap.c I noticed that the condition set would > cause a memory leak if the unlikely event ever occured. The patch > causes a warning to be issued as well so that there is a record. Why would it cause a memory leak? This thing is only used for clearing the block when debugging. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: wine/dlls/ntdll virtual.c
by Mike Hearn 11 Feb '04

11 Feb '04

> Log message: > Don't request PROT_EXEC permissions when mapping an image file to > avoid problems on noexec filesystems with kernel 2.6. http://people.redhat.com/mingo/exec-shield/ANNOUNCE-exec-shield According to the exec-shield paper, its effects can include revealing "bugs in applications that assume PROT_READ implies PROT_EXEC" due to the funky things it does with relocations into the ASCII-armour. Not sure but it might be worth ensuring mprotect is called afterwards.... Just a random thought, I don't think it'd matter in this case as we use MAP_FIXED anyway.

2 1

can the wine debugger be disabled
by "Cristóvão B. B. Dalla Costa" 11 Feb '04

11 Feb '04

Hello, Before anyone flames me let me say that I'm perfectly aware of the continuing effort of the Wine team for greater compatibility with Windows applications, and that the debugger is instrumental in that quest. However, in the company I work for we will replace a hundred or so PCs which run Windows with Linux PCs. The people using these PCs are the most clueless possible, and we want to avoid aggravation from them when/if the Wine debugger shows up when an application fails. That's inacceptable since those people would be lost and not know what to do. However, I cannot figure out how to do so using configuration files (wineserver -d0 rarely does the trick, and I don't think we can rely on that). So I humbly ask for directions so that I can alter Wine's source code to not call up the debugger and instead show a dialogue to inform the user of what happened. Naturally, any application which misbehaves and is important enough *will* be debugged, we just can't have the debugger showing up every time, leaving the app frozen. (sorry if it's been asked before, I couldn't find out how to search of the mailling lists) Thank you in advance. Cristovao.

2 1

Linking against a dll
by Dan Timis 11 Feb '04

11 Feb '04

Is it possible to link a wine application against a Windows dll without calling LoadLibrary? The documentation says: > All the libraries you link with should be available as '.so' > libraries. If one of them is available only in '.dll' form then > consult Building WineLib DLLs. But, the chapter "Building WineLib DLLs" talks only about taking a Linux library and making it available as a .dll.so library. I could build a wrapper library that uses LoadLibrary and then calls each available functions, but I can also do that directly in my code, which I am trying to avoid if possible. Thanks. Dan Timis Muse Research, Inc.

2 1

possible StretchBlt problem
by Kevin Koltzau 11 Feb '04

11 Feb '04

I'm having an issue with StretchBlt and alpha channels, I've got 2 DIBs, and using StretchBlt from one to the other. If the source and destination height & width are identical, it works perfectly, but if I increase or decrease either height or width by as much as 1 pixel, the alpha channel appears to be zeroed out Digging through x11drv, I think I narrowed the problem down to a XGetImage call in BITBLT_GetSrcAreaStretch where the alpha channel is lost, but when XCopyArea is used, alpha is preserved I'm not extremely familiar with X at this level so I very well may be completely wrong, and I have no idea what type of solution there would be Anyone familiar with this stuff that may be able to help? Thanks Kevin

1 0

WineConf movie
by Boaz Harrosh 10 Feb '04

10 Feb '04

Hi guys I'm back home. WineConf has been a profound experience for me. Thank you all. It is my intention to edit a 4-7 minutes of a WineConf2004 movie. to post on the web. I am browsing through the 8 hours of WineConf videos and I need your help: Please from the top of your head, be totally associative, what are the couple of moments you most remember / where profoundly moved by, at WineConf2004? I will try and use every ones feelings that way to guide me through the edit process. I'm not sure it will make it easer but it looks like a short cut. Free Life Boaz

6 5

strange file name question.
by Rein Klazes 10 Feb '04

10 Feb '04

Hi, Showing my ignorance, but this is the first time that I see something like this: (agent.xrs is indeed a zip file) | 0009:Call kernel32.GetFileAttributesA(416818c4 "H:\\binw\\Agent\\agent.xrs#zip:version.xml") ret=005f4635 | 0009:Ret kernel32.GetFileAttributesA() retval=ffffffff ret=005f4635 it looks that with a normal file function you can access the contents of a zip file. What is a proper search term to look for the documentation on msdn? Rein. -- Rein Klazes rklazes(a)xs4all.nl

2 2

An excellent test program for Wine
by gslink 10 Feb '04

10 Feb '04

I find the following program to be an excellent test program for anything that acts like Windows. The program is Vast and may be downloaded from http://www-306.ibm.com/software/awdtools/smalltalk/. The program you want is the 6.0.2 fixpack which is also a fully operational evaluation version of Vast. It gives an evaluation notice on startup but is not disabled and has no timeout. The value of this program is that it runs on everything from Win 95 on and uses just about every feature in a Windows system. It is one of the best tests of system integrity I have been able to find. It almost installs and runs on Wine.

1 0

Re: Update to heap.c
by Dimitrie O. Paun 10 Feb '04

10 Feb '04

On Tue, 10 Feb 2004, jeffl wrote: > When browsing ntdll/heap.c I noticed that the condition set would cause > a memory leak if the unlikely event ever occured. The patch causes a > warning to be issued as well so that there is a record. Please submit patches in unified format: diff -u -- Dimi.

1 0

Developer reminders tracker bug?
by Mike Hearn 10 Feb '04

10 Feb '04

At the moment there is no way in CVS to organize bugs filed by developers to remind us of stuff we should fix, as far as I know. In the past few days at least 3 such bugs were filed: 2000: %ProgramFiles% is not set in environment [me] 2003: WindowFromPoint Returns Wrong Window [rob] 2004: Bug In LVM_GETNEXTITEM(hWnd, -1, LVNI_FOCUSED | LVNI_SELECTED) [rob] I think we should have a way to keep track of misc (small) buglets found but for whatever reason not fixed in bugzilla, so when one of us is bored (tee hee) there is a ready supply of nice descriptions of bugs probably with fixes described too. Perhaps there should be a tracker bug for "Bugs filed by people with nice descriptions of what is wrong that are fixable in a reasonable timeframe by anyone", to separate out the random flotsam & jetsam that accumulates in bugzilla over time. Thoughts? thanks -mike

3 3

Alternative implementation of DocFiles (long, posted for archival purposes)
by Troy Rollo 10 Feb '04

10 Feb '04

The attached file contains the CorVu implementation of DocFiles (the Microsoft compound file format). This was coded from scratch based on analysis of the file format some time in or before 1998. There was no reliance on the LAOLA project, and there are several aspects of the DocFile format that are implemented in this code (and documented in docfile.h) that are not documented by the LAOLA project and not implemented in Wine. Because it's in C++, it's not directly usable in Wine, but it may be of use to anybody seeking to improve the Wine implementation of DocFiles in the future. The code is being released under the LGPL. Files no-docfile/.docfile.h.swp and docfile/.docfile.h.swp differ diff -uN no-docfile/Makefile docfile/Makefile --- no-docfile/Makefile 1970-01-01 10:00:00.000000000 +1000 +++ docfile/Makefile 2004-02-05 09:07:05.000000000 +1100 @@ -0,0 +1,19 @@ +.SUFFIXES: .a .o .s .i .d .c .cpp + +CC=gcc + +#DEFS=-DDF_INTEL_BYTE_ORDER + +.cpp.o: + $(CC) $(DEFS) -g -x c++ -c $*.cpp + +.c.o: + $(CC) $(DEFS) -g -c $*.c + +DFOBJECTS=docfile.o dfint.o oleinit.o dfrc.o flokbyte.o \ + dfmgr.o dfo.o dfstg.o dfess.o dfstream.o redblack.o guid.o + +default: $(DFOBJECTS) + -rm libdf.a + ar q libdf.a $(DFOBJECTS) + -ranlib libdf.a diff -uN no-docfile/dfconv.h docfile/dfconv.h --- no-docfile/dfconv.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfconv.h 2004-02-05 09:00:29.000000000 +1100 @@ -0,0 +1,109 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __DFCONV_H +#define __DFCONV_H + +#ifdef DF_INTEL_BYTE_ORDER +#define SI4(x) x +#define SI2(x) x +#else +#define SI4(x) __CV_SI4::__CV_SI4(x) +#define SI2(x) __CV_SI2::__CV_SI2(x) + +class __CV_SI4 +{ +private: + df_int4 &iValue; + +public: + inline + __CV_SI4(df_int4 &iValue_) : + iValue(iValue_) + { + } + + inline df_int4 + operator=(df_int4 iValue_) + { + char *pchSource = (char *) &iValue_; + char *pchDest = (char *) &iValue; + + pchDest[0] = pchSource[3]; + pchDest[1] = pchSource[2]; + pchDest[2] = pchSource[1]; + pchDest[3] = pchSource[0]; + return iValue_; + } + + inline + operator df_int4(void) const + { + df_int4 iValue_; + + char *pchSource = (char *) &iValue; + char *pchDest = (char *) &iValue_; + + pchDest[0] = pchSource[3]; + pchDest[1] = pchSource[2]; + pchDest[2] = pchSource[1]; + pchDest[3] = pchSource[0]; + return iValue_; + } +}; + +class __CV_SI2 +{ +private: + df_int2 &iValue; + +public: + inline + __CV_SI2(df_int2 &iValue_) : + iValue(iValue_) + { + } + + inline df_int2 + operator=(df_int2 iValue_) + { + char *pchSource = (char *) &iValue_; + char *pchDest = (char *) &iValue; + + pchDest[0] = pchSource[1]; + pchDest[1] = pchSource[0]; + return iValue_; + } + + inline + operator df_int2(void) const + { + df_int2 iValue_; + + char *pchSource = (char *) &iValue; + char *pchDest = (char *) &iValue_; + + pchDest[0] = pchSource[1]; + pchDest[1] = pchSource[0]; + return iValue_; + } +}; +#endif + +#endif diff -uN no-docfile/dfess.cpp docfile/dfess.cpp --- no-docfile/dfess.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfess.cpp 2004-02-05 08:58:21.000000000 +1100 @@ -0,0 +1,129 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfess.cpp,v 1.4 2002/01/23 05:51:43 borgia Exp $"; +#include "docfile.h" +#include "dfmgr.h" +#include "dfess.h" +#include <stdlib.h> +#include <string.h> + + +DocFileEnumStatStg::DocFileEnumStatStg( DocFileStorage *pdfs_, + HRESULT &hr) : + pdfs(pdfs_), + iStackPtr(0) +{ + pdfs->AddRef(); + hr = Reset(); +} + +DocFileEnumStatStg::DocFileEnumStatStg( DocFileEnumStatStg *pdfess) : + pdfs(pdfess->pdfs), + iStackPtr(pdfess->iStackPtr) +{ + memcpy(aiStack, pdfess->aiStack, sizeof(aiStack[0]) * iStackPtr); +} + +DocFileEnumStatStg::~DocFileEnumStatStg(void) +{ + pdfs->Release(); +} + +DEFINE_REFCOUNT(DocFileEnumStatStg) + +HRESULT +DocFileEnumStatStg::DescendLeft(df_int4 iEntry) +{ + HRESULT hr; + DocFile_DirEnt dfde; + + if (iEntry == -1) + return S_OK; + + aiStack[iStackPtr] = iEntry; + iStackPtr++; + hr = pdfs->pdfm->GetDirectoryEntry(iEntry, &dfde); + if (!hr) + hr = DescendLeft(SI4(dfde.iLeftSibling)); + return hr; +} + +HRESULT DF_STDCALL +DocFileEnumStatStg::Reset(void) +{ + HRESULT hr; + DocFile_DirEnt dfde; + + iStackPtr = 0; + hr = pdfs->pdfm->GetDirectoryEntry(pdfs->GetEntryNumber(), &dfde); + if (!hr) + { + hr = DescendLeft(SI4(dfde.iFirstChild)); + } + return hr; +} + +HRESULT DF_STDCALL +DocFileEnumStatStg::Clone(IEnumSTATSTG **ppiess) +{ + HRESULT hr; + + *ppiess = new DocFileEnumStatStg(this); + if (hr) + (*ppiess)->Release(); + return hr; +} + +HRESULT DF_STDCALL +DocFileEnumStatStg::Next( ULONG nElems, + STATSTG *pss, + ULONG *pnFetched) +{ + DocFile_DirEnt dfde; + HRESULT hr = 0; + + if (pnFetched) + *pnFetched = 0; + while (iStackPtr && nElems && !hr) + { + iStackPtr--; + hr = pdfs->pdfm->GetDirectoryEntry(aiStack[iStackPtr], &dfde); + if (hr == 0) + { + if (pss) + { + PopulateStatStg(pss, TRUE, dfde); + pss++; + } + if (pnFetched) + (*pnFetched)++; + hr = DescendLeft(SI4(dfde.iRightSibling)); + nElems--; + } + } + return hr; +} + +HRESULT DF_STDCALL +DocFileEnumStatStg::Skip(ULONG nElems) +{ + return Next(nElems, 0, 0); +} + diff -uN no-docfile/dfess.h docfile/dfess.h --- no-docfile/dfess.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfess.h 2004-02-05 09:00:34.000000000 +1100 @@ -0,0 +1,46 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +class DocFileEnumStatStg : public IEnumSTATSTG, public DocFileReferenceCounter, public DocFileInternalFunctions +{ +private: + DocFileStorage *pdfs; + int iStackPtr; + df_int4 aiStack[256]; + + DocFileEnumStatStg( DocFileEnumStatStg *pdfess); + ~DocFileEnumStatStg(void); + + HRESULT DF_STDCALL QueryInterface(REFIID riid, + void **ppvObj); + ULONG DF_STDCALL AddRef(void) ; + ULONG DF_STDCALL Release(void); + + HRESULT DescendLeft(df_int4 iEntry); + HRESULT DF_STDCALL Reset(void); + HRESULT DF_STDCALL Clone(IEnumSTATSTG **ppiess); + HRESULT DF_STDCALL Next( ULONG nElems, + STATSTG *pss, + ULONG *pnFetched); + HRESULT DF_STDCALL Skip(ULONG nElems); + +public: + DocFileEnumStatStg( DocFileStorage *pdfs_, + HRESULT &hr); +}; diff -uN no-docfile/dfint.cpp docfile/dfint.cpp --- no-docfile/dfint.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfint.cpp 2004-02-05 08:58:26.000000000 +1100 @@ -0,0 +1,215 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfint.cpp,v 1.4 1999/01/20 02:58:07 troy Exp $"; +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <errno.h> +#include <time.h> +#include "docfile.h" + + +HRESULT +DocFileInternalFunctions::Translate( ULARGE_INTEGER *piULARGE, + LONG i) +{ + piULARGE->u.HighPart = 0; + piULARGE->u.LowPart = i; + return 0; +} + +HRESULT +DocFileInternalFunctions::Translate( LONG *pi, + ULARGE_INTEGER const *piULARGE) +{ + if (piULARGE->u.HighPart) + return E_FAIL; + *pi = piULARGE->u.LowPart; + return 0; +} + + +HRESULT +DocFileInternalFunctions::Translate( LARGE_INTEGER *piLARGE, + LONG i) +{ + piLARGE->u.HighPart = 0; + piLARGE->u.LowPart = i; + return 0; +} + +HRESULT +DocFileInternalFunctions::Translate( LONG *pi, + LARGE_INTEGER const *piLARGE) +{ + if (piLARGE->u.HighPart) + return E_FAIL; + *pi = piLARGE->u.LowPart; + return 0; +} + + +HRESULT +DocFileInternalFunctions::Translate( FILETIME *pft, + LONG i) +{ + ULARGE_INTEGER uli; + LONGLONG iTmp; + + uli.QuadPart = iTmp; + iTmp = 86400l; + iTmp *= 134774l; + iTmp += i; + iTmp *= 10000000; + uli.QuadPart = iTmp; + pft->dwLowDateTime = uli.u.LowPart; + pft->dwHighDateTime = uli.u.HighPart; + return 0; +} + +HRESULT +DocFileInternalFunctions::Translate( LONG *pi, + FILETIME const *pft) +{ + ULARGE_INTEGER uli; + LONGLONG iTmp, iTmp2; + + uli.u.LowPart = pft->dwLowDateTime; + uli.u.HighPart = pft->dwHighDateTime; + iTmp = uli.QuadPart; + iTmp /= 10000000; + iTmp2 = 86400l; + iTmp2 *= 134774l; + iTmp -= iTmp2; + *pi = iTmp; + return 0; +} + + +void +DocFileInternalFunctions::GetTimeNow(FILETIME &ft) +{ + time_t t; + + time(&t); + Translate(&ft, t); +} + +HRESULT +DocFileInternalFunctions::TranslateError(void) +{ + switch(errno) + { +#ifdef EPERM + case EPERM: + return E_FAIL; +#endif +#ifdef ENOENT + case ENOENT: + return STG_E_FILENOTFOUND; +#endif +#ifdef ENOMEM + case ENOMEM: + return STG_E_INSUFFICIENTMEMORY; +#endif +#ifdef EEXIST + case EEXIST: + return STG_E_FILEALREADYEXISTS; +#endif +#ifdef ENOTDIR + case ENOTDIR: + return STG_E_FILENOTFOUND; +#endif + } + return E_FAIL; +} + +void +DocFileInternalFunctions::PopulateStatStg( STATSTG *pss, + BOOL bIncludeName, + DocFile_DirEnt &dfde) +{ + df_int4 i1; + df_int2 i2; + + if (bIncludeName) + { + df_char_t achName[DF_NAMELEN]; + + GetName(&dfde, achName); + // FIXME - Needs to use the OleAllocate functions in Windows + pss->pwcsName = (df_char_t *) malloc((df_strlen(achName) + 1) * sizeof(df_char_t)); + df_strcpy(pss->pwcsName, achName); + } + else + { + pss->pwcsName = 0; + } + switch(dfde.iFileType) + { + case DF_FT_ROOT: + case DF_FT_STORAGE: + pss->type = STGTY_STORAGE; + break; + + case DF_FT_STREAM: + pss->type = STGTY_STREAM; + break; + } + Translate(&pss->cbSize, SI4(dfde.iFileSize)); + pss->mtime.dwHighDateTime = SI4(dfde.iModifiedHigh); + pss->mtime.dwLowDateTime = SI4(dfde.iModifiedLow); + pss->ctime.dwHighDateTime = SI4(dfde.iCreatedHigh); + pss->ctime.dwLowDateTime = SI4(dfde.iCreatedLow); + pss->atime = pss->mtime; + pss->grfMode = 0; + pss->grfLocksSupported = 0; + + memcpy(&i1, dfde.achClassID, 4); + pss->clsid.Data1 = SI4(i1); + memcpy(&i2, dfde.achClassID + 4, 2); + pss->clsid.Data2 = SI2(i2); + memcpy(&i2, dfde.achClassID + 6, 2); + pss->clsid.Data3 = SI2(i2); + memcpy(pss->clsid.Data4, dfde.achClassID + 8, 8); + pss->grfStateBits = SI4(dfde.iStateBits); + pss->reserved = 0; +} + +void +DocFileInternalFunctions::GetName( DocFile_DirEnt *pdfde, + df_char_t *pchName) +{ + int i; + df_int2 iChar; + int iLen; + + iLen = SI2(pdfde->iNameLen) / 2 - 1; + + for (i = 0; i < iLen; i++) + { + iChar = pdfde->achEntryName[i]; + pchName[i] = SI2(iChar); + } + pchName[iLen] = 0; +} + + + diff -uN no-docfile/dfmgr.cpp docfile/dfmgr.cpp --- no-docfile/dfmgr.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfmgr.cpp 2004-02-05 08:58:34.000000000 +1100 @@ -0,0 +1,1823 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfmgr.cpp,v 1.6 1999/01/20 02:58:07 troy Exp $"; +#include <stdlib.h> +#include <memory.h> +#include <string.h> +#include "dfmgr.h" +#include "redblack.h" +#define FILE_LEVEL_THRESHOLD 4096 + +static DF_StreamType dfstDirectory(DFST_Directory); +static DF_StreamType dfstDataVTOC(DFST_DataVTOC); +static DF_StreamType dfstData(DFST_Data); + +DocFileManager::DocFileManager(ILockBytes *pilb_) : + pilb(pilb_), + nHeaderRef(0), + iVTOCSize(0), + pchVTOC(0), + iLowestFreeStreamBlock(0), + nExtVTOCs(0) +{ + pilb->AddRef(); +} + +DocFileManager::~DocFileManager(void) +{ + if (pchVTOC) + delete [] pchVTOC; + pilb->Release(); +} + +DEFINE_REFCOUNT(DocFileManager) + +HRESULT +DocFileManager::GetBlock( void *pvData, + long iBlock) +{ + ULARGE_INTEGER iBlock_; + DWORD nRead; + HRESULT hr; + + hr = Translate(&iBlock_, (iBlock + 1) * DF_BLOCK_SIZE); + if (hr) + return hr; + return pilb->ReadAt(iBlock_, pvData, DF_BLOCK_SIZE, &nRead); +} + +HRESULT +DocFileManager::SetBlock( void const *pvData, + long iBlock) +{ + ULARGE_INTEGER iBlock_; + DWORD nWritten; + HRESULT hr; + + hr = Translate(&iBlock_, (iBlock + 1) * DF_BLOCK_SIZE); + if (hr) + return hr; + return pilb->WriteAt(iBlock_, pvData, DF_BLOCK_SIZE, &nWritten); +} + +HRESULT +DocFileManager::LockBlock( long iBlock, + DWORD dwLockType) +{ + ULARGE_INTEGER iBlock_; + ULARGE_INTEGER nBytes; + HRESULT hr; + + hr = Translate(&iBlock_, iBlock * DF_BLOCK_SIZE); + if (!hr) + hr = Translate(&nBytes, DF_BLOCK_SIZE); + if (hr) + return hr; + return pilb->LockRegion(iBlock_, nBytes, dwLockType); +} + +HRESULT +DocFileManager::UnlockBlock( long iBlock, + DWORD dwLockType) +{ + ULARGE_INTEGER iBlock_; + ULARGE_INTEGER nBytes; + HRESULT hr; + + hr = Translate(&iBlock_, (iBlock + 1) * DF_BLOCK_SIZE); + if (!hr) + hr = Translate(&nBytes, DF_BLOCK_SIZE); + if (hr) + return hr; + return pilb->UnlockRegion(iBlock_, nBytes, dwLockType); +} + +HRESULT +DocFileManager::InitOldFile(void) +{ + HRESULT hr; + df_int4 nVTOCs; + df_int4 i; + DocFile_VTOC dfvt; + char *pchNow; + df_int4 iCurrentVTOC = -1; + df_int4 iVTOCBlock; + + hr = GetHeader(); + if (hr) + return hr; + + nVTOCs = SI4(dfh.nVTOCs); + + iVTOCBlock = SI4(dfh.iExtendedVTOC); + i = SI4(dfh.iExtendedVTOCSize); + + while ( i-- && + iVTOCBlock != DF_VTOC_EOF && + iVTOCBlock != DF_VTOC_FREE) + { + aiExtVTOCs[nExtVTOCs++] = iVTOCBlock; + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + iVTOCBlock = DF_VTOC_EOF; + else + iVTOCBlock = SI4(dfvt.aiBlocks[DF_VTOC_SIZE - 1]); + } + + iVTOCSize = nVTOCs * 0x10; + + pchVTOC = new char[iVTOCSize]; + pchNow = pchVTOC; + + for (i = 0; i < nVTOCs; i++) + { + int j; + df_int4 iVTOCBlock = FindVTOCBlock(i); + + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + { + for (j = 0; j < DF_VTOC_SIZE; j++) + { + if (SI4(dfvt.aiBlocks[j]) != DF_VTOC_FREE) + { + int iBitValue = 1 << (j % 8); + + *pchNow |= iBitValue; + if (iBitValue == 128) + pchNow++; + } + } + } + else + { + memset(pchNow, -1, 0x10); + pchNow += 0x10; + } + } + + for (i = 0; i < 3; i++) + { + df_int4 iNextBlock; + df_int4 iBlockNum; + + switch(i) + { + case 0: + iNextBlock = SI4(dfh.iFirstDirBlock); + break; + + case 1: + iNextBlock = SI4(dfh.iFirstDataVTOC); + break; + + case 2: + { + DocFile_DirEnt dfde; + + hr = GetDirectoryEntry(0, &dfde); + if (hr) + iNextBlock = DF_VTOC_EOF; + else + iNextBlock = SI4(dfde.iVTOCPosition); + } + break; + } + iBlockNum = 0; + while (iNextBlock != DF_VTOC_EOF) + { + df_int4 iNextVTOC; + + adfsi[i].SetBlock(iBlockNum++, iNextBlock); + iNextVTOC = iNextBlock / DF_VTOC_SIZE; + if (iNextVTOC != iCurrentVTOC) + { + df_int4 iVTOCBlock = FindVTOCBlock(iNextVTOC); + + GetBlock(&dfvt, iVTOCBlock); + iCurrentVTOC = iNextVTOC; + } + iNextBlock = SI4(dfvt.aiBlocks[iNextBlock % DF_VTOC_SIZE]); + } + } + + hr = ReleaseHeader(FALSE); + return hr; +} + + +void +DocFileManager::InitNewFile(void) +{ + DocFile_VTOC dfvt; + DocFile_DirEnt adfde[DF_DE_PER_BLOCK]; + FILETIME ft; + df_int4 nWritten; + + nHeaderRef = 1; + + dfh.iMagic1 = 0xd0; + dfh.iMagic2 = 0xcf; + dfh.iMagic3 = 0x11; + dfh.iMagic4 = 0xe0; + dfh.iMagic5 = 161; + dfh.iMagic6 = 177; + dfh.iMagic7 = 26; + dfh.iMagic8 = 225; + SI4(dfh.aiUnknown1[0]) = 0; + SI4(dfh.aiUnknown1[1]) = 0; + SI4(dfh.aiUnknown1[2]) = 0; + SI4(dfh.aiUnknown1[3]) = 0; + SI4(dfh.iVersion) = 0x3003e; + SI4(dfh.aiUnknown2[0]) = 0x9fffe; + SI4(dfh.aiUnknown2[1]) = 6; + SI4(dfh.aiUnknown2[2]) = 0; + SI4(dfh.aiUnknown2[3]) = 0; + SI4(dfh.nVTOCs) = 0; + SI4(dfh.iFirstDirBlock) = 0; + SI4(dfh.aiUnknown3[0]) = 0; + SI4(dfh.aiUnknown3[1]) = 0x1000; // Could this be the threshold for storage as a file level stream? + SI4(dfh.iFirstDataVTOC) = 0xfffffffe; + SI4(dfh.iHasData) = 0; + SI4(dfh.iExtendedVTOC) = 0xfffffffe; + SI4(dfh.iExtendedVTOCSize) = 0; + memset(dfh.aiVTOCofVTOCs, 0xff, sizeof(dfh.aiVTOCofVTOCs)); + ReleaseHeader(TRUE); + GetHeader(); + + InitDirBlock(adfde); +#if defined(_Windows) || defined(__WIN32) || defined(_WIN32) || defined(WIN32) + SetName(adfde, L"Root Entry"); +#else + SetName(adfde, "Root Entry"); +#endif + adfde[0].iFileType = DF_FT_ROOT; + GetTimeNow(ft); + SI4(adfde->iCreatedLow) = ft.dwLowDateTime; + SI4(adfde->iCreatedHigh) = ft.dwHighDateTime; + SI4(adfde->iModifiedLow) = ft.dwLowDateTime; + SI4(adfde->iModifiedHigh) = ft.dwHighDateTime; + SI4(adfde->iVTOCPosition) = DF_VTOC_EOF; + WriteToFileStream( dfstDirectory, + 0, + adfde, + sizeof(adfde), + nWritten); + ReleaseHeader(FALSE); +} + +void +DocFileManager::InitDirBlock( DocFile_DirEnt *pdfde, + int nEntries) +{ + int i; + + memset(pdfde, 0, sizeof(*pdfde) * nEntries); + + for (i = 0; i < nEntries; i++, pdfde++) + { + SI4(pdfde->iLeftSibling) = -1; + SI4(pdfde->iRightSibling) = -1; + SI4(pdfde->iFirstChild) = -1; + } +} + +void +DocFileManager::SetName( DocFile_DirEnt *pdfde, + df_char_t const *pchName) +{ + int i; + df_int2 iChar; + + memset(pdfde->achEntryName, 0, sizeof(pdfde->achEntryName)); + for (i = 0; pchName[i]; i++) + { + SI2(iChar) = (df_int2) (unsigned char) pchName[i]; + pdfde->achEntryName[i] = iChar; + } + SI2(pdfde->iNameLen) = (df_int2) ((i + 1) * 2); +} + +HRESULT +DocFileManager::GetDirectoryEntry( df_int4 iLocation, + DocFile_DirEnt *pdfde) +{ + df_int4 nRead; + HRESULT hr; + + hr = ReadFromFileStream(dfstDirectory, + iLocation * sizeof(*pdfde), + pdfde, + sizeof(*pdfde), + nRead); + if (hr) + return hr; + if (nRead < sizeof(*pdfde)) + return E_FAIL; + return S_OK; +} + +HRESULT +DocFileManager::SetDirectoryEntry( df_int4 iLocation, + DocFile_DirEnt *pdfde) +{ + df_int4 nWritten; + + return WriteToFileStream(dfstDirectory, + iLocation * sizeof(*pdfde), + pdfde, + sizeof(*pdfde), + nWritten); +} + +HRESULT +DocFileManager::AnnihilateEntry(df_int4 iEntry, + BOOL bSiblingsToo) +{ + DocFile_DirEnt dfde; + HRESULT hr; + df_int4 iChild; + + if (iEntry == -1) + return S_OK; + + hr = GetDirectoryEntry(iEntry, &dfde); + if (!hr) + { + if (bSiblingsToo) + { + iChild = SI4(dfde.iLeftSibling); + AnnihilateEntry(iChild, TRUE); + iChild = SI4(dfde.iRightSibling); + AnnihilateEntry(iChild, TRUE); + } + iChild = SI4(dfde.iFirstChild); + AnnihilateEntry(iChild, TRUE); + if (dfde.iFileType == DF_FT_STREAM) + { + if (SI4(dfde.iFileSize) >= FILE_LEVEL_THRESHOLD) + hr = FreeFileChain(SI4(dfde.iVTOCPosition)); + else + hr = FreeDataChain(SI4(dfde.iVTOCPosition)); + if (hr) + return hr; + } + InitDirBlock(&dfde, 1); + hr = SetDirectoryEntry(iEntry, &dfde); + } + return hr; +} + +HRESULT +DocFileManager::LocateChild( df_int4 iParentLocation, + df_char_t const *pchName, + DocFile_DirEnt &dfde, + df_int4 &iEntryLocation, + DFLocType dflt, + BOOL bStart, + DF_RBNode **ppnParent) +{ + HRESULT hr; + int iBranch; + df_int4 iLeftLocation; + df_int4 iRightLocation; + int iCompare; + DF_RBNode *pnChild; + DF_RBNode *pnParent; + + if (bStart) + { + pnParent = new DF_RBNode(iParentLocation, 0); + hr = pnParent->Populate(this); + if (hr) + { + delete pnParent; + return hr; + } + iBranch = DFRB_LEFT; + + iLeftLocation = SI4(pnParent->GetEntry(this).iFirstChild); + iRightLocation = -1; + } + else + { + pnParent = *ppnParent; + hr = pnParent->Populate(this); + if (hr) + return hr; + + iLeftLocation = SI4(pnParent->GetEntry(this).iLeftSibling); + iRightLocation = SI4(pnParent->GetEntry(this).iRightSibling); + + iCompare = (df_strlen(pchName) + 1) * 2 - SI2(pnParent->GetEntry(this).iNameLen); + if (!iCompare) + { + df_char_t achName[DF_NAMELEN]; + + GetName(&pnParent->GetEntry(this), achName); + iCompare = df_stricmp(pchName, achName); + } + + if (iCompare == 0) + { + iEntryLocation = iParentLocation; + if (dflt == DFLT_Remove || dflt == DFLT_Delete) + { + pnParent = *ppnParent = pnParent->Delete(this, FALSE); + dfde = pnParent->GetEntry(this); + } + else + { + dfde = pnParent->GetEntry(this); + if (dflt != DFLT_Find) + return STG_E_FILEALREADYEXISTS; + } + return S_OK; + } + else if (iCompare < 0) + { + iBranch = DFRB_LEFT; + } + else + { + iBranch = DFRB_RIGHT; + } + } + + if (iLeftLocation >= 0) + pnParent->SetChild(DFRB_LEFT, new DF_RBNode(iLeftLocation, pnParent)); + if (iRightLocation >= 0) + pnParent->SetChild(DFRB_RIGHT, new DF_RBNode(iRightLocation, pnParent)); + pnChild = pnParent->GetChild(iBranch); + if (pnChild) + { + hr = LocateChild( pnChild->GetDirEnt(), + pchName, + dfde, + iEntryLocation, + dflt, + FALSE, + &pnChild); + } + else + { + /* If we've arrived here, we have failed to find an entry */ + if (dflt == DFLT_Create || dflt == DFLT_Insert) + { + DF_RBNode *pnNew; + + df_int4 iNextChildLocation; + FILETIME ft; + + if (dflt == DFLT_Insert) + { + pnNew = new DF_RBNode(iEntryLocation, 0); + hr = 0; + } + else + { + iNextChildLocation = 0; + do + { + iEntryLocation = iNextChildLocation++; + hr = GetDirectoryEntry(iEntryLocation, &dfde); + } while (!hr && SI2(dfde.iNameLen) != 0); + + if (hr) + { + df_int4 nWritten; + DocFile_DirEnt adfde[DF_DE_PER_BLOCK]; + + InitDirBlock(adfde); + + hr = WriteToFileStream(dfstDirectory, + iEntryLocation * sizeof(adfde), + adfde, + sizeof(adfde), + nWritten); + } + pnNew = new DF_RBNode(iEntryLocation, 0); + pnNew->CreateNew(this); + SetName(&pnNew->GetEntry(this), pchName); + GetTimeNow(ft); + SI4(pnNew->GetEntry(this).iCreatedLow) = ft.dwLowDateTime; + SI4(pnNew->GetEntry(this).iCreatedHigh) = ft.dwHighDateTime; + SI4(pnNew->GetEntry(this).iModifiedLow) = ft.dwLowDateTime; + SI4(pnNew->GetEntry(this).iModifiedHigh) = ft.dwHighDateTime; + SI4(pnNew->GetEntry(this).iVTOCPosition) = DF_VTOC_EOF; + } + if (!hr) + { + pnNew->Populate(this); + pnNew->SetChild(DFRB_LEFT, 0); + pnNew->SetChild(DFRB_RIGHT, 0); + pnNew->InsertInto(pnParent, iBranch, this); + dfde = pnNew->GetEntry(this); + } + else + { + delete pnNew; + } + } + else + { + hr = STG_E_PATHNOTFOUND; + } + } + if (bStart) + { + if (!hr) + pnParent->WriteChanges(this); + delete pnParent; + } + return hr; +} + +HRESULT +DocFileManager::ReadFromFileStream( DF_StreamType &dfst, + df_int4 iLocation, + void *pvData, + df_int4 nBytes, + df_int4 &nRead) +{ + HRESULT hr = 0; + char achBlock[DF_BLOCK_SIZE]; + df_int4 nStreamBlocks = GetTotalStreamBlocks(dfst); + BOOL bIStream = (dfst.GetType() == DFST_IStream); + + nRead = 0; + while (nBytes) + { + df_int4 iBlockNow = iLocation / DF_BLOCK_SIZE; + df_int4 iLocNow = iLocation % DF_BLOCK_SIZE; + df_int4 nBytesNow = DF_BLOCK_SIZE - iLocNow; + df_int4 iFileBlock; + + if (nBytesNow > nBytes) + nBytesNow = nBytes; + if (iBlockNow >= nStreamBlocks) + break; + iFileBlock = GetStreamBlock(dfst, iBlockNow); + if (bIStream) + { + DocFile_StreamPtr &dfsp = dfst.GetStreamPointer(); + + dfsp.iStreamBlock = iFileBlock; + dfsp.iPosition = iLocation; + } + hr = GetBlock(achBlock, iFileBlock); + if (hr) + break; + memcpy( pvData, achBlock + iLocNow, nBytesNow); + nBytes -= nBytesNow; + nRead += nBytesNow; + iLocation += nBytesNow; + pvData = (char *) pvData + nBytesNow; + } + if (bIStream && nRead) + { + DocFile_StreamPtr &dfsp = dfst.GetStreamPointer(); + df_int4 iTotalBlockSize = nStreamBlocks * DF_BLOCK_SIZE; + + if (iLocation >= iTotalBlockSize) + { + df_int4 iLocTmp = iLocation - iTotalBlockSize; + + dfsp.iStreamBlock = GetStreamBlock(dfst,nStreamBlocks - 1); + dfsp.iExtraBlocks = 0; + while (iLocTmp >= 0) + iLocTmp -= DF_BLOCK_SIZE, dfsp.iExtraBlocks++; + } + else + { + dfsp.iExtraBlocks = 0; + dfsp.iStreamBlock = GetStreamBlock(dfst, iLocation / DF_BLOCK_SIZE); + } + dfsp.iPosition = iLocation; + } + return hr; +} + +HRESULT +DocFileManager::WriteToFileStream( DF_StreamType &dfst, + df_int4 iLocation, + void const *pvData, + df_int4 nBytes, + df_int4 &nWritten) +{ + HRESULT hr = 0; + char achBlock[DF_BLOCK_SIZE]; + BOOL bIStream = (dfst.GetType() == DFST_IStream); + df_int4 nStreamBlocks = GetTotalStreamBlocks(dfst); + + nWritten = 0; + while (nBytes) + { + df_int4 iBlockNow = iLocation / DF_BLOCK_SIZE; + df_int4 iLocNow = iLocation % DF_BLOCK_SIZE; + df_int4 nBytesNow = DF_BLOCK_SIZE - iLocNow; + df_int4 iFileBlock; + + if (nBytesNow < 0) + nBytes = nBytesNow = 0; + else if (nBytesNow > nBytes) + nBytesNow = nBytes; + if (iBlockNow >= nStreamBlocks) + { + hr = ExtendFileStream(dfst, iBlockNow); + nStreamBlocks = iBlockNow + 1; + if (hr) + break; + } + iFileBlock = GetStreamBlock(dfst, iBlockNow); + if (bIStream) + { + DocFile_StreamPtr &dfsp = dfst.GetStreamPointer(); + + dfsp.iStreamBlock = iFileBlock; + dfsp.iPosition = iLocation; + dfsp.iExtraBlocks = 0; + } + if (nBytesNow != DF_BLOCK_SIZE) + { + hr = GetBlock(achBlock, iFileBlock); + if (hr) + break; + } + memcpy(achBlock + iLocNow, pvData, nBytesNow); + SetBlock(achBlock, iFileBlock); + nBytes -= nBytesNow; + nWritten += nBytesNow; + iLocation += nBytesNow; + pvData = (char const *) pvData + nBytesNow; + } + if (bIStream) + { + DocFile_StreamPtr &dfsp = dfst.GetStreamPointer(); + + if (iLocation == nStreamBlocks * DF_BLOCK_SIZE) + { + dfsp.iStreamBlock = GetStreamBlock(dfst, nStreamBlocks - 1); + dfsp.iExtraBlocks = 1; + } + else + { + dfsp.iStreamBlock = GetStreamBlock(dfst, iLocation / DF_BLOCK_SIZE); + dfsp.iExtraBlocks = 0; + } + dfsp.iPosition = iLocation; + } + return hr; +} + + +int +DocFileManager::StreamTypeToIndex(DF_StreamType &dfst) +{ + switch(dfst.GetType()) + { + case DFST_Directory: + return 0; + + case DFST_DataVTOC: + return 1; + + case DFST_Data: + return 2; + } + *(char *) 0 = 0; + return -1; +} + +df_int4 +DocFileManager::GetTotalStreamBlocks(DF_StreamType &dfst) +{ + if (dfst.GetType() == DFST_IStream) + return dfst.GetTotalBlocks(); + return adfsi[StreamTypeToIndex(dfst)].GetTotalBlocks(); +} + +df_int4 +DocFileManager::GetStreamBlock( DF_StreamType &dfst, + df_int4 iBlockNum) +{ + if (dfst.GetType() == DFST_IStream) + { + df_int4 iBlockNow; + df_int4 iFileBlockNow; + df_int4 iVTOCBlock; + DocFile_StreamPtr &dfsp = dfst.GetStreamPointer(); + DocFile_DirEnt &dfde = dfst.GetDirEnt(); + + if (iBlockNum == 0) + return SI4(dfde.iVTOCPosition); + + if (dfsp.iStreamBlock != -1 && + (iBlockNow = dfsp.iPosition / DF_BLOCK_SIZE - dfsp.iExtraBlocks) <= iBlockNum) + { + + if (iBlockNow == iBlockNum) + return dfsp.iStreamBlock; + iFileBlockNow = dfsp.iStreamBlock; + } + else + { + iBlockNow = 0; + iFileBlockNow = SI4(dfde.iVTOCPosition); + } + + while (iBlockNow < iBlockNum) + { + HRESULT hr; + DocFile_VTOC dfvt; + + iVTOCBlock = FindVTOCBlock(iFileBlockNow / DF_VTOC_SIZE); + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + return -2; + iFileBlockNow = SI4(dfvt.aiBlocks[iFileBlockNow % DF_VTOC_SIZE]); + iBlockNow++; + } + return iFileBlockNow; + } + return adfsi[StreamTypeToIndex(dfst)].GetBlock(iBlockNum); +} + +HRESULT +DocFileManager::ExtendFileStream(DF_StreamType &dfst, + df_int4 iBlockNum) +{ + df_int4 i; + int iBit; + int iBitValue; + HRESULT hr = 0; + DocFile_VTOC dfvt; + char achZeroes[DF_BLOCK_SIZE]; + df_int4 iLinkBlock; + + memset(achZeroes, 0, DF_BLOCK_SIZE); + + i = GetTotalStreamBlocks(dfst); + + if (i) + iLinkBlock = GetStreamBlock(dfst, i - 1); + else + iLinkBlock = -1; + + for (; i <= iBlockNum; i++) + { + df_int4 j; + df_int4 iBlock; + int iVTOCBlock; + + for (j = 0; + j < iVTOCSize && !((~((int) pchVTOC[j])) & 0xff); + j++); + if (j == iVTOCSize) + ExtendVTOC(); + for (iBit = 0, iBitValue = 1; + pchVTOC[j] & iBitValue; + iBit++, iBitValue <<= 1); + pchVTOC[j] |= iBitValue; + iBlock = j * 8 + iBit; + hr = SetBlock(achZeroes, iBlock); + if (hr) + break; + iVTOCBlock = FindVTOCBlock(iBlock / DF_VTOC_SIZE); + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + break; + SI4(dfvt.aiBlocks[iBlock % DF_VTOC_SIZE]) = DF_VTOC_EOF; + hr = SetBlock(&dfvt, iVTOCBlock); + if (hr) + break; + if (dfst.GetType() != DFST_IStream) + adfsi[StreamTypeToIndex(dfst)].SetBlock(i, iBlock); + else + dfst.AddedBlock(); + if (iLinkBlock != -1) + { + iVTOCBlock = FindVTOCBlock(iLinkBlock / DF_VTOC_SIZE); + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + break; + SI4(dfvt.aiBlocks[iLinkBlock % DF_VTOC_SIZE]) = iBlock; + hr = SetBlock(&dfvt, iVTOCBlock); + } + else + { + hr = GetHeader(); + if (!hr) + { + BOOL bChanged = FALSE; + + switch(dfst.GetType()) + { + case DFST_Directory: + SI4(dfh.iFirstDirBlock) = iBlock; + bChanged = TRUE; + break; + + case DFST_DataVTOC: + SI4(dfh.iFirstDataVTOC) = iBlock; + SI4(dfh.iHasData) = 1; + bChanged = TRUE; + break; + + case DFST_Data: + { + DocFile_DirEnt dfde; + + GetDirectoryEntry(0, &dfde); + j = SI4(dfh.iFirstDirBlock); + SI4(dfde.iVTOCPosition) = iBlock; + SetDirectoryEntry(0, &dfde); + } + break; + + case DFST_IStream: + SI4(dfst.GetDirEnt().iVTOCPosition) = iBlock; + break; + } + hr = ReleaseHeader(bChanged); + } + } + iLinkBlock = iBlock; + } + return hr; +} + +df_int4 +DocFile_StreamInfo::GetBlock(df_int4 iBlock) +{ + unsigned char *pchLoc = pchBlocks + iBlock * 3; + + return (df_int4) pchLoc[0] + + (df_int4) pchLoc[1] * 256 + + (df_int4) pchLoc[2] * 65536; +} + +void +DocFile_StreamInfo::SetBlock( df_int4 iBlock, + df_int4 iFileBlock) +{ + unsigned char *pchLoc; + + if (iBlock >= nPositions) + { + df_int4 nPositionsNew = nPositions; + unsigned char *pchNew; + + while (nPositionsNew <= iBlock) + { + if (nPositionsNew == 0) + nPositionsNew = 64; + else + nPositionsNew <<= 1; + } + pchNew = new unsigned char[nPositionsNew * 3]; + memcpy(pchNew, pchBlocks, nPositions * 3); + if (pchBlocks) + delete [] pchBlocks; + pchBlocks = pchNew; + nPositions = nPositionsNew; + } + pchLoc = pchBlocks + iBlock * 3; + pchLoc[0] = iFileBlock & 0xff; + pchLoc[1] = (iFileBlock & 0xff00) >> 8; + pchLoc[2] = (iFileBlock & 0xff0000) >> 16; + if (iBlock >= nBlocks) + nBlocks = iBlock + 1; +} + +df_int4 +DocFileManager::FindVTOCBlock(df_int4 iBlock) +{ + df_int4 iValue; + HRESULT hr = GetHeader(); + + if (hr) + return -2; + if (iBlock < TOTAL_SIMPLE_VTOCS) + { + iValue = SI4(dfh.aiVTOCofVTOCs[iBlock]); + } + else + { + int iExtBlock = 0; + int iSize = TOTAL_SIMPLE_VTOCS; + DocFile_VTOC dfvt; + + do + { + iBlock -= iSize; + iSize = DF_VTOC_SIZE - 1; + } while (iBlock >= iSize && ++iExtBlock); + + iValue = -2; + if (iExtBlock < nExtVTOCs) + { + hr = GetBlock(&dfvt, aiExtVTOCs[iExtBlock]); + if (!hr) + iValue = SI4(dfvt.aiBlocks[iBlock]); + } + } + hr = ReleaseHeader(FALSE); + if (hr) + return -2; + return iValue; +} + +HRESULT +DocFileManager::ExtendVTOC(void) +{ + HRESULT hr; + DocFile_VTOC dfvt; + char *pchVTOCNew; + df_int4 nBlocks; + df_int4 iVTOCBlock; + df_int4 iExtVTOCBlock = -1; + + hr = GetHeader(); + if (hr) + return hr; + nBlocks = iVTOCSize / 0x10; /* * 8 / DF_VTOC_SIZE */ + iVTOCBlock = nBlocks * DF_VTOC_SIZE; + + memset(&dfvt, -1, sizeof(dfvt)); + SI4(dfvt.aiBlocks[0]) = DF_VTOC_VTOC; + if (nBlocks < TOTAL_SIMPLE_VTOCS) + { + SI4(dfh.aiVTOCofVTOCs[nBlocks]) = iVTOCBlock; + } + else + { + df_int4 iExtBlock = 0; + df_int4 iBlock = nBlocks; + int iSize = TOTAL_SIMPLE_VTOCS; + DocFile_VTOC dfvtExt; + + do // On RISC platforms this is actually faster than doing both % and / + // when the modulus is not a power of 2 + { + iBlock -= iSize; + iSize = DF_VTOC_SIZE - 1; + } while (iBlock >= iSize && ++iExtBlock); + + if (iBlock) + { + if (GetBlock(&dfvtExt, aiExtVTOCs[iExtBlock])) + *(char *) 0 = 0; + } + else + { + iExtVTOCBlock = iVTOCBlock + 1; + + if (iExtBlock) + { + if (GetBlock(&dfvtExt, aiExtVTOCs[iExtBlock - 1])) + *(char *) 0 = 0; + SI4(dfvtExt.aiBlocks[DF_VTOC_SIZE - 1]) = iExtVTOCBlock; + if (SetBlock(&dfvtExt, aiExtVTOCs[iExtBlock - 1])) + *(char *) 0 = 0; + } + else + { + SI4(dfh.iExtendedVTOC) = iExtVTOCBlock; + } + aiExtVTOCs[nExtVTOCs++] = iExtVTOCBlock; + SI4(dfh.iExtendedVTOCSize) = nExtVTOCs; + SI4(dfvt.aiBlocks[1]) = DF_EXT_VTOC; + memset(&dfvtExt, -1, sizeof(dfvtExt)); + } + SI4(dfvtExt.aiBlocks[iBlock]) = iVTOCBlock; + if (SetBlock(&dfvtExt, aiExtVTOCs[iExtBlock])) + *(char *) 0 = 0; + } + SetBlock(&dfvt, iVTOCBlock); + SI4(dfh.nVTOCs) = nBlocks + 1; + pchVTOCNew = new char[iVTOCSize + 0x10]; + memcpy(pchVTOCNew, pchVTOC, iVTOCSize); + memset(pchVTOCNew + iVTOCSize, 0, 0x10); + if (iExtVTOCBlock != -1) + pchVTOCNew[iVTOCSize] = 3; + else + pchVTOCNew[iVTOCSize] = 1; + if (pchVTOC) + delete [] pchVTOC; + pchVTOC = pchVTOCNew; + iVTOCSize += 0x10; + hr = ReleaseHeader(TRUE); + return hr; +} + + +HRESULT +DocFileManager::StreamSeek( DocFile_StreamPtr &dfsp_, + df_int4 iLoc, + df_int4 *piNewLoc, + int iWhence) +{ + long iNewLoc; + long iBlockOld; + long iBlockNew; + DocFile_DirEnt dfde; + HRESULT hr; + int iRewind = 0; + DocFile_StreamPtr dfsp = dfsp_; + int iBlockSize; + df_int4 iEOF; + + hr = GetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + iEOF = SI4(dfde.iFileSize); + if (iEOF >= FILE_LEVEL_THRESHOLD) + dfsp.bFileStream = TRUE; + iBlockSize = dfsp.bFileStream ? DF_BLOCK_SIZE : DF_STREAM_BLOCK_SIZE; + switch(iWhence) + { + case 0: + iNewLoc = iLoc; + break; + + case 1: + iNewLoc = dfsp.iPosition + iLoc; + break; + + case 2: + iNewLoc = iEOF + iLoc; + break; + } + + if (dfsp.iStreamBlock == -1) + iRewind = 1; + + iBlockNew = iNewLoc / iBlockSize; + if (dfsp.iPosition == -1) + { + iRewind = 1; + } + else + { + iBlockOld = dfsp.iPosition / iBlockSize; + if (iBlockOld > iBlockNew) + iRewind = 1; + } + if (iRewind) + { + dfsp.iPosition = 0; + dfsp.iStreamBlock = SI4(dfde.iVTOCPosition); + if (dfsp.iStreamBlock == DF_VTOC_EOF) + dfsp.iExtraBlocks = 1; + else + dfsp.iExtraBlocks = 0; + iBlockOld = 0; + } + + if (dfsp.bFileStream) + { + DF_StreamType dfst(dfsp, dfde); + df_int4 nBlocks = GetTotalStreamBlocks(dfst); + df_int4 iBlock = iNewLoc / DF_BLOCK_SIZE; + df_int4 iBlockFind; + + if (iBlock >= nBlocks) + iBlockFind = nBlocks - 1; + else + iBlockFind = iBlock; + if (iBlockFind >= 0) + { + if (dfsp.iStreamBlock == DF_VTOC_EOF) + dfsp.iStreamBlock = -1; + dfsp.iStreamBlock = GetStreamBlock(dfst, iBlockFind); + } + else + { + dfsp.iStreamBlock = -1; + } + dfsp.iExtraBlocks = iBlock - iBlockFind; + } + else + { + while (iBlockOld < iBlockNew && !dfsp.iExtraBlocks) + { + df_int4 iBlock; + df_int4 nRead; + + hr = ReadFromFileStream(dfstDataVTOC, + dfsp.iStreamBlock * sizeof(iBlock), + &iBlock, + sizeof(iBlock), + nRead); + if (hr) + return hr; + if (nRead != sizeof(iBlock)) + return E_FAIL; + iBlock = SI4(iBlock); + if (iBlock == DF_VTOC_EOF) + dfsp.iExtraBlocks = 1; + else if (iBlock == DF_VTOC_FREE) + return E_FAIL; + else + dfsp.iStreamBlock = iBlock; + iBlockOld++; + } + if (iBlockOld < iBlockNew) + dfsp.iExtraBlocks += iBlockNew - iBlockOld; + } + dfsp.iPosition = iNewLoc; + if (piNewLoc) + *piNewLoc = iNewLoc; + dfsp_ = dfsp; + return S_OK; +} + +HRESULT +DocFileManager::Read( DocFile_StreamPtr &dfsp, + void *pvData, + ULONG nBytes, + ULONG &nRead) +{ + HRESULT hr; + DocFile_DirEnt dfde; + df_int4 iEOF; + + hr = GetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + iEOF = SI4(dfde.iFileSize); + + nRead = 0; + if (iEOF >= FILE_LEVEL_THRESHOLD) + { + if (iEOF <= dfsp.iPosition) + { + nRead = 0; + return S_OK; + } + else + { + df_int4 nReadNow; + DF_StreamType dfst(dfsp, dfde); + + if (iEOF < dfsp.iPosition + nBytes) + nBytes = iEOF - dfsp.iPosition; + hr = ReadFromFileStream(dfst, + dfsp.iPosition, + pvData, + nBytes, + nReadNow); + if (hr) + return hr; + nRead = nReadNow; + } + } + else + { + if (dfsp.iStreamBlock == -1 && + (hr = StreamSeek(dfsp, dfsp.iPosition, 0, 0)) != 0) + return hr; + while (nBytes && !dfsp.iExtraBlocks && dfsp.iPosition < iEOF) + { + df_int4 nReadNow; + df_int4 iOffset = dfsp.iPosition % DF_STREAM_BLOCK_SIZE; + df_int4 nBytesNow = DF_STREAM_BLOCK_SIZE - iOffset; + + if (nBytesNow > nBytes) + nBytesNow = nBytes; + hr = ReadFromFileStream(dfstData, + dfsp.iStreamBlock * DF_STREAM_BLOCK_SIZE + iOffset, + pvData, + nBytesNow, + nReadNow); + if (hr) + return hr; + if (nReadNow != nBytesNow) + return E_FAIL; + nRead += nBytesNow; + pvData = (char *) pvData + nBytesNow; + nBytes -= nBytesNow; + hr = StreamSeek(dfsp, nBytesNow, 0, 1); + if (hr) + return hr; + } + } + return S_OK; +} + +HRESULT +DocFileManager::Write( DocFile_StreamPtr &dfsp, + void const *pvData, + ULONG nBytes, + ULONG &nWritten) +{ + HRESULT hr; + df_int4 iVTOCBlock = -1; + DocFile_VTOC dfvt; + df_int4 iFileSize; + DocFile_DirEnt dfde; + df_int4 iEOF; + FILETIME ft; + int iAddedBlocks = 0; + char achZeroes[DF_STREAM_BLOCK_SIZE]; + + if (!dfsp.iPosition && !nBytes) + { + nWritten = 0; + return S_OK; + } + memset(achZeroes, 0, DF_STREAM_BLOCK_SIZE); + hr = GetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + iEOF = SI4(dfde.iFileSize); + if (iEOF >= FILE_LEVEL_THRESHOLD || + dfsp.iPosition + (nBytes == (ULONG) -1 ? 0 : nBytes) >= FILE_LEVEL_THRESHOLD) + { + df_int4 nWrittenNow; + + if (iEOF < FILE_LEVEL_THRESHOLD && iEOF) + { + DocFile_DirEnt dfdeOld = dfde; + DocFile_StreamPtr dfspOut, dfspIn; + char achBuffer[FILE_LEVEL_THRESHOLD]; + ULONG nRead; + + SI4(dfde.iVTOCPosition) = DF_VTOC_EOF; + SI4(dfde.iFileSize) = 0; + dfspOut = dfsp; + dfspIn = dfsp; + dfspOut.iPosition = 0; + dfspOut.iStreamBlock = -1; + dfspOut.iExtraBlocks = 0; + dfspOut.bFileStream = TRUE; + + DF_StreamType dfst(dfspOut, dfde); + + hr = StreamSeek(dfspIn, 0); + if (hr) + return hr; + hr = Read(dfspIn, achBuffer, iEOF, nRead); + if (hr) + return hr; + if (nRead != iEOF) + return STG_E_READFAULT; + hr = WriteToFileStream(dfst, 0, achBuffer, iEOF, nWrittenNow); + if (hr) + return hr; + if (nWrittenNow != iEOF) + return STG_E_WRITEFAULT; + + FreeDataChain(SI4(dfdeOld.iVTOCPosition)); + SI4(dfde.iFileSize) = iEOF; + hr = SetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + + dfsp.bFileStream = TRUE; + dfsp.iStreamBlock = -1; + hr = StreamSeek(dfsp, dfsp.iPosition); + if (hr) + return hr; + } + + DF_StreamType dfst(dfsp, dfde); + + hr = WriteToFileStream(dfst, + dfsp.iPosition, + pvData, + nBytes, + nWrittenNow); + if (hr) + return hr; + nWritten = nWrittenNow; + } + else + { + if (dfsp.iStreamBlock == -1 && + (hr = StreamSeek(dfsp, dfsp.iPosition, 0, 0)) != 0) + return hr; + nWritten = 0; + while (nBytes) + { + while (dfsp.iExtraBlocks) + { + df_int4 nWrite; + df_int4 iBlock = -1; + df_int4 iVTBNow; + + iAddedBlocks = 1; + while (iBlock == -1) + { + df_int4 i; + + iVTBNow = iLowestFreeStreamBlock / DF_VTOC_SIZE; + if (iVTBNow != iVTOCBlock) + { + df_int4 nRead; + + hr = ReadFromFileStream(dfstDataVTOC, + iVTBNow * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nRead); + if (hr) + return hr; + if (nRead != sizeof(dfvt)) + memset(&dfvt, -1, sizeof(dfvt)); + iVTOCBlock = iVTBNow; + } + for (i = iLowestFreeStreamBlock % DF_VTOC_SIZE; + i < DF_VTOC_SIZE && iBlock == -1; + i++, iLowestFreeStreamBlock++) + { + df_int4 iNow = SI4(dfvt.aiBlocks[i]); + + if (iNow == DF_VTOC_FREE) + iBlock = iLowestFreeStreamBlock; + } + } + SI4(dfvt.aiBlocks[iBlock % DF_VTOC_SIZE]) = DF_VTOC_EOF; + hr = WriteToFileStream(dfstDataVTOC, + iVTOCBlock * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nWrite); + if (hr) + return hr; + if (nWrite != sizeof(dfvt)) + return E_FAIL; + + if (dfsp.iStreamBlock != DF_VTOC_EOF) + { + iVTBNow = dfsp.iStreamBlock / DF_VTOC_SIZE; + + if (iVTBNow != iVTOCBlock) + { + df_int4 nRead; + + hr = ReadFromFileStream(dfstDataVTOC, + iVTBNow * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nRead); + if (hr) + return hr; + if (nRead != sizeof(dfvt)) + return E_FAIL; + iVTOCBlock = iVTBNow; + } + SI4(dfvt.aiBlocks[dfsp.iStreamBlock % DF_VTOC_SIZE]) = iBlock; + hr = WriteToFileStream(dfstDataVTOC, + iVTOCBlock * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nWrite); + if (hr) + return hr; + if (nWrite != sizeof(dfvt)) + return E_FAIL; + } + else + { + SI4(dfde.iVTOCPosition) = iBlock; + hr = SetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + } + + dfsp.iStreamBlock = iBlock; + dfsp.iExtraBlocks--; + WriteToFileStream(dfstData, + iBlock * DF_STREAM_BLOCK_SIZE, + achZeroes, + sizeof(achZeroes), + nWrite); + } + + if (nBytes == (ULONG) -1) + { + nBytes = 0; + } + else + { + df_int4 nWrittenNow; + df_int4 iOffset = dfsp.iPosition % DF_STREAM_BLOCK_SIZE; + df_int4 nBytesNow = DF_STREAM_BLOCK_SIZE - iOffset; + + if (nBytesNow > nBytes) + nBytesNow = nBytes; + hr = WriteToFileStream(dfstData, + dfsp.iStreamBlock * DF_STREAM_BLOCK_SIZE + iOffset, + pvData, + nBytesNow, + nWrittenNow); + if (hr) + return hr; + if (nWrittenNow != nBytesNow) + return E_FAIL; + nWritten += nBytesNow; + pvData = (char const *) pvData + nBytesNow; + nBytes -= nBytesNow; + hr = StreamSeek(dfsp, nBytesNow, 0, 1); + if (hr) + return hr; + } + } + } + if (dfsp.iPosition > iEOF) + SI4(dfde.iFileSize) = dfsp.iPosition; + GetTimeNow(ft); + SI4(dfde.iModifiedLow) = ft.dwLowDateTime; + SI4(dfde.iModifiedHigh) = ft.dwHighDateTime; + hr = SetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + if (iAddedBlocks) + { + hr = GetDirectoryEntry(0, &dfde); + if (hr) + return hr; + iFileSize = iLowestFreeStreamBlock * DF_STREAM_BLOCK_SIZE; + if (SI4(dfde.iFileSize) < iFileSize) + { + SI4(dfde.iFileSize) = iFileSize; + hr = SetDirectoryEntry(0, &dfde); + if (hr) + return hr; + } + } + return S_OK; +} + +HRESULT +DocFileManager::SetStreamSize( DocFile_StreamPtr &dfsp, + ULONG iSize) +{ + HRESULT hr; + df_int4 iEOF; + DocFile_DirEnt dfde; + FILETIME ft; + BOOL bFileLevel; + + hr = GetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + iEOF = SI4(dfde.iFileSize); + if (iSize != iEOF) + { + DocFile_StreamPtr dfsp_ = dfsp; + ULONG nWritten; + + bFileLevel = (iEOF >= FILE_LEVEL_THRESHOLD); + dfsp_.bFileStream = bFileLevel; // Insurance + if (iSize) + { + hr = StreamSeek(dfsp_, iSize - 1); + if (hr) + return hr; + } + if (iSize > iEOF) + { + hr = Write(dfsp_, 0, (ULONG) -1, nWritten); + if (hr) + return hr; + } + else + { + df_int4 iChain; + + if (iSize) + { + df_int4 nWritten; + df_int4 nRead; + df_int4 iVTOCPos; + DocFile_VTOC dfvt; + int iLoc; + df_int4 iVTOCBlock; + + iVTOCPos = dfsp_.iStreamBlock / DF_VTOC_SIZE; + + if (bFileLevel) + { + iVTOCBlock = FindVTOCBlock(iVTOCPos); + hr = GetBlock(&dfvt, iVTOCBlock); + nRead = sizeof(dfvt); + } + else + { + hr = ReadFromFileStream(dfstDataVTOC, + iVTOCPos * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nRead); + } + if (hr) + return hr; + if (nRead != sizeof(dfvt)) + return STG_E_READFAULT; + + iLoc = dfsp_.iStreamBlock % DF_VTOC_SIZE; + iChain = SI4(dfvt.aiBlocks[iLoc]); + SI4(dfvt.aiBlocks[iLoc]) = DF_VTOC_EOF; + if (bFileLevel) + { + hr = SetBlock(&dfvt, iVTOCBlock); + nWritten = sizeof(dfvt); + } + else + { + hr = WriteToFileStream(dfstDataVTOC, + iVTOCPos * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nWritten); + } + if (hr) + return hr; + if (nWritten != sizeof(dfvt)) + return STG_E_WRITEFAULT; + } + else + { + dfsp.bFileStream = dfsp_.bFileStream = FALSE; + iChain = SI4(dfde.iVTOCPosition); + SI4(dfde.iVTOCPosition) = DF_VTOC_EOF; + dfsp.iStreamBlock = dfsp_.iStreamBlock = DF_VTOC_EOF; + dfsp.iExtraBlocks = dfsp_.iPosition = dfsp.iPosition / DF_STREAM_BLOCK_SIZE; + } + + SI4(dfde.iFileSize) = iSize; + GetTimeNow(ft); + SI4(dfde.iModifiedLow) = ft.dwLowDateTime; + SI4(dfde.iModifiedHigh) = ft.dwHighDateTime; + // FIXME - Transfer from file stream to data stream if necessary + hr = SetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + if (bFileLevel) + hr = FreeFileChain(iChain); + else + hr = FreeDataChain(iChain); + if (hr) + return hr; + if (bFileLevel && + iSize < FILE_LEVEL_THRESHOLD && + iSize > 0) + { + char achBlock[FILE_LEVEL_THRESHOLD]; + df_int4 nRead; + ULONG nWritten; + df_int4 iVTOCPosition = SI4(dfde.iVTOCPosition); + + dfsp_.iPosition = 0; + dfsp_.iStreamBlock = iVTOCPosition; + dfsp_.iExtraBlocks = 0; + + DF_StreamType dfst(dfsp_, dfde); + + hr = ReadFromFileStream(dfst, + 0, + achBlock, + iSize, + nRead); + if (hr) + return hr; + if (nRead != iSize) + return STG_E_READFAULT; + hr = FreeFileChain(iVTOCPosition); + if (hr) + return hr; + SI4(dfde.iVTOCPosition) = DF_VTOC_EOF; + dfde.iFileSize = 0; + dfsp_.iPosition = -1; + dfsp_.bFileStream = FALSE; + hr = SetDirectoryEntry(dfsp.iDirectoryEntry, &dfde); + if (hr) + return hr; + hr = StreamSeek(dfsp_, 0); + if (hr) + return hr; + hr = Write(dfsp_, achBlock, iSize, nWritten); + if (hr) + return hr; + if (nWritten != iSize) + return STG_E_WRITEFAULT; + hr = StreamSeek(dfsp_, dfsp.iPosition); + if (hr) + return hr; + dfsp = dfsp_; + } + else if (dfsp.iPosition > iSize) + { + hr = StreamSeek(dfsp_, dfsp.iPosition); + if (hr) + return hr; + dfsp = dfsp_; + } + } + } + return S_OK; +} + +HRESULT +DocFileManager::FreeFileChain(df_int4 iChain) +{ + DocFile_VTOC dfvt; + long iVTOCPosition = -1; + HRESULT hr; + df_int4 iVTOCBlock; + + while (iChain != DF_VTOC_EOF) + { + int iLoc; + df_int4 iVTOCPosNow = iChain / DF_VTOC_SIZE; + + if (iVTOCPosNow != iVTOCPosition) + { + if (iVTOCPosition != -1) + { + hr = SetBlock(&dfvt, iVTOCBlock); + if (hr) + return hr; + } + iVTOCBlock = FindVTOCBlock(iVTOCPosNow); + hr = GetBlock(&dfvt, iVTOCBlock); + if (hr) + return hr; + iVTOCPosition = iVTOCPosNow; + } + iLoc = iChain % DF_VTOC_SIZE; + pchVTOC[iChain >> 3] &= ~(1 << (iChain & 7)); + iChain = SI4(dfvt.aiBlocks[iLoc]); + SI4(dfvt.aiBlocks[iLoc]) = DF_VTOC_FREE; + } + if (iVTOCPosition != -1) + { + hr = SetBlock(&dfvt, iVTOCBlock); + if (hr) + return hr; + } + return S_OK; +} + +void +DocFileManager::ShrinkDataStream( df_int4 iVTOCPosition, + DocFile_VTOC &dfvt_) +{ + HRESULT hr; + DocFile_VTOC dfvt = dfvt_; + df_int4 iBlock = GetTotalStreamBlocks(dfstData) - 1; + df_int4 iStartBlock = iBlock; + int iOffset = iBlock % DF_VTOC_SIZE; + + if (iVTOCPosition * DF_VTOC_SIZE > iBlock) + return; + while (iBlock >= 0 && SI4(dfvt.aiBlocks[iOffset]) == DF_VTOC_FREE) + { + iBlock--; + if (iOffset) + { + iOffset--; + } + else + { + iVTOCPosition--; + if (iBlock >= 0) + { + df_int4 nRead; + + hr = ReadFromFileStream(dfstDataVTOC, + iVTOCPosition * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nRead); + if (hr) + break; + if (nRead != sizeof(dfvt)) + break; + iOffset = DF_VTOC_SIZE - 1; + } + } + } + if (iStartBlock != iBlock) + { + BOOL bLinkRemoved = FALSE; + DocFile_StreamInfo &dfsi = adfsi[StreamTypeToIndex(dfstData)]; + df_int4 iFileBlock = dfsi.GetBlock(iVTOCPosition + 1); + + dfsi.SetTotalBlocks(iBlock + 1); + if (iBlock >= 0) + { + df_int4 iFileBlockLast = dfsi.GetBlock(iBlock); + df_int4 iVTOCBlock = FindVTOCBlock(iFileBlockLast / DF_VTOC_SIZE); + + if (!GetBlock(&dfvt, iVTOCBlock)) + { + SI4(dfvt.aiBlocks[iFileBlockLast % DF_VTOC_SIZE]) = DF_VTOC_EOF; + if (!SetBlock(&dfvt, iVTOCBlock)) + bLinkRemoved = TRUE; + } + } + else if (!GetHeader()) + { + dfh.iHasData = 0; + if (!ReleaseHeader(TRUE)) + { + DocFile_DirEnt dfde; + + if (!GetDirectoryEntry(0, &dfde)) + { + dfde.iFileSize = 0; + SI4(dfde.iVTOCPosition) = DF_VTOC_EOF; + if (!SetDirectoryEntry(0, &dfde)) + bLinkRemoved = TRUE; + } + } + } + if (bLinkRemoved) + FreeFileChain(iFileBlock); + } +} + +HRESULT +DocFileManager::FreeDataChain(df_int4 iChain) +{ + DocFile_VTOC dfvt; + long iVTOCPosition = -1; + HRESULT hr; + + while (iChain != DF_VTOC_EOF) + { + int iLoc; + df_int4 iVTOCPosNow = iChain / DF_VTOC_SIZE; + + if (iVTOCPosNow != iVTOCPosition) + { + df_int4 nRead; + + if (iVTOCPosition != -1) + { + df_int4 nWritten; + + hr = WriteToFileStream(dfstDataVTOC, + iVTOCPosition * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nWritten); + if (hr) + return hr; + if (nWritten != sizeof(dfvt)) + return E_FAIL; + ShrinkDataStream(iVTOCPosition, dfvt); + } + hr = ReadFromFileStream(dfstDataVTOC, + iVTOCPosNow * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nRead); + if (hr) + return hr; + if (nRead != sizeof(dfvt)) + return E_FAIL; + iVTOCPosition = iVTOCPosNow; + } + iLoc = iChain % DF_VTOC_SIZE; + iChain = SI4(dfvt.aiBlocks[iLoc]); + SI4(dfvt.aiBlocks[iLoc]) = DF_VTOC_FREE; + } + if (iVTOCPosition != -1) + { + df_int4 nWritten; + + hr = WriteToFileStream(dfstDataVTOC, + iVTOCPosition * DF_BLOCK_SIZE, + &dfvt, + sizeof(dfvt), + nWritten); + if (hr) + return hr; + if (nWritten != sizeof(dfvt)) + return E_FAIL; + ShrinkDataStream(iVTOCPosition, dfvt); + } + return S_OK; +} diff -uN no-docfile/dfmgr.h docfile/dfmgr.h --- no-docfile/dfmgr.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfmgr.h 2004-02-05 09:00:38.000000000 +1100 @@ -0,0 +1,268 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __DFMGR_H +#define __DFMGR_H +#ifndef __DOCFILE_H +#include "docfile.h" +#endif + +class DF_RBNode; + +enum DF_StreamTypeEnum +{ + DFST_Directory, + DFST_DataVTOC, + DFST_Data, + DFST_IStream +}; + +class DF_StreamType +{ +private: + DF_StreamTypeEnum dfste; + + DocFile_StreamPtr &dfsp; + DocFile_DirEnt &dfde; + df_int4 iTotalBlocks; + +public: + inline + DF_StreamType( DF_StreamTypeEnum dfste_) : + dfste(dfste_), + dfsp(*(DocFile_StreamPtr *) 0), + dfde(*(DocFile_DirEnt *) 0) + { + } + + inline + DF_StreamType( DocFile_StreamPtr &dfsp_, + DocFile_DirEnt &dfde_) : + dfste(DFST_IStream), + dfsp(dfsp_), + dfde(dfde_) + { + df_int4 iEOF = SI4(dfde.iFileSize); + iTotalBlocks = 0; + + while (iEOF > 0) + iTotalBlocks++, iEOF -= DF_BLOCK_SIZE; + } + + inline DF_StreamTypeEnum + GetType(void) + { + return dfste; + } + + inline DocFile_DirEnt & + GetDirEnt(void) + { + return dfde; + } + + inline DocFile_StreamPtr & + GetStreamPointer(void) + { + return dfsp; + } + + inline df_int4 + GetTotalBlocks(void) + { + return iTotalBlocks; + } + + inline void + AddedBlock(void) + { + iTotalBlocks++; + } +}; + +class DocFile_StreamInfo +{ +private: + df_int4 nBlocks; + df_int4 nPositions; + unsigned char *pchBlocks; + +public: + DocFile_StreamInfo(void) : + nBlocks(0), + nPositions(0), + pchBlocks(0) + { + } + + inline + ~DocFile_StreamInfo(void) + { + if (pchBlocks) + delete [] pchBlocks; + } + + inline df_int4 + GetTotalBlocks(void) + { + return nBlocks; + } + + inline void + SetTotalBlocks(df_int4 nBlocks_) + { + nBlocks = nBlocks_; + } + + df_int4 GetBlock( df_int4 iStreamBlock); + void SetBlock( df_int4 iStreamBlock, + df_int4 iFileBlock); +}; + +enum DFLocType +{ + DFLT_Find, + DFLT_Create, + DFLT_Insert, + DFLT_Delete, + DFLT_Remove +}; + +#define MAX_EXTVTOCS 517 + +class DocFileManager : public IUnknown, + public DocFileReferenceCounter, + public DocFileInternalFunctions +{ +private: + ILockBytes *pilb; + DocFile_Header dfh; + int nHeaderRef; + BOOL bChanged; + df_int4 iLowestFreeStreamBlock; + df_int4 aiExtVTOCs[MAX_EXTVTOCS]; + int nExtVTOCs; + + int iVTOCSize; + char *pchVTOC; + DocFile_StreamInfo adfsi[3]; + + int StreamTypeToIndex(DF_StreamType &dfst); + + HRESULT ExtendVTOC(void); + df_int4 FindVTOCBlock( df_int4 iBlock); + + df_int4 GetTotalStreamBlocks(DF_StreamType &dfst); + df_int4 GetStreamBlock( DF_StreamType &dfst, + df_int4 iBlockNum); + HRESULT ExtendFileStream(DF_StreamType &dfst, + df_int4 iBlockNum); + HRESULT ReadFromFileStream( DF_StreamType &dfst, + df_int4 iLocation, + void *pvData, + df_int4 nBytes, + df_int4 &nRead); + HRESULT WriteToFileStream( DF_StreamType &dfst, + df_int4 iLocation, + void const *pvData, + df_int4 nBytes, + df_int4 &nWritten); + + HRESULT GetBlock(void *pvData, + long iBlock); + HRESULT SetBlock(void const *pvData, + long iBlock); + HRESULT LockBlock(long iBlock, + DWORD dwLockType); + HRESULT UnlockBlock(long iBlock, + DWORD dwLockType); + void ShrinkDataStream( df_int4 iVTOCPosition, + DocFile_VTOC &dfvt_); + inline HRESULT + GetHeader(void) + { + if (!nHeaderRef++) + { + bChanged = FALSE; + return GetBlock(&dfh, -1); + } + return 0; + } + + inline HRESULT + ReleaseHeader(BOOL bChanged_) + { + if (bChanged_) + bChanged = TRUE; + if ((!nHeaderRef || !--nHeaderRef) && bChanged) + return SetBlock(&dfh, -1); + return 0; + } + +protected: + ~DocFileManager(void); + +public: + DocFileManager(ILockBytes *pilb_); + + HRESULT DF_STDCALL QueryInterface(REFIID riid, + void **ppvObj); + ULONG DF_STDCALL AddRef(void) ; + ULONG DF_STDCALL Release(void); + + HRESULT AnnihilateEntry( df_int4 iEntry, + BOOL bSiblingsToo = FALSE); + df_int4 UnlinkEntry( df_int4 iEntry); + HRESULT LocateChild( df_int4 iParentLocation, + df_char_t const *pchName, + DocFile_DirEnt &dfde, + df_int4 &iEntryLocation, + DFLocType dflt, + BOOL bStart = TRUE, + DF_RBNode **ppnParent = 0); + HRESULT GetDirectoryEntry( df_int4 iLocation, + DocFile_DirEnt *pdfeNew); + HRESULT SetDirectoryEntry( df_int4 iLocation, + DocFile_DirEnt *pdfe); + void SetName( DocFile_DirEnt *pdfe, + df_char_t const *pchName); + + void InitNewFile(void); + HRESULT InitOldFile(void); + void InitDirBlock( DocFile_DirEnt *pdfde, + int nEntries = DF_DE_PER_BLOCK); + + HRESULT StreamSeek( DocFile_StreamPtr &dfsp, + df_int4 iLoc, + df_int4 *piNewLoc = 0, + int iWhence = 0); + HRESULT Read( DocFile_StreamPtr &dfsp, + void *pvData, + ULONG nBytes, + ULONG &nRead); + HRESULT Write( DocFile_StreamPtr &dfsp, + void const *pvData, + ULONG nBytes, + ULONG &nWritten); + HRESULT FreeDataChain( df_int4 iChain); + HRESULT FreeFileChain( df_int4 iChain); + HRESULT SetStreamSize( DocFile_StreamPtr &dfsp, + ULONG iSize); +}; +#endif /* __DFMGR_H */ diff -uN no-docfile/dfo.cpp docfile/dfo.cpp --- no-docfile/dfo.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfo.cpp 2004-02-05 08:58:39.000000000 +1100 @@ -0,0 +1,135 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfo.cpp,v 1.4 2002/01/23 05:51:43 borgia Exp $"; +#include "docfile.h" +#include "dfmgr.h" +#include <string.h> + +DocFileObject::DocFileObject( DocFileStorage *pdfsParent_, + df_char_t const *pchName_, + DocFileManager *pdfm_, + HRESULT &hr, + df_byte iType, + BOOL bMustExist, + DWORD dwMode_) : + pdfsParent(pdfsParent_), + pchName(0), + pdfm(pdfm_), + dwMode(dwMode_) +{ + pdfm->AddRef(); + if (!pdfsParent) + { + iEntryNumber = 0; + } + else if (!pchName_) + { + *(char *) 0 = 0; + } + else + { + pchName = new df_char_t[df_strlen(pchName_) + 1]; + + pdfsParent->AddRef(); + df_strcpy(pchName, pchName_); + + hr = FindEntry(bMustExist, iType); + if (hr) + return; + } + hr = 0; +} + +DocFileObject::DocFileObject( DocFileObject *pdfo, + HRESULT &hr) : + pdfsParent(pdfo->pdfsParent), + pchName(0), + pdfm(pdfo->pdfm), + dwMode(pdfo->dwMode), + iEntryNumber(pdfo->iEntryNumber) +{ + pdfm->AddRef(); + if (pdfsParent) + { + pchName = new df_char_t[df_strlen(pdfo->pchName) + 1]; + + pdfsParent->AddRef(); + df_strcpy(pchName, pdfo->pchName); + } + hr = 0; +} + +DocFileObject::~DocFileObject(void) +{ + pdfm->Release(); + if (pchName) + delete [] pchName; + if (pdfsParent) + pdfsParent->Release(); +} + +HRESULT +DocFileObject::FindEntry(BOOL bMustExist, + df_byte iType) +{ + DocFile_DirEnt dfe; + HRESULT hr; + + hr = pdfm->LocateChild( pdfsParent->GetEntryNumber(), + pchName, + dfe, + iEntryNumber, + bMustExist ? DFLT_Find : DFLT_Create); + if (!bMustExist) + { + if (hr == STG_E_FILEALREADYEXISTS) + { + hr = 0; + } + else if (!hr) + { + dfe.iFileType = iType; + hr = pdfm->SetDirectoryEntry(iEntryNumber, &dfe); + } + } + if (!hr && dfe.iFileType != iType) + hr = STG_E_FILEALREADYEXISTS; + return hr; +} + +HRESULT +DocFileObject::Stat( STATSTG *pss, + DWORD iStatFlags) +{ + DocFile_DirEnt dfde; + HRESULT hr = pdfm->GetDirectoryEntry(iEntryNumber, &dfde); + df_int4 i1; + df_int2 i2; + + if (!hr) + { + PopulateStatStg(pss, + (iStatFlags & STATFLAG_NONAME) ? TRUE : FALSE, + dfde); + pss->grfMode = dwMode; + } + return hr; +} + diff -uN no-docfile/dfrc.cpp docfile/dfrc.cpp --- no-docfile/dfrc.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfrc.cpp 2004-02-05 08:58:51.000000000 +1100 @@ -0,0 +1,46 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfrc.cpp,v 1.2 1998/06/26 01:50:04 ttsc Exp $"; +#include "docfile.h" + +DocFileReferenceCounter::DocFileReferenceCounter(void) : + nRef(1) +{ +} + +DocFileReferenceCounter::~DocFileReferenceCounter(void) +{ +} + +ULONG +DocFileReferenceCounter::RCAddRef(void) +{ + return ++nRef; +} + +ULONG +DocFileReferenceCounter::RCRelease(void) +{ + ULONG nRef_ = --nRef; + + if (!nRef_) + delete this; + return nRef_; +} diff -uN no-docfile/dfstg.cpp docfile/dfstg.cpp --- no-docfile/dfstg.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfstg.cpp 2004-02-05 08:59:42.000000000 +1100 @@ -0,0 +1,529 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfstg.cpp,v 1.5 2002/01/24 02:11:18 borgia Exp $"; +#include "docfile.h" +#include "dfmgr.h" +#include "dfess.h" +#include <string.h> +#include <stdlib.h> + +DocFileStorage::DocFileStorage( DocFileStorage *pdfsParent_, + df_char_t const *pchName_, + DWORD dwMode_, + DocFileManager *pdfm_, + HRESULT &hr, + BOOL bMustExist) : + DocFileObject( pdfsParent_, + pchName_, + pdfm_, + hr, + pdfsParent_ ? DF_FT_STORAGE : DF_FT_ROOT, + bMustExist, + dwMode_) +{ + df_int4 iEntry = GetEntryNumber(); + DocFile_DirEnt dfde; + + pdfm->GetDirectoryEntry(iEntry, &dfde); +} + +DocFileStorage::~DocFileStorage(void) +{ +} + +DEFINE_REFCOUNT(DocFileStorage) + +HRESULT DF_STDCALL +DocFileStorage::CreateStream(df_char_t const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStream **ppstm) +{ + HRESULT hr; + + *ppstm = new DocFileStream(this, pchName, pdfm, iMode, FALSE, hr); + if (hr) + { + (*ppstm)->Release(); + *ppstm = 0; + } + return hr; +} + + +HRESULT DF_STDCALL +DocFileStorage::OpenStream(df_char_t const *pchName, + void *reserved1, + DWORD iMode, + DWORD reserved2, + IStream **ppstm) +{ + HRESULT hr; + + *ppstm = new DocFileStream(this, pchName, pdfm, iMode, TRUE, hr); + if (hr) + { + (*ppstm)->Release(); + *ppstm = 0; + } + return hr; +} + + +HRESULT DF_STDCALL +DocFileStorage::CreateStorage(df_char_t const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStorage **ppstg) +{ + HRESULT hr; + + *ppstg = new DocFileStorage(this, pchName, iMode, pdfm, hr, FALSE); + if (hr) + { + (*ppstg)->Release(); + *ppstg = 0; + } + return hr; +} + + +HRESULT DF_STDCALL +DocFileStorage::OpenStorage(df_char_t const *pchName, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstg) +{ + HRESULT hr; + + *ppstg = new DocFileStorage(this, pchName, iMode, pdfm, hr, TRUE); + if (hr) + { + (*ppstg)->Release(); + *ppstg = 0; + } + return hr; +} + + +HRESULT DF_STDCALL +DocFileStorage::CopyTo( DWORD nExclude, + IID const *piidExclude, + SNB snbExclude, + IStorage *pstgDest) +{ + IEnumSTATSTG *piess = 0; + STATSTG ss; + ULONG nFetched; + HRESULT hr; + int i; + BOOL bBanished; + + if (!piidExclude || nExclude) + { + hr = EnumElements(0, 0, 0, &piess); + while (!hr) + { + hr = piess->Next(1, &ss, &nFetched); + if (!hr) + { + if (!nFetched) + break; + bBanished = FALSE; + if (snbExclude) + { + for (i = 0; snbExclude[i] && !bBanished; i++) + { + if (!df_stricmp(snbExclude[i], ss.pwcsName)) + bBanished = TRUE; + } + } + for (i = 0; i < nExclude && !bBanished; i++) + { + if (!memcmp(&piidExclude[i], + ss.type == STGTY_STREAM ? + &IID_IStream : + &IID_IStorage, + sizeof(GUID))) + bBanished = TRUE; + } + + if (!bBanished) + { + switch(ss.type) + { + case STGTY_STREAM: + { + IStream *pstrSrc, *pstrDst; + hr = OpenStream(ss.pwcsName, + 0, + STGM_READ, + 0, + &pstrSrc); + if (!hr) + { + hr = CreateStream(ss.pwcsName, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + 0, + 0, + &pstrDst); + if (!hr) + { + ULARGE_INTEGER uliSize; + + uliSize = ss.cbSize; + hr = pstrSrc->CopyTo(pstrDst, uliSize, 0, 0); + pstrDst->Release(); + } + pstrSrc->Release(); + } + } + break; + + default: + { + IStorage *pstgSrc, *pstgDst; + + hr = OpenStorage(ss.pwcsName, + 0, + STGM_READ, + 0, + 0, + &pstgSrc); + if (!hr) + { + hr = pstgDest->CreateStorage(ss.pwcsName, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + 0, + 0, + &pstgDst); + if (!hr) + { + hr = pstgSrc->CopyTo(0, 0, 0, pstgDst); + pstgDst->Release(); + } + pstgSrc->Release(); + } + } + break; + } + if (!hr) + hr = pstgDest->SetElementTimes(ss.pwcsName, + &ss.ctime, + &ss.atime, + &ss.mtime); + } + free(ss.pwcsName); + } + } + if (piess) + piess->Release(); + } + else + { + hr = 0; + } + if (!hr) + { + hr = Stat(&ss, STATFLAG_NONAME); + + if (!hr) + { + hr = pstgDest->SetStateBits(ss.grfStateBits, (df_uint4) -1); + if (!hr) + { + hr = pstgDest->SetClass(ss.clsid); + } + } + } + return hr; +} + + +HRESULT DF_STDCALL +DocFileStorage::MoveElementTo(df_char_t const *pchOldName, + IStorage *pstgDest, + df_char_t const *pchNewName, + DWORD iFlags) +{ + HRESULT hr; + df_int4 iEntry; + DocFile_DirEnt dfde; + df_int4 iParent = GetEntryNumber(); + + hr = pdfm->LocateChild( iParent, + pchOldName, + dfde, + iEntry, + DFLT_Find); + if (!hr) + { + switch(dfde.iFileType) + { + case DF_FT_STREAM: + { + IStream *pstrSrc, *pstrDst; + + hr = OpenStream(pchOldName, + 0, + STGM_READ, + 0, + &pstrSrc); + if (!hr) + { + hr = CreateStream(pchNewName, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + 0, + 0, + &pstrDst); + if (!hr) + { + ULARGE_INTEGER uliSize; + + uliSize.u.LowPart = SI4(dfde.iFileSize); + uliSize.u.HighPart = 0; + hr = pstrSrc->CopyTo(pstrDst, uliSize, 0, 0); + pstrDst->Release(); + } + pstrSrc->Release(); + } + } + break; + + default: + { + IStorage *pstgSrc, *pstgDst; + + hr = OpenStorage(pchOldName, + 0, + STGM_READ, + 0, + 0, + &pstgSrc); + if (!hr) + { + hr = pstgDest->CreateStorage(pchNewName, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, + 0, + 0, + &pstgDst); + if (!hr) + { + hr = pstgSrc->CopyTo(0, 0, 0, pstgDst); + pstgDst->Release(); + } + pstgSrc->Release(); + } + } + break; + } + if (!hr && iFlags == STGMOVE_MOVE) + hr = DestroyElement(pchOldName); + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::Commit( DWORD iCommitFlags) +{ + return 0; +} + +HRESULT DF_STDCALL +DocFileStorage::Revert(void) +{ + return E_FAIL; +} + +HRESULT DF_STDCALL +DocFileStorage::EnumElements(DWORD reserved1, + void *reserved2, + DWORD reserved3, + IEnumSTATSTG **ppiess) +{ + HRESULT hr = S_OK; + + *ppiess = new DocFileEnumStatStg(this, hr); + if (hr) + { + (*ppiess)->Release(); + *ppiess = 0; + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::DestroyElement(df_char_t const *pchName) +{ + HRESULT hr; + df_int4 iEntry; + DocFile_DirEnt dfde; + + hr = pdfm->LocateChild( GetEntryNumber(), + pchName, + dfde, + iEntry, + DFLT_Delete); + if (!hr) + hr = pdfm->AnnihilateEntry(iEntry); + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::RenameElement(df_char_t const *pchOldName, + df_char_t const *pchNewName) +{ + HRESULT hr; + df_int4 iEntry; + DocFile_DirEnt dfde; + df_int4 iParent = GetEntryNumber(); + + hr = pdfm->LocateChild( iParent, + pchOldName, + dfde, + iEntry, + DFLT_Find); + if (!hr) + { + hr = pdfm->LocateChild( iParent, + pchOldName, + dfde, + iEntry, + DFLT_Remove); + if (!hr) + { + pdfm->SetName(&dfde, pchNewName); + hr = pdfm->SetDirectoryEntry(iEntry, &dfde); + + if (!hr) + { + hr = pdfm->LocateChild( iParent, + pchNewName, + dfde, + iEntry, + DFLT_Insert); + } + } + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::SetElementTimes(df_char_t const *lpszName, + FILETIME const *pftCreated, + FILETIME const *, + FILETIME const *pftModified) +{ + DocFile_DirEnt dfde; + df_int4 iLocation; + HRESULT hr; + + if (pftModified || pftCreated) + { + hr = pdfm->LocateChild( GetEntryNumber(), + lpszName, + dfde, + iLocation, + DFLT_Find); + if (!hr) + { + if (pftCreated) + { + SI4(dfde.iCreatedLow) = pftCreated->dwLowDateTime; + SI4(dfde.iCreatedHigh) = pftCreated->dwHighDateTime; + } + if (pftModified) + { + SI4(dfde.iModifiedLow) = pftModified->dwLowDateTime; + SI4(dfde.iModifiedHigh) = pftModified->dwHighDateTime; + } + hr = pdfm->SetDirectoryEntry(iLocation, &dfde); + } + } + else + { + hr = S_OK; + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::SetClass(REFCLSID clsid) +{ + HRESULT hr; + df_int4 iEntry = GetEntryNumber(); + DocFile_DirEnt dfe; + + hr = pdfm->GetDirectoryEntry(iEntry, &dfe); + if (!hr) + { + struct + { + df_int4 i1; + df_int2 i2; + } ints; + + SI4(ints.i1) = clsid.Data1; + memcpy(dfe.achClassID, &ints.i1, 4); + SI2(ints.i2) = clsid.Data2; + memcpy(dfe.achClassID + 4, &ints.i2, 2); + SI2(ints.i2) = clsid.Data3; + memcpy(dfe.achClassID + 6, &ints.i2, 2); + memcpy(dfe.achClassID + 8, clsid.Data4, 8); + hr = pdfm->SetDirectoryEntry(iEntry, &dfe); + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::SetStateBits(DWORD iStateBits, + DWORD giMask) +{ + HRESULT hr; + DocFile_DirEnt dfe; + df_int4 iEntry = GetEntryNumber(); + + hr = pdfm->GetDirectoryEntry(iEntry, &dfe); + if (!hr) + { +#ifdef DF_INTEL_BYTE_ORDER + df_int4 &si = dfe.iStateBits; +#else + __CV_SI4 si(dfe.iStateBits); +#endif + + si = (si & ~giMask) | iStateBits; + hr = pdfm->SetDirectoryEntry(iEntry, &dfe); + } + return hr; +} + +HRESULT DF_STDCALL +DocFileStorage::Stat(STATSTG *pstatstg, + DWORD iStatFlags) +{ + return DocFileObject::Stat(pstatstg, iStatFlags); +} + + diff -uN no-docfile/dfstream.cpp docfile/dfstream.cpp --- no-docfile/dfstream.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dfstream.cpp 2004-02-05 08:59:48.000000000 +1100 @@ -0,0 +1,215 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: dfstream.cpp,v 1.7 1999/01/20 05:05:05 ttsc Exp $"; +#include "docfile.h" +#include "dfmgr.h" + +DocFileStream::DocFileStream( DocFileStorage *pdfsParent_, + char const *pchName_, + DocFileManager *pdfm_, + DWORD dwMode_, + BOOL bMustExist, + HRESULT &hr) : + DocFileObject( pdfsParent_, + pchName_, + pdfm_, + hr, + DF_FT_STREAM, + bMustExist, + dwMode_) +{ + if (!hr) + { + dfsp.iDirectoryEntry = GetEntryNumber(); + pdfm->StreamSeek(dfsp, 0); + } +} + +DocFileStream::DocFileStream( DocFileStream *pstr, + HRESULT &hr) : + DocFileObject( pstr, + hr), + dfsp(pstr->dfsp) +{ + dfsp = pstr->dfsp; +} + +DocFileStream::~DocFileStream(void) +{ +} + +DEFINE_REFCOUNT(DocFileStream) + +HRESULT +DocFileStream::Read( VOID *pvData, + ULONG nBytes, + ULONG *pnRead) +{ + HRESULT hr; + ULONG nRead; + + hr = pdfm->Read(dfsp, pvData, nBytes, nRead); + if (!hr && pnRead) + *pnRead = nRead; + return hr; +} + +HRESULT +DocFileStream::Write( VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten) +{ + HRESULT hr; + ULONG nWritten; + + hr = pdfm->Write(dfsp, pvData, nBytes, nWritten); + if (!hr && pnWritten) + *pnWritten = nWritten; + return hr; +} + +HRESULT +DocFileStream::Seek( LARGE_INTEGER iMove, + DWORD dwOrigin, + ULARGE_INTEGER *piNewPosition) +{ + HRESULT hr; + df_int4 iLoc; + df_int4 iNew; + + hr = Translate(&iLoc, &iMove); + if (!hr) + { + hr = pdfm->StreamSeek(dfsp, iLoc, &iNew, dwOrigin); + if (!hr) + hr = Translate(piNewPosition, iNew); + } + return hr; +} + +HRESULT +DocFileStream::SetSize(ULARGE_INTEGER iNewSize) +{ + HRESULT hr; + df_int4 iSize; + + hr = Translate(&iSize, &iNewSize); + if (!hr) + hr = pdfm->SetStreamSize(dfsp, iSize); + return hr; +} + +HRESULT +DocFileStream::CopyTo( IStream *pstm, + ULARGE_INTEGER nBytes_, + ULARGE_INTEGER *pnRead, + ULARGE_INTEGER *pnWritten) +{ + HRESULT hr = S_OK; + df_int4 nBytes; + char achBuffer[DF_BLOCK_SIZE]; + df_int4 nRead = 0; + df_int4 nWritten = 0; + + hr = Translate(&nBytes, &nBytes_); + if (hr) + return hr; + while (nBytes) + { + long nBytesNow = nBytes; + ULONG nReadNow; + ULONG nWrittenNow; + + if (DF_BLOCK_SIZE < nBytesNow) + nBytesNow = DF_BLOCK_SIZE; + hr = pdfm->Read(dfsp, achBuffer, nBytesNow, nReadNow); + if (hr) + break; + if (!nReadNow) + break; + nRead += nReadNow; + hr = pstm->Write(achBuffer, nRead, &nWrittenNow); + if (hr) + break; + if (nReadNow != nWrittenNow) + { + hr = E_FAIL; + break; + } + nWritten += nWrittenNow; + nBytes -= nBytesNow; + } + if (pnRead) + Translate(pnRead, nRead); + if (pnWritten) + Translate(pnWritten, nWritten); + return hr; +} + +HRESULT +DocFileStream::Commit( DWORD iCommitFlags) +{ + return S_OK; +} + +HRESULT +DocFileStream::Revert(void) +{ + return S_OK; +} + +HRESULT +DocFileStream::LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) +{ + return S_OK; +} + +HRESULT +DocFileStream::UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) +{ + return S_OK; +} + +HRESULT +DocFileStream::Stat( STATSTG *pss, + DWORD iStatFlags) +{ + return DocFileObject::Stat(pss, iStatFlags); +} + +HRESULT +DocFileStream::Clone( IStream **ppstm) +{ + HRESULT hr = S_OK; + + *ppstm = new DocFileStream(this, hr); + if (hr) + { + (*ppstm)->Release(); + *ppstm = 0; + } + return hr; +} + + diff -uN no-docfile/dftypes.h docfile/dftypes.h --- no-docfile/dftypes.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/dftypes.h 2004-02-05 09:00:50.000000000 +1100 @@ -0,0 +1,112 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __DFTYPES_H +#define __DFTYPES_H + +#if defined(__alpha__) && defined(__osf__) +#define BITS_64 +#define DF_INTEL_BYTE_ORDER +#else +#define BITS_32 +#endif + +#ifdef BITS_64 +typedef unsigned df_uint4; +typedef int df_int4; +typedef unsigned short df_uint2; +typedef short df_int2; +typedef unsigned char df_byte; +typedef short df_char; +#else +typedef unsigned long df_uint4; +typedef long df_int4; +typedef unsigned short df_uint2; +typedef short df_int2; +typedef unsigned char df_byte; +typedef short df_char; /* Actually wchar_t */ +#endif + + +#ifndef __WINDOWS_H +#ifdef BITS_64 +typedef long LONGLONG; +typedef unsigned long DWORDLONG; +#else +typedef long long LONGLONG; +typedef unsigned long long DWORDLONG; +#endif + +typedef int BOOL; +typedef df_uint4 DWORD; +typedef df_uint4 ULONG; +typedef df_int4 LONG; +typedef df_uint2 WORD; +typedef df_byte BYTE; +typedef df_uint4 HRESULT; +typedef void VOID; /* Duuuh */ +typedef char *LPSTR; +#define TRUE 1 +#define FALSE 0 + +typedef union tagULARGE_INTEGER +{ + struct + { +#ifdef DF_INTEL_BYTE_ORDER + DWORD LowPart; + DWORD HighPart; +#else + DWORD HighPart; + DWORD LowPart; +#endif + } u; + DWORDLONG QuadPart; +} ULARGE_INTEGER; + + +typedef union tagLARGE_INTEGER +{ + struct + { +#ifdef DF_INTEL_BYTE_ORDER + DWORD LowPart; + LONG HighPart; +#else + LONG HighPart; + DWORD LowPart; +#endif + } u; + LONGLONG QuadPart; +} LARGE_INTEGER; + +typedef struct tagFILETIME +{ + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME; + + +#ifndef __GUID_H +#include "guid.h" +#endif /* __GUID_H */ + +#endif /* __WINDOWS_H */ +#endif /* __DFTYPES_H */ + diff -uN no-docfile/docfile.cpp docfile/docfile.cpp --- no-docfile/docfile.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/docfile.cpp 2004-02-05 08:59:58.000000000 +1100 @@ -0,0 +1,143 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: docfile.cpp,v 1.4 1999/01/20 02:58:09 troy Exp $"; +#include <stdio.h> +#include <fcntl.h> +#include <unistd.h> +#include <string.h> +#include "docfile.h" +#include "dfmgr.h" + +HRESULT DF_STDCALL +StgIsStorageFile( char const *pchName) +{ + int fd; + unsigned char achMagic[4]; + + fd = open(pchName, O_RDONLY); + if (fd == -1) + return E_FAIL; + memset(achMagic, 0, sizeof(achMagic)); + read(fd, achMagic, sizeof(achMagic)); + close(fd); + return (achMagic[0] == 0xd0 && + achMagic[1] == 0xcf && + achMagic[2] == 0x11 && + achMagic[3] == 0xe0) ? S_OK : E_FAIL; +} + +HRESULT DF_STDCALL +StgCreateDocfile( char const *pchName, + DWORD iMode, + DWORD reserved, + IStorage **ppstgOpen) +{ + HRESULT hr; + ILockBytes *pilb; + + iMode |= STGM_CREATE; + pilb = new FileLockBytes(pchName, iMode, hr); + if (hr) + { + pilb->Release(); + return hr; + } + hr = StgCreateDocfileOnILockBytes(pilb, iMode, 0, ppstgOpen); + pilb->Release(); + return hr; +} + +HRESULT DF_STDCALL +StgOpenStorage( const char *pchName, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstgOpen) +{ + HRESULT hr; + ILockBytes *pilb; + + pilb = new FileLockBytes(pchName, iMode, hr); + if (hr) + { + pilb->Release(); + return hr; + } + hr = StgOpenStorageOnILockBytes(pilb, + pstgPriority, + iMode, + snbExclude, + 0, + ppstgOpen); + pilb->Release(); + return hr; +} + +HRESULT DF_STDCALL +StgCreateDocfileOnILockBytes(ILockBytes *plkbyt, + DWORD iMode, + DWORD reserved, + IStorage **ppstgOpen) +{ + DocFileManager *pdfm; + HRESULT hr; + + iMode |= STGM_CREATE; + pdfm = new DocFileManager(plkbyt); + pdfm->InitNewFile(); + *ppstgOpen = new DocFileStorage(0, 0, iMode, pdfm, hr, FALSE); + pdfm->Release(); + if (hr) + { + (*ppstgOpen)->Release(); + *ppstgOpen = 0; + } + return hr; +} + +HRESULT DF_STDCALL +StgOpenStorageOnILockBytes( ILockBytes *plkbyt, + IStorage *pStgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstgOpen) +{ + DocFileManager *pdfm; + HRESULT hr; + + iMode |= STGM_CREATE; + pdfm = new DocFileManager(plkbyt); + hr = pdfm->InitOldFile(); + if (hr) + { + pdfm->Release(); + return hr; + } + *ppstgOpen = new DocFileStorage(0, 0, iMode, pdfm, hr, FALSE); + pdfm->Release(); + if (hr) + { + (*ppstgOpen)->Release(); + *ppstgOpen = 0; + } + return hr; +} diff -uN no-docfile/docfile.h docfile/docfile.h --- no-docfile/docfile.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/docfile.h 2004-02-05 09:13:13.000000000 +1100 @@ -0,0 +1,553 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __DOCFILE_H +#define __DOCFILE_H + +#define DF_STDCALL +#ifndef __STORAGE_H +#include "storage.h" +#endif +typedef char df_char_t; +#define df_strlen strlen +#define df_strcpy strcpy +#define df_stricmp stricmp + +#ifndef __DFCONV_H +#include "dfconv.h" +#endif + + +#if (defined(__sun__) || defined(_AIX) || defined(linux) || (defined(__alpha__) && defined(__osf__)))&& !defined(stricmp) +extern "C" int strcasecmp(char const *, char const *); +#define stricmp strcasecmp +#endif + + + +#define DF_EXT_VTOC -4 +#define DF_VTOC_VTOC -3 +#define DF_VTOC_EOF -2 +#define DF_VTOC_FREE -1 +#define DF_NAMELEN 0x20 /* Maximum entry name length - 31 characters plus + a NUL terminator */ + +#define DF_FT_STORAGE 1 +#define DF_FT_STREAM 2 +#define DF_FT_LOCKBYTES 3 // Not used -- How the bloody hell did I manage +#define DF_FT_PROPERTY 4 // Not Used -- to figure these two out? +#define DF_FT_ROOT 5 + +#define DF_BLOCK_SIZE 0x200 +#define DF_VTOC_SIZE 0x80 +#define DF_DE_PER_BLOCK 4 +#define DF_STREAM_BLOCK_SIZE 0x40 + +/* A DocFile is divided into blocks of 512 bytes. + * The first block contains the header. + * + * The file header contains The first 109 entries in the VTOC of VTOCs. + * + * Each block pointed to by a VTOC of VTOCs contains a VTOC, which + * includes block chains - just like FAT. This is a somewhat poor + * design for the following reasons: + * + * 1. FAT was a poor file system design to begin with, and + * has long been known to be horrendously inefficient + * for day to day operations. + * + * 2. The problem is compounded here, since the file + * level streams are generally *not* read sequentially. + * This means that a significant percentage of reads + * require seeking from the start of the chain. + * + * Data chains also contain an internal VTOC. The block size for + * the standard VTOC is 512. The block size for the internal VTOC + * is 64. + * + * Now, the 109 blocks in the VTOC of VTOCs allows for files of + * up to around 7MB. So what do you think happens if that's + * exceeded? Well, there's an entry in the header block which + * points to the first block used as additional storage for + * the VTOC of VTOCs. + * + * Now we can get up to around 15MB. Now, guess how the file + * format adds in another block to the VTOC of VTOCs. Come on, + * it's no big surprise. That's right - the last entry in each + * block extending the VTOC of VTOCs is, you guessed it, the + * block number of the next block containing an extension to + * the VTOC of VTOCs. The VTOC of VTOCs is chained!!!! + * + * So, to review: + * + * 1. If you are using a FAT file system, the location of + * your file's blocks is stored in chains. + * + * 2. At the abstract level, the file contains a VTOC of VTOCs, + * which is stored in the most inefficient possible format for + * random access - a chain (AKA list). + * + * 3. The VTOC of VTOCs contains descriptions of three file level + * streams: + * + * a. The Directory stream + * b. The Data stream + * c. The Data VTOC stream + * + * These are, of course, represented as chains. + * + * 4. The Data VTOC contains data describing the chains of blocks + * within the Data stream. + * + * That's right - we have a total of four levels of block chains! + * + * Now, is that complicated enough for you? No? OK, there's another + * complication. If an individual stream (ie. an IStream) reaches + * 4096 bytes in size, it gets moved from the Data Stream to + * a new file level stream. Now, if the stream then gets truncated + * back to less than 4096 bytes, it returns to the data stream. + * + * The effect of using this format can be seen very easily. Pick + * an arbitrary application with a grid data representation that + * can export to both Lotus 123 and Excel 5 or higher. Export + * a large file to Lotus 123 and time it. Export the same thing + * to Excel 5 and time that. The difference is the inefficiency + * of the Microsoft DocFile format. + * + */ +#define TOTAL_SIMPLE_VTOCS 109 + +struct DocFile_Header +{ + df_byte iMagic1; /* 0xd0 */ + df_byte iMagic2; /* 0xcf */ + df_byte iMagic3; /* 0x11 */ + df_byte iMagic4; /* 0xe0 - Spells D0CF11E0, or DocFile */ + df_byte iMagic5; /* 161 (igi upside down) */ + df_byte iMagic6; /* 177 (lli upside down - see below */ + df_byte iMagic7; /* 26 (gz upside down) */ + df_byte iMagic8; /* 225 (szz upside down) - see below */ + df_int4 aiUnknown1[4]; + df_int4 iVersion; /* DocFile Version - 0x03003E */ + df_int4 aiUnknown2[4]; + df_int4 nVTOCs; /* Number of VTOCs */ + df_int4 iFirstDirBlock; /* First Directory Block */ + df_int4 aiUnknown3[2]; + df_int4 iFirstDataVTOC; /* First data VTOC block */ + df_int4 iHasData; /* 1 if there is data in the file - yes, this is important*/ + df_int4 iExtendedVTOC; /* Extended VTOC location */ + df_int4 iExtendedVTOCSize; /* Size of extended VTOC (+1?) */ + df_int4 aiVTOCofVTOCs[TOTAL_SIMPLE_VTOCS]; +}; + +struct DocFile_VTOC +{ + df_int4 aiBlocks[DF_VTOC_SIZE]; +}; + + +/* The meaning of the magic numbers + * + * 0xd0cf11e0 is DocFile with a zero on the end (sort of) + * + * If you key 177161 into a calculator, then turn the calculator + * upside down, you get igilli, which may be a reference to + * somebody's name, or to the Hebrew word for "angel". + * + * If you key 26225 into a calculator, then turn it upside down, you + * get szzgz. Microsoft has a tradition of creating nonsense words + * using the letters s, g, z and y. We think szzgz may be one of the + * Microsoft placeholder variables, along the lines of foo, bar and baz. + * Alternatively, it could be 22526, which would be gzszz. + */ + +struct DocFile_DirEnt +{ + df_char achEntryName[DF_NAMELEN]; /* Entry Name */ + df_int2 iNameLen; /* Name length in bytes, including NUL terminator */ + df_byte iFileType; /* Entry type */ + df_byte iColour; /* 1 = Black, 0 = Red */ + df_int4 iLeftSibling; /* Next Left Sibling Entry - See below */ + df_int4 iRightSibling; /* Next Right Sibling Entry */ + df_int4 iFirstChild; /* First Child Entry */ + df_byte achClassID[16]; /* Class ID */ + df_int4 iStateBits; /* [GS]etStateBits value */ + df_int4 iCreatedLow; /* Low DWORD of creation time */ + df_int4 iCreatedHigh; /* High DWORD of creation time */ + df_int4 iModifiedLow; /* Low DWORD of modification time */ + df_int4 iModifiedHigh; /* High DWORD of modification time */ + df_int4 iVTOCPosition; /* VTOC Position */ + df_int4 iFileSize; /* Size of the stream */ + df_int4 iZero; /* We think this is part of the 64 bit stream size - must be 0 */ +}; + +/* Siblings + * ======== + * + * Siblings are stored in an obscure but incredibly elegant + * data structure called a red-black tree. This is generally + * defined as a 2-3-4 tree stored in a binary tree. + * + * A red-black tree can always be balanced very easily. The rules + * for a red-black tree are as follows: + * + * 1. The root node is always black. + * 2. The parent of a red node is always black. + * + * There is a Java demo of red-black trees at: + * + * http://langevin.usc.edu/BST/RedBlackTree-Example.html + * + * This demo is an excellent tool for learning how red-black + * trees work, without having to go through the process of + * learning how they were derived. + * + * Within the tree, elements are ordered by the length of the + * name and within that, ASCII order by name. This causes the + * apparently bizarre reordering you see when you use dfview. + * + * This is a somewhat bizarre choice. It suggests that the + * designer of the DocFile format was trying to optimise + * searching through the directory entries. However searching + * through directory entries is a relatively rare operation. + * Reading and seeking within a stream are much more common + * operations, especially within the file level streams, yet + * these use the horrendously inefficient FAT chains. + * + * This suggests that the designer was probably somebody + * fresh out of university, who had some basic knowledge of + * basic data structures, but little knowledge of anything + * more practical. It is bizarre to attempt to optimise + * directory searches while not using a more efficient file + * block locating system than FAT (seedling/sapling/tree + * would result in a massive improvement - in fact we have + * an alternative to DocFiles that we use internally that + * uses seedling/sapling/tree and *is* far more efficient). + * + * It is worth noting that the MS implementation of red-black + * trees is incorrect (I can tell you're surprised) and + * actually causes more operations to occur than are really + * needed. Fortunately the fact that our implementation is + * correct will not cause any problems - the MS implementation + * still appears to cause the tree to satisfy the rules, albeit + * a sequence of the same insertions in the different + * implementations may result in a different, and possibly + * deeper (but never shallower) tree. + */ + + + +class DocFileManager; +class DocFileInternalFunctions +{ +public: + static HRESULT TranslateError(void); + + HRESULT Translate( ULARGE_INTEGER *piULARGE, + LONG i); + HRESULT Translate( LONG *pi, + ULARGE_INTEGER const *piULARGE); + HRESULT Translate( LARGE_INTEGER *piULARGE, + LONG i); + HRESULT Translate( LONG *pi, + LARGE_INTEGER const *piULARGE); + HRESULT Translate( FILETIME *pft, + LONG i); + HRESULT Translate( LONG *pi, + FILETIME const *pft); + void GetTimeNow( FILETIME &ft); + void PopulateStatStg(STATSTG *pss, + BOOL bIncludeName, + DocFile_DirEnt &dfde); + void GetName( DocFile_DirEnt *pdfe, + df_char_t *pchName); +}; + +class DocFileReferenceCounter +{ +private: + ULONG nRef; + +protected: + virtual ~DocFileReferenceCounter(void); + +public: + DocFileReferenceCounter(void); + + ULONG RCAddRef(void); + ULONG RCRelease(void); +}; + +#define DEFINE_REFCOUNT(x) ULONG DF_STDCALL x::AddRef(void) { return RCAddRef(); } \ + ULONG DF_STDCALL x::Release(void) { return RCRelease(); } \ + HRESULT DF_STDCALL x::QueryInterface(REFIID, void **) { return E_FAIL; } + +#define DF_FLB_BUFFERS 8 + +struct DF_Cache +{ + df_int4 iBlock; + df_int4 iLastUsed; + char achData[DF_BLOCK_SIZE]; + BOOL bDirty; + + DF_Cache(void) : + iBlock(-1), + iLastUsed(-1) + { + } +}; + +class FileLockBytes : public ILockBytes, public DocFileReferenceCounter, public DocFileInternalFunctions +{ +private: + DF_Cache aCache[DF_FLB_BUFFERS]; + df_int4 iSequence; + char *pchFileName; + DWORD dwMode; + int fd; + + HRESULT MoveTo( long iOffset); + + HRESULT GetCache(df_int4 iBlock, int &iCache); + void Flush(int iCache); + +protected: + ~FileLockBytes(void); + +public: + FileLockBytes( char const *pchFileName_, + DWORD dwMode_, + HRESULT &hr); + + HRESULT DF_STDCALL QueryInterface(REFIID riid, + void **ppvObj); + ULONG DF_STDCALL AddRef(void) ; + ULONG DF_STDCALL Release(void); + + HRESULT DF_STDCALL ReadAt( ULARGE_INTEGER iOffset, + VOID *pvData, + ULONG nBytes, + ULONG *pnRead); + HRESULT DF_STDCALL WriteAt(ULARGE_INTEGER iOffset, + VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten); + HRESULT DF_STDCALL Flush(void); + HRESULT DF_STDCALL SetSize(ULARGE_INTEGER nBytes); + HRESULT DF_STDCALL LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType); + HRESULT DF_STDCALL UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType); + HRESULT DF_STDCALL Stat( STATSTG *pss, + DWORD iStatFlags); +}; + +class DocFileStorage; + +class DocFileObject : public DocFileInternalFunctions +{ +private: + df_int4 iEntryNumber; + + friend class DocFileEnumStatStg; + +protected: + DocFileStorage *pdfsParent; + df_char_t *pchName; + DocFileManager *pdfm; + DWORD dwMode; + + DocFileObject( DocFileStorage *pdfsParent_, + df_char_t const *pchName_, + DocFileManager *pdfm_, + HRESULT &hr, + df_byte iType, + BOOL bMustExist, + DWORD dwMode); + DocFileObject( DocFileObject *pdfo, + HRESULT &hr); + ~DocFileObject(void); + + HRESULT FindEntry( BOOL bMustExist, + df_byte iType); + + inline void + SetEntryNumber(df_int4 iEntry) + { + iEntryNumber = iEntry; + } + + HRESULT Stat( STATSTG *pss, + DWORD iStatFlags); + +public: + inline df_int4 + GetEntryNumber(void) + { + return iEntryNumber; + } +}; + +class DocFileStorage : public IStorage, + public DocFileReferenceCounter, + public DocFileObject +{ +protected: + ~DocFileStorage(void); + +public: + DocFileStorage( DocFileStorage *pdfsParent_, + df_char_t const *pchName_, + DWORD dwMode_, + DocFileManager *pdfm_, + HRESULT &hr_, + BOOL bMustExist = FALSE); + + HRESULT DF_STDCALL QueryInterface(REFIID riid, + void **ppvObj); + ULONG DF_STDCALL AddRef(void) ; + ULONG DF_STDCALL Release(void); + + HRESULT DF_STDCALL CreateStream(df_char_t const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStream **ppstm); + HRESULT DF_STDCALL OpenStream(df_char_t const *pchName, + void *reserved1, + DWORD iMode, + DWORD reserved2, + IStream **ppstm); + HRESULT DF_STDCALL CreateStorage(df_char_t const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStorage **ppstg); + HRESULT DF_STDCALL OpenStorage(df_char_t const *pchName, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstg); + HRESULT DF_STDCALL CopyTo( DWORD nExclude, + IID const *piidExclude, + SNB snbExclude, + IStorage *pstgDest); + HRESULT DF_STDCALL MoveElementTo(df_char_t const *pchName, + IStorage *pstgDest, + df_char_t const *pchNewName, + DWORD iFlags); + HRESULT DF_STDCALL Commit( DWORD iCommitFlags); + HRESULT DF_STDCALL Revert(void); + HRESULT DF_STDCALL EnumElements(DWORD reserved1, + void *reserved2, + DWORD reserved3, + IEnumSTATSTG **ppiess); + HRESULT DF_STDCALL DestroyElement(df_char_t const *pchName); + HRESULT DF_STDCALL RenameElement(df_char_t const *pchOldName, + df_char_t const *pchNewName); + HRESULT DF_STDCALL SetElementTimes(df_char_t const *lpszName, + FILETIME const *pftCreated, + FILETIME const *pftAccessed, + FILETIME const *pftModified); + HRESULT DF_STDCALL SetClass(REFCLSID clsid); + HRESULT DF_STDCALL SetStateBits(DWORD iStateBits, + DWORD giMask); + HRESULT DF_STDCALL Stat(STATSTG *pstatstg, + DWORD iStatFlags); +}; + +struct DocFile_StreamPtr +{ + df_int4 iDirectoryEntry; + df_int4 iPosition; + df_int4 iStreamBlock; + df_int4 iExtraBlocks; + BOOL bFileStream; + + DocFile_StreamPtr(void) : + iPosition(-1), + iDirectoryEntry(-1), + iStreamBlock(-1), + iExtraBlocks(0), + bFileStream(FALSE) + { + } +}; + + +class DocFileStream : public IStream, + public DocFileObject, + public DocFileReferenceCounter +{ +private: + DocFile_StreamPtr dfsp; + + DocFileStream( DocFileStream *pstr, + HRESULT &hr); + void FlushBuffer(void); + HRESULT PopulateBuffer(void); + +protected: + ~DocFileStream(void); + +public: + DocFileStream( DocFileStorage *pdfsParent_, + df_char_t const *pchName_, + DocFileManager *pdfm_, + DWORD dwMode_, + BOOL bMustExist, + HRESULT &hr); + + HRESULT DF_STDCALL QueryInterface(REFIID riid, + void **ppvObj); + ULONG DF_STDCALL AddRef(void) ; + ULONG DF_STDCALL Release(void); + + HRESULT DF_STDCALL Read( VOID *pvData, + ULONG nBytes, + ULONG *pnRead); + HRESULT DF_STDCALL Write( VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten); + HRESULT DF_STDCALL Seek(LARGE_INTEGER iMove, + DWORD dwOrigin, + ULARGE_INTEGER *piNewPosition); + HRESULT DF_STDCALL SetSize(ULARGE_INTEGER iNewSize); + HRESULT DF_STDCALL CopyTo( IStream *pstm, + ULARGE_INTEGER nBytes, + ULARGE_INTEGER *pnRead, + ULARGE_INTEGER *pnWritten); + HRESULT DF_STDCALL Commit( DWORD iCommitFlags); + HRESULT DF_STDCALL Revert(void); + HRESULT DF_STDCALL LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType); + HRESULT DF_STDCALL UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType); + HRESULT DF_STDCALL Stat( STATSTG *pss, + DWORD iStatFlags); + HRESULT DF_STDCALL Clone( IStream **ppstm); +}; + +#endif /* __DOCFILE_H */ diff -uN no-docfile/flokbyte.cpp docfile/flokbyte.cpp --- no-docfile/flokbyte.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/flokbyte.cpp 2004-02-05 09:00:04.000000000 +1100 @@ -0,0 +1,290 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: flokbyte.cpp,v 1.4 1999/01/20 02:58:09 troy Exp $"; +#include <fcntl.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <stdlib.h> +#include <stdio.h> +#if defined(_Windows) || defined(WIN32) || defined(_WIN32) || defined(__WIN32) +int ftruncate(int, long); +#else +#include <unistd.h> +#endif +#include "docfile.h" + +FileLockBytes::FileLockBytes( char const *pchFileName_, + DWORD dwMode_, + HRESULT &hr) : + dwMode(dwMode_), + iSequence(0) +{ + int iMode; + + if (!pchFileName_) + { + pchFileName_ = tmpnam(0); + dwMode |= STGM_DELETEONRELEASE; + } + pchFileName = new char[strlen(pchFileName_) + 1]; + strcpy(pchFileName, pchFileName_); + + switch (dwMode & 0x3) + { + case STGM_READ: + iMode = O_RDONLY; + break; + + case STGM_WRITE: + iMode = O_WRONLY; + break; + + case STGM_READWRITE: + iMode = O_RDWR; + break; + + default: + *(char *) 0 = 0; + break; + } + if (dwMode & STGM_CREATE) + iMode |= O_CREAT; + + fd = open(pchFileName, iMode, 0666); + if (fd != -1) + hr = 0; + else + hr = TranslateError(); +} + +DEFINE_REFCOUNT(FileLockBytes); + +HRESULT +FileLockBytes::GetCache(df_int4 iBlock, + int &iCache) +{ + int i; + int iFound = -1; + df_int4 iBestSequence = iSequence; + df_int4 iBestFound = -1; + DF_Cache *pCache = aCache; + HRESULT hr; + + for (i = 0; i < DF_FLB_BUFFERS; i++, pCache++) + { + if (pCache->iBlock == iBlock) + { + pCache->iLastUsed = iSequence++; + iCache = i; + return 0; + } + if (pCache->iBlock == -1 && iFound == -1) + { + iFound = i; + } + else if ((unsigned long) (iSequence - pCache->iLastUsed) > + (unsigned long) (iSequence - iBestSequence)) + { + iBestFound = i; + iBestSequence = pCache->iLastUsed; + } + } + if (iFound == -1) + { + Flush(iBestFound); + iFound = iBestFound; + } + pCache = aCache + iFound; + pCache->iLastUsed = iSequence++; + pCache->iBlock = iBlock; + pCache->bDirty = FALSE; + hr = MoveTo(iBlock * DF_BLOCK_SIZE); + if (hr) + memset(pCache->achData, 0, sizeof(pCache->achData)); + else if (read(fd, pCache->achData, sizeof(pCache->achData)) < 0) + hr = TranslateError(); + iCache = iFound; + return hr; +} + +FileLockBytes::~FileLockBytes(void) +{ + Flush(); + if (fd != -1) + close(fd); + if (dwMode & STGM_DELETEONRELEASE) + unlink(pchFileName); + delete [] pchFileName; +} + +HRESULT DF_STDCALL +FileLockBytes::ReadAt( ULARGE_INTEGER iOffset_, + VOID *pvData, + ULONG nBytes, + ULONG *pnRead) +{ + int iCacheEntry; + HRESULT hr; + df_int4 nRead = 0; + df_int4 iOffset; + + Translate(&iOffset, &iOffset_); + while (nBytes) + { + df_int4 iBlock = iOffset / DF_BLOCK_SIZE; + int iBOff = iOffset % DF_BLOCK_SIZE; + int nNow = DF_BLOCK_SIZE - iBOff; + int iCache; + HRESULT hr = GetCache(iBlock, iCache); + + if (hr) + { + *pnRead = nRead; + return hr; + } + + if (nNow > nBytes) + nNow = nBytes; + memcpy(pvData, aCache[iCache].achData + iBOff, nNow); + pvData = ((char *) pvData) + nNow; + iOffset += nNow; + nBytes -= nNow; + nRead += nNow; + } + *pnRead = nRead; + return 0; +} + +HRESULT DF_STDCALL +FileLockBytes::WriteAt(ULARGE_INTEGER iOffset_, + VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten) +{ + int iCacheEntry; + HRESULT hr; + df_int4 nWritten = 0; + df_int4 iOffset; + + Translate(&iOffset, &iOffset_); + while (nBytes) + { + df_int4 iBlock = iOffset / DF_BLOCK_SIZE; + int iBOff = iOffset % DF_BLOCK_SIZE; + int nNow = DF_BLOCK_SIZE - iBOff; + int iCache; + HRESULT hr = GetCache(iBlock, iCache); + + if (hr) + { + *pnWritten= nWritten; + return hr; + } + + if (nNow > nBytes) + nNow = nBytes; + memcpy(aCache[iCache].achData + iBOff, pvData, nNow); + pvData = ((char *) pvData) + nNow; + iOffset += nNow; + nBytes -= nNow; + nWritten += nNow; + aCache[iCache].bDirty = 1; + } + *pnWritten = nWritten; + return 0; +} + +void +FileLockBytes::Flush(int i) +{ + if (aCache[i].iBlock != -1 && aCache[i].bDirty) + { + lseek(fd, aCache[i].iBlock * DF_BLOCK_SIZE, 0); + write(fd, aCache[i].achData, sizeof(aCache[i].achData)); + } +} + +HRESULT DF_STDCALL +FileLockBytes::Flush(void) +{ + int i; + + for (i = 0; i < DF_FLB_BUFFERS; i++) + Flush(i); + return 0; +} + +HRESULT DF_STDCALL +FileLockBytes::SetSize(ULARGE_INTEGER nBytes_) +{ + HRESULT hr; + df_int4 nBytes; + + hr = Translate(&nBytes, &nBytes_); + if (hr) + return hr; + + if (ftruncate(fd, nBytes) == -1) + return TranslateError(); + return 0; +} + +HRESULT DF_STDCALL +FileLockBytes::LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) +{ + return 0; +} + +HRESULT DF_STDCALL +FileLockBytes::UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) +{ + return 0; +} + +HRESULT DF_STDCALL +FileLockBytes::Stat( STATSTG *pss, + DWORD iStatFlags) +{ + struct stat sbuf; + + if (fstat(fd, &sbuf) == -1) + return TranslateError(); + + memset(pss, 0, sizeof(*pss)); + pss->type = STGTY_LOCKBYTES; + Translate(&pss->cbSize, sbuf.st_size); + Translate(&pss->mtime, sbuf.st_mtime); + Translate(&pss->ctime, sbuf.st_ctime); + Translate(&pss->atime, sbuf.st_atime); + pss->grfMode = dwMode; +} + +HRESULT +FileLockBytes::MoveTo( long iOffset) +{ + if (lseek(fd, iOffset, 0) == -1) + return TranslateError(); + return 0; +} diff -uN no-docfile/redblack.cpp docfile/redblack.cpp --- no-docfile/redblack.cpp 1970-01-01 10:00:00.000000000 +1000 +++ docfile/redblack.cpp 2004-02-05 09:00:24.000000000 +1100 @@ -0,0 +1,423 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +static char const *rcsid = "$Id: redblack.cpp,v 1.3 1999/01/20 02:58:10 troy Exp $"; +#include "redblack.h" + +DF_RBNode::~DF_RBNode(void) +{ + if (apnChildren[0]) + delete apnChildren[0]; + if (apnChildren[1]) + delete apnChildren[1]; +} + +DF_RBNode * +DF_RBNode::GetParent(void) +{ + return pnParent; +} + +DF_RBNode * +DF_RBNode::GetUncle(void) +{ + DF_RBNode *pnGrandPappy; + + if (!pnParent || + (pnGrandPappy = pnParent->pnParent) == 0 || + pnGrandPappy->pnParent == 0) + return 0; + return pnGrandPappy->apnChildren[1 - pnParent->GetSide()]; +} + +int +DF_RBNode::GetSide(void) +{ + if (pnParent->apnChildren[0] == this) + return 0; + else + return 1; +} + +DF_RBNode * +DF_RBNode::GetChild( int iType) +{ + return apnChildren[iType]; +} + +void +DF_RBNode::SetBlack(void) +{ + if (this) + dfde.iColour = DFRB_BLACK; +} + +void +DF_RBNode::SetRed(void) +{ + if (this) + dfde.iColour = DFRB_RED; +} + +BOOL +DF_RBNode::IsBlack(void) +{ + if (this) // OK, this *is* a hack + return dfde.iColour == DFRB_BLACK; + return TRUE; +} + +BOOL +DF_RBNode::IsRed(void) +{ + if (this) // OK, this *is* a hack + return dfde.iColour == DFRB_RED; + return FALSE; +} + +void +DF_RBNode::SetChild( int iType, + DF_RBNode *pnChild) +{ + df_int4 iChildID = pnChild ? pnChild->iDirEnt : -1; + + apnChildren[iType] = pnChild; + if (!bRead) + return; + if (IsRoot()) + SI4(dfde.iFirstChild) = iChildID; + else if (iType == DFRB_LEFT) + SI4(dfde.iLeftSibling) = iChildID; + else + SI4(dfde.iRightSibling) = iChildID; + +} + +void +DF_RBNode::CheckInsertion(DocFileManager *pdfm) +{ + if (pnParent->IsRoot()) + { + SetBlack(); + return; + } + + if (pnParent->IsBlack()) + { + return; + } + + DF_RBNode *pnUncle = GetUncle(); + DF_RBNode *pnGrandPappy = pnParent->pnParent; + + // OK, we're red, and our parent's red, what should we do? + if (pnUncle) + pnUncle->GetEntry(pdfm); + + if (pnUncle->IsRed()) + { + // If our uncle is red, split and cascade + + pnParent->SetBlack(); + pnParent->SetChanged(); + pnUncle->SetBlack(); + pnUncle->SetChanged(); + pnGrandPappy->SetRed(); + pnGrandPappy->SetChanged(); + pnGrandPappy->CheckInsertion(pdfm); + } + else + { + // Our uncle is black, we need to rotate + + int iMySide = GetSide(); + int iDadsSide = pnParent->GetSide(); + + if (iMySide != iDadsSide) + { + // Double rotation. After this we're done. + pnParent->Rotate(iDadsSide); + pnParent->Rotate(iMySide); + SetBlack(); + apnChildren[iMySide]->SetRed(); + } + else + { + // Single rotation. After this we're done. + int iOtherSide = 1 - iMySide; + + pnGrandPappy->Rotate(iOtherSide); + pnParent->SetBlack(); + pnParent->apnChildren[iOtherSide]->SetRed(); + } + } +} + +void +DF_RBNode::CreateNew(DocFileManager *pdfm) +{ + bRead = TRUE; + pdfm->InitDirBlock(&dfde, 1); +} + +void +DF_RBNode::InsertInto( DF_RBNode *pnParent_, + int iType, + DocFileManager *pdfm) +{ + SetChanged(); + pnParent = pnParent_; + pnParent->SetChild(iType, this); + pnParent->GetEntry(pdfm); + pnParent->SetChanged(); + if (pnParent->IsRoot()) + { + SetBlack(); + return; + } + SetRed(); + CheckInsertion(pdfm); +} + +void +DF_RBNode::Copy(DF_RBNode *pnSrc) +{ + int iSide = GetSide(); + BOOL bBlack = IsBlack(); + + iDirEnt = pnSrc->iDirEnt; + dfde = pnSrc->dfde; + SetChild(0, apnChildren[0]); + SetChild(1, apnChildren[1]); + if (bBlack) + SetBlack(); + else + SetRed(); + SetChanged(); + pnParent->SetChild(iSide, this); + pnParent->SetChanged(); +} + +void +DF_RBNode::Rotate( int iDirection) +{ + int iOtherSide = 1 - iDirection; + int iSide = GetSide(); + DF_RBNode *pnChild = GetChild(iOtherSide); + + pnParent->SetChanged(); + pnChild->SetChanged(); + SetChanged(); + + pnParent->SetChild(iSide, pnChild); + pnChild->pnParent = pnParent; + SetChild(iOtherSide, pnChild->apnChildren[iDirection]); + if (apnChildren[iOtherSide]) + apnChildren[iOtherSide]->pnParent = this; + pnChild->SetChild(iDirection, this); + pnParent = pnChild; +} + +void +DF_RBNode::FixupDelete( DocFileManager *pdfm, + int iSide) +{ + int iSibling = 1 - iSide; + DF_RBNode *pnNearNephew, *pnFarNephew; + + if (IsRoot() || apnChildren[iSide]->IsRed()) + { + apnChildren[iSide]->SetBlack(); + apnChildren[iSide]->SetChanged(); + return; + } + + apnChildren[iSibling]->Populate(pdfm); + apnChildren[iSibling]->PopulateChildren(pdfm); + + if (apnChildren[iSibling]->IsRed()) + { + apnChildren[iSibling]->SetBlack(); + SetRed(); + Rotate(iSide); + apnChildren[iSibling]->Populate(pdfm); + apnChildren[iSibling]->PopulateChildren(pdfm); + } + + pnNearNephew = apnChildren[iSibling]->apnChildren[iSide]; + pnFarNephew = apnChildren[iSibling]->apnChildren[iSibling]; + if (pnNearNephew) + pnNearNephew->Populate(pdfm); + if (pnFarNephew) + pnFarNephew->Populate(pdfm); + + if (pnNearNephew->IsBlack() && pnFarNephew->IsBlack()) + { + apnChildren[iSibling]->SetRed(); + apnChildren[iSibling]->SetChanged(); + pnParent->FixupDelete(pdfm, GetSide()); + return; + } + if (pnFarNephew->IsBlack()) + { + pnNearNephew->SetBlack(); + apnChildren[iSibling]->SetRed(); + apnChildren[iSibling]->Rotate(iSibling); + } + if (IsRed()) + apnChildren[iSibling]->SetRed(); + else + apnChildren[iSibling]->SetBlack(); + SetBlack(); + pnFarNephew->SetBlack(); + pnFarNephew->SetChanged(); + Rotate(iSide); +} + +DF_RBNode * +DF_RBNode::Delete(DocFileManager *pdfm, + BOOL bErase) +{ + DF_RBNode *pnUnlink, *pnRoot; + int iMoveSide; + int iSide = GetSide(); + int iDestSide = iSide; + int iDirEnt_; + DocFile_DirEnt dfde_; + + Populate(pdfm); + PopulateChildren(pdfm); + + if (!apnChildren[DFRB_LEFT]) + { + pnUnlink = this; + iMoveSide = DFRB_RIGHT; + } + else if (!apnChildren[DFRB_RIGHT]) + { + pnUnlink = this; + iMoveSide = DFRB_LEFT; + } + else + { + pnUnlink = apnChildren[DFRB_RIGHT]; + pnUnlink->Populate(pdfm); + pnUnlink->PopulateChildren(pdfm); + iMoveSide = DFRB_RIGHT; + iDestSide = DFRB_RIGHT; + while (pnUnlink->apnChildren[DFRB_LEFT]) + { + pnUnlink = pnUnlink->apnChildren[DFRB_LEFT]; + pnUnlink->Populate(pdfm); + pnUnlink->PopulateChildren(pdfm); + iDestSide = DFRB_LEFT; + } + } + if (pnUnlink->apnChildren[iMoveSide]) + pnUnlink->apnChildren[iMoveSide]->pnParent = pnUnlink->pnParent; + pnUnlink->pnParent->SetChild(iDestSide, pnUnlink->apnChildren[iMoveSide]); + pnUnlink->pnParent->SetChanged(); + SetChild(DFRB_LEFT, apnChildren[DFRB_LEFT]); + SetChild(DFRB_RIGHT, apnChildren[DFRB_RIGHT]); + SetChanged(); + + iDirEnt_ = iDirEnt; + dfde_ = dfde; + + for (pnRoot = pnUnlink; pnRoot->pnParent; pnRoot = pnRoot->pnParent); + + if (pnUnlink != this) + { + Copy(pnUnlink); + } + if (pnUnlink->IsBlack()) + pnUnlink->pnParent->FixupDelete(pdfm, iDestSide); + + if (bErase) + pdfm->InitDirBlock(&pnUnlink->dfde, 1); + else + pnUnlink->dfde = dfde_; + pnUnlink->SetChild(DFRB_LEFT, 0); + pnUnlink->SetChild(DFRB_RIGHT, 0); + pnUnlink->bRead = pnUnlink->bChanged = TRUE; + pnUnlink->iDirEnt = iDirEnt_; + pnUnlink->pnParent = pnRoot; + pnRoot->apnChildren[DFRB_RIGHT] = pnUnlink; + return pnUnlink; +} + + +HRESULT +DF_RBNode::Populate(DocFileManager *pdfm) +{ + HRESULT hr; + + if (!bRead) + { + hr = pdfm->GetDirectoryEntry(iDirEnt, &dfde); + if (!hr) + bRead = TRUE; + } + else + { + hr = 0; + } + return hr; +} + +void +DF_RBNode::PopulateChildren(DocFileManager *pdfm) +{ + if (!apnChildren[DFRB_LEFT]) + { + df_int4 iDirEnt = SI4(dfde.iLeftSibling); + + if (iDirEnt != -1) + apnChildren[DFRB_LEFT] = new DF_RBNode(iDirEnt, this); + } + if (!apnChildren[DFRB_RIGHT]) + { + df_int4 iDirEnt = SI4(dfde.iRightSibling); + + if (iDirEnt != -1) + apnChildren[DFRB_RIGHT] = new DF_RBNode(iDirEnt, this); + } +} + +DocFile_DirEnt & +DF_RBNode::GetEntry(DocFileManager *pdfm) +{ + if (!bRead) + { + Populate(pdfm); + } + return dfde; +} + + +void +DF_RBNode::WriteChanges(DocFileManager *pdfm) +{ + if (bChanged) + pdfm->SetDirectoryEntry(iDirEnt, &dfde); + if (apnChildren[0]) + apnChildren[0]->WriteChanges(pdfm); + if (apnChildren[1]) + apnChildren[1]->WriteChanges(pdfm); +} diff -uN no-docfile/redblack.h docfile/redblack.h --- no-docfile/redblack.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/redblack.h 2004-02-05 09:01:04.000000000 +1100 @@ -0,0 +1,118 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __REDBLACK_H +#define __REDBLACK_H +#ifndef __DFMGR_H +#include "dfmgr.h" +#endif + +/* Does the red-black trees for the directory lists */ + +#define DFRB_LEFT 0 +#define DFRB_RIGHT 1 + +#define DFRB_BLACK 1 +#define DFRB_RED 0 + +class DF_RBNode +{ +private: + DF_RBNode *pnParent; + DF_RBNode *apnChildren[2]; + df_int4 iDirEnt; + + DocFile_DirEnt dfde; + + BOOL bRead; + BOOL bChanged; + + void Copy(DF_RBNode *pnSrc); + + void CheckInsertion(DocFileManager *pdfm); + void FixupDelete( DocFileManager *pdfm, + int iSide); + + int GetSide(void); + DF_RBNode *GetParent( void); + DF_RBNode *GetUncle( void); + + void SetBlack(void); + void SetRed(void); + + BOOL IsBlack(void); + BOOL IsRed(void); + + void Rotate(int iDirection); + +public: + DF_RBNode( df_int4 iDirEnt_, + DF_RBNode *pnParent_) : + pnParent(pnParent_), + iDirEnt(iDirEnt_), + bChanged(FALSE), + bRead(FALSE) + { + apnChildren[0] = apnChildren[1] = 0; + } + + ~DF_RBNode(void); + + void InsertInto( DF_RBNode *pnParent, + int iType, + DocFileManager *pdfm); + DF_RBNode *Delete( DocFileManager *pdfm, + BOOL bErase = TRUE); + + HRESULT Populate(DocFileManager *pdfm); + void PopulateChildren(DocFileManager *pdfm); + DocFile_DirEnt &GetEntry(DocFileManager *pdfm); + void WriteChanges(DocFileManager *pdfm); + void CreateNew(DocFileManager *pdfm); + + void SetChild( int iType, + DF_RBNode *pnChild); + DF_RBNode *GetChild( int iType); + + inline BOOL + IsPopulated(void) + { + return bRead; + } + + inline BOOL + IsRoot(void) + { + return !pnParent; + } + + inline void + SetChanged(void) + { + bChanged = TRUE; + } + + inline df_int4 + GetDirEnt(void) + { + return iDirEnt; + } +}; + +#endif /* __REDBLACK_H */ diff -uN no-docfile/stgerr.h docfile/stgerr.h --- no-docfile/stgerr.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/stgerr.h 2004-02-05 09:01:10.000000000 +1100 @@ -0,0 +1,37 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __STGERR_H +#define __STGERR_H + +#ifndef S_OK +#define S_OK 0L +#endif +#ifndef E_FAIL +#define E_FAIL 0x80000008L +#endif + +#define STG_E_FILENOTFOUND 0x80030001L +#define STG_E_PATHNOTFOUND 0x80030003L +#define STG_E_INSUFFICIENTMEMORY 0x80030008L +#define STG_E_WRITEFAULT 0x8003001dL +#define STG_E_READFAULT 0x8003001eL +#define STG_E_FILEALREADYEXISTS 0x80030050L + +#endif /* __STGERR_H */ diff -uN no-docfile/storage.h docfile/storage.h --- no-docfile/storage.h 1970-01-01 10:00:00.000000000 +1000 +++ docfile/storage.h 2004-02-05 09:01:15.000000000 +1100 @@ -0,0 +1,286 @@ +/* Compound Storage + * + * Copyright 1998-2003 CorVu Corporation + * + * 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 + */ + +#ifndef __STORAGE_H +#define __STORAGE_H +#ifndef __DFTYPES_H +#include "dftypes.h" +#endif +#ifndef __WINDOWS_H +#ifndef __STGERR_H +#include "stgerr.h" +#endif + +#define STGM_DIRECT 0x00000000L +#define STGM_TRANSACTED 0x00010000L + +#define STGM_READ 0x00000000L +#define STGM_WRITE 0x00000001L +#define STGM_READWRITE 0x00000002L + +#define STGM_SHARE_DENY_NONE 0x00000040L +#define STGM_SHARE_DENY_READ 0x00000030L +#define STGM_SHARE_DENY_WRITE 0x00000020L +#define STGM_SHARE_EXCLUSIVE 0x00000010L + +#define STGM_PRIORITY 0x00040000L +#define STGM_DELETEONRELEASE 0x04000000L + +#define STGM_CREATE 0x00001000L +#define STGM_CONVERT 0x00020000L +#define STGM_FAILIFTHERE 0x00000000L + +typedef enum tagSTGC +{ + STGC_DEFAULT = 0, + STGC_OVERWRITE = 1, + STGC_ONLYIFCURRENT = 2, + STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE = 4 +} STGC; + +typedef char **SNB; + +typedef struct tagSTATSTG +{ + char *pwcsName; + DWORD type; + ULARGE_INTEGER cbSize; + FILETIME mtime; + FILETIME ctime; + FILETIME atime; + DWORD grfMode; + DWORD grfLocksSupported; + CLSID clsid; + DWORD grfStateBits; + DWORD reserved; +} STATSTG; + + +typedef enum tagSTGTY +{ + STGTY_STORAGE = 1, + STGTY_STREAM = 2, + STGTY_LOCKBYTES = 3, + STGTY_PROPERTY = 4 +} STGTY; + +typedef enum tagSTREAM_SEEK +{ + STREAM_SEEK_SET = 0, + STREAM_SEEK_CUR = 1, + STREAM_SEEK_END = 2 +} STREAM_SEEK; + +typedef enum tagLOCKTYPE +{ + LOCK_WRITE = 1, + LOCK_EXCLUSIVE = 2, + LOCK_ONLYONCE = 4 +} LOCKTYPE; + +typedef enum tagSTGMOVE +{ + STGMOVE_MOVE = 0, + STGMOVE_COPY = 1 +} STGMOVE; + +typedef enum tagSTATFLAG +{ + STATFLAG_DEFAULT = 0, + STATFLAG_NONAME = 1 +} STATFLAG; + +class IUnknown +{ +public: + virtual HRESULT QueryInterface(REFIID riid, + void **ppvObj) = 0; + virtual ULONG AddRef(void) = 0; + virtual ULONG Release(void) = 0; +}; + +class IEnumSTATSTG : public IUnknown +{ +public: + virtual HRESULT Next( ULONG nElements, + STATSTG *pssElements, + ULONG *pnFetched) = 0; + virtual HRESULT Skip( ULONG nElements) = 0; + virtual HRESULT Reset(void) = 0; + virtual HRESULT Clone( IEnumSTATSTG **ppiess) = 0; +}; + +typedef IEnumSTATSTG *LPENUMSTATSTG; + + + +class ILockBytes : public IUnknown +{ +public: + virtual HRESULT ReadAt( ULARGE_INTEGER iOffset, + VOID *pvData, + ULONG nBytes, + ULONG *pnRead) = 0; + virtual HRESULT WriteAt(ULARGE_INTEGER iOffset, + VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten) = 0; + virtual HRESULT Flush(void) = 0; + virtual HRESULT SetSize(ULARGE_INTEGER nBytes) = 0; + virtual HRESULT LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) = 0; + virtual HRESULT UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) = 0; + virtual HRESULT Stat( STATSTG *pss, + DWORD iStatFlags) = 0; +}; + +typedef ILockBytes *LPLOCKBYTES; + + + +class IStream : public IUnknown +{ +public: + virtual HRESULT Read( VOID *pvData, + ULONG nBytes, + ULONG *pnRead) = 0; + virtual HRESULT Write( VOID const *pvData, + ULONG nBytes, + ULONG *pnWritten) = 0; + virtual HRESULT Seek(LARGE_INTEGER iMove, + DWORD dwOrigin, + ULARGE_INTEGER *piNewPosition) = 0; + virtual HRESULT SetSize(ULARGE_INTEGER iNewSize) = 0; + virtual HRESULT CopyTo( IStream *pstm, + ULARGE_INTEGER nBytes, + ULARGE_INTEGER *pnRead, + ULARGE_INTEGER *pnWritten) = 0; + virtual HRESULT Commit( DWORD iCommitFlags) = 0; + virtual HRESULT Revert(void) = 0; + virtual HRESULT LockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) = 0; + virtual HRESULT UnlockRegion(ULARGE_INTEGER iOffset, + ULARGE_INTEGER nBytes, + DWORD dwLockType) = 0; + virtual HRESULT Stat( STATSTG *pss, + DWORD iStatFlags) = 0; + virtual HRESULT Clone( IStream **ppstm) = 0; +}; + +typedef IStream *LPSTREAM; + +class IStorage : public IUnknown +{ +public: + virtual HRESULT CreateStream(char const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStream **ppstm) = 0; + virtual HRESULT OpenStream(char const *pchName, + void *reserved1, + DWORD iMode, + DWORD reserved2, + IStream **ppstm) = 0; + virtual HRESULT CreateStorage(char const *pchName, + DWORD iMode, + DWORD reserved1, + DWORD reserved2, + IStorage **ppstg) = 0; + virtual HRESULT OpenStorage(char const *pchName, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstg) = 0; + virtual HRESULT CopyTo( DWORD nExclude, + IID const *piidExclude, + SNB snbExclude, + IStorage *pstgDest) = 0; + virtual HRESULT MoveElementTo(char const *pchName, + IStorage *pstgDest, + char const *pchNewName, + DWORD iFlags) = 0; + virtual HRESULT Commit( DWORD iCommitFlags) = 0; + virtual HRESULT Revert(void) = 0; + virtual HRESULT EnumElements(DWORD reserved1, + void *reserved2, + DWORD reserved3, + IEnumSTATSTG **ppiess) = 0; + virtual HRESULT DestroyElement(char const *pchName) = 0; + virtual HRESULT RenameElement(char const *pchOldName, + char const *pchNewName) = 0; + virtual HRESULT SetElementTimes(char const *lpszName, + FILETIME const *pftCreated, + FILETIME const *pftAccessed, + FILETIME const *pftModified) = 0; + virtual HRESULT SetClass(REFCLSID clsid) = 0; + virtual HRESULT SetStateBits(DWORD iStateBits, + DWORD giMask) = 0; + virtual HRESULT Stat(STATSTG *pstatstg, + DWORD iStatFlags) = 0; +}; + +typedef IStorage *LPSTORAGE; + +class IRootStorage : public IUnknown +{ +public: + virtual HRESULT SwitchToFile(LPSTR lpstrFile) = 0; +}; + +typedef IRootStorage *LPROOTSTORAGE; + +extern "C" { + +HRESULT StgCreateDocfile(char const *pchName, + DWORD iMode, + DWORD reserved, + IStorage **ppstgOpen); +HRESULT StgCreateDocfileOnILockBytes(ILockBytes *plkbyt, + DWORD iMode, + DWORD reserved, + IStorage **ppstgOpen); +HRESULT StgOpenStorage( char const *pchName, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstgOpen); +HRESULT StgOpenStorageOnILockBytes(ILockBytes *plkbyt, + IStorage *pstgPriority, + DWORD iMode, + SNB snbExclude, + DWORD reserved, + IStorage **ppstgOpen); +HRESULT StgIsStorageFile(char const *pchName); +HRESULT StgIsStorageILockBytes(ILockBytes *plkbyt); + +HRESULT StgSetTimes( char const *pchName, + FILETIME const *pftCreated, + FILETIME const *pftModified, + FILETIME const *pftAccessed); +} /* extern "C" */ + +#endif /* __WINDOWS_H */ +#endif /* __STORAGE_H */

4 3

System Error H80010108 (-2147417848)
by Fabian Cenedese 10 Feb '04

10 Feb '04

Hi Did I already mention what I think of VB?... I try another VB program with an embedded ocx on wine and it gives me a dialog with the above mentioned error message. Then it just quits. After looking on the internet I found some explanation of this error: Run-time error '-2147417848 (80010108)' automation error The object invoked has been disconnected from its clients. But that doesn't tell me what's wrong. In the trace logs I can see it build and display this message but nothing that would show what went wrong before. Does anybody know this error or its reasons? Thanks bye Fabi

1 0

Re: WineConf movie
by Brian Vincent (C) 10 Feb '04

10 Feb '04

> You mean, like the point where about 15 wine hackers all crowded into > the same elevator and hoped that noone from MS sabotaged it? I mean, > when people say that "you cannot kill an open source project", I don't > think they mean "set up a conference, and then sabotage the elevator > when everyone crowds in". I bet we would have gotten a lot of press from it though. > Speaking of memorable moments - One of Dimi, Michael (Stefaniuc), Marcus > or Brian had a camera, and we took a picture in front of the Ice palace. > Can that someone please step forward and send me the pic? Guess I needed a little motivation to put together my pictures. Here's what I took @ WineConf: http://users.theshell.com/~vinn/wineconf2004/ As far as the movie editing goes: - There were some funny comments when Alexandre was talking about NPTL support in his presentation. - Something from Dimi's 0.9 list would be nice - Graphical stuff is always nice to look at. So Gav's demo of Alice, Lionel's of 3DMark2000, and the ReactOS demos would probably fit in there well. --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

1 0

Re: Status of Wine History page?
by Brian Vincent (C) 10 Feb '04

10 Feb '04

> It is my understanding that Brian V sent the "Wine History" page to J > Newman for inclusion. > May I ask what the current status is? I talked to Newman yesterday and we worked out a plan to update it. I'm also updating some other stuff that has to be done at the same time. > May I also ask that this page be posted to wine-patches? For now: http://www.theshell.com/~vinn/wine-history.html This is the working draft that seems to be complete. --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

1 0

Stack size
by Robert Lunnon 10 Feb '04

10 Feb '04

I have a program which used to work under wine but now seems to fail due to a stack overflow. Unfortunately I'm no windows expert, but I vaguely recollect that tthe stack size for a windows program is declared in the PE executable header. Does wine honour this setting and can someone point me at a utility (preferably a unix one) to change it ? Thanks in advance Bob

1 0

NT services ...
by Lars Segerlund 10 Feb '04

10 Feb '04

I think I have an idea about NT services which is doable in the current framework. So what do you guy's think about spawning a second daemon handling the nt-services fron wineserver ? This could be done optionally ( services/noservices) and they can talk to each other on a unix socket ? Alternatively, you could run the service daemon as a common user on the system and fork off specific wine instances for each user who had registered a service running at an interval ? All these scenarios can easily be handled by the proposed setup, on ly a bit of different setup would be needed. Any comments ? I just wanted to know if I was thinking in the right tracks and if anybody has an estimate about how hard an undertaking like this would be before getting into the effort. / regards, Lars Segerlund.

3 2

CPUID update to update
by Robert Lunnon 10 Feb '04

10 Feb '04

For anyone who is using my previously submitted patch here is an update. It fixes the latent file descriptor leak, and patches a hole where have_cpuid was retained from the legacy code (Dunno how I missed that one) this ended up diving into the middle of the cpuid machine code where have_cpuid is defined (For different reasons). Since my original submission is not being incorporated into the wine codebase, I am posting here instead. It just might be useful for someone out there... bash-2.05$ diff -c cpu.orig.c cpu.c *** cpu.orig.c Tue Feb 10 23:31:27 2004 --- cpu.c Tue Feb 10 23:39:15 2004 *************** *** 116,122 **** { if (strstr(line,"processor") )count++; } ! if(count>0) return count; } #endif /* linux*/ --- 116,126 ---- { if (strstr(line,"processor") )count++; } ! fclose(f); ! if(count>0) ! { ! return count; ! } } #endif /* linux*/ *************** *** 193,202 **** "\tandl $2097152,%%eax\n" "\tandl $2097152,%%ebx\n" "\txorl %%eax,%%ebx\n" ! "\tjnz have_cpuid\n" "\tclrl %%ebx\n" "\tjmp endcpuid\n" ! "have_cpuid:\tmovl %%ecx,%%eax\n" "\tcpuid\n" "endcpuid:\n" "\tmovl %%ebx,%0\n" --- 197,206 ---- "\tandl $2097152,%%eax\n" "\tandl $2097152,%%ebx\n" "\txorl %%eax,%%ebx\n" ! "\tjnz have_cpuid_inst\n" "\tclrl %%ebx\n" "\tjmp endcpuid\n" ! "have_cpuid_inst:\tmovl %%ecx,%%eax\n" "\tcpuid\n" "endcpuid:\n" "\tmovl %%ebx,%0\n" *************** *** 713,721 **** cpuid_t cpuId; unsigned int regs[4], regs2[4]; ! if (!have_cpuid()) ! regs[0] = 0; /* No cpuid support -- skip the rest */ ! else cpuId= CPUID_GetId(); /* get standard cpuid level and vendor name */ if (cpuId.family!=0) --- 717,723 ---- cpuid_t cpuId; unsigned int regs[4], regs2[4]; ! cpuId= CPUID_GetId(); /* get standard cpuid level and vendor name */ if (cpuId.family!=0)

1 0

Acknowledgment page
by Tom 10 Feb '04

10 Feb '04

Hello All, I have decided to volunteer to do the "Acknowledgment page" It will be short and simple and here are my plans. After Brian sends his update to the "Who's Who" page I will list everyone that has been removed from that page onto a "Acknowledgment page". Here is my problem :) I have only been involved with this project for the last 18 months so I have no idea of who some of the major contributors were! Here is a short list of past developers that i'm aware of, and the work that they did. Bob Amstadt Guy Albertelli David Hammerton Peter Hunnisett György 'Nog' Jeney Tony Lambregts Douglas Ridgway John Sheets Are you guys aware of past developers who did major work and who are not listed here or on the current "Who's Who" page? I will also link to the AUTHORS page for a full list of current and past developers. All feedback is most welcome! Tom

2 1

NHL2004 D3D8 crash
by Abdul-Haseeb Ahmad 10 Feb '04

10 Feb '04

i have finally gotten nhl2004's menus to work the way its supposed to.. going into the game it crashes however.. i've attached a +d3d trace of the error output (here: http://bugs.winehq.com/attachment.cgi?id=530&action=view). the game does some d3d8 stuff before it goes into the menu.. and then once you click on the play button to go ingame the resolution changes, and it does a whole bunch of d3d stuff again and crashes... one thing that may or may not be interesting to note here is that the resolution list in the display options is empty... the installation instructions look pretty lengthy, I'm not sure if you *have* to install all of these, but most of them made a difference when i did install them... you can (and *should*) skip the Flash installation, because its not necessary, and when flash IS enabled, it makes everything else on the screen flicker... if you have the time i'd appreciate you'd check it out... 1. installed IE6 via mike hearn's script (wine20031212) - can switch to winex cvs after installing ie6, although ie6 wont be functional standalone 2. installed DCOM98 with "ole32, oleaut32, rpcrt4" native 3. changed dlloverrides to following: [DllOverrides] ;dcom "ole32" = "native" "oleaut32" = "native" "rpcrt4" = "native" "oleaut32.dll" = "native" "olepro32.dll" = "native" "comcat.dll" = "native" "ole32.dll" = "native" "rpcrt4.dll" = "native" ;ie6 "mshtml" = "native, builtin" "shfolder" = "native, builtin" "shell32" = "native, builtin" "shell" = "native, builtin" "shdocvw" = "native, builtin" "shlwapi" = "native, builtin" "urlmon" = "native, builtin" "crypt32" = "native, builtin" "wininet" = "native, builtin" ;default ;"oleaut32" = "builtin, native" ;"ole32" = "builtin, native" "commdlg" = "builtin, native" "comdlg32" = "builtin, native" ;"shell" = "builtin, native" ;"shell32" = "builtin, native" "shfolder" = "builtin, native" "shlwapi" = "builtin, native" ;"shdocvw" = "builtin, native" "advapi32" = "builtin, native" "msvcrt" = "native, builtin" "mciavi.drv" = "native, builtin" "mcianim.drv" = "native, builtin" "msi" = "native, builtin" 4. installed InstallShield 5. installed Java 2 Runtime Environment 1.4.2_02 - gives an error, but it still is installed 6. installed MDAC 2.8 - set "setupapi" = "native" before installation - set "odbc32" = "native" after installataion 7. installed Jet 4.0 SP8 9x/NT - set "imm32" to native before installation - copied native win98se "setupx.dll" to system dir and set to native in config 8. installed Windows Script 5.6 98/ME/NT 9. installed Shockwave Flash 6 redistributable from NHL2004 CD (Shockwave_Installer_Full) - can just regsvr32 Flash.ocx from your windows install - can be obtained from www.macromedia.com/support/shockwave/info/licensing/ as well by signing up - will give an error registering Flash.ocx with redistributable, break program at this point - copy tmp/IXPxxx.TMP/Flash.ocx to system/Macromed/flash/ - run install again, or wine regsvr32 Flash.ocx 10. installed nhl2004 demo from ftp.ea.com/pub/easports/demos/nhl2004/NHL2004Demo.exe - must apply the intro.html hack and the game_setup_interface.js hack from http://bugs.winehq.org/show_bug.cgi?id=1970 (make sure you get the game_setup_interface.js for the DEMO version, not the RETAIL version

1 0

Want to Help with Wine Icons
by Terence Scott 10 Feb '04

10 Feb '04

I'm an illustrator who has been working in the Web Designing/Programming world for a while and would like to help out with drawing icons for Wine. Is there a list of what needs to be drawn and who to send the icons to? Thanks, Terry Scott Innovative Solutions 585-292-5070 x245 tscott(a)innovativesol.com Terence Scott Innovative Solutions 585-292-5070 x245 tscott(a)innovativesol.com

2 1

Status of Wine History page?
by Tom 10 Feb '04

10 Feb '04

It is my understanding that Brian V sent the "Wine History" page to J Newman for inclusion. May I ask what the current status is? May I also ask that this page be posted to wine-patches? It is my understanding that all changes should ge to the patch list so everyone will have a chance to view future changes. Tom

1 0

Re: Uncomment a now passing path test
by Alexandre Julliard 09 Feb '04

09 Feb '04

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > now one more path test passes. No it doesn't, at least not on my machine (otherwise it wouldn't be a todo, I never commit anything that causes a test failure here). Looks like this test will need more work. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: wine/dlls/kernel profile.c
by Dmitry Timoshkov 09 Feb '04

09 Feb '04

"Alexandre Julliard" <julliard(a)winehq.org> wrote: > Log message: > Robert Shearman <R.J.Shearman(a)warwick.ac.uk> > - Use Win32 instead of Unix file functions. > - Process files fully in Unicode. > - Add Unicode file detection. Profile test suite fails after this patch. Please either fix or revert the patch. -- Dmitry.

2 1

Registry delete
by Zimler Attila 09 Feb '04

09 Feb '04

Hi, I tried to found out which value to use in framewnd.c to add key delete support (and rename). I found out that both key and value delete use ID_EDIT_DELETE. My question is: How can I separate the two event? Attila

2 3

Re: lostwages: todo_lists.diff
by Michael Stefaniuc 09 Feb '04

09 Feb '04

Hello, On Sun, Feb 08, 2004 at 01:01:49PM -0500, Tom wrote: > Here is the new revised 0.9 todo_lists it is based on the criteria that we > talked > about at WineConf for a 0.9 release.. At this time we have 4 [DONE], 34 [IN > PROGRESS] > and 18 [TODO] items. So if you woul'd like to volunteer for a item just let > the list know > and we will add you as the current worker. I would keep the old [DONE] items, the page looks better in mostly green. Could maybe motivate some more people to tackle the last remaining problems. Btw. the status of the "Cross compilation on RH" is [DONE] and please use RHL for the abbreviation. bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Bug compatible?
by Fabian Cenedese 08 Feb '04

08 Feb '04

Hi Looking for something else I found this in wine/objects/font.c: GetTextExtentPointA/W: TRACE("not bug compatible."); As funny as it is it doesn't say that much. Is this referring to a bug in Windows? And in what way not compatible? Maybe there should be some comment explaining it. Thanks bye Fabi

3 5

Problem with Quicken crashing: Help, please!
by Carl Sopchak 08 Feb '04

08 Feb '04

Hi, Since about mid-December, I've had an issue running Quicken 2000 Deluxe using the CVS version of wine. The symptom is that *sometimes* (I hate that word when trying to debug!) the program crashes when printing a partial page of checks (landscape, centered, 1 or 2 checks on the page, not 3). When it happens (mostly when I'm trying to print real checks, not when I'm trying to debug the problem - argh!), it always happens after Quicken asks if the bottom tear-off part of the page of checks is still attached, and I click the Yes button. The actual error that I get is an X error, stating that X has run out of resources. The reason for that is that it's trying to create a bitmap with dimensions 1,075,900,608 by 1,082,644,840. Of course it's gonna run out of resources! Running it with --debugmsg, I see that this size is being passed to either CreateBitmap() or CreateCompatibleBitmap() in several places. I have added TRACE() statements before every call to either of these two functions that I can find in the wine source, displaying the values. Unfortunately, I don't see my trace statements in the log (created by redirecting wine's output with --debugmsg +all,-snoop,-win32,-heap) before the "bad values". (I DO see the statements for other calls, as well as those I put within CreateBitmap, so they are getting compiled, etc., correctly...) I have spent a few days - on several occasions - trying to debug this, but I keep running into a brick wall. Before I go much further here, I gotta say that besides other debugging of wine that I've done in the past, I know little to nothing about the Windows API, or the internals of wine. I can't call myself a C expert, either. (I have been a computer consultant for 20+ years - just on other platforms - so I consider myself competant in general debugging and various languages. Picking up C, so far, hasn't been that big of a deal. But I certainly don't know many of the nuances!) That said, here are the questions that I'm hoping someone can help me with so I can continue the debugging process: 1) I'd LOVE to use --debugmsg +snoop, but when I do this, the text box Quicken displays (within the Print Checks dialog) for the user to enter the first check number to print does not get displayed, and the program gives an "invalid check number" error, and I never get to the point that the program crashes. So, as an alternative to tracking down and trying to fix this debugging bug (which I really don't have the expertise [or, frankly, desire] to do in a reasonable amount of time), I was wondering if there was a data structure available that I could use in relay.c that would get me the CALLING procedure name, so that I could add the DPRINTF statements to show who called CreateBitmap / CreateCompatibleBitmap with the "bad values". Any help - as specific as possible - would be greatly appreciated... (Trying to follow all of the calls and returns gets pretty confusing pretty fast!) Or, if anyone has a clue on why +snoop would cause the textbox problem... 2) Now, for my lack of C knowledge: When adding the TRACE() statements, I found several places where the width and height parameters being passed to CreateBitmap and/or CreateCompatibleBitmap and/or CreateDIBitmap were not INT. For example (approximate line numbers in []) dlls/conctl32/animate.c[224], listview.c[4051], trackbar.c[799], treeview.c[4004], objects/dib.c[183], and metafile.c[1037] all pass LONG's, and dib.c[825] passes width as a DWORD, and height as an int. (This seems to be a potential issue relating to the function DIB_GetBitmapInfo, as the width an height fields of the data structures passed in as *header are LONG, except if *header is of type BITMAPCOREHEADER, where it's WORD, but they are being passed back to DWORD and int pointers.) Does the C compiler do an implicit conversion of these data types to INT (correctly), or is the fact that parameters are too big suspect in causing my problem? Can I just assign a LONG (and DWORD) to an INT (i.e., iWidth = lWidth) to do the conversion? Hopefully, these are simple enough questions for someone with the knowledge to answer and get me back on track to solving this issue. Any and all help will be greatly appreciated! Thanks, Carl P.S., I think my next step is going to restore my wine source tree from my November (October?) backup, and make sure the issue is in fact something that's changed in wine, and not some configuration change that's happened. (Althought I'm not certain of the timing, in the same time frame, I've attempted to install IE6, installed TaxCut 2003 (which required IE6 dlls, and seems to run, BTW. I haven't done my taxes yet, though...), and played with fonts some.

1 0

Re: shell32 patch 12
by Mike McCormack 08 Feb '04

08 Feb '04

This patch broke the installation of IE6. When running the command below during installation of IE6, a pathname is scribbled over the stack... C:\windows\inf\unregmp2.exe /Shortcuts /IE5 /RegExts Any ideas why? Mike Martin Fuchs wrote: > This patch is based on work of Ge van Geldorp <ge(a)gse.nl> and me. > > Changelog: > reimplementation of SHGetPathFromIDListA/W() using the new helper > functions SHELL_GetPathFromIDListA/W(). The new implementation avoids to > use IShellFolder::GetDisplayNameOf(), so that it behaves like the following: > > - return the absolute file system path, not relative to the dekstop > - return FALSE as error code if the path can not converted in a valid file system path > - don't return virtual CLSID paths > > Note: > The two helper functions will we called from other places in following patches, so they > are declared in the header file.

2 2

manpage slimmed down?
by cedric 08 Feb '04

08 Feb '04

Hi, recently i upgraded from 20031118 to 20040121. I noticed a lot of bugfixes and speed increases. Thanks! However, i don't like the new man.1 page as much as i did the one from 20031118. The section about what debug channels wine has is gone. This was nice info to have under 'man wine'. Why is it removed? Regards, cedric P.S. Sorry for posting a complaint as my very first post to this list. -- No microsoft products were used for this e-mail

4 4

IE6 Security Controls/URLMon;msimtf (nhl 2004)
by Abdul-Haseeb Ahmad 07 Feb '04

07 Feb '04

Okay when i use IE6 (installed by mike's script) any webpage that uses an activex control says my security settings are too high, even if i lower them (both custom settings and the slider have no effect), or even if i make the site a trusted website... now i believe this might be what be causing problems with NHL2004 because i get a script error 80040154 (which doesnt let me go in game) when i go to the game setup screen(rest of the game is flawless other than DXImageTransform filters not functioning), which is caused by a missing CLSID entry.. so i checked out the errors I was getting and urlmon.dll wasn't registered and neither was msimtf... now the thing that nhl was trying to call was the security manager which is part of urlmon.dll.. when i registered urlmon, it would crash the game, and i can't get msimtf to register because of problems it has with advapi32/user32 implementations... Im not sure what msimtf does, but i have a hunch that clearing the urlmon issue might solve my problems.. anyone have an idea of what i can do to solve this issue? Theres also an error: fixme:system:SystemParametersInfoA Unknown action: 8198 I have a feeling this is harmless though...

2 4

Are bugzilla patches getting in?
by Leonardo Quijano Vincenzi 07 Feb '04

07 Feb '04

Hello everybody. I'm new to the developers list. I have a question about patches in bugzilla. Do developers usually read the bug reports to check for patches? Or is it better to send them directly to wine-patches? I'm talking about the following (minor) bugs, just in case: http://bugs.winehq.org/show_bug.cgi?id=1980 http://bugs.winehq.org/show_bug.cgi?id=1981 Thanks in advance. -- Leonardo Quijano Vincenzi <lquijano(a)hotpop.com>

4 5

Update: starcraft runs faster from debugger!
by cedric 07 Feb '04

07 Feb '04

crossposted to wine-dev, and wine-users Hi, I've done some more tests, and i found that when i run winedbg starcraft and wine starcraft and then again winedbg starcraft etc. It works, but always following this pattern: <boot my box> winedbg starcraft :all runs perfectly wine starcraft: all video choppy winedbg starcraft :all runs perfectly winedbg starcraft: all video choppy wine starcraft all video choppy winedbg starcraft: :all runs perfectly Looks like winedbg leaves some things in a bad state, and running wine seems to solve the problems. However, after each run of winedbg i have 4 more of these: 1797 pts/0 00:00:01 wine-kthread <defunct> And after about 4 or 5 times trying the wine trick doesn't work anymore, Whatever i do the game starts choppy. I don't know how to trace a program while it's running from the debugger, winededbg --debugmsg +x11drv <prog> doesn't seem to work. How is the corrrect startline? The trace from wine shows that DGA is disabled (even with /dev/mem set at 777) Can somebody confirm this pattern of events? you need ,wine-20040121 (haven't tried other versions) and starcraft retail or starcraft shareware to reproduce this. The shareware version of starcraft should be available at: www.blizzard.com Regards, cedric -- No microsoft products were used for this e-mail

2 1

programs/winedbg/elf.c breaks non-Linux platforms
by Gerald Pfeifer 07 Feb '04

07 Feb '04

Hi, I'm afraid the following patch which added programs/winedbg/elf.c date: 2004/02/03 00:14:12; author: julliard; state: Exp; Eric Pouech <pouech-eric(a)wanadoo.fr> - now detecting Dwarf debug information in ELF modules (but don't load it) - separated module management (pe.c, elf.c) from debug information management (stabs.c, msc.c) - worked around new wine-pthread and wine-kthread loaders (no longer use "wine" as default loader) - better convergence of gdb-proxy and winedbg for ELF handling - fixed ELF link-map walking - now using all loaded shared libs - (with the help of Robert Shearman) - added a bit of const correctness breaks building Wine on non-Linux platforms. For example, on FreeBSD 4.9 I'm seeing: elf.c: In function `DEBUG_ProcessElfFile': elf.c:344: error: `DT_NUM' undeclared (first use in this function) elf.c:344: error: (Each undeclared identifier is reported only once elf.c:344: error: for each function it appears in.) elf.c:344: error: `DT_PROCNUM' undeclared (first use in this function) elf.c:344: error: `DT_EXTRANUM' undeclared (first use in this function) elf.c:345: error: `DT_LOOS' undeclared (first use in this function) elf.c:345: error: `DT_HIOS' undeclared (first use in this function) elf.c:346: error: `DT_LOPROC' undeclared (first use in this function) elf.c:346: error: `DT_HIPROC' undeclared (first use in this function) Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

3 4

Wineboot should process RunOnceEx Entries
by Geoffrey Antos 07 Feb '04

07 Feb '04

I saw early postings about RunOnceEx in this mailing list circa January 2003, however the problems they presented were never fixed. Some programs come with simple INF installers because people can cheaply create an INF file, and use a free Setup.exe bootstrap file that reads the name of an INF file from Setup.ini or something similar. These programs do not have any way of processing RunOnceEx themselves. In the distant past before I had converted to Linux and wine, I used to deal with such programs quite a bit; RunOnceEx was Microsoft's way of allowing simple installers to register files, especially if a reboot and wininit was necessary to overwrite files. The basic structure of the registry format is: [Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx\\Number] "Number"="program.exe arguments" "Number"="c:\\somepath\\somedll.dll|SomeExportedFunction" Number is nothing more than a number. All commands are processed in sequential order, first by key, then by value. If there is no pipe symbol in the line ('|'), the data of the value is executed as a program, with all following tokens passed on as arguments. However, if the pipe symbol is included, the portion to the left is treated as a DLL, and calls the exported function of the name to the right of the symbol. Once all values in a key are processed, the key is deleted, and the process starts with the next key. There is one subkey that has a special meaning: All keys/values in [Software\\Microsoft\\Windows\\CurrentVersion\\RunOnceEx\\Setup] are not processed at boot-up. Rather, they are read by the program runonce.exe, not included in wine. It is through this key that one gets the annoying "Updating Windows" box in the upper left corner of the screen, listing tasks being performed. I believe Powertoys for Windows 98 utilized this feature, but I do not remember how. However, these days RunOnceEx still has one important feature: Some people, like me, have programs that fail to load objects because the OS version is not set to XP. When the OS is set to xp, the install-ie6 script does not automatically process the RunOnceEx keys, failling to register all of the DLL's, including the Crypto support needed for programs such as Steam. As such, for IE6 alone, users have to process 50+ lines by hand, in something that SHOULD be processed at bootup, via wineboot.

3 3

Update: starcraft runs faster from debugger!
by cedric 07 Feb '04

07 Feb '04

crossposted to wine-dev, and wine-users Hi, I've done some more tests, and i found that when i run winedbg starcraft and wine starcraft and then again winedbg starcraft etc. It works, but always following this pattern: <boot my box> winedbg starcraft :all runs perfectly wine starcraft: all video choppy winedbg starcraft :all runs perfectly winedbg starcraft: all video choppy wine starcraft all video choppy winedbg starcraft: :all runs perfectly Looks like winedbg leaves some things in a bad state, and running wine seems to solve the problems. However, after each run of winedbg i have 4 more of these: 1797 pts/0 00:00:01 wine-kthread <defunct> And after about 4 or 5 times trying the wine trick doesn't work anymore, Whatever i do the game starts choppy. I don't know how to trace a program while it's running from the debugger, winededbg --debugmsg +x11drv <prog> doesn't seem to work. How is the corrrect startline? The trace from wine shows that DGA is disabled (even with /dev/mem set at 777) Can somebody confirm this pattern of events? you need ,wine-20040121 (haven't tried other versions) and starcraft retail or starcraft shareware to reproduce this. The shareware version of starcraft should be available at: www.blizzard.com Regards, cedric -- No microsoft products were used for this e-mail

1 0

Re: PATCH: virtual fixes for native mode
by Juan Lang 07 Feb '04

07 Feb '04

Hi Uwe, in NT the native (system call) interface is through ntdll. There are a number of subsystems implemented on top of that: the win32 subsystem, the posix subsystem, and the OS/2 subsystem. It's possible however to write an app that just uses ntdll; this is a "native" NT app. This page has a pretty good explanation: http://www.sysinternals.com/ntw2k/info/native.shtml --Juan __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

2 1

Re: PATCH: virtual fixes for native mode
by Uwe Bonnes 06 Feb '04

06 Feb '04

>>>>> "Marcus" == Marcus Meissner <marcus(a)jet.franken.de> writes: Marcus> Hi, This is the next try for assisting loading NT native dlls. Marcus> We need non-page aligned access for those drvs, which have Marcus> sections that are not page aligned. Marcus> Also some bad magic tries to write the import thunks into Marcus> thefirst page, so we need to map the header r/w too. Marcus> Ciao, Marcus Marcus> Changelog: Added possibility to map native mode dlls which have Marcus> sections that are not page aligned. What are native NT dlls? An explanation is appreciated! Thanks -- 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

Re: DOC: improvement to the cross-compiling of the tests (take 2)
by Dimitrie O. Paun 06 Feb '04

06 Feb '04

On Fri, 6 Feb 2004, Michael Stefaniuc wrote: > Hello, > > Alexandre, please use this patch instead. Funny, funny :) -- Dimi. P.S. No patch attached.

1 0

Re: DOC: improvement to the cross-compiling of the tests doc
by Dimitrie O. Paun 06 Feb '04

06 Feb '04

On Fri, 6 Feb 2004, Michael Stefaniuc wrote: > here is an updated documentation for the cross-compiling of the Wine > tests with MinGW. You can safely drop the reference to that patch, things have been fixed since then. Even if they aren't, it's not the place for such kind of information. And while you're at it, maybe you can also include the instructions about cross-compiling the entire Wine tree. :) -- Dimi.

2 1

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 06 Feb '04

06 Feb '04

>> Where did you disable it? My patch or yours? With my patch it should >> never even get to try to call CreateIcon (which fails). So either the >> field is not 0 or you don't jump out. > >I juste removed my header[1]==1, so you can say i rejected my patch. > >> >MessageBox with >> >"Failed to load control 'SSTab' from TABCTL32.OCX. Your version of >> >TABCTL32.OCX is outdated...." >> >> This is the error I wanted to eliminate, just look for my postings with >> SSTAB in the subject in the last two months :) >> When I jump out if header[1] is 0 then I don't get this error anymore >and >> VB programs with the SSTab control come up. But I only tried those >> without icons as I assumed that those with icons don't have a 0 field. >But they do have 0 field... > >I can't help you until i see how your app is supposed to work. >Please make sure the programm runs without (header[1]==0). That's the point, it doesn't work on wine in the current state. That's why I try to fix wine. Use my patch (even if it's wrong for your progs) then my app should come up and you can test what's going on. This bug in wine prevents many VB apps from running on wine. And as we have some of them I tried to fix it. bye Fabi

2 1

Out of the office and all of that.....
by Steven Edwards 06 Feb '04

06 Feb '04

Sorry if you have had mail bounced to me and all of that. I am still on post-wineconf vacation until monday and my mailbox is a little overflowing. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Finance: Get your refund fast by filing online. http://taxes.yahoo.com/filing.html

1 0

Wrong short filenames instead of long ones
by Fabian Cenedese 06 Feb '04

06 Feb '04

Hi I'm trying to find a file copy tool which works on windows as well as wine. I tried several and this looked promising: ftp://ftp.simtel.net/pub/simtelnet/msdos/fileutil/cc108dos.zip On Windows it copied all files without problems and kept the long filenames even if the name implies that it's DOS-only, but it worked fine on W2K. But on wine the long names where all shortened to something like CINO~E2H.CPP. So it doesn't look like normal DOS short names ...~1.cpp but it's not the long name either. Can anybody try this out? My wine (actual cvs) config is set to windows version nt40. Thanks bye Fabi

3 3

File probably truncated
by Thomas Brix Larsen 06 Feb '04

06 Feb '04

Hi again, I'm getting stuff like this when trying to use Windows programs: 0009:trace:module:map_image mapped PE file at 0x400000-0xf89000 0009:trace:module:map_image mapping section .text at 0x401000 off 1000 size 6a4000 flags 60000020 0009:err:module:map_image Could not map section .text, file probably truncated Why? Anybody please? -- Thomas Brix Larsen <killar(a)get2net.dk>

4 5

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 06 Feb '04

06 Feb '04

At 12:58 06.02.2004 -0500, Kirill Smelkov wrote: >On Fri, 6 Feb 2004, Fabian Cenedese wrote: > >[...] >> >I can't help you until i see how your app is supposed to work. >> >Please make sure the programm runs without (header[1]==0). >> >> That's the point, it doesn't work on wine in the current state. That's why >> I try to fix wine. Use my patch (even if it's wrong for your progs) then >> my app should come up and you can test what's going on. >> This bug in wine prevents many VB apps from running on wine. And as >> we have some of them I tried to fix it. > >Maybe i missed something (is so, i'm sorry), but where do i get your >patches? I sent it to wine-devel, but I can't access winehq at the moment (down?) so here it is again. It's just jumping out if header [1] is 0 (which works for me but I guess it's wrong for your programs). Index: dlls/oleaut32/olepicture.c =================================================================== RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v retrieving revision 1.30 diff -u -r1.30 olepicture.c --- dlls/oleaut32/olepicture.c 5 Sep 2003 23:08:33 -0000 1.30 +++ dlls/oleaut32/olepicture.c 29 Jan 2004 16:19:25 -0000 @@ -873,6 +873,9 @@ hr=IStream_Read(pStm,header,8,&xread); if (hr || xread!=8) { FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread); + return hr; + } + if (header[1]==0) { return hr; } if (header[1] > statstg.cbSize.QuadPart) {/* Incorrect header, assume none. */ bye Fabi

1 0

Sending patch for bug 1848
by Andreas Rosenberg 06 Feb '04

06 Feb '04

Hi folks, I sent a patch for bug 1848 already twice. 1st time in the first half of december. 2nd time last week. Other stuff seems to be commited into the CVS. I was wondering, why my patch is not accepted. Can't you keep the pace commiting the patch into the CVS as they are sent to you? Is something wrong with my patch? Wrong diff format, style, break's something??? It the bug being fixed "to small" to include the patch? - Andy

2 1

32bpp bitmaps
by Kevin Koltzau 06 Feb '04

06 Feb '04

I am loading a 32bpp bitmap from resources of a dll, but under wine its being reported as 24 bit..for example void main() { HMODULE hTheme = LoadLibrary("C:\\Windows\\Resources\\Themes\\Luna\\Luna.msstyles"); HBITMAP hBmp = LoadBitmap(hTheme, "BLUE_BUTTON_BMP"); BITMAP bmp; GetObject(hBmp, sizeof(bmp), &bmp); printf("bpp=%d\n", bmp.bmBitsPizel); } under Windows prints 32, under Wine prints 24 I've tried to find the cause of this, but much of this is deep in x11drv which I am not familliar with at all.. Is wine stripping the alpha channel for some reason? or is this a bug? (I've only run this example on that one file, its the native Luna.msstyles theme from an XP system)

2 3

Re: Wine - update for Who's Who page
by Tom 06 Feb '04

06 Feb '04

Brian Vincent wrote: > One of the to do items is update the Who's Who list on WineHQ. If > you look at it right now it's horribly out of date: > http://www.winehq.org/site/who Yea.. The idea is to create an Acknowledgment page for the guy's that are currently inactive, or just have a link to the authors.. (???) > > This is an opportunity to both recognize you for your contributions > and serve as a way to promote Wine. After talking with Dimi at Wineconf > it became immediately apparent that being immortalized on WineHQ will > lead to hordes of beautiful women knocking on your door. When I first started using linux everyone talked about all this free beer.. Now we get wemon to boot.. :-) > > I think the format will remain similar; What I was going to do is not have the CodeWeavers section, VIPs/Core Devel/etc categories, as maybe some people don't like classifications. There are developers from CodeWeavers, TransGaming, ReactOS and so on.. The best thing would be to just have a affiliation attribute to each person. This way the more developers they have working on wine the more linkage they receive. This is a "Wine" Who's Who! Should we add a small pic of each developer to there section? Comments or idea's are most welcome. Tom

1 0

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 06 Feb '04

06 Feb '04

>> >Then what type of picture it is? >> > >> >0x4947 GIF >> >0xd8ff JPEG >> >0x4d42 BMP >> >0x0000 ICON >> >0x746c ??? >> >> Well, as I didn't use any pictures I don't know what it's supposed to be. >> Might as well be "NoPic" :) But I have also seen this marker where the >> second field was not zero. > >It's probably some ole-storage magic. Don't know as i have no clue on how >ole works at all :) Neither do I :) >> Maybe this isn't even part of a picture and we shouldn't be reading this. >> How does it know that a picture is coming? Perhaps we shouldn't >> even enter OLEPictureImpl_Load if there is no picture at all. > >Fabi, > >I temporarly disable checking for (header[1]==0). even in such case your >test-case doesn't start: >fixme:ole:CoRegisterMessageFilter stub >fixme:ole:OleLoadPictureEx >(0x418ae294,774,0,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x4075fb08), >partially implemented. >fixme:ole:OleLoadPictureEx >(0x418ae294,774,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x4075fad8), >partially implemented. >fixme:ole:SPCF_CreateInstance >(0x40acdbc8,(nil),{7bf80980-bf32-101a-8bbb-00aa00300cab},0x402313a4), >creating stdpic with PICTYPE_NONE. >fixme:ole:SPCF_CreateInstance >(0x40acdbc8,(nil),{7bf80980-bf32-101a-8bbb-00aa00300cab},0x40231aac), >creating stdpic with PICTYPE_NONE. >fixme:ole:OLEPictureImpl_Load CreateIcon failed. >fixme:ole:OLEPictureImpl_Destroy Unsupported type 0 - unable to delete >fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet. Where did you disable it? My patch or yours? With my patch it should never even get to try to call CreateIcon (which fails). So either the field is not 0 or you don't jump out. >and then > >MessageBox with >"Failed to load control 'SSTab' from TABCTL32.OCX. Your version of >TABCTL32.OCX is outdated...." > >Does it work at all? This is the error I wanted to eliminate, just look for my postings with SSTAB in the subject in the last two months :) When I jump out if header[1] is 0 then I don't get this error anymore and VB programs with the SSTab control come up. But I only tried those without icons as I assumed that those with icons don't have a 0 field. >If so, then we probably should figure out whethere there are some >ole-storage magic present and chek for them when decidign whether to look at header[1] and how to interpret it. This is definitely above me. Maybe some guru can help here. Who's a pro in ole pictures? Picking anyone's pride? :) bye Fabi

2 1

App compiled with Delphi5 works, same App with Delphi7 does not.
by Samuel Herzog 05 Feb '04

05 Feb '04

Dear Newsgroup, I have downloaded and installed Release 20040121. I have a very small application (for testing purpose) which I can compile with Delphi 5,Delphi 6,Delphi 7. The application compiled with Delphi5 works fine. The same application compiled with Delphi7 shows an exception <EAccessvioalation in Module zxtheme.dll at 00006A71>. Any hints what to do ? Thank you, Samuel Herzog

3 4

Investigating the XInitThreads deadlock bug
by Sami Aario 05 Feb '04

05 Feb '04

Hi all, I decided to investigate this old bug: http://www.winehq.com/hypermail/wine-devel/2003/12/0158.html even though Alexander removed thread initialization from x11drv. So the first thing I did was apply this patch: Index: x11drv_main.c =================================================================== RCS file: /home/wine/wine/dlls/x11drv/x11drv_main.c,v retrieving revision 1.87 diff -u -r1.87 x11drv_main.c --- x11drv_main.c 30 Jan 2004 22:54:39 -0000 1.87 +++ x11drv_main.c 1 Feb 2004 18:02:26 -0000 @@ -332,6 +332,8 @@ /* Open display */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); + if (!(display = XOpenDisplay( NULL ))) { MESSAGE( "x11drv: Can't open display: %s\n", XDisplayName(NULL) ); I determined that the tests under user/tests were causing deadlock. The attached file debugrun1 shows this. Start the debugger with: winedbg user32_test.exe.so and repeat the steps I made, and the executable should deadlock at the call to XGetScreenSaver. (By the way, I used a version of the tests where I'd commented out all other tests except the test_SPI_GETSCREENSAVEACTIVE one, and that's why you only see "testing SPI_{GET,SET}SCREENSAVEACTIVE", but that's not important.) Next, I decided to investigate which mutual exclusion primitive is causing the trouble. This run is included as debugrun2. There are two threads involved: thread 0xb is the application main thread, and 0xe is a thread created by the main thread to generate the tests. Thread 0xb owns a critical section that 0xe wants, and hence deadlock. Note the call to "walk thread" in the beginning. Note also that I single-stepped thread 0xe right up to the call to RtlpWaitForCriticalSection that deadlocks. I also added some display commands to show you the details of the critical section in question. Now, if you look at what the display says you'll notice something odd: at first crit = 0x0011d1e0, but then it switches to 0x403112b8. And this is without any breakpoints having been set up within RtlEnterCriticalSection! So it can't be a context switch - it seems like a bug in the debugger. Or is this intentional in some way? Anyway, this critical section is the one the x11drv library sets up when XInitThreads is called. Next I attempted to find out where the main thread acquires the critical section, before the deadlock. This is attached as debugrun3. Notice that I worked around the odd debugger feature mentioned in the previous paragraph, by placing a breakpoint not at the entry point of RtlEnterCriticalSection, but a few next's later. This allowed me to add the condition crit==0x403112b8. The "crit" pointer seems to consistently stay the same between debugger sessions, so this works (for me at least). See how LockCount is 0, even though this is the first call to RtlEnterCriticalSection with crit==0x403112b8 during this session? It should be -1 for a critical section that is being acquired for the first time! So this made me suspect that the crit sect is acquired during initialization (and then not released), which is why I applied the following patch: Index: critsection.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/critsection.c,v retrieving revision 1.23 diff -u -r1.23 critsection.c --- critsection.c 5 Sep 2003 23:08:34 -0000 1.23 +++ critsection.c 4 Feb 2004 20:15:46 -0000 @@ -243,6 +243,7 @@ */ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) { + if (crit==(RTL_CRITICAL_SECTION *)0x403112b8) TRACE("critsection=%p: LockCount=%ld\n", crit, crit->LockCount); if (interlocked_inc( &crit->LockCount )) { if (crit->OwningThread == (HANDLE)GetCurrentThreadId()) and then launched the debugger with: winedbg --debugmsg -all,+ntdll user32_test.exe.so (I didn't bother with making the reference to crit->LockCount thread-safe.) The result of this is attached as debugrun4. Notice this line: No debug information in ELF '/usr/X11R6/lib/libXrender.so.1' (0x40016000) See how after four calls to RtlEnterCriticalSection, LockCount starts to be 0? So a pretty good theory is that the critical section is acquired, and then not released, during the loading and initialization of /usr/X11R6/lib/libXrender.so.1. This theory is not bulletproof, which is why I attempted to see whether LockCount ever becomes -1 again, but the debugger consistently barfed on me (== crashed). Well, that's it for now - I'll let someone more knowledgeable in libraries and their initialization carry on with this, if the're interested. A final note: naturally, you most likely won't have the same address for the critical section as me, but you should be able to find out what it is if you redo the steps I made. Have fun! -- Sami

3 2

Re: Re: [Winecfg] - redo applications tab, misc changes
by chmorgan＠charter.net 05 Feb '04

05 Feb '04

> On February 4, 2004 05:20 pm, chmorgan(a)charter.net wrote: > > I'm pretty sure lots of other wine code uses 2 space indents, I know I > > started using them after working with wine. > > Yes, other code does so, but I think the preferred style is 4-space. > Now, as I said, if you feel strongly about it, it will stay 2-space. > But if you're flexible on this issue, 4-space indents would be nice. > > > No other comments on the ui changes in winecfg? ;-) I'll submit to > > wine-patches tonight after going through the code once more. > > Hey, I was at work (so I couldn't test). But now I got a chance to > look at it, so here are my comments: > -- it looks good. This is good stuff, I think we're getting > very close to the finish line. > -- have the Applications be the first page is a bit confusing. > This is advanced functionality, I'd start with something > else, like the Drives tab. > -- I could delete the "Global Settings" in the Application > tab, which also hosed my registry Doh. We should probably prevent users from deleting any of the global settings and ensure that the global settings are always present. > -- Whenever I've tried to add a app, and change it's settings, > it will disappear right away (whenever I tried to change > any of it's settings). > -- whenever I've tried changing something, I got errors like > this: > err:winecfg:setConfigValue Unable to set configuration key (null) in section AppDefaults\coolplayer.exe\Version to (null), res=1021 > Maybe my installation is faulty? > Winecfg is using the ~/.wine/config file right now, this isn't writeable so if you try to add/delete apps you won't be able to change anything. When you try to add the app the keys are created and then the treeview is completely rebuilt, I know, not the most efficent but it works. So, you click to add the app, the keys are created(but don't create since you can't modify your config file), and then the treeview is refreshed so your changes are lost. Chris

1 0

[ddraw] asynchronous screen updates
by Piotr Pawlow 05 Feb '04

05 Feb '04

If DGA is not available, Wine falls back to creating offscreen primary surface and blitting all changes to the screen. It knows which part of the surface might have changed by watching unlock calls. However, as Jukka Heinonen pointed out in his message posted on 17.10.2001, the update logic in asynchronous mode (when SYNC_UPDATE is not defined, which is the default) is broken: "(...)if more than one lock/unlock pair happens between update thread blits, display might not be updated correctly". Synchronous mode on the other hand, causes applications, which constantly lock and unlock big areas just to change a few pixels, run very slow. As this bug prevents me from playing "Warlords: Battlecry", I decided to do something about it. Here are my changes: - User_add_dirty_rect is now an asynchronous equivalent of User_copy_to_screen. It adds the rectangle to the list of dirty rectangles and signal the update thread that there is some work to do. - update thread calls User_get_dirty_rect to iterate over the list of dirty rectangles - current "naïve" algoritm keeps only one rectangle which is a union of all dirty rectangles, so it tends to redraw too much, but better algoritms may be implemented - removed now unused lastlockrect variable, and the code which updates it I attached the patch for your reviews, comments, suggestions. The game is almost playable now, there are remaining issues with DirectMusic (must be run with NODIRECTMUSIC switch or crashes) and windows managers (kwin cannot raise the window, metacity complains that the window attributes do not make sense). -- Piotr Pawlow mailto:pp@siedziba.pl

5 7

DIB_DirectDrawSurface_BltFast signed/unsigned comparision bug
by Piotr Pawlow 05 Feb '04

05 Feb '04

Hello, I spotted this bug while trying to fix mouse pointer trails problem in Warlords Battlecry. All widths, heights and left/top coordinates are of DWORD type, so substracting them from each other always give positive numbers. Thus h and w are always >= 0, so DDERR_INVALIDRECT is returned only in a couple of boundary cases. I just added explicit casting to int where needed. It didn't fix the mouse trails, but previously missing mouseover effect on icons at the main screen appeared, so I guess it is a change in the right direction :) Patch attached.

3 4

Broken tests in CVS
by Paul Millar 05 Feb '04

05 Feb '04

Hi everyone, It looks like last night's patches broke the conformance tests: http://www.astro.gla.ac.uk/users/paulm/WRT/wrt.php I'm away from my desk machines at the moment, so can't test this further. Does anyone else see these problems? Cheers, PS is winehq.org website dead at the moment? ---- Paul Millar

1 0

Re: Re: [Winecfg] - redo applications tab, misc changes
by chmorgan＠charter.net 05 Feb '04

05 Feb '04

I'm pretty sure lots of other wine code uses 2 space indents, I know I started using them after working with wine. No other comments on the ui changes in winecfg? ;-) I'll submit to wine-patches tonight after going through the code once more. The x11 tab is global settings only at this point. I think we can remove a couple of options on this tab, UseRandR is the only one I can think of atm. If we do make x11 settings per-app/global, like the apps and libraries tab, it seems like we should somehow combine the tabs. Yet is is nice having distinct tabs. In any case, I don't use per-app x11 settings so unless someone decides to implement this I likely won't be back at it for a while. Thanks, Chris > > From: "Dimitrie O. Paun" <dimi(a)intelliware.ca> > Date: 2004/02/04 Wed PM 02:14:59 EST > To: Chris Morgan <chmorgan(a)charter.net> > CC: wine-devel(a)winehq.com > Subject: Re: [Winecfg] - redo applications tab, misc changes > > On Tue, 3 Feb 2004, Chris Morgan wrote: > > > Comments, questions, suggestions welcome ;-) > > The one complaint I have is that it changes the 4-space indentation > to 2-space indentation, which makes the code so much harder to follow. > I know, you're doing the work, so you get to chose :), but if it's not > too much to ask, can we please stick to 4-space indentation? > > -- > Dimi. > >

6 6

Re: winedbg fixup
by Dmitry Timoshkov 05 Feb '04

05 Feb '04

"Eric Pouech" <pouech-eric(a)wanadoo.fr> wrote: > +static unsigned is_dt_flag_valid(unsigned d_tag) > +{ > +#ifndef DT_PROCNUM > +#define DT_PROCNUM 0 > +#endif > +#ifndef DT_EXTRANUM > +#define DT_PROCNUM 0 > +#endif Shouldn't in the latter case it be: #ifndef DT_EXTRANUM #define DT_EXTRANUM 0 #endif -- Dmitry.

1 0

Installing MS Windows Script 5.6
by Abdul-Haseeb Ahmad 04 Feb '04

04 Feb '04

Has anyone managed to intstall either the 9x or NT/XP version of windows script 5.6 (http://msdn.microsoft.com/library/default.asp?url=/downloads/list/webdev.as… I get an error registering the OCX wshom.ocx when it installs; I had to use a native MFC42.DLL to get vbscript.dll to register. I'm pretty sure I've narrowed down that this is the reason why I'm getting script errors in NHL2004; if you check EA's tech support site, it says that you need to install IE6SP1 (which i have installed) and Windows Script 5.6... oh this also was the 9x version that I tried to install... im thinking it might have to do with this specific error: fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 anyone know about this? heres the full error output: err:wave:OSS_WaveOutInit /dev/mixer1: No such device err:wave:OSS_WaveInInit /dev/mixer1: No such device fixme:setupapi:SETUPX_CreateStandardLDDs LDID_SRCPATH: what exactly do we have to do here ? fixme:setupapi:GenInstall16 unsupported flag: GENINSTALL_DO_REGSRCPATH fixme:setupapi:create_system_dirid unknown dirid 13 fixme:setupapi:vcpUICallbackProc16 (0x6e00, 0705, 0000, 00000000, 403210ac) - semi-stub fixme:setupapi:vcpUICallbackProc16 (0x6e00, 070f, 0000, 00000000, 403210ac) - semi-stub fixme:setupapi:vcpUICallbackProc16 (0x6e00, 0710, 0000, 00000000, 403210ac) - semi-stub fixme:setupapi:vcpUICallbackProc16 (0x6e00, 070b, 0000, 00000000, 403210ac) - semi-stub fixme:setupapi:vcpUICallbackProc16 (0x6e00, 070c, 0000, 00000000, 403210ac) - semi-stub fixme:setupapi:GenInstall16 unsupported flag: GENINSTALL_DO_CFGAUTO fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:MSFT_ReadValue BSTR length = 0? fixme:ole:MSFT_ReadValue BSTR length = 0? fixme:ole:MSFT_ReadValue BSTR length = 0? fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154 fixme:ole:CoCreateInstance no classfactory created for CLSID {0002e005-0000-0000-c000-000000000046}, hres is 0x80040154

1 1

Wine 0.9 TODO
by Dimitrie O. Paun 04 Feb '04

04 Feb '04

Hi folks, Here is the detailed TODO in all it's glory. We _really_ need to get this over with, so please help us out to get this release out the door. I'll mark names by the tasks based on conversations I had with folks at WineConf (and on the list). If you notice any mistakes, please let me know. Items marked with (???) have no owner. If you think you can help on any of these (including ones that do have owners!), please let me know. Help is needed and appreciated. If it's not clear what needs to be done for any of these, get in touch with me, I'll be more than happy to help you get started. Enjoy! A. WineHQ.org ============== 1. History page (Brian) [IN PROGRESS] 2. Testing status (Ferec) [IN PROGRESS] 3. I18n status (Vincent) [IN PROGRESS] 4. Porting status (Dimi, Steven) [IN PROGRESS] 5. Who's Who (Tom) 6. Documentation page update (???) 7. Download page (esp. source) needs work (???) 8. Acknowledgment page (???) 9. UI status update (???) 10. Integrate API status into WineHQ (???) B. Documentation ================ User Guide ---------- 1. Update configuration instructions based winecfg & regedit (???) 2. Suggest winefile instead of Calmira (???) 3. Misc cleanups (Dimi) Devel Guide ----------- 1. Update COM section/widl (???) 2. Redo Multimedia section (???) 3. Add i18n section (Vincent) 4. Suggest adding tests w/ patches (Dimi) 5. Cross compilation on RH (Michael) 6. Add section on KERNEL32 (???) 7. Misc cleanups (Dimi) Winelib Guide ------------- 1. Update around MinGW/winegcc (Dimi, Francois) 2. Misc updates (Dimi) C. Configuration ================ 1. Complete regedit (Attila) [IN PROGRESS] 2. Complete winecfg (Chris, Mike) 3. Setup API .inf scripts (Chris) [IN PROGRESS] D. UI Code ========== 1. Visible region handling in server (Alexandre) 2. Inter-process handle management (Urlich, Alexandre) E. File Formats =============== 1. .spec files [DONE] 2. .reg files [DONE] 3. I18n output (Vincent) [IN PROGRESS] F. Exported API =============== 1. DLL separation I [DONE] 2. DLL separation II (Alexandre, Eric) [IN PROGRESS] 3. wineserver protocol (Alexandre) G. Tools ======== 1. winebuild: build DLLs from .def files (Alexandre) 2. winegcc: add simple gcc-independence (Dimi) 3. winegcc: generate DLLs/-shared (Dimi) 5. winemaker: generate MinGW compatible makefiles (???) 4. winemaker: use dsw2make from MinGW (???) 5. winemaker: no configure script (???) 6. autoconf: add all Wine-specific macros to the aclocal (???) 7. winedesktop: create new tool (Alex) [IN PROGRESS] H. Miscellaneous ================ 1. Testing daemon to run as a Windows service (???) 2. Exec-shield support (???) 3. Prelink support (???) 4. Version symbols in libwine & libwine_unicode (Alexandre) 5. Find packager for a PE-build of Wine on SF (???) 6. Standardize Wine handling in autoconf (Dimi) -- Dimi.

3 5

Re: ntdll / kernel32: #49
by Dimitrie O. Paun 04 Feb '04

04 Feb '04

On Wed, 4 Feb 2004, Eric Pouech wrote: > that's all for now Ahhh, so disappointing! We were expecting a cool patch... :))) -- Dimi. P.S. Man, you rock! This is way, way cool!!!

1 0

[Winecfg] - redo applications tab, misc changes
by Chris Morgan 04 Feb '04

04 Feb '04

* programs/winecfg/En.rc, appdefaults.c, properties.c, properties.h, resource.h, winecfg.h, x11drvdlg.c, Es.rc, Pt.rc, Ru.rc, Si.rc Chris Morgan <cmorgan(a)alum.wpi.edu> Rename 'General tab' to 'About', move to the last position. Make applications tab handle global and per-app winver, dosver and winelook settings, mirroring the Libraries tab. Code copied from Robert van Herk's libraries tab. Move global/app specific function and global to the x11drv tab where it is currently used. Add a couple of property helper functions. Set 3D border around treeview controls. Removed invalid resources from languages other than En. Comments, questions, suggestions welcome ;-) Chris

2 1

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 04 Feb '04

04 Feb '04

>> >> This fails on on my computer and I don't >> >> know how wine could detect if it's a headerless picture or no picture at all >> >> if they look the same (so far). >> > >> >Maybe check header[0] to be real .bmp or .gif magic and header[1] for >> >zero? >> >> I couldn't see a difference, always 0x746c in the first entry. > >Then what type of picture it is? > >0x4947 GIF >0xd8ff JPEG >0x4d42 BMP >0x0000 ICON >0x746c ??? Well, as I didn't use any pictures I don't know what it's supposed to be. Might as well be "NoPic" :) But I have also seen this marker where the second field was not zero. >Have you seen something like "Unknown magic, blah-blah-blah..."? It depends. Without your patch (where [0]=746c, and [1]=0) : trace:ole:OLEPictureImpl_Load (0x40383880,0x414de29c) fixme:ole:OLEPictureImpl_Load icon.idReserved=0 fixme:ole:OLEPictureImpl_Load icon.idType=0 fixme:ole:OLEPictureImpl_Load icon.idCount=0 fixme:ole:OLEPictureImpl_Load [0] width 0 fixme:ole:OLEPictureImpl_Load [0] height 0 fixme:ole:OLEPictureImpl_Load [0] bColorCount 0 fixme:ole:OLEPictureImpl_Load [0] bReserved 0 fixme:ole:OLEPictureImpl_Load [0] xHotspot 0 fixme:ole:OLEPictureImpl_Load [0] yHotspot 0 fixme:ole:OLEPictureImpl_Load [0] dwDIBSize 0 fixme:ole:OLEPictureImpl_Load [0] dwDIBOffset 0 fixme:ole:OLEPictureImpl_Load CreateIcon failed. (obviously when all data are 0) trace:ole:OLEPictureImpl_Release (0x40383880)->(ref=2) trace:ole:OLEPictureImpl_Release (0x40382ec8)->(ref=1) trace:ole:OLEPictureImpl_Destroy (0x40382ec8) trace:ole:OLEPictureImpl_Release (0x40383880)->(ref=1) trace:ole:OLEPictureImpl_Destroy (0x40383880) fixme:ole:OLEPictureImpl_Destroy Unsupported type 0 - unable to delete trace:ole:OLEPictureImpl_Release (0x40380a70)->(ref=1) trace:ole:OLEPictureImpl_Destroy (0x40380a70) trace:ole:OLEFontImpl_ReleaseHfont (0x4037f648)->(0xd82) (lock=0) trace:ole:OLEPictureImpl_Release (0x4037f7a8)->(ref=1) trace:ole:OLEPictureImpl_Destroy (0x4037f7a8) With your patch (already earlier with [0]=756c, [1]=...): fixme:ole:OLEPictureImpl_Load Could only read 109 of 2763 bytes in no-header case? fixme:ole:OLEPictureImpl_Load Unknown magic 746c, 109 read bytes: 6c 74 00 00 00 00 00 00 6c 74 00 00 00 00 00 00 00 00 01 00 00 00 0a 00 54 00 61 00 62 00 20 00 31 00 01 00 00 00 04 52 e3 0b 91 8f ce 11 9d e3 00 aa 00 4b b8 51 6c 74 00 00 00 00 00 00 00 00 00 00 00 00 0a 00 54 00 61 00 62 00 20 00 32 00 01 00 00 00 04 52 e3 0b 91 8f ce 11 9d e3 00 aa 00 4b b8 51 6c 74 00 00 00 00 00 00 00 00 00 00 00 00 ff 02 04 Maybe this isn't even part of a picture and we shouldn't be reading this. How does it know that a picture is coming? Perhaps we shouldn't even enter OLEPictureImpl_Load if there is no picture at all. Thanks bye Fabi

2 1

Orkut community for wine
by Shachar Shemesh 04 Feb '04

04 Feb '04

Hi all, Just so noone else create another community, I have created an Orkut community for Wine. It's located at http://www.orkut.com/Community.aspx?cmm=8767. Sorry about the noise. Shachar -- Shachar Shemesh Lingnu Open Systems Consulting http://www.lingnu.com/

1 0

Mouse up vs Mouse click
by Fabian Cenedese 04 Feb '04

04 Feb '04

Hi Where is decided if I release the mouse button if a mouse up or a mouse click is generated? Is this time dependent? Or generally the same? The misbehaving app uses a ownerdrawn, CListCtrl-derived list. When I click on a cell not in the first column the cell gets selected. But on wine I can see that the selection flashes shortly and disappears right again (Surprisingly it works when I click in the first column. As my application uses the same code for all columns it must be something else.). After putting some debug messages in my code I found that on Windows after the left-button-down event a left-button-click event is generated, no matter how long I hold the button before releasing. On wine there is no click event but a mouse up event. And the cell flashes even when I hold the button, so it's not the releasing itself that clears the selection. The control is a bit quirky with moving focus around and handling events specially. But still it works on Windows :) Now I'm a bit lost how I can debug this. +mouse didn't show anything usefull. I guess the generating and sending of the events is done in the wineserver. Thankful for any hints. bye Fabi

6 22

PPDEV: Allow to switch direction of the printer port
by Uwe Bonnes 04 Feb '04

04 Feb '04

Changelog: dlls/winedos/ppdev.c:IO_pp_outp Allow to switch direction of the printer port This lets mitoujtag.exe access the Jtag chain via the parallel port and a Xilinx parallel cable. -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/dlls/winedos/ppdev.c =================================================================== RCS file: /home/wine/wine/dlls/winedos/ppdev.c,v retrieving revision 1.1 diff -u -w -r1.1 ppdev.c --- wine/dlls/winedos/ppdev.c 17 Sep 2003 22:45:46 -0000 1.1 +++ wine/dlls/winedos/ppdev.c 4 Feb 2004 15:27:00 -0000 @@ -300,7 +300,16 @@ case 0: return IO_pp_do_access(idx,PPWDATA,res); case 2: - return IO_pp_do_access(idx,PPWCONTROL,res); + { + /* We can't switch port direction via PPWCONTROL, + so do it via PPDATADIR + */ + DWORD mode = *res & 0x20; + IO_pp_do_access(idx,PPDATADIR,&mode); + mode = (*res & ~0x20); + return IO_pp_do_access(idx,PPWCONTROL,&mode); + } + case 1: case 0x400: case 0x402:

1 0

Unable to compile under FreeBSD 4.8
by CyberBotX 04 Feb '04

04 Feb '04

I've been trying to compile the latest version of WINE (1-21-2004) under FreeBSD 4.8-RELEASE, but it keeps failing on me with the following during the compile of glu32: gcc -shared -Wl,-Bsymbolic,-z,defs,-init,__wine_spec_init,-fini,__wine_spec_ fini glu32.spec.o glu.o glu32.dll.dbg.o -o glu32.dll.so -L../../dlls -L../../libs/wine -lwine -L/usr/X11R6/lib -lSM -l ICE -lXxf86dga -lXxf86vm -lXrandr -lXrender -lXv -lXext -lX11 -lGL -lGLU -L ../../libs/port -lwine_port -lm -lc /usr/lib/libgcc.a(_eh.o): In function `__empty': _eh.o(.text+0x9e): undefined reference to `pthread_setspecific' /usr/lib/libgcc.a(_eh.o): In function `__get_eh_info': _eh.o(.text+0xec): undefined reference to `pthread_key_create' _eh.o(.text+0x1b9): undefined reference to `pthread_getspecific' _eh.o(.text+0x1d8): undefined reference to `pthread_setspecific' /usr/lib/libgcc.a(frame.o)(.text+0x44b): undefined reference to `pthread_mutex_lock' /usr/lib/libgcc.a(frame.o)(.text+0x492): undefined reference to `pthread_mutex_unlock' /usr/lib/libgcc.a(frame.o): In function `__register_frame_info': frame.o(.text+0x8d9): undefined reference to `pthread_mutex_lock' frame.o(.text+0x900): undefined reference to `pthread_mutex_unlock' /usr/lib/libgcc.a(frame.o): In function `__register_frame_info_table': frame.o(.text+0x969): undefined reference to `pthread_mutex_lock' frame.o(.text+0x990): undefined reference to `pthread_mutex_unlock' /usr/lib/libgcc.a(frame.o): In function `__deregister_frame_info': frame.o(.text+0x9dc): undefined reference to `pthread_mutex_lock' frame.o(.text+0xa27): undefined reference to `pthread_mutex_unlock' frame.o(.text+0xa4d): undefined reference to `pthread_mutex_unlock' *** Error code 1 Stop in /usr/home/cyberbotx/wine/dlls/glu32. *** Error code 1 Stop in /usr/home/cyberbotx/wine/dlls. *** Error code 1 Stop in /usr/home/cyberbotx/wine. I don't know if there is a way to stop it from doing that, but I was told it'd be best to let you guys know. I was trying to compile the source because I've been having problems with the ported version from FreeBSD's site. --- Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.564 / Virus Database: 356 - Release Date: 1/22/2004

1 0

Re: Wineconf wrapup
by Brian Vincent (C) 04 Feb '04

04 Feb '04

> Say, I wanted to thank everyone for coming to Wineconf 2004; > as far as I can tell, a good time was had by all, and we may > even have accomplished one or two useful things <grin>. fyi, I posted a summary in the form of a WWN issue: http://www.winehq.com/?issue=208 If anyone sees any glaring errors or omissions let me know. -brian

1 0

NHL2004 having problems with OLE?; Error output
by Abdul-Haseeb Ahmad 04 Feb '04

04 Feb '04

Okay, so I'm running wine cvs from Feb3 - IE6 installed (installed it on wine20031212 via mike hearn's script and then just used that directory for winecvs) - NHL2004 Demo installed (ftp://ftp.ea.com/pub/easports/demos/nhl2004/NHL2004Demo.exe) & Full version installed - following settings: [AppDefaults\\nhldemo.exe\\Version] "Windows" = "win98" [AppDefaults\\nhldemo.exe\\DllOverrides] "ole32" = "native, builtin" "oleaut32" = "native, builtin" "mshtml" = "native, builtin" "shfolder" = "native, builtin" "shell32" = "native, builtin" "shell" = "native, builtin" "shdocvw" = "native, builtin" "shlwapi" = "native, builtin" "urlmon" = "native, builtin" "crypt32" = "native, builtin" "wininet" = "native, builtin" - ole32, oleaut32 copied from win98 installation, stdole2.tlb from winxp install http://bugs.winehq.org/show_bug.cgi?id=1970 okay, so I can get into the menus with those settings.. ole32/oleaut32 being native reduce the error messages that I get and in the full version lets me navigate around more of the menus.. but I still get some js/html errors.. seems like the HTML files can't read the "global" variables and functions.. im not exactly sure whats going on, i've attached (at http://bugs.winehq.org/show_bug.cgi?id=1970): 1)intro.html which skips the intro videos so you dont get a crash 2)running wine --debugmsg +ole nhldemo (exiting the game as soon as i get into the menus) 3)running winedbg nhldemo, and entering cont a few times until i get into the menu, where i start to get a lot of errors related to the DllUnregisterServer function in the NHL2004 Browser Controls DLL... im hoping someone can help me narrow down the problems here, thanks

1 0

Wineconf wrapup
by Jeremy White 03 Feb '04

03 Feb '04

Hi all, Say, I wanted to thank everyone for coming to Wineconf 2004; as far as I can tell, a good time was had by all, and we may even have accomplished one or two useful things <grin>. I really appreciate that so many of you braved -30C temperature and two days of constant snowfall to come work with us on Wine - such insanity^H^H^H^H^H^H^H^H dedication is admirable. I wanted to suggest that we get to planning Wineconf 2005 sooner rather than later; I'm curious to see which European city hosts the event <grin>. For the record, we're willing to be the major sponsor for the next Wineconf; we'll kick in some funds and person power to help make sure it happens. However, I think it'll only work well in conjunction with one or more locals. I did have some closing thoughts and advice I wanted to get off my chest; there are some things I would do differently next time, and it's probably also wise to touch on the things that worked well. In no particular order, here are a number of thoughts: 1. Screw fancy audio/video streaming. Find an inexpensive telephone conference service, and use it. Test it, several weeks in advance, *with the intended audience* (the stream worked fine on this side of the Atlantic, afaict), and *with the expected load*. Our tests were always done with less load than we had during wineconf, because the streaming traffic used the same pipe as the 'net connection everyone was using. We wasted a lot of time and energy on this, against my initial better judgement, and it proved to be largely useless, afaict from the #wineconf comments. Go low tech. Swallow your geek pride. Just get simple audio that works. /me kicks self 2. Things that worked well: A. An inexpensive location Not one person opted for the expensive hotel I listed; cost really matters to this crowd. The last thing we want to do is scare away young people; they often have enormous energy and no cash. Help with hostels and friends with floors was appreciated. B. Breaks The only times that I was sure that productive conversations were occuring was during the breaks. Provide lots of 'em. Go very light on scheduled topics. C. Do lunch in; that worked really well. Have lots of food and beverages about, that also seems to work well. Bring the water cooler down on the *first* day <grin>. D. Internet connectivity is a must. Really. And provide both wireless and wired. We had some grumpy campers when we initially didn't have enough cat5 ports. E. All of the professional conference paraphenalia was invaluable. A wireless mic (preferably two) and someone to operate it. A PA type system. A projector. Even with the relatively small group we had it was invaluable. 3. Suggestion - blue collar location I know it's fashionable to suggest fancy vacation spots for Wineconf 2005, but I honestly think it would be much better to pick a 'blue collar' venue. Pick somewhere that is a transportation hub, with modest prices. Someplace where some Wine hackers live; having local help is incredibly valuable (thanks to Mandi, Chris, Jon, Aric, Zak, Newman, and all of the gang who did so much work). In fact, when we did go to the fancy tourist night spot, we ended up at a bar where it was too loud to talk; conversation amongst folks from 10 different countries is hard enough without load blaring music or odd ball distractions. A quite room and a good supply of ale, perhaps with a whiteboard, is what folks mostly craved. This is just my $0.02; I think others would differ sharply. 4. The final, critical piece of advice Don't type 'ifconfig eth0 down' in a terminal Window on the Mac in an attempt to reinitialize it's DHCP settings, unless you're dead certain you haven't ssh'd over to the server that is the life blood of your community, and is physically miles away behind locked doors... ...and I still can't figure out why Alexandre won't take my patches! <grin> At any rate, I feel much better now - thanks for listening, and thanks for coming. Cheers, Jeremy

2 1

status of journal hook chain work
by Bill Medland 03 Feb '04

03 Feb '04

I've just tripped over the fact that the journal hook chains are currently not implemented (and were disconnected in October 2002). Does anyone have any plans to do anything about them? -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

1 0

shlwapi.MLIsMLHInstance
by Juan Lang 03 Feb '04

03 Feb '04

Anyone know anything about this function? I stubbed it to get around an occasional crash in native common controls, but I'm not positive the function signature's correct. --Juan __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free web site building tool. Try it! http://webhosting.yahoo.com/ps/sb/

1 0

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 03 Feb '04

03 Feb '04

>> >In my case there are lots of *.bmp (with picture) with exactly same header >> >i mentioned. Thus header[1]==0 doesnt imply 'there is no picture at all' >> > >> >This pictures came in ole storage taken from a real win32 app, and loading >> >them on windows works correctly. >> >> Do you have VB6? Can you create a testprogram? If not then I can send you one. >> Just create an empty form and place the SSTab on it (the one from tab control, >> not the one in the standard palette). >I don't have VB. In fact i ether dont have VC and windows installed at all >here. > >If you have an winelib based example, let's try get it working. It's not a winelib app but I can send you the exe and ocx off the list. >> This fails on on my computer and I don't >> know how wine could detect if it's a headerless picture or no picture at all >> if they look the same (so far). > >Maybe check header[0] to be real .bmp or .gif magic and header[1] for >zero? I couldn't see a difference, always 0x746c in the first entry. bye Fabi

2 1

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 03 Feb '04

03 Feb '04

>> I don't think that this is correct. If header[1] is 0 then it means that there is no picture at >> all, and not a picture without header (me thinks). When trying to start a program that uses >> the SSTab from TabCtl32.ocx without having assigned icons to the tabs it fails because >> wine tries to create icons that aren't in the stream. So there's no point in continuing and trying >> to read data from the stream. I could only make it work when I jump out of this function >> without doing anything if header[1] is 0. That may be wrong too but this patch doesn't >> solve it either. > >In my case there are lots of *.bmp (with picture) with exactly same header >i mentioned. Thus header[1]==0 doesnt imply 'there is no picture at all' > >This pictures came in ole storage taken from a real win32 app, and loading >them on windows works correctly. Do you have VB6? Can you create a testprogram? If not then I can send you one. Just create an empty form and place the SSTab on it (the one from tab control, not the one in the standard palette). This fails on on my computer and I don't know how wine could detect if it's a headerless picture or no picture at all if they look the same (so far). Thanks bye Fabi

2 1

Re: OLEPictureImpl_Load: fix for headerless pictures
by Fabian Cenedese 03 Feb '04

03 Feb '04

>Hi, >In my case headerless bitmaps have >{ 0x42, 0x4d, 0x9c, 0xbd, 0x00, 0x00, 0x00, 0x00 } first 8 bytes. > >So, when last four are equal to zero its 'no header' case. > >ChangeLog: > OLEPictureImpl_Load: fix for headerless pictures > >Index: dlls/oleaut32/olepicture.c >=================================================================== >RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v >retrieving revision 1.30 >diff -u -r1.30 olepicture.c >--- dlls/oleaut32/olepicture.c 5 Sep 2003 23:08:33 -0000 1.30 >+++ dlls/oleaut32/olepicture.c 1 Feb 2004 12:35:41 -0000 >@@ -875,7 +875,7 @@ > FIXME("Failure while reading picture header (hr is %lx, nread is %ld).\n",hr,xread); > return hr; > } >- if (header[1] > statstg.cbSize.QuadPart) {/* Incorrect header, assume none. */ >+ if (header[1] > statstg.cbSize.QuadPart || (header[1]==0)) {/* Incorrect header, assume none. */ > xread = 8; > xbuf = This->data = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,statstg.cbSize.QuadPart); > memcpy(xbuf,&header,8); I don't think that this is correct. If header[1] is 0 then it means that there is no picture at all, and not a picture without header (me thinks). When trying to start a program that uses the SSTab from TabCtl32.ocx without having assigned icons to the tabs it fails because wine tries to create icons that aren't in the stream. So there's no point in continuing and trying to read data from the stream. I could only make it work when I jump out of this function without doing anything if header[1] is 0. That may be wrong too but this patch doesn't solve it either. Described here: http://www.winehq.org/hypermail/wine-devel/2004/01/0968.html bye Fabi

2 1

Re: Sourceforge WIne RPMs and Yum
by Dwayne Bailey 03 Feb '04

03 Feb '04

Hi, Are there any yum experts here? I thought it would be a good idea to get a yum repository established for the Wine RPMs held at sourceforge. I for one would love to have the latest build of wine installed as soon as RPMs are available on Sourceforge. yum-arch seems to be the command to create the repository headers but I'm not sure how you would manage this with the round robbin sourceforge downloads. I think some other sf project have managed this. Anyone out their who can help? Dimitrie O. Paun wrote: >On February 3, 2004 04:42 am, you wrote: > > >>I was wondering if it would be possible to create yum repositories >>of the Sourceforge RPMs certainly for use with Fedora. >> >> > >It sounds like a really good idea, but I know little about the topic, >as I'm not yet running Fedora. You may want to post a call for >volunteers on wine-devel(a)winehq.org, maybe someone has the know-how >and steps forward... > > > -- Kind regards Dwayne Bailey dwayne(a)translate.org.za +27-21-448 7827 / 9265 (work) +27-21-448 9574 (fax) +27-83-443 7114 (cell) "An English-only, or even an English-mainly, policy necessarily condemns most people, and thus the country as a whole, to a permanent state of mediocrity, since people are unable to be spontaneous, creative and self-confident if they cannot use their first language" Dr Neville Alexander - 'Where English can Serve but not Empower.' Translate.org.za - Opensource software for all South Africans A project of the Zuza Software Foundation Zuza - given freely, get as a gift, obtained freely

1 0

Re: Wine 0.9 TODO
by Dimitrie O. Paun 03 Feb '04

03 Feb '04

On February 3, 2004 02:56 am, Lars Segerlund wrote: > I am curious about 'testing daemon to run as windows service' [I'm Cc:-ing wine-devel, other may be interested in this as well] This TODO item has nothing to do with running services under Wine. What this is instead is a real Win32 service for Windows. The purpose of this service is to help us automate the running of our conformance test suite under Windows. It's operation should be very simple: once installed, it has to poll (say every 1h) a location on winehq.org to determine when new tests are available. When they are, it has to download one executable (winetest.exe), and run it (winetest.exe -b). That's it. This way, people that want to help us test, can simply install this service, and go by their business. Needless to say, we need a volunteer for this... No Unix experience required, this is purely a Win32 little app. Nice way to get started :) -- Dimi.

1 0

WineConf update
by Vizzini 02 Feb '04

02 Feb '04

After a slippery drive home (12 stressful hours from Minneapolis -> Kansas City, rather than the six it took me to get there on Friday), I finally have time to report a bit on WineConf. First of all, I'd like to thank Codeweavers on behalf of those of us from ReactOS that attended the conference. It was really run well, with ample free food (always a requirement). I didn't even mind -5F as much as I thought! There were about 35 Wine and ReactOS hackers there, and two days worth of presentations. I started getting serious questions about ReactOS the instant people figured out who I was. There was about a 50/50 split between people wanting to know what it was and people wondering why we are bothering to do this. There were a lot of interesting (and passionate) conversations about the role of Linux on the desktop, the stupidity of trying to clone the windows kernel, intellectual property considerations, etc. I can say that in all cases, the discussions were very positive and open. I'm certain that I didn't convince everyone, but just the opportunity to make the case was worthwhile. The ReactOS presentation on Sunday morning went as well as can be expected, given the state of our code. I spoke from a prepared deck (http://plasmic.com/~vizzini) for about 15 or 20 minutes, and then we demonstrated various aspects of the system. Steven ran the demonstrations, which included showing off Explorer, Windows XP Notepad, and our installation system. Then, the four of us (Steven, Art, Mark, and me) took questions. Most of the questions this time around were very technical in nature, and there was at least one question (from Gavriel State, regarding our DIB engine), that pretty much stumped us (can one of the UI guys please comment?). We had two crashes due to the floppy driver (well, also due to my stupidity at not configuring VMWare with a blank floppy disk image before starting), and one non-detected mouse incident. There was also a bit of a repainting problem, but on the whole, the system represented itself well. There was a very interesting question brought up on Saturday morning by one of the Wine guys (Mike perhaps?) regarding running ReactOS inside Linux, like Win4Lin. I was skeptical at first, but having slept on it a day or two, I think this is a really cool idea. The proposal is that we adapt our own ntoskrnl.exe and hal.dll to run correctly in user mode, just like user mode linux does, and use them to run the rest of a native Windows XP system. In other words, it replaces Win4Lin with free software, and it would be compatible with the current Windows OSes. Much investigating remains to be done, of course - I can't really even guess at the level of difficulty or time required at this point - but it is worth pursuing in my opinion. Jan Kratochvil also joined us to present about his Captive NTFS project. For those that don't remember what this is, Jan got the ntfs.sys driver from Windows XP running in Linux, in part by using chunks of ReactOS code. Jan and I had some offline discussions as well about bringing Captive's improvements back into our tree, and about other captive-like projects that could be implemented. I expect a lot of focus will be applied to this area of Quasi-Wine, Quasi-ReactOS hacking over the next year. All in all, it was a really great conference, and I'll definitely try to attend again next year. Presentations were good, conversations were interesting, people were friendly, and Minnesota at -5 was beautiful! ;-) -Vizzini

2 2

Re: New registry key adding patch
by Zimler Attila 02 Feb '04

02 Feb '04

Dimitrie O. Paun wrote: >On February 2, 2004 03:05 am, you wrote: > > >>Yes, I nee help :) It's the old problem :) what task could I start :) If >>I saw correctly in the list, regedit is implemented meantime :) >> >> > >We still need to add support for delete/rename of keys. > > > > Ok, I all will do it :) (if I don't know something I will ask it) Attila

1 0

Found this on ATI's devel pages, might help with directx ?
by Lars Segerlund 02 Feb '04

02 Feb '04

I don't know if you have seen this before, but it's a program to run the grafix pipeline interactive, thought it might be usefull. http://mirror.ati.com/developer/sdk/rage128SDK/Multex/Multex3D.html / have a look, Lars Segerlund.

1 0

TransparentBlt
by Kevin Koltzau 02 Feb '04

02 Feb '04

Implementation of TransparentBlt This brings up an interesting thing however..it works perfectly under windows (tested on XP), but produces strange results under wine. MaskBlt seems to be broken, but I'm not quite sure what the cause is yet I figured I'd send this out incase the problem is obvious to anyone

3 3

Re: x11drv
by Dimitrie O. Paun 02 Feb '04

02 Feb '04

On January 30, 2004 09:00 am, RemiAssailly(a)aol.com wrote: > I don't understand you ! > Without that it does not work. > With that, it works and graphic working is faster. Maybe so, but it looks obviously incorrect. Not everything that seems to fix problems is a real fix. You maybe hiding a bigger issue. The fix as you sent it can't be right, but you maybe on to something. Someone knowledgable in the area should express a more informed opinion. -- Dimi.

2 3

Announcing #winehackers
by Mike Hearn 02 Feb '04

02 Feb '04

Hi guys, One of the action items decided on at wineconf was to set up an IRC channel for Wine developers. This channel now exists and is #winehackers. Key points to be aware of are: * It's on freenode * It is for developers only, user tech support (how do i run counterstrike?) etc should be/will be bounced to #winehq * There are a lot of ops. This is intentional. Often on #winehq there are problems caused by users but there are no ops around (only like 3 guys have op access to it). Me (TD), Mike McCormack (mike_m) and Francois Gouget (fgouget) have the ability to add people to the auto-op list through virtue of being the first guys into the channel. * The channel is modelled after #gnome-hackers on gimpnet, which has been a great success with buy-in from even their busiest, most core hackers (hint hint alexandre :) * All wine hackers are welcome, this most explicitly includes WineX dudes * No topic is offtopic. Have fun! I'll submit a patch to add mention of it to the WineHQ website, but #gnome-hackers grew to a huge number of people just through word of mouth so there's no real hurry. Tell your friends, rescue budding wine hackers from the helpdesk that is #winehq etc. It's a resource that is there to be used, so use it. thanks -mike

1 0

win32 application error - Cannot open AVI - a FindFolder animation
by sun 01 Feb '04

01 Feb '04

Hi, I searched archives, but not found solution for my problem. I try to run a EMS QuickDesk application on wine, everything going fine until i wan't to connect to database. In this moment on QD displays animation FindFolder. That animation is launch by SendMessage API call and it in a dll resource shell32.dll i think. How can i run this prog?. On testing purposes i make a simple delphi prog, you can download it from http://eclsoft.no-ip.com/project.exe.gz Help me, please. -- regards Greg

1 0

Telux wine presentation slides (modifiable source)
by Shachar Shemesh 01 Feb '04

01 Feb '04

Hi all, I have sent the Telux Wine presentation slides to Jeremy Newman so he can put them on the winehq site. Feel free to use them (and change them) for similar presentations, but please give me some sort of credit for them. Shachar

1 0

PATCH: SPI_GETGRADIENTCAPTIONS
by J C 01 Feb '04

01 Feb '04

Hi All, I've put together a little patch to allow SystemParametersInfoA to read an actual registry value for SPI_GETGRADIENTCAPTIONS instead of the default 'false' that was returned all the time (got tired of seeing those fixmes). I based the registry information off of this page: http://212.203.14.81/virtualp/html/ui_tips.html How does this patch look? It's the first i've put together for Wine (so be easy ;). I will continue to flesh out the remaining UI settings (at least those that apply in all versions of windows (9x,nt,2000,xp) if there is interest and i'm on the right path here. The only thing i can think of us doing is reading these values from the Window Manager instead of our own registry values. Are there standard ways of detecting this or is it just best left in the registry? I have included the patch as well as the Reg Key for these settings (with gradient captions disabled by default). Justin Chevrier _________________________________________________________________ Add photos to your e-mail with MSN 8. Get 2 months FREE*. http://join.msn.com/?page=features/photos&pgmarket=en-ca&RU=http%3a%2f%2fjo…

1 0

GetBitmapDimensionEx() usage in STATIC_PaintBitmapfn()
by Ge van Geldorp 01 Feb '04

01 Feb '04

The call to GetBitmapDimensionEx() and the use of the returned size as the x and y offset for the BitBlt in controls/static.c function STATIC_PaintBitmapfn (around line 576) looks incorrect to me. Does anyone have an idea what the purpose of that code could be? Gé van Geldorp.

1 0

Wineps.drv not a fully windows compliant printer driver?
by ceztko＠libero.it 01 Feb '04

01 Feb '04

1 week ago, i posted a msg (subject: 16bit app calls wineps.drv, but wine has wineps.dll) in the ml reporting a run-time error 482: Printer Error with a 16 bit app. Weel, that report is not rappresentative of the problem, it seems more complicated than i tought. At MSDN, i found: Printer error (Error 482) There is some problem that prevents printing. This error has the following causes and solutions: * You don't have a printer installed from the Windows Control Panel. Open the Control Panel, double-click the Printers icon, and choose Add Printer to install a printer. * Your printer isn't online. Physically switch the printer online. * Your printer is jammed or out of paper. Physically correct the problem. * You tried to print a form to a printer that can accept only text. Switch to an installed printer that can print graphics. In windows, all is OK with all type of printer. After 2 weeks of attempts, i understood i'm unable to find the origin of the problem and a possible resolution. So, hoping you can help me, i did a snapshot of my wine configuration including the non-working app and the natives dll needed to run it (no problem of dependences: they should be ok). The snapshot is not very big (~7mb), and it's a simple copy of .wine dir with a testapp script (cd ..., WINEDLLOVERRIDES=... wine app.exe) to immediately run the fucking/non-working app. So, a backup of your .wine dir is needed. Weel, there's also the problem of trust: a new non-root user is OK =) My interest in this stupid business app is only to convert my father to linux, but if you can help me, a donation to the wine project is CERTAIN! Here the easy instruction: NB: Use a new non-root user for trust, or at least # mv .wine winebak 1 - Download to your home http://digilander.libero.it/ceztko/testapp.tar.gz 3 - # tar xvzf testapp.tar.gz 4 - # ./testapp The error message i get is this: run-time error '482': Printer Error ( http://digilander.libero.it/ceztko/snapshot-err.png ) Instead, it should be like this http://digilander.libero.it/ceztko/screenshot-ok.png . I'm unable to understand if is a my mis-configuration or a bug in wine (and maybe this snapshot is not weel configured anyway). But, after 2 weeks of attempts without results, using different printer configurations FROM SCRATCH (cups, file, original windows printer driver, ..), i'm almost sure this is a bug, or a sort of... Thanks for your help!

1 0

WineConf Webcast
by Uwe Bonnes 01 Feb '04

01 Feb '04

Hallo, when is the webcast supposed to start today? Any chance to get non-choppy sound, even perhaps at the expense of no video stream? If we have a video stream, can the camera OSD perhaps be disables? Any conclusions why the stream yesterday was tagged "non-cachable", perhaps resulting in the choopy sound due to network latencies? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Re: [Bug 1982] Can't SSH into a computer and use "wine cmd" or wineconsole
by Dan Kegel 01 Feb '04

01 Feb '04

On Sat, Jan 31, 2004 at 01:24:49PM -0600, Wine Bugs wrote: >> ------- Additional Comments From netdemonz_at_yahoo.com 2004-31-01 13:24 ------- >> I had already tried that. >> >> Connection to 192.168.0.1 closed. >> (~)> ssh -X 192.168.0.1 >> boberb_at_192.168.0.1's password: >> (~)> wine cmd >> x11drv: Can't open display: > > Maybe a solution would be to ssh -x (in case -X is default)? No, that's not a solution, that's a workaround. (And it's -X you want.) Wine should be able to run commandline programs WITHOUT USING X IN ANY WAY, SHAPE, OR FORM! This is a longstanding bug in Wine, and one that periodically makes my blood boil. The workaround I've used in the past is to create a .winetty directory with special settings to use the tty driver instead of the x driver, but that's a pain in the ass. - Dan

1 0

window focus working better?
by Alex Pasadyn 01 Feb '04

01 Feb '04

Greetings all! I just happened to run an installer with Wine and I forgot to trap it inside a desktop, and to my surprise, it did NOT put a big blank window up front, so I was able to use it normally. I had not used one of these in a while, so I tried a couple others, and they worked normally too (outside of desktop mode). Looking back through the logs, I think this patch may have fixed that issue, at least for a lot of cases: http://www.winehq.org/hypermail/wine-cvs/2003/12/0156.html I couldn't see any discussion of this in here, so I was wondering if anyone else has seen similar results. I also tried several full-screen games that historically gave me keyboard focus trouble, and every one of them got keyboard input. I have not changed anything with my window manager, and reversing that patch causes the problem to return. So, is this working now for anyone else? Did I overlook the discussion? Alex

1 0

Re: [Bug 1982] Can't SSH into a computer and use "wine cmd" or wineconsole
by Joerg Mayer 01 Feb '04

01 Feb '04

On Sat, Jan 31, 2004 at 01:24:49PM -0600, Wine Bugs wrote: > ------- Additional Comments From netdemonz(a)yahoo.com 2004-31-01 13:24 ------- > I had already tried that. > > Connection to 192.168.0.1 closed. > (~)> ssh -X 192.168.0.1 > boberb(a)192.168.0.1's password: > (~)> wine cmd > x11drv: Can't open display: Maybe a solution would be to ssh -x (in case -X is default)? Ciao Jörg -- Joerg Mayer <jmayer(a)loplof.de> We are stuck with technology when what we really want is just stuff that works. Some say that should read Microsoft instead of technology.

2 1

Wineconf Webcast
by Uwe Bonnes 31 Jan '04

31 Jan '04

Hallo, could it be that the site is overloaded? > ping wine.codeweavers.com PING wine.codeweavers.com (198.144.15.226) 56(84) bytes of data. no reaction... -- 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

Hel debugging windows app with wine(dbg) + gdb
by Leo 31 Jan '04

31 Jan '04

Hi, I don't know if this is the place to ask this, but anyway here it goes: I'm trying to debug a windows application using wine. The app is compiled with mingw (www.mingw.org), and I tried using -gstabs and -ggdb debug info but same problem happens. The problem is: 1) Using winedbg as server for remote gdb debugger, when execution stops (sigfault, or whatever), and I type 'bt' in the gdb client, no debug info is shown, just lines like this one: #0 0xdeaf1005 in ?? () 2) Running 'wine <myapp.exe>' and then using gdb client to debug the process with the 'attach' command, when execution stops (sigfault, or whatever), and I type 'bt' in the gdb client, debug info IS shown, but line numbering shows always just the first line in the function. For example, say I have this function: void f() { int a=123; *(char *)0=a; } then when sigfault is caught, gdb shows backtrace like this: #0 0x0040130b in f() () at f.cpp:2 even though exception occurs in line 4. Either way, I can't debug a windows app correctly. May I be doing something wrong. I've read the docs and followed instructions for DDD, KDbg, and just plain gbd. I'm using latest wine 2004 rpm under Redhat 9. Any help greatly appreciated. Thanks, Leo.

3 6

Re: File change notifications
by Duane Clark 31 Jan '04

31 Jan '04

Hans Leidekker wrote: > On Thursday 29 January 2004 01:01, Duane Clark wrote: > >>For some reason, a comment end is missing there. But otherwise, it seems >>to work fine with the one important app I use file notification on. > > > Which app is that? Xilinx ISE, a program for use when designing with Xilinx chips.

3 3

WinMM/MIDI problem? (/dev/mixer1 error message)
by Abdul-Haseeb Ahmad 31 Jan '04

31 Jan '04

This again is related to NHL2004 but I felt it needed to be in a different psot as I think its more related to the way WinMM works... When the HTML files w/MPEGs embedded in NHL2004 load (via IE6) theres a crash.. and it seems to be related to WinMM: ----- fixme:ole:CoCreateInstance no classfactory created for CLSID {6c736db1-bd94-11d0-8a23-00aa00b58e10}, hres is 0x80040154 No debug information in 32bit DLL 'Z:\MNT\D\NHLDEMO\BECONTROLS_PC_Z.DLL' (0x48390000) err:ole:ITypeInfo_fnInvoke did not find member id -525, flags 2! First chance exception: illegal instruction in 32-bit code (0x4685c868). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0033 GS:005f EIP:4685c868 ESP:408493b0 EBP:408493c3 EFLAGS:00010246( R- 00 I Z- -P1 ) EAX:46c8bda8 EBX:40c5a1d4 ECX:40c59de0 EDX:40310075 ESI:408493e8 EDI:4040e118 Stack dump: 0x408493b0 (KERNEL32.DLL.VerSetConditionMask+0x334386): 40c2e612 46c8bda8 40c5a1d4 4040e118 0x408493c0 (KERNEL32.DLL.VerSetConditionMask+0x334396): 4040e1b0 408493fc 40c2e4a9 4040e118 0x408493d0 (KERNEL32.DLL.VerSetConditionMask+0x3343a6): 408493e8 408493ec 4040e118 4040e118 0x408493e0 (KERNEL32.DLL.VerSetConditionMask+0x3343b6): 46c8bda8 80004005 46c8bda8 0000000d 0x408493f0 (KERNEL32.DLL.VerSetConditionMask+0x3343c6): 00000000 48520190 00000000 4084943c 0x40849400 (KERNEL32.DLL.VerSetConditionMask+0x3343d6): 70e9d83d 4040e118 00000578 40849448 0x40849410 (KERNEL32.DLL.VerSetConditionMask+0x3343e6): Backtrace: =>0 0x4685c868 (MIDIMAP.DRV..data+0x4aa8868) (ebp=408493c3) 1 0xc2e4a940 (MSVCRT.DLL..reloc+0x4ae0d940) (ebp=8493fc40) *** Invalid address 0x8493fc40 (MSVCRT.DLL..reloc+0xc902c40) 0x4685c868 (MIDIMAP.DRV..data+0x4aa8868): lock push %ds ---- im not familiar with how WinMM works, but my hunch is that im getting a crash because my MIDI isnt set up properly because I always get the following error when starting anything in wine: err:wave:OSS_WaveOutInit /dev/mixer1: No such device err:wave:OSS_WaveInInit /dev/mixer1: No such device does anyone know how I can fix this error if its possible?

2 1

Posix Subsystem for ReactOS - Project 2010
by Steven Edwards 31 Jan '04

31 Jan '04

Hello All, Now that the word is out its time to fill you guys in. Over the past few months I have been working with a Project called Cooperative Linux. Cooperative Linux allows you to the Linux kernel as a process under Windows NT/2K. With CoLinux you can run any linux application under Windows. http://www.colinux.org/?section=screenshots My plan is to work with the CoLinux team to integrate CoLinux in to Windows and ReactOS as a POSIX subsystem. They are very interested in working with us on this project and have linked to reactos.com on the website. http://www.colinux.org Currently CoLinux depends on a driver that allows it to use the hardware MMU. It also currently depends on cygwin to be compiled. The first steps for developing this for ReactOS and other Win32 hosts will be to remove the cygwin dependancy. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free web site building tool. Try it! http://webhosting.yahoo.com/ps/sb/

2 2

Wineconf notice
by Jeremy White 31 Jan '04

31 Jan '04

Hi all, Barring disaster, we're going to start Wineconf tomorrow morning at 9:30 am. It looks like we'll have streaming video working; I've updated the wineconf page with some instructions, and a Wine tarball that Works For Me (TM) with the Quicktime player (although mplayer works quite well also). See http://www.winehq.org/wineconf/ for more info. We should also have good 'net connectivity, so feel free to join in via irc. Cheers, Jeremy

1 0

IE6/JSCRIPT: hook:NotifyWinEvent, imm:ImmGetContext
by Abdul-Haseeb Ahmad 31 Jan '04

31 Jan '04

(sorry if this is a double post, im having difficulties with my mail client) okay I've got nhl 2004 (and the demo) to go into the menus fine but in the full version in the main menu screen (which isnt in the demo, but this error occurs similarly in the demo menu screens that do exist) the drop down menus dont show when i click them; plus there are java script errors, seems like the different html/js files arent communicating with each other properly, prevents me from starting a game because no play button shows up in the demo's game setup screen (first menu screen in the demo, full version cant even get to the game setup screen, as the main menu buttons dont show), but i get messages in the terminal everytime i click on the dropdown menu buttons, and then click off of them as if the drop downs were actually there.. they look like this: fixme:imm:ImmGetContext (0x1002f): stub fixme:hook:NotifyWinEvent (32778,0x1002f,30,0)-stub! fixme:hook:NotifyWinEvent (32773,0x1002f,31,0)-stub! does anyone know what DLL's this message stems from? looks like an incomplete implemntation of something... I also get an error related to MSXML3.DLL as well when i run winedbg on it... id really appreciate it if someone else looked at it and saw what was wrong --- - clean installation of wine20031212 - ie6 installed via mike hearn's script - nhl2004 demo installed (ftp.ea.com/pub/easports/demos/nhl2004/NHL2004Demo.exe) - nhl2004 full version also installed (instructions at http://bugs.winehq.org/show_bug.cgi?id=1970, bug info outdated, ill fix it up later today or tomorrow) - fe/nhl/html/intro.html & fe/nhl/html/sting.html edited so that the movie doesnt load, just goes straight to next page - DLLOverrides for nhl2004.exe/nhldemo.exe same as IE6 installed from Mike Hearn's script except also add oleaut32.dll (song names will show and in the demo the drop down menus will work) - copied *.tlb in my realwindows/system32 into my NHL 2004 Demo dir

1 0

IE6/JSCRIPT: hook:NotifyWinEvent, imm:ImmGetContext
by Abdul-Haseeb Ahmad 31 Jan '04

31 Jan '04

okay I've got nhl 2004 (and the demo) to go into the menus fine but in the full version in the main menu screen (which isnt in the demo, but this error occurs similarly in the demo menu screens that do exist) the drop down menus dont show when i click them; plus there are java script errors, seems like the different html/js files arent communicating with each other properly, prevents me from starting a game because no play button shows up in the demo's game setup screen (first menu screen in the demo, full version cant even get to the game setup screen, as the main menu buttons dont show), but i get messages in the terminal everytime i click on the dropdown menu buttons, and then click off of them as if the drop downs were actually there.. they look like this: fixme:imm:ImmGetContext (0x1002f): stub fixme:hook:NotifyWinEvent (32778,0x1002f,30,0)-stub! fixme:hook:NotifyWinEvent (32773,0x1002f,31,0)-stub! does anyone know what DLL's this message stems from? looks like an incomplete implemntation of something... I also get an error related to MSXML3.DLL as well when i run winedbg on it... id really appreciate it if someone else looked at it and saw what was wrong --- - clean installation of wine20031212 - ie6 installed via mike hearn's script - nhl2004 demo installed (ftp.ea.com/pub/easports/demos/nhl2004/NHL2004Demo.exe) - nhl2004 full version also installed (instructions at http://bugs.winehq.org/show_bug.cgi?id=1970, bug info outdated, ill fix it up later today or tomorrow) - fe/nhl/html/intro.html & fe/nhl/html/sting.html edited so that the movie doesnt load, just goes straight to next page - DLLOverrides for nhl2004.exe/nhldemo.exe same as IE6 installed from Mike Hearn's script except also add oleaut32.dll (song names will show and in the demo the drop down menus will work)

1 0

Re: desktop mode again
by Alex Pasadyn 30 Jan '04

30 Jan '04

Robert Shearman wrote: > I suggest you put the system metrics stuff in a separate patch. It is a lot more tested and more likely to get in than the other code, which is quite a big change. I can do that, if it would get applied. :) I sent an earlier version of the sysmetrics patch by itself a long time ago, and it was not applied because it could give incorrect results in desktop mode. This version is cleaner that that one, and I think that by itself it would at least give correct results for an application running in the one desktop that changed its size. So, Alexandre? Is that worth sending? > I guess we need test cases for those then. > The way I see it the only way around the problem of inter-process graphics operations is for us to have our own DIB engine and move functions calling WIN_FindWndPtr into the server. X doesn't allow inter-process operations right? Actually, I think X doesn't care. It has no problem with me having one process create the desktop window and another process creating a "normal" window inside it. Or did you mean something else? >>@@ -128,7 +129,14 @@ >> */ >> BOOL WINAPI PaintDesktop(HDC hdc) >> { >>- HWND hwnd = GetDesktopWindow(); >>+ HWND hwnd; >>+ SERVER_START_REQ( set_desktop_window ) >>+ { >>+ req->handle = 0; >>+ wine_server_call( req ); >>+ hwnd = reply->cur_handle; >>+ } >>+ SERVER_END_REQ; >> >> /* check for an owning thread; otherwise don't paint anything (non-desktop mode) */ >> if (GetWindowThreadProcessId( hwnd, NULL )) > > > Is there some reason for replacing GetDesktopWindow with this server call? Yes. The problem is that the winedesktop app thinks the "root" X window is the desktop, while all other apps think the window winedesktop created is the desktop. For convenience, winedesktop is just calling PaintDesktop when appropriate. I did not want to just copy the body of that function into winedesktop because it depends on other variables in the file where it is located. I guess the alternative would be to have the set wallpaper, set pattern, and paintdesktop functions simply send a message to the winedesktop process (if it's running), which would then contain the implementations. If that sounds more reasonable I can certainly change it to that way. >>+/*********************************************************************** >>+ * BecomeDesktop >>+ * >>+ * Tell the server to make our window the desktop. >>+ */ >>+static BOOL BecomeDesktop() >>+{ >>+ BOOL res = TRUE; >>+ SERVER_START_REQ( set_desktop_window ) > > > This is bad. There shouldn't be a direct server call in a normal wine program. We should try and find the right Windows API to do this, or create our own export from user32. Only user32, gdi32, ntdll and x11drv should need to use server calls (and kernel32 out of convenience). I guess I have no opinion about whether it would be worse to create a new export or just call the server. I was not happy about doing either, but I am not aware of anything in the "real" API that would do this. This application is not really "normal" anyway. I see it more as an extension of x11drv. > Why do you need two windows procedures? If you're sure you do need both of them, a comment in the code explaining why would be good. It's not at all obvious to the casual observer (i.e. me) otherwise. That I can add. The basic thing is that the "main" window created by winedesktop is just a normal ordinary window, and it can be minimized, etc. The child window came in because an app should be able to ask for the size of the desktop window and always get the right answer. I thought it was better to create a child window than to have to put code in the server to intercept calls to get the size of the desktop and fudge the results if it was minimized. > It appears you don't launch winedesktop anywhere and you don't remove any options from the config file. It will be a bit confusing for people who do use the wine desktop when it doesn't do anything after applying your patch (until they launch winedesktop). Do you plan to launch winedesktop at startup (possibly just after wineserver is launched) if the desktop setting is enabled? This was described when I originally posted a version of this a long time ago. The general idea is that if no other Wine apps are running, you can start winedesktop. While it's running, all Wine apps that get started get trapped inside the desktop. I would like to find a way to have multiple desktops or desktop coexisting with non-desktop, but that would be a ton of additional bookkeeping in the server. Alex

3 2

Re: system metrics update
by Lionel Ulmer 30 Jan '04

30 Jan '04

> **** Lionel, I looked at your ClipCursor patch, and I think it will work > correctly with this for the currently running process, but for it to > take effect in other processes, the code you put in settings.c probably > needs to go to the new X11DRV_handle_desktop_resize function I just added. Hmmm, the next time I will boot in Win2K, I will try to have a program continously print the content of the ClipCursor while another one changes the resolution just to check what happens :-) This way we will be sure exactly what Windows does. If it really propagates, we will see when we will merge both patches :-) Lionel -- Lionel Ulmer - http://www.bbrox.org/

1 0

Dungeon Keeper thread(s) recently
by Jason Edmeades 30 Jan '04

30 Jan '04

Just a thank you for the people who followed up on this recently, including the recent patch. (I have been offline due to a failing modem, so couldnt participate towards the end.) Jason

5 8

Re: LostWages: status5.diff
by Eric Pouech 30 Jan '04

30 Jan '04

Tom a écrit : > > I'm getting ready to head out the door so here is #5 > it is dmitry's suggestions per: > http://www.winehq.org/hypermail/wine-devel/2004/01/0952.html > > Eric..............thumbs up/down? synchro should be ok. using avifile should be a good test case anyway (even if native mciavi doesn't use it), but this good be removed (doesn't matter much anyway) A+

1 0

TransparentBlt
by Kevin Koltzau 30 Jan '04

30 Jan '04

I noticed Warren Baird has submitted an implementation of TransparentBlt back in Feb 2003.. http://www.winehq.org/hypermail/wine-patches/2003/02/0029.html I'm curious what was wrong with that implementation to keep it from being committed, and what might be done to get it up to par..or maybe it was just missed? Reason I ask is I need this function for uxtheme

1 0

Re: Add a test case and a fix for the window styles state at the window creation time
by Bill Medland 30 Jan '04

30 Jan '04

On January 30, 2004 08:08 am, Dmitry Timoshkov wrote: > Hello, > > Changelog: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Add a test case and a fix for the window styles state > at the window creation time. > SNIP > + cs->style |= WS_CAPTION; > + wndPtr->flags |= WIN_NEED_SIZE; > + } > + } > + > /* Fill the window structure */ > > wndPtr->tid = GetCurrentThreadId(); SNIP The problem with comments is that they don't get maintained. I suggest that this is one of those "x=x+1; /* increment x */" type comments and the comment should go too. (If it is not clear to anyone, the comment suggests that below the comment is where the structure gets filled in and the casual observer won't notice that one element was actually done before the comment). Bill -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

1 0

[oleaut32] implement VarMod() + tests, fix bug in VarNot()
by Chris Morgan 30 Jan '04

30 Jan '04

* dlls/oleaut32/variant.c Chris Morgan <cmorgan(a)alum.wpi.edu> Implement VarMod(). Fix VarParseNumFromStr() to work correctly with NUMPRS_HEX_OCT flag. Add a few trace outputs. Fix VarNot() with VT_CY. * dlls/oleaut32/tests/vartest.c Chris Morgan <cmorgan(a)alum.wpi.edu> Implement tests for VarMod(). Added char *vtstr() to enhance test debugging by returning a text string that corresponds to the inputted type. Still have a couple of issues with this change. I'm not sure why the (BSTR) tests fail under wine and not windows, I've wrappered them with todo_wine{} but they still get listed as failures. I'm not sure if the fix to VarParseNumFromStr() is the most correct. It does appear to be exactly what windows does, overwrite the characters in the buffer but lie and return an incorrect character count. Also, testing the types in VarMod() results in some 700k additional tests and adds some time to the tests, something like 6 seconds on my machine. Is this simply too much to test? It certainly helped me nail down the types for VarMod(). Thanks, Chris

2 2

Re: x11drv
by Dimitrie O. Paun 30 Jan '04

30 Jan '04

On January 30, 2004 08:47 am, RemiAssailly(a)aol.com wrote: Please, no HTML mail if possible. > - if (devmode) > + if (devmode==NULL) > { > TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); This can't possibly be right. In effect you're disabling that if completely (unless devmode is NULL, in which case you'll get a segfault on the next line). -- Dimi.

1 0

alsa and audioio testing needed for dsound patch
by Robert Reif 30 Jan '04

30 Jan '04

This patch insures that the hardware primary buffer is deleted and recreated properly when changing the primary format. It also makes sure the proper frequency adjust is calculated for the actual format used rather than the requested one. This should only affect oss, alsa, and audioio and I have tested oss already. Please test it with the dsound tests in the interactive mode so sounds are actually played. Make sure "HardwareAcceleration" in the config file is not set to 'Emulation" so the dsound HAL driver is used. Thanks, Bob.

1 0

Re: Hel debugging windows app with wine(dbg) + gdb
by Leo 30 Jan '04

30 Jan '04

gdb is my friend too. There are many things you can do with that, that you can't do with printf. Anyway I don't want to start a flame here about debugging techniques. I just need to know if gdb works with wine, or if winedbg actually works with gdb. Thanks. Peter Hartshorn wrote: >Here is my debugging tip: > >printf is your friend. > >If you can narrow down the error to the function at which it occurs, place a >printf, or fprintf to stderr, after every line of code. The last message that >is printed should get you a lot closer to your error. > > >

1 0

NHL 2004 (IE6 in another APP!)
by Abdul-Haseeb Ahmad 30 Jan '04

30 Jan '04

YES! I got the splash screen of NHL 2004 Demo to load up.. I hope the full version also works with the way i configured it.. actually i didnt do much at all, i just used the following DLLOverides [AppDefaults\\iexplore.exe\\DllOverrides] "mshtml" = "native, builtin" "shfolder" = "native, builtin" "shell32" = "native, builtin" "shell" = "native, builtin" "shdocvw" = "native, builtin" "shlwapi" = "native, builtin" "urlmon" = "native, builtin" "crypt32" = "native, builtin" "wininet" = "native, builtin" [AppDefaults\\nhldemo.exe\\DllOverrides] "mshtml" = "native, builtin" "shfolder" = "native, builtin" "shell32" = "native, builtin" "shell" = "native, builtin" "shdocvw" = "native, builtin" "shlwapi" = "native, builtin" "urlmon" = "native, builtin" "crypt32" = "native, builtin" "wininet" = "native, builtin" also the windows version is set to win98... this is what happens when the splash screen loads up: fixme:ole:LoadTypeLibEx Wanted to load L"stdole2.tlb" as typelib, but file was not found. err:ole:ITypeInfo_fnInvoke did not find member id -525, flags 2! wine: Unhandled exception (thread 0009), starting debugger... err:ntdll:RtlpWaitForCriticalSection section 0x4031001c "?" wait timed out in thread 000a, blocked by 0009, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x4031001c "?" wait timed out in thread 000a, blocked by 0009, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x4031001c "?" wait timed out in thread 000a, blocked by 0009, retrying (60 sec) err:ntdll:RtlpWaitForCriticalSection section 0x4031001c "?" wait timed out in thread 000a, blocked by 0009, retrying (60 sec) this is what winedbg shows: First chance exception: page fault on write access to 0xd9df12c8 in 32-bit code (0x4545529f). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0033 GS:005f EIP:4545529f ESP:408493ad EBP:408493c5 EFLAGS:00010286( R- 00 I S - -P1 ) EAX:4c8cb854 EBX:40c5a1d6 ECX:40c59ddd EDX:40310070 ESI:408493ea EDI:4c8e08b9 Stack dump: 0x408493ad (KERNEL32.DLL.VerSetConditionMask+0x334383): 4c8cb854 5840c2e6 d44c8cb8 b840c5a1 0x408493bd (KERNEL32.DLL.VerSetConditionMask+0x334393): 084c8e08 fc4c8e0a a9408493 b840c2e4 0x408493cd (KERNEL32.DLL.VerSetConditionMask+0x3343a3): e84c8e08 ec408493 b8408493 b84c8e08 0x408493dd (KERNEL32.DLL.VerSetConditionMask+0x3343b3): 584c8e08 054c8cb8 58800040 0d4c8cb8 0x408493ed (KERNEL32.DLL.VerSetConditionMask+0x3343c3): 00000000 50000000 004cd201 10d500d4 0x408493fd (KERNEL32.DLL.VerSetConditionMask+0x3343d3): 3d408468 b870e9d8 784c8e08 48000005 0x4084940d (KERNEL32.DLL.VerSetConditionMask+0x3343e3): Backtrace: =>0 0x4545529f (X11DRV.DLL..data+0x3ab129f) (ebp=408493c5) 1 0xb840c2e4 (MSVCRT.DLL..reloc+0x403cf2e4) (ebp=a9408493) 0x4545529f (X11DRV.DLL..data+0x3ab129f): *** Invalid address 0x4545529f (X11DRV.DLL..data+0x3ab129f) -- no code -- im not sure if this is some D3D stuff or what.. maybe mike hearn might know

1 3

Remote access to wineconf
by Jeremy White 29 Jan '04

29 Jan '04

Hi folks, It looks as though through the kind help of some folks that we will be able to have video streaming for Wineconf. We'll also be maintaining an irc channel for the conference; #wineconf on freenode (said channel is already open for business, and will be active throughout the weekend). We've got a test stream up if you want to try your viewer: http://www.winehq.org/wineconf/stream.html I'll point it to the live stream on Saturday morning. We've had success with mplayer (the following was found by Art to work well): mplayer -rtsp-stream-over-tcp rtsp://wine.codeweavers.com/wineconf-test.sdp You can also use Quicktime, and the Player from Quicktime 6.3 should run under Wine. I haven't had time to nail down a version of Wine that runs it reliably; I had one working a few weeks ago, but now our CVS tip doesn't work for beans. Hopefully I'll get enough time to push one out. If someone else wants to take a poke, the key is to snag Quicktime 6.3 (it's a bit hard to find, but is out there), and make sure you use a Wine that is recent enough that it has the REUSEADDR badness in socket.c reverted. Cheers, Jeremy

2 1

Help needed to build & run a VC++ program in Linux
by saravanan 29 Jan '04

29 Jan '04

Hi, I want to know how i can a compile & port a simple VC++ application to linux using wine. I tried to compile a VC++ application using the winelib method. But it showed a lot of errors. Does anyone have any idea. I had tried all options. I had done follwing things 1) I created a simple VC++ application. Just to display a msg on clicking a button. 2) I copied it to Linux' home directory 3) I executed following commands a)winemaker --lower-uppercase . (later i tried the follwing command also. winemaker --lower-uppercase --console -I/usr/include/include/wine -L/usr/include/include/wine .) ///To the /usr/include/include directory i copied all the original MFC files from V.Studio. b) ./configure --with-wine-includes=/usr/include/include now it showed the error --> checking for -lmfc... configure: error: Could not find the MFC library I couldn't able to correcet it. Where i can get the original -lmfc (libmfc) file, there is no such file present in the system. c)Finally I myself created a fake libmfc.so file and placed it in the /usr/include/include directory. But when i "make" it showed a lot of errors . Some are given below . ---------- s/usr/include/include/afxwin1.inl:1014: warning: ISO C++ forbids declaration of `operator==' with no type /usr/include/include/afxwin1.inl:1016: warning: ISO C++ forbids declaration of `operator!=' with no type . . /usr/include/include/afxole.inl:97: `vt' undeclared (first use this function) /usr/include/include/afxole.inl:97: (Each undeclared identifier is reported only once for each function it appears in.) /usr/include/include/afxole.inl: In method `COleVariant::COleVariant (unsigned char)': . . /usr/include/include/afxole.inl: In method `COleCurrency::COleCurrency ()': /usr/include/include/afxole.inl:123: `union tagCY' has no member named `Hi' /usr/include/include/afxole.inl:123: `union tagCY' has no member named `Lo' /usr/include/include/afxole.inl:283: `parray' undeclared (first use this function) make: *** [vctest.o] Error 1 ------ Later I run the command winemaker --lower-uppercase . in the /usr/include/include directory and converted entire contents. after that when i make the vc++ application again it showed some different errors. -------- . . . /usr/include/include/pshpack2.h:22:4: #error "Alignment nesting > 3 is not supported" In file included from /usr/include/include/afxcmn.h:38, from StdAfx.h:20, from vctest.cpp:4: /usr/include/include/pshpack4.h:22:4: #error "Alignment nesting > 3 is not supported" In file included from /usr/include/include/poppack.h:31, from /usr/include/include/pshpack2.h:38, from /usr/include/include/poppack.h:31, from /usr/include/include/afxcmn.h:1132, from StdAfx.h:20, from vctest.cpp:4: /usr/include/include/pshpack2.h:22:4: #error "Alignment nesting > 3 is not supported" In file included from /usr/include/include/pshpack2.h:47, from /usr/include/include/poppack.h:31, from /usr/include/include/afxcmn.h:1132, from StdAfx.h:20, from vctest.cpp:4: /usr/include/include/pshpack2.h:22:4: #error "Alignment nesting > 3 is not supported" make: *** [vctest.o] Error 1 ---------------- I think the problem might be with -lmfc. Please kindly help me to come out of these errors. ______________________________________ Scanned and protected by Email scanner

3 2

Mac OS X Binary Released
by ATMRD＠aol.com 29 Jan '04

29 Jan '04

I have created and released a binary for wine on Mac OS X available at http://prdownloads.sourceforge.net/darwine/Darwine.pkg.tgz?download this binary is part of the Darwine project. Thanks for all of your help in helping the Darwine team, especially Pierre to bring wine over to Mac OS X. ~Sanjay Connare

1 0

For Mike...
by MediaHost (TM) 29 Jan '04

29 Jan '04

Mike, Somehow your personal mail seams to be out of order....?? Sending it through wine-devel: Yes, I didn't try even the modern skin, because I don't like it... Winamp version 3 failed badly, so I tried version 5.... Can you send me the relevant config and native dll's you have on your installation? It loads fine but I get the following when clicking on play (sound of the whole system stops working): [eddyn@pceddyn eddyn]$ wine --debugmsg +loaddll c:\\Program\ Files\\Winamp\\winamp.exe trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\advapi32.dll" : builtin trace:loaddll:load_dll Loaded module L"gdi32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\USER32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\msvcrt.dll" : nativetrace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\SHLWAPI.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\COMCTL32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\SHELL32.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\ole32.dll" : native trace:loaddll:load_dll Loaded module L"winspool.drv" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\comdlg32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\WINMM.dll" : builtintrace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\MSACM32.dll" : native trace:loaddll:MODULE_LoadModule16 Loaded module 'krnl386.exe' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'system.drv' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'GDI.EXE' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'USER.EXE' : builtin trace:loaddll:load_dll Loaded module L"x11drv.dll" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'KEYBOARD.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'COMMCTRL.DLL' : native trace:loaddll:MODULE_LoadModule16 Loaded module 'shell.dll' : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\SHFOLDER.DLL" : native trace:loaddll:load_dll Loaded module L"wineoss.drv" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'MMSYSTEM.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'MSACM.DLL' : native trace:loaddll:MODULE_LoadModule16 Loaded module 'msacm.drv' : native trace:loaddll:load_dll Loaded module L"winedos.dll" : builtin trace:loaddll:load_dll Loaded module L"midimap.drv" : builtin fixme:file:DeviceIo_MMDEVLDR (5,(nil),0,0x4027996c,4,0x4073fd60,(nil)): stub trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\iphlpapi.dll" : builtin trace:loaddll:load_dll Loaded module L"ws2_32.dll" : builtin trace:loaddll:load_dll Loaded module L"WSOCK32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_mp3.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_wm.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_midi.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\read_file.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_mod.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_vorbis.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\OLEAUT32.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_cdda.dll" : native fixme:win32:SetCriticalSectionSpinCount critsection=0x653cf7a0: spincount=1000 not supported fixme:win32:SetCriticalSectionSpinCount critsection=0x653cf810: spincount=1000 not supported trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_wave.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_nsv.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\in_dshow.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\out_wave.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\lz32.dll" : builtin trace:loaddll:load_dll Loaded module L"VERSION.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\ddraw.dll" : native trace:loaddll:MODULE_LoadModule16 Loaded module 'TOOLHELP.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'DIBENG.DLL' : native trace:loaddll:MODULE_LoadModule16 Loaded module 'VER.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'DDRAW16.DLL' : native fixme:x11drv:X11DRV_GetDeviceCaps (0x84): CAPS1 is unimplemented, will return 0 trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\advapi32.dll" : builtin trace:loaddll:load_dll Loaded module L"GDI32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\USER32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\WINMM.dll" : native trace:loaddll:MODULE_LoadModule16 Loaded module 'krnl386.exe' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'system.drv' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'GDI.EXE' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'USER.EXE' : builtin trace:loaddll:load_dll Loaded module L"x11drv.dll" : builtin fixme:file:DEVICE_Open Unknown/unsupported VxD VJOYD.VXD. Try setting Windows version to 'nt40' or 'win31'. fixme:vxd:VxDCall Unknown/unimplemented VxD (04420000) trace:loaddll:MODULE_LoadModule16 Loaded module 'KEYBOARD.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'MMSYSTEM.DLL' : native trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\lz32.dll" : builtin trace:loaddll:load_dll Loaded module L"VERSION.dll" : builtin err:ntdll:RtlpWaitForCriticalSection section 0x400e5040 "loader.c: loader_section" wait timed out in thread 000a, blocked by 0009, retrying (60 sec) trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\DDRAW.DLL" : native trace:loaddll:MODULE_LoadModule16 Loaded module 'TOOLHELP.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'DIBENG.DLL' : native trace:loaddll:MODULE_LoadModule16 Loaded module 'VER.DLL' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'DDRAW16.DLL' : native trace:loaddll:load_dll Loaded module L"winedos.dll" : builtin fixme:x11drv:X11DRV_GetDeviceCaps (0x74): CAPS1 is unimplemented, will return 0 trace:loaddll:load_dll Loaded module L"C:\\Windows\\System\\msimg32.dll" : builtin fixme:msimg32:vSetDdrawflag stub: vSetDrawFlag 1 trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\WINDOWS\\SYSTEM\\msimg32.dll" : builtin fixme:system:EnumDisplayDevicesA ((nil),0,0x4073cb58,0x00000000), stub! trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\gen_tray.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\Plugins\\gen_ml.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PX.dll" : native trace:loaddll:load_dll Loaded module L"C:\\Program Files\\Winamp\\PXSDKPLS.dll" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PXDRV.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PXMAS.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PXWAVE.DLL" : nativefixme:file:DEVICE_Open Unknown/unsupported VxD PxHelper. Try setting Windows version to 'nt40' or 'win31'. trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\WINDOWS\\SYSTEM\\PXDRV.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PXDRV.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\RPCRT4.DLL" : nativetrace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\NETAPI32.DLL" : builtin fixme:file:DeviceIoControl Unimplemented control 256 for VxD device NWLINK trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\WINDOWS\\SYSTEM\\PXDRV.DLL" : native trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\PXDRV.DLL" : native trace:loaddll:load_dll Loaded module L"WNASPI32.DLL" : builtin err:aspi:SCSI_GetProcinfo Could not open /proc/scsi/scsi trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\Program Files\\Winamp\\PXSDKPLS.dll" : native trace:loaddll:MODULE_FlushModrefs Unloaded module L"C:\\WINDOWS\\SYSTEM\\PX.dll" : native fixme:winmm:MMDRV_WaveOut_UnMap16To32A Shouldn't be used: those 16 bit functions use the 32 bit interface wine: Unhandled exception (thread 0011), starting debugger... trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\advapi32.dll" : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'krnl386.exe' : builtin trace:loaddll:MODULE_LoadModule16 Loaded module 'system.drv' : builtin WineDbg starting on pid 8 No debug information in ELF 'wine' ((nil)) No debug information in 32bit DLL 'C:\Program Files\Winamp\winamp.exe' (0x400000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\NTDLL.DLL' (0x40090000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\KERNEL32.DLL' (0x40330000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\ADVAPI32.DLL' (0x40a80000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\GDI32.DLL' (0x408d0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\USER32.DLL' (0x40760000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MSVCRT.DLL' (0x78000000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHLWAPI.DLL' (0x70bd0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\COMCTL32.DLL' (0x40ac0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHELL32.DLL' (0x70970000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\OLE32.DLL' (0x7ff30000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINSPOOL.DRV' (0x40bf0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\COMDLG32.DLL' (0x40b70000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINMM.DLL' (0x40c20000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MSACM32.DLL' (0x7c1e0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\X11DRV.DLL' (0x40d30000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHFOLDER.DLL' (0x71930000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINEOSS.DRV' (0x412c0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINEDOS.DLL' (0x41300000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MIDIMAP.DRV' (0x409b0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\IPHLPAPI.DLL' (0x414b0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WS2_32.DLL' (0x41490000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WSOCK32.DLL' (0x41470000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_MP3.DLL' (0x10000000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_WM.DLL' (0x414c3000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_MIDI.DLL' (0x414d3000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\READ_FILE.DLL' (0x414f0000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_MOD.DLL' (0x4150b000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_VORBIS.DLL' (0x41539000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\OLEAUT32.DLL' (0x65340000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_CDDA.DLL' (0x41574000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_WAVE.DLL' (0x40f85000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_NSV.DLL' (0x41ac0000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\IN_DSHOW.DLL' (0x41afe000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\OUT_WAVE.DLL' (0x41451000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\LZ32.DLL' (0x41de0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\VERSION.DLL' (0x41dd0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\DDRAW.DLL' (0xbaaa0000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\GEN_TRAY.DLL' (0x415a5000) No debug information in 32bit DLL 'C:\PROGRAM FILES\WINAMP\PLUGINS\GEN_ML.DLL' (0x41df2000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\PXMAS.DLL' (0x42770000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\PXWAVE.DLL' (0x429b0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\RPCRT4.DLL' (0x7fbc0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\NETAPI32.DLL' (0x426a0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\PXDRV.DLL' (0x41faa000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WNASPI32.DLL' (0x426c0000) Unhandled exception: page fault in 16-bit code (11ef:2502). In 16-bit mode. 0x11ef:0x2502: mov 0xfffffffe(%bp),%es Wine-dbg> Then I get ddhelp.exe still running at ps after stopping the debugger. But the output is allmost the same when using ddraw = builtin...ecxept that there was no ddhelp.exe running... Any ideas? Thanks a lot.... Signer: Eddy Nigg Company: StartCom Group at http://www.startcom.org MediaHostT at http://www.mediahost.org ----- Original Message ----- From: "Mike Hearn" <mike(a)theoretic.com> To: <wine-devel(a)winehq.com> Sent: Thursday, January 29, 2004 11:41 AM Subject: Re: UXTHEME > On Wed, 28 Jan 2004 21:14:39 +0200, MediaHost (TM) wrote: > > I see this also bothering Winamp 5....would maybe run too. > > To get WinAmp 5 running use the "Classic" theme instead of Modern. > > Modern uses stuff we haven't implemented yet. > > --- StartCom Ltd. http://www.startcom.org Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.574 / Virus Database: 364 - Release Date: 1/29/2004

2 1

Re: 16bit app calls wineps.drv, but wine has wineps.dll (missing alias?)
by ceztko＠libero.it 29 Jan '04

29 Jan '04

"Alexandre Julliard" <julliard(a)winehq.com> writes: > > > Ok, but the cups autoconfiguration set "wineps" in win.ini, and it seems > > impossible to ovveride this settings... Maybe a synlinks wineps.drv.so --> > > wineps16.drv.so in /etc/lib/wine/lib/wine can help? > > No, you can't really fix that with symlinks, the dll names are built > into the dlls themselves. If the win.ini entry is set by the cups code > then it should be fairly easy to change it to store wineps16 > instead. This may break something else, but I guess we'll see... > > -- > Alexandre Julliard > julliard(a)winehq.com > As i touhgt a symlinks is not enough... No chance for alias? Isn't there a mechanism to make wine to use different dll if required to do so? Anyway, i'll be very happy If you'll change cups code a bit: is very frustrating this impossibility of edit the autodetect configuration, and the fact it removes any other printer configured in the [windows] section in win.ini (is it a bug?)! ...forgive me if i forwarded the previous mail only to you. I was at university and i did a mistake with the web-mail. Francesco Pretto ceztko(a)libero.it

1 0

Wine totally broken on Fedora Core because of security patch in kernel
by Ivan Leo Murray-Smith 29 Jan '04

29 Jan '04

FC has some security patch in the kernel, so wine fails with this error: err:virtual:map_image Standard load address for a Win32 program (0x00400000) not available - security-patched kernel ? wine: could not load L"C:\\Program Files\\Common Files\\InstallShield\\Engine\\6\\Intel 32\\IKernel.exe" as Win32 binary as reported by Marek Lipovcan and some users on the newsgroup, I don't have fc myself, but I guess something should be done about this. Ivan.

4 4

OLEPictureImpl_Load CreateIcon failed
by Fabian Cenedese 29 Jan '04

29 Jan '04

Hi Looks like I'm quite busy today... or just don't know anything about wine :) I'm still on the VB SSTab problem as described here: http://www.winehq.org/hypermail/wine-devel/2003/12/0157.html I looked further into this to find out what happens with this picture stuff. I found out that it fails in this function (from olepicture.c): * OLEPictureImpl_IPersistStream_Load (IUnknown) * Loads the binary data from the IStream. Starts at current position. * Currently implemented: BITMAP, ICON, JPEG. static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { It first reads the picture size from the stream and reads the picture properties and data. This works sometimes, I can see it creating e.g. 32x32 pictures for icons. But in this error I have it always fails due to the reported picture data size of zero. So it doesn't read any picture properties from the stream and tries to create a picture with 0x0 dimensions. Obviously this fails. But now I can't find out where this comes from. What is this stream where it wants to read data from? In what source file is this implemented? The used IStream_Load is just a macro. What could have gone wrong earlier that this picture size is now zero? Maybe the stream is ok but wine wants to create more pictures than there are? Thanks for any pointers. bye Fabi

1 2

Re: NHL2004 Testing / Version.dll
by Abdul-Haseeb Ahmad 29 Jan '04

29 Jan '04

I just tried the NHL 2003 demo right now, since it would be the most relevant game to try since it also uses IE.. it has problems initializing the WinMM components.. im not sure but i have a feeling this might be because something isn't configure right.. i get this error when i start wine everytime: err:wave:OSS_WaveOutInit /dev/mixer1: No such device err:wave:OSS_WaveInInit /dev/mixer1: No such device anyone know how i could fix that? the exact error i get running nhl2003 is: Backtrace: =>0 0x005bb868 (nhl2003Demo.exe.EntryPoint+0xf301 in nhl2003Demo.exe) (ebp=0065a4e4) 1 0x6f724265 (MIDIMAP.DRV..data+0x29e70265) (ebp=6c746954) *** Invalid address 0x6c746954 (MIDIMAP.DRV..data+0x26e92954) 0x005bb868 (nhl2003Demo.exe.EntryPoint+0xf301 in nhl2003Demo.exe): movl 0x0(%eax),%ecx also, NHL 2000 works in software mode from what i recall, NHL 2002 has a problem selecting the video card that im using, it has something to do with that program it uses, 3DSetup, like all of the older EA Games.. Backtrace: =>0 0x600024ae (DX7Z.DLL._THRASH_selectdisplay@4+0x23e in DX7Z.DLL) (ebp=00000000) 0x600024ae (DX7Z.DLL._THRASH_selectdisplay@4+0x23e in DX7Z.DLL): movl 0x0(%eax),%ecx when I run 3DSetup to setup my videocard, it goes back to the version.dll problem i was having with NHL2004: Backtrace: =>0 0x408c5d8b (VERSION.DLL.VerQueryValueA+0xa7 in VERSION.DLL) (ebp=4083eae0) 1 0x10003bcf (3DSETUP.DLL.TDSETUP_IsSupportedCard+0x1aa4 in 3DSETUP.DLL) (ebp=4083eb18) 2 0x1000249d (3DSETUP.DLL.TDSETUP_IsSupportedCard+0x372 in 3DSETUP.DLL) (ebp=4083ebd4) 3 0x10001160 (3DSETUP.DLL.TDSETUP_Init+0xcc in 3DSETUP.DLL) (ebp=4083efec) 4 0x0040179b (3DSetup.exe..text+0x79b in 3DSetup.exe) (ebp=00000001) I copied over version.dll from winxp and it did run the 3DSetup but with no videocards in the list; could be because i didn't install NHL 2002 the way it should be installed (i installed nhl2003/2004 properly) like i stated earlier for NHL 2004, version.dll cannot be used from WinXP as it gives an error... the only solution would be to fix the version.dll implementation.. however im not familiar with windows api and how everything works, so im not sure how i'd approach that problem myself Tom wrote: > Abdul-Haseeb Ahmad wrote: > >> Jonathan Wilson wrote: >> >>> Abdul-Haseeb Ahmad wrote: >>> >>>> ive tinkered around some more, and i copied over winxp's >>>> kernel32.dll, and i >>> >>> >>> >>> >>> You cant use kernel32.dll from real windows on WINE. >>> >>> >>> >> if i do put it there, the program goes past the kernel32 error, as >> i've explained.. i changed it to a dummy kernel32 and it worked as well >> >> > > Have you tried NHL 2003, 2002, 2001, 99 ? > > > >

2 1

Re: File change notifications
by Duane Clark 29 Jan '04

29 Jan '04

Hans Leidekker wrote: > + > +/* TODO: - security attribute changes > + * - compound filter and multiple notifications > + * - subtree notifications > + * - non-documented flags FILE_NOTIFY_CHANGE_LAST_ACCESS and > + * FILE_NOTIFY_CHANGE_CREATION > + For some reason, a comment end is missing there. But otherwise, it seems to work fine with the one important app I use file notification on.

2 1

Re: NHL 2004 Testing Report
by Abdul-Haseeb Ahmad 29 Jan '04

29 Jan '04

Jonathan Wilson wrote: > Abdul-Haseeb Ahmad wrote: > >> ive tinkered around some more, and i copied over winxp's >> kernel32.dll, and i > > You cant use kernel32.dll from real windows on WINE. > > > if i do put it there, the program goes past the kernel32 error, as i've explained.. i changed it to a dummy kernel32 and it worked as well

3 2

UXTHEME
by MediaHost (TM) 29 Jan '04

29 Jan '04

Hi, I wanted to know about the issue with uxtheme and the newest release: As stated at http://www.winehq.com/?issue=206#Broken%20Apps:%20IE%20Setup%20and%20Lotus%… explorer only bombs, when a theme installed and selected in your registry . How do I go about uninstalling a theme and which registry keys to remove. If Explorer (working with 20031212) will work with the new release after removing the theme? Or can the native dlls work? Regards Signer: Eddy Nigg Company: StartCom Group at http://www.startcom.org MediaHostT at http://www.mediahost.org --- StartCom Ltd. http://www.startcom.org Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.563 / Virus Database: 355 - Release Date: 1/19/2004

3 4

Re: WineHQ: Isn't status update news?
by Brian Vincent (C) 29 Jan '04

29 Jan '04

> How about a news item about the status being updated? > Tom just finished a big status update, and people that > don't follow wine-{cvs,devel,patches}(a)winehq.org have > no way of knowing. I was under the impression it wasn't completed yet because the Core page still needed to be done. --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

3 2

Missing RedHat fc1 src rpm
by Bill Medland 29 Jan '04

29 Jan '04

The sourceforge site seems to be missing the fc1 src rpm for the Jan 2004 build. -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

3 2

NHL 2004 Testing Report
by Abdul-Haseeb Ahmad 28 Jan '04

28 Jan '04

Okay guys, I'm a first time poster here, so sorry if I goofed up somewhere. The full bug report is here, includes full output: http://bugs.winehq.org/show_bug.cgi?id=1970 okay heres my testing report of NHL 2004.. I decided to go the full length to see if we can get it working because IE6 does work in wine, and Madden 2004, an EAGL-engined game (NHL 2004 also uses the same engine, although probably a slightly older revision than Madden, both dx8 though), works with little graphical glitches. running wine20031212 compiled from source on fedora core release 1 installed IE6 using mike hearn's install script installed NHL 2004: - ran "wine Autorun.exe &" in /mnt/cdrom - changed directory out of cdrom to allow switching of CDs - said no to new version of DCOM installation - said yes to Flash Player installation (no errors, unlike winex) - advanced install - typed in directory i wanted to install it into (browse is buggy, crashes when you click OK) - (installed it on a fat32 partition) - chose register later - said no to installing EA Online components - progress meter frozen at 0.00% but files copied - error copying Support\en-us_eahelp.GID - unmounted cd, created /mnt/cdrom/Support - created missing file with "touch en-us_eahelp.GID" - retried, error copying with Support\go_ez.exe - deleted /mnt/cdrom/Support/en-us_eahelp.GID - rmdir'd /mnt/cdrom/Support - remounted cd, clicked retry, cd continued to copy files - install asked for cd2, switched to cd2, clicked ok, files continued to copy, indicator still at 0.00% though - install goes to Please wait window for a 5 or 6 minutes - screen pops up saying a debugger has been detected (install completed) - copied v1.0 nocd crack into nhl 2004 directory afterwards is the output i got running the wine20031212 debugger okay, so I'm pretty sure that BROWSERENGINE_PC_Z.DLL is what NHL 2004 uses to communicate with IE6 (NHL 2004 uses HTML/JS files for its menu interface) I when i load intro.html (the first page that NHL 2004 runs) into IE6 it doesnt show anything when in windows when opening it in IE6 it shows the intro video (an mpg file)... however title.html does appear correctly (its a very basic html file) so i backed-up my intro.html and copied the title.html file over intro.html, yet the errors i got were still the same, so the error seems to unrelated to the content of the HTML file that is being loaded, if it even gets to that stage. The game does create the My Documents/NHL 2004 directory correctly. I copied over the My Documents/NHL 2004 directory over from my windows installation and I still got the same error. The game does go into a full screen 800x600 mode, but the game just sits there with a frozen image of the desktop (in winex i get a black screen with the white windows mouse pointer as it should be, but thats a different story because winex doesnt even run IE), so i had to alt-tab to see the proper terminal window again... the debugger keeps on outputting the same thing over at the end when i type cont, and thats where both outputs end (actually the second output ends with wine not finding the debugged because i didnt have it setup properly) anyone know what the BROWSERENGINE_PC_Z.DLL is trying to call at the end when i get this as the trace (im not sure exactly how to read the order of what calling what, browserengine_pc_z calling kernel21, or the other way around): =>0 0x1000997a (BROWSERENGINE_PC_Z.DLL.DllGetClassObject+0x42fa in BROWSERENGINE_PC_Z.DLL) (ebp=003afc34) 1 0xe8530845 (KERNEL32.DLL.VerSetConditionMask+0xd803581b) (ebp=8be58955) *** Invalid address 0x8be58955 (KERNEL32.DLL.VerSetConditionMask+0x7b95d92b) also, I made sure that IE still functions after the installation of NHL 2004. However IE6 doesn't seem to be able to play SWF files, even though that shouldnt be a major factor, as I know people who have had the game in windows without the flash parts showing any help would be appreciated. there is an NHL 2004 demo and im sure it would probably behave the same, although you might have to install it through a windows installation if its giving problems installing the demo in wine. also if there is a better forum to post this information so it can be used, please tell me.

1 2

Re: desktop mode again
by Robert Shearman 28 Jan '04

28 Jan '04

I apologise in advance if this message is poorly formatted. Blame webmail for that. Alex Pasadyn wrote: > ChangeLog: > - Make a separate process for the Wine desktop window > - In desktop mode, all applications share one desktop window > - Ensure system metrics are accurate for all processes after resolution > changes I suggest you put the system metrics stuff in a separate patch. It is a lot more tested and more likely to get in than the other code, which is quite a big change. [snip] > While several applications work fine, there are > some issues I have not been able to resolve. The problems have to do > with trying to call WIN_FindWndPtr across processes, especially from the > windows/painting.c file. As you rightly say, we need to move a lot of the window code into wineserver. ReactOS probably has a head start on us in this area, although we won't be able to borrow anything more than ideas because of the license. [snip] > I am hoping someone with more knowledge of the painting and region > code could spot some obvious way to get around the issue. Otherwise it > will be tough. I had tried replacing some of the WND* uses with server > calls to get rectangles and style flags, but that does not handle > everything that's being read out of those structures. Unless there's > some shortcut I don't see how to do it without moving more of that data > into the server. The other problem related to this is that some > functions are supposed to fail if the window is in another process, > while others would work better if they got the data from the server, and > it's not always obvious which way a particular function should work. I guess we need test cases for those then. The way I see it the only way around the problem of inter-process graphics operations is for us to have our own DIB engine and move functions calling WIN_FindWndPtr into the server. X doesn't allow inter-process operations right? > @@ -128,7 +129,14 @@ > */ > BOOL WINAPI PaintDesktop(HDC hdc) > { > - HWND hwnd = GetDesktopWindow(); > + HWND hwnd; > + SERVER_START_REQ( set_desktop_window ) > + { > + req->handle = 0; > + wine_server_call( req ); > + hwnd = reply->cur_handle; > + } > + SERVER_END_REQ; > > /* check for an owning thread; otherwise don't paint anything (non-desktop mode) */ > if (GetWindowThreadProcessId( hwnd, NULL )) Is there some reason for replacing GetDesktopWindow with this server call? [snip] > +/*********************************************************************** > + * BecomeDesktop > + * > + * Tell the server to make our window the desktop. > + */ > +static BOOL BecomeDesktop() > +{ > + BOOL res = TRUE; > + SERVER_START_REQ( set_desktop_window ) This is bad. There shouldn't be a direct server call in a normal wine program. We should try and find the right Windows API to do this, or create our own export from user32. Only user32, gdi32, ntdll and x11drv should need to use server calls (and kernel32 out of convenience). [snip] > +/*********************************************************************** > + * WrapperWndProc > + * > + * Window procedure > + */ > +static LRESULT WINAPI WrapperWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) [snip] > +/*********************************************************************** > + * DesktopWndProc > + * > + * Window procedure > + */ > +static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) Why do you need two windows procedures? If you're sure you do need both of them, a comment in the code explaining why would be good. It's not at all obvious to the casual observer (i.e. me) otherwise. It appears you don't launch winedesktop anywhere and you don't remove any options from the config file. It will be a bit confusing for people who do use the wine desktop when it doesn't do anything after applying your patch (until they launch winedesktop). Do you plan to launch winedesktop at startup (possibly just after wineserver is launched) if the desktop setting is enabled? Rob

1 0

Re: Fix Unicode support for SetupApi INFs
by Alexandre Julliard 28 Jan '04

28 Jan '04

Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > A well meaning individual implemented Unicode support for SetupApi. > However, the detection for whether a file was Unicode was slightly > broken because RtlIsTextUnicode only returns true if all the flags input > were output (and NULL means all flags). Since some are contradictory > this will never return TRUE. I only set the signature detection since > heuristics will probably take a while on larger files. Actually that's a bug in RtlIsTextUnicode. Passing NULL as flags is legitimate and means to do all the available tests; it certainly doesn't mean to always return FALSE, so it will have to be fixed to avoid contradictory tests. -- Alexandre Julliard julliard(a)winehq.com

1 0

Named pipes
by Peter Riocreux 28 Jan '04

28 Jan '04

[reposted because I posted not from the subscribed address - Doh! Sorry if you see it twice in the end] Using the RH9 RPM from the SF downloads area (wine-20040121-1rh9winehq.i686.rpm) This is my first serious attempt at getting a non-working app working, so if I am giving insufficient, or the wrong kind of, info, or am asking on the wrong list, or have not found the blindingly-obvious-to-everyone-but-me FAQ covering something then please point me at the right things. At my company, we have just purchased a spangly new Alcatel telephone exchange, and despite the exchange running Linux apparently (I am going to start work on obtaining the source next week ...), they have only a Windows client for managing this exchange. Thus Wine .... The management software (binary called pm5.exe) installed fairly easily and gets a long way in on execution but then stops making progress. It consumes pretty much all the CPU and when run with debug messages printed I get the following: fixme:ole:CoRegisterMessageFilter stub warn:heap:HEAP_ValidateInUseArena Heap 40220000: invalid in-use arena magic for 402576a0 warn:ole:create_marshalled_proxy Could not open named pipe to broker \\.\pipe\{46A9F31C-E868-11D4-8BC9-000102A831DC}, le is 2 [last message repeated indefinitely] There are two earlier instances of the first message, so I don't think that is the fundamental problem, but that is the first and only HEAP message, and the last message gets repeated endlessly. (full logs available on request). It also looks for, and doesn't find, ADVAPI32.dll. I am not a Windows person at all, so have no idea if the above dll is one that I should expect to find somewhere, or likely to be from the app itself. As for the pipe thing, I couldn't tell whether it couldn't connect because it couldn't make a pipe, or because it could but there was nothing at the end of it. (I am assuming the 'broker' is at the other end of the pipe.) Can anyone advance my state here? Cheers, Peter

5 7

Re: Fix .. in path names
by Dimitrie O. Paun 28 Jan '04

28 Jan '04

On Wed, 28 Jan 2004, Mike McCormack wrote: > This patch fixes the problem with non-existant directories and .. in > pathnames. (and it makes my test case work, Dimi!) > + /* don't mess with unix path names */ > + if( strchrW(name,'/') ) > + return DOSFS_GetFullNameNoDots( name, check_last, full ); I don't think this is a good test for Unix path names. AFAAIK, DOS supports '/' as well as path separator. Maybe we should export a wine_is_unix_path() function... -- Dimi.

1 0

WineHQ: Isn't status update news?
by Dimitrie O. Paun 28 Jan '04

28 Jan '04

Guys, How about a news item about the status being updated? Tom just finished a big status update, and people that don't follow wine-{cvs,devel,patches}(a)winehq.org have no way of knowing. In general, I think any big site update should make it as news items. -- Dimi.

1 0

Re: Test .. in path name for various file functions
by Dimitrie O. Paun 28 Jan '04

28 Jan '04

On January 27, 2004 08:30 pm, Mike McCormack wrote: > This doesn't pass in Wine yet, but it works on Win2000. If they don't pass under Wine, shouldn't they be marked as todo_wine {} ? Alexandre stated a number of times (with good reason my thinks) that he's not going to commit tests that fail under Wine... -- Dimi.

1 0

Variable in Visual Basic
by Savio Ramos 28 Jan '04

28 Jan '04

Hi, I am using wine with fake_windows. A Program don't works and return the message below. Any help? []'s Run time error '458' Variable uses an Automation type not supported in Visual Basic Invoking /usr/bin/wine.bin SISUPFOR.exe ... fixme:ole:CoRegisterMessageFilter stub fixme:ole:OleLoadPictureEx (0x4140292c,47552,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x406bf958), partially implemented. fixme:ole:OleLoadPictureEx (0x4140292c,1086,0,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x406bf958), partially implemented. fixme:ole:OleLoadPictureEx (0x4140292c,334,1,{7bf80980-bf32-101a-8bbb-00aa00300cab},x=0,y=0,f=0,0x406bf958), partially implemented. fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf86c): stub fixme:ole:OLEPictureImpl_SaveAsFile (0x403b9d58)->(0x403c4168, 0, (nil)), hacked stub. fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf0a0): stub fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf1dc): stub fixme:ole:VarCat Failed to convert right side from vt 8 to VT_BSTR? fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf214): stub fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf214): stub fixme:ole:OLEPictureImpl_get_hPal (0x403adbc0)->(0x406bf214): stub fixme:ole:CoRegisterMessageFilter stub Wine exited with a successful status -- Savio Martins Ramos Arquiteto Rio de Janeiro ICQ 174972645 Pirataria não! Use GNU/Linux Debian-br #705 Unstable http://www.debian.org

2 2

Re: current cvs doesn't compile,winearts,undefined reference to `DSDEVID_DefaultPlayback'
by Ivan Leo Murray-Smith 27 Jan '04

27 Jan '04

Problem fixed by patch 10892. Ivan.

1 0

Re: current cvs doesn't compile,winearts,undefined reference to `DSDEVID_DefaultPlayback'
by Ivan Leo Murray-Smith 27 Jan '04

27 Jan '04

I have [ivan@localhost ivan]$ artsd -v artsd 1.1.3 on Mandrake 9.2, current code doesn't build, make exits with the following error make[2]: Entering directory `/home/ivan/Development/Wine/CVS/wine/wine/dlls/winmm/winearts' gcc -shared -Wl,-Bsymbolic,-z,defs,-init,__wine_spec_init,-fini,__wine_spec_fini winearts.drv.spec.o arts.o audio.o winearts.drv.dbg.o -o winearts.drv.so -L../../../dlls -L../../../libs/wine -lwine -L/usr/lib -ldl -lartsc -lpthread -luuid -L../../../libs/port -lwine_port -lm -lc audio.o(.text+0x4112): In function `wodDsGuid': /home/ivan/Development/Wine/CVS/wine/wine/dlls/winmm/winearts/audio.c:2058: undefined reference to `DSDEVID_DefaultPlayback' collect2: ld returned 1 exit status make[2]: *** [winearts.drv.so] Error 1 make[2]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/wine/dlls/winmm/winearts' make[1]: *** [winmm/winearts] Error 2 make[1]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/wine/dlls' make: *** [dlls] Error 2 [ivan@localhost wine]$ Maybe caused by patch 10871? Ivan.

1 0

current cvs doesn't compile, winearts, undefined reference to `DSDEVID_DefaultPlayback'
by hatky 27 Jan '04

27 Jan '04

make[2]: Entering directory `/home/hatky/cvs/wine/dlls/winmm/winealsa' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/home/hatky/cvs/wine/dlls/winmm/winealsa' make[2]: Entering directory `/home/hatky/cvs/wine/dlls/winmm/winearts' gcc -shared -Wl,-Bsymbolic,-z,defs,-init,__wine_spec_init,-fini,__wine_spec_fini winearts.drv.spec.o arts.o audio.o winearts.drv.dbg.o -o winearts.drv.so -L../../../dlls -L../../../libs/wine -lwine -L/usr/lib -ldl -lartsc -lpthread -luuid -L../../../libs/port -lwine_port -lm -lc audio.o(.text+0x4112): In function `wodDsGuid': /home/hatky/cvs/wine/dlls/winmm/winearts/audio.c:2058: undefined reference to `DSDEVID_DefaultPlayback' collect2: ld returned 1 exit status make[2]: *** [winearts.drv.so] Error 1 make[2]: Leaving directory `/home/hatky/cvs/wine/dlls/winmm/winearts' make[1]: *** [winmm/winearts] Error 2 make[1]: Leaving directory `/home/hatky/cvs/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. Mandrake Linux 9.2 box....... -- Hatky. Hebrew translator of http://www.mandrakelinux.com/he/ Helper of http://www.phpnuke-israel.org Worshiper of http://www.winehq.org

1 0

Re: Lotus Notes broken in recent CVS
by David.Goodenough＠DGA.co.uk 27 Jan '04

27 Jan '04

I just upgraded my Debian system (unstable) which runs Notes 5, and it upgraded to wine version 20040121. Notes seems to run, I do not get the error described below but I am getting an odd error with the clipboard. At least it is reported as a clipboard error, it actually occurs when trying to read a multipart MIME document from my mailbox. If I find any error messages I will report them. BTW, I also retried installing Notes 6.5, but the installer still fails with a rather uninformative error saying the installer failed. Again I will look to see if there are any log messages. David Paul R Streitman <prs(a)us.ibm.com> To: wine-devel(a)winehq.org Sent by: cc: wine-devel-admin@ Subject: Lotus Notes broken in recent CVS winehq.org 01/24/2004 12:11 AM Through iterative CVS pulls, I have established that the problem I see with Lotus Notes not working occurred between 01/02/2004 and 01/03/2004. I had thought that the problem came up only in the last week, but I must have been mistaken. The 01/03 CVS snapshot gives the symptoms that I mentioned before (appended below), and I was able to send this note with the 01/02 snapshot. I did try copying my Notes directory to a linux drive (ext3) and reconfiguring my configuration file to use it, but saw the same problem (except of course for the path name in the error messages). Paul z/OS core components development Internet: prs(a)us.ibm.com [paul: ~]wine nlnotes Warning: could not find wine config [Drive x] entry for current working directory /home/paul; starting in windows directory. fixme:reg:_nt_dump_lf unknown Win XP node id 0x686c: do we need to add support for it ? fixme:reg:_nt_dump_lf unknown Win XP node id 0x686c: do we need to add support for it ? fixme:reg:_nt_dump_lf unknown Win XP node id 0x686c: do we need to add support for it ? err:module:map_image Could not map section .rdata, file probably truncated err:module:import_dll Loading module (file) LTOUIN22.dll (which is needed by L"C:\\Lotus\\notes\\nnotesws.dll") failed (error c000007b). err:module:import_dll No implementation for LTOUIN22.dll.130 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.141 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.123 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.60 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.77 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.127 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.136 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.72 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.101 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.94 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.135 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.131 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.74 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.61 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.76 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.58 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.67 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.68 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll No implementation for LTOUIN22.dll.71 imported from L"C:\\Lotus\\notes\\nnotesws.dll", setting to 0xdeadbeef err:module:import_dll Module (file) nnotesws.dll (which is needed by L"C:\\Lotus\\notes\\nlnotes.exe") not found err:module:import_dll No implementation for nnotesws.dll.1 imported from L"C:\\Lotus\\notes\\nlnotes.exe", setting to 0xdeadbeef err:module:LdrInitializeThunk Main exe initialization for L"C:\\Lotus\\notes\\nlnotes.exe" failed, status c0000135

2 1

Re: Wine history draft
by Brian Vincent (C) 27 Jan '04

27 Jan '04

> Did you already grab quotes from my earlier post, > http://www.winehq.com/hypermail/wine-devel/2002/11/0455.html ? > There might be a couple good ones there. I did grab some info out of there. Thanks. I made some minor additions, the updated version is here: http://users.theshell.com/~vinn/wine-history.html Jeremy - how do you want this formatted? Even better, would you like to grab it, reformat it, and stick it on the web site? --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

1 0

WINMM problem with Half-Life
by Mike McCormack 27 Jan '04

27 Jan '04

Hi Eric, After implementing the ICCVID codec, the intro AVI in Half-Life plays nicely, however when it finishes, WinMM gets stuck in a loop while cleaning up in MCIAVI_mciPlay. I think it's trying to wait for the sound to finish, however I'm not sure how to fix the problem. The patch below makes it work, but I'm not sure what bad side effects it will have... Any ideas? Mike Index: dlls/winmm/mciavi/mciavi.c =================================================================== RCS file: /cvstrees/crossover/office/wine/dlls/winmm/mciavi/mciavi.c,v retrieving revision 1.1.1.10 diff -u -r1.1.1.10 mciavi.c --- dlls/winmm/mciavi/mciavi.c 10 Jan 2004 00:11:58 -0000 1.1.1.10 +++ dlls/winmm/mciavi/mciavi.c 20 Jan 2004 16:22:23 -0000 @@ -503,12 +503,14 @@ } if (wma->lpWaveFormat) { +#if 0 while (wma->dwEventCount != nHdr - 1) { LeaveCriticalSection(&wma->cs); Sleep(100); EnterCriticalSection(&wma->cs); } +#endif /* just to get rid of some race conditions between play, stop and pause */ waveOutReset(wma->hWave);

2 7

GPG key party
by Shachar Shemesh 27 Jan '04

27 Jan '04

Hi all, I'm going offline in preparations for the flight. As only two people expressed their interest in the party, I'm cancelling the centreally managed party. People are still welcome to do a distributed party. In order to do that, just bring along several copies of your key's fingerprint printed on paper along with your name, and hand them out to anyone willing to sign them. If Jeremy will allow me to use codeweaver's printers, and more people express interest in the party by my arrival, we can switch back. Shachar

1 0

DllOverride for ocx?
by Fabian Cenedese 27 Jan '04

27 Jan '04

Hi I have a ocx which works better with a native dll. But there are also other apps which work worse if this dll is set to native by default. OK, so I add a setting for the application which uses the ocx. Works. But there are many apps that use this ocx and the customer could even make his own. So it would be nice if I could have a dll override setting for just the ocx. Is this technically possible at all? Or is the app-level the only one for overrides? (I know, fixing wine would be even better, but I don't have the time nor the knowledge. )-: But I keep trying whenever I can :) bye Fabi

3 3

Re: Wine history draft
by Dan Kegel 27 Jan '04

27 Jan '04

On August 6, 2003 01:51 pm, Brian Vincent (C) wrote: > I put together the following: > http://users.theshell.com/~vinn/wine-history.html [...] > Comments / suggestions / criticisms? Did you already grab quotes from my earlier post, http://www.winehq.com/hypermail/wine-devel/2002/11/0455.html ? There might be a couple good ones there. - Dan

1 0

Games Tested - 20040121
by Mike Kost 27 Jan '04

27 Jan '04

This is an update for the 'More Games Tested' post on 1/3/04. I reran everything on 20040121 and the results are below. All games are freely downloadable as they are demos. Two error/fixme changes I noticed over the 20031212 runs: - appearance of fixme:ntdll:NtQueryInformationToken (0x44,2,(nil),0,0x406cebe4): stub fixme:ntdll:NtQueryInformationToken (0x44,2,0x406cebc8,12,0x406cebe4): stub - Disappearance of fixme:shell:ShellView_OnNotify -- 0x403990b8 WM_COMMAND ffffff98 unh fixme:shell:ShellView_OnNotify -- 0x403990b8 WM_COMMAND fffffff4 unh fixme:shell:ShellView_OnNotify -- 0x403990b8 WM_COMMAND fffffff0 unh System: + AMD 1GHz + Mandrake 9.2 + Freshly compiled Wine 20040121 Mike mike at tashcorp dot net Dominions II for Windows -------------------------------- - Graphics did not go to full-screen correctly and had refresh issues - Mouse did not appear to work correctly. - keyboard errors produced when arrow keys pressed. - No noticable improvement over Wine-20031212 File: http://www.shrapnelgames.com/downloads/dominions2demo_install.exe Install: wine dominions2demo_install.exe Run: wine dom2demo.exe (from c:\Program Files\dominions2demo\) Error Output on Install fixme:shell:Stream_WriteLocationInfo writing empty location info err:menubuilder:InvokeShellLinker failed to extract icon. fixme:shell:Stream_WriteLocationInfo writing empty location info err:menubuilder:InvokeShellLinker failed to extract icon. Error Output on Run fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x4039e290)->(00000000,00000008) fixme:msvcrt:MSVCRT_signal (2 0x1001ba80):stub fixme:msvcrt:MSVCRT_signal (2 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (15 0x1001ba80):stub fixme:msvcrt:MSVCRT_signal (15 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (11 0x100185a0):stub fixme:msvcrt:MSVCRT_signal (11 0xffffffff):stub fixme:msvcrt:MSVCRT_signal (8 0x100185a0):stub fixme:msvcrt:MSVCRT_signal (8 0xffffffff):stub fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 800x600) fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_PRIORITY not fully supported err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=C5,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) err:keyboard:X11DRV_ToUnicodeEx Please report: no char for keysym 0000 (No Name) : err:keyboard:X11DRV_ToUnicodeEx (virtKey=0,scanCode=D0,keycode=8,state=10) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6696) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6692) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6692) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6692) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6692) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6692) fixme:dsound:DSOUND_MixOne problem with underrun detection (mixlen=4096 < primary_done=6204) Austerlitz for Windows -------------------- - Installer was a self-extracting zip file and unzipped without incident - new install fixme however - On run, crash. Had to reboot computer to recover video settings. - No noticable change over Wine-20031212 File: http://www.breakawaygames.com/downloads/austerlitz_demo.exe Install: wine austerlitz_demo.exe Run: wine AusterlitzDemo.exe (from unzipped directory) Error Output on Install fixme:font:WineEngCreateFontInstance just using first face for now ... (repeat many many times) Error Output On Run fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x403fe8d0)->(00010021,00000011) fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 800x600) fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 800x600) fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_PRIORITY not fully supported err:mmio:MMIO_ParseExtA + but no . in szFileName: "sounds\\french fanfare + perc.wav" fixme:cursor:CURSORICON_SimulateLoadingFromResourceW Animated icons not correctly implemented! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon entry found! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon size ok. offset=0x4754004c fixme:cursor:CURSORICON_SimulateLoadingFromResourceW Animated icons not correctly implemented! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon entry found! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon size ok. offset=0x47540064 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW Animated icons not correctly implemented! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon entry found! 0x47540000 fixme:cursor:CURSORICON_SimulateLoadingFromResourceW icon size ok. offset=0x475400a4 wine: Unhandled exception (thread 000e), starting debugger... WineDbg starting on pid 8 Loaded debug information from ELF 'wine' ((nil)) No debug information in 32bit DLL 'F:\Desktop\Files\Downloads\Austerlitz Demo - Win\E\AusterlitzDemo.exe' (0x400000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\NTDLL.DLL' (0x40200000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\KERNEL32.DLL' (0x40490000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\ADVAPI32.DLL' (0x408c0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\GDI32.DLL' (0x40a30000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\USER32.DLL' (0x40900000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\RPCRT4.DLL' (0x40ab0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\OLE32.DLL' (0x40860000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\DDRAW.DLL' (0x406e0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINMM.DLL' (0x40b30000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\DPLAYX.DLL' (0x40b00000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\COMCTL32.DLL' (0x40bc0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\LZ32.DLL' (0x40c70000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\VERSION.DLL' (0x40c50000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MSVFW32.DLL' (0x40b90000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\X11DRV.DLL' (0x40d40000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\IMM32.DLL' (0x40e50000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINEOSS.DRV' (0x45790000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MSACM32.DLL' (0x457d0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MSACM.DRV' (0x457c0000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\MIDIMAP.DRV' (0x45910000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\DSOUND.DLL' (0x46920000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\WINSPOOL.DRV' (0x46960000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHLWAPI.DLL' (0x46a90000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHELL32.DLL' (0x46a10000) No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\COMDLG32.DLL' (0x46990000) No debug information in 32bit DLL 'F:\DESKTOP\FILES\DOWNLOADS\AUSTERLITZ DEMO - WIN\E\BAGSOUND.DLL' (0x10000000) No debug information in 32bit DLL 'F:\DESKTOP\FILES\DOWNLOADS\AUSTERLITZ DEMO - WIN\E\BAGLOAD.DLL' (0x46ef2000) Unhandled exception: page fault on write access to 0x47720000 in 32-bit code (0x00511033). In 32-bit mode. 0x00511033 (AusterlitzDemo.exe.EntryPoint+0x3ed in AusterlitzDemo.exe): repe movsl (%esi),%es:(%edi) Remote Assult ------------------- - Installation appeared successful - On run, graphics had refresh errors and the kde kicker bar was visible over the full-screen view. - Mouse behaved better, but otherwise no noticable improvement over Wine-20031212 File: http://www.shrapnelgames.com/downloads/rad50.exe Install: wine rad50.exe Run: wine ra.exe (from install directory) Error Output On Install: fixme:ntdll:NtQueryInformationToken (0x44,2,(nil),0,0x406cebe4): stub fixme:ntdll:NtQueryInformationToken (0x44,2,0x406cebc8,12,0x406cebe4): stub fixme:ntdll:NtQueryInformationToken (0x58,2,(nil),0,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x58,2,0x406ced20,12,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x64,2,(nil),0,0x406ce584): stub fixme:ntdll:NtQueryInformationToken (0x64,2,0x406ce568,12,0x406ce584): stub fixme:ntdll:NtQueryInformationToken (0x68,2,(nil),0,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x68,2,0x406ced20,12,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x6c,2,(nil),0,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x6c,2,0x406ced20,12,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x70,2,(nil),0,0x406ced3c): stub fixme:ntdll:NtQueryInformationToken (0x70,2,0x406ced20,12,0x406ced3c): stub fixme:shell:Stream_WriteLocationInfo writing empty location info fixme:shell:Stream_WriteLocationInfo writing empty location info fixme:shell:Stream_WriteLocationInfo writing empty location info fixme:shell:Stream_WriteLocationInfo writing empty location info err:menubuilder:WinMain failed to build menu item for C\Shrapnel Games\Remote Assault\ShrapnelGames Web site.lnk fixme:shell:Stream_WriteLocationInfo writing empty location info err:menubuilder:WinMain failed to build menu item for C\Shrapnel Games\Remote Assault\OneGames Web site.lnk fixme:ntdll:NtQueryInformationToken (0x74,2,(nil),0,0x406ce390): stub fixme:ntdll:NtQueryInformationToken (0x74,2,0x406ce374,12,0x406ce390): stub fixme:ntdll:NtQueryInformationToken (0x7c,2,(nil),0,0x406cf3e0): stub fixme:ntdll:NtQueryInformationToken (0x7c,2,0x406cf3c4,12,0x406cf3e0): stub fixme:ntdll:NtQueryInformationToken (0x80,2,(nil),0,0x406cf3e0): stub fixme:ntdll:NtQueryInformationToken (0x80,2,0x406cf3c4,12,0x406cf3e0): stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub fixme:heap:RtlCompactHeap stub Error Output on Run: fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_EXCLUSIVE not fully supported fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x45fd6028)->(00010021,00000011) fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 640x480) err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_LINEPATTERN (0000000a) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_MONOENABLE (0000000b) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_ROP2 (0000000c) value : 0000000d ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_PLANEMASK(0000000d) value : ffffffff ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_LASTPIXEL(00000010) value : 00000001 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_ZVISIBLE (0000001e) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_EDGEANTIALIAS (00000028) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_RANGEFOGENABLE (00000030) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_EXTENTS (0000008a) value : 00000000 ! err:ddraw:set_render_state Unhandled dwRenderStateType D3DRENDERSTATE_VERTEXBLEND (00000097) value : 00000000 ! err:ddraw:set_render_state Unhandled texture mag 6 ! err:ddraw:set_render_state Unhandled texture min 6 ! err:ddraw:GL_IDirect3DTextureImpl_2_1T_Load Trying to load surfaces with different mip-map counts ! err:ddraw:GL_IDirect3DTextureImpl_2_1T_Load Loading surface with different mipmap structure !!! fixme:bitblt:X11DRV_BitBlt potential optimization - client-side DIB copy ... (repeat last 3 a lot) err:ddraw:Main_DirectDrawSurface_Lock Invalid values in LPRECT !!! ... (repeat ~20 times) fixme:winmm:MMDRV_Exit Closing while ll-driver open The War Engine ------------------- - Installation run without issue - new install fixme's however - On run, graphics had refresh errors and the kde kicker bar was visible over the full-screen view - Mouse did not appear to work correctly. - Several shell fixme's disappeared in Error Output on Run, but no functional difference was noted over Wine-20031212 File: http://www.shrapnelgames.com/downloads/TWEDemo.exe Install: wine TWEDemo.exe Run: wine TheWarEngineDemo.exe (from install directory) Error Output On Install fixme:font:WineEngCreateFontInstance just using first face for now ... (repeat a lot) fixme:seh:check_resource_write Broken app is writing to the resource data, enabling work-around fixme:ntdll:NtQueryInformationToken (0x58,2,(nil),0,0x406cec28): stub fixme:ntdll:NtQueryInformationToken (0x58,2,0x406cec14,12,0x406cec28): stub fixme:ntdll:NtQueryInformationToken (0x70,2,(nil),0,0x406ce5d0): stub fixme:ntdll:NtQueryInformationToken (0x70,2,0x406ce5bc,12,0x406ce5d0): stub fixme:ntdll:NtQueryInformationToken (0x74,2,(nil),0,0x406ce3e0): stub fixme:ntdll:NtQueryInformationToken (0x74,2,0x406ce3cc,12,0x406ce3e0): stub fixme:ntdll:NtQueryInformationToken (0x78,2,(nil),0,0x406cf304): stub fixme:ntdll:NtQueryInformationToken (0x78,2,0x406cf2f0,12,0x406cf304): stub fixme:ntdll:NtQueryInformationToken (0x7c,2,(nil),0,0x406cf304): stub fixme:ntdll:NtQueryInformationToken (0x7c,2,0x406cf2f0,12,0x406cf304): stub fixme:ntdll:NtQueryInformationToken (0x80,2,(nil),0,0x406cf304): stub fixme:ntdll:NtQueryInformationToken (0x80,2,0x406cf2f0,12,0x406cf304): stub fixme:ole:CoCreateInstance no classfactory created for CLSID {fbf23b40-e3f0-101b-8488-00aa003e56f8}, hres is 0x80040154 fixme:shell:Stream_WriteLocationInfo writing empty location info ... (repeat 5 times) Error Output On Run fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (0x40394e18)->(00010023,00000051) fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 800x600) fixme:xrandr:X11DRV_XRandR_SetCurrentMode Need to update SYSMETRICS after resizing display (now 800x600) fixme:ddraw:DIB_DirectDrawSurface_Blt dwFlags DDBLT_WAIT and/or DDBLT_ASYNC: can't handle right now. fixme:dsound:IDirectSoundImpl_SetCooperativeLevel level=DSSCL_PRIORITY not fully supported

2 1

porting a keyboard driver
by saravanan 27 Jan '04

27 Jan '04

Hi all, I would liketo know is it possible to port a Malayalam(An Indian Language) keyboard driver written for Windows to Linux using any softwares(emulators). The keyboard driver application could be called using wine. It's running & is found be working partially in the wordpad application called using wine. Is it possible to make it work in Linux editors. Do anybody have any idea. Thanks in advance for your kind replys. Saravanan ______________________________________ Scanned and protected by Email scanner

1 0

Re: The part of AlphaBlend in msimg32.dll is now coded.
by Alexandre Julliard 27 Jan '04

27 Jan '04

taro-x(a)justsystem.co.jp writes: > The part of AlphaBlend in msimg32.dll is now coded. > > Changelog: > > * dlls/gdi/driver.c, dlls/gdi/gdi32.spec, > * dlls/gdi/enhmfdrv/init.c, dlls/gdi/mfdrv/init.c, > * dlls/msimg32/msimg32.spec, dlls/msimg32/msimg32_main.c, > * dlls/x11drv/bitblt.c, dlls/x11drv/x11drv.spec, > * include/gdi.h, include/wingdi.h, graphics/painting.c > > The part of AlphaBlend() in msimg32.dll is now coded. This is making incorrect assumptions about the image format. You have to use the X image RGB masks into account to extract the color components. -- Alexandre Julliard julliard(a)winehq.com

1 0

Wine history draft
by Brian Vincent (C) 27 Jan '04

27 Jan '04

I put together the following: http://users.theshell.com/~vinn/wine-history.html There's two major additions I'd like to see and I don't think I'm capable of doing them: 1) Wine history from 1994 - 1999 with a specific emphasis on changes to the architecture, design decisions that got discarded, developers who've come and gone. 2) Specific quotes from over the years. I sort of put some examples of that in the document above. Humorous quotes would be especially nice. If no one has any suggestions then I'll likely just remove the existing ones and add the information to the relevant paragraphs. I'm also thinking of adding a paragraph on the tools and programs developed for Wine. Comments / suggestions / criticisms? --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

4 3

wine/arts won't build with arts > 1.1.90
by sean 27 Jan '04

27 Jan '04

artsc-config in arts > 1.1.90 has: --cflags) flags="$flags -I$includedir/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include " When you try to build Wine this gives an error in winearts: make[2]: Entering directory `/usr/src/redhat/BUILD/wine-20040121/dlls/winmm/winearts' ../../../tools/makedep -I. -I. -I../../../include -I../../../include -I/usr/include/kde/artsc -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -C. arts.c audio.c Unknown option '-pthread' I've worked around it by changing artsc-config, but It seems a better fix is needed. sean

1 0

16bit app calls wineps.drv, but wine has wineps.dll (missing alias?)
by ceztko＠libero.it 26 Jan '04

26 Jan '04

I have a 16 bit app that have a older printer initialization mechanism: it loads the printer driver reading its name from win.ini,adding ".DRV" to it. This is a problem, cause the builtin postscript driver is called wineps.dll in wine, and the apps quits with the VB Error (482 run-time error: Printer error). I tryed to fix this making synlinks to wineps.dll.so in /etc/lib/wine/lib/wine, but the problem remains. The debug output doesn't need comments: err:module:NE_LoadBuiltinModule loaded .so but dll wineps.drv still not found I verifyed this using a similar configuration in a real windows installation (renaming printerdriver.drv to .dll, leaving "printerdriver" with no ext in win.ini). In this way, the app quits with the same error. I'm sure the app is NOT calling registry to get the printer configuration (monitored it wit regmon) There are other 2 old threads with similar (read indentical) problem: http://www.winehq.org/hypermail/wine-users/2001/04/0515.html http://www.winehq.org/hypermail/wine-devel/2001/04/0164.html, but no resolution is proposed. I supposed is missing the alias wineps.drv --> wineps.dll, similarly wineps16.drv --> wineps.dll. Someone told me symlinks in /usr/lib/wine/lib/wine should work....but... This is what i have done: -rw-r--r-- 1 root root 1815919 Jan 26 00:14 wineps.dll.so lrwxrwxrwx 1 root root 13 Jan 26 19:06 wineps.drv.so -> wineps.dll.so lrwxrwxrwx 1 root root 13 Jan 26 19:07 wineps16.dll.so -> wineps.dll.so lrwxrwxrwx 1 root root 13 Jan 26 00:14 wineps16.drv.so -> wineps.dll.so The error and debugmsg are the same. I suppose (and hope..) wine loader manages alias in a different way. Thanks! P.S.: i also post this at bugzilla, http://bugs.winehq.org/show_bug.cgi?id=1967 Not sure it's a real bug, anyway..

2 1

Strange debug message in programs/winedbg/info.c
by Sami Aario 26 Jan '04

26 Jan '04

Hi, The debugger kept messing up my output because of a missing newline. This patch fixes that. However, the condition checks for first_dll, but the output says first_option. They can't both be right. So which one should it be?

2 2

RE: Lotus Notes broken in recent CVS
by Paul R Streitman 26 Jan '04

26 Jan '04

I tested the patches by taking an 01/03 CVS snapshot and replacing the relevant parts from an 01/02 snapshot rather than trying to un-patch the files. Using that technique, I found that the changes in patch 10547 (which required patch 10552 to compile) cause the problem that I am seeing with Lotus Notes. That problem still occurs with current CVS. Thanks, Paul z/OS core components development Internet: prs(a)us.ibm.com ----- Forwarded by Paul R Streitman/Poughkeepsie/IBM on 01/26/04 02:32 PM ----- "Robert Shearman" <R.J.Shearman@war To: Paul R Streitman/Poughkeepsie/IBM@IBMUS wick.ac.uk> cc: <wine-devel(a)winehq.org> Subject: RE: Lotus Notes broken in recent CVS 01/23/04 08:10 PM > Through iterative CVS pulls, I have established that the problem > I see with > Lotus Notes not working occurred between 01/02/2004 and 01/03/2004. I had > thought that the problem came up only in the last week, but I must have > been mistaken. The 01/03 CVS snapshot gives the symptoms that I mentioned > before (appended below), and I was able to send this note with the 01/02 > snapshot. As a wild guess, try backing out these patches in order, testing after each one: 1. http://cvs.winehq.com/patch.py?id=10552 2. http://cvs.winehq.com/patch.py?id=10547 3. http://cvs.winehq.com/patch.py?id=10546 Rob

2 1

imm32 ImmDisableIME stub concern
by Jason Edmeades 26 Jan '04

26 Jan '04

Hello, Debugging a game, it crashes because it calls a currently unimplemented function, ImmDisableIME. Ordinarily this wouldnt be worrying, and I could stub it (which i have). The game gets far further now, and displays a blank screen and corrupt graphics, rather than just terminating. :-) However, looking at a history of the IMM32 spec file, it was added (version 1.10) and removed (version 1.11). Has anyone any idea why, and would anyone have any strong objections to me re-stubbing it? Jason

2 2

Re: Various MDI fixes
by Rein Klazes 26 Jan '04

26 Jan '04

On Mon, 26 Jan 2004 16:56:59 +0800, you wrote: > > Hello, > > I didn't break this patch into smaller parts. I think the changes > are self explaining enough and quite straightforward. > > This patch fixes a bug with MDI menus reported by Duane Clark and > a couple of other minor problems I found while debugging that issue > (a not working system menu in a maximized child is a more noticeable one). > > Please apply this patch after the WM_MDISETMENU/WM_MDIREFRESHMENU fix > for Visio. Dmitry, After applying the two patches there is a new problem (with Agent 2.0 beta). I'm using it with maximized mdi windows. If I open another window, it opens maximized (as it should). Now if I return to the original window, either by closing the current one (with the X button, or <ctrl>-F4) or selecting it (<ctrl>-TAB or the Window-menu using <alt>-W,1) the size of the original window is now <restored> and needs to be maximized again. Any idea? Rein. -- Rein Klazes rklazes(a)xs4all.nl

2 1

NtSetThreadExecutionState
by Fabian Cenedese 26 Jan '04

26 Jan '04

Hi (Message bounced the first so I try again.) ----- The following addresses had permanent fatal errors ----- "|spamscan /var/lib/mailman/mail/wrapper-hq post wine-devel" (reason: User unknown) (expanded from: <wine-devel(a)winehq.org>) ----- Transcript of session follows ----- 550 5.1.1 "|spamscan /var/lib/mailman/mail/wrapper-hq post wine-devel"... User unknown Reporting-MTA: dns; wine.codeweavers.com Received-From-MTA: DNS; mxout.hispeed.ch Arrival-Date: Mon, 26 Jan 2004 07:53:28 -0600 I'm trying to run the Windows xcopy (no, don't ask :) It needs two more dlls (ulib.dll, ifsutil.dll) and then is almost happy. The only thing left it complains about is this: err:module:import_dll No implementation for ntdll.dll.NtSetThreadExecutionState imported from L"C:\\windows\\system\\ifsutil.dll", setting to 0xdeadbeef Can anybody help me with a stub? Maybe this gets things further. Thanks bye Fabi

1 0

Wrong LANG message
by Fabian Cenedese 26 Jan '04

26 Jan '04

Hi When I start wine I always get a message about several possible language ids and that I need to set LANG to the specific sub id. But even after that I still get this message. I need to set LANGUAGE to the sub id, then wine keeps quiet. So either my setup is quite wrong or this message needs to be changed to set LANGUAGE. Thanks bye Fabi

1 0

Wine in gdb brokenness
by Mike Hearn 26 Jan '04

26 Jan '04

Hi, Running wine in gdb appears to be broken with latest CVS: (gdb) file wine Reading symbols from wine...done. Using host libthread_db library "/lib/tls/libthread_db.so.1". (gdb) run Starting program: /opt/wine/bin/wine wine [Thread debugging using libthread_db enabled] [New Thread -1084455552 (LWP 30661)] [New Thread -1084458064 (LWP 30662)] Cannot find user-level thread for LWP 30661: generic error This is on fedora core 1. It looks like it might be the NPTL runtime detection stuff, does anybody have any ideas?

3 2

Re: wine/dlls x11drv/x11drv_main.c x11drv/x11drv.s ...
by Dmitry Timoshkov 26 Jan '04

26 Jan '04

"Alexandre Julliard" <julliard(a)winehq.org> wrote: > Log message: > Aric Stewart <aric(a)codeweavers.com> > Use X11 XIM callbacks to enable full IME support. > Correct some timing issues with XIM input. > Start to provide the framework for the MSIME messages. > langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); > if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) > - layout |= 0xe001 << 16; /* FIXME */ > + layout = 0xe001 << 16; /* FIXME */ The above change looks wrong. This thrashes low 16 bits of layout id. Moreover, 0xe001 was added already in the global keyboard table list for Japanese kbd layout (btw, why not for Chinese and Korean?). -- Dmitry.

2 2

An MDI regression
by Duane Clark 26 Jan '04

26 Jan '04

A minor regression in the MDI code. I am not sure which patch it was, but it is something in the last couple of weeks. Open most any MDI application (I've tried 3) including Pegasus mail. Maximize one of the windows, and take a look at the menus. Even better, after doing that, drag the entire application to a different size. The effect is rather impressive.

2 1

Re: New Open Source License: Single Supplier Open Source License
by Ivan Leo Murray-Smith 25 Jan '04

25 Jan '04

> The problem with [L]GPL and BSD is that if someone does not turn in their changes then the developer has no recourse to > enforce the requirment. Under this license they can. > Under GPL and BSD the developer has absoutely no control or means to keep their work an open source because they > cannot remove distribution from people who don't comply. Sorry for the language but this is pure bullshit. The Free Software Foundation has enforced the GPL many times, forcing proprietary vendors to GPL the code of works deviated from GPL'ed code, and has always reached a settlement before getting to court, that shows how good the GPL is. > I am trying to make it possible for people to earn a living as Open Source developers. I am also making it possible for > companies that do Open Source development as their primary activiey to provide jobs to those (like those on this list) > who invest their time into Open Source products. IMHO you're quite confused, and don't have a good idea about what open source is all about. You license closely remembers the shared source license. Ivan.

2 1

Fwd: [Bug 1952] half-life, unreal tournament: video runs too 1.5x too fast
by hatky 25 Jan '04

25 Jan '04

Sound like a valid claim that wine does not update the cpu speed on speed step speed change.... ---------- Forwarded Message ---------- Subject: [Bug 1952] half-life, unreal tournament: video runs too 1.5x too fast Date: Saturday 24 January 2004 20:30 From: Wine Bugs <wine-bugs(a)winehq.org> To: wine-bugs(a)winehq.org http://bugs.winehq.org/show_bug.cgi?id=1952 lesha(a)netman.ru changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |UNCONFIRMED Resolution|FIXED | ------- Additional Comments From lesha(a)netman.ru 2004-24-01 14:30 ------- I finally know exactly what was going on. Someone knowledgeable needs to decide if this is a problem Wine should fix. My laptop has SpeedStep, and if you power it up without AC power, it will boot in 1200 Mhz, and /proc/cpuinfo will list 1200 mhz. Turning on AC power switches back to 1700Mhz (or manual acpi adjustments). However, /proc/cpuinfo reflects only 1200. Wine apparently uses CPU cycles for timing (IMO, a lousy idea). Thus, when I had gone through power up without AC, later switched to AC, Wine thinks that my Mhz rating is lower than it is, and I get a speed increase of 42%. If I now use ACPI to reconfigure as 1200 Mhz, I end up with normal speeds again. So, really, ACPI could be considered at fault for not updating cpuinfo. But maybe /proc/cpuinfo isn't even the right place to read this information. Or at least, maybe one shouldn't rely on reported MHz for timing. For instance, the native shooters (Prboom, Quake3) don't mind at all if I switch the CPU frequency mid-game. Opinions? -- Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. ------------------------------------------------------- -- Hatky. Hebrew tranlator of http://www.mandrakelinux.com/he/ Helper of http://www.phpnuke-israel.org Worshiper of http://www.winehq.org

1 0

Re: Winedbg: Parse symbols in libc, libpthread, etc
by Eric Pouech 25 Jan '04

25 Jan '04

Robert Shearman a écrit : > Hi, > > This patch allows winedbg to parse symbols in libraries directly linked > to the wine binaries, like libc and libpthread. This will usually mean > just using the symbol table, but this is better than nothing. Hi Robert I don't understand why you need to walk the shared object (from lm.l_ld)? Normally, all loaded shared object will appear in the main module loaded linked list, so we should only need to walk that list. The rest of the patch is correct (I'm currently working on fixing some of the issues of the debugger: get around WINELOADER issue, report unsupported debug format (like Dwarf2...)). A+

2 2

Re: shell32 patch 20
by Rolf Kalbermatter 25 Jan '04

25 Jan '04

"Dmitry Timoshkov" <dmitry(a)baikal.ru> >"Martin Fuchs" <martin-fuchs(a)gmx.net> wrote: > >> > > Changelog: >> > > - don't link directly to NTDLL; use MultiByteToWideChar() instead of >> > RtlCreateUnicodeStringFromAsciiz() >> > >> > Why do you need that? >> >> RtlCreateUnicodeStringFromAsciiz() is neither present in MinGW nor in PSDK. > >That doesn't justify the change IMO. There are lots of places in Wine >using that construct, and it's much more convenient and avoids code >duplication (with a possibility of adding bugs in even such a simple >case). I was under the impression that it was desirable to cross compile as many dlls as possible in different environments. shell32 has currently only a few reasons why it can't be compiled and linked in Visual C and I think it is a good idea to improve on that. This of course isn't any reason but maybe an indication: native shell32 does not import RtlCreateUnicodeStringFromAsciiz() either. Rolf Kalbermatter CIT Engineering Nederland BV tel: +31 (070) 415 9190 Treubstraat 7H fax: +31 (070) 415 9191 2288 EG Rijswijk http://www.citengineering.com Netherlands mailto:rolf.kalbermatter@citeng.com

3 4

New Open Source License: Single Supplier Open Source License
by Richard Schilling 25 Jan '04

25 Jan '04

I would like to present to you all a new Open Source software license I've written up. It's called the Single Supplier Open Source License. I will be distributing software under this license as well as the traditional Open Source licenses found at opensource.org. You can see a copy of the license and its associated FAQ at http://www.rsmba.biz/licenses . A link on the homepage at rsmba.biz will also direct you there. I will also be working directly with opensource.org to address any issues they have with the license wording. The license has the following features: # Users have freely available access to source code, documentation just like the GPL. # Users may use, modify, and install the software on as many computers as they want within their organization. # Any changes made by the user and others get contributed back into the base product # The developer's right to control who provides services using the product is protected. # The developer's right to control who can distribute the software is protected. # The developer has complete control over the product forking. # The developer and all contributors retain copyright of their individual works. # The software is always downloaded from the same place by the end user even if it's used as part of a larger product, protecting the quality of the software. Please feel free to contact me on or off list about this announcement. Richard Schilling

5 8

Re: New Open Source License: Single Supplier Open Source License
by Brian Vincent (C) 25 Jan '04

25 Jan '04

Please take the discussion over to wine-license @ winehq.com --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

1 0

Re: INI File Processing Improvements
by Dmitry Timoshkov 25 Jan '04

25 Jan '04

"Robert Shearman" <R.J.Shearman(a)warwick.ac.uk> wrote: > Changelog: > - Use Win32 instead of Unix file functions > - Process files fully in Unicode > - Add Unicode file detection Further concerns: 1. You are duplicating too much unicode helpers already existing in wine_unicode and include/wine/unicode.h 2. Are you sure that Windows supports unicode .ini files at all? -- Dmitry.

2 4

Re: INI File Processing Improvements
by Dmitry Timoshkov 25 Jan '04

25 Jan '04

"Robert Shearman" <R.J.Shearman(a)warwick.ac.uk> wrote: > - Add Unicode file detection > +static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer) > +{ > + if (!memcmp(buffer, bom_utf8, sizeof(bom_utf8)/sizeof(bom_utf8[0]))) > + return ENCODING_UTF8; > + if (*(WCHAR*)buffer == BOM_UTF16LE) > + return ENCODING_UTF16LE; > + if (*(WCHAR*)buffer == BOM_UTF16BE) > + return ENCODING_UTF16BE; > + if (*(DWORD*)buffer == BOM_UTF32LE) > + return ENCODING_UTF32LE; > + if (*(DWORD*)buffer == BOM_UTF32BE) > + return ENCODING_UTF32BE; > + return ENCODING_ANSI; > +} Why not simply use IsTextUnicode/RtlIsTextUnicode and fix it if necessary? -- Dmitry.

2 4

Re: uxtheme Prevent segfault if no theme is set
by Robert Shearman 25 Jan '04

25 Jan '04

> > This follows the same lines, in some cases > MSSTYLES_SetActiveTheme would return success when in fact it failed > Apply on top of Vitaliy's patch > > Changelog: > Ensure MSSTYLES_SetActiveTheme fails when theme fails to load ... > invalid_theme: > if(hTheme) FreeLibrary(hTheme); > - if(!hr) hr = HRESULT_FROM_WIN32(GetLastError()); > + if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(GetLastError()); > + if(SUCCEEDED(hr)) hr = E_FAIL; > return hr; You shouldn't be doing this in the first place. As you have seen, at best you will set hr to a random error and at worst it won't be set at all and you need your hack to make it still work. What you should be doing is setting hr to the correct error as soon as you detect a failure. So after a Win32 call: if (callfailed) { hr = HRESULT_FROM_WIN32(GetLastError()); goto invalid_theme; } or after another type of failure: if (somethingnotquiteright) { hr = E_FAIL; goto invalid_theme; } Also, please try to use a more descriptive code than E_FAIL if one exists. Rob

1 0

Sound disappears after few seconds
by Vitaliy Margolen 25 Jan '04

25 Jan '04

After last number of patches to sound drivers I'm having problems with sound. Unfortunately I haven't spotted when exactly did that happened. Here is what the problem is: - When using AIM, yes, windows AIM - there are nothing else I could find that exists on both Windows and Linux and has "Talk" feature. - After 5 - 10 seconds sound stops working. Recording works fine, but playback stops completely. - Tested with oss, alsa and arts. Problem exists in all of them or in something common between them. - If I don't use record, just play some sound - no problem. - Needless to say this used to work before. Any suggestions? -- Best regards, Vitaliy

1 1

Re: New Open Source License: Single Supplier Open Source License
by Tom 25 Jan '04

25 Jan '04

From: Cordula's Web (cpghost_at_cordula.ws) > # Any changes made by the user and others get contributed back into the base product This is the main difference between BSD and GPL, and you're using the GPL model here. This is exacly what would prevent commercial vendors from adopting this license. But, okay. Hi, Maybe i've misread your re-ply.. do you care to elaborate why the GPL, LGPL woul'd "prevent commercial vendors from adopting this license." Like I said before maybe ive made a mistake. Regards, Tom

1 0

Re: LockResource16 in ole32.dll
by Ge van Geldorp 25 Jan '04

25 Jan '04

> From: Dmitry Timoshkov > > "Casper Hornstrup" <chorns(a)users.sourceforge.net> wrote: > > > I would like to have the call to the Win16 API LockResource16 removed > > from ole32.dll. I guess there is a reason for it being LockResource16 > > and not LockResource. What is the reason? > > Because LoadAcceleratorsA/W returns a value allocated by GlobalAlloc16. > > > How can the call be removed? > > Only if you or someone else can prove that under real windows > LoadAcceleratorsA/W behaves differently (taking into account Win9x > weirdness). Would the attached patch be an acceptable solution? Basically it does a GetProcAddress on LockResource16 and uses it if found (Wine case). If it's not found, it uses LockResource(). Ge van Geldorp. Index: dlls/ole32/ole2.c =================================================================== RCS file: /home/wine/wine/dlls/ole32/ole2.c,v retrieving revision 1.48 diff -u -r1.48 ole2.c --- dlls/ole32/ole2.c 8 Dec 2003 22:46:08 -0000 1.48 +++ dlls/ole32/ole2.c 23 Jan 2004 14:17:06 -0000 @@ -1422,9 +1422,34 @@ /* YES, Accel16! */ LPACCEL16 lpAccelTbl; int i; + HMODULE Kernel32; + LPVOID (WINAPI *LockResource16Ptr)(HGLOBAL16 ResData); if(!lpMsg) return FALSE; - if (!hAccel || !(lpAccelTbl = (LPACCEL16)LockResource16(HACCEL_16(hAccel)))) + if (!hAccel) + { + WARN_(accel)("NULL accel handle\n"); + return FALSE; + } + Kernel32 = GetModuleHandleA("kernel32.dll"); + if (NULL != Kernel32) + { + LockResource16Ptr = (LPVOID (WINAPI *)(HGLOBAL16)) + GetProcAddress(Kernel32, "LockResource16"); + } + else + { + LockResource16Ptr = NULL; + } + if (NULL != LockResource16Ptr) + { + lpAccelTbl = (LPACCEL16) LockResource16Ptr(HACCEL_16(hAccel)); + } + else + { + lpAccelTbl = (LPACCEL16) LockResource(hAccel); + } + if (NULL == lpAccelTbl) { WARN_(accel)("invalid accel handle=%p\n", hAccel); return FALSE;

3 8

Re: shell32 patch 20
by Dmitry Timoshkov 25 Jan '04

25 Jan '04

"Martin Fuchs" <martin-fuchs(a)gmx.net> wrote: > Changelog: > - don't link directly to NTDLL; use MultiByteToWideChar() instead of RtlCreateUnicodeStringFromAsciiz() Why do you need that? -- Dmitry.

3 4

Still trying to get Wine running with kernel 2.6
by Thomas Brix Larsen 25 Jan '04

25 Jan '04

Hi list, I'm still trying to get Wine running with kernel 2.6. I've finally got Wine built (OpenGL header prob.), but now it says this about files that Wine could run before my switch to 2.6: $ wine machine.exe: Warning: Language '' was not recognized, defaulting to English. err:module:map_image Could not map section .text, file probably truncated wine: could not load L"G:\\Corp\\machine.exe" as Win32 binary The only program (Skype) I have which actually starts (or well, almost starts) displays a msgbox: Exception EAccessViolation in module uxtheme.dll at 000063BE. Acess violation at adress 427963BE in module 'uxtheme.dll'. Write of adress 00000000. Any help? -- Thomas Brix Larsen <killar(a)get2net.dk>

2 2

Re: New Open Source License: Single Supplier Open Source License
by Ivan Leo Murray-Smith 24 Jan '04

24 Jan '04

> Do we have any recource against him? We could blacklist his email address from our mailing lists. Ivan.

1 0

Re: x11drv
by Alex Pasadyn 24 Jan '04

24 Jan '04

RemiAssailly(a)aol.com wrote: > Well I explain in more details. > When I launched wine it writed: > err:x11settings:X11DRV_ChangeDisplaySettingsExW No matching mode found! > (NoRes) > err:x11settings:X11DRV_ChangeDisplaySettingsExW No matching mode found! > (NoRes) > And StarCraft told me that it was unable to change graphic mode. The (NoRes) in there means that resolution changing is disabled in the config file or failed to initialize (if the latter there would be other log messages farther back). Try enabling XRandR or XF86VidMode in the config file or running Wine in desktop mode. -ajp

1 0

DeviceIoControl Unimplemented control 256 for VxD device NWLINK
by MediaHost (TM) 24 Jan '04

24 Jan '04

Hi, Can anybody tell me, what's this device NWLINK should be? A search in google did not solve anything.... I suspect some leftovers from a imported registry file. Fixing that (whatever it is, probably NET device??) the app will work... trace:loaddll:load_dll Loaded module L"ws2_32.dll" : builtin trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\NETAPI32.DLL" : builtin fixme:file:DeviceIoControl Unimplemented control 256 for VxD device NWLINK trace:loaddll:load_dll Loaded module L"dsound.dll" : builtin wine: Unhandled exception (thread 000c), starting debugger... trace:loaddll:load_dll Loaded module L"C:\\WINDOWS\\SYSTEM\\advapi32.dll" : built Regards Signer: Eddy Nigg Company: StartCom Group at http://www.startcom.org MediaHostT at http://www.mediahost.org --- StartCom Ltd. http://www.startcom.org Outgoing mail is certified Virus Free. Checked by AVG anti-virus system (http://www.grisoft.com). Version: 6.0.563 / Virus Database: 355 - Release Date: 1/17/2004

3 5

virus on cvs mailing list
by Ivan Leo Murray-Smith 24 Jan '04

24 Jan '04

OK, I'm not sure it's a virus (Don't have a win box at the moment), but this emails should go in any case. http://www.winehq.com/hypermail/wine-cvs/2004/01/0319.html Ivan.

2 1

libs/wine/loader.c:wine_dll_get_owner and running 16 bit apps in-place
by Uwe Bonnes 24 Jan '04

24 Jan '04

Hallo, I didn't install wine, but run it in-place by giving the full path of the wine wrapper. Now I have a 16 bit application that doesn't find the dlls it wants to load. What happens is: - NE_LoadDLLs tries to laod CTL3DV2.DLL - wine_dll_get_owner resolves the symbolic link to ctl3d/ctl3d32.dll.so - and rejects is as it contains a slash With additinal debug output this looks like: fixme:module:NE_LoadDLLs BON: buffer "CTL3DV2.DLL" fixme:module:MODULE_LoadModule16 BON: dllname "ctl3dv2.dll" BON: readlink "/spare/wine/wine/dlls/ctl3dv2.dll.so" returned 20 errno 0"Success" BON: readlink "ctl3d/ctl3d32.dll.so" ^ Commenting out the clause that checks for a slash lets the application proceed. What's the correct solution for this problem? Thanks -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

Re: x11drv
by Dmitry Timoshkov 24 Jan '04

24 Jan '04

<RemiAssailly(a)aol.com> wrote: > I had the following problem : I could not resize my screen and it was unable > to play StarCraft and Red Alert ( I ). > So I modified dlls/x11drv/settings.c and I tested many possibilty and I have > corrected that. > Since I have modified it I can play StarCraft, Red Alert. > That's are the some of the softwares I use to test wine. The change in dlls/x11drv/keyboard.c has nothing to do with the explanation above and is really unnecessary, right? And as Andreas already has pointed out another part of the patch is wrong. -- Dmitry.

1 0

Re: x11drv
by Andreas Mohr 24 Jan '04

24 Jan '04

Hi, On Sat, Jan 24, 2004 at 09:29:14AM -0500, RemiAssailly(a)aol.com wrote: > diff -Nru a/dlls/x11drv/settings.c b/dlls/x11drv/settings.c > --- a/dlls/x11drv/settings.c 2003-10-16 00:21:42.000000000 +0000 > +++ b/dlls/x11drv/settings.c 2004-01-24 11:15:46.000000000 +0000 > @@ -242,7 +242,7 @@ > > TRACE("(%s,%p,%p,0x%08lx,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); > TRACE("flags=%s\n",_CDS_flags(flags)); > - if (devmode) > + if (devmode==NULL) > { > TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); > TRACE("width=%ld height=%ld bpp=%ld freq=%ld (%s)\n", Sorry, that's invalid from the very beginning, since we trace a devmode->dmFields when devmode is NULL. No way. :-\ Maybe it's useful to describe the problem in more detail? -- Microsoft prepares new round of .doc office format lock-in (just forget about OpenOffice/StarOffice .doc interoperability then, ok?) http://news.com.com/2100-1012_3-5069246.html

1 0

Debugging problem
by Andrew L. Bereson 24 Jan '04

24 Jan '04

I've got an application that is crashing in Wine and I am trying to debug it. However, I am runnign into a problem before I even get started... When I go into the debugger (winedbg) it complains that it cannot find "debug information" in any of the 32bit DLL's. Indeed, from within the debugger I cannot find nor break at any of the DLL functions... which is quite a drag. I'm sure there is some simple solution to this relted to a problem with my setup or the way I am running the debugger, but I can't figure it out. I have tried recompiling and reinstalling all of wine with the -g compiler option (seems reasonable, I suppose) but that doesn't solve it. I've told wine/configure to "--enable-debug", to no avail. I don;t know what I'm missing and I can't find any useful suggestions in any of the documentation or FAQ's (not that thtere is nothing useful... just I haven't yet found it, though I have looked) Any hints/help would be most appreciated. sample error message: No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\USER32.DLL' (0x40690000) -- Andrew L. Bereson bereson(a)sea-ware.com (800)307-5754

4 3

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