wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

Script to get committed patches
by gerard patel 01 May '01

01 May '01

I have tried to retrieve this patch : http://cvs.winehq.com/patch.py?id=9881549330718504618853331 It does not look as a regular diff ??? I suspect a problem in the script. I have absolutely no knowledge of the language used in this script, so I can't do more than report. Here is quoted a small part of the beast, cut & paste from Netscape. Gerard --- /opt/cvs-commit/wine/dlls/x11drv/x11drv.spec 2001/01/15 20:23:06 1.7 +++ /opt/cvs-commit/wine/dlls/x11drv/x11drv.spec 2001/04/24 23:28:52 1.8 @@ -11,8 +11,6 @@ # USER driver -@ cdecl Synchronize() X11DRV_Synchronize -@ cdecl CheckFocus() X11DRV_CheckFocus @ cdecl UserRepaintDisable(long) X11DRV_UserRepaintDisable @ cdecl InitKeyboard() X11DRV_InitKeyboard @ cdecl VkKeyScan(long) X11DRV_VkKeyScan @@ -24,8 +22,6 @@ @ cdecl Beep() X11DRV_Beep @ cdecl GetDIState(long ptr) X11DRV_GetDIState @ cdecl GetDIData(ptr long ptr ptr long) X11DRV_GetDIData -@ cdecl GetKeyboardConfig(ptr) X11DRV_GetKeyboardConfig -@ cdecl SetKeyboardConfig(ptr long) X11DRV_SetKeyboardConfig @ cdecl InitMouse(ptr) X11DRV_InitMouse @ cdecl SetCursor(ptr) X11DRV_SetCursor @ cdecl MoveCursor(long long) X11DRV_MoveCursor @@ -34,6 +30,16 @@ @ cdecl GetScreenSaveTimeout() X11DRV_GetScreenSaveTimeout @ cdecl SetScreenSaveTimeout(long) X11DRV_SetScreenSaveTimeout @ cdecl LoadOEMResource(long long) X11DRV_LoadOEMResource +@ cdecl CreateWindow(long) X11DRV_CreateWindow +@ cdecl DestroyWindow(long) X11DRV_DestroyWindow +@ cdecl GetDC(long long long long) X11DRV_GetDC +@ cdecl EnableWindow(long long) X11DRV_EnableWindow +@ cdecl SetFocus(long) X11DRV_SetFocus +@ cdecl SetParent(long long) X11DRV_SetParent +@ cdecl SetWindowPos(ptr) X11DRV_SetWindowPos +@ cdecl SetWindowRgn(long long) X11DRV_SetWindowRgn +@ cdecl SetWindowIcon(long long long) X11DRV_SetWindowIcon +@ cdecl SetWindowText(long wstr) X11DRV_SetWindowText @ cdecl IsSingleWindow() X11DRV_IsSingleWindow @ cdecl AcquireClipboard() X11DRV_AcquireClipboard @ cdecl ReleaseClipboard() X11DRV_ReleaseClipboard &&& wine/dlls/x11drv/window.c /* * Window related functions * * Copyright 1993, 1994, 1995, 1996, 2001 Alexandre Julliard * Copyright 1993 David Metcalfe * Copyright 1995, 1996 Alex Korobka */ #include "config.h" #include "ts_xlib.h" #include "ts_xutil.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h"

2 1

FW: Notes and Java test on 20010216 drop
by Nerijus Baliunas 01 May '01

01 May '01

Hello, why the following patch is not applied? -----Original Message----- From: David.Goodenough(a)dga.co.uk [mailto:David.Goodenough@dga.co.uk] Subject: RE: Notes and Java test on 20010216 drop The Java problem I had with the last drop (the problem with Callout not being initialised) is still there, so obviously the fix that was generated and which fixes the problem has not made it into the CVS. The good news is that now Java works (if the patch is applied). Now the fonts display correctly. I am not sure what you have done guys, but it works a treat. Now for some more testing with some of the things I wanted to run but could not because of the Java support. Interestingly both the Sun and the IBM JREs now work, where last month with the fix the Sun one produced the wrong output but at least ran to completion, while the IBM one locked up somewhere. Now both run to completion properly. I was sent this (I think on wine-develop but it might have been directly). It fixes the Callout problem. I forget who originally sent it to me, but I could find out if that is necessary. diff -ur wine-cvs/if1632/thunk.c wine-uw/if1632/thunk.c --- wine-cvs/if1632/thunk.c Wed Jan 3 22:51:30 2001 +++ wine-uw/if1632/thunk.c Mon Jan 29 00:35:49 2001 @@ -166,7 +166,7 @@ NE_MODULE *pModule; hModule = GetModuleHandleA( "user32.dll" ); - if ( hModule ) + if ( hModule && !Callout.PeekMessageA ) { #define GETADDR( name ) \ *(FARPROC *)&Callout.name = GetProcAddress( hModule, #name ) @@ -185,10 +185,24 @@ GETADDR( MessageBoxW ); #undef GETADDR } - else WARN("no 32-bit USER\n"); + if ( !hModule && Callout.PeekMessageA ) + { + Callout.PeekMessageA = NULL; + Callout.GetMessageA = NULL; + Callout.SendMessageA = NULL; + Callout.PostMessageA = NULL; + Callout.TranslateMessage = NULL; + Callout.DispatchMessageA = NULL; + Callout.RedrawWindow = NULL; + Callout.WaitForInputIdle = NULL; + Callout.MsgWaitForMultipleObjects = NULL; + Callout.WindowFromDC = NULL; + Callout.MessageBoxA = NULL; + Callout.MessageBoxW = NULL; + } pModule = NE_GetPtr( GetModuleHandle16( "USER.EXE" ) ); - if ( pModule ) + if ( pModule && !Callout.FinalUserInit16 ) { #define GETADDR( var, name, thk ) \ *(FARPROC *)&Callout.var = THUNK_GetCalloutThunk( pModule, name, \ @@ -201,5 +215,12 @@ GETADDR( UserSignalProc, "SignalProc32", word_lllw ); #undef GETADDR } - else WARN("no 16-bit USER\n"); + if ( !pModule && Callout.FinalUserInit16 ) + { + Callout.FinalUserInit16 = NULL; + Callout.InitThreadInput16 = NULL; + Callout.UserYield16 = NULL; + Callout.DestroyIcon32 = NULL; + Callout.UserSignalProc = NULL; + } } diff -ur wine-cvs/loader/module.c wine-uw/loader/module.c --- wine-cvs/loader/module.c Tue Jan 16 00:29:27 2001 +++ wine-uw/loader/module.c Mon Jan 29 00:30:20 2001 @@ -1432,6 +1432,9 @@ /* decrement the dependencies through the MODULE_FreeLibrary call. */ pwm->refCount++; + /* Update the kernel Callout tables */ + THUNK_InitCallout(); + RtlReleasePebLock(); SetLastError( err ); /* restore last error */ HeapFree ( GetProcessHeap(), 0, filename ); @@ -1526,6 +1529,9 @@ HeapFree( GetProcessHeap(), 0, wm->short_filename ); HeapFree( GetProcessHeap(), 0, wm ); } + + /* Update the kernel Callout tables */ + THUNK_InitCallout(); } /*********************************************************************** diff -ur wine-cvs/miscemu/main.c wine-uw/miscemu/main.c --- wine-cvs/miscemu/main.c Wed Jan 10 02:42:49 2001 +++ wine-uw/miscemu/main.c Mon Jan 29 00:36:05 2001 @@ -34,7 +34,6 @@ MESSAGE( "Cannot load user32.dll\n" ); ExitProcess( GetLastError() ); } - THUNK_InitCallout(); if ((instance = NE_StartMain( main_exe_name, main_exe_file )) < 32) { diff -ur wine-cvs/scheduler/process.c wine-uw/scheduler/process.c --- wine-cvs/scheduler/process.c Sun Jan 28 18:58:09 2001 +++ wine-uw/scheduler/process.c Mon Jan 29 00:36:17 2001 @@ -346,9 +346,6 @@ MODULE_DllProcessAttach( NULL, (LPVOID)1 ); RtlReleasePebLock(); - /* Get pointers to USER routines called by KERNEL */ - THUNK_InitCallout(); - /* Call FinalUserInit routine */ if (Callout.FinalUserInit16) Callout.FinalUserInit16();

1 0

Re: InstallShield and ole question...
by juergen.schmied＠debitel.net 01 May '01

01 May '01

> As for doing the 10k+ lines of coding myself, I have experience in > (de)marshalling and network coding, spent many years doing it, it's more a > matter of available time and learning the com wire protocols, neither of which > are currently available to me. Here's to hoping someone is already working on > it ;). For local marshalling we could use our own protocol and even our own way of ipc if we don't try to mix processes with native and wine com-dll's. It com server is only interested in the result ;-). And isn't the com marshalling similar to the dce one? For networking - the dcom protocoll is documented (IMHO). juergen

5 4

Quickbooks 5 and printing
by Sean A. Walberg 01 May '01

01 May '01

After a long break, I'd like to figure out why quickbooks 5 can't print. wineps works, ie I can print in notepad, but QB seems to implement its own printing mechanism. --debugmsg +psdrv,+print,+winspool produces no output. Adding +font spits out a lot, but no errors that I can see. This all used to work until wineps was moved from graphics to a dll about a year ago. I can see from +dosfs that it's accessing some files (WPR.DAT/WPR.INI) which contain information on printers. There is also a QBWPR.DLL file that gets loaded. Any hints on where to start would be appreciated. Thanks, Sean -- Sean A. Walberg <sean(a)ertw.com> http://www.ertw.com *updated!* Join the weekly brainbuzz.com Linux newsletter for news and resources! Send a blank email to: join-linuxnews(a)list.brainbuzz.com

5 8

Re: STATUS_* codes
by David Howells 01 May '01

01 May '01

STATUS_INVALID_EXECUTABLE_IMAGE should have read: STATUS_INVALID_IMAGE_FORMAT and I'm told that the value is 0xC000007B. Cheers, David

1 0

Re: Quickbooks 5 and printing
by gerard patel 01 May '01

01 May '01

At 09:44 AM 28/04/2001 -0500, you wrote: >Okay, here are the traces. Here >(ftp://sourceharvest.com/pub/wine_qb4.log.gz) is the QB4 trace. QB4 >printing works. > >The other (ftp://sourceharvest.com/pub/wine_qb5.log.gz) is the QB5 trace. >QB5 printing doesn't work. The 2 traces are showing the same problem : the 2 versions of your app are trying to loadlibrary on the Wineps driver. This is not working in both cases. The difference comes from the app itself : QB4 is proceding anyway to a call to CreateDC (that's the usual way of printing after all) and this call succeeds - because Wine has been coded for this case- , while QB5 don't want to continue. My impression is that QB5 is a more sophisticate application that is actually *testing* the errors returned by the system. Unfortunately, that is also breaking its capability of printing under Wine. I am not sure why this LoadLibrary fails (it returns 2, file not found). I have done a quick and dirty LoadLibrary("WINEPS.DRV") in a winelib application : it fails. LoadLibrary("WINEPS.DLL") succeeds. So this is the problem it seems. LoadLibrary should be tweaked. I think that the code to patch is in library/loader.c, line 96 /* check for .dll or .exe extension to remove */ if (ext && (!strcmp( ext, ".dll" ) || !strcmp( ext, ".exe" ))) p = ext After the name problem is solved, the following problem is probably loading a 32 bits builtin library from 16 bits code. I don't remember clearly now (it's past 2 am for me) but the problem has already occured for other dlls. I think it was you who asked about the difference between 16 and 32 bits code; while you got a correct answer, there is also a first glance trick, useful when in one application you have transitions between 16 and 32 bits code : the 16 bits calls to the Api are shown in uppercase, the 32 bits are in lowercase. Gerard

1 0

TrueType font metrics for PostScript driver
by Ian Pilcher 30 Apr '01

30 Apr '01

And the verdict is . . . Everyone seems to feel that using FreeType 2.x directly from the Post- Script driver is the right thing to do, so that's what I'll do. This does mean that I'm going to have to learn autoconf, so expect some stupid questions on that subject. -- ======================================================================== Ian Pilcher ian.pilcher(a)home.com ========================================================================

1 0

msvcrt error
by Chris Morgan 30 Apr '01

30 Apr '01

I'm getting this error: Could not stat /mnt/fd0 (No such file or directory), ignoring drive A: err:win32:PE_FindExportedFunction function not found for forward 'ntdll._iswctype' used by 'msvcrt.dll'. If you are using builtin 'msvcrt.dll', try using the native one instead. err:win32:fixup_imports No implementation for MSVCRT.dll.636(iswctype) imported from C:\program files\notepad.exe, setting to 0xdeadbeef ~/program files$ when running notepad.exe using builtin msvcrt.dll. Any ideas on what might be causing this? Thanks, Chris

2 1

Re: TrueType font metrics for PostScript driver
by Alexandre Julliard 30 Apr '01

30 Apr '01

Ian Pilcher <ian.pilcher(a)home.com> writes: > With a separate program, FreeType is only required for people who want > to print TrueType fonts. If I put FreeType calls directly into the > driver, FreeType will be required to build/run Wine at all, even for > users that derive no benefit from it. You can have an autoconf check and #ifdef the code out if possible. We will have to use FreeType at some point anyway, so we might as well start now. Besides it seems it will be easier to use if everything is built-in instead of having to run a separate tool. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: TrueType font metrics for PostScript driver
by Alexandre Julliard 30 Apr '01

30 Apr '01

Ian Pilcher <ian.pilcher(a)home.com> writes: > Absolutely nothing. I just don't think the immediate benefit of getting > at TrueType encodings justifies creating the dependency at this time. But doesn't your solution also require FreeType anyway? Linking it into Wine or into a separate program is not really different for the user, he still needs to install it. -- Alexandre Julliard julliard(a)winehq.com

3 2

Jump to page:

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