May 2003 - Wine-devel - list.winehq.org

CVS bombs
by Andreas Mohr 20 May '03

20 May '03

Hi all, main.c:34: warning: implicit declaration of function `exit' gcc -o wine -Wl,--section-start,.interp=0x3c000100 main.o -L../dlls -lntdll.dll -L../libs/wine -lwine -L../libs/unicode -lwine_unicode -L../libs/port -lwine_port ../dlls/libntdll.dll.so: undefined reference to `SetWaitableTimer' ../dlls/libntdll.dll.so: undefined reference to `CancelWaitableTimer' ../dlls/libntdll.dll.so: undefined reference to `CreateWaitableTimerA' collect2: ld returned 1 exit status make[1]: *** [wine] Error 1 make[1]: Leaving directory `/usr/local/src/wine/miscemu' make: *** [miscemu] Error 2 Not sure whether that's a general problem of the timer transitions or just a quirkiness in my local modified tree, but... -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

3 3

CX merge
by Steven Edwards 19 May '03

19 May '03

How close are we to being done with the CrossOver merge? I have more ole32 to submit and want to merge the ReactOS stuff. Thanks Steven __________________________________ Do you Yahoo!? The New Yahoo! Search - Faster. Easier. Bingo. http://search.yahoo.com

2 1

seh_try_macros2-00
by Gregory M. Turner 19 May '03

19 May '03

This should not go in, it's WIP, just trolling for comments... License: Bugroff Changelog: - include/wine/excpetion.h - memory/global.c Implement gcc-specific "__TYPED_TRY" macro supposedly capable of intercepting return and running the finally clause. If it compiles, it should work on x86... If it fails to compile, it needs you to specify the return type as in __TYPED_TRY(float) { } __FINALLY(func) { } __ENDTRY . Other arches may have much less success ;) of course, almost any problem of this kind should be fixed by turning __TRY into the appropriate __TYPED_TRY. __TRY generates warnings, some may be fixable. Untested, and probably broken... but this should give you an idea of where I'm headed. From here, I can probably implement __try and friends much as before, with the twist that __try is just __typed_try(int ****) or what-have-you. -gmt -- diff -ur --minimal --exclude-from=/home/greg/bin/winetreediff_excl ../wine.vanilla/include/wine/exception.h ./include/wine/exception.h --- ../wine.vanilla/include/wine/exception.h 2003-01-29 21:50:14.000000000 -0600 +++ ./include/wine/exception.h 2003-05-14 21:37:51.000000000 -0500 @@ -74,6 +74,94 @@ #else /* USE_COMPILER_EXCEPTIONS */ +#if defined(__GNUC__) + +#define __TYPED_TRY(return_type) \ + if ( ({ \ + __label__ __typed_try_block_setup, __typed_try_block_entry, \ + __typed_try_block_exit_no_return, __typed_try_block_exit_return0, \ + __typed_try_block_exit_return1, __typed_try_block_exit_full; \ + __WINE_FRAME __wf; \ + typeof(return_type) __scope_return_val; \ + auto typeof(return_type) __scope_tryblock_fn(); \ + goto __typed_try_block_setup; \ + \ + __typed_try_block_entry: \ + __scope_return_val = __scope_tryblock_fn(); \ + __wine_pop_frame( &__wf.frame ); \ + goto __typed_try_block_exit_return0; \ + \ + __typed_try_block_exit_return1: \ + return __scope_return_val; \ + \ + typeof(return_type) __scope_tryblock_fn() \ + { \ + { + +#define __TRY __TYPED_TRY(unsigned int ****) + +#define __FINALLY(func) \ + } \ + /* this unwinds the __scope_tryblock_fn call */ \ + goto __typed_try_block_exit_no_return; \ + } \ + \ + __typed_try_block_setup: \ + __wf.frame.Handler = (PEXCEPTION_HANDLER)__wine_finally_handler; \ + __wf.u.finally_func = (func); \ + __wine_push_frame( &__wf.frame ); \ + goto __typed_try_block_entry; \ + \ + __typed_try_block_exit_return0: \ + (func)(1); \ + goto __typed_try_block_exit_return1; \ + \ + __typed_try_block_exit_no_return: \ + __wine_pop_frame( &__wf.frame ); \ + (func)(1); \ + { \ + { + +#define __EXCEPT(func) \ + } \ + /* this unwinds the __scope_tryblock_fn call */ \ + goto __typed_try_block_exit_no_return; \ + } \ + \ + __typed_try_block_exit_return0: \ + goto __typed_try_block_exit_return1; \ + \ + __typed_try_block_exit_no_return: \ + __wine_pop_frame( &__wf.frame ); \ + goto __typed_try_block_exit_full; \ + \ + __typed_try_block_setup: \ + __wf.frame.Handler = (PEXCEPTION_HANDLER)__wine_exception_handler; \ + __wf.u.filter = (func); \ + __wine_push_frame( &__wf.frame ); \ + if (!(setjmp( __wf.jmp ))) { \ + goto __typed_try_block_entry; \ + } else { \ + const __WINE_FRAME * const __eptr WINE_UNUSED = &__wf; \ + { + +#define __ENDTRY \ + } \ + } \ + __typed_try_block_exit_full: 0; \ + }) ) { } else { } + +#define __BREAK goto __typed_try_block_exit_no_return + +#else /* __GNUC__ */ + +/* these are the old wine __TRY macros. They are not + * capable of intercepting returns, which means the + * return-from-tryblock feature of the above macros + * shouldn't be used in parts of wine which will be used + * with non-gcc compilers. + */ + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ @@ -81,6 +169,8 @@ { \ do { +#define __TYPED_TRY(x) __TRY + #define __EXCEPT(func) \ } while(0); \ __wine_pop_frame( &__f.frame ); \ @@ -114,6 +204,9 @@ } \ } while (0); +#define __BREAK break + +#endif /* __GNUC__*/ typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); diff -ur --minimal --exclude-from=/home/greg/bin/winetreediff_excl ../wine.vanilla/memory/global.c ./memory/global.c --- ../wine.vanilla/memory/global.c 2003-05-14 15:06:26.000000000 -0500 +++ ./memory/global.c 2003-05-14 21:38:13.000000000 -0500 @@ -1251,7 +1251,7 @@ if (ISPOINTER(pmem)) { if (HeapValidate( GetProcessHeap(), 0, pmem )) { handle = (HGLOBAL)pmem; /* valid fixed block */ - break; + __BREAK; } handle = POINTER_TO_HANDLE(pmem); } else @@ -1263,7 +1263,7 @@ test = maybe_intern->Pointer; if (HeapValidate( GetProcessHeap(), 0, (char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ HeapValidate( GetProcessHeap(), 0, maybe_intern )) /* intern valid arena? */ - break; /* valid moveable block */ + __BREAK; /* valid moveable block */ } handle = 0; SetLastError( ERROR_INVALID_HANDLE ); -- "There is no dignity quite so impressive, and no independence quite so important, as living within your means." --Calvin Coolidge gmt

6 18

Function forwarding in DLL
by Gerhard W. Gruber 19 May '03

19 May '03

I noticed that some functions from w95inf32 are similarily named and already implemented in setupx.dll. For some functions even the arguments are the same. So I wanted to try if this works when I simply forward the function to setupx. I looked into other spec files on how this is done but when I try to compile it then I get a compile error: make[2]: Entering directory `/mnt/data2/home/gerhard/src/wine/dlls/w95inf32' make[2]: *** No rule to make target `../../dlls/libsetupx.def', needed by `w95inf32.spec.c'. Stop. make[2]: Leaving directory `/mnt/data2/home/gerhard/src/wine/dlls/w95inf32' make[1]: *** [w95inf32] Error 2 make[1]: Leaving directory `/mnt/data2/home/gerhard/src/wine/dlls' -- Gerhard Gruber Für jedes menschliche Problem gibt es immer eine einfache Lösung: Klar, einleuchtend und falsch. (Henry Louis Mencken)

3 4

How symbols are resolved?
by Pierre d'Herbemont 19 May '03

19 May '03

Hi, I would like to have some precision on how symbols are resolved, because I am having troubles like : 000b:trace:module:find_ordinal_export ordinal 24410 out of range(10/1049)! err:module:import_dll No implementation for kernel32.dll.24420 imported from C:\windows\system\notepad.exe, setting to 0xdeadbeef My specific is how does the link is done from a symbol to the ordinal? Is it handled by winebuild? Thanks, Pierre

2 1

Re: wine/dlls/shell32 shlexec.c
by Eric Pouech 19 May '03

19 May '03

Alexandre Julliard wrote: > Log message: > Aric Stewart <aric(a)codeweavers.com> > Added support for the %L escape. from the docs I have found, %L is meant to be the long name followed by the 8+3 short name (last time I tried with wmp just the long name part it didn't work, maybe it's better with latest wmp version) A+ -- Eric Pouech

1 0

US international keyboard layout
by Gerhard W. Gruber 19 May '03

19 May '03

I'm using Suse 8.0 Prof and I configured a US international keyboard. I have a US keyboard but I need to have german umlauts as well. When I run wine then I get the errormessage that my keyboard can't be recognized and I should include it in x11drv/keyboard .c . Now I checked this file and I was surprised to find this layout already there. Apparently wine can't detect my layout for some reason but I don't know how to fix this. Any suggestions how I should proceed? The funny thing is that the keyboard layout works properly in wine, so I get all the Umlauts. Seems that the error message is wrong. -- Gerhard Gruber Für jedes menschliche Problem gibt es immer eine einfache Lösung: Klar, einleuchtend und falsch. (Henry Louis Mencken)

4 6

glXGetProcAddressARB causing dozens of warnings
by Gerald Pfeifer 19 May '03

19 May '03

I'm afraid the following patch date: 2003/05/07 03:18:51; author: julliard; state: Exp; lines: +1 -0 Michael Schlüter <michael(a)johalla.de> Added wglGetExtensionsStringARB. to dlls/opengl32/opengl32.spec, dlls/opengl32/wgl.c and dlls/opengl32/wgl.h is responsible for the following warnings (seen on FreeBSD 4.8/i386 with XFree86-4.3.0 and Mesa-3.4.2). Would you mind fixing these? stateblock.c:203: warning: implicit declaration of function `glActiveTextureARB' wgl.c:325: warning: implicit declaration of function `glXGetProcAddressARB' wgl.c:325: warning: comparison between pointer and integer wgl.c:334: warning: assignment makes pointer from integer without a cast opengl_norm.c:28: warning: implicit declaration of function `glActiveTextureARB' opengl_norm.c:210: warning: implicit declaration of function `glClientActiveTextureARB' opengl_norm.c:2152: warning: implicit declaration of function `glMultiTexCoord1dARB' opengl_norm.c:2162: warning: implicit declaration of function `glMultiTexCoord1dvARB' opengl_norm.c:2172: warning: implicit declaration of function `glMultiTexCoord1fARB' opengl_norm.c:2182: warning: implicit declaration of function `glMultiTexCoord1fvARB' opengl_norm.c:2192: warning: implicit declaration of function `glMultiTexCoord1iARB' opengl_norm.c:2202: warning: implicit declaration of function `glMultiTexCoord1ivARB' opengl_norm.c:2212: warning: implicit declaration of function `glMultiTexCoord1sARB' opengl_norm.c:2222: warning: implicit declaration of function `glMultiTexCoord1svARB' opengl_norm.c:2232: warning: implicit declaration of function `glMultiTexCoord2dARB' opengl_norm.c:2242: warning: implicit declaration of function `glMultiTexCoord2dvARB' opengl_norm.c:2252: warning: implicit declaration of function `glMultiTexCoord2fARB' opengl_norm.c:2262: warning: implicit declaration of function `glMultiTexCoord2fvARB' opengl_norm.c:2272: warning: implicit declaration of function `glMultiTexCoord2iARB' opengl_norm.c:2282: warning: implicit declaration of function `glMultiTexCoord2ivARB' opengl_norm.c:2292: warning: implicit declaration of function `glMultiTexCoord2sARB' opengl_norm.c:2302: warning: implicit declaration of function `glMultiTexCoord2svARB' opengl_norm.c:2312: warning: implicit declaration of function `glMultiTexCoord3dARB' opengl_norm.c:2322: warning: implicit declaration of function `glMultiTexCoord3dvARB' opengl_norm.c:2332: warning: implicit declaration of function `glMultiTexCoord3fARB' opengl_norm.c:2342: warning: implicit declaration of function `glMultiTexCoord3fvARB' opengl_norm.c:2352: warning: implicit declaration of function `glMultiTexCoord3iARB' opengl_norm.c:2362: warning: implicit declaration of function `glMultiTexCoord3ivARB' opengl_norm.c:2372: warning: implicit declaration of function `glMultiTexCoord3sARB' opengl_norm.c:2382: warning: implicit declaration of function `glMultiTexCoord3svARB' opengl_norm.c:2392: warning: implicit declaration of function `glMultiTexCoord4dARB' opengl_norm.c:2402: warning: implicit declaration of function `glMultiTexCoord4dvARB' opengl_norm.c:2412: warning: implicit declaration of function `glMultiTexCoord4fARB' opengl_norm.c:2422: warning: implicit declaration of function `glMultiTexCoord4fvARB' opengl_norm.c:2432: warning: implicit declaration of function `glMultiTexCoord4iARB' opengl_norm.c:2442: warning: implicit declaration of function `glMultiTexCoord4ivARB' opengl_norm.c:2452: warning: implicit declaration of function `glMultiTexCoord4sARB' opengl_norm.c:2462: warning: implicit declaration of function `glMultiTexCoord4svARB' Thanks, Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.pfeifer.com/gerald/

4 6

Valgrind for WINE tarball now available
by Adam Gundy 19 May '03

19 May '03

For all you developers out there who haven't tried valgrinding WINE yet (it's fun - honest!) there is now a pre-patched tarball of the latest valgrind 1.9.6 for WINE available from the valgrind website: http://developer.kde.org/~sewardj/ no patching needed to WINE or valgrind. Just get the latest snapshot of WINE (or a CVS checkout), build for debugging, get the pre-patched valgrind and use it! there are still plenty of bugs in WINE which need fixing - most are simple 1 line edits.. Seeya, Adam -- Real Programmers don't comment their code. If it was hard to write, it should be hard to read, and even harder to modify. These are all my own opinions.

3 5

Another keyboard problem
by Gerhard W. Gruber 18 May '03

18 May '03

I'm using a US keyboard with US international driver. When using this driver under Windows you can press ALT and then an ASCII code on the NUM block. This works since back to the days when DOS was still in use and you could use this to enter characters that may not be supported by the keyboard driver. This doesn't work in Wine. -- Gerhard Gruber Für jedes menschliche Problem gibt es immer eine einfache Lösung: Klar, einleuchtend und falsch. (Henry Louis Mencken)

2 2