June 2004 - wine-devel

Support for IDvdInfo2::GetDiscID
by James Courtier-Dutton 25 Mar '05

25 Mar '05

The Windows api method uses the function call IDvdInfo2::GetDiscID http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/directx9_c… This returns a unique 64bit ID for a DVD. Has anyone found out what exactly it does to create this 64bit ID. It would be nice to get linux DVD players to be able to use the same method. Cheers James

2 2

text edit box not painting text ( on form startup )
by Doug Herbert 09 Mar '05

09 Mar '05

( I have posted a similiar question in wine-users, don't flame me for doing so, just thinking about this some more, perhaps it may be more a developer question ) Ok, I have a windows app, that runs under wine fine - not quite. This app has a form, with many text field edit boxes on. Quite often these edit boxes already have text values, ie. they are not empty - there is a database behind the form. Anyway, the form shows on the screen, but the text within the edit fields is invisible, until you activate each edit box component. When you leave one edit box to the next, the text remains visible. It seems like the repainting is not working, on initial startup of the form. As a way to debug this database app ( I don't have the source code for it ) I wrote a real basic form app in Visual Studio, with two edit boxes, with data in each. Now this basic app shows the text values immediately on startup. So there must be something different that the database app is not doing. I then ran wine using 'wine --debugmsg +edit programname' for both app's. I see both logging 'Creating ANSI edit control, style = xxxxx' but the style reference is different between apps - I am not sure if this the cause or not. The problem app reports style = 54011104 and the basic app shows style = 50010080. Can somebody explain what this style reference means and how do I force an app to use a certain style of edit box ? What other wine class debugmsg types should I use to narrow down the source of this problem ? Is there anyway I can check to see how the database app is repainting text within the text edit components ? Regards Doug Herbert. __________________________________ Do you Yahoo!? Yahoo! SiteBuilder - Free, easy-to-use web site design software http://sitebuilder.yahoo.com

3 4

Re: Wine on FreeBSD current
by Gerald Pfeifer 30 Oct '04

30 Oct '04

>> I'm just wondering if it is supposed to work as well as FreeBSD stable. Right now, Wine doesn't work at all on FreeBSD -STABLE: wine: failed to initialize: /swtest/wine/dlls/ntdll.dll.so: mmap of entire address space failed: Cannot allocate memory and before that I used to see deadlocks upon startup of non-trivial applications (such as Forte Agent, both 16bit and 32bit flavors). I believe there are also signficant threadings issues on -CURRENT, so overall Wine is hardly, if at all, usable on any version of FreeBSD I have access to, even though I'm still working to keep it at least compilable on FreeBSD 4.9 and 5.2/5.3. Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

6 13

Don't crash on failing DRIVER_FindFromHDrvr
by Uwe Bonnes 06 Sep '04

06 Sep '04

Hallo, I sent a patch to prevent wine from crashing last friday. It happend, when DRIVER_FindFromHDrvr returned NULL. No I found out, that I had sent that patch before last year. Eric answered > this doesn't seem right to me: either the loading fails and we shouldn't > get a valid handle, or it succeeds and we should be able to find it > there's must be something wrong elsewhere > could you please send a -debugmsg +driver,+module,+winmm to see what > happens ? and like before, I can't reproduce the error after reverting the patch: > the error no longer exists. I guess some registry entry was corrupt and a > successfull run corrected it later. > > However I see a lot of check after DRIVER_FindFromHDrvr() in other parts of > the code... If one dose "grep -3 DRIVER_FindFromHDrvr wine/dlls/winmm/*", every other usage of DRIVER_FindFromHDrvr is like if ((lpDrv = DRIVER_FindFromHDrvr(hDrvr)) != NULL) Why should expecting a NULL return be wrong? It happens, as the the crashes show. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

2 4

Wine bug with delphi Menus
by Robert van Herk 05 Sep '04

05 Sep '04

Hi people, I think I discovered a wine bug. In a delphi program, changing the visibility of a menuitem (TMenuItem) causes the whole menu of that form to stop working, when the program is run under Wine. Behind the screens, the setVisible of a menu item calls MenuChanged. This seems to put the menu in such a state that, in wine, all menu components stop doing anything. I've written a small application (455 kb EXE) to show what goes wrong. Would anybody be interested to help me in solving this bug? Would a message trace from Winsight (for example) be of any help? Greetings, Robert

2 1

Remote operations -- need for advice
by Alexander Yaworsky 27 Aug '04

27 Aug '04

I'm thinking how to implement CreateRemoteThread and besides fix memory management functions. The complete (afaik) list includes: RtlCreateUserThread NtAllocateVirtualMemory NtFreeVirtualMemory NtProtectVirtualMemory NtQueryVirtualMemory NtLockVirtualMemory (do nothing?) NtUnlockVirtualMemory (do nothing?) NtFlushVirtualMemory NtMapViewOfSection NtUnmapViewOfSection Suggested implementation. Let's add two groups of handlers to the wineserver, something like remote_operation_xxxx and remote_operation_xxxx_complete. remote_operation should do the following: 1) suspend_for_ptrace(); 2) inject a piece of code into required process and start its execution; 3) resume_after_ptrace(); 4) place calling thread into suspended state (or into some wait state?) remote_operation_complete should prepare reply and resume thread suspended by remote_operation. Injected code should call required function and then remote_operation_complete in context of required process. The question is: how to correctly get address of function? imho possible solutions are: 1) assume ntdll loaded at the same address for all processes -- unreliable; 2) get dll base address from per-process dll list and parse ELF by hand -- too complicated (?); 3) pass relative offsets and add them later to the ntdll's base address -- unreliable a bit: ntdll may be replaced, although, it is unlikely; 4) extend the struct process (server/process.h) and the request init_process with pointers to required functions -- most reliable and simple but looks ugly. What do you think?

6 11

Re: appdb dump
by Jeremy Newman 11 Aug '04

11 Aug '04

This is getting to be a common request. I think what I am going to do is make a script that tars up the appdb every night and puts it up for download. The only table it will not dump will be the userdb, for privacy reasons. I'll email you all again when I have something whipped up. On Thu, 2004-06-24 at 18:12, Joel Konkle-Parker wrote: > I'm trying to set up a copy of appdb on localhost to play with (and > hopefully use as a base for patches for you guys). Do you think I could > get a dump of the apps tables so that I can have a good set to test with? -- _ _ WebGeek/SysAdmin CodeWeavers -= http://www.codeweavers.com | \| |_____ __ ___ __ __ _ _ _ -= http://www.dracowulf.com | .` / -_) | | / ' \/ _` | ' \ -= mailto:jnewman@codeweavers.com |_|\_\___|\_/\_/|_|_|_\__,_|_||_| -= ICQ: 1711553 Yahoo: laxdragon

2 2

Re: Scrollbars, an application bug or a wine regression ? (#2314)
by Dmitry Timoshkov 26 Jul '04

26 Jul '04

"George Marshall" <g.marshall(a)nospam.com> wrote: > > Does reverting of the following patch help? > > Yes it does make the application work as it did before > the June Release :-) Do you have a small application I could test with? -- Dmitry.

4 16

Yard sale windows app fun: Lotus SmartSuite '96. 1-2-3 works, WordPro doesn't.
by Dan Kegel 18 Jul '04

18 Jul '04

I went to a yard sale today, and that's always dangerous. Today I ended up buying a copy of Lotus SmartSuite '96. I then installed Wine-20040615.tar.gz and tried installing my new disc with $ wine d:\\install.exe It got all confused, started iterating through every file underneath my home directory, and printed out err:shell:SHGetFileInfoW pidl is null! for each one! On a hunch, I made my home directory look empty, $ mkdir .blort $ mv * .blort $ wine d:\\install.exe That seemed much better; Wine only printed out the SHGetFileInfoW error once, presumably for the lotustmp.000 directory it created in my home directory. The next problem was when a dialog box "Select a Program Group..." popped up. At about the same time, an error box with title "Setup Message" and body "Setup has encountered a problem. Please report File='COMMON\SYMTAB11.C',Line='618' to Microsoft Product Support Services." This looks a bit lot like http://support.microsoft.com/default.aspx?scid=kb;EN-US;113252 which happens when GetWindowsDirectory() returns a string with lowercase letters, but clicking OK let me past with no ill affects, and I was able to install. At least when all I installed was Word Pro. When I also tried installing 1-2-3 and ScreenCam, I got the error "Lotus Setup" : "Install encountered an error trying to start Regedit.exe." That popped up twice, after which install thought for a long time, then warned fixme:ole:CoCreateInstance no classfactory created for CLSID {00021401-0000-0000-c000-000000000046}, hres is 0x80040154 and seemed to get stuck. Still, things seemed to be more or less well installed, so I tried running two of the apps. $ cd c/lotus/123/programs $ wine 123w.exe worked quite nicely. (Well, it did say the date was 6/17/104, but nobody's perfect!) Next I tried Word Pro: $ cd ~/.wine/c/lotus/wordpro $ wine wordpro.exe That failed immediately, so quickly that WINEDEBUG=+all wine wordpro.exe was practical to run. Here's part of its output. It looks as if the very first instruction accesses a null pointer in a strange way. 0009:Starting process L"C:\\lotus\\wordpro\\wordpro.exe" (entryproc=0x7a6aee) 0009:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x7a6aee 0009:trace:seh:EXC_RtlRaiseException info[0]=00000001 0009:trace:seh:EXC_RtlRaiseException info[1]=00000000 0009:trace:seh:EXC_RtlRaiseException eax=00000000 ebx=403f1668 ecx=400c0be8 edx=400c0c37 esi=400c1000 edi=007a6aee 0009:trace:seh:EXC_RtlRaiseException ebp=4070fff4 esp=4070ff30 cs=0023 ds=002b es=002b fs=003b gs=0033 flags=00010246 0009:trace:seh:EXC_CallHandler calling handler at 0x403e1708 code=c0000005 flags=0 0009:Call ntdll.NtQueryVirtualMemory(ffffffff,00000000,00000000,4070fac0,0000001c,4070fa84) ret=4037aeb8 0009:Ret ntdll.NtQueryVirtualMemory() retval=00000000 ret=4037aeb8 0009:Call ntdll.RtlImageDirectoryEntryToData(00000000,00000001,00000002,4070fabc) ret=4033fbbe 0009:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x40091368 0009:trace:seh:EXC_RtlRaiseException info[0]=00000000 0009:trace:seh:EXC_RtlRaiseException info[1]=00000000 0009:trace:seh:EXC_RtlRaiseException eax=00000000 ebx=400beec4 ecx=00000001 edx=00000000 esi=00000000 edi=00000002 0009:trace:seh:EXC_RtlRaiseException ebp=4070f9e4 esp=4070f928 cs=0023 ds=002b es=002b fs=003b gs=0033 flags=00010246 0009:trace:seh:EXC_CallHandler calling handler at 0x40089948 code=c0000005 flags=0 0009:trace:seh:EXC_RtlUnwind code=c0000005 flags=2 0009:trace:seh:EXC_CallHandler calling handler at 0x40088fc0 code=c0000005 flags=2 0009:trace:seh:EXC_CallHandler handler returned 1 0009:Ret ntdll.RtlImageDirectoryEntryToData() retval=00000000 ret=4033fbbe 0009:Call ntdll.NtCreateEvent(4070fac0,001f0003,4070fac4,00000001,00000000) ret=4033f836 0009:Ret ntdll.NtCreateEvent() retval=00000000 ret=4033f836 wine: Unhandled exception (thread 0009), starting debugger... ... Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x007a6aee). In 32 bit mode. Register dump: CS:0023 SS:002b DS:002b ES:002b FS:003b GS:0033 EIP:007a6aee ESP:4070ff30 EBP:4070fff4 EFLAGS:00010246( - 00 -RIZP1) EAX:00000000 EBX:403f1668 ECX:400c0be8 EDX:400c0c37 ESI:400c1000 EDI:007a6aee Stack dump: 0x00000000: 00000000 00000000 00000000 00000000 0x00000010: 00000000 00000000 00000000 00000000 0x00000020: 00000000 00000000 00000000 00000000 0x00000030: 00000000 00000000 00000000 00000000 0x00000040: 00000000 00000000 00000000 00000000 0x00000050: 00000000 00000000 00000000 00000000 0x00000060: Backtrace: =>1 0x007a6aee (0x4070fff4) 2 0x4002e83d (0x00000000) 0x007a6aee: addb %al,0x0(%eax) Modules: 0x40070000-400c2000 Deferred ntdll 0x40320000-403f3000 Deferred kernel32 0x00400000-00888000 --none-- wordpro 0x402f0000-403f3000 Deferred kernel32<elf> 0x40019000-40025000 Deferred libnss_files.so.2 0x401b5000-401d7000 Deferred libm.so.6 0x400c2000-401b5000 Deferred libwine_unicode.so.1 0x40053000-400c2000 Deferred ntdll<elf> 0x40000000-40016000 Deferred ld-linux.so.2 0x4004f000-40052000 Deferred libdl.so.2 0x420155f0-841485f0 Deferred libc.so.6 0x40042000-4004f000 Deferred libpthread.so.0 0x4002a000-40042000 Sym libwine.so.1 0x420155f0-841485f0 Deferred libc.so.6 Module Address Debug info Name (14 modules) PE 0x00400000-00888000 --none-- wordpro ELF 0x40000000-40016000 Deferred ld-linux.so.2 ELF 0x40019000-40025000 Deferred libnss_files.so.2 ELF 0x4002a000-40042000 Sym libwine.so.1 ELF 0x40042000-4004f000 Deferred libpthread.so.0 ELF 0x4004f000-40052000 Deferred libdl.so.2 ELF 0x40053000-400c2000 Deferred ntdll<elf> \-PE 0x40070000-400c2000 Deferred ntdll ELF 0x400c2000-401b5000 Deferred libwine_unicode.so.1 ELF 0x401b5000-401d7000 Deferred libm.so.6 ELF 0x402f0000-403f3000 Deferred kernel32<elf> \-PE 0x40320000-403f3000 Deferred kernel32 ELF 0x420155f0-841485f0 Deferred libc.so.6 ELF 0x420155f0-841485f0 Deferred libc.so.6 Threads: process tid prio (all id:s are in hex) 0000000b (D) C:\lotus\wordpro\wordpro.exe 00000009 0 <== 00000010 00000011 0 WineDbg terminated on pid 0xb So I guess I got a couple hours worth of entertainment out of my $5, and I can now run Lotus 1-2-3 if I feel like it. Cool. - Dan -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

3 8

ioctl(/dev/dsp, SNDCTL_DSP_SETDUPLEX) failed
by Saulius Krasuckas 10 Jul '04

10 Jul '04

With thepatch [1] I am getting some this line from Wine: err:wave:OSS_RawOpenDevice ioctl(/dev/dsp, SNDCTL_DSP_SETDUPLEX) failed (Input/output error) Yes, my soundcard doesn't support full duplex, I believe (I have OPTi 82c931 chip with mad16 driver running here). But shouldn't the type of the message be WARN or TRACE instead of ERR then? [1] http://cvs.winehq.org/patch.py?id=12636

2 1

Precompiled headers?
by Shachar Shemesh 05 Jul '04

05 Jul '04

Hi, Is anyone considering putting precompiled headers support into the wine build system? http://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html#Precompiled%20He… -- Shachar Shemesh Lingnu Open Source Consulting http://www.lingnu.com/

2 1

Pango for BiDi
by Mike Hearn 03 Jul '04

03 Jul '04

Hi Shachar, I am reading your interview and a few words jumped out at me, mostly "BiDi", "shaping" and "unicode" - very vague I know, but if I understand correctly Pango is a library with advanced support for shaping and laying out all kinds of different scripts. Only stopper I can think of would be that it uses UTF-8 not UTF-16. Have you looked at this, or am I talking smack? thanks -mike

2 5

taskmgs hangs on edit debug channels
by Andrei Barbu 02 Jul '04

02 Jul '04

The taskmanager dies when trying to edit the debug channels of any programs with the newest CVS (checked out 2 days ago) It just sits there with this: 002e:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000102 ret=409cd43c 002e:Call kernel32._ConfirmSysLevel(40a08ac0) ret=409a3f15 002e:Ret kernel32._ConfirmSysLevel() retval=00000000 ret=409a3f15 002e:Call kernel32.GlobalLock16(0000116f) ret=40999b70 002e:Ret kernel32.GlobalLock16() retval=404326d0 ret=40999b70 002e:Call kernel32.ReleaseThunkLock(41625f7c) ret=409cd30f 002e:Ret kernel32.ReleaseThunkLock() retval=00000000 ret=409cd30f 002e:trace:msg:GetMessageW (116f) mask=0000007f, bits=00000000, changed=00000000, waiting 002e:Call kernel32.ReleaseThunkLock(41625fe4) ret=409cd684 002e:Ret kernel32.ReleaseThunkLock() retval=00000000 ret=409cd684 002e:Call x11drv.MsgWaitForMultipleObjectsEx(00000001,404326d4,ffffffff,00000000,00000000) ret=409cd6c6 002e:Call ntdll.RtlEnterCriticalSection(40d76680) ret=40d54902 002e:Ret ntdll.RtlEnterCriticalSection() retval=00000000 ret=40d54902 002e:Call ntdll.RtlLeaveCriticalSection(40d76680) ret=40d54932 002e:Ret ntdll.RtlLeaveCriticalSection() retval=00000000 ret=40d54932 002e:Call ntdll.RtlEnterCriticalSection(40d76680) ret=40d54902 002e:Ret ntdll.RtlEnterCriticalSection() retval=00000000 ret=40d54902 002e:Call ntdll.RtlLeaveCriticalSection(40d76680) ret=40d54932 002e:Ret ntdll.RtlLeaveCriticalSection() retval=00000000 ret=40d54932 002e:Call kernel32.WaitForMultipleObjectsEx(00000002,41625dac,00000000,ffffffff,00000000) ret=40d383db 002e:Call ntdll.NtWaitForMultipleObjects(00000002,41625ba0,00000000,00000000,00000000) ret=40591c85 If I move the mouse it spits out the correct mouse messages which indicate that wine itself is running just fine. The taskmanager window doesn't get redrawn (the black backround around it does). The backtrace from that point is: =>1 0x400636a9 (0x41b2be48) 2 0x402335c2 NTDLL_wait_for_multiple_objects+0x122(count=0x1, handles=0x41b2bf38, flags=0x4, timeout=0x0) [sync.c:587] in ntdll (0x41b2beec) 3 0x40233636 NtWaitForMultipleObjects+0x66(count=0x1, handles=0x41b2bf38, wait_all=0x0, alertable=0x0, timeout=0x0) [sync.c:605] in ntdll (0x41b2bf14) 4 0x40591c85 WaitForMultipleObjectsEx+0xb5(count=0x1, handles=0x41b2c06c, wait_all=0x0, timeout=0xffffffff, alertable=0x0) [sync.c:171] in kernel32 (0x41b2c044) 5 0x40591b1a WaitForSingleObject+0x3a(handle=0x6c, timeout=0xffffffff) [sync.c:99] in kernel32 (0x41b2c064) 6 0x40656867 ProcessPageRefreshThread+0x87(lpParameter=0x0) [procpage.c:511] in taskmgr (0x41b2c1a4) 7 0x40598fba THREAD_Start+0x11a(ptr=0x40450220) [thread.c:107] in kernel32 (0x41b2c27c) 8 0x40234fe9 start_thread+0x199(info=0x40450240) [thread.c:198] in ntdll (0x41b2cacc) 9 0x4005df70 (0x41b2cbcc) 10 0x4017e40a (0x00000000) Any ideas? I'm not quite versed enough in wine to know what's happening too well. I realise it's a thread waiting for another that apparently never finishes.. or I think it is, and I'm kind of lost from there. Thanks, Andrei

2 1

Delayed breakpoints in winedbg
by Adrian Rees 02 Jul '04

02 Jul '04

Hi all, Apologies in advance for what is probably a dumb question... I'm trying to debug a windows application by breaking on a call to a DLL function - in fact it's the NtCreateKey function within the ntdll library. I must be missing something fundamental because the debugger indicates that it has set a delayed breakpoint, but the breakpoint is never reached, although turning on debugging messages clearly indicates that the function is being called. Here's a typical attempt: $ WINDEBUG=reg winedbg MSMONEY.EXE ... (lots of startup calls to reg) ... In 32 bit mode. Wine-dbg>break NtCreateKey fixme:dbghelp:elf_new_wine_thunks Duplicate in midimap.drv<elf>: _edata<5b828a10 -00000000> completed.1<5b828a10-00000000> ... (snip) ... No symbols found for NtCreateKey Unable to add breakpoint, will check again when a new DLL is loaded Wine-dbg>info break No breakpoints No watchpoints Delayed breakpoints: 0: NtCreateKey Wine-dbg>cont trace:reg:NtCreateKey(0x28,L"Software\\Microsoft\\Windows\\CurrentVersion\\AppPaths\\MSMONEY.EXE",L"",1,1,0xb9fd04) trace:reg:NtCreateKey <- 0x50 trace:reg:RegQueryValueExA(0x50,"Path",(nil),0xb9fcf8,0xb9f318,0xb9fd00=260) ... (etc till program ends) ... I've spent a couple of hours searching for more information on how to use this capability of the debugger, but with no luck - can anyone tell me what I'm doing wrong? Thanks, Adrian

2 3

Cleaning up W->A calls
by James Hawkins 01 Jul '04

01 Jul '04

I recently decided to help with the development of Wine, and seeing as how I am new to the process, I have chosen menial tasks to take on. This way I can learn more about Wine while contributing. I am currently working on the janitorial task of getting rid of W->A calls and I have a few questions about how I should implement these changes. I'll start the question with an example: dlls/advapi32/crypt.c line 255, 482 BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags) { ... complete implementation } BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, LPCWSTR pszProvider, DWORD dwProvType, DWORD dwFlags) { PSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE; TRACE("(%p, %s, %s, %ld, %08lx)\n", phProv, debugstr_w(pszContainer), debugstr_w(pszProvider), dwProvType, dwFlags); if ( !CRYPT_UnicodeToANSI(pszContainer, &pContainer, -1) ) CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); if ( !CRYPT_UnicodeToANSI(pszProvider, &pProvider, -1) ) { CRYPT_Free(pContainer); CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); } ret = CryptAcquireContextA(phProv, pContainer, pProvider, dwProvType, dwFlags); if (pContainer) CRYPT_Free(pContainer); if (pProvider) CRYPT_Free(pProvider); return ret; } Initially CryptAcquireContextW converts all of its arguments to ansi then calls CryptAcquireContextA (which is intuitively not what we're wanting and thus the cleanup.) The question is, what exactly is the best way to clean this up? It seems to me that there are two main options as to what can be done: A) convert the W->A calls in the wide-char functions to A->W calls in the asci functions and implement the wide-char functions instead, or B) implement both asci and wide-char functions separately ie asci functions only call asci functions etc. If we are to choose plan A, I have seen several different methods of converting asci to wide-char, and I am wondering which method is best. for example: dlls/advapi32/crypt.c lines 133-141 wcount = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); wcount = wcount < wstrsize/sizeof(WCHAR) ? wcount : wstrsize/sizeof(WCHAR); if (wstrsize == -1) *wstr = CRYPT_Alloc(wcount * sizeof(WCHAR)); if (*wstr) { MultiByteToWideChar(CP_ACP, 0, str, -1, *wstr, wcount); return TRUE; } and, dlls/advapi32/registry.c lines 1626-1636 LONG WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa ) { UNICODE_STRING *fileW = &NtCurrentTeb()->StaticUnicodeString; NTSTATUS status; STRING fileA; RtlInitAnsiString(&fileA, file); if ((status = RtlAnsiStringToUnicodeString(fileW, &fileA, FALSE))) return RtlNtStatusToDosError( status ); return RegSaveKeyW(hkey, fileW->Buffer, sa); } Which method is better/more efficient? I would have to argue that implementing both the asci functions and wide-char functions separately would be the most efficient way to solve the W->A problem. Throughout all the wine libs, many conversion calls are being made from W->A and A->W, when most of these calls could be left out. I think performance would improve without all of the conversion calls. Granted the size of the code would increase, but speed would also increase. There are a couple snags when it comes to implementing asci and wide-char functions independently, but that can be discussed later. If I'm totally off the mark, let me know, and if there are other jobs I could be doing, let me know as well because I would like to contribute, but I'm not exactly sure what to do yet. Thankyou for your time. James Hawkins truiken(a)comcast.net

4 4

Re: dlls/shell32 W->A cleanup of systray.c
by Marcelo Duarte 30 Jun '04

30 Jun '04

Danny Hawkins wrote: >Hi, > >Converted all wide-char->ansi calls to ansi->wide-char in systray.c > > > The TTM_UPDATETIPTEXTA should be converted to TTM_UPDATETIPTEXTW and TTM_ADDTOOLA -> TTM_ADDTOOLW >@@ -272,13 +272,13 @@ > ti.rect.bottom = ICON_SIZE+2*ICON_BORDER; > > if(modify) >- SendMessageA(ptrayItem->hWndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti); >+ SendMessageW(ptrayItem->hWndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti); > else >- SendMessageA(ptrayItem->hWndToolTip, TTM_ADDTOOLA, 0, (LPARAM)&ti); >+ SendMessageW(ptrayItem->hWndToolTip, TTM_ADDTOOLA, 0, (LPARAM)&ti); > } > > Here, you should'nt cast (WCHAR *)"". Please define: static const WCHAR emptyW[] = {0}; Or modify the function to accept NULL. >@@ -297,15 +297,15 @@ > (*ptrayItem)->notifyIcon.hWnd = pnid->hWnd; /* only needed for callback message */ > SYSTRAY_ItemSetIcon (*ptrayItem, (pnid->uFlags&NIF_ICON) ?pnid->hIcon :0); > SYSTRAY_ItemSetMessage(*ptrayItem, (pnid->uFlags&NIF_MESSAGE)?pnid->uCallbackMessage:0); >- SYSTRAY_ItemSetTip (*ptrayItem, (pnid->uFlags&NIF_TIP) ?pnid->szTip :"", FALSE); >+ SYSTRAY_ItemSetTip (*ptrayItem, (pnid->uFlags&NIF_TIP) ?pnid->szTip :(WCHAR *)"", FALSE); > > The old code should be eliminated, not commented: >+/*{ > BOOL flag=FALSE; > TRACE("enter %p %d %ld\n", pnid->hWnd, pnid->uID, dwMessage); > switch(dwMessage) { >@@ -377,13 +390,30 @@ > } > TRACE("leave %p %d %ld=%d\n", pnid->hWnd, pnid->uID, dwMessage, flag); > return flag; >-} >+}*/ > > > >+/*{ > BOOL ret; > > PNOTIFYICONDATAA p = HeapAlloc(GetProcessHeap(),0,sizeof(NOTIFYICONDATAA)); >@@ -395,4 +425,4 @@ > > HeapFree(GetProcessHeap(),0,p); > return ret; >-} >+}*/ > >

1 0

Scrollbars, an application bug or a wine regression ? (#2314)
by Gabriele Giorgetti 30 Jun '04

30 Jun '04

Hello, I've noticed a problem with scrollbars in the latest Wine's release (20040615). With wine version 20040505 everything was just fine. I've attacched a zip file with two screenshots (pls. see wine BUG #2314 @ bugs.winehq.org ) the first one is the correct behavior of the app using wine 20040505 the second one is wine 20040615 and the app in its wrong behavior. Trying to describe the problem: The application show up with a bottom scrollbar and a right scrollbar even if they are not needed. When executing the very same application, with the very same settings and size with wine 20040505 the scrollbars are not there. I hope you get it Thanks. NB: BUG #2314 at bugs.winehq.org

5 9

err:opengl:X11DRV_ChoosePixelFormat Flag not supported
by Tobias Burnus 30 Jun '04

30 Jun '04

Hello, I have the following problems with WINE, CVS version as of yesterday and Crystal Impact's Diamond http://www.crystalimpact.com/diamond/ http://www.crystalimpact.com/download/diamond/demo/dm2demo.exe, which installs flawlessly. a) I get a err:opengl:X11DRV_ChoosePixelFormat Flag not supported when I open e.g. ./Samples/Minerals/Copper.dsf and a dialogbox with the following text is shown: ChoosePixelFormat() returns 0 (last error = 0) SetPixelFormat() returns 1 (last error = 0) wglCreateContext() returns 0 (last error 2000) wglMakeCurrent() returns 1 (last error = 0) (Workaround: disable rendering) b) Some data is displayed as list, e.g. like http://www.physik.fu-berlin.de/~tburnus/wine/diamond_list.png under WINE this is completely mangled: http://www.physik.fu-berlin.de/~tburnus/wine/diamond_list_wine.png Sometimes some spread numbers appear, but in this case one can only mark cells. Any ideas how to fix/debug this? (I have unfortunally no experience at all in programming in Wine/Windows.) Anyone volunteering to look at this? I'm willing to spend some $$ (but not $$$) on that (I know that this is not much, but some rewarding of volunteer work doesn't hurd either). Regards, Tobias

1 0

Re: Typo in winedbg
by Mike Hearn 30 Jun '04

30 Jun '04

On Mon, 28 Jun 2004 20:45:35 -0400, Andrei Barbu wrote: > This fixes debuggee to debugger. I think debuggee is the right word, it means "the one that is being debugged". Ctrl-C doesn't interrupt winedbg, it interrupts the process you are currently attached to.

2 1

Failed to compile on Sparc/Solaris 9
by John O'Donnell 30 Jun '04

30 Jun '04

make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/export/home/root/wine/wine/dlls/newdev' make[2]: Entering directory `/export/home/root/wine/wine/dlls/ntdll' ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./ntdll.spec cdrom.o critsection.o debugbuffer.o debugtools.o directory.o env.o error.o exception.o file.o heap.o large_int.o loader.o loadorder.o misc.o nt.o om.o path.o process.o reg.o relay.o resource.o rtl.o rtlbitmap.o rtlstr.o sec.o server.o signal_i386.o signal_powerpc.o signal_sparc.o string.o sync.o version.o thread.o time.o virtual.o wcstring.o relay32.o ntdll.dll.dbg.o -o ntdll.dll.so -L../../dlls -L../../libs/wine -lwine -L../../libs/unicode -lwine_unicode -L../../libs/port -lwine_port -lresolv -lsocket -lnsl ntdll.dll-IHmocZ.spec.c:20:1: warning: "__stdcall" redefined <command line>:17:1: warning: this is the location of the previous definition thread.o: In function `NtCurrentTeb': /export/home/root/wine/wine/dlls/ntdll/thread.c:582: undefined reference to `wine_pthread_get_current_teb' collect2: ld returned 1 exit status winegcc: gcc failed. make[2]: *** [ntdll.dll.so] Error 2 make[2]: Leaving directory `/export/home/root/wine/wine/dlls/ntdll' make[1]: *** [ntdll] Error 2 make[1]: Leaving directory `/export/home/root/wine/wine/dlls' make: *** [dlls] Error 2 root@gold251:/root/wine/wine# This is CVS'ed a day ago. Any ideas? Any more info needed?

1 0

[RFC] Wine upgrade procedure (spec)
by Dimitrie O. Paun 30 Jun '04

30 Jun '04

Hi folks, It seems that we are getting ever so closer to 0.9. Slow, but steady. Looking at the TODO, it looks like upgrading is one of the big showstoppers, in that it will affect (1) the end-user experience, and (2) how we deal with the configuration. So this seems like a good time to start discussing this topic, as we need to eventually reach the elusive 0.9. This seems to be a difficult topic, so we need to approach the problem well prepared. That is, we need to first define (and agree) on what we need to solve here. So after a tumultuous discussion on IRC, I decided to get the ball rolling. Intuitively, upgrading wine is simple to understand: once a new version is installed, we need to get users in a state where they can use it. While simple to state, this problem is complicated by the various corner cases that can appear in Real Life (TM): -- native vs. builtin DLLs handling -- multiple Wine installations on a box -- updating only some DLLs -- integrating into the Unix environment -- dealing with Windows software We can also look at some important use-cases that we need to support, but before we do, the following must hold true in all cases: -- administrators should be able to install a new Wine on the system easily with "rpm -U" (or equivalent). -- the upgrade should not erase registry settings that are managed by the user Let's look at the use-cases: A. Global Install In this case, both Wine code, as well as applications are installed globally, for all users to access. This is the most Unix-like setup, but unfortunately the most difficult to support, due to the fact that Win32 apps simply expect a different environment. Since we can't control application's code, this setup may present some limitations, but it may be sufficient for sites that need a limited set of applications. For this to work, it is acceptable that we ship special scripts that know about the applications that are supported, so that they can work around inherent limitations in the applications themselves. Users should transparently be able to use the new version of wine, the next time they start wine. B. Mixed Install Here, Wine code is installed globally, but applications are installed in the user's account. In a way is like (A) but with some additional applications installed directly into the user's account. Same requirements apply to this case as well. C. Local Install Both Wine code, as well as applications are installed locally, into the user's account. The Wine code is still installed globally by the administrator (as in A & B), but it is copied locally before it's being used. An upgrade in this case may require an explicit action by the user, so the upgrade can happen at a controlled time, when the user desires it. In all of the above, there is always state in the user directory. Thus, it is imperative that the upgrade process makes sure that after the upgrade, the user-private state is consistent with the new code base. Also, any solution must take into account that the registry must be created on the fly, as it is created when registering the DLLs. Before we go any further, I'd like to ask everybody to contribute their thoughts/requirements/desires so that we get a conprehensive view of the problem we are trying to solve. Thanks for reading this far! -- Dimi.

3 3

A wine magic trace key
by Andrei Barbu 29 Jun '04

29 Jun '04

I'm about to implement a set of keys that lets me enable disable traces any time. Seems to me like it's a good idea, like that I can get traces for exactly what I need. Especially when I'm faced with weird debugger output that's 10 minutes into the game and I can't turn traces on to begin with. Is there another way, possibly existing, to do this? Is this a really bad idea? If people are interested I can post a patch later on today or tomorrow with it. It'll be implemented in the x11 driver and calling the existing wine_dbg_parse_options with a new options string. It can even be made a commandline option to enable and disable that key combination (and possibly the key combination could be set in wineconfig) but that's if enough people are interested in the idea. Thanks, Andrei

3 4

Temporary moderator needed
by Duane Clark 29 Jun '04

29 Jun '04

Howdy, Someone is needed for the period June 30-July 5 to handle moderation of the Wine lists. If you are willing to do it, please email me off list. Thanks.

1 0

Re: Missing declaration for MSVCRT_div_t and MSVCRT_ldiv_t
by Dimitrie O. Paun 29 Jun '04

29 Jun '04

On Tue, Jun 29, 2004 at 01:27:23PM +0200, Pierre d'Herbemont wrote: > Hi! > > On non-i386 we have to define MSVCRT_div_t and MSVCRT_ldiv_t. Please also add the appropriate tests to tests/headers.c. -- Dimi.

1 0

Re: parameter checking in CoMarshalInterface
by Uwe Bonnes 29 Jun '04

29 Jun '04

>>>>> "Aric" == Aric Stewart <aric(a)codeweavers.com> writes: Aric> Changlog: return an error if the IUnknown pointer is NULL and dont Aric> crash tested with win2k and this is proper behavior Index: The test is welcome in the test suite... 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: Mandrake RPMs
by Ivan 29 Jun '04

29 Jun '04

> It turns out the reason they don't work on Fedora is because they don't > work at all No, wine segfaulted, so it probably wasn't a packaging related problem. > wine.inf is in /usr/share/doc/wine-20040615 which is wrong, > it needs to be in /usr/share/wine. This is strange because I tested both RPMs on multiple versions of Mandrake before releasing them. Anyway, new RPMs will be up soon. Ivan.

2 1

Mandrake RPMs
by Mike Hearn 29 Jun '04

29 Jun '04

Hi, Ivans comment that the Mandrake RPMs didn't work on Red Hat/Fedora surprised me, so after encountering a stuck Mandrake user for whom the RPMs weren't working either on IRC I decided to check them out. It turns out the reason they don't work on Fedora is because they don't work at all - wine.inf is in /usr/share/doc/wine-20040615 which is wrong, it needs to be in /usr/share/wine. As this file is in the wrong place Wine refuses to start on a new users account. Once I manually copied the file to the right place Wine worked just fine. Could somebody please fix the Mandrake RPMs, and maintainers of other packages please ensure you have details like this right. thanks -mike

1 0

Re: fix typo in wwn
by Brian Vincent 29 Jun '04

29 Jun '04

> -A few other people were in favor of saving it to support a > +A few other people were in favour of saving it to support a "The Americans are identical to the British in all respects except, of course, language." - Oscar Wilde Brian

3 2

How to handle odbc/registry
by Bill Medland 29 Jun '04

29 Jun '04

The builtin odbc32.dll basically simply proxies the underlying unix ODBC provider (e.g. unixODBC or iODBC). I have just discovered that somewhere in the compilation/link phase under Windows some standard ODBC function calls somehow actually get translated into direct registry calls. For example the SQLGGetInstalledDrivers call actually gets translated into an OpenKey and EnumerateKey on the HKLM/Software/ODBC/ODBCINST.INI/ODBC Drivers So should we have code within the registry code that recognises access to the ODBC tree when odbc32 is builtin and redirects it to the corresponding calls to the unix ODBC manager? -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

2 1

Re: objects/region.c: REGION_FrameRgn
by Alexandre Julliard 29 Jun '04

29 Jun '04

Filip Navara <xnavara(a)volny.cz> writes: > Indeed Dimtry was right about the cause of the balloon tooltips > drawing issue. Here is the code for FrameRgn ported from ReactOS that > actaully does the right thing. I don't think you should modify the source region at all, even temporarily; it could be in use somewhere else. -- Alexandre Julliard julliard(a)winehq.org

1 0

AT_SYSINFO under RedHat 8
by Bill Medland 28 Jun '04

28 Jun '04

preloader.c doesn't make due to the most recent change. Presumably AT_SYSINFO is supposed to be in the Elf.h? Bill -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

1 0

Crash when resizing window in Desktop mode
by Uwe Bonnes 28 Jun '04

28 Jun '04

Hallo, resizing the window of ISE (Xilinx FPGA programming suite), the mouse remains captured inside the wine desktop and following backtrace can be requested: Backtrace: =>1 0x404fdc04 DebugBreak+0x4 [debugger.c:274] in kernel32 (0x406ef1fc) 2 0x41f11067 error_handler+0x87(display=0x78089550, error_evt=0x406ef248) [x11drv_main.c:186] in x11drv (0x406ef210) 3 0x4114fc6b (0x406ef2c0) 4 0x4114e086 (0x406ef300) 5 0x41148f15 (0x406ef340) 6 0x41148ff5 (0x406ef360) 7 0x41130269 (0x406ef380) 8 0x41ee08a1 BITBLT_InternalStretchBlt+0x6e1(physDevDst=0x403d8f60, xDst=0x53, yDst=0x64, widthDst=0x286, heightDst=0x4, physDevSrc=0x0, xSrc=0x0, ySrc=0x0, widthSrc=0x0, heightSrc=0x0, rop=0x5a0049) [bitblt.c:1429] in x11drv (0x406ef424) 9 0x41ee0d93 X11DRV_PatBlt+0x43(physDev=0x403d8f60, left=0x53, top=0x64, width=0x286, height=0x4, rop=0x5a0049) [bitblt.c:1533] in x11drv (0x406ef470) 10 0x408a34ec PatBlt+0x5c(hdc=0xb38, left=0x53, top=0x64, width=0x286, height=0x4, rop=0x5a0049) [bitblt.c:42] in gdi32 (0x406ef49c) 11 0x41f0d8f7 draw_moving_frame+0x67(hdc=0xb38, rect=0x406ef58c, thickframe=0x1) [winpos.c:1763] in x11drv (0x406ef4cc) 12 0x41f0e7b4 X11DRV_SysCommandSizeMove+0xae4(hwnd=0x20028, wParam=0xf008) [winpos.c:2062] in x11drv (0x406ef5c8) 13 0x407c03e1 NC_HandleSysCommand+0x1b1(hwnd=0x20028, wParam=0xf008, lParam=0x25302d3) [../../windows/nonclient.c:1499] in user32 (0x406ef5f4) 14 0x407b0b5f DEFWND_DefWinProc+0x98f(hwnd=0x20028, msg=0x112, wParam=0xf008, lParam=0x25302d3) [../../windows/defwnd.c:528] in user32 (0x406ef684) 15 0x407b10c3 DefWindowProcA+0xa3(hwnd=0x20028, msg=0x112, wParam=0xf008, lParam=0x25302d3) [../../windows/defwnd.c:916] in user32 (0x406ef6b0) 16 0x407ba2d2 DefFrameProcA+0x42(hwnd=0x20028, hwndMDIClient=0x1002a, message=0x112, wParam=0xf008, lParam=0x25302d3) [../../windows/mdi.c:1272] in user32 (0x406ef6d4) 17 0x6c376a27 (0x406ef7bc) 18 0x6c371cea (0x406ef7dc) 19 0x40e41ccc (0x0000f008) 20 0x00000000 (0x00000000) This is with today's CVS -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 3

Re: fix typo in wwn
by Ivan 28 Jun '04

28 Jun '04

> And they don't use the metric system. Shame. The matric system is way more used in the UK than in the US, where it's hardly used at all. Ivan.

1 0

Re: Change REFIID to IID* for stack declarations in oaidl_p.c to avoid initializers being discarded
by Mike Hearn 27 Jun '04

27 Jun '04

On Sun, 27 Jun 2004 21:13:17 +0200, Marcus Meissner wrote: >> + It is usually generated directly by MIDL, however this file has >> + been tweaked since then to account for slight differences in the way >> + gcc and MSVC++ compile it. In particular, in some functions REFIIDs >> + declared on the stack have been converted to plain IID* in order to eliminate >> + the constness of the REFIID type, ensuring that the zero initializer is not >> + discarded. >> + >> + Therefore, please do not regenerate this file. >> +*/ > > The comment is not understandable. > > Shouldn't it read '"REFIID" should not be used, because the value is not "const"'? I don't understand that wording of the comment either unfortunately :( It's not that it shouldn't be used, it's more that in the original generated code (I think) it was written like this: REFIID riid; (REFIID ) riid = 0; I'm not sure why MIDL did this, but as REFIID is simply #define REFIID const IID* const changing those instances to IID* should "fix" it without any warnings about assigning to a readonly variable. REFIID can still be used elsewhere though. thanks -mike

1 0

Re: Tooltips: Start of Balloon Support
by Dmitry Timoshkov 27 Jun '04

27 Jun '04

"Robert Shearman" <R.J.Shearman(a)warwick.ac.uk> wrote: > This patch marks the start of balloon tip support. Note that it also has > the same bug as native due to regions not being handled the same as on > Windows. Do you mean a bug in FrameRgn? If yes, ReactOS might have that bug fixed in their implementation. Could you have a look? -- Dmitry.

2 1

Re: Change REFIID to IID* for stack declarations in oaidl_p.c to avoid initializers being discarded
by Marcus Meissner 27 Jun '04

27 Jun '04

On Sun, Jun 27, 2004 at 05:23:27PM +0100, Mike Hearn wrote: > This can cause a subtle marshalling failure in some cases > (inter-thread IDispatch, native MSI, etc) > > > Mike Hearn <mh(a)codeweavers.com> > Change REFIID to IID* for stack declarations in oaidl_p.c to avoid > initializers being discarded > Index: oaidl_p.c > =================================================================== > RCS file: /home/wine/wine/dlls/oleaut32/oaidl_p.c,v > retrieving revision 1.2 > diff -u -p -w -r1.2 oaidl_p.c > --- oaidl_p.c 5 Sep 2003 23:08:33 -0000 1.2 > +++ oaidl_p.c 27 Jun 2004 16:17:04 -0000 > @@ -1,5 +1,14 @@ > -/* this ALWAYS GENERATED file contains the proxy stub code */ > +/* This file contains the proxy/stub code for core COM interfaces. > > + It is usually generated directly by MIDL, however this file has > + been tweaked since then to account for slight differences in the way > + gcc and MSVC++ compile it. In particular, in some functions REFIIDs > + declared on the stack have been converted to plain IID* in order to eliminate > + the constness of the REFIID type, ensuring that the zero initializer is not > + discarded. > + > + Therefore, please do not regenerate this file. > +*/ The comment is not understandable. Shouldn't it read '"REFIID" should not be used, because the value is not "const"'? Ciao, Marcus

1 0

Wine/WineX and subfs
by Uwe Bonnes 27 Jun '04

27 Jun '04

Hallo, when trying to install programs from subfs mounted CDROMS, wine stumbled on several occasions (GetVolumenInformation?), running on Suse 9.1. I had not yet time to investigate deeper. However the announcement for WineX 3.3.2 tells explicit about changes for CDROMs and subfs for Suse9.1. Anybody from Transgaming reading hear, willing to submit a patch or explain the changes? Bye -- 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

FILE_GetNtStatus Converting errno 38 to STATUS_UNSUCCESSFUL
by Jürgen Leibner 27 Jun '04

27 Jun '04

Hi there, i'm trying to install a Software for Schools using wine-20040505-SuSELinux90.i586.rpm. After launching wine as user with: # wine setup.exe i get this message: .... # fixme:ntdll:FILE_GetNtStatus Converting errno 38 to STATUS_UNSUCCESSFUL Is anybody out there, who is able to explain what happens and what to do to get succsess? Thanks, Jürgen

3 3

Re: Change Desktopsize for _INS5576._MP in config
by Uwe Bonnes 27 Jun '04

27 Jun '04

>>>>> "Uwe" == Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: Uwe> Changelog: documentation/samples/config: Uwe> [AppDefaults\\_INS5576._MP\\x11drv] Change Desktop size to 800x600 Uwe> With a desktop siye of 640y480, Sage PC Kaufmann Setup aborts, Uwe> asking for higher resolution. Looking at http://frankscorner.org/modules.php?op=modload&name=Sections&file=index&req… the small desktopsize used until now for _INS5576._MP seems to cause problems with the photoshop installer too... -- 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

Suppressing NTDLL Relay messages
by Uwe Bonnes 27 Jun '04

27 Jun '04

Hallo, as the include and exclude lists for relay logging are initialized later than our ntdll is loader, relay logs contain all ntdll calls, even if the user didn't request them. Does anybody have an idea how to make the ntdll relay behave better? 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: dbghelp crashes
by Eric Pouech 27 Jun '04

27 Jun '04

Jon Griffiths a écrit : > Hi, > > Some overly long stabs cause crashes when debug tracing is enabled. > > Cheers, > Jon > > +dlls/dbghelp/stabs.c > Prevent the debug buffer from overflowing on long stabs You shouldn't use debugstr_an with a fixed value, since all strings are '\0' terminated. Either fix dlls/ntdll/debugtools.c to handle properly those long string conditions (and remove the ugly call to abort()), or use min(256, strlen(ptr)) as the actual length of the string in debugstr_an calls. I'd prefer the first solution. A+

1 0

Re: wine/loader preloader.c
by Mike Hearn 27 Jun '04

27 Jun '04

On Sat, 2004-06-26 at 08:25 -0500, Mike McCormack wrote: > I think a better fix is to define it if it's missing. This commit by Alexandre should fix the segfaults people have been seeing on Fedora Core 2. Either of the two patches just sent are correct BTW, Red Hat 9/Fedora Core 1 do not place AT_SYSINFO* headers in the ELF startup auxiliary vector. thanks -mike

2 1

Wine causing a Segmentation Fault
by David Lee 26 Jun '04

26 Jun '04

I am using the CVS wine as of 6/22/04 and when I run the compiled binary of wine, I get a Segmentation Fault. In fact, most of the wine* binaries located in /usr/local/bin give me a Segmentation Fault. I have tried a manual compile: ./configure, make depend && make, su -c make install. and using the wineinstall tool. I'm running fedora 2 and using the sources. RPMs don't work either. -- David Lee

4 3

Re: !LOSTWAGES! site misc updates
by Ivan 26 Jun '04

26 Jun '04

> Do you really think we need to switch from American to English spelling? A common solution is to spell the same word in A.E. in some places and in B.E. in others, and that's what my patch does. Apart fomr that, it's not only a spelling patch. Ivan.

1 0

Re: wine/loader preloader.c
by Michael Stefaniuc 26 Jun '04

26 Jun '04

Hello, On Fri, Jun 25, 2004 at 07:12:20PM -0500, Alexandre Julliard wrote: > ChangeSet ID: 12717 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2004/06/25 19:12:20 > > Modified files: > loader : preloader.c > > Log message: > Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page > is in one of our reserved ranges. On Red Hat Linux 9 there is no AT_SYSINFO_EHDR in /usr/include/elf.h thus breaking compilation there. I've attached a trivial patch to fix this. > > Patch: http://cvs.winehq.org/patch.py?id=12717 > > Old revision New revision Changes Path > 1.6 1.7 +62 -20 wine/loader/preloader.c 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

Re: !LOSTWAGES! site misc updates
by Dimitrie O. Paun 26 Jun '04

26 Jun '04

On Fri, Jun 25, 2004 at 07:35:23PM +0200, Ivan wrote: > As in subject. Jeremy, please let me know if there's anything wrong in this patch. Do you really think we need to switch from American to English spelling? What if someone else is sending a patch to convert back to American? I think the spelling is fine the way it is now. -- Dimi.

1 0

Chasing Galactic Civilizations Unhandled Exception
by Mike Kost 25 Jun '04

25 Jun '04

After sucking it up and realizing I'd have to learn how to navigate winedbg, I started playing around with the Galactic Civilizations unhandled exception. Some documentation and a few trips through winedbg later, it appears that Gal Civ is throwing a divide-by-zero -----------<snip>--------------- First chance exception: divide by zero in 32-bit code (0x40f2cda8) -----------<snip>--------------- I did a 'bt' next: -----------<snip>--------------- =>1 0x40f2cda8 send_mouse_event+0xc8(hwnd=0x10024, flags=0x8001, posX=0x1fb0000, posY=0x1df, data=0x0, time=0xef3d) [mouse.c:135] in x11drv (0x406cfbb0) 2 0x40f2e010 X11DRV_MotionNotify+0x60(hwnd=0x10024, event=0x406cfc4c) [mouse.c:613] in x11drv (0x406cfbdc) 3 0x40f24e90 .L79+0xa in x11drv (0x406cfc3c) ... stuff ... -----------<snip>--------------- and then did an 'info local' and got: -----------<snip>--------------- send_mouse_event: struct HWND__* hwnd = 0x00010024 (parameter) long unsigned int flags = 0x00008001 (parameter) long unsigned int posX = 0x01fb0000 (parameter) long unsigned int posY = 0x000001df (parameter) long unsigned int data = 0x00000000 (parameter) long unsigned int time = 0x0000ef3d (parameter) unsigned int state = 0x0000004c (local in register ECX) unsigned int state = 0x0000004c (local in register ECX) struct HWND__* hwnd = 0x01faffff (local in register EAX) long unsigned int data = 0x01faffff (local in register EAX) long unsigned int time = 0x0000ef3d (local in register EDI) struct tagINPUT input = 0x40f61028 (local) int width = 0x00000000 (local in register ESI) int height = 0x00000000 (local) -----------<snip>--------------- After digging around in dlls/x11drv/mouse.c (see the bt output), I found: -----------<snip>--------------- int width = GetSystemMetrics( SM_CXSCREEN ); int height = GetSystemMetrics( SM_CYSCREEN ); /* Relative mouse movements seem not to be scaled as absolute ones */ posX = (((long)posX << 16) + width-1) / width; posY = (((long)posY << 16) + height-1) / height; -----------<snip>--------------- The posX and poxY calculations are the only divides in the send_mouse_event function (pointed to by the bt as the stack location when the divide-by-zero occurred). The 'info local' confirms that width and height are indeed 0. My problem is that I do not think GetSystemMetrics should be returning 0. The display is quite chorked up by the time the unhandled exception occurs, so I'm pretty sure something bad has already happened; I just don't know what. If any x11drv experienced folk can provide pointers or insight, I'd greatly appreciate it. Mike Kost mike -at- tashcorp.net

1 0

problem with linkage of so under RHEL3
by Bill Medland 25 Jun '04

25 Jun '04

Guys (I'll be looking into it tomorrow but I thought I'd see if anyone already knows) Command line application opens a dll using LoadLibrary. That Dll links to odbc odbc uses unixODBC to link to the new Oracle 10g Beta ODBC client. That client so access rather a lot of Oracle libraries Relocation error occurs /usr/local/bin/wine-pthread: relocation error: /opt/oracle/product/10.1.0/client_1/lib/libsqora.so: undefined symbol: SQLGetPrivateProfileString The application can also be built under Linux, as can "That Dll" and link directly to unixODBC. Under that configuration it works fine. In all the messing about with the threading etc can anyone think immediately of where we might have messed up the linking? (Wine is rather old - cvs compile of about 20040408) -- Bill Medland mailto:billmedland@mercuryspeed.com http://webhome.idirect.com/~kbmed

2 3

FW: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Krishna Murthy 25 Jun '04

25 Jun '04

Alexandre, Is these changes looks good? Do I have to submit this patch to 'wine-patches(a)winehq.org' ? Thanks, Krishna -----Original Message----- From: Krishna Murthy Sent: Tuesday, June 22, 2004 2:56 PM To: 'Alexandre Julliard'; Krishna Murthy Cc: wine-devel(a)winehq.org Subject: RE: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier Alexandre, Please find attached modified patch. The method DEFDLG_SetDefButton() now accepts the BOOL bSetDefID parameter to adapt for both DM_SETDEFID and WM_NEXTDLGCTL. Thanks, Krishna -----Original Message----- From: Alexandre Julliard [mailto:julliard@winehq.org] Sent: Friday, June 18, 2004 10:30 AM To: Krishna Murthy Cc: wine-devel(a)winehq.org Subject: Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > No, it is required. The DEFDLG_SetDefButton() is also called from > message DM_SETDEFID. In this case idResult should set to the default > button ID passed. And the current logic of DEFDLG_SetDefButton() does > what is required for DM_SETDEFID. Well, of course you'd need to adapt the DM_SETDEFID handling to the change. I think that's better than sending duplicate messages. -- Alexandre Julliard julliard(a)winehq.org

2 1

does wineshelllink work for use with GNOME?
by Santosh Siddheshwar 25 Jun '04

25 Jun '04

Hi, Does anybody know of the issues when making shortcuts on the main menu on GNOME (redhat 9)? It seems to me that the .desktop files are created under the right folder ($HOME/.gnome/apps) but the shortcuts dont appear on the menu. As far as I could figure the way to go about adding to the main or system menu is to make entries in the Applications.directory file in /etc/X11/desktop-menus and then have your app .desktop files in /usr/share/applications. Why dont the .desktop files under $HOME/.gnome/apps show up on the menu? Any other ideas? Similarly on redhat 9 for KDE the shortcuts seem to be required to be under $HOME/.kde/applnk-redhat but wineshelllink puts them in applnk folder. Is this correct? Thanks in advance! Santosh Siddheshwar ********************************************************************* Disclaimer: The information in this e-mail and any attachments is confidential / privileged. It is intended solely for the addressee or addressees. If you are not the addressee indicated in this message, you may not copy or deliver this message to anyone. In such case, you should destroy this message and kindly notify the sender by reply email. Please advise immediately if you or your employer does not consent to Internet email for messages of this kind. *********************************************************************

1 0

winedbg crashes
by Jon Griffiths 24 Jun '04

24 Jun '04

Hi, I'm having some trouble with the debugger and a large C++ application I'm trying to debug. This seems unrelated to the recent changes that were made (the old debugger used to have issues as well). When my app dies i get the following: wine: Unhandled exception (thread 0009), starting debugger... fixme:console:SetConsoleCtrlHandler (0x405db800,1) - no error checking or testing yet WineDbg starting on pid 0x8 fixme:dbghelp:SymLoadModule should no longer happen fixme:dbghelp:SymLoadModule should no longer happen Unhandled exception: page fault on read access to 0x00000001 in 32-bit code (0x40a272a2). In 32 bit mode. err:dbghelp_stabs:stabs_pts_read_type_def Forward declaration name mismatch _Obj <> __default_alloc_template<true,0> err:dbghelp_stabs:stabs_pts_read_type_def Forward declaration name mismatch _Impl <> locale err:dbghelp_stabs:stabs_pts_read_type_def Forward declaration name mismatch id <> locale wine-pthread: stabs.c:169: stabs_add_include: Assertion `idx >= 0' failed. wine: Unhandled exception (thread 000b), starting debugger... fixme:console:SetConsoleCtrlHandler (0x405db800,1) - no error checking or testing yet WineDbg starting on pid 0xa Unhandled exception: assertion failed in 32-bit code (0xffffe410). In 32 bit mode. 0xffffe410: popl %ebp Wine-dbg> The 'read access to 0x00000001' exception is my app, but the the debugger fails the above assertion and dies. I have stripped the application and .so's for this app (its winelib based), but this doesn't help the crash. I suspect maybe the template brackets may be screwing up the stabs parsing (since template names can contain commas). Has anyone seen something like this before? I'm happy to help debug the problem from this end if that helps. Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail

2 1

strace log of SIGSEGV on FC2
by Vincent Béron 24 Jun '04

24 Jun '04

Here's a strace log of strace ./wine in the root of a current cvs build tree, with wine's preloader debug enabled. It ends with a SIGSEGV. Vincent

1 0

Free application with menu redrawing/flicker loop (window position mismatch?)
by Andreas Mohr 24 Jun '04

24 Jun '04

Hi all, greetings from the Wine booth at LinuxTag! :) (Uwe Bonnes and me are there) The following program which a school employee (4000 pupils!) asked me about that prevents his school administration from switching to Linux has problems with continuous redrawing of the menu bar and non-redrawing of the client area (resulting from continuous menu redrawing?): http://schulverwaltungsprogramme.mswwf.nrw.de/mswf_software/html/winplan.ht… Note that installation runs fine; it's the main program which breaks. The relay log shows signs of a WM_WINDOWPOSCHANGING/WM_WINDOWPOSCHANGED loop or something like that. If someone more familiar with messaging and window management could have a look at it, then I'm sure he'd greatly appreciate it. :) Greetings, Andreas Mohr

2 1

Re: [WineHQ] Updated TODO
by Mike Hearn 24 Jun '04

24 Jun '04

Can I double check that this is actually all there is to it? My reading of the changelog was that this is only the calculations have been moved into the server, but the rest of it has not been. For instance, I haven't checked but it didn't look like InvalidateRect was rewritten. If this is it then I'll resend my LockWindow patch but I think there is more to come ... Alexandre? On Thu, 2004-06-24 at 09:37 -0400, Dimitrie O. Paun wrote: > ChangeLog > Alexander finished moving the visible region handling > to the server. >

2 1

lost vertical and horizontal scroll bar
by Nicolai Kuntze 24 Jun '04

24 Jun '04

Hi, I have here an application (bmed) but I can't see any scrollbars. Is there something I can do? Yours, Nicolai ---- Diese Nachricht wurde auf Viren und andere gefaehrliche Inhalte sowie Spam untersucht.

2 2

RE: LISTBOX_Directory() returns LB_OKAY for invalid directory / f ilen ame
by Krishna Murthy 23 Jun '04

23 Jun '04

It looks like in bug 1435 they wanted to avoid triggering of error if no more files found. But could not understand why they wanted to avoid triggering of error when the specified filename does not exists. In MS windows if File Not found, then it returns error. So we could satisfy both by just doing the following check: > if (le != ERROR_NO_MORE_FILES) return LB_ERR; So the above condition triggers error for all the error conditions except for ERROR_NO_MORE_FILES. Krishna -----Original Message----- From: Alexandre Julliard [mailto:julliard@winehq.org] Sent: Tuesday, June 22, 2004 2:54 PM To: Krishna Murthy Cc: 'Dimitrie O. Paun'; wine-devel(a)winehq.org Subject: Re: LISTBOX_Directory() returns LB_OKAY for invalid directory / f ilen ame Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > Yesssss! got it, stupid mistake.... > It should be... > if ((le == ERROR_NO_MORE_FILES) || (le == ERROR_FILE_NOT_FOUND)) > return LB_ERR; That makes more sense, but it still looks wrong, I don't see why you would ignore all other errors. I suspect what you are really trying to do is to revert the change in rev 1.94, but this causes other problems (cf. bug 1435). I think you'll have to write a regression test for that one. -- Alexandre Julliard julliard(a)winehq.org

2 1

MSVCRT - __unDNameEx
by Andrei Barbu 23 Jun '04

23 Jun '04

Hey, I encountered an app that heavily relies on __unDNameEx which is a stub, and I couldn't find any MSDN info on it. The stub did have a hint as to an implementation of it, said that it's been implemented pretty well in tools/winebuild/msmangle.c I looked for that, couldn't find it, but I did find it in the CVS attic in wine/tools/speckmaker http://cvs.winehq.com/cvsweb/~checkout~/wine/tools/specmaker/Attic/msmangle… Is there a reason this isn't used there? or can I clean it up a little and include it? Yes it does have some fixme's, but it's better than ignoring it. Thanks, Andrei

4 3

Control.exe Replacement
by Steven Edwards 23 Jun '04

23 Jun '04

Hello, This a replacement control panel that was developed for ReactOS until the Control Panel namespace in Shell32 is done. Its far from perfect but seems to be a little better than the older implementation. Feedback is welcome. Thanks Steven Changelog: Gero Kuehn (reactos.filter(a)gkware.com) Control.exe replacement __________________________________ Do you Yahoo!? New and Improved Yahoo! Mail - 100MB free storage! http://promotions.yahoo.com/new_mail

2 2

Re: Make sure that both deactivated and activated MDI children receive WM_MDIACTIVATE message in all cases
by Alexandre Julliard 23 Jun '04

23 Jun '04

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > Changelog: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Make sure that both deactivated and activated MDI children > receive WM_MDIACTIVATE message in all cases. This is causing test failures here: win.c:1449: Test failed: rects do not match win.c:1449: Test failed: rects do not match win.c:1449: Test failed: rects do not match win.c:1449: Test failed: rects do not match win.c:1449: Test failed: rects do not match win.c:1449: Test failed: rects do not match make: *** [win.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

2 1

Setting up drive letters without wineinstall?
by Dan Kegel 22 Jun '04

22 Jun '04

OK, if wineinstall is no longer needed, how does one get drive letters set up? The doc on winehq seems to still tell people to edit the config file. If one does that, wine will then create the symlinks, but there's no doc on how to do it yourself... -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

6 5

RE: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Krishna Murthy 22 Jun '04

22 Jun '04

Alexandre, Please find attached modified patch. The method DEFDLG_SetDefButton() now accepts the BOOL bSetDefID parameter to adapt for both DM_SETDEFID and WM_NEXTDLGCTL. Thanks, Krishna -----Original Message----- From: Alexandre Julliard [mailto:julliard@winehq.org] Sent: Friday, June 18, 2004 10:30 AM To: Krishna Murthy Cc: wine-devel(a)winehq.org Subject: Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > No, it is required. The DEFDLG_SetDefButton() is also called from > message DM_SETDEFID. In this case idResult should set to the default > button ID passed. And the current logic of DEFDLG_SetDefButton() does > what is required for DM_SETDEFID. Well, of course you'd need to adapt the DM_SETDEFID handling to the change. I think that's better than sending duplicate messages. -- Alexandre Julliard julliard(a)winehq.org

1 0

RE: LISTBOX_Directory() returns LB_OKAY for invalid directory / f ilen ame
by Krishna Murthy 22 Jun '04

22 Jun '04

Yesssss! got it, stupid mistake.... It should be... if ((le == ERROR_NO_MORE_FILES) || (le == ERROR_FILE_NOT_FOUND)) return LB_ERR; Thanks, Krishna -----Original Message----- From: Dimitrie O. Paun [mailto:dpaun@rogers.com] Sent: Tuesday, June 22, 2004 2:01 PM To: Krishna Murthy Cc: 'Alexandre Julliard'; wine-devel(a)winehq.org Subject: Re: LISTBOX_Directory() returns LB_OKAY for invalid directory / f ilen ame On Tue, Jun 22, 2004 at 11:08:28AM -0700, Krishna Murthy wrote: > The 'le' is an integer value and not a bitwise value. This means it > could have only one error condition at a time. Right. Because of this fact: > if ((le != ERROR_NO_MORE_FILES) || (le != ERROR_FILE_NOT_FOUND)) > return LB_ERR; Will always return LB_ERR. Proof: (le != ERROR_NO_MORE_FILES) || (le != ERROR_FILE_NOT_FOUND) ## by deMorgan's Law == !((le == ERROR_NO_MORE_FILES) && (le == ERROR_FILE_NOT_FOUND)) ## by transitivity == !(ERROR_NO_MORE_FILES == ERROR_FILE_NOT_FOUND) ## by the definition of these error codes == !(18 == 2) ## different numbers are not equal == !(FALSE) ## by negation == TRUE ;) -- Dimi. P.S. I haven't done a formal proof since I was doing my M.Sc. at UofT :)

2 1

RE: LISTBOX_Directory() returns LB_OKAY for invalid directory / f ilen ame
by Krishna Murthy 22 Jun '04

22 Jun '04

The 'le' is an integer value and not a bitwise value. This means it could have only one error condition at a time. The condition: if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; Could never return LB_ERR even if file was not found. Hence we have changed to the logical OR condition which could trigger error either if no more files or file not found: if ((le != ERROR_NO_MORE_FILES) || (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; Please find attached sample executable (DIRLIST.exe.zip has the executable), which demonstrate the behavior change between windows and wine. Run the sample and enter invalid path name or file name and press enter (click on Display button). On windows it displays error message "DlgDirList Failed...". Same steps when repeated on wine, it does not display this error message because of the above logical error. Krishna -----Original Message----- From: Alexandre Julliard [mailto:julliard@winehq.org] Sent: Friday, June 18, 2004 11:20 AM To: Krishna Murthy Cc: wine-devel(a)winehq.org Subject: Re: LISTBOX_Directory() returns LB_OKAY for invalid directory / filen ame Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > diff -u -r1.103 listbox.c > --- wine/controls/listbox.c 1 Apr 2004 04:57:12 -0000 1.103 > +++ wine/controls/listbox.c 17 Jun 2004 21:50:20 -0000 > @@ -1760,7 +1760,7 @@ > if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) > { > int le = GetLastError(); > - if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; > + if ((le != ERROR_NO_MORE_FILES) || (le != > + ERROR_FILE_NOT_FOUND)) return LB_ERR; This makes the test completely useless, it can't be right. -- Alexandre Julliard julliard(a)winehq.org

2 1

Port to native x86_64?
by Sean Kormilo 22 Jun '04

22 Jun '04

Greetings - I'm interested in porting Wine to run in native x86_64 mode, and was wondering if anyone had attempted to do such a thing already? I notice that there does not appear to be any support in CVS to do this, but figured that perhaps someone else is already undertaking such an effort. My main motivation for doing so has to do with video driver support, in that the 32bit "emulated" applications are unable to use the 64bit 3D accelerated drivers, and fall back to software rendering - which is less than ideal. While this may eventually be resolved by the device drivers, I'd rather not wait for them. Any comments, or hints as to what needs to be done (other than the obvious compile time fixes) would be appreciated. I've got software development experience, but none porting code from a 32bit architecture to a 64bit one. Thanks! Sean.

2 3

Re: bug in sound support?
by Ivan 22 Jun '04

22 Jun '04

I haven't tested any non-directx software, anyway, both the winmm and dsound tests give quite a few errors, the logs are attached. I can hear the test tones, BTW the dsound one is much louder than the winmm one for no obvious reason. Ivan.

1 0

bug in sound support?
by Ivan 22 Jun '04

22 Jun '04

Wine oss doesn't work with the via82cxxx_audio audio driver shipped in the linux kernel, no other app has any problems, so I'm wondering if it's wine related. What info is needed to debug this? Ivan.

2 1

Problem with Soundblaster Live and Wine
by Constantin Bergemann 22 Jun '04

22 Jun '04

Hi, I have a problem with my Soundblaster Live and Wine. When running Windows Applications, they often set the mixer level for the PCM channel to 100%. However, the Soundblaster Live under Linux tends to sound a bit dirty at these levels, you have to use values under 80%. Is there anything I can do to tell wine to let this value unchanged? I am using ALSA and the OSS module of wine. Is anyone even aware of this problem? Thanks, Tony.

2 1

Re: Donations - RFC
by Brian Vincent 21 Jun '04

21 Jun '04

> >I would say sponsoring Wineconf 2005 would be a better idea (so we could go > >somewhere exotic (not that St Paul in winter was not exotic in a kinda > >perverted way for most of us :-) )). > > > > > I have volunteered to organize it in Cyprus. I've already started > lobbying for that location. After last year's last minute "hey, it's > more comfortable in the US" change, I decided that long term preparation > for votes, like you do in any self-disrespecting parliament, is the only > way to go. I just a did a quick search and found that airfare to Cyprus is about twice that of anywhere in western Europe. That's about what I would expect too. The cheapest flights from North America are generally into London, Paris, Amsterdam, or Frankfurt. Sometimes Madrid and Rome are reasonable too. Cyprus also adds a fair amount of travel time. Don't get me wrong - Cyprus would be a cool destination and I would love to travel there. It's also wonderful someone is will to try to organize a location other than North America. However, I'm willing to bet a Cyprus location will be such an inconvenient place to get to that we'd keep a lot of people away.

2 1

Re: new shell32 icons
by Mike Hearn 21 Jun '04

21 Jun '04

On Sun, 2004-06-20 at 21:55 -0400, Chris Morgan wrote: > *dlls/shell32/shres.rc: > Royce improved the 8bit versions of the icons but an unknown ReactOS author > drew these icons. > Improve shell32 icons. > > I've attached an image from my xp machine that has the old and new icons so > people can judge for themselves whether they are an improvement or not. I have to admit they are a big improvement but they seem to have been scaled badly at some point - the new icons seem rather fuzzy? Also you'll note that Crystal uses totally different icons for small sizes, maybe we should be using these as they are used in the filepicker.

1 0

Re: new shell32 icons
by Steven Edwards 21 Jun '04

21 Jun '04

Hi --- Chris Morgan <cmorgan(a)alum.wpi.edu> wrote: > *dlls/shell32/shres.rc: > Royce improved the 8bit versions of the icons but an unknown ReactOS > author > drew these icons. > Improve shell32 icons. There were donated to ReactOS by Everaldo Coelho from the Crystal Icon set. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail

1 0

winegcc and winemaker- a few minor bugs
by Steven Edwards 21 Jun '04

21 Jun '04

Hola, I noticed two minor bugs when porting some sample DirectX code. 1. MSVC and Borland both allow for WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) where under winegcc you will get the following error: "winmain.cpp:187: error: ISO C++ forbids declaration of `WinMain' with no type". If you change it to: int APIENTRY WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) Then it will compile fine. So should we work around the incorrectness of code allowed for by other compilers? Or document the changes that you will run in to porting C++ from other compilers? 2. Winemaker does not import all of the import libs from the MS_VC makefile. When building my projects it does not link to ddraw even though the MS_VC makefile has ddraw.lib in it. So I will get the following warning on linking: winmain.o(.text+0xd5): In function `DoModeEnumeration(HWND__*)': : warning: undefined reference to `DirectDrawCreateEx' It needs to be a error rather than a warrning. When you try and run the program of course you get the following: [steven@steven enummode]# wine enummode.exe.so wine: could not load L"Z:\\mnt\\src\\tmp\\MSVC\\Chapters 11-15 (DirectDraw_ requires DirectX 7 or 8)\\enummode\\enummode.exe.so": /steven/.wine/dosdevices/z:/mnt/src/tmp/MSVC/Chapters 11-15 (DirectDraw_ requires DirectX 7 or 8)/enummode/enummode.exe.so: undefined symbol: DirectDrawCreateEx So of course adding ddraw to the imports in the Makefile fixes it. Other then these two bugs, (one of which is the other compilers fault for allowing bad code) I have had no problems with anything I have thrown at winemaker and winegcc. Nice work Dimi and Francois! Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Mail Address AutoComplete - You start. We finish. http://promotions.yahoo.com/new_mail

2 1

Game Testing Update - 20040615
by Mike Kost 21 Jun '04

21 Jun '04

Here a continuation of my game testing efforts. Same rules still apply in my efforts: All games tested are freely available as demos or F/OSS games on the Internet and they don't work right. Since my last report: - No bugs have closed - 2 more bugs filed - - #2299: Static in Dominions II Demo Audio - - #2300: Galactic Civilizations demo dies with unhandled exception - Finally started testing Galactic Civilizations Galactic Civilization Summary ----------------------------- Galactic Civilization is a bit grumpy and requires both a DCOM9x and an IE install to work correctly. It installed, but died with an unhandled exception when the game was started. Filed bug #2300 http://www.tashcorp.net/Wine/GalCiv/galciv-20040615.html Austerlitz Summary ------------------ There were no noticable changes over 20040505 testing. http://www.tashcorp.net/Wine/Austerlitz/austerlitz-20040615.html Dominions II ------------ There were no changes over 20040505, but I turned on the speakers and noticed that there was static in the audio at the startup screen. This was filed as bug #2299. http://www.tashcorp.net/Wine/DominionsII/dominionsII-20040615.html Remote Assault -------------- There were no noticable changes over 20040505 testing. http://www.tashcorp.net/Wine/RemoteAssault/remoteassault-20040615.html

1 0

Donations - RFC
by Jeremy White 21 Jun '04

21 Jun '04

Hi Everyone, Say, I've gotten in a few fairly generous donations lately, and so the Wine fund has a bit of money (around $800, afair). Now, the bulk of that is marked for embezzlement <g>, but it does leave a bit left over that could go to help Wine. The question is: how could that money be spent effectively? I have several thoughts on this, but would like to open it up for discussion. My suggestions are: * Buy software for proven Wine hackers If Wine hackers are lacking for licensed software, I could buy + ship it to them. My financially prudent side suggests that games would be a great way to do that, because we can buy a lot of games for $800, and only 1 copy of MS Office for the same price... :-/ The trouble with this idea is that the few times I've tried to offer software to Lionel and others they tell me that they have all they need. * Sponsor Wineconf 2005 We spent about $1500 of the Wine fund sponsoring some folks to travel to Wineconf this year. We could similarly use the funds for the next Wineconf. That suggests saving it for this purpose would be prudent. Thoughts? Suggestions? Comments? Cheers, Jeremy

4 4

Re: Incoming Message
by Twickline 21 Jun '04

21 Jun '04

1 0

Re: docu update
by Ivan 20 Jun '04

20 Jun '04

> I've tried binary wine packages on a few occasions > and *always* had major problems. Wine, and more importantly the things A user recently accidentally tried the Mandrake RPM on Red Hat and it wouldn't even run notepad. I build with no patches, no special stuff, just configure/make depend/make/make install Ivan.

2 1

Re: [USER] 'Fix' SetWindowsHookEx
by Alexandre Julliard 20 Jun '04

20 Jun '04

Lionel Ulmer <lionel.ulmer(a)free.fr> writes: > I have actually no idea what exactly is what Windows is doing there, but > this attached patch seems to do the trick. I have no idea if it's correct > though (as I do not know if what GetModuleHandle returns is really the same > thing as what SetWindowsHookEx expects as an HINSTANCE input). This doesn't look right, it doesn't make sense to create a system-wide hook without an instance, since in that case there is no way to call the function in other processes. This requires more investigation to find out exactly what Windows does in this case. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: docu update
by Alexandre Julliard 20 Jun '04

20 Jun '04

"Ivan" <puoti(a)inwind.it> writes: > This patch has been written thinking that a) it's better to have no doc than an > out of date one and b) most of the stuff that's commented out can be easily > re-written before the next release (I have school holidays until september so I > have lots of time to do this). wineinstall is not out of date, it still works fine, I don't see any reason to remove it from the doc. -- Alexandre Julliard julliard(a)winehq.org

6 20

Device drivers in Wine
by Damjan Jovanovic 20 Jun '04

20 Jun '04

Hi Basically, I have a Windows user-space device driver, and I need to get it working under Linux. I note Wine has some "device" functions (FILE_CreateDevice(), and DOSFS_OpenDevice()). How do these work and what do they do? Are they documented anywhere? And is there a way to open and use a Windows DLL from a Linux program? Thanks Damjan __________________________________ Do you Yahoo!? Yahoo! Mail - Helps protect you from nasty viruses. http://promotions.yahoo.com/new_mail

2 3

winemaker problems for creating winelib DLL projects
by Shachar Shemesh 20 Jun '04

20 Jun '04

Hi all, I'm trying to create a winelib DLL project from scratch. You can reproduce using the following steps: create a file called "name.c", put the following content in it: int func( int a ) { return a+1; } Create a file called "name.spec". Put the following content in it: @ cdecl func( long ) In this directory, run "winemaker --dll ." Run "make". I would expect, at this stage, to get a file called "name.dll.so". Instead, I get a file called "name.dll.exe.so", with which I cannot link other applications, even if I try to rename it to "name.dll.so". Am I doing something wrong here? Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

2 2

Re: docu update
by Ivan 20 Jun '04

20 Jun '04

> Why is that? I have no idea, but X11drv doesn't initialize properly. This has been reported by users, I don't have x.org myself. Ivan.

2 1

Attn Christian - Last texops patch
by Ann and Jason Edmeades 20 Jun '04

20 Jun '04

Hi Christian - I tried to sent you an email but it bounced... Are you sure that patch is correct (I've only glanced at it though!), as I thought the src1 was set from GetSrvcAndOpFromValue, and this should already handle the ONE_MINUS* type values? Jason

1 0

Re: Fix winedbg stack_backtrace on non i386
by Eric Pouech 20 Jun '04

20 Jun '04

emmanuel maillard a écrit : > Hi, > > stack.c fail to build on ppc host due to CONTEXT_SEGMENTS flag, wich is > only define for i386 host. > > > ChangeLog: > Fix compilation error on non-i386 in stack_backtrace. > we shouldn't need the __i386__ tests in the winedbg code, except in the CPU specific files (be_*.c). IMO, we should do something like this: Index: stack.c =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/programs/winedbg/stack.c,v retrieving revision 1.3 diff -u -u -r1.3 stack.c --- stack.c 4 Jun 2004 00:59:16 -0000 1.3 +++ stack.c 20 Jun 2004 07:45:37 -0000 @@ -119,7 +119,11 @@ return; } memset(&ctx, 0, sizeof(ctx)); - ctx.ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS; + ctx.ContextFlags = CONTEXT_CONTROL +#ifdef CONTEXT_SEGMENTS + | CONTEXT_SEGMENTS +#endif + ; if (SuspendThread(thread->handle) == -1 || !GetThreadContext(thread->handle, &ctx))

1 0

Re: Msg reply
by Johane 20 Jun '04

20 Jun '04

1 0

RE: Incoming Msg
by Twickline 20 Jun '04

20 Jun '04

1 0

Lotus SmartSuite '97 nonfunctional
by Dan Kegel 20 Jun '04

20 Jun '04

In the same yard sale where I bought Lotus SmartSuite '96 (whose Lotus 1-2-3 works under wine-20040615), I also bought the '97 version. I had numerous problems with the '97 version. Its installer failed while installing Word Pro (though it seemed to install Lotus 1-2-3). Lotus 1-2-3 fails with numerous errors when loading a small file or even starting without any file. Something (maybe heavier use of OLE?) changed from the '96 to '97 versions such that Wine is much less happy running the '97 version. If anyone's interested, I can post more details. - Dan -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

1 0

Re: docu update
by Ivan 20 Jun '04

20 Jun '04

> Why is that? Adam Schreiber may know as slackware he build 2 binaries for slack users using xfree86 and x.org, you can reach him at shipssadam -at - clemson.edu Ivan.

1 0

Re: docu update
by Ivan 20 Jun '04

20 Jun '04

> Maybe, but for example Mandrake users won't get wine listed in the "remove > software" utility, and that will be confusing > Solving that problem is a desktop issue, I've done a bit of work on it but nothing has got into mainstream yet. OK, but in the mean time I still don't see how one binary can fit all needs, if a binary build for X.org wo'nt run on XFree86 and vice-versa > I don't see why it'd slow down after we freeze libwine, it's not that > many functions... Not all users care, some people still use linux 1.0 > So the user has to upgrade ... and ? use CVS even if he didn't/doesn't want to, that isn't a bug issue but it also isn't a nice thing. > So it could have been anything, in other words. I'd need to see hard > figures in a controlled environment. I can send you a copy of Linux Magazine, I should still have a copy somewhere. You'll have to translate it with google or something because it's in Italian. Also, form sutopackage.org > Nobody should produce any .package files for their own projects until we've hit version 1 I guess we won't be using it too soon anyway.

1 0

IconsDir
by Vitaly Lipatov 20 Jun '04

20 Jun '04

Does anyone knows why we have not in registry Software\\Wine\\Wine\\Config\\Wine\IconsDir entry? winemenubuilder can't extract any icons without this dir. -- Lav Vitaly Lipatov Russia, Saint-Petersburg GNU! ALT Linux Team! LaTeX! LyX!

1 0

Re: docu update
by Ivan 19 Jun '04

19 Jun '04

About building one binary of wine for all distros, it's interesting to notice that one the same distro you need different binaries depending on if you're using xfree86 or x.org. Ivan.

2 1

Re: docu update
by Ivan 19 Jun '04

19 Jun '04

> Anyway, Wine doesn't have any menu > integration. And why shouldn't we have the wine programs in the menu? > Compiling it as i586 or i686 should be fine, very few people use > processors old enough to barf on it Sure. > That's what apbuild solves. It lets you compile for glibc 2.2 on a 2.3 > system, amongst other things. And what if the user wants a glibc 2.3 build? > Yes, we still do that, but most people use the Loki installer - in fact > I'm pretty sure it's the most popular by a long way. Maybe, but for example Mandrake users won't get wine listed in the "remove software" utility, and that will be confusing > 1.0 implies API stability, not that it's suddenly good enough that > people won't want to upgrade. I presume by then wine won't change so quickly. And the average user (the average pc user, not the average linux geek) is lazy and often doesn't upgrade if he doesn't have to > That's entirely wrong, it works fine. What did you think the recent > high-gig mmap patches were for? they won't help wine-20040615 any more. > Also some distros are built for i386, others for i586 and others for i686, how can you > have one binary for all, force them to all use i386 (That will be about 30% > slower that a i586 build)? > Just build them for i586 or i686, like I said, that should work just > fine. I really doubt anybody is running Wine on a system that can't cope > with an i586 compiled binary. 30% sounds extremely high anyway, I'd want > to see hard figures on that. That was a benchmark done by comparing Red Hat and Mandrake, it was a few months ago. > Sure, it may be possible to build one binary and run > it anywhere, but in most cases it wouldn't run as well (and as fast) as a build > done natively on the distro. Actually, yes it is. Go read the docs on autopackage.org to find out how. > would be somewhat suboptimal as we sacrifice speed for flexibility and distro neutrality. Do we NEED to sacrifice such things? Also we can't use it until version 1.0, it will be reasonable to look at this then. Ivan.

2 1

Re: docu update
by Ivan 19 Jun '04

19 Jun '04

> (a) and (b) can be solved by WineHQ providing its own distro-neutral, run > anywhere binary packages. This isn't easy to do, and it means you have to A) Leave out some features (mime types, menus, that most distros handle in a different way) or B) package menu/mime stuff for all distros, meaning the user downloads a big binary but will only need part of it. Also, it means we have it compiled for only one architecture. But not all distros use the same one. For example, all software on Mandrake linux is built for i586, and I don't see why that should change. Also how can you have one binary work on platforms that are so different? For example, some users will still use (and want to use) systems that use glibc 2.2, so what do you do, ship 2 binaries for the different versions of glibc? Also, lots of users like to install software using the native packaging system of their distro, infect CodeWeavers now provides native Debs and RPMs of crossover, or at least it did at some point (Not sure if this is still true). Now, if wine was shipped on a CD (Could be done for 1.0 that won't change for some time), we could just have an installer that detected the distro, and installed the appropriate files, but if users have to download (Remember many users still use 56k modems, and that will stay true for quite some time) they only want to have what they really need. I think we won't be able to have a single binary that works on all distros, they are all just to different, for example wine currently doesn't work on FC2 at all, but works perfectly on other distros. Also some distros are built for i386, others for i586 and others for i686, how can you have one binary for all, force them to all use i386 (That will be about 30% slower that a i586 build)? Sure, it may be possible to build one binary and run it anywhere, but in most cases it wouldn't run as well (and as fast) as a build done natively on the distro. Ivan.

2 1

Yum repository for wine
by Leonardo Quijano Vincenzi 19 Jun '04

19 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I can't help but notice that there's no Yum repository for Wine. Or at least I haven't found it yet ;). So, would it be too hard to setup one? In case anyone needs instructions, there is a tutorial here: http://fedoranews.org/alex/tutorial/yum/ Leonardo -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFA1JEnnuk7PwJlZIURArRtAKC0tlERDAHam+J5TbOTclwSZS/aXgCgsQl0 3IwAd4mFH4JLFx4aOcEy7pk= =Cwf0 -----END PGP SIGNATURE-----

2 1

Investigating a crash at startup
by Phil Krylov 19 Jun '04

19 Jun '04

Hello, I have a program here (IBM Translation Manager v.6.0.4) which crashes wine at startup. The program loads a DLL, and Wine starts importing this DLL's imports from kernel32.dll. It crashes on the first import in dlls/ntdll/loader.c:453, which says: thunk_list->u1.Function = (PDWORD)find_named_export( imp_mod, exports, exp_size, pe_name->Name, pe_name->Hint ); This causes an exception because thunk_list happens to be located in .rdata section of the DLL, which is readonly. Currently I have hacked this around by making all PE sections read-write in map_image() in dlls/ntdll/virtual.c, and the program works. If a Wine guru would like to investigate this problem, I can give any support (e.g., ssh access to my computer with the program). If not - I will be using this hacked version of Wine. -- Best regards, Phil mailto:phil@newstar.rinet.ru

2 4

Fax Message Received
by Twickline 19 Jun '04

19 Jun '04

1 0

Re: Thanks :)
by Twickline 19 Jun '04

19 Jun '04

1 0

Forum notify
by Johane 19 Jun '04

19 Jun '04

1 0

Where does richedit20.dll fit in the to-do list?
by Dan Kegel 19 Jun '04

19 Jun '04

I keep running into apps that won't run without richedit20.dll, yet I can't see any mention of that DLL in the wine 0.9 or wine 1.0 tasklists. Surely it's important enough to merit at least a mention in the wine 1.0 tasklist? - Dan -- My technical stuff: http://kegel.com My politics: see http://www.misleader.org for examples of why I'm for regime change

3 3

font problems with "Hello" application
by Matt Beaumont 19 Jun '04

19 Jun '04

There is a font that displays _extremely_ poorly in the tooltips for the "Hello" photo-sharing application (<http://www.hello.com/>, harmless(?) registration required for download). I'm running the 6/15 wine source package, installed with "make install". Hello wants riched20.dll before it will do anything useful; this can be acquired at <http://www.dll-files.com/dllindex/dll-files.shtml?riched20>. The problem can be reproduced by bringing up a tooltip for one of the checkboxes on the login screen; it shows a completely unreadable string. I've been looking at the output from the font and tooltip WINEDEBUG channels, and haven't found anything screamingly obvious. Does anybody have a suggestion for other channels to look at, or places to look in the source? Thanks, Matt

2 3

Re: docu update
by Ivan 19 Jun '04

19 Jun '04

> I want to be able to say to a user who reported a bug "please try latest CVS > and confirm that it is fixed" without having to tell them about > configure or LD_LIBRARY_PATH or whatever If they've reported a bug, and you've told them to try the CVS, then it's not a configuration problem, so configure has been run and LD_LIBRARY_PATH is set correctly. Apart from this, all this sort of stuff can be done in the build system anyway. Also removing wineinstall is on the todo, and it does nothing that can't be handled (more transparently) elsewhere. Ivan.

1 0

Re: docu update
by Ivan 18 Jun '04

18 Jun '04

> wineinstall is not out of date, it still works fine, I don't see any > reason to remove it from the doc. I see no reason to leave it, it's now as if it did anything essential for wine. Usually things are first removed from wine, and then from the documentation, this causes an afoul lot of confusion, because people tend to really trust the docs. So it would be a good idea to remove the docs about wineinstall before we remove wineinstall, and as wine can be built and run perfectly well without it I don't see why we should keep it in the docs. Also the documentation about the config will have to be re-written, as soon everything will be done with winecfg of regedit, and as that will take a non trivial amount of time, it's a good idea to start well in advance, so the docs aren't behind wine when the switch is done. Ivan.

1 0

wine window disappears from virtual desktop!
by Paul R Streitman 18 Jun '04

18 Jun '04

Last week, I appended about this problem: Application windows under wine disappear if you switch to a different virtual desktop and then back under either AfterStep or Enlightenment window managers. The program is still apparently running (according to top), but there is no way to retrieve it and it no longer appears in the window manager's window list. It has to be killed off and restarted. I have now isolated the problem to the change made to wine/dlls/x11drv/winpos.c in patch http://cvs.winehq.org/patch.py?id=12173 on 4/27/2004. I do not know enough to take it further. For what it is worth, today's cvs wine with a 4/26 version of winpos.c seems to work just fine. Thanks, Paul z/OS core components development Internet: prs(a)us.ibm.com

2 2

Re: LISTBOX_Directory() returns LB_OKAY for invalid directory / filen ame
by Alexandre Julliard 18 Jun '04

18 Jun '04

Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > diff -u -r1.103 listbox.c > --- wine/controls/listbox.c 1 Apr 2004 04:57:12 -0000 1.103 > +++ wine/controls/listbox.c 17 Jun 2004 21:50:20 -0000 > @@ -1760,7 +1760,7 @@ > if ((handle = FindFirstFileW(filespec, &entry)) == INVALID_HANDLE_VALUE) > { > int le = GetLastError(); > - if ((le != ERROR_NO_MORE_FILES) && (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; > + if ((le != ERROR_NO_MORE_FILES) || (le != ERROR_FILE_NOT_FOUND)) return LB_ERR; This makes the test completely useless, it can't be right. -- Alexandre Julliard julliard(a)winehq.org

1 0

[RFC] [MSVCRT] Removing the MSVCRT() hack
by Dimitrie O. Paun 18 Jun '04

18 Jun '04

Here is a patch that separates the implementation headers from the public ones. It's not yet ready for inclusion, but it's pretty close, so I'm sending it off to the list for comments. Some of the things in here: -- cleanup of naming conventions. Things shared with the public header *always* start with MSVCRT_ -- stuff that's private, doesn't start with MSVCRT_ From this two rules follows that a symbol starts with MSVCRT_ if and only if it's shared with the public headers, where it appears without MSVCRT_ -- most private functions start with msvcrt_ now, a convetion that was already in place, but not followed to the letter -- there is a sh script that uses this simple rule to generate the test file. Do we integrate the script with the build system? What's left to do: -- if we keep the test generation script, it needs to get integrated in the build system -- there are still a bunch of functions that are shared with the public headers that don't have the MSVCRT_ prefix. They need to be renamed -- more cleanup in the public headers, remove the MSVCRT_ from the sentries. Comments, flames, etc. appreciated. It's been sitting on my HD long enough, it's time to get it into the tree. -- Dimi. Index: include/msvcrt/conio.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/conio.h,v retrieving revision 1.5 diff -u -r1.5 conio.h --- include/msvcrt/conio.h 18 Jul 2003 22:57:15 -0000 1.5 +++ include/msvcrt/conio.h 16 Jun 2004 05:54:16 -0000 @@ -39,7 +39,6 @@ #endif -#ifndef USE_MSVCRT_PREFIX static inline char* cgets(char* str) { return _cgets(str); } static inline int cputs(const char* str) { return _cputs(str); } static inline int getch(void) { return _getch(); } @@ -62,6 +61,4 @@ #define cscanf _cscanf #endif /* __GNUC__ */ -#endif /* USE_MSVCRT_PREFIX */ - #endif /* __WINE_CONIO_H */ Index: include/msvcrt/ctype.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/ctype.h,v retrieving revision 1.6 diff -u -r1.6 ctype.h --- include/msvcrt/ctype.h 26 Apr 2004 23:31:39 -0000 1.6 +++ include/msvcrt/ctype.h 16 Jun 2004 05:54:16 -0000 @@ -11,14 +11,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -26,23 +18,17 @@ #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif -#ifndef USE_MSVCRT_PREFIX -# ifndef WEOF -# define WEOF (wint_t)(0xFFFF) -# endif -#else -# ifndef MSVCRT_WEOF -# define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) -# endif -#endif /* USE_MSVCRT_PREFIX */ +#ifndef WEOF +#define WEOF (wint_t)(0xFFFF) +#endif #ifndef _WCTYPE_T_DEFINED -typedef unsigned short MSVCRT(wint_t); -typedef unsigned short MSVCRT(wctype_t); +typedef unsigned short wint_t; +typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif @@ -58,46 +44,46 @@ #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ -int MSVCRT(__isascii)(int); -int MSVCRT(__iscsym)(int); -int MSVCRT(__iscsymf)(int); -int MSVCRT(__toascii)(int); -int MSVCRT(_isctype)(int,int); -int MSVCRT(_tolower)(int); -int MSVCRT(_toupper)(int); -int MSVCRT(isalnum)(int); -int MSVCRT(isalpha)(int); -int MSVCRT(iscntrl)(int); -int MSVCRT(isdigit)(int); -int MSVCRT(isgraph)(int); -int MSVCRT(islower)(int); -int MSVCRT(isprint)(int); -int MSVCRT(ispunct)(int); -int MSVCRT(isspace)(int); -int MSVCRT(isupper)(int); -int MSVCRT(isxdigit)(int); -int MSVCRT(tolower)(int); -int MSVCRT(toupper)(int); +int __isascii(int); +int __iscsym(int); +int __iscsymf(int); +int __toascii(int); +int _isctype(int,int); +int _tolower(int); +int _toupper(int); +int isalnum(int); +int isalpha(int); +int iscntrl(int); +int isdigit(int); +int isgraph(int); +int islower(int); +int isprint(int); +int ispunct(int); +int isspace(int); +int isupper(int); +int isxdigit(int); +int tolower(int); +int toupper(int); #ifndef MSVCRT_WCTYPE_DEFINED #define MSVCRT_WCTYPE_DEFINED -int MSVCRT(is_wctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(isleadbyte)(int); -int MSVCRT(iswalnum)(MSVCRT(wint_t)); -int MSVCRT(iswalpha)(MSVCRT(wint_t)); -int MSVCRT(iswascii)(MSVCRT(wint_t)); -int MSVCRT(iswcntrl)(MSVCRT(wint_t)); -int MSVCRT(iswctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(iswdigit)(MSVCRT(wint_t)); -int MSVCRT(iswgraph)(MSVCRT(wint_t)); -int MSVCRT(iswlower)(MSVCRT(wint_t)); -int MSVCRT(iswprint)(MSVCRT(wint_t)); -int MSVCRT(iswpunct)(MSVCRT(wint_t)); -int MSVCRT(iswspace)(MSVCRT(wint_t)); -int MSVCRT(iswupper)(MSVCRT(wint_t)); -int MSVCRT(iswxdigit)(MSVCRT(wint_t)); -MSVCRT(wchar_t) MSVCRT(towlower)(MSVCRT(wchar_t)); -MSVCRT(wchar_t) MSVCRT(towupper)(MSVCRT(wchar_t)); +int is_wctype(wint_t,wctype_t); +int isleadbyte(int); +int iswalnum(wint_t); +int iswalpha(wint_t); +int iswascii(wint_t); +int iswcntrl(wint_t); +int iswctype(wint_t,wctype_t); +int iswdigit(wint_t); +int iswgraph(wint_t); +int iswlower(wint_t); +int iswprint(wint_t); +int iswpunct(wint_t); +int iswspace(wint_t); +int iswupper(wint_t); +int iswxdigit(wint_t); +wchar_t towlower(wchar_t); +wchar_t towupper(wchar_t); #endif /* MSVCRT_WCTYPE_DEFINED */ #ifdef __cplusplus @@ -105,11 +91,9 @@ #endif -#ifndef USE_MSVCRT_PREFIX static inline int isascii(int c) { return __isascii(c); } static inline int iscsym(int c) { return __iscsym(c); } static inline int iscsymf(int c) { return __iscsymf(c); } static inline int toascii(int c) { return __toascii(c); } -#endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_CTYPE_H */ Index: include/msvcrt/direct.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/direct.h,v retrieving revision 1.6 diff -u -r1.6 direct.h --- include/msvcrt/direct.h 16 Mar 2004 19:17:11 -0000 1.6 +++ include/msvcrt/direct.h 16 Jun 2004 05:54:16 -0000 @@ -11,14 +11,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -26,18 +18,18 @@ #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif #ifndef MSVCRT_DISKFREE_T_DEFINED #define MSVCRT_DISKFREE_T_DEFINED -struct MSVCRT(_diskfree_t) { +struct _diskfree_t { unsigned int total_clusters; unsigned int avail_clusters; unsigned int sectors_per_cluster; @@ -56,11 +48,11 @@ #ifndef MSVCRT_WDIRECT_DEFINED #define MSVCRT_WDIRECT_DEFINED -int _wchdir(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)* _wgetcwd(MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)* _wgetdcwd(int,MSVCRT(wchar_t)*,int); -int _wmkdir(const MSVCRT(wchar_t)*); -int _wrmdir(const MSVCRT(wchar_t)*); +int _wchdir(const wchar_t*); +wchar_t* _wgetcwd(wchar_t*,int); +wchar_t* _wgetdcwd(int,wchar_t*,int); +int _wmkdir(const wchar_t*); +int _wrmdir(const wchar_t*); #endif /* MSVCRT_WDIRECT_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/dos.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/dos.h,v retrieving revision 1.5 diff -u -r1.5 dos.h --- include/msvcrt/dos.h 16 Mar 2004 19:17:11 -0000 1.5 +++ include/msvcrt/dos.h 16 Jun 2004 05:54:16 -0000 @@ -22,7 +22,7 @@ #ifndef MSVCRT_DISKFREE_T_DEFINED #define MSVCRT_DISKFREE_T_DEFINED -struct MSVCRT(_diskfree_t) { +struct _diskfree_t { unsigned int total_clusters; unsigned int avail_clusters; unsigned int sectors_per_cluster; @@ -35,7 +35,7 @@ extern "C" { #endif -unsigned int MSVCRT(_getdiskfree)(unsigned int, struct MSVCRT(_diskfree_t) *); +unsigned int _getdiskfree(unsigned int, struct _diskfree_t *); #ifdef __cplusplus } @@ -43,7 +43,7 @@ #ifndef USE_MSVCRT_PREFIX -#define MSVCRT(diskfree_t) MSVCRT(_diskfree_t) +#define diskfree_t _diskfree_t #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_DOS_H */ Index: include/msvcrt/eh.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/eh.h,v retrieving revision 1.7 diff -u -r1.7 eh.h --- include/msvcrt/eh.h 18 Jul 2003 22:57:15 -0000 1.7 +++ include/msvcrt/eh.h 16 Jun 2004 05:54:16 -0000 @@ -27,14 +27,6 @@ #error "eh.h is meant only for C++ applications" #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - struct _EXCEPTION_POINTERS; typedef void (*terminate_handler)(); @@ -43,11 +35,11 @@ typedef void (*unexpected_function)(); typedef void (*_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); -terminate_function MSVCRT(set_terminate)(terminate_function func); -unexpected_function MSVCRT(set_unexpected)(unexpected_function func); -_se_translator_function MSVCRT(_set_se_translator)(_se_translator_function func); +terminate_function set_terminate(terminate_function func); +unexpected_function set_unexpected(unexpected_function func); +_se_translator_function _set_se_translator(_se_translator_function func); -void MSVCRT(terminate)(); -void MSVCRT(unexpected)(); +void terminate(); +void unexpected(); #endif /* __WINE_EH_H */ Index: include/msvcrt/errno.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/errno.h,v retrieving revision 1.5 diff -u -r1.5 errno.h --- include/msvcrt/errno.h 18 Jul 2003 22:57:15 -0000 1.5 +++ include/msvcrt/errno.h 16 Jun 2004 05:54:16 -0000 @@ -22,57 +22,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - -#ifdef USE_MSVCRT_PREFIX - -# define MSVCRT_EPERM 1 -# define MSVCRT_ENOENT 2 -# define MSVCRT_ESRCH 3 -# define MSVCRT_EINTR 4 -# define MSVCRT_EIO 5 -# define MSVCRT_ENXIO 6 -# define MSVCRT_E2BIG 7 -# define MSVCRT_ENOEXEC 8 -# define MSVCRT_EBADF 9 -# define MSVCRT_ECHILD 10 -# define MSVCRT_EAGAIN 11 -# define MSVCRT_ENOMEM 12 -# define MSVCRT_EACCES 13 -# define MSVCRT_EFAULT 14 -# define MSVCRT_EBUSY 16 -# define MSVCRT_EEXIST 17 -# define MSVCRT_EXDEV 18 -# define MSVCRT_ENODEV 19 -# define MSVCRT_ENOTDIR 20 -# define MSVCRT_EISDIR 21 -# define MSVCRT_EINVAL 22 -# define MSVCRT_ENFILE 23 -# define MSVCRT_EMFILE 24 -# define MSVCRT_ENOTTY 25 -# define MSVCRT_EFBIG 27 -# define MSVCRT_ENOSPC 28 -# define MSVCRT_ESPIPE 29 -# define MSVCRT_EROFS 30 -# define MSVCRT_EMLINK 31 -# define MSVCRT_EPIPE 32 -# define MSVCRT_EDOM 33 -# define MSVCRT_ERANGE 34 -# define MSVCRT_EDEADLK 36 -# define MSVCRT_EDEADLOCK MSVCRT_EDEADLK -# define MSVCRT_ENAMETOOLONG 38 -# define MSVCRT_ENOLCK 39 -# define MSVCRT_ENOSYS 40 -# define MSVCRT_ENOTEMPTY 41 - -#else /* USE_MSVCRT_PREFIX */ - # define EPERM 1 # define ENOENT 2 # define ESRCH 3 @@ -112,22 +61,16 @@ # define ENOSYS 40 # define ENOTEMPTY 41 -#endif /* USE_MSVCRT_PREFIX */ - #ifdef __cplusplus extern "C" { #endif -extern int* MSVCRT(_errno)(void); +extern int* _errno(void); #ifdef __cplusplus } #endif -#ifndef USE_MSVCRT_PREFIX -# define errno (*_errno()) -#else -# define MSVCRT_errno (*MSVCRT__errno()) -#endif +#define errno (*_errno()) #endif /* __WINE_ERRNO_H */ Index: include/msvcrt/float.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/float.h,v retrieving revision 1.2 diff -u -r1.2 float.h --- include/msvcrt/float.h 25 Mar 2004 23:36:14 -0000 1.2 +++ include/msvcrt/float.h 16 Jun 2004 05:54:16 -0000 @@ -12,14 +12,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifdef __cplusplus extern "C" { #endif Index: include/msvcrt/io.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/io.h,v retrieving revision 1.7 diff -u -r1.7 io.h --- include/msvcrt/io.h 16 Mar 2004 19:17:11 -0000 1.7 +++ include/msvcrt/io.h 16 Jun 2004 05:55:12 -0000 @@ -11,18 +11,10 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -42,33 +34,33 @@ #define _A_ARCH 0x00000020 #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif #ifndef MSVCRT_FSIZE_T_DEFINED -typedef unsigned long MSVCRT(_fsize_t); +typedef unsigned long _fsize_t; #define MSVCRT_FSIZE_T_DEFINED #endif #ifndef MSVCRT_FINDDATA_T_DEFINED #define MSVCRT_FINDDATA_T_DEFINED -struct MSVCRT(_finddata_t) +struct _finddata_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; - MSVCRT(_fsize_t) size; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; char name[260]; }; -struct MSVCRT(_finddatai64_t) +struct _finddatai64_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; + time_t time_create; + time_t time_access; + time_t time_write; __int64 size; char name[260]; }; @@ -76,22 +68,22 @@ #ifndef MSVCRT_WFINDDATA_T_DEFINED #define MSVCRT_WFINDDATA_T_DEFINED -struct MSVCRT(_wfinddata_t) { +struct _wfinddata_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; - MSVCRT(_fsize_t) size; - MSVCRT(wchar_t) name[260]; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; + wchar_t name[260]; }; -struct MSVCRT(_wfinddatai64_t) { +struct _wfinddatai64_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; + time_t time_create; + time_t time_access; + time_t time_write; __int64 size; - MSVCRT(wchar_t) name[260]; + wchar_t name[260]; }; #endif /* MSVCRT_WFINDDATA_T_DEFINED */ @@ -111,10 +103,10 @@ __int64 _filelengthi64(int); long _filelength(int); int _findclose(long); -long MSVCRT(_findfirst)(const char*,struct MSVCRT(_finddata_t)*); -long MSVCRT(_findfirsti64)(const char*, struct MSVCRT(_finddatai64_t)*); -int MSVCRT(_findnext)(long,struct MSVCRT(_finddata_t)*); -int MSVCRT(_findnexti64)(long, struct MSVCRT(_finddatai64_t)*); +long _findfirst(const char*,struct _finddata_t*); +long _findfirsti64(const char*, struct _finddatai64_t*); +int _findnext(long,struct _finddata_t*); +int _findnexti64(long, struct _finddatai64_t*); long _get_osfhandle(int); int _isatty(int); int _locking(int,int,long); @@ -133,23 +125,23 @@ int _unlink(const char*); int _write(int,const void*,unsigned int); -int MSVCRT(remove)(const char*); -int MSVCRT(rename)(const char*,const char*); +int remove(const char*); +int rename(const char*,const char*); #ifndef MSVCRT_WIO_DEFINED #define MSVCRT_WIO_DEFINED -int _waccess(const MSVCRT(wchar_t)*,int); -int _wchmod(const MSVCRT(wchar_t)*,int); -int _wcreat(const MSVCRT(wchar_t)*,int); -long MSVCRT(_wfindfirst)(const MSVCRT(wchar_t)*,struct MSVCRT(_wfinddata_t)*); -long MSVCRT(_wfindfirsti64)(const MSVCRT(wchar_t)*, struct MSVCRT(_wfinddatai64_t)*); -int MSVCRT(_wfindnext)(long,struct MSVCRT(_wfinddata_t)*); -int MSVCRT(_wfindnexti64)(long, struct MSVCRT(_wfinddatai64_t)*); -MSVCRT(wchar_t)*_wmktemp(MSVCRT(wchar_t)*); -int _wopen(const MSVCRT(wchar_t)*,int,...); -int _wrename(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wsopen(const MSVCRT(wchar_t)*,int,int,...); -int _wunlink(const MSVCRT(wchar_t)*); +int _waccess(const wchar_t*,int); +int _wchmod(const wchar_t*,int); +int _wcreat(const wchar_t*,int); +long _wfindfirst(const wchar_t*,struct _wfinddata_t*); +long _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); +int _wfindnext(long,struct _wfinddata_t*); +int _wfindnexti64(long, struct _wfinddatai64_t*); +wchar_t*_wmktemp(wchar_t*); +int _wopen(const wchar_t*,int,...); +int _wrename(const wchar_t*,const wchar_t*); +int _wsopen(const wchar_t*,int,int,...); +int _wunlink(const wchar_t*); #endif /* MSVCRT_WIO_DEFINED */ #ifdef __cplusplus @@ -192,6 +184,6 @@ #define sopen _sopen #endif /* __GNUC__ */ -#endif /* USE _MSVCRT_PREFIX */ +#endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_IO_H */ Index: include/msvcrt/locale.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/locale.h,v retrieving revision 1.5 diff -u -r1.5 locale.h --- include/msvcrt/locale.h 18 Jul 2003 22:57:15 -0000 1.5 +++ include/msvcrt/locale.h 16 Jun 2004 05:54:16 -0000 @@ -23,31 +23,13 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif -#ifdef USE_MSVCRT_PREFIX -#define MSVCRT_LC_ALL 0 -#define MSVCRT_LC_COLLATE 1 -#define MSVCRT_LC_CTYPE 2 -#define MSVCRT_LC_MONETARY 3 -#define MSVCRT_LC_NUMERIC 4 -#define MSVCRT_LC_TIME 5 -#define MSVCRT_LC_MIN MSVCRT_LC_ALL -#define MSVCRT_LC_MAX MSVCRT_LC_TIME -#else #define LC_ALL 0 #define LC_COLLATE 1 #define LC_CTYPE 2 @@ -56,11 +38,10 @@ #define LC_TIME 5 #define LC_MIN LC_ALL #define LC_MAX LC_TIME -#endif /* USE_MSVCRT_PREFIX */ #ifndef MSVCRT_LCONV_DEFINED #define MSVCRT_LCONV_DEFINED -struct MSVCRT(lconv) +struct lconv { char* decimal_point; char* thousands_sep; @@ -88,12 +69,12 @@ extern "C" { #endif -char* MSVCRT(setlocale)(int,const char*); -struct MSVCRT(lconv)* MSVCRT(localeconv)(void); +char* setlocale(int,const char*); +struct lconv* localeconv(void); #ifndef MSVCRT_WLOCALE_DEFINED #define MSVCRT_WLOCALE_DEFINED -MSVCRT(wchar_t)* _wsetlocale(int,const MSVCRT(wchar_t)*); +wchar_t* _wsetlocale(int,const wchar_t*); #endif /* MSVCRT_WLOCALE_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/malloc.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/malloc.h,v retrieving revision 1.7 diff -u -r1.7 malloc.h --- include/msvcrt/malloc.h 18 Jul 2003 22:57:15 -0000 1.7 +++ include/msvcrt/malloc.h 16 Jun 2004 05:54:16 -0000 @@ -23,14 +23,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - /* heap function constants */ #define _HEAPEMPTY -1 #define _HEAPOK -2 @@ -44,7 +36,7 @@ #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif @@ -53,7 +45,7 @@ typedef struct _heapinfo { int* _pentry; - MSVCRT(size_t) _size; + size_t _size; int _useflag; } _HEAPINFO; #endif /* MSVCRT_HEAPINFO_DEFINED */ @@ -62,19 +54,19 @@ extern "C" { #endif -void* _expand(void*,MSVCRT(size_t)); -int _heapadd(void*,MSVCRT(size_t)); +void* _expand(void*,size_t); +int _heapadd(void*,size_t); int _heapchk(void); int _heapmin(void); int _heapset(unsigned int); -MSVCRT(size_t) _heapused(MSVCRT(size_t)*,MSVCRT(size_t)*); +size_t _heapused(size_t*,size_t*); int _heapwalk(_HEAPINFO*); -MSVCRT(size_t) _msize(void*); +size_t _msize(void*); -void* MSVCRT(calloc)(MSVCRT(size_t),MSVCRT(size_t)); -void MSVCRT(free)(void*); -void* MSVCRT(malloc)(MSVCRT(size_t)); -void* MSVCRT(realloc)(void*,MSVCRT(size_t)); +void* calloc(size_t,size_t); +void free(void*); +void* malloc(size_t); +void* realloc(void*,size_t); #ifdef __cplusplus } Index: include/msvcrt/math.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/math.h,v retrieving revision 1.3 diff -u -r1.3 math.h --- include/msvcrt/math.h 9 Apr 2004 19:02:45 -0000 1.3 +++ include/msvcrt/math.h 16 Jun 2004 05:54:16 -0000 @@ -12,14 +12,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -33,7 +25,7 @@ #ifndef MSVCRT_EXCEPTION_DEFINED #define MSVCRT_EXCEPTION_DEFINED -struct MSVCRT(_exception) +struct _exception { int type; char *name; @@ -45,7 +37,7 @@ #ifndef MSVCRT_COMPLEX_DEFINED #define MSVCRT_COMPLEX_DEFINED -struct MSVCRT(_complex) +struct _complex { double x; /* Real part */ double y; /* Imaginary part */ @@ -83,8 +75,8 @@ double y1(double); double yn(int, double); -int MSVCRT(_matherr)(struct MSVCRT(_exception)*); -double MSVCRT(_cabs)(struct MSVCRT(_complex)); +int _matherr(struct _exception*); +double _cabs(struct _complex); #ifndef HUGE_VAL # if defined(__GNUC__) && (__GNUC__ >= 3) Index: include/msvcrt/mbstring.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/mbstring.h,v retrieving revision 1.4 diff -u -r1.4 mbstring.h --- include/msvcrt/mbstring.h 18 Jul 2003 22:57:15 -0000 1.4 +++ include/msvcrt/mbstring.h 16 Jun 2004 05:54:16 -0000 @@ -23,16 +23,8 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif @@ -67,52 +59,52 @@ void _mbccpy(unsigned char*,const unsigned char*); unsigned int _mbcjistojms(unsigned int); unsigned int _mbcjmstojis(unsigned int); -MSVCRT(size_t) _mbclen(const unsigned char*); +size_t _mbclen(const unsigned char*); unsigned int _mbctohira(unsigned int); unsigned int _mbctokata(unsigned int); unsigned int _mbctolower(unsigned int); unsigned int _mbctombb(unsigned int); unsigned int _mbctoupper(unsigned int); -int _mbsbtype(const unsigned char*,MSVCRT(size_t)); +int _mbsbtype(const unsigned char*,size_t); unsigned char* _mbscat(unsigned char*,const unsigned char*); unsigned char* _mbschr(const unsigned char*,unsigned int); int _mbscmp(const unsigned char*,const unsigned char*); int _mbscoll(const unsigned char*,const unsigned char*); unsigned char* _mbscpy(unsigned char*,const unsigned char*); -MSVCRT(size_t) _mbscspn(const unsigned char*,const unsigned char*); +size_t _mbscspn(const unsigned char*,const unsigned char*); unsigned char* _mbsdec(const unsigned char*,const unsigned char*); unsigned char* _mbsdup(const unsigned char*); int _mbsicmp(const unsigned char*,const unsigned char*); int _mbsicoll(const unsigned char*,const unsigned char*); unsigned char* _mbsinc(const unsigned char*); -MSVCRT(size_t) _mbslen(const unsigned char*); +size_t _mbslen(const unsigned char*); unsigned char* _mbslwr(unsigned char*); -unsigned char* _mbsnbcat(unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbcmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbcoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -MSVCRT(size_t) _mbsnbcnt(const unsigned char*,MSVCRT(size_t)); +unsigned char* _mbsnbcat(unsigned char*,const unsigned char*,size_t); +int _mbsnbcmp(const unsigned char*,const unsigned char*,size_t); +int _mbsnbcoll(const unsigned char*,const unsigned char*,size_t); +size_t _mbsnbcnt(const unsigned char*,size_t); unsigned char* _mbsnbcpy(unsigned char*,const unsigned char* -,MSVCRT(size_t)); -int _mbsnbicmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbicoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsnbset(unsigned char*,unsigned int,MSVCRT(size_t)) +,size_t); +int _mbsnbicmp(const unsigned char*,const unsigned char*,size_t); +int _mbsnbicoll(const unsigned char*,const unsigned char*,size_t); +unsigned char* _mbsnbset(unsigned char*,unsigned int,size_t) ; unsigned char* _mbsncat(unsigned char*,const unsigned char*, - MSVCRT(size_t)); -MSVCRT(size_t) _mbsnccnt(const unsigned char*,MSVCRT(size_t)); -int _mbsncmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsncoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsncpy(unsigned char*,const unsigned char*,MSVCRT(size_t)); + size_t); +size_t _mbsnccnt(const unsigned char*,size_t); +int _mbsncmp(const unsigned char*,const unsigned char*,size_t); +int _mbsncoll(const unsigned char*,const unsigned char*,size_t); +unsigned char* _mbsncpy(unsigned char*,const unsigned char*,size_t); unsigned int _mbsnextc (const unsigned char*); -int _mbsnicmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnicoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsninc(const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsnset(unsigned char*,unsigned int,MSVCRT(size_t)); +int _mbsnicmp(const unsigned char*,const unsigned char*,size_t); +int _mbsnicoll(const unsigned char*,const unsigned char*,size_t); +unsigned char* _mbsninc(const unsigned char*,size_t); +unsigned char* _mbsnset(unsigned char*,unsigned int,size_t); unsigned char* _mbspbrk(const unsigned char*,const unsigned char*); unsigned char* _mbsrchr(const unsigned char*,unsigned int); unsigned char* _mbsrev(unsigned char*); unsigned char* _mbsset(unsigned char*,unsigned int); -MSVCRT(size_t) _mbsspn(const unsigned char*,const unsigned char*); +size_t _mbsspn(const unsigned char*,const unsigned char*); unsigned char* _mbsspnp(const unsigned char*,const unsigned char*); unsigned char* _mbsstr(const unsigned char*,const unsigned char*); unsigned char* _mbstok(unsigned char*,const unsigned char*); Index: include/msvcrt/process.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/process.h,v retrieving revision 1.10 diff -u -r1.10 process.h --- include/msvcrt/process.h 18 Jul 2003 22:57:15 -0000 1.10 +++ include/msvcrt/process.h 16 Jun 2004 05:54:16 -0000 @@ -11,18 +11,10 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -80,32 +72,32 @@ int _spawnvp(int,const char*,const char* const *); int _spawnvpe(int,const char*,const char* const *,const char* const *); -void MSVCRT(_c_exit)(void); -void MSVCRT(_cexit)(void); -void MSVCRT(_exit)(int); -void MSVCRT(abort)(void); -void MSVCRT(exit)(int); -int MSVCRT(system)(const char*); +void _c_exit(void); +void _cexit(void); +void _exit(int); +void abort(void); +void exit(int); +int system(const char*); #ifndef MSVCRT_WPROCESS_DEFINED #define MSVCRT_WPROCESS_DEFINED -int _wexecl(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexecle(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexeclp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexeclpe(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexecv(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wexecve(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wexecvp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wexecvpe(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wspawnl(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnle(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnlp(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnlpe(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnv(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wspawnve(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wspawnvp(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wspawnvpe(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wsystem(const MSVCRT(wchar_t)*); +int _wexecl(const wchar_t*,const wchar_t*,...); +int _wexecle(const wchar_t*,const wchar_t*,...); +int _wexeclp(const wchar_t*,const wchar_t*,...); +int _wexeclpe(const wchar_t*,const wchar_t*,...); +int _wexecv(const wchar_t*,const wchar_t* const *); +int _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wexecvp(const wchar_t*,const wchar_t* const *); +int _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wspawnl(int,const wchar_t*,const wchar_t*,...); +int _wspawnle(int,const wchar_t*,const wchar_t*,...); +int _wspawnlp(int,const wchar_t*,const wchar_t*,...); +int _wspawnlpe(int,const wchar_t*,const wchar_t*,...); +int _wspawnv(int,const wchar_t*,const wchar_t* const *); +int _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wspawnvp(int,const wchar_t*,const wchar_t* const *); +int _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wsystem(const wchar_t*); #endif /* MSVCRT_WPROCESS_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/search.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/search.h,v retrieving revision 1.7 diff -u -r1.7 search.h --- include/msvcrt/search.h 18 Jul 2003 22:57:15 -0000 1.7 +++ include/msvcrt/search.h 16 Jun 2004 05:54:16 -0000 @@ -23,16 +23,8 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif @@ -45,9 +37,9 @@ int (*)(const void*,const void*)); void* _lsearch(const void*,void*,unsigned int*,unsigned int, int (*)(const void*,const void*)); -void* MSVCRT(bsearch)(const void*,const void*,MSVCRT(size_t),MSVCRT(size_t), +void* bsearch(const void*,const void*,size_t,size_t, int (*)(const void*,const void*)); -void MSVCRT(qsort)(void*,MSVCRT(size_t),MSVCRT(size_t), +void qsort(void*,size_t,size_t, int (*)(const void*,const void*)); #ifdef __cplusplus Index: include/msvcrt/setjmp.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/setjmp.h,v retrieving revision 1.5 diff -u -r1.5 setjmp.h --- include/msvcrt/setjmp.h 18 Jul 2003 22:57:15 -0000 1.5 +++ include/msvcrt/setjmp.h 16 Jun 2004 05:54:16 -0000 @@ -23,15 +23,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - - #ifdef __i386__ typedef struct __JUMP_BUFFER @@ -52,23 +43,17 @@ #endif /* __i386__ */ -#ifndef USE_MSVCRT_PREFIX #define _JBLEN 16 #define _JBTYPE int typedef _JBTYPE jmp_buf[_JBLEN]; -#else -#define MSVCRT__JBLEN 16 -#define MSVCRT__JBTYPE int -typedef MSVCRT__JBTYPE MSVCRT_jmp_buf[MSVCRT__JBLEN]; -#endif #ifdef __cplusplus extern "C" { #endif -int MSVCRT(_setjmp)(MSVCRT(jmp_buf)); -int MSVCRT(longjmp)(MSVCRT(jmp_buf),int); +int _setjmp(jmp_buf); +int longjmp(jmp_buf,int); #ifdef __cplusplus } Index: include/msvcrt/stddef.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/stddef.h,v retrieving revision 1.7 diff -u -r1.7 stddef.h --- include/msvcrt/stddef.h 18 Jul 2003 22:57:15 -0000 1.7 +++ include/msvcrt/stddef.h 16 Jun 2004 05:54:16 -0000 @@ -23,18 +23,10 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -44,7 +36,7 @@ #endif #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif Index: include/msvcrt/stdio.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/stdio.h,v retrieving revision 1.19 diff -u -r1.19 stdio.h --- include/msvcrt/stdio.h 12 May 2004 00:12:26 -0000 1.19 +++ include/msvcrt/stdio.h 16 Jun 2004 05:54:16 -0000 @@ -15,16 +15,7 @@ #include <stdarg.h> #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - /* file._flag flags */ -#ifndef USE_MSVCRT_PREFIX #define _IOREAD 0x0001 #define _IOWRT 0x0002 #define _IOMYBUF 0x0008 @@ -32,15 +23,6 @@ #define _IOERR 0x0020 #define _IOSTRG 0x0040 #define _IORW 0x0080 -#else -#define MSVCRT__IOREAD 0x0001 -#define MSVCRT__IOWRT 0x0002 -#define MSVCRT__IOMYBUF 0x0008 -#define MSVCRT__IOEOF 0x0010 -#define MSVCRT__IOERR 0x0020 -#define MSVCRT__IOSTRG 0x0040 -#define MSVCRT__IORW 0x0080 -#endif /* USE_MSVCRT_PREFIX */ #ifndef NULL #ifdef __cplusplus @@ -50,8 +32,6 @@ #endif #endif -#ifndef USE_MSVCRT_PREFIX - #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 @@ -75,29 +55,9 @@ #define SEEK_END 2 #endif -#else - -#define MSVCRT_STDIN_FILENO 0 -#define MSVCRT_STDOUT_FILENO 1 -#define MSVCRT_STDERR_FILENO 2 - -/* more file._flag flags, but these conflict with Unix */ -#define MSVCRT__IOFBF 0x0000 -#define MSVCRT__IONBF 0x0004 -#define MSVCRT__IOLBF 0x0040 - -#define MSVCRT_FILENAME_MAX 260 -#define MSVCRT_TMP_MAX 0x7fff - -#define MSVCRT_EOF (-1) - -#define MSVCRT_BUFSIZ 512 - -#endif /* USE_MSVCRT_PREFIX */ - #ifndef MSVCRT_FILE_DEFINED #define MSVCRT_FILE_DEFINED -typedef struct MSVCRT(_iobuf) +typedef struct _iobuf { char* _ptr; int _cnt; @@ -107,29 +67,29 @@ int _charbuf; int _bufsiz; char* _tmpfname; -} MSVCRT(FILE); +} FILE; #endif /* MSVCRT_FILE_DEFINED */ #ifndef MSVCRT_FPOS_T_DEFINED -typedef long MSVCRT(fpos_t); +typedef long fpos_t; #define MSVCRT_FPOS_T_DEFINED #endif #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif #ifndef _WCTYPE_T_DEFINED -typedef unsigned short MSVCRT(wint_t); -typedef unsigned short MSVCRT(wctype_t); +typedef unsigned short wint_t; +typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif @@ -138,124 +98,118 @@ #endif #ifndef MSVCRT_STDIO_DEFINED -MSVCRT(FILE)* MSVCRT(__p__iob)(void); +FILE* __p__iob(void); #define _iob (__p__iob()) #endif /* MSVCRT_STDIO_DEFINED */ -#ifndef USE_MSVCRT_PREFIX #define stdin (_iob+STDIN_FILENO) #define stdout (_iob+STDOUT_FILENO) #define stderr (_iob+STDERR_FILENO) -#else -#define MSVCRT_stdin (MSVCRT__iob+MSVCRT_STDIN_FILENO) -#define MSVCRT_stdout (MSVCRT__iob+MSVCRT_STDOUT_FILENO) -#define MSVCRT_stderr (MSVCRT__iob+MSVCRT_STDERR_FILENO) -#endif /* USE_MSVCRT_PREFIX */ #ifndef MSVCRT_STDIO_DEFINED #define MSVCRT_STDIO_DEFINED -int MSVCRT(_fcloseall)(void); -MSVCRT(FILE)* MSVCRT(_fdopen)(int,const char*); +int _fcloseall(void); +FILE* _fdopen(int,const char*); int _fgetchar(void); -int MSVCRT(_filbuf)(MSVCRT(FILE*)); -int MSVCRT(_fileno)(MSVCRT(FILE)*); -int MSVCRT(_flsbuf)(int,MSVCRT(FILE)*); +int _filbuf(FILE*); +int _fileno(FILE*); +int _flsbuf(int,FILE*); int _flushall(void); int _fputchar(int); -MSVCRT(FILE)* _fsopen(const char*,const char*,int); +FILE* _fsopen(const char*,const char*,int); int _getmaxstdio(void); -int MSVCRT(_getw)(MSVCRT(FILE)*); -int MSVCRT(_pclose)(MSVCRT(FILE)*); -MSVCRT(FILE)* MSVCRT(_popen)(const char*,const char*); -int MSVCRT(_putw)(int,MSVCRT(FILE)*); +int _getw(FILE*); +int _pclose(FILE*); +FILE* _popen(const char*,const char*); +int _putw(int,FILE*); int _rmtmp(void); int _setmaxstdio(int); -int _snprintf(char*,MSVCRT(size_t),const char*,...); +int _snprintf(char*,size_t,const char*,...); char* _tempnam(const char*,const char*); int _unlink(const char*); -int _vsnprintf(char*,MSVCRT(size_t),const char*,va_list); +int _vsnprintf(char*,size_t,const char*,va_list); -void MSVCRT(clearerr)(MSVCRT(FILE)*); -int MSVCRT(fclose)(MSVCRT(FILE)*); -int MSVCRT(feof)(MSVCRT(FILE)*); -int MSVCRT(ferror)(MSVCRT(FILE)*); -int MSVCRT(fflush)(MSVCRT(FILE)*); -int MSVCRT(fgetc)(MSVCRT(FILE)*); -int MSVCRT(fgetpos)(MSVCRT(FILE)*,MSVCRT(fpos_t)*); -char* MSVCRT(fgets)(char*,int,MSVCRT(FILE)*); -MSVCRT(FILE)* MSVCRT(fopen)(const char*,const char*); -int MSVCRT(fprintf)(MSVCRT(FILE)*,const char*,...); -int MSVCRT(fputc)(int,MSVCRT(FILE)*); -int MSVCRT(fputs)(const char*,MSVCRT(FILE)*); -MSVCRT(size_t) MSVCRT(fread)(void*,MSVCRT(size_t),MSVCRT(size_t),MSVCRT(FILE)*); -MSVCRT(FILE)* MSVCRT(freopen)(const char*,const char*,MSVCRT(FILE)*); -int MSVCRT(fscanf)(MSVCRT(FILE)*,const char*,...); -int MSVCRT(fseek)(MSVCRT(FILE)*,long,int); -int MSVCRT(fsetpos)(MSVCRT(FILE)*,MSVCRT(fpos_t)*); -long MSVCRT(ftell)(MSVCRT(FILE)*); -MSVCRT(size_t) MSVCRT(fwrite)(const void*,MSVCRT(size_t),MSVCRT(size_t),MSVCRT(FILE)*); -int MSVCRT(getc)(MSVCRT(FILE)*); -int MSVCRT(getchar)(void); -char* MSVCRT(gets)(char*); -void MSVCRT(perror)(const char*); -int MSVCRT(printf)(const char*,...); -int MSVCRT(putc)(int,MSVCRT(FILE)*); -int MSVCRT(putchar)(int); -int MSVCRT(puts)(const char*); -int MSVCRT(remove)(const char*); -int MSVCRT(rename)(const char*,const char*); -void MSVCRT(rewind)(MSVCRT(FILE)*); -int MSVCRT(scanf)(const char*,...); -void MSVCRT(setbuf)(MSVCRT(FILE)*,char*); -int MSVCRT(setvbuf)(MSVCRT(FILE)*,char*,int,MSVCRT(size_t)); -int MSVCRT(sprintf)(char*,const char*,...); -int MSVCRT(sscanf)(const char*,const char*,...); -MSVCRT(FILE)* MSVCRT(tmpfile)(void); -char* MSVCRT(tmpnam)(char*); -int MSVCRT(ungetc)(int,MSVCRT(FILE)*); -int MSVCRT(vfprintf)(MSVCRT(FILE)*,const char*,va_list); -int MSVCRT(vprintf)(const char*,va_list); -int MSVCRT(vsprintf)(char*,const char*,va_list); +void clearerr(FILE*); +int fclose(FILE*); +int feof(FILE*); +int ferror(FILE*); +int fflush(FILE*); +int fgetc(FILE*); +int fgetpos(FILE*,fpos_t*); +char* fgets(char*,int,FILE*); +FILE* fopen(const char*,const char*); +int fprintf(FILE*,const char*,...); +int fputc(int,FILE*); +int fputs(const char*,FILE*); +size_t fread(void*,size_t,size_t,FILE*); +FILE* freopen(const char*,const char*,FILE*); +int fscanf(FILE*,const char*,...); +int fseek(FILE*,long,int); +int fsetpos(FILE*,fpos_t*); +long ftell(FILE*); +size_t fwrite(const void*,size_t,size_t,FILE*); +int getc(FILE*); +int getchar(void); +char* gets(char*); +void perror(const char*); +int printf(const char*,...); +int putc(int,FILE*); +int putchar(int); +int puts(const char*); +int remove(const char*); +int rename(const char*,const char*); +void rewind(FILE*); +int scanf(const char*,...); +void setbuf(FILE*,char*); +int setvbuf(FILE*,char*,int,size_t); +int sprintf(char*,const char*,...); +int sscanf(const char*,const char*,...); +FILE* tmpfile(void); +char* tmpnam(char*); +int ungetc(int,FILE*); +int vfprintf(FILE*,const char*,va_list); +int vprintf(const char*,va_list); +int vsprintf(char*,const char*,va_list); #ifndef MSVCRT_WSTDIO_DEFINED #define MSVCRT_WSTDIO_DEFINED -MSVCRT(wint_t) _fgetwchar(void); -MSVCRT(wint_t) _fputwchar(MSVCRT(wint_t)); -MSVCRT(wchar_t)*_getws(MSVCRT(wchar_t)*); -int _putws(const MSVCRT(wchar_t)*); -int _snwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,...); -int _vsnwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,va_list); -MSVCRT(FILE)* MSVCRT(_wfdopen)(int,const MSVCRT(wchar_t)*); -MSVCRT(FILE)* MSVCRT(_wfopen)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(FILE)* MSVCRT(_wfreopen)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -MSVCRT(FILE)* MSVCRT(_wfsopen)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,int); -void _wperror(const MSVCRT(wchar_t)*); -MSVCRT(FILE)* MSVCRT(_wpopen)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wremove(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wtempnam(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wtmpnam(MSVCRT(wchar_t)*); - -MSVCRT(wint_t) MSVCRT(fgetwc)(MSVCRT(FILE)*); -MSVCRT(wchar_t)*MSVCRT(fgetws)(MSVCRT(wchar_t)*,int,MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(fputwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -int MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -int MSVCRT(fwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...); -int MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -int MSVCRT(fwscanf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...); -MSVCRT(wint_t) MSVCRT(getwc)(MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(getwchar)(void); -MSVCRT(wchar_t)*MSVCRT(getws)(MSVCRT(wchar_t)*); -MSVCRT(wint_t) MSVCRT(putwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(putwchar)(MSVCRT(wint_t)); -int MSVCRT(putws)(const MSVCRT(wchar_t)*); -int MSVCRT(swprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int MSVCRT(swscanf)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -MSVCRT(wint_t) MSVCRT(ungetwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -int MSVCRT(vfwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,va_list); -int MSVCRT(vswprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,va_list); -int MSVCRT(vwprintf)(const MSVCRT(wchar_t)*,va_list); -int MSVCRT(wprintf)(const MSVCRT(wchar_t)*,...); -int MSVCRT(wscanf)(const MSVCRT(wchar_t)*,...); +wint_t _fgetwchar(void); +wint_t _fputwchar(wint_t); +wchar_t*_getws(wchar_t*); +int _putws(const wchar_t*); +int _snwprintf(wchar_t*,size_t,const wchar_t*,...); +int _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list); +FILE* _wfdopen(int,const wchar_t*); +FILE* _wfopen(const wchar_t*,const wchar_t*); +FILE* _wfreopen(const wchar_t*,const wchar_t*,FILE*); +FILE* _wfsopen(const wchar_t*,const wchar_t*,int); +void _wperror(const wchar_t*); +FILE* _wpopen(const wchar_t*,const wchar_t*); +int _wremove(const wchar_t*); +wchar_t*_wtempnam(const wchar_t*,const wchar_t*); +wchar_t*_wtmpnam(wchar_t*); + +wint_t fgetwc(FILE*); +wchar_t*fgetws(wchar_t*,int,FILE*); +wint_t fputwc(wint_t,FILE*); +int fputws(const wchar_t*,FILE*); +int fwprintf(FILE*,const wchar_t*,...); +int fputws(const wchar_t*,FILE*); +int fwscanf(FILE*,const wchar_t*,...); +wint_t getwc(FILE*); +wint_t getwchar(void); +wchar_t*getws(wchar_t*); +wint_t putwc(wint_t,FILE*); +wint_t putwchar(wint_t); +int putws(const wchar_t*); +int swprintf(wchar_t*,const wchar_t*,...); +int swscanf(const wchar_t*,const wchar_t*,...); +wint_t ungetwc(wint_t,FILE*); +int vfwprintf(FILE*,const wchar_t*,va_list); +int vswprintf(wchar_t*,const wchar_t*,va_list); +int vwprintf(const wchar_t*,va_list); +int wprintf(const wchar_t*,...); +int wscanf(const wchar_t*,...); #endif /* MSVCRT_WSTDIO_DEFINED */ #endif /* MSVCRT_STDIO_DEFINED */ @@ -266,12 +220,12 @@ #ifndef USE_MSVCRT_PREFIX -static inline MSVCRT(FILE)* fdopen(int fd, const char *mode) { return _fdopen(fd, mode); } +static inline FILE* fdopen(int fd, const char *mode) { return _fdopen(fd, mode); } static inline int fgetchar(void) { return _fgetchar(); } -static inline int fileno(MSVCRT(FILE)* file) { return _fileno(file); } +static inline int fileno(FILE* file) { return _fileno(file); } static inline int fputchar(int c) { return _fputchar(c); } -static inline int pclose(MSVCRT(FILE)* file) { return _pclose(file); } -static inline MSVCRT(FILE)* popen(const char* command, const char* mode) { return _popen(command, mode); } +static inline int pclose(FILE* file) { return _pclose(file); } +static inline FILE* popen(const char* command, const char* mode) { return _popen(command, mode); } static inline char* tempnam(const char *dir, const char *prefix) { return _tempnam(dir, prefix); } #ifndef MSVCRT_UNLINK_DEFINED static inline int unlink(const char* path) { return _unlink(path); } @@ -279,11 +233,11 @@ #endif static inline int vsnprintf(char *buffer, size_t size, const char *format, va_list args) { return _vsnprintf(buffer,size,format,args); } -static inline MSVCRT(wint_t) fgetwchar(void) { return _fgetwchar(); } -static inline MSVCRT(wint_t) fputwchar(MSVCRT(wint_t) wc) { return _fputwchar(wc); } -static inline int getw(MSVCRT(FILE)* file) { return _getw(file); } -static inline int putw(int val, MSVCRT(FILE)* file) { return _putw(val, file); } -static inline MSVCRT(FILE)* wpopen(const MSVCRT(wchar_t)* command,const MSVCRT(wchar_t)* mode) { return _wpopen(command, mode); } +static inline wint_t fgetwchar(void) { return _fgetwchar(); } +static inline wint_t fputwchar(wint_t wc) { return _fputwchar(wc); } +static inline int getw(FILE* file) { return _getw(file); } +static inline int putw(int val, FILE* file) { return _putw(val, file); } +static inline FILE* wpopen(const wchar_t* command,const wchar_t* mode) { return _wpopen(command, mode); } #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_STDIO_H */ Index: include/msvcrt/stdlib.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/stdlib.h,v retrieving revision 1.16 diff -u -r1.16 stdlib.h --- include/msvcrt/stdlib.h 16 Mar 2004 19:17:11 -0000 1.16 +++ include/msvcrt/stdlib.h 16 Jun 2004 05:54:16 -0000 @@ -11,14 +11,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef NULL #ifdef __cplusplus #define NULL 0 @@ -30,7 +22,7 @@ #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -40,13 +32,9 @@ # endif #endif -#ifndef USE_MSVCRT_PREFIX #define EXIT_SUCCESS 0 #define EXIT_FAILURE -1 #define RAND_MAX 0x7FFF -#else -#define MSVCRT_RAND_MAX 0x7FFF -#endif /* USE_MSVCRT_PREFIX */ #ifndef _MAX_PATH #define _MAX_DRIVE 3 @@ -57,18 +45,18 @@ #endif -typedef struct MSVCRT(_div_t) { +typedef struct _div_t { int quot; int rem; -} MSVCRT(div_t); +} div_t; -typedef struct MSVCRT(_ldiv_t) { +typedef struct _ldiv_t { long quot; long rem; -} MSVCRT(ldiv_t); +} ldiv_t; #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif @@ -101,17 +89,16 @@ extern int* __p___argc(void); extern char*** __p___argv(void); -extern MSVCRT(wchar_t)*** __p___wargv(void); +extern wchar_t*** __p___wargv(void); extern char*** __p__environ(void); -extern MSVCRT(wchar_t)*** __p__wenviron(void); +extern wchar_t*** __p__wenviron(void); extern int* __p___mb_cur_max(void); -extern unsigned long* MSVCRT(__doserrno)(void); +extern unsigned long* __doserrno(void); extern unsigned int* __p__fmode(void); /* FIXME: We need functions to access these: * int _sys_nerr; * char** _sys_errlist; */ -#ifndef USE_MSVCRT_PREFIX #define __argc (*__p___argc()) #define __argv (*__p___argv()) #define __wargv (*__p___wargv()) @@ -120,18 +107,13 @@ #define __mb_cur_max (*__p___mb_cur_max()) #define _doserrno (*__doserrno()) #define _fmode (*_fmode) -#endif /* USE_MSVCRT_PREFIX */ -extern int* MSVCRT(_errno)(void); -#ifndef USE_MSVCRT_PREFIX -# define errno (*_errno()) -#else -# define MSVCRT_errno (*MSVCRT__errno()) -#endif +extern int* _errno(void); +#define errno (*_errno()) -typedef int (*MSVCRT(_onexit_t))(void); +typedef int (*_onexit_t)(void); __int64 _atoi64(const char*); @@ -139,7 +121,7 @@ void _beep(unsigned int,unsigned int); char* _ecvt(double,int,int*,int*); char* _fcvt(double,int,int*,int*); -char* _fullpath(char*,const char*,MSVCRT(size_t)); +char* _fullpath(char*,const char*,size_t); char* _gcvt(double,int,char*); char* _i64toa(__int64,char*,int); char* _itoa(int,char*,int); @@ -147,8 +129,8 @@ unsigned long _lrotl(unsigned long,int); unsigned long _lrotr(unsigned long,int); void _makepath(char*,const char*,const char*,const char*,const char*); -MSVCRT(size_t) _mbstrlen(const char*); -MSVCRT(_onexit_t) MSVCRT(_onexit)(MSVCRT(_onexit_t)); +size_t _mbstrlen(const char*); +_onexit_t _onexit(_onexit_t); int _putenv(const char*); unsigned int _rotl(unsigned int,int); unsigned int _rotr(unsigned int,int); @@ -158,67 +140,67 @@ void _sleep(unsigned long); void _splitpath(const char*,char*,char*,char*,char*); long double _strtold(const char*,char**); -void MSVCRT(_swab)(char*,char*,int); +void _swab(char*,char*,int); char* _ui64toa(unsigned __int64,char*,int); char* _ultoa(unsigned long,char*,int); -void MSVCRT(_exit)(int); -void MSVCRT(abort)(); -int MSVCRT(abs)(int); -int MSVCRT(atexit)(void (*)(void)); -double MSVCRT(atof)(const char*); -int MSVCRT(atoi)(const char*); -long MSVCRT(atol)(const char*); -void* MSVCRT(calloc)(MSVCRT(size_t),MSVCRT(size_t)); +void _exit(int); +void abort(); +int abs(int); +int atexit(void (*)(void)); +double atof(const char*); +int atoi(const char*); +long atol(const char*); +void* calloc(size_t,size_t); #ifndef __i386__ -MSVCRT(div_t) MSVCRT(div)(int,int); -MSVCRT(ldiv_t) MSVCRT(ldiv)(long,long); +div_t div(int,int); +ldiv_t ldiv(long,long); #endif -void MSVCRT(exit)(int); -void MSVCRT(free)(void*); -char* MSVCRT(getenv)(const char*); -long MSVCRT(labs)(long); -void* MSVCRT(malloc)(MSVCRT(size_t)); -int MSVCRT(mblen)(const char*,MSVCRT(size_t)); -void MSVCRT(perror)(const char*); -int MSVCRT(rand)(void); -void* MSVCRT(realloc)(void*,MSVCRT(size_t)); -void MSVCRT(srand)(unsigned int); -double MSVCRT(strtod)(const char*,char**); -long MSVCRT(strtol)(const char*,char**,int); -unsigned long MSVCRT(strtoul)(const char*,char**,int); -int MSVCRT(system)(const char*); -void* MSVCRT(bsearch)(const void*,const void*,MSVCRT(size_t),MSVCRT(size_t), +void exit(int); +void free(void*); +char* getenv(const char*); +long labs(long); +void* malloc(size_t); +int mblen(const char*,size_t); +void perror(const char*); +int rand(void); +void* realloc(void*,size_t); +void srand(unsigned int); +double strtod(const char*,char**); +long strtol(const char*,char**,int); +unsigned long strtoul(const char*,char**,int); +int system(const char*); +void* bsearch(const void*,const void*,size_t,size_t, int (*)(const void*,const void*)); -void MSVCRT(qsort)(void*,MSVCRT(size_t),MSVCRT(size_t), +void qsort(void*,size_t,size_t, int (*)(const void*,const void*)); #ifndef MSVCRT_WSTDLIB_DEFINED #define MSVCRT_WSTDLIB_DEFINED -MSVCRT(wchar_t)*_itow(int,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_i64tow(__int64,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ltow(long,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ui64tow(unsigned __int64,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ultow(unsigned long,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_wfullpath(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*_wgetenv(const MSVCRT(wchar_t)*); -void _wmakepath(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -void _wperror(const MSVCRT(wchar_t)*); -int _wputenv(const MSVCRT(wchar_t)*); -void _wsearchenv(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(wchar_t)*); -void _wsplitpath(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*); -int _wsystem(const MSVCRT(wchar_t)*); -int _wtoi(const MSVCRT(wchar_t)*); -__int64 _wtoi64(const MSVCRT(wchar_t)*); -long _wtol(const MSVCRT(wchar_t)*); - -MSVCRT(size_t) MSVCRT(mbstowcs)(MSVCRT(wchar_t)*,const char*,MSVCRT(size_t)); -int MSVCRT(mbtowc)(MSVCRT(wchar_t)*,const char*,MSVCRT(size_t)); -double MSVCRT(wcstod)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**); -long MSVCRT(wcstol)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**,int); -MSVCRT(size_t) MSVCRT(wcstombs)(char*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -unsigned long MSVCRT(wcstoul)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**,int); -int MSVCRT(wctomb)(char*,MSVCRT(wchar_t)); +wchar_t*_itow(int,wchar_t*,int); +wchar_t*_i64tow(__int64,wchar_t*,int); +wchar_t*_ltow(long,wchar_t*,int); +wchar_t*_ui64tow(unsigned __int64,wchar_t*,int); +wchar_t*_ultow(unsigned long,wchar_t*,int); +wchar_t*_wfullpath(wchar_t*,const wchar_t*,size_t); +wchar_t*_wgetenv(const wchar_t*); +void _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +void _wperror(const wchar_t*); +int _wputenv(const wchar_t*); +void _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); +void _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); +int _wsystem(const wchar_t*); +int _wtoi(const wchar_t*); +__int64 _wtoi64(const wchar_t*); +long _wtol(const wchar_t*); + +size_t mbstowcs(wchar_t*,const char*,size_t); +int mbtowc(wchar_t*,const char*,size_t); +double wcstod(const wchar_t*,wchar_t**); +long wcstol(const wchar_t*,wchar_t**,int); +size_t wcstombs(char*,const wchar_t*,size_t); +unsigned long wcstoul(const wchar_t*,wchar_t**,int); +int wctomb(char*,wchar_t); #endif /* MSVCRT_WSTDLIB_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/string.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/string.h,v retrieving revision 1.9 diff -u -r1.9 string.h --- include/msvcrt/string.h 16 Mar 2004 19:17:11 -0000 1.9 +++ include/msvcrt/string.h 16 Jun 2004 05:54:16 -0000 @@ -11,23 +11,15 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif @@ -56,63 +48,63 @@ int _stricmp(const char*,const char*); int _stricoll(const char*,const char*); char* _strlwr(char*); -int _strnicmp(const char*,const char*,MSVCRT(size_t)); -char* _strnset(char*,int,MSVCRT(size_t)); +int _strnicmp(const char*,const char*,size_t); +char* _strnset(char*,int,size_t); char* _strrev(char*); char* _strset(char*,int); char* _strupr(char*); -void* MSVCRT(memchr)(const void*,int,MSVCRT(size_t)); -int MSVCRT(memcmp)(const void*,const void*,MSVCRT(size_t)); -void* MSVCRT(memcpy)(void*,const void*,MSVCRT(size_t)); -void* MSVCRT(memmove)(void*,const void*,MSVCRT(size_t)); -void* MSVCRT(memset)(void*,int,MSVCRT(size_t)); -char* MSVCRT(strcat)(char*,const char*); -char* MSVCRT(strchr)(const char*,int); -int MSVCRT(strcmp)(const char*,const char*); -int MSVCRT(strcoll)(const char*,const char*); -char* MSVCRT(strcpy)(char*,const char*); -MSVCRT(size_t) MSVCRT(strcspn)(const char*,const char*); -char* MSVCRT(strerror)(int); -MSVCRT(size_t) MSVCRT(strlen)(const char*); -char* MSVCRT(strncat)(char*,const char*,MSVCRT(size_t)); -int MSVCRT(strncmp)(const char*,const char*,MSVCRT(size_t)); -char* MSVCRT(strncpy)(char*,const char*,MSVCRT(size_t)); -char* MSVCRT(strpbrk)(const char*,const char*); -char* MSVCRT(strrchr)(const char*,int); -MSVCRT(size_t) MSVCRT(strspn)(const char*,const char*); -char* MSVCRT(strstr)(const char*,const char*); -char* MSVCRT(strtok)(char*,const char*); -MSVCRT(size_t) MSVCRT(strxfrm)(char*,const char*,MSVCRT(size_t)); +void* memchr(const void*,int,size_t); +int memcmp(const void*,const void*,size_t); +void* memcpy(void*,const void*,size_t); +void* memmove(void*,const void*,size_t); +void* memset(void*,int,size_t); +char* strcat(char*,const char*); +char* strchr(const char*,int); +int strcmp(const char*,const char*); +int strcoll(const char*,const char*); +char* strcpy(char*,const char*); +size_t strcspn(const char*,const char*); +char* strerror(int); +size_t strlen(const char*); +char* strncat(char*,const char*,size_t); +int strncmp(const char*,const char*,size_t); +char* strncpy(char*,const char*,size_t); +char* strpbrk(const char*,const char*); +char* strrchr(const char*,int); +size_t strspn(const char*,const char*); +char* strstr(const char*,const char*); +char* strtok(char*,const char*); +size_t strxfrm(char*,const char*,size_t); #ifndef MSVCRT_WSTRING_DEFINED #define MSVCRT_WSTRING_DEFINED -MSVCRT(wchar_t)*_wcsdup(const MSVCRT(wchar_t)*); -int _wcsicmp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wcsicoll(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wcslwr(MSVCRT(wchar_t)*); -int _wcsnicmp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*_wcsnset(MSVCRT(wchar_t)*,MSVCRT(wchar_t),MSVCRT(size_t)); -MSVCRT(wchar_t)*_wcsrev(MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wcsset(MSVCRT(wchar_t)*,MSVCRT(wchar_t)); -MSVCRT(wchar_t)*_wcsupr(MSVCRT(wchar_t)*); - -MSVCRT(wchar_t)*MSVCRT(wcscat)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcschr)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)); -int MSVCRT(wcscmp)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int MSVCRT(wcscoll)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcscpy)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcscspn)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcslen)(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsncat)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -int MSVCRT(wcsncmp)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*MSVCRT(wcsncpy)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*MSVCRT(wcspbrk)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsrchr)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t) wcFor); -MSVCRT(size_t) MSVCRT(wcsspn)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsstr)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcstok)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcsxfrm)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); +wchar_t*_wcsdup(const wchar_t*); +int _wcsicmp(const wchar_t*,const wchar_t*); +int _wcsicoll(const wchar_t*,const wchar_t*); +wchar_t*_wcslwr(wchar_t*); +int _wcsnicmp(const wchar_t*,const wchar_t*,size_t); +wchar_t*_wcsnset(wchar_t*,wchar_t,size_t); +wchar_t*_wcsrev(wchar_t*); +wchar_t*_wcsset(wchar_t*,wchar_t); +wchar_t*_wcsupr(wchar_t*); + +wchar_t*wcscat(wchar_t*,const wchar_t*); +wchar_t*wcschr(const wchar_t*,wchar_t); +int wcscmp(const wchar_t*,const wchar_t*); +int wcscoll(const wchar_t*,const wchar_t*); +wchar_t*wcscpy(wchar_t*,const wchar_t*); +size_t wcscspn(const wchar_t*,const wchar_t*); +size_t wcslen(const wchar_t*); +wchar_t*wcsncat(wchar_t*,const wchar_t*,size_t); +int wcsncmp(const wchar_t*,const wchar_t*,size_t); +wchar_t*wcsncpy(wchar_t*,const wchar_t*,size_t); +wchar_t*wcspbrk(const wchar_t*,const wchar_t*); +wchar_t*wcsrchr(const wchar_t*,wchar_t wcFor); +size_t wcsspn(const wchar_t*,const wchar_t*); +wchar_t*wcsstr(const wchar_t*,const wchar_t*); +wchar_t*wcstok(wchar_t*,const wchar_t*); +size_t wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif /* MSVCRT_WSTRING_DEFINED */ #ifdef __cplusplus @@ -121,8 +113,8 @@ #ifndef USE_MSVCRT_PREFIX -static inline void* memccpy(void *s1, const void *s2, int c, MSVCRT(size_t) n) { return _memccpy(s1, s2, c, n); } -static inline int memicmp(const void* s1, const void* s2, MSVCRT(size_t) len) { return _memicmp(s1, s2, len); } +static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return _memccpy(s1, s2, c, n); } +static inline int memicmp(const void* s1, const void* s2, size_t len) { return _memicmp(s1, s2, len); } static inline int strcasecmp(const char* s1, const char* s2) { return _stricmp(s1, s2); } static inline int strcmpi(const char* s1, const char* s2) { return _strcmpi(s1, s2); } static inline char* strdup(const char* buf) { return _strdup(buf); } @@ -130,20 +122,20 @@ static inline int stricoll(const char* s1, const char* s2) { return _stricoll(s1, s2); } static inline char* strlwr(char* str) { return _strlwr(str); } static inline int strncasecmp(const char *str1, const char *str2, size_t n) { return _strnicmp(str1, str2, n); } -static inline int strnicmp(const char* s1, const char* s2, MSVCRT(size_t) n) { return _strnicmp(s1, s2, n); } +static inline int strnicmp(const char* s1, const char* s2, size_t n) { return _strnicmp(s1, s2, n); } static inline char* strnset(char* str, int value, unsigned int len) { return _strnset(str, value, len); } static inline char* strrev(char* str) { return _strrev(str); } static inline char* strset(char* str, int value) { return _strset(str, value); } static inline char* strupr(char* str) { return _strupr(str); } -static inline MSVCRT(wchar_t)* wcsdup(const MSVCRT(wchar_t)* str) { return _wcsdup(str); } -static inline int wcsicoll(const MSVCRT(wchar_t)* str1, const MSVCRT(wchar_t)* str2) { return _wcsicoll(str1, str2); } -static inline MSVCRT(wchar_t)* wcslwr(MSVCRT(wchar_t)* str) { return _wcslwr(str); } -static inline int wcsnicmp(const MSVCRT(wchar_t)* str1, const MSVCRT(wchar_t)* str2, MSVCRT(size_t) n) { return _wcsnicmp(str1, str2, n); } -static inline MSVCRT(wchar_t)* wcsnset(MSVCRT(wchar_t)* str, MSVCRT(wchar_t) c, MSVCRT(size_t) n) { return _wcsnset(str, c, n); } -static inline MSVCRT(wchar_t)* wcsrev(MSVCRT(wchar_t)* str) { return _wcsrev(str); } -static inline MSVCRT(wchar_t)* wcsset(MSVCRT(wchar_t)* str, MSVCRT(wchar_t) c) { return _wcsset(str, c); } -static inline MSVCRT(wchar_t)* wcsupr(MSVCRT(wchar_t)* str) { return _wcsupr(str); } +static inline wchar_t* wcsdup(const wchar_t* str) { return _wcsdup(str); } +static inline int wcsicoll(const wchar_t* str1, const wchar_t* str2) { return _wcsicoll(str1, str2); } +static inline wchar_t* wcslwr(wchar_t* str) { return _wcslwr(str); } +static inline int wcsnicmp(const wchar_t* str1, const wchar_t* str2, size_t n) { return _wcsnicmp(str1, str2, n); } +static inline wchar_t* wcsnset(wchar_t* str, wchar_t c, size_t n) { return _wcsnset(str, c, n); } +static inline wchar_t* wcsrev(wchar_t* str) { return _wcsrev(str); } +static inline wchar_t* wcsset(wchar_t* str, wchar_t c) { return _wcsset(str, c); } +static inline wchar_t* wcsupr(wchar_t* str) { return _wcsupr(str); } #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_STRING_H */ Index: include/msvcrt/time.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/time.h,v retrieving revision 1.7 diff -u -r1.7 time.h --- include/msvcrt/time.h 16 Mar 2004 19:17:11 -0000 1.7 +++ include/msvcrt/time.h 16 Jun 2004 05:54:16 -0000 @@ -23,33 +23,25 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif #ifndef MSVCRT_CLOCK_T_DEFINED -typedef long MSVCRT(clock_t); +typedef long clock_t; #define MSVCRT_CLOCK_T_DEFINED #endif @@ -67,7 +59,7 @@ #ifndef MSVCRT_TM_DEFINED #define MSVCRT_TM_DEFINED -struct MSVCRT(tm) { +struct tm { int tm_sec; int tm_min; int tm_hour; @@ -87,29 +79,29 @@ /* FIXME: Must do something for _daylight, _dstbias, _timezone, _tzname */ -unsigned _getsystime(struct MSVCRT(tm)*); -unsigned _setsystime(struct MSVCRT(tm)*,unsigned); +unsigned _getsystime(struct tm*); +unsigned _setsystime(struct tm*,unsigned); char* _strdate(char*); char* _strtime(char*); void _tzset(void); -char* MSVCRT(asctime)(const struct MSVCRT(tm)*); -MSVCRT(clock_t) MSVCRT(clock)(void); -char* MSVCRT(ctime)(const MSVCRT(time_t)*); -double MSVCRT(difftime)(MSVCRT(time_t),MSVCRT(time_t)); -struct MSVCRT(tm)* MSVCRT(gmtime)(const MSVCRT(time_t)*); -struct MSVCRT(tm)* MSVCRT(localtime)(const MSVCRT(time_t)*); -MSVCRT(time_t) MSVCRT(mktime)(struct MSVCRT(tm)*); -size_t MSVCRT(strftime)(char*,size_t,const char*,const struct MSVCRT(tm)*); -MSVCRT(time_t) MSVCRT(time)(MSVCRT(time_t)*); +char* asctime(const struct tm*); +clock_t clock(void); +char* ctime(const time_t*); +double difftime(time_t,time_t); +struct tm* gmtime(const time_t*); +struct tm* localtime(const time_t*); +time_t mktime(struct tm*); +size_t strftime(char*,size_t,const char*,const struct tm*); +time_t time(time_t*); #ifndef MSVCRT_WTIME_DEFINED #define MSVCRT_WTIME_DEFINED -MSVCRT(wchar_t)* MSVCRT(_wasctime)(const struct MSVCRT(tm)*); -MSVCRT(size_t) MSVCRT(wcsftime)(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,const struct MSVCRT(tm)*); -MSVCRT(wchar_t)*_wctime(const MSVCRT(time_t)*); -MSVCRT(wchar_t)*_wstrdate(MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wstrtime(MSVCRT(wchar_t)*); +wchar_t* _wasctime(const struct tm*); +size_t wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +wchar_t*_wctime(const time_t*); +wchar_t*_wstrdate(wchar_t*); +wchar_t*_wstrtime(wchar_t*); #endif /* MSVCRT_WTIME_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/wchar.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/wchar.h,v retrieving revision 1.8 diff -u -r1.8 wchar.h --- include/msvcrt/wchar.h 26 Apr 2004 23:31:39 -0000 1.8 +++ include/msvcrt/wchar.h 16 Jun 2004 05:56:01 -0000 @@ -13,14 +13,6 @@ #include <stdarg.h> -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifdef __cplusplus extern "C" { #endif @@ -28,7 +20,7 @@ #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -41,18 +33,18 @@ #endif #define WCHAR_MIN 0 -#define WCHAR_MAX ((MSVCRT(wchar_t))-1) +#define WCHAR_MAX ((wchar_t)-1) -typedef int MSVCRT(mbstate_t); +typedef int mbstate_t; #ifndef MSVCRT_SIZE_T_DEFINED -typedef unsigned int MSVCRT(size_t); +typedef unsigned int size_t; #define MSVCRT_SIZE_T_DEFINED #endif #ifndef _WCTYPE_T_DEFINED -typedef unsigned short MSVCRT(wint_t); -typedef unsigned short MSVCRT(wctype_t); +typedef unsigned short wint_t; +typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif @@ -62,15 +54,9 @@ # endif #endif -#ifndef USE_MSVCRT_PREFIX -# ifndef WEOF -# define WEOF (wint_t)(0xFFFF) -# endif -#else -# ifndef MSVCRT_WEOF -# define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) -# endif -#endif /* USE_MSVCRT_PREFIX */ +#ifndef WEOF +#define WEOF (wint_t)(0xFFFF) +#endif #ifndef MSVCRT_FSIZE_T_DEFINED typedef unsigned long _fsize_t; @@ -88,18 +74,18 @@ #endif #ifndef MSVCRT_OFF_T_DEFINED -typedef int MSVCRT(_off_t); +typedef int _off_t; #define MSVCRT_OFF_T_DEFINED #endif #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif #ifndef MSVCRT_TM_DEFINED #define MSVCRT_TM_DEFINED -struct MSVCRT(tm) { +struct tm { int tm_sec; int tm_min; int tm_hour; @@ -114,7 +100,7 @@ #ifndef MSVCRT_FILE_DEFINED #define MSVCRT_FILE_DEFINED -typedef struct MSVCRT(_iobuf) +typedef struct _iobuf { char* _ptr; int _cnt; @@ -124,28 +110,28 @@ int _charbuf; int _bufsiz; char* _tmpfname; -} MSVCRT(FILE); +} FILE; #endif /* MSVCRT_FILE_DEFINED */ #ifndef MSVCRT_WFINDDATA_T_DEFINED #define MSVCRT_WFINDDATA_T_DEFINED -struct MSVCRT(_wfinddata_t) { +struct _wfinddata_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; - MSVCRT(_fsize_t) size; - MSVCRT(wchar_t) name[260]; + time_t time_create; + time_t time_access; + time_t time_write; + _fsize_t size; + wchar_t name[260]; }; -struct MSVCRT(_wfinddatai64_t) { +struct _wfinddatai64_t { unsigned attrib; - MSVCRT(time_t) time_create; - MSVCRT(time_t) time_access; - MSVCRT(time_t) time_write; + time_t time_create; + time_t time_access; + time_t time_write; __int64 size; - MSVCRT(wchar_t) name[260]; + wchar_t name[260]; }; #endif /* MSVCRT_WFINDDATA_T_DEFINED */ @@ -153,46 +139,46 @@ #ifndef MSVCRT_STAT_DEFINED #define MSVCRT_STAT_DEFINED -struct MSVCRT(_stat) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct _stat { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; - MSVCRT(_off_t) st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; -struct MSVCRT(stat) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct stat { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; - MSVCRT(_off_t) st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; -struct MSVCRT(_stati64) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct _stati64 { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; + _dev_t st_rdev; __int64 st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; #endif /* MSVCRT_STAT_DEFINED */ @@ -210,197 +196,197 @@ #ifndef MSVCRT_WCTYPE_DEFINED #define MSVCRT_WCTYPE_DEFINED -int MSVCRT(is_wctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(isleadbyte)(int); -int MSVCRT(iswalnum)(MSVCRT(wint_t)); -int MSVCRT(iswalpha)(MSVCRT(wint_t)); -int MSVCRT(iswascii)(MSVCRT(wint_t)); -int MSVCRT(iswcntrl)(MSVCRT(wint_t)); -int MSVCRT(iswctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(iswdigit)(MSVCRT(wint_t)); -int MSVCRT(iswgraph)(MSVCRT(wint_t)); -int MSVCRT(iswlower)(MSVCRT(wint_t)); -int MSVCRT(iswprint)(MSVCRT(wint_t)); -int MSVCRT(iswpunct)(MSVCRT(wint_t)); -int MSVCRT(iswspace)(MSVCRT(wint_t)); -int MSVCRT(iswupper)(MSVCRT(wint_t)); -int MSVCRT(iswxdigit)(MSVCRT(wint_t)); -MSVCRT(wchar_t) MSVCRT(towlower)(MSVCRT(wchar_t)); -MSVCRT(wchar_t) MSVCRT(towupper)(MSVCRT(wchar_t)); +int is_wctype(wint_t,wctype_t); +int isleadbyte(int); +int iswalnum(wint_t); +int iswalpha(wint_t); +int iswascii(wint_t); +int iswcntrl(wint_t); +int iswctype(wint_t,wctype_t); +int iswdigit(wint_t); +int iswgraph(wint_t); +int iswlower(wint_t); +int iswprint(wint_t); +int iswpunct(wint_t); +int iswspace(wint_t); +int iswupper(wint_t); +int iswxdigit(wint_t); +wchar_t towlower(wchar_t); +wchar_t towupper(wchar_t); #endif /* MSVCRT_WCTYPE_DEFINED */ #ifndef MSVCRT_WDIRECT_DEFINED #define MSVCRT_WDIRECT_DEFINED -int _wchdir(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)* _wgetcwd(MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)* _wgetdcwd(int,MSVCRT(wchar_t)*,int); -int _wmkdir(const MSVCRT(wchar_t)*); -int _wrmdir(const MSVCRT(wchar_t)*); +int _wchdir(const wchar_t*); +wchar_t* _wgetcwd(wchar_t*,int); +wchar_t* _wgetdcwd(int,wchar_t*,int); +int _wmkdir(const wchar_t*); +int _wrmdir(const wchar_t*); #endif /* MSVCRT_WDIRECT_DEFINED */ #ifndef MSVCRT_WIO_DEFINED #define MSVCRT_WIO_DEFINED -int _waccess(const MSVCRT(wchar_t)*,int); -int _wchmod(const MSVCRT(wchar_t)*,int); -int _wcreat(const MSVCRT(wchar_t)*,int); -long _wfindfirst(const MSVCRT(wchar_t)*,struct _wfinddata_t*); -long _wfindfirsti64(const MSVCRT(wchar_t)*, struct _wfinddatai64_t*); +int _waccess(const wchar_t*,int); +int _wchmod(const wchar_t*,int); +int _wcreat(const wchar_t*,int); +long _wfindfirst(const wchar_t*,struct _wfinddata_t*); +long _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); int _wfindnext(long,struct _wfinddata_t*); int _wfindnexti64(long, struct _wfinddatai64_t*); -MSVCRT(wchar_t)*_wmktemp(MSVCRT(wchar_t)*); -int _wopen(const MSVCRT(wchar_t)*,int,...); -int _wrename(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wsopen(const MSVCRT(wchar_t)*,int,int,...); -int _wunlink(const MSVCRT(wchar_t)*); +wchar_t*_wmktemp(wchar_t*); +int _wopen(const wchar_t*,int,...); +int _wrename(const wchar_t*,const wchar_t*); +int _wsopen(const wchar_t*,int,int,...); +int _wunlink(const wchar_t*); #endif /* MSVCRT_WIO_DEFINED */ #ifndef MSVCRT_WLOCALE_DEFINED #define MSVCRT_WLOCALE_DEFINED -MSVCRT(wchar_t)* _wsetlocale(int,const MSVCRT(wchar_t)*); +wchar_t* _wsetlocale(int,const wchar_t*); #endif /* MSVCRT_WLOCALE_DEFINED */ #ifndef MSVCRT_WPROCESS_DEFINED #define MSVCRT_WPROCESS_DEFINED -int _wexecl(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexecle(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexeclp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexeclpe(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wexecv(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wexecve(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wexecvp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wexecvpe(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wspawnl(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnle(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnlp(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnlpe(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int _wspawnv(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wspawnve(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wspawnvp(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *); -int _wspawnvpe(int,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)* const *,const MSVCRT(wchar_t)* const *); -int _wsystem(const MSVCRT(wchar_t)*); +int _wexecl(const wchar_t*,const wchar_t*,...); +int _wexecle(const wchar_t*,const wchar_t*,...); +int _wexeclp(const wchar_t*,const wchar_t*,...); +int _wexeclpe(const wchar_t*,const wchar_t*,...); +int _wexecv(const wchar_t*,const wchar_t* const *); +int _wexecve(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wexecvp(const wchar_t*,const wchar_t* const *); +int _wexecvpe(const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wspawnl(int,const wchar_t*,const wchar_t*,...); +int _wspawnle(int,const wchar_t*,const wchar_t*,...); +int _wspawnlp(int,const wchar_t*,const wchar_t*,...); +int _wspawnlpe(int,const wchar_t*,const wchar_t*,...); +int _wspawnv(int,const wchar_t*,const wchar_t* const *); +int _wspawnve(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wspawnvp(int,const wchar_t*,const wchar_t* const *); +int _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wchar_t* const *); +int _wsystem(const wchar_t*); #endif /* MSVCRT_WPROCESS_DEFINED */ #ifndef MSVCRT_WSTAT_DEFINED #define MSVCRT_WSTAT_DEFINED -int _wstat(const MSVCRT(wchar_t)*,struct MSVCRT(_stat)*); -int _wstati64(const MSVCRT(wchar_t)*,struct MSVCRT(_stati64)*); +int _wstat(const wchar_t*,struct _stat*); +int _wstati64(const wchar_t*,struct _stati64*); #endif /* MSVCRT_WSTAT_DEFINED */ #ifndef MSVCRT_WSTDIO_DEFINED #define MSVCRT_WSTDIO_DEFINED -MSVCRT(wint_t) _fgetwchar(void); -MSVCRT(wint_t) _fputwchar(MSVCRT(wint_t)); -MSVCRT(wchar_t)*_getws(MSVCRT(wchar_t)*); -int _putws(const MSVCRT(wchar_t)*); -int _snwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,...); -int _vsnwprintf(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,va_list); -MSVCRT(FILE)* _wfdopen(int,const MSVCRT(wchar_t)*); -MSVCRT(FILE)* _wfopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(FILE)* _wfreopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -MSVCRT(FILE)* _wfsopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,int); -void _wperror(const MSVCRT(wchar_t)*); -MSVCRT(FILE)* _wpopen(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wremove(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wtempnam(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wtmpnam(MSVCRT(wchar_t)*); - -MSVCRT(wint_t) MSVCRT(fgetwc)(MSVCRT(FILE)*); -MSVCRT(wchar_t)*MSVCRT(fgetws)(MSVCRT(wchar_t)*,int,MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(fputwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -int MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -int MSVCRT(fwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...); -int MSVCRT(fputws)(const MSVCRT(wchar_t)*,MSVCRT(FILE)*); -int MSVCRT(fwscanf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,...); -MSVCRT(wint_t) MSVCRT(getwc)(MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(getwchar)(void); -MSVCRT(wchar_t)*MSVCRT(getws)(MSVCRT(wchar_t)*); -MSVCRT(wint_t) MSVCRT(putwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -MSVCRT(wint_t) MSVCRT(putwchar)(MSVCRT(wint_t)); -int MSVCRT(putws)(const MSVCRT(wchar_t)*); -int MSVCRT(swprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -int MSVCRT(swscanf)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,...); -MSVCRT(wint_t) MSVCRT(ungetwc)(MSVCRT(wint_t),MSVCRT(FILE)*); -int MSVCRT(vfwprintf)(MSVCRT(FILE)*,const MSVCRT(wchar_t)*,va_list); -int MSVCRT(vswprintf)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,va_list); -int MSVCRT(vwprintf)(const MSVCRT(wchar_t)*,va_list); -int MSVCRT(wprintf)(const MSVCRT(wchar_t)*,...); -int MSVCRT(wscanf)(const MSVCRT(wchar_t)*,...); +wint_t _fgetwchar(void); +wint_t _fputwchar(wint_t); +wchar_t*_getws(wchar_t*); +int _putws(const wchar_t*); +int _snwprintf(wchar_t*,size_t,const wchar_t*,...); +int _vsnwprintf(wchar_t*,size_t,const wchar_t*,va_list); +FILE* _wfdopen(int,const wchar_t*); +FILE* _wfopen(const wchar_t*,const wchar_t*); +FILE* _wfreopen(const wchar_t*,const wchar_t*,FILE*); +FILE* _wfsopen(const wchar_t*,const wchar_t*,int); +void _wperror(const wchar_t*); +FILE* _wpopen(const wchar_t*,const wchar_t*); +int _wremove(const wchar_t*); +wchar_t*_wtempnam(const wchar_t*,const wchar_t*); +wchar_t*_wtmpnam(wchar_t*); + +wint_t fgetwc(FILE*); +wchar_t*fgetws(wchar_t*,int,FILE*); +wint_t fputwc(wint_t,FILE*); +int fputws(const wchar_t*,FILE*); +int fwprintf(FILE*,const wchar_t*,...); +int fputws(const wchar_t*,FILE*); +int fwscanf(FILE*,const wchar_t*,...); +wint_t getwc(FILE*); +wint_t getwchar(void); +wchar_t*getws(wchar_t*); +wint_t putwc(wint_t,FILE*); +wint_t putwchar(wint_t); +int putws(const wchar_t*); +int swprintf(wchar_t*,const wchar_t*,...); +int swscanf(const wchar_t*,const wchar_t*,...); +wint_t ungetwc(wint_t,FILE*); +int vfwprintf(FILE*,const wchar_t*,va_list); +int vswprintf(wchar_t*,const wchar_t*,va_list); +int vwprintf(const wchar_t*,va_list); +int wprintf(const wchar_t*,...); +int wscanf(const wchar_t*,...); #endif /* MSVCRT_WSTDIO_DEFINED */ #ifndef MSVCRT_WSTDLIB_DEFINED #define MSVCRT_WSTDLIB_DEFINED -MSVCRT(wchar_t)*_itow(int,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_i64tow(__int64,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ltow(long,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ui64tow(unsigned __int64,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_ultow(unsigned long,MSVCRT(wchar_t)*,int); -MSVCRT(wchar_t)*_wfullpath(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,size_t); -MSVCRT(wchar_t)*_wgetenv(const MSVCRT(wchar_t)*); -void _wmakepath(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -void _wperror(const MSVCRT(wchar_t)*); -int _wputenv(const MSVCRT(wchar_t)*); -void _wsearchenv(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(wchar_t)*); -void _wsplitpath(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*,MSVCRT(wchar_t)*); -int _wsystem(const MSVCRT(wchar_t)*); -int _wtoi(const MSVCRT(wchar_t)*); -__int64 _wtoi64(const MSVCRT(wchar_t)*); -long _wtol(const MSVCRT(wchar_t)*); - -MSVCRT(size_t) MSVCRT(mbstowcs)(MSVCRT(wchar_t)*,const char*,MSVCRT(size_t)); -int MSVCRT(mbtowc)(MSVCRT(wchar_t)*,const char*,MSVCRT(size_t)); -double MSVCRT(wcstod)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**); -long MSVCRT(wcstol)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**,int); -MSVCRT(size_t) MSVCRT(wcstombs)(char*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -unsigned long MSVCRT(wcstoul)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)**,int); -int MSVCRT(wctomb)(char*,MSVCRT(wchar_t)); +wchar_t*_itow(int,wchar_t*,int); +wchar_t*_i64tow(__int64,wchar_t*,int); +wchar_t*_ltow(long,wchar_t*,int); +wchar_t*_ui64tow(unsigned __int64,wchar_t*,int); +wchar_t*_ultow(unsigned long,wchar_t*,int); +wchar_t*_wfullpath(wchar_t*,const wchar_t*,size_t); +wchar_t*_wgetenv(const wchar_t*); +void _wmakepath(wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*,const wchar_t*); +void _wperror(const wchar_t*); +int _wputenv(const wchar_t*); +void _wsearchenv(const wchar_t*,const wchar_t*,wchar_t*); +void _wsplitpath(const wchar_t*,wchar_t*,wchar_t*,wchar_t*,wchar_t*); +int _wsystem(const wchar_t*); +int _wtoi(const wchar_t*); +__int64 _wtoi64(const wchar_t*); +long _wtol(const wchar_t*); + +size_t mbstowcs(wchar_t*,const char*,size_t); +int mbtowc(wchar_t*,const char*,size_t); +double wcstod(const wchar_t*,wchar_t**); +long wcstol(const wchar_t*,wchar_t**,int); +size_t wcstombs(char*,const wchar_t*,size_t); +unsigned long wcstoul(const wchar_t*,wchar_t**,int); +int wctomb(char*,wchar_t); #endif /* MSVCRT_WSTDLIB_DEFINED */ #ifndef MSVCRT_WSTRING_DEFINED #define MSVCRT_WSTRING_DEFINED -MSVCRT(wchar_t)*_wcsdup(const MSVCRT(wchar_t)*); -int _wcsicmp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int _wcsicoll(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wcslwr(MSVCRT(wchar_t)*); -int _wcsnicmp(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*_wcsnset(MSVCRT(wchar_t)*,MSVCRT(wchar_t),MSVCRT(size_t)); -MSVCRT(wchar_t)*_wcsrev(MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wcsset(MSVCRT(wchar_t)*,MSVCRT(wchar_t)); -MSVCRT(wchar_t)*_wcsupr(MSVCRT(wchar_t)*); - -MSVCRT(wchar_t)*MSVCRT(wcscat)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcschr)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t)); -int MSVCRT(wcscmp)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -int MSVCRT(wcscoll)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcscpy)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcscspn)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcslen)(const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsncat)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -int MSVCRT(wcsncmp)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*MSVCRT(wcsncpy)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); -MSVCRT(wchar_t)*MSVCRT(wcspbrk)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsrchr)(const MSVCRT(wchar_t)*,MSVCRT(wchar_t) wcFor); -MSVCRT(size_t) MSVCRT(wcsspn)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcsstr)(const MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*MSVCRT(wcstok)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*); -MSVCRT(size_t) MSVCRT(wcsxfrm)(MSVCRT(wchar_t)*,const MSVCRT(wchar_t)*,MSVCRT(size_t)); +wchar_t*_wcsdup(const wchar_t*); +int _wcsicmp(const wchar_t*,const wchar_t*); +int _wcsicoll(const wchar_t*,const wchar_t*); +wchar_t*_wcslwr(wchar_t*); +int _wcsnicmp(const wchar_t*,const wchar_t*,size_t); +wchar_t*_wcsnset(wchar_t*,wchar_t,size_t); +wchar_t*_wcsrev(wchar_t*); +wchar_t*_wcsset(wchar_t*,wchar_t); +wchar_t*_wcsupr(wchar_t*); + +wchar_t*wcscat(wchar_t*,const wchar_t*); +wchar_t*wcschr(const wchar_t*,wchar_t); +int wcscmp(const wchar_t*,const wchar_t*); +int wcscoll(const wchar_t*,const wchar_t*); +wchar_t*wcscpy(wchar_t*,const wchar_t*); +size_t wcscspn(const wchar_t*,const wchar_t*); +size_t wcslen(const wchar_t*); +wchar_t*wcsncat(wchar_t*,const wchar_t*,size_t); +int wcsncmp(const wchar_t*,const wchar_t*,size_t); +wchar_t*wcsncpy(wchar_t*,const wchar_t*,size_t); +wchar_t*wcspbrk(const wchar_t*,const wchar_t*); +wchar_t*wcsrchr(const wchar_t*,wchar_t wcFor); +size_t wcsspn(const wchar_t*,const wchar_t*); +wchar_t*wcsstr(const wchar_t*,const wchar_t*); +wchar_t*wcstok(wchar_t*,const wchar_t*); +size_t wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif /* MSVCRT_WSTRING_DEFINED */ #ifndef MSVCRT_WTIME_DEFINED #define MSVCRT_WTIME_DEFINED -MSVCRT(wchar_t)*_wasctime(const struct MSVCRT(tm)*); -MSVCRT(size_t) wcsftime(MSVCRT(wchar_t)*,MSVCRT(size_t),const MSVCRT(wchar_t)*,const struct MSVCRT(tm)*); -MSVCRT(wchar_t)*_wctime(const MSVCRT(time_t)*); -MSVCRT(wchar_t)*_wstrdate(MSVCRT(wchar_t)*); -MSVCRT(wchar_t)*_wstrtime(MSVCRT(wchar_t)*); +wchar_t*_wasctime(const struct tm*); +size_t wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +wchar_t*_wctime(const time_t*); +wchar_t*_wstrdate(wchar_t*); +wchar_t*_wstrtime(wchar_t*); #endif /* MSVCRT_WTIME_DEFINED */ -MSVCRT(wchar_t) btowc(int); -MSVCRT(size_t) mbrlen(const char *,MSVCRT(size_t),MSVCRT(mbstate_t)*); -MSVCRT(size_t) mbrtowc(MSVCRT(wchar_t)*,const char*,MSVCRT(size_t),MSVCRT(mbstate_t)*); -MSVCRT(size_t) mbsrtowcs(MSVCRT(wchar_t)*,const char**,MSVCRT(size_t),MSVCRT(mbstate_t)*); -MSVCRT(size_t) wcrtomb(char*,MSVCRT(wchar_t),MSVCRT(mbstate_t)*); -MSVCRT(size_t) wcsrtombs(char*,const MSVCRT(wchar_t)**,MSVCRT(size_t),MSVCRT(mbstate_t)*); -int wctob(MSVCRT(wint_t)); +wchar_t btowc(int); +size_t mbrlen(const char *,size_t,mbstate_t*); +size_t mbrtowc(wchar_t*,const char*,size_t,mbstate_t*); +size_t mbsrtowcs(wchar_t*,const char**,size_t,mbstate_t*); +size_t wcrtomb(char*,wchar_t,mbstate_t*); +size_t wcsrtombs(char*,const wchar_t**,size_t,mbstate_t*); +int wctob(wint_t); #ifdef __cplusplus } Index: include/msvcrt/wctype.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/wctype.h,v retrieving revision 1.7 diff -u -r1.7 wctype.h --- include/msvcrt/wctype.h 26 Apr 2004 23:31:39 -0000 1.7 +++ include/msvcrt/wctype.h 16 Jun 2004 05:56:22 -0000 @@ -23,18 +23,10 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -50,19 +42,13 @@ #define _LEADBYTE 0x8000 #define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ -#ifndef USE_MSVCRT_PREFIX -# ifndef WEOF -# define WEOF (wint_t)(0xFFFF) -# endif -#else -# ifndef MSVCRT_WEOF -# define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) -# endif -#endif /* USE_MSVCRT_PREFIX */ +#ifndef WEOF +#define WEOF (wint_t)(0xFFFF) +#endif #ifndef _WCTYPE_T_DEFINED -typedef unsigned short MSVCRT(wint_t); -typedef unsigned short MSVCRT(wctype_t); +typedef unsigned short wint_t; +typedef unsigned short wctype_t; #define _WCTYPE_T_DEFINED #endif @@ -75,23 +61,23 @@ #ifndef MSVCRT_WCTYPE_DEFINED #define MSVCRT_WCTYPE_DEFINED -int MSVCRT(is_wctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(isleadbyte)(int); -int MSVCRT(iswalnum)(MSVCRT(wint_t)); -int MSVCRT(iswalpha)(MSVCRT(wint_t)); -int MSVCRT(iswascii)(MSVCRT(wint_t)); -int MSVCRT(iswcntrl)(MSVCRT(wint_t)); -int MSVCRT(iswctype)(MSVCRT(wint_t),MSVCRT(wctype_t)); -int MSVCRT(iswdigit)(MSVCRT(wint_t)); -int MSVCRT(iswgraph)(MSVCRT(wint_t)); -int MSVCRT(iswlower)(MSVCRT(wint_t)); -int MSVCRT(iswprint)(MSVCRT(wint_t)); -int MSVCRT(iswpunct)(MSVCRT(wint_t)); -int MSVCRT(iswspace)(MSVCRT(wint_t)); -int MSVCRT(iswupper)(MSVCRT(wint_t)); -int MSVCRT(iswxdigit)(MSVCRT(wint_t)); -MSVCRT(wchar_t) MSVCRT(towlower)(MSVCRT(wchar_t)); -MSVCRT(wchar_t) MSVCRT(towupper)(MSVCRT(wchar_t)); +int is_wctype(wint_t,wctype_t); +int isleadbyte(int); +int iswalnum(wint_t); +int iswalpha(wint_t); +int iswascii(wint_t); +int iswcntrl(wint_t); +int iswctype(wint_t,wctype_t); +int iswdigit(wint_t); +int iswgraph(wint_t); +int iswlower(wint_t); +int iswprint(wint_t); +int iswpunct(wint_t); +int iswspace(wint_t); +int iswupper(wint_t); +int iswxdigit(wint_t); +wchar_t towlower(wchar_t); +wchar_t towupper(wchar_t); #endif /* MSVCRT_WCTYPE_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/sys/stat.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/stat.h,v retrieving revision 1.12 diff -u -r1.12 stat.h --- include/msvcrt/sys/stat.h 16 Mar 2004 19:17:11 -0000 1.12 +++ include/msvcrt/sys/stat.h 16 Jun 2004 05:54:02 -0000 @@ -13,18 +13,10 @@ #include <sys/types.h> -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif @@ -35,22 +27,22 @@ #endif #ifndef MSVCRT_DEV_T_DEFINED -typedef unsigned int MSVCRT(_dev_t); +typedef unsigned int _dev_t; #define MSVCRT_DEV_T_DEFINED #endif #ifndef MSVCRT_INO_T_DEFINED -typedef unsigned short MSVCRT(_ino_t); +typedef unsigned short _ino_t; #define MSVCRT_INO_T_DEFINED #endif #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif #ifndef MSVCRT_OFF_T_DEFINED -typedef int MSVCRT(_off_t); +typedef int _off_t; #define MSVCRT_OFF_T_DEFINED #endif @@ -71,46 +63,46 @@ #ifndef MSVCRT_STAT_DEFINED #define MSVCRT_STAT_DEFINED -struct MSVCRT(_stat) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct _stat { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; - MSVCRT(_off_t) st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; -struct MSVCRT(stat) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct stat { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; - MSVCRT(_off_t) st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + _dev_t st_rdev; + _off_t st_size; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; -struct MSVCRT(_stati64) { - MSVCRT(_dev_t) st_dev; - MSVCRT(_ino_t) st_ino; +struct _stati64 { + _dev_t st_dev; + _ino_t st_ino; unsigned short st_mode; short st_nlink; short st_uid; short st_gid; - MSVCRT(_dev_t) st_rdev; + _dev_t st_rdev; __int64 st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; + time_t st_atime; + time_t st_mtime; + time_t st_ctime; }; #endif /* MSVCRT_STAT_DEFINED */ @@ -118,16 +110,16 @@ extern "C" { #endif -int MSVCRT(_fstat)(int,struct MSVCRT(_stat)*); -int MSVCRT(_stat)(const char*,struct MSVCRT(_stat)*); -int MSVCRT(_fstati64)(int,struct MSVCRT(_stati64)*); -int MSVCRT(_stati64)(const char*,struct MSVCRT(_stati64)*); +int _fstat(int,struct _stat*); +int _stat(const char*,struct _stat*); +int _fstati64(int,struct _stati64*); +int _stati64(const char*,struct _stati64*); int _umask(int); #ifndef MSVCRT_WSTAT_DEFINED #define MSVCRT_WSTAT_DEFINED -int MSVCRT(_wstat)(const MSVCRT(wchar_t)*,struct MSVCRT(_stat)*); -int MSVCRT(_wstati64)(const MSVCRT(wchar_t)*,struct MSVCRT(_stati64)*); +int _wstat(const wchar_t*,struct _stat*); +int _wstati64(const wchar_t*,struct _stati64*); #endif /* MSVCRT_WSTAT_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/sys/timeb.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/timeb.h,v retrieving revision 1.6 diff -u -r1.6 timeb.h --- include/msvcrt/sys/timeb.h 18 Jul 2003 22:57:15 -0000 1.6 +++ include/msvcrt/sys/timeb.h 16 Jun 2004 05:53:18 -0000 @@ -23,16 +23,8 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif @@ -40,7 +32,7 @@ #define MSVCRT_TIMEB_DEFINED struct _timeb { - MSVCRT(time_t) time; + time_t time; unsigned short millitm; short timezone; short dstflag; Index: include/msvcrt/sys/types.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/types.h,v retrieving revision 1.9 diff -u -r1.9 types.h --- include/msvcrt/sys/types.h 18 Jul 2003 22:57:15 -0000 1.9 +++ include/msvcrt/sys/types.h 16 Jun 2004 05:53:18 -0000 @@ -23,14 +23,6 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_DEV_T_DEFINED typedef unsigned int _dev_t; #define MSVCRT_DEV_T_DEFINED @@ -47,12 +39,12 @@ #endif #ifndef MSVCRT_OFF_T_DEFINED -typedef int MSVCRT(_off_t); +typedef int _off_t; #define MSVCRT_OFF_T_DEFINED #endif #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif Index: include/msvcrt/sys/utime.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/utime.h,v retrieving revision 1.6 diff -u -r1.6 utime.h --- include/msvcrt/sys/utime.h 18 Jul 2003 22:57:15 -0000 1.6 +++ include/msvcrt/sys/utime.h 16 Jun 2004 05:53:18 -0000 @@ -23,23 +23,15 @@ #define __WINE_USE_MSVCRT #endif -#ifndef MSVCRT -# ifdef USE_MSVCRT_PREFIX -# define MSVCRT(x) MSVCRT_##x -# else -# define MSVCRT(x) x -# endif -#endif - #ifndef MSVCRT_WCHAR_T_DEFINED #define MSVCRT_WCHAR_T_DEFINED #ifndef __cplusplus -typedef unsigned short MSVCRT(wchar_t); +typedef unsigned short wchar_t; #endif #endif #ifndef MSVCRT_TIME_T_DEFINED -typedef long MSVCRT(time_t); +typedef long time_t; #define MSVCRT_TIME_T_DEFINED #endif @@ -47,8 +39,8 @@ #define MSVCRT_UTIMBUF_DEFINED struct _utimbuf { - MSVCRT(time_t) actime; - MSVCRT(time_t) modtime; + time_t actime; + time_t modtime; }; #endif /* MSVCRT_UTIMBUF_DEFINED */ @@ -59,7 +51,7 @@ int _futime(int,struct _utimbuf*); int _utime(const char*,struct _utimbuf*); -int _wutime(const MSVCRT(wchar_t)*,struct _utimbuf*); +int _wutime(const wchar_t*,struct _utimbuf*); #ifdef __cplusplus } Index: dlls/msvcrt/console.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/console.c,v retrieving revision 1.11 diff -u -r1.11 console.c --- dlls/msvcrt/console.c 31 Oct 2003 04:17:45 -0000 1.11 +++ dlls/msvcrt/console.c 18 Jun 2004 04:33:40 -0000 @@ -22,12 +22,7 @@ */ #include "msvcrt.h" #include "wincon.h" - -#include "msvcrt/conio.h" -#include "msvcrt/malloc.h" -#include "msvcrt/stdio.h" #include "mtdll.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); Index: dlls/msvcrt/cpp.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/cpp.c,v retrieving revision 1.17 diff -u -r1.17 cpp.c --- dlls/msvcrt/cpp.c 9 Feb 2004 22:07:43 -0000 1.17 +++ dlls/msvcrt/cpp.c 18 Jun 2004 04:33:40 -0000 @@ -31,9 +31,6 @@ #include "wine/exception.h" #include "excpt.h" #include "wine/debug.h" -#include "msvcrt/malloc.h" -#include "msvcrt/stdlib.h" - #include "msvcrt.h" #include "cppexcept.h" #include "mtdll.h" @@ -211,12 +208,12 @@ int i, *ptr = (int *)_this - 1; for (i = *ptr - 1; i >= 0; i--) MSVCRT_exception_dtor(_this + i); - MSVCRT_operator_delete(ptr); + msvcrt_operator_delete(ptr); } else { MSVCRT_exception_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); } return _this; } @@ -229,7 +226,7 @@ { TRACE("(%p %x)\n", _this, flags); MSVCRT_exception_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); return _this; } @@ -301,12 +298,12 @@ int i, *ptr = (int *)_this - 1; for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_typeid_dtor(_this + i); - MSVCRT_operator_delete(ptr); + msvcrt_operator_delete(ptr); } else { MSVCRT_bad_typeid_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); } return _this; } @@ -319,7 +316,7 @@ { TRACE("(%p %x)\n", _this, flags); MSVCRT_bad_typeid_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); return _this; } @@ -384,12 +381,12 @@ int i, *ptr = (int *)_this - 1; for (i = *ptr - 1; i >= 0; i--) MSVCRT___non_rtti_object_dtor(_this + i); - MSVCRT_operator_delete(ptr); + msvcrt_operator_delete(ptr); } else { MSVCRT___non_rtti_object_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); } return _this; } @@ -402,7 +399,7 @@ { TRACE("(%p %x)\n", _this, flags); MSVCRT___non_rtti_object_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); return _this; } @@ -464,12 +461,12 @@ int i, *ptr = (int *)_this - 1; for (i = *ptr - 1; i >= 0; i--) MSVCRT_bad_cast_dtor(_this + i); - MSVCRT_operator_delete(ptr); + msvcrt_operator_delete(ptr); } else { MSVCRT_bad_cast_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); } return _this; } @@ -482,7 +479,7 @@ { TRACE("(%p %x)\n", _this, flags); MSVCRT_bad_cast_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); return _this; } @@ -539,9 +536,9 @@ if (!_this->name) { /* Create and set the demangled name */ - char* name = MSVCRT___unDName(0, _this->mangled, 0, - (MSVCRT_malloc_func)MSVCRT_malloc, - (MSVCRT_free_func)MSVCRT_free, 0x2800); + char* name = msvcrt___unDName(0, _this->mangled, 0, + (malloc_func_t)MSVCRT_malloc, + (free_func_t)MSVCRT_free, 0x2800); if (name) { @@ -589,12 +586,12 @@ int i, *ptr = (int *)_this - 1; for (i = *ptr - 1; i >= 0; i--) MSVCRT_type_info_dtor(_this + i); - MSVCRT_operator_delete(ptr); + msvcrt_operator_delete(ptr); } else { MSVCRT_type_info_dtor(_this); - if (flags & 1) MSVCRT_operator_delete(_this); + if (flags & 1) msvcrt_operator_delete(_this); } return _this; } @@ -953,10 +950,10 @@ * RETURNS * The previously installed handler function, if any. */ -terminate_function MSVCRT_set_terminate(terminate_function func) +MSVCRT_terminate_function MSVCRT_set_terminate(MSVCRT_terminate_function func) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); - terminate_function previous = data->terminate_handler; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_terminate_function previous = data->terminate_handler; TRACE("(%p) returning %p\n",func,previous); data->terminate_handler = func; return previous; @@ -973,10 +970,10 @@ * RETURNS * The previously installed handler function, if any. */ -unexpected_function MSVCRT_set_unexpected(unexpected_function func) +MSVCRT_unexpected_function MSVCRT_set_unexpected(MSVCRT_unexpected_function func) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); - unexpected_function previous = data->unexpected_handler; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_unexpected_function previous = data->unexpected_handler; TRACE("(%p) returning %p\n",func,previous); data->unexpected_handler = func; return previous; @@ -985,10 +982,10 @@ /****************************************************************** * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z (MSVCRT.@) */ -_se_translator_function MSVCRT__set_se_translator(_se_translator_function func) +MSVCRT__se_translator_function MSVCRT__set_se_translator(MSVCRT__se_translator_function func) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); - _se_translator_function previous = data->se_translator; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT__se_translator_function previous = data->se_translator; TRACE("(%p) returning %p\n",func,previous); data->se_translator = func; return previous; @@ -1009,7 +1006,7 @@ */ void MSVCRT_terminate(void) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); + thread_data_t *data = msvcrt_get_thread_data(); if (data->terminate_handler) data->terminate_handler(); MSVCRT_abort(); } @@ -1019,7 +1016,7 @@ */ void MSVCRT_unexpected(void) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); + thread_data_t *data = msvcrt_get_thread_data(); if (data->unexpected_handler) data->unexpected_handler(); MSVCRT_terminate(); } Index: dlls/msvcrt/cppexcept.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/cppexcept.c,v retrieving revision 1.9 diff -u -r1.9 cppexcept.c --- dlls/msvcrt/cppexcept.c 4 Dec 2003 05:51:01 -0000 1.9 +++ dlls/msvcrt/cppexcept.c 18 Jun 2004 04:33:40 -0000 @@ -269,7 +269,7 @@ void *addr, *object = (void *)rec->ExceptionInformation[1]; struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; - MSVCRT_thread_data *thread_data = msvcrt_get_thread_data(); + thread_data_t *thread_data = msvcrt_get_thread_data(); for (i = 0; i < descr->tryblock_count; i++) { Index: dlls/msvcrt/ctype.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/ctype.c,v retrieving revision 1.7 diff -u -r1.7 ctype.c --- dlls/msvcrt/ctype.c 19 Dec 2002 04:21:30 -0000 1.7 +++ dlls/msvcrt/ctype.c 18 Jun 2004 04:50:55 -0000 @@ -18,26 +18,23 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "msvcrt.h" - -#include "msvcrt/ctype.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* Some abbreviations to make the following table readable */ -#define _C_ _CONTROL -#define _S_ _SPACE -#define _P_ _PUNCT -#define _D_ _DIGIT -#define _H_ _HEX -#define _U_ _UPPER -#define _L_ _LOWER +#define _C_ MSVCRT__CONTROL +#define _S_ MSVCRT__SPACE +#define _P_ MSVCRT__PUNCT +#define _D_ MSVCRT__DIGIT +#define _H_ MSVCRT__HEX +#define _U_ MSVCRT__UPPER +#define _L_ MSVCRT__LOWER WORD MSVCRT__ctype [257] = { 0, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|_C_, _S_|_C_, _S_|_C_, _S_|_C_, _S_|_C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, - _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|_BLANK, + _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _C_, _S_|MSVCRT__BLANK, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _D_|_H_, _P_, _P_, _P_, _P_, _P_, _P_, _P_, _U_|_H_, @@ -90,7 +87,7 @@ WORD typeInfo; char convert[3], *pconv = convert; - if (MSVCRT__pctype[(UINT)c >> 8] & _LEADBYTE) + if (MSVCRT__pctype[(UINT)c >> 8] & MSVCRT__LEADBYTE) *pconv++ = (UINT)c >> 8; *pconv++ = c & 0xff; *pconv = 0; @@ -107,7 +104,7 @@ */ int MSVCRT_isalnum(int c) { - return _isctype( c, _ALPHA | _DIGIT ); + return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT ); } /********************************************************************* @@ -115,7 +112,7 @@ */ int MSVCRT_isalpha(int c) { - return _isctype( c, _ALPHA ); + return _isctype( c, MSVCRT__ALPHA ); } /********************************************************************* @@ -123,7 +120,7 @@ */ int MSVCRT_iscntrl(int c) { - return _isctype( c, _CONTROL ); + return _isctype( c, MSVCRT__CONTROL ); } /********************************************************************* @@ -131,7 +128,7 @@ */ int MSVCRT_isdigit(int c) { - return _isctype( c, _DIGIT ); + return _isctype( c, MSVCRT__DIGIT ); } /********************************************************************* @@ -139,7 +136,7 @@ */ int MSVCRT_isgraph(int c) { - return _isctype( c, _ALPHA | _DIGIT | _PUNCT ); + return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT ); } /********************************************************************* @@ -147,7 +144,7 @@ */ int MSVCRT_isleadbyte(int c) { - return _isctype( c, _LEADBYTE ); + return _isctype( c, MSVCRT__LEADBYTE ); } /********************************************************************* @@ -155,7 +152,7 @@ */ int MSVCRT_islower(int c) { - return _isctype( c, _LOWER ); + return _isctype( c, MSVCRT__LOWER ); } /********************************************************************* @@ -163,7 +160,7 @@ */ int MSVCRT_isprint(int c) { - return _isctype( c, _ALPHA | _DIGIT | _BLANK | _PUNCT ); + return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT ); } /********************************************************************* @@ -171,7 +168,7 @@ */ int MSVCRT_ispunct(int c) { - return _isctype( c, _PUNCT ); + return _isctype( c, MSVCRT__PUNCT ); } /********************************************************************* @@ -179,7 +176,7 @@ */ int MSVCRT_isspace(int c) { - return _isctype( c, _SPACE ); + return _isctype( c, MSVCRT__SPACE ); } /********************************************************************* @@ -187,7 +184,7 @@ */ int MSVCRT_isupper(int c) { - return _isctype( c, _UPPER ); + return _isctype( c, MSVCRT__UPPER ); } /********************************************************************* @@ -195,7 +192,7 @@ */ int MSVCRT_isxdigit(int c) { - return _isctype( c, _HEX ); + return _isctype( c, MSVCRT__HEX ); } /********************************************************************* Index: dlls/msvcrt/data.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/data.c,v retrieving revision 1.23 diff -u -r1.23 data.c --- dlls/msvcrt/data.c 19 May 2004 03:22:56 -0000 1.23 +++ dlls/msvcrt/data.c 18 Jun 2004 04:33:40 -0000 @@ -23,11 +23,7 @@ #include <math.h> #include "msvcrt.h" - #include "msvcrt/fcntl.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" - #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -57,8 +53,8 @@ MSVCRT_wchar_t **MSVCRT___wargv; char *MSVCRT__acmdln; MSVCRT_wchar_t *MSVCRT__wcmdln; -char **MSVCRT__environ = 0; -MSVCRT_wchar_t **MSVCRT__wenviron = 0; +char **msvcrt__environ = 0; +MSVCRT_wchar_t **msvcrt__wenviron = 0; char **MSVCRT___initenv = 0; MSVCRT_wchar_t **MSVCRT___winitenv = 0; int MSVCRT_timezone; @@ -211,9 +207,9 @@ */ char*** __p__environ(void) { - if (!MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(NULL); - return &MSVCRT__environ; + if (!msvcrt__environ) + msvcrt__environ = msvcrt_SnapshotOfEnvironmentA(NULL); + return &msvcrt__environ; } /********************************************************************* @@ -221,9 +217,9 @@ */ MSVCRT_wchar_t*** __p__wenviron(void) { - if (!MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); - return &MSVCRT__wenviron; + if (!msvcrt__wenviron) + msvcrt__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); + return &msvcrt__wenviron; } /********************************************************************* @@ -317,8 +313,8 @@ /* FIXME: more things to free */ if (MSVCRT___initenv) HeapFree(GetProcessHeap(), 0, MSVCRT___initenv); if (MSVCRT___winitenv) HeapFree(GetProcessHeap(), 0, MSVCRT___winitenv); - if (MSVCRT__environ) HeapFree(GetProcessHeap(), 0, MSVCRT__environ); - if (MSVCRT__wenviron) HeapFree(GetProcessHeap(), 0, MSVCRT__wenviron); + if (msvcrt__environ) HeapFree(GetProcessHeap(), 0, msvcrt__environ); + if (msvcrt__wenviron) HeapFree(GetProcessHeap(), 0, msvcrt__wenviron); if (MSVCRT__pgmptr) HeapFree(GetProcessHeap(), 0, MSVCRT__pgmptr); if (MSVCRT__wpgmptr) HeapFree(GetProcessHeap(), 0, MSVCRT__wpgmptr); } @@ -334,7 +330,7 @@ *argv = MSVCRT___argv; *envp = MSVCRT___initenv; if (new_mode) - MSVCRT__set_new_mode( *new_mode ); + msvcrt__set_new_mode( *new_mode ); } /********************************************************************* @@ -348,7 +344,7 @@ *wargv = MSVCRT___wargv; *wenvp = MSVCRT___winitenv; if (new_mode) - MSVCRT__set_new_mode( *new_mode ); + msvcrt__set_new_mode( *new_mode ); } /********************************************************************* Index: dlls/msvcrt/dir.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/dir.c,v retrieving revision 1.28 diff -u -r1.28 dir.c --- dlls/msvcrt/dir.c 17 May 2004 21:08:31 -0000 1.28 +++ dlls/msvcrt/dir.c 18 Jun 2004 04:33:40 -0000 @@ -33,14 +33,6 @@ #include "winternl.h" #include "wine/unicode.h" #include "msvcrt.h" -#include "msvcrt/errno.h" - -#include "wine/unicode.h" -#include "msvcrt/io.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" -#include "msvcrt/dos.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -144,7 +136,7 @@ { if (!SetCurrentDirectoryA(newdir)) { - MSVCRT__set_errno(newdir?GetLastError():0); + msvcrt_set_errno(newdir?GetLastError():0); return -1; } return 0; @@ -159,7 +151,7 @@ { if (!SetCurrentDirectoryW(newdir)) { - MSVCRT__set_errno(newdir?GetLastError():0); + msvcrt_set_errno(newdir?GetLastError():0); return -1; } return 0; @@ -187,7 +179,7 @@ buffer[0] += newdrive - 1; if (!SetCurrentDirectoryW( buffer )) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); if (newdrive <= 0) *MSVCRT__errno() = MSVCRT_EACCES; return -1; @@ -215,7 +207,7 @@ TRACE(":handle %ld\n",hand); if (!FindClose((HANDLE)hand)) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } return 0; @@ -246,7 +238,7 @@ hfind = FindFirstFileA(fspec, &find_data); if (hfind == INVALID_HANDLE_VALUE) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } msvcrt_fttofd(&find_data,ft); @@ -267,7 +259,7 @@ hfind = FindFirstFileW(fspec, &find_data); if (hfind == INVALID_HANDLE_VALUE) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } msvcrt_wfttofd(&find_data,ft); @@ -288,7 +280,7 @@ hfind = FindFirstFileA(fspec, &find_data); if (hfind == INVALID_HANDLE_VALUE) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } msvcrt_fttofdi64(&find_data,ft); @@ -309,7 +301,7 @@ hfind = FindFirstFileW(fspec, &find_data); if (hfind == INVALID_HANDLE_VALUE) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } msvcrt_wfttofdi64(&find_data,ft); @@ -619,7 +611,7 @@ return 0; } err = GetLastError(); - MSVCRT__set_errno(err); + msvcrt_set_errno(err); return err; } @@ -642,7 +634,7 @@ { if (CreateDirectoryA(newdir,NULL)) return 0; - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -655,7 +647,7 @@ { if (CreateDirectoryW(newdir,NULL)) return 0; - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -678,7 +670,7 @@ { if (RemoveDirectoryA(dir)) return 0; - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -691,7 +683,7 @@ { if (RemoveDirectoryW(dir)) return 0; - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -1216,7 +1208,7 @@ { GetFullPathNameA( file, MAX_PATH, buf, NULL ); /* Sigh. This error is *always* set, regardless of success */ - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return; } @@ -1224,7 +1216,7 @@ envVal = MSVCRT_getenv(env); if (!envVal) { - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return; } @@ -1238,7 +1230,7 @@ while(*end && *end != ';') end++; /* Find end of next path */ if (penv == end || !*penv) { - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return; } strncpy(curPath, penv, end - penv); @@ -1255,7 +1247,7 @@ if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) { strcpy(buf, curPath); - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return; /* Found */ } penv = *end ? end + 1 : end; Index: dlls/msvcrt/environ.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/environ.c,v retrieving revision 1.11 diff -u -r1.11 environ.c --- dlls/msvcrt/environ.c 24 Sep 2003 18:57:28 -0000 1.11 +++ dlls/msvcrt/environ.c 18 Jun 2004 04:33:40 -0000 @@ -22,10 +22,6 @@ */ #include "wine/unicode.h" #include "msvcrt.h" - -#include "msvcrt/stdlib.h" - - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -97,10 +93,10 @@ ret = !SetEnvironmentVariableA(name, value[0] ? value : NULL); /* Update the __p__environ array only when already initialized */ - if (MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + if (msvcrt__environ) + msvcrt__environ = msvcrt_SnapshotOfEnvironmentA(msvcrt__environ); + if (msvcrt__wenviron) + msvcrt__wenviron = msvcrt_SnapshotOfEnvironmentW(msvcrt__wenviron); return ret; } @@ -129,9 +125,9 @@ ret = !SetEnvironmentVariableW(name, value[0] ? value : NULL); /* Update the __p__environ array only when already initialized */ - if (MSVCRT__environ) - MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); - if (MSVCRT__wenviron) - MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + if (msvcrt__environ) + msvcrt__environ = msvcrt_SnapshotOfEnvironmentA(msvcrt__environ); + if (msvcrt__wenviron) + msvcrt__wenviron = msvcrt_SnapshotOfEnvironmentW(msvcrt__wenviron); return ret; } Index: dlls/msvcrt/errno.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/errno.c,v retrieving revision 1.12 diff -u -r1.12 errno.c --- dlls/msvcrt/errno.c 16 Mar 2004 19:17:11 -0000 1.12 +++ dlls/msvcrt/errno.c 18 Jun 2004 04:37:55 -0000 @@ -18,24 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "msvcrt.h" -#include "msvcrt/errno.h" - #include <stdio.h> #include <string.h> -#include "msvcrt/conio.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" - - +#include "msvcrt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* INTERNAL: Set the crt and dos errno's from the OS error given. */ -void MSVCRT__set_errno(int err) +void msvcrt_set_errno(int err) { int *errno = MSVCRT__errno(); unsigned long *doserrno = MSVCRT___doserrno(); @@ -154,10 +147,10 @@ */ int _set_error_mode(int mode) { - static int current_mode = _OUT_TO_DEFAULT; + static int current_mode = MSVCRT__OUT_TO_DEFAULT; const int old = current_mode; - if ( _REPORT_ERRMODE != mode ) { + if ( MSVCRT__REPORT_ERRMODE != mode ) { current_mode = mode; FIXME("dummy implementation (old mode: %d, new mode: %d)\n", old, mode); Index: dlls/msvcrt/except.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/except.c,v retrieving revision 1.29 diff -u -r1.29 except.c --- dlls/msvcrt/except.c 4 Dec 2003 05:51:01 -0000 1.29 +++ dlls/msvcrt/except.c 18 Jun 2004 04:33:40 -0000 @@ -36,11 +36,7 @@ #include "winternl.h" #include "wine/exception.h" #include "msvcrt.h" - -#include "msvcrt/setjmp.h" #include "excpt.h" - - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -281,7 +277,7 @@ * _setjmp (MSVCRT.@) */ DEFINE_REGS_ENTRYPOINT( MSVCRT__setjmp, _MSVCRT__setjmp, 4, 0 ); -void _MSVCRT__setjmp(_JUMP_BUFFER *jmp, CONTEXT86* context) +void _MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp, CONTEXT86* context) { TRACE("(%p)\n",jmp); jmp->Ebp = context->Ebp; @@ -303,7 +299,7 @@ * _setjmp3 (MSVCRT.@) */ DEFINE_REGS_ENTRYPOINT( MSVCRT__setjmp3, _MSVCRT__setjmp3, 8, 0 ); -void _MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, CONTEXT86* context) +void _MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, CONTEXT86* context) { TRACE("(%p,%d)\n",jmp,nb_args); jmp->Ebp = context->Ebp; @@ -340,7 +336,7 @@ * longjmp (MSVCRT.@) */ DEFINE_REGS_ENTRYPOINT( MSVCRT_longjmp, _MSVCRT_longjmp, 8, 0 ); -void _MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval, CONTEXT86* context) +void _MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval, CONTEXT86* context) { unsigned long cur_frame = 0; @@ -383,7 +379,7 @@ /********************************************************************* * _seh_longjmp_unwind (MSVCRT.@) */ -void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp) +void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) { _local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel ); } Index: dlls/msvcrt/exit.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/exit.c,v retrieving revision 1.12 diff -u -r1.12 exit.c --- dlls/msvcrt/exit.c 16 Mar 2004 19:17:11 -0000 1.12 +++ dlls/msvcrt/exit.c 18 Jun 2004 04:33:40 -0000 @@ -19,12 +19,8 @@ */ #include <stdio.h> #include "msvcrt.h" - -#include "msvcrt/conio.h" -#include "msvcrt/stdlib.h" #include "mtdll.h" #include "winuser.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -132,7 +128,7 @@ /********************************************************************* * _amsg_exit (MSVCRT.@) */ -void MSVCRT__amsg_exit(int errnum) +void msvcrt__amsg_exit(int errnum) { TRACE("(%d)\n", errnum); /* FIXME: text for the error number. */ @@ -259,5 +255,5 @@ void _purecall(void) { TRACE("(void)\n"); - MSVCRT__amsg_exit( 25 ); + msvcrt__amsg_exit( 25 ); } Index: dlls/msvcrt/file.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/file.c,v retrieving revision 1.68 diff -u -r1.68 file.c --- dlls/msvcrt/file.c 27 May 2004 20:01:34 -0000 1.68 +++ dlls/msvcrt/file.c 18 Jun 2004 04:45:46 -0000 @@ -31,36 +31,27 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#include <sys/types.h> #include "windef.h" #include "winbase.h" #include "winreg.h" #include "winternl.h" #include "msvcrt.h" -#include "msvcrt/errno.h" #include "wine/unicode.h" #include "msvcrt/fcntl.h" -#include "msvcrt/io.h" -#include "msvcrt/sys/locking.h" -#include "msvcrt/stdio.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" -#include "msvcrt/sys/stat.h" -#include "msvcrt/sys/utime.h" -#include "msvcrt/time.h" #include "msvcrt/share.h" -#include "msvcrt/wctype.h" -#include "msvcrt/direct.h" +#include "msvcrt/sys/locking.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* for stat mode, permissions apply to all,owner and group */ -#define MSVCRT_S_IREAD (_S_IREAD | (_S_IREAD >> 3) | (_S_IREAD >> 6)) -#define MSVCRT_S_IWRITE (_S_IWRITE | (_S_IWRITE >> 3) | (_S_IWRITE >> 6)) -#define MSVCRT_S_IEXEC (_S_IEXEC | (_S_IEXEC >> 3) | (_S_IEXEC >> 6)) +#define ALL_S_IREAD (MSVCRT__S_IREAD | (MSVCRT__S_IREAD >> 3) | (MSVCRT__S_IREAD >> 6)) +#define ALL_S_IWRITE (MSVCRT__S_IWRITE | (MSVCRT__S_IWRITE >> 3) | (MSVCRT__S_IWRITE >> 6)) +#define ALL_S_IEXEC (MSVCRT__S_IEXEC | (MSVCRT__S_IEXEC >> 3) | (MSVCRT__S_IEXEC >> 6)) /* _access() bit flags FIXME: incomplete */ #define MSVCRT_W_OK 0x02 @@ -352,12 +343,12 @@ if (!filename || attr == INVALID_FILE_ATTRIBUTES) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & MSVCRT_W_OK)) { - MSVCRT__set_errno(ERROR_ACCESS_DENIED); + msvcrt_set_errno(ERROR_ACCESS_DENIED); return -1; } return 0; @@ -374,12 +365,12 @@ if (!filename || attr == INVALID_FILE_ATTRIBUTES) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & MSVCRT_W_OK)) { - MSVCRT__set_errno(ERROR_ACCESS_DENIED); + msvcrt_set_errno(ERROR_ACCESS_DENIED); return -1; } return 0; @@ -394,13 +385,13 @@ if (oldFlags != INVALID_FILE_ATTRIBUTES) { - DWORD newFlags = (flags & _S_IWRITE)? oldFlags & ~FILE_ATTRIBUTE_READONLY: + DWORD newFlags = (flags & MSVCRT__S_IWRITE)? oldFlags & ~FILE_ATTRIBUTE_READONLY: oldFlags | FILE_ATTRIBUTE_READONLY; if (newFlags == oldFlags || SetFileAttributesA(path, newFlags)) return 0; } - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -413,13 +404,13 @@ if (oldFlags != INVALID_FILE_ATTRIBUTES) { - DWORD newFlags = (flags & _S_IWRITE)? oldFlags & ~FILE_ATTRIBUTE_READONLY: + DWORD newFlags = (flags & MSVCRT__S_IWRITE)? oldFlags & ~FILE_ATTRIBUTE_READONLY: oldFlags | FILE_ATTRIBUTE_READONLY; if (newFlags == oldFlags || SetFileAttributesW(path, newFlags)) return 0; } - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -459,7 +450,7 @@ if(DeleteFileA(path)) return 0; TRACE("failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -472,7 +463,7 @@ if(DeleteFileW(path)) return 0; TRACE("failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -533,7 +524,7 @@ if (!CloseHandle(hand)) { WARN(":failed-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } msvcrt_free_fd(fd); @@ -562,7 +553,7 @@ return 0; } TRACE(":failed-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } TRACE(":ok\n"); @@ -654,7 +645,7 @@ return ((__int64)hoffset << 32) | ret; } TRACE(":error-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -709,7 +700,7 @@ { ret = LockFile(hand, cur_locn, 0L, nbytes, 0L); if (ret) break; - _sleep (1); + Sleep(1); } } else if (mode == _LK_UNLCK) @@ -916,7 +907,7 @@ if (!buf) { WARN(":failed-NULL buf\n"); - MSVCRT__set_errno(ERROR_INVALID_PARAMETER); + msvcrt_set_errno(ERROR_INVALID_PARAMETER); return -1; } @@ -925,7 +916,7 @@ if (!GetFileInformationByHandle(hand, &hfi)) { WARN(":failed-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(ERROR_INVALID_PARAMETER); + msvcrt_set_errno(ERROR_INVALID_PARAMETER); return -1; } FIXME(":dwFileAttributes = %ld, mode set to 0\n",hfi.dwFileAttributes); @@ -954,7 +945,7 @@ /********************************************************************* * _futime (MSVCRT.@) */ -int _futime(int fd, struct _utimbuf *t) +int MSVCRT__futime(int fd, struct MSVCRT__utimbuf *t) { HANDLE hand = msvcrt_fdtoh(fd); FILETIME at, wt; @@ -977,7 +968,7 @@ if (!SetFileTime(hand, NULL, &at, &wt)) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1 ; } return 0; @@ -1130,7 +1121,7 @@ pmode = va_arg(ap, int); va_end(ap); - if(pmode & ~(_S_IREAD | _S_IWRITE)) + if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); else WARN(": pmode 0x%04x ignored\n", pmode); @@ -1200,7 +1191,7 @@ if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -1238,7 +1229,7 @@ return retval; } - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -1282,7 +1273,7 @@ return retval; } - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -1450,7 +1441,7 @@ { DWORD dw; WIN32_FILE_ATTRIBUTE_DATA hfi; - unsigned short mode = MSVCRT_S_IREAD; + unsigned short mode = ALL_S_IREAD; int plen; TRACE(":file (%s) buf(%p)\n",path,buf); @@ -1458,7 +1449,7 @@ if (!GetFileAttributesExA(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return -1; } @@ -1479,22 +1470,22 @@ /* Dir, or regular file? */ if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || (path[plen-1] == '\\')) - mode |= (_S_IFDIR | MSVCRT_S_IEXEC); + mode |= (MSVCRT__S_IFDIR | ALL_S_IEXEC); else { - mode |= _S_IFREG; + mode |= MSVCRT__S_IFREG; /* executable? */ if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ { unsigned int ext = tolower(path[plen-1]) | (tolower(path[plen-2]) << 8) | (tolower(path[plen-3]) << 16); if (ext == EXE || ext == BAT || ext == CMD || ext == COM) - mode |= MSVCRT_S_IEXEC; + mode |= ALL_S_IEXEC; } } if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - mode |= MSVCRT_S_IWRITE; + mode |= ALL_S_IWRITE; buf->st_mode = mode; buf->st_nlink = 1; @@ -1529,7 +1520,7 @@ { DWORD dw; WIN32_FILE_ATTRIBUTE_DATA hfi; - unsigned short mode = MSVCRT_S_IREAD; + unsigned short mode = ALL_S_IREAD; int plen; TRACE(":file (%s) buf(%p)\n",debugstr_w(path),buf); @@ -1537,7 +1528,7 @@ if (!GetFileAttributesExW(path, GetFileExInfoStandard, &hfi)) { TRACE("failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(ERROR_FILE_NOT_FOUND); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); return -1; } @@ -1554,22 +1545,22 @@ /* Dir, or regular file? */ if ((hfi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || (path[plen-1] == '\\')) - mode |= (_S_IFDIR | MSVCRT_S_IEXEC); + mode |= (MSVCRT__S_IFDIR | ALL_S_IEXEC); else { - mode |= _S_IFREG; + mode |= MSVCRT__S_IFREG; /* executable? */ if (plen > 6 && path[plen-4] == '.') /* shortest exe: "\x.exe" */ { ULONGLONG ext = tolowerW(path[plen-1]) | (tolowerW(path[plen-2]) << 16) | ((ULONGLONG)tolowerW(path[plen-3]) << 32); if (ext == WCEXE || ext == WCBAT || ext == WCCMD || ext == WCCOM) - mode |= MSVCRT_S_IEXEC; + mode |= ALL_S_IEXEC; } } if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - mode |= MSVCRT_S_IWRITE; + mode |= ALL_S_IWRITE; buf->st_mode = mode; buf->st_nlink = 1; @@ -1663,13 +1654,13 @@ /********************************************************************* * _utime (MSVCRT.@) */ -int _utime(const char* path, struct _utimbuf *t) +int _utime(const char* path, struct MSVCRT__utimbuf *t) { int fd = _open(path, _O_WRONLY | _O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = MSVCRT__futime(fd, t); _close(fd); return retVal; } @@ -1679,13 +1670,13 @@ /********************************************************************* * _wutime (MSVCRT.@) */ -int _wutime(const MSVCRT_wchar_t* path, struct _utimbuf *t) +int _wutime(const MSVCRT_wchar_t* path, struct MSVCRT__utimbuf *t) { int fd = _wopen(path, _O_WRONLY | _O_BINARY); if (fd > 0) { - int retVal = _futime(fd, t); + int retVal = MSVCRT__futime(fd, t); _close(fd); return retVal; } @@ -2074,7 +2065,7 @@ if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; - fd = _open(path, open_flags, _S_IREAD | _S_IWRITE); + fd = _open(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); if (fd < 0) return NULL; @@ -2114,7 +2105,7 @@ return retval; } - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return NULL; } @@ -2250,7 +2241,7 @@ if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1) return NULL; - fd = _open(path, open_flags, _S_IREAD | _S_IWRITE); + fd = _open(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE); if (fd < 0) return NULL; @@ -2258,7 +2249,7 @@ { file->_flag = 0; WARN(":failed-last error (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return NULL; } return file; @@ -2432,7 +2423,7 @@ if (DeleteFileA(path)) return 0; TRACE(":failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -2445,7 +2436,7 @@ if (DeleteFileW(path)) return 0; TRACE(":failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -2458,7 +2449,7 @@ if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; TRACE(":failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } @@ -2471,7 +2462,7 @@ if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) return 0; TRACE(":failed (%ld)\n",GetLastError()); - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } Index: dlls/msvcrt/heap.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/heap.c,v retrieving revision 1.14 diff -u -r1.14 heap.c --- dlls/msvcrt/heap.c 20 Nov 2003 23:41:13 -0000 1.14 +++ dlls/msvcrt/heap.c 18 Jun 2004 04:56:36 -0000 @@ -22,12 +22,7 @@ */ #include "msvcrt.h" -#include "msvcrt/errno.h" - -#include "msvcrt/malloc.h" -#include "msvcrt/stdlib.h" #include "mtdll.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -46,7 +41,7 @@ /********************************************************************* * ??2@YAPAXI@Z (MSVCRT.@) */ -void* MSVCRT_operator_new(unsigned long size) +void* msvcrt_operator_new(unsigned long size) { void *retval = HeapAlloc(GetProcessHeap(), 0, size); TRACE("(%ld) returning %p\n", size, retval); @@ -60,7 +55,7 @@ /********************************************************************* * ??3@YAXPAX@Z (MSVCRT.@) */ -void MSVCRT_operator_delete(void *mem) +void msvcrt_operator_delete(void *mem) { TRACE("(%p)\n", mem); HeapFree(GetProcessHeap(), 0, mem); @@ -110,7 +105,7 @@ /********************************************************************* * ?_set_new_mode@@YAHH@Z (MSVCRT.@) */ -int MSVCRT__set_new_mode(int mode) +int msvcrt__set_new_mode(int mode) { int old_mode; LOCK_HEAP; @@ -145,10 +140,10 @@ { if (!HeapValidate( GetProcessHeap(), 0, NULL)) { - MSVCRT__set_errno(GetLastError()); - return _HEAPBADNODE; + msvcrt_set_errno(GetLastError()); + return MSVCRT__HEAPBADNODE; } - return _HEAPOK; + return MSVCRT__HEAPOK; } /********************************************************************* @@ -159,7 +154,7 @@ if (!HeapCompact( GetProcessHeap(), 0 )) { if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } return 0; @@ -168,21 +163,21 @@ /********************************************************************* * _heapwalk (MSVCRT.@) */ -int _heapwalk(_HEAPINFO* next) +int _heapwalk(struct MSVCRT__heapinfo* next) { PROCESS_HEAP_ENTRY phe; LOCK_HEAP; phe.lpData = next->_pentry; phe.cbData = next->_size; - phe.wFlags = next->_useflag == _USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; + phe.wFlags = next->_useflag == MSVCRT__USEDENTRY ? PROCESS_HEAP_ENTRY_BUSY : 0; if (phe.lpData && phe.wFlags & PROCESS_HEAP_ENTRY_BUSY && !HeapValidate( GetProcessHeap(), 0, phe.lpData )) { UNLOCK_HEAP; - MSVCRT__set_errno(GetLastError()); - return _HEAPBADNODE; + msvcrt_set_errno(GetLastError()); + return MSVCRT__HEAPBADNODE; } do @@ -191,19 +186,19 @@ { UNLOCK_HEAP; if (GetLastError() == ERROR_NO_MORE_ITEMS) - return _HEAPEND; - MSVCRT__set_errno(GetLastError()); + return MSVCRT__HEAPEND; + msvcrt_set_errno(GetLastError()); if (!phe.lpData) - return _HEAPBADBEGIN; - return _HEAPBADNODE; + return MSVCRT__HEAPBADBEGIN; + return MSVCRT__HEAPBADNODE; } } while (phe.wFlags & (PROCESS_HEAP_REGION|PROCESS_HEAP_UNCOMMITTED_RANGE)); UNLOCK_HEAP; next->_pentry = phe.lpData; next->_size = phe.cbData; - next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? _USEDENTRY : _FREEENTRY; - return _HEAPOK; + next->_useflag = phe.wFlags & PROCESS_HEAP_ENTRY_BUSY ? MSVCRT__USEDENTRY : MSVCRT__FREEENTRY; + return MSVCRT__HEAPOK; } /********************************************************************* @@ -212,17 +207,17 @@ int _heapset(unsigned int value) { int retval; - _HEAPINFO heap; + struct MSVCRT__heapinfo heap; - memset( &heap, 0, sizeof(_HEAPINFO) ); + memset( &heap, 0, sizeof(heap) ); LOCK_HEAP; - while ((retval = _heapwalk(&heap)) == _HEAPOK) + while ((retval = _heapwalk(&heap)) == MSVCRT__HEAPOK) { - if (heap._useflag == _FREEENTRY) + if (heap._useflag == MSVCRT__FREEENTRY) memset(heap._pentry, value, heap._size); } UNLOCK_HEAP; - return retval == _HEAPEND? _HEAPOK : retval; + return retval == MSVCRT__HEAPEND? MSVCRT__HEAPOK : retval; } /********************************************************************* @@ -272,7 +267,7 @@ { void *ret = HeapAlloc(GetProcessHeap(),0,size); if (!ret) - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return ret; } Index: dlls/msvcrt/locale.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/locale.c,v retrieving revision 1.22 diff -u -r1.22 locale.c --- dlls/msvcrt/locale.c 13 Jan 2004 05:45:05 -0000 1.22 +++ dlls/msvcrt/locale.c 18 Jun 2004 04:33:40 -0000 @@ -30,7 +30,6 @@ #include "winuser.h" #include "msvcrt.h" -#include "msvcrt/locale.h" #include "mtdll.h" #include "wine/debug.h" @@ -44,7 +43,7 @@ #define MAX_LOCALE_LENGTH 256 char MSVCRT_current_lc_all[MAX_LOCALE_LENGTH]; LCID MSVCRT_current_lc_all_lcid; -int MSVCRT_current_lc_all_cp; +int msvcrt_current_lc_all_cp; /* MT */ #define LOCK_LOCALE _mlock(_SETLOCALE_LOCK); @@ -275,7 +274,7 @@ unsigned char *traverse = (unsigned char *)cp.LeadByte; memset(MSVCRT_current_ctype, 0, sizeof(MSVCRT__ctype)); - MSVCRT_current_lc_all_cp = codepage; + msvcrt_current_lc_all_cp = codepage; /* Switch ctype macros to MBCS if needed */ MSVCRT___mb_cur_max = cp.MaxCharSize; @@ -342,7 +341,7 @@ { MSVCRT_current_lc_all[0] = 'C'; MSVCRT_current_lc_all[1] = '\0'; - MSVCRT_current_lc_all_cp = GetACP(); + msvcrt_current_lc_all_cp = GetACP(); switch (category) { case MSVCRT_LC_ALL: @@ -520,10 +519,10 @@ void _setmbcp(int cp) { LOCK_LOCALE; - if (MSVCRT_current_lc_all_cp != cp) + if (msvcrt_current_lc_all_cp != cp) { /* FIXME: set ctype behaviour for this cp */ - MSVCRT_current_lc_all_cp = cp; + msvcrt_current_lc_all_cp = cp; } UNLOCK_LOCALE; } @@ -533,7 +532,7 @@ */ int _getmbcp(void) { - return MSVCRT_current_lc_all_cp; + return msvcrt_current_lc_all_cp; } /********************************************************************* Index: dlls/msvcrt/main.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/main.c,v retrieving revision 1.17 diff -u -r1.17 main.c --- dlls/msvcrt/main.c 13 Jan 2004 22:56:59 -0000 1.17 +++ dlls/msvcrt/main.c 18 Jun 2004 04:33:40 -0000 @@ -19,15 +19,12 @@ */ #include "msvcrt.h" -#include "msvcrt/locale.h" -#include "msvcrt/stdio.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* Index to TLS */ -DWORD MSVCRT_tls_index; +DWORD msvcrt_tls_index; static inline BOOL msvcrt_init_tls(void); static inline BOOL msvcrt_free_tls(void); @@ -38,12 +35,12 @@ */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - MSVCRT_thread_data *tls; + thread_data_t *tls; TRACE("(%p, %s, %p) pid(%lx), tid(%lx), tls(%ld)\n", hinstDLL, msvcrt_get_reason(fdwReason), lpvReserved, GetCurrentProcessId(), GetCurrentThreadId(), - (long)MSVCRT_tls_index); + (long)msvcrt_tls_index); switch (fdwReason) { @@ -70,7 +67,7 @@ break; case DLL_THREAD_DETACH: /* Free TLS */ - tls = TlsGetValue(MSVCRT_tls_index); + tls = TlsGetValue(msvcrt_tls_index); if (tls) HeapFree(GetProcessHeap(), 0, tls); TRACE("finished thread free\n"); break; @@ -80,9 +77,9 @@ static inline BOOL msvcrt_init_tls(void) { - MSVCRT_tls_index = TlsAlloc(); + msvcrt_tls_index = TlsAlloc(); - if (MSVCRT_tls_index == TLS_OUT_OF_INDEXES) + if (msvcrt_tls_index == TLS_OUT_OF_INDEXES) { ERR("TlsAlloc() failed!\n"); return FALSE; @@ -92,7 +89,7 @@ static inline BOOL msvcrt_free_tls(void) { - if (!TlsFree(MSVCRT_tls_index)) + if (!TlsFree(msvcrt_tls_index)) { ERR("TlsFree() failed!\n"); return FALSE; @@ -140,9 +137,9 @@ * Success: A string pointing to the unmangled name, allocated with memget. * Failure: NULL. */ -char* MSVCRT___unDNameEx(char * OutStr, const char* mangled, int OutStrLen, - MSVCRT_malloc_func memget, - MSVCRT_free_func memfree, +char* msvcrt___unDNameEx(char * OutStr, const char* mangled, int OutStrLen, + malloc_func_t memget, + free_func_t memfree, void * unknown, unsigned short int flags) { @@ -177,11 +174,11 @@ /********************************************************************* * __unDName (MSVCRT.@) */ -char* MSVCRT___unDName(char * OutStr, const char* mangled, int OutStrLen, - MSVCRT_malloc_func memget, - MSVCRT_free_func memfree, +char* msvcrt___unDName(char * OutStr, const char* mangled, int OutStrLen, + malloc_func_t memget, + free_func_t memfree, unsigned short int flags) { - return MSVCRT___unDNameEx( OutStr, mangled, OutStrLen, memget, memfree, + return msvcrt___unDNameEx( OutStr, mangled, OutStrLen, memget, memfree, NULL, flags); } Index: dlls/msvcrt/math.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/math.c,v retrieving revision 1.23 diff -u -r1.23 math.c --- dlls/msvcrt/math.c 12 May 2004 23:22:36 -0000 1.23 +++ dlls/msvcrt/math.c 18 Jun 2004 04:33:40 -0000 @@ -28,9 +28,6 @@ #endif #include "msvcrt.h" -#include "msvcrt/errno.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/math.h" #include "msvcrt/float.h" #include "wine/debug.h" @@ -654,7 +651,7 @@ */ char *_ecvt( double number, int ndigits, int *decpt, int *sign ) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); + thread_data_t *data = msvcrt_get_thread_data(); char *dec; if (!data->efcvt_buffer) @@ -672,7 +669,7 @@ */ char *_fcvt( double number, int ndigits, int *decpt, int *sign ) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); + thread_data_t *data = msvcrt_get_thread_data(); char *dec; if (!data->efcvt_buffer) Index: dlls/msvcrt/mbcs.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/mbcs.c,v retrieving revision 1.27 diff -u -r1.27 mbcs.c --- dlls/msvcrt/mbcs.c 17 Apr 2003 02:15:03 -0000 1.27 +++ dlls/msvcrt/mbcs.c 18 Jun 2004 04:33:40 -0000 @@ -24,13 +24,6 @@ */ #include "msvcrt.h" - -#include "msvcrt/mbctype.h" -#include "msvcrt/mbstring.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" -#include "msvcrt/wctype.h" - #include "wine/unicode.h" #include "wine/debug.h" @@ -53,7 +46,7 @@ mbch[1] = ch & 0xff; n_chars = 2; } - if (!MultiByteToWideChar(MSVCRT_current_lc_all_cp, 0, mbch, n_chars, &chW, 1)) + if (!MultiByteToWideChar(msvcrt_current_lc_all_cp, 0, mbch, n_chars, &chW, 1)) { WARN("MultiByteToWideChar failed on %x\n", ch); return 0; @@ -555,7 +548,7 @@ */ unsigned char* _mbstok(unsigned char *str, const unsigned char *delim) { - MSVCRT_thread_data *data = msvcrt_get_thread_data(); + thread_data_t *data = msvcrt_get_thread_data(); char *ret; if(MSVCRT___mb_cur_max > 1) @@ -626,7 +619,7 @@ int _ismbbkana(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(MSVCRT_current_lc_all_cp == 932) + if(msvcrt_current_lc_all_cp == 932) { /* Japanese/Katakana, CP 932 */ return (c >= 0xa1 && c <= 0xdf); @@ -736,7 +729,7 @@ int _ismbchira(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(MSVCRT_current_lc_all_cp == 932) + if(msvcrt_current_lc_all_cp == 932) { /* Japanese/Hiragana, CP 932 */ return (c >= 0x829f && c <= 0x82f1); @@ -750,7 +743,7 @@ int _ismbckata(unsigned int c) { /* FIXME: use lc_ctype when supported, not lc_all */ - if(MSVCRT_current_lc_all_cp == 932) + if(msvcrt_current_lc_all_cp == 932) { if(c < 256) return _ismbbkana(c); Index: dlls/msvcrt/misc.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/misc.c,v retrieving revision 1.11 diff -u -r1.11 misc.c --- dlls/msvcrt/misc.c 17 May 2004 21:08:31 -0000 1.11 +++ dlls/msvcrt/misc.c 18 Jun 2004 04:33:40 -0000 @@ -24,8 +24,6 @@ #include <stdlib.h> #include "msvcrt.h" -#include "msvcrt/stdlib.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); Index: dlls/msvcrt/msvcrt.h =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/msvcrt.h,v retrieving revision 1.25 diff -u -r1.25 msvcrt.h --- dlls/msvcrt/msvcrt.h 16 Mar 2004 19:17:11 -0000 1.25 +++ dlls/msvcrt/msvcrt.h 18 Jun 2004 04:53:17 -0000 @@ -28,38 +28,58 @@ #include "winerror.h" #include "winnls.h" -#include "msvcrt/string.h" -#include "msvcrt/eh.h" +typedef unsigned short MSVCRT_wchar_t; +typedef unsigned short MSVCRT_wint_t; +typedef unsigned short MSVCRT_wctype_t; +typedef unsigned short MSVCRT__ino_t; +typedef unsigned long MSVCRT__fsize_t; +typedef unsigned int MSVCRT_size_t; +typedef unsigned int MSVCRT__dev_t; +typedef int MSVCRT__off_t; +typedef long MSVCRT_clock_t; +typedef long MSVCRT_time_t; +typedef long MSVCRT_fpos_t; + +typedef void (*MSVCRT_terminate_handler)(); +typedef void (*MSVCRT_terminate_function)(); +typedef void (*MSVCRT_unexpected_handler)(); +typedef void (*MSVCRT_unexpected_function)(); +typedef void (*MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); +typedef void (*MSVCRT__beginthread_start_routine_t)(void *); +typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); +typedef int (*MSVCRT__onexit_t)(void); + /* TLS data */ -extern DWORD MSVCRT_tls_index; +extern DWORD msvcrt_tls_index; -typedef struct __MSVCRT_thread_data -{ - int thread_errno; - unsigned long thread_doserrno; - char *mbstok_next; /* next ptr for mbstok() */ - char *efcvt_buffer; /* buffer for ecvt/fcvt */ - int fpecode; - terminate_function terminate_handler; - unexpected_function unexpected_handler; - _se_translator_function se_translator; - EXCEPTION_RECORD *exc_record; -} MSVCRT_thread_data; +struct __thread_data { + int thread_errno; + unsigned long thread_doserrno; + char *mbstok_next; /* next ptr for mbstok() */ + char *efcvt_buffer; /* buffer for ecvt/fcvt */ + int fpecode; + MSVCRT_terminate_function terminate_handler; + MSVCRT_unexpected_function unexpected_handler; + MSVCRT__se_translator_function se_translator; + EXCEPTION_RECORD *exc_record; +}; + +typedef struct __thread_data thread_data_t; -extern MSVCRT_thread_data *msvcrt_get_thread_data(void); +extern thread_data_t *msvcrt_get_thread_data(void); -extern int MSVCRT_current_lc_all_cp; +extern int msvcrt_current_lc_all_cp; -void _purecall(void); -void MSVCRT__set_errno(int); +void _purecall(void); +void msvcrt_set_errno(int); char* msvcrt_strndup(const char*,unsigned int); MSVCRT_wchar_t *msvcrt_wstrndup(const MSVCRT_wchar_t*, unsigned int); -void MSVCRT__amsg_exit(int errnum); +void msvcrt__amsg_exit(int errnum); -extern char **MSVCRT__environ; -extern MSVCRT_wchar_t **MSVCRT__wenviron; +extern char **msvcrt__environ; +extern MSVCRT_wchar_t **msvcrt__wenviron; extern char ** msvcrt_SnapshotOfEnvironmentA(char **); extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); @@ -67,16 +87,16 @@ /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. */ -int MSVCRT__set_new_mode(int mode); +int msvcrt__set_new_mode(int mode); -void* MSVCRT_operator_new(unsigned long size); -void MSVCRT_operator_delete(void*); +void* msvcrt_operator_new(unsigned long size); +void msvcrt_operator_delete(void*); -typedef void* (*MSVCRT_malloc_func)(MSVCRT_size_t); -typedef void (*MSVCRT_free_func)(void*); +typedef void* (*malloc_func_t)(MSVCRT_size_t); +typedef void (*free_func_t)(void*); -extern char* MSVCRT___unDName(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,unsigned short int); -extern char* MSVCRT___unDNameEx(char *,const char*,int,MSVCRT_malloc_func,MSVCRT_free_func,void *,unsigned short int); +extern char* msvcrt___unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); +extern char* msvcrt___unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void); @@ -123,4 +143,355 @@ #define _RT_CRNL 252 #define _RT_BANNER 255 +struct MSVCRT_tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + +struct MSVCRT__timeb { + MSVCRT_time_t time; + unsigned short millitm; + short timezone; + short dstflag; +}; + +struct MSVCRT__iobuf { + char* _ptr; + int _cnt; + char* _base; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; +}; + +typedef struct MSVCRT__iobuf MSVCRT_FILE; + +struct MSVCRT_lconv { + char* decimal_point; + char* thousands_sep; + char* grouping; + char* int_curr_symbol; + char* currency_symbol; + char* mon_decimal_point; + char* mon_thousands_sep; + char* mon_grouping; + char* positive_sign; + char* negative_sign; + char int_frac_digits; + char frac_digits; + char p_cs_precedes; + char p_sep_by_space; + char n_cs_precedes; + char n_sep_by_space; + char p_sign_posn; + char n_sign_posn; +}; + +struct MSVCRT__exception { + int type; + char* name; + double arg1; + double arg2; + double retval; +}; + +struct MSVCRT__complex { + double x; /* Real part */ + double y; /* Imaginary part */ +}; + +struct MSVCRT__heapinfo { + int* _pentry; + MSVCRT_size_t _size; + int _useflag; +}; + +#ifdef __i386__ +struct MSVCRT___JUMP_BUFFER { + unsigned long Ebp; + unsigned long Ebx; + unsigned long Edi; + unsigned long Esi; + unsigned long Esp; + unsigned long Eip; + unsigned long Registration; + unsigned long TryLevel; + /* Start of new struct members */ + unsigned long Cookie; + unsigned long UnwindFunc; + unsigned long UnwindData[6]; +}; +#endif /* __i386__ */ + +struct MSVCRT__diskfree_t { + unsigned int total_clusters; + unsigned int avail_clusters; + unsigned int sectors_per_cluster; + unsigned int bytes_per_sector; +}; + +struct MSVCRT__finddata_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + MSVCRT__fsize_t size; + char name[260]; +}; + +struct MSVCRT__finddatai64_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + __int64 size; + char name[260]; +}; + +struct MSVCRT__wfinddata_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + MSVCRT__fsize_t size; + MSVCRT_wchar_t name[260]; +}; + +struct MSVCRT__wfinddatai64_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + __int64 size; + MSVCRT_wchar_t name[260]; +}; + +struct MSVCRT__utimbuf +{ + MSVCRT_time_t actime; + MSVCRT_time_t modtime; +}; + +/* for FreeBSD */ +#undef st_atime +#undef st_ctime +#undef st_mtime + +struct MSVCRT__stat { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + MSVCRT__off_t st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +struct MSVCRT_stat { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + MSVCRT__off_t st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +struct MSVCRT__stati64 { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + __int64 st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +#define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) +#define MSVCRT_EOF (-1) +#define MSVCRT_TMP_MAX 0x7fff +#define MSVCRT_BUFSIZ 512 + +#define MSVCRT_STDIN_FILENO 0 +#define MSVCRT_STDOUT_FILENO 1 +#define MSVCRT_STDERR_FILENO 2 + +/* more file._flag flags, but these conflict with Unix */ +#define MSVCRT__IOFBF 0x0000 +#define MSVCRT__IONBF 0x0004 +#define MSVCRT__IOLBF 0x0040 + +#define MSVCRT_FILENAME_MAX 260 +#define MSVCRT_stdin (MSVCRT__iob+MSVCRT_STDIN_FILENO) +#define MSVCRT_stdout (MSVCRT__iob+MSVCRT_STDOUT_FILENO) +#define MSVCRT_stderr (MSVCRT__iob+MSVCRT_STDERR_FILENO) + +#define MSVCRT__P_WAIT 0 +#define MSVCRT__P_NOWAIT 1 +#define MSVCRT__P_OVERLAY 2 +#define MSVCRT__P_NOWAITO 3 +#define MSVCRT__P_DETACH 4 + +#define MSVCRT_EPERM 1 +#define MSVCRT_ENOENT 2 +#define MSVCRT_ESRCH 3 +#define MSVCRT_EINTR 4 +#define MSVCRT_EIO 5 +#define MSVCRT_ENXIO 6 +#define MSVCRT_E2BIG 7 +#define MSVCRT_ENOEXEC 8 +#define MSVCRT_EBADF 9 +#define MSVCRT_ECHILD 10 +#define MSVCRT_EAGAIN 11 +#define MSVCRT_ENOMEM 12 +#define MSVCRT_EACCES 13 +#define MSVCRT_EFAULT 14 +#define MSVCRT_EBUSY 16 +#define MSVCRT_EEXIST 17 +#define MSVCRT_EXDEV 18 +#define MSVCRT_ENODEV 19 +#define MSVCRT_ENOTDIR 20 +#define MSVCRT_EISDIR 21 +#define MSVCRT_EINVAL 22 +#define MSVCRT_ENFILE 23 +#define MSVCRT_EMFILE 24 +#define MSVCRT_ENOTTY 25 +#define MSVCRT_EFBIG 27 +#define MSVCRT_ENOSPC 28 +#define MSVCRT_ESPIPE 29 +#define MSVCRT_EROFS 30 +#define MSVCRT_EMLINK 31 +#define MSVCRT_EPIPE 32 +#define MSVCRT_EDOM 33 +#define MSVCRT_ERANGE 34 +#define MSVCRT_EDEADLK 36 +#define MSVCRT_EDEADLOCK MSVCRT_EDEADLK +#define MSVCRT_ENAMETOOLONG 38 +#define MSVCRT_ENOLCK 39 +#define MSVCRT_ENOSYS 40 +#define MSVCRT_ENOTEMPTY 41 + +#define MSVCRT_LC_ALL 0 +#define MSVCRT_LC_COLLATE 1 +#define MSVCRT_LC_CTYPE 2 +#define MSVCRT_LC_MONETARY 3 +#define MSVCRT_LC_NUMERIC 4 +#define MSVCRT_LC_TIME 5 +#define MSVCRT_LC_MIN MSVCRT_LC_ALL +#define MSVCRT_LC_MAX MSVCRT_LC_TIME + +#define MSVCRT__HEAPEMPTY -1 +#define MSVCRT__HEAPOK -2 +#define MSVCRT__HEAPBADBEGIN -3 +#define MSVCRT__HEAPBADNODE -4 +#define MSVCRT__HEAPEND -5 +#define MSVCRT__HEAPBADPTR -6 + +#define MSVCRT__FREEENTRY 0 +#define MSVCRT__USEDENTRY 1 + +#define MSVCRT__OUT_TO_DEFAULT 0 +#define MSVCRT__REPORT_ERRMODE 3 + +/* ASCII char classification table - binary compatible */ +#define MSVCRT__UPPER 0x0001 /* C1_UPPER */ +#define MSVCRT__LOWER 0x0002 /* C1_LOWER */ +#define MSVCRT__DIGIT 0x0004 /* C1_DIGIT */ +#define MSVCRT__SPACE 0x0008 /* C1_SPACE */ +#define MSVCRT__PUNCT 0x0010 /* C1_PUNCT */ +#define MSVCRT__CONTROL 0x0020 /* C1_CNTRL */ +#define MSVCRT__BLANK 0x0040 /* C1_BLANK */ +#define MSVCRT__HEX 0x0080 /* C1_XDIGIT */ +#define MSVCRT__LEADBYTE 0x8000 +#define MSVCRT__ALPHA (0x0100|MSVCRT__UPPER|MSVCRT__LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ + +#define MSVCRT__IOREAD 0x0001 +#define MSVCRT__IOWRT 0x0002 +#define MSVCRT__IOMYBUF 0x0008 +#define MSVCRT__IOEOF 0x0010 +#define MSVCRT__IOERR 0x0020 +#define MSVCRT__IOSTRG 0x0040 +#define MSVCRT__IORW 0x0080 + +#define MSVCRT__S_IEXEC 0x0040 +#define MSVCRT__S_IWRITE 0x0080 +#define MSVCRT__S_IREAD 0x0100 +#define MSVCRT__S_IFIFO 0x1000 +#define MSVCRT__S_IFCHR 0x2000 +#define MSVCRT__S_IFDIR 0x4000 +#define MSVCRT__S_IFREG 0x8000 +#define MSVCRT__S_IFMT 0xF000 + +void MSVCRT_free(void*); +void* MSVCRT_malloc(MSVCRT_size_t); +void* MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); +void* MSVCRT_realloc(void*,MSVCRT_size_t); + +int MSVCRT_iswalpha(MSVCRT_wint_t); +int MSVCRT_iswspace(MSVCRT_wint_t); +int MSVCRT_iswdigit(MSVCRT_wint_t); +int MSVCRT_isleadbyte(int); + +int MSVCRT_fgetc(MSVCRT_FILE*); +int MSVCRT_ungetc(int,MSVCRT_FILE*); +MSVCRT_wint_t MSVCRT_fgetwc(MSVCRT_FILE*); +MSVCRT_wint_t MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); +void MSVCRT__exit(int); +void MSVCRT_abort(); +unsigned long* MSVCRT___doserrno(void); +int* MSVCRT__errno(void); +char* MSVCRT_getenv(const char*); +char* MSVCRT_setlocale(int,const char*); +int MSVCRT_fclose(MSVCRT_FILE*); +void MSVCRT_terminate(); +int MSVCRT__futime(int,struct MSVCRT__utimbuf*); +MSVCRT_FILE* MSVCRT__p__iob(void); +MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*); + +MSVCRT_wchar_t* _wcsdup(const MSVCRT_wchar_t*); +MSVCRT_wchar_t*** __p__wenviron(void); + +int _write(int,const void*,unsigned int); +int _vsnwprintf(MSVCRT_wchar_t*,MSVCRT_size_t,const MSVCRT_wchar_t*,va_list); +void _splitpath(const char*,char*,char*,char*,char*); +int _ismbstrail(const unsigned char* start, const unsigned char* str); +int _spawnve(int,const char*,const char* const *,const char* const *); +void _searchenv(const char*,const char*,char*); +int _getdrive(void); +char* _strdup(const char*); +char* _strlwr(char*); +char* _strupr(char*); +char* _strnset(char*,int,MSVCRT_size_t); +char* _strset(char*,int); +int _getch(void); +int _ungetch(int); +int _cputs(const char*); +int _cprintf(const char*,...); +int _snprintf(char*,MSVCRT_size_t,const char*,...); + +char*** __p__environ(void); +int* __p___mb_cur_max(void); +unsigned int* __p__fmode(void); + #endif /* __WINE_MSVCRT_H */ Index: dlls/msvcrt/msvcrt.spec =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/msvcrt.spec,v retrieving revision 1.91 diff -u -r1.91 msvcrt.spec --- dlls/msvcrt/msvcrt.spec 2 Jun 2004 00:35:09 -0000 1.91 +++ dlls/msvcrt/msvcrt.spec 18 Jun 2004 04:30:00 -0000 @@ -15,10 +15,10 @@ @ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor @ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor @ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor -@ cdecl ??2@YAPAXI@Z(long) MSVCRT_operator_new -@ cdecl ??_U@YAPAXI@Z(long) MSVCRT_operator_new -@ cdecl ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete -@ cdecl ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete +@ cdecl ??2@YAPAXI@Z(long) msvcrt_operator_new +@ cdecl ??_U@YAPAXI@Z(long) msvcrt_operator_new +@ cdecl ??3@YAXPAX@Z(ptr) msvcrt_operator_delete +@ cdecl ??_V@YAXPAX@Z(ptr) msvcrt_operator_delete @ cdecl -i386 -norelay ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT___non_rtti_object_opequals @ cdecl -i386 -norelay ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_cast_opequals @ cdecl -i386 -norelay ??4bad_typeid@@QAEAAV0@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_opequals @@ -40,7 +40,7 @@ @ cdecl ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler @ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode @ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler -@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode +@ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt__set_new_mode @ cdecl ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator @ cdecl -i386 -norelay ?before@type_info@@QBEHABV1@@Z(ptr) __thiscall_MSVCRT_type_info_before @ cdecl -i386 -norelay ?name@type_info@@QBEPBDXZ() __thiscall_MSVCRT_type_info_name @@ -137,8 +137,8 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) MSVCRT___toascii -@ cdecl __unDName(ptr str long ptr ptr long) MSVCRT___unDName -@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) MSVCRT___unDNameEx +@ cdecl __unDName(ptr str long ptr ptr long) msvcrt___unDName +@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt___unDNameEx @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @ extern __wargv MSVCRT___wargv @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @@ -161,7 +161,7 @@ @ cdecl _adj_fptan() @ cdecl _adjust_fdiv() @ extern _aexit_rtn -@ cdecl _amsg_exit(long) MSVCRT__amsg_exit +@ cdecl _amsg_exit(long) msvcrt__amsg_exit @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl #(ptr str) @ cdecl -ret64 _atoi64(str) ntdll._atoi64 @@ -200,7 +200,7 @@ @ cdecl _ecvt(double long ptr ptr) @ cdecl _endthread () @ cdecl _endthreadex(long) -@ extern _environ MSVCRT__environ +@ extern _environ msvcrt__environ @ cdecl _eof(long) @ cdecl _errno() MSVCRT__errno @ cdecl _except_handler2(ptr ptr ptr ptr) @@ -245,7 +245,7 @@ @ cdecl _ftime(ptr) @ cdecl -ret64 _ftol() ntdll._ftol @ cdecl _fullpath(ptr str long) -@ cdecl _futime(long ptr) +@ cdecl _futime(long ptr) MSVCRT__futime @ cdecl _gcvt(double long str) @ cdecl _get_osfhandle(long) @ stub _get_sbh_threshold #() @@ -504,7 +504,7 @@ @ cdecl _wcsset(wstr long) @ cdecl _wcsupr(wstr) ntdll._wcsupr @ stub _wctime #(ptr) -@ extern _wenviron MSVCRT__wenviron +@ extern _wenviron msvcrt__wenviron @ stub _wexecl #(wstr wstr) varargs @ stub _wexecle #(wstr wstr) varargs @ stub _wexeclp #(wstr wstr) varargs Index: dlls/msvcrt/process.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/process.c,v retrieving revision 1.23 diff -u -r1.23 process.c --- dlls/msvcrt/process.c 9 Apr 2004 19:03:13 -0000 1.23 +++ dlls/msvcrt/process.c 18 Jun 2004 04:33:40 -0000 @@ -30,13 +30,6 @@ #include <stdarg.h> #include "msvcrt.h" -#include "msvcrt/errno.h" - -#include "msvcrt/stdio.h" -#include "msvcrt/process.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -50,7 +43,7 @@ if (sizeof(HANDLE) != sizeof(int)) WARN("This call is unsuitable for your architecture\n"); - if ((unsigned)flags > _P_DETACH) + if ((unsigned)flags > MSVCRT__P_DETACH) { *MSVCRT__errno() = MSVCRT_EINVAL; return -1; @@ -62,30 +55,30 @@ si.cb = sizeof(si); if (!CreateProcessA(exe, cmdline, NULL, NULL, TRUE, - flags == _P_DETACH ? DETACHED_PROCESS : 0, + flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, env, NULL, &si, &pi)) { - MSVCRT__set_errno(GetLastError()); + msvcrt_set_errno(GetLastError()); return -1; } switch(flags) { - case _P_WAIT: + case MSVCRT__P_WAIT: WaitForSingleObject(pi.hProcess, INFINITE); GetExitCodeProcess(pi.hProcess,&pi.dwProcessId); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); return (int)pi.dwProcessId; - case _P_DETACH: + case MSVCRT__P_DETACH: CloseHandle(pi.hProcess); pi.hProcess = 0; /* fall through */ - case _P_NOWAIT: - case _P_NOWAITO: + case MSVCRT__P_NOWAIT: + case MSVCRT__P_NOWAITO: CloseHandle(pi.hThread); return (int)pi.hProcess; - case _P_OVERLAY: + case MSVCRT__P_OVERLAY: MSVCRT__exit(0); } return -1; /* can't reach here */ @@ -218,7 +211,7 @@ *MSVCRT___doserrno() = doserrno; } else - MSVCRT__set_errno(doserrno); + msvcrt_set_errno(doserrno); return status ? *status = -1 : -1; } @@ -239,7 +232,7 @@ args = msvcrt_valisttos(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn(_P_OVERLAY, name, args, NULL); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL); MSVCRT_free(args); return ret; @@ -273,7 +266,7 @@ args = msvcrt_valisttos(arg0, ap, ' '); va_end(ap); - ret = msvcrt_spawn(_P_OVERLAY, fullname[0] ? fullname : name, args, NULL); + ret = msvcrt_spawn(MSVCRT__P_OVERLAY, fullname[0] ? fullname : name, args, NULL); MSVCRT_free(args); return ret; @@ -296,7 +289,7 @@ */ int _execv(const char* name, char* const* argv) { - return _spawnve(_P_OVERLAY, name, (const char* const*) argv, NULL); + return _spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, NULL); } /********************************************************************* @@ -307,7 +300,7 @@ */ int _execve(const char* name, char* const* argv, const char* const* envv) { - return _spawnve(_P_OVERLAY, name, (const char* const*) argv, envv); + return _spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); } /********************************************************************* @@ -321,7 +314,7 @@ char fullname[MAX_PATH]; _searchenv(name, "PATH", fullname); - return _spawnve(_P_OVERLAY, fullname[0] ? fullname : name, + return _spawnve(MSVCRT__P_OVERLAY, fullname[0] ? fullname : name, (const char* const*) argv, envv); } @@ -504,7 +497,7 @@ /* Make a writable copy for CreateProcess */ cmdcopy=_strdup(cmd); /* FIXME: should probably launch cmd interpreter in COMSPEC */ - res=msvcrt_spawn(_P_WAIT, NULL, cmdcopy, NULL); + res=msvcrt_spawn(MSVCRT__P_WAIT, NULL, cmdcopy, NULL); MSVCRT_free(cmdcopy); return res; } @@ -527,7 +520,7 @@ else { int err = GetLastError(); - MSVCRT__set_errno(err); + msvcrt_set_errno(err); return err; } } Index: dlls/msvcrt/scanf.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/scanf.c,v retrieving revision 1.6 diff -u -r1.6 scanf.c --- dlls/msvcrt/scanf.c 19 Feb 2004 01:13:13 -0000 1.6 +++ dlls/msvcrt/scanf.c 18 Jun 2004 04:33:40 -0000 @@ -30,10 +30,6 @@ #include "winreg.h" #include "winternl.h" #include "msvcrt.h" -#include "msvcrt/conio.h" -#include "msvcrt/io.h" -#include "msvcrt/stdio.h" -#include "msvcrt/wctype.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); Index: dlls/msvcrt/string.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/string.c,v retrieving revision 1.9 diff -u -r1.9 string.c --- dlls/msvcrt/string.c 16 Mar 2004 19:17:11 -0000 1.9 +++ dlls/msvcrt/string.c 18 Jun 2004 04:33:40 -0000 @@ -22,9 +22,6 @@ */ #include "msvcrt.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); Index: dlls/msvcrt/thread.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/thread.c,v retrieving revision 1.12 diff -u -r1.12 thread.c --- dlls/msvcrt/thread.c 25 Oct 2002 03:12:01 -0000 1.12 +++ dlls/msvcrt/thread.c 18 Jun 2004 04:33:40 -0000 @@ -18,10 +18,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "msvcrt.h" - -#include "msvcrt/malloc.h" -#include "msvcrt/process.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -29,7 +25,7 @@ /********************************************************************/ typedef struct { - _beginthread_start_routine_t start_address; + MSVCRT__beginthread_start_routine_t start_address; void *arglist; } _beginthread_trampoline_t; @@ -38,16 +34,16 @@ * * Return the thread local storage structure. */ -MSVCRT_thread_data *msvcrt_get_thread_data(void) +thread_data_t *msvcrt_get_thread_data(void) { - MSVCRT_thread_data *ptr; + thread_data_t *ptr; DWORD err = GetLastError(); /* need to preserve last error */ - if (!(ptr = TlsGetValue( MSVCRT_tls_index ))) + if (!(ptr = TlsGetValue( msvcrt_tls_index ))) { if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) - MSVCRT__amsg_exit( _RT_THREAD ); - if (!TlsSetValue( MSVCRT_tls_index, ptr )) MSVCRT__amsg_exit( _RT_THREAD ); + msvcrt__amsg_exit( _RT_THREAD ); + if (!TlsSetValue( msvcrt_tls_index, ptr )) msvcrt__amsg_exit( _RT_THREAD ); } SetLastError( err ); return ptr; @@ -75,7 +71,7 @@ * _beginthread (MSVCRT.@) */ unsigned long _beginthread( - _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + MSVCRT__beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ { @@ -102,7 +98,7 @@ unsigned long _beginthreadex( void *security, /* [in] Security descriptor for new thread; must be NULL for Windows 9x applications */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - _beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + MSVCRT__beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ void *arglist, /* [in] Argument list to be passed to new thread or NULL */ unsigned int initflag, /* [in] Initial state of new thread (0 for running or CREATE_SUSPEND for suspended) */ unsigned int *thrdaddr) /* [out] Points to a 32-bit variable that receives the thread identifier */ Index: dlls/msvcrt/time.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/time.c,v retrieving revision 1.14 diff -u -r1.14 time.c --- dlls/msvcrt/time.c 25 Mar 2004 00:12:40 -0000 1.14 +++ dlls/msvcrt/time.c 18 Jun 2004 04:33:40 -0000 @@ -30,11 +30,7 @@ #endif #include "msvcrt.h" -#include "msvcrt/sys/timeb.h" -#include "msvcrt/time.h" - #include "winbase.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -221,23 +217,9 @@ } /********************************************************************* - * time (MSVCRT.@) - */ -MSVCRT_time_t MSVCRT_time(MSVCRT_time_t* buf) -{ - MSVCRT_time_t curtime; - struct _timeb tb; - - _ftime(&tb); - - curtime = tb.time; - return buf ? *buf = curtime : curtime; -} - -/********************************************************************* * _ftime (MSVCRT.@) */ -void _ftime(struct _timeb *buf) +void _ftime(struct MSVCRT__timeb *buf) { TIME_ZONE_INFORMATION tzinfo; FILETIME ft; @@ -255,6 +237,20 @@ } /********************************************************************* + * time (MSVCRT.@) + */ +MSVCRT_time_t MSVCRT_time(MSVCRT_time_t* buf) +{ + MSVCRT_time_t curtime; + struct MSVCRT__timeb tb; + + _ftime(&tb); + + curtime = tb.time; + return buf ? *buf = curtime : curtime; +} + +/********************************************************************* * _daylight (MSVCRT.@) */ int MSVCRT___daylight = 1; /* FIXME: assume daylight */ Index: dlls/msvcrt/wcs.c =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/wcs.c,v retrieving revision 1.17 diff -u -r1.17 wcs.c --- dlls/msvcrt/wcs.c 2 Jun 2004 00:35:09 -0000 1.17 +++ dlls/msvcrt/wcs.c 18 Jun 2004 04:33:40 -0000 @@ -24,12 +24,6 @@ #include "msvcrt.h" #include "winnls.h" #include "wine/unicode.h" - -#include "msvcrt/stdio.h" -#include "msvcrt/stdlib.h" -#include "msvcrt/string.h" -#include "msvcrt/wctype.h" - #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); Index: dlls/msvcrt/tests/Makefile.in =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/tests/Makefile.in,v retrieving revision 1.6 diff -u -r1.6 Makefile.in --- dlls/msvcrt/tests/Makefile.in 25 Mar 2004 00:12:40 -0000 1.6 +++ dlls/msvcrt/tests/Makefile.in 16 Jun 2004 05:31:43 -0000 @@ -4,11 +4,13 @@ VPATH = @srcdir@ TESTDLL = msvcrt.dll IMPORTS = msvcrt -EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt +EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/.. CTESTS = \ cpp.c \ file.c \ + headers.c \ heap.c \ scanf.c \ string.c \ @@ -16,4 +18,6 @@ @MAKE_TEST_RULES@ +headers.c: test-gen $(SRCDIR)/../msvcrt.h + ### Dependencies: --- /dev/null 2004-02-23 16:02:56.000000000 -0500 +++ dlls/msvcrt/tests/headers.c 2004-06-18 01:44:43.339714008 -0400 @@ -0,0 +1,397 @@ +/* Automatically generated test. Do not edit. */ +#define USE_MSVCRT_PREFIX +#include "dos.h" +#include "math.h" +#include "stdlib.h" +#include "eh.h" +#include "io.h" +#include "errno.h" +#include "unistd.h" +#include "fcntl.h" +#include "malloc.h" +#include "limits.h" +#include "mbctype.h" +#include "stdio.h" +#include "wchar.h" +#include "ctype.h" +#include "crtdbg.h" +#include "share.h" +#include "search.h" +#include "wctype.h" +#include "float.h" +#include "stddef.h" +#include "mbstring.h" +#include "sys/unistd.h" +#include "sys/locking.h" +#include "sys/utime.h" +#include "sys/types.h" +#include "sys/stat.h" +#include "sys/timeb.h" +#include "direct.h" +#include "conio.h" +#include "dirent.h" +#include "process.h" +#include "string.h" +#include "time.h" +#include "locale.h" +#include "setjmp.h" +#include "msvcrt.h" +#include "wine/test.h" + +#ifdef __GNUC__ +#define TYPEOF(type) typeof(type) +#else +#define TYPEOF(type) int +#endif +#define MSVCRT(x) MSVCRT_##x +#define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) +#define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") +#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = 0; a = b; CHECK_SIZE(t); } +#define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") +#define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") +#define CHECK_DEF(n,d1,d2) ok(d1 == d2, "Defines (MSVCRT_)%s are different: '%d' vs. '%d'\n", n, d1, d2) +#define CHECK_FUNC(f) { TYPEOF(f) *a = 0; TYPEOF(MSVCRT(f)) *b = 0; a = b; } + +/************* Checking types ***************/ +void test_types() +{ + CHECK_TYPE(wchar_t); + CHECK_TYPE(wint_t); + CHECK_TYPE(wctype_t); + CHECK_TYPE(_ino_t); + CHECK_TYPE(_fsize_t); + CHECK_TYPE(size_t); + CHECK_TYPE(_dev_t); + CHECK_TYPE(_off_t); + CHECK_TYPE(clock_t); + CHECK_TYPE(time_t); + CHECK_TYPE(fpos_t); + CHECK_SIZE(FILE); + CHECK_TYPE(terminate_handler); + CHECK_TYPE(terminate_function); + CHECK_TYPE(unexpected_handler); + CHECK_TYPE(unexpected_function); + CHECK_TYPE(_se_translator_function); + CHECK_TYPE(_beginthread_start_routine_t); + CHECK_TYPE(_onexit_t); +} + +/************* Checking structs ***************/ +void test_structs() +{ + CHECK_STRUCT(tm); + CHECK_FIELD(tm, tm_sec); + CHECK_FIELD(tm, tm_min); + CHECK_FIELD(tm, tm_hour); + CHECK_FIELD(tm, tm_mday); + CHECK_FIELD(tm, tm_mon); + CHECK_FIELD(tm, tm_year); + CHECK_FIELD(tm, tm_wday); + CHECK_FIELD(tm, tm_yday); + CHECK_FIELD(tm, tm_isdst); + CHECK_STRUCT(_timeb); + CHECK_FIELD(_timeb, time); + CHECK_FIELD(_timeb, millitm); + CHECK_FIELD(_timeb, timezone); + CHECK_FIELD(_timeb, dstflag); + CHECK_STRUCT(_iobuf); + CHECK_FIELD(_iobuf, _ptr); + CHECK_FIELD(_iobuf, _cnt); + CHECK_FIELD(_iobuf, _base); + CHECK_FIELD(_iobuf, _flag); + CHECK_FIELD(_iobuf, _file); + CHECK_FIELD(_iobuf, _charbuf); + CHECK_FIELD(_iobuf, _bufsiz); + CHECK_FIELD(_iobuf, _tmpfname); + CHECK_STRUCT(lconv); + CHECK_FIELD(lconv, decimal_point); + CHECK_FIELD(lconv, thousands_sep); + CHECK_FIELD(lconv, grouping); + CHECK_FIELD(lconv, int_curr_symbol); + CHECK_FIELD(lconv, currency_symbol); + CHECK_FIELD(lconv, mon_decimal_point); + CHECK_FIELD(lconv, mon_thousands_sep); + CHECK_FIELD(lconv, mon_grouping); + CHECK_FIELD(lconv, positive_sign); + CHECK_FIELD(lconv, negative_sign); + CHECK_FIELD(lconv, int_frac_digits); + CHECK_FIELD(lconv, frac_digits); + CHECK_FIELD(lconv, p_cs_precedes); + CHECK_FIELD(lconv, p_sep_by_space); + CHECK_FIELD(lconv, n_cs_precedes); + CHECK_FIELD(lconv, n_sep_by_space); + CHECK_FIELD(lconv, p_sign_posn); + CHECK_FIELD(lconv, n_sign_posn); + CHECK_STRUCT(_exception); + CHECK_FIELD(_exception, type); + CHECK_FIELD(_exception, name); + CHECK_FIELD(_exception, arg1); + CHECK_FIELD(_exception, arg2); + CHECK_FIELD(_exception, retval); + CHECK_STRUCT(_complex); + CHECK_FIELD(_complex, x); + CHECK_FIELD(_complex, y); + CHECK_STRUCT(_heapinfo); + CHECK_FIELD(_heapinfo, _pentry); + CHECK_FIELD(_heapinfo, _size); + CHECK_FIELD(_heapinfo, _useflag); + CHECK_STRUCT(__JUMP_BUFFER); + CHECK_FIELD(__JUMP_BUFFER, Ebp); + CHECK_FIELD(__JUMP_BUFFER, Ebx); + CHECK_FIELD(__JUMP_BUFFER, Edi); + CHECK_FIELD(__JUMP_BUFFER, Esi); + CHECK_FIELD(__JUMP_BUFFER, Esp); + CHECK_FIELD(__JUMP_BUFFER, Eip); + CHECK_FIELD(__JUMP_BUFFER, Registration); + CHECK_FIELD(__JUMP_BUFFER, TryLevel); + CHECK_FIELD(__JUMP_BUFFER, Cookie); + CHECK_FIELD(__JUMP_BUFFER, UnwindFunc); + CHECK_FIELD(__JUMP_BUFFER, UnwindData[6]); + CHECK_STRUCT(_diskfree_t); + CHECK_FIELD(_diskfree_t, total_clusters); + CHECK_FIELD(_diskfree_t, avail_clusters); + CHECK_FIELD(_diskfree_t, sectors_per_cluster); + CHECK_FIELD(_diskfree_t, bytes_per_sector); + CHECK_STRUCT(_finddata_t); + CHECK_FIELD(_finddata_t, attrib); + CHECK_FIELD(_finddata_t, time_create); + CHECK_FIELD(_finddata_t, time_access); + CHECK_FIELD(_finddata_t, time_write); + CHECK_FIELD(_finddata_t, size); + CHECK_FIELD(_finddata_t, name[260]); + CHECK_STRUCT(_finddatai64_t); + CHECK_FIELD(_finddatai64_t, attrib); + CHECK_FIELD(_finddatai64_t, time_create); + CHECK_FIELD(_finddatai64_t, time_access); + CHECK_FIELD(_finddatai64_t, time_write); + CHECK_FIELD(_finddatai64_t, size); + CHECK_FIELD(_finddatai64_t, name[260]); + CHECK_STRUCT(_wfinddata_t); + CHECK_FIELD(_wfinddata_t, attrib); + CHECK_FIELD(_wfinddata_t, time_create); + CHECK_FIELD(_wfinddata_t, time_access); + CHECK_FIELD(_wfinddata_t, time_write); + CHECK_FIELD(_wfinddata_t, size); + CHECK_FIELD(_wfinddata_t, name[260]); + CHECK_STRUCT(_wfinddatai64_t); + CHECK_FIELD(_wfinddatai64_t, attrib); + CHECK_FIELD(_wfinddatai64_t, time_create); + CHECK_FIELD(_wfinddatai64_t, time_access); + CHECK_FIELD(_wfinddatai64_t, time_write); + CHECK_FIELD(_wfinddatai64_t, size); + CHECK_FIELD(_wfinddatai64_t, name[260]); + CHECK_STRUCT(_utimbuf); + CHECK_FIELD(_utimbuf, actime); + CHECK_FIELD(_utimbuf, modtime); + CHECK_STRUCT(_stat); + CHECK_FIELD(_stat, st_dev); + CHECK_FIELD(_stat, st_ino); + CHECK_FIELD(_stat, st_mode); + CHECK_FIELD(_stat, st_nlink); + CHECK_FIELD(_stat, st_uid); + CHECK_FIELD(_stat, st_gid); + CHECK_FIELD(_stat, st_rdev); + CHECK_FIELD(_stat, st_size); + CHECK_FIELD(_stat, st_atime); + CHECK_FIELD(_stat, st_mtime); + CHECK_FIELD(_stat, st_ctime); + CHECK_FIELD(_stat, st_dev); + CHECK_FIELD(_stat, st_ino); + CHECK_FIELD(_stat, st_mode); + CHECK_FIELD(_stat, st_nlink); + CHECK_FIELD(_stat, st_uid); + CHECK_FIELD(_stat, st_gid); + CHECK_FIELD(_stat, st_rdev); + CHECK_FIELD(_stat, st_size); + CHECK_FIELD(_stat, st_atime); + CHECK_FIELD(_stat, st_mtime); + CHECK_FIELD(_stat, st_ctime); + CHECK_FIELD(_stat, st_dev); + CHECK_FIELD(_stat, st_ino); + CHECK_FIELD(_stat, st_mode); + CHECK_FIELD(_stat, st_nlink); + CHECK_FIELD(_stat, st_uid); + CHECK_FIELD(_stat, st_gid); + CHECK_FIELD(_stat, st_rdev); + CHECK_FIELD(_stat, st_size); + CHECK_FIELD(_stat, st_atime); + CHECK_FIELD(_stat, st_mtime); + CHECK_FIELD(_stat, st_ctime); + CHECK_STRUCT(stat); + CHECK_FIELD(stat, st_dev); + CHECK_FIELD(stat, st_ino); + CHECK_FIELD(stat, st_mode); + CHECK_FIELD(stat, st_nlink); + CHECK_FIELD(stat, st_uid); + CHECK_FIELD(stat, st_gid); + CHECK_FIELD(stat, st_rdev); + CHECK_FIELD(stat, st_size); + CHECK_FIELD(stat, st_atime); + CHECK_FIELD(stat, st_mtime); + CHECK_FIELD(stat, st_ctime); + CHECK_FIELD(stat, st_dev); + CHECK_FIELD(stat, st_ino); + CHECK_FIELD(stat, st_mode); + CHECK_FIELD(stat, st_nlink); + CHECK_FIELD(stat, st_uid); + CHECK_FIELD(stat, st_gid); + CHECK_FIELD(stat, st_rdev); + CHECK_FIELD(stat, st_size); + CHECK_FIELD(stat, st_atime); + CHECK_FIELD(stat, st_mtime); + CHECK_FIELD(stat, st_ctime); + CHECK_FIELD(stat, st_dev); + CHECK_FIELD(stat, st_ino); + CHECK_FIELD(stat, st_mode); + CHECK_FIELD(stat, st_nlink); + CHECK_FIELD(stat, st_uid); + CHECK_FIELD(stat, st_gid); + CHECK_FIELD(stat, st_rdev); + CHECK_FIELD(stat, st_size); + CHECK_FIELD(stat, st_atime); + CHECK_FIELD(stat, st_mtime); + CHECK_FIELD(stat, st_ctime); + CHECK_STRUCT(_stati64); + CHECK_FIELD(_stati64, st_dev); + CHECK_FIELD(_stati64, st_ino); + CHECK_FIELD(_stati64, st_mode); + CHECK_FIELD(_stati64, st_nlink); + CHECK_FIELD(_stati64, st_uid); + CHECK_FIELD(_stati64, st_gid); + CHECK_FIELD(_stati64, st_rdev); + CHECK_FIELD(_stati64, st_size); + CHECK_FIELD(_stati64, st_atime); + CHECK_FIELD(_stati64, st_mtime); + CHECK_FIELD(_stati64, st_ctime); +} + +/************* Checking defines ***************/ +void test_defines() +{ + CHECK_DEF("WEOF", WEOF, MSVCRT_WEOF); + CHECK_DEF("EOF", EOF, MSVCRT_EOF); + CHECK_DEF("TMP_MAX", TMP_MAX, MSVCRT_TMP_MAX); + CHECK_DEF("BUFSIZ", BUFSIZ, MSVCRT_BUFSIZ); + CHECK_DEF("STDIN_FILENO", STDIN_FILENO, MSVCRT_STDIN_FILENO); + CHECK_DEF("STDOUT_FILENO", STDOUT_FILENO, MSVCRT_STDOUT_FILENO); + CHECK_DEF("STDERR_FILENO", STDERR_FILENO, MSVCRT_STDERR_FILENO); + CHECK_DEF("_IOFBF", _IOFBF, MSVCRT__IOFBF); + CHECK_DEF("_IONBF", _IONBF, MSVCRT__IONBF); + CHECK_DEF("_IOLBF", _IOLBF, MSVCRT__IOLBF); + CHECK_DEF("FILENAME_MAX", FILENAME_MAX, MSVCRT_FILENAME_MAX); + CHECK_DEF("_P_WAIT", _P_WAIT, MSVCRT__P_WAIT); + CHECK_DEF("_P_NOWAIT", _P_NOWAIT, MSVCRT__P_NOWAIT); + CHECK_DEF("_P_OVERLAY", _P_OVERLAY, MSVCRT__P_OVERLAY); + CHECK_DEF("_P_NOWAITO", _P_NOWAITO, MSVCRT__P_NOWAITO); + CHECK_DEF("_P_DETACH", _P_DETACH, MSVCRT__P_DETACH); + CHECK_DEF("EPERM", EPERM, MSVCRT_EPERM); + CHECK_DEF("ENOENT", ENOENT, MSVCRT_ENOENT); + CHECK_DEF("ESRCH", ESRCH, MSVCRT_ESRCH); + CHECK_DEF("EINTR", EINTR, MSVCRT_EINTR); + CHECK_DEF("EIO", EIO, MSVCRT_EIO); + CHECK_DEF("ENXIO", ENXIO, MSVCRT_ENXIO); + CHECK_DEF("E2BIG", E2BIG, MSVCRT_E2BIG); + CHECK_DEF("ENOEXEC", ENOEXEC, MSVCRT_ENOEXEC); + CHECK_DEF("EBADF", EBADF, MSVCRT_EBADF); + CHECK_DEF("ECHILD", ECHILD, MSVCRT_ECHILD); + CHECK_DEF("EAGAIN", EAGAIN, MSVCRT_EAGAIN); + CHECK_DEF("ENOMEM", ENOMEM, MSVCRT_ENOMEM); + CHECK_DEF("EACCES", EACCES, MSVCRT_EACCES); + CHECK_DEF("EFAULT", EFAULT, MSVCRT_EFAULT); + CHECK_DEF("EBUSY", EBUSY, MSVCRT_EBUSY); + CHECK_DEF("EEXIST", EEXIST, MSVCRT_EEXIST); + CHECK_DEF("EXDEV", EXDEV, MSVCRT_EXDEV); + CHECK_DEF("ENODEV", ENODEV, MSVCRT_ENODEV); + CHECK_DEF("ENOTDIR", ENOTDIR, MSVCRT_ENOTDIR); + CHECK_DEF("EISDIR", EISDIR, MSVCRT_EISDIR); + CHECK_DEF("EINVAL", EINVAL, MSVCRT_EINVAL); + CHECK_DEF("ENFILE", ENFILE, MSVCRT_ENFILE); + CHECK_DEF("EMFILE", EMFILE, MSVCRT_EMFILE); + CHECK_DEF("ENOTTY", ENOTTY, MSVCRT_ENOTTY); + CHECK_DEF("EFBIG", EFBIG, MSVCRT_EFBIG); + CHECK_DEF("ENOSPC", ENOSPC, MSVCRT_ENOSPC); + CHECK_DEF("ESPIPE", ESPIPE, MSVCRT_ESPIPE); + CHECK_DEF("EROFS", EROFS, MSVCRT_EROFS); + CHECK_DEF("EMLINK", EMLINK, MSVCRT_EMLINK); + CHECK_DEF("EPIPE", EPIPE, MSVCRT_EPIPE); + CHECK_DEF("EDOM", EDOM, MSVCRT_EDOM); + CHECK_DEF("ERANGE", ERANGE, MSVCRT_ERANGE); + CHECK_DEF("EDEADLK", EDEADLK, MSVCRT_EDEADLK); + CHECK_DEF("EDEADLOCK", EDEADLOCK, MSVCRT_EDEADLOCK); + CHECK_DEF("ENAMETOOLONG", ENAMETOOLONG, MSVCRT_ENAMETOOLONG); + CHECK_DEF("ENOLCK", ENOLCK, MSVCRT_ENOLCK); + CHECK_DEF("ENOSYS", ENOSYS, MSVCRT_ENOSYS); + CHECK_DEF("ENOTEMPTY", ENOTEMPTY, MSVCRT_ENOTEMPTY); + CHECK_DEF("LC_ALL", LC_ALL, MSVCRT_LC_ALL); + CHECK_DEF("LC_COLLATE", LC_COLLATE, MSVCRT_LC_COLLATE); + CHECK_DEF("LC_CTYPE", LC_CTYPE, MSVCRT_LC_CTYPE); + CHECK_DEF("LC_MONETARY", LC_MONETARY, MSVCRT_LC_MONETARY); + CHECK_DEF("LC_NUMERIC", LC_NUMERIC, MSVCRT_LC_NUMERIC); + CHECK_DEF("LC_TIME", LC_TIME, MSVCRT_LC_TIME); + CHECK_DEF("LC_MIN", LC_MIN, MSVCRT_LC_MIN); + CHECK_DEF("LC_MAX", LC_MAX, MSVCRT_LC_MAX); + CHECK_DEF("_HEAPEMPTY", _HEAPEMPTY, MSVCRT__HEAPEMPTY); + CHECK_DEF("_HEAPOK", _HEAPOK, MSVCRT__HEAPOK); + CHECK_DEF("_HEAPBADBEGIN", _HEAPBADBEGIN, MSVCRT__HEAPBADBEGIN); + CHECK_DEF("_HEAPBADNODE", _HEAPBADNODE, MSVCRT__HEAPBADNODE); + CHECK_DEF("_HEAPEND", _HEAPEND, MSVCRT__HEAPEND); + CHECK_DEF("_HEAPBADPTR", _HEAPBADPTR, MSVCRT__HEAPBADPTR); + CHECK_DEF("_FREEENTRY", _FREEENTRY, MSVCRT__FREEENTRY); + CHECK_DEF("_USEDENTRY", _USEDENTRY, MSVCRT__USEDENTRY); + CHECK_DEF("_OUT_TO_DEFAULT", _OUT_TO_DEFAULT, MSVCRT__OUT_TO_DEFAULT); + CHECK_DEF("_REPORT_ERRMODE", _REPORT_ERRMODE, MSVCRT__REPORT_ERRMODE); + CHECK_DEF("_UPPER", _UPPER, MSVCRT__UPPER); + CHECK_DEF("_LOWER", _LOWER, MSVCRT__LOWER); + CHECK_DEF("_DIGIT", _DIGIT, MSVCRT__DIGIT); + CHECK_DEF("_SPACE", _SPACE, MSVCRT__SPACE); + CHECK_DEF("_PUNCT", _PUNCT, MSVCRT__PUNCT); + CHECK_DEF("_CONTROL", _CONTROL, MSVCRT__CONTROL); + CHECK_DEF("_BLANK", _BLANK, MSVCRT__BLANK); + CHECK_DEF("_HEX", _HEX, MSVCRT__HEX); + CHECK_DEF("_LEADBYTE", _LEADBYTE, MSVCRT__LEADBYTE); + CHECK_DEF("_ALPHA", _ALPHA, MSVCRT__ALPHA); + CHECK_DEF("_IOREAD", _IOREAD, MSVCRT__IOREAD); + CHECK_DEF("_IOWRT", _IOWRT, MSVCRT__IOWRT); + CHECK_DEF("_IOMYBUF", _IOMYBUF, MSVCRT__IOMYBUF); + CHECK_DEF("_IOEOF", _IOEOF, MSVCRT__IOEOF); + CHECK_DEF("_IOERR", _IOERR, MSVCRT__IOERR); + CHECK_DEF("_IOSTRG", _IOSTRG, MSVCRT__IOSTRG); + CHECK_DEF("_IORW", _IORW, MSVCRT__IORW); + CHECK_DEF("_S_IEXEC", _S_IEXEC, MSVCRT__S_IEXEC); + CHECK_DEF("_S_IWRITE", _S_IWRITE, MSVCRT__S_IWRITE); + CHECK_DEF("_S_IREAD", _S_IREAD, MSVCRT__S_IREAD); + CHECK_DEF("_S_IFIFO", _S_IFIFO, MSVCRT__S_IFIFO); + CHECK_DEF("_S_IFCHR", _S_IFCHR, MSVCRT__S_IFCHR); + CHECK_DEF("_S_IFDIR", _S_IFDIR, MSVCRT__S_IFDIR); + CHECK_DEF("_S_IFREG", _S_IFREG, MSVCRT__S_IFREG); + CHECK_DEF("_S_IFMT", _S_IFMT, MSVCRT__S_IFMT); +} + +/************* Checking functions ***************/ +void test_functions() +{ + CHECK_FUNC(free); + CHECK_FUNC(malloc); + CHECK_FUNC(calloc); + CHECK_FUNC(realloc); + CHECK_FUNC(iswalpha); + CHECK_FUNC(iswspace); + CHECK_FUNC(iswdigit); + CHECK_FUNC(isleadbyte); + CHECK_FUNC(_exit); + CHECK_FUNC(abort); + CHECK_FUNC(__doserrno); + CHECK_FUNC(_errno); + CHECK_FUNC(getenv); + CHECK_FUNC(setlocale); + CHECK_FUNC(terminate); + CHECK_FUNC(time); +} + +START_TEST(headers) +{ + test_types(); + test_structs(); + test_defines(); + test_functions(); +} --- /dev/null 2004-02-23 16:02:56.000000000 -0500 +++ dlls/msvcrt/tests/test-gen 2004-06-18 01:44:37.793557152 -0400 @@ -0,0 +1,91 @@ +#!/bin/bash + +HEADER=../msvcrt.h +SIMPLE_TYPES=`grep 'typedef.*MSVCRT_' $HEADER | grep -v ')' | sed 's/.*MSVCRT_$[^; ]*$.*;/\1/'` +FUNC_TYPES=`grep 'typedef.*( *\* *MSVCRT_' $HEADER | sed 's/[^(]*([^*]*\*MSVCRT_$[^ )]*$.*/\1/'` +DEFS=`grep 'define *MSVCRT_' $HEADER | sed 's/.*define *MSVCRT_$[^ ]*$ .*/\1/'` +STRUCTS=`grep '^struct *MSVCRT_' $HEADER | sed 's/.*MSVCRT_$[^ {]*$.*/\1/'` +FUNCS=`grep '[^(]*MSVCRT_[a-zA-Z0-9_]* *(.*;' $HEADER | grep -v typedef | grep -v MSVCRT_FILE | grep -v struct | sed 's/[^(]*MSVCRT_$[a-zA-Z0-9_]*$ *(.*/\1/'` + +echo "/* Automatically generated test. Do not edit. */" +echo "#define USE_MSVCRT_PREFIX" +(cd ../../../include/msvcrt/; find -name "*.h") | sed 's/..$.*$/#include "\1"/' + +cat <<EOF +#include "msvcrt.h" +#include "wine/test.h" + +#ifdef __GNUC__ +#define TYPEOF(type) typeof(type) +#else +#define TYPEOF(type) int +#endif +#define MSVCRT(x) MSVCRT_##x +#define OFFSET(T,F) ((unsigned int)((char *)&((struct T *)0L)->F - (char *)0L)) +#define CHECK_SIZE(e) ok(sizeof(e) == sizeof(MSVCRT(e)), "Element has different sizes\n") +#define CHECK_TYPE(t) { TYPEOF(t) a = 0; TYPEOF(MSVCRT(t)) b = 0; a = b; CHECK_SIZE(t); } +#define CHECK_STRUCT(s) ok(sizeof(struct s) == sizeof(struct MSVCRT(s)), "Struct has different sizes\n") +#define CHECK_FIELD(s,e) ok(OFFSET(s,e) == OFFSET(MSVCRT(s),e), "Bad offset\n") +#define CHECK_DEF(n,d1,d2) ok(d1 == d2, "Defines (MSVCRT_)%s are different: '%d' vs. '%d'\n", n, d1, d2) +#define CHECK_FUNC(f) { TYPEOF(f) *a = 0; TYPEOF(MSVCRT(f)) *b = 0; a = b; } + +EOF + +echo "/************* Checking types ***************/" +echo "void test_types()" +echo "{" +for type in $SIMPLE_TYPES $FUNC_TYPES; do + if [ $type = FILE ]; then + echo " CHECK_SIZE($type);" + else + echo " CHECK_TYPE($type);" + fi +done +echo "}" +echo "" + +echo "/************* Checking structs ***************/" +echo "void test_structs()" +echo "{" +for struct in $STRUCTS; do + fields=`sed -n "/^struct.*$struct/,/}/p" $HEADER | grep -v '}' | sed '1d' | grep ';' | sed 's/.* *$[^ ;]*$ *;.*/\1/'` + echo " CHECK_STRUCT($struct);" + for field in $fields; do + echo " CHECK_FIELD($struct, $field);" + done +done +echo "}" +echo "" + +echo "/************* Checking defines ***************/" +echo "void test_defines()" +echo "{" +for def in $DEFS; do + case $def in + stdin) ;; + stdout) ;; + stderr) ;; + *) echo " CHECK_DEF(\"$def\", $def, MSVCRT_$def);" ;; + esac +done +echo "}" +echo "" + +echo "/************* Checking functions ***************/" +echo "void test_functions()" +echo "{" +for func in $FUNCS; do + echo " CHECK_FUNC($func);" +done +echo "}" +echo "" + +cat <<EOF +START_TEST(headers) +{ + test_types(); + test_structs(); + test_defines(); + test_functions(); +} +EOF

2 1

RE: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Krishna Murthy 18 Jun '04

18 Jun '04

No, it is required. The DEFDLG_SetDefButton() is also called from message DM_SETDEFID. In this case idResult should set to the default button ID passed. And the current logic of DEFDLG_SetDefButton() does what is required for DM_SETDEFID. But when called from the WM_NEXTDLGCTL, it should not change idResult. It should only change the look of the button by drawing the default button rectangle if it is a push button. Otherwise we need to enhance the DEFDLG_SetDefButton() to accept one more parameter which indicates who invoked the method. Krishna -----Original Message----- From: Alexandre Julliard [mailto:julliard@winehq.org] Sent: Thursday, June 17, 2004 8:36 PM To: Krishna Murthy Cc: wine-devel(a)winehq.org Subject: Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > + /** > + * if the next control is push button, then draw default push button > + * rectangle. > + * > + * if the next control is not a push button, then draw the push button > + * rectangle for the default control. > + * > + * Call SetDefButton to draw the default rectangle, but do not change the > + * default push button ID (idResult) - As Per MSDN > + */ > + if ( !(SendMessageW(hwndDest, WM_GETDLGCODE, 0, 0 ) & > + (DLGC_UNDEFPUSHBUTTON | DLGC_BUTTON)) ) > + hwndDest = GetDlgItem(hwnd, idSaveResult); > + DEFDLG_SetDefButton( hwnd, dlgInfo, GetDlgCtrlID(hwndDest) ); > + dlgInfo->idResult = idSaveResult; It seems you are doing redundant work here, since DEFDLG_SetDefButton will also send the same WM_GETDLGCODE. Wouldn't a simpler fix be to have DEFDLG_SetDefButton not set idResult unless it really changed the default button? -- Alexandre Julliard julliard(a)winehq.org

4 3

[comp.emulators.ms-windows.wine] winetest observations
by Ferenc Wagner 18 Jun '04

18 Jun '04

Hi, let me simply forward this message here. I can't take care for these during the weekend, but would be happy to receive comments on the harder parts when I'm back. Bye, Feri. From: Andrew Ziem <andrewz(a)springsrescuemission.org> Newsgroups: comp.emulators.ms-windows.wine Subject: winetest observations Message-ID: <AgEAc.13$fm6.34847(a)news.uswest.net> Date: Fri, 18 Jun 2004 09:56:12 -0600 It looks like winetest developers are busy. I don't know whether these are all bugs, but some of them are annoying. - winetest creates 3 popups complaining msvcdtd.dll could not be found - mapi32: creates popup: "Microsoft Outlook: either there is no default email client or the current mail client cannot fulfill the mesage request" - mapi32: util: another Outlook popup - user32_input always times out - Some test (maybe in user32) kills the system bar. On W2K it just pops up. On Win95 stays dead. This makes automated winrash testing difficult on 95. - winetest tells me my results are too big to upload. It tells me to upload the manually, but it would be nice if it would give me a URL or instructions to do that. - During winetest results upload, I cannot use DNS, SSH, IMAP, or HTTP. However, I can use Windows File Sharing. Andrew

1 0

Re: font problems with "Hello" application
by Ivan 18 Jun '04

18 Jun '04

> this can be acquired at ... That site is illegal, please avoid linking to such sites. Developers know where to get native dlls. Ivan.

2 1

Re: Donations - RFC
by Mike Kost 18 Jun '04

18 Jun '04

> The trouble with this idea is that the few times > I've tried to offer software to Lionel and others > they tell me that they have all they need. What about hardware for proven Wine developers. Lionel mentioned his /OLD/ TNT2 in his recent interview (http://www.winehq.org/?interview=15). More modern video hardware than a TNT2 can be had for the price of a game or two. http://www.pricewatch.com/menus/m37.htm Mike K

1 0

RE: Incoming Msg
by Twickline 18 Jun '04

18 Jun '04

1 0

WWN error
by Mike Hearn 18 Jun '04

18 Jun '04

Hi, This weeks WWN makes the same error the O'Reilly article made - CrossOver does support MS Project these days thanks to the work of Dmitry. It's at bronze level but good enough to play with at any rate. thanks -mike

2 1

Re: Donations - RFC
by Ivan 18 Jun '04

18 Jun '04

> they tell me that they have all they need. Ok course, why spend money on games when you can use demos? You have less chances of having installer problems, as the demo installer isn't usually as advanced as the retail one, and most of the functionality needed by the game is in the demo anyway. > That suggests saving it for this purpose would be prudent. Save it until we have a good reason to sped it. That reason could be wineconf, or something else, in the mean time keep it in the bank. Ivan.

1 0

Re: Default to Windows 98 version, introduce new version mode 'auto' to use the DLL linkage heuristics
by Alexandre Julliard 18 Jun '04

18 Jun '04

Mike Hearn <mike(a)navi.cx> writes: > Mike Hearn <mike(a)navi.cx> > Default to Windows 98 version, introduce new version mode 'auto' > to use the DLL linkage heuristics. I'm not sure this is a good idea, it will require anybody who wants to use NT dlls to change the config or things will break, while they work fine today. I think it's better to keep the current way and improve the auto-detection if needed. -- Alexandre Julliard julliard(a)winehq.org

2 1

[test.winehq.org] missing tests
by Stefan Leichter 18 Jun '04

18 Jun '04

Hello, i noticed that not all dlls with unittests are listed inside the Main summary of test.winehq.org. Missing dlls are: iphlpapi, mapi32, msvcrtd, psapi, version Is there any reason for this? Bye Stefan

3 6

Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Alexandre Julliard 18 Jun '04

18 Jun '04

Krishna Murthy <Krishna.Murthy(a)guptaworldwide.com> writes: > + /** > + * if the next control is push button, then draw default push button > + * rectangle. > + * > + * if the next control is not a push button, then draw the push button > + * rectangle for the default control. > + * > + * Call SetDefButton to draw the default rectangle, but do not change the > + * default push button ID (idResult) - As Per MSDN > + */ > + if ( !(SendMessageW(hwndDest, WM_GETDLGCODE, 0, 0 ) & > + (DLGC_UNDEFPUSHBUTTON | DLGC_BUTTON)) ) > + hwndDest = GetDlgItem(hwnd, idSaveResult); > + DEFDLG_SetDefButton( hwnd, dlgInfo, GetDlgCtrlID(hwndDest) ); > + dlgInfo->idResult = idSaveResult; It seems you are doing redundant work here, since DEFDLG_SetDefButton will also send the same WM_GETDLGCODE. Wouldn't a simpler fix be to have DEFDLG_SetDefButton not set idResult unless it really changed the default button? -- Alexandre Julliard julliard(a)winehq.org

1 0

mmap of entire address space failed
by Gerald Pfeifer 17 Jun '04

17 Jun '04

On Tue, 15 Jun 2004, Alexandre Julliard wrote: > WHAT'S NEW with Wine-20040615: (see ChangeLog for details) > - Major winedbg rewrite using the dbghelp dll. > - New Wine preloader to reserve memory areas at startup. On FreeBSD 4.x, I'm now getting the following when trying to invoke Wine, even without any parameters: wine: failed to initialize: /swtest/wine/dlls/ntdll.dll.so: mmap of entire address space failed: Cannot allocate memory Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

2 1

Memory allocation command
by Shachar Shemesh 17 Jun '04

17 Jun '04

Hi, The attached Windows program is compiled with support for 3GB user space. It is trying to allocate as much memory as it can, in 100MB chunks. On my unpatched Wine, it fails after allocating 10 chunks (i.e. - 1GB of data), which is consistent with the expected behavior as discussed with Alexandre on IRC. We should get it to succeed with allocating up to 2GB on regular compilation, and 3GB if it takes into consideration the memory reserving. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

1 0

Winedbg problem in 20040615
by Oliver 17 Jun '04

17 Jun '04

Hi, Just to confirm the current winedbg problem also with my system: Suse 9.1, Linux cassix 2.6.4-52-default #1 Wed Apr 7 02:08:30 UTC 2004 i686 i686 i386 GNU/Linux On Thursday 17 June 2004 16:48, Rein Klazes wrote: > > When I set breakpoints, I get a lot of messages like this: > > [...] > > fixme:dbghelp:elf_new_wine_thunks Duplicate in kernel32<elf>: > > module.0<40529348-00000004> module<40529348-00000000> > > fixme:dbghelp:elf_new_wine_thunks Duplicate in kernel32<elf>: > > iDateW.4<40509aba-0000000c> iDateW<40509aba-00000000> > > [...] > > This is discussed on the developer list, subject "Debugger spews > elf_new_wine_thunks fixmes". You are hitting bugs in the debugger, it > seems a good idea you send you questions to the developer list as it is > such a specialized item. Yes, a working winedbg would for the current CVS would be good. Especially setting the debugging channels again would be good. I have following problem there: Wine-dbg>set +file fixme:dbghelp:elf_new_wine_thunks Duplicate in imm32<elf>: name.0<4219a75c-00000012> name<4219a75c-00000000> [...] No symbols found for first_dll Can't get first_dll symbol Wine-dbg> Cheerio, Oliver

1 0

[ILLUSTRATOR10] not installable, need to merge 'winedefault.reg'
by Luca Capello 17 Jun '04

17 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, as reported in my previous mail, after the trick for DCOM95, 'Adobe Illustrator 10' is still not installable, cause this error: ===== luca@gismo:~$ wine win32_install/Adobe/Adobe.Illustrator.10/Adobe\ Illustrator\ 10/Setup.exe fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects ERROR: You need to merge the 'winedefault.reg' file into your Wine registry by running: `regedit winedefault.reg' fixme:ole:_LocalServerThread CoMarshalInterface failed, 80070057! ERROR: You need to merge the 'winedefault.reg' file into your Wine registry by running: `regedit winedefault.reg' fixme:ole:_LocalServerThread CoMarshalInterface failed, 80070057! luca@gismo:~$ ===== But where I can find 'winedefault.reg' in the released 'wine-20040615'? ===== gismo:/home/luca# updatedb gismo:/home/luca# locate winedefault.reg /home/luca/cvs/cvs-commit/wine/Attic/winedefault.reg,v gismo:/home/luca# tar tzvf cvs/Wine-20040615.tar.gz | grep winedefault gismo:/home/luca# ===== Thx, bye, Gismo / Luca -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFA0GgfVAp7Xm10JmkRAmIMAJ46H4w6ebQUd70GpSoKsmGC/d4riACfc637 Mdgnycwixh+1sZGbUzOA/WA= =25Pd -----END PGP SIGNATURE-----

3 3

Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Mike Hearn 17 Jun '04

17 Jun '04

On Thu, 2004-06-17 at 09:09 -0700, Krishna Murthy wrote: > I have submitted this patch last Friday. Today I got the latest update > from the CVS and found that the changes are not applied. > > Earlier I have found that the patches used to get updated overnight. > Please let me know if I am missing anything? OR the patch update > process takes some time? Probably it just needs thinking about, this sort of patch affects core parts of Wine and so often it takes Alexandre some time to decide if the patch is correct or not. Be patient, he is only human ;) Having said that, there are a few things you can do to make it more likely that patches will be applied quickly. 1) Use text mail rather than HTML mail. Alexandre applies patches by feeding the entire email to patch, so the less junk there is the more likely it is to just work. 2) You don't need to provide a long/short description, just a changelog entry is fine. If after a week or so the patch is still not applied, try resending it or asking why it was not applied on wine-devel. thanks -mike

2 1

RE: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier
by Krishna Murthy 17 Jun '04

17 Jun '04

Thanks a lot. Krishna -----Original Message----- From: Mike Hearn [mailto:mike@navi.cx] Sent: Thursday, June 17, 2004 9:28 AM To: wine-devel(a)winehq.org Cc: Krishna Murthy Subject: Re: FW: WM_NEXTDLGCTL changes the default button ID and does not rest ore default control identifier On Thu, 2004-06-17 at 09:09 -0700, Krishna Murthy wrote: > I have submitted this patch last Friday. Today I got the latest update > from the CVS and found that the changes are not applied. > > Earlier I have found that the patches used to get updated overnight. > Please let me know if I am missing anything? OR the patch update > process takes some time? Probably it just needs thinking about, this sort of patch affects core parts of Wine and so often it takes Alexandre some time to decide if the patch is correct or not. Be patient, he is only human ;) Having said that, there are a few things you can do to make it more likely that patches will be applied quickly. 1) Use text mail rather than HTML mail. Alexandre applies patches by feeding the entire email to patch, so the less junk there is the more likely it is to just work. 2) You don't need to provide a long/short description, just a changelog entry is fine. If after a week or so the patch is still not applied, try resending it or asking why it was not applied on wine-devel. thanks -mike

1 0

How to test patches?
by Joel Konkle-Parker 17 Jun '04

17 Jun '04

I want to patch something in wrc/ (hopefully trivial), but I'm not sure how to test for any side effects. Is there a regression test suite or something you guys use to test your patches? Thanks. -- Joel Konkle-Parker Webmaster [Ballsome.com] E-mail [jjk3(a)msstate.edu]

2 1

[DCOM95] not installable: "a newer version had been installed"
by Luca Capello 17 Jun '04

17 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, as Mike Hearn asked if 'wineinstall' is still needed [1], I was making some tests with no config file and a fresh 'fake_windows' created automatically by 'wine-20040615'. This is the first test of two: 'Adobe Illustrator 10' doesn't install because a problem with the DCOM95 package The steps: - - get and uncompress 'Wine-20040615' - - ./configure && make depend && make - - su root - - make install - - CTRL-D - - then the following ===== luca@gismo:~/cvs/wine-20040615$ wine /home/luca/win32_install/Adobe/Adobe.Illustrator.10/Adobe\ Illustrator\ 10/Setup.exe wine: creating configuration directory '/home/luca/.wine'... wine: '/home/luca/.wine' created successfully. fixme:ole:RegisterTypeLib Registering non-oleautomation interface! fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:ITypeInfo_fnRelease destroy child objects fixme:ole:create_marshalled_proxy Failed to read marshal id from classfactory of {91814ec0-b5f0-11d2-80b9-00104b1f6cea}. ************************************************************************** You must copy a 'stdole32.tlb' file to your Windows\System directory! You can get one from a Windows installation, or look for the DCOM95 package on the Microsoft Download Pages. ************************************************************************** fixme:ole:LoadTypeLibEx Wanted to load L"stdole32.tlb" as typelib, but file was not found. fixme:ole:_get_funcdesc Did not find a typeinfo for reftype 0? fixme:ole:PSFacBuf_CreateProxy GetFuncDesc 80004005 should not fail here. fixme:ole:StdMarshalImpl_UnmarshalInterface Failed to create a proxy for {91814ec1-b5f0-11d2-80b9-00104b1f6cea} fixme:ole:CoUnmarshalInterface Failed to Unmarshal the interface, 80004005? fixme:ole:_unmarshal_interface Marshalling interface {91814ec1-b5f0-11d2-80b9-00104b1f6cea} failed with 80004005 fixme:ole:deserialize_param failed to stuballoc in TKIND_RECORD. fixme:ole:xCall Failed to unmarshall param, hres 80004005 wine: Unhandled exception (thread 0009), starting debugger... fixme:console:SetConsoleCtrlHandler (0x405de730,1) - no error checking or testing yet WineDbg starting on pid 0x8 Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00404a34). In 32 bit mode. 0x00404a34: movl 0x0(%eax),%ecx Wine-dbg> Wine-dbg>WineDbg terminated on pid 0x8 fixme:ole:_xread Read only 0 of 4 bytes from 0x50. fixme:ole:_StubReaderThread Failed with hres 80004005 luca@gismo:~/cvs/wine-20040615$ ===== I downloaded the DCOM95 package [2], but when I tried to install it, I got the message window: "A newer version of DCOM95 or DCOM98 had been installed. To override, you must uninstall the current version first." with this message in the 'gnome-terminal': ===== luca@gismo:~/cvs/wine-20040615$ wine /home/luca/.wine/drive_c/windows/temp/x86/DCom95.Exe err:module:load_builtin_dll loaded .so for L"setupx.dll" but got L"setupapi.dll" instead - probably 16-bit dll luca@gismo:~/cvs/wine-20040615$ ===== The same if I try to install DCOM98... and I can't install 'Adobe Illustrator 10' :-( With the 'fake_windows' provided by the 'WineTools' [3], I can install the DCOM98 with no problem. Is this the same problem reported as bug #1456 [4]? Or is it a problem of mine? Thx, bye, Gismo / Luca [1] http://www.winehq.org/hypermail/wine-devel/2004/06/0242.html [2] http://www.microsoft.com/com/dcom/dcom95/download.asp [3] http://franksworld.net/winetools.html [4] http://bugs.winehq.org/show_bug.cgi?id=1456 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFA0BxYVAp7Xm10JmkRAqptAJ45+cwvWG0ZX8zrAxRRvGmW7m39UwCfUA83 3s222OvH6YaXFtzLA0uK/ro= =TMuG -----END PGP SIGNATURE-----

4 6

WineHQ-hosted projects?
by Joel Konkle-Parker 17 Jun '04

17 Jun '04

I'd like to start up a WINE-based project to further development for a specific app. (e.g. The WINE-Star Wars Galaxies Project, or The WINE-Internet Explorer Project). Does WineHQ have a place to host such things (with their own sites, etc.), or should I turn to SourceForge? -- Joel Konkle-Parker Webmaster [Ballsome.com] E-mail [jjk3(a)msstate.edu]

4 6

RE: Text message
by Johane 17 Jun '04

17 Jun '04

1 0

New changes
by Twickline 17 Jun '04

17 Jun '04

1 0

Changes..
by Twickline 17 Jun '04

17 Jun '04

1 0

Re: dlls/dinput/mouse.c - GetDeviceState
by Lionel Ulmer 17 Jun '04

17 Jun '04

> this patch adds a missing errorcode in GetDeviceState in > dlls/dinput/mouse.c which prevented the mouse to work in some game. Which games did require this error to be set ? I seem to remember some hacks around this but I do not remember if it was an error added in the GetDeviceData function or an error removed somewhere because it relied on getting something even if not acquired... I will try a test application when I have access to my Windows development machine to get the error code :-) Lionel -- Lionel Ulmer - http://www.bbrox.org/

2 1

Re: dlls/dinput/mouse.c warp handling
by Lionel Ulmer 17 Jun '04

17 Jun '04

> this is a more complete version of my mouse patch in which I tried to > remove this funny mouse-warping-stuff. > > the mouse feels much better this way, but I am new to wine and maybe I > missed something important and/or did not remove the mousewarping cleanly. Errrm, do you understand exactly what you remove and why it was in the code ? Basically, if you remove mouse warping, when you play games like Quake, you will only be able to turn to your right (or left :-) ) for a fixed amount... I.e. up until the point where the mouse will hit the right border of the window. I agree though that 2D games (like StarCraft or others) will feel a LOT better with a patch like that, but it's plainly wrong. The only way to fix this is to sometimes warp the mouse back in the middle of the window (or to use DGAMouse (or to write a new X11 extension :-) )). Lionel -- Lionel Ulmer - http://www.bbrox.org/

3 5

Re: [KERNEL] add CmdBatNotification stub
by Dmitry Timoshkov 17 Jun '04

17 Jun '04

<markus.amsler(a)oribi.org> wrote: > CmdBatNotification is used by cmd.exe when executing a bat file. > Found no documentation about this function, so I dissassembled it: Please do not send disassembled Windows code to these lists. To find number of arguments for an API call there is no need to disassemble anything, just run an app with +snoop and it will do the job for you. -- Dmitry.

3 2

D3D9 - Anyone working on that
by Andrei Barbu 16 Jun '04

16 Jun '04

Hey, Is anyone working on DX9? It's all implemented by stubs right now, and I was thinking of lending a hand. If anyone's doing that, do you have a place where I can see how far you've gotten. No point in reinventing the wheel. I probably won't be able to do very advanced work with it because I've barely touched DX under Windows, I can find a few books on it though. Also I've never used DX shaders, only CG so unless it's very close to that I can't much help there, I am willing to try though. If noone's in the middle of doing that, I guess I can start on my own. Thanks, Andrei

2 1

[PHOTOSHOP7] not installable, OS not supported, for NT4 service pack >= 6a
by Luca Capello 16 Jun '04

16 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, this is the second test with no config file as Mike Hearn suggested [1]. 'Adobe Photoshop 7.0' can't be installed: the problem is grave, as the installation process doesn't start at all. The steps: ===== luca@gismo:~/cvs/wine-20040615$ rm -rf /home/luca/.wine/ luca@gismo:~/cvs/wine-20040615$ wine /home/luca/win32_install/Adobe/Adobe.Photoshop.7/Photoshop/Setup.exe wine: creating configuration directory '/home/luca/.wine'... wine: '/home/luca/.wine' created successfully. fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet. luca@gismo:~/cvs/wine-20040615$ ===== I can see the 'Photoshop 7' logo window, but then another window appears with this message: "This operating system is not supported by this installation. For Windows NT 4, you must have service pack 6a or greater to install. Setup will now quit." And pressing OK causes nothing, I mean, I don't need to press OK to have 'wine' quitting: I can leave the message window open and continue to use the 'gnome-terminal' with no problem. Again, with the 'fake_windows' provided by the 'WineTools' [2], I can install 'Photoshop 7.0' with all the options (included 'ImageReady'). The only problem I get is an error creating the icon set, but pressing 'OK' lets the installation process to finish cleanly. Solutions? Thx, bye, Gismo / Luca [1] http://www.winehq.org/hypermail/wine-devel/2004/06/0242.html [2] http://franksworld.net/winetools.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFA0CH4VAp7Xm10JmkRAmufAJ9yKlSlSJhV6Wt0C1RIYGdoacLsxgCfUi1B /bN09F/mXRzMmG5lKTqDQss= =ARER -----END PGP SIGNATURE-----

2 2

Re: WineHQ-hosted projects?pecific app. (e.g. The WINE-Star Wars Galaxies Project, or The
by Brian Vincent 16 Jun '04

16 Jun '04

> I'd like to start up a WINE-based project to further development for a > specific app. (e.g. The WINE-Star Wars Galaxies Project, or The > WINE-Internet Explorer Project). Does WineHQ have a place to host such > things (with their own sites, etc.), or should I turn to SourceForge? Another resource is the AppDB: http://appdb.winehq.org I'd think all the details could go in there. Ideally it would all work out of the box and there would be no reason for special instructions. -Brian

1 0

Re: PATCH: fix dlls/ntdll/cdrom.c breakage
by Uwe Bonnes 16 Jun '04

16 Jun '04

>>>>> "Gerald" == Gerald Pfeifer <gerald(a)pfeifer.com> writes: Gerald> The following patch to dlls/ntdll/cdrom.c revision 1.46 date: Gerald> 2004/06/15 00:45:01; author: julliard; state: Exp; lines: +421 Gerald> -1 Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> Support Gerald> for reading encrypted DVDs. Gerald> causes a build failure on all FreeBSD (and it seems also NetBSD) Gerald> platforms: Gerald> cdrom.c: In function `DVD_EndSession': cdrom.c:1739: error: Gerald> `dev' undeclared (first use in this function) cdrom.c:1739: Gerald> error: (Each undeclared identifier is reported only once Gerald> cdrom.c:1739: error: for each function it appears in.) Gerald> cdrom.c:1739: error: `rmv' undeclared (first use in this Gerald> function) gmake[2]: *** [cdrom.o] Error 1 gmake[2]: Leaving Gerald> directory `/.amd_mnt/nashira/files5/test/wine/dlls/ntdll' Gerald> gmake[1]: *** [ntdll] Error 2 Gerald> There is BSD-specific code in this function, but both dev and Gerald> rmv do not appear anywhere, so I guess this was copied from Gerald> somewhere else and then not adjusted? The Non-Linux side of the patch was never tested. Appended patch return STATUS_NOT_SUPPORTED for that code clause and should make the code compile again. Gerald, can you perhaps have a look at the implementation of the BSD parts? libdvdcss should have all the needed calls somewhere. Bye -- 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/ntdll/cdrom.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/cdrom.c,v retrieving revision 1.46 diff -u -w -r1.46 cdrom.c --- wine/dlls/ntdll/cdrom.c 15 Jun 2004 00:45:01 -0000 1.46 +++ wine/dlls/ntdll/cdrom.c 16 Jun 2004 15:11:00 -0000 @@ -1736,7 +1736,8 @@ TRACE("\n"); return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); #elif defined(__FreeBSD__) || defined(__NetBSD__) - return CDROM_GetStatusCode(ioctl(cdrom_cache[dev].fd, (rmv->PreventMediaRemoval) ? CDIOCPREVENT : CDIOCALLOW, NULL)); + TRACE("bsd\n"); + return STATUS_NOT_SUPPORTED; #else return STATUS_NOT_SUPPORTED; #endif

1 0

Re: WineHQ-hosted projects?
by chmorgan＠charter.net 16 Jun '04

16 Jun '04

No need to fork winehq to support such things. Imaging having to keep up with all of the patches applied to the mainline code? It's probably better just to fix things that break those apps in the winehq tree so every other app gets the benifit. Chris > > From: Joel Konkle-Parker <jjk3(a)msstate.edu> > Date: 2004/06/16 Wed AM 07:09:28 EDT > To: wine-devel(a)winehq.com > Subject: WineHQ-hosted projects? > > I'd like to start up a WINE-based project to further development for a > specific app. (e.g. The WINE-Star Wars Galaxies Project, or The > WINE-Internet Explorer Project). Does WineHQ have a place to host such > things (with their own sites, etc.), or should I turn to SourceForge? > > > -- > Joel Konkle-Parker > Webmaster [Ballsome.com] > > E-mail [jjk3(a)msstate.edu] > > >

1 0

Notification
by Twickline 16 Jun '04

16 Jun '04

1 0

Fax Message Received
by Twickline 16 Jun '04

16 Jun '04

1 0

Debugger spews elf_new_wine_thunks fixmes
by Mike Hearn 16 Jun '04

16 Jun '04

Hi Eric, I get a lot of messages like this since the new debugger shuffle patch landed: fixme:dbghelp:elf_new_wine_thunks Duplicate in kernel32<elf>: audiocdW.6<40515de8-00000012> audiocdW<40515de8-00000000> For now I just changed the fixme to a warn in my local tree - what does this message mean though? It makes it much harder to use the debugger currently. thanks -mike

4 4

WineHQ-hosted projects?
by Joel Konkle-Parker 16 Jun '04

16 Jun '04

I'd like to start up a WINE-based project to further development for a specific app. (e.g. The WINE-Star Wars Galaxies Project, or The WINE-Internet Explorer Project). Does WineHQ have a place to host such things (with their own sites, etc.), or should I turn to SourceForge? -- Joel Konkle-Parker Webmaster [Ballsome.com] E-mail [jjk3(a)msstate.edu]

1 0

assertion "view->next->flags & VFLAG_SYSTEM" failed: file "virtual.c", line 330
by jordan lougheed 16 Jun '04

16 Jun '04

WINE BUILD: /wine-20040505 I need Internet Explorer on my workstation (openbsd 3.4) at work, so I decided to see if I could get the lastest wine to compile/run. I'll list the steps required to get it to build and install. `sh configure` complained about 'libGL.a' so i renamed it and the configure completed successfully. `make` ./loader/kthread.c: line 276 complained about an unknown flag `RFTHREAD` so i erased that flag from the code, and the build continued. (openbsd's rfork doesn't support that flag, side effects are unknown) `make install` wouldn't complete. I had to `gmake install`. worked fine. everything is built and installed, now here is my problem. $ wine notepad.exe wine:/usr/local/lib/wine/ntdll.dll.so: undefined symbol 'DllMain' wine: /usr/local/lib/wine/ntdll.dll.so: can't resolve reference 'DllMain' fixme:ntdll:NtQueryVolumeInformationFile device info not properly supported on this platform fixme:file:get_default_drive_device auto detection of DOS devices not supported on this platform assertion "view->next->flags & VFLAG_SYSTEM" failed: file "virtual.c", line 330 the "fixme:" problems seem to be common with FreeBSD, so i figure i can ignore them. I always seems to hit that assertion on no matter what i run. The first time i ran this "PokerStarsInstall.exe" it ran fine and gave me the install menu after configuring the "font cache". The second time it gave me this usual assertion. If someone can confirm/deny that this is related the that FLAG i erased from kthread.c (i don't think these are related). Or is there something else going on here? If anyone can offer any help it would be appreciated. I'm going to compile with -DNDEBUG tommorow and see what happends, until then i'll let you guys stew on this. Thank you in advance, JordanL

1 0

3GB address space
by Shachar Shemesh 15 Jun '04

15 Jun '04

Hi all, Is there a way to run processes intended for a 3GB user addressable memory to work under Wine? I'm talking here, of course, assuming that the Linux kernel is compiled with the relevant big memory support. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

4 11

Re: GetAcceptLanguages A->W [2nd][resend]
by Alexandre Julliard 15 Jun '04

15 Jun '04

Stefan Leichter <Stefan.Leichter(a)camLine.com> writes: > Hello, > > anything wrong with this patch? The last error handling is very suspicious, I doubt the function sets ERROR_FILE_NOT_FOUND on a null buffer. I think it's because your test is broken, you need to clear last error before every call if you want to be able to test it afterwards otherwise you just get leftovers from a previous call. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winetest: move to resources (take n+1)
by Alexandre Julliard 15 Jun '04

15 Jun '04

Ferenc Wagner <wferi(a)afavant.elte.hu> writes: > Alexandre Julliard <julliard(a)winehq.org> writes: > >> Also I think it would be cleaner to use a different rc >> file for the dist case instead of using #ifdefs. > > I agree. The problem is the single-rc-file limitation, > which would require some code duplication. That's why I > went for the #ifdefs. Please come back at me if you still > have strong feelings about this. What you can do is have a dist.rc file that defines the extra values and then #includes the normal .rc file. This way there is no duplication and no problems with multiple rc files. The only thing is that the code should behave gracefully when the extra resources are missing, but that would be a good thing to do anyway. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [WineHQ] service.cgi fixes
by Paul Millar 15 Jun '04

15 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi Dimi, Why remove the verification of the code's gpg signature? It seems to break a basic security maxim: don't trust the network. On Thursday 10 June 2004 22:48, Dimitrie O. Paun wrote: > ChangeLog > Do not include irrelevant stuff in the _history. > Do not instruct the client to verify the .sig, > it's a b0rken idea anyway. - -- Paul Millar -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFAybhq/9JwS78PA+kRAuv/AJ9Ulntb1MLGn+2gp8r/qpy6VqJDVACePwVB VXxAHr9gaBuMhIJ7P81ahMA= =0tkh -----END PGP SIGNATURE-----

3 5

Latest iteration of the systray patch
by Mike Hearn 15 Jun '04

15 Jun '04

This version is resynced against CVS HEAD, and now does a ShowWindow in the right place (just after the embed notification not in some random WM message). This won't be merged so I'm sending it to wine-devel not wine-patches. Getting it merged is blocking on either somebody giving me example code for [un]marshaling an HICON into a block of memory or (best fix) images being moved into the wineserver. This is on Ulrichs todo list but if anybody wants to beat him to it, go ahead, it's still some time off yet. thanks -mike

1 0

Re: Incoming Message
by Twickline 15 Jun '04

15 Jun '04

1 0

(no subject)
by Gerald Pfeifer 15 Jun '04

15 Jun '04

The following patch to dlls/shell32/shlexec.c revision 1.50 date: 2004/06/15 00:44:14; author: julliard; state: Exp; lines: +11 -3 Dmitry Timoshkov <dmitry(a)codeweavers.com> Restore default "open" functionality of ShellExecute. introduced the following warning regressions: shlexec.c:722: warning: format argument is not a pointer (arg 11) shlexec.c:722: warning: format argument is not a pointer (arg 12) Would you mind fixing this? Gerald -- Gerald Pfeifer (Jerry) gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

1 0

Re: Incoming Message
by Twickline 15 Jun '04

15 Jun '04

1 0

Re: Yahoo!
by Johane 15 Jun '04

15 Jun '04

1 0

Do we still need wineinstall?
by Mike Hearn 15 Jun '04

15 Jun '04

Hi, I've been running without a config file for a while now, and have fixed various misc bugs related to that as I go - I'm sure there are some more in there, but as the config file is destined for eventual doom anyway I am wondering if we still need wineinstall at all? Currently, it's possible to use Wine quite succesfully just by doing a standard ./configure, make, make install. When you run wine for the first time wineprefixcreate will be used to setup ~/.wine, merge the registry, create the fake windows drive and so on. The only piece you don't get is the default config file, but that doesn't seem to make much difference any more. At least, the defaults should be in the code not the config file as people never upgrade that bit anyway :) So - do we still need it?

2 1

Re: winetest: move to resources (take n) (resend)
by Alexandre Julliard 14 Jun '04

14 Jun '04

Ferenc Wagner <wferi(a)afavant.elte.hu> writes: > This is a resend to elicit some feedback on your objections > against this patch. What did I miss again? It's much better this time. The only thing I would suggest changing is that the build info text formatting should be done in the code, not in the makefile. Also I think it would be cleaner to use a different rc file for the dist case instead of using #ifdefs. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Create DIALOGINFO On Demand When Calling DIALOG_get_info
by Alexandre Julliard 14 Jun '04

14 Jun '04

Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > This patch fixes bug 2210: > http://bugs.winehq.org/show_bug.cgi?id=2210 > This patch differs slightly from the one posted to wine-devel, as it > includes some checks for NULL return from DIALOG_get_info. I don't think you want to create the dialog info in all cases, this should only be done where we are sure we have a dialog window. For instance you don't want MapDialogRect to add dialog info to arbitrary windows just because it got passed a wrong handle. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wine/include ddeml.h
by andrejoh＠c2i.net 14 Jun '04

14 Jun '04

* Alexandre Julliard (Mon, 14 Jun 2004 11:58:02 -0500) wrote: | Dmitry Timoshkov <dmitry(a)codeweavers.com> | Fix CBR_BLOCK definition. | | Patch: http://cvs.winehq.org/patch.py?id=12591 | | Old revision New revision Changes Path | 1.29 1.30 +1 -1 wine/include/ddeml.h This one causes a compile failure: dde/server.c: In function `WDML_ServerHandleRequest': dde/server.c:580: error: pointers are not permitted as case values switch ((ULONG_PTR)hDdeData) [...] case CBR_BLOCK: The patch below fixes it by casting to an ULONG_PTR, which is what the switch variable is casted to. Index: dlls/user/dde/server.c =================================================================== RCS file: /home/wine/wine/dlls/user/dde/server.c,v retrieving revision 1.16 diff -u -w -p -r1.16 server.c --- dlls/user/dde/server.c 26 Apr 2004 23:29:44 -0000 1.16 +++ dlls/user/dde/server.c 14 Jun 2004 19:18:52 -0000 @@ -577,7 +577,7 @@ static WDML_QUEUE_STATE WDML_ServerHandl WDML_PostAck(pConv, WDML_SERVER_SIDE, 0, FALSE, FALSE, pXAct->atom, pXAct->lParam, WM_DDE_REQUEST); break; - case CBR_BLOCK: + case (ULONG_PTR)CBR_BLOCK: ret = WDML_QS_BLOCK; break; default: -- Try Anarchy Online http://www.anarchy-online.com/content/downloads/tryout/ Netiquette guidelines ftp://ftp.rfc-editor.org/in-notes/rfc1855.txt How to quote properly http://www.i-hate-computers.demon.co.uk/ Hvordan sitere riktig http://home.online.no/~vidaandr/news/OBSquoting.html

1 0

Re: wine/dlls/user/dde client.c
by Ivan 14 Jun '04

14 Jun '04

This patch http://www.winehq.com/hypermail/wine-cvs/2004/06/0085.html breaks the build on Mandrake 10.0 using gcc 3.3.2 and make 3.8, with the following error: dde/server.c: In function `WDML_ServerHandleRequest': dde/server.c:580: error: pointers are not permitted as case values make[2]: *** [dde/server.o] Error 1 make[2]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/wine/dlls/user' make[1]: *** [user] Error 2 make[1]: Leaving directory `/home/ivan/Development/Wine/CVS/wine/wine/dlls' make: *** [dlls] Error 2 Ivan.

1 0

Re: revised winmm GetDevCaps better pointer check patch
by Alexandre Julliard 14 Jun '04

14 Jun '04

Robert Reif <reif(a)earthlink.net> writes: > +/* Use the first version for strict compatibility with Microsoft */ > +/* #define WINMM_IsBadWritePtr(x,y) IsBadWritePtr((x), (y)) */ > +#define WINMM_IsBadWritePtr(x,y) ((x)==NULL) This is very confusing, if we don't check the pointer we shouldn't have a macro that looks like we do. The proper way is to add exception handlers in functions where an app explicitly relies on the pointer check, and not add checks otherwise; using the IsBad*Ptr functions is always wrong since they are not thread-safe. -- Alexandre Julliard julliard(a)winehq.org

1 0

General serial communications issues
by David Purucker 14 Jun '04

14 Jun '04

Hello, I have tried several terminal programs (Hyperterm and TeraTerm) under several builds of Wine including Wine-20040505 and they seem to have the same generic problem. They all exhibit the same situation, DATA seems to go OUT, but never seems to come IN. Several other people have experienced the same thing, as seen in this bug report: http://bugs.winehq.org/show_bug.cgi?id=2115 By the way, TeraTerm does work fine in TCP/IP mode, so it's definitely a serial problem. It's freeware available here: http://hp.vector.co.jp/authors/VA002416/teraterm.html It appears to be a fundamental problem in the serial/file code, which I understand is now under the ntdll tree. Obviously, I don't know much about it, but there is definitely something wrong. I was wondering if any developers were aware of this problem, as the decreased general usage of serial communications may have caused this to slip under the carpet, so to speak. I look forward to hearing any ideas, work-arounds, or patches. Thanks _________________________________________________________________ Stop worrying about overloading your inbox - get MSN Hotmail Extra Storage! http://join.msn.click-url.com/go/onm00200362ave/direct/01/

7 20

Re: Fix 3 bugs in locale handling
by Alexandre Julliard 14 Jun '04

14 Jun '04

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > 1. If the locale has changed current code never refreshes win.ini > and registry values due to the following test done in GetLocaleInfoW: > > /* first check for overrides in the registry */ > > if (!(lcflags & LOCALE_NOUSEROVERRIDE) && lcid == GetUserDefaultLCID()) > { > > lcid is always pointing to current user locale returned by GetUserDefaultLCID() > and therefore cached (old) values get returned. > > I modified code to get data directly from kernel resources in that case. It seems to me that this is what we are doing already since we pass LOCALE_NOUSEROVERRIDE in that case, I don't see how your patch would make any difference (and win.ini definitely gets refreshed with the current code). Could you please give more details on the problem you are seeing? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: SHELL32:RunFileDlg
by Alexandre Julliard 14 Jun '04

14 Jun '04

Filip Navara <xnavara(a)volny.cz> writes: > + if (!(hRes = FindResourceW(shell32_hInstance, L"SHELL_RUN_DLG", (LPWSTR)RT_DIALOG))) You cannot use wide char string constants in Wine. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Fix Private Profile Functions for .INI in Current Directory
by Alexandre Julliard 14 Jun '04

14 Jun '04

Robert Shearman <R.J.Shearman(a)warwick.ac.uk> writes: > As per MSDN (1), if a relative path to a file is passed in to the > {Get,Write}PrivateProfile* functions then the current directory is tried > first, and then if that fails the Windows directory is used (for both > the opening and creating cases). I don't see any evidence that this is true, and MSDN says "If the lpFileName parameter does not contain a full path and file name for the file, WritePrivateProfileString searches the Windows directory for the file". Do you have a test case showing that the current behavior is wrong? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Do we still need wineinstall?
by Ivan 14 Jun '04

14 Jun '04

> So - do we still need it? Can we use the registry (BTW then will winecfg be working?) to set up all the stuff we can do in the config file? Stuff such as winver, UseDGA, UseXVidMode, Managed or desktop more, and DllOverrides? If we can, IMHO wineinstall can go. Ivan.

1 0

text input focus problem
by Richard Gobeille 14 Jun '04

14 Jun '04

Recently I upgraded a piece of software on my system called Synergy. This software allows one keyboard and mouse to control input on two or more machines via a network connection -- not dissimilar to VNC, except that only the keyboard and mouse input is forwarded, nothing with video, et cetera, and that it lets you mouse back and forth as if you were using a dualhead configuration on one box. Anyhow, the problem is as follows: when using Synergy, I'm no longer able to use text input in wine at all. This applies to both winehq and crossover, winex appears to be unaffected. Originally, I thought this was a problem with Synergy itself, but upon asking the developer about it, I received notification that it was an X11 bug that wine wasn't working around. The technical details are as follows: "the X11 bug is subtle: if client A creates two windows X and Y where Y is a child of X and selects for key events on window X, it expects to receive key events that occur in either X or Y (the events in Y propagate up to the nearest ancestor that has selected for the event). if another client B (synergy) comes along and selects for key events in Y then not only will B receive key events from Y (as expected) but key events in A will no longer propagate from Y to X and A won't see the events. that is, when B selects for events on window Y it changes the behavior of client A. this is just wrong." One of the guys in #winehq on freenode (TD) said to send this to wine-devel, so here it is. I'm not sure if any more information is required. The site for Synergy is http://synergy2.sourceforge.net. Any 1.1.x release should demonstrate the problem for you. I'm hopeful that this will be an easy problem to work around as winex is working around it, but I'm not sure how similar or dissimilar the trees are in this area. -- *Richard Gobeille* Chief Technical Officer Envision7, LLC Internet Services http://www.envision7.com rich(a)envision7.com

1 0

Re: Yahoo!
by Johane 14 Jun '04

14 Jun '04

1 0

Forum notify
by Johane 14 Jun '04

14 Jun '04

1 0

Re: Yahoo!
by Twickline 14 Jun '04

14 Jun '04

1 0

Versioning and internal APIs
by Mike Hearn 13 Jun '04

13 Jun '04

Hi Alexandre, Paul Davis of Ardour has raised a good point: currently despite the fact that the symbols in libwine are versioned, we change them at will and don't change the symbol version, for instance in the patch that made environ passed through to wine_init from main to hack around the general suckage of MacOS X. Unless this versioning system is meant to be dormant until Wine 1.0 is out (and we should definitely document this if so), perhaps we should be changing the symbol versions? Also, there is no easy way to find out the version of Wine you got from dlopen at runtime. Should we export a wine_version symbol? Finally, apparently Paul has had to duplicate a fair amount of Wine code inside his libfst (library for loading Cubase VST plugins) because the relevant functions are declared static in Wine. Paul, could you post a list of exactly what you use? It might be worth extending and starting to freeze some of these semi-internal interfaces. thanks -mike

3 5

[MSVCRT] Separate internal definitions from the public headers
by Dimitrie O. Paun 13 Jun '04

13 Jun '04

Hi Alexandre, Welcome back! I did this last Friday, but I didn't want to continue before running it by you. I'm sending here just the first cut of the definitions I needed to duplicate in msvcrt.h, to compile the entire msvcrt DLL without the MSVCRT() define in the public headers. Looking at the changes it seems to me: 1. There aren't that many 2. We can easily add a test file to check for consistency with the public headers (ideally, this file would be automatically generated by a script) 3. We should be able to actually drop some of them, this is just the first cut, and I've tried to keep the number of changes to the source code to a minimum. Should I carry on? -- Dimi. Index: dlls/msvcrt/msvcrt.h =================================================================== RCS file: /var/cvs/wine/dlls/msvcrt/msvcrt.h,v retrieving revision 1.25 diff -u -r1.25 msvcrt.h --- dlls/msvcrt/msvcrt.h 16 Mar 2004 19:17:11 -0000 1.25 +++ dlls/msvcrt/msvcrt.h 4 Jun 2004 23:05:05 -0000 @@ -28,8 +28,27 @@ #include "winerror.h" #include "winnls.h" -#include "msvcrt/string.h" -#include "msvcrt/eh.h" +typedef unsigned short MSVCRT_wchar_t; +typedef unsigned short MSVCRT_wint_t; +typedef unsigned short MSVCRT_wctype_t; +typedef unsigned short MSVCRT__ino_t; +typedef unsigned long MSVCRT__fsize_t; +typedef unsigned int MSVCRT_size_t; +typedef unsigned int MSVCRT__dev_t; +typedef int MSVCRT__off_t; +typedef long MSVCRT_clock_t; +typedef long MSVCRT_time_t; +typedef long MSVCRT_fpos_t; + +typedef void (*terminate_handler)(); +typedef void (*terminate_function)(); +typedef void (*unexpected_handler)(); +typedef void (*unexpected_function)(); +typedef void (*_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); +typedef void (*_beginthread_start_routine_t)(void *); +typedef unsigned int (__stdcall *_beginthreadex_start_routine_t)(void *); +typedef int (*MSVCRT__onexit_t)(void); + /* TLS data */ extern DWORD MSVCRT_tls_index; @@ -123,4 +142,363 @@ #define _RT_CRNL 252 #define _RT_BANNER 255 +struct MSVCRT_tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + +struct _timeb +{ + MSVCRT_time_t time; + unsigned short millitm; + short timezone; + short dstflag; +}; + +typedef struct MSVCRT_iobuf +{ + char* _ptr; + int _cnt; + char* _base; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; +} MSVCRT_FILE; + +struct MSVCRT_lconv +{ + char* decimal_point; + char* thousands_sep; + char* grouping; + char* int_curr_symbol; + char* currency_symbol; + char* mon_decimal_point; + char* mon_thousands_sep; + char* mon_grouping; + char* positive_sign; + char* negative_sign; + char int_frac_digits; + char frac_digits; + char p_cs_precedes; + char p_sep_by_space; + char n_cs_precedes; + char n_sep_by_space; + char p_sign_posn; + char n_sign_posn; +}; + +struct MSVCRT__exception +{ + int type; + char *name; + double arg1; + double arg2; + double retval; +}; + +struct MSVCRT__complex +{ + double x; /* Real part */ + double y; /* Imaginary part */ +}; + +typedef struct _heapinfo +{ + int* _pentry; + MSVCRT_size_t _size; + int _useflag; +} _HEAPINFO; + +#ifdef __i386__ +typedef struct __JUMP_BUFFER +{ + unsigned long Ebp; + unsigned long Ebx; + unsigned long Edi; + unsigned long Esi; + unsigned long Esp; + unsigned long Eip; + unsigned long Registration; + unsigned long TryLevel; + /* Start of new struct members */ + unsigned long Cookie; + unsigned long UnwindFunc; + unsigned long UnwindData[6]; +} _JUMP_BUFFER; +#endif /* __i386__ */ + +struct MSVCRT__diskfree_t { + unsigned int total_clusters; + unsigned int avail_clusters; + unsigned int sectors_per_cluster; + unsigned int bytes_per_sector; +}; + +struct MSVCRT__finddata_t +{ + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + MSVCRT__fsize_t size; + char name[260]; +}; + +struct MSVCRT__finddatai64_t +{ + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + __int64 size; + char name[260]; +}; + +struct MSVCRT__wfinddata_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + MSVCRT__fsize_t size; + MSVCRT_wchar_t name[260]; +}; + +struct MSVCRT__wfinddatai64_t { + unsigned attrib; + MSVCRT_time_t time_create; + MSVCRT_time_t time_access; + MSVCRT_time_t time_write; + __int64 size; + MSVCRT_wchar_t name[260]; +}; + +struct _utimbuf +{ + MSVCRT_time_t actime; + MSVCRT_time_t modtime; +}; + +/* for FreeBSD */ +#undef st_atime +#undef st_ctime +#undef st_mtime + +struct MSVCRT__stat { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + MSVCRT__off_t st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +struct MSVCRT_stat { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + MSVCRT__off_t st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +struct MSVCRT__stati64 { + MSVCRT__dev_t st_dev; + MSVCRT__ino_t st_ino; + unsigned short st_mode; + short st_nlink; + short st_uid; + short st_gid; + MSVCRT__dev_t st_rdev; + __int64 st_size; + MSVCRT_time_t st_atime; + MSVCRT_time_t st_mtime; + MSVCRT_time_t st_ctime; +}; + +#define MSVCRT_WEOF (MSVCRT_wint_t)(0xFFFF) +#define MSVCRT_EOF (-1) +#define MSVCRT_TMP_MAX 0x7fff +#define MSVCRT_BUFSIZ 512 + +#define MSVCRT_STDIN_FILENO 0 +#define MSVCRT_STDOUT_FILENO 1 +#define MSVCRT_STDERR_FILENO 2 + +/* more file._flag flags, but these conflict with Unix */ +#define MSVCRT__IOFBF 0x0000 +#define MSVCRT__IONBF 0x0004 +#define MSVCRT__IOLBF 0x0040 + +#define MSVCRT_FILENAME_MAX 260 +#define MSVCRT_stdin (MSVCRT__iob+MSVCRT_STDIN_FILENO) +#define MSVCRT_stdout (MSVCRT__iob+MSVCRT_STDOUT_FILENO) +#define MSVCRT_stderr (MSVCRT__iob+MSVCRT_STDERR_FILENO) + +#define _P_WAIT 0 +#define _P_NOWAIT 1 +#define _P_OVERLAY 2 +#define _P_NOWAITO 3 +#define _P_DETACH 4 + +#define MSVCRT_EPERM 1 +#define MSVCRT_ENOENT 2 +#define MSVCRT_ESRCH 3 +#define MSVCRT_EINTR 4 +#define MSVCRT_EIO 5 +#define MSVCRT_ENXIO 6 +#define MSVCRT_E2BIG 7 +#define MSVCRT_ENOEXEC 8 +#define MSVCRT_EBADF 9 +#define MSVCRT_ECHILD 10 +#define MSVCRT_EAGAIN 11 +#define MSVCRT_ENOMEM 12 +#define MSVCRT_EACCES 13 +#define MSVCRT_EFAULT 14 +#define MSVCRT_EBUSY 16 +#define MSVCRT_EEXIST 17 +#define MSVCRT_EXDEV 18 +#define MSVCRT_ENODEV 19 +#define MSVCRT_ENOTDIR 20 +#define MSVCRT_EISDIR 21 +#define MSVCRT_EINVAL 22 +#define MSVCRT_ENFILE 23 +#define MSVCRT_EMFILE 24 +#define MSVCRT_ENOTTY 25 +#define MSVCRT_EFBIG 27 +#define MSVCRT_ENOSPC 28 +#define MSVCRT_ESPIPE 29 +#define MSVCRT_EROFS 30 +#define MSVCRT_EMLINK 31 +#define MSVCRT_EPIPE 32 +#define MSVCRT_EDOM 33 +#define MSVCRT_ERANGE 34 +#define MSVCRT_EDEADLK 36 +#define MSVCRT_EDEADLOCK MSVCRT_EDEADLK +#define MSVCRT_ENAMETOOLONG 38 +#define MSVCRT_ENOLCK 39 +#define MSVCRT_ENOSYS 40 +#define MSVCRT_ENOTEMPTY 41 + +#define MSVCRT_LC_ALL 0 +#define MSVCRT_LC_COLLATE 1 +#define MSVCRT_LC_CTYPE 2 +#define MSVCRT_LC_MONETARY 3 +#define MSVCRT_LC_NUMERIC 4 +#define MSVCRT_LC_TIME 5 +#define MSVCRT_LC_MIN MSVCRT_LC_ALL +#define MSVCRT_LC_MAX MSVCRT_LC_TIME + +#define _HEAPEMPTY -1 +#define _HEAPOK -2 +#define _HEAPBADBEGIN -3 +#define _HEAPBADNODE -4 +#define _HEAPEND -5 +#define _HEAPBADPTR -6 + +#define _FREEENTRY 0 +#define _USEDENTRY 1 + +#define _OUT_TO_DEFAULT 0 +#define _REPORT_ERRMODE 3 + +/* ASCII char classification table - binary compatible */ +#define _UPPER 0x0001 /* C1_UPPER */ +#define _LOWER 0x0002 /* C1_LOWER */ +#define _DIGIT 0x0004 /* C1_DIGIT */ +#define _SPACE 0x0008 /* C1_SPACE */ +#define _PUNCT 0x0010 /* C1_PUNCT */ +#define _CONTROL 0x0020 /* C1_CNTRL */ +#define _BLANK 0x0040 /* C1_BLANK */ +#define _HEX 0x0080 /* C1_XDIGIT */ +#define _LEADBYTE 0x8000 +#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ + +#define MSVCRT__IOREAD 0x0001 +#define MSVCRT__IOWRT 0x0002 +#define MSVCRT__IOMYBUF 0x0008 +#define MSVCRT__IOEOF 0x0010 +#define MSVCRT__IOERR 0x0020 +#define MSVCRT__IOSTRG 0x0040 +#define MSVCRT__IORW 0x0080 + +#define _S_IEXEC 0x0040 +#define _S_IWRITE 0x0080 +#define _S_IREAD 0x0100 +#define _S_IFIFO 0x1000 +#define _S_IFCHR 0x2000 +#define _S_IFDIR 0x4000 +#define _S_IFREG 0x8000 +#define _S_IFMT 0xF000 + +void MSVCRT_free(void*); +void* MSVCRT_malloc(MSVCRT_size_t); +void* MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); +void* MSVCRT_realloc(void*,MSVCRT_size_t); + +int MSVCRT_iswalpha(MSVCRT_wint_t); +int MSVCRT_iswspace(MSVCRT_wint_t); +int MSVCRT_iswdigit(MSVCRT_wint_t); +int MSVCRT_isleadbyte(int); + +int MSVCRT_fgetc(MSVCRT_FILE*); +int MSVCRT_ungetc(int,MSVCRT_FILE*); +MSVCRT_wint_t MSVCRT_fgetwc(MSVCRT_FILE*); +MSVCRT_wint_t MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); +void MSVCRT__exit(int); +void MSVCRT_abort(); +unsigned long* MSVCRT___doserrno(void); +int* MSVCRT__errno(void); +char* MSVCRT_getenv(const char*); +char* MSVCRT_setlocale(int,const char*); +int MSVCRT_fclose(MSVCRT_FILE*); +void MSVCRT_terminate(); +MSVCRT_FILE* MSVCRT__p__iob(void); +MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*); + +MSVCRT_wchar_t* _wcsdup(const MSVCRT_wchar_t*); +MSVCRT_wchar_t*** __p__wenviron(void); + +int _write(int,const void*,unsigned int); +int _vsnwprintf(MSVCRT_wchar_t*,MSVCRT_size_t,const MSVCRT_wchar_t*,va_list); +void _splitpath(const char*,char*,char*,char*,char*); +int _ismbstrail(const unsigned char* start, const unsigned char* str); +int _spawnve(int,const char*,const char* const *,const char* const *); +void _searchenv(const char*,const char*,char*); +void _sleep(unsigned long); +int _getdrive(void); +int _futime(int,struct _utimbuf*); +char* _strdup(const char*); +char* _strlwr(char*); +char* _strupr(char*); +char* _strnset(char*,int,MSVCRT_size_t); +char* _strset(char*,int); +int _getch(void); +int _ungetch(int); +int _cputs(const char*); +int _cprintf(const char*,...); +int _snprintf(char*,MSVCRT_size_t,const char*,...); + +char*** __p__environ(void); +int* __p___mb_cur_max(void); +unsigned int* __p__fmode(void); + #endif /* __WINE_MSVCRT_H */

2 1

Re: FindClose crash fix.
by Mike Hearn 13 Jun '04

13 Jun '04

On Sat, 2004-06-12 at 20:34 +0200, Rein Klazes wrote: > BTW. I thought Crossover Office supports this application? It does (well, not the NL version specifically ...) so I checked and the CrossOver version of FindClose is the same as the WineHQ version. I seem to recall some talk of double closing find handles, but I guess either we have a hack elsewhere, or for some reason the bug doesn't appear in the builds we support? thanks -mike

2 1

Windows are unmaxmized when closing other window
by Gerhard W. Gruber 13 Jun '04

13 Jun '04

Some time ago I noticed a strange behviour in Agent. When the windows are maxmized and you close any other window (doesn't matter if it is a dialog or any other normal window) the remaining windows are unmaximized. They arr not minimized, but they are getting smaller. Don't know if this is the same for all types but it seems at least for multiple document windows it is true. I just downloaded the current CVS version and there this behaviour is also. -- Gerhard Gruber Maintainer of SoftICE for Linux - http://pice.sourceforge.net/ Fast application launcher - http://sourceforge.net/projects/launchmenu

3 3

[REGRESSION] Photoshop 7.0 works before wine-cvs-20040130 16:??:?? CST (bug #2017)
by Luca Capello 13 Jun '04

13 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, as reported on bug #2017 [1], Adobe Photoshop 7.0 stops working after wine-20031212 (in the majority of cases). This happens on Debian unstable (where I am) as well as on other distro. As suggested by Tony Lambregts, I made a regression testing to find the patch that broke this. The problem is between cvs-20040130-165720 and cvs-20040130-165721. The 'cvs -d ...' command gives me updates for only 3 files: ===== U dlls/kernel/Makefile.in U dlls/kernel/actctx.c U dlls/kernel/kernel32.spec ===== so I think the problem should be in these files, am I right? If it's so, well, the patch that broke Photoshop 7.0 working is the following [2] - - Jon Griffiths <jon_p_griffiths(a)yahoo.com> Add stubs for the Activation Context API (XP+). Please fix this problem, now that you know the cause. Thx, bye, Gismo / Luca [1] http://bugs.winehq.org/show_bug.cgi?id=2017 [2] http://www.winehq.org/hypermail/wine-cvs/2004/01/0394.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFAu1FuVAp7Xm10JmkRAgWIAJ90THCdqfIu6/uLGyurqrLfNNWEkACeIAze ALi4ZeOtMTEEDp8ETWu4G4c= =/pZb -----END PGP SIGNATURE-----

6 25

A bug in symbol loading in winedbg
by Shachar Shemesh 13 Jun '04

13 Jun '04

Hi all, Bug Report: If winedbg is asked to load an external PDB file, and that file does not match the executable being run, the debugger does not warn about it. Instead, bad things (tm) happen when actually trying to run the executable. Shachar

2 8

Re: Implement a --backtrace-all mode for winedbg
by Eric Pouech 12 Jun '04

12 Jun '04

I'm not sure I understand the purpose of the --backtrace-all. There's no way you can ensure a complete synchro between all threads & processes to get a global picture of the whole system, so the option is likely not very useful (except for the threads which are in a wait operation), but you will miss some other information for that (ie an event (entering/leaving CS...) tracker tool would be better). More over, I don't like either adding options to winedbg. So, I'd prefer adding an option to actually process the commands from a file (or even a string from command line) would be better. And, finally, you leak the handle for the snapshot. A+

3 4

Re: [USER] 'Fix' SetWindowsHookEx
by Shachar Shemesh 12 Jun '04

12 Jun '04

Lionel Ulmer wrote: >I have no idea if it's correct >though (as I do not know if what GetModuleHandle returns is really the same >thing as what SetWindowsHookEx expects as an HINSTANCE input). > > Yes, it is. It's just used to grab the procedure address to call when the hook is activated. >Index: dlls/user/hook.c >=================================================================== >RCS file: /home/wine/wine/dlls/user/hook.c,v >retrieving revision 1.12 >diff -u -r1.12 hook.c >--- dlls/user/hook.c 19 May 2004 03:22:55 -0000 1.12 >+++ dlls/user/hook.c 12 Jun 2004 15:27:01 -0000 >@@ -141,11 +141,15 @@ > else /* system-global hook */ > { > if (id == WH_KEYBOARD_LL || id == WH_MOUSE_LL) inst = 0; >- else if (!inst || !(len = GetModuleFileNameW( inst, module, MAX_PATH )) || len >= MAX_PATH) >- { >- SetLastError( ERROR_INVALID_PARAMETER ); >- return 0; >- } > > If you just remove the "!inst" test, does the game work? I think that would be simpler. Shachar -- Shachar Shemesh Lingnu Open Source Consulting ltd. http://www.lingnu.com/

1 0

Re: Investigating a crash at startup
by Filip Navara 12 Jun '04

12 Jun '04

1 0

wingcc and -Wb option
by Jon Griffiths 12 Jun '04

12 Jun '04

Hi, The -Wb argument to winegcc currently expects a comma separated list of arguments which it then splits up and passes to winebuild. This conflicts with the --ignore=x,y,z syntax of winebuilds ignore argument, since it also uses a comma to delimit the list to ignore. The easiest way to fix this is to change the delimiting character in either option, i.e.: winebuild: --ignore=x,y,z => --ignore=x;y;z winegcc: -Wb,--ignore=x,y,z,<opts> => -Wb;--ignore=x,y,z;<opts> Does anyone care which one it is? Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________ Do you Yahoo!? Friends. Fun. Try the all-new Yahoo! Messenger. http://messenger.yahoo.com/

2 2

(Still) problem on AMD64 with wine CVS
by Maurizio Monge 12 Jun '04

12 Jun '04

Hello, i have retried to compile wine CVS on amd64 (gcc 3.4 with -m32, etc + kernel 2.6.4-rc2), where i was thinking the 0xc0000000 problem was solved. but i get: wine: failed to initialize: /opt/wine/lib/wine/ntdll.dll.so: failed to map segment from shared object: Cannot allocate memory attach to this mail the output of "strace32 wine" one of the last lines is (i have 512Mb of ram) old_mmap(NULL, 482376, PROT_READ|PROT_EXEC, MAP_PRIVATE, 3, 0) = -1 ENOMEM (Cannot allocate memory) It looks like my kernel absolutly wants to allocate memory > 0xc0000000 :-) Any idea? Thanx Maurizio Please CC answers to monge(at)sns(dot)it, since i'm not subscribed.

4 5

Game Testing Update - 20040505
by Mike Kost 12 Jun '04

12 Jun '04

Here a continuation of my game testing efforts. Same rules still apply in my efforts: All games tested are freely available as demos or F/OSS games on the Internet and they don't work right. I know 20040505 is showing its age, but there isn't a 200406xx yet. Since my last report: - Bugzlla bugs #2128 & #2129 have closed. The problems were self-correcting - 2 More Bugs Filed - - #2276 - Screen refresh/redraw errors in Austerlitz demo - - #2277 - Redraw/refresh errors for Remote Assault demo - Stopped testing The War Engine. I don't want to juggle more than 4 programs at a time and I want to pick up Galactic Civilization. Austerlitz Summary ------------------ Bug #2276 is newly filed and the unhandled exception error is no longer present. There is still a screen redraw error Full report: http://www.tashcorp.net/Wine/Austerlitz/austerlitz-20040505.html Dominions II ------------ No noticable change. Dominions II still has screen redraw errors and mouse errors. Full report: http://www.tashcorp.net/Wine/DominionsII/dominionsII-20040505.html Remote Assault -------------- Remote Assault has started running but has several refresh/redraw errors. There are several new 'err:ddraw' messages: err:ddraw:set_render_state Unhandled dwRenderStateType ... and err:ddraw:Main_DirectDrawSurface_Lock Invalid values in LPRECT !!! Full report: http://www.tashcorp.net/Wine/RemoteAssault/remoteassault-20040505.html

1 0

Winrash update
by Chris Morgan 11 Jun '04

11 Jun '04

Just released a new version of winrash. I'm sending this email because after asking people who are running Winrash to send an email to the list or myself , I didn't receive any emails. This isn't usually a problem except when there is an issue with Winrash. I get error reports that have the IDs people put in but no way to contact them. So I added a field in the installer for a contact email. This will be sent along with the clientID when an error report is generated by winrash. In case anyone is curious the web archive for the error reports is here: http://www.winehq.org/hypermail/wine-tests-results/ I'd like to ask that anyone who installed winrash please run the installer again so they can enter a valid contact email. If you are one of those people wondering why your results aren't found at http://test.winehq.org/data/ this will help both of us by letting me get a hold of you ;-) The one change I should mention is the addition of proxy support in the 0008 release. There are a handful of people running behind proxies, I can tell by squid html in what should be the script part of the error reports. This version of the client *should* fix things for you. Thanks to Florian Steinel for the code change. Here is the SF link to the latest client: http://osdn.dl.sourceforge.net/sourceforge/winrash/winrash-0008-chris-msvc.… Thanks to anyone running the testing suite and for the feedback on winrash changes, I appreciate it. Thanks, Chris

2 2

Re: wine-devel -- confirmation of subscription -- request 127551
by root 11 Jun '04

11 Jun '04

confirm 127551

1 0

RE: How to determine if an application is running in Wine environ ment?
by Ivan 11 Jun '04

11 Jun '04

> It would be trivial for MS to say, "Thank you for > buying Microsift WOW! 2006, you are not authorized to > copy the program from the CD-ROM to a WINE environment > and doing so will constitute a violation of copyright, > punishable by a maximum term of five years in prison > and a $250,000 fine. Click here to exit the install > program" They can't do that, it would be an illegal violation of anti-trust laws. If they could have done it, you probably couldn't run office on crossover. Ivan.

1 0

RE: How to determine if an application is running in Wine environ ment?
by Raghavan Gurumurthy 11 Jun '04

11 Jun '04

The purpose of my question was to make sure that wherever we are doing changes to the product code to work-around limitations in Wine, we are doing so only when running on Wine. And, before you (or anyone else) send further flame mail, note that we are submitting fixes to Wine as and when we run into them and have a solution. We are not trying to limit the product in anyway on Linux - if any, we are trying to make sure that the end-user experience for our product when running on Linux is as painless and seamless as possible. So, stop being so paranoid! == Raghavan -----Original Message----- From: Joshua Walker [mailto:halkun2002@yahoo.com] Sent: Thursday, June 10, 2004 5:13 PM To: wine-devel(a)winehq.com Subject: Re: How to determine if an application is running in Wine environment? Hold on... Let's pretend that a particular software manufacturer decides that running thier software under wine is no in the best intrest of the company. Or better yet, decides that if the program isn't running under a true Microsoft windows It will you that running program XYZ under Wine is illigal (Due to click-wrap licence agreement). Can you safely remove that key so that "menie" programs like that don't know where they are. Remeber DR-DOS and Win3.1? --- Bill Medland <billmedland(a)mercuryspeed.com> wrote: > On June 9, 2004 10:07 am, Raghavan Gurumurthy wrote: > > BlankIf i want to do some special handling inside > my Windows executable > > when running in Wine environment, what is the best > way to do this? > > > > Thanks, > Unless things have changed, I think the normal suggestion is to look > for the HKLM/Software/Wine registry key > -- > Bill Medland > mailto:billmedland@mercuryspeed.com > http://webhome.idirect.com/~kbmed > >

5 4

Looking for developers: processing of Windows EMF files for CUPS, NX, Samba and Freedesktop.org printing
by Fabian Franz 11 Jun '04

11 Jun '04

Hi, my name is Fabian Franz. I am usually hacking for Knoppix. Recently Kurt showed me NX/NoMachine.com. You can read some more about NX/NoMachine here: http://www.linux-kongress.org/2003/abstracts/index.html#3_7_2 http://www.nomachine.com/ 'X from NoMachine makes remote GUI connections faster than ever before, especially over lo-bandwidth/hi-latency links. The remote session can be initiated from all major workstation OS-es (Linux, Windows, Mac OS X, Solaris) and even PDAs (Zaurus, iPAQ). They can connect truely cross platform to Unix-Linux/X11, Windows/RDP and "anything"/VNC. A modem link a mere of 40 KBit/sec gives a very comfortable working speed for a KDE desktop running Konqueror (file manager), OpenOffice (word prozessor), Mozilla (web browser) and KMail (email client). This type of NX link is faster to work with than a DSL link with 384 kBit/sec using vanilla X11 over "ssh -X -C".' I was fascinated so much by this sofware, that I did some research. I noticed that it doesnt yet support printing ... You are not be interested in the use case I describe next? But you stll find the research useful? Then just skip to "===" The Use Case ----------------- With NoMachine I have the possiblity to use my machine at home (Windows, Linux) from anywhere and from every OS platform (Linux, Windows, Solaris, Zaurus, iPAQ, Knoppix) with maximum speed. Even with just 16 kbit/s upstream, it has nice performance. I login and can work on my machine, with my files and everything is good. :-) Now I want to print something. I have attached my local printer to my notebook and want to print from my remote Linux session. If my notebook is running linux, everything is fine. The CUPS on the remote side is sending the untouched data ("raw printer driver") to the CUPS on my side. The local CUPS parses the format, prints with the local driver and my printer prints. So I did not have to configure _anything_ on the remote CUPS daemon. It just works out of the box. Now change the scenario. Assume that now I had to boot my notebook into Windows. The locally attached printer may be proprietary.... So even if I could configure CUPS on the remote side, it still would have no driver to print to Windows. Windows would pass whatever it gets to the printer and the printer would in the best case say "I don't understand this" or print garbage. But there is one file format every Windows printer driver accepts as input (and converts it into the format of his target printer): it is called EMF (Enhanced MetaFile). If we could make sure that we send correct EMF to Windows, we had a guarantee that it would finally be printed. In fact, one of the central jobs of any Windows printer driver is to convert EMF into printer specific data. The task to "reverse engineer" EMF and create a Linux program that outputs EMF for printing seems to be too complicated at first. In priciple Windows records all commands that draw something and writes it to a (temporary) file. This was done to allow an application to just pass the data to Windows and then return back to normal operation. If "direct printing" is enabled, the application would have to wait for the printer to finally accept the last page. This spooling can be used to get hold of EMF files for analyzing. It should be noted that EMF is encapsulated then into a *.SPL spool file, which can contain several EMF-files and a printjob title. For more information and a really nice diagram see: http://www.printlogger.com/support/articles/msdn/3/index.html You can also get much information directly from Microsoft or other websites. Just use google ;-) Wouldn't it be nice, if I just printed on my remote session and then Windows would use its native driver? I would print on my remote session with CUPS and CUPS would create EMF (device independent extended metafile) and that EMF would be spooled to a SPL file and that SPL file would be transferred to my local Windows box printer and from there it would use the native driver to print my document. === The Task ----------- Spooling EMF to Windows ()instead of raw) to allow usage of the native printer driver ... First it sounds really easy to do. But then you find many problems at second sight: The Problems ----------------- - There is no program to convert ps to EMF on Linux. - The MS spool format is proprietary and not easy to understand. (This format is called SPL) But both of these are wrong: EMF Creation ----------------- For converting ps to EMF you can use either: - libEMF.sf.net and pstoedit or - OpenOffice.org :-) While libEMF does only implment a subset of the EMF-fileformat and is optimized for graphics, OpenOffice.org's EMF-Output is of perfect quality. Kudos to the guys from Star Division, who I believe did this initial job. (If I am wrong, please correct me) So, the first problem is almost solved. Almost, because OpenOffice cannot import PS (postscript) or any other vector based fileformat, we have on linux. But I am sure there are possibilitites, to solve these issues: Either implement OpenOffice PS-import (We'll need it anyway sooner or later) or to extract the EMF-Filter from OpenOffice.org and build it into some PS-Application. Ok, now to the second problem. SPL File Format -------------------- - SPL format is proprietairy. Well, yes. Microsoft gives no information whatsforever about this format, as it is due to change in a new version. Well, but when SMB / CIFS was implemented I believe it did also change from Release to Release, didn't it? Fortunatley there are already some "hackers", who have done substantial work on the SPL-fileformat, so that its now "known". Well, but let me start from beginning. The day before yesterday morning I started my research again, after I got an email from Wolfgang Glunz, author of pstoedit, saying that EMF was not like the Windows spool-format spl. So I did some google-groups reseach and I found posts from Feng Yuan. He explained that spl was just a small aditional header before and after the EMF pages. Programming resources ----------------------------- He also pointed to his website http://www.fengyuan.com. Guess what, Feng Yuan even did write a book about Windows GDI programming and also had a very nice EMF-test-application included. If you want to experiment with EMF, get that EMF.zip: It is really worth it. It can even read spl files directly. And it prints out the different GDI-commands to print the image, so you can also check the "quality" of your EMF-creation tool. (I'll try to get the book at our local computer science library (If I can trust the internet it should be there ;-) ) to look up the chapter about printing) You can "force" your local printer to spool to EMF first and to keep the spooled files. (You have to use "EMF NT 1.8" instead of RAW in one of the advanced pages and also tick another checkbox to keep the spooled files) Once I got that spooled spl file, I did look at it with "edit" in binary mode and did remove the spl header. And the (one page) spl-file was converted to EMF! What is really nice is, that as I already mentioned, the "hackers" from http://undocprint.printassociates.com/spooler/spoolfiles/spl/ did write up, what they do know about the spl format and that should be enough to parse or create spl files from / to EMF. "Print Mirror" ---------------- And there is also another very interesting link to some "hacker", who published an article on the msdn how to extract EMF files from the spl files. But not enough, he even started an open source project under the GPL (!) for a print mirror utility, that allows one to save the EMF data from the spool files. http://www.angelfire.com/extreme4/vprint/ While it could be a very practical tool to create EMF -> SPL and vice versa converters, I also could imagine that having sample GPLed printer code could be useful for other developments too. (You'll need the DDK (MS VisualStudio DDK (Driver Development Kit)) to compile it, though) Sources ---------- I have attached some sources I wrote today from the undoc-printing specification (You'll need libwine-dev to compile them). Thanks go to Christoph Lindemann for publishing that information. spl_info.c could be easily extended to allow extraction of EMF-files, I just was too lazy to do it. spl_create.c can create valid spl-files from one or more EMF-files. I tried using an EMF made by OpenOffice.org under linux and spooling that one to Windows through normal kprinter / cupsdoprint / smbspool operation. Guess what? Windows did use the native driver installed on the machine. As I did use some printer that prints to "FILE", I could see that the output indeed was "HPs Adobe Postscript". So my initial idea indeed does work. "Experiments" and next steps ------------------------------------- For first experiment see "sources" above ;-) Even one step further would be to integrate and experiment with that technology in Samba smbspool some more. (Jerry Carter from the Samba Team mentioned it could be interesting to change to RPC instead of SMB for that). One could also try to enhance libEMF to allow the whole EMF-"standard". (Well, WINE GDI libs and OpenOffice.org source could help) You can find an overview of EMF at MSDN: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/metafi… - An Overview of the Extended METAFILE Structures. Or / And to add ps-import to OpenOffice.org. While pstoedit is nice, the font creation with the current sdl is charcater for character, which is not exactly the best for printing ;-) - especially if you have such an powerful library as GDI. Do something cool with "Print Mirror". I for exmaple could imagine that testing is much easier that way, as you can directly see the results. Conclusion -------------- I believe, when one would combine the results of this "technology analysis", it would be possible to: - Allow spooling of EMF for Samba to accept (Dunno if there are szenarios, where this would have advantages) - Allow a CUPSd to send EMF data to Windows and let Windows use the local printer driver. (for the use case mentioned in the beginning) - With the "PrintMirror" it might be possible to force creation of EMF, as its not always done, yet. Even if Microsoft decided to change the format of SPL, one could support, I believe 3.x/95/98/ME/NT/2000/XP/2003, which should suffice for the next years ;-). Thanks also go to Kurt Pfeifle for reading and helping with this document. All discussions should CC one mailing list and I would propose samba-technical for that. cu Fabian "Bibliography": http://www.linux-kongress.org/2003/abstracts/index.html#3_7_2 - Explanation of NX / NoMachine by Kurt Pfeifle. http://www.nomachine.com/ - Terminalserver with very efficient compression to allow usage over low-bandwidth links http://www.printlogger.com/support/articles/msdn/3/index.html - Diagrams that explain the Windows Spooling Process http://libEMF.sf.net - Library, which can create EMF together with http://www.pstoedit.net http://www.fengyuan.com - Book and sample EMF application http://undocprint.printassociates.com/spooler/spoolfiles/spl/ - The SPL file format http://www.angelfire.com/extreme4/vprint/ - Open Source "Print Mirror" EMF extraction utility. http://msdn.microsoft.com/library/default.asp?url=/library/en-us/gdi/metafi… - An Overview of the Extended METAFILE Structures. This posting is dual licensed under the Creative Commons Share Alike (http://creativecommons.org/licenses/by-sa/2.0/) and the GNU FDL license.

5 4

How to determine if an application is running in Wine environment?
by Raghavan Gurumurthy 11 Jun '04

11 Jun '04

BlankIf i want to do some special handling inside my Windows executable when running in Wine environment, what is the best way to do this? Thanks, -- Raghavan Gurumurthy Gupta Technologies

4 4

[D3D8] Fix Ati set_tex_op
by Raphael 11 Jun '04

11 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Changelog: - fix version string - some fixes to ATI specific paths of set_tex_op (Christian need to complete it) - fix use of GL_SUPPORT(NV_TEXGEN_REFLECTION). I have used the wrong define, i'll get a brown paper bag :( Now Unreal(s) (UT2003,UT2004,U2) are more beautifulls :) Regards, Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) iD8DBQFAyP9+p7NA3AmQTU4RAiFyAJ0TqFMtteoA2A7NIMQ1tZqnEnuiIACeLKL7 6zh71LxsAFX1KhX6W1Q0EP4= =93Dw -----END PGP SIGNATURE-----

1 0

Zombie processes
by Shachar Shemesh 09 Jun '04

09 Jun '04

Hi all, Mike M told me on IRC that this matter has come up before, but I have not been able to find it in the archives. It seems Wine has been generating lots of zombie processes when it's not 100% cleanly killed. I have also seen the system hold a socket created from a wine process in "ESTABLISHED" state, when no process is registered as the socket's owner. According to Alexandre according to Mike, this is a kernel bug. Well, it most certainly is. Theoretically, there is nothing a user space process can do to cause zombies to stay around after their parent has exit, or keep sockets open after their controlling process has quit. As wine is a user space only process, this must be a kernel bug. No way around it. However, it happened to me both on RedHat 9 with 2.4.something (NPTL back ported), with both RH9's original kernel, and their most up to date one. It also happened on Debian Sid's almost-vanilla kernel 2.6.6. It happened with LD_ASSUME_KERNEL=2.4.1 making wine choose the standard threading mode, as well as without, choosing nptl. The zombies are sometimes called wine-pthread/wine-kthread, and sometimes wine-preloader. In short, I think this is a long standing Linux kernel bug, and Linus helps those who help themselves. I will also not be surprised if it was triggered by a wine bug. So the question is this. Is there anyone on this list who knows how to submit this as a question to lkml? The only time I tried to do anything remotely like it, I was seriously ridiculed. I understand from friends that live there that this is not an exceptional thing, so I'm a bit hesitant to go back there. If no one else does, however, I will. It will require me to untaint my kernel, so someone please save me from the slow armagatron I get when I'm not running nvidia, and report this :-) Will someone take this task on himself? Shachar -- Shachar Shemesh Lingnu Open Source Consulting http://www.lingnu.com/

7 6

[winemenubuilder] shell:SHELL32_DllCanUnloadNow (void): stub, WinMain failed
by Luca Capello 09 Jun '04

09 Jun '04

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, I'm not 100% sure this is the good mailing-list, but I think so. I was trying to use the 'winemenubuilder' with CVS-20040605, but I got an error: ===== luca@gismo:~/cvs/wine$ ./wine winemenubuilder \ /home/luca/.wine/fake_windows/TreeView.lnk fixme:shell:SHELL32_DllCanUnloadNow (void): stub err:menubuilder:WinMain failed to build menu item for \ /home/luca/.wine/fake_windows/TreeView.lnk luca@gismo:~/cvs/wine$ ===== Now, to let you know my 'wine' environment, my 'fake_windows' came from the 'WineTools' [1] and then I installed: 1) DCOM98 (via WineTools) 2) Windows Installer (via WineTools) 3) Adobe Illustrator 10 4) Adobe Photoshop 7.0 5) BioEdit && TreeView && pDRAW32 (biological programs) In ~/.wine/config, I've: ===== luca@gismo:~/cvs/wine$ grep shell /home/luca/.wine/config "ShellLinker" = "wineshelllink" "shell32" = "builtin, native" luca@gismo:~/cvs/wine$ ===== Is this a 'wine' bug or a problem with my configuration? Thx, bye, Gismo / Luca [1] http://franksworld.net/winetools.html -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Using GnuPG with Debian - http://enigmail.mozdev.org iD8DBQFAwdyCVAp7Xm10JmkRAiKVAJ0Sf/n7T1HZHP5DnkTmJB7d69AFIwCfSWMc mnMY9xdr2OODWBPWZknkoWc= =W0wV -----END PGP SIGNATURE-----

3 11

Wine on FreeBSD current
by John Birrell 09 Jun '04

09 Jun '04

Are there any people subscribed to this list who use Wine on FreeBSD current? I'm just wondering if it is supposed to work as well as FreeBSD stable. -- John Birrell

2 1

Linux links in Windows
by Fabian Cenedese 09 Jun '04

09 Jun '04

Hi I have a question about the standard drive/directory. I think there were some changes recently so I don't know the current state. I'm still on 20040408 as we needed to freeze and test the source. I have a process which changes the current dir and then starts a new program with CreateThread. But this one is back in the old dir again. Shouldn't it inherit the current dir of the starting process? Is this already in the current wine? Thanks bye Fabi

1 1

Re: winmm GetDevCaps better pointer check patch
by Robert Shearman 08 Jun '04

08 Jun '04

On Sun, 2004-06-06 at 19:26, Robert Reif wrote: > Not a real program but Microsoft's API checking programs do > try non NULL bad pointers and expect an error return rather > than a program crash. > > Are you saying checking a good pointer can cause problems? No, checking a bad pointer can cause problems. See: http://blogs.msdn.com/LarryOsterman/archive/2004/05/18/134471.aspx Rob

4 4

Re: (Still) problem on AMD64 with wine CVS
by Maurizio Monge 08 Jun '04

08 Jun '04

> Maurizio, > Ignore what it says in the source, in dlls/ntdlls/virtual.c you can change > the value in ADDRESS_SPACE_LIMIT to suit yourself. Many applications (I > venture to say most ) work fine and my solaris distro has been compiled > like this for two years with few (Actually no) complaints. > > Just don't tell Aleandre, the comment in there about not being able to > change it was directed squarely at me as a result of me doing it ! Stil, it > made wine work, while without changing the define Wine definitely would NOT > > Bob mh, i have set ADDRESS_SPACE_LIMIT to 0xffffffff and i am getting the same error... :-( Does anyone have an idea of why the mmap at the and of the "strace" i posted some time ago fails? Thx Maurizio please CC to monge(at)sns(dot)it

1 0

RE: Incoming Msg
by Twickline 08 Jun '04

08 Jun '04

1 0

wine problem
by mguyard 08 Jun '04

08 Jun '04

Hello I do that Before starting to work on a big project you may want to try to port a small application. The winemine application from the Wine source tree suits well for testing purposes. It can be found in the programs subdirectory. winemine is a simple application, but has a few C, header and resource files. Run make clean in the winemine source directory if it contains results of previous builds. Create a separate directory with name winemine2, so it won't conflict with the Wine copy of the application. Copy the sources of winemine (files *.c, *.h, *.rc) to this directory. Now run the commands, mentioned above from the winemine2 directory: $ winemaker --lower-uppercase . without any problem and after i go at wine directory and do ./configure and after i type make and i have a lot of errors: dialog.c:64: « p_board » non déclaré (première utilisation dans cette fonction) dialog.c:64: erreur d'analyse syntaxique avant le jeton « ) » dialog.c:65: « hDlg » non déclaré (première utilisation dans cette fonction) dialog.c:67: « TRUE » non déclaré (première utilisation dans cette fonction) dialog.c:69: « WM_COMMAND » non déclaré (première utilisation dans cette fonction) dialog.c:70: « wParam » non déclaré (première utilisation dans cette fonction) dialog.c:71: « IDOK » non déclaré (première utilisation dans cette fonction) dialog.c:78: « IDCANCEL » non déclaré (première utilisation dans cette fonction) dialog.c:84: « FALSE » non déclaré (première utilisation dans cette fonction) dialog.c: Au niveau supérieur: dialog.c:87: erreur d'analyse syntaxique avant « CALLBACK » dialog.c:87: erreur d'analyse syntaxique avant « hDlg » dialog.c: Dans la fonction « TimesDlgProc »: dialog.c:89: erreur de syntaxes avant le jeton « * » dialog.c:92: « uMsg » non déclaré (première utilisation dans cette fonction) dialog.c:93: « WM_INITDIALOG » non déclaré (première utilisation dans cette fonction) dialog.c:94: « p_board » non déclaré (première utilisation dans cette fonction) dialog.c:94: erreur d'analyse syntaxique avant le jeton « ) » dialog.c:98: « hDlg » non déclaré (première utilisation dans cette fonction) dialog.c:102: « FALSE » non déclaré (première utilisation dans cette fonction) dialog.c:103: « TRUE » non déclaré (première utilisation dans cette fonction) dialog.c:105: « WM_COMMAND » non déclaré (première utilisation dans cette fonction) dialog.c:106: « wParam » non déclaré (première utilisation dans cette fonction) dialog.c:107: « IDOK » non déclaré (première utilisation dans cette fonction) dialog.c:108: « IDCANCEL » non déclaré (première utilisation dans cette fonction) dialog.c: Au niveau supérieur: dialog.c:117: erreur d'analyse syntaxique avant « CALLBACK » dialog.c:117: erreur d'analyse syntaxique avant « hDlg » dialog.c: Dans la fonction « AboutDlgProc »: dialog.c:119: « uMsg » non déclaré (première utilisation dans cette fonction) dialog.c:120: « WM_INITDIALOG » non déclaré (première utilisation dans cette fonction) dialog.c:121: « TRUE » non déclaré (première utilisation dans cette fonction) dialog.c:123: « WM_COMMAND » non déclaré (première utilisation dans cette fonction) dialog.c:124: « wParam » non déclaré (première utilisation dans cette fonction) dialog.c:125: « IDOK » non déclaré (première utilisation dans cette fonction) dialog.c:126: « IDCANCEL » non déclaré (première utilisation dans cette fonction) dialog.c:127: « hDlg » non déclaré (première utilisation dans cette fonction) dialog.c:132: « FALSE » non déclaré (première utilisation dans cette fonction) something is not declared so i follow the operation procedure: You are done! Now you can start the application as ./winemine2. If you come across problems preparing and building this application this probably means that winemaker utility is broken by some changes in Wine. Try asking for help on <wine-devel(a)winehq.org> so i try to ask the question at your business. Please help me regards Mickael GUYARD INTA engineer Paris Accédez au courrier électronique de La Poste : www.laposte.net ; 3615 LAPOSTENET (0,34/mn) ; tél : 08 92 68 13 50 (0,34/mn)

1 0

Re: Spin Counts For Critical Sections on SMP
by Robert Shearman 08 Jun '04

08 Jun '04

On Mon, 2004-06-07 at 18:14, Robert Shearman wrote: > Changelog: > Honour spin count setting for critical sections on SMP Actually, this patch isn't right. Don't apply. Rob

1 0

Blizzard Updater Problem
by Erich Hoover 08 Jun '04

08 Jun '04

I haven't been able to get the blizzard updater to run on recent versions of wine (I've downloaded from CVS to make sure there isn't a fix). I'm not sure if this is something wrong with my setup or a bug with wine (i recently reinstalled my system with Fedora Core 2 and am no-longer running the same version of wine). I'm executing programs with "setarch i386 wine <appname>" but the blizzard updater seems hosed (though Diablo II and Warcraft III run fine). It appears that the updater doesn't launch correctly (i'm guessing because of the setarch stuff) so I run the updater manually by typing "setarch i386 wine BNupdate.exe" and I get this: fixme:msvcrt:_XcptFilter (-1073741819,0x5584f76c)semi-stub wine: Unhandled exception (thread 0009), starting debugger... fixme:console:SetConsoleCtrlHandler (0x55609ec4,1) - no error checking or testing yet WineDbg starting on pid 0x8 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x558fc91c). In 32 bit mode. 0x558fc91c: movl $0x0,0x0(%eax) Wine-dbg>quit WineDbg terminated on pid 0x8 At which point I have to type quit to close the debugger (as you can see). Any help would be greatly appreciated, if you need more information just send me a message.

4 7

Warning about ultra-confusing thing
by Mike Hearn 07 Jun '04

07 Jun '04

Hi all, Sometimes it is convenient to do a "killall -9 wine-pthread" to kill Wine for whatever reason. This no longer works: $ ps ax | grep wine-pthread | grep -v grep 10425 pts/4 S 0:00 /opt/wine/bin/wine-pthread notepad.exe $ killall wine-pthread wine-pthread: no process killed $ killall wine-preloader $ Huh? WTF is going on here? Well, it seems that "ps" and "killall" look at different places to get the process name, so despite the fact that it appears as wine-pthread in the process list, you must use the name wine-preloader in order to send it signals from the command line. There are reasons for this, which will hopefully become clear when I submit my docs on the Wine init process. For now, you have been warned. thanks -mike

1 0

Re: KERNEL32: implement SetFilePointerEx
by Dmitry Timoshkov 07 Jun '04

07 Jun '04

"Mike McCormack" <mike(a)codeweavers.com> wrote: > /*********************************************************************** > + * SetFilePointerEx (KERNEL32.@) > + */ > +BOOL WINAPI SetFilePointerEx( HANDLE hFile, LARGE_INTEGER distance, > + LARGE_INTEGER *newpos, DWORD method ) > +{ > + static const int whence[3] = { SEEK_SET, SEEK_CUR, SEEK_END }; > + BOOL ret = FALSE; > + NTSTATUS status; > + int fd; > + > + TRACE("handle %p offset %lld newpos %p origin %ld\n", > + hFile, distance.QuadPart, newpos, method ); %lld is not portable, Alexandre added wine_dbgstr_longlong() for that purpose. MSDN states that newpos parameter is allowed to be NULL, in that case a new file pointer is not returned. To avoid code duplication SetFilePointer should become just a wrapper for SetFilePointerEx. -- Dmitry.

1 0

Re: winmm GetDevCaps better pointer check patch
by Robert Shearman 06 Jun '04

06 Jun '04

On Sun, 2004-06-06 at 17:27, Robert Reif wrote: > Do better check on pointers to memory to be written to. ... ________________________________________________________________________ > + if (IsBadWritePtr(lpCaps, uSize)) ... Does a program depend on these checks? We should only put them in when a program depends on them because they can silently corrupt memory and cause a few other hard to detect side effects. Rob

1 0

Re: General serial communications issues
by David Purucker 06 Jun '04

06 Jun '04

>does this fix it ? >;A+ ><< async_ser.diff >> Yes, it does!!! Thank you very much. Also thanks to James(a)superbug.demon.co.uk for his diagnostic efforts, nice teamwork. Wow _________________________________________________________________ MSN Toolbar provides one-click access to Hotmail from any Web page FREE download! http://toolbar.msn.click-url.com/go/onm00200413ave/direct/01/

1 0

Re: fix for launching unix executables
by Andreas Mohr 06 Jun '04

06 Jun '04

Hi, On Fri, Jun 04, 2004 at 03:25:00PM +0200, Rein Klazes wrote: > Changelog: > dlls/kernel : process.c > Fix a crash when launching Unix executables. Is there any way to have a test for that in the test suite? Sure hurts to see such quite basic stuff non-working. Andreas Mohr

3 3

winetest.exe on wine fails
by Robert Reif 05 Jun '04

05 Jun '04

When I try to run winetest.exe on wine, it fails with an error dialog: "Can't redirect stdout." and prints: fixme:msvcrt:_dup2 (od=3, nd=1): stub to the screen. Shouldn't we be able to run wintest.exe on wine?

1 0

Microsoft Visio 2000
by James Courtier-Dutton 05 Jun '04

05 Jun '04

Has anyone managed to get Microsoft Visio 2000 working on a native wine install. I.E. No Pre installed Windows partition. If so, how? If not, I will open a bug and post the details of where the install fails. Cheers James

1 0

Re: [tests] disable winspool tests if we don't have a default printer
by Dimitrie O. Paun 05 Jun '04

05 Jun '04

On Fri, Jun 04, 2004 at 08:26:49AM +0200, Andreas Mohr wrote: > Why not be more verbose about that? Because those people will not see the warning anyway I'm afraid. Most run in non-interactive mode through winrash, others through winetest. The most we can do is leave the error in, and bug people into fixing their setup, but I'm not sure this is practical. Maybe we need a special sort of failure more for these sort of things, so we can separate them in the HTML output. -- Dimi.

2 2

segfault at startup -- race condition
by terra＠gnome.org 05 Jun '04

05 Jun '04

Recall that "./wine" usually, but not always, segfaults for me. I have tracked my race condition down to SHELL_LoadRegistry where the successful runs exit via the first return ("someone else already loaded the registry") whereas the segfaulting runs go on. Ideas? Morten

1 0

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 June 2004