April 2010 - Wine-commits - list.winehq.org

Gerald Pfeifer : comctl32: Remove unused scrollInfo from LISTVIEW_MouseWheel.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: aa745feddc8c56f5bca9f202edea600b2be8f547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa745feddc8c56f5bca9f202e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 14:35:06 2010 +0200 comctl32: Remove unused scrollInfo from LISTVIEW_MouseWheel. --- dlls/comctl32/listview.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9ca52c5..aeb1ae1 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9493,16 +9493,12 @@ static LRESULT LISTVIEW_MouseWheel(LISTVIEW_INFO *infoPtr, INT wheelDelta) { INT gcWheelDelta = 0; INT pulScrollLines = 3; - SCROLLINFO scrollInfo; TRACE("(wheelDelta=%d)\n", wheelDelta); SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); gcWheelDelta -= wheelDelta; - scrollInfo.cbSize = sizeof(SCROLLINFO); - scrollInfo.fMask = SIF_POS; - switch(infoPtr->uView) { case LV_VIEW_ICON:

1 0

Gerald Pfeifer : winhlp32: Remove not really used id from WINHELP_IndexDlgProc.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: b33d0d5405924e9fd34d902ab8de9119b63d6a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33d0d5405924e9fd34d902ab… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 14:41:48 2010 +0200 winhlp32: Remove not really used id from WINHELP_IndexDlgProc. --- programs/winhlp32/winhelp.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index c5176ca..ffab618 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -1307,12 +1307,9 @@ static INT_PTR CALLBACK WINHELP_IndexDlgProc(HWND hWnd, UINT msg, WPARAM wParam, */ static INT_PTR CALLBACK WINHELP_SearchDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - static struct index_data* id; - switch (msg) { case WM_INITDIALOG: - id = (struct index_data*)((PROPSHEETPAGE*)lParam)->lParam; return TRUE; case WM_NOTIFY: switch (((NMHDR*)lParam)->code)

1 0

Gerald Pfeifer : wordpad: Remove variable hwndPreview which is not really used from init_preview.
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 62871e0b7124c574ddc932b09eaf0e8840dabdaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=62871e0b7124c574ddc932b09… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 18:48:04 2010 +0200 wordpad: Remove variable hwndPreview which is not really used from init_preview. --- programs/wordpad/print.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 71c0627..226052e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -789,7 +789,6 @@ static void update_scaled_preview(HWND hMainWnd) void init_preview(HWND hMainWnd, LPWSTR wszFileName) { - HWND hwndPreview; HINSTANCE hInstance = GetModuleHandleW(0); preview.page = 1; preview.hdc = 0; @@ -799,7 +798,7 @@ void init_preview(HWND hMainWnd, LPWSTR wszFileName) preview.zoomlevel = 0; preview_bar_show(hMainWnd, TRUE); - hwndPreview = CreateWindowExW(0, wszPreviewWndClass, NULL, + CreateWindowExW(0, wszPreviewWndClass, NULL, WS_VISIBLE | WS_CHILD | WS_VSCROLL | WS_HSCROLL, 0, 0, 200, 10, hMainWnd, (HMENU)IDC_PREVIEW, hInstance, NULL); }

1 0

Gerald Pfeifer : taskmgr: Remove two variables which are not really used from ApplicationPageCompareFunc .
by Alexandre Julliard 20 Apr '10

20 Apr '10

Module: wine Branch: master Commit: 90e5edbf18be07aed1d52ed20d3ea01fe3b2046a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90e5edbf18be07aed1d52ed20… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Apr 19 18:51:00 2010 +0200 taskmgr: Remove two variables which are not really used from ApplicationPageCompareFunc. --- programs/taskmgr/applpage.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/taskmgr/applpage.c b/programs/taskmgr/applpage.c index b958887..9f05868 100644 --- a/programs/taskmgr/applpage.c +++ b/programs/taskmgr/applpage.c @@ -411,9 +411,7 @@ static int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, L static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) { - int idctrl; LPNMHDR pnmh; - LPNM_LISTVIEW pnmv; LV_DISPINFOW* pnmdi; LPAPPLICATION_PAGE_LIST_ITEM pAPLI; @@ -423,9 +421,7 @@ static void ApplicationPageOnNotify(WPARAM wParam, LPARAM lParam) LoadStringW(hInst, IDS_APPLICATION_NOT_RESPONDING, wszNotResponding, sizeof(wszNotResponding)/sizeof(WCHAR)); LoadStringW(hInst, IDS_APPLICATION_RUNNING, wszRunning, sizeof(wszRunning)/sizeof(WCHAR)); - idctrl = (int) wParam; pnmh = (LPNMHDR) lParam; - pnmv = (LPNM_LISTVIEW) lParam; pnmdi = (LV_DISPINFOW*) lParam; if (pnmh->hwndFrom == hApplicationPageListCtrl) {

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: 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: 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

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

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

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