July 2007 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Implement high order patches.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: 26ebe396c31cbc29335b5d26a4f43821d805c1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ebe396c31cbc29335b5d26a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 4 17:57:45 2007 +0200 wined3d: Implement high order patches. --- dlls/wined3d/device.c | 118 +++++++++++-- dlls/wined3d/directx.c | 7 +- dlls/wined3d/drawprim.c | 384 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 19 ++ dlls/wined3d/wined3d_private.h | 30 +++- 5 files changed, 542 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26ebe396c31cbc29335b5…

1 0

Evan Stade : gdiplus: Added SetPenEndCap.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: 68ba30f4333ac468b04656016fc7355ab0bfb2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ba30f4333ac468b04656016… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jul 5 18:37:52 2007 -0700 gdiplus: Added SetPenEndCap. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/pen.c | 15 +++++++++++++++ include/gdiplusenums.h | 18 ++++++++++++++++++ include/gdiplusgpstubs.h | 1 + 5 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5ca2b0f..f3ebc6b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -550,7 +550,7 @@ @ stub GdipSetPenDashCap197819 @ stub GdipSetPenDashOffset @ stub GdipSetPenDashStyle -@ stub GdipSetPenEndCap +@ stdcall GdipSetPenEndCap(ptr long) @ stub GdipSetPenLineCap197819 @ stub GdipSetPenLineJoin @ stub GdipSetPenMiterLimit diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e221044..b023c31 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -32,6 +32,7 @@ struct GpPen{ GpUnit unit; REAL width; HPEN gdipen; + GpLineCap endcap; }; struct GpGraphics{ diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 9ee72d9..0fcbb69 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -43,6 +43,7 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, gp_pen->color = ARGB2COLORREF(color); gp_pen->width = width; gp_pen->unit = unit; + gp_pen->endcap = LineCapFlat; /* FIXME: Currently only solid lines supported. */ lb.lbStyle = BS_SOLID; @@ -71,3 +72,17 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen) return Ok; } + +GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap) +{ + if(!pen) return InvalidParameter; + + if(cap != LineCapFlat){ + FIXME("Not implemented for non-flat EndCap\n"); + return NotImplemented; + } + + pen->endcap = cap; + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index c6b5f15..16ded0d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -45,11 +45,29 @@ enum FillMode FillModeWinding = 1 }; +enum LineCap +{ + LineCapFlat = 0x00, + LineCapSquare = 0x01, + LineCapRound = 0x02, + LineCapTriangle = 0x03, + + LineCapNoAnchor = 0x10, + LineCapSquareAnchor = 0x11, + LineCapRoundAnchor = 0x12, + LineCapDiamondAnchor = 0x13, + LineCapArrowAnchor = 0x14, + + LineCapCustom = 0xff, + LineCapAnchorMask = 0xf0 +}; + #ifndef __cplusplus typedef enum Unit Unit; typedef enum BrushType BrushType; typedef enum FillMode FillMode; +typedef enum LineCap LineCap; #endif /* end of c typedefs */ diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 6e283d8..8be4e9c 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -43,5 +43,6 @@ typedef BrushType GpBrushType; typedef PointF GpPointF; typedef FillMode GpFillMode; typedef PathData GpPathData; +typedef LineCap GpLineCap; #endif

1 0

Stefan Dösinger : ddraw: Y coords are inversed.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: def7122f3cc7d1674ec7fa2c65d6bf093a6fa10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=def7122f3cc7d1674ec7fa2c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 23:31:41 2007 +0200 ddraw: Y coords are inversed. --- dlls/ddraw/executebuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index c44a37e..0ca20ad 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -439,7 +439,7 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, dst->u1.sx = dst->u1.sx / dst->u4.rhw * Viewport->dwWidth / 2 + Viewport->dwX + Viewport->dwWidth / 2; - dst->u2.sy = dst->u2.sy / dst->u4.rhw * Viewport->dwHeight / 2 + dst->u2.sy = (-dst->u2.sy) / dst->u4.rhw * Viewport->dwHeight / 2 + Viewport->dwY + Viewport->dwHeight / 2; dst->u3.sz /= dst->u4.rhw; dst->u4.rhw = 1 / dst->u4.rhw;

1 0

Maarten Lankhorst : dsound: Revert "dsound: Disable property sets if hardware doesn't support it.".
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: c45d4f77c66026333925000d5f4c680b0feaa721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c45d4f77c66026333925000d5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 6 12:38:19 2007 +0200 dsound: Revert "dsound: Disable property sets if hardware doesn't support it.". --- dlls/dsound/propset.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 4017f07..35fe325 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -197,20 +197,10 @@ HRESULT IKsBufferPropertySetImpl_Create( IDirectSoundBufferImpl *dsb, IKsBufferPropertySetImpl **piks) { - PIDSDRIVERPROPERTYSET ps = NULL; IKsBufferPropertySetImpl *iks; TRACE("(%p,%p)\n",dsb,piks); *piks = NULL; - if (!dsb->hwbuf) - return DSERR_INVALIDPARAM; - - IDsDriver_QueryInterface(dsb->hwbuf, &IID_IDsDriverPropertySet, (void **)&ps); - if (!ps) - return DSERR_INVALIDPARAM; - - IUnknown_Release(ps); - iks = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*iks)); if (iks == 0) { WARN("out of memory\n");

1 0

Maarten Lankhorst : winealsa: Silence the buffer warning more often.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: 5d7c63f1e0886f00306c422fec385190f5de2b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7c63f1e0886f00306c422fe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 5 15:34:11 2007 +0200 winealsa: Silence the buffer warning more often. --- dlls/winealsa.drv/dsoutput.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index c5ad141..7990a0f 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -388,8 +388,10 @@ static HRESULT SetFormat(IDsDriverBufferImpl *This, LPWAVEFORMATEX pwfx, BOOL fo */ if (psize >= 512) { - if (psize > 512 && ++warnonce == 1) - FIXME("Your alsa dmix period size is excessively high, unfortunately this is alsa default, try decreasing it to 512 or 256 (but double the amount of periods) if possible\n"); + if (psize == 1024 && ++warnonce == 1) + FIXME("Your alsa dmix period size is 1024, try decreasing it to 512 if possible\n"); + else if (psize > 512) + WARN("Your alsa period size is excessively high (%lu)\n", psize); This->mmap_commitahead = 2 * psize + psize/2; This->mmap_writeahead = 2 * psize; }

1 0

Maarten Lankhorst : dsound: Clean up some unused variables.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: f13f48876c0b3207f11b48be5aef80b1da2cd5a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13f48876c0b3207f11b48be5… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 6 15:34:33 2007 +0200 dsound: Clean up some unused variables. --- dlls/dsound/buffer.c | 2 +- dlls/dsound/dsound_main.c | 17 ----------------- dlls/dsound/dsound_private.h | 2 -- dlls/dsound/mixer.c | 6 +++--- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 9de2a39..7a45679 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -503,7 +503,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_GetCurrentPosition( * behind write cursor, hmm... */ /* let's just do what might work for Half-Life */ DWORD wp; - wp = (This->device->pwplay + ds_hel_margin) * This->device->fraglen; + wp = (This->device->pwplay + This->device->prebuf) * This->device->fraglen; wp %= This->device->buflen; *playpos = DSOUND_CalcPlayPosition(This, wp, pwrite); TRACE("Using non-GETCURRENTPOSITION2\n"); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 483d51b..791dd30 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -61,11 +61,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); /* some stuff may get more responsive with lower values though... */ #define DS_EMULDRIVER 0 /* some games (Quake 2, UT) refuse to accept emulated dsound devices. set to 0 ! */ -#define DS_HEL_MARGIN 2 /* HEL only: number of waveOut fragments ahead to mix in new buffers - * (keep this close or equal to DS_HEL_QUEUE for best results) */ -#define DS_HEL_QUEUE 2 /* HEL only: number of waveOut fragments ahead to queue to driver - * (this will affect HEL sound reliability and latency) */ - #define DS_SND_QUEUE_MAX 10 /* max number of fragments to prebuffer */ DirectSoundDevice* DSOUND_renderer[MAXWAVEDRIVERS]; @@ -100,8 +95,6 @@ HRESULT mmErr(UINT err) } int ds_emuldriver = DS_EMULDRIVER; -int ds_hel_margin = DS_HEL_MARGIN; -int ds_hel_queue = DS_HEL_QUEUE; int ds_snd_queue_max = DS_SND_QUEUE_MAX; int ds_hw_accel = DS_HW_ACCEL_FULL; int ds_default_playback = 0; @@ -159,12 +152,6 @@ void setup_dsound_options(void) if (!get_config_key( hkey, appkey, "EmulDriver", buffer, MAX_PATH )) ds_emuldriver = strcmp(buffer, "N"); - if (!get_config_key( hkey, appkey, "HELmargin", buffer, MAX_PATH )) - ds_hel_margin = atoi(buffer); - - if (!get_config_key( hkey, appkey, "HELqueue", buffer, MAX_PATH )) - ds_hel_queue = atoi(buffer); - if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) ds_snd_queue_max = atoi(buffer); @@ -196,10 +183,6 @@ void setup_dsound_options(void) if (ds_emuldriver != DS_EMULDRIVER ) WARN("ds_emuldriver = %d (default=%d)\n",ds_emuldriver, DS_EMULDRIVER); - if (ds_hel_margin != DS_HEL_MARGIN ) - WARN("ds_hel_margin = %d (default=%d)\n",ds_hel_margin, DS_HEL_MARGIN ); - if (ds_hel_queue != DS_HEL_QUEUE ) - WARN("ds_hel_queue = %d (default=%d)\n",ds_hel_queue, DS_HEL_QUEUE ); if (ds_snd_queue_max != DS_SND_QUEUE_MAX) WARN("ds_snd_queue_max = %d (default=%d)\n",ds_snd_queue_max ,DS_SND_QUEUE_MAX); if (ds_hw_accel != DS_HW_ACCEL_FULL) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 42437a2..56fbd0c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -34,8 +34,6 @@ #define DS_HW_ACCEL_EMULATION 3 extern int ds_emuldriver; -extern int ds_hel_margin; -extern int ds_hel_queue; extern int ds_snd_queue_max; extern int ds_hw_accel; extern int ds_default_playback; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 98dfe52..96c7c42 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -286,7 +286,7 @@ static INT DSOUND_MixerNorm(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len) /* New PerfectPitch(tm) Technology (c) 1998 Rob Riggs */ /* Patent Pending :-] */ - /* Patent enhancements (c) 2000 Ove K�ven, + /* Patent enhancements (c) 2000 Ove K�ven, * TransGaming Technologies Inc. */ /* FIXME("(%p) Adjusting frequency: %ld -> %ld (need optimization)\n", @@ -749,8 +749,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) /* calculte the current wave write position */ wave_writepos = wave_fragpos * device->fraglen; - TRACE("wave_fragpos = %i, wave_writepos = %i, pwqueue = %i, ds_hel_queue= %i\n", - wave_fragpos, wave_writepos, device->pwqueue, ds_hel_queue); + TRACE("wave_fragpos = %i, wave_writepos = %i, pwqueue = %i, prebuf = %i\n", + wave_fragpos, wave_writepos, device->pwqueue, device->prebuf); if(force == FALSE){ /* check remaining prebuffered frags */

1 0

Stefan Dösinger : wined3d: Offscreen rendering from foreign threads.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: 9928a4c4fdb365281e5ba0be7d74d9b7f93ab9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9928a4c4fdb365281e5ba0be7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 4 16:47:22 2007 +0200 wined3d: Offscreen rendering from foreign threads. --- dlls/wined3d/context.c | 65 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f51cc1d..2707407 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -629,6 +629,27 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex } /***************************************************************************** + * findThreadContextForSwapChain + * + * Searches a swapchain for all contexts and picks one for the thread tid. + * If none can be found the swapchain is requested to create a new context + * + *****************************************************************************/ +static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchain, DWORD tid) { + int i; + + for(i = 0; i < ((IWineD3DSwapChainImpl *) swapchain)->num_contexts; i++) { + if(((IWineD3DSwapChainImpl *) swapchain)->context[i]->tid == tid) { + return ((IWineD3DSwapChainImpl *) swapchain)->context[i]; + } + + } + + /* Create a new context for the thread */ + return IWineD3DSwapChainImpl_CreateContextForThread(swapchain); +} + +/***************************************************************************** * ActivateContext * * Finds a rendering context and drawable matching the device and render @@ -660,17 +681,8 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(hr == WINED3D_OK && swapchain) { TRACE("Rendering onscreen\n"); - context = NULL; - for(i = 0; i < ((IWineD3DSwapChainImpl *) swapchain)->num_contexts; i++) { - if(((IWineD3DSwapChainImpl *) swapchain)->context[i]->tid == tid) { - context = ((IWineD3DSwapChainImpl *) swapchain)->context[i]; - } - } + context = findThreadContextForSwapChain(swapchain, tid); - if(!context) { - /* Create a new context for the thread */ - context = IWineD3DSwapChainImpl_CreateContextForThread(swapchain); - } This->render_offscreen = FALSE; /* The context != This->activeContext will catch a NOP context change. This can occur * if we are switching back to swapchain rendering in case of FBO or Back Buffer offscreen @@ -685,6 +697,10 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU glDrawBuffer(GL_FRONT); checkGLcall("glDrawBuffer(GL_FRONT)"); } + } else if(wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) { + if(This->pbufferContext && tid == This->pbufferContext->tid) { + This->pbufferContext->tid = 0; + } } IWineD3DSwapChain_Release(swapchain); @@ -699,21 +715,20 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; - if(tid != This->lastThread) { - FIXME("Offscreen rendering is only supported from the creation thread yet\n"); - FIXME("Expect a crash now ...\n"); - } - switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: /* FBOs do not need a different context. Stay with whatever context is active at the moment */ - if(This->activeContext) { + if(This->activeContext && tid == This->lastThread) { context = This->activeContext; } else { /* This may happen if the app jumps streight into offscreen rendering - * Start using the context of the primary swapchain + * Start using the context of the primary swapchain. tid == 0 is no problem + * for findThreadContextForSwapChain. + * + * Can also happen on thread switches - in that case findThreadContextForSwapChain + * is perfect to call. */ - context = ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]; + context = findThreadContextForSwapChain(This->swapchains[0], tid); } break; @@ -738,6 +753,10 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU } if(This->pbufferContext) { + if(This->pbufferContext->tid != 0 && This->pbufferContext->tid != tid) { + FIXME("The PBuffr context is only supported for one thread for now!\n"); + } + This->pbufferContext->tid = tid; context = This->pbufferContext; break; } else { @@ -748,13 +767,17 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU case ORM_BACKBUFFER: /* Stay with the currently active context for back buffer rendering */ - if(This->activeContext) { + if(This->activeContext && tid == This->lastThread) { context = This->activeContext; } else { /* This may happen if the app jumps streight into offscreen rendering - * Start using the context of the primary swapchain + * Start using the context of the primary swapchain. tid == 0 is no problem + * for findThreadContextForSwapChain. + * + * Can also happen on thread switches - in that case findThreadContextForSwapChain + * is perfect to call. */ - context = ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]; + context = findThreadContextForSwapChain(This->swapchains[0], tid); } glDrawBuffer(This->offscreenBuffer); checkGLcall("glDrawBuffer(This->offscreenBuffer)");

1 0

Stefan Dösinger : ddraw: Update the wined3d matrix if a current matrix handle is modified.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: f7597dee15307cb46e53d297f7a461c20b058328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7597dee15307cb46e53d297f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 1 23:28:21 2007 +0200 ddraw: Update the wined3d matrix if a current matrix handle is modified. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 19 +++++++++++++++++++ dlls/ddraw/executebuffer.c | 6 ++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ee194a1..2f35643 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -348,6 +348,7 @@ struct IDirect3DDeviceImpl /* Handle management */ struct HandleEntry *Handles; DWORD numHandles; + D3DMATRIXHANDLE world, proj, view; }; /* Vtables in various versions */ diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 5c21bf9..d0cfcdf 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1406,6 +1406,25 @@ IDirect3DDeviceImpl_1_SetMatrix(IDirect3DDevice *iface, *((D3DMATRIX *) This->Handles[D3DMatHandle - 1].ptr) = *D3DMatrix; + if(This->world == D3DMatHandle) + { + IWineD3DDevice_SetTransform(This->wineD3DDevice, + WINED3DTS_WORLDMATRIX(0), + (WINED3DMATRIX *) D3DMatrix); + } + if(This->view == D3DMatHandle) + { + IWineD3DDevice_SetTransform(This->wineD3DDevice, + WINED3DTS_VIEW, + (WINED3DMATRIX *) D3DMatrix); + } + if(This->proj == D3DMatHandle) + { + IWineD3DDevice_SetTransform(This->wineD3DDevice, + WINED3DTS_PROJECTION, + (WINED3DMATRIX *) D3DMatrix); + } + LeaveCriticalSection(&ddraw_cs); return D3D_OK; } diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ff0bbdb..c44a37e 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -227,6 +227,12 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, } else if(lpDevice->Handles[ci->u2.dwArg[0] - 1].type != DDrawHandle_Matrix) { ERR("Handle %d is not a matrix handle\n", ci->u2.dwArg[0]); } else { + if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_WORLD) + lpDevice->world = ci->u2.dwArg[0]; + if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_VIEW) + lpDevice->view = ci->u2.dwArg[0]; + if(ci->u1.drstRenderStateType == D3DTRANSFORMSTATE_PROJECTION) + lpDevice->proj = ci->u2.dwArg[0]; IDirect3DDevice7_SetTransform(ICOM_INTERFACE(lpDevice, IDirect3DDevice7), ci->u1.drstRenderStateType, (LPD3DMATRIX) lpDevice->Handles[ci->u2.dwArg[0] - 1].ptr); }

1 0

Alexander Nicolaysen Sørnes : comdlg32: fontdlg: Respect the CF_NOSCRIPTSEL flag.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: 886d804854e198ca5e0b30d879a8b932df00ab2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=886d804854e198ca5e0b30d87… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 4 15:28:45 2007 +0200 comdlg32: fontdlg: Respect the CF_NOSCRIPTSEL flag. --- dlls/comdlg32/fontdlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 42833f1..a900c69 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -621,6 +621,8 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE); if (!(lpcf->Flags & CF_APPLY)) ShowWindow(GetDlgItem(hDlg,psh3),SW_HIDE); + if (lpcf->Flags & CF_NOSCRIPTSEL) + EnableWindow(GetDlgItem(hDlg,cmb5),FALSE); if (lpcf->Flags & CF_EFFECTS) { for (i=0;i<TEXT_COLORS;i++)

1 0

Alexandre Julliard : Maketest.rules: Add dependency on IDL headers for crosstest objects.
by Alexandre Julliard July 6, 2007

July 6, 2007

Module: wine Branch: master Commit: fff723d7393756d0e9fc78564b08283e09b06cc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff723d7393756d0e9fc78564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 18:20:06 2007 +0200 Maketest.rules: Add dependency on IDL headers for crosstest objects. --- dlls/Maketest.rules.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 73bf4d9..6c70a23 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -68,6 +68,8 @@ crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in $(CROSSCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) +$(CROSSOBJS): $(IDL_GEN_HEADERS) + # Rules for cleaning testclean::

1 0