April 2009 - Wine-Commits - list.winehq.org

Jörg Höhle : Perform case-insensitive FOURCC comparison of built-in video codecs.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: e7c06ea6ae8cbd852d3cbfed4606739cd92adb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7c06ea6ae8cbd852d3cbfed4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Apr 1 21:06:52 2009 +0200 Perform case-insensitive FOURCC comparison of built-in video codecs. --- dlls/iccvid/iccvid.c | 3 ++- dlls/msrle32/msrle32.c | 4 +++- dlls/msvfw32/tests/msvfw.c | 4 ++-- dlls/msvidc32/msvideo1.c | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 77328ea..1a1b33e 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -57,6 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iccvid); static HINSTANCE ICCVID_hModule; #define ICCVID_MAGIC mmioFOURCC('c', 'v', 'i', 'd') +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) #define DBUG 0 #define MAX_STRIPS 32 @@ -975,7 +976,7 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, TRACE("Opened\n"); - if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; info = heap_alloc( sizeof (ICCVID_Info) ); if( info ) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index b0354b9..e157027 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msrle32); static HINSTANCE MSRLE32_hModule = 0; +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) + #define ABS(a) ((a) < 0 ? -(a) : (a)) #define SQR(a) ((a) * (a)) @@ -1114,7 +1116,7 @@ static CodecInfo* Open(LPICOPEN icinfo) return (LPVOID)0xFFFF0000; } - if (icinfo->fccType != ICTYPE_VIDEO) return NULL; + if (compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return NULL; TRACE("(%p = {%u,0x%08X(%4.4s),0x%08X(%4.4s),0x%X,0x%X,...})\n", icinfo, icinfo->dwSize, icinfo->fccType, (char*)&icinfo->fccType, diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 537c230..1082486 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -42,12 +42,12 @@ static void test_OpenCase(void) ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('m','s','v','c'),ICMODE_DECOMPRESS); - todo_wine ok(0!=h,"ICOpen(VIDC.msvc) failed\n"); + ok(0!=h,"ICOpen(VIDC.msvc) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } h = ICOpen(mmioFOURCC('V','I','D','C'),mmioFOURCC('M','S','V','C'),ICMODE_DECOMPRESS); - todo_wine ok(0!=h,"ICOpen(VIDC.MSVC) failed\n"); + ok(0!=h,"ICOpen(VIDC.MSVC) failed\n"); if (h) { ok(ICClose(h)==ICERR_OK,"ICClose failed\n"); } diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index 9de2a2d..ab51e4c 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -7,7 +7,7 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -50,6 +50,7 @@ static HINSTANCE MSVIDC32_hModule; #define CRAM_MAGIC mmioFOURCC('C', 'R', 'A', 'M') #define MSVC_MAGIC mmioFOURCC('M', 'S', 'V', 'C') #define WHAM_MAGIC mmioFOURCC('W', 'H', 'A', 'M') +#define compare_fourcc(fcc1, fcc2) (((fcc1)^(fcc2))&~0x20202020) #define PALETTE_COUNT 256 #define LE_16(x) ((((const uint8_t *)(x))[1] << 8) | ((const uint8_t *)(x))[0]) @@ -502,7 +503,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, TRACE("Opened\n"); - if (icinfo && icinfo->fccType != ICTYPE_VIDEO) return 0; + if (icinfo && compare_fourcc(icinfo->fccType, ICTYPE_VIDEO)) return 0; info = HeapAlloc( GetProcessHeap(), 0, sizeof (Msvideo1Context) ); if( info )

1 0

Stefan Dösinger : wined3d: Use Map and Unmap for index buffers.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 3ed94329a34b3619832d8b39819c559c3b1950a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed94329a34b3619832d8b398… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 13:29:27 2009 +0200 wined3d: Use Map and Unmap for index buffers. Just a change in name to prepare for the next patch --- dlls/d3d8/indexbuffer.c | 4 ++-- dlls/d3d9/indexbuffer.c | 4 ++-- dlls/ddraw/device.c | 12 ++++++------ dlls/wined3d/buffer.c | 8 ++++---- include/wine/wined3d.idl | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index a35eb1c..0443dcf 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -161,7 +161,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 ifac TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); + hr = IWineD3DIndexBuffer_Map(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, ppbData, Flags); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -172,7 +172,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Unlock(LPDIRECT3DINDEXBUFFER8 if TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + hr = IWineD3DIndexBuffer_Unmap(This->wineD3DIndexBuffer); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 3bb997d..3cf790e 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -162,7 +162,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Lock(LPDIRECT3DINDEXBUFFER9 ifac TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DIndexBuffer_Lock(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); + hr = IWineD3DIndexBuffer_Map(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -173,7 +173,7 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Unlock(LPDIRECT3DINDEXBUFFER9 if TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DIndexBuffer_Unlock(This->wineD3DIndexBuffer); + hr = IWineD3DIndexBuffer_Unmap(This->wineD3DIndexBuffer); LeaveCriticalSection(&d3d9_cs); return hr; } diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e8791bd..c8bd88d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4271,11 +4271,11 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, * or a SetData-Method for the index buffer, which * overrides the index buffer data with our pointer. */ - hr = IWineD3DIndexBuffer_Lock(This->indexbuffer, - 0 /* OffSetToLock */, - IndexCount * sizeof(WORD), - (BYTE **) &LockedIndices, - 0 /* Flags */); + hr = IWineD3DIndexBuffer_Map(This->indexbuffer, + 0 /* OffSetToLock */, + IndexCount * sizeof(WORD), + (BYTE **) &LockedIndices, + 0 /* Flags */); assert(IndexCount < 0x100000); if(hr != D3D_OK) { @@ -4284,7 +4284,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return hr; } memcpy(LockedIndices, Indices, IndexCount * sizeof(WORD)); - hr = IWineD3DIndexBuffer_Unlock(This->indexbuffer); + hr = IWineD3DIndexBuffer_Unmap(This->indexbuffer); if(hr != D3D_OK) { ERR("(%p) IWineD3DIndexBuffer::Unlock failed with hr = %08x\n", This, hr); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6a66c73..350cb4b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1091,7 +1091,7 @@ static WINED3DRESOURCETYPE STDMETHODCALLTYPE IWineD3DIndexBufferImpl_GetType(IWi /* IWineD3DIndexBuffer methods */ -static HRESULT STDMETHODCALLTYPE IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, +static HRESULT STDMETHODCALLTYPE IWineD3DIndexBufferImpl_Map(IWineD3DIndexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; @@ -1128,7 +1128,7 @@ static HRESULT STDMETHODCALLTYPE IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffe return WINED3D_OK; } -static HRESULT STDMETHODCALLTYPE IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) +static HRESULT STDMETHODCALLTYPE IWineD3DIndexBufferImpl_Unmap(IWineD3DIndexBuffer *iface) { IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; ULONG locks = InterlockedDecrement(&This->lockcount); @@ -1193,7 +1193,7 @@ const IWineD3DIndexBufferVtbl IWineD3DIndexBuffer_Vtbl = IWineD3DIndexBufferImpl_UnLoad, IWineD3DIndexBufferImpl_GetType, /* IWineD3DIndexBuffer methods */ - IWineD3DIndexBufferImpl_Lock, - IWineD3DIndexBufferImpl_Unlock, + IWineD3DIndexBufferImpl_Map, + IWineD3DIndexBufferImpl_Unmap, IWineD3DIndexBufferImpl_GetDesc, }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 96c5927..4eb3d17 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2346,13 +2346,13 @@ interface IWineD3DRendertargetView : IWineD3DBase ] interface IWineD3DIndexBuffer : IWineD3DResource { - HRESULT Lock( + HRESULT Map( [in] UINT offset, [in] UINT size, [out] BYTE **data, [in] DWORD flags ); - HRESULT Unlock( + HRESULT Unmap( ); HRESULT GetDesc( [out] WINED3DBUFFER_DESC *desc

1 0

Stefan Dösinger : d3d: Unify WINED3DVERTEXBUFFER_DESC and WINED3DINDEXBUFFER_DESC.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: dc80a3ede53467f98842d9502eba46e84e996a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc80a3ede53467f98842d9502… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 13:28:02 2009 +0200 d3d: Unify WINED3DVERTEXBUFFER_DESC and WINED3DINDEXBUFFER_DESC. --- dlls/d3d8/indexbuffer.c | 8 ++++++-- dlls/d3d8/vertexbuffer.c | 9 +++++++-- dlls/d3d9/indexbuffer.c | 19 +++++++++++-------- dlls/d3d9/vertexbuffer.c | 9 +++++++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/vertexbuffer.c | 6 +++--- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/device.c | 2 +- include/wine/wined3d.idl | 23 ++++++----------------- 9 files changed, 45 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc80a3ede53467f98842d…

1 0

Stefan Dösinger : wined3d: Merge IWineD3DIndexBuffer and IWineD3DBuffer.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 513a493f00df8aea2ceb9e86c612391ce58630db URL: http://source.winehq.org/git/wine.git/?a=commit;h=513a493f00df8aea2ceb9e86c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 16:46:12 2009 +0200 wined3d: Merge IWineD3DIndexBuffer and IWineD3DBuffer. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 6 +++--- dlls/d3d8/indexbuffer.c | 22 +++++++++++----------- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/indexbuffer.c | 22 +++++++++++----------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 20 ++++++++++---------- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/vertexbuffer.c | 4 ++-- dlls/wined3d/device.c | 34 +++++++++++++++++----------------- dlls/wined3d/stateblock.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 26 +++----------------------- 14 files changed, 70 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=513a493f00df8aea2ceb9…

1 0

Rein Klazes : user32/tests: Avoid a few unneeded test failures in sysparams .c.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 89a170ffa14eb42c8e109a8ad9e86dd6122fdf3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a170ffa14eb42c8e109a8ad… Author: Rein Klazes <wijn(a)online.nl> Date: Tue Apr 7 18:34:44 2009 +0200 user32/tests: Avoid a few unneeded test failures in sysparams.c. --- dlls/user32/tests/sysparams.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 165226a..73b9a9a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -156,6 +156,7 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ); static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ); static int change_counter; +static int change_setworkarea_param, change_iconverticalspacing_param; static int change_last_param; static int last_bpp; static BOOL displaychange_ok = FALSE, displaychange_test_active = FALSE; @@ -176,21 +177,32 @@ static LRESULT CALLBACK SysParamsTestWndProc( HWND hWnd, UINT msg, WPARAM wParam case WM_SETTINGCHANGE: if (change_counter>0) { /* ignore these messages caused by resizing of toolbars */ - if( wParam == SPI_SETWORKAREA || - wParam == SPI_ICONVERTICALSPACING || - displaychange_test_active) + if( wParam == SPI_SETWORKAREA){ + change_setworkarea_param = 1; break; - if( change_last_param == SPI_SETWORKAREA || - change_last_param == SPI_ICONVERTICALSPACING) - { + } else if( wParam == SPI_ICONVERTICALSPACING) { + change_iconverticalspacing_param = 1; + break; + } else if( displaychange_test_active) + break; + if( !change_last_param){ change_last_param = wParam; break; } ok(0,"too many changes counter=%d last change=%d\n", change_counter,change_last_param); + change_counter++; + change_last_param = wParam; + break; } change_counter++; - change_last_param = wParam; + change_last_param = change_setworkarea_param = change_iconverticalspacing_param =0; + if( wParam == SPI_SETWORKAREA) + change_setworkarea_param = 1; + else if( wParam == SPI_ICONVERTICALSPACING) + change_iconverticalspacing_param = 1; + else + change_last_param = wParam; break; case WM_DESTROY: @@ -218,7 +230,9 @@ static void test_change_message( int action, int optional ) ok( 1 == change_counter, "Missed a message: change_counter=%d\n", change_counter ); change_counter = 0; - ok( action == change_last_param, + ok( action == change_last_param || + ( change_setworkarea_param && action == SPI_SETWORKAREA) || + ( change_iconverticalspacing_param && action == SPI_ICONVERTICALSPACING), "Wrong action got %d expected %d\n", change_last_param, action ); change_last_param = 0; } @@ -1778,20 +1792,22 @@ static void test_SPI_SETWORKAREA( void ) /* 47 */ SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); if (!test_error_msg(rc,"SPI_SETWORKAREA")) return; ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); - test_change_message( SPI_SETWORKAREA, 0 ); rc=SystemParametersInfoA( SPI_GETWORKAREA, 0, &area, 0 ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); + if( !EqualRect( &area, &curr_val)) /* no message if rect has not changed */ + test_change_message( SPI_SETWORKAREA, 0); eq( area.left, curr_val.left, "left", "%d" ); eq( area.top, curr_val.top, "top", "%d" ); eq( area.right, curr_val.right, "right", "%d" ); eq( area.bottom, curr_val.bottom, "bottom", "%d" ); - + curr_val = area; rc=SystemParametersInfoA( SPI_SETWORKAREA, 0, &old_area, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); - test_change_message( SPI_SETWORKAREA, 0 ); rc=SystemParametersInfoA( SPI_GETWORKAREA, 0, &area, 0 ); ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); + if( !EqualRect( &area, &curr_val)) /* no message if rect has not changed */ + test_change_message( SPI_SETWORKAREA, 0 ); eq( area.left, old_area.left, "left", "%d" ); eq( area.top, old_area.top, "top", "%d" ); eq( area.right, old_area.right, "right", "%d" );

1 0

Nikolay Sivov : comctl32/listview: Implement delayed header creation for ListView control.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 59148d0bb549ff8690f15f14571a715e3fdd43a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59148d0bb549ff8690f15f145… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 7 12:15:21 2009 -0400 comctl32/listview: Implement delayed header creation for ListView control. --- dlls/comctl32/listview.c | 96 ++++++++++++++++++++++++++++++++------- dlls/comctl32/tests/listview.c | 20 ++++---- 2 files changed, 88 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9d1b4ff..f06095b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1374,7 +1374,34 @@ static inline COLUMN_INFO * LISTVIEW_GetColumnInfo(const LISTVIEW_INFO *infoPtr, assert (nSubItem >= 0 && nSubItem < DPA_GetPtrCount(infoPtr->hdpaColumns)); return DPA_GetPtr(infoPtr->hdpaColumns, nSubItem); } - + +static INT LISTVIEW_CreateHeader(LISTVIEW_INFO *infoPtr) +{ + DWORD dFlags = WS_CHILD | HDS_HORZ | HDS_FULLDRAG | HDS_DRAGDROP; + HINSTANCE hInst; + + if (infoPtr->hwndHeader) return 0; + + /* setup creation flags */ + dFlags |= (LVS_NOSORTHEADER & infoPtr->dwStyle) ? 0 : HDS_BUTTONS; + dFlags |= (LVS_NOCOLUMNHEADER & infoPtr->dwStyle) ? HDS_HIDDEN : 0; + + hInst = (HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE); + + /* create header */ + infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL, dFlags, + 0, 0, 0, 0, infoPtr->hwndSelf, NULL, hInst, NULL); + if (!infoPtr->hwndHeader) return -1; + + /* set header unicode format */ + SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT, TRUE, 0); + + /* set header font */ + SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE); + + return 0; +} + static inline void LISTVIEW_GetHeaderRect(const LISTVIEW_INFO *infoPtr, INT nSubItem, LPRECT lprc) { *lprc = LISTVIEW_GetColumnInfo(infoPtr, nSubItem)->rcHeader; @@ -6859,6 +6886,7 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, COLUMN_INFO *lpColumnInfo; INT nNewColumn; HDITEMW hdi; + UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; TRACE("(nColumn=%d, lpColumn=%s, isW=%d)\n", nColumn, debuglvcolumn_t(lpColumn, isW), isW); @@ -6887,6 +6915,14 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, hdi.lParam = lpColumn->iSubItem; } + /* create header if not present */ + LISTVIEW_CreateHeader(infoPtr); + if (!(LVS_NOCOLUMNHEADER & infoPtr->dwStyle) && + (LVS_REPORT == uView) && (WS_VISIBLE & infoPtr->dwStyle)) + { + ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); + } + /* insert item in header control */ nNewColumn = SendMessageW(infoPtr->hwndHeader, isW ? HDM_INSERTITEMW : HDM_INSERTITEMA, @@ -8079,7 +8115,6 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) { LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongPtrW(hwnd, 0); UINT uView = lpcs->style & LVS_TYPEMASK; - DWORD dFlags = WS_CHILD | HDS_HORZ | HDS_FULLDRAG | HDS_DRAGDROP; TRACE("(lpcs=%p)\n", lpcs); @@ -8087,28 +8122,19 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->notifyFormat = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, (LPARAM)NF_QUERY); - /* setup creation flags */ - dFlags |= (LVS_NOSORTHEADER & lpcs->style) ? 0 : HDS_BUTTONS; - dFlags |= (LVS_NOCOLUMNHEADER & lpcs->style) ? HDS_HIDDEN : 0; - - /* create header */ - infoPtr->hwndHeader = CreateWindowW(WC_HEADERW, NULL, dFlags, - 0, 0, 0, 0, hwnd, NULL, - lpcs->hInstance, NULL); - if (!infoPtr->hwndHeader) return -1; - - /* set header unicode format */ - SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT, TRUE, 0); - - /* set header font */ - SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE); + if ((uView == LVS_REPORT) && (lpcs->style & WS_VISIBLE)) + { + if (LISTVIEW_CreateHeader(infoPtr) < 0) return -1; + } + else + infoPtr->hwndHeader = 0; /* init item size to avoid division by 0 */ LISTVIEW_UpdateItemSize (infoPtr); if (uView == LVS_REPORT) { - if (!(LVS_NOCOLUMNHEADER & lpcs->style)) + if (!(LVS_NOCOLUMNHEADER & lpcs->style) && (WS_VISIBLE & lpcs->style)) { ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); } @@ -9553,6 +9579,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, HDLAYOUT hl; WINDOWPOS wp; + LISTVIEW_CreateHeader( infoPtr ); + hl.prc = &infoPtr->rcList; hl.pwpos = &wp; SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl ); @@ -9603,6 +9631,34 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /*** * DESCRIPTION: + * Processes WM_SHOWWINDOW messages. + * + * PARAMETER(S): + * [I] infoPtr : valid pointer to the listview structure + * [I] bShown : window is being shown (FALSE when hidden) + * [I] iStatus : window show status + * + * RETURN: + * Zero + */ +static LRESULT LISTVIEW_ShowWindow(LISTVIEW_INFO *infoPtr, BOOL bShown, INT iStatus) +{ + UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; + + /* header delayed creation */ + if ((uView == LVS_REPORT) && bShown) + { + LISTVIEW_CreateHeader(infoPtr); + + if (!(LVS_NOCOLUMNHEADER & infoPtr->dwStyle)) + ShowWindow(infoPtr->hwndHeader, SW_SHOWNORMAL); + } + + return 0; +} + +/*** + * DESCRIPTION: * Window procedure of the listview control. * */ @@ -10064,6 +10120,10 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SETREDRAW: return LISTVIEW_SetRedraw(infoPtr, (BOOL)wParam); + case WM_SHOWWINDOW: + LISTVIEW_ShowWindow(infoPtr, (BOOL)wParam, (INT)lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + case WM_SIZE: return LISTVIEW_Size(infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 84db3d2..6f3524b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -787,8 +787,8 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; @@ -803,8 +803,8 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; @@ -851,8 +851,8 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; @@ -868,12 +868,12 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); ShowWindow(hList, SW_SHOW); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header shouldn't be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ok(IsWindow(hHeader), "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); }

1 0

Stefan Dösinger : wined3d: Merge indexbuffer and buffer implementations.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 2a7a2371709233bc87071bbab43e87955cb122ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a7a2371709233bc87071bbab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 13:38:56 2009 +0200 wined3d: Merge indexbuffer and buffer implementations. --- dlls/wined3d/buffer.c | 303 +++++----------------------------------- dlls/wined3d/device.c | 76 +++-------- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 19 +--- 5 files changed, 59 insertions(+), 347 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a7a2371709233bc87071…

1 0

Alexandre Julliard : gdi32: Fix SetEnhMetaFileBits last error handling.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 55fc90220fea198ff9a62154e8a411b6de78e928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fc90220fea198ff9a62154e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:44:12 2009 +0200 gdi32: Fix SetEnhMetaFileBits last error handling. --- dlls/gdi32/enhmetafile.c | 8 ++++++-- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 9ca8517..25b3389 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -252,12 +252,16 @@ HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, BOOL on_disk ) HENHMETAFILE hmf; ENHMETAFILEOBJ *metaObj; - if (emh->iType != EMR_HEADER || emh->dSignature != ENHMETA_SIGNATURE || + if (emh->iType != EMR_HEADER) + { + SetLastError(ERROR_INVALID_DATA); + return 0; + } + if (emh->dSignature != ENHMETA_SIGNATURE || (emh->nBytes & 3)) /* refuse to load unaligned EMF as Windows does */ { WARN("Invalid emf header type 0x%08x sig 0x%08x.\n", emh->iType, emh->dSignature); - SetLastError(ERROR_INVALID_DATA); return 0; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 233d1e9..077977e 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2349,7 +2349,6 @@ static void test_SetEnhMetaFileBits(void) ok(!hemf || broken(hemf != NULL), /* Win9x, WinMe */ "SetEnhMetaFileBits should fail\n"); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError()); DeleteEnhMetaFile(hemf); @@ -2360,7 +2359,6 @@ static void test_SetEnhMetaFileBits(void) ok(!hemf || broken(hemf != NULL), /* Win9x, WinMe */ "SetEnhMetaFileBits should fail\n"); - todo_wine ok(GetLastError() == 0xdeadbeef, "Expected deadbeef, got %u\n", GetLastError()); DeleteEnhMetaFile(hemf); }

1 0

Alexandre Julliard : gdi32: Remove Get/SetDCState16 implementation, it should not be used by apps.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: 1380f0ac4046f7f5495e83fb9d90bb588925905f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1380f0ac4046f7f5495e83fb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:13:45 2009 +0200 gdi32: Remove Get/SetDCState16 implementation, it should not be used by apps. --- dlls/gdi32/gdi16.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 643f682..2f49948 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3388,7 +3388,8 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) */ HDC16 WINAPI GetDCState16( HDC16 hdc ) { - return HDC_16( get_dc_state( HDC_32(hdc) )); + ERR( "no longer supported\n" ); + return 0; } @@ -3397,7 +3398,7 @@ HDC16 WINAPI GetDCState16( HDC16 hdc ) */ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs ) { - set_dc_state( HDC_32(hdc), HDC_32(hdcs) ); + ERR( "no longer supported\n" ); } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary.
by Alexandre Julliard April 8, 2009

April 8, 2009

Module: wine Branch: master Commit: bbb1626bf8629e20778b514c2aed26a7a341f553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1626bf8629e20778b514c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:32:58 2009 +0200 gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary. --- dlls/gdi32/dc.c | 12 +++--------- dlls/gdi32/enhmfdrv/dc.c | 13 ++++++++++--- dlls/gdi32/tests/metafile.c | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ae58479..4694c3e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -578,19 +578,13 @@ INT WINAPI SaveDC( HDC hdc ) DC * dc; INT ret; - dc = get_dc_ptr( hdc ); - if (!dc) return 0; + if (!(dc = get_dc_ptr( hdc ))) return 0; if(dc->funcs->pSaveDC) - { ret = dc->funcs->pSaveDC( dc->physDev ); - if(ret) - ret = ++dc->saveLevel; - release_dc_ptr( dc ); - return ret; - } + else + ret = save_dc_state( hdc ); - ret = save_dc_state( hdc ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f08b17d..bd5dbd5 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -25,10 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) { + EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + INT ret = save_dc_state( physDev->hdc ); EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - return EMFDRV_WriteRecord( dev, &emr.emr ); + + if (ret) + { + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + EMFDRV_WriteRecord( dev, &emr.emr ); + } + return ret; } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 63c2cc4..2524af1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -643,6 +643,11 @@ static void test_SaveDC(void) todo_wine ok(hFontOld == hFontCheck && hFontCheck != hFont && hFontCheck != hFont2, "Font not reverted with DC Restore\n"); + ret = RestoreDC(hdcMetafile, -20); + ok(!ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + ok(!ret, "ret = %d\n", ret); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -702,7 +707,7 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -2, -2, NULL); SetViewportOrgEx(hdcMetafile, 20, 20, NULL); @@ -715,7 +720,7 @@ static void test_mf_SaveDC(void) SetBkColor( hdcMetafile, 0 ); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -3, -3, NULL); SetViewportOrgEx(hdcMetafile, 30, 30, NULL); @@ -731,10 +736,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, -1); - ok(ret, "ret = %d\n", ret); + todo_wine ok(ret, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = RestoreDC(hdcMetafile, 1); todo_wine ok(ret, "ret = %d\n", ret); @@ -748,10 +753,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); memset(&orig_lf, 0, sizeof(orig_lf)); orig_lf.lfCharSet = ANSI_CHARSET; @@ -774,10 +779,19 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, 1); + todo_wine ok(ret, "ret = %d\n", ret); hFontCheck = SelectObject(hdcMetafile, hFontOld); ok(hFontOld != hFontCheck && hFontCheck == hFont2, "Font incorrectly reverted with DC Restore\n"); + /* restore level is ignored */ + ret = RestoreDC(hdcMetafile, -20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 0); + todo_wine ok(ret, "ret = %d\n", ret); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0