wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Eric Pouech : winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit ).
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 285200b29bbd43a1deea25b32454cf10bef1f0cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=285200b29bbd43a1deea25b32… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:26 2010 +0200 winedbg: For stack info command, display information in 'a' format (instead of 'x') to get word size machine (instead of forcing 32bit). --- programs/winedbg/stack.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 7ba2773..bccb56a 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -50,7 +50,9 @@ void stack_info(void) dbg_printf("Stack dump:\n"); switch (lvalue.addr.Mode) { - case AddrModeFlat: /* 32-bit mode */ + case AddrModeFlat: /* 32-bit or 64-bit mode */ + memory_examine(&lvalue, 24, 'a'); + break; case AddrMode1632: /* 32-bit mode */ memory_examine(&lvalue, 24, 'x'); break;

1 0

Eric Pouech : winedbg: Correctly display whether we're in 32 vs 64 bit code .
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 3833600c7956c7f377b7ec8042e58d59508f1365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3833600c7956c7f377b7ec804… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Apr 19 22:33:19 2010 +0200 winedbg: Correctly display whether we're in 32 vs 64 bit code. --- programs/winedbg/tgt_active.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 0511063..0572d95 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -131,7 +131,8 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC switch (addr.Mode) { case AddrModeFlat: - dbg_printf(" in 32-bit code (%s)", + dbg_printf(" in %d-bit code (%s)", + be_cpu->pointer_size * 8, memory_offset_to_string(hexbuf, addr.Offset, 0)); break; case AddrModeReal: @@ -141,7 +142,7 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); break; case AddrMode1632: - dbg_printf(" in 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); + dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); break; default: dbg_printf(" bad address"); } @@ -164,15 +165,14 @@ static unsigned dbg_exception_prolog(BOOL is_debug, BOOL first_chance, const EXC if (addr.Mode != dbg_curr_thread->addr_mode) { const char* name = NULL; - + switch (addr.Mode) { case AddrMode1616: name = "16 bit"; break; - case AddrMode1632: name = "32 bit"; break; + case AddrMode1632: name = "segmented 32 bit"; break; case AddrModeReal: name = "vm86"; break; - case AddrModeFlat: name = "32 bit"; break; + case AddrModeFlat: name = be_cpu->pointer_size == 4 ? "32 bit" : "64 bit"; break; } - dbg_printf("In %s mode.\n", name); dbg_curr_thread->addr_mode = addr.Mode; }

1 0

Maarten Lankhorst : ntdll: Clear alignment flag in exception handlers.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 8734d5b9acb2ae85a8da2160f881ad27551edc4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8734d5b9acb2ae85a8da2160f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 19 22:36:22 2010 +0200 ntdll: Clear alignment flag in exception handlers. --- dlls/ntdll/signal_i386.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4998820..7a60c2a 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -873,6 +873,15 @@ static int solaris_sigaction( int sig, const struct sigaction *new, struct sigac typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); +extern void clear_alignment_flag(void); +__ASM_GLOBAL_FUNC( clear_alignment_flag, + "pushfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "andl $~0x40000,(%esp)\n\t" + "popfl\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "ret" ) + /*********************************************************************** * init_handler @@ -884,6 +893,8 @@ static inline void *init_handler( const SIGCONTEXT *sigcontext, WORD *fs, WORD * { TEB *teb = get_current_teb(); + clear_alignment_flag(); + /* get %fs and %gs at time of the fault */ #ifdef FS_sig *fs = LOWORD(FS_sig(sigcontext));

1 0

André Hentschel : ntdll: Add SP2 for Vista.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: b999b69ee968a0851f94e9574a04dc470680ca3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b999b69ee968a0851f94e9574… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 19 20:57:15 2010 +0200 ntdll: Add SP2 for Vista. --- dlls/ntdll/version.c | 6 +++--- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index ece1cb5..9d06d8f 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -140,9 +140,9 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WINVISTA */ { - sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1770, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + sizeof(RTL_OSVERSIONINFOEXW), 6, 0, 0x1772, VER_PLATFORM_WIN32_NT, + {'S','e','r','v','i','c','e',' ','P','a','c','k',' ','2',0}, + 2, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN2K8 */ { diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 8d28b0a..cf07fe8 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -50,7 +50,7 @@ static const struct { { "win7", "Windows 7", 6, 1, 0x1DB0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1771,VER_PLATFORM_WIN32_NT, "Service Pack 1", 0, 0, "ServerNT"}, - { "vista", "Windows Vista", 6, 0, 0x1770,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "vista", "Windows Vista", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "WinNT"}, { "win2003", "Windows 2003", 5, 2, 0xECE, VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "winxp", "Windows XP", 5, 1, 0xA28, VER_PLATFORM_WIN32_NT, "Service Pack 3", 3, 0, "WinNT"}, { "win2k", "Windows 2000", 5, 0, 0x893, VER_PLATFORM_WIN32_NT, "Service Pack 4", 4, 0, "WinNT"},

1 0

Henri Verbeet : wined3d: Immediately return on redundant changes in IWineD3DDeviceImpl_SetDepthStencilSurface ().
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: fb189b39a9c6ae630b27b4e6280af21d6c5ae775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb189b39a9c6ae630b27b4e62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:47:03 2010 +0200 wined3d: Immediately return on redundant changes in IWineD3DDeviceImpl_SetDepthStencilSurface(). --- dlls/wined3d/device.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 35be80c..c840e2a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5913,37 +5913,37 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (This->depth_stencil == (IWineD3DSurfaceImpl *)pNewZStencil) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); + return WINED3D_OK; } - else + + if (This->depth_stencil) { - if (This->depth_stencil) + if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL + || This->depth_stencil->Flags & SFLAG_DISCARD) { - if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL - || This->depth_stencil->Flags & SFLAG_DISCARD) - { - surface_modify_ds_location(This->depth_stencil, SFLAG_DS_DISCARDED); - } - else - { - struct wined3d_context *context = context_acquire(This, - (IWineD3DSurface *)This->render_targets[0], CTXUSAGE_RESOURCELOAD); - surface_load_ds_location(This->depth_stencil, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->depth_stencil, SFLAG_DS_OFFSCREEN); - context_release(context); - } + surface_modify_ds_location(This->depth_stencil, SFLAG_DS_DISCARDED); + } + else + { + struct wined3d_context *context = context_acquire(This, + (IWineD3DSurface *)This->render_targets[0], CTXUSAGE_RESOURCELOAD); + surface_load_ds_location(This->depth_stencil, context, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location(This->depth_stencil, SFLAG_DS_OFFSCREEN); + context_release(context); } + } - tmp = This->depth_stencil; - This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; - if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); - if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); + tmp = This->depth_stencil; + This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; + if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); + if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); - if((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) { - /* Swapping NULL / non NULL depth stencil affects the depth and tests */ - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILENABLE)); - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); - } + if ((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) + { + /* Swapping NULL / non NULL depth stencil affects the depth and tests */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILENABLE)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); } return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Get rid of a useless local variable in IWineD3DDeviceImpl_SetDepthStencilSurface ().
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 5056fd309d88d463e453df2db17d5a1c5f42ea89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5056fd309d88d463e453df2db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:47:02 2010 +0200 wined3d: Get rid of a useless local variable in IWineD3DDeviceImpl_SetDepthStencilSurface(). --- dlls/wined3d/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 64d884e..35be80c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5907,7 +5907,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface *pNewZStencil) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *tmp; - HRESULT hr = WINED3D_OK; TRACE("device %p, depth_stencil %p, old depth_stencil %p.\n", This, pNewZStencil, This->depth_stencil); @@ -5938,7 +5937,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * This->depth_stencil = (IWineD3DSurfaceImpl *)pNewZStencil; if (This->depth_stencil) IWineD3DSurface_AddRef((IWineD3DSurface *)This->depth_stencil); if (tmp) IWineD3DSurface_Release((IWineD3DSurface *)tmp); - hr = WINED3D_OK; if((!tmp && pNewZStencil) || (!pNewZStencil && tmp)) { /* Swapping NULL / non NULL depth stencil affects the depth and tests */ @@ -5948,7 +5946,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * } } - return hr; + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_SetCursorProperties(IWineD3DDevice* iface, UINT XHotSpot,

1 0

Henri Verbeet : wined3d: Store the depth/ stencil surface as an IWineD3DSurfaceImpl pointer in the device.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: c5de1e10450ba78e9b9bda8d8c3a201073967fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5de1e10450ba78e9b9bda8d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:47:01 2010 +0200 wined3d: Store the depth/stencil surface as an IWineD3DSurfaceImpl pointer in the device. --- dlls/wined3d/context.c | 20 +++++----- dlls/wined3d/device.c | 72 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 7 ++-- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/surface.c | 7 ++-- dlls/wined3d/swapchain.c | 6 ++-- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 59 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5de1e10450ba78e9b9bd…

1 0

Henri Verbeet : wined3d: Store the auto depth/ stencil surface as an IWineD3DSurfaceImpl pointer in the device.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 520f74de21032cc110b60767846859844337bab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520f74de21032cc110b607678… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:47:00 2010 +0200 wined3d: Store the auto depth/stencil surface as an IWineD3DSurfaceImpl pointer in the device. --- dlls/wined3d/device.c | 26 +++++++++++++++----------- dlls/wined3d/stateblock.c | 5 ++--- dlls/wined3d/swapchain.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b1103a..09cafd7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1621,7 +1621,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, IWineD3DSurface_AddRef((IWineD3DSurface *)This->render_targets[0]); /* Depth Stencil support */ - This->stencilBufferTarget = This->auto_depth_stencil_buffer; + This->stencilBufferTarget = (IWineD3DSurface *)This->auto_depth_stencil; if (NULL != This->stencilBufferTarget) { IWineD3DSurface_AddRef(This->stencilBufferTarget); } @@ -1855,8 +1855,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Release the buffers (with sanity checks)*/ TRACE("Releasing the depth stencil buffer at %p\n", This->stencilBufferTarget); - if(This->stencilBufferTarget != NULL && (IWineD3DSurface_Release(This->stencilBufferTarget) >0)){ - if(This->auto_depth_stencil_buffer != This->stencilBufferTarget) + if (This->stencilBufferTarget != NULL && IWineD3DSurface_Release(This->stencilBufferTarget)) + { + if (This->auto_depth_stencil != (IWineD3DSurfaceImpl *)This->stencilBufferTarget) FIXME("(%p) Something's still holding the stencilBufferTarget\n",This); } This->stencilBufferTarget = NULL; @@ -1867,12 +1868,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, TRACE("Setting rendertarget to NULL\n"); This->render_targets[0] = NULL; - if (This->auto_depth_stencil_buffer) { - if (IWineD3DSurface_Release(This->auto_depth_stencil_buffer) > 0) + if (This->auto_depth_stencil) + { + if (IWineD3DSurface_Release((IWineD3DSurface *)This->auto_depth_stencil)) { FIXME("(%p) Something's still holding the auto depth stencil buffer\n", This); } - This->auto_depth_stencil_buffer = NULL; + This->auto_depth_stencil = NULL; } context_release(context); @@ -6436,7 +6438,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->hDeviceWindow != swapchain->presentParms.hDeviceWindow) { ERR("Cannot change the device window yet\n"); } - if (pPresentationParameters->EnableAutoDepthStencil && !This->auto_depth_stencil_buffer) { + if (pPresentationParameters->EnableAutoDepthStencil && !This->auto_depth_stencil) + { HRESULT hrc; TRACE("Creating the depth stencil buffer\n"); @@ -6449,7 +6452,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->MultiSampleType, pPresentationParameters->MultiSampleQuality, FALSE, - &This->auto_depth_stencil_buffer); + (IWineD3DSurface **)&This->auto_depth_stencil); if (FAILED(hrc)) { ERR("Failed to create the depth stencil buffer\n"); @@ -6460,7 +6463,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE /* Reset the depth stencil */ if (pPresentationParameters->EnableAutoDepthStencil) - IWineD3DDevice_SetDepthStencilSurface(iface, This->auto_depth_stencil_buffer); + IWineD3DDevice_SetDepthStencilSurface(iface, (IWineD3DSurface *)This->auto_depth_stencil); else IWineD3DDevice_SetDepthStencilSurface(iface, NULL); @@ -6510,8 +6513,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE return hr; } } - if(This->auto_depth_stencil_buffer) { - hr = updateSurfaceDesc((IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer, pPresentationParameters); + if (This->auto_depth_stencil) + { + hr = updateSurfaceDesc(This->auto_depth_stencil, pPresentationParameters); if(FAILED(hr)) { IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 028b79f..6d0eff0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1083,11 +1083,10 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat TRACE("Render states\n"); /* Render states: */ - if (ThisDevice->auto_depth_stencil_buffer != NULL) { + if (ThisDevice->auto_depth_stencil) IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_TRUE); - } else { + else IWineD3DDevice_SetRenderState(device, WINED3DRS_ZENABLE, WINED3DZB_FALSE); - } IWineD3DDevice_SetRenderState(device, WINED3DRS_FILLMODE, WINED3DFILL_SOLID); IWineD3DDevice_SetRenderState(device, WINED3DRS_SHADEMODE, WINED3DSHADE_GOURAUD); lp.lp.wRepeatFactor = 0; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 934979b..c9f64e8 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -856,20 +856,20 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (present_parameters->EnableAutoDepthStencil && surface_type == SURFACE_OPENGL) { TRACE("Creating depth/stencil buffer.\n"); - if (!device->auto_depth_stencil_buffer) + if (!device->auto_depth_stencil) { hr = IWineD3DDeviceParent_CreateDepthStencilSurface(device->device_parent, parent, swapchain->presentParms.BackBufferWidth, swapchain->presentParms.BackBufferHeight, swapchain->presentParms.AutoDepthStencilFormat, swapchain->presentParms.MultiSampleType, swapchain->presentParms.MultiSampleQuality, FALSE /* FIXME: Discard */, - &device->auto_depth_stencil_buffer); + (IWineD3DSurface **)&device->auto_depth_stencil); if (FAILED(hr)) { WARN("Failed to create the auto depth stencil, hr %#x.\n", hr); goto err; } - IWineD3DSurface_SetContainer(device->auto_depth_stencil_buffer, NULL); + IWineD3DSurface_SetContainer((IWineD3DSurface *)device->auto_depth_stencil, NULL); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 596935e..59c0141 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1667,7 +1667,7 @@ struct IWineD3DDeviceImpl /* Render Target Support */ IWineD3DSurfaceImpl **render_targets; - IWineD3DSurface *auto_depth_stencil_buffer; + IWineD3DSurfaceImpl *auto_depth_stencil; IWineD3DSurface *stencilBufferTarget; /* palettes texture management */

1 0

Henri Verbeet : wined3d: Store render targets as IWineD3DSurfaceImpl pointers in the device.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: c7a1848656947c6b285cc5c629bf9983bc03f2bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a1848656947c6b285cc5c62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 19 20:46:59 2010 +0200 wined3d: Store render targets as IWineD3DSurfaceImpl pointers in the device. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 11 +++----- dlls/wined3d/device.c | 45 ++++++++++++++++++++---------------- dlls/wined3d/drawprim.c | 9 +++---- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 6 ++-- dlls/wined3d/surface.c | 23 ++++++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 8 files changed, 51 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a1848656947c6b285cc…

1 0

André Hentschel : shell32: Update German translation.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 8b326350914630fb96b1e0459440ca5fb323312f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b326350914630fb96b1e0459… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 19 20:26:30 2010 +0200 shell32: Update German translation. --- dlls/shell32/shell32_De.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 828f56d..4194e22 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -208,6 +208,10 @@ STRINGTABLE IDS_SHV_COLUMN11 "Gruppe" IDS_SHV_COLUMN_DELFROM "Ursprung" IDS_SHV_COLUMN_DELDATE "Gelöscht am" + IDS_SHV_COL_DOCS "Dokumente" + IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_LOCATION "Ort" + IDS_SHV_COL_MODEL "Modell" /* special folders */ IDS_DESKTOP "Desktop"

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
90
Older →

Jump to page:

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-commits April 2010