October 2006 - Wine-devel - list.winehq.org

Re: oleaut32 1/2: [try 3] Implements function varformat:VarWeekdayName
by Alexandre Julliard 04 Oct '06

04 Oct '06

"Benjamin Arai" <me(a)benjaminarai.com> writes: > + if (fAbbrev) > + if (iFirstDay == 0) > + localeValue = LOCALE_SABBREVDAYNAME1 + ((iWeekday + LOCALE_IFIRSTDAYOFWEEK - 1) % 7); > + else > + localeValue = LOCALE_SABBREVDAYNAME1 + ((iWeekday + iFirstDay + 4) % 7); > + else > + if (iFirstDay == 0) > + localeValue = LOCALE_SDAYNAME1 + ((iWeekday + LOCALE_IFIRSTDAYOFWEEK - 1) % 7); > + else > + localeValue = LOCALE_SDAYNAME1 + ((iWeekday + iFirstDay + 4) % 7); This obviously can't work, LOCALE_IFIRSTDAYOFWEEK is a constant. -- Alexandre Julliard julliard(a)winehq.org

1 0

Register policy for WGL_ARB_render_texture
by Paweł Różański 04 Oct '06

04 Oct '06

Hi, On current git I see that "wglBindTexImageARB" isn't found on my system (when running nvidia demos). Quick look into dlls/winex11.drv/opengl.c reveals: if (glxRequireExtension("GLX_ATI_render_texture") || glxRequireExtension("GLX_ARB_render_texture")) register_extension(&WGL_ARB_render_texture); My glxinfo doesn't show GLX_ATI_render_texture nor GLX_ARB_render_texture - if i remove that if and force register_extension - all is working The card is GeForce 6200/AGP on opengl 2.0.2 NVIDIA 87.74. I would like only to point that buggy code - maybe someone will came with nice fix. http://bugs.winehq.org/show_bug.cgi?id=6329 take care, -- Paweł Różański

2 1

Re: [PATCH] add some more fake binaries
by Francois Gouget 04 Oct '06

04 Oct '06

On Tue, 3 Oct 2006, Marcus Meissner wrote: > Hi, > > Added dsound.dll and dsound.vxd and ddhelp.exe > to the fake dlls. > > These are checked for by "Curse of Monkey Island" > DirectX check. [...] > +11,,ddhelp.exe > 11,,ddraw.dll > +11,,dsound.dll > +11,,dsound.vxd [...] I think we should not add fake exes if we don't have the corresponding Winelib exe. I have seen it cause applications think that the exe is available and thus try to run it which fails (hence commit efafe08fc6a6d843e52069095947c70abeab867e). So here it seems to fix an application but it may just break many others. IMHO, it would be better to (also) add a stub. Fake dlls probably have the same issue but maybe not vxds. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ 1 + e ^ ( i * pi ) = 0

1 0

Re: [PATCH 1/3] Compile oleaut32 for win32 but not for win64
by Robert Shearman 04 Oct '06

04 Oct '06

Pavel Roskin wrote: > GLUT32FILES = glut32 > OPENGLFILES = opengl32 wined3d > XFILES = winex11.drv > -EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@ > +WIN32FILES = oleaut32 > +EXTRADIRS = @GLU32FILES@ @GLUT32FILES@ @OPENGLFILES@ @XFILES@ Why? -- Rob Shearman

2 1

Re: [TRY2 1/8] gdi32: Cleanup the update_font_info().
by Huw Davies 04 Oct '06

04 Oct '06

On Wed, Oct 04, 2006 at 11:26:49AM +0900, Byeong-Sik Jeon wrote: > Changelog: > Cleanup the updata_font_info(). > > +static void add_nls_font_to_registry( > + HKEY hkey, > + const char *value_name, > + const char *value_data, > + BOOL is_force) .... > + { > + RegSetValueExA(hkey, value_name, 0, REG_SZ, > + (const BYTE *)value_data, (DWORD)(strlen(value_data) + 1)); > + } You shouldn't need the DWORD cast here. > @@ -1546,6 +1528,7 @@ static void update_font_info(void) > + if(!matched_nls_font_list) > + { > + FIXME("there is no font defaults for lcid %04lx/ansi_cp %u", lcid, ansi_cp); > + return; > + } Could you add the missing \n in the FIXME and change the text to read "There are no..."? Thanks, Huw.

1 0

Re: [PATCH 1/3] Compile oleaut32 for win32 but not for win64
by James Hawkins 03 Oct '06

03 Oct '06

On 10/3/06, Pavel Roskin <proski(a)gnu.org> wrote: > From: Pavel Roskin <proski(a)gnu.org> > > Compile oleaut32 for win32 but not for win64 Does win64 not come with oleaut32? What I'm really asking is, why are you making this change? -- James Hawkins

2 4

Re: x11.drv: [2/2] Use internal cached cursor position for GetCursorPos.
by Mirek 03 Oct '06

03 Oct '06

Why was not accepted those patches? With those patches is mouse moving in some games perfetly smooth and correct (Tomb Raider Legend, GTA San Andreas, NFS Most Wanted). Mirek Vitaliy Margolen napsal(a): > ChangeLog: > winex11.drv: Use internal cached cursor position for GetCursorPos. > Query X directly only when cursor is outside process' windows. > > We need to use cached cursor position in GetCursorPos() because it should > return previous position inside hook handler. And get updated right after > hook chain is finished and we sent appropriate mouse messages. > > However we have a problem with synchronizing this cached cursor position > between processes. To solve that we can either share that information between > processes or query X the same we did before, if cursor is outside process' > windows. > > dlls/winex11.drv/event.c | 4 +-- > dlls/winex11.drv/mouse.c | 71 ++++++++++++++++++++++++++++++--------------- > dlls/winex11.drv/window.c | 2 + > dlls/winex11.drv/x11drv.h | 1 + > 4 files changed, 52 insertions(+), 26 deletions(-) > > > > ------------------------------------------------------------------------ > > b81f98baf1ba0321f413a0a0c3a5cf90b07fab8c > diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c > index 210d816..bbd1a0c 100644 > --- a/dlls/winex11.drv/event.c > +++ b/dlls/winex11.drv/event.c > @@ -87,7 +87,7 @@ static struct event_handler handlers[MAX > { ButtonRelease, X11DRV_ButtonRelease }, > { MotionNotify, X11DRV_MotionNotify }, > { EnterNotify, X11DRV_EnterNotify }, > - /* LeaveNotify */ > + { LeaveNotify, X11DRV_LeaveNotify }, > { FocusIn, EVENT_FocusIn }, > { FocusOut, EVENT_FocusOut }, > { KeymapNotify, X11DRV_KeymapNotify }, > @@ -116,7 +116,7 @@ static struct event_handler handlers[MAX > { MappingNotify, X11DRV_MappingNotify }, > }; > > -static int nb_event_handlers = 18; /* change this if you add handlers above */ > +static int nb_event_handlers = 19; /* change this if you add handlers above */ > > > /* return the name of an X event */ > diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c > index 14ffcc7..470b9f1 100644 > --- a/dlls/winex11.drv/mouse.c > +++ b/dlls/winex11.drv/mouse.c > @@ -70,6 +70,7 @@ static const UINT button_up_flags[NB_BUT > }; > > POINT cursor_pos; > +static int mouse_inside_wine; > > static CRITICAL_SECTION cursor_CritSection; > static CRITICAL_SECTION_DEBUG critsect_debug = > @@ -697,17 +698,29 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ) > { > Display *display = thread_display(); > > - TRACE( "warping to (%d,%d)\n", x, y ); > + /* Cursor position hasn't changed at all or not yet. */ > + EnterCriticalSection(&cursor_CritSection); > + if (cursor_pos.x == x && cursor_pos.y == y) > + { > + LeaveCriticalSection(&cursor_CritSection); > > - wine_tsx11_lock(); > - XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, x, y ); > - XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ > - wine_tsx11_unlock(); > + /* We still need to generate WM_MOUSEMOVE */ > + queue_raw_mouse_message( WM_MOUSEMOVE, NULL, x, y, 0, GetCurrentTime(), 0, 0 ); > + return TRUE; > + } > + LeaveCriticalSection(&cursor_CritSection); > + > + TRACE( "warping to (%d,%d)\n", x, y ); > > EnterCriticalSection( &cursor_CritSection ); > cursor_pos.x = x; > cursor_pos.y = y; > LeaveCriticalSection( &cursor_CritSection ); > + > + wine_tsx11_lock(); > + XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, x, y ); > + XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ > + wine_tsx11_unlock(); > return TRUE; > } > > @@ -716,25 +729,28 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ) > */ > BOOL X11DRV_GetCursorPos(LPPOINT pos) > { > - Display *display = thread_display(); > - Window root, child; > - int rootX, rootY, winX, winY; > - unsigned int xstate; > - BOOL res; > - > - wine_tsx11_lock(); > - res = XQueryPointer( display, root_window, &root, &child, > - &rootX, &rootY, &winX, &winY, &xstate ); > - wine_tsx11_unlock(); > - if (res) > + if (!mouse_inside_wine) > { > - update_key_state( xstate ); > - update_button_state( xstate ); > - TRACE("pointer at (%d,%d)\n", winX, winY ); > - EnterCriticalSection( &cursor_CritSection ); > - cursor_pos.x = winX; > - cursor_pos.y = winY; > - LeaveCriticalSection( &cursor_CritSection ); > + Display *display = thread_display(); > + Window root, child; > + int rootX, rootY, winX, winY; > + unsigned int xstate; > + Bool res; > + > + wine_tsx11_lock(); > + res = XQueryPointer( display, root_window, &root, &child, > + &rootX, &rootY, &winX, &winY, &xstate ); > + wine_tsx11_unlock(); > + if (res) > + { > + update_key_state( xstate ); > + update_button_state( xstate ); > + TRACE("pointer at (%d,%d)\n", winX, winY ); > + EnterCriticalSection( &cursor_CritSection ); > + cursor_pos.x = winX; > + cursor_pos.y = winY; > + LeaveCriticalSection( &cursor_CritSection ); > + } > } > EnterCriticalSection( &cursor_CritSection ); > *pos = cursor_pos; > @@ -838,6 +854,7 @@ void X11DRV_EnterNotify( HWND hwnd, XEve > > TRACE("hwnd %p, event->detail %d\n", hwnd, event->detail); > > + mouse_inside_wine = TRUE; > if (!hwnd) return; > if (event->detail == NotifyVirtual || event->detail == NotifyNonlinearVirtual) return; > > @@ -847,3 +864,11 @@ void X11DRV_EnterNotify( HWND hwnd, XEve > X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, > pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time), 0, 0 ); > } > + > +/*********************************************************************** > + * X11DRV_LeaveNotify > + */ > +void X11DRV_LeaveNotify( HWND hwnd, XEvent *xev ) > +{ > + mouse_inside_wine = FALSE; > +} > diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c > index fe07ddf..17ecc1e 100644 > --- a/dlls/winex11.drv/window.c > +++ b/dlls/winex11.drv/window.c > @@ -758,7 +758,7 @@ static Window create_whole_window( Displ > attr.event_mask = (ExposureMask | PointerMotionMask | > ButtonPressMask | ButtonReleaseMask | EnterWindowMask | > KeyPressMask | KeyReleaseMask | StructureNotifyMask | > - FocusChangeMask | KeymapStateMask); > + FocusChangeMask | KeymapStateMask | LeaveWindowMask); > mask |= CWBitGravity | CWBackingStore | CWEventMask; > > wine_tsx11_lock(); > diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h > index b5bec51..2e1423e 100644 > --- a/dlls/winex11.drv/x11drv.h > +++ b/dlls/winex11.drv/x11drv.h > @@ -611,6 +611,7 @@ extern void X11DRV_ButtonPress( HWND hwn > extern void X11DRV_ButtonRelease( HWND hwnd, XEvent *event ); > extern void X11DRV_MotionNotify( HWND hwnd, XEvent *event ); > extern void X11DRV_EnterNotify( HWND hwnd, XEvent *event ); > +extern void X11DRV_LeaveNotify( HWND hwnd, XEvent *event ); > extern void X11DRV_KeyEvent( HWND hwnd, XEvent *event ); > extern void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ); > extern void X11DRV_Expose( HWND hwnd, XEvent *event ); > > > > ------------------------------------------------------------------------ > >

1 0

Re: [WINED3D 6/8] Stateblock support for dmap and vtf samplers
by H. Verbeet 03 Oct '06

03 Oct '06

On 03/10/06, Ivan Gyurdiev <ivg231(a)gmail.com> wrote: > + IWineD3DDevice_SetTexture(iface, D3DDMAPSAMPLER, NULL); I don't think wined3d should depend on d3d9 includes. There are currently a number of places in wined3d where we do use d3d9 constants, but at least for new code I don't think we should add dependencies on d3d9 includes.

5 9

Re: LOSTWAGES: Instructions for getting additional modules
by Mike McCormack 03 Oct '06

03 Oct '06

Detlef Riekenberg wrote: > When switching the Instructions for the Wine tree > from cvs to git, the Instructions for the > additional modules (docs, lostwages, ...) got lost. They're still available at the old link: http://www.winehq.org/site/cvs It would be nice to move the remaining modules to Git too, IMO. Mike

4 3

AMD64 compilation successful; still not working
by Alexander K. Seewald 03 Oct '06

03 Oct '06

Hi, I've managed to compile the current CVS version under AMD64, according to the WineOn64bit-Wiki for Debian. So far, so good. However, all tests fail and starting wine gives an error code of 2. --version gives no output. wine-kthread gives an error code of 139 (segmentation violation), wine-pthread seems to work. Debugging wine shows that the error appears when execve'ing (should have been somewhat obvious ;-) When debugging wine-kthread, I get the following error on the first line of code: 0x557721ba in __libc_pthread_init () from /emul/ia32-linux/lib/tls/libc.so.6 Interestingly, my libc.so.6 link points to libc-2.3.2.so. Hope that is ok... it is defined in the ia32-libc6 debian package from stable. :-> Might this have something to do with my 4GB of memory? I am open for suggestions... Best, Alex -- Dr. Alexander K. Seewald GE Money Bank, Analytics/CRM +43(664)1106886 ------------------------------------------------ Information wants to be free; Information also wants to be expensive (S.Brant) --------------- alex.seewald.at ----------------

2 3