December 2006 - Wine-Commits

Stefan Dösinger : wined3d: Fix a function name.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: f154f543aa94f97cd07a4a9007217a603458bccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f154f543aa94f97cd07a4a900… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 15 20:03:17 2006 +0100 wined3d: Fix a function name. --- dlls/wined3d/state.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index eab3661..524309c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1162,7 +1162,7 @@ static void state_multisampmask(DWORD st ERR("(WINED3DRS_MULTISAMPLEMASK,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_MULTISAMPLEMASK]); } -static void state_patchededge(DWORD state, IWineD3DStateBlockImpl *stateblock) { +static void state_patchedgestyle(DWORD state, IWineD3DStateBlockImpl *stateblock) { TRACE("Stub\n"); if (stateblock->renderState[WINED3DRS_PATCHEDGESTYLE] != D3DPATCHEDGE_DISCRETE) ERR("(WINED3DRS_PATCHEDGESTYLE,%d) not yet implemented\n", stateblock->renderState[WINED3DRS_PATCHEDGESTYLE]); @@ -1468,7 +1468,7 @@ const struct StateEntry StateTable[] = { /*160, WINED3DRS_POINTSCALE_C */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa }, { /*162, WINED3DRS_MULTISAMPLEMASK */ STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask }, - { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchededge }, + { /*163, WINED3DRS_PATCHEDGESTYLE */ STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), state_patchedgestyle}, { /*164, WINED3DRS_PATCHSEGMENTS */ STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments }, { /*165, WINED3DRS_DEBUGMONITORTOKEN */ STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_nogl }, { /*166, WINED3DRS_POINTSIZE_MAX */ STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax },

1 0

Stefan Dösinger : wined3d: Catch nop render state changes.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 062b6ffc5c30141968472e88280e9334ccb536a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=062b6ffc5c30141968472e882… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 15 19:16:36 2006 +0100 wined3d: Catch nop render state changes. --- dlls/wined3d/device.c | 47 +++++++++++++++++++++++++++++++---------------- dlls/wined3d/drawprim.c | 16 ++-------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a4a270..32fc71b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2068,6 +2068,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; + DWORD state; TRACE("(%p)->(%p,%p)\n", This, pPresentationParameters, D3DCB_CreateAdditionalSwapChain); if(This->d3d_initialized) return WINED3DERR_INVALIDCALL; @@ -2148,6 +2149,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* Clear the screen */ IWineD3DDevice_Clear((IWineD3DDevice *) This, 0, NULL, WINED3DCLEAR_STENCIL|WINED3DCLEAR_ZBUFFER|WINED3DCLEAR_TARGET, 0x00, 1.0, 0); + /* Mark all states dirty. The Setters will not mark a state dirty when the new value is equal to the old value + * This might create a problem in 2 situations: + * ->The D3D default value is 0, but the opengl default value is something else + * ->D3D7 unintialized D3D and reinitializes it. This way the context is destroyed, be the stateblock unchanged + */ + for(state = 0; state <= STATE_HIGHEST; state++) { + IWineD3DDeviceImpl_MarkStateDirty(This, state); + } + This->d3d_initialized = TRUE; return WINED3D_OK; } @@ -3316,8 +3326,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + DWORD oldValue = This->stateBlock->renderState[State]; TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + This->updateStateBlock->changed.renderState[State] = TRUE; This->updateStateBlock->set.renderState[State] = TRUE; This->updateStateBlock->renderState[State] = Value; @@ -3328,7 +3340,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(State)); + /* Compared here and not before the assignment to allow proper stateblock recording */ + if(Value == oldValue) { + TRACE("Application is setting the old value over, nothing to do\n"); + } else { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(State)); + } return WINED3D_OK; } @@ -4546,19 +4563,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DBaseTexture_Release(oldTexture); } - /* Reset color keying */ + /* Color keying is affected by the texture. Temporarily mark the color key state (=alpha test) + * dirty until textures are integrated with the state management + */ if(Stage == 0 && This->stateBlock->renderState[WINED3DRS_COLORKEYENABLE]) { - BOOL enable_ckey = FALSE; - - if(pTexture) { - IWineD3DSurfaceImpl *surf = (IWineD3DSurfaceImpl *) ((IWineD3DTextureImpl *)pTexture)->surfaces[0]; - if(surf->CKeyFlags & DDSD_CKSRCBLT) enable_ckey = TRUE; - } - - if(enable_ckey) { - glAlphaFunc(GL_NOTEQUAL, 0.0); - checkGLcall("glAlphaFunc"); - } + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORKEYENABLE)); } return WINED3D_OK; @@ -6007,6 +6016,7 @@ static void device_reapply_stateblock(IW BOOL oldRecording; IWineD3DStateBlockImpl *oldUpdateStateBlock; + DWORD i; /* Disable recording */ oldUpdateStateBlock = This->updateStateBlock; @@ -6017,6 +6027,13 @@ static void device_reapply_stateblock(IW /* Reapply the state block */ IWineD3DStateBlock_Apply((IWineD3DStateBlock *)This->stateBlock); + /* Temporaryily mark all render states dirty to force reapplication + * until the context management for is integrated with the state management + */ + for(i = 1; i < WINEHIGHEST_RENDER_STATE; i++) { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(i)); + } + /* Restore recording */ This->isRecordingState = oldRecording; This->updateStateBlock = oldUpdateStateBlock; @@ -6030,7 +6047,6 @@ static void device_reapply_stateblock(IW * make this unnecessary */ static void device_render_to_texture(IWineD3DDeviceImpl* This, BOOL isTexture) { - DWORD cullMode; BOOL oldRecording; IWineD3DStateBlockImpl *oldUpdateStateBlock; @@ -6049,8 +6065,7 @@ static void device_render_to_texture(IWi } This->last_was_rhw = FALSE; This->proj_valid = FALSE; - IWineD3DDevice_GetRenderState((IWineD3DDevice*) This, WINED3DRS_CULLMODE, &cullMode); - IWineD3DDevice_SetRenderState((IWineD3DDevice*) This, WINED3DRS_CULLMODE, cullMode); + IWineD3DDeviceImpl_MarkStateDirty(This, WINED3DRS_CULLMODE); /* Restore recording */ This->isRecordingState = oldRecording; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 06a86ae..6ac7462 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -332,20 +332,8 @@ static void primitiveInitState( } else if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] != WINED3DFOG_NONE) { - - if(GL_SUPPORT(EXT_FOG_COORD)) { - glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); - checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)\n"); - /* Reapply the fog range */ - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGSTART, This->stateBlock->renderState[WINED3DRS_FOGSTART]); - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGEND, This->stateBlock->renderState[WINED3DRS_FOGEND]); - /* Restore the fog mode */ - IWineD3DDevice_SetRenderState(iface, WINED3DRS_FOGTABLEMODE, This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE]); - } else { - /* Enable GL_FOG again because we disabled it above */ - glEnable(GL_FOG); - checkGLcall("glEnable(GL_FOG)"); - } + /* Reapply the fog */ + StateTable[STATE_RENDER(WINED3DRS_FOGENABLE)].apply(STATE_RENDER(WINED3DRS_FOGSTART), This->stateBlock); } } }

1 0

Stefan Dösinger : wined3d: Move render state applying to drawprim.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: c83562af697e735fe6d8e96aa8c033759a124cd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83562af697e735fe6d8e96aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 15 19:17:53 2006 +0100 wined3d: Move render state applying to drawprim. --- dlls/wined3d/device.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 217f666..5a4a270 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3328,10 +3328,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3D_OK; } - ENTER_GL(); - /* TODO: Mark the state dirty instead of immediate applying */ - StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); - LEAVE_GL(); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(State)); return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Add the state dirtification infrastructure.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 7532c759f1d73698631d6ad56cd2677828766ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7532c759f1d73698631d6ad56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 13:00:03 2006 +0100 wined3d: Add the state dirtification infrastructure. --- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/drawprim.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 685cdf9..217f666 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7084,3 +7084,16 @@ const DWORD SavedVertexStates_T[NUM_SAVE const DWORD SavedVertexStates_S[NUM_SAVEDVERTEXSTATES_S] = { WINED3DSAMP_DMAPOFFSET }; + +void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state) { + DWORD rep = StateTable[state].representative; + DWORD idx; + BYTE shift; + + if(!rep || isStateDirty(This, rep)) return; + + This->dirtyArray[This->numDirtyEntries++] = rep; + idx = rep >> 5; + shift = rep & 0x1f; + This->isStateDirty[idx] |= (1 << shift); +} diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a560084..06a86ae 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2129,6 +2129,8 @@ void drawPrimitive(IWineD3DDevice *iface IWineD3DSwapChainImpl *swapchain; int i; BOOL fixup = FALSE; + DWORD dirtyState, idx; + BYTE shift; BOOL lighting_changed, lighting_original = FALSE; @@ -2163,6 +2165,16 @@ void drawPrimitive(IWineD3DDevice *iface /* Ok, we will be updating the screen from here onwards so grab the lock */ ENTER_GL(); + /* Apply dirty states */ + for(i=0; i < This->numDirtyEntries; i++) { + dirtyState = This->dirtyArray[i]; + idx = dirtyState >> 5; + shift = dirtyState & 0x1f; + This->isStateDirty[idx] &= ~(1 << shift); + StateTable[dirtyState].apply(dirtyState, This->stateBlock); + } + This->numDirtyEntries = 0; /* This makes the whole list clean */ + if(DrawPrimStrideData) { /* Note: this is a ddraw fixed-function code path */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da3fbe9..c0a6614 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -413,6 +413,8 @@ typedef void (*APPLYSTATEFUNC)(DWORD sta #define STATE_RENDER(a) (a) #define STATE_IS_RENDER(a) ((a) >= STATE_RENDER(1) && (a) <= STATE_RENDER(WINEHIGHEST_RENDER_STATE)) +#define STATE_HIGHEST (STATE_RENDER(WINEHIGHEST_RENDER_STATE)) + struct StateEntry { DWORD representative; @@ -627,10 +629,28 @@ typedef struct IWineD3DDeviceImpl /* Final position fixup constant */ float posFixup[4]; + + /* State dirtification + * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices + * 0...numDirtyEntries - 1. isStateDirty is a redundant copy of the dirtyArray. Technically only one of them would be needed, + * but with the help of both it is easy to find out if a state is dirty(just check the array index), and for applying dirty states + * only numDirtyEntries array elements have to be checked, not STATE_HIGHEST states. + */ + DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ + DWORD numDirtyEntries; + DWORD isStateDirty[STATE_HIGHEST/32 + 1]; /* Bitmap to find out quickly if a state is dirty */ + } IWineD3DDeviceImpl; extern const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl; +void IWineD3DDeviceImpl_MarkStateDirty(IWineD3DDeviceImpl *This, DWORD state); +static inline BOOL isStateDirty(IWineD3DDeviceImpl *This, DWORD state) { + DWORD idx = state >> 5; + BYTE shift = state & 0x1f; + return This->isStateDirty[idx] & (1 << shift); +} + /* Support for IWineD3DResource ::Set/Get/FreePrivateData. I don't think * anybody uses it for much so a good implementation is optional. */ typedef struct PrivateData

1 0

Louis Lenders : msvcrt: Add _atoldbl.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 6c04a187d24a396b0a141ddf96959f6c7c834c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c04a187d24a396b0a141ddf9… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Dec 17 17:56:50 2006 +0000 msvcrt: Add _atoldbl. --- configure | 2 ++ configure.ac | 1 + dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 18 ++++++++++++++++++ include/config.h.in | 3 +++ 6 files changed, 27 insertions(+), 1 deletions(-) diff --git a/configure b/configure index b60889d..6779121 100755 --- a/configure +++ b/configure @@ -15845,6 +15845,7 @@ fi + for ac_func in \ _pclose \ _popen \ @@ -15910,6 +15911,7 @@ for ac_func in \ strcasecmp \ strerror \ strncasecmp \ + strtold \ tcgetattr \ timegm \ usleep \ diff --git a/configure.ac b/configure.ac index f44e3eb..efbf32d 100644 --- a/configure.ac +++ b/configure.ac @@ -1228,6 +1228,7 @@ AC_CHECK_FUNCS(\ strcasecmp \ strerror \ strncasecmp \ + strtold \ tcgetattr \ timegm \ usleep \ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0066e3d..3a50af2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -70,6 +70,8 @@ typedef void (*MSVCRT__beginthread_start typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (*MSVCRT__onexit_t)(void); +typedef struct {long double x;} _LDOUBLE; + struct MSVCRT_tm { int tm_sec; int tm_min; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 59e21f6..7712045 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -166,7 +166,7 @@ @ cdecl _assert(str str long) MSVCRT__assert @ stub _atodbl #(ptr str) @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ stub _atoldbl #(ptr str) +@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ cdecl _beep(long long) @ cdecl _beginthread (ptr long ptr) @ cdecl _beginthreadex (ptr long ptr ptr long ptr) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6dfce9a..ec4bd70 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -21,6 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define _ISOC99_SOURCE +#include "config.h" + #include <stdlib.h> #include "msvcrt.h" #include "wine/debug.h" @@ -184,3 +187,18 @@ int CDECL MSVCRT__stricoll( const char* TRACE("str1 %s str2 %s\n", debugstr_a(str1), debugstr_a(str2)); return lstrcmpiA( str1, str2 ); } + +/******************************************************************** + * _atoldbl (MSVCRT.@) + */ +int CDECL MSVCRT__atoldbl(_LDOUBLE * value, char * str) +{ + /* FIXME needs error checking for huge/small values */ +#ifdef HAVE_STRTOLD + TRACE("str %s value %p\n",str,value); + value->x = strtold(str,0); +#else + FIXME("stub, str %s value %p\n",str,value); +#endif + return 0; +} diff --git a/include/config.h.in b/include/config.h.in index 11bd3bb..6f5387a 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -666,6 +666,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strtold' function. */ +#undef HAVE_STRTOLD + /* Define to 1 if `direction' is member of `struct ff_effect'. */ #undef HAVE_STRUCT_FF_EFFECT_DIRECTION

1 0

Alexandre Julliard : configure: Re-generated with autoconf 2.61.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: dc9f384370f8418dbadad9c0470caae83b80415b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9f384370f8418dbadad9c04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 19 16:17:09 2006 +0100 configure: Re-generated with autoconf 2.61. --- configure | 5617 ++++++++++++------------------------------------------------- 1 files changed, 1101 insertions(+), 4516 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc9f384370f8418dbadad…

1 0

Vitaliy Margolen : winex11drv: Return cached cursor_pos in GetCursorPos().
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 7de64a3ab892ad7a254282da7038a34f72cf4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de64a3ab892ad7a254282da7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Dec 18 13:26:35 2006 -0700 winex11drv: Return cached cursor_pos in GetCursorPos(). --- dlls/user32/tests/win.c | 9 +++++++++ dlls/winex11.drv/mouse.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4ca0b31..3dde99a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2501,6 +2501,15 @@ static void test_mouse_input(HWND hwnd) GetCursorPos(&pt); ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + /* Check that setting the same position will generate WM_MOUSEMOVE */ + SetCursorPos(x, y); + msg.message = 0; + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%d,%d)\n", x, y, msg.pt.x, msg.pt.y); + /* force the system to update its internal queue mouse position, * otherwise it won't generate relative mouse movements below. */ diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index a9a4a8d..e8ae64f 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 DWORD last_time_modified; BOOL X11DRV_SetCursorPos( INT x, INT y ); @@ -190,6 +191,7 @@ static void queue_raw_mouse_message( UIN hook.time = time; hook.dwExtraInfo = extra_info; + last_time_modified = GetTickCount(); if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; SERVER_START_REQ( send_hardware_message ) @@ -685,6 +687,14 @@ BOOL X11DRV_SetCursorPos( INT x, INT y ) TRACE( "warping to (%d,%d)\n", x, y ); wine_tsx11_lock(); + if (cursor_pos.x == x && cursor_pos.y == y) + { + 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; + } + XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, x - virtual_screen_rect.left, y - virtual_screen_rect.top ); XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ @@ -705,7 +715,8 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos) unsigned int xstate; wine_tsx11_lock(); - if (XQueryPointer( display, root_window, &root, &child, + if ((GetTickCount() - last_time_modified > 100) && + XQueryPointer( display, root_window, &root, &child, &rootX, &rootY, &winX, &winY, &xstate )) { update_button_state( xstate );

1 0

Alex Villacís Lasso : oleaut32: Bypass conversion to string in R4/R8 -> DECIMAL conversion.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: f162ce45ad5f1592be1d64c5149e5b74074f7d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f162ce45ad5f1592be1d64c51… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Thu Dec 14 12:32:42 2006 -0500 oleaut32: Bypass conversion to string in R4/R8 -> DECIMAL conversion. --- dlls/oleaut32/vartype.c | 319 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 303 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f162ce45ad5f1592be1d6…

1 0

Hans Leidekker : ws2_32: Implement the SIO_ADDRESS_LIST_QUERY ioctl.
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 84f0a03556f81d47b5aa65b50f6aa5c8b502e82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f0a03556f81d47b5aa65b50… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 18 19:37:52 2006 +0100 ws2_32: Implement the SIO_ADDRESS_LIST_QUERY ioctl. --- dlls/ws2_32/socket.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 99f46bc..76e60cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2389,9 +2389,78 @@ INT WINAPI WSAIoctl(SOCKET s, break; case WS_SIO_ADDRESS_LIST_QUERY: - FIXME("-> SIO_ADDRESS_LIST_QUERY request: stub\n"); - break; + { + DWORD size; + + TRACE("-> SIO_ADDRESS_LIST_QUERY request\n"); + + if (!lpcbBytesReturned) + { + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) + { + IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + DWORD need, num; + + if (!table || GetAdaptersInfo(table, &size)) + { + HeapFree(GetProcessHeap(), 0, table); + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + for (p = table, num = 0; p; p = p->Next) + if (p->IpAddressList.IpAddress.String[0]) num++; + + need = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); + need += sizeof(SOCKADDR) * num; + *lpcbBytesReturned = need; + + if (need > cbOutBuffer) + { + HeapFree(GetProcessHeap(), 0, table); + WSASetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (lpbOutBuffer) + { + unsigned int i; + SOCKET_ADDRESS *sa; + SOCKET_ADDRESS_LIST *sa_list = (SOCKET_ADDRESS_LIST *)lpbOutBuffer; + SOCKADDR_IN *sockaddr; + + sa = sa_list->Address; + sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sa_list->iAddressCount = num; + + for (p = table, i = 0; p; p = p->Next) + { + if (!p->IpAddressList.IpAddress.String[0]) continue; + + sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; + sa[i].iSockaddrLength = sizeof(SOCKADDR); + + sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_port = 0; + sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); + i++; + } + } + HeapFree(GetProcessHeap(), 0, table); + return 0; + } + else + { + WARN("unable to get IP address list\n"); + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + } case WS_SIO_FLUSH: FIXME("SIO_FLUSH: stub.\n"); break;

1 0

Dmitry Timoshkov : kernel32: Add a minimal PE image that XP is able to load .
by Alexandre Julliard Dec. 19, 2006

Dec. 19, 2006

Module: wine Branch: master Commit: 5fc9ffd500c77d508797a57a3f7a89303e4a74fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc9ffd500c77d508797a57a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 18 19:14:36 2006 +0800 kernel32: Add a minimal PE image that XP is able to load. --- dlls/kernel32/tests/loader.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7ae70f3..8811334 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -185,6 +185,14 @@ START_TEST(loader) 0, ERROR_SUCCESS }, +#if 0 /* not power of 2 alignments need more test cases */ + { &dos_header, sizeof(dos_header), + 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 0x300, 0x300, + 1, + 0, + ERROR_BAD_EXE_FORMAT /* alignment is not power of 2 */ + }, +#endif { &dos_header, sizeof(dos_header), 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), 4, 4, 1, @@ -210,6 +218,14 @@ START_TEST(loader) 0x200, ERROR_SUCCESS }, + /* Minimal PE image that XP is able to load: 92 bytes */ + { &dos_header, 0x04, + 0, FIELD_OFFSET(IMAGE_OPTIONAL_HEADER, CheckSum), + 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, + 1, + 0, + ERROR_SUCCESS + } }; static const char filler[0x1000]; static const char section_data[0x10] = "section data"; @@ -412,7 +428,7 @@ todo_wine { ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError()); } else - { /* LoadLibrary has failed */ + { /* LoadLibrary is expected to fail */ ok(!hlib, "%d: LoadLibrary should fail\n", i); if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */

1 0