August 2006 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Add a couple of traces to the vertexdeclaration creation code.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 02a8f74490cc0d765f828faa8d5972645bd218fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02a8f74490cc0d765f828fa… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Aug 7 19:21:54 2006 +0200 wined3d: Add a couple of traces to the vertexdeclaration creation code. --- dlls/wined3d/utils.c | 46 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexdeclaration.c | 14 ++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d_types.h | 10 ++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fc9edf6..debd8a3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -269,6 +269,51 @@ #undef WINED3DUSAGEQUERY_TO_STR } } +const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) { + switch (method) { +#define WINED3DDECLMETHOD_TO_STR(u) case u: return #u + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP); + WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED); +#undef WINED3DDECLMETHOD_TO_STR + default: + FIXME("Unrecognized %u declaration method!\n", method); + return "unrecognized"; + } +} + +const char* debug_d3ddecltype(WINED3DDECLTYPE type) { + switch (type) { +#define WINED3DDECLTYPE_TO_STR(u) case u: return #u + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT1); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT3); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_D3DCOLOR); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UBYTE4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT2N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_SHORT4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT2N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_USHORT4N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UDEC3); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_DEC3N); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_2); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_FLOAT16_4); + WINED3DDECLTYPE_TO_STR(WINED3DDECLTYPE_UNUSED); +#undef WINED3DDECLTYPE_TO_STR + default: + FIXME("Unrecognized %u declaration type!\n", type); + return "unrecognized"; + } +} + const char* debug_d3ddeclusage(BYTE usage) { switch (usage) { #define WINED3DDECLUSAGE_TO_STR(u) case u: return #u @@ -600,6 +645,7 @@ #undef POOL_TO_STR return "unrecognized"; } } + /***************************************************************************** * Useful functions mapping GL <-> D3D values */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 8045745..eeacb31 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -170,6 +170,16 @@ #define D3DVSD_TOKENTYPEMASK (0x7 #define D3DVSD_END() 0xFFFFFFFF #define D3DVSD_NOP() 0x00000000 +static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { + TRACE(" Stream: %d\n", element->Stream); + TRACE(" Offset: %d\n", element->Offset); + TRACE(" Type: %s (%#x)\n", debug_d3ddecltype(element->Type), element->Type); + TRACE(" Method: %s (%#x)\n", debug_d3ddeclmethod(element->Method), element->Method); + TRACE(" Usage: %s (%#x)\n", debug_d3ddeclusage(element->Usage), element->Usage); + TRACE("Usage index: %d\n", element->UsageIndex); + TRACE(" Register: %d\n", element->Reg); +} + static DWORD IWineD3DVertexDeclarationImpl_ParseToken8(const DWORD* pToken) { const DWORD token = *pToken; DWORD tokenlen = 1; @@ -298,6 +308,8 @@ #define MAKE_LOOKUP(_reg,_usage,_usagein convToW[nTokens].Type = type; convToW[nTokens].Offset = offset; convToW[nTokens].Reg = reg; + TRACE("Adding element %ld:\n", nTokens); + dump_wined3dvertexelement(&convToW[nTokens]); offset += glTypeLookup[type].size * glTypeLookup[type].typesize; ++nTokens; } else if (D3DVSD_TOKEN_STREAMDATA == tokentype && 0x10000000 & tokentype ) { @@ -386,6 +398,8 @@ static HRESULT IWineD3DVertexDeclaration for(i = 0; i < This->declaration9NumElements; ++i) { memcpy(This->pDeclarationWine + i, This->pDeclaration9 + i, sizeof(D3DVERTEXELEMENT9)); This->pDeclarationWine[i].Reg = -1; + TRACE("Adding element %d:\n", i); + dump_wined3dvertexelement(&This->pDeclarationWine[i]); } This->declarationWNumElements = This->declaration9NumElements; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ef8877..a87439b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1216,6 +1216,8 @@ const char* debug_d3ddevicetype(D3DDEVTY const char* debug_d3dresourcetype(WINED3DRESOURCETYPE res); const char* debug_d3dusage(DWORD usage); const char* debug_d3dusagequery(DWORD usagequery); +const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method); +const char* debug_d3ddecltype(WINED3DDECLTYPE type); const char* debug_d3ddeclusage(BYTE usage); const char* debug_d3dprimitivetype(D3DPRIMITIVETYPE PrimitiveType); const char* debug_d3drenderstate(DWORD state); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 5538563..a82f094 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -893,6 +893,16 @@ typedef struct glDescriptor { int/*GLenum*/ glType; } glDescriptor; +typedef enum _WINED3DDECLMETHOD { + WINED3DDECLMETHOD_DEFAULT = 0, + WINED3DDECLMETHOD_PARTIALU = 1, + WINED3DDECLMETHOD_PARTIALV = 2, + WINED3DDECLMETHOD_CROSSUV = 3, + WINED3DDECLMETHOD_UV = 4, + WINED3DDECLMETHOD_LOOKUP = 5, + WINED3DDECLMETHOD_LOOKUPPRESAMPLED = 6 +} WINED3DDECLMETHOD; + typedef enum _WINED3DDECLTYPE { WINED3DDECLTYPE_FLOAT1 = 0, WINED3DDECLTYPE_FLOAT2 = 1,

1 0

Alexandre Julliard : ntdll: Get rid of the Linux legacy signal stack switching.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: ea08ec55b2e17e615a4ed1f4c5d2579bf4593055 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea08ec55b2e17e615a4ed1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 7 16:45:45 2006 +0200 ntdll: Get rid of the Linux legacy signal stack switching. It doesn't work right in 32-bit code anyway. --- dlls/ntdll/signal_i386.c | 159 +++++++++++++--------------------------------- 1 files changed, 45 insertions(+), 114 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 5db30b5..2055d93 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -120,56 +120,6 @@ #define FPU_sig(context) ((FLOATING_ #define FAULT_ADDRESS ((void *)HANDLER_CONTEXT->cr2) -/* this is the sigaction structure from the Linux 2.1.20 kernel. */ -struct kernel_sigaction -{ - void (*ksa_handler)(); - unsigned long ksa_mask; - unsigned long ksa_flags; - void *ksa_restorer; -}; - -#ifndef SYS_sigaction -# ifndef __NR_sigaction -# error The sigaction syscall is part of the Linux i386 ABI, but your headers does not define it. Please raise a bug with your distribution. -# endif -# define SYS_sigaction __NR_sigaction -#endif - -/* Similar to the sigaction function in libc, except it leaves alone the - restorer field, which is used to specify the signal stack address */ -static inline int wine_sigaction( int sig, struct kernel_sigaction *new, - struct kernel_sigaction *old ) -{ - __asm__ __volatile__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx" - : "=a" (sig) - : "0" (SYS_sigaction), "S" (sig), "c" (new), "d" (old) ); - if (sig>=0) return 0; - errno = -sig; - return -1; -} - -#ifdef HAVE_SIGALTSTACK -/* direct syscall for sigaltstack to work around glibc 2.0 brain-damage */ -static inline int wine_sigaltstack( const struct sigaltstack *new, - struct sigaltstack *old ) -{ - int ret; - __asm__ __volatile__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" - "int $0x80\n\t" - "popl %%ebx" - : "=a" (ret) - : "0" (SYS_sigaltstack), "q" (new), "c" (old) ); - if (ret >= 0) return 0; - errno = -ret; - return -1; -} -#endif - #define VM86_EAX 0 /* the %eax value while vm86_enter is executing */ int vm86_enter( void **vm86_ptr ); @@ -1482,52 +1432,6 @@ size_t get_signal_stack_total_size(void) /*********************************************************************** - * set_handler - * - * Set a signal handler - */ -static int set_handler( int sig, int have_sigaltstack, void (*func)() ) -{ - struct sigaction sig_act; - -#ifdef linux - if (!have_sigaltstack) - { - struct kernel_sigaction sig_act; - sig_act.ksa_handler = func; - sig_act.ksa_flags = SA_RESTART; - sig_act.ksa_mask = (1 << (SIGINT-1)) | - (1 << (SIGUSR1-1)) | - (1 << (SIGUSR2-1)); - /* point to the top of the signal stack */ - sig_act.ksa_restorer = (char *)get_signal_stack() + signal_stack_size; - return wine_sigaction( sig, &sig_act, NULL ); - } -#endif /* linux */ - sig_act.sa_handler = func; - sigemptyset( &sig_act.sa_mask ); - sigaddset( &sig_act.sa_mask, SIGINT ); - sigaddset( &sig_act.sa_mask, SIGUSR1 ); - sigaddset( &sig_act.sa_mask, SIGUSR2 ); - -#if defined(linux) - sig_act.sa_flags = SA_RESTART; -#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || \ - defined(__NetBSD__) || defined(__OpenBSD__) || \ - defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - sig_act.sa_flags = SA_SIGINFO | SA_RESTART; -#else - sig_act.sa_flags = 0; -#endif - -#ifdef SA_ONSTACK - if (have_sigaltstack) sig_act.sa_flags |= SA_ONSTACK; -#endif - return sigaction( sig, &sig_act, NULL ); -} - - -/*********************************************************************** * __wine_set_signal_handler (NTDLL.@) */ int __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) @@ -1544,38 +1448,65 @@ int __wine_set_signal_handler(unsigned i */ BOOL SIGNAL_Init(void) { - int have_sigaltstack = 0; + struct sigaction sig_act; #ifdef HAVE_SIGALTSTACK struct sigaltstack ss; ss.ss_sp = get_signal_stack(); ss.ss_size = signal_stack_size; ss.ss_flags = 0; - if (!sigaltstack(&ss, NULL)) have_sigaltstack = 1; -#ifdef linux - /* sigaltstack may fail because the kernel is too old, or - because glibc is brain-dead. In the latter case a - direct system call should succeed. */ - else if (!wine_sigaltstack(&ss, NULL)) have_sigaltstack = 1; -#endif /* linux */ + if (sigaltstack(&ss, NULL) == -1) + { + perror( "sigaltstack" ); + return FALSE; + } #endif /* HAVE_SIGALTSTACK */ - if (set_handler( SIGINT, have_sigaltstack, (void (*)())int_handler ) == -1) goto error; - if (set_handler( SIGFPE, have_sigaltstack, (void (*)())fpe_handler ) == -1) goto error; - if (set_handler( SIGSEGV, have_sigaltstack, (void (*)())segv_handler ) == -1) goto error; - if (set_handler( SIGILL, have_sigaltstack, (void (*)())segv_handler ) == -1) goto error; - if (set_handler( SIGABRT, have_sigaltstack, (void (*)())abrt_handler ) == -1) goto error; - if (set_handler( SIGTERM, have_sigaltstack, (void (*)())term_handler ) == -1) goto error; - if (set_handler( SIGUSR1, have_sigaltstack, (void (*)())usr1_handler ) == -1) goto error; + sigemptyset( &sig_act.sa_mask ); + sigaddset( &sig_act.sa_mask, SIGINT ); + sigaddset( &sig_act.sa_mask, SIGUSR1 ); + sigaddset( &sig_act.sa_mask, SIGUSR2 ); + +#if defined(linux) + sig_act.sa_flags = SA_RESTART; +#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || \ + defined(__NetBSD__) || defined(__OpenBSD__) || \ + defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + sig_act.sa_flags = SA_SIGINFO | SA_RESTART; +#else + sig_act.sa_flags = 0; +#endif + +#ifdef SA_ONSTACK + sig_act.sa_flags |= SA_ONSTACK; +#endif + + sig_act.sa_handler = (void (*)())int_handler; + if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; + sig_act.sa_handler = (void (*)())fpe_handler; + if (sigaction( SIGFPE, &sig_act, NULL ) == -1) goto error; + sig_act.sa_handler = (void (*)())abrt_handler; + if (sigaction( SIGABRT, &sig_act, NULL ) == -1) goto error; + sig_act.sa_handler = (void (*)())term_handler; + if (sigaction( SIGTERM, &sig_act, NULL ) == -1) goto error; + sig_act.sa_handler = (void (*)())usr1_handler; + if (sigaction( SIGUSR1, &sig_act, NULL ) == -1) goto error; + + sig_act.sa_handler = (void (*)())segv_handler; + if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error; + if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error; #ifdef SIGBUS - if (set_handler( SIGBUS, have_sigaltstack, (void (*)())segv_handler ) == -1) goto error; + if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error; #endif + #ifdef SIGTRAP - if (set_handler( SIGTRAP, have_sigaltstack, (void (*)())trap_handler ) == -1) goto error; + sig_act.sa_handler = (void (*)())trap_handler; + if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error; #endif #ifdef __HAVE_VM86 - if (set_handler( SIGUSR2, have_sigaltstack, (void (*)())usr2_handler ) == -1) goto error; + sig_act.sa_handler = (void (*)())usr2_handler; + if (sigaction( SIGUSR2, &sig_act, NULL ) == -1) goto error; #endif return TRUE;

1 0

Tijl Coosemans : ntdll: Cleanup signal_i386.c a bit and fix *BSD.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 148120f21ecf7ad30aaa2136f8d9f00f2f241231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=148120f21ecf7ad30aaa213… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Sat Aug 5 22:34:11 2006 +0200 ntdll: Cleanup signal_i386.c a bit and fix *BSD. --- dlls/ntdll/signal_i386.c | 262 +++++++++++++++++++++++++++++----------------- 1 files changed, 167 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=148120f21ecf7ad30aa…

1 0

Robert Shearman : ole32: Tell the advise holder what the data delegate is in DefaultHandle_DAdvise if we are already connected .
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 6ba258ec1d0c9cded81ca83c88e25428a02ce0f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ba258ec1d0c9cded81ca83… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 7 12:59:13 2006 +0100 ole32: Tell the advise holder what the data delegate is in DefaultHandle_DAdvise if we are already connected. --- dlls/ole32/defaulthandler.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index fefd7ad..5058468 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1125,7 +1125,11 @@ static HRESULT WINAPI DefaultHandler_DAd /* Make sure we have a data advise holder before we start. */ if (!This->dataAdviseHolder) + { hres = CreateDataAdviseHolder(&This->dataAdviseHolder); + if (SUCCEEDED(hres) && This->pDataDelegate) + DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); + } if (SUCCEEDED(hres)) hres = IDataAdviseHolder_Advise(This->dataAdviseHolder,

1 0

Vitaliy Margolen : dinput: Signal event after we queued an event. Not before.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: fd6e974d92c79a16a173645ee1326d73db92774e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fd6e974d92c79a16a173645… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sun Aug 6 20:27:40 2006 -0600 dinput: Signal event after we queued an event. Not before. --- dlls/dinput/mouse.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index e626bf6..363d1b8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -426,16 +426,14 @@ static LRESULT CALLBACK dinput_mouse_hoo EnterCriticalSection(&(This->crit)); dwCoop = This->dwCoopLevel; - /* Mouse moved -> send event if asked */ - if (This->hEvent) - SetEvent(This->hEvent); - if (wparam == WM_MOUSEMOVE) { if (This->absolute) { if (hook->pt.x != This->prevX) - GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x, hook->time, 0); + GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x, + hook->time, This->dinput->evsequence); if (hook->pt.y != This->prevY) - GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y, hook->time, 0); + GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y, + hook->time, This->dinput->evsequence); } else { /* Now, warp handling */ if ((This->need_warp == WARP_STARTED) && @@ -450,22 +448,22 @@ static LRESULT CALLBACK dinput_mouse_hoo (This->need_warp == WARP_STARTED)) { if (hook->pt.x != This->prevX) GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->prevX, - hook->time, (This->dinput->evsequence)++); + hook->time, This->dinput->evsequence); if (hook->pt.y != This->prevY) GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->prevY, - hook->time, (This->dinput->evsequence)++); + hook->time, This->dinput->evsequence); } else { /* This is the first time the event handler has been called after a GetDeviceData or GetDeviceState. */ if (hook->pt.x != This->mapped_center.x) { GEN_EVENT(This->offset_array[WINE_MOUSE_X_POSITION], hook->pt.x - This->mapped_center.x, - hook->time, (This->dinput->evsequence)++); + hook->time, This->dinput->evsequence); This->need_warp = WARP_NEEDED; } if (hook->pt.y != This->mapped_center.y) { GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->mapped_center.y, - hook->time, (This->dinput->evsequence)++); + hook->time, This->dinput->evsequence); This->need_warp = WARP_NEEDED; } } @@ -489,38 +487,38 @@ static LRESULT CALLBACK dinput_mouse_hoo switch(wparam) { case WM_LBUTTONDOWN: GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x80, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[0] = 0x80; break; case WM_LBUTTONUP: GEN_EVENT(This->offset_array[WINE_MOUSE_L_POSITION], 0x00, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[0] = 0x00; break; case WM_RBUTTONDOWN: GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x80, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[1] = 0x80; break; case WM_RBUTTONUP: GEN_EVENT(This->offset_array[WINE_MOUSE_R_POSITION], 0x00, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[1] = 0x00; break; case WM_MBUTTONDOWN: GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x80, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[2] = 0x80; break; case WM_MBUTTONUP: GEN_EVENT(This->offset_array[WINE_MOUSE_M_POSITION], 0x00, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.rgbButtons[2] = 0x00; break; case WM_MOUSEWHEEL: wdata = (short)HIWORD(hook->mouseData); GEN_EVENT(This->offset_array[WINE_MOUSE_Z_POSITION], wdata, - hook->time, This->dinput->evsequence++); + hook->time, This->dinput->evsequence); This->m_state.lZ += wdata; break; } @@ -529,7 +527,12 @@ static LRESULT CALLBACK dinput_mouse_hoo This->m_state.lX, This->m_state.lY, This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); + This->dinput->evsequence++; + end: + /* Mouse moved -> send event if asked */ + if (This->hEvent) SetEvent(This->hEvent); + LeaveCriticalSection(&(This->crit)); if (dwCoop & DISCL_NONEXCLUSIVE) {

1 0

Robert Shearman : ole32: Finish off delegate notifications in the data advise holder.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: c860b8aec498f2dcaec2bb61ea3d3de93a651c6d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c860b8aec498f2dcaec2bb6… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Aug 7 12:59:04 2006 +0100 ole32: Finish off delegate notifications in the data advise holder. Advise the data delegate object when new advises come in on the data advise holder, not just when connecting. Unadvise the data delegate object when unadvising a connection on the data advise holder, when destructing the data advise holder and when disconnecting. --- dlls/ole32/oleobj.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 473d7c2..f9c8668 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -555,6 +555,7 @@ typedef struct DataAdviseHolder LONG ref; DWORD maxCons; DataAdviseConnection* Connections; + IDataObject* delegate; } DataAdviseHolder; /* this connection has also has been advised to the delegate data object */ @@ -572,6 +573,11 @@ static void DataAdviseHolder_Destructor( { if (ptrToDestroy->Connections[index].sink != NULL) { + if (ptrToDestroy->delegate && + (ptrToDestroy->Connections[index].advf & WINE_ADVF_REMOTE)) + IDataObject_DUnadvise(ptrToDestroy->delegate, + ptrToDestroy->Connections[index].remote_connection); + IAdviseSink_Release(ptrToDestroy->Connections[index].sink); ptrToDestroy->Connections[index].sink = NULL; } @@ -725,6 +731,23 @@ static HRESULT WINAPI DataAdviseHolder_A if(advf & ADVF_PRIMEFIRST) { IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf); } + + /* if we are already connected advise the remote object */ + if (This->delegate) + { + HRESULT hr; + + hr = IDataObject_DAdvise(This->delegate, &This->Connections[index].fmat, + This->Connections[index].advf, + This->Connections[index].sink, + &This->Connections[index].remote_connection); + if (FAILED(hr)) + { + IDataAdviseHolder_Unadvise(iface, index + 1); + return hr; + } + This->Connections[index].advf |= WINE_ADVF_REMOTE; + } } /* * Return the index as the cookie. @@ -763,11 +786,16 @@ static HRESULT WINAPI DataAdviseHold if (This->Connections[dwConnection].sink == NULL) return OLE_E_NOCONNECTION; + if (This->delegate && This->Connections[dwConnection].advf & WINE_ADVF_REMOTE) + IDataObject_DUnadvise(This->delegate, + This->Connections[dwConnection].remote_connection); + /* * Release the sink and mark the spot in the list as free. */ IAdviseSink_Release(This->Connections[dwConnection].sink); memset(&(This->Connections[dwConnection]), 0, sizeof(DataAdviseConnection)); + return S_OK; } @@ -852,13 +880,26 @@ HRESULT DataAdviseHolder_OnConnect(IData This->Connections[index].advf |= WINE_ADVF_REMOTE; } } - /* FIXME: store pDelegate somewhere */ + This->delegate = pDelegate; return hr; } void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface) { - /* FIXME: Unadvise all remote interfaces */ + DataAdviseHolder *This = (DataAdviseHolder *)iface; + DWORD index; + + for(index = 0; index < This->maxCons; index++) + { + if((This->Connections[index].sink != NULL) && + (This->Connections[index].advf & WINE_ADVF_REMOTE)) + { + IDataObject_DUnadvise(This->delegate, + This->Connections[index].remote_connection); + This->Connections[index].advf &= ~WINE_ADVF_REMOTE; + } + } + This->delegate = NULL; } /****************************************************************************** @@ -877,6 +918,7 @@ static IDataAdviseHolder* DataAdviseHold HEAP_ZERO_MEMORY, newHolder->maxCons * sizeof(DataAdviseConnection)); + newHolder->delegate = NULL; TRACE("returning %p\n", newHolder); return (IDataAdviseHolder*)newHolder;

1 0

Robert Reif : netapi32: Add stubs for remaining NetLocalGroup* functions.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 2fa5806a3aaf8978ec3e89b5fb697fafd6082074 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2fa5806a3aaf8978ec3e89b… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Aug 5 06:27:50 2006 -0400 netapi32: Add stubs for remaining NetLocalGroup* functions. Move existing NetLocalGroup* functions to local_group.c. Add stubs for remaining NetLocalGroup* functions. --- dlls/netapi32/Makefile.in | 1 dlls/netapi32/access.c | 38 -------- dlls/netapi32/local_group.c | 202 +++++++++++++++++++++++++++++++++++++++++++ dlls/netapi32/netapi32.spec | 22 ++--- include/lmaccess.h | 9 ++ 5 files changed, 223 insertions(+), 49 deletions(-) create mode 100644 dlls/netapi32/local_group.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=2fa5806a3aaf8978ec3…

1 0

Eric Pouech : dbghelp: Missing bits from previous patch about variables with constant values.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 5f4ac2499187eb81c5d04451c52d545657311e71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f4ac2499187eb81c5d0445… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Aug 5 13:50:53 2006 +0200 dbghelp: Missing bits from previous patch about variables with constant values. --- dlls/dbghelp/dwarf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a618986..e129d99 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1059,7 +1059,6 @@ static void dwarf2_parse_variable(dwarf2 dwarf2_find_name(subpgm->ctx, di, &name, "parameter"); if (dwarf2_find_attribute(di, DW_AT_location, &loc) && loc.block) { - union attribute name; union attribute ext; long offset; int in_reg; @@ -1096,7 +1095,7 @@ static void dwarf2_parse_variable(dwarf2 } if (dwarf2_find_attribute(di, DW_AT_const_value, &value)) { - FIXME("NIY (const value %08lx for %s\n", value.uvalue, name.string); + FIXME("NIY: const value %08lx for %s\n", value.uvalue, name.string); } if (is_pmt && subpgm->func && subpgm->func->type) symt_add_function_signature_parameter(subpgm->ctx->module,

1 0

Alexandre Julliard : Make.rules: Make all submake invocations silent for consistency.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: 5012c17a053bb533fe60952b0528dd25f71ce8d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5012c17a053bb533fe60952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 7 13:54:09 2006 +0200 Make.rules: Make all submake invocations silent for consistency. --- Make.rules.in | 14 +++++++------- Makefile.in | 2 +- documentation/Makefile.in | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 57e6ba7..f9aa27f 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -200,7 +200,7 @@ winapi_check:: dummy # Rules for dependencies $(SUBDIRS:%=%/__depend__): dummy - cd `dirname $@` && $(MAKE) depend + @cd `dirname $@` && $(MAKE) depend depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) @@ -210,10 +210,10 @@ depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%= # Rules for cleaning $(SUBDIRS:%=%/__clean__): dummy - cd `dirname $@` && $(MAKE) clean + @cd `dirname $@` && $(MAKE) clean $(SUBDIRS:%=%/__testclean__): dummy - cd `dirname $@` && $(MAKE) testclean + @cd `dirname $@` && $(MAKE) testclean $(EXTRASUBDIRS:%=%/__clean__): dummy -cd `dirname $@` && $(RM) $(CLEAN_FILES) @@ -228,16 +228,16 @@ clean:: $(SUBDIRS:%=%/__clean__) $(EXTRA # Rules for installing $(SUBDIRS:%=%/__install__): dummy - cd `dirname $@` && $(MAKE) install + @cd `dirname $@` && $(MAKE) install $(SUBDIRS:%=%/__install-lib__): dummy - cd `dirname $@` && $(MAKE) install-lib + @cd `dirname $@` && $(MAKE) install-lib $(SUBDIRS:%=%/__install-dev__): dummy - cd `dirname $@` && $(MAKE) install-dev + @cd `dirname $@` && $(MAKE) install-dev $(SUBDIRS:%=%/__uninstall__): dummy - cd `dirname $@` && $(MAKE) uninstall + @cd `dirname $@` && $(MAKE) uninstall install:: $(INSTALLSUBDIRS:%=%/__install__) diff --git a/Makefile.in b/Makefile.in index 02fd676..d49d1fe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -127,7 +127,7 @@ tags ctags: find $(TOPSRCDIR)/ -name '*.[ch]' -print | ctags --c-types=+px -L - manpages htmlpages sgmlpages: - cd documentation && $(MAKE) $@ + @cd documentation && $(MAKE) $@ clean:: $(RM) wine diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 1e7ec7b..52a5c17 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -8,15 +8,15 @@ MODULE = none manpages: $(MKINSTALLDIRS) man$(api_manext) - cd $(DLLDIR) && $(MAKE) man + @cd $(DLLDIR) && $(MAKE) man htmlpages: $(MKINSTALLDIRS) html - cd $(DLLDIR) && $(MAKE) doc-html + @cd $(DLLDIR) && $(MAKE) doc-html sgmlpages: $(MKINSTALLDIRS) api-guide - cd $(DLLDIR) && $(MAKE) doc-sgml + @cd $(DLLDIR) && $(MAKE) doc-sgml .PHONY: manpages htmlpages sgmlpages

1 0

Francois Gouget : usp10/tests: Add trailing '\n's to ok() calls.
by Alexandre Julliard Aug. 7, 2006

Aug. 7, 2006

Module: wine Branch: refs/heads/master Commit: b149f3c717b43adade3789618d7a47c47df03ac8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b149f3c717b43adade37896… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Aug 6 12:30:14 2006 +0200 usp10/tests: Add trailing '\n's to ok() calls. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 85546b1..eec8e35 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -485,7 +485,7 @@ static void test_ScriptXtoX(void) hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %d\n", (unsigned int) hr); ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); - ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d", piTrailing); + ok(piTrailing == TRUE, "Negative iX should return piTrailing=TRUE not %d\n", piTrailing); iX = 1954; cChars = 10; cGlyphs = 10;

1 0