- Wine-devel - list.winehq.org

Re: olepicture.c patch
by Francois Gouget 13 Oct '01

13 Oct '01

Wouldn't this be better (do the trick inside the #ifdef HAVE_JPEGLIB_H): #ifdef HAVE_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ #define XMD_H #ifdef HAVE_JPEGLIB_H +# define UINT16 JPEG_UINT16 # include <jpeglib.h> +# undef UINT16 #endif #endif -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ If it stinks, it's chemistry. If it moves, it's biology. If it does not work, It's computer science.

1 0

Re: added missing CloseHandle
by eric pouech 13 Oct '01

13 Oct '01

Kai Morich wrote: > > * dlls/shell32/shell.c > Kai Morich <mail(a)kai-morich.de> > InternalExtractIcon16 forgot to close file handle > > p.s. that's the reason why my last mail had no attachment, because the mailprogram couldn't open the still opened attachment file since we don't use the handle afterwards, it seems like OF_EXIST as a flag to OpenFile would be a much better way to handle this my 2 cents A+ -- --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) "The future will be better tomorrow", Vice President Dan Quayle

1 0

Re: Don't TRACE NULL strings
by Dmitry Timoshkov 13 Oct '01

13 Oct '01

"FranГois Gouget" <fgouget(a)codeweavers.com> wrote: > - TRACE("(%p %p %x)\n",pidl,szOut,uOutSize); > + TRACE("(%p %p %x)\n",pidl,debugstr_a(szOut),uOutSize); ^^ ^^^^^^^^^^^^^^^^^ Please recheck for pointer format vs. string argument mismatches. -- Dmitry.

1 0

Re: PATCH: Fix LoadCursor() under win9x
by Marcus Meissner 13 Oct '01

13 Oct '01

On Fri, Oct 12, 2001 at 03:16:04PM +0200, Johan Gill wrote: > LoadCursor() should return 0 if we emulate win9x and the second parameter > is an invalid pointer. > + if (HIWORD(name)) > + if (GetVersion() & 0x80000000) /* win9x */ > + if (IsBadReadPtr(name, 4)) > + return 0; This code is unclean: It should not check for versions. It should not use IsBadReadPtr(), but IsBadStringPtrA(). It should not use IsBad* functions, but an exception handler. I would suggest the patch below. Ciao, Marcus Changelog: Handle bad pointer arguments to LoadImageA() (and functions calling LoadImageA) with an exception handler. Index: cursoricon.c =================================================================== RCS file: /home/wine/wine/windows/cursoricon.c,v retrieving revision 1.35 diff -u -r1.35 cursoricon.c --- cursoricon.c 2001/10/05 19:38:14 1.35 +++ cursoricon.c 2001/10/12 16:50:03 @@ -36,6 +36,7 @@ #include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" +#include "wine/exception.h" #include "heap.h" #include "palette.h" #include "bitmap.h" @@ -2174,14 +2175,29 @@ * FIXME: implementation lacks some features, see LR_ defines in winuser.h */ +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + HANDLE WINAPI LoadImageA( HINSTANCE hinst, LPCSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags) { HANDLE res; LPWSTR u_name; - if (HIWORD(name)) u_name = HEAP_strdupAtoW(GetProcessHeap(), 0, name); - else u_name=(LPWSTR)name; + __TRY { + if (HIWORD(name)) u_name = HEAP_strdupAtoW(GetProcessHeap(), 0, name); + else u_name=(LPWSTR)name; + } + __EXCEPT(page_fault) { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + __ENDTRY res = LoadImageW(hinst, u_name, type, desiredx, desiredy, loadflags); if (HIWORD(name)) HeapFree(GetProcessHeap(), 0, u_name); return res;

2 2

winemaker
by lawson_whitney＠juno.com 12 Oct '01

12 Oct '01

Good day! I like winemaker, but it frustrates me. Given a standard wine installation (from source in /oof/wine, ./configure, make depend && make, make install) and a little winelib program with a handmade .spec file in subdirectory wlp, and the command winemaker --nosource-fix --console --nogenerated-specs \ --single-target toj2 wlp why does it make a configure script that can find -lwine, but can not find -lntdll - ? They are both in /usr/local/lib ... checking whether we can build a Linux dll... yes checking whether we need to define __i386__... no checking for g++ -fpermissive option... yes checking for g++ -fno-for-scope option... yes checking for windef.h header... /usr/local/include/wine checking for -lwine... checking for libntdll.so... configure: error: Could not find the Wine dlls (libntdll.so) The Winelib program is responsible to bring you this letter, but I had to hand-hack some scripts to get it to compile. Well, it may take me a while, but you or I will solve it. Regards, Lawson ---oof---

2 6

Re: PATCH: Fix LoadCursor() under win9x
by Alexandre Julliard 12 Oct '01

12 Oct '01

Andreas Mohr <u4t5s0yq1001(a)sneakemail.com> writes: > Using your exception handler, LoadCursor() *always* returns 0 > on invalid parameter, which is WRONG in the NT 4 case > since it continues program execution without crashing. > > --> GetVersion() is required, check was (nearly) right IMHO. > Probably the best solution would be to use both an exception handler and > call GetVersion() on exception. Come on Andreas, we've been through this before. A version check must be added *only* when there is a real-life application that demonstrably depends on the version difference for proper behavior. So if you want the version check you'll have to show us an application that needs the crash in order to work right... -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: winebuild and circular DLL dependencies
by Alexandre Julliard 12 Oct '01

12 Oct '01

eric pouech <eric.pouech(a)wanadoo.fr> writes: > well, I think we need to differentiate two things: > - circular deps in normal imports > - circular refs of DLLs for delayed imports I consider that both are wrong. I think it's important to maintain proper layers and ensure that dll dependencies always go in one direction. Of course this is not always possible thanks to Microsoft design (or lack of it); but in the cases where we need to hack something I want it to be very explicit that something unusual is going on. If we make it so that any dll can easily import any other one, we'll quickly end up with an inextricable mess of cross-dll dependencies, simply because adding an import in the spec file for any dll that you may need is so much easier than having to use GetProcAddress and think about minimizing inter-dll calls because they are a pain to do. So there aren't really technical reasons we cannot do it, the issue is enforcing a structure by not making it too easy to do things the wrong way. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: winebuild and circular DLL dependencies
by Alexandre Julliard 12 Oct '01

12 Oct '01

Ove Kaaven <ovehk(a)ping.uio.no> writes: > Well, can this be done with delayed imports yet? I have a situation here > where ole32 imports stuff from rpcrt4 (windows uses delayed imports for > that), and rpcrt4 imports stuff from ole32 (again, windows uses delayed > imports). It would be nice if I could use the winebuild delayed import > mechanism to achieve this, instead of doing it manually with callout > tables and stuff... but I suppose winebuild has to be changed to read > the .spec files instead of using nm on compiled libraries... anyone > working on it? No, and I don't think it's a desirable feature, it's too error-prone. Besides, circular dependencies are really something to avoid, so it must not be too easy to do... (what does rpcrt4 need from ole32 BTW?) -- Alexandre Julliard julliard(a)winehq.com

3 2

BUG: mouse_event does not move pointer for relative coordinates
by Andriy P 12 Oct '01

12 Oct '01

The attached test program moves pointer under Windows NT. Under Wine the pointer changes position on move request in absolute coordinates and does not move for relative coordinates. I found out that variables PosX and PosY ARE updated in queue_mouse_event in windows/input.c. Can somebody give me a hint where to go from there? I don't see further any difference in processing between absolute and relative movement. In case somebody will fix this bug, don't worry about different relative distance reported under Windows and in Wine. I alredy fixed that part and will submit the patch soon. Thanks, Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Make a great connection at Yahoo! Personals. http://personals.yahoo.com

1 0

Re:winebuild and circular DLL dependencies
by Eric Pouech 12 Oct '01

12 Oct '01

well, I must have this somewhere in my tree, but didn't publish it because Alexandre was somehow reluctant to use this type of features (not the reading of missing symbols from .spec files, but the circular deps). Alexandre, any "new" comments ? A+ > Well, can this be done with delayed imports yet? I have a situation here > where ole32 imports stuff from rpcrt4 (windows uses delayed imports for > that), and rpcrt4 imports stuff from ole32 (again, windows uses delayed > imports). It would be nice if I could use the winebuild delayed import > mechanism to achieve this, instead of doing it manually with callout > tables and stuff... but I suppose winebuild has to be changed to read > the .spec files instead of using nm on compiled libraries... anyone > working on it? > > > > --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle __________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Pendant tout l'été, gagnez une Ford Ka sur Voila Gratter ! http://cybergrattage.voila.fr/voila

1 0