- wine-devel - winehq.org

Re: make check_no_exec() work reliable
by Peter Beutner 04 Dec '06

04 Dec '06

Peter Beutner wrote: > Before starting to make this whole noexecute override behaviour configurable, > it first must work reliable. In its current form there is no guarantee that > the check_no_exec() function is actually called, because any other installed > exception handler might decide to handle the exception itself. > And as seen by the number of failing applications, this seems to happen > quite a lot. > This patch therefore makes check_no_exec() to be called before any other > exception handler. > > --- Any comments what is wrong with this one?

2 7

Re: [5/6] wined3d: Make CreateFakeGLContext thread safe.
by Alexandre Julliard 04 Dec '06

04 Dec '06

Jan Zerebecki <jan.wine(a)zerebecki.de> writes: > This adds thread safety to CreateFakeGLContext and it's > corresponding Release function only. This addresses no thread > safety in the rest of wined3d, which AFAIk as a whole is still > not thread safe. When addressing thread safety in wined3d it must > also be taken care that a GL context is not deleted away by a > different thread when execution is between these two functions. You are calling ENTER_GL while holding your crit section, this will deadlock. -- Alexandre Julliard julliard(a)winehq.org

1 0

Help needed on an SHGetFileInfoW() crash
by Francois Gouget 04 Dec '06

04 Dec '06

A friend pointed me to a railway signalling simulation game: http://www.simsig.co.uk/html/downloads.html However, the installer crashes in SHGetFileInfoW(): 000d:Call shell32.SHGetFileInfoA(0045eae8,00000010,0034fcec,00000160,00001010) ret=0045e9f6 000d:trace:seh:raise_exception code=c0000005 flags=0 addr=0x7e8871b2 000d:trace:seh:raise_exception info[0]=00000000 000d:trace:seh:raise_exception info[1]=00000000 More precisely the crash happens on this line: hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, &uDummy, (LPVOID*)&pei); And the reason is that psfParent is NULL. psfParent is initialized a bit above, but only if SHGetFileInfoW() was given a PIDL and SHGFI_USEFILEATTRIBUTES was not used. This means that whenever a 'real path' or SHGFI_USEFILEATTRIBUTES is used in combination with SHGFI_DISPLAYNAME, SHGFI_ICONLOCATION, SHGFI_ICON or SHGFI_SYSICONINDEX, then SHGetFileInfoW() will crash. However we cannot just create a pidl since the 'real path' will usually refer to a nonexistent file or directory (in our case it is 'c:\directory' so it's clear the installer just wants to know what's the icon for a standard directory). Any idea? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Lotto: A tax on people who are bad at math." -- unknown "Windows: Microsoft's tax on computer illiterates." -- WE7U

2 1

Call for DirectPlay captures
by Kai Blin 04 Dec '06

04 Dec '06

Hi folks, As you might know, I'm currently toying with figuring out the MS DirectPlay protocol. I've been making some progress with my wireshark dissector over the weekend, and would be interested in some additional games to get more different data on some of this stuff. Here's what I would like you to do (if you want to help out): Fire up a network sniffer that dumps to libpcap format. Grab TCP and UDP packets. Start a game that uses DirectPlay for networking and start a network game. Start the game on another box and connect to the game. Now, in the game lobby, use the chat to say something from both games. Then, change a setting or two and start the game. After a few moments of playing (or more, your pick), leave the game. After both games are closed, you can stop the capture, zip it up and send it to me. Thanks in advance, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

4 6

Re: riched20: fixes and additional conformance tests for EM_EXSETSEL
by Matt Finnicum 04 Dec '06

04 Dec '06

Hey, I'm sorry for not noticing this bug earlier - I have a bad habit of only browsing bugs listed under wine-richedit. I actually sent in a patch that fixes this bug before, but it wasn't accepted because I hadn't marked a test that it causes to fail as todo_wine. Does the attached patch solve your problem? The attached patch moves all the logic to ME_SetSelection, so it'll apply to EM_SETSEL as well as EM_EXSETSEL (they both are supposed to follow the same special cases), and this way it will contribute to my further separating functionality from the message handlers into ME_ local functions which is needed to properly implement windowless controls. This patch does result in a wrong return if the user sent a SetSelection beyond the end of the document (windows allows you to select an imaginary character at the end), but I don't think that's a problem for anything, and I'll have it working in a couple weeks (I'm working on improving the selection code in general, a part of which will allow you to actually select that extra character in our richedit). I suppose i could just put a small hack in for the meantime, if anyone cares. I haven't tried them together yet, but your new tests do look significantly more comprehensive - well done. --Matt On 12/3/06, Lei Zhang <thestig(a)google.com> wrote: > Hi, > > Changelog: > * Check the input to EM_EXSETSEL > * Fixes bug 6814 > * Added more comprehensive conformance tests for EM_EXSETSEL > > editor.c | 52 +++++++++++++++++++++--- > tests/editor.c | 103 +++++++++++++++++++++++++++++++------------------ > 2 files changed, 112 insertions(+), 43 deletions(-) > > > > > > >

2 1

Re: tools/. mono.php
by Jonathan Ernst 04 Dec '06

04 Dec '06

Le vendredi 01 décembre 2006 à 10:35 -0600, Jeremy Newman a écrit : > ChangeSet ID: 30235 > CVSROOT: /opt/cvs-commit > Module name: tools > Changes by: jnewman(a)winehq.org 2006/12/01 10:35:01 > > Added files: > . : mono.php > > Log message: > Jonathan Ernst <jonathan(a)ernstfamily.ch> > - mono downloader script Please don't forget to upload the files to sourceforge as requested with the patches, because it is breaking those Wine downloads... See: http://source.winehq.org/mono.php?action=showlist http://source.winehq.org/mozactivex?action=showlist Thanks

3 2

Re: [ws2_32] make closesocket cancel pending I/O operations
by Kai Blin 04 Dec '06

04 Dec '06

On Monday 04 December 2006 07:01, Damjan Jovanovic wrote: > On Windows, calling closesocket in one thread causes blocking I/O > operations on that socket (select, accept) running in other threads to > return immediately. On Linux, the I/O will block forever. Calling > shutdown as part of closesocket reproduces the same behaviour under > Linux. Closes #4619 and #3777. Sweet, this seems to solve part of the problems in bug #5534, too. Thanks, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: ws2_32: Rewrite getsockopt to make it more readable.
by Kai Blin 04 Dec '06

04 Dec '06

On Sunday 03 December 2006 16:46, Kai Blin wrote: > --- > dlls/ws2_32/socket.c | 409 > ++++++++++++++++++++++++++++++++++------------ > dlls/ws2_32/tests/sock.c | 35 ++++ > 2 files changed, 332 insertions(+), 112 deletions(-) Sorry, misplaced a closing bracked somehow. I'll send a fixed version in a minute. Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Firefox-1.5.x on Wine slow on javascript-heavy pages
by Dan Kegel 04 Dec '06

04 Dec '06

I've been using Firefox-1.5.x again on wine (using the winehq packages for Ubuntu) on my dual 650MHz system as my main browser again for the last few months. It's working quite well... except that javascript-heavy pages/apps like gmail are a tad sluggish at accepting keyboard input. For some reason, yahoo.com's main page is also sluggish; they must do something fancy. Both are fine with native firefox on this system. I'm sure this won't affect anyone with a modern system, but it is kind of sad that my trusty old dual CPU system isn't up to daily tasks anymore. Sniff... ah, well, I see Fry's has amd64 4000 motherboard/cpu combos for $189, guess it's time to upgrade. At some point it'd be nice to look into why Firefox's javascript is slow under Wine, though. - Dan

2 1

Re: d3d [2]: Optional callback infrastructure for implicit texture surface destruction.
by Stefan Dösinger 03 Dec '06

03 Dec '06

Am Sonntag 03 Dezember 2006 21:52 schrieb Markus Amsler: > /* IWineD3DTexture */ > + IWineD3DTextureImpl_Destroy, Wouldn't it maybe be better to make the destroy method part of IWineD3DBase?

2 1

Re: d3d [2]: Optional callback infrastructure for implicit texture surface destruction.
by H. Verbeet 03 Dec '06

03 Dec '06

On 03/12/06, Markus Amsler <markus.amsler(a)oribi.org> wrote: > --- > dlls/wined3d/texture.c | 53 > +++++++++++++++++++++++--------------- > include/wine/wined3d_interface.h | 7 +++++ > 2 files changed, 39 insertions(+), 21 deletions(-) I think the callback should be non-optional.

2 1

One more go at fixing GetCursorPos()
by Vitaliy Margolen 03 Dec '06

03 Dec '06

Here is one more shot at fixing GetCursorPos() to make it usable in dinput. This time I used a refcount of sorts. Because the problem appears only during processing of hook chain. Just to remind about what is the problem: when hook handler calls GetCursorPos() position returned is the "old" position. While hook parameters contain "new" coordinates. This is on windows. On Wine returned position queried directly from X and might be even "newer" then position in hook parameters. Attached are two tests (out of lots more that I've used to find and fix the problem). test_msg.c - tests major problem that Alexandre pointed out about last fix attempt. Application in question does not process messages while calling GetCursorPos(). It still works properly with proposed patch. di_mouse_2th.c - 2 threads showing that there are no extra thread local position involved (if there is such a thing). Cached cursor position is global to all threads. (Last numbers should stay at dt(0 0) at all times). Inside hook handler d(x y) should show relative mouse move delta. If anyone has any objections, comment, suggestions, please do send them. Vitaliy Margolen. #define COBJMACROS #define _WIN32_WINNT 0x0501 #include <windows.h> #include <windowsx.h> #include <stdio.h> static HANDLE event1, event2; static HINSTANCE g_hInstance; static POINT pt_global; LRESULT CALLBACK hook_proc( int code, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; POINT pt; GetCursorPos(&pt); if (code == HC_ACTION) { fprintf(stderr, "Hook: code=%d w=%x [(%ld %ld) %lx %lx %lx] cur(%ld %ld) d(%ld %ld) ", code, wparam, hook->pt.x, hook->pt.y, hook->mouseData, hook->flags, hook->dwExtraInfo, pt.x, pt.y, hook->pt.x - pt.x, hook->pt.y - pt.y); pt_global = pt; SetEvent(event1); WaitForSingleObject(event2, INFINITE); } return CallNextHookEx( 0, code, wparam, lparam ); } static DWORD CALLBACK thread_proc(LPVOID arg) { while (WaitForSingleObject(event1, INFINITE) == WAIT_OBJECT_0) { POINT pt; GetCursorPos(&pt); fprintf(stderr, "Th: (%ld %ld) dt(%ld %ld)\n", pt.x, pt.y, pt.x - pt_global.x, pt.y - pt_global.y); SetEvent(event2); } return 0; } static DWORD wnd_proc(void) { MSG msg; while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } return msg.wParam; } #define SEND(x,y) \ i.mi.time = GetCurrentTime(); \ i.mi.dx = x; i.mi.dy = y; \ SendInput(1, &i, sizeof(INPUT)); void send_input(void) { INPUT i; POINT ptorg, pt; GetCursorPos(&ptorg); fprintf(stderr, "Cur pos: %ld %ld\n", ptorg.x, ptorg.y); i.type = INPUT_MOUSE; i.mi.dwFlags = MOUSEEVENTF_MOVE; i.mi.dwExtraInfo = 0; i.mi.mouseData = 0; SEND(-4, -4) GetCursorPos(&pt); fprintf(stderr, "%ld %ld\n", pt.x, pt.y); SetCursorPos(ptorg.x, ptorg.y); Sleep(250); fprintf(stderr, "***DONE***\n"); } void test1(HWND hwnd) { HANDLE thread; HHOOK hook; MSG msg; event1 = CreateEvent(NULL, FALSE, FALSE, NULL); event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL); Sleep(250); hook = SetWindowsHookExA(WH_MOUSE_LL, hook_proc, g_hInstance, 0); Sleep(250); // send_input(); wnd_proc(); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); UnhookWindowsHookEx(hook); CloseHandle(event1); CloseHandle(event2); CloseHandle(thread); Sleep(250); } LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_DESTROY: PostQuitMessage(0); return 0; } return DefWindowProc(hWnd, message, wParam, lParam); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { WNDCLASSEX wcex; HWND hwnd; g_hInstance = hInstance; wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = (WNDPROC)WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; wcex.hIcon = NULL; wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; wcex.lpszClassName = "MainWindow"; wcex.hIconSm = NULL; RegisterClassEx(&wcex); hwnd = CreateWindow("MainWindow", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ShowWindow(hwnd, SW_SHOW); test1(hwnd); DestroyWindow(hwnd); return 0; } #include <windows.h> #include <stdio.h> int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { LONG started = GetTickCount(); POINT pt, pt_org; HWND hwnd; MSG msg; hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); GetCursorPos(&pt_org); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); while (started + 10000 > GetTickCount()) { GetCursorPos(&pt); if ((pt.x - pt_org.x) || (pt.y - pt_org.y)) printf("(%ld %ld)\n", pt.x - pt_org.x, pt.y - pt_org.y); pt_org = pt; } DestroyWindow(hwnd); return 0; }

2 2

winedump: Cast-qual warnings fix (2 of 2)
by Andrew Talbot 03 Dec '06

03 Dec '06

Sorry, I made a mess of titling this patch, twice. Please find and use the version whose subject line and changelog entry refer to "winedump", not "winedbg". Thanks, -- Andy.

1 0

[PATCH] overflow checking for MultiByteToWideChar/WideCharToMultiByte
by Marcus Meissner 03 Dec '06

03 Dec '06

Hi, This is more a FYI patch and GCC 4.0+ specific. This enhancement detects if the size of a known buffer is different than the specified size. Thie tests/sock.c adjustement is necessary due to stdlib.h inclusion. Ciao, Marcus --- dlls/kernel32/locale.c | 2 ++ dlls/ws2_32/tests/sock.c | 2 +- include/winnls.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletions(-) d0e7840335b6bbe4990b1c043dcff9b298c7a5a8 diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bc7db75..1d4ceaf 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1757,6 +1757,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPA * is passed, and ERROR_NO_UNICODE_TRANSLATION if no translation is * possible for src. */ +#undef MultiByteToWideChar INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, LPWSTR dst, INT dstlen ) { @@ -1850,6 +1851,7 @@ INT WINAPI MultiByteToWideChar( UINT pag * and dstlen != 0, and ERROR_INVALID_PARAMETER, if an invalid * parameter was given. */ +#undef WideCharToMultiByte INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, LPSTR dst, INT dstlen, LPCSTR defchar, BOOL *used ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c8b9cc8..f5ed0c1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -22,8 +22,8 @@ #include <stdarg.h> #include <windef.h> -#include <winbase.h> #include <winsock2.h> +#include <winbase.h> #include <mswsock.h> #include "wine/test.h" #include <winnt.h> diff --git a/include/winnls.h b/include/winnls.h index 8888171..c13c0bf 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -20,6 +20,10 @@ #define __WINE_WINNLS_H #ifndef NONLS +#ifndef RC_INVOKED +# include <stdlib.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -768,6 +772,26 @@ INT WINAPI LCMapStringW(LCID,DWO #define LCMapString WINELIB_NAME_AW(LCMapString) LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); + +static inline INT +WINAPI MultiByteToWideChar_ichk( + UINT cp,DWORD flags, + LPCSTR src,INT srclen,INT srcbuflen, + LPWSTR dst,INT dstlen,INT dstbuflen +) { + if ((srclen != -1) && (srcbuflen != -1) && (srcbuflen < srclen)) + abort(); + if ((dstlen != -1) && (dstbuflen != -1) && (dstbuflen/2 < dstlen)) + abort(); + /* later add assertions regarding conversion lengths */ + return MultiByteToWideChar(cp,flags,src,srclen,dst,dstlen); +} +#define MultiByteToWideChar(cp,flags,src,srclen,dst,dstlen) \ + MultiByteToWideChar_ichk(cp,flags, \ + src,srclen,__builtin_object_size(src,0), \ + dst,dstlen,__builtin_object_size(dst,0) \ + ) + INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo) @@ -778,6 +802,27 @@ BOOL WINAPI SetThreadLocale(LCID) BOOL WINAPI SetUserGeoID(GEOID); INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); +static inline INT +WINAPI WideCharToMultiByte_ichk( + UINT cp,DWORD flags, + LPCWSTR src,INT srclen,INT srcbuflen, + LPSTR dst,INT dstlen,INT dstbuflen, + LPCSTR xstr,LPBOOL b +) { + if ((srclen != -1) && (srcbuflen != -1) && (srcbuflen/2 < srclen)) + abort(); + if ((dstlen != -1) && (dstbuflen != -1) && (dstbuflen < dstlen)) + abort(); + /* later add assertions regarding conversion lengths */ + return WideCharToMultiByte(cp,flags,src,srclen,dst,dstlen,xstr,b); +} +#define WideCharToMultiByte(cp,flags,src,srclen,dst,dstlen,defchar,b) \ + WideCharToMultiByte_ichk(cp,flags, \ + src,srclen,__builtin_object_size(src,0), \ + dst,dstlen,__builtin_object_size(dst,0), \ + defchar,b \ + ) + #ifdef __cplusplus } #endif -- 1.2.4

1 0

Re: [PATCH] check length in path canonicalize
by Dmitry Timoshkov 03 Dec '06

03 Dec '06

"Marcus Meissner" <marcus(a)jet.franken.de> wrote: > - MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); > + INT ret; > + > + ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,NULL,0); > + if (ret > MAX_PATH) { > + FIXME("Too long path!\n"); > + return FALSE; > + } > + ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,sizeof(szPath)/sizeof(WCHAR)); It should be sufficient to check return value of MultiByteToWideChar to detect an overflow, there is no need to call MultiByteToWideChar twice for that. -- Dmitry.

1 0

XEMBED Implementation
by Cloudor Pu 03 Dec '06

03 Dec '06

Hi, I find discussion about XEMBED implementation in this mailing list and that was 3 years ago. Is there now any usable implementation or examples for wine XEMBED plug? What I am doing is to embed IE into a GtkSocket. I wrote a standalone program compiled using winelib that can CreateWindow and embed IE. Can I CreateWindow using the XEMBED Id if there is already XEMBED implementation or can I just CreateWindow as a child of a GtkPlug which is a gtk-embeddee? Any advices or suggestions would be highly appreciated. Thank you! Regards, cloudor

3 3

Wined3d State management again
by Stefan Dösinger 02 Dec '06

02 Dec '06

Hi, I've done some more work on my state management, and I uploaded an updated patch to http://stud4.tuwien.ac.at/~e0526822/wined3d-statemgmt-2.tar.bz2 . Ok, so what's updated: * Pixel shaders: Should work now * GLSL shaders: Working too. Henris shader backend stuff is integrated in a messy way. * Offscreen rendering: Works with back buffer and pbuffer rendering, fbos not yet. * Stateblocks: Brute force integration by just scheduling all modified states for a reset. No display list yet * Blitting, render target unlocking: Enabled again, sets new gl states and schedules a reapplication of the modified states. Not a nice solution yet What is still missing: * Nv register combiners. I haven't found a way yet to build a texture stage -> texture unit mapping which I like. All the ways I could think of could potentially cause lots of unneccessary state changes. One nice thing I have noticed is that this changes give a huge performance gain in Half-Life 2(dxlevel 80, and 90). Dxlevel 80 is accelerated to approximately 150-200% of the former performance, and especially slow parts are faster now. This makes a really huge playability difference :-) There are some regressions too, especially related to texture loading(3Dmark2000), and some glsl crashes. The good part about this change is that I can send it in in very small patches, making regression testing much easier, contrary to the huge ddraw rewrite. Where to go from here? As long as nobody screams I'd start sending patches now. Its easier to catch regressions while sending small patches instead of hunting them on the blob I have here(and my messy patch history in my git tree). I'm also afraid that I get too far away from the main wined3d code(See the shader backend integration). We can discuss the code based on the small changes I'll send. Stefan

1 1

Re: msi 2: Remove redundant NULL checks before x_Release
by Mike McCormack 02 Dec '06

02 Dec '06

James Hawkins wrote: > Changelog: > * Remove redundant NULL checks before x_Release. obj->Release() will read the vtable pointer from the object, and that will crash if obj is NULL, so these checks are needed. The following code will crash: IUnknown *obj = NULL; IUnknown_Release(obj); You can see this looking at the definition of the IUnknown_Release macro: include/unknwn.h:#define IUnknown_Release(p) (p)->lpVtbl->Release(p) Mike

1 0

Video problems with FC6
by gslink 01 Dec '06

01 Dec '06

There is currently a bug in FC6 that affects Wine. If, with any Nvidia driver from any source, a program attempts to use accelerated video and the attached monitor uses digital feed the program will often crash the user session. This has been reported and is not a problem in Wine but a good many games that used to run under Wine now crash. Other cards were not tested but may be affected. It is hoped RH will fix this rather quickly.

2 1

Re: [PATCH 1/9] dinput: Move acquired flag to the base device class.
by Peter Oberndorfer 01 Dec '06

01 Dec '06

On Friday 01 December 2006 07:23, Vitaliy Margolen wrote: > Sorry ignore my previous patches. I didn't send them in the proper order. > > --- > dlls/dinput/device.c | 28 ++++++++++++++++++++++++++++ > dlls/dinput/device_private.h | 3 +++ > dlls/dinput/joystick_linux.c | 23 ++++++++--------------- > dlls/dinput/keyboard.c | 36 ++++++++++++++++-------------------- > dlls/dinput/mouse.c | 23 ++++++++--------------- > 5 files changed, 63 insertions(+), 50 deletions(-) > Hi, some questions/notices about this patch: Previously when the device was not acquired inside JoystickAImpl_Unacquire DIERR_NOTACQUIRED was returned. now you call IDirectInputDevice2AImpl_Unacquire, which returns DI_NOEFFECT when not acquired. but DI_NOEFFECT does not have high bit set so it won't trigger the FAILED macro. Do you know if the Acquire/Unacquire functions return value the same for all device types? In JoystickAImpl_Acquire you don't use your new IDirectInputDevice2AImpl_Acquire function but set This->base.acquired = 1; Is there a reason for this? In SysKeyboardAImpl_Unacquire you seem to call IDirectInputDevice2AImpl_Acquire? Greetings Peter

2 1

Re: user32: Factorize graphics driver's WindowCreate and ShowWindow in user32.
by Dmitry Timoshkov 01 Dec '06

01 Dec '06

"Pierre d'Herbemont" <pdherbemont(a)free.fr> wrote: > At the same time ShowWindow gets factorized because WindowCreate and > ShowWindow share both the use of WINPOS_MinMaximize, so it is easier to > factorize both functions in a single patch. In fact ShowWindow is > removed entirely from the drivers as it is driver independant. > > To properly factorize WindowCreate we have to export 3 new functions > from the graphics driver which are SetIconicState, SyncWindowStyle, > SystrayDockWindow. I'd suggest to leave ShowWindow in the driver's interface. You already have created 3 new entry points to replace its partial functionality, but still miss ShowWindow functionality for at least SW_RESTORE and SW_MAXIMIZE. Also did you run 'make test' after this patch? -- Dmitry.

2 3

Re: oleaut32: add VarBstrCmp binary comparison for LCID==0
by Dmitry Timoshkov 01 Dec '06

01 Dec '06

"Charles Blacklock" <charles(a)diagnos.co.uk> wrote: > + if (lcid == 0) > + { > + ret = memcmp(pbstrLeft, pbstrRight, min(SysStringByteLen(pbstrLeft), SysStringByteLen(pbstrRight))); > + if (ret < 0) > + return VARCMP_LT; > + if (ret > 0) > + return VARCMP_GT; > + if (SysStringByteLen(pbstrLeft) < SysStringByteLen(pbstrRight)) > + return VARCMP_LT; > + if (SysStringByteLen(pbstrLeft) > SysStringByteLen(pbstrRight)) > + return VARCMP_GT; > + return VARCMP_EQ; > + } It would be much more effective to call SysStringByteLen only once for each string instead of calling it again and again after a failing comparison. -- Dmitry.

2 2

How to embed wine into swt?
by Cloudor Pu 01 Dec '06

01 Dec '06

Hi, all I am developing an swt app only for gtk. I want to embed IE into this app. I can create a SWT.EMBEDDED composite and get its embededHandle (an integer). Then, how to do next? Thanks in advace! regards, cloudor

3 3

Re: msi: Add handling for the StartServices action [try2]
by Robert Shearman 30 Nov '06

30 Nov '06

James Hawkins wrote: > + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS); This can be just SC_MANAGER_CONNECT instead. -- Rob Shearman

1 0

Re: msi: Add handling for the StartServices action
by Alexandre Julliard 30 Nov '06

30 Nov '06

"James Hawkins" <truiken(a)gmail.com> writes: > + p = args; > + do > + { > + if ((q = strstrW(p, separator))) *q = '\0'; > + > + (*numargs)++; > + vector = msi_realloc(vector, *numargs * sizeof(LPWSTR)); > + vector[*numargs - 1] = p; > + } while (q); This won't work for more than one arg. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winemenubuilder: Look for supported color depths icons only. [resend]
by Frank Richter 30 Nov '06

30 Nov '06

On 30.11.2006 01:54, Vitaliy Margolen wrote: > Remove all the code simplification. This patch fixes icon extraction for > most steam games. All HL2 based games have .ico file with 32-bit colors. > Since we don't support those, Or write the icons as PNGs. -f.r.

2 4

Re: [AppDB] Allow maintainer request on app submission
by Chris Morgan 29 Nov '06

29 Nov '06

On Wednesday 29 November 2006 1:58 pm, Alexander Nicolaysen Sørnes wrote: > New and improved version. > > > Regards, > > Alexander N. Sørnes Looks a lot better. + // Allow user to apply as super maintainer if this is a new app + if(!$this->iAppId or $this->iAppId == "/") + { + if($this->bSuperMaintainerRequest) Why are you comparing the iAppId against a string containing a forward slash? + /* Approve automatically if submitted by an admin */ + if($_SESSION['current']->AppCreatedMustBeQueued()) + $this->sQueued = 'true'; + else + $this->sQueued = 'false'; + We probably want to make a new interface function here like MaintainerCreatedMustBeQueued() so we don't overload the meaning of this function. Today we aren't very particular about user roles but adding user roles is something we should do and keeping these privilages finely grained is useful. Also, the unit tests don't pass after this change. I suspect something related to the queueing changes: test_user_update_password() starting test_user_update_password() passed test_maintainer_getMaintainerCountForUser() starting test_maintainer_getMaintainerCountForUser() passed test_maintainer_getAppsMaintained() starting aAppsMaintained is null, we expected a non-null return value!<------------- test_maintainer_getAppsMaintained() failed! test_query_parameters() starting test_query_parameters() passed You can run these by going into the appdb/unit_test/ directory and executing ./run_tests from the command line. Make sure you don't have sendmail configured or you may end up sending emails around. We should really disable emailing at the start of the unit tests... Chris

1 0

Re: [AppDB] Allow maintainer request along with app submission
by Chris Morgan 29 Nov '06

29 Nov '06

On Wednesday 29 November 2006 10:08 am, Alexander Nicolaysen Sørnes wrote: > Allow the user to submit a maintainer request along with an application, by > ticking a checkbox. > If the application is accepted, the maintainer request is accepted as well; > and if it is deleted or marked as a duplicate, the request is deleted. > These maintainer requests are not displayed in the queue. > > Also, maintainer requests submitted by an administrator are now > automatically approved. > > > Regards, > > Alexander N. Sørnes + if($hResultMaint) + { + $oMaintainer = mysql_fetch_row($hResultMaint); + $oMaintainer = new Maintainer($oMaintainer[0]); + } We don't want to overload the $oMaintainer variable here. Also, we want to use the name of the field you are accessing and not the index so we aren't asking ourselves what $oMaintainer[0] means. Also you'll want to check that mysql_fetch_row() actually returns a row prior to creating a new maintainer based upon it. This logic isn't quite right: + /* Reject super maintainer request if app is deleted or a duplicate */ + if(($aClean['sSub'] == "Reject" || $aClean['sSub'] == "Delete") && $hResultMaint) + { + $oMaintainter->reject("Deleting super maintainer request along with application entry."); + } + Rejecting an application doesn't mean deleting it so we don't want to delete or reject the maintainer request right there. Users can modify and resubmit applications after they have been rejected. The application class already handles the case where an application is deleted by calling Maintainer::deleteMaintainersForApplication() from Application::Delete(). In application.php: + if(makesafe($_REQUEST['bSmaintainerRequest'])) We should make the variable explicit, bSuperMaintainerRequest makes the purpose of this variable more clear. It's probably better to add a new variable to the class that we document as being used during application creation. That way we can modify Application::GetOutputEditorValues() to retrieve the value from the $aValues array passed in. This avoids having to makesafe() a $_REQUEST value, something that we really don't want to do anymore because eventually I think we'll want to clear out all non-standard entries in $_REQUEST as an additional protection against attacks from poorly checked input. The text here in the queries is too specific: "AND queued = '?' AND maintainReason != 'This user submitted the application; auto-queued.' ORDER by submitTime"; The query will fail if the text changes and we should assume it will. We need to do something like: select count(*) as queued_maintainers from appMaintainers, appFamily where appFamily.queued = 'true' and appMaintainers.queued = 'true' and appMaintainers.appId = appFamily.appId and appMaintainers.iSubmitterId != appMaintainers.iUserId; We also need to add a comment to getQueuedMaintainerCount() and to the sql to note that we are excluding queued maintainers that have applications queued as we will automatically submit them when the application is submitted. Chris

1 0

Re: mlang: Make user32 a delay load import
by Alexandre Julliard 29 Nov '06

29 Nov '06

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > the only import from user32 which mlang uses is wsprintfW, and it's only used > by the DllRegisterServer code, so it's reasonable to move user32 to delay load > imports. As long as mlang imports ole32 which imports user32, there is nothing to gain by not importing user32 directly. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3d [1]: Remove AddRef from IWineD3DDevice_GetVertexDeclaration.
by H. Verbeet 29 Nov '06

29 Nov '06

On 28/11/06, Markus Amsler <markus.amsler(a)oribi.org> wrote: > The following patches remove refcounting in wined3d Getters. The > Setters/Creaters refcounting can't be removed right now, because of the > way implicit surfaces are currently handled. > > The idea is to simplify the d3dx<->wined3d refcount relation. Ideally > every wined3d object gets created with refcount=1, never AddRef'ed and > destroyed with the first Release call. Rob mentioned this violates COM > rules, but wined3d is wine internal. > > The GetParent patch doesn't remove wined3d refcounting, it seperates > d3dx and wined3d refcounting (Which was the reason I started to remove > AddRefs). > --- I think this is a bad idea, if only for consistency with other COM objects. I don't think wined3d being wine internal is a very good reason to violate COM rules. IMO if we're going to use COM we should stick to its rules. Also see my other mail.

4 10

Mozilla Sunbird install - Mystery bug #6613
by Mike McCormack 29 Nov '06

29 Nov '06

Anybody have time to help triage an install problem? Sunbird (and FireFox 2) installs run in an endless loop for some people. If you have time to try the install out and see if it works on your system, then comment on bug 6613, it would help out. http://bugs.winehq.org/show_bug.cgi?id=6613 I'm interested in which distro you're using, which filesystem, free disk space, locale, timezone, CPU (64bit or 32 bit?), etc. Mike

2 1

Re: ws2_32: Implement SO_GET_MAX_MSG_SIZE for getsockopt.
by Dmitry Timoshkov 28 Nov '06

28 Nov '06

"Kai Blin" <kai.blin(a)gmail.com> wrote: > +static void test_extendedSocketOptions() > +{ > + WSADATA wsa; > + SOCKET sock; > + struct sockaddr_in sa; > + int sa_len = sizeof(struct sockaddr_in); > + ULONG optval, optlen = sizeof(ULONG); Why to use ULONG if what you later cast it to is 'int *', and according to the docs (and your implementation) SO_MAX_MSG_SIZE expects sizeof(int) for the optval? ... > + if(bind(sock, (struct sockaddr *) &sa, (int)sa_len) < 0){ There is not need for a cast, sa_len has the type 'int'. > + trace("Failed to bind socket: 0x%08x\n", WSAGetLastError()); > + closesocket(sock); > + WSACleanup(); > + exit(1); This kills the whole process instead of terminating gracefully just this particular test. > + } > + > + ret = getsockopt(sock, SOL_SOCKET, SO_MAX_MSG_SIZE, (char *)&optval, (int *)&optlen); -- Dmitry.

2 1

Re: d3d [8]: Remove AddRef from IWineD3D*_QueryInterface. This also removes the implicit AddRef in IWineD3D*_GetContainer.
by H. Verbeet 28 Nov '06

28 Nov '06

I thought we discussed on IRC why this is a bad idea? Anyway, you can't do this. Removing the AddRef in QueryInterface is a pretty blatant violation of COM specs, and is pretty sure to cause problems somewhere. The caller of that function won't always know if the object it's called on is a wined3d object or not, and will depend on the behaviour of QueryInterface as defined by COM. Another thing is that know we get a situation where wined3d objects behave differently from all other COM objects. Also, if, as you stated earlier, the idea of these patches is *not* to get rid of COM in wined3d, I think they're a bad idea. Because in that case all it will do is make wined3d violate COM rules.

3 3

Re: [2/8] wined3d: Select the right shader backend when creating the device
by Ivan Gyurdiev 28 Nov '06

28 Nov '06

H. Verbeet wrote: > Changelog: > - Select the right shader backend when creating the device Imho there should be either ps_selected/vs_selected flags, or shader_backend flag, but definitely not both [ does not make sense ]. I'd opt for allowing different backends on pshader vs vshader. Maybe the current drawprim code is implemented to use ARB or GLSL for both, but that's not a good reason to disallow capability by writing future code as if the backend was unified. More importantly, you should be able to mix software shaders, with the other backends. I'm also not sure replacing all if statements with a function table is a good idea - restructuring code is dangerous, better not to do it unless new features are being added, or the code is being rewritten, or it's completely unmaintainable (I think that's a bit hard to argue).

3 9

Re: Vitaliy Margolen : wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Marcus Meissner 28 Nov '06

28 Nov '06

On Mon, Nov 27, 2006 at 12:51:03PM -0600, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: da3676229722eb76c8a91bf8165b09cc9e58455c > URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3676229722eb76c8a91bf81… > > Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> > Date: Fri Nov 24 13:53:29 2006 -0700 > > wineshelllink: Use FreeDesktop standard to create Wine menu structure. Umm. This means we (distributor) need to supply xdg utils also for all old distros, right? Ciao, Marcus

1 0

Re: ddraw/device.c: Fixed Thunk_IDirect3DDeviceImpl_1_AddViewport
by Stefan Dösinger 28 Nov '06

28 Nov '06

Am Montag 27 November 2006 11:23 schrieb Christoph Bumiller: > This is my first "patch" - I was trying an old game with wine > (Starfleet Academy), which crashed when using D3D, and I got the > following trace messages: > > trace:ddraw_thunk:Thunk_IDirect3DDeviceImpl_1_AddViewport > (0x1b440c)->(0x1f44f0) thunking to IDirect3DDevice3 interface. > trace:ddraw_thunk:Thunk_IDirect3DDeviceImpl_2_GetStats > (0x1b4408)->(0x1f44f0) thunking to IDirect3DDevice3 interface. > fixme:d3d7:IDirect3DDeviceImpl_3_GetStats (0x1b4408)->(0x1f44f0): Stub! > > This looks like Thunk_IDirect3DDeviceImpl_1_AddViewport called the > GetStats thunk > which called GetStats with the viewport as argument, where it set some > fields to > 0, which resulted in a segfault in IDirect3DViewportImpl_SetBackground > because IDirect3DViewportImpl->ddraw was NULL. Good catch, yeah, your patch is correct. I blamed native d3drm.dll of calling GetStats with a viewport, but it turns out that it was my fault in the end :-)

1 0

Re: riched20: Make ME_StreamIn create undos properly
by Matt Finnicum 28 Nov '06

28 Nov '06

I retract my claim of fixing that bug, but the patch still fixes the test / crashes / has great merit otherwise. --Matt On 11/27/06, Matt Finnicum <mattfinn(a)gmail.com> wrote: > This fixes an occasional crash/assertion in richedit that has been > around for a while. It also fixes a conformance test. I also believe > it fixed bug 6005 but I'll wait for the submitter to check it since I > found testing it confusing. > > Changelog: > Make ME_StreamIn create undos properly > --- > dlls/riched20/editor.c | 20 ++++++++++---------- > dlls/riched20/tests/editor.c | 2 -- > 2 files changed, 10 insertions(+), 12 deletions(-) > > >

1 0

Re: [Module] winex11.drv A new function.
by Dmitry Timoshkov 28 Nov '06

28 Nov '06

"Anatoly" <vostok(a)etersoft.ru> wrote: > +static struct codepair { > +unsigned short keysym; > + unsigned short ucs; > +} keysymtab[] = { Nothing prevents to make the keysymtab[] a const data. -- Dmitry.

1 0

Re: [winex11.drv/keyboard.c] Fix
by Dmitry Timoshkov 28 Nov '06

28 Nov '06

"Anatoly" <vostok(a)etersoft.ru> wrote: > --- x11drv.h 8 Nov 2006 20:14:19 -0000 1.10 > +++ x11drv.h 24 Nov 2006 09:38:39 -0000 > @@ -19,6 +19,8 @@ > * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA > */ > > +#include <config.h> You can't do that, a comment 2 lines further in that file explains what you need to do instead. -- Dmitry.

1 0

Re: mscoree [1/2]: Add missing stubs to the spec file
by Paul Chitescu 28 Nov '06

28 Nov '06

On Wed, 11 Oct 2006, James Hawkins wrote: > Hi, > > Changelog: > * Add missing stubs to the spec file. > > dlls/mscoree/mscoree.spec | 125 +++++++++++++++++++++++++++++++++++++++++++-- > 1 files changed, 120 insertions(+), 5 deletions(-) Interesting - what mscoree version are those ordinals from? I got mines from XP Home SP2. Paul Chitescu

3 8

Re: msxml3: Implement createProcessingInstruction with a stub PI object.
by Lei Zhang 28 Nov '06

28 Nov '06

domdoc.c:domdoc_createProcessingInstruction() uses xmlNewDocPI() from libxml2. This feature was added in libxml2 version 2.6.15. (released about 2 years ago) Anyone using an older distro with an outdated libxml2 (e.x. RHEL 3) will not be able to compile this code. On 11/16/06, Huw Davies <huw(a)codeweavers.com> wrote: > --- > dlls/msxml3/Makefile.in | 1 > dlls/msxml3/domdoc.c | 19 +- > dlls/msxml3/msxml_private.h | 1 > dlls/msxml3/pi.c | 544 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 563 insertions(+), 2 deletions(-) > > > > > >

1 1

Re: [3/8] wined3d: Create a separate function for sampling a texture
by Ivan Gyurdiev 27 Nov '06

27 Nov '06

H. Verbeet wrote: > There are a couple of instructions that have to sample from a texture, > right now most of them duplicate that code, and hardcode the texture > type. > > Changelog: > - Create a separate function for sampling a texture You should continue to use "add_param" or "get_register_name". There should be a single point in the code where register names are constructed, adding another one is a bad idea. This function is specifically tasked with naming registers, and taking into account things like relative addressing, so that when samplers support relative addressing in the future, changing the naming scheme would be trivial.

2 3

Re: [4/8] wined3d: Fix the texm3x3tex instruction to sample properly
by Mirek 27 Nov '06

27 Nov '06

Wow, I am impressed those patches fixed almost all tests in 3DMark 2003, test4 (mother nature), vertex shader and Ragtroll without any regression in other apps. Perfect work! Mirek H. Verbeet napsal(a): > The current code for texm3x3tex doesn't handle projected textures, and > actually uses the wrong argument to determine the sampler type. This > patch fixes the turtle in the 4th game test in 3DMark03. > > Changelog: > - Fix the texm3x3tex instruction to sample properly > > > ------------------------------------------------------------------------ > > --- > > dlls/wined3d/arb_program_shader.c | 6 ++++-- > dlls/wined3d/glsl_shader.c | 23 ++++++----------------- > 2 files changed, 10 insertions(+), 19 deletions(-) > > diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c > index 9f2be9b..7c73fd4 100644 > --- a/dlls/wined3d/arb_program_shader.c > +++ b/dlls/wined3d/arb_program_shader.c > @@ -781,13 +781,15 @@ void pshader_hw_texm3x3tex(SHADER_OPCODE > DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; > SHADER_BUFFER* buffer = arg->buffer; > SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; > + char dst_str[8]; > char src0_name[50]; > > pshader_gen_input_modifier_line(buffer, arg->src[0], 0, src0_name); > shader_addline(buffer, "DP3 TMP.z, T%u, %s;\n", reg, src0_name); > > - /* Cubemap textures will be more used than 3D ones. */ > - shader_addline(buffer, "TEX T%u, TMP, texture[%u], CUBE;\n", reg, reg); > + /* Sample the texture using the calculated coordinates */ > + sprintf(dst_str, "T%u", reg); > + shader_hw_sample(arg, reg, dst_str, "TMP"); > current_state->current_row = 0; > } > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 6be71bb..39ad693 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -1560,33 +1560,22 @@ void pshader_glsl_texm3x2tex(SHADER_OPCO > } > > /** Process the WINED3DSIO_TEXM3X3TEX instruction in GLSL > - * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculate coordinates */ > + * Perform the 3rd row of a 3x3 matrix multiply, then sample the texture using the calculated coordinates */ > void pshader_glsl_texm3x3tex(SHADER_OPCODE_ARG* arg) { > - > + char dst_str[8]; > char src0_str[100]; > char src0_name[50]; > char src0_mask[6]; > - char dimensions[5]; > DWORD reg = arg->dst & WINED3DSP_REGNUM_MASK; > - DWORD src0_regnum = arg->src[0] & WINED3DSP_REGNUM_MASK; > - DWORD stype = arg->reg_maps->samplers[src0_regnum] & WINED3DSP_TEXTURETYPE_MASK; > IWineD3DPixelShaderImpl* This = (IWineD3DPixelShaderImpl*) arg->shader; > SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; > - > - switch (stype) { > - case WINED3DSTT_2D: strcpy(dimensions, "2D"); break; > - case WINED3DSTT_CUBE: strcpy(dimensions, "Cube"); break; > - case WINED3DSTT_VOLUME: strcpy(dimensions, "3D"); break; > - default: > - strcpy(dimensions, ""); > - FIXME("Unrecognized sampler type: %#x\n", stype); > - break; > - } > > shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_name, src0_mask, src0_str); > shader_addline(arg->buffer, "tmp0.z = dot(vec3(T%u), vec3(%s));\n", reg, src0_str); > - shader_addline(arg->buffer, "T%u = texture%s(Psampler%u, tmp0.%s);\n", > - reg, dimensions, reg, (stype == WINED3DSTT_2D) ? "xy" : "xyz"); > + > + /* Sample the texture using the calculated coordinates */ > + sprintf(dst_str, "T%u", reg); > + shader_glsl_sample(arg, reg, dst_str, "tmp0"); > current_state->current_row = 0; > } > > > > ------------------------------------------------------------------------ > >

1 0

WineD3D state management
by Stefan Dösinger 27 Nov '06

27 Nov '06

Hi, In the past days I've been hacking on implementing my state management ideas, and I think I've come to a state where I don't have to be completely ashamed of my patches :-) First, what the code does NOT do yet: * Pixel Shaders, GLSL shaders: I only had my notebook with the M9 available, so I had no chance to implement them. Expect anything from broken graphics to the sudden release of Duke Nukem Forever if you try to use them. * Stateblocks * Register combiners: Disabled right now * Offscreen rendering: Causes random rendering garbage * 2D Blits: Commented out I have described the basic ideas in earlier mails(http://www.winehq.org/pipermail/wine-devel/2006-October/051868.html), so I don't describe them here again. I pretty much followed the original plan. Performance: One of the aims was to get better performance, since we apparently lost performance due to exessive state changes which eat CPU time and may require CPU-GPU syncs. My patches improve performance, but not as much as I originally hoped. I mainly have performance figures on the M9, and some basic testing on a gf7600. * Billboard dx8 sdk demo: got from 56fps to 107 fps :-) * Half-Life 1: Quite an improvement here too. 110->150 fps in one of my timedemos. The d3d renderer now outperforms the opengl renderer(140 fps). Both the billboard demo and hl1 hit a special rendering case(no stream source or fvf changes), this is nicely optimized by my changes. The gl renderer in hl1 uses immediate mode drawing while wined3d can use VBOs and array drawing, thus beeing faster on today's cards. * Battlefield 1942: Slight improvement too, 32->37 fps on my testing scene(spawn point on a u.s. carrier@full graphics). BF1942 exceeded the usual linux/windows driver performance ratio already before, so I assume I'm pretty much at the limit of my M9 here. * 3DMark2000: Unfortunately my driver crashes it before showing the scores, so I can only watch the in-test counter. Seems to get +5 to +10 fps in the low detail helicopter test(resolution independent). Native msvcrt.dll gets another +5 fps. I did only a short testing on my geforce7600: * 3dmark2000: gets 11500 3dmarks, with forcing drawStridedFast 14500. This is I believe the windows performance. However, the benchmark is too old to be meaningful. Before my state patches drawStridedFast scroe was around 13500 if I remember correctly, have to retest. * 3dmark2001: Low detail tests run at 150-300 fps, too fast for a meaningful result. high detail tests are slow and partially broken due to offscreen rendering. * Battlefield 1942: Runs at steady 100fps, but it did that already before So it seems that the state patches improve one bottleneck, but we have still many others(offscreen rendering, drawStridedSlow) left. The nvidia profiling driver may help here. Where to go from here: The state management was also planned to make implementing other features easier: * Multithreading: Make the dirty states list per context, and the helpers stored in the device too. Before applying the states activate the correct ctx for the thread. * Stateblocks: Basic idea is to record a display list and call it: glNewList(stateblock->listname, GL_COMPILE); for(i = 1; i <= STATE_HIGHEST; i++) { States[i].func(i, stateblock); } glEndList(); To apply the stateblock: glCallList(stateblock->listname); Ok, we need to split the list to apply only partial states, and the for loop can be improved to create a more efficient list. When the stateblock is altered we have to recreate the list. Thats the basic idea... * Offscreen rendering: Depends on wether we need seperate contexts for pbuffers. If yes, include it with the multithreading ctx finding, then apply the states, otherwise I think we can make selecting the pbuffer/fbo a state like all others. Has interactions with the viewport(I think) and the projection matrix(render_offscreen for upside down rendering) * sRGB textures: Dirtifies the sampler. All textures have now information about how many samplers they are bound to, and the number of one of the samplers. Phil? * Vertex samplers: Ivan said he'd need the state management for them. My idea is to build a d3d sampler - gl sampler mapping in SetTexture, which will be needed for register combiners too. Based on that we can bind vtf samplers in gl. I have no clean patches right now(45 chaotic patches), so I decided to share my wined3d directory. However, this is even compressed a bit big for a mailing list, so I uploaded it to http://stud4.tuwien.ac.at/~e0526822/wined3d-statemgmt.tar.bz2 Stefan

4 9

[wiki] multi language FrontPage
by Karsten Elfenbein 27 Nov '06

27 Nov '06

Hi, could a wiki admin please delete StartSeite on the wiki. According to http://wiki.winehq.org/HelpOnLanguages the wiki would use the english FrontPage if StartSeite doesn't exist. The german FrontPage isn't needed as the users don't get any information about wine there. Karsten

1 0

re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Dan Kegel 27 Nov '06

27 Nov '06

Vitaly wrote: > [xdg-utils] can not handle files with spaces in them. If that's true, it's a bug, and should be fixed. > Also they don't allow installing icons without specifying size. ? http://portland.freedesktop.org/xdg-utils-1.0/xdg-desktop-icon.html doesn't seem to talk about sizes at all. > [We can't just check the scripts into the wine source tree > and require their installation.] Why not? If they save effort and work well, let's do it. - Dan

7 6

Re: WineD3D state management
by Stefan Dösinger 27 Nov '06

27 Nov '06

Am Montag 27 November 2006 13:36 schrieben Sie: > Here is log from 3DMark 2005, some new games are not working with those > patches, 3DMark 2001 works but very bad in high details tests. 05 fails because of pixel shaders / glsl, and I know that 2001 is broken because my patch doesn't care for offscreen rendering yet. The mail was mainly to show what the code looks like, rather than doing extensive testing. Its time for testing once pshaders, glsl and offscreen rendering are in. Sorry - Should have mentioned that in my original mail

3 4

Re: sfd2ttf - modify buglist entry
by theun.wine.mail＠planet.nl 27 Nov '06

27 Nov '06

----- Oorspronkelijk bericht ----- Van: Markus Amsler <markus.amsler(a)oribi.org> Datum: zaterdag, november 25, 2006 11:05 pm Onderwerp: Re: sfd2ttf > theun.wine.mail(a)planet.nl wrote: > > Hi, > > > >>From the buglist I gather that the fontforge dependency is still > an issue. > > > > I've taken a look at the sources and I think a can strip it down to > > about 5 to 10 pages of code without a major rewrite. > > > > If this is acceptable, I'd be happy to spend my time. > > > > Are you sure? > > The problem is TTF generation. There's no library and it's not > trivial. > With 5 to 10 pages its impossible to generate a valid, non-empty > TTF file. > > I tried it once with dropping all unnecesary features (Apple > Advanced > Typography, Codpages, ...) and managed to get it down to 500 KB. > Without > Code obfuscation or comment dropping my guessed minimum was around > 350 > KB which would be around 150-200 pages of code. And we agreed > that's too > much, so I stopped my efforts. > You can download my latest version from [1]. There was also a > sfd2ttf > thread some time ago. > > So sfd2ttf is not feasible, and AJ wonn't commit TTF files so I > think we > could resolve this bug as WONTFIX. > > Markus > > [1] http://oribi.org/download/sfd2ttf.tar.gz > > Obviously, you've already put quite a bit of effort in sfd2ttf and the result is there. Since it also clear that the sfd2ttf entry in the buglist in far from up to date, I think it's a good idea to modify the entry to reflect the current status. Hopefully, this will prevent other potential contributers from wasting their time. Thanks, Theun van der Veen.

1 0

Yet another Wine success story: the CD-ROM in today's LA Times runs ok
by Dan Kegel 27 Nov '06

27 Nov '06

The Sunday Los Angeles Times had a CD-ROM insert today (a promo from Vonage about upcoming Hollywood films, go figure). With some trepidation, I tried it out with Wine... and it worked flawlessly (OK, maybe there was one audio stutter). It was a Flash 8 executable, and played very smoothly on my beefy Athlon laptop. Congratulations again to Team Wine... - Dan

1 0

Re: [AppDB] (resend) Add basic rating logic checking
by Chris Morgan 26 Nov '06

26 Nov '06

On Sunday 26 November 2006 12:49 pm, Alexander Nicolaysen Sørnes wrote: > Add basic rating logic checking, by asking the user to correct the error if > > - Installs? = No and the rating is Platinum > - Runs? is not 'yes' and rating is not Garbage > > > Regards, > > Alexander N. Sørnes When the erorr occurs is the users data retained so they can correct the error and continue without re-entering it? Chris

1 0

Re: [6/6] Add a partial COFF library support to the winedump
by Eric Pouech 26 Nov '06

26 Nov '06

Dmitry Timoshkov a écrit : > Hello, > > this implementation is able to parse imports libraries from the PSDK > and hopefully should help interested parties to check/synchronize ordinal > imports between Wine and Windows. > > The dumper is not able (yet) to parse import libraries with the long format > described in Portable Executable and Common Object File Format Specification > and uuid.lib. > > I think it's a bad idea to "force" the kind of file on the command line for dumping I'd rather see winedump guess the file format based on the file header, as we do for .exe, .dll, .mdmp, .pdb, .dbg... we didn't do it for emf and lnk because it seems they don't have a simple header to find it out, but .lib files definitively have you should also provide support for the -C option (symbol demangling) BTW, I have a couple of patches for debug files dumping (.pdb, .dbg...), that should help the dumping of debug information from a coff file (when needed) A+

2 3

sfd2ttf
by theun.wine.mail＠planet.nl 25 Nov '06

25 Nov '06

Hi, >From the buglist I gather that the fontforge dependency is still an issue. I've taken a look at the sources and I think a can strip it down to about 5 to 10 pages of code without a major rewrite. If this is acceptable, I'd be happy to spend my time. Theun van der Veen

2 1

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Vitaliy Margolen 25 Nov '06

25 Nov '06

Jeremy White wrote: > I would strongly recommend that this be done instead with > xdg-utils: > > http://portland.freedesktop.org/wiki/XdgUtils Sure, but they can not handle files with spaces in them. Also they don't work as-is with Wine's winemenubuilder. Which will require at least one more wrapper script. Also they don't allow installing icons without specifying size. And all in all it will be 4 large scripts instead of 1 small. > That will allow us to avoid the pain of maintaining our own > implementation, and allow distro vendors to make their distro > work with Wine just by supplying a working version of xdg-utils. It's been discussed multiple times here. And last time I remember agreement was not to introduce any additional dependencies. I have also checked, and not a single distro had those installed. I do not want to depend on something that's no one has, and no way to distribute it to users either. > The trick is whether or not we can persuade Alexandre and/or all > of the Wine packagers to include xdg-utils by default in distributions. That's not his call but packagers. And the problem will remain the same. Vitaliy.

2 1

Extending the testframe to cope with different windows versions
by Paul Vriens 25 Nov '06

25 Nov '06

Hi, after my last patch to yet 'remove' another test I had another look at tests.winehq.org. With the arrival of IE7 and of course a lot of changes to dll's (not even mentioning Vista) it looks like Windows versions are starting to behave not even close to similar. How can we deal with these differences? Several tests we have already include checks against a lot of possible return values or errorcodes. It's a shame when we have to stop running a test because it fails on 1 or more versions of Windows. If the end-result is that we start excluding more-and-more tests, then we should start doubting the usefulness of the regression tests. Any ideas ? Cheers, Paul.

4 5

Re: winex11.drv: Cast-qual warning fix + remove superfluous HeapFree()
by Paul Vriens 25 Nov '06

25 Nov '06

On Sat, 2006-11-25 at 12:41 +0000, Andrew Talbot wrote: > Changelog: > winex11.drv: Cast-qual warning fix + remove superfluous HeapFree(). > > diff -urN a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c > --- a/dlls/winex11.drv/clipboard.c 2006-10-09 20:06:04.000000000 +0100 > +++ b/dlls/winex11.drv/clipboard.c 2006-11-25 12:37:27.000000000 +0000 > @@ -511,7 +511,8 @@ > { > LPWINE_CLIPFORMAT lpFormat; > LPWINE_CLIPFORMAT lpNewFormat; > - > + LPWSTR new_name; > + > /* allocate storage for new format entry */ > lpNewFormat = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT)); > > @@ -521,14 +522,13 @@ > return NULL; > } > > - if (!(lpNewFormat->Name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > + if (!(new_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > { > WARN("No more memory for the new format name!\n"); > - HeapFree(GetProcessHeap(), 0, lpNewFormat); > return NULL; > } > > - strcpyW((LPWSTR)lpNewFormat->Name, FormatName); > + lpNewFormat->Name = strcpyW(new_name, FormatName); > lpNewFormat->wFlags = 0; > lpNewFormat->wFormatID = GlobalAddAtomW(lpNewFormat->Name); > lpNewFormat->drvData = prop; > > Just out of curiosity. Why is the HeapFree superfluous? It is allocated a few lines above and not free-ed in this fail condition. Cheers, Paul.

2 3

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Jeremy White 24 Nov '06

24 Nov '06

I would strongly recommend that this be done instead with xdg-utils: http://portland.freedesktop.org/wiki/XdgUtils That will allow us to avoid the pain of maintaining our own implementation, and allow distro vendors to make their distro work with Wine just by supplying a working version of xdg-utils. The trick is whether or not we can persuade Alexandre and/or all of the Wine packagers to include xdg-utils by default in distributions. Cheers, Jeremy Vitaliy Margolen wrote: > Change Log: > wineshelllink: Use FreeDesktop standard to create Wine menu structure. > > The major changes include: > - Use WM independent paths for all generated files. > - Dynamically build .menu and .directory files to create menu structure. > - Store icons in local icon store using their "cryptic" names to avoid conflicts. > - Number of other changes required for compatibility. > Note: .desktop links are still stored in a directory structure representing > Start Menu. This is done for possible future expansion. > > This new approach should work with KDE, Gnome and other XDG compliant managers. > I have verified this with recent versions of KDE and Gnome on several distros. > > However there are might be some problems with some custom changes some distros > might have. As an example SuSE has special feature that doesn't work right: > https://bugzilla.novell.com/show_bug.cgi?id=188110 > > The question of removing these links after programs have been uninstalled still open. > There are number of possible ways to solve it. The simplest would be symlinking > directories containing .desktop files. However that might brake whole menu structure. > --- > tools/wineshelllink | 258 ++++++++++++++++++++++---------------------------- > 1 files changed, 114 insertions(+), 144 deletions(-) > > > ------------------------------------------------------------------------ > > diff --git a/tools/wineshelllink b/tools/wineshelllink > index db65efa..5d91afc 100755 > --- a/tools/wineshelllink > +++ b/tools/wineshelllink > @@ -4,6 +4,7 @@ > # This is used by the IShellLink interface > # > # Copyright 2000 Alexandre Julliard > +# Copyright 2006 Vitaliy Margolen > # > # This library is free software; you can redistribute it and/or > # modify it under the terms of the GNU Lesser General Public > @@ -22,8 +23,7 @@ > > # Note that the link is a relative unix-style path name. Since the / character > # is not valid in Windows filenames it is an adequate separator to show the > -# menu structure. (This program may need to split the menu structure out for > -# implementing xdg-style menus) > +# menu structure. > > mode="" > args="" > @@ -82,176 +82,146 @@ if [ -z "$link" ] ; then > usage > fi > > -kde_entry() > +desktop_entry() > { > - xname=`basename "$link"` > - cat <<EOF > -# KDE Config File > -[KDE Desktop Entry] > -Name=$xname > -Exec=wine '$path' $args > -Type=Application > -Comment=$descr > -EOF > - [ -z "$workdir" ] || echo "Path=\"$workdir\"" > - [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > -} > - > -gnome_entry() > -{ > - xname=`basename "$link"` > cat <<EOF > [Desktop Entry] > -Name=$xname > +Name=$linkname > Exec=wine "$path" $args > Type=Application > -Comment=$descr > EOF > + [ -z "$descr" ] || echo "Comment=$descr" > [ -z "$workdir" ] || echo "Path=$workdir" > [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > } > > -mdk_entry() > +directory_entry() > { > - base=`basename "$link"` > - section=`dirname "$link"` > - [ -z "$icon" ] || xicon="icon=\"$xpmicon\"" > - pathmenu=`echo "$path" | sed 's+\\\\+\\\\\\\\+g'` > - echo "?package(local.Wine):needs=x11 section=\"/Wine/$section\" title=\"$base\" longtitle=\"$descr\" command=\"wine '$pathmenu' $args\" $xicon" > + cat <<EOF > +[Desktop Entry] > +Type=Directory > +EOF > + if [ "$1" == "wine" ] ; then > + echo "Name=Wine" > + echo "Icon=wine" > + else > + echo "Name=$1" > + echo "Icon=folder" > + fi > } > > # copy the icon file to a specified dir and set xpmicon to the resulting path > copy_icon() > { > - dir="$1" > - mkdir -p "$dir" > - mkdir -p "$dir/""`dirname "$link"`" || true > - if [ -f "$icon" ] > - then > - cp "$icon" "$dir/$link.xpm" > - xpmicon="$dir/$link.xpm" > - else > - xpmicon="" > - fi > + if [ -f "$icon" ] > + then > + xpmicon=`basename "$icon" .xpm` > + > + mkdir -p "$1" > + cp "$icon" "$1/$xpmicon.xpm" > + else > + xpmicon="" > + fi > } > > -# Debian/Mandrake > - > -type update-menus > /dev/null 2>&1 > -if [ $? = 0 -a $mode = "menu" ] > -then > - iconname="`basename "$link"`.xpm" > - dir="$HOME/.menu/icons" > - if [ -f "$icon" ] > - then > - mkdir -p "$dir" > - cp "$icon" "$dir/$iconname" > - xpmicon="$dir/$iconname" > - else > - xpmicon="" > - fi > - mdk_entry >> "$HOME/.menu/wine" > - if [ -d "/usr/lib/menu" ] && [ -w "/usr/lib/menu" ] > - then > - mdk_entry >> "/usr/lib/menu/wine" > - fi > - update-menus > /dev/null 2>&1 > -fi > +# XDG > > -# KDE > +xdg_config_dir="$XDG_CONFIG_HOME" > +[ -n "$xdg_user_dir" ] || xdg_config_dir="$HOME/.config" > +xdg_config_dir="$xdg_config_dir/menus/applications-merged" > > -if [ -d "$HOME/.kde" ] > -then > - kdeversion=0 > - if type kde-config >/dev/null 2>&1 > - then > - kdeversion=`kde-config -v | grep KDE: | sed -n "s/^KDE: $[^.]*$\..*$/\1/p"` > - fi > +xdg_data_dir="$XDG_DATA_HOME" > +[ -n "$xdg_data_dir" ] || xdg_data_dir="$HOME/.local/share" > > - if [ $kdeversion -ge 2 ] > - then > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop" > - elif [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +# Create common directories > +mkdir -p "$xdg_config_dir" > +mkdir -p "$xdg_data_dir/desktop-directories" > + > +get_menu_entries() > +{ > + tmp="$xdg_config_dir/$1.menu" > + > + if [ -r "$tmp" ] ; then > + awk ' > +BEGIN { RS="<" } > +/^Filename/ { > + if (match($0,/>/)) { > + print substr($0,RSTART+1) > + } > +}' $tmp > fi > - else > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk" > +} > > - # KDE 1.x kludge. Wake up KDE, if we can find kpanel running > - type kwmcom >/dev/null 2>/dev/null && \ > - ps u -C kpanel >/dev/null 2>/dev/null && \ > - kwmcom kpanel:restart > +# Input > +# menu file name > +# new item > +write_menu_file() > +{ > + tmpfile=`mktemp` > + ( > + echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' > + echo '"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">' > + echo '<Menu>' > + echo ' <Name>Applications</Name>' > + > + IFS="-" > + > + fullname='wine' > + for i in $1; do > + echo " <Menu>" > + echo " <Name>$fullname-$i</Name>" > + echo " <Directory>$fullname-$i.directory</Directory>" > + > + dir_file_name="$xdg_data_dir/desktop-directories/$fullname-$i.directory" > + if [ ! -f "$dir_file_name" ] ; then > + directory_entry "$i" > "$dir_file_name" > + fi > + test "$i" = "wine" || fullname="$fullname-$i" > + done > + > + echo " <Include>" > + > + IFS=" > +" > + for i in $(get_menu_entries "$1"); do > + test "$i" = "$2" && continue > + echo " <Filename>$i</Filename>" > + done > + > + # New record > + echo " <Filename>$2</Filename>" > + echo " </Include>" > + > + IFS='-' > + for i in $1; do > + echo " </Menu>" > + done > + echo '</Menu>' > + ) > $tmpfile > + chmod 0600 $tmpfile > + > + mv -f $tmpfile "$xdg_config_dir/$1.menu" > +} > > - elif [ -d "$HOME/Desktop" ] > - then > - kde_entry > "$HOME/Desktop/$link.kdelnk" > - # KDE 1.x kludge: wake up KDE, if we can find kfm running... > - type kfmclient >/dev/null 2>/dev/null && \ > - ps u -C kfm >/dev/null 2>/dev/null && \ > - kfmclient refreshDesktop > - fi > - fi > -fi > > -if [ -d "$HOME/.kde2" ] > -then > - copy_icon "$HOME/.kde2/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > - fi > - fi > -fi > +copy_icon "$xdg_data_dir/icons" > > -if [ -d "$HOME/.kde3/share/applnk" ] > -then > - copy_icon "$HOME/.kde3/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop3" ] > - then > - gnome_entry > "$HOME/Desktop3/$link.desktop" > - fi > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +linkname=`basename "$link"` > + > +if [ $mode = "menu" ] ; then > + mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" > + > + linkpath=`dirname "$link" | sed 's!/!-!g'` > + if [ "$linkpath" == "." ] ; then > + linkpath="" > + else > + linkpath="-$linkpath" > fi > - fi > -fi > > -# Gnome > - > -if [ -d "$HOME/.gnome" ] > -then > - copy_icon "$HOME/.gnome/apps/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.gnome/apps/Wine/$link.desktop" > - elif [ -d "$HOME/.gnome-desktop" ] > - then > - gnome_entry > "$HOME/.gnome-desktop/$link.desktop" > - fi > + desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" > + write_menu_file "wine$linkpath" "wine$linkpath-$linkname.desktop" > +else > + desktop_entry > "$HOME/Desktop/$linkname.desktop" > fi > > exit 0 > > > > ------------------------------------------------------------------------ > >

2 1

WM_SETFONT support
by Jing Li 24 Nov '06

24 Nov '06

Hi, I am building a dialog box which is used to display the license agreement information. I create my dialog template with the dialog editor. The dialog box contains the "Microsoft Rich Textbox Control" (ActiveX control). When the function DialogBox() is called to display the dialog box, the command "WM_SETFONT" is sent to my dialog procedure and the dialog box does not pop up at all. Do you know how to deal with this problem? The only information I've got from MSDN is "The dialog box procedure is responsible for saving the font handle passed with the WM_SETFONT message and selecting the handle into the display device context whenever it writes text to the window." Thanks a lot for your response and help. Regards, Jing

2 1

Re: winmm/wineoss: Cast-qual warning fix
by Marcus Meissner 24 Nov '06

24 Nov '06

On Thu, Nov 23, 2006 at 08:29:00PM +0000, Andrew Talbot wrote: > Changelog: > winmm/wineoss: Cast-qual warning fix. > > diff -urN a/dlls/winmm/wineoss/dscapture.c b/dlls/winmm/wineoss/dscapture.c > --- a/dlls/winmm/wineoss/dscapture.c 2006-11-13 17:34:40.000000000 +0000 > +++ b/dlls/winmm/wineoss/dscapture.c 2006-11-23 20:15:22.000000000 +0000 > @@ -853,7 +853,7 @@ > { > int i; > for (i = 0; i < length; i++) > - ((char *)dst)[i] = ((char *)src)[i]; > + ((char *)dst)[i] = ((const char *)src)[i]; > return dst; > } I really wonder why we do have our own memcpy() here and why there is a strange /* FIXME: using memcpy can cause strange crashes so use this fake one */ comment above it. Ciao, Marcus

2 1

Re: wine crashes on every win32 application (null ptr access early); winedbg adventures
by Saulius Menkevičius 24 Nov '06

24 Nov '06

alexis.deruelle wrote: > Try removing nvidia drivers if installed (see bug > http://bugs.winehq.org/show_bug.cgi?id=6735) > > Cheers, > > -- > Alexis > > > Accédez au courrier électronique de La Poste > sur www.laposte.net ou sur 3615 LAPOSTENET (0,34€ TTC /mn) > 1 Giga de stockage gratuit – Antispam et antivirus intégrés > > > > yep, that will be it.. thanks

1 0

[kernel32/console.c] A really very small fix.
by Anatoly 24 Nov '06

24 Nov '06

Hi! This fix change CodePage parameter in MultiByteToWideChar() type function from CP_ACP to return of GetConsoleOutputCP(). Now unicode symbols correct outs in wineconsole application (ex: Far). Changelog: Change codepage parameter in ReadConsoleA function. Change codepage parameter in ScrollConsoleScreenBufferA function. Index: dlls/kernel32/console.c =================================================================== RCS file: /home/wine/wine/dlls/kernel32/console.c,v retrieving revision 1.2 diff -u -p -u -r1.2 console.c --- dlls/kernel32/console.c 13 Oct 2006 10:27:18 -0000 1.2 +++ dlls/kernel32/console.c 24 Nov 2006 12:56:13 -0000 @@ -1200,7 +1199,7 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsole BOOL ret; if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) - ncr = WideCharToMultiByte(CP_ACP, 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); + ncr = WideCharToMultiByte(GetConsoleOutputCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; HeapFree(GetProcessHeap(), 0, ptr); @@ -2258,7 +2257,7 @@ BOOL WINAPI ScrollConsoleScreenBufferA(H CHAR_INFO ciw; ciw.Attributes = lpFill->Attributes; - MultiByteToWideChar(CP_ACP, 0, &lpFill->Char.AsciiChar, 1, &ciw.Char.UnicodeChar, 1); + MultiByteToWideChar(GetConsoleOutputCP(), 0, &lpFill->Char.AsciiChar, 1, &ciw.Char.UnicodeChar, 1); return ScrollConsoleScreenBufferW(hConsoleOutput, lpScrollRect, lpClipRect, dwDestOrigin, &ciw);

1 0

oleaut32: preliminary support for VT_DISPATCH as parameters to VarAdd (and other 2-operand operations) (RESEND)
by Alex Villacís Lasso 24 Nov '06

24 Nov '06

This is a preliminary patch to add support for VT_DISPATCH as parameters to VarAdd and other arithmetic operations with variants. The tests still "pass" in the sense that null VT_DISPATCH as issued by the tests are still rejected. I post this in the hope that it will be reviewed while I prepare a test case. Changelog: * Add support for receiving of VT_DISPATCH parameters in several operator functions by fetching the result value, then reissuing the same operation on result data. -- The following cryptic message was allegedly found in the inner edge of a Windows XP installation CD: 4F6E65204F5320746F2072756C65207468656D20616C6C2C204F6E65204F5320746F2066696E6420 7468656D2C0D0A4F6E65204F5320746F206272696E67207468656D20616C6C20616E6420696E2074 6865206461726B6E6573732062696E64207468656D2E0A It is rumored that only a true Unix Wizard can decypher this mysterious message, which supposedly encodes the true nature and purpose of the software.

2 1

[winex11.drv/keyboard.c] :Some fix and new function.
by Anatoly 24 Nov '06

24 Nov '06

Hi! This patch adds in /dlls/winex11.drv/ new module (ucs2keysym.c). Keyboard.c needs this module (function ucs2ketsym) for convert Unicode values to KeySym (See patch). Now in function X11DRV_VkKeyScanEx have removed FIXME,because function ucs2keysym returns correct keysym for wchar/ Changelog: Add function usc2keysym to convert from WCHAR values to Keysym. And now we have correct keycode for wchar values.

1 0

RFC: OpenAL Winmm driver and OpenAL32.dll thunk -- 2
by Nick Burns 24 Nov '06

24 Nov '06

(due to alut changes -- im asking for comments again -- if no problems -- ill try and submit) ------ Very cool audio worked for you as well... I too noticed the stereo effects in ut2004 and was taken aback -- first it was like -- its only on the right -- the the sound zipped over (never heard it like that before) good thing i had my airsick-bag handy. -- Ok those build failures are not totally unexpected -- depending on yer impl of openal -- they may have broken binary compat (i would 'nm' (list exported symbols of) your openal lib) and look for alut*. Very surprising that those functions are missing thou -- they are supposed to be there... freealut will fix the binary compat issues -- so its not the biggest problem -- what i could do is be safer with alut and have the configure test for each alut function that SHOULD be in the openal lib. OR better yet I can just IMPL the lame (OLD DEPRECATED) alut functions on top of openal inside openal32.dll -- this is probably the most portable and best solution... (I would just copy the impl from freealut) Looking at freealut... It is doable -- but it quite a bit of extra code... OR I can drop alut support altogether so the possibilities... 1 - require freealut 2 - impl alut functions on openal (using freealut code 5 functions -> 7 files) 3 - stub alut -- then use freealut to impl these (never used dead deprecated) functions 4 - remove alut I have choosen 3 -- attaching my patch with those changes in (and removed some meaningless comments) These stubs will FIXME -- if hit. The stubbing is controlled with 'USE_BUILTIN_ALUT' in openal.c --- btw if you dont have openal it will still build -- but spew at you if it is used -- that openal is not supported... - Nick >From: Stefan Dösinger <stefandoesinger(a)gmx.at> >To: wine-devel(a)winehq.org >CC: Nick Burns <adger44(a)hotmail.com> >Subject: Re: RFC: OpenAL Winmm driver and OpenAL32.dll thunk was >Re:OpenALand DirectSound >Date: Thu, 23 Nov 2006 21:56:52 +0100 > >Am Mittwoch 22 November 2006 11:44 schrieb Nick Burns: > > Good luck > > And may the Sound be with you... >Ok, after cleaning up the d3d mess in my tree a bit I gave your patch a >try: > >It applied fine, found AL/al.h after creating configure with autoconf, but >compilation failed in dlls/openal: > >openal.o: In function `wine_alutLoadWAVMemory': >/usr/src/wine/dlls/openal32/openal.c:327: undefined reference to >`alutLoadWAVMemory' >openal.o: In function `wine_alutLoadWAVFile': >/usr/src/wine/dlls/openal32/openal.c:327: undefined reference to >`alutLoadWAVFile' >openal.o: In function `wine_alutUnloadWAV': >/usr/src/wine/dlls/openal32/openal.c:326: undefined reference to >`alutUnloadWAV' >openal.o: In function `wine_alutExit': >/usr/src/wine/dlls/openal32/openal.c:326: undefined reference to `alutExit' >openal.o: In function `wine_alutInit': >/usr/src/wine/dlls/openal32/openal.c:326: undefined reference to `alutInit' >collect2: ld returned 1 exit status >winegcc: gcc failed. > >turned out that I needed the freealut package(gentoo). Stangely wine didn't >link against that lib automatically, I had to specify -lalut manually. > >Once the thing was compiled it worked perfectly with Jedi Academy :-) . >Wine >loaded openal32.dll builtin, and I had sound although I had no sound driver >selected in winecfg, which shows that the whole api rollercoaster is >bypassed. I had to configure the game to use openal first. > >The sound appeared strange at first, but after using headphones instead of >my >broken notebook speakers it turned out that those were just stereo effects >I >never heard before :-) . I also used to wonder what that promiently >marked "EAX Sound" option was that used to crash wine: Apparently exactly >that openal option I enabled first in the config files :-) > >/me joins the dark side of the sound > >Great job! >Stefan

1 0

RFC: OpenAL Winmm driver and OpenAL32.dll thunk was Re: OpenAL and DirectSound
by Nick Burns 23 Nov '06

23 Nov '06

Attached is my diff/patch for both an openal winmm driver and an openal32.dll thunk I would like to get these into wine -- please comment and stuff... ----Rant follows---- I seem to be making a habit of responding to myself... (this antihistamine is kicking in) Sometimes in life you feel retarded -- at least this time I have an excuse (I am sick) Anyhow -- I took all sorts of care to make sure that my OpenAL thunk was CDECL -- I even made sure that my spec file was perfect... But, I for some reason (unknown to even the person who wrote this code -- me) I used WINAPI (stdcall) in all the actual impl of the OpenAL thunk This explains why 'WINEDEBUG=relay' worked just fine -- but it failed in odd ways without the relay. I fixed that in my thunk -- and all seems well Tested with UT2004Demo (uses openal) hello_world.exe (al example code) playfile.exe (al example code) On Mac Book Pro running Mac OSX 10.4.8 and tot wine ut2004 notes -- in System (this can be done in the gui -- uncheck (yes uncheck -- the gui seems backwards) 'use system driver' under audio) mv DefOpenAL32.dll DefOpenAL32.dll_ UT2004.ini -- change [ALAudio.ALAudioSubsystem] UseDefaultDriver=False then run WINEDEBUG=trace+openal wine UT2004.exe Also I did play ut2004 -- menus and 2 bot matches sounded fine (though the mouse seems sluggish...) (not tested in linux) - Nick >From: "Nick Burns" <adger44(a)hotmail.com> >To: wine-devel(a)winehq.org >Subject: Re: OpenAL and DirectSound -- openal32.dll first pass >Date: Mon, 20 Nov 2006 20:43:05 -0800 > >Sorry for the double post -- was unaware that 'wine.dev(a)web.de' was the >same thing... > >I was sick last night and could not sleep .: I wrote up an openal32.dll >thunk. > >I will be testing with ut2004/and the demos (hello_world and playfile) very >soon... > >I get sound with tracing but not without -- when it works ill submit a >patch... > >- Nick > >>From: "Nick Burns" <adger44(a)hotmail.com> >>To: wine.dev(a)web.de, stefandoesinger(a)gmx.at >>CC: wine-devel(a)winehq.org >>Subject: Re: OpenAL and DirectSound >>Date: Mon, 20 Nov 2006 00:29:42 -0800 >> >>I would really like to get my openal driver into wine... >>But we should also have an openal32.dll >> >>For example -- on my Mac Book Pro running Mac OSX 10.4.8 and tot wine >>If a windows application uses openal it will go from openal(windows) -> >>dsound HEL(wine) -> openal(osx) >>This means the audio data has soo much fun traveling from api to api -- >>kinda like a code rollercoaster... >> >>Anyhow -- I will resubmit my openal patch -- maybe if I get some time I >>will try to make a thunk (or I could help ... or work more)... >> >>Also I would like help with my openal patch (get hw accel working for >>dsound and dsound3d) >> >>- Nick >> >>>From: Detlef Riekenberg <wine.dev(a)web.de> >>>To: Stefan Dösinger <stefandoesinger(a)gmx.at> >>>CC: wine-devel(a)winehq.org >>>Subject: Re: OpenAL and DirectSound >>>Date: Fri, 17 Nov 2006 20:06:01 +0100 >>> >>>On Fr, 2006-11-17 at 17:31 +0100, Stefan Dösinger wrote: >>> >>> > Just stumbled uppon some interesting thing about openal and >>>DirectSound 3D on >>> > vista: http://www.openal.org/openal_vista.html >>> > >>> > It sounds like openal will be the old way to get hw accelerated 3d >>>sound on >>> > vista, and creative is writing a dsound -> openal wrapper. Maybe it >>>gets a >>> > proper license so we can include it in wine :-) >>> > >>> > Maybe we should write an openal thunk for wine? Many games use openal, >>>and it >>> > seems that on wine openal uses directsound. That might work more >>>better and >>> > faster if we had a openal.dll which directly called linux openal :-) >>> > >>> > Just dropping the suggestions :-) >>> >>>There was something a while ago... >>> >>> >>>Google-Result for "wineopenal": >>>http://www.winehq.com/pipermail/wine-devel/2006-June/048273.html >>> >>> >>>-- >>> >>>By by ... Detlef >>> >> >> >> >> > > > >

3 10

Wine internship available
by Dan Kegel 23 Nov '06

23 Nov '06

James Hawkins is wrapping up his internship with me next month, and boy will I miss him! (See http://cia.navi.cx/stats/author/James%20Hawkins%20%3Ctruiken@gmail.com%3E for one reason why!) If you know any students who are good programmers who would like to get paid to work on Wine for a term, please send them to http://www.kegel.com/academy/ Thanks! - Dan

1 0

Suggestions on your FAQ
by M.D. van Es 23 Nov '06

23 Nov '06

Hello, Searching your website http://www.winehq.org for information on release 1.0of Wine, I read your FAQ and found some items that appear to be out of date. Hopefully, you'll find the following remarks helpful. 1. - following the link: http://www.winehq.com/site/docs/wine-faq/index#ARE-HERE-ANY-ALTERNATIVES-TO… - that is paragraph 2.3 - here is nothed that both VMWare and Win4Lin cost money. To my knowledge, some months ago, VMWare has released some free software, first the Viewer and later on the VMWare Server, although it remains closed source and in my opinion cannot be compared to Wine in that it does emulate. 2. - following the link: http://www.winehq.com/site/docs/wine-faq/index#WHEN-WILL-WINE-BE-FINISHED - that is paragraph 2.12 - The current release being referred to in the last line is Wine 0.9 to be released around September 30th 2005. I'm sure this is not valid. In fact, I read you were working on release 1.0 for the end of 2006. http://tweakers.net/nieuws/44607/Plannen-voor-Wine-1.0-gepresenteerd.html(D…. Succes with your work, I'm enjoying it every day. Regards, Martin van Es

1 0

Problem with optary.h
by Francois Gouget 23 Nov '06

23 Nov '06

I have done a test compilation of the Wine conformance tests on Windows and found that dlls/mshtml/tests/misc.c fails to compile because it depends on the optary.h header. The problem is that this header is not part of the Platform SDK or of the DirectX SDK. Apparently it is only part of the IE6 SDK, which seems to be deprecated now. At least that's the impression I got from: http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/samples/in… This raises the following questions: * Should optary.h really be in Wine's global include directory? * How should one go about compiling misc.c with the Windows headers? Should we add the IE SDK as a requirement for compiling the Wine conformance tests? * Is optary.h still present in the IE 7 SDK (or equivalent)? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Linux: the choice of a GNU generation

1 0

wine crashes on every win32 application (null ptr access early); winedbg adventures
by Saulius Menkevičius 22 Nov '06

22 Nov '06

Hi, Recently I got a problem that every app crashes on my system, like: -- begin winedbg output -- bob@highland:~$ winedbg ~/bin/win32/mirc/mirc.exe WineDbg starting on pid 0x12 First chance exception: page fault on read access to 0x00000000 in 32-bit code (0x00000000). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:00000000 ESP:0034eb18 EBP:0034ec3c EFLAGS:00210216( - 00 -RIAP1) EAX:00000000 EBX:00000000 ECX:00000000 EDX:000000c8 ESI:7c165cd0 EDI:00000000 Stack dump: 0x0034eb18: 7dcd7ffc 7c165cd0 7c16a430 7c16a430 0x0034eb28: 7c165cd0 7c167564 00000000 0034ec3c 0x0034eb38: 00000000 7deaf7d4 7c165cd0 0000005c 0x0034eb48: 00000000 7dcd778f 7c165cd0 7dcd7700 0x0034eb58: 00000001 7dcba235 7c165cd0 7c165cd0 0x0034eb68: 7c165cd0 7c066498 7c0f23c0 7d8d0000 Backtrace: =>1 0x00000000 (0x0034ec3c) 2 0x00000040 (0x00000002) 3 0x00000000 (0x00000000) 0x00000000: addb %al,0x0(%eax) Wine-dbg> -- end of winedbg -- I tried to remove wine configs, then recompile it from git, still the same. As a separate issue while trying to debug, I find winedbg not acting according to the man page (either that or I'm a dork). Would like to try to digest the stack frames: -- begin winedbg output -- Wine-dbg>l * 7dcd7ffc syntax error Wine-dbg>list * 7dcd7ffc syntax error Wine-dbg>list * 0x7dcd7ffc syntax error Wine-dbg>watch * 7dcd7ffc Watchpoint 1 at 0x00000007 syntax error Wine-dbg> -- end winedbg output -- So the "watch * <addr>" is working (kinda) properly, but list * doesn't. Am I missing something? Thanks

1 0

Re: d3d [1]: Remove AddRef from IWineD3DDevice_GetVertexDeclaration.
by Robert Shearman 22 Nov '06

22 Nov '06

Markus Amsler wrote: > @@ -4704,7 +4704,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl > TRACE("(%p) : ppDecl=%p\n", This, ppDecl); > > *ppDecl = This->stateBlock->vertexDecl; > - if (NULL != *ppDecl) IWineD3DVertexDeclaration_AddRef(*ppDecl); > return WINED3D_OK; > These patches violate COM rules. Is this for performance or other reasons? -- Rob Shearman

3 4

Re: [Try2] winhelp: add preliminary *.cnt file support (parser) - what's wrong?
by Kirill K. Smirnov 22 Nov '06

22 Nov '06

Hi! Please, tell me what's wrong with the patch? http://www.winehq.org/pipermail/wine-patches/2006-November/032984.html -- Kirill K. Smirnov

1 0

Looking for programmator to complete Direct3D 9.0c with GLSL in the Wine
by Mirek 22 Nov '06

22 Nov '06

Hi, I am not so good at programming in C, but I would like to be perfectly working in Direct3D 9.0c in the Wine. I dont know how much work is on so if someone cold told me how far is the complementation of the Direct3D 9.0c support in the Wine? Here is the offer for everyone: The aim is to prepare all apps below working under the Windows on Nvidia GF 6XXX series, with at least 50% of speed in WinXP. There is not needed sound after merging those patches in cvs main head. I offer 1 000 Euro or 1 200 dollars for this work. 3DMark 2003 3DMark 2005 3DMark 2006 CoD 2 NFS MW NFS Carbon ES IV Oblivion Please, contact me or send this to another person you would think could do it. Mirek Slugen Czech Republic

7 6

Question about unloadVertexData
by Stefan Dösinger 22 Nov '06

22 Nov '06

Hi Henri, I think you wrote unloadVertexData and unloadNumberedArrays. If I remember correctly those were needed to deactivate stream sources so they do not make issues in future draws where they shouldn't be active(3dmark2003 vbo performance regression). I noticed that loadVertexData already disables stream sources that aren't available in the current draws, while loadNumberedArrays doesn't. Do we need unloadVertexData at all? Or are non-drawing operations or drawStridedSlow affected by arrays? Background is that I'm atm working on using dirtification to manage stream sources. So far the state management is progressing nicely, what is missing atm are Shaders, re-enabling register combiners and fixing regressions which slipped in(hl2 and bf1942). Then optimizations :-) Stefan

2 1

Re: dlls: add wpcap
by James Hawkins 22 Nov '06

22 Nov '06

On 11/21/06, mengzhuo li <muziwind(a)yahoo.com.cn> wrote: > Changlog: add wpcap.dll.so in wine, there are some wpcap functions added, > not all. > note: before configure, you should use autoreconf to generate a new > configure file. > Why are you adding this dll? Does it fix some app? I just looked around and wpcap.dll is a third-party library used for packet capturing. This does not need to be implemented in Wine if that's the case, but I've added comments below for future reference. diff -uNr wine.orig/configure.ac wine/configure.ac --- wine.orig/configure.ac 2006-11-21 16:28:25.000000000 +0800 +++ wine/configure.ac 2006-11-21 16:30:51.000000000 +0800 @@ -1669,6 +1669,7 @@ dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile +dlls/wpcap/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile diff -uNr wine.orig/dlls/Makefile.in wine/dlls/Makefile.in --- wine.orig/dlls/Makefile.in 2006-11-21 16:27:59.000000000 +0800 +++ wine/dlls/Makefile.in 2006-11-21 16:30:51.000000000 +0800 @@ -125,6 +125,7 @@ ntdsapi \ objsel \ odbc32 \ + wpcap \ odbccp32 \ ole32 \ oleacc \ @@ -559,6 +560,7 @@ ntdll/libntdll.$(IMPLIBEXT) \ ntdsapi/libntdsapi.$(IMPLIBEXT) \ odbc32/libodbc32.$(IMPLIBEXT) \ + wpcap/libwpcap.$(IMPLIBEXT) \ odbccp32/libodbccp32.$(IMPLIBEXT) \ ole32/libole32.$(IMPLIBEXT) \ oleacc/liboleacc.$(IMPLIBEXT) \ @@ -820,6 +822,9 @@ odbc32/libodbc32.$(IMPLIBEXT): odbc32/odbc32.spec $(WINEBUILD) @cd odbc32 && $(MAKE) libodbc32.$(IMPLIBEXT) +wpcap/libwpcap.$(IMPLIBEXT): wpcap/wpcap.spec $(WINEBUILD) + @cd wpcap && $(MAKE) libwpcap.$(IMPLIBEXT) + odbccp32/libodbccp32.$(IMPLIBEXT): odbccp32/odbccp32.spec $(WINEBUILD) @cd odbccp32 && $(MAKE) libodbccp32.$(IMPLIBEXT) diff -uNr wine.orig/dlls/wpcap/Makefile.in wine/dlls/wpcap/Makefile.in --- wine.orig/dlls/wpcap/Makefile.in 1970-01-01 08:00:00.000000000 +0800 +++ wine/dlls/wpcap/Makefile.in 2006-11-21 16:30:51.000000000 +0800 @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = wpcap.dll +IMPORTLIB = libwpcap.$(IMPLIBEXT) +IMPORTS = kernel32 ntdll +EXTRAINCL = @X_CFLAGS@ +EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ -lpcap + I'm not a Makefile pro by any means, but why do you need all thse EXTRALIBS? Also, you're going to have to add a configure check for -lpcap. +C_SRCS = \ + wpcap.c + +@MAKE_DLL_RULES@ + +### Dependencies: diff -uNr wine.orig/dlls/wpcap/wpcap.c wine/dlls/wpcap/wpcap.c --- wine.orig/dlls/wpcap/wpcap.c 1970-01-01 08:00:00.000000000 +0800 +++ wine/dlls/wpcap/wpcap.c 2006-11-21 16:30:51.000000000 +0800 @@ -0,0 +1,73 @@ +#ifdef WIN32 +#undef WIN32 +#endif +#include <pcap.h> You need to add the GPL license to the top of every source file. Check out any other source file in the code base for examples. +void wine_pcap_close(pcap_t * a) +{ + pcap_close(a); +} + Assuming the name of the API is pcap_close, you'll have to define it like this: void WINAPI pcap_close(pcap_t *a) WINAPI is needed, but the wine_ prefix is not. +pcap_t * wine_pcap_open_live(const char * a, int b, int c , int d , char * e ) +{ + return pcap_open_live(a,b,c,d,e); +} + +int wine_pcap_findalldevs(pcap_if_t ** a, char * b) +{ + return pcap_findalldevs(a,b); +} + +void wine_pcap_freealldevs(pcap_if_t * a) +{ + pcap_freealldevs(a); +} + +int wine_pcap_compile(pcap_t * a, struct bpf_program * b, char * c, int d, bpf_u_int32 e ) +{ + return pcap_compile(a,b,c,d,e); +} + +int wine_pcap_setfilter(pcap_t * a, struct bpf_program * b) +{ + return pcap_setfilter(a,b); +} + +int wine_pcap_datalink(pcap_t * a) +{ + return pcap_datalink(a); +} + +const u_char* wine_pcap_next(pcap_t * a, struct pcap_pkthdr * b) +{ + return pcap_next(a,b); +} + +int wine_pcap_setbuff(pcap_t * p, int dim) +{ + //return pcap_setbuff(p ,dim); + return 0; +#if 0 + #ifdef HAVE_REMOTE + if (p->rmt_clientside) + { + /* Currently, this is a bug: the capture buffer cannot be set with remote capture */ + return 0; + } +#endif /* HAVE_REMOTE */ + + if (p->adapter==NULL) + { + snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "The kernel buffer size cannot be set while reading from a file"); + return -1; + } + + if(PacketSetBuff(p->adapter,dim)==FALSE) + { + snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "driver error: not enough memory to allocate the kernel buffer"); + return -1; + } + return 0; +#endif +} + + diff -uNr wine.orig/dlls/wpcap/wpcap.spec wine/dlls/wpcap/wpcap.spec --- wine.orig/dlls/wpcap/wpcap.spec 1970-01-01 08:00:00.000000000 +0800 +++ wine/dlls/wpcap/wpcap.spec 2006-11-21 16:30:51.000000000 +0800 @@ -0,0 +1,9 @@ +@ stdcall pcap_close(ptr) wine_pcap_close +@ stdcall pcap_open_live(str long long long str) wine_pcap_open_live +@ stdcall pcap_findalldevs(ptr str) wine_pcap_findalldevs +@ stdcall pcap_freealldevs(ptr) wine_pcap_freealldevs +@ stdcall pcap_compile(ptr ptr str long long) wine_pcap_compile +@ stdcall pcap_setfilter(ptr ptr) wine_pcap_setfilter +@ stdcall pcap_datalink(ptr) wine_pcap_datalink +@ stdcall pcap_next(ptr ptr) wine_pcap_next +@ stdcall pcap_setbuff(ptr long) wine_pcap_setbuff As I said before, you don't need to forward these, just name the APIs like they are in the spec file and it should work. -- James Hawkins

2 2

Re: wined3d: Don't refcount in getter functions.
by Stefan Dösinger 22 Nov '06

22 Nov '06

> If this is complete garbage please let me know, so i can stop working on I think these patches make sense :-) Preferably we should get completely rid of COM in wined3d. Well ok, the interface can stay, but the refcounting is pain...

1 0

Re: [5/6] wined3d: Make CreateFakeGLContext thread safe.
by Dmitry Timoshkov 22 Nov '06

22 Nov '06

"Jan Zerebecki" <jan.wine(a)zerebecki.de> wrote: > static void WineD3D_ReleaseFakeGLContext(void) { > GLXContext glCtx; > > + EnterCriticalSection(&wined3d_fake_gl_context_cs); > + > if(!wined3d_fake_gl_context_available) { > TRACE_(d3d_caps)("context not available\n"); > + LeaveCriticalSection(&wined3d_fake_gl_context_cs); > return; > } You could avoid a call to LeaveCriticalSection by moving EnterCriticalSection after the wined3d_fake_gl_context_available check. -- Dmitry.

2 1

Re: user32: add a test for window width and height fixup when width or height exceed a short storage or are negative.
by Dmitry Timoshkov 22 Nov '06

22 Nov '06

"Pierre d'Herbemont" <pdherbemont(a)free.fr> wrote: > This is a test for the CreateWindow call to see what is done with width > or height that exceed the size of a short storage, or are negative. > Hence we could decide if the fixup should be moved in user32 from > winex11.drv. > > This test is passing under Wine, but I didn't test with real Windows, so > I guess I better monitor: > http://test.winehq.org/data Under XP SP2 with your test case I get: win.c:3725: Test failed: expected rect.right 65535 != 65539 win.c:3726: Test failed: expected rect.bottom 65535 != 65539 I'm attaching a more comprehensive test which passes for me under XP SP2. -- Dmitry.

1 0

Re: user32: add a test for window width and height fixup when width or height exceed a short storage or are negative.
by James Hawkins 22 Nov '06

22 Nov '06

On 11/21/06, Pierre d'Herbemont <pdherbemont(a)free.fr> wrote: > This is a test for the CreateWindow call to see what is done with width > or height that exceed the size of a short storage, or are negative. > Hence we could decide if the fixup should be moved in user32 from > winex11.drv. > > This test is passing under Wine, but I didn't test with real Windows, so > I guess I better monitor: > http://test.winehq.org/data > > Is that the best way to go? > No, you need to either test it in Windows yourself, or have someone else run the tests on Windows for you to verify what you've written is correct. It won't be accepted otherwise. -- James Hawkins

1 0

Wine 0.9.25 full of regressions!
by Mirek 21 Nov '06

21 Nov '06

Hi, i just instaled wine 0.9.25 (i had 0.9.24) and it is full of regressions, why is this possible, why is not there someone who can test wine before it came out to new release? 1. 3DMark 2003 - cant open setigns menu 2. 3DMark 2003 - with GLSL, almost all working test are broken (bad graphic) 3. 3DMark 2003 - with ARB is about 25% slower 4. HL2 Episode One - Some characters are black 5. NFS: MW - with ARB it is slower 6. W3 - cannot run, because of Opengl init 7. W3 FT - same as W3 8. nVidiaSDK - opengl demos in nVidia are not working anymore 9. nVidiaSDK - some Direct3D demos are broken more than in release 0.9.24 9. Prey - not working This is pretty big list, almost half of my apps are not working, or working worst than before, it is sad. Mirek Slugen

10 19

Re: winequartz.drv: Add mouse events handling and stub window creation support. (take2)
by Detlef Riekenberg 21 Nov '06

21 Nov '06

On Mo, 2006-11-20 at 16:48 +0100, Pierre d'Herbemont wrote: > +/* --------------------------------------------------------------------- > + * send_mouse_input > + */ > +static void send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y, > + DWORD data, DWORD time, DWORD extra_info, UINT injected_flags ) > +{ > + POINT pt; > + > + pt.x = x; > + pt.y = y; Hi. Some more questions. POINT pt is never used for more than accessing pt.x and pt.y in this function, which is really useless, as both values are fn-parameters. Is there code waiting, that use pt? A comment would be nice for this case. Did you already try to replace "DWORD x, DWORD y" with "POINT pt" for the driver-internal Functions? > +BOOL QDRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) > + if (cs->cx > 65535) > + { > + ERR( "invalid window width %d\n", cs->cx ); > + cs->cx = 50; > + } Setting the minimal or maximal size to 50 looks strange for me. Is this an leftover from debugging? > \ No newline at end of file This is easy to fix. -- By by ... Detlef

6 6

Re: rpcrt4: Allow applications to specify authentication levels other than connect in RpcBindingSetAuthInfoA/W.
by Kai Blin 21 Nov '06

21 Nov '06

On Tuesday 21 November 2006 14:09, Robert Shearman wrote: > + /* FIXME: the mapping should probably be retrieved using SSPI somehow */ > + if (AuthnLevel == RPC_C_AUTHN_LEVEL_DEFAULT) > + AuthnLevel = RPC_C_AUTHN_LEVEL_NONE; I figure this could be done using QueryContextAttributes, I guess. So far this is a bit stubbed out, but it should basically do the right thing (tm) for integrity and confidentiality. Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: user32: Add a rudimentary WM_SETFONT message test for the static control, make it pass under Wine
by Alexandre Julliard 21 Nov '06

21 Nov '06

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > @@ -496,7 +504,10 @@ static LRESULT StaticWndProc_common( HWN > { > SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); > if (LOWORD(lParam)) > - STATIC_TryPaintFcn( hwnd, full_style ); > + { > + InvalidateRect( hwnd, NULL, TRUE ); > + UpdateWindow( hwnd ); > + } A single RedrawWindow call would be more efficient. > @@ -673,9 +684,7 @@ static void STATIC_PaintTextfn( HWND hwn > if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); > } > > - if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return; > - if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; > - SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text ); > + if (!(len = InternalGetWindowText( hwnd, text, sizeof(text)/sizeof(WCHAR) ))) return; You are introducing a hard-coded limit to the length of the text, that's not a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

FW: Re: Hebrew translation of wine
by Scott Ritchie 21 Nov '06

21 Nov '06

Of course, translations are always welcome. The trick is, I really have no idea how Rosetta works or which parts belong in Ubuntu Rosetta and which parts belong in upstream Wine. Therefore I'm forwarding your message to wine-devel, hopefully someone there can enlighten me. Thanks, Scott Ritchie On Mon, 2006-11-20 at 18:53 +0200, Amichai Teumim wrote: > Hi Scott > > I would like to translate Wine to Hebrew for Ubuntu using Rosetta. > > Would you approve of this? > > Thanks > > Amichai

4 4

Re: d3d [9]: Remove AddRef from IWineD3DResource_GetDevice.
by Markus Amsler 21 Nov '06

21 Nov '06

Don't apply d3d[9] - d3d[14], they are not independent and I missed one GetDevice AddRef. But I strongly assume they were already dropped for other reasons. Anything wrong with them? Markus

1 0

re: OLE Automatization Linux's OpenOffice from wine app
by Dan Kegel 21 Nov '06

21 Nov '06

Kochmin wrote: > I have windows application wich use OLE Automatization to fill-in > OpenOffice document It's create OleObject like > OpenOffice := CreateOleObject('com.sun.star.ServiceManager'); >.. > How can I rewrite it, or use any tools, to work when OpenOffice is > installed on Linux, and my application runs in wine? Try installing the Windows version of OpenOffice in Wine. - Dan

4 5

re: What operating systems will Winelib run on non-x86 systems?
by Dan Kegel 21 Nov '06

21 Nov '06

Hi Wei Li, last year, you asked in http://www.winehq.org/hypermail/wine-users/2004/06/0086.html > I could not find the info regarding what operating systems > (such as AIX 5L v5.2, HP-UX 11i, Solaris Release Level > 9) will Winelib run on non-x86 machines. I'll really > appreciate it if someone can provide my related link or > info. I can only find the following link regarding the > supporting OS but it does not provide Winelib's supporting > OS info: > http://www.winehq.org/site/docs/wine-faq/index 3.1. > Under what hardware > platform(s) and operating system(s) will Wine(Lib) run? I'm sorry nobody got back to you -- the wine-devel mailing list might have been a better place to ask. I believe winelib runs on the following non-x86 operating systems: Linux, Solaris, Mac OS X, and FreeBSD. There's no reason in principle it couldn't run on AIX or HP/UX. Some work has been done on an HP/UX port, but some assembly would be required to complete it: http://www.winehq.com/site/?issue=241#HP-UX%20Port Cheers, Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 2

OpenAL and DirectSound
by Stefan Dösinger 21 Nov '06

21 Nov '06

Hi, Just stumbled uppon some interesting thing about openal and DirectSound 3D on vista: http://www.openal.org/openal_vista.html It sounds like openal will be the old way to get hw accelerated 3d sound on vista, and creative is writing a dsound -> openal wrapper. Maybe it gets a proper license so we can include it in wine :-) Maybe we should write an openal thunk for wine? Many games use openal, and it seems that on wine openal uses directsound. That might work more better and faster if we had a openal.dll which directly called linux openal :-) Just dropping the suggestions :-) Stefan

3 3

Regression in wininet between 0.9.23 and 0.9.24
by Pavel Troller 21 Nov '06

21 Nov '06

Hi! I would like to report a regression in wininet.dll, causing Dreamcom Kubik SMS to crash as follows: wine: Unhandled page fault on read access to 0x00000000 at address 0x7e687b86 (thread 0013), starting debugger... Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7e687b86). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7e687b86 ESP:7d936820 EBP:7d9368d8 EFLAGS:00010246( - 00 -RIZP1) EAX:00000016 EBX:7e6a6728 ECX:00000002 EDX:00000000 ESI:00000000 EDI:00000000 Stack dump: 0x7d936820: 7b9177e0 7d936834 00000000 7e6a2520 0x7d936830: 001f3538 7e6a6728 001f3538 20000013 0x7d936840: 7d936900 7e68763b 00000000 f7cc0a2e 0x7d936850: 00000013 00000000 01160230 00000000 0x7d936860: 00010000 7b87fac6 7d9368b8 7bc35945 0x7d936870: 00001257 00010000 0010bdd0 7e68e354 Backtrace: =>1 0x7e687b86 in wininet (+0x17b86) (0x7d9368d8) 2 0x7e687f6b HttpQueryInfoW+0x1cb in wininet (0x7d936918) 3 0x7e6884d0 HttpQueryInfoA+0xc0 in wininet (0x7d936968) 4 0x0057a62c in dreamcom (+0x17a62c) (0x7d9369c8) 5 0x00579fb0 in dreamcom (+0x179fb0) (0x7d9369f0) 6 0x00578d0b in dreamcom (+0x178d0b) (0x7d9369f8) 7 0x7b88b488 in kernel32 (+0x6b488) (0x7d936ac8) 8 0x7bc5b570 in ntdll (+0x4b570) (0x7d9373c8) fixme:dbghelp:elf_load_debug_info_from_map Alpha-support for Dwarf2 information for libpthread.so.0 9 0xf7dd5528 start_thread+0xb8 in libpthread.so.0 (0x7d9374b8) 10 0xf7d6021e __clone+0x5e in libc.so.6 (0x00000000) 0x7e687b86: cmpw $0,0x0(%edx) I was doing "cvs bisect" in dlls/wininet and found that the problem lies between .23 and .24 - from .24 on it crashes, .23 is still OK. So now I'm using HEAD wine with .23 wininet and the program is happy. With regards, Pavel Troller

2 1

Tests for the Win16-API
by Detlef Riekenberg 20 Nov '06

20 Nov '06

Hi. During some bug-hunting, i found a Problem with the 16Bit version of GetSystemDirectory. (WinXP returned "%windir%\system", wine: "%windir%\system32") The bad thing is, that we have no tests for the 16Bit API at all. I already tried Open Watcom on linux a while ago, and with the attached Patch for "include/wine/test.h", i'm able to cross-compile a standalone 16Bit test with Open Watcom 1.6beta (See attached Example: "sysdir.c") The test still need the header from the compiler, as "windows.h" from wine is not Win16-aware. Including Win16-Tests in the wine testsuite is still not possible yet (stdio limitations in Win16), but this Patch is a first step. Comments are welcome. Thanks -- By by ... Detlef

1 0

Re: dlls/ws2_32: Note and patch about strange UDP packets
by Detlef Riekenberg 20 Nov '06

20 Nov '06

On Mo, 2006-11-20 at 11:22 +0100, Florian Echtler wrote: Welcome to wine. > the software was sending UDP packets to IP _254_.255.255.255 > (note the first octet). After some experimentation, I noticed that while Windows just > sends this as a broadcast packet, Are you sure, that the Function on Windows also get this wrong IP? If that is the case, then a fix is needed for the customized tracking software. There are various API-Hook Tools on the Net. Wine is also a great Software to make Application-Bugs visible. Did you already create a simple test-App, that used the IP 254.* and verified, that Windows interpreted that as Broadcast? A test for the wine testsuite is always prefered to verify, what Windows does. > I therefore build a small patch which checks for these strange adresses > and replaces them by broadcast adresses. You modify the beavior for a complete "/4" - Subnet. Is this really the same thing, what Windows does? Reimplement a Windows-Bug will require more tests. It's also Possible, that a different Function in wine malformed the IP. You need some tests to verify this. > However, the question now is whether it makes sense to include > this patch into Wine? Even, when tests verified, that Windows is not RFC compliant for this case, the tracking software should be fixed. Your Patch need some polish: - SPACE/TAB mixing - No C++ comments allowed - fprintf is wrong here. We have macros for this: (include/wine/debug.h) - > as I have not subscribed to the list. Please subscribe, it's easier for you to follow the discussion. -- By by ... Detlef

1 0

Re: dlls/ws2_32: Note and patch about strange UDP packets
by Jesse Allen 20 Nov '06

20 Nov '06

On 11/20/06, Florian Echtler <echtler(a)in.tum.de> wrote: > Hi everybody, > > we are using a customized tracking software. This is a windows software, > but we decided some time ago that it would be more flexible to be able > to use it under Linux, too, so I gave it a try with Wine. > > As this software communicates with customized (expensive) cameras via > UDP, I noted a strange bug in the Wine debug channel "winsock": the > software was sending UDP packets to IP _254_.255.255.255 (note the first > octet). After some experimentation, I noticed that while Windows just > sends this as a broadcast packet, Linux rejects this address, because > the corresponding RFC states that the network 240.0.0.0/4 is reserved > and should not be used. > > I therefore build a small patch which checks for these strange adresses > and replaces them by broadcast adresses. This enabled our software to > work. However, the question now is whether it makes sense to include > this patch into Wine? On the one hand, it increases the similarity > between Wine's behaviour and Windows's, OTOH it decreases Wine's RFC > compliance.. > > Comments? Please CC me as I have not subscribed to the list. > > Thanks, Yours, Florian > > You can use a iptables rule to do the same thing. Right? Jesse

2 1

oleaut32: preliminary support for VT_DISPATCH as parameters to VarAdd (and other 2-operand operations)
by Alex Villacís Lasso 20 Nov '06

20 Nov '06

This is a preliminary patch to add support for VT_DISPATCH as parameters to VarAdd and other arithmetic operations with variants. The tests still "pass" in the sense that null VT_DISPATCH as issued by the tests are still rejected. I post this in the hope that it will be reviewed while I prepare a test case. Changelog: * Add support for receiving of VT_DISPATCH parameters in several operator functions by fetching the result value, then reissuing the same operation on result data. -- The following cryptic message was allegedly found in the inner edge of a Windows XP installation CD: 4F6E65204F5320746F2072756C65207468656D20616C6C2C204F6E65204F5320746F2066696E6420 7468656D2C0D0A4F6E65204F5320746F206272696E67207468656D20616C6C20616E6420696E2074 6865206461726B6E6573732062696E64207468656D2E0A It is rumored that only a true Unix Wizard can decypher this mysterious message, which supposedly encodes the true nature and purpose of the software.

1 0

Re: winequartz.drv: Second glance at Window support.
by Alexandre Julliard 20 Nov '06

20 Nov '06

Pierre d'Herbemont <pdherbemont(a)free.fr> writes: > +static inline void * BindCarbonFunctions(void) > +{ > + void * HIToolBoxDLHandle = dlopen("/System/Library/Frameworks/Carbon.framework/Frameworks/HIToolbox.framework/HIToolbox", RTLD_LAZY | RTLD_LOCAL); > + > + if (!HIToolBoxDLHandle) { > + fprintf(stderr, "%s impossible d'ouvrir HIToolBoxDLHandle\n", __FUNCTION__); > + return nil; > + } > +#define LOAD_FUNCTION(f) \ > + if((carbonPtr_##f = dlsym(HIToolBoxDLHandle, #f)) == NULL) \ > + { \ > + fprintf(stderr, "%s Can't find symbol %s\n", __FUNCTION__, #f); \ > + return nil; \ > + } > + LOAD_FUNCTION(ShowWindow) > + LOAD_FUNCTION(HideWindow) > +#undef LOAD_FUNCTION > + return HIToolBoxDLHandle; > +} This stuff should go in a C file, not in a header. Also you should use ERR instead of fprintf, and error messages should be in English <g> > +struct quartzdrv_thread_data > +{ > + int process_event_count; /* recursion count for event processing */ > +}; > + > +extern struct quartzdrv_thread_data *quartzdrv_init_thread_data(void); > +extern DWORD thread_data_tls_index; > + > +inline static struct quartzdrv_thread_data *quartzdrv_thread_data(void) > +{ > + struct quartzdrv_thread_data *data = TlsGetValue( thread_data_tls_index ); > + if (!data) data = quartzdrv_init_thread_data(); > + return data; > +} This is not used, it would be better to wait until you actually need per-thread data to add it. > +/* --------------------------------------------------------------------- > + quartzdrv_main.c > +*/ > +extern void wine_quartzdrv_lock(void); > +extern void wine_quartzdrv_unlock(void); Do you really need locking around Carbon calls, or is this just imitating x11drv? (either way there's no reason to export those). > +/* --------------------------------------------------------------------- > + * get_quartzdrv_win_data_from_hwnd > + */ > +struct quartzdrv_win_data *get_quartzdrv_win_data_from_hwnd(HWND hwnd) > +{ > + return (struct quartzdrv_win_data *)GetPropA(hwnd, wine_quartzdrv_win_data); > +} GetProp is not the best choice for associating data to a window as it requires a server round trip. A process-local mechanism is preferable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: msi: Split msi_set_sourcedir_props into a separate function.
by James Hawkins 20 Nov '06

20 Nov '06

On 11/19/06, Mike McCormack <mike(a)codeweavers.com> wrote: > --- > dlls/msi/action.c | 37 +++++++++++++++++++++++-------------- > 1 files changed, 23 insertions(+), 14 deletions(-) > +UINT msi_set_sourcedir_props(MSIPACKAGE *package) +{ Shouldn't this be static? -- James Hawkins

2 1

ASN.1 parser
by Kai Blin 20 Nov '06

20 Nov '06

Hi Juan, I'm just looking into implementing Kerberos and Negotiate for SSPI. It seems like I'll need an ASN.1 parser for both of those. I know you have a partial implementation of an ASN.1 DER parser in crypt32, but I think it would be kind of silly to keep two seperate copies. Think it would make sense to create our own asn dll? Or is there any method to find out what functions msasn1.dll provides? Cheers, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

4 4

Re: winhelp: wRefCount
by Kirill K. Smirnov 19 Nov '06

19 Nov '06

В сообщении от 19 ноября 2006 19:23 вы написали: > actually we should decrement the count for: > - closing the window attached to a page > - upon exit, remove references in history (and attached refcounts) > that should help here (not sure I got them all though) To be honest, I do not understand "cleary and distinctly" what wRefCount represents. Now, I consider wRefCount as amount of history entries (referring to the file) in all histories. But what to do with popup windows? They are not in any history. Also, there are help files used ONLY in popup windows (e.g. wdtip8.hlp in MS Office 97). This is another problem to meditate upon. -- Kirill K. Smirnov

2 1

Wine 0.9.25 for SuSE 10.1 is Wine 0.9.24
by theUser BL 19 Nov '06

19 Nov '06

Yesterday I have seen, that Wine 0.9.25 is already published and I have downloaded it. I gave downloaded the Sorces http://prdownloads.sourceforge.net/wine/wine-0.9.25.tar.bz2 And the rpm-files for SuSE 10.1. But after installing the SuSE-rpms, after the input of "wine --version" it says, that it is version 0.9.24. After an "winver" its says also 0.9.24. Then I have compiled the sources. The self-compiled Wine says 0.9.25. And in 0.9.25 are some bugs fixed, which in 0.9.24 still exists. And the Wine 0.9.25 for SuSE 10.1 have still the old 0.9.24 bugs. So the builds of SuSE 10.1 are not correct created. Greatings theuserbl _________________________________________________________________ Sie suchen E-Mails, Dokumente oder Fotos? Die neue MSN Suche Toolbar mit Windows-Desktopsuche liefert in sekundenschnelle Ergebnisse. Jetzt neu! http://desktop.msn.de/ Jetzt gratis downloaden!

3 4

Re: winecfg: [2/2] Add ability to change colors and non-client sizes.
by Stefan Dösinger 19 Nov '06

19 Nov '06

Am Samstag 18 November 2006 18:58 schrieb Vitaliy Margolen: > Change Log: > winecfg: Add ability to change colors and non-client sizes. Beeing able to configure colors in winecfg is a good idea :-) . But would it be possible to read the values from the window manager? Afaik there are environment variables for configuring this since a long time which are written by kde and gome ("Apply colors to non-kde programs"). I don't think it should be autoloaded every wine launch, with some configurations this might have bad results, so beeing able to edit it should still be possible. But maybe for creating an initial color sheme from wineprefixcreate?

1 0

Re: winhelp: add preliminary *.cnt file support (parser)
by Kirill K. Smirnov 19 Nov '06

19 Nov '06

В сообщении от 19 ноября 2006 10:37 вы написали: > 1/ you forgot to include the changes (at least) to hlpfile.h Thanks! I've messed a little. > 2/ internal function definitions > > > +static BOOL HLPFILE_ReadCntFile(HLPFILE*); > > +static void HLPFILE_FreeCnt(HLPFILE_CNT*); > > I think those two functions are not correctly designed... I'd more > likely see something like: > > +static HLPFILE_CNT* HLPFILE_ReadCntFile(const char*); > +static void HLPFILE_FreeCnt(HLPFILE_CNT*); > > this makes the two functions consistent in what they depend on (either > both of them are passed a HLPFILE* or none of them), and also allows to > return the newly created HLPFILE_CNT which you never store in HLPFILE I messed here too... Also, I stumbled upon the following problem: HLPFILE_FreeCnt is never called! There is something bad with hlpfile->wRefCount - it's 4 (!) instead of 1 after just opening and closing file. --Kirill K. Smirnov

2 1

Re: winhelp: add preliminary *.cnt file support (parser)
by Eric Pouech 19 Nov '06

19 Nov '06

Kirill K. Smirnov a écrit : > ChangeLog: > Add preliminary *.cnt file support (parser) > Hi Kirill, good to see someone enhancing winhelp!! a few comments though about your patch 1/ you forgot to include the changes (at least) to hlpfile.h 2/ internal function definitions > +static BOOL HLPFILE_ReadCntFile(HLPFILE*); > +static void HLPFILE_FreeCnt(HLPFILE_CNT*); > I think those two functions are not correctly designed... I'd more likely see something like: +static HLPFILE_CNT* HLPFILE_ReadCntFile(const char*); +static void HLPFILE_FreeCnt(HLPFILE_CNT*); this makes the two functions consistent in what they depend on (either both of them are passed a HLPFILE* or none of them), and also allows to return the newly created HLPFILE_CNT which you never store in HLPFILE 3/ don't use C++ comments in C code > + if (cur->level == entry->level) // level exists > + { > + entry->parent = cur->parent; > + cur->next = entry; > + } > + else // entry on new level > A+

1 0

Re; Solidworks 2006
by Kartik Thakore 19 Nov '06

19 Nov '06

I added the bug to winehq here is the link thank you for the help I made it a little better to run: http://bugs.winehq.org/show_bug.cgi?id=6723 -- -------- Kartik Thakore 250313003 kthakore(a)uwo.ca 1st year engineering

1 0

Re; Solidworks 2006
by Kartik Thakore 19 Nov '06

19 Nov '06

I added the bug to winehq here is the link thank you for the help I made it a little better to run: http://bugs.winehq.org/show_bug.cgi?id=6723 -- -------- Kartik Thakore 250313003 kthakore(a)uwo.ca 1st year engineering

1 0

Wine Version String
by Robert Lunnon 18 Nov '06

18 Nov '06

Somewhere between Version 0.9.23 and Version 0.9.25 the version string format changed from Wine X.X.X to wine-X.X.X Can we please decide on a version string format and stick to it so packaging can be reasonably automated. Bob

2 1

oleaut32 tests and VarAdd(VT_DISPATCH, ...)
by Dan Kegel 18 Nov '06

18 Nov '06

Alex Villacís Lasso wrote: >BTW, I see many attempts of VarAdd(VT_DISPATCH, ...) tested. All of them >are expected to fail. However, the tax app does just that >(VarAdd(VT_DISPATCH, ...)) and fails to display a print preview because >of this. I think that native oleaut32 fails these tests, not because it >does not support VarAdd(VT_DISPATCH) at all, but because these >VT_DISPATCHs are incorrectly formed (as in, just zeroing the variant, >then assigning VT_DISPATCH as variant type). I need to confirm this with >a test program. Yes, if you can improve the variant tests for oleaut32, please do! - Dan

1 0

CD-ROM access via "\\\\.\\Cdrom0"
by Pavel Roskin 18 Nov '06

18 Nov '06

Hello! I've tried to figure out why some programs working with CD and DVD drives work only if the emulated version is set to Windows NT 4, but not Windows 2000 or XP. I used DVDDecrypter 3.5.4.0 with the current Wine from git. DVDDecrypter is configured to use SPTI, which is the default. Fixing ASPI would be a separate topic. If NT4 is emulated, the program scans all drives by letters and then opens drive H: (which is the DVD drive on my system). Here's an excerpt from the log produced by WINEDEBUG=+file,+cdrom,+ntdll,+kernel,+aspi wine DVDDecrypter.exe trace:file:CreateFileW L"\\\\.\\H:" GENERIC_READ GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WRITE creation 3 attributes 0x0 trace:file:RtlDosPathNameToNtPathName_U (L"\\\\.\\H:",0x7d6b75b0,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"\\\\.\\H:" 520 0x7d6b7314 (nil)) trace:ntdll:NtCreateFile handle=0x7d6b75b8 access=c0000000 name=L"\\??\\H:" objattr=00000040 roo t=(nil) sec=(nil) io=0x7d6b75a8 alloc_size=(nil) attr=00000000 sharing=00000003 disp=1 options=00000050 ea=(nil).0x00000000 trace:file:get_dos_device L"H:" -> "/dev/scd0" trace:file:CreateFileW returning 0x8c And that's what the same command would produce with win2k emulation: trace:file:CreateFileW L"\\\\.\\Cdrom0" GENERIC_READ GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WR ITE creation 3 attributes 0x0 trace:file:RtlDosPathNameToNtPathName_U (L"\\\\.\\Cdrom0",0x7d6b25b0,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"\\\\.\\Cdrom0" 520 0x7d6b2314 (nil)) trace:ntdll:NtCreateFile handle=0x7d6b25b8 access=c0000000 name=L"\\??\\Cdrom0" objattr=00000040 root=(nil) sec=(nil) io=0x7d6b25a8 alloc_size=(nil) attr=00000000 sharing=00000003 disp=1 options=00000050 ea=(nil).0x00000000 warn:file:CreateFileW Unable to create file L"\\\\.\\Cdrom0" (status c0000034) trace:file:CreateFileW returning 0xffffffff trace:file:CreateFileW L"\\\\.\\Cdrom1" GENERIC_READ GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WR ITE creation 3 attributes 0x0 trace:file:RtlDosPathNameToNtPathName_U (L"\\\\.\\Cdrom1",0x7d6b25b0,(nil),(nil)) The program cycles like this to Cdrom63 and then gives up. I think it would be great if Wine adds supported for opening CD-ROMs by number. Better yet if it enumerated CD-ROMs an other drives automatically. I have make a proof-of-concept patch that allows DVDDecrypter to find the CD-ROM drive under win2k emulation. I had to create a link from .wine/dosdevices/cdrom0 to /dev/scd0 manually. This is not the right fix, but it shows that it can be done. diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index e4af89a..2ca5883 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -316,6 +316,7 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDos ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) { static const WCHAR consoleW[] = {'\\','\\','.','\\','C','O','N',0}; + static const WCHAR cdromW[] = {'\\','\\','.','\\','C','D','R','O','M',0}; static const WCHAR auxW[3] = {'A','U','X'}; static const WCHAR comW[3] = {'C','O','M'}; static const WCHAR conW[3] = {'C','O','N'}; @@ -372,6 +373,12 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWST if (strncmpiW( start, comW, 3 ) && strncmpiW( start, lptW, 3 )) break; if (*end <= '0' || *end > '9') break; return MAKELONG( 4 * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); + case 11: + if (*(end - 1) <= '0' || *(end - 1) > '9') break; + case 10: + if (*end <= '0' || *end > '9') break; + if (strncmpiW( start, cdromW, 9 )) break; + return MAKELONG( (end - start + 1) * sizeof(WCHAR), (start - dos_name) * sizeof(WCHAR) ); default: /* can't match anything */ break; } -- Regards, Pavel Roskin

2 3

Re: [3/5] wined3d: Make the offscreen render mode a registry setting
by Ivan Gyurdiev 17 Nov '06

17 Nov '06

This flag needs to be per adapter - should be added to device.c like the shader mode.

2 7

Bug in MapAndLoad function
by Adam Connell 17 Nov '06

17 Nov '06

Greetings, While investigating why a game (Kasparov's Chessmate) didn't work, I think I found a bug in the implementation of imagehlp.dll in the the MapAndLoad function located in dlls/imagehlp/access.c lines 165-167. The function looks like it tries to open an uninitialized string szFileName instead of the passed file name "pszImageName". I think there has been a bug filed already (Bug 6099 Alien Shooter needs imagehlp.dll override) and I think this explains it. Wine version 0.9.25 /*********************************************************************** * MapAndLoad (IMAGEHLP.@) */ BOOL WINAPI MapAndLoad( LPSTR pszImageName, LPSTR pszDllPath, PLOADED_IMAGE pLoadedImage, BOOL bDotDll, BOOL bReadOnly) { CHAR szFileName[MAX_PATH]; HANDLE hFile = NULL; HANDLE hFileMapping = NULL; HMODULE hModule = NULL; PIMAGE_NT_HEADERS pNtHeader = NULL; TRACE("(%s, %s, %p, %d, %d)\n", pszImageName, pszDllPath, pLoadedImage, bDotDll, bReadOnly); /* PathCombine(&szFileName, pszDllPath, pszImageName); */ /* PathRenameExtension(&szFileName, bDotDll?:"dll":"exe"); */ /* FIXME: Check if the file already loaded (use IMAGEHLP_pFirstLoadedImage) */ if(!(hFile = CreateFileA( szFileName, GENERIC_READ, 1, /* FIXME: FILE_SHARE_READ not defined */ NULL, OPEN_EXISTING, 0, NULL))) { SetLastError(ERROR_FILE_NOT_FOUND); goto Error; } Cheers, Adam

4 4

Re: [2/5] wined3d: Fix depth buffer formats to use actual depth textures
by Ivan Gyurdiev 17 Nov '06

17 Nov '06

That's still missing runtime check for GL_ARB_DEPTH_TEXTURE extension. I don't like "developers only" and "registry key" - feature should be complete or not in the tree. > The trouble with the current setup is that we can't use different formats based on what extensions are present. Then the setup should be fixed, rather than adding dependent code without extension checks. I might have mentioned before that statically initialized tables are evil.... ======== Btw, good job, I am glad you're working on this.... does it make Battlefield 2 work?

1 0

Re: [2/5] wined3d: Fix depth buffer formats to use actual depth textures
by Ivan Gyurdiev 17 Nov '06

17 Nov '06

H. Verbeet wrote: > Two things to note here: > - We use GL_DEPTH_COMPONENT24_ARB as internal format for 16-bit > depth textures. This is needed because GL_DEPTH_COMPONENT16_ARB > doesn't work with FBOs. > - We don't properly support combined depth and stencil buffer > formats yet. To support this properly we need to be able to detect if > the relevant extensions are available or not. > Was GL_ARB_DEPTH_TEXTURE detection added to wine recently? I don't have the latest copy. If not, needs to be added to take advantage of the formats you're adding. I think GL_EXT_PACKED_DEPTH_STENCIL should be used for stencil/depth..

2 1

Printing of line joins/ends in Wine
by XXX 17 Nov '06

17 Nov '06

Hello, When rastering on display (winex11) some pen options set in GDI(PS_JOIN_xxx, PS_ENDCAP_xxx) are taken into account, but they are ignored in wineps when generating a postscript for printing as it seems. Is there any workaround or i'm wrong and these styles are supported ? Thanks a lot

1 0

Re: loader: Mark the stack as executable if possible.
by Peter Beutner 17 Nov '06

17 Nov '06

Mike McCormack schrieb: > --- > > This should fix bug #6622. The application in question doesn't crash because it needs an executable stack, but because the PE image header of the exe is totally broken, no section is marked as executable there at all. Wine does exactly what it should do here(same goes for Irfanview in #6129, seems both apps use the same exe packer(ASPack) so probably it's the packer which is broken). I bet the applications would also crash under windows if the noexecute protection is activated. The reason why -z execstack helps is that the linux kernel marks _all_ readable pages as executable if an executable stack is requested, not only the stack(for whatever reasons), i.e. basically switching off the whole NX protection thing. So for fixing some _broken_ applications this patch unconditionally disables nx protection for every application running under wine. Seems like a bad tradeoff imo. (Though I don't know how widespread these kind of broken applications are. But there are definitly applications out there which don't need this.) I tried to solve the same problem last weekend in a different way, see attached patch. It's not quite ready yet though. It basically adds an option(HKCU\Software\Wine\NoExecCompat=On|Off) which, if enabled, couples PROT_READ with PROT_EXEC in every mprotect/mmap call, i.e. emulating the old standard x86 behaviour. (The main problem is that this config option should be read out as early as possible from the registry but on the other hand a number of things need to be set up before it is possible to access the registry. So I'm not sure when the earliest/best point would be to do this. For now it is done right before the main exe is loaded.) This way would have the advantage that the behaviour is tunable either globally or on a per-app basis. dlls/ntdll/loader.c | 2 + dlls/ntdll/loadorder.c | 78 +++++++++++++++++++++++++--------------------- dlls/ntdll/ntdll_misc.h | 6 +++ dlls/ntdll/virtual.c | 57 +++++++++++++++++++++++++++++++++- 4 files changed, 106 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 87767e5..64ed609 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1728,6 +1728,8 @@ static NTSTATUS load_dll( LPCWSTR load_p main_exe = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress ); loadorder = get_load_order( main_exe ? main_exe->ldr.BaseDllName.Buffer : NULL, filename ); + if(!main_exe) init_noexec_setting(filename); + switch(loadorder) { case LO_INVALID: diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c31b633..552ce87 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -294,31 +294,35 @@ static inline enum loadorder get_env_loa * * Return a handle to the standard DllOverrides registry section. */ -static HANDLE get_standard_key(void) +HANDLE get_standard_key( const WCHAR *subkey ) { - static const WCHAR DllOverridesW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'D','l','l','O','v','e','r','r','i','d','e','s',0}; - static HANDLE std_key = (HANDLE)-1; + static const WCHAR winekeyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; + HANDLE std_key, root; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR *str = NULL; + + if(subkey) { + str = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(winekeyW) + strlenW(subkey) * sizeof(WCHAR)); + if(!str) return 0; + strcatW(str, winekeyW); + strcatW(str, subkey); + RtlInitUnicodeString( &nameW, str ); + } else + RtlInitUnicodeString( &nameW, winekeyW ); - if (std_key == (HANDLE)-1) - { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE root; - - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); - attr.Length = sizeof(attr); - attr.RootDirectory = root; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, DllOverridesW ); - - /* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */ - if (NtOpenKey( &std_key, KEY_ALL_ACCESS, &attr )) std_key = 0; - NtClose( root ); - } + RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); + memset(&attr, 0, sizeof(attr)); + attr.Length = sizeof(attr); + attr.RootDirectory = root; + attr.ObjectName = &nameW; + + /* @@ Wine registry key: HKCU\Software\Wine[\<subkey>] */ + if (NtOpenKey( &std_key, KEY_ALL_ACCESS, &attr )) std_key = 0; + NtClose( root ); + + if(str) RtlFreeHeap( GetProcessHeap(), 0, str ); return std_key; } @@ -328,26 +332,26 @@ static HANDLE get_standard_key(void) * * Get the registry key for the app-specific DllOverrides list. */ -static HANDLE get_app_key( const WCHAR *app_name ) +HANDLE get_app_key( const WCHAR *app_name, const WCHAR *subkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - HANDLE root; + HANDLE root, app_key; WCHAR *str; static const WCHAR AppDefaultsW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const WCHAR DllOverridesW[] = {'\\','D','l','l','O','v','e','r','r','i','d','e','s',0}; - static HANDLE app_key = (HANDLE)-1; + int size; + + app_name = get_basename( app_name ); - if (app_key != (HANDLE)-1) return app_key; + size = sizeof(AppDefaultsW) + strlenW(app_name) * sizeof(WCHAR); + if(subkey) size += strlenW(subkey) * sizeof(WCHAR); - str = RtlAllocateHeap( GetProcessHeap(), 0, - sizeof(AppDefaultsW) + sizeof(DllOverridesW) + - strlenW(app_name) * sizeof(WCHAR) ); + str = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (!str) return 0; strcpyW( str, AppDefaultsW ); strcatW( str, app_name ); - strcatW( str, DllOverridesW ); + if(subkey) strcatW( str, subkey ); RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); @@ -358,7 +362,7 @@ static HANDLE get_app_key( const WCHAR * attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, str ); - /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DllOverrides */ + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe[\<subkey>] */ if (NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr )) app_key = 0; NtClose( root ); RtlFreeHeap( GetProcessHeap(), 0, str ); @@ -432,15 +436,17 @@ static enum loadorder get_load_order_val */ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) { + const static WCHAR DllOverridesW[] = {'\\','D','l','l','O','v','e','r','r','i','d','e','s',0}; enum loadorder ret = LO_INVALID; - HANDLE std_key, app_key = 0; + static HANDLE std_key = (HANDLE)-1, app_key = (HANDLE) -1; WCHAR *module, *basename; UNICODE_STRING path_str; int len; if (!init_done) init_load_order(); - std_key = get_standard_key(); - if (app_name) app_key = get_app_key( app_name ); + if ( std_key == (HANDLE)-1 ) std_key = get_standard_key( DllOverridesW ); + if ( app_name && app_key == (HANDLE)-1 ) + app_key = get_app_key( app_name, DllOverridesW ); TRACE("looking for %s\n", debugstr_w(path)); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1225036..310b528 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -144,6 +144,12 @@ struct debug_info char output[1024]; /* current output line */ }; +HANDLE get_standard_key( const WCHAR *subkey ); +HANDLE get_app_key( const WCHAR *app_name, const WCHAR *subkey ); + +void init_noexec_setting(const WCHAR *fullpath); + + struct ntdll_thread_data { struct debug_info *debug_info; /* info for debugstr functions */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c469f76..48859eb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -51,6 +51,7 @@ #include "winioctl.h" #include "wine/library.h" #include "wine/server.h" +#include "wine/unicode.h" #include "wine/list.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -143,6 +144,7 @@ static void *user_space_limit = USER_SPA static void *preload_reserve_start; static void *preload_reserve_end; static int use_locks; +static BOOL read_implies_exec = FALSE; /* default to Off */ /*********************************************************************** @@ -460,7 +462,7 @@ static int VIRTUAL_GetUnixProt( BYTE vpr int prot = 0; if ((vprot & VPROT_COMMITTED) && !(vprot & VPROT_GUARD)) { - if (vprot & VPROT_READ) prot |= PROT_READ; + if (vprot & VPROT_READ) prot |= ( read_implies_exec ) ? PROT_READ | PROT_EXEC : PROT_READ; if (vprot & VPROT_WRITE) prot |= PROT_WRITE; if (vprot & VPROT_WRITECOPY) prot |= PROT_WRITE; if (vprot & VPROT_EXEC) prot |= PROT_EXEC; @@ -2020,3 +2022,56 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HA if (bytes_written) *bytes_written = size; return status; } + +/* from heap.c */ +#define HEAP_DEF_SIZE 0x110000 /* Default heap size = 1Mb + 64Kb */ + +static int get_noexec_setting(HANDLE key, UNICODE_STRING *valueW) +{ + const static WCHAR onW[] = {'O','n',0}; + const static WCHAR offW[] = {'O','f','f',0}; + WCHAR buffer[10]; + DWORD count; + int ret = 0; + + if(!key) return 0; + + if( NtQueryValueKey( key, valueW, KeyValuePartialInformation, + buffer, sizeof(buffer), &count ) == STATUS_SUCCESS) { + WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; + + ret = 1; + if(strncmpW(str, onW, count) == 0) { + read_implies_exec = TRUE; + /* fix stack */ + mprotect( NtCurrentTeb()->Tib.StackLimit, + (size_t) NtCurrentTeb()->Tib.StackBase - (size_t)NtCurrentTeb()->Tib.StackLimit, + PROT_READ | PROT_WRITE | PROT_EXEC); + + /* fix heap (FIXME: this is wrong, should only fix already commited memory) */ + mprotect( NtCurrentTeb()->Peb->ProcessHeap, HEAP_DEF_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC); + } + else if(strncmpW(str, offW, count)) { + ERR("invalid registry value for NoExecCompat: %s\n", debugstr_w(str)); + ret = 0; + } + } + + NtClose(key); + return ret; +} + +void init_noexec_setting(const WCHAR *app_name) +{ + static const WCHAR NoExecCompatW[] = { 'N','o','E','x','e','c','C','o','m','p','a','t',0}; + UNICODE_STRING valueW; + HANDLE key; + + RtlInitUnicodeString( &valueW, NoExecCompatW); + + key = get_app_key(app_name, NULL); + if(get_noexec_setting(key, &valueW)) return; + + key = get_standard_key(NULL); + get_noexec_setting(key, &valueW); +}

8 21

Need some Win2k3 help
by Kai Blin 17 Nov '06

17 Nov '06

Hi folks, in my last patch to NTLM, I manually flip a bit in the code ntlm_auth returns so NTLMSSP_NEGOTIATE_ALWAYS_SIGN is negotiated. I decided to really fix that for Samba, as my Win2k box always sets that bit. The Samba team wants me to check if this also happens in Win2k3, too. I don't have that version of Windows flying around, but maybe someone in here has and would like to run the attached exe for me and send me the output? Thanks in advance, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

2 2

CRichEditCtrl: Performance issue
by Renu Rajput 17 Nov '06

17 Nov '06

Hi, I am facing a performance issue in CRichEditCtrl under Wine. My application reads data from a *.dat file and displays it in the CRichEdit editor. When I try to open large data files, it takes a lot of time(around 4-5 minutes) to open the file. I checked the code and found that, in Wine, the richedit editor streams-in the data in a block of 4096 bytes. On Linux, the read request to the file is routed via Wine. For every block of 4096 bytes that are read, the system makes a back and forth call between the callback function in the application and Wine code(ME_StreamInFill() in dlls\riched20\editor.c), which causes the delay. If anyone stumbled upon the similar issue, what should be the solution to this. Thanks Renu Rajput

3 2

Debugging solidworks 2006
by Kartik Thakore 17 Nov '06

17 Nov '06

I am currently trying Solid Works 2006 to work with wine-0.9.25. It installed with some error, but it finished. The trouble is when it is run. What is my next step? As this is the first time I am doing debugging in wine and I have little experience with windows programming. I am doing this so I can get solidworks working as I really need it. Any help will be very much appreciated. fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" err:wgl:ConvertPixelFormatWGLtoGLX Can't find a matching FBCONFIG_ID for VISUAL_ID 0x24! err:wgl:X11DRV_ChoosePixelFormat Can't find a matching FBCONFIG_ID for VISUAL_ID 0x24! fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:shdocvw:PersistStreamInit_InitNew (0x335d3f0) err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d fixme:shdocvw:navigate_url Unsupported arguments err:ole:CoGetClassObject class {4955dd33-b159-11d0-8fcf-00aa006bcc59} not registered err:ole:CoGetClassObject no class object {4955dd33-b159-11d0-8fcf-00aa006bcc59} could be created for context 0x1 fixme:shdocvw:ClOleCommandTarget_QueryStatus (0x335d48c)->((null) 1 0x33e520 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->((null) 25 2 0x33e534 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->((null) 26 2 0x33e534 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-709 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e448 0x33e494 (nil) 0x33e458) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e448 0x33e494 (nil) 0x33e458) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5513 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-726 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClientSite_GetContainer (0x335d48c)->(0x33e560) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->({000214d1-0000-0000-c000-000000000046} 37 0 0x33e684 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e548 0x33e674 (nil) 0x33e558) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e548 0x33e664 (nil) 0x33e558) fixme:shdocvw:HttpNegotiate_BeginningTransaction (0x3318608)->(L"" L"" 0 0x33e698) fixme:shdocvw:BindStatusCallback_GetBindInfo (0x3318608)->(0x33e69c 0x33e5c0) err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d fixme:shdocvw:navigate_url Unsupported arguments fixme:mshtml:HlinkTarget_SetBrowseContext (0x3318900)->((nil)) err:ole:CoGetClassObject class {4955dd33-b159-11d0-8fcf-00aa006bcc59} not registered err:ole:CoGetClassObject no class object {4955dd33-b159-11d0-8fcf-00aa006bcc59} could be created for context 0x1 fixme:shdocvw:ClOleCommandTarget_QueryStatus (0x335d48c)->((null) 1 0x33f000 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->((null) 25 2 0x33f014 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->((null) 26 2 0x33f014 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-709 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef28 0x33ef74 (nil) 0x33ef38) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef28 0x33ef74 (nil) 0x33ef38) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5513 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-726 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClientSite_GetContainer (0x335d48c)->(0x33f040) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d48c)->({000214d1-0000-0000-c000-000000000046} 37 0 0x33f164 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33f028 0x33f154 (nil) 0x33f038) fixme:shdocvw:ClDispatch_Invoke (0x335d48c)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33f028 0x33f144 (nil) 0x33f038) fixme:shdocvw:HttpNegotiate_BeginningTransaction (0x39b27c8)->(L"" L"" 0 0x33f178) fixme:shdocvw:BindStatusCallback_GetBindInfo (0x39b27c8)->(0x33f17c 0x33f0a0) fixme:atl:AtlModuleInit SEMI-STUB (0x37b93a8 0x37b83e0 0x3760000) fixme:atl:AtlModuleRegisterServer 0x37b93a8 1 (null) fixme:storage:StgCreateDocfile Transacted mode not implemented. fixme:ole:CoRegisterMessageFilter message filter has been registered, but will not be used wine: Unhandled page fault on read access to 0x00000001 at address 0x1 (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x00000001 in 32-bit code (0x00000001). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:00000001 ESP:0033f418 EBP:0033f43c EFLAGS:00010206( - 00 - RIP1) EAX:043600fc EBX:800ac39e ECX:0490d628 EDX:043600d0 ESI:049094e0 EDI:00000000 Stack dump: 0x0033f418: 100db041 043600fc 049094c8 049094e0 0x0033f428: 100da159 7e921a40 0490960c 7e921b30 0x0033f438: 049096b8 0033f458 100da45b 049094c8 0x0033f448: 044709f0 0490960c 04909498 00000001 0x0033f458: 0033f52c 10189a29 049094bc 044709f0 0x0033f468: 0490960c 00000001 00000001 103a0065 fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 Backtrace: =>1 0x00000001 (0x0033f43c) 2 0x100da45b in sldappu (+0xda45b) (0x0033f458) 3 0x10189a29 in sldappu (+0x189a29) (0x0033f52c) 4 0x10012cdb in sldappu (+0x12cdb) (0x0033fa18) 5 0x10013130 in sldappu (+0x13130) (0x0033fa48) 6 0x00404404 in sldworks (+0x4404) (0x0033fe48) 7 0x5f812566 in mfc42u (+0x12566) (0x0033ff08) 8 0x7b86f53e in kernel32 (+0x4f53e) (0x0033ffe8) 9 0xb7e7a587 wine_switch_to_stack+0x17 in libwine.so.1 (0x00000000) 0x00000001: addb %al,0x0(%eax) Modules: Module Address Debug info Name (216 modules) PE 340000-352000 Deferred rwuxthemesu PE 370000-38e000 Deferred sldarchiveu PE 390000-3a1000 Deferred zlib PE 3b0000-3bd000 Deferred sldebu PE 3c0000-3ea000 Deferred swccu PE 400000-450000 Export sldworks PE 450000-5d0000 Deferred sldgridasu PE 5d0000-711000 Deferred sldmfcu PE 720000-968000 Deferred sldutu PE 970000-9ac000 Deferred sldmgu PE 9b0000-101e000 Deferred sldgcu PE 1020000-1051000 Deferred bodydiffu PE 1060000-1159000 Deferred sldgciparau PE 1160000-1449000 Deferred sldsvu PE 1450000-174d000 Deferred 2d46nt6 PE 1750000-17f3000 Deferred pgm02nt6 PE 1800000-1815000 Deferred sldxtkitu PE 2200000-2706000 Deferred slddialogresu PE 2710000-2718000 Deferred slderrresu PE 2720000-29db000 Deferred sldres1u PE 29e0000-2fba000 Deferred sldresu PE 3630000-364e000 Deferred swpo~bi4 PE 42d0000-4355000 Deferred apc60 PE 10000000-10499000 Export sldappu PE 308c0000-30e19000 Deferred mso9 PE 40000000-41642000 Deferred pskernel ELF 45e04000-45e1f000 Deferred ld-linux.so.2 ELF 45e21000-45f55000 Deferred libc.so.6 ELF 45f57000-45f5b000 Deferred libdl.so.2 ELF 45f5d000-45f83000 Deferred libm.so.6 ELF 45f85000-45f98000 Deferred libpthread.so.0 ELF 45f9a000-45fae000 Deferred libz.so.1 ELF 45fb0000-45fb3000 Deferred libxau.so.6 ELF 45fb5000-4607e000 Deferred libx11.so.6 ELF 46080000-46085000 Deferred libxdmcp.so.6 ELF 46087000-46094000 Deferred libxext.so.6 ELF 460c6000-46130000 Deferred libfreetype.so.6 ELF 46132000-46150000 Deferred libexpat.so.1 ELF 46152000-46181000 Deferred libfontconfig.so.1 ELF 4618d000-46195000 Deferred libxrender.so.1 ELF 46197000-4619c000 Deferred libxfixes.so.3 ELF 4619e000-461a1000 Deferred libxinerama.so.1 ELF 461a3000-461a6000 Deferred libxrandr.so.2 ELF 461a8000-461b1000 Deferred libxcursor.so.1 ELF 46289000-46292000 Deferred libsm.so.6 ELF 46294000-462ac000 Deferred libice.so.6 ELF 462ae000-462b9000 Deferred libgcc_s.so.1 ELF 462bb000-462ce000 Deferred libresolv.so.2 ELF 463cc000-463e2000 Deferred libnsl.so.1 ELF 46aae000-46ac1000 Deferred libtasn1.so.3 ELF 46ac3000-46ac7000 Deferred libgpg-error.so.0 ELF 46ac9000-46b17000 Deferred libgcrypt.so.11 ELF 46b19000-46b88000 Deferred libgnutls.so.13 ELF 46cf6000-46d24000 Deferred libcrypt.so.1 ELF 46e25000-46e2a000 Deferred libxxf86vm.so.1 ELF 46e5a000-46e89000 Deferred libcups.so.2 ELF 4b87a000-4b8f1000 Deferred libglu.so.1 PE 5f800000-5f8f2000 Export mfc42u PE 600a0000-600d9000 Deferred appcomps PE 600e0000-600f0000 Deferred appshell PE 60120000-6012f000 Deferred caps PE 60130000-60140000 Deferred chrome PE 60150000-60159000 Deferred cookie PE 60160000-6018c000 Deferred docshell PE 60200000-6021e000 Deferred embedcomponents PE 60230000-60254000 Deferred gkgfxwin PE 60260000-6052d000 Deferred gklayout PE 60530000-60568000 Deferred gkparser PE 605a0000-605c5000 Deferred gkwidget PE 605d0000-605fe000 Deferred i18n PE 60610000-60635000 Deferred imglib2 PE 606e0000-606ef000 Deferred jsd3250 PE 60940000-609bb000 Deferred necko PE 609e0000-609ec000 Deferred oji PE 60a00000-60a18000 Deferred palmsync PE 60a20000-60a27000 Deferred perms PE 60a30000-60a38000 Deferred pipboot PE 60a90000-60a9e000 Deferred profile PE 60aa0000-60aba000 Deferred rdf PE 60af0000-60af7000 Deferred sroaming PE 60b40000-60b4c000 Deferred typeaheadfind PE 60b50000-60c0b000 Deferred uconv PE 60c70000-60c7e000 Deferred webbrwsr PE 60cf0000-60d22000 Deferred xpc3250 PE 60d30000-60d37000 Deferred xpcom_compat_c PE 60d70000-60d7c000 Deferred xppref32 PE 60d80000-60d96000 Deferred gkgfx PE 60da0000-60e09000 Deferred js3250 PE 60e10000-60e23000 Deferred jsj3250 PE 60ec0000-60ed1000 Deferred mozz PE 60ee0000-60f14000 Deferred msgbsutl PE 60f60000-60f87000 Deferred nspr4 PE 60f90000-60fe9000 Deferred nss3 PE 60ff0000-6102a000 Deferred nssckbi PE 61030000-61037000 Deferred palmsyncproxy PE 61040000-61047000 Deferred plc4 PE 61050000-61056000 Deferred plds4 PE 61060000-61068000 Deferred npnul32 PE 61070000-6108a000 Deferred smime3 PE 61090000-610ea000 Deferred softokn3 PE 610f0000-6110b000 Deferred ssl3 PE 61110000-61116000 Deferred xpcom PE 61120000-61134000 Deferred xpcom_compat PE 61140000-611a5000 Deferred xpcom_core PE 611b0000-611b6000 Deferred xpistub PE 65000000-65264000 Deferred vbe6 PE 65300000-65327000 Deferred vbe6intl PE 66700000-66855000 Deferred ~df394b.tmp PE 66b00000-66b95000 Deferred ~de30d7.tmp PE 67800000-67923000 Deferred sldxtoolkitu PE 69b10000-69c3f000 Deferred msxml4 PE 70d00000-70ea0000 Deferred gdiplus PE 780c0000-78121000 Deferred msvcp60 ELF 7b800000-7b91a000 Export kernel32<elf> \-PE 7b820000-7b91a000 \ kernel32 ELF 7bc00000-7bc82000 Deferred ntdll<elf> \-PE 7bc10000-7bc82000 \ ntdll ELF 7bf00000-7bf03000 Deferred <wine-loader> PE 7c340000-7c396000 Deferred msvcr71 ELF 7c967000-7c9e9000 Deferred msi<elf> \-PE 7c970000-7c9e9000 \ msi ELF 7d804000-7d875000 Deferred mshtml<elf> \-PE 7d810000-7d875000 \ mshtml ELF 7da21000-7da5d000 Deferred shdocvw<elf> \-PE 7da30000-7da5d000 \ shdocvw ELF 7da80000-7daa1000 Deferred cabinet<elf> \-PE 7da90000-7daa1000 \ cabinet ELF 7db2d000-7db48000 Deferred comcat<elf> \-PE 7db30000-7db48000 \ comcat ELF 7db48000-7db66000 Deferred atl<elf> \-PE 7db50000-7db66000 \ atl ELF 7dcb4000-7dcf8000 Deferred riched20<elf> \-PE 7dcc0000-7dcf8000 \ riched20 ELF 7dcf8000-7dd0c000 Deferred riched32<elf> \-PE 7dd00000-7dd0c000 \ riched32 ELF 7dd0c000-7dd21000 Deferred midimap<elf> \-PE 7dd10000-7dd21000 \ midimap ELF 7dd47000-7dd83000 Deferred wineoss<elf> \-PE 7dd50000-7dd83000 \ wineoss ELF 7de18000-7de30000 Deferred msacm32<elf> \-PE 7de20000-7de30000 \ msacm32 ELF 7dece000-7dee2000 Deferred msimg32<elf> \-PE 7ded0000-7dee2000 \ msimg32 ELF 7df0a000-7df3c000 Deferred uxtheme<elf> \-PE 7df10000-7df3c000 \ uxtheme ELF 7dfc3000-7dfdf000 Deferred imm32<elf> \-PE 7dfd0000-7dfdf000 \ imm32 ELF 7dfdf000-7dffd000 Deferred ximcp.so.2 ELF 7e00b000-7e098000 Deferred winex11<elf> \-PE 7e020000-7e098000 \ winex11 ELF 7e163000-7e178000 Deferred psapi<elf> \-PE 7e170000-7e178000 \ psapi ELF 7e178000-7e1be000 Deferred dbghelp<elf> \-PE 7e180000-7e1be000 \ dbghelp ELF 7e1be000-7e1d8000 Deferred wsock32<elf> \-PE 7e1c0000-7e1d8000 \ wsock32 ELF 7e1d8000-7e1ed000 Deferred wtsapi32<elf> \-PE 7e1e0000-7e1ed000 \ wtsapi32 ELF 7e1ed000-7e218000 Deferred ws2_32<elf> \-PE 7e200000-7e218000 \ ws2_32 ELF 7e218000-7e23d000 Deferred netapi32<elf> \-PE 7e220000-7e23d000 \ netapi32 ELF 7e23d000-7e257000 Deferred crtdll<elf> \-PE 7e240000-7e257000 \ crtdll ELF 7e257000-7e2e0000 Deferred winmm<elf> \-PE 7e260000-7e2e0000 \ winmm ELF 7e2e0000-7e2f4000 Deferred lz32<elf> \-PE 7e2f0000-7e2f4000 \ lz32 ELF 7e2f4000-7e30d000 Deferred version<elf> \-PE 7e300000-7e30d000 \ version ELF 7e30d000-7e328000 Deferred hlink<elf> \-PE 7e310000-7e328000 \ hlink ELF 7e328000-7e347000 Deferred mpr<elf> \-PE 7e330000-7e347000 \ mpr ELF 7e347000-7e38e000 Deferred wininet<elf> \-PE 7e350000-7e38e000 \ wininet ELF 7e38e000-7e3c1000 Deferred urlmon<elf> \-PE 7e3a0000-7e3c1000 \ urlmon ELF 7e440000-7e4df000 Deferred libgl.so.1 ELF 7e5ba000-7e633000 Deferred opengl32<elf> \-PE 7e5d0000-7e633000 \ opengl32 ELF 7e633000-7e664000 Deferred winspool<elf> \-PE 7e640000-7e664000 \ winspool ELF 7e664000-7e700000 Deferred comdlg32<elf> \-PE 7e670000-7e700000 \ comdlg32 ELF 7e700000-7e721000 Deferred oledlg<elf> \-PE 7e710000-7e721000 \ oledlg ELF 7e721000-7e747000 Deferred odbc32<elf> \-PE 7e730000-7e747000 \ odbc32 ELF 7e747000-7e832000 Deferred shell32<elf> \-PE 7e760000-7e832000 \ shell32 ELF 7e832000-7e8f2000 Deferred comctl32<elf> \-PE 7e840000-7e8f2000 \ comctl32 ELF 7e8f2000-7e989000 Deferred oleaut32<elf> \-PE 7e900000-7e989000 \ oleaut32 ELF 7e9b6000-7e9d4000 Deferred iphlpapi<elf> \-PE 7e9c0000-7e9d4000 \ iphlpapi ELF 7e9d4000-7ea27000 Deferred rpcrt4<elf> \-PE 7e9e0000-7ea27000 \ rpcrt4 ELF 7ea27000-7eabb000 Deferred ole32<elf> \-PE 7ea40000-7eabb000 \ ole32 ELF 7eabb000-7eb13000 Deferred shlwapi<elf> \-PE 7ead0000-7eb13000 \ shlwapi ELF 7eb13000-7ec49000 Deferred user32<elf> \-PE 7eb30000-7ec49000 \ user32 ELF 7ec49000-7ec8f000 Deferred advapi32<elf> \-PE 7ec50000-7ec8f000 \ advapi32 ELF 7ed71000-7ee27000 Deferred gdi32<elf> \-PE 7ed90000-7ee27000 \ gdi32 ELF 7ee27000-7ee8b000 Deferred msvcrt<elf> \-PE 7ee40000-7ee8b000 \ msvcrt ELF 7ef95000-7efa0000 Deferred libnss_files.so.2 ELF 7efa0000-7efaa000 Deferred libnss_nis.so.2 ELF 7efe6000-7efe8000 Deferred xlcutf8load.so.2 ELF b7d03000-b7d0c000 Deferred libnss_compat.so.2 ELF b7e73000-b7f84000 Export libwine.so.1 Threads: process tid prio (all id:s are in hex) 0000000d 0000000f 0 0000000e 0 0000000a 0000000c 0 0000000b 0 00000008 (D) C:\Program Files\SolidWorks\SLDWORKS.exe 0000001c 0 0000001b 0 0000001a 0 00000019 0 00000018 0 00000017 0 00000016 0 00000015 0 00000014 0 00000013 0 00000012 0 00000011 0 00000010 0 00000009 0 <==

2 2

Re: shlwapi: Cast-qual warnings fix (2 of 4)
by Dimi Paun 16 Nov '06

16 Nov '06

On Wed, November 15, 2006 5:02 pm, Andrew Talbot wrote: > - static const WCHAR szProperty[] = { > + static WCHAR szProperty[] = { '{','D','0','F','C','A','4','2','0', If they aren't constant, shouldn't they be non-static too? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 3

Re: opengl: Initial attempt to address opengl child window bug
by Alexandre Julliard 16 Nov '06

16 Nov '06

Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> writes: > + if (ctx && (hwnd = WindowFromDC(ctx->hdc)) != 0) > + { > + roothwnd = GetAncestor(hwnd, GA_ROOT); > + > + if (roothwnd != hwnd) > + { > + GetClientRect(roothwnd, &rootrc); > + rheight = rootrc.bottom - rootrc.top; > + > + GetWindowRect(hwnd, &rc); > + width = rc.right - rc.left; > + height = rc.bottom - rc.top; Now that you can get access to the physDev, you should use this to retrieve the position and size instead of using the window rectangles, it will be more correct. For instance physDev->org gives you the origin relative to the drawable, and you can get the clip rectangle from physDev->region. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: Wine-wiki broken by design
by Dan Kegel 16 Nov '06

16 Nov '06

Maybe the wine wiki could publish a machine-readable sitemap; see http://www.xml-sitemaps.com/ http://www.google.com/webmasters/sitemaps/docs/en/about.html That would put less load on the server than letting Yahoo and Google crawl the wiki themselves. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 3

shlwapi: Cast-qual warnings fix (2 of 4)
by Andrew Talbot 16 Nov '06

16 Nov '06

On Wed, November 15, 2006 5:02 pm, Andrew Talbot wrote: > - static const WCHAR szProperty[] = { > + static WCHAR szProperty[] = { '{','D','0','F','C','A','4','2','0', If they aren't constant, shouldn't they be non-static too? -- Dimi Paun <dimi at lattica.com <http://www.winehq.org/mailman/listinfo/wine-devel> > Lattica, Inc. Hi Dimi, As I understand it, declaring them static means that the storage will be assigned and initialised at compile time, rather than run time, since the size and contents are already known. -- Andy.

1 0

arcpad developers talking up wine
by Dan Kegel 16 Nov '06

16 Nov '06

arcpad ( http://www.esri.com/software/arcgis/arcpad/ ) is a popular mobile app for doing map-related tasks. The developers' blog now mentions that the app runs under Wine: http://arcpadteam.blogspot.com/2006/11/arcpad-works-in-linux.html but only with native msxml3. - Dan

1 0

Coverity reports on possible overruns of static arrays
by Paul Vriens 16 Nov '06

16 Nov '06

Hi, we have quite a few places in the code where we do: WCHAR param[any-value]; len = sizeof(param) / sizeof(WCHAR); param[len] = '\0'; and of course more-or-less the same for CHAR arrays. This could lead (and the example does) to writing behind the end of param. I've submitted two patches for this, but I'm not sure just doing: param[len - 1] = '\0'; is the correct/good approach. Any idea's? Cheers, Paul.

3 2

Re: d3d8/wined3d [5]: Create implicit surfaces with refcount 0.
by Stefan Dösinger 16 Nov '06

16 Nov '06

Am Mittwoch 15 November 2006 23:35 schrieb Markus Amsler: > Depends on [1]. > This fixes all d3d8 implicit surface refcount problems. > if (This->parentDevice && ref == 1) { > if (implicit) { > IUnknown_AddRef(This->parentDevice); > } else { > /* This can only happen on device/swapchain destruction. > * It avoids destructing the device again on release. */ > This->parentDevice = NULL; > } I do not like the extra if(implicit here). An incorrect test shows that an AddRef on any object with refcount == 0 increases the device's refcount, no matter if its implicit or not: CreateTexture(device.., &texture); /* increases device refcount */ AddRef(texture); /* no change in dev refcount*/ Release(texture); Release(texture); /* device refcount decremented */ AddRef(texture); /* device refcount incremented */ Release(texture); /* decremented again */ Currently our CreateTexture(surface, vertexbuffer, ...) increases the device refcount and initializes the refcount to 1. In my eyes it would be cleaner to init the refcount of everything to 0, and if the interface is not implicit AddRef it(from 0 to 1) in Create*. In AddRef, when increasing the refcount from to to 1, AddRef the device. > } else { > /* This can only happen on device/swapchain destruction. > * It avoids destructing the device again on release. */ > This->parentDevice = NULL; > } > } This looks like pretty obscure magic in AddRef to me :-/ . Wouldn't it be cleaner to unset the parent device in d3d8device8::Release?

2 1

Re: wined3d [3]: Add IsImplicit/SetImplicit surface functions.
by Stefan Dösinger 16 Nov '06

16 Nov '06

Am Mittwoch 15 November 2006 23:33 schrieb Markus Amsler: > --- > dlls/wined3d/surface.c | 14 ++++++++++++++ > dlls/wined3d/surface_gdi.c | 2 ++ > dlls/wined3d/wined3d_private.h | 3 +++ > include/wine/wined3d_interface.h | 4 ++++ > 4 files changed, 23 insertions(+), 0 deletions(-) Does wined3d have to know if the surface is implicit? Wouldn't it be sufficient to just store it in the d3d8/9 surface? This would avoid adding more complexity to wined3d. Btw, the refcount of the wined3d surfaces can't be seen by the app, so you don't have to add your 0 refcount hack to wined3d. Actually I am thinking of dropping refcounting in wined3d completely, it makes things just unneccessary difficult.

2 1

Re: winequartz.drv: Second glance at Window support.
by Detlef Riekenberg 15 Nov '06

15 Nov '06

On Mo, 2006-11-13 at 20:32 +0100, Pierre d'Herbemont wrote: > +++ b/dlls/winequartz.drv/carbon_imports.h > +++ b/dlls/winequartz.drv/quartzdrv_carbon.c You are using various "fprintf(stderr, ..." here. Please use: #include "wine/debug.h" ERR(...) -- By by ... Detlef

1 0

Re: winequartz.drv: Second glance at Window support.
by Detlef Riekenberg 15 Nov '06

15 Nov '06

On Mo, 2006-11-13 at 20:32 +0100, Pierre d'Herbemont wrote: > +void CARBON_HideWindow(WindowRef win) > +{ > + if (carbonPtr_ShowWindow) carbonPtr_ShowWindow(win); > +} This looks like a Copy & Paste bug. -- By by ... Detlef

1 0

Re: localspl: Implement ConfigurePort (API-doc are my own words)
by Detlef Riekenberg 15 Nov '06

15 Nov '06

> Changelog: > - localspl: Implement ConfigurePort Forgot to mention: I did the Function-Description with my own words (same for winspool.drv a while ago) -- By by ... Detlef

1 0

Re: Debugging solidworks 2006
by Kartik Thakore 15 Nov '06

15 Nov '06

After doing the suggested tactis it still failed but with fewer errors: Here is the output " fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" fixme:msvcrt:MSVCRT__wsetlocale 4 L"C" fixme:msvcrt:MSVCRT__wsetlocale 4 L"English_United States.1252" err:wgl:ConvertPixelFormatWGLtoGLX Can't find a matching FBCONFIG_ID for VISUAL_ID 0x24! err:wgl:X11DRV_ChoosePixelFormat Can't find a matching FBCONFIG_ID for VISUAL_ID 0x24! fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:toolbar:TOOLBAR_Restore send TBN_GETBUTTONINFO for each button fixme:shdocvw:PersistStreamInit_InitNew (0x335d488) err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d fixme:shdocvw:navigate_url Unsupported arguments fixme:ole:CoCreateInstance no instance created for interface {08c0e040-62d1-11d1-9326-0060b067b86e} of class {4955dd33-b159-11d0-8fcf-00aa006bcc59}, hres is 0x80004002 fixme:shdocvw:ClOleCommandTarget_QueryStatus (0x335d524)->((null) 1 0x33e520 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->((null) 25 2 0x33e534 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->((null) 26 2 0x33e534 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-709 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e448 0x33e494 (nil) 0x33e458) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e448 0x33e494 (nil) 0x33e458) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5513 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-726 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e488 0x33e4d4 (nil) 0x33e498) fixme:shdocvw:ClientSite_GetContainer (0x335d524)->(0x33e560) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->({000214d1-0000-0000-c000-000000000046} 37 0 0x33e684 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e548 0x33e674 (nil) 0x33e558) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33e548 0x33e664 (nil) 0x33e558) fixme:shdocvw:HttpNegotiate_BeginningTransaction (0x33186a0)->(L"" L"" 0 0x33e698) fixme:shdocvw:BindStatusCallback_GetBindInfo (0x33186a0)->(0x33e69c 0x33e5c0) err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d err:shdocvw:get_typeinfo LoadRegTypeLib failed: 8002801d fixme:shdocvw:navigate_url Unsupported arguments fixme:mshtml:HlinkTarget_SetBrowseContext (0x3318998)->((nil)) fixme:ole:CoCreateInstance no instance created for interface {08c0e040-62d1-11d1-9326-0060b067b86e} of class {4955dd33-b159-11d0-8fcf-00aa006bcc59}, hres is 0x80004002 fixme:shdocvw:ClOleCommandTarget_QueryStatus (0x335d524)->((null) 1 0x33f000 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->((null) 25 2 0x33f014 (nil)) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->((null) 26 2 0x33f014 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-709 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef28 0x33ef74 (nil) 0x33ef38) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5512 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef28 0x33ef74 (nil) 0x33ef38) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5513 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-726 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33ef68 0x33efb4 (nil) 0x33ef78) fixme:shdocvw:ClientSite_GetContainer (0x335d524)->(0x33f040) fixme:shdocvw:ClOleCommandTarget_Exec (0x335d524)->({000214d1-0000-0000-c000-000000000046} 37 0 0x33f164 (nil)) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5502 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33f028 0x33f154 (nil) 0x33f038) fixme:shdocvw:ClDispatch_Invoke (0x335d524)->(-5501 {00000000-0000-0000-0000-000000000000} 2048 0002 0x33f028 0x33f144 (nil) 0x33f038) fixme:shdocvw:HttpNegotiate_BeginningTransaction (0x39d5e88)->(L"" L"" 0 0x33f178) fixme:shdocvw:BindStatusCallback_GetBindInfo (0x39d5e88)->(0x33f17c 0x33f0a0) fixme:atl:AtlModuleInit SEMI-STUB (0x43293a8 0x43283e0 0x42d0000) fixme:atl:AtlModuleRegisterServer 0x43293a8 1 (null) fixme:storage:StgCreateDocfile Transacted mode not implemented. fixme:ole:CoRegisterMessageFilter message filter has been registered, but will not be used wine: Unhandled page fault on read access to 0x00000002 at address 0x2 (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x00000002 in 32-bit code (0x00000002). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:00000002 ESP:0033f418 EBP:0033f43c EFLAGS:00010206( - 00 - RIP1) EAX:04361024 EBX:800ac39e ECX:0490dbe0 EDX:043600e0 ESI:04909a98 EDI:00000000 Stack dump: 0x0033f418: 100db041 04361024 04909a80 04909a98 0x0033f428: 100da159 7e920a40 04909bc4 7e920b30 0x0033f438: 04909c70 0033f458 100da45b 04909a80 0x0033f448: 04470a40 04909bc4 04909a50 00000001 0x0033f458: 0033f52c 10189a29 04909a74 04470a40 0x0033f468: 04909bc4 00000001 00000001 103a0065 fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 Backtrace: =>1 0x00000002 (0x0033f43c) 2 0x100da45b in sldappu (+0xda45b) (0x0033f458) 3 0x10189a29 in sldappu (+0x189a29) (0x0033f52c) 4 0x10012cdb in sldappu (+0x12cdb) (0x0033fa18) 5 0x10013130 in sldappu (+0x13130) (0x0033fa48) 6 0x00404404 in sldworks (+0x4404) (0x0033fe48) 7 0x5f812566 in mfc42u (+0x12566) (0x0033ff08) 8 0x7b86f53e in kernel32 (+0x4f53e) (0x0033ffe8) 9 0xb7e44587 (0x00000000) 0x00000002: addb %al,0x0(%eax) Modules: Module Address Debug info Name (218 modules) PE 340000-352000 Deferred rwuxthemesu PE 370000-38e000 Deferred sldarchiveu PE 390000-3a1000 Deferred zlib PE 3b0000-3bd000 Deferred sldebu PE 3c0000-3ea000 Deferred swccu PE 400000-450000 Export sldworks PE 450000-5d0000 Deferred sldgridasu PE 5d0000-711000 Deferred sldmfcu PE 720000-968000 Deferred sldutu PE 970000-9ac000 Deferred sldmgu PE 9b0000-101e000 Deferred sldgcu PE 1020000-1051000 Deferred bodydiffu PE 1060000-1159000 Deferred sldgciparau PE 1160000-1449000 Deferred sldsvu PE 1450000-174d000 Deferred 2d46nt6 PE 1750000-17f3000 Deferred pgm02nt6 PE 1800000-1815000 Deferred sldxtkitu PE 2200000-2706000 Deferred slddialogresu PE 2710000-2718000 Deferred slderrresu PE 2720000-29db000 Deferred sldres1u PE 29e0000-2fba000 Deferred sldresu PE 3630000-364e000 Deferred swpo~bi4 PE 42d0000-4355000 Deferred apc60 PE 10000000-10499000 Export sldappu PE 308c0000-30e19000 Deferred mso9 PE 40000000-41642000 Deferred pskernel ELF 45e04000-45e1f000 Deferred ld-linux.so.2 ELF 45e21000-45f55000 Deferred libc.so.6 ELF 45f57000-45f5b000 Deferred libdl.so.2 ELF 45f5d000-45f83000 Deferred libm.so.6 ELF 45f85000-45f98000 Deferred libpthread.so.0 ELF 45f9a000-45fae000 Deferred libz.so.1 ELF 45fb0000-45fb3000 Deferred libxau.so.6 ELF 45fb5000-4607e000 Deferred libx11.so.6 ELF 46080000-46085000 Deferred libxdmcp.so.6 ELF 46087000-46094000 Deferred libxext.so.6 ELF 460c6000-46130000 Deferred libfreetype.so.6 ELF 46132000-46150000 Deferred libexpat.so.1 ELF 46152000-46181000 Deferred libfontconfig.so.1 ELF 4618d000-46195000 Deferred libxrender.so.1 ELF 46197000-4619c000 Deferred libxfixes.so.3 ELF 4619e000-461a1000 Deferred libxinerama.so.1 ELF 461a3000-461a6000 Deferred libxrandr.so.2 ELF 461a8000-461b1000 Deferred libxcursor.so.1 ELF 46289000-46292000 Deferred libsm.so.6 ELF 46294000-462ac000 Deferred libice.so.6 ELF 462ae000-462b9000 Deferred libgcc_s.so.1 ELF 462bb000-462ce000 Deferred libresolv.so.2 ELF 463cc000-463e2000 Deferred libnsl.so.1 ELF 46aae000-46ac1000 Deferred libtasn1.so.3 ELF 46ac3000-46ac7000 Deferred libgpg-error.so.0 ELF 46ac9000-46b17000 Deferred libgcrypt.so.11 ELF 46b19000-46b88000 Deferred libgnutls.so.13 ELF 46cf6000-46d24000 Deferred libcrypt.so.1 ELF 46e25000-46e2a000 Deferred libxxf86vm.so.1 ELF 46e5a000-46e89000 Deferred libcups.so.2 ELF 4b4b1000-4b5c2000 Deferred libwine.so.1 ELF 4b5b2000-4b662000 Deferred libgl.so.1 ELF 4b664000-4b6db000 Deferred libglu.so.1 PE 5f800000-5f8f2000 Export mfc42u PE 600a0000-600d9000 Deferred appcomps PE 600e0000-600f0000 Deferred appshell PE 60120000-6012f000 Deferred caps PE 60130000-60140000 Deferred chrome PE 60150000-60159000 Deferred cookie PE 60160000-6018c000 Deferred docshell PE 60200000-6021e000 Deferred embedcomponents PE 60230000-60254000 Deferred gkgfxwin PE 60260000-6052d000 Deferred gklayout PE 60530000-60568000 Deferred gkparser PE 605a0000-605c5000 Deferred gkwidget PE 605d0000-605fe000 Deferred i18n PE 60610000-60635000 Deferred imglib2 PE 606e0000-606ef000 Deferred jsd3250 PE 60940000-609bb000 Deferred necko PE 609e0000-609ec000 Deferred oji PE 60a00000-60a18000 Deferred palmsync PE 60a20000-60a27000 Deferred perms PE 60a30000-60a38000 Deferred pipboot PE 60a90000-60a9e000 Deferred profile PE 60aa0000-60aba000 Deferred rdf PE 60af0000-60af7000 Deferred sroaming PE 60b40000-60b4c000 Deferred typeaheadfind PE 60b50000-60c0b000 Deferred uconv PE 60c70000-60c7e000 Deferred webbrwsr PE 60cf0000-60d22000 Deferred xpc3250 PE 60d30000-60d37000 Deferred xpcom_compat_c PE 60d70000-60d7c000 Deferred xppref32 PE 60d80000-60d96000 Deferred gkgfx PE 60da0000-60e09000 Deferred js3250 PE 60e10000-60e23000 Deferred jsj3250 PE 60ec0000-60ed1000 Deferred mozz PE 60ee0000-60f14000 Deferred msgbsutl PE 60f60000-60f87000 Deferred nspr4 PE 60f90000-60fe9000 Deferred nss3 PE 60ff0000-6102a000 Deferred nssckbi PE 61030000-61037000 Deferred palmsyncproxy PE 61040000-61047000 Deferred plc4 PE 61050000-61056000 Deferred plds4 PE 61060000-61068000 Deferred npnul32 PE 61070000-6108a000 Deferred smime3 PE 61090000-610ea000 Deferred softokn3 PE 610f0000-6110b000 Deferred ssl3 PE 61110000-61116000 Deferred xpcom PE 61120000-61134000 Deferred xpcom_compat PE 61140000-611a5000 Deferred xpcom_core PE 611b0000-611b6000 Deferred xpistub PE 65000000-65264000 Deferred vbe6 PE 65300000-65327000 Deferred vbe6intl PE 66700000-66855000 Deferred ~df394b.tmp PE 66b00000-66b95000 Deferred ~de30d7.tmp PE 67800000-67923000 Deferred sldxtoolkitu PE 69b10000-69c3f000 Deferred msxml4 PE 70d00000-70ea0000 Deferred gdiplus PE 746f0000-7471a000 Deferred msimtf PE 74720000-7476b000 Deferred msctf PE 780c0000-78121000 Deferred msvcp60 ELF 7b800000-7b91a000 Export kernel32<elf> \-PE 7b820000-7b91a000 \ kernel32 ELF 7bc00000-7bc82000 Deferred ntdll<elf> \-PE 7bc10000-7bc82000 \ ntdll ELF 7bf00000-7bf03000 Deferred <wine-loader> PE 7c340000-7c396000 Deferred msvcr71 ELF 7c907000-7c989000 Deferred msi<elf> \-PE 7c910000-7c989000 \ msi ELF 7d766000-7d7d7000 Deferred mshtml<elf> \-PE 7d770000-7d7d7000 \ mshtml ELF 7d8ce000-7d90a000 Deferred shdocvw<elf> \-PE 7d8e0000-7d90a000 \ shdocvw ELF 7da80000-7daa1000 Deferred cabinet<elf> \-PE 7da90000-7daa1000 \ cabinet ELF 7db24000-7db3f000 Deferred comcat<elf> \-PE 7db30000-7db3f000 \ comcat ELF 7db3f000-7db5d000 Deferred atl<elf> \-PE 7db50000-7db5d000 \ atl ELF 7dcab000-7dcef000 Deferred riched20<elf> \-PE 7dcc0000-7dcef000 \ riched20 ELF 7dcef000-7dd03000 Deferred riched32<elf> \-PE 7dd00000-7dd03000 \ riched32 ELF 7dd03000-7dd18000 Deferred midimap<elf> \-PE 7dd10000-7dd18000 \ midimap ELF 7dd3e000-7dd7a000 Deferred wineoss<elf> \-PE 7dd50000-7dd7a000 \ wineoss ELF 7de0f000-7de27000 Deferred msacm32<elf> \-PE 7de20000-7de27000 \ msacm32 ELF 7dec5000-7ded9000 Deferred msimg32<elf> \-PE 7ded0000-7ded9000 \ msimg32 ELF 7df01000-7df33000 Deferred uxtheme<elf> \-PE 7df10000-7df33000 \ uxtheme ELF 7dfbc000-7dfd8000 Deferred imm32<elf> \-PE 7dfc0000-7dfd8000 \ imm32 ELF 7dfd8000-7dff6000 Deferred ximcp.so.2 ELF 7e001000-7e08e000 Deferred winex11<elf> \-PE 7e010000-7e08e000 \ winex11 ELF 7e159000-7e16e000 Deferred psapi<elf> \-PE 7e160000-7e16e000 \ psapi ELF 7e16e000-7e1b4000 Deferred dbghelp<elf> \-PE 7e180000-7e1b4000 \ dbghelp ELF 7e1b4000-7e1ce000 Deferred wsock32<elf> \-PE 7e1c0000-7e1ce000 \ wsock32 ELF 7e1ce000-7e1e3000 Deferred wtsapi32<elf> \-PE 7e1d0000-7e1e3000 \ wtsapi32 ELF 7e1e3000-7e20e000 Deferred ws2_32<elf> \-PE 7e1f0000-7e20e000 \ ws2_32 ELF 7e20e000-7e233000 Deferred netapi32<elf> \-PE 7e220000-7e233000 \ netapi32 ELF 7e233000-7e24d000 Deferred crtdll<elf> \-PE 7e240000-7e24d000 \ crtdll ELF 7e24d000-7e2d6000 Deferred winmm<elf> \-PE 7e260000-7e2d6000 \ winmm ELF 7e2d6000-7e2ea000 Deferred lz32<elf> \-PE 7e2e0000-7e2ea000 \ lz32 ELF 7e2ea000-7e303000 Deferred version<elf> \-PE 7e2f0000-7e303000 \ version ELF 7e303000-7e31e000 Deferred hlink<elf> \-PE 7e310000-7e31e000 \ hlink ELF 7e31e000-7e33d000 Deferred mpr<elf> \-PE 7e330000-7e33d000 \ mpr ELF 7e33d000-7e384000 Deferred wininet<elf> \-PE 7e350000-7e384000 \ wininet ELF 7e384000-7e3b7000 Deferred urlmon<elf> \-PE 7e390000-7e3b7000 \ urlmon ELF 7e5b9000-7e632000 Deferred opengl32<elf> \-PE 7e5d0000-7e632000 \ opengl32 ELF 7e632000-7e663000 Deferred winspool<elf> \-PE 7e640000-7e663000 \ winspool ELF 7e663000-7e6ff000 Deferred comdlg32<elf> \-PE 7e670000-7e6ff000 \ comdlg32 ELF 7e6ff000-7e720000 Deferred oledlg<elf> \-PE 7e710000-7e720000 \ oledlg ELF 7e720000-7e746000 Deferred odbc32<elf> \-PE 7e730000-7e746000 \ odbc32 ELF 7e746000-7e831000 Deferred shell32<elf> \-PE 7e760000-7e831000 \ shell32 ELF 7e831000-7e8f1000 Deferred comctl32<elf> \-PE 7e840000-7e8f1000 \ comctl32 ELF 7e8f1000-7e988000 Deferred oleaut32<elf> \-PE 7e900000-7e988000 \ oleaut32 ELF 7e99b000-7e9b9000 Deferred iphlpapi<elf> \-PE 7e9a0000-7e9b9000 \ iphlpapi ELF 7e9b9000-7ea0c000 Deferred rpcrt4<elf> \-PE 7e9d0000-7ea0c000 \ rpcrt4 ELF 7ea0c000-7eaa0000 Deferred ole32<elf> \-PE 7ea20000-7eaa0000 \ ole32 ELF 7eaa0000-7eaf8000 Deferred shlwapi<elf> \-PE 7eab0000-7eaf8000 \ shlwapi ELF 7eaf8000-7ec2e000 Deferred user32<elf> \-PE 7eb10000-7ec2e000 \ user32 ELF 7ec2e000-7ec74000 Deferred advapi32<elf> \-PE 7ec40000-7ec74000 \ advapi32 ELF 7ec7f000-7ec81000 Deferred xlcutf8load.so.2 ELF 7ed7b000-7ee31000 Deferred gdi32<elf> \-PE 7ed90000-7ee31000 \ gdi32 ELF 7ee31000-7ee95000 Deferred msvcrt<elf> \-PE 7ee40000-7ee95000 \ msvcrt ELF 7ef9f000-7efaa000 Deferred libnss_files.so.2 ELF 7efed000-7eff7000 Deferred libnss_nis.so.2 ELF 7eff7000-7f000000 Deferred libnss_compat.so.2 Threads: process tid prio (all id:s are in hex) 0000000d 00000010 0 0000000e 0 0000000a 0000000c 0 0000000b 0 00000008 (D) C:\Program Files\SolidWorks\SLDWORKS.exe 0000001d 0 0000001c 0 0000001b 0 0000001a 0 00000019 0 00000018 0 00000017 0 00000016 0 00000015 0 00000014 0 00000013 0 00000012 0 00000011 0 0000000f 0 00000009 0 <== -- -------- Kartik Thakore 250313003 kthakore(a)uwo.ca 1st year engineering

2 1

Re: Add small comment to function
by James Hawkins 15 Nov '06

15 Nov '06

On 11/15/06, Anatoly <vostok(a)etersoft.ru> wrote: > Hi! > This fix add comment in cosole.c > > Changelog: > Add comment for function GetConsoleWindow in console.c > (../dlls/kernel32/console.c) > Please read [1] to learn how to write API documentation for Wine. Also, this looks like you copied the documentation directly from msdn, which will not be accepted. I personally don't think documentation for this function will be accepted anway, but if you want to try, you'll have to change it according to [1]. [1] http://winehq.org/site/docs/winedev-guide/api-docs -- James Hawkins

1 0

HLSL2GLSL
by Ian Macfarlane 15 Nov '06

15 Nov '06

ATI has released software called HLSL2GLSL which converts D3D9 High Level Shader Language (HLSL) into the OpenGL equivalent GLSL. It's open source, and appears to be under a BSD license, so may be possible to integrate into WINE (I'm not sure if it's old or new BSD license). The source code is here: http://sourceforge.net/projects/hlsl2glsl Press releases and news about it are here: http://www.macworld.com/news/2006/11/10/hlsl2glsl/index.php http://www.theinquirer.net/default.aspx?article=35742 Hope this is of interest, Regards, Ian ps: Sorry if this comes through more than once - I didn't subscribe before sending this the first time and it looks like it didn't get through.

2 1

Re: localspl: Implement ConfigurePortW
by Juan Lang 15 Nov '06

15 Nov '06

Hi Detlef, + IDS_NOTHINGTOCONFIG "This Port has no Options to configure" This should be "This port has no options to configure." In English, nouns are generally not capitalized - only proper nouns. Google will give many pages helping with that if you like. Thanks, --Juan ____________________________________________________________________________________ Cheap talk? Check out Yahoo! Messenger's low PC-to-Phone call rates. http://voice.yahoo.com

2 1

Re: ntdll: prevent test from crashing on amd64
by Marcus Meissner 15 Nov '06

15 Nov '06

On Mon, Nov 13, 2006 at 08:54:33AM +0100, Peter Beutner wrote: > Putting code in the .data section means it will be mapped RW only, causing > segfaults when trying to execute it (at least on NX-capable systems). > > As a quick workaround mark it const, i.e. put it into the .rodata section > which seems to be always mapped executable for ELF files(for whatever reasons). > > (It still doesn't work though if you crosscompile the test.) The previous code also in this file does the same thing, so it would be fine by me. (The more correct fix would be likely to create a executable section and memcpy the code there and execute it there, but I think we can avoid it for now.) ciao, Marcus > --- > dlls/ntdll/tests/exception.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c > index a87cadf..0437661 100644 > --- a/dlls/ntdll/tests/exception.c > +++ b/dlls/ntdll/tests/exception.c > @@ -241,7 +241,7 @@ static DWORD dreg_handler( EXCEPTION_REC > return ExceptionContinueExecution; > } > > -static BYTE code[5] = { > +const static BYTE code[5] = { > 0x31, 0xc0, /* xor %eax,%eax */ > 0x8f, 0x00, /* popl (%eax) - cause exception */ > 0xc3 /* ret */ > @@ -292,7 +292,7 @@ static DWORD single_step_handler( EXCEPT > return ExceptionContinueExecution; > } > > -static BYTE single_stepcode[] = { > +const static BYTE single_stepcode[] = { > 0x9c, /* pushf */ > 0x58, /* pop %eax */ > 0x0d,0,1,0,0, /* or $0x100,%eax */ > @@ -325,7 +325,7 @@ static void test_single_step(void) > } > > /* Test the alignment check (AC) flag handling. */ > -static BYTE align_check_code[] = { > +const static BYTE align_check_code[] = { > 0x55, /* push %ebp */ > 0x89,0xe5, /* mov %esp,%ebp */ > 0x9c, /* pushf */ > -- > 1.4.3.4 > > > >

2 1

HLSL2GLSL
by Ian Macfarlane 15 Nov '06

15 Nov '06

ATI has released software called HLSL2GLSL which converts D3D9 High Level Shader Language (HLSL) into the OpenGL equivalent GLSL. It's open source, and appears to be under a BSD license, so may be possible to integrate into WINE (I'm not sure if it's old or new BSD license). The source code is here: http://sourceforge.net/projects/hlsl2glsl Press releases and news about it are here: http://www.macworld.com/news/2006/11/10/hlsl2glsl/index.php http://www.theinquirer.net/default.aspx?article=35742 Hope this is of interest, Regards, Ian ps: Sorry if this comes through twice - I didn't subscribe before sending this the first time and it looks like it didn't get through.

1 0

HLSL2GLSL
by Ian Macfarlane 15 Nov '06

15 Nov '06

ATI has released software called HLSL2GLSL which converts D3D9 High Level Shader Language (HLSL) into the OpenGL equivalent GLSL. It's open source, and appears to be under a BSD license, so may be possible to integrate into WINE (I'm not sure if it's old or new BSD license). The source code is here: http://sourceforge.net/projects/hlsl2glsl Press releases and news about it are here: http://www.macworld.com/news/2006/11/10/hlsl2glsl/index.php http://www.theinquirer.net/default.aspx?article=35742 Hope this is of interest, Regards, Ian

1 0

Re: user32: Update the edit control when the IME composition string is emptied.
by Michael Stefaniuc 15 Nov '06

15 Nov '06

Hello, Byeong-Sik Jeon wrote: > I tested for this patch with the patched Xlib(XFilterEvent deadlock > problem with XInitThreads). > https://bugs.freedesktop.org/show_bug.cgi?id=1182 > https://bugs.freedesktop.org/attachment.cgi?id=4874 > > Changelog: > Update the edit control when the "IME composition string" is emptied. > --- > dlls/user/edit.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > > ------------------------------------------------------------------------ > > diff --git a/dlls/user/edit.c b/dlls/user/edit.c > index 5b38b68..c0410f1 100644 > --- a/dlls/user/edit.c > +++ b/dlls/user/edit.c > @@ -5335,7 +5335,7 @@ static void EDIT_GetCompositionStr(HWND > > dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); > > - if (dwBufLen <= 0) > + if (dwBufLen < 0) > { > ImmReleaseContext(hwnd, hIMC); > return; > @@ -5349,7 +5349,8 @@ static void EDIT_GetCompositionStr(HWND > return; > } > > - ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); > + if (dwBufLen) > + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); > lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; > > if (CompFlag & GCS_COMPATTR) > @@ -5396,7 +5397,8 @@ static void EDIT_GetCompositionStr(HWND > es->selection_start = es->composition_start; > es->selection_end = es->selection_start + es->composition_len; > > - HeapFree(GetProcessHeap(),0,lpCompStrAttr); > + if (lpCompStrAttr) > + HeapFree(GetProcessHeap(),0,lpCompStrAttr); This change is not needed as HeapFree'ing NULL isn't an error. > HeapFree(GetProcessHeap(),0,lpCompStr); > ImmReleaseContext(hwnd,hIMC); > } bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

RFC: d3d8 refcount implementation
by Markus Amsler 15 Nov '06

15 Nov '06

After spamming wine-patches with d3d tests, I tried to implement the probed behaviour. Attached are two patches, which makes all d3d8 refcount test pass. They are small and ugly. The problems are: The implicit surfaces now gets released if the refcount is -1. Somehow we have to force releasing d3d8 sufaces from wined3d. No idea how. I added a flag to mark the implicit surfaces. It's redundant, because wined3d knows the implicit surfaces. The other idea is calling GetRenderTarget and friends in Surface_(AddRef/Release). Besides the problem of an endless recursion, it would be quite an overhead. Another problem is, that IWineD3DDeviceImpl_Uninit3D calls via GetParent AddRef/Release on the d3d8 surface. This causes the device to be released again(=>endless recursion). I "solved" it with ignoring an addref from 0 in the d3d8 Device, which causes the release to be -1 => no wined3d device releasing. Works but ugly. Ideas, suggestions? >From 1a73ec5958e2e4c7fd076184c9e1f1cf7427d936 Mon Sep 17 00:00:00 2001 From: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon, 13 Nov 2006 22:29:12 +0100 Subject: [PATCH] d3d8: Force implicit surfaces to handle their own refcount. To: wine-patches <wine-patches(a)winehq.org> --- dlls/d3d8/d3d8_private.h | 3 +++ dlls/d3d8/directx.c | 2 ++ dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/tests/device.c | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index b32033f..9ca9989 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -246,6 +246,9 @@ struct IDirect3DSurface8Impl /* Parent reference */ LPDIRECT3DDEVICE8 parentDevice; + + /* Flags an implicit surface */ + BOOL implicit; }; /* ------------------ */ diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 42ae40d..b51181e 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -202,6 +202,7 @@ HRESULT WINAPI D3D8CB_CreateRenderTarget *ppSurface = d3dSurface->wineD3DSurface; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; + d3dSurface->implicit = TRUE; } else { *ppSurface = NULL; } @@ -281,6 +282,7 @@ HRESULT WINAPI D3D8CB_CreateDepthStencil *ppSurface = d3dSurface->wineD3DSurface; IUnknown_Release(d3dSurface->parentDevice); d3dSurface->parentDevice = NULL; + d3dSurface->implicit = TRUE; } return res; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8ab312e..83265e9 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -46,7 +46,7 @@ static ULONG WINAPI IDirect3DSurface8Imp TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); + if (!This->implicit) IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); if (containerParent) { /* Forward to the containerParent */ TRACE("(%p) : Forwarding to %p\n", This, containerParent); @@ -65,7 +65,7 @@ static ULONG WINAPI IDirect3DSurface8Imp TRACE("(%p)\n", This); - IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); + if (!This->implicit) IWineD3DSurface_GetContainerParent(This->wineD3DSurface, &containerParent); if (containerParent) { /* Forward to the containerParent */ TRACE("(%p) : Forwarding to %p\n", This, containerParent); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 06f8aab..86e10af 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -429,17 +429,17 @@ static void test_refcount(void) /* check implicit back buffer */ hr = IDirect3DSwapChain8_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); - todo_wine CHECK_REFCOUNT( pSwapChain, 1); + CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { todo_wine CHECK_CONTAINER( Surface, pBackBuffer, IID_IDirect3DDevice8, pDevice, S_OK); todo_wine CHECK_REFCOUNT( pBackBuffer, 1); todo_wine CHECK_ADDREF_REFCOUNT(pBackBuffer, 2); - todo_wine CHECK_REFCOUNT(pSwapChain, 1); + CHECK_REFCOUNT(pSwapChain, 1); todo_wine CHECK_REFCOUNT(pDevice, refcount); todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 1); - todo_wine CHECK_REFCOUNT(pSwapChain, 1); + CHECK_REFCOUNT(pSwapChain, 1); todo_wine CHECK_REFCOUNT(pDevice, refcount); todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); -- 1.4.3.3 >From 99bea2c16f008c412d578c81919bc52985396145 Mon Sep 17 00:00:00 2001 From: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue, 14 Nov 2006 00:15:31 +0100 Subject: [PATCH] d3d8: Hack to fix all refcount issues. To: wine-patches <wine-patches(a)winehq.org> --- dlls/d3d8/device.c | 1 + dlls/d3d8/directx.c | 6 +-- dlls/d3d8/surface.c | 7 ++-- dlls/d3d8/tests/device.c | 70 +++++++++++++++++++++++----------------------- dlls/wined3d/device.c | 2 +- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1fa10da..04d37f6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -80,6 +80,7 @@ static HRESULT WINAPI IDirect3DDevice8Im static ULONG WINAPI IDirect3DDevice8Impl_AddRef(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + if (This->ref == 0) return 0; ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b51181e..ba6eec5 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -200,9 +200,8 @@ HRESULT WINAPI D3D8CB_CreateRenderTarget if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; - IUnknown_Release(d3dSurface->parentDevice); - d3dSurface->parentDevice = NULL; d3dSurface->implicit = TRUE; + IDirect3DSurface8_Release((IDirect3DSurface8 *)d3dSurface); } else { *ppSurface = NULL; } @@ -280,9 +279,8 @@ HRESULT WINAPI D3D8CB_CreateDepthStencil (D3DFORMAT)Format, MultiSample, (IDirect3DSurface8 **)&d3dSurface); if (SUCCEEDED(res)) { *ppSurface = d3dSurface->wineD3DSurface; - IUnknown_Release(d3dSurface->parentDevice); - d3dSurface->parentDevice = NULL; d3dSurface->implicit = TRUE; + IDirect3DSurface8_Release((IDirect3DSurface8 *)d3dSurface); } return res; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 83265e9..f15a5fa 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -55,6 +55,7 @@ static ULONG WINAPI IDirect3DSurface8Imp /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); + if (This->parentDevice && ref == 1) IUnknown_AddRef(This->parentDevice); return ref; } } @@ -75,12 +76,12 @@ static ULONG WINAPI IDirect3DSurface8Imp ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); - if (ref == 0) { + if (This->parentDevice && ref == 0) IUnknown_Release(This->parentDevice); + if ((ref == 0 && !This->implicit) || ref == -1) { IWineD3DSurface_Release(This->wineD3DSurface); - if (This->parentDevice) IUnknown_Release(This->parentDevice); HeapFree(GetProcessHeap(), 0, This); } - + if (ref==-1) ref = 0; return ref; } } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 86e10af..d2cf7b5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -297,38 +297,38 @@ static void test_refcount(void) * - the refcount is not forwarded to the container. */ hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); - todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); + CHECK_CALL( hr, "GetRenderTarget", pDevice, ++refcount); if(pRenderTarget) { todo_wine CHECK_CONTAINER( Surface, pRenderTarget, IID_IDirect3DDevice8, pDevice, S_OK); - todo_wine CHECK_REFCOUNT( pRenderTarget, 1); + CHECK_REFCOUNT( pRenderTarget, 1); - todo_wine CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); - todo_wine CHECK_REFCOUNT(pDevice, refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_ADDREF_REFCOUNT(pRenderTarget, 2); + CHECK_REFCOUNT(pDevice, refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 1); + CHECK_REFCOUNT(pDevice, refcount); hr = IDirect3DDevice8_GetRenderTarget(pDevice, &pRenderTarget); - todo_wine CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); - todo_wine CHECK_REFCOUNT( pRenderTarget, 2); - todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); + CHECK_CALL( hr, "GetRenderTarget", pDevice, refcount); + CHECK_REFCOUNT( pRenderTarget, 2); + CHECK_RELEASE_REFCOUNT( pRenderTarget, 1); - todo_wine CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); + CHECK_RELEASE_REFCOUNT( pRenderTarget, 0); CHECK_REFCOUNT( pDevice, --refcount); /* The render target is released with the device, so AddRef with refcount=0 is fine here. */ - todo_wine CHECK_ADDREF_REFCOUNT(pRenderTarget, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); + CHECK_ADDREF_REFCOUNT(pRenderTarget, 1); + CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_RELEASE_REFCOUNT(pRenderTarget, 0); CHECK_REFCOUNT(pDevice, --refcount); } /* Render target and back buffer are the same. */ hr = IDirect3DDevice8_GetBackBuffer(pDevice, 0, 0, &pBackBuffer); - todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); if(pBackBuffer) { - todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT( pDevice, --refcount); ok(pRenderTarget == pBackBuffer, "RenderTarget=%p and BackBuffer=%p should be the same.\n", pRenderTarget, pBackBuffer); @@ -337,24 +337,24 @@ static void test_refcount(void) pRenderTarget = NULL; hr = IDirect3DDevice8_GetDepthStencilSurface(pDevice, &pStencilSurface); - todo_wine CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); + CHECK_CALL( hr, "GetDepthStencilSurface", pDevice, ++refcount); if(pStencilSurface) { CHECK_CONTAINER( Surface, pStencilSurface, IID_IDirect3DDevice8, pDevice, S_OK); - todo_wine CHECK_REFCOUNT( pStencilSurface, 1); + CHECK_REFCOUNT( pStencilSurface, 1); - todo_wine CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); - todo_wine CHECK_REFCOUNT(pDevice, refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_ADDREF_REFCOUNT(pStencilSurface, 2); + CHECK_REFCOUNT(pDevice, refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 1); + CHECK_REFCOUNT(pDevice, refcount); - todo_wine CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); + CHECK_RELEASE_REFCOUNT( pStencilSurface, 0); CHECK_REFCOUNT( pDevice, --refcount); /* The stencil surface is released with the device, so AddRef with refcount=0 is fine here. */ - todo_wine CHECK_ADDREF_REFCOUNT(pStencilSurface, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); + CHECK_ADDREF_REFCOUNT(pStencilSurface, 1); + CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_RELEASE_REFCOUNT(pStencilSurface, 0); CHECK_REFCOUNT(pDevice, --refcount); } @@ -428,27 +428,27 @@ static void test_refcount(void) { /* check implicit back buffer */ hr = IDirect3DSwapChain8_GetBackBuffer(pSwapChain, 0, 0, &pBackBuffer); - todo_wine CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); + CHECK_CALL( hr, "GetBackBuffer", pDevice, ++refcount); CHECK_REFCOUNT( pSwapChain, 1); if(pBackBuffer) { todo_wine CHECK_CONTAINER( Surface, pBackBuffer, IID_IDirect3DDevice8, pDevice, S_OK); - todo_wine CHECK_REFCOUNT( pBackBuffer, 1); + CHECK_REFCOUNT( pBackBuffer, 1); - todo_wine CHECK_ADDREF_REFCOUNT(pBackBuffer, 2); + CHECK_ADDREF_REFCOUNT(pBackBuffer, 2); CHECK_REFCOUNT(pSwapChain, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 1); + CHECK_REFCOUNT(pDevice, refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 1); CHECK_REFCOUNT(pSwapChain, 1); - todo_wine CHECK_REFCOUNT(pDevice, refcount); + CHECK_REFCOUNT(pDevice, refcount); - todo_wine CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); + CHECK_RELEASE_REFCOUNT( pBackBuffer, 0); CHECK_REFCOUNT( pDevice, --refcount); /* The back buffer is released with the swapchain, so AddRef with refcount=0 is fine here. */ - todo_wine CHECK_ADDREF_REFCOUNT(pBackBuffer, 1); - todo_wine CHECK_REFCOUNT(pDevice, ++refcount); - todo_wine CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); + CHECK_ADDREF_REFCOUNT(pBackBuffer, 1); + CHECK_REFCOUNT(pDevice, ++refcount); + CHECK_RELEASE_REFCOUNT(pBackBuffer, 0); CHECK_REFCOUNT(pDevice, --refcount); pBackBuffer = NULL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 794cba3..12dcf95 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2170,7 +2170,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stencilBufferTarget = NULL; TRACE("Releasing the render target at %p\n", This->renderTarget); - if(IWineD3DSurface_Release(This->renderTarget) >0){ + if(This->renderTarget && IWineD3DSurface_Release(This->renderTarget) >0){ /* This check is a bit silly, itshould be in swapchain_release FIXME("(%p) Something's still holding the renderTarget\n",This); */ } TRACE("Setting rendertarget to NULL\n"); -- 1.4.3.3

3 4

Success story with Wine
by Darryl Dixon 15 Nov '06

15 Nov '06

Hi All, Just a quick note to say thanks to the Devs for the incredible job that you are doing on the march to 1.0. I have been following Wine development for many many years, and the progress in the last year is truly extraordinary. Earlier today I fired up my copy of Firefox 1.5.0.7 for Windows with Wine 0.9.25, browsed to the Firefox page, downloaded Firefox 2.0, clicked `Open' from the download window, ran the installer flawlessly, and started up the new version of Firefox seamlessly. From there I downloaded ColorPic (a screen color picker for Windows that I use for Web work); the .zip file opened up automatically in WinRAR, from which I was able to launch the installer executable and install it fine. It started up after install perfectly too, and now I can pick colors from all over my Linux (Gnome) desktop with a Windows color picker tool. Not a single error, glitch, or fault to be seen. It all went fast, and smooth. It seems to me that Wine is now at the point that the average user could probably browse the web quite happily, downloading little Windows apps and trying them out, without ever even realising they were running the Windows versions of everything. Astounding. Awesome. Full credit. many regards, -- Darryl Dixon <esrever_otua(a)pythonhacker.is-a-geek.net>

1 0

Over 500 maintainers in the applcation database
by Tony Lambregts 14 Nov '06

14 Nov '06

_I_ think this is news worthy. We now have over 500 individuals who have signed up to be maintainer of an applications. these maintainers are spread out over 794 entries in the AppDB. Since there are some applications with multiple maintainers and some maintainers maintain multiple apps and the fact that super maintainers are responsible for multiple versions I cannot give a accurate count on maintained applications ;^) There has not been a lot of hacking on the AppDB for a while. At least part of the reason for this is that there is a lot of work to be done just administrating it. even with all the maintainers and administrators it seems we are always a couple of days behind checking new application submissions and test results. Current active Administrators are : Chris Morgan (In charge of cvs commits) Tony Lambregts (me) Louis Lenders Alexander Nicolaysen Sørnes Killertux Molle Bestefich Jan Zerebecki Nick Law We can always use more help and even though I am kind of proud of the current status of the AppDB I have to be one of the first to admit it needs some more polish. If you know php and would like to help out you can download the source http://www.winehq.org/site/cvs There are lots of features that would enhance the AppDB please have a look at the wiki and feel free to add other stuff that you think would be good to have. http://wiki.winehq.org/AppdbInfo You can also help out by becoming an application maintainer as well or if you are a sucker for punishment then perhaps you might consider becoming a Administrator for the AppDB. -- Tony Lambregts

1 0

OLE Automatization Linux's OpenOffice from wine app
by Alexandr Kochmin 14 Nov '06

14 Nov '06

I have windows application wich use OLE Automatization to fill-in OpenOffice document It's create OleObject like OpenOffice := CreateOleObject('com.sun.star.ServiceManager'); And then use it. Everything is OK when I run it on windows. How can I rewrite it, or use any tools, to work when OpenOffice is installed on Linux, and my application runs in wine? -- Kochmin Alexandr

1 0

Re: d3d8 2: Test refcount forwarding.
by H. Verbeet 14 Nov '06

14 Nov '06

On 14/11/06, Markus Amsler <markus.amsler(a)oribi.org> wrote: >+extern int get_refcount(IUnknown *object); --- >-static int get_refcount(IUnknown *object) >+int get_refcount(IUnknown *object) We don't really want to do that. The idea is that a test should depend only on the .c file it's defined in. That's also why eg. the code to initialise a D3D device is duplicated everywhere.

2 2

winex11.drv keyboard driver rewrite
by Oleh R. Nykyforchyn 14 Nov '06

14 Nov '06

For a rather long time (since wine-2004XXXX) I worked at the most complete integration of XKB features into Wine. There was an unsuccessful attempt to submit a large patch to Wine team. I think that it was rejected because such a big change cannot be made "clean and small" and because of unwillingness to repair that is not broken. I kept working on polishing my implementation and synchronizing it with the official Wine releases. I also tracked all changes in keyboard driver and recently I noted that Dmitry Timoshkov introduces things that I already did in my code. This encourages me to make an another attempt to share my extensions (that now go much further) with others. The most serious problem to me was that Wine can correctly deal with XKB enabled X11, but only for the simplest configuration : one or two XKB groups, with two keysyms for a keycode in each. Thus we can choose one of the two variants: 1) there are two groups, e.g. US/ASCII and Russian, so Wine should contain a dual (English/Russian) layout. It makes impossible to detect input language depending on the keyboard state. We also cannot have more than two layouts. We cannot also combine, e.g., French and Russian, because it takes 3+2>4 keysyms per keycode. 2) there are several XKB layouts, and each of them contains only one XKB group (in fact, a layout for one language). This simplifies the thing, but each time we switch the layout, new keyboard mapping is loaded into X, and Wine keyboard driver should redetect everything from the beginning. Furthermore, Wine never can know how much layouts are there on the system, thus calls like ActivateKeyboardLayout() can't be implemented. As far as XKB extension exists and is widely used on most of Unices, it is wise to use its features to the maximal extent. In theory, four XKB groups and two overlay groups allow to have to 16 different layouts and switch between them just by X means, without need to reload another mapping into X server. Of course, reality isn't so perfect, but I wrote a simple "Cyrillic-Eastern/Western European" layout that uses three XKB groups: one for English and German, an another for English/Polish and the third for Ukrainian/Russian/Belarusian, i.e., six of possible twelve layouts. If I used the last remaining XKB group, I could easily have two or three layouts more, for example, Chech, Slovak and so on can be added. Here an another X/Unix problem arises. IFAIK, You cannot type chars that are not supported by Your current locale. It would be nice if X switched the "input locale", but I don't know anything about it. So I can't see German umlauts or Belarussian short_u. For Wine this means that I can't make a M$ Office document that contains simultaneously Ukrainian, Belarussian, Polish and German characters. I partially rewrote Wine keyboard driver to avoid these restrictions. The most notable changes are: 1) all layouts for current XKB configuration are detected independently and listed only once. They are redetected only if X server signals that keyboard mapping is changed; 2) for each possible combination (XKB group, Overlay1 state, Overlay2 state) two modes of lookup are tried : determined by current locale and by native locale for the layout (if not specified, DEFAULTUNIXCODEPAGE from kernel/nls is used); 3) for each detected LCID the closest candidate of possible 16 layouts is chosen and used to implement ActivateKeyboardLayout(); 4) You can manually configure each of 16 (or 1) layouts through registry, by "HKCU/Software/Wine/X11 Driver/Keyboard/Layout{0--15}" and (or) "HKCU/Software/Wine/X11 Driver/Keyboard/Codepage{0--15}"; 5) now GetKeyboardLayout() returns the LCID for the current layout, and an application (e.g., MS Word) is notified about changes. My implementation worked for me without serious changes since at least Wine-20041019. Upgrade to new releases is made by a simple script. The only thing that needed hand work was renaming of x11drv directory to winex11.drv. I have a snapshot (although don't attach it here because of its large size) that shows a text typed in Word (MS Office 2000) sequentially in German, French, Polish, Belarusian, Ukrainian and Russian (locale is KOI8-U and supports only English, Russian and Ukrainian letters). I doubt that it is possible in core Wine. I think that other Wine users can benefit from my work. The problem is that such a patch cannot be kept "small and clear", as recommended. We cannot jump across an abyss in several small steps. Another question is that all testing was done only on Linux+X.Org+XKB (I just have no anything else), although I tried to preserve all functionality in non-XKB case. The structure of code is such that if at last X11 support multiple input locales, only minimal changes will be needed. Now I propose my implementation for discussion and/or testing. I haven't prepared the patch with git because it is too difficult for me to pull a 80 Gb repository by my slow dialup connection, especially when I am not sure that it will be used by anybody. The patch is prepared by "diff -c" against the last Wine release (0.9.25). If it worth doing, I will ask my friends to pull the Git repository through a faster channel or (if it is appropriate) turn the unpacked source into a local Git repository and then make a patch. Anyway, the patch is too large to be useful for a person who wants to understand the changes. Thus I also attach new versions of the changed files. PS. If You have an ordinary en+... XKB keyboard setup (en+ru, en+ua or so), then the patched Wine should work out of the box. To use English/German/Polish/Ukrainian/Russian/Belarussian/... simultaneously, some little hacking is needed. You are to write a simple XKB configuration or to take mine (then You will have also almost all european accents: acute, grave, diaeresis, tilde, circumflex, cedilla, macron, caron, doubleacute; here are also double angle brackets, i.e. guillemotsleft and guillemotsright). You may also append to You locale/Compose file some composition rules for european languages (the simplest way is to add the contents of iso-8859-15/Compose). Of course, my XKB layout isn't mature enough to propose it for inclusion into official release, but it works well for me in Office 2000 (I was also to set "riched20=n,imm32=n" in winecfg). To ChangeLog: X11DRV keyboard driver partially rewritten to correctly handle XKB extension features. The most notable changes are: 1) all layouts for current XKB configuration are detected independently and listed only once. They are redetected only if X server signals that keyboard mapping is changed. Thus with XKB enabled You can have (in theory) up to 16 layouts; 2) for each possible combination (XKB group, Overlay1 state, Overlay2 state) two modes of lookup are tried : determined by current locale and by native locale for the layout (if not specified, DEFAULTUNIXCODEPAGE from kernel/nls is used); 3) for each detected LCID the closest candidate of possible 16 layouts is chosen and used to implement ActivateKeyboardLayout(); 4) You can manually configure each of 16 (or 1) layouts through registry, by "HKCU/Software/Wine/X11 Driver/Keyboard/Layout{0--15}" and (or) "HKCU/Software/Wine/X11 Driver/Keyboard/Codepage{0--15}"; 5) now GetKeyboardLayout() returns the LCID for the current layout, and an application (e.g., MS Word) is notified about changes. --- wine-0.9/dlls/winex11.drv/x11drv_main.c.orig 2006-11-13 12:04:22.000000000 +0200 +++ wine-0.9/dlls/winex11.drv/x11drv_main.c 2006-11-13 12:04:09.000000000 +0200 @@ -75,6 +75,7 @@ int usexvidmode = 1; int usexrandr = 1; int use_xkb = 1; +int xkbEventCode = 0; int use_take_focus = 1; int use_primary_selection = 0; int managed_mode = 1; @@ -519,24 +520,23 @@ #ifdef HAVE_XKB if (use_xkb) { - use_xkb = XkbUseExtension( data->display, NULL, NULL ); - if (use_xkb) - { - /* Hack: dummy call to XkbKeysymToModifiers to force initialisation of Xkb internals */ - /* This works around an Xlib bug where it tries to get the display lock */ - /* twice during XFilterEvents if Xkb hasn't been initialised yet. */ - XkbKeysymToModifiers( data->display, 'A' ); - XkbSetDetectableAutoRepeat( data->display, True, NULL ); - } + use_xkb = XkbQueryExtension( data->display, + NULL, &xkbEventCode, NULL , NULL , NULL ); + if (use_xkb) { + XkbSetDetectableAutoRepeat( data->display, True, NULL ); + XkbSelectEvents(data->display, XkbUseCoreKbd, + XkbAllEventsMask, + XkbNewKeyboardNotifyMask | XkbMapNotifyMask | + XkbStateNotifyMask | XkbControlsNotifyMask); + X11DRV_register_event_handler(xkbEventCode, X11DRV_XkbEvent); + } } #endif if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); - if (!use_xim) - data->xim = NULL; - else if (!(data->xim = X11DRV_SetupXIM( data->display, input_style ))) + if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style ))) WARN("Input Method is not available\n"); if (wine_server_fd_to_handle( ConnectionNumber(data->display), GENERIC_READ | SYNCHRONIZE, --- wine-0.9/dlls/winex11.drv/x11drv.h.orig 2006-11-13 12:04:23.000000000 +0200 +++ wine-0.9/dlls/winex11.drv/x11drv.h 2006-11-13 12:04:22.000000000 +0200 @@ -622,6 +622,9 @@ extern void X11DRV_SelectionRequest( HWND hWnd, XEvent *event ); extern void X11DRV_SelectionClear( HWND hWnd, XEvent *event ); extern void X11DRV_MappingNotify( HWND hWnd, XEvent *event ); +#ifdef HAVE_XKB +extern void X11DRV_XkbEvent( HWND hwnd, XEvent *event ); +#endif extern DWORD EVENT_x11_time_to_win32_time(Time time); --- wine-0.9/dlls/winex11.drv/event.c.orig 2006-11-13 12:04:23.000000000 +0200 +++ wine-0.9/dlls/winex11.drv/event.c 2006-11-13 12:04:09.000000000 +0200 @@ -26,6 +26,9 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> +#ifdef HAVE_XKB +#include <X11/XKBlib.h> +#endif #include <assert.h> #include <stdarg.h> @@ -238,31 +241,36 @@ */ static int process_events( Display *display, ULONG_PTR mask ) { - XEvent event; + union _event { + XEvent core; +#ifdef HAVE_XKB + XkbEvent space; +#endif + } event; HWND hwnd; int count = 0; x11drv_event_handler handler; wine_tsx11_lock(); - while (XCheckIfEvent( display, &event, filter_event, (char *)mask )) + while (XCheckIfEvent( display, &event.core, filter_event, (char *)mask )) { count++; - if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ + if (XFilterEvent( &event.core, None )) continue; /* filtered, ignore it */ - if (!(handler = find_handler( event.type ))) + if (!(handler = find_handler( event.core.type ))) { - TRACE( "%s, ignoring\n", dbgstr_event( event.type )); + TRACE( "%s, ignoring\n", dbgstr_event( event.core.type )); continue; /* no handler, ignore it */ } - if (XFindContext( display, event.xany.window, winContext, (char **)&hwnd ) != 0) + if (XFindContext( display, event.core.xany.window, winContext, (char **)&hwnd ) != 0) hwnd = 0; /* not for a registered window */ - if (!hwnd && event.xany.window == root_window) hwnd = GetDesktopWindow(); + if (!hwnd && event.core.xany.window == root_window) hwnd = GetDesktopWindow(); wine_tsx11_unlock(); TRACE( "%s for hwnd/window %p/%lx\n", - dbgstr_event( event.type ), hwnd, event.xany.window ); - handler( hwnd, &event ); + dbgstr_event( event.core.type ), hwnd, event.core.xany.window ); + handler( hwnd, &event.core ); wine_tsx11_lock(); } XFlush( gdi_display ); --- wine-0.9/dlls/winex11.drv/keyboard.c.orig 2006-11-13 12:04:23.000000000 +0200 +++ wine-0.9/dlls/winex11.drv/keyboard.c 2006-11-13 13:45:05.000000000 +0200 @@ -7,6 +7,7 @@ * Copyright 1998 Morten Welinder * Copyright 1998 Ulrich Weigand * Copyright 1999 Ove KЕven + * Copyright 2005 Oleh Nykyforchyn * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,13 +31,21 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> -#ifdef HAVE_X11_XKBLIB_H +#ifdef HAVE_XKB #include <X11/XKBlib.h> +#define MAX_OVERLAYS 4 +#define OVER1_ENABLED 1 +#define OVER2_ENABLED 2 +#define MAX_LAYOUTS 16 +#else +#define MAX_OVERLAYS 1 +#define MAX_LAYOUTS 1 #endif #include <ctype.h> #include <stdarg.h> #include <string.h> +#include <stdio.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -46,14 +55,16 @@ #include "winuser.h" #include "wine/winuser16.h" #include "winnls.h" +#include "winreg.h" #include "win.h" #include "x11drv.h" #include "wine/server.h" #include "wine/unicode.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(keyboard); -WINE_DECLARE_DEBUG_CHANNEL(key); +WINE_DEFAULT_DEBUG_CHANNEL(keyboard); /* Managing the whole layouts set */ +WINE_DECLARE_DEBUG_CHANNEL(layout); /* How each layout is detected */ +WINE_DECLARE_DEBUG_CHANNEL(key); /* Processing single key event */ typedef union { @@ -86,8 +97,31 @@ static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP or a WM_KEYUP message */ -static int min_keycode, max_keycode, keysyms_per_keycode; -static WORD keyc2vkey[256], keyc2scan[256]; +static int min_keycode = 0, max_keycode = 0, keysyms_per_keycode = 4; +static int layout_no = 0; /* Current layout */ +static int max_group = 1; /* Can be 1 to 4 XKB groups; ignored if XKB is not used */ +#ifdef HAVE_XKB +static int kbd_group = 0; /* Current XKB group */ +static int kbd_overlay = 0; /* Active overlay groups : 0 = none, + 1=overlay1, 2=overlay2, 3=both */ +static KeyCode keyc2over[MAX_OVERLAYS-1][256] = {{0}}; /* real key mapped to virtual */ +static KeyCode over2keyc[MAX_OVERLAYS-1][256] = {{0}}; /* the least real key mapped + by overlay to this virtual one */ +#endif +static WORD keyc2vkey[MAX_LAYOUTS][256] = {{0}}, \ + keyc2scan[MAX_LAYOUTS][256] = {{0}}; +static KeySym keyc2ksym[MAX_LAYOUTS][256][4] = {{{0}}}; +static unsigned kbd_layout[MAX_LAYOUTS]= {0}; /* indices into table of + layouts for possible combinations + of XKB group and overlay group */ +static int kbd_list[MAX_LAYOUTS]; /* scores for preferred layouts */ +static unsigned kbd_cp[MAX_LAYOUTS]; /* Win number of the Unix codepage for a layout, 0 = locale encoding */ +static unsigned global_refresh = 1; /* rebuild all tables */ +#ifdef HAVE_XKB +XkbDescPtr desc = NULL; /* XKB keyboard description record - here we + quickly get all XKB information */ +#endif +static const char * INIKeyboard = "Software\\Wine\\X11 Driver\\Keyboard"; static int NumLockMask, AltGrMask; /* mask in the XKeyEvent state */ static int kcControl, kcAlt, kcShift, kcNumLock, kcCapsLock; /* keycodes */ @@ -240,7 +274,7 @@ and Shift-AltGr if it can vary among different X servers */ /* Remember that your 102nd key (to the right of l-shift) should be on a separate line, see existing tables */ -/* If Wine fails to match your new table, use WINEDEBUG=+key to find out why */ +/* If Wine fails to match your new table, use WINEDEBUG=+layout to find out why */ /* Remember to also add your new table to the layout index table far below! */ /*** German Logitech Desktop Pro keyboard layout */ @@ -341,6 +375,16 @@ "<>|","yY","xX","cC","vV","bB","nN","mM",",;",".:","-_", }; +/*** German keyboard layout (simple, minimal difference from US layout) */ +static const char main_key_DE_std[MAIN_LEN][4] = +{ + "\xdf\xb0","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","Ээ","`'~", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","Жж","Дд","\\|", + "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", + "<>" /* the phantom key */ +}; + /*** Swiss German keyboard layout (setxkbmap ch -variant de) */ static const char main_key_SG[MAIN_LEN][4] = { @@ -572,6 +616,16 @@ "<>" /* the phantom key */ }; +/*** Belarusian keyboard layout KOI8-RU */ +static const char main_key_BY_std[MAIN_LEN][4] = +{ + "ёЁ","1!","2\"","3'","4;","5%","6:","7?","8*","9(","0)","-_","=+", + "йЙ","цЦ","уУ","кК","еЕ","нН","гГ","шШ","╝╬","зЗ","хХ","ъЪ", + "фФ","ыЫ","вВ","аА","пП","рР","оО","лЛ","дД","жЖ","эЭ","\\/", + "яЯ","чЧ","сС","мМ","іІ","тТ","ьЬ","бБ","юЮ",".,", + "<>" /* the phantom key */ +}; + /*** Spanish keyboard layout (setxkbmap es) */ static const char main_key_ES[MAIN_LEN][4] = { @@ -612,6 +666,16 @@ "<>|" }; +/*** Polish keyboard layout (simple, minimal difference from US layout) */ +static const char main_key_PL_std[MAIN_LEN][4] = +{ + "`~","1!","2@","3#","4$","5%","6^","7&","8*","9(","0)","-_","=+", + "qQ","wW","eE","rR","tT","yY","uU","iI","oO","pP","\xea\xca","\xb3\xa3", + "aA","sS","dD","fF","gG","hH","jJ","kK","lL","\xf3\xd3","\xb1\xa1","\\|", + "zZ","xX","cC","vV","bB","nN","mM",",<",".>","/?", + "<>" /* the phantom key */ +}; + /*** Slovenian keyboard layout (setxkbmap si) ***/ static const char main_key_SI[MAIN_LEN][4] = { @@ -895,82 +959,91 @@ /*** Layout table. Add your keyboard mappings to this list */ -static const struct { - LCID lcid; /* input locale identifier, look for LOCALE_ILANGUAGE +static struct { + const LCID lcid; /* input locale identifier, look for LOCALE_ILANGUAGE in the appropriate dlls/kernel/nls/.nls file */ - const char *comment; - const char (*key)[MAIN_LEN][4]; - const WORD (*scan)[MAIN_LEN]; /* scan codes mapping */ - const WORD (*vkey)[MAIN_LEN]; /* virtual key codes mapping */ + unsigned int codepage; /* If keysyms in a layout are outside of Your locale, + but You want to input them, and XKB is enabled, then Wine will + try to simply cut out lower byte of each keysym (raw lookup) + instead of converting to current locale (locale lookup). + If chars produced this way match some Windows codepage, write + it here. + 0 = DefaultUnixCodepage for lcid (fallback) */ + const char * const comment; + const char (* const key)[MAIN_LEN][4]; + const WORD (* const scan)[MAIN_LEN]; /* scan codes mapping */ + const WORD (* const vkey)[MAIN_LEN]; /* virtual key codes mapping */ } main_key_tab[]={ - {0x0409, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, - {0x0409, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0809, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0407, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout without dead keys", &main_key_DE_nodead, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout for logitech desktop pro", &main_key_DE_logitech, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0407, "German keyboard layout without dead keys 105", &main_key_DE_nodead_105, &main_key_scan_qwerty, &main_key_vkey_qwertz_105}, - {0x0807, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x100c, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x041d, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2}, - {0x0425, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0414, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0406, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040c, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0c0c, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0c0c, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x080c, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, - {0x0816, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, - {0x0416, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, - {0x040b, "Finnish keyboard layout", &main_key_FI, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0402, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0423, "Belarusian keyboard layout", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0422, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0419, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0410, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040f, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040e, "Hungarian keyboard layout", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0415, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0424, "Slovenian keyboard layout", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0c1a, "Serbian keyboard layout sr", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ - {0x0c1a, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ - {0x041a, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x041a, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0411, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, - {0x0411, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041b, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041b, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0405, "Czech keyboard layout", &main_key_CS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0405, "Czech keyboard layout cz", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz}, - {0x0405, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040a, "Latin American keyboard layout", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0427, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041f, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x040d, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0409, "VNC keyboard layout", &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, - {0x0408, "Greek keyboard layout", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x041e, "Thai (Kedmanee) keyboard layout", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0x0413, "Dutch keyboard layout", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, 0, "United States keyboard layout", &main_key_US, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, 0, "United States keyboard layout (phantom key version)", &main_key_US_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, 0, "United States keyboard layout (dvorak)", &main_key_US_dvorak, &main_key_scan_dvorak, &main_key_vkey_dvorak}, + {0x0409, 0, "United States International keyboard layout", &main_key_US_intl, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0809, 0, "British keyboard layout", &main_key_UK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0407, 0, "German keyboard layout", &main_key_DE, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0407, 0, "German keyboard layout without dead keys", &main_key_DE_nodead, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0407, 0, "German keyboard layout for logitech desktop pro", &main_key_DE_logitech, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0407, 0, "German keyboard layout without dead keys 105", &main_key_DE_nodead_105, &main_key_scan_qwerty, &main_key_vkey_qwertz_105}, + {0x0407, 0, "German keyboard layout (simple)", &main_key_DE_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0807, 0, "Swiss German keyboard layout", &main_key_SG, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x100c, 0, "Swiss French keyboard layout", &main_key_SF, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x041d, 0, "Swedish keyboard layout", &main_key_SE, &main_key_scan_qwerty, &main_key_vkey_qwerty_v2}, + {0x0425, 0, "Estonian keyboard layout", &main_key_ET, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0414, 0, "Norwegian keyboard layout", &main_key_NO, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0406, 0, "Danish keyboard layout", &main_key_DA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040c, 0, "French keyboard layout", &main_key_FR, &main_key_scan_qwerty, &main_key_vkey_azerty}, + {0x0c0c, 0, "Canadian French keyboard layout", &main_key_CF, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, 0, "Canadian French keyboard layout (CA_fr)", &main_key_CA_fr, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0c0c, 0, "Canadian keyboard layout", &main_key_CA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x080c, 0, "Belgian keyboard layout", &main_key_BE, &main_key_scan_qwerty, &main_key_vkey_azerty}, + {0x0816, 0, "Portuguese keyboard layout", &main_key_PT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0416, 0, "Brazilian ABNT-2 keyboard layout", &main_key_PT_br, &main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, + {0x0416, 0, "Brazilian ABNT-2 keyboard layout ALT GR", &main_key_PT_br_alt_gr,&main_key_scan_abnt_qwerty, &main_key_vkey_abnt_qwerty}, + {0x040b, 0, "Finnish keyboard layout", &main_key_FI, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0402, 0, "Bulgarian bds keyboard layout", &main_key_BG_bds, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0402, 0, "Bulgarian phonetic keyboard layout", &main_key_BG_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0423, 21866, "Belarusian keyboard layout", &main_key_BY, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 20866, "Russian keyboard layout", &main_key_RU, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 20866, "Russian keyboard layout (phantom key version)", &main_key_RU_phantom, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 20866, "Russian keyboard layout KOI8-R", &main_key_RU_koi8r, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 1251, "Russian keyboard layout cp1251", &main_key_RU_cp1251, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 20866, "Russian phonetic keyboard layout", &main_key_RU_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0422, 21866, "Ukrainian keyboard layout KOI8-U", &main_key_UA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0422, 21866, "Ukrainian keyboard layout (standard)", &main_key_UA_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0419, 20866, "Russian keyboard layout (standard)", &main_key_RU_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0423, 21866, "Belarusian keyboard layout (standard)", &main_key_BY_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040a, 0, "Spanish keyboard layout", &main_key_ES, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0410, 0, "Italian keyboard layout", &main_key_IT, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040f, 0, "Icelandic keyboard layout", &main_key_IS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040e, 0, "Hungarian keyboard layout", &main_key_HU, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0415, 0, "Polish (programmer's) keyboard layout", &main_key_PL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0415, 0, "Polish keyboard layout (simple)", &main_key_PL_std, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0424, 0, "Slovenian keyboard layout", &main_key_SI, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0c1a, 0, "Serbian keyboard layout sr", &main_key_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ + {0x0c1a, 0, "Serbian keyboard layout us,sr", &main_key_US_SR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, /* LANG_SERBIAN,SUBLANG_SERBIAN_CYRILLIC */ + {0x041a, 0, "Croatian keyboard layout", &main_key_HR, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x041a, 0, "Croatian keyboard layout (specific)", &main_key_HR_jelly, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0411, 0, "Japanese 106 keyboard layout", &main_key_JA_jp106, &main_key_scan_qwerty_jp106, &main_key_vkey_qwerty_jp106}, + {0x0411, 0, "Japanese pc98x1 keyboard layout", &main_key_JA_pc98x1, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041b, 0, "Slovak keyboard layout", &main_key_SK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041b, 0, "Slovak and Czech keyboard layout without dead keys", &main_key_SK_prog, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0405, 0, "Czech keyboard layout", &main_key_CS, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0405, 0, "Czech keyboard layout cz", &main_key_CZ, &main_key_scan_qwerty, &main_key_vkey_qwertz}, + {0x0405, 0, "Czech keyboard layout cz_qwerty", &main_key_CZ_qwerty, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040a, 0, "Latin American keyboard layout", &main_key_LA, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0427, 0, "Lithuanian (Baltic) keyboard layout", &main_key_LT_B, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, 0, "Turkish keyboard layout", &main_key_TK, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, 0, "Turkish keyboard layout tr", &main_key_TR, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041f, 0, "Turkish keyboard layout trf", &main_key_TR_F, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040d, 0, "Israelian keyboard layout", &main_key_IL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040d, 0, "Israelian phonetic keyboard layout", &main_key_IL_phonetic, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x040d, 0, "Israelian Saharon keyboard layout", &main_key_IL_saharon, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0409, 0, "VNC keyboard layout", &main_key_vnc, &main_key_scan_vnc, &main_key_vkey_vnc}, + {0x0408, 0, "Greek keyboard layout", &main_key_EL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x041e, 0, "Thai (Kedmanee) keyboard layout", &main_key_th, &main_key_scan_qwerty, &main_key_vkey_qwerty}, + {0x0413, 0, "Dutch keyboard layout", &main_key_NL, &main_key_scan_qwerty, &main_key_vkey_qwerty}, - {0, NULL, NULL, NULL, NULL} /* sentinel */ + {0, 0, NULL, NULL, NULL, NULL} /* sentinel */ }; -static unsigned kbd_layout=0; /* index into above table of layouts */ /* maybe more of these scancodes should be extended? */ /* extended must be set for ALT_R, CTRL_R, @@ -1076,32 +1149,198 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x153 /* FFF8 */ }; +/* Forward declarations */ + +static void +KEYBOARD_DetectLayouts(void); + +void +X11DRV_InitKeyboard(void); + +inline static KeyCode +OverToKeyc(KeyCode k); + +HKL X11DRV_GetKeyboardLayout(DWORD); + + +/********************************************************************** + * KEYBOARD_LayoutSwitched + * + * Track changes of effective XKB group and overlay group + */ + +static Bool +KEYBOARD_LayoutSwitched (void) +{ /* enter and exit in tsx11_lock'ed state */ + int changed = 0; + Display *display = thread_display(); +#ifdef HAVE_XKB + if (use_xkb) { + unsigned ctrls; + XkbStateRec state; + XkbGetState(display, XkbUseCoreKbd, &state); + keysyms_per_keycode = 4; /* ??? */ + kbd_group = state.locked_group; + desc = XkbGetKeyboard(display, + XkbAllComponentsMask, + XkbUseCoreKbd); + XkbGetControls(display, XkbAllControlsMask, desc); + ctrls = desc->ctrls->enabled_ctrls; + kbd_overlay = 0; + if (ctrls & XkbOverlay1Mask) kbd_overlay = OVER1_ENABLED; + if (ctrls & XkbOverlay2Mask) kbd_overlay |= OVER2_ENABLED; + changed = MAX_OVERLAYS*kbd_group + kbd_overlay; + if (layout_no != changed) { + layout_no = changed; + changed = 1; + } else changed = 0; + if (desc->min_key_code != min_keycode) { + TRACE(": min_key_code changed from %d to %d\n", + min_keycode, desc->min_key_code); + min_keycode = desc->min_key_code; + changed = global_refresh = 1; + } + if (desc->max_key_code != max_keycode) { + TRACE(": max_key_code changed from %d to %d\n", + max_keycode, desc->max_key_code); + max_keycode = desc->max_key_code; + changed = global_refresh = 1; + } + if (desc->ctrls->num_groups != max_group) { + TRACE(": num_groups changed from %d to %d\n", + max_group, desc->ctrls->num_groups); + max_group = desc->ctrls->num_groups; + changed = global_refresh = 1; + } + if (global_refresh) + TRACE("caused global refresh: %d groups, keycodes from %d to %d\n", + max_group, min_keycode, max_keycode); + else + TRACE("Selected XKB group %d, overlay %d\n", + kbd_group, kbd_overlay); + } else +#endif /* HAVE_XKB */ + { + int min_key_code, max_key_code, have_chars; + layout_no = 0; + changed = 0; + XDisplayKeycodes(display, &min_key_code, &max_key_code); + XFree(XGetKeyboardMapping(display, + min_key_code, max_key_code - min_key_code +1, &have_chars)); + if ((min_key_code != min_keycode) || (max_key_code != max_keycode) || + (have_chars != keysyms_per_keycode)) { + min_keycode = min_key_code; + max_keycode = max_key_code; + keysyms_per_keycode = have_chars; + changed = global_refresh = 1; + TRACE("caused global refresh: max %d keysyms, keycodes from %d to %d\n", + have_chars, min_keycode, max_keycode); + } + } +#ifdef HAVE_XKB + if (use_xkb && desc) { + XkbFreeKeyboard(desc, XkbAllComponentsMask,True); + desc = NULL; + } + if (changed) { + if (global_refresh) + TRACE("to layout #%d - detect it later\n",layout_no); + else { + HWND hwnd = GetFocus(); + if (!hwnd) hwnd = GetActiveWindow(); + PostMessageW(hwnd, WM_INPUTLANGCHANGEREQUEST, + 0 /*FIXME*/, (LPARAM)X11DRV_GetKeyboardLayout(0)); + TRACE("to layout #%d, \"%s\", codepage %d\n", + layout_no, main_key_tab[kbd_layout[layout_no]].comment,kbd_cp[layout_no]); + } + } +#endif + return changed; +} + +/********************************************************************** + * EVENT_event_to_vkey + * + */ /* Returns the Windows virtual key code associated with the X event <e> */ /* x11 lock must be held */ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) { + KeyCode kc = 0; KeySym keysym = 0; Status status; char buf[24]; - - if (xic) - XmbLookupString(xic, e, buf, sizeof(buf), &keysym, &status); + WORD vkey = 0; + int savetype, check, i; + unsigned int savestate; + + TRACE_(key)("Received e->keycode = %x\n", e->keycode); + + savestate = e->state; + if (xic) { + /* XmbLookupString returns neither char nor keysym for KeyRelease */ + savetype = e->type; + if (savetype == KeyRelease) e->type = KeyPress; + XmbLookupString(xic, e, buf, sizeof(buf), &keysym, &status); + e->type = savetype; + } else XLookupString(e, buf, sizeof(buf), &keysym, NULL); + e->state = savestate; + + +#ifdef HAVE_XKB + if (use_xkb) check = 2; + else +#endif + check = 1; + + again: + kc = OverToKeyc(e->keycode); + if (kc != e->keycode) + TRACE_(key)("Treated as e->keycode = %x\n", kc); if ((e->state & NumLockMask) && (keysym == XK_KP_Separator || keysym == XK_KP_Decimal || (keysym >= XK_KP_0 && keysym <= XK_KP_9))) /* Only the Keypad keys 0-9 and . send different keysyms * depending on the NumLock state */ - return nonchar_key_vkey[keysym & 0xFF]; + vkey = nonchar_key_vkey[keysym & 0xFF]; + else + vkey = keyc2vkey[layout_no][kc]; - TRACE_(key)("e->keycode = %x\n", e->keycode); + for (i = 0; i < 4; i++) { +#ifdef HAVE_XKB + if (use_xkb) { + TRACE_(key)("Compare: 0x%04lx <> 0x%04lx, group %d, overlay %d, level %d\n", + keysym,keyc2ksym[layout_no][kc][i], kbd_group, kbd_overlay, i); + } else +#endif + TRACE_(key)("Compare: 0x%04lx <> 0x%04lx, level %d\n", + keysym,keyc2ksym[layout_no][kc][i], i); + if (keyc2ksym[layout_no][kc][i] && (keysym == keyc2ksym[layout_no][kc][i])) { + if (vkey) check = 0; + break; + } + } - return keyc2vkey[e->keycode]; + switch (check--) { + case 2: + KEYBOARD_LayoutSwitched(); + if (global_refresh) KEYBOARD_DetectLayouts(); + goto again; + case 1: + TRACE_(key)("Matching keycode and level not found for keysym 0x%04lx in layout #%d\n", + keysym,layout_no); + } + + e->keycode = kc; + return vkey; } + + static BOOL NumState=FALSE, CapsState=FALSE; @@ -1218,7 +1457,7 @@ don't treat it. It's from the same key press. Then the state goes to ON. And from there, a 'release' event will switch off the toggle key. */ *State=FALSE; - TRACE("INTERM : don't treat release of toggle key. key_state_table[%#x] = %#x\n", + TRACE_(key)("INTERM : don't treat release of toggle key. key_state_table[%#x] = %#x\n", vkey,key_state_table[vkey]); } else { @@ -1228,7 +1467,7 @@ { if (Evtype!=KeyPress) { - TRACE("ON + KeyRelease => generating DOWN and UP messages.\n"); + TRACE_(key)("ON + KeyRelease => generating DOWN and UP messages.\n"); X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); *State=FALSE; @@ -1238,7 +1477,7 @@ else /* it was OFF */ if (Evtype==KeyPress) { - TRACE("OFF + Keypress => generating DOWN and UP messages.\n"); + TRACE_(key)("OFF + Keypress => generating DOWN and UP messages.\n"); X11DRV_send_keyboard_input( vkey, scan, down, event_time, 0, 0 ); X11DRV_send_keyboard_input( vkey, scan, up, event_time, 0, 0 ); *State=TRUE; /* Goes to intermediary state before going to ON */ @@ -1292,7 +1531,7 @@ for (j = 0; j < 8; j++) { if (!(event->xkeymap.key_vector[i] & (1<<j))) continue; - switch(keyc2vkey[(i * 8) + j] & 0xff) + switch(keyc2vkey[layout_no][(i * 8) + j] & 0xff) { case VK_MENU: alt = 1; break; case VK_CONTROL: control = 1; break; @@ -1308,7 +1547,7 @@ /*********************************************************************** * X11DRV_KeyEvent * - * Handle a X key event + * Handle a X key event */ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) { @@ -1317,7 +1556,8 @@ KeySym keysym = 0; WORD vkey = 0, bScan; DWORD dwFlags; - int ascii_chars; + int ascii_chars, savetype; + unsigned int savestate; XIC xic = X11DRV_get_ic( hwnd ); DWORD event_time = EVENT_x11_time_to_win32_time(event->time); Status status = 0; @@ -1326,18 +1566,28 @@ event->type, event->window, event->state, event->keycode); wine_tsx11_lock(); - if (xic) - ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); + + savestate = event->state; + if (xic) { + /* XmbLookupString returns neither char nor keysym for KeyRelease */ + savetype = event->type; + if (savetype == KeyRelease) event->type = KeyPress; + ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); + event->type = savetype; + } else ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL); + event->state = savestate; + wine_tsx11_unlock(); /* Ignore some unwanted events */ if ((keysym >= XK_ISO_Lock && keysym <= XK_ISO_Last_Group_Lock) || + keysym == XK_Overlay1_Enable || keysym == XK_Overlay2_Enable || keysym == XK_Mode_switch) { wine_tsx11_lock(); - TRACE("Ignoring %s keyboard event\n", XKeysymToString(keysym)); + TRACE_(key)("Ignoring %s keyboard event\n", XKeysymToString(keysym)); wine_tsx11_unlock(); return; } @@ -1396,22 +1646,22 @@ KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, event->type, event_time ); break; case VK_CAPITAL: - TRACE("Caps Lock event. (type %d). State before : %#.2x\n",event->type,key_state_table[vkey]); + TRACE_(key)("Caps Lock event. (type %d). State before : %#.2x\n",event->type,key_state_table[vkey]); KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, event->type, event_time ); - TRACE("State after : %#.2x\n",key_state_table[vkey]); + TRACE_(key)("State after : %#.2x\n",key_state_table[vkey]); break; default: /* Adjust the NUMLOCK state if it has been changed outside wine */ if (!(key_state_table[VK_NUMLOCK] & 0x01) != !(event->state & NumLockMask)) { - TRACE("Adjusting NumLock state.\n"); + TRACE_(key)("Adjusting NumLock state.\n"); KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyPress, event_time ); KEYBOARD_GenerateMsg( VK_NUMLOCK, 0x45, KeyRelease, event_time ); } /* Adjust the CAPSLOCK state if it has been changed outside wine */ if (!(key_state_table[VK_CAPITAL] & 0x01) != !(event->state & LockMask)) { - TRACE("Adjusting Caps Lock state.\n"); + TRACE_(key)("Adjusting Caps Lock state.\n"); KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyPress, event_time ); KEYBOARD_GenerateMsg( VK_CAPITAL, 0x3A, KeyRelease, event_time ); } @@ -1419,7 +1669,7 @@ NumState = FALSE; CapsState = FALSE; - bScan = keyc2scan[event->keycode] & 0xFF; + bScan = keyc2scan[layout_no][event->keycode] & 0xFF; TRACE_(key)("bScan = 0x%02x.\n", bScan); dwFlags = 0; @@ -1431,149 +1681,328 @@ } } +#ifdef HAVE_XKB + +static const char * const xkb_event_names[] = +{ + "XkbNewKeyboardNotify", "XkbMapNotify", "XkbStateNotify", + "XkbControlsNotify", "XkbIndicatorStateNotify", "XkbIndicatorMapNotify", + "XkbNamesNotify", "XkbCompatMapNotify", "XkbBellNotify", "XkbActionMessage", + "XkbAccessXnotify", "XkbExtensionDeviceNotify" +}; + +/*********************************************************************** + * X11DRV_XkbEvent + * + * Handle an XKB event + */ +void X11DRV_XkbEvent( HWND hwnd, XEvent * event ) +{ + XkbEvent* xkbevent = (XkbEvent*) event; + TRACE_(key)(" : type %s\n",xkb_event_names[xkbevent->any.xkb_type]); + switch ( xkbevent->any.xkb_type ) { + case XkbMapNotify: + global_refresh = 1; + case XkbControlsNotify: + case XkbStateNotify: + if ( xkbevent->any.xkb_type == XkbStateNotify ){ + TRACE_(key)(" : changed %x\n", xkbevent->state.changed); + if ( !(xkbevent->state.changed & + ( XkbGroupStateMask | XkbGroupBaseMask | + XkbGroupLatchMask | XkbGroupLockMask ))) { + TRACE_(key)(" : ignore XkbStateNotify events other than group changes\n"); + break; + } + } + wine_tsx11_lock(); + KEYBOARD_LayoutSwitched(); + if (global_refresh) KEYBOARD_DetectLayouts(); + wine_tsx11_unlock(); + break; + case XkbNewKeyboardNotify: + X11DRV_InitKeyboard(); break; + default: + break; + } + +} + /********************************************************************** - * X11DRV_KEYBOARD_DetectLayout + * KEYBOARD_RefreshOverlays * - * Called from X11DRV_InitKeyboard - * This routine walks through the defined keyboard layouts and selects - * whichever matches most closely. - * X11 lock must be held. + * Build the tables of conversions done by overlays that + * map some keys to other, so that the same key can behave + * differently in the same XKB group depending on active + * overlay group (e.g. Ukrainian "i" becomes Russian "yeru"). + * This way You can join close enough layouts (e.g. Czech + * and Slovak) into single group. Wine will detect them all. */ + static void -X11DRV_KEYBOARD_DetectLayout (void) -{ - Display *display = thread_display(); - unsigned current, match, mismatch, seq, i, syms; - int score, keyc, key, pkey, ok; - KeySym keysym = 0; - const char (*lkey)[MAIN_LEN][4]; - unsigned max_seq = 0; - int max_score = 0, ismatch = 0; - char ckey[256][4]; - - syms = keysyms_per_keycode; - if (syms > 4) { - WARN("%d keysyms per keycode not supported, set to 4\n", syms); - syms = 4; +KEYBOARD_RefreshOverlays(void) { /* desc should contain server fields */ + KeyCode keyc, over; + int i; + char betype, bedata; + + for (i = 1; i < MAX_OVERLAYS; i++) { + for (keyc = min_keycode; (keyc && (keyc <= max_keycode)); keyc++) { + over = keyc; + haveoverlay: + betype = (desc->server->behaviors)[over].type; + bedata = (desc->server->behaviors)[over].data; + if (((betype == XkbKB_Overlay1) && (i & OVER1_ENABLED)) || + ((betype == XkbKB_Overlay2) && (i & OVER2_ENABLED))) + { + over = bedata; + goto haveoverlay; + } + if (keyc != over) { + TRACE_(layout)("Keycode %d changed to %d (Overlay%d)\n", keyc, over, i); + } + keyc2over[i-1][keyc] = over; + } + + for (over = min_keycode; (over && (over <= max_keycode)); over++) { + over2keyc[i-1][over] = over; + for (keyc = min_keycode; keyc < over; keyc++) { + if (keyc2over[i-1][keyc] == keyc2over[i-1][over]) { + over2keyc[i-1][over] = over2keyc[i-1][keyc]; + break; + } + } + if (over2keyc[i-1][over] != over) + TRACE_(layout)("In Overlay%d keycode %d behaves as %d\n", + i, over, over2keyc[i-1][over]); + } } +} +#endif /* HAVE_XKB */ - memset( ckey, 0, sizeof(ckey) ); - for (keyc = min_keycode; keyc <= max_keycode; keyc++) { - /* get data for keycode from X server */ - for (i = 0; i < syms; i++) { - if (!(keysym = XKeycodeToKeysym (display, keyc, i))) continue; - /* Allow both one-byte and two-byte national keysyms */ - if ((keysym < 0x8000) && (keysym != ' ')) - { + +/********************************************************************** + * KeycToOver + OverToKeyc + * + * Helper functions that provide direct and inverse + * keycode transformation based on current overlay group + * + */ + +inline static KeyCode +KeycToOver(KeyCode k){ +#ifdef HAVE_XKB + if (use_xkb && kbd_overlay) return keyc2over[kbd_overlay-1][k]; + else +#endif /* HAVE_XKB */ + return k; +} + +inline static KeyCode +OverToKeyc(KeyCode k){ #ifdef HAVE_XKB - if (!use_xkb || !XkbTranslateKeySym(display, &keysym, 0, &ckey[keyc][i], 1, NULL)) + if (use_xkb && kbd_overlay) return over2keyc[kbd_overlay-1][k]; + else +#endif /* HAVE_XKB */ + return k; +} + +/********************************************************************** + * OverIgnore + * + * Should we ignore this keycode when calculating the score + * for layout candidate? When overlay is not active, key that + * is mapped to by some overlay probably is virtual, so must + * not be taken into consideration. When overlay is active, + * we ignore keys that are mapped to other ones or mapped to + * by other overlay (thus it is better to have separate virtual + * keys for Overlay1 and Overlay2). + */ + +inline static Bool +OverIgnore(KeyCode k){ +#ifdef HAVE_XKB + if (use_xkb) { + switch (kbd_overlay) { + case 0: return ((over2keyc[0][k] != k) + || (over2keyc[1][k] != k)); + case 1: return ((keyc2over[0][k] != k) + || (over2keyc[1][k] != k)); + case 2: return ((keyc2over[1][k] != k) + || (over2keyc[0][k] != k)); + case 3: return ((keyc2over[1][k] != k) + || (keyc2over[0][k] != k)); + default: return 0; /* just to make compiler happy */ + } + } + else +#endif /* HAVE_XKB */ + return 0; +} + + +/********************************************************************** + * KEYBOARD_CharsForKeycode + * + * Build arrays of keysyms and chars that key produces + * depending on shift level. If XKB is used, take it + * directly from keyboard description for the sake of + * speed and correctness + */ + +static Bool +KEYBOARD_CharsForKeyCode (Display *display, + KeyCode keyc, + KeySym (*ksym)[4], /* output */ + char (*chars)[4], /* return values */ + char (*rawchars)[4], /* other codepage */ + int *numchars, int *numrawchars) /* how many */ +{ + char Chars[5], RawChars[5]; + int i, w; + KeySym keysym; + int NumChars = 0, NumRawChars = 0; + +#ifdef HAVE_XKB + unsigned info; + int group = 0; + if (use_xkb) { + group = kbd_group; + keyc = KeycToOver(keyc); + w = XkbKeyNumGroups(desc,keyc); + if (!w) { + TRACE_(layout)("No groups for keycode %d\n", keyc); + return False; + } + info = XkbOutOfRangeGroupInfo(XkbKeyGroupInfo(desc,keyc)); + if (group>=w) + switch (info) { + case (XkbRedirectIntoRange): group = XkbOutOfRangeGroupNumber(XkbKeyGroupInfo(desc,keyc)); + if (group >= w) group = 0; break; + case (XkbClampIntoRange): ; group = w-1; break; + default: group %= w; break; + } + w = XkbKeyGroupWidth(desc,keyc,group); + } else +#endif /* HAVE_XKB */ + w = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode; + + for (i = 0; i < w; i++) { +#ifdef HAVE_XKB + if (use_xkb) keysym=XkbKeySymEntry(desc, keyc, i, group); + else #endif - { - TRACE("XKB could not translate keysym %ld\n", keysym); + keysym = XKeycodeToKeysym (display, keyc, i); + if (ksym != NULL) (*ksym)[i] = keysym; + if (!keysym) break; /* keysym == NoSymbol == 0 */ + if ((keysym < 0x8000) && (keysym != ' ')) { + RawChars[i] = keysym & 0xFF; +#ifdef HAVE_XKB + if (!use_xkb) +#endif + Chars[i] = RawChars[i]; +#ifdef HAVE_XKB + else if (!XkbTranslateKeySym(display, &keysym, 0, &Chars[i], 1, NULL)) + { + TRACE_(layout)("XKB could not translate keysym %ld\n", keysym); /* FIXME: query what keysym is used as Mode_switch, fill XKeyEvent * with appropriate ShiftMask and Mode_switch, use XLookupString * to get character in the local encoding. */ - ckey[keyc][i] = keysym & 0xFF; - } - } - else { - ckey[keyc][i] = KEYBOARD_MapDeadKeysym(keysym); - } - } - } + /* Chars[i] = keysym & 0xFF; */ + Chars[i] = 0; + } +#endif + } + else Chars[i] = RawChars[i] = KEYBOARD_MapDeadKeysym(keysym); - for (current = 0; main_key_tab[current].comment; current++) { - TRACE("Attempting to match against \"%s\"\n", main_key_tab[current].comment); - match = 0; - mismatch = 0; - score = 0; - seq = 0; - lkey = main_key_tab[current].key; - pkey = -1; - for (keyc = min_keycode; keyc <= max_keycode; keyc++) { - if (ckey[keyc][0]) { - /* search for a match in layout table */ - /* right now, we just find an absolute match for defined positions */ - /* (undefined positions are ignored, so if it's defined as "3#" in */ - /* the table, it's okay that the X server has "3#ё", for example) */ - /* however, the score will be higher for longer matches */ - for (key = 0; key < MAIN_LEN; key++) { - for (ok = 0, i = 0; (ok >= 0) && (i < syms); i++) { - if ((*lkey)[key][i] && ((*lkey)[key][i] == ckey[keyc][i])) - ok++; - if ((*lkey)[key][i] && ((*lkey)[key][i] != ckey[keyc][i])) - ok = -1; - } - if (ok > 0) { - score += ok; - break; - } - } - /* count the matches and mismatches */ - if (ok > 0) { - match++; - /* and how much the keycode order matches */ - if (key > pkey) seq++; - pkey = key; - } else { - /* print spaces instead of \0's */ - char str[5]; - for (i = 0; i < 4; i++) str[i] = ckey[keyc][i] ? ckey[keyc][i] : ' '; - str[4] = 0; - TRACE_(key)("mismatch for keysym 0x%04lX, keycode %d, got %s\n", keysym, keyc, str ); - mismatch++; - score -= syms; - } - } + if (Chars[i] && (NumChars == i)) { + if (chars) (*chars)[i]=Chars[i]; + NumChars++; } - TRACE("matches=%d, mismatches=%d, seq=%d, score=%d\n", - match, mismatch, seq, score); - if ((score > max_score) || - ((score == max_score) && (seq > max_seq))) { - /* best match so far */ - kbd_layout = current; - max_score = score; - max_seq = seq; - ismatch = !mismatch; + + if (RawChars[i] && (NumRawChars == i)) { + if (rawchars) (*rawchars)[i]=RawChars[i]; + NumRawChars++; } + + if ((NumChars != (i+1)) && (NumRawChars != (i+1))) break; } - /* we're done, report results if necessary */ - if (!ismatch) - WARN("Using closest match (%s) for scan/virtual codes mapping.\n", - main_key_tab[kbd_layout].comment); - TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment); + Chars[NumChars]='\0'; + RawChars[NumRawChars]='\0'; + if (numchars) (*numchars) = NumChars; + if (numrawchars) (*numrawchars) = NumChars; + if (chars && (NumChars < 4)) (*chars)[NumChars]='\0'; + if (rawchars && (NumRawChars < 4)) (*rawchars)[NumRawChars]='\0'; + + TRACE_(layout)("Keycode %d translated to %d chars: \"%s\"\n", keyc, NumChars, Chars); +#ifdef HAVE_XKB + if (use_xkb) + TRACE_(layout)(" and to %d raw chars: \"%s\"\n", NumRawChars, RawChars); +#endif + if (ksym) TRACE_(layout)(" Keysyms: %s, %s, %s, %s\n", + XKeysymToString((*ksym)[0]), XKeysymToString((*ksym)[1]), + XKeysymToString((*ksym)[2]), XKeysymToString((*ksym)[3])); + + if (NumChars || NumRawChars) return True; + else return False; } /********************************************************************** - * X11DRV_InitKeyboard + * KEYBOARD_DetectLayouts + * + * Detect all layouts (1 without XKB, up to 16 if XKB is used) + * Make the list of preferred XKB and overlay groups for all + * layouts ( layout can be detected two or more times, so we should + * find the closest match for ActivateKeyboardLayout() ) */ -void X11DRV_InitKeyboard(void) + +static void +KEYBOARD_DetectLayouts (void) { - Display *display = thread_display(); - KeySym *ksp; - XModifierKeymap *mmp; - KeySym keysym; - KeyCode *kcp; - XKeyEvent e2; - WORD scan, vkey, OEMvkey; - int keyc, i, keyn, syms; - char ckey[4]={0,0,0,0}; - const char (*lkey)[MAIN_LEN][4]; +/* enter in tsx11_lock()'ed state */ - wine_tsx11_lock(); - XDisplayKeycodes(display, &min_keycode, &max_keycode); - ksp = XGetKeyboardMapping(display, min_keycode, - max_keycode + 1 - min_keycode, &keysyms_per_keycode); - /* We are only interested in keysyms_per_keycode. - There is no need to hold a local copy of the keysyms table */ - XFree(ksp); - - mmp = XGetModifierMapping(display); - kcp = mmp->modifiermap; - for (i = 0; i < 8; i += 1) /* There are 8 modifier keys */ - { + Display *display = thread_display(); + int current, key, i, ok, have_chars, have_raw; + int score, match, miss, inv, is_raw; + int prev, bestScore, bestInv, bestMiss; + int prefLayout, prefCP, prefScore; + WORD scan, vkey; + + const char (*lkey)[MAIN_LEN][4]; + static char keyc2char[2][256][4] = {{{0}}}; /* 0 = locale, 1 = raw */ + unsigned int codepage; + KeyCode keyc; + KeySym keysym; + XModifierKeymap *mmp; + KeyCode * kcp; + +#ifdef HAVE_XKB + int save_group = 0, save_overlay = 0; + + if (use_xkb) { /* get XKB keyboard description to speed up things later */ + desc = XkbGetKeyboard(display, + XkbAllComponentsMask, + XkbUseCoreKbd); +/* XkbGetControls(display, XkbAllControlsMask, desc); */ + save_group = kbd_group; + save_overlay = kbd_overlay; + } else +#endif /* HAVE_XKB */ + { + TRACE("No XKB, keycodes from %d to %d\n", + min_keycode, max_keycode); + } + + /* Everything from the beginning */ + +#ifdef HAVE_XKB + if (use_xkb) KEYBOARD_RefreshOverlays(); +#endif + + mmp = XGetModifierMapping(display); + kcp = mmp->modifiermap; + for (i = 0; i < 8; i += 1) /* There are 8 modifier keys */ + { int j; for (j = 0; j < mmp->max_keypermod; j += 1, kcp += 1) @@ -1585,33 +2014,184 @@ if (XKeycodeToKeysym(display, *kcp, k) == XK_Num_Lock) { NumLockMask = 1 << i; - TRACE_(key)("NumLockMask is %x\n", NumLockMask); + TRACE_(layout)("NumLockMask is %x\n", NumLockMask); } } + } + XFreeModifiermap(mmp); + + /* Now store one keycode for each modifier. Used to simulate keypresses. */ + kcControl = XKeysymToKeycode(display, XK_Control_L); + kcAlt = XKeysymToKeycode(display, XK_Alt_L); + if (!kcAlt) kcAlt = XKeysymToKeycode(display, XK_Meta_L); + kcShift = XKeysymToKeycode(display, XK_Shift_L); + kcNumLock = XKeysymToKeycode(display, XK_Num_Lock); + kcCapsLock = XKeysymToKeycode(display, XK_Caps_Lock); + + global_refresh = 0; /* finished */ + + /* Going through all possible groups and overlays */ +#ifdef HAVE_XKB + for (layout_no=0; layout_no<(use_xkb? MAX_OVERLAYS*max_group:1); layout_no++) { + if (use_xkb) { + kbd_group = layout_no / MAX_OVERLAYS; + kbd_overlay = layout_no % MAX_OVERLAYS; + TRACE("examining layout #%d : XKB group %d, overlay %d, keycodes from %d to %d\n", + layout_no, kbd_group, kbd_overlay, min_keycode, max_keycode); + } +#else + for (layout_no=0; 0;) { +#endif + + for (key=0; key<256; key++) { + keyc2vkey[layout_no][key] = 0; keyc2scan[layout_no][key] = 0; + for (i=0; i<4; i++) { + keyc2ksym[layout_no][key][i] = 0; + keyc2char[0][key][i] = keyc2char[1][key][i] ='\0'; } - XFreeModifiermap(mmp); + } - /* Detect the keyboard layout */ - X11DRV_KEYBOARD_DetectLayout(); - lkey = main_key_tab[kbd_layout].key; - syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode; + for (keyc = min_keycode; (keyc && (keyc <= max_keycode)); keyc++) + if (!KEYBOARD_CharsForKeyCode (display, + keyc, &keyc2ksym[layout_no][keyc], + &keyc2char[0][keyc], &keyc2char[1][keyc], + &have_chars, &have_raw)) { +#ifdef HAVE_XKB + if (use_xkb) + TRACE_(layout)("No keysyms translated in layout %d for keycode %d\n", layout_no, keyc); + else +#endif + TRACE_(layout)("No keysyms translated for keycode %d\n", keyc); + } + + bestScore = prefScore = 0; bestInv = max_keycode; bestMiss = MAIN_LEN; prev = 0; + prefLayout = kbd_layout[layout_no]; /* May be set in registry */ + prefCP = kbd_cp[layout_no]; + kbd_layout[layout_no] = 0; /* Fallback */ + kbd_list[layout_no] = 0; + kbd_cp[layout_no] = 0; + for (current = 0; main_key_tab[current].comment; current++) { + is_raw = 0; /* first try locale encoding */ + again: +#ifdef HAVE_XKB + if (is_raw) { + if (!(codepage=main_key_tab[current].codepage)) + continue; + } else codepage = 0; +#endif + score = match = miss = inv = 0; + lkey = main_key_tab[current].key; + /* search for a match in layout table */ + /* right now, we just find an absolute match for defined positions */ + /* (undefined positions are ignored, so if it's defined as "3#" in */ + /* the table, it's okay that the X server has "3#ё", for example) */ + /* however, the score will be higher for longer matches */ + for (keyc = min_keycode; (keyc && (keyc <= max_keycode)); keyc++) { + if (!keyc2char[is_raw][keyc][0] || OverIgnore(keyc)) continue; + for (key = 0; key < MAIN_LEN; key++) { + for (ok = i = 0; ((ok >= 0) && ((*lkey)[key][i])); i++) { + if ((*lkey)[key][i] == keyc2char[is_raw][keyc][i]) ok++; + else ok = -1; + } + if (ok > 0) { + score += ok; + break; + } + } + /* count the matches and mismatches */ + if (ok > 0) { + match++; +/* TRACE_(layout)("keycode %d matches entry %d\n", keyc, key); */ + /* and how much the keycode order matches */ + if (key < prev) inv++; + prev = key; + } + else { +/* TRACE_(layout)("mismatch for keycode %d\n", keyc); */ + miss++; + for (i=0; i<4; i++) { + if (keyc2char[is_raw][keyc][i]) score--; + else break; + } + } + } + TRACE_(layout)("\"%s\", %s lookup: matches=%d, mismatches=%d, inversions=%d, score=%d\n", + main_key_tab[current].comment, + (is_raw?"raw":"locale"), + match, miss, inv, score); + if (prefLayout == current) prefScore = score; + if ((score > bestScore) || + ((score == bestScore) && (!is_raw) && (kbd_cp[layout_no])) || + ((score == bestScore) && ((!is_raw) == (!kbd_cp[layout_no])) && (inv<bestInv))) + { + bestScore = score; + bestInv = inv; + bestMiss = miss; + kbd_layout[layout_no] = current; +#ifdef HAVE_XKB + kbd_cp[layout_no] = codepage; + } + if (use_xkb && !is_raw) { + is_raw = 1; + goto again; /* now simply get lower bytes */ +#endif + } + } - /* Now build two conversion arrays : - * keycode -> vkey + scancode + extended - * vkey + extended -> keycode */ + if (bestMiss) { + if (TRACE_ON(keyboard)) + TRACE("Detected layout is \"%s\" (closest match), codepage %d\n", + main_key_tab[kbd_layout[layout_no]].comment, + kbd_cp[layout_no]); + else + TRACE_(layout)("Detected layout is \"%s\" (closest match), codepage %d\n", + main_key_tab[kbd_layout[layout_no]].comment, + kbd_cp[layout_no]); + } + else { + if (TRACE_ON(keyboard)) + TRACE("Detected layout is \"%s\" (exact match), codepage %d\n", + main_key_tab[kbd_layout[layout_no]].comment, + kbd_cp[layout_no]); + else + TRACE_(layout)("Detected layout is \"%s\" (exact match), codepage %d\n", + main_key_tab[kbd_layout[layout_no]].comment, + kbd_cp[layout_no]); + } - e2.display = display; - e2.state = 0; + if (prefLayout != -1) { + TRACE("Overridden by registry settings, layout is \"%s\", codepage %d,\n", + main_key_tab[prefLayout].comment, + prefCP); + if (prefScore < bestScore) + TRACE(" score %d (best is %d)\n", + prefScore, bestScore); + kbd_layout[layout_no] = prefLayout; + kbd_cp[layout_no] = prefCP; + bestScore = prefScore; + } - OEMvkey = VK_OEM_8; /* next is available. */ - for (keyc = min_keycode; keyc <= max_keycode; keyc++) - { - char buf[30]; - int have_chars; +#ifdef HAVE_XKB + if (use_xkb && bestScore) { + kbd_list[layout_no] = bestScore; + for (i=0; i<layout_no; i++) { + if (kbd_list[i] && (main_key_tab[kbd_layout[i]].lcid == + main_key_tab[kbd_layout[layout_no]].lcid)) { + if (kbd_list[layout_no] > kbd_list[i]) + kbd_list[i] = 0; + else + kbd_list[layout_no] = 0; + break; + } + } + } +#endif /* HAVE_XKB */ - keysym = 0; - e2.keycode = (KeyCode)keyc; - have_chars = XLookupString(&e2, buf, sizeof(buf), &keysym, NULL); + for (keyc = min_keycode; (keyc && (keyc <= max_keycode)); keyc++) + { + keysym = keyc2ksym[layout_no][keyc][0]; + is_raw = (kbd_cp[layout_no] != 0); + have_chars = (keyc2char[is_raw][keyc][0]); vkey = 0; scan = 0; if (keysym) /* otherwise, keycode not used */ { @@ -1626,116 +2206,51 @@ scan = 0x39; } else if (have_chars) { /* we seem to need to search the layout-dependent scancodes */ - int maxlen=0,maxval=-1,ok; - for (i=0; i<syms; i++) { - keysym = XKeycodeToKeysym(display, keyc, i); - if ((keysym<0x8000) && (keysym!=' ')) - { -#ifdef HAVE_XKB - if (!use_xkb || !XkbTranslateKeySym(display, &keysym, 0, &ckey[i], 1, NULL)) -#endif - { - /* FIXME: query what keysym is used as Mode_switch, fill XKeyEvent - * with appropriate ShiftMask and Mode_switch, use XLookupString - * to get character in the local encoding. - */ - ckey[i] = keysym & 0xFF; - } - } else { - ckey[i] = KEYBOARD_MapDeadKeysym(keysym); - } - } + lkey = main_key_tab[kbd_layout[layout_no]].key; + int maxlen=0,maxval=-1; /* find key with longest match streak */ - for (keyn=0; keyn<MAIN_LEN; keyn++) { - for (ok=(*lkey)[keyn][i=0]; ok&&(i<4); i++) - if ((*lkey)[keyn][i] && (*lkey)[keyn][i]!=ckey[i]) ok=0; - if (ok||(i>maxlen)) { - maxlen=i; maxval=keyn; + for (key=0; key<MAIN_LEN; key++) { + for(i=0, ok=1; i<4; i++) { + if (!(*lkey)[key][i]) break; + if ((*lkey)[key][i]!=keyc2char[is_raw][keyc][i]) { + ok=0; break; + } + } + if ((ok && i)||(i>maxlen)) { + maxlen=i; maxval=key; } if (ok) break; } if (maxval>=0) { /* got it */ - const WORD (*lscan)[MAIN_LEN] = main_key_tab[kbd_layout].scan; - const WORD (*lvkey)[MAIN_LEN] = main_key_tab[kbd_layout].vkey; + const WORD (*lscan)[MAIN_LEN] = main_key_tab[kbd_layout[layout_no]].scan; + const WORD (*lvkey)[MAIN_LEN] = main_key_tab[kbd_layout[layout_no]].vkey; scan = (*lscan)[maxval]; vkey = (*lvkey)[maxval]; + unsigned int out[4]; + char bkey[5]; + out[0] = (unsigned char)keyc2char[is_raw][keyc][0]; + out[1] = (unsigned char)keyc2char[is_raw][keyc][1]; + out[2] = (unsigned char)keyc2char[is_raw][keyc][2]; + out[3] = (unsigned char)keyc2char[is_raw][keyc][3]; + memccpy(&bkey[0], keyc2char[is_raw][keyc], 0, 4); + bkey[5] = '\0'; + TRACE_(layout)("Identified %d chars of \"%s\" / " + "\"%02x,%02x,%02x,%02x\" as \"%s\", entry %d\n", + maxlen, bkey, out[0], out[1], out[2], out[3], + (*lkey)[key], maxval); } } -#if 0 /* this breaks VK_OEM_x VKeys in some layout tables by inserting - * a VK code into a not appropriate place. - */ - /* find a suitable layout-dependent VK code */ - /* (most Winelib apps ought to be able to work without layout tables!) */ - for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) - { - keysym = XLookupKeysym(&e2, i); - if ((keysym >= VK_0 && keysym <= VK_9) - || (keysym >= VK_A && keysym <= VK_Z)) { - vkey = keysym; - } - } - for (i = 0; (i < keysyms_per_keycode) && (!vkey); i++) - { - keysym = XLookupKeysym(&e2, i); - switch (keysym) - { - case ';': vkey = VK_OEM_1; break; - case '/': vkey = VK_OEM_2; break; - case '`': vkey = VK_OEM_3; break; - case '[': vkey = VK_OEM_4; break; - case '\\': vkey = VK_OEM_5; break; - case ']': vkey = VK_OEM_6; break; - case '\'': vkey = VK_OEM_7; break; - case ',': vkey = VK_OEM_COMMA; break; - case '.': vkey = VK_OEM_PERIOD; break; - case '-': vkey = VK_OEM_MINUS; break; - case '+': vkey = VK_OEM_PLUS; break; - } - } - - if (!vkey) - { - /* Others keys: let's assign OEM virtual key codes in the allowed range, - * that is ([0xba,0xc0], [0xdb,0xe4], 0xe6 (given up) et [0xe9,0xf5]) */ - switch (++OEMvkey) - { - case 0xc1 : OEMvkey=0xdb; break; - case 0xe5 : OEMvkey=0xe9; break; - case 0xf6 : OEMvkey=0xf5; WARN("No more OEM vkey available!\n"); - } - - vkey = OEMvkey; - - if (TRACE_ON(keyboard)) - { - TRACE("OEM specific virtual key %X assigned to keycode %X:\n", - OEMvkey, e2.keycode); - TRACE("("); - for (i = 0; i < keysyms_per_keycode; i += 1) - { - const char *ksname; - - keysym = XLookupKeysym(&e2, i); - ksname = XKeysymToString(keysym); - if (!ksname) - ksname = "NoSymbol"; - TRACE( "%lX (%s) ", keysym, ksname); - } - TRACE(")\n"); - } - } -#endif } - TRACE("keycode %04x => vkey %04x\n", e2.keycode, vkey); - keyc2vkey[e2.keycode] = vkey; - keyc2scan[e2.keycode] = scan; - } /* for */ + TRACE_(layout)("keycode %04x => vkey %04x\n", keyc, vkey); + keyc2vkey[layout_no][keyc] = vkey; + keyc2scan[layout_no][keyc] = scan; + } /* for */ /* If some keys still lack scancodes, assign some arbitrary ones to them now */ - for (scan = 0x60, keyc = min_keycode; keyc <= max_keycode; keyc++) - if (keyc2vkey[keyc]&&!keyc2scan[keyc]) { + for (scan = 0x60, keyc = min_keycode; (keyc && (keyc <= max_keycode)); keyc++) + if (keyc2vkey[layout_no][keyc]&&!keyc2scan[layout_no][keyc]) { const char *ksname; keysym = XKeycodeToKeysym(display, keyc, 0); ksname = XKeysymToString(keysym); @@ -1743,17 +2258,114 @@ /* should make sure the scancode is unassigned here, but >=0x60 currently always is */ - TRACE_(key)("assigning scancode %02x to unidentified keycode %02x (%s)\n",scan,keyc,ksname); - keyc2scan[keyc]=scan++; + TRACE_(layout)("assigning scancode %02x to unidentified keycode %02x (%s)\n",scan,keyc,ksname); + keyc2scan[layout_no][keyc]=scan++; } - /* Now store one keycode for each modifier. Used to simulate keypresses. */ - kcControl = XKeysymToKeycode(display, XK_Control_L); - kcAlt = XKeysymToKeycode(display, XK_Alt_L); - if (!kcAlt) kcAlt = XKeysymToKeycode(display, XK_Meta_L); - kcShift = XKeysymToKeycode(display, XK_Shift_L); - kcNumLock = XKeysymToKeycode(display, XK_Num_Lock); - kcCapsLock = XKeysymToKeycode(display, XK_Caps_Lock); + } /* End of grand cycle, restore current group and overlay */ +#ifdef HAVE_XKB + if (use_xkb) { + for (layout_no=0; layout_no<(use_xkb? MAX_OVERLAYS*max_group:1); + layout_no++) { + if (kbd_list[layout_no]) { + TRACE("Preferred layout #%d \"%s\", score %d, codepage %d\n", layout_no, + main_key_tab[kbd_layout[layout_no]].comment, + kbd_list[layout_no], + kbd_cp[layout_no]); + } + } + if (desc) { + XkbFreeKeyboard(desc, XkbAllComponentsMask,True); + desc = NULL; + } + kbd_group = save_group; + kbd_overlay = save_overlay; + layout_no = MAX_OVERLAYS*kbd_group + kbd_overlay; + } else +#endif + layout_no = 0; + +/* exit in tsx11_lock()'ed state again */ +} + +/********************************************************************** + * InitKeyboard (X11DRV.@) + */ +void X11DRV_InitKeyboard(void) +{ + int current, no; + const int buf_size = 128; + unsigned int cp; + DWORD type, count; + char buffer[buf_size], name_buffer[12]; + HKEY hkey; + + /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Keyboard */ + if (RegOpenKeyA(HKEY_CURRENT_USER, INIKeyboard, &hkey)) hkey = 0; +#ifdef HAVE_XKB + for (no=0; no<(use_xkb?MAX_LAYOUTS:1); no++ ) { +#else + for (no=0; 0;) { +#endif + kbd_layout[no] = -1; + kbd_cp[no] = cp = 0; + if (!hkey) continue; + sprintf(name_buffer, "Layout%d", no); + count = buf_size; + buffer[0] = 0; + RegQueryValueExA(hkey, name_buffer, 0, &type, (LPBYTE)buffer, &count); + if (!buffer[0]) continue; + for (current=0; main_key_tab[current].comment; current++) + if (!strcmp(buffer,main_key_tab[current].comment)) break; + if (!main_key_tab[current].comment) { + TRACE("Layout #%d \"%s\" specified in registry but not found\n", + no, buffer); + continue; + } + TRACE("Layout #%d \"%s\" specified in registry\n", no, buffer); + kbd_layout[no] = current; +#ifdef HAVE_XKB + if (use_xkb) { + count = buf_size; + buffer[0] = 0; + sprintf(name_buffer, "Codepage%d", no); + RegQueryValueExA(hkey, name_buffer, 0, &type, (LPBYTE)buffer, &count); + if (buffer[0]) cp=atoi(buffer); + if (cp>0) { + kbd_cp[no] = cp; + TRACE("Codepage %d for layout #%d specified in registry\n", cp, no); + } + } +#endif + } + if (hkey) RegCloseKey(hkey); + +#ifdef HAVE_XKB + if (use_xkb) + for (current = 0; main_key_tab[current].comment; current++) { + if (!use_xkb) continue; + if (main_key_tab[current].codepage) + TRACE_(layout)("keysyms codepage for %s defaults to %d\n", + main_key_tab[current].comment,main_key_tab[current].codepage); + else { + if (!GetLocaleInfoW(main_key_tab[current].lcid, + LOCALE_IDEFAULTUNIXCODEPAGE|LOCALE_RETURN_NUMBER, + (WCHAR *)(&cp),sizeof(cp)/sizeof(WCHAR))) { + TRACE_(layout)("keysyms codepage for %s unknown, cannot get DefaultUnixCodepage, skipping\n", + main_key_tab[current].comment); + } else { + TRACE_(layout)("set keysyms codepage for %s to DefaultUnixCodepage = %d\n", + main_key_tab[current].comment,cp); + main_key_tab[current].codepage = cp; + } + } + } +#endif + wine_tsx11_lock(); + + KEYBOARD_LayoutSwitched(); /* get current group and overlay */ + KEYBOARD_DetectLayouts(); /* detect all layouts */ + wine_tsx11_unlock(); } @@ -1818,8 +2430,8 @@ if (dwThreadid && dwThreadid != GetCurrentThreadId()) FIXME("couldn't return keyboard layout for thread %04x\n", dwThreadid); -#if 0 - layout = main_key_tab[kbd_layout].lcid; +#if 1 + layout = main_key_tab[kbd_layout[layout_no]].lcid; #else /* FIXME: * Winword uses return value of GetKeyboardLayout as a codepage @@ -1855,7 +2467,8 @@ DWORD layout; LANGID langid; - layout = main_key_tab[kbd_layout].lcid; + layout = main_key_tab[kbd_layout[layout_no]].lcid; + /* see comment for GetKeyboardLayout */ langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) @@ -1896,9 +2509,72 @@ */ HKL X11DRV_ActivateKeyboardLayout(HKL hkl, UINT flags) { - FIXME("%p, %04x: stub!\n", hkl, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +#ifdef HAVE_XKB + /* Ignore all flags : */ + /* KLF_REORDER, KLF_RESET, KLF_SETFORPROCESS, KLF_SHIFTLOCK */ + /* KLF_UNLOADPREVIOUS - unsupported by Windows */ + if (use_xkb) { + HKL cur_lcid; + ULONG_PTR lcid; + int i; + Display *display; + wine_tsx11_lock(); + display = thread_display(); + lcid = (ULONG_PTR)hkl; + cur_lcid = (HKL)(main_key_tab[kbd_layout[layout_no]].lcid); + if (lcid == HKL_NEXT) { + for(i=layout_no+1; i != layout_no; i++) { + if (i == MAX_OVERLAYS*max_group) i=0; + if (kbd_list[i]) break; + } + if (i == layout_no) { + TRACE("Failed to activate next layout\n"); + wine_tsx11_unlock(); + return 0; + } + } else + if (lcid == HKL_PREV) { + for(i=layout_no-1; i != layout_no; i--) { + if (i < 0) i=MAX_OVERLAYS*max_group-1; + if (kbd_list[i]) break; + } + if (i == layout_no) { + TRACE("Failed to activate previous layout\n"); + wine_tsx11_unlock(); + return 0; + } + } else { + if (main_key_tab[kbd_layout[layout_no]].lcid == lcid) { + TRACE("Handle %08lx is already active\n",lcid); + wine_tsx11_unlock(); + return hkl; + } + for(i=0; i<MAX_OVERLAYS*max_group; i++) + if (kbd_list[i] && + (main_key_tab[kbd_layout[i]].lcid == lcid)) break; + if (i == MAX_OVERLAYS*max_group) { + TRACE("Failed to activate handle %08lx\n",lcid); + wine_tsx11_unlock(); + return 0; + } + } + XkbLockGroup(display, XkbUseCoreKbd, i/MAX_OVERLAYS); + XkbChangeEnabledControls(display, XkbUseCoreKbd, + XkbOverlay1Mask | XkbOverlay2Mask , + (((i%MAX_OVERLAYS) & OVER1_ENABLED ? XkbOverlay1Mask : 0) | + ((i%MAX_OVERLAYS) & OVER2_ENABLED ? XkbOverlay2Mask : 0))); +/* KEYBOARD_LayoutSwitched(); // Should we wait for server response ? */ + TRACE(" #%d, \"%s\", handle %08lx\n", + layout_no, main_key_tab[kbd_layout[layout_no]].comment, lcid); + wine_tsx11_unlock(); + return cur_lcid; + } else +#endif /* HAVE_XKB */ + { + FIXME("%p, %04x: stub: not implemented without XKB!\n", hkl, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + } } @@ -1938,13 +2614,24 @@ /* FIXME: what happens if wChar is not a Latin1 character and CP_UNIXCP * is UTF-8 (multibyte encoding)? */ - if (!WideCharToMultiByte(CP_UNIXCP, 0, &wChar, 1, &cChar, 1, NULL, NULL)) +#ifdef HAVE_XKB + if (use_xkb && kbd_cp[layout_no]) { + if (!WideCharToMultiByte(kbd_cp[layout_no], 0, &wChar, 1, &cChar, 1, NULL, NULL)) + { + WARN("no translation from unicode to codepage %d for 0x%02x\n", kbd_cp[layout_no], wChar); + return -1; + } + } else +#endif { - WARN("no translation from unicode to CP_UNIXCP for 0x%02x\n", wChar); - return -1; + if (!WideCharToMultiByte(CP_UNIXCP, 0, &wChar, 1, &cChar, 1, NULL, NULL)) + { + WARN("no translation from unicode to CP_UNIXCP for 0x%02x\n", wChar); + return -1; + } } - TRACE("wChar 0x%02x -> cChar '%c'\n", wChar, cChar); + TRACE_(key)("wChar 0x%02x -> cChar '%c'\n", wChar, cChar); /* char->keysym (same for ANSI chars) */ keysym = (unsigned char)cChar; /* (!) cChar is signed */ @@ -1957,45 +2644,42 @@ if (keysym >= 0xFF00) /* Windows returns 0x0240 + cChar in this case */ { ret = 0x0240 + cChar; /* 0x0200 indicates a control character */ - TRACE(" ... returning ctrl char %#.2x\n", ret); + TRACE_(key)(" ... returning ctrl char %#.2x\n", ret); wine_tsx11_unlock(); return ret; } /* It didn't work ... let's try with deadchar code. */ - TRACE("retrying with | 0xFE00\n"); + TRACE_(key)("retrying with | 0xFE00\n"); keycode = XKeysymToKeycode(display, keysym | 0xFE00); } wine_tsx11_unlock(); - TRACE("'%c'(%#lx, %lu): got keycode %#.2x (%d)\n", + TRACE_(key)("'%c'(%#lx, %lu): got keycode %#.2x (%d)\n", cChar, keysym, keysym, keycode, keycode); /* keycode -> (keyc2vkey) vkey */ - ret = keyc2vkey[keycode]; + ret = keyc2vkey[layout_no][keycode]; if (!keycode || !ret) { - TRACE("keycode for '%c' not found, returning -1\n", cChar); + TRACE_(key)("keycode for '%c' not found, returning -1\n", cChar); return -1; } index = -1; - wine_tsx11_lock(); for (i = 0; i < 4; i++) /* find shift state */ { - if (XKeycodeToKeysym(display, keycode, i) == keysym) - { - index = i; - break; - } + if (keyc2ksym[layout_no][keycode][i] && (keyc2ksym[layout_no][keycode][i] == keysym)) { + index = i; + break; + } } - wine_tsx11_unlock(); switch (index) { default: case -1: - WARN("Keysym %lx not found while parsing the keycode table\n", keysym); + WARN_(key)("Keysym %lx not found while parsing the keycode table\n", keysym); return -1; case 0: break; @@ -2011,7 +2695,7 @@ index : 3 adds 0x0700 (ctrl+alt+shift) */ - TRACE(" ... returning %#.2x\n", ret); + TRACE_(key)(" ... returning %#.2x\n", ret); return ret; } @@ -2024,7 +2708,7 @@ #define returnMVK(value) { TRACE("returning 0x%x.\n",value); return value; } - TRACE("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); + TRACE_(key)("wCode=0x%x, wMapType=%d, hkl %p\n", wCode, wMapType, hkl); if (hkl != X11DRV_GetKeyboardLayout(0)) FIXME("keyboard layout %p is not supported\n", hkl); @@ -2033,18 +2717,18 @@ /* let's do vkey -> keycode -> scan */ int keyc; for (keyc=min_keycode; keyc<=max_keycode; keyc++) - if ((keyc2vkey[keyc] & 0xFF) == wCode) - returnMVK (keyc2scan[keyc] & 0xFF); - TRACE("returning no scan-code.\n"); + if ((keyc2vkey[layout_no][keyc] & 0xFF) == wCode) + returnMVK (keyc2scan[layout_no][keyc] & 0xFF); + TRACE_(key)("returning no scan-code.\n"); return 0; } case 1: { /* scan-code to vkey-code */ /* let's do scan -> keycode -> vkey */ int keyc; for (keyc=min_keycode; keyc<=max_keycode; keyc++) - if ((keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) - returnMVK (keyc2vkey[keyc] & 0xFF); - TRACE("returning no vkey-code.\n"); + if ((keyc2scan[layout_no][keyc] & 0xFF) == (wCode & 0xFF)) + returnMVK (keyc2vkey[layout_no][keyc] & 0xFF); + TRACE_(key)("returning no vkey-code.\n"); return 0; } case 2: { /* vkey-code to unshifted ANSI code */ @@ -2056,7 +2740,7 @@ */ /* let's do vkey -> keycode -> (XLookupString) ansi char */ XKeyEvent e; - KeySym keysym; + KeySym keysym = 0; int keyc; char s[2]; e.display = display; @@ -2071,13 +2755,18 @@ /* We exit on the first keycode found, to speed up the thing. */ for (keyc=min_keycode; (keyc<=max_keycode) && (!e.keycode) ; keyc++) { /* Find a keycode that could have generated this virtual key */ - if ((keyc2vkey[keyc] & 0xFF) == wCode) + if ((keyc2vkey[layout_no][keyc] & 0xFF) == wCode) { /* We filter the extended bit, we don't know it */ - e.keycode = keyc; /* Store it temporarily */ - if ((EVENT_event_to_vkey(0,&e) & 0xFF) != wCode) { - e.keycode = 0; /* Wrong one (ex: because of the NumLock - state), so set it to 0, we'll find another one */ - } + e.keycode = KeycToOver(keyc); /* Store it temporarily */ + if ( keyc != e.keycode ) + TRACE_(key)("Keycode %02x turned back to %02x\n", keyc, e.keycode); + if ((EVENT_event_to_vkey(0,&e) & 0xFF) != wCode) { + e.keycode = 0; /* Wrong one (ex: because of the NumLock + state), so set it to 0, we'll find another one */ + } + else { + e.keycode = KeycToOver(keyc); /* again */ + } } } @@ -2089,19 +2778,27 @@ if (!e.keycode) { - WARN("Unknown virtual key %X !!!\n", wCode); + WARN_(key)("Unknown virtual key %X !!!\n", wCode); wine_tsx11_unlock(); return 0; /* whatever */ } - TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); + TRACE_(key)("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); - if (XLookupString(&e, s, 2, &keysym, NULL)) + if (XLookupString(&e, s, 2, &keysym, NULL) && !kbd_cp[layout_no]) { wine_tsx11_unlock(); returnMVK (*s); - } - - TRACE("returning no ANSI.\n"); + } +#ifdef HAVE_XKB + else if (keysym && kbd_cp[layout_no]) { + KeySym lkeysym, ukeysym; + XConvertCase(keysym,&lkeysym,&ukeysym); + wine_tsx11_unlock(); + if (ukeysym < 0x8000) + returnMVK ((unsigned)(ukeysym & 0xFF)); /* ???? */ + } +#endif + TRACE_(key)("returning no ANSI.\n"); wine_tsx11_unlock(); return 0; } @@ -2112,7 +2809,7 @@ return 0; default: /* reserved */ - WARN("Unknown wMapType %d !\n", wMapType); + WARN_(key)("Unknown wMapType %d !\n", wMapType); return 0; } return 0; @@ -2156,7 +2853,7 @@ } ansi = X11DRV_MapVirtualKeyEx(vkey, 2, X11DRV_GetKeyboardLayout(0)); - TRACE("scan 0x%04x, vkey 0x%04x, ANSI 0x%04x\n", scanCode, vkey, ansi); + TRACE_(key)("scan 0x%04x, vkey 0x%04x, ANSI 0x%04x\n", scanCode, vkey, ansi); /* first get the name of the "regular" keys which is the Upper case value of the keycap imprint. */ @@ -2190,7 +2887,7 @@ /* let's do scancode -> keycode -> keysym -> String */ for (keyi=min_keycode; keyi<=max_keycode; keyi++) - if ((keyc2scan[keyi]) == scanCode) + if ((keyc2scan[layout_no][keyi]) == scanCode) break; if (keyi <= max_keycode) { @@ -2199,7 +2896,7 @@ keys = XKeycodeToKeysym(thread_display(), keyc, 0); name = XKeysymToString(keys); wine_tsx11_unlock(); - TRACE("found scan=%04x keyc=%04x keysym=%04x string=%s\n", + TRACE_(key)("found scan=%04x keyc=%04x keysym=%04x string=%s\n", scanCode, keyc, (int)keys, name); if (lpBuffer && nSize && name) { @@ -2291,7 +2988,6 @@ return 's'; */ } - TRACE("no character for dead keysym 0x%08lx\n",keysym); return 0; } @@ -2320,7 +3016,8 @@ XKeyEvent e; KeySym keysym = 0; INT ret; - int keyc; + int keyc, savetype; + unsigned int savestate; char lpChar[10]; HWND focus; XIC xic; @@ -2328,7 +3025,7 @@ if (scanCode & 0x8000) { - TRACE("Key UP, doing nothing\n" ); + TRACE_(key)("Key UP, doing nothing\n" ); return 0; } @@ -2337,7 +3034,7 @@ if ((lpKeyState[VK_MENU] & 0x80) && (lpKeyState[VK_CONTROL] & 0x80)) { - TRACE("Ctrl+Alt+[key] won't generate a character\n"); + TRACE_(key)("Ctrl+Alt+[key] won't generate a character\n"); return 0; } @@ -2354,27 +3051,27 @@ if (lpKeyState[VK_SHIFT] & 0x80) { - TRACE("ShiftMask = %04x\n", ShiftMask); + TRACE_(key)("ShiftMask = %04x\n", ShiftMask); e.state |= ShiftMask; } if (lpKeyState[VK_CAPITAL] & 0x01) { - TRACE("LockMask = %04x\n", LockMask); + TRACE_(key)("LockMask = %04x\n", LockMask); e.state |= LockMask; } if (lpKeyState[VK_CONTROL] & 0x80) { - TRACE("ControlMask = %04x\n", ControlMask); + TRACE_(key)("ControlMask = %04x\n", ControlMask); e.state |= ControlMask; } if (lpKeyState[VK_NUMLOCK] & 0x01) { - TRACE("NumLockMask = %04x\n", NumLockMask); + TRACE_(key)("NumLockMask = %04x\n", NumLockMask); e.state |= NumLockMask; } /* Restore saved AltGr state */ - TRACE("AltGrMask = %04x\n", AltGrMask); + TRACE_(key)("AltGrMask = %04x\n", AltGrMask); e.state |= AltGrMask; TRACE_(key)("(%04X, %04X) : faked state = 0x%04x\n", @@ -2383,13 +3080,18 @@ /* We exit on the first keycode found, to speed up the thing. */ for (keyc=min_keycode; (keyc<=max_keycode) && (!e.keycode) ; keyc++) { /* Find a keycode that could have generated this virtual key */ - if ((keyc2vkey[keyc] & 0xFF) == virtKey) + if ((keyc2vkey[layout_no][keyc] & 0xFF) == virtKey) { /* We filter the extended bit, we don't know it */ - e.keycode = keyc; /* Store it temporarily */ + e.keycode = KeycToOver(keyc); /* Store it temporarily */ + if ( keyc != e.keycode ) + TRACE_(key)("Keycode %02x turned back to %02x\n", keyc, e.keycode); if ((EVENT_event_to_vkey(xic,&e) & 0xFF) != virtKey) { e.keycode = 0; /* Wrong one (ex: because of the NumLock state), so set it to 0, we'll find another one */ } + else { + e.keycode = KeycToOver(keyc); /* again */ + } } } @@ -2407,35 +3109,56 @@ if (!e.keycode && virtKey != VK_NONAME) { - WARN("Unknown virtual key %X !!!\n", virtKey); + WARN_(key)("Unknown virtual key %X !!!\n", virtKey); wine_tsx11_unlock(); - return 0; + return 0; /* whatever */ } - else TRACE("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); + else TRACE_(key)("Found keycode %d (0x%2X)\n",e.keycode,e.keycode); TRACE_(key)("type %d, window %lx, state 0x%04x, keycode 0x%04x\n", e.type, e.window, e.state, e.keycode); - if (xic) - ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, &status); + savestate = e.state; + if (xic) { + savetype = e.type; + if (savetype == KeyRelease) e.type = KeyPress; + ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, &status); + e.type = savetype; + } else ret = XLookupString(&e, lpChar, sizeof(lpChar), &keysym, NULL); + e.state = savestate; wine_tsx11_unlock(); +#ifdef XK_EuroSign + /* An ugly hack for EuroSign: X can't translate it to a character + for some locales. */ + if (keysym == XK_EuroSign) + { + bufW[0] = 0x20AC; + ret = 1; + goto found; + } +#endif + +#ifdef HAVE_XKB + if ((keysym > 0) && (keysym < 0x8000) && kbd_cp[layout_no]) { + /* Get lower byte */ + lpChar[0] = keysym & 0xFF; + if (MultiByteToWideChar(kbd_cp[layout_no], 0, lpChar, 1, bufW, bufW_size)) { + ret = 1; + } else { + TRACE_(key)("keysym 0x%04lx treated as char 0x%02x from codepage %d, but conversion to Unicode failed\n", + keysym,lpChar[0],kbd_cp[layout_no]); + ret = 0; + } + } +#endif + if (ret == 0) { char dead_char; -#ifdef XK_EuroSign - /* An ugly hack for EuroSign: X can't translate it to a character - for some locales. */ - if (keysym == XK_EuroSign) - { - bufW[0] = 0x20AC; - ret = 1; - goto found; - } -#endif /* Special case: X turns shift-tab into ISO_Left_Tab. */ /* Here we change it back. */ if (keysym == XK_ISO_Left_Tab) @@ -2445,14 +3168,6 @@ goto found; } - dead_char = KEYBOARD_MapDeadKeysym(keysym); - if (dead_char) - { - MultiByteToWideChar(CP_UNIXCP, 0, &dead_char, 1, bufW, bufW_size); - ret = -1; - goto found; - } - if (keysym >= 0x01000100 && keysym <= 0x0100ffff) { /* Unicode direct mapping */ @@ -2460,25 +3175,37 @@ ret = 1; goto found; } - else - { - const char *ksname; - wine_tsx11_lock(); - ksname = XKeysymToString(keysym); - wine_tsx11_unlock(); - if (!ksname) - ksname = "No Name"; - if ((keysym >> 8) != 0xff) - { + dead_char = KEYBOARD_MapDeadKeysym(keysym); + if (dead_char) + { +#ifdef HAVE_XKB + if (use_xkb && kbd_cp[layout_no]) + MultiByteToWideChar(kbd_cp[layout_no], 0, &dead_char, 1, bufW, bufW_size); + else +#endif + MultiByteToWideChar(CP_UNIXCP, 0, &dead_char, 1, bufW, bufW_size); + ret = -1; + goto found; + } + TRACE_(key)("MapDeadKeysym failed for dead keysym 0x%08lx\n",keysym); + const char *ksname; + + wine_tsx11_lock(); + ksname = XKeysymToString(keysym); + wine_tsx11_unlock(); + if (!ksname) + ksname = "No Name"; + if ((keysym >> 8) != 0xff) + { ERR("Please report: no char for keysym %04lX (%s) :\n", keysym, ksname); ERR("(virtKey=%X,scanCode=%X,keycode=%X,state=%X)\n", virtKey, scanCode, e.keycode, e.state); - } } - } - else { /* ret != 0 */ + goto found; + } else { + /* ret != 0 */ /* We have a special case to handle : Shift + arrow, shift + home, ... X returns a char for it, but Windows doesn't. Let's eat it. */ if (!(e.state & NumLockMask) /* NumLock is off */ @@ -2515,18 +3242,21 @@ ret = 0; } - /* Hack to detect an XLookupString hard-coded to Latin1 */ - if (ret == 1 && keysym >= 0x00a0 && keysym <= 0x00ff && (BYTE)lpChar[0] == keysym) - { - bufW[0] = (BYTE)lpChar[0]; - goto found; - } - - /* perform translation to unicode */ - if(ret) - { - TRACE_(key)("Translating char 0x%02x to unicode\n", *(BYTE *)lpChar); - ret = MultiByteToWideChar(CP_UNIXCP, 0, lpChar, ret, bufW, bufW_size); + if(ret) { + /* perform translation to unicode */ + { +#ifdef HAVE_XKB + if (use_xkb && kbd_cp[layout_no]) { + TRACE_(key)("Translating char 0x%02x from codepage %d to unicode\n", + *(BYTE *)lpChar,kbd_cp[layout_no]); + ret = MultiByteToWideChar(kbd_cp[layout_no], 0, lpChar, 1, bufW, bufW_size); + } else +#endif + { + TRACE_(key)("Translating char 0x%02x to unicode\n", *(BYTE *)lpChar); + ret = MultiByteToWideChar(CP_UNIXCP, 0, lpChar, ret, bufW, bufW_size); + } + } } }

3 4

Re: mscoree: Reimplemented GetCORVersion using a helper that checks properly the return buffer; shortened a few FIXMEs (1/4)
by James Hawkins 14 Nov '06

14 Nov '06

On 11/13/06, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: mscoree: Reimplemented GetCORVersion using a helper that checks > properly the return buffer; shortened a few FIXMEs (1/4) > Can you please put the [x/y] at the beginning of the subject, after the module name. My mailer cuts off long subjects, so I can't tell which order I need to look at the patches. +#include "config.h" +#include "wine/port.h" +#include "wine/library.h" +#include "wine/debug.h" Why did you add these includes (besides debug.h)? +/* this helper is needed very often */ This is a very useless comment. Please leave it out. Also, you say this helper function is needed often, but as it stands, it's only being used once, and it hides the real purpose of the GetCORVersion function. Copying to an out parameter is pretty standard for a lot of the Win32 API, and we don't use helper functions anywhere else in the Wine code base for this purpose because of reasons stated above, and because each function usually does something different with the parameters. +static HRESULT copyToWBuffer(LPCWSTR str, LPWSTR pBuf, DWORD cchBuf, LPDWORD pBufLen) +{ + DWORD len; + if (!(pBuf && cchBuf)) + return E_POINTER; + len = lstrlenW(str); + if (pBufLen) + *pBufLen = len; + if (cchBuf < len) + return ERROR_INSUFFICIENT_BUFFER; + lstrcpyW(pBuf, str); + return S_OK; +} You've totally changed the whitespace style of the file in this helper function. Please leave GetCORVersion the way it was. -- James Hawkins

2 2

Re: mscoree: Detect if the current program is a GUI one and pop up a warning about not supporting .NET (4/4)
by James Hawkins 14 Nov '06

14 Nov '06

On 11/13/06, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: mscoree: Detect if the current program is a GUI one and pop up a > warning about not supporting .NET (4/4) > I think a fixme is sufficient. It's worked for all the other unimplemented features we don't provide. -- James Hawkins

2 2

Re: mscoree: Load settings (for now only reported version) from Registry on initialization (2/4)
by James Hawkins 14 Nov '06

14 Nov '06

On 11/13/06, Paul Chitescu <paulc(a)voip.null.ro> wrote: > Changelog: mscoree: Load settings (for now only reported version) from > Registry on initialization (2/4) > + /* @@ Wine registry key: HKCU\Software\Wine\CLR */ + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Wine\\CLR", 0, KEY_READ, &key) == ERROR_SUCCESS) { + char buffer[BUFFER_MAX]; + DWORD type = 0; + DWORD length = sizeof(buffer); + if (RegQueryValueExA(key, "RuntimeVersion", 0, &type, (LPBYTE)buffer, &length) == ERROR_SUCCESS) + wine_utf8_mbstowcs(0, buffer, length, currentCORversion, BUFFER_MAX); + else + lstrcpyW(currentCORversion,defaultCORversion); + RegCloseKey(key); + } + else { + lstrcpyW(currentCORversion,defaultCORversion); + } +} This isn't how Windows stores the COR version, why are we doing it this way? -- James Hawkins

2 1

Re: Add the IE6 registry key
by Mike McCormack 14 Nov '06

14 Nov '06

Lei Zhang wrote: > Add the IE6 registry key, so installers that check for the key will > stop complaining. mike@black:~/wine$ patch -p1 --dry-run < Add\ the\ IE6\ registry\ key.eml patching file tools/wine.inf patch: **** malformed patch at line 67: Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 Please consider attaching your patches and using git-imap-send as described on the GitWine wiki page. Mike

1 0

When will ie6 registry key be added?
by Louis. Lenders 14 Nov '06

14 Nov '06

Hi, subject says it: When will ie6 registry key be added? People are filing bugs against wine, because installers fail, saying ie6 has to be installed. I guess in most cases, they will rush for ies4linux (which is btw a great script i think, but useless to use other apps then ie6) and end up with a mess because it sets lots of dlls to native. Or is this a wontfix, because real ie6 will never come with wine? Please consider adding the key. Send instant messages to your online friends http://uk.messenger.yahoo.com

7 8

Re: [PATCH] Use the custom vsnprintf implementation for msvcrt.vsprintf too
by Mike McCormack 14 Nov '06

14 Nov '06

Sam Dennis wrote: > @ cdecl vprintf(str long) MSVCRT_vprintf > -@ cdecl vsprintf(ptr str ptr) ntdll.vsprintf > +@ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf Looks like your mailer munged the whitespace in the patch, which will prevent it from applying cleanly. Try using git format-patch --attach / git imap-send as described on the Wine wiki page. Mike

1 0

Understanding VirtualSize and SizeOfRawData in PE Section header
by Stephen Torri 13 Nov '06

13 Nov '06

I am trying to understand how the VirtualSize and SizeOfRawData are used in the PE Section Header when Windows loads a executable or DLL into memory. So far here is what I understand. If the VirtualSize is greater or equal to the SizeOfRawData then the loader reads N bytes of section data with N = SizeOfRawData. Yet if the SizeOfRawData is greater than VirtualSize then it was rounded up to the nearest segment so the loader reads N bytes of section data with N = VirtualSize. Is this a correct assessment of how these two variables are used? My problem is how to determine the real length of data to be read from the file. Stephen

1 0

Info about nsURI_Release
by Brandon Warhurst 13 Nov '06

13 Nov '06

I had a question about nsURI_Release. Is it okay for this function to release multiple references at once or is it supposed to release references one at a time? I'm trying to narrow down an application lock-up, and it appears that it occurs when mshtml release multiple references at the same time (say for example, the last AddRef shows 10, and the next release shows 9, then a subsequent release shows 0). After this the last thing reported (or at least that I was tracing) was shdocvw, and it showed: trace:shdocvw:DllMain 0x60fa0000 0x2 (nil) trace:shdocvw:DllMain 0x60fa0000 0x3 (nil) The application just beeps when I try to give it any user interface input beyond this point, as if it is busy (which it isn't busy doing anything application oriented). I can still hit the "Close" on the application, but it fails to close. At any rate, that is the reason for the question. -- Life is a Xerox copy. Quick someone add more toner!

2 1

Re: kernel32: Use LC_NUMERIC instead of LC_ALL to determine the user locale.
by Kirill K. Smirnov 13 Nov '06

13 Nov '06

>Module: wine >Branch: master >Commit: 7a1522a20f45a39e9f127c9f2f83638ff600f5d9 >URL: >http://source.winehq.org/git/wine.git/?a=commit;h=7a1522a20f45a39e9f127c9f2… >Author: Alexandre Julliard <julliard at winehq.org> >Date: Mon Nov 13 14:27:00 2006 +0100 >kernel32: Use LC_NUMERIC instead of LC_ALL to determine the user locale. >Passing LC_ALL to setlocale() doesn't do what we want. Why LC_NUMERIC? Maybe, LC_MESSAGES more suits for this role? Or LANG env? -- Kirill K. Smirnov

2 1

oleaut32: ITypeInfo_fnInvoke behavior on PARAMFLAG_FOPT without PARAMFLAG_FHASDEFAULT
by a_villacis＠palosanto.com 13 Nov '06

13 Nov '06

In a tax app written in Visual Basic/ADO, I found the following problem: In dlls/oleaut32/typelib.c, in function ITypeInfo_fnInvoke(), the following code is found (around line 5569). VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); V_VT(arg) = VT_VARIANT | VT_BYREF; V_VARIANTREF(arg) = &missing_arg[i]; V_VT(V_VARIANTREF(arg)) = VT_ERROR; V_ERROR(V_VARIANTREF(arg)) = DISP_E_PARAMNOTFOUND; This code runs when a parameter is found that has the PARAMFLAG_FIN and PARAMFLAG_FOPT flags, but not the PARAMFLAG_FHASDEFAULT flag. As far as I understand, this code is supposed to supply a variant that might hold an output value. However, in the Append method of the Fields object within the Recordset object of Microsoft ADODB 2.7, the following declaration is found: trace:ole:ITypeInfo_fnInvoke invoking: L"Append"(5) parm0: L"Name" parm1: L"Type" parm2: L"DefinedSize" parm3: L"Attrib" parm4: L"FieldValue" memid is 00000003 Param 0: tdesc.vartype 8 (VT_BSTR) u.paramdesc.wParamFlags PARAMFLAG_FIN u.paramdesc.lpex (nil) Param 1: tdesc.vartype 29 (VT_USERDEFINED ref = 2bc) u.paramdesc.wParamFlags PARAMFLAG_FIN u.paramdesc.lpex (nil) Param 2: tdesc.vartype 29 (VT_USERDEFINED ref = 1c84) u.paramdesc.wParamFlags PARAMFLAG_FIN PARAMFLAG_FOPT PARAMFLAG_FHASDEFAULT u.paramdesc.lpex 0x199868 Param 3: tdesc.vartype 29 (VT_USERDEFINED ref = 320) u.paramdesc.wParamFlags PARAMFLAG_FIN PARAMFLAG_FOPT PARAMFLAG_FHASDEFAULT u.paramdesc.lpex 0x1998d0 Param 4: tdesc.vartype 12 (VT_VARIANT) u.paramdesc.wParamFlags PARAMFLAG_FIN PARAMFLAG_FOPT u.paramdesc.lpex (nil) funckind: 1 (pure virtual) invkind: 1 (func) callconv: 4 (stdcall) oVft: 52 cParamsOpt: 1 wFlags: 0 elemdescFunc (return value type): tdesc.vartype 25 (VT_HRESULT) u.paramdesc.wParamFlags PARAMFLAGS_NONE u.paramdesc.lpex (nil) helpstring: (null) entry (ordinal): 0x0000 The implementation of the method in Microsoft ADODB 2.7 last parameter (FieldValue) absolutely refuses to accept a VT_VARIANT | VT_BYREF variant. This result is not dependent of the type of variant pointed to by the first-level variant - changing VT_ERROR to VT_EMPTY has no effect. Only by passing a VT_EMPTY instead of a VT_VARIANT | VT_BYREF can the application proceed normally. All oleaut32 tests still pass. Please comment if this is an appropriate fix for this issue. Changelog: * (PARAMFLAG_FIN | PARAMFLAG_FOPT) & ~PARAMFLAG_FHASDEFAULT should result in a default parameter of VT_EMPTY, not a VT_VARIANT | VT_BYREF in ITypeInfo_fnInvoke Alex Villacís Lasso

3 5

Re: setupapi: The inf section suffix that corresponds to __x86_64 is .ntamd64.
by Michael Stefaniuc 13 Nov '06

13 Nov '06

Hans Leidekker wrote: > -Hans > > Changelog > The inf section suffix that corresponds to __x86_64 is .ntamd64. > > > ------------------------------------------------------------------------ > > fe843f1050d9673354e0ae2329d86a6df67b7dfb > diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c > index f6a541b..4c60b86 100644 > --- a/dlls/setupapi/install.c > +++ b/dlls/setupapi/install.c > @@ -995,7 +995,7 @@ void WINAPI InstallHinfSectionW( HWND hw > #ifdef __i386__ > static const WCHAR nt_platformW[] = {'.','n','t','x','8','6',0}; > #elif defined(__x86_64) > - static const WCHAR nt_platformW[] = {'.','n','t','i','a','6','4',0}; > + static const WCHAR nt_platformW[] = {'.','n','t','a','m','d','6','4',0}; There was also a Windows for IA64 aka Itanium CPUs. Not sure if the .ntia64 needs to stay in. bye michael > #else /* FIXME: other platforms */ > static const WCHAR nt_platformW[] = {'.','n','t',0}; > #endif > > > ------------------------------------------------------------------------ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

1 0

Re: [PATCH] ntdll: round section parameters on 0x200
by Dmitry Timoshkov 13 Nov '06

13 Nov '06

"Andrey Turkin" <pancha(a)mail.nnov.ru> wrote: > if (map_file_into_view( view, fd, 0, header_size, 0, VPROT_COMMITTED | VPROT_READ, > - removable ) != STATUS_SUCCESS) goto error; > + TRUE ) != STATUS_SUCCESS) goto error; This chunk has nothin to do with the patch description and simply is wrong. > - sec->PointerToRawData, (int)pos, file_size, map_size, > + (int)start, (int)pos, file_size, map_size, ... > - sec->PointerToRawData, sec->SizeOfRawData, > + (int)start, sec->SizeOfRawData, Please use a proper format specifier instead of a cast. -- Dmitry.

3 7

Re: setupapi: Implement SetupGetSourceFileLocation{A,W}. 1/5
by Alexandre Julliard 13 Nov '06

13 Nov '06

Hans Leidekker <hans(a)it.vu.nl> writes: > + if (!SetupFindFirstLineW( hinf, SourceDisksNames, source_id, context ) && > + !SetupFindFirstLineW( hinf, SourceDisksNames_x86, source_id, context )) I believe x86 is supposed to take precedence. You may have to support nt and ntx86 prefixes too. > +@ stdcall SetupGetSourceFileLocationA(ptr ptr str ptr ptr long) > +@ stdcall SetupGetSourceFileLocationW(ptr ptr wstr ptr ptr long) This doesn't match the prototype. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: include: Add credui.h header file.
by Paul Vriens 13 Nov '06

13 Nov '06

On Mon, 2006-11-13 at 13:28 +0000, Robert Shearman wrote: > --- > include/Makefile.in | 1 + > include/wincred.h | 98 > +++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 99 insertions(+), 0 deletions(-) Hi, the patch description and Makefile.in reference credui.h. The patch itself however creates wincred.h. Cheers, Paul.

2 1

Re: [msi] Remove todo_wine for succeeding test
by Paul Vriens 13 Nov '06

13 Nov '06

On 11/12/06, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > this test succeeds (at least on my box). > > Changelog > Remove todo_wine for succeeding test > > Cheers, > > Paul. > --- > dlls/msi/tests/suminfo.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c > index 869495d..6e912b3 100644 > --- a/dlls/msi/tests/suminfo.c > +++ b/dlls/msi/tests/suminfo.c > @@ -393,7 +393,7 @@ static void test_summary_binary(void) > > r = MsiSummaryInfoGetProperty(hsuminfo, PID_WORDCOUNT, &type, &ival, NULL, NULL, NULL); > ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetProperty failed\n"); > - todo_wine ok( ival == 0, "value incorrect\n"); > + ok( ival == 0, "value incorrect\n"); > > /* looks like msi adds some of its own values in here */ > count = 0; > -- > 1.4.3.4 > > Forget this one. This test should fail on Wine as shown by Mike's patch (msi: Fix an uninitialized variable in the test cases.). Cheers, Paul.

1 0

Re: [comdlg32] Remove unused variable (Coverity)
by Paul Vriens 12 Nov '06

12 Nov '06

On 11/12/06, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > > Hi, > > hResource16 is not used. > > Will fix Coverity-17. > > Changelog > Remove unused variable > > Cheers, > > Paul. > --- > dlls/comdlg32/fontdlg16.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c > index 4b13c2d..c5f11df 100644 > --- a/dlls/comdlg32/fontdlg16.c > +++ b/dlls/comdlg32/fontdlg16.c > @@ -164,7 +164,7 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR > BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) > { > HINSTANCE16 hInst; > - HANDLE16 hDlgTmpl16 = 0, hResource16 = 0; > + HANDLE16 hDlgTmpl16 = 0; > HGLOBAL16 hGlobal16 = 0; > BOOL16 bRet = FALSE; > LPVOID template; > @@ -255,7 +255,6 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT1 > hInst = GetWindowLongPtrA(HWND_32(lpChFont->hwndOwner), > GWLP_HINSTANCE); > bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, > lpChFont->hwndOwner, > (DLGPROC16) ptr, (DWORD)lpChFont); > - if (hResource16) FreeResource16(hDlgTmpl16); > if (hGlobal16) > { > GlobalUnlock16(hGlobal16); > -- > 1.4.3.5 Forget this one as I'm not sure whether hDlgTmpl16 needs to be freed. Cheers, Paul.

1 0

Unimplemented Functionality
by Martin Owens 12 Nov '06

12 Nov '06

Hey all, How easy would it be for one of you guys to add this missing functionality (see log below)? It prevents the installer working for "Nations WWII Fighter Command" and yet the game should work once installed. $ wine SETUP.EXE SpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub fixme:setupapi:SetupAddInstallSectionToDiskSpaceListA Stub wine: Call from 0x7b840790 to unimplemented function setupapi.dll.SetupGetSourceFileSizeA, aborting wine: Unimplemented function setupapi.dll.SetupGetSourceFileSizeA called at address 0x7b840790 (thread 0010), starting debugger... Unhandled exception: unimplemented function setupapi.dll.SetupGetSourceFileSizeA called in 32-bit code (0x7b840808). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:7b840808 ESP:0033f09c EBP:0033f100 EFLAGS:00000212( - 00 - -IA1) EAX:7b82bd41 EBX:7b8a8f60 ECX:00000000 EDX:00000000 ESI:00000000 EDI:0033f1ac Stack dump: 0x0033f09c: 0033f124 00000008 7b8a8f60 0000004b 0x0033f0ac: 80000100 00000001 00000000 7b840790 0x0033f0bc: 00000002 7e86eba0 7e870942 7b8a8f60 0x0033f0cc: 7b8a8f60 0033f140 7b877540 00110000 0x0033f0dc: 00000000 0019d320 0000004c 0033f160 0x0033f0ec: 00000400 00000000 00000000 00000000 fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 Backtrace: =>1 0x7b840808 RaiseException+0x78 in kernel32 (0x0033f100) 2 0x7e86eb21 in setupapi (+0x2eb21) (0x0033f130) 3 0x7e852203 in setupapi (+0x12203) (0x00000000) 0x7b840808 RaiseException+0x78 in kernel32: movl 0xfffffffc(%ebp),%ebx Modules: Module Address Debug info Name (78 modules) PE 400000-4bc000 Deferred setup ELF 7b800000-7b91a000 Export kernel32<elf> \-PE 7b820000-7b91a000 \ kernel32 ELF 7bc00000-7bc81000 Deferred ntdll<elf> \-PE 7bc10000-7bc81000 \ ntdll ELF 7bf00000-7bf03000 Deferred <wine-loader> ELF 7c45d000-7c472000 Deferred midimap<elf> \-PE 7c460000-7c472000 \ midimap ELF 7c498000-7c4b0000 Deferred msacm32<elf> \-PE 7c4a0000-7c4b0000 \ msacm32 ELF 7c4b0000-7c568000 Deferred libasound.so.2 ELF 7c568000-7c591000 Deferred winealsa<elf> \-PE 7c570000-7c591000 \ winealsa ELF 7c5be000-7c5f0000 Deferred uxtheme<elf> \-PE 7c5d0000-7c5f0000 \ uxtheme ELF 7d811000-7d816000 Deferred libxfixes.so.3 ELF 7d816000-7d81f000 Deferred libxcursor.so.1 ELF 7d81f000-7d83b000 Deferred imm32<elf> \-PE 7d830000-7d83b000 \ imm32 ELF 7d83b000-7d859000 Deferred ximcp.so.2 ELF 7d859000-7d85c000 Deferred libxrandr.so.2 ELF 7d85c000-7d864000 Deferred libxrender.so.1 ELF 7d864000-7d867000 Deferred libxinerama.so.1 ELF 7dd7e000-7e541000 Deferred libglcore.so.1 ELF 7e541000-7e5c6000 Deferred libgl.so.1 ELF 7e5c6000-7e68f000 Deferred libx11.so.6 ELF 7e68f000-7e69c000 Deferred libxext.so.6 ELF 7e69c000-7e6b4000 Deferred libice.so.6 ELF 7e6b4000-7e741000 Deferred winex11<elf> \-PE 7e6c0000-7e741000 \ winex11 ELF 7e741000-7e75f000 Deferred libexpat.so.1 ELF 7e75f000-7e78e000 Deferred libfontconfig.so.1 ELF 7e78e000-7e7a2000 Deferred libz.so.1 ELF 7e7a2000-7e80c000 Deferred libfreetype.so.6 ELF 7e80c000-7e820000 Deferred lz32<elf> \-PE 7e810000-7e820000 \ lz32 ELF 7e820000-7e839000 Deferred version<elf> \-PE 7e830000-7e839000 \ version ELF 7e839000-7e894000 Export setupapi<elf> \-PE 7e840000-7e894000 \ setupapi ELF 7e894000-7e91d000 Deferred winmm<elf> \-PE 7e8a0000-7e91d000 \ winmm ELF 7e91d000-7e9dd000 Deferred comctl32<elf> \-PE 7e930000-7e9dd000 \ comctl32 ELF 7e9dd000-7ea35000 Deferred shlwapi<elf> \-PE 7e9f0000-7ea35000 \ shlwapi ELF 7ea35000-7eb1f000 Deferred shell32<elf> \-PE 7ea50000-7eb1f000 \ shell32 ELF 7eb1f000-7eb32000 Deferred libresolv.so.2 ELF 7eb32000-7eb50000 Deferred iphlpapi<elf> \-PE 7eb40000-7eb50000 \ iphlpapi ELF 7eb50000-7eba2000 Deferred rpcrt4<elf> \-PE 7eb60000-7eba2000 \ rpcrt4 ELF 7eba2000-7ebad000 Deferred libgcc_s.so.1 ELF 7ec8c000-7ed42000 Deferred gdi32<elf> \-PE 7eca0000-7ed42000 \ gdi32 ELF 7ed42000-7ee78000 Deferred user32<elf> \-PE 7ed60000-7ee78000 \ user32 ELF 7ee78000-7eebe000 Deferred advapi32<elf> \-PE 7ee80000-7eebe000 \ advapi32 ELF 7eebe000-7ef52000 Deferred ole32<elf> \-PE 7eed0000-7ef52000 \ ole32 ELF 7ef52000-7ef5d000 Deferred libnss_files.so.2 ELF 7ef5d000-7ef73000 Deferred libnsl.so.1 ELF 7ef73000-7ef7c000 Deferred libnss_compat.so.2 ELF 7ef7c000-7ef7e000 Deferred xlcutf8load.so.2 ELF 7ef80000-7ef85000 Deferred libxdmcp.so.6 ELF 7ef85000-7ef8e000 Deferred libsm.so.6 ELF 7efc8000-7efee000 Deferred libm.so.6 ELF 7efef000-7eff1000 Deferred libnvidia-tls.so.1 ELF 7eff1000-7eff6000 Deferred libxxf86vm.so.1 ELF 7eff6000-7f000000 Deferred libnss_nis.so.2 ELF b7cd0000-b7cd3000 Deferred libxau.so.6 ELF b7cd4000-b7cd8000 Deferred libdl.so.2 ELF b7cd8000-b7e0c000 Deferred libc.so.6 ELF b7e0c000-b7e1f000 Deferred libpthread.so.0 ELF b7e31000-b7f42000 Deferred libwine.so.1 ELF b7f44000-b7f5f000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 0000000f (D) C:\windows\temp\setup.exe 00000010 0 <== 0000000c 0000000e 0 0000000d 0 Best Regards, Martin Owens

2 1

Ignition app (GPL source) dosnt work
by Matheus Izvekov 11 Nov '06

11 Nov '06

The app called Ignition does runtime patching and dll loading into another process space. It currently fails silently, without both the app and wine reporting any errors. Its source code (GPL) is availiable for download here: http://www.beosil.com/ignition/download.html Is it some known issue? if so, what needs to be done to make it work? Thanks in advance

1 0

Re: Damjan Jovanovic : winex11.drv: Fix copying top-down/bottom-up DIBs.
by Robert Reif 11 Nov '06

11 Nov '06

This patch http://www.winehq.org/pipermail/wine-cvs/2006-November/027732.html breaks http://angusj.com/sudoku/

2 2

Re: Regression: broken locale in 0.9.25
by Kirill K. Smirnov 10 Nov '06

10 Nov '06

As glibc manual http://www.cs.utah.edu/dept/old/texinfo/glibc-manual-0.02/library.html says: QUOTE When you read the current locale for category LC_ALL, the value encodes the entire combination of selected locales for all categories. In this case, the value is not just a single locale name. In fact, we don't make any promises about what it looks like. But if you specify the same "locale name" with LC_ALL in a subsequent call to setlocale, it restores the same combination of locale selections. END OF QUOTE So, any calls setlocale(LC_ALL, *) with analyzing the return value should be eliminated. Moreover, variable LC_ALL may be absent (my case). Quick solution: diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9a72a4c..1ac2b4c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -512,7 +512,10 @@ static LCID get_env_lcid( UINT *unix_cp, char *buf, *lang,*country,*charset,*dialect,*next; LCID ret = 0; - if ((lang = setlocale( category, NULL )) && *lang) + if (category == LC_ALL) lang = getenv("LC_ALL"); + else lang = setlocale(category, NULL); + if (!lang || !*lang) lang = getenv("LANG"); + if (lang && *lang) { if (!strcmp(lang,"POSIX") || !strcmp(lang,"C")) goto done;

1 0

Regression: broken locale in 0.9.25
by Kirill K. Smirnov 10 Nov '06

10 Nov '06

Hi, all! The following patch: http://www.winehq.org/pipermail/wine-cvs/2006-November/027599.html breaks locale with wine. I get several messages: Warning: Language 'LC_CTYPE=ru_RU' was not recognized, defaulting to English. Warning: Language 'LC_CTYPE=ru_RU' was not recognized, defaulting to English. and, as result, fonts are broken too. The reason is in the following piece of patch: - if (((lang = getenv( "LC_ALL" )) && *lang) || - (env_str && (lang = getenv( env_str )) && *lang) || - ((lang = getenv( "LANG" )) && *lang) || - ((lang = user_locale) && *lang)) + if ((lang = setlocale( category, NULL )) && *lang) LC_ALL variable contains single locale, e.g. "ru_RU.KOI8-R", but function setlocale(LC_ALL, NULL) returns: LC_CTYPE=ru_RU.KOI8-R;LC_NUMERIC=ru_RU.KOI8-R;LC_TIME=ru_RU.KOI8-R;LC_COLLATE=C;LC_MONETARY=ru_RU.KOI8-R;LC_MESSAGES=ru_RU.KOI8-R;LC_PAPER=ru_RU.KOI8-R;LC_NAME=ru_RU.KOI8-R;LC_ADDRESS=ru_RU.KOI8-R;LC_TELEPHONE=ru_RU.KOI8-R;LC_MEASUREMENT=ru_RU.KOI8-R;LC_IDENTIFICATION=ru_RU.KOI8-R which is incorrectly parsed. -- Kirill K. Smirnov

1 0

What about improve D3D in wine?
by Mirek 10 Nov '06

10 Nov '06

Hi i have found Nvidia SDK programs and demos, i can install it in wine and some D3D demos can even run, but almost all are someway broken, in Nvidia SDK there are even source codes for those demos, what about start improving Direct3D in wine with help of this demos? It should be easy to track what is wrong and what is right. Here is link: http://www.nvidia.com/object/sdk_home.html Mirek

2 1

Re: server: Avoid accessing free'd thread pointers.
by Eric Pouech 10 Nov '06

10 Nov '06

IMO this should be fixed by rewriting correctly the _SAFE version of the list macros, which are to blame here. I have this somewhere, I'll send it later on. 2006/11/10, Mike McCormack <mike(a)codeweavers.com>: > > --- > server/process.c | 28 ++++++++++++++++++++++++---- > 1 files changed, 24 insertions(+), 4 deletions(-) > > > > > > > -- Eric Pouech

4 10

Regression: bug #6560
by Kirill K. Smirnov 10 Nov '06

10 Nov '06

Hi! The following patch: http://www.winehq.org/pipermail/wine-cvs/2006-September/025991.html [ 106156cb7597cf6f077b6f4e9d7562d8932fd766 is first bad commit commit 106156cb7597cf6f077b6f4e9d7562d8932fd766 Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:14:25 2006 +0100 ole32: Remove some assertions in the stuctured storage code by returning error codes to the caller and by handling the error condition. :040000 040000 a17e245c7e40f15678aa2a78709ec927fb456d40 e25ebc1996d61a0d34658b4c09434705e9245512 M dlls ] caused the bug #6560 I do not understand the true reasons. The reason of it lurks somewhere in installation process (installation of Office), but no reasonable messages on console. Any ideas? -- Kirill K. Smirnov

1 0

Regression in patch: OpenGL32: remove glx context
by Mirek 10 Nov '06

10 Nov '06

This patch broke nvidia SDK opengl demos, i cant run it with this patch. Here is some small report from terminal: cvswine glsl_bump_mapping.exe err:wgl:process_attach X11DRV or GDI32 not loaded. Cannot create default context. err:module:LdrInitializeThunk "opengl32.dll" failed to initialize, aborting err:module:LdrInitializeThunk Main exe initialization for L"G:\\usr\\games\\nvidiaSDK\\DEMOS\\OpenGL\\bin\\Release\\glsl_bump_mapping.exe" failed, status c0000142 Mirek Roderick Colenbrander napsal(a): > Hi, > > This patch removes creation of a GLX context at opengl32 startup. > > The old code created a GLX context at startup, so that programs could call glGet* functions like glGetString before creating an OpenGL context. The OpenGL standards don't allow this and I verified this on winxp/win98 and as expected calling glGet* before creating a context returns NULL as documented everywhere. > > The the code was originally added for a game called Homeworld which called wglGet* before creating a context. Atleast the first version of the game made this call but I haven't seen this behaviour in the source code of the game (which is public). Most likely it was a bug in the first version of the game. > > Regards, > Roderick Colenbrander > > > ------------------------------------------------------------------------ > > --- dlls/opengl32/wgl.c 2006-11-03 22:35:06.000000000 +0100 > +++ dlls/opengl32/wgl.c 2006-11-03 16:47:33.000000000 +0100 > @@ -74,9 +74,6 @@ > void (*wine_tsx11_lock_ptr)(void) = NULL; > void (*wine_tsx11_unlock_ptr)(void) = NULL; > > -static GLXContext default_cx = NULL; > -static Display *default_display; /* display to use for default context */ > - > static HMODULE opengl32_handle; > > static char internal_gl_disabled_extensions[512]; > @@ -107,17 +104,6 @@ > return; > } > > -/* retrieve the X display to use on a given DC */ > -inline static Display *get_display( HDC hdc ) > -{ > - Display *display; > - enum x11drv_escape_codes escape = X11DRV_GET_DISPLAY; > - > - if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, > - sizeof(display), (LPSTR)&display )) display = NULL; > - return display; > -} > - > /*********************************************************************** > * wglCreateLayerContext (OPENGL32.@) > */ > @@ -635,19 +621,12 @@ > creating a rendering context.... */ > static BOOL process_attach(void) > { > - XWindowAttributes win_attr; > - Visual *rootVisual; > - int num; > - XVisualInfo template; > - HDC hdc; > - XVisualInfo *vis = NULL; > - Window root = (Window)GetPropA( GetDesktopWindow(), "__wine_x11_whole_window" ); > HMODULE mod = GetModuleHandleA( "winex11.drv" ); > HMODULE mod_gdi32 = GetModuleHandleA( "gdi32.dll" ); > DWORD size = sizeof(internal_gl_disabled_extensions); > HKEY hkey = 0; > > - if (!root || !mod || !mod_gdi32) > + if (!mod || !mod_gdi32) > { > ERR("X11DRV or GDI32 not loaded. Cannot create default context.\n"); > return FALSE; > @@ -661,40 +640,6 @@ > /* Interal WGL function */ > wine_wgl.p_wglGetIntegerv = (void *)wine_wgl.p_wglGetProcAddress("wglGetIntegerv"); > > - hdc = GetDC(0); > - default_display = get_display( hdc ); > - ReleaseDC( 0, hdc ); > - if (!default_display) > - { > - ERR("X11DRV not loaded. Cannot get display for screen DC.\n"); > - return FALSE; > - } > - > - ENTER_GL(); > - > - /* Try to get the visual from the Root Window. We can't use the standard (presumably > - double buffered) X11DRV visual with the Root Window, since we don't know if the Root > - Window was created using the standard X11DRV visual, and glXMakeCurrent can't deal > - with mismatched visuals. Note that the Root Window visual may not be double > - buffered, so apps actually attempting to render this way may flicker */ > - if (XGetWindowAttributes( default_display, root, &win_attr )) > - { > - rootVisual = win_attr.visual; > - } > - else > - { > - /* Get the default visual, since we can't seem to get the attributes from the > - Root Window. Let's hope that the Root Window Visual matches the DefaultVisual */ > - rootVisual = DefaultVisual( default_display, DefaultScreen(default_display) ); > - } > - > - template.visualid = XVisualIDFromVisual(rootVisual); > - vis = XGetVisualInfo(default_display, VisualIDMask, &template, &num); > - if (vis != NULL) default_cx = glXCreateContext(default_display, vis, 0, GL_TRUE); > - if (default_cx != NULL) glXMakeCurrent(default_display, root, default_cx); > - XFree(vis); > - LEAVE_GL(); > - > internal_gl_disabled_extensions[0] = 0; > if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\OpenGL", &hkey)) { > if (!RegQueryValueExA( hkey, "DisabledExtensions", 0, NULL, (LPBYTE)internal_gl_disabled_extensions, &size)) { > @@ -703,9 +648,6 @@ > RegCloseKey(hkey); > } > > - if (default_cx == NULL) { > - ERR("Could not create default context.\n"); > - } > return TRUE; > } > > @@ -714,8 +656,6 @@ > > static void process_detach(void) > { > - glXDestroyContext(default_display, default_cx); > - > HeapFree(GetProcessHeap(), 0, internal_gl_extensions); > } > > > > ------------------------------------------------------------------------ > >

3 2

[FYI] Wiki down
by Dimi Paun 10 Nov '06

10 Nov '06

Folks, We are experiencing some hardware problems on wiki.winehq.org. I have taken the wiki down until we work through the issues to protect the data. We are working to fix it, and to provide better failover in the future. We are hoping to have it back up by the end of the day. I am sorry about the downtime, and I apologize for any inconvenience caused by it. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

1 1

Qcap questions
by Andrew Talbot 09 Nov '06

09 Nov '06

In qcap/pin.c, the function OutputPin_GetDeliveryBuffer() shows the parameters tStart and tStop as being of type const REFERENCE_TIME *. Looking at the SDK web site, I see a function called CBaseOutputPin::GetDeliveryBuffer() that has similar parameters that are non-const. May I deconstify these parameters in our function, in order to avoid some cast-qual warnings, or are they constrained? Thanks, -- Andy.

1 0

dlls/user/hook.c HOOK_CallHooks() help
by Phil Lodwick 09 Nov '06

09 Nov '06

Hi, I have an application that is hitting the assert in HOOK_CallHooks. ------ trace:hook:HOOK_CallHooks calling hook in thread 0113 WH_CALLWNDPROC code 0 wp 0 lp 7fbef984 err:hook:HOOK_CallHooks Unknown hook id 4 wine-pthread: hook.c:381: HOOK_CallHooks: Assertion `0' failed. ------ Basically I have a call stack that looks like this: 4 0x7f886b31 HOOK_CallHooks+0x251(id=0x4, code=0x0, wparam=0x0, lparam=0x7fbef984, unicode=0x0) [dlls/user/hook.c:381] in user32 (0x7fbef944) 5 0x7f8a4e8c call_window_proc+0x9c(hwnd=0x0, msg=0x0, wparam=0x0, lparam=0x0, unicode=0x0, same_thread=0x0) [dlls/user/message.c:1512] in user32 (0x7fbef9a0) 6 0x7f8a5dca peek_message(msg=0x7fbefcd0, hwnd=0x0, first=0x0, last=0xffffffff, flags=0x1) [dlls/user/message.c:2053] in user32 (0x7fbefca8) 7 0x7f8a7a16 PeekMessageW(msg_out=0x7fbefe10, hwnd=0x0, first=0x0, last=0x0, flags=0x1) [dlls/user/message.c:2694] in user32 (0x7fbefcfc) 8 0x7f8a7cc9 GetMessageW+0x109(msg=0x7fbefe10, hwnd=0x0, first=0x0, last=0x0) [dlls/user/message.c:2764] in user32 (0x7fbefdb0) 9 0x7f8a7e67 GetMessageA+0x37(msg=0x7fbefe10, hwnd=0x0, first=0x0, last=0x0) [dlls/user/message.c:2804] in user32 (0x7fbefdd0) ------------------- The WH_CALLWNDPROC is usually filtered out by the HOOK_IsHooked() call, but not in this case. I don't have source code available for the application. I was hoping somebody might have a good suggestion for the next step in debugging this problem. Right now I am going to start looking at GetMessageA and follow that code down to call_window_proc and see if I see something obvious. Thanks, Phil

2 4

mscoree: Graphical notice
by Segin 09 Nov '06

09 Nov '06

Is it a wise idea to add a graphical warning to mscoree that Wine doesn't support running .NET applications directly yet? I was thinking about using a MessageBox() to deliver the warning. I also wanted the popup to be displayed conditionally, in which if Wine was started from the commandline, the box isn't displayed at all. Since most DEs spawn programs that, although their output reaches the tty that 'startx' was called from, they aren't attached to that tty. Evidence this by starting "tty" from within KDE or GNOME, then switch to the virtual console that you started your X session from. You should note a line near the bottom that says "not a tty". From a program's perspective, you can check for this by calling isatty(1) (file descriptor 1 is usually standard output, and I belive that POSIX mandates this behaviour) and checking if the return value is one (or not, in which display the GUI warning). Is using OS-level file descriptors in conjunction with functions such as isatty() safe programming practice with Wine? I wasn't to sure, and wanted to know. -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

2 1

Re: oledlg: Cast-qual warnings fix
by Huw Davies 09 Nov '06

09 Nov '06

On Wed, Nov 08, 2006 at 09:56:54PM +0000, Andrew Talbot wrote: > @@ -666,16 +672,20 @@ > if(psA->cPasteEntries > 0) > { > UINT i; > - for(i = 0; i < psA->cPasteEntries; i++) > + > + for(i = psA->cPasteEntries; i != 0;) Was there any need for this? Huw.

2 1

Re: kernel32: Add basic OpenProcess test, make it pass under Wine
by Alexandre Julliard 08 Nov '06

08 Nov '06

Dmitry Timoshkov <dmitry(a)codeweavers.com> writes: > diff -up a/server/protocol.def b/server/protocol.def > --- a/server/protocol.def 2006-11-06 18:35:52.000000000 +0800 > +++ b/server/protocol.def 2006-11-06 21:57:22.000000000 +0800 > @@ -335,6 +335,7 @@ struct token_groups > /* Retrieve information about a process */ > @REQ(get_process_info) > obj_handle_t handle; /* process handle */ > + unsigned int access; /* wanted access rights */ > @REPLY > process_id_t pid; /* server process id */ > process_id_t ppid; /* server process id of parent */ Enforcing the proper access rights for a given operation is the server's job, it doesn't make sense to allow the client to specify its own access rights. -- Alexandre Julliard julliard(a)winehq.org

1 0

DIBs with negative width/height
by Damjan Jovanovic 08 Nov '06

08 Nov '06

Hi Does anyone know (or know where to find) what it means for biWidth and/or biHeight for a DIB section's BITMAPINFOHEADER to be negative? It seems largely undocumented. The MSDN says a negative biHeight is a top-down bitmap (the normal positive biHeight is bottom-up), so does a negative biWidth mean scanlines run from right to left? Thank you Damjan

1 0

subclass test for comctl32
by Paul Vriens 08 Nov '06

08 Nov '06

Hi, There are no tests run on Wine (or win98/nt4/w2K) when running the subclass tests for comctl32. test.winehq.org shows that tests are run for XP and W2K3. It look like SetWindowSubclass, RemoveWindowSubclass and DefSubclassProc are exported by name on XP and W2K3 and by ordinal on the other ones. How should/can we deal with this? Should we export by name as well? (get rid of the -noname). Or do we need to change the test to first try by name and then by ordinal (or only by ordinal)? Cheers, Paul.

2 1

Re: usp10 #1/2: create HandleTables to keep track of memory allocation.
by Jeff L 08 Nov '06

08 Nov '06

Rob, as the HandleTable was your suggestion, could you provide a comment on whether these patches are a practical way forward? Jeff Latimer Jeff Latimer wrote: > These 2 patches implement HandleTables for tracking memory usage for > the SCRIPT_STRING_ANALYSIS pointer. The problem is that the ssa can > be copied to another pointer and NULL'ing the pointer is not a > reliable means of de-allocating the pointer. The use of HandleTables > looks like a solution to the problem but it depends on whether storing > a handle in the ssa pointer is acceptable. The table is of fixed size > which is another potential problem but tests indicate that the number > of handles in use will remain relatively small by comparison to the > table size. > > Advice is welcome. > > Jeff Latimer > > Changelog: > Create HandleTables to keep track of memory allocation > --- > dlls/usp10/Makefile.in | 2 + > dlls/usp10/usp10.c | 71 > +++++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 70 insertions(+), 3 deletions(-) > ------------------------------------------------------------------------ > > diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in > index 9d716d5..edef33a 100644 > --- a/dlls/usp10/Makefile.in > +++ b/dlls/usp10/Makefile.in > @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ > VPATH = @srcdir@ > MODULE = usp10.dll > IMPORTLIB = libusp10.$(IMPLIBEXT) > -IMPORTS = gdi32 kernel32 > +IMPORTS = gdi32 ntdll kernel32 > > C_SRCS = \ > usp10.c > diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c > index 9fd6c1e..4b15047 100644 > --- a/dlls/usp10/usp10.c > +++ b/dlls/usp10/usp10.c > @@ -30,6 +30,7 @@ #include "wingdi.h" > #include "winuser.h" > #include "winnls.h" > #include "usp10.h" > +#include "winternl.h" > > #include "wine/debug.h" > > @@ -73,17 +74,83 @@ typedef struct scriptcache { > HDC hdc; > } Scriptcache; > > +typedef struct _CACHE_HANDLE > +{ > + RTL_HANDLE RtlHandle; > + void * Cache_Address; > +} CACHE_HANDLE; > + > +DWORD TlsIndex; /* Adress of shared memory */ > + > /*********************************************************************** > * DllMain > * > + * In this DllMain storage is allocated to each thread so that a HandleTable can > + * be created and maintained thread safe. > + * > + * NOTES > + * The Tls functions (TlsAlloc, TlsSetValue, TlsGetValue and TlsFree) provide > + * access to the local thread storage. > + * > + * LocalAlloc and LocalFree are used as in the Microsoft examples to access > + * local thread storage. > + * > + * RtlInitializeHandleTable initialises the handle table to a fixed size of > + * entries to contain the addresses of the cache pointers used in the > + * ScriptString... functions. This function is fairly light weight as the > + * space for the handle table entries is not allocated at this time but waits > + * until the first RtlAllocateHandle call. Hence only the functions that need > + * the handles incur the additional expense. > */ > BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > { > + RTL_HANDLE_TABLE *Cache_HandleTable; > + BOOL Return_flag; > + > switch(fdwReason) { > + /* > + * When the dll is loaded obtain a TlsIndex so that the HandleTable > + * pointer can be stored there uniquely for each thread. > + */ > case DLL_PROCESS_ATTACH: > - DisableThreadLibraryCalls(hInstDLL); > - break; > + if ((TlsIndex = TlsAlloc()) == TLS_OUT_OF_INDEXES) > + return FALSE; > + /* Fall though to THREAD_ATTACH as loading a DLL only drives > + * DLL_PROCESS_ATTACHand not DLL_THREAD_ATTACH. Here we allocate space > + * for the HandleTable from the thread local storage, save the pointer in > + * the Tls and intialise the table. > + */ > + case DLL_THREAD_ATTACH: > + Cache_HandleTable = LocalAlloc(LPTR, sizeof(RTL_HANDLE_TABLE)); > + if (Cache_HandleTable) > + { > + Return_flag = TlsSetValue(TlsIndex, Cache_HandleTable); > + RtlInitializeHandleTable(0x3FFF, sizeof(CACHE_HANDLE), Cache_HandleTable); > + } > + break; > + /* > + * At exit from a thread, clean up HandleTable which includes freeing the > + * associated memory for handles and the HandleTable. > + */ > + case DLL_THREAD_DETACH: > + Cache_HandleTable = TlsGetValue(TlsIndex); > + if (Cache_HandleTable) > + { > + RtlDestroyHandleTable(Cache_HandleTable); > + LocalFree(Cache_HandleTable); > + } > + break; > + /* > + * As for DLL_THREAD_DETACH but includes freeing the TlsIndex. > + */ > case DLL_PROCESS_DETACH: > + Cache_HandleTable = TlsGetValue(TlsIndex); > + if (Cache_HandleTable) > + { > + RtlDestroyHandleTable(Cache_HandleTable); > + LocalFree(Cache_HandleTable); > + } > + TlsFree(TlsIndex); > break; > } > return TRUE; > > > ------------------------------------------------------------------------ > > >

1 0

Big regressions in latest CVS version
by Mirek 08 Nov '06

08 Nov '06

Hi, there is big regression in latest CVS version, i dont know which patch caused it, but it was ok in release 0.9.24. The first regression is in 3DMarks (i tried only 2005 and 2006), startup logo is completly broken, and selection of tests too, second bigger regression is in nvidia SDK demos, all opengl demos are not working now with log like this: athlon64:/usr/games/nvidiaSDK/DEMOS/OpenGL/bin/Release# cvswine glsl_physics.exe err:wgl:process_attach X11DRV or GDI32 not loaded. Cannot create default context. err:module:LdrInitializeThunk "opengl32.dll" failed to initialize, aborting err:module:LdrInitializeThunk Main exe initialization for L"G:\\usr\\games\\nvidiaSDK\\DEMOS\\OpenGL\\bin\\Release\\glsl_physics.exe" failed, status c0000142 athlon64:/usr/games/nvidiaSDK/DEMOS/OpenGL/bin/Release# Tomorow i am going to try find which patch caused such regression. Mirek

4 4

Re: [PATCH 2/2] comctl32: Switch to a Nx4 tiling.
by Kirill K. Smirnov 07 Nov '06

07 Nov '06

> This patch breaks http://angusj.com/sudoku/ This patch breaks toolbars in almost every application, e.g. comdlg32.GetOpenFileName. But Winword 97 was not affected though.

2 1

Re: [PATCH 5/5] winspool.drv: Associate a printer driver with each printer, rather than share a common one between all printers.
by Detlef Riekenberg 07 Nov '06

07 Nov '06

On Di, 2006-11-07 at 14:43 +0000, Huw Davies wrote: > + dep_file[] = "<dependend files?>" REG_MULTI_SZ need a second '\0', but I prefer to remove the Junk and use an empty string. (I have no Idea, if a NULL works on windows, because I have no tests for the AddDriver* - Functions yet) -- By by ... Detlef

1 0

Re: [PATCH 4/5] winspool.drv: Fix AddPrinterDriverA so that the strings actually get written.
by Detlef Riekenberg 07 Nov '06

07 Nov '06

On Di, 2006-11-07 at 14:37 +0000, Huw Davies wrote: > RegSetValueExA(hkeyName, "Dependent Files", 0, REG_MULTI_SZ, > + (LPBYTE) di3.pDependentFiles, > lstrlenA(di3.pDependentFiles) + 1); Hi Huw. Thanks for working on winspool.drv again, but: "lstrlenA(di3.pDependentFiles) + 1" is not correct for REG_MULTI_SZ I suggest: LPSTR ptr; DWORD total; .... total = 0; ptr = di3.pDependentFiles; if (ptr) { while (ptr[0]) { len = lstrlenA(ptr) + 1; /* actual string */ total += len; ptr += len; } total++; /* extra '\0' for REG_MULTI_SZ - termination */ } -- By by ... Detlef

1 0

Re: wined3d: Use width while converting surfaces.
by Stefan Dösinger 07 Nov '06

07 Nov '06

Hi, > - for (x = 0; x < pitch / 2; x++ ) { > + for (x = 0; x < width / 2; x++ ) { This is not quite correct. pitch / 2 was used because in D3DFMT_R5G6B5 pitch = 2* width(Used to be, before my alignment patches). So this line should be for (x = 0; x < width; x++ ) {

1 0

Re: Executing wine over make segfaults.
by Lee Harr 07 Nov '06

07 Nov '06

># wine --version >Works! > >But: > >Makefile >--------- >test: > wine --version >--------- > >Then run: >#make test > >Wine will segfault! I am having the same problem. I use wine to run a compiler from a Makefile. A few months ago, it worked fine, but recently it stopped working. I even downgraded to versions that had worked before, but without success. I have a few older systems that rarely get updated and are working fine, so I was not too concerned about it, but when I saw that 0.9.24 worked, I thought I was back in business.... except it doesn't work from make. The system is gentoo linux (2.6.18-gentoo-r1) wine compiled like this: ./configure --prefix=/usr --host=i686-pc-linux-gnu --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --sysconfdir=/etc/wine --without-curses --without-opengl --with-x --disable-trace --disable-debug --build=i686-pc-linux-gnu >Do you have any special kernel compile options in use? It's gentoo, so everything is custom compiled, but I try to keep it pretty vanilla. I don't think I have stack-protector on unless that is the default for gcc-4.1.1 I could try installing an older version of gcc or an older kernel and see if that helps. Any other ideas? Thanks for your time. _________________________________________________________________ FREE pop-up blocking with the new MSN Toolbar - get it now! http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/

8 20

toolbar buttons bug
by Kirill K. Smirnov 07 Nov '06

07 Nov '06

Hi! Today, Nov 7 13:05:46 MSK 2006 I've build current wine git. Something evil happened to toolbar buttons - most of them are black. This bug appears in every application I use. Has anybody have the same problem? (If so, then regression testing awaits us :-() -- Kirill K. Smirnov

1 0

Re: Patch for opengl32.dll.so
by Roderick Colenbrander 07 Nov '06

07 Nov '06

> Roderick Colenbrander wrote : > >> On 11/1/06, Bertrand Coconnier <bcoconni(a)club-internet.fr> wrote: > >>> Hi, > >>> > >>> The last release of Wine 0.9.24 contains an error in the code of > >> opengl32.dll.so > >>> under X11 : Wine tries to get the address of "wglGetIntegerv" (line > 608 > >> of > >>> dlls/opengl32/wgl.c) before the extensions of WGL have actually been > >> loaded > >>> (i.e. before X11DRV_WineGL_LoadExtensions() is called). The reading of > >> the > >>> wglGetIntegerv address fails and afterwards, whenever > >> internal_glGetIntegerv() > >>> is called, wine_wgl.p_wglGetIntegerv is NULL and a Fatal Exception is > >> raised. > >> > >> > >> This is probably already fixed in the git tree. See the commit: > >> winex11.drv: Fixed the prototype of many OpenGL functions. > >> > >> Jesse > > > > Else if the problem still happens something strange is going as the > extensions are registered at x11drv startup. > > > > Roderick > > Yes, the problem still happens because the function process_attach() (line > 582 > of dlls/opengl32/wgl.c) is called before the x11drv startup. The comment > of > process_attach is very clear : "/* This is for brain-dead applications > that use > OpenGL functions before even creating a rendering context.... */". It is > clear > that process_attach is a workaround for *brain-dead* apps :) and among > other > things it gets the address of wglGetIntegerv. This operation used to > succeed as > long as GetProcAddress() was used but now since x11drv is needed to upload > the > wglGetIntegerv address there is some kind of race condition and the > operation > fails hence the bug. > > Bertrand. Compared to 0.9.23 I changed the way wglGetIntegerv is loaded before it was directly loaded using GetProcAddress from winex11.drv now it is still loaded from winex11.drv but then using wglGetProcAddress from gdi32. At wine startup (I'm not sure at which stage but I believe directly when you use gdi stuff or perhaps even earlier) winex11.drv is initialized and during this initialization my opengl code is initialized aswell. I wonder what causes the race as I haven't seen it happening for other users yet. I want to avoid a patch like yours as I plan to do similar things for some other functions. Perhaps something goes wrong in wglGetProcAddress itself. Try running wine using: WINEDEBUG=+wgl,+opengl wine wow.exe -opengl &> log. If it is correct you'll see some opengl information (gl version, loading of extensions) before stuff happens in opengl32.dll. Roderick -- Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer

6 10

Re: [PATCH 2/2] comctl32: Switch to a Nx4 tiling.
by Robert Reif 07 Nov '06

07 Nov '06

Mike McCormack wrote: > --- > This fixes bug #3573. The only functions left that depend on Nx1 are > ImageList_Read and ImageList_Write, and they need a good rewriting... This patch breaks http://angusj.com/sudoku/

1 0

re: oleaut32: variant - allow conversion of VT_DISPATCH into VT_BSTR in VarCat
by Dan Kegel 06 Nov '06

06 Nov '06

Alex wrote: > While reviewing a tax application, I found out that this app tries to > VarCat(VT_BSTR, VT_DISPATCH) and viceversa. By allowing this conversion, > the application proceeds normally until the next step. Please include a change to the conformance test to test this case. Also, if you have a minute, please file a bug report at http://bugs.winehq.org so we know what tax application it is, etc. Thanks! - Dan (the guy who asked Benjamin do all those VarCat fixes...) -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: [PATCH] Implement GetShellSecurityDescriptor and test for it
by Francois Gouget 06 Nov '06

06 Nov '06

On Mon, 6 Nov 2006, Andrey Turkin wrote: [...] > The patch also adds 2 structures definitions to include/shlwapi.h. > According to MSDN, one of these structures should be placed into > include/shlobj.h, The MSDN is wrong: the PSDK does not define any of SHELL_USER_SID, SHELL_USER_PERMISSION or GetShellSecurityDescriptor(). So they should be defined in a private shlwapi header, not in include/shlobj.h or include/shlwapi.h. > but I think it is bad idea to include shlobj.h from > shlwapi.h (at least at the moment). It would certainly be a bad idea since the PSDK's shlwapi.h header does not include shlobj.h. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Nouvelle version : les anciens bogues ont été remplacés par de nouveaux.

2 3

WineD3D: heap corruption in d3dfmt_convert_surface
by Markus Amsler 06 Nov '06

06 Nov '06

I have (finally!) found the heap corruption in bf1942: Small surfaces have a pitch of 4 and a width <4. This results in pitch*4 > outpitch in IWineD3DSurfaceImpl_LoadTexture:1844. Afterwards the heap gets corrupted in d3dfmt_convert_surface:1654. The attached patch fixes the problem. I'm quite sure this fix is ugly, Suggestions? Markus

2 1

Re: kernel32: Add basic OpenProcess test, make it pass under Wine
by Robert Shearman 06 Nov '06

06 Nov '06

Dmitry Timoshkov wrote: > Hello, > > Changelog: > kernel32: Add basic OpenProcess test, make it pass under Wine. > > @@ -1960,7 +1961,7 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HA > NTSTATUS status = STATUS_SUCCESS; > void *addr = ROUND_ADDR( *addr_ptr, page_mask ); > > - if (!is_current_process( process )) > + if (!is_current_process( process, PROCESS_VM_OPERATION )) > { > ERR("Unsupported on other process\n"); > return STATUS_ACCESS_DENIED; > > Does this fix a real application or is it something that could just as easily be deferred until these remote operations are supported? -- Rob Shearman

2 1

WineD3D: heap corruption patch
by Markus Amsler 06 Nov '06

06 Nov '06

Oops, forgot to attach diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d0f44cf..45972c4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1841,8 +1841,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp int height = This->glRect.bottom - This->glRect.top; /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - outpitch = width * bpp; - outpitch = (outpitch + 3) & ~3; + outpitch = pitch * 4; mem = HeapAlloc(GetProcessHeap(), 0, outpitch * height); if(!mem) {

1 0

Re: Cast-qual warning fix
by Dmitry Timoshkov 06 Nov '06

06 Nov '06

"Andrew Talbot" <Andrew.Talbot(a)talbotville.com> wrote: > -typedef void *MSIITERHANDLE; > +typedef void *MSIITERHANDLE; > +typedef const void *MSICITERHANDLE; Personally I don't like MSICITERHANDLE typedef at all. It' not obvious that 'C' in the name marks constness of the object. Using 'const' explicitly such as 'const MSIITERHANDLE *handle' is much more clear and readable IMO. -- Dmitry.

3 2

Re: ntdll: implement RtlMakeHandleAllocated to mark handles as vailid
by Robert Shearman 06 Nov '06

06 Nov '06

Jeff Latimer wrote: > This patch automates the marking of a handle as allocated as part of > RtlAllocateHandle. I can't see any reason for not providing a > complete function handle as part of allocating it. > > Changelog: > Mark handle as valid as part of RtlAllocateHandle. From my vague memory of writing the tests, I don't think Windows does this (or I wouldn't have written the code in the tests to make the handle valid). -- Rob Shearman

1 0

exception in MsiDatabaseOpenViewW
by Stefan Leichter 06 Nov '06

06 Nov '06

Hello, when installing MS VC 2005 i get an exception in MsiDatabaseOpenViewW. Is anyone interested ? Bye Stefan

1 0

Re: select() on sockets considered harmful, use poll() instead?
by Juan Lang 06 Nov '06

06 Nov '06

Dan wrote: > The suspect statements are: > > dinput/joystick_linux.c: if (1>select(This->joyfd+1,&readfds,... > dinput/joystick_linuxinput.c: if (1>select(This->joyfd+1,&readfds,... > icmp/icmp_main.c: while ((res=select(icp->sid+1,&fdr,... > netapi32/nbt.c: r = select(fd + 1, &fds, ... > wininet/internet.c: if (select(nSocket+1,&infd,... > wininet/netconnection.c: if (select(connection->socketFD+1,&infd,... These, at least, are safe: they poll on a single file descriptor. > ws2_32/socket.c: if( (highfd = select(highfd + 1, p_read, p_write, p_except, timeoutaddr)) This is the only potentially problematic one, but I didn't look at it closely enough to know for sure. --Juan __________________________________________________________________________________________ Check out the New Yahoo! Mail - Fire up a more powerful email and get things done faster. (http://advision.webevents.yahoo.com/mailbeta)

3 2

Linux with Wine is faster than windowsXP?
by ErV 05 Nov '06

05 Nov '06

Hello. I've got a computer with two OS'es installed - ASPLinux11 and WindowsXP SP2. I've tested recently a super_pi mod 1.4(pi caltulation) on both operating systems (I've used same Win32 binary file) . It looks like it works faster under Linux, while it crashes under windowsXP at certain conditions. What's going on? My friend tried same trick on his computer(taht is much more powerful). He got slightly different results. IN his case program works fastr under windows, when calculations aren't very complicated (pi with 16K digits), but it works faster under linux when calculating "pi" with 1M digits. What's going on? I just want to know if this is a proof of WindowsXP being slower, or does that mean that there is some timer-related bug? ASPLinux claims their wine version is 9.5 while there is mention only about 9.24 version on this site. Here are timing results and links to original program: link to the program: http://www.techpowerup.com/downloads/126/mirrors.php checksum of result can be checked (if provided) at: http://www.xtremesystems.com/pi/ My configuration: 1. AMD Athlon (Thunderbird) 900 Mhz 2. 3x128 Мб DIMM SDRam 3. DFI AK75-EC /OCtect Rhino KT133A-ASP motherboard WindowsXP timinig: 16К - 1.199 s. 32K - 2.727 s 64K - 6.433 s 128K and more - crashes with an accessviolation. ASPLinux11 (via Wine) timinig: 16K - 01.199s 32K - 02.339s 64K - 04.676s 128K - 12.409s 256K - 31.005s 512K - 1m 17.630s 1M - 2m 53.044s results with checksum: ASPLinux11: 64K time 4.703s checksum 06874B42 WindowsXP: 64K time 06.461s checksum 72955C87 My friend's configuration and results (unfortunately he didn't provide any checksum): configuration: GigabitP4Titan 845PE/Cel2400/1Gb/WXPSp2 WindowsXP: 16K - 0.922s 32K - 1.828s 64K - 3.437s 128K - 9.266s 256K - 26.453s 512K - 1m 07.391s 1M - 2m 43.078s ASPLinux11: 16K - 1.511s 32K - 2.318s 64K - 4.372s 128K - 9.156s 256K - 23.454s 512K - 1m 3.082s 1M - 2m 07.937s Victor "ErV" Eremin.

4 5

explorer: Build on Darwin versions prior to 8.0
by Phil Krylov 05 Nov '06

05 Nov '06

Hello, In Darwin versions prior to 8.0, the DiskArbitration framework was a private framework, that is, the headers were not included in SDK and the API was changing in every version. This patch fixes the build in these OS versions. -- Ph.

1 1

Re: msvfw32: Cast-qual warning fix
by Andrew Talbot 05 Nov '06

05 Nov '06

Francois Gouget wrote: > Actually they are in recent PSDKs (for instance the Windows 2003 SP2 > PSDK). > > So this patch should not be applied. > Acknowledged with thanks to Dmitry and yourself. -- Andy.

1 0

Re: msvfw32: Cast-qual warning fix
by Francois Gouget 05 Nov '06

05 Nov '06

On Sat, 4 Nov 2006, Andrew Talbot wrote: > The last formal argument of MCIWndCreate() is not const-qualified in the SDK. Actually they are in recent PSDKs (for instance the Windows 2003 SP2 PSDK). So this patch should not be applied. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Hiroshima '45 - Czernobyl '86 - Windows '95

1 0

Re: msvfw32: Cast-qual warning fix
by Dmitry Timoshkov 05 Nov '06

05 Nov '06

"Andrew Talbot" <Andrew.Talbot(a)talbotville.com> wrote: > The last formal argument of MCIWndCreate() is not const-qualified in the SDK. It is in my version of the PSDK headers, but it is not in the PSDK docs. -- Dmitry.

2 1

Flickering bug for World of Warcraft
by Bertrand Coconnier 04 Nov '06

04 Nov '06

Hi, After investigating a bit in the Wine code, it seems that the flickering bug of WoW in OpenGL mode is due to wglGetPbufferDCARB that returns a DC which type is OBJ_MEMDC while it should return a DC which type is OBJ_DC. And since in the current git tree, the DC type of a Pbuffer is OBJ_MEMDC then the code located in lines 1394-1395 of dlls/winex11.drv/opengl.c is executed : the Pbuffer is copied to the screen each time the GL context is made current to the Pbuffer hence the flickering (WoW bounds the GL context alternatively to the screen and to the Pbuffer). The expected behaviour is not to copy the Pbuffer content to the screen since WoW does it itself. The easiest workaround for this bug would be to make X11DRV_wglGetPbufferDCARB to return the Pbuffer's object->hdc (this fixes the flickering bug). However, I have made some tests with Windows XP and it appears that wglGetPbufferDCARB returns a HDC different from the HDC passed when wglCreatePbufferARB was called. So such a patch would be a dirty hack not a real fix. I am not familiar enough with Wine to submit a patch so I leave the gurus out there find an elegant solution. Attached is the code that I used to perform a few tests about Pbuffers on Windows XP (code of interest is located from line 293 to line 298). Regards, Bertrand. /* * This Code Was Created By Jeff Molofee 2000 * A HUGE Thanks To Fredric Echols For Cleaning Up * And Optimizing This Code, Making It More Flexible! * If You've Found This Code Useful, Please Let Me Know. * Visit My Site At nehe.gamedev.net */ #include <windows.h> // Header File For Windows #include <gl\gl.h> // Header File For The OpenGL32 Library #include <gl\glu.h> // Header File For The GLu32 Library #include <gl\glaux.h> // Header File For The Glaux Library HDC hDC=NULL; // Private GDI Device Context HGLRC hRC=NULL; // Permanent Rendering Context HWND hWnd=NULL; // Holds Our Window Handle HINSTANCE hInstance; // Holds The Instance Of The Application bool keys[256]; // Array Used For The Keyboard Routine bool active=TRUE; // Window Active Flag Set To TRUE By Default bool fullscreen=TRUE; // Fullscreen Flag Set To Fullscreen Mode By Default LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc DECLARE_HANDLE(HPBUFFERARB); typedef HPBUFFERARB (APIENTRY * wglCreatePbufferARB_t)(HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); typedef HDC (APIENTRY * wglGetPbufferDCARB_t)(HPBUFFERARB hPbuffer); typedef int (APIENTRY * wglReleasePbufferDCARB_t)(HPBUFFERARB hPbuffer, HDC hDC); typedef BOOL (APIENTRY * wglDestroyPbufferARB_t)(HPBUFFERARB hPbuffer); wglCreatePbufferARB_t wglCreatePbufferARB = NULL; wglGetPbufferDCARB_t wglGetPbufferDCARB = NULL; wglReleasePbufferDCARB_t wglReleasePbufferDCARB = NULL; wglDestroyPbufferARB_t wglDestroyPbufferARB = NULL; GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // Resize And Initialize The GL Window { if (height==0) // Prevent A Divide By Zero By { height=1; // Making Height Equal One } glViewport(0,0,width,height); // Reset The Current Viewport glMatrixMode(GL_PROJECTION); // Select The Projection Matrix glLoadIdentity(); // Reset The Projection Matrix // Calculate The Aspect Ratio Of The Window gluPerspective(45.0f,(GLfloat)width/(GLfloat)height,0.1f,100.0f); glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); // Reset The Modelview Matrix } int InitGL(GLvoid) // All Setup For OpenGL Goes Here { glShadeModel(GL_SMOOTH); // Enable Smooth Shading glClearColor(0.0f, 0.0f, 0.0f, 0.5f); // Black Background glClearDepth(1.0f); // Depth Buffer Setup glEnable(GL_DEPTH_TEST); // Enables Depth Testing glDepthFunc(GL_LEQUAL); // The Type Of Depth Testing To Do glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Really Nice Perspective Calculations return TRUE; // Initialization Went OK } int DrawGLScene(GLvoid) // Here's Where We Do All The Drawing { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear Screen And Depth Buffer glLoadIdentity(); // Reset The Current Modelview Matrix return TRUE; // Everything Went OK } GLvoid KillGLWindow(GLvoid) // Properly Kill The Window { if (fullscreen) // Are We In Fullscreen Mode? { ChangeDisplaySettings(NULL,0); // If So Switch Back To The Desktop ShowCursor(TRUE); // Show Mouse Pointer } if (hRC) // Do We Have A Rendering Context? { if (!wglMakeCurrent(NULL,NULL)) // Are We Able To Release The DC And RC Contexts? { MessageBox(NULL,"Release Of DC And RC Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); } if (!wglDeleteContext(hRC)) // Are We Able To Delete The RC? { MessageBox(NULL,"Release Rendering Context Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); } hRC=NULL; // Set RC To NULL } if (hDC && !ReleaseDC(hWnd,hDC)) // Are We Able To Release The DC { MessageBox(NULL,"Release Device Context Failed.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); hDC=NULL; // Set DC To NULL } if (hWnd && !DestroyWindow(hWnd)) // Are We Able To Destroy The Window? { MessageBox(NULL,"Could Not Release hWnd.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); hWnd=NULL; // Set hWnd To NULL } if (!UnregisterClass("OpenGL",hInstance)) // Are We Able To Unregister Class { MessageBox(NULL,"Could Not Unregister Class.","SHUTDOWN ERROR",MB_OK | MB_ICONINFORMATION); hInstance=NULL; // Set hInstance To NULL } } /* This Code Creates Our OpenGL Window. Parameters Are: * * title - Title To Appear At The Top Of The Window * * width - Width Of The GL Window Or Fullscreen Mode * * height - Height Of The GL Window Or Fullscreen Mode * * bits - Number Of Bits To Use For Color (8/16/24/32) * * fullscreenflag - Use Fullscreen Mode (TRUE) Or Windowed Mode (FALSE) */ BOOL CreateGLWindow(char* title, int width, int height, int bits, bool fullscreenflag) { GLuint PixelFormat; // Holds The Results After Searching For A Match WNDCLASS wc; // Windows Class Structure DWORD dwExStyle; // Window Extended Style DWORD dwStyle; // Window Style RECT WindowRect; // Grabs Rectangle Upper Left / Lower Right Values WindowRect.left=(long)0; // Set Left Value To 0 WindowRect.right=(long)width; // Set Right Value To Requested Width WindowRect.top=(long)0; // Set Top Value To 0 WindowRect.bottom=(long)height; // Set Bottom Value To Requested Height fullscreen=fullscreenflag; // Set The Global Fullscreen Flag hInstance = GetModuleHandle(NULL); // Grab An Instance For Our Window wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; // Redraw On Size, And Own DC For Window. wc.lpfnWndProc = (WNDPROC) WndProc; // WndProc Handles Messages wc.cbClsExtra = 0; // No Extra Window Data wc.cbWndExtra = 0; // No Extra Window Data wc.hInstance = hInstance; // Set The Instance wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); // Load The Default Icon wc.hCursor = LoadCursor(NULL, IDC_ARROW); // Load The Arrow Pointer wc.hbrBackground = NULL; // No Background Required For GL wc.lpszMenuName = NULL; // We Don't Want A Menu wc.lpszClassName = "OpenGL"; // Set The Class Name HPBUFFERARB pBuffer = NULL; #define WGL_PBUFFER_LARGEST_ARB 0x2033 int attrib[] = {WGL_PBUFFER_LARGEST_ARB, 0, 0}; BOOL success; HDC pBufferHDC; DWORD type1 = 0; DWORD type2 = 0; int result = 0xdeadbeef; if (!RegisterClass(&wc)) // Attempt To Register The Window Class { MessageBox(NULL,"Failed To Register The Window Class.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } if (fullscreen) // Attempt Fullscreen Mode? { DEVMODE dmScreenSettings; // Device Mode memset(&dmScreenSettings,0,sizeof(dmScreenSettings)); // Makes Sure Memory's Cleared dmScreenSettings.dmSize=sizeof(dmScreenSettings); // Size Of The Devmode Structure dmScreenSettings.dmPelsWidth = width; // Selected Screen Width dmScreenSettings.dmPelsHeight = height; // Selected Screen Height dmScreenSettings.dmBitsPerPel = bits; // Selected Bits Per Pixel dmScreenSettings.dmFields=DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT; // Try To Set Selected Mode And Get Results. NOTE: CDS_FULLSCREEN Gets Rid Of Start Bar. if (ChangeDisplaySettings(&dmScreenSettings,CDS_FULLSCREEN)!=DISP_CHANGE_SUCCESSFUL) { // If The Mode Fails, Offer Two Options. Quit Or Use Windowed Mode. if (MessageBox(NULL,"The Requested Fullscreen Mode Is Not Supported By\nYour Video Card. Use Windowed Mode Instead?","NeHe GL",MB_YESNO|MB_ICONEXCLAMATION)==IDYES) { fullscreen=FALSE; // Windowed Mode Selected. Fullscreen = FALSE } else { // Pop Up A Message Box Letting User Know The Program Is Closing. MessageBox(NULL,"Program Will Now Close.","ERROR",MB_OK|MB_ICONSTOP); return FALSE; // Return FALSE } } } if (fullscreen) // Are We Still In Fullscreen Mode? { dwExStyle=WS_EX_APPWINDOW; // Window Extended Style dwStyle=WS_POPUP; // Windows Style ShowCursor(FALSE); // Hide Mouse Pointer } else { dwExStyle=WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; // Window Extended Style dwStyle=WS_OVERLAPPEDWINDOW; // Windows Style } AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, dwExStyle); // Adjust Window To True Requested Size // Create The Window if (!(hWnd=CreateWindowEx( dwExStyle, // Extended Style For The Window "OpenGL", // Class Name title, // Window Title dwStyle | // Defined Window Style WS_CLIPSIBLINGS | // Required Window Style WS_CLIPCHILDREN, // Required Window Style 0, 0, // Window Position WindowRect.right-WindowRect.left, // Calculate Window Width WindowRect.bottom-WindowRect.top, // Calculate Window Height NULL, // No Parent Window NULL, // No Menu hInstance, // Instance NULL))) // Dont Pass Anything To WM_CREATE { KillGLWindow(); // Reset The Display MessageBox(NULL,"Window Creation Error.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } static PIXELFORMATDESCRIPTOR pfd= // pfd Tells Windows How We Want Things To Be { sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor 1, // Version Number PFD_DRAW_TO_WINDOW | // Format Must Support Window PFD_SUPPORT_OPENGL | // Format Must Support OpenGL PFD_DOUBLEBUFFER, // Must Support Double Buffering PFD_TYPE_RGBA, // Request An RGBA Format bits, // Select Our Color Depth 0, 0, 0, 0, 0, 0, // Color Bits Ignored 0, // No Alpha Buffer 0, // Shift Bit Ignored 0, // No Accumulation Buffer 0, 0, 0, 0, // Accumulation Bits Ignored 16, // 16Bit Z-Buffer (Depth Buffer) 0, // No Stencil Buffer 0, // No Auxiliary Buffer PFD_MAIN_PLANE, // Main Drawing Layer 0, // Reserved 0, 0, 0 // Layer Masks Ignored }; if (!(hDC=GetDC(hWnd))) // Did We Get A Device Context? { KillGLWindow(); // Reset The Display MessageBox(NULL,"Can't Create A GL Device Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } if (!(PixelFormat=ChoosePixelFormat(hDC,&pfd))) // Did Windows Find A Matching Pixel Format? { KillGLWindow(); // Reset The Display MessageBox(NULL,"Can't Find A Suitable PixelFormat.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } if(!SetPixelFormat(hDC,PixelFormat,&pfd)) // Are We Able To Set The Pixel Format? { KillGLWindow(); // Reset The Display MessageBox(NULL,"Can't Set The PixelFormat.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } if (!(hRC=wglCreateContext(hDC))) // Are We Able To Get A Rendering Context? { KillGLWindow(); // Reset The Display MessageBox(NULL,"Can't Create A GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } if(!wglMakeCurrent(hDC,hRC)) // Try To Activate The Rendering Context { KillGLWindow(); // Reset The Display MessageBox(NULL,"Can't Activate The GL Rendering Context.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } wglCreatePbufferARB = (wglCreatePbufferARB_t)wglGetProcAddress("wglCreatePbufferARB"); wglGetPbufferDCARB = (wglGetPbufferDCARB_t)wglGetProcAddress("wglGetPbufferDCARB"); wglReleasePbufferDCARB = (wglReleasePbufferDCARB_t)wglGetProcAddress("wglReleasePbufferDCARB"); wglDestroyPbufferARB = (wglDestroyPbufferARB_t)wglGetProcAddress("wglDestroyPbufferARB"); pBuffer = wglCreatePbufferARB(hDC, PixelFormat, width, height, attrib); pBufferHDC = wglGetPbufferDCARB(pBuffer); type1 = GetObjectType(hDC); type2 = GetObjectType(pBufferHDC); result = wglReleasePbufferDCARB(pBuffer, pBufferHDC); success = wglDestroyPbufferARB(pBuffer); ShowWindow(hWnd,SW_SHOW); // Show The Window SetForegroundWindow(hWnd); // Slightly Higher Priority SetFocus(hWnd); // Sets Keyboard Focus To The Window ReSizeGLScene(width, height); // Set Up Our Perspective GL Screen if (!InitGL()) // Initialize Our Newly Created GL Window { KillGLWindow(); // Reset The Display MessageBox(NULL,"Initialization Failed.","ERROR",MB_OK|MB_ICONEXCLAMATION); return FALSE; // Return FALSE } return TRUE; // Success } LRESULT CALLBACK WndProc( HWND hWnd, // Handle For This Window UINT uMsg, // Message For This Window WPARAM wParam, // Additional Message Information LPARAM lParam) // Additional Message Information { switch (uMsg) // Check For Windows Messages { case WM_ACTIVATE: // Watch For Window Activate Message { if (!HIWORD(wParam)) // Check Minimization State { active=TRUE; // Program Is Active } else { active=FALSE; // Program Is No Longer Active } return 0; // Return To The Message Loop } case WM_SYSCOMMAND: // Intercept System Commands { switch (wParam) // Check System Calls { case SC_SCREENSAVE: // Screensaver Trying To Start? case SC_MONITORPOWER: // Monitor Trying To Enter Powersave? return 0; // Prevent From Happening } break; // Exit } case WM_CLOSE: // Did We Receive A Close Message? { PostQuitMessage(0); // Send A Quit Message return 0; // Jump Back } case WM_KEYDOWN: // Is A Key Being Held Down? { keys[wParam] = TRUE; // If So, Mark It As TRUE return 0; // Jump Back } case WM_KEYUP: // Has A Key Been Released? { keys[wParam] = FALSE; // If So, Mark It As FALSE return 0; // Jump Back } case WM_SIZE: // Resize The OpenGL Window { ReSizeGLScene(LOWORD(lParam),HIWORD(lParam)); // LoWord=Width, HiWord=Height return 0; // Jump Back } } // Pass All Unhandled Messages To DefWindowProc return DefWindowProc(hWnd,uMsg,wParam,lParam); } int WINAPI WinMain( HINSTANCE hInstance, // Instance HINSTANCE hPrevInstance, // Previous Instance LPSTR lpCmdLine, // Command Line Parameters int nCmdShow) // Window Show State { MSG msg; // Windows Message Structure BOOL done=FALSE; // Bool Variable To Exit Loop // Ask The User Which Screen Mode They Prefer if (MessageBox(NULL,"Would You Like To Run In Fullscreen Mode?", "Start FullScreen?",MB_YESNO|MB_ICONQUESTION)==IDNO) { fullscreen=FALSE; // Windowed Mode } // Create Our OpenGL Window if (!CreateGLWindow("NeHe's OpenGL Framework",640,480,16,fullscreen)) { return 0; // Quit If Window Was Not Created } while(!done) // Loop That Runs While done=FALSE { if (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) // Is There A Message Waiting? { if (msg.message==WM_QUIT) // Have We Received A Quit Message? { done=TRUE; // If So done=TRUE } else // If Not, Deal With Window Messages { TranslateMessage(&msg); // Translate The Message DispatchMessage(&msg); // Dispatch The Message } } else // If There Are No Messages { // Draw The Scene. Watch For ESC Key And Quit Messages From DrawGLScene() if (active) // Program Active? { if (keys[VK_ESCAPE]) // Was ESC Pressed? { done=TRUE; // ESC Signalled A Quit } else // Not Time To Quit, Update Screen { DrawGLScene(); // Draw The Scene SwapBuffers(hDC); // Swap Buffers (Double Buffering) } } if (keys[VK_F1]) // Is F1 Being Pressed? { keys[VK_F1]=FALSE; // If So Make Key FALSE KillGLWindow(); // Kill Our Current Window fullscreen=!fullscreen; // Toggle Fullscreen / Windowed Mode // Recreate Our OpenGL Window if (!CreateGLWindow("NeHe's OpenGL Framework",640,480,16,fullscreen)) { return 0; // Quit If Window Was Not Created } } } } // Shutdown KillGLWindow(); // Kill The Window return (msg.wParam); // Exit The Program }

3 12

preloader: Setup a fake thread-local storage block pointed to by %gs. breaks RH9
by Robert Reif 04 Nov '06

04 Nov '06

This last commit: http://www.winehq.org/pipermail/wine-cvs/2006-November/027508.html totally breaks wine on Red Hat 9. Red Hat 9 has been partially broken since 2.4 kernel support has been dropped a while back but this patch makes it totally unusable. It is unfortunate that 2.4 kernel support has been removed from wine because in "The Real World" (large enterprise and dedicated or embedded systems) users don't have the option of upgrading the OS to the latest and greatest. Some systems will never be upgraded once deployed. Dropping 2.4 support is a regression.

2 1

Re: wined3d: Respect ARB_VERTEX_BUFFER_OBJECT in loadVertexData.
by Markus Amsler 04 Nov '06

04 Nov '06

Stefan Dösinger wrote: > Am Samstag 28 Oktober 2006 16:44 schrieben Sie: > >> Its a Radeon Mobility M7 LW, with direct rendering. It has a RV200 core >> which is a R100 with the memory controller from R200. And it looks like >> the R100 doesn't support vertex_buffer_objects (couldn't find precise >> specs). >> > How well does bf1942 work without vertex buffers? My experiance with my M9 is > that it got a 100% performance boost with vbos. > It's playable (~10-15fps), perhaps 1/3-1/5 of w2k performance. > That were rather the vertex fixups, not the vbos themselves. I think you can > get most of that gain by improving the vertex buffer code to be able to do > vertex fixups without VBOs > Thanks for the tip. I will have a look at it.

2 2

Re: WineD3D: Scissor rect corrections
by Alexandre Julliard 04 Nov '06

04 Nov '06

Stefan Dösinger <stefan(a)codeweavers.com> writes: > + GetWindowRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect); > + /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply > + * Warning2: Even in windowed mode the coords are relative to the window, not the screen > + */ Wouldn't GetClientRect be more appropriate? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: secur32: [4/3]Test and fix DecryptMessage for multiple data buffers.
by Dmitry Timoshkov 04 Nov '06

04 Nov '06

"Kai Blin" <kai.blin(a)gmail.com> wrote: > --- a/dlls/secur32/ntlm.c > +++ b/dlls/secur32/ntlm.c > @@ -1345,22 +1345,32 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ve > if(helper->neg_flags & NTLMSSP_NEGOTIATE_SIGN) > { > SecBufferDesc local_desc; > - SecBuffer local_buff[2]; > + SecBuffer local_buff[pMessage->cBuffers]; This construct is not portable, you need to use HeapAlloc to dynamically allocate buffers. -- Dmitry.

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