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

Alexandre Julliard : user32/tests: Add an optional message for Win95.
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 4bd4812b8030aac32579a532ff7ead9e8ccab243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd4812b8030aac32579a532f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 11:54:55 2009 +0200 user32/tests: Add an optional message for Win95. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f6b5bd..1db5146 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8248,6 +8248,7 @@ static const struct message ScrollWindowPaint1[] = { { WM_GETTEXT, sent|beginpaint|optional }, { WM_GETTEXT, sent|beginpaint|optional }, { WM_GETTEXT, sent|beginpaint|optional }, + { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, { 0 } };

1 0

Alexandre Julliard : include: Fix the C_ASSERT macro for the latest gcc.
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 5d31eb93771f00f94b907cd19b251adcb907a49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d31eb93771f00f94b907cd19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 13 10:32:03 2009 +0200 include: Fix the C_ASSERT macro for the latest gcc. --- include/winnt.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index abcc502..93c7961 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -291,10 +291,8 @@ extern "C" { #if defined(_MSC_VER) # define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] -#elif defined(__GNUC__) -# define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] __attribute__((unused)) #else -# define C_ASSERT(e) +# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) #endif /* Eliminate Microsoft C/C++ compiler warning 4715 */

1 0

Henri Verbeet : wined3d: Directly call basetexture_apply_state_changes().
by Alexandre Julliard May 13, 2009

May 13, 2009

Module: wine Branch: master Commit: 91c3a5eac195360e6598537594edfeccb685bdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c3a5eac195360e659853759… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 12 16:19:55 2009 +0200 wined3d: Directly call basetexture_apply_state_changes(). All the implementations of IWineD3DBaseTexture::ApplyStateChanges() forward to basetexture_apply_state_changes(). --- dlls/wined3d/basetexture.c | 4 +++- dlls/wined3d/cubetexture.c | 9 --------- dlls/wined3d/state.c | 5 +++-- dlls/wined3d/texture.c | 8 -------- dlls/wined3d/volumetexture.c | 10 ---------- include/wine/wined3d.idl | 4 ---- 6 files changed, 6 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index caf2148..359e3d8 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -322,13 +322,15 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, GLint textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(iface); BOOL cond_np2 = IWineD3DBaseTexture_IsCondNP2(iface); + TRACE("iface %p, textureStates %p, samplerStates %p\n", iface, textureStates, samplerStates); + if(This->baseTexture.is_srgb) { states = This->baseTexture.srgbstates; } else { states = This->baseTexture.states; } - /* ApplyStateChanges relies on the correct texture being bound and loaded. */ + /* This function relies on the correct texture being bound and loaded. */ if(samplerStates[WINED3DSAMP_ADDRESSU] != states[WINED3DTEXSTA_ADDRESSU]) { state = samplerStates[WINED3DSAMP_ADDRESSU]; diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index ce5f6b6..f29db22 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -257,14 +257,6 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_IsCondNP2(IWineD3DCubeTexture *iface) return FALSE; } -static void WINAPI IWineD3DCubeTextureImpl_ApplyStateChanges(IWineD3DCubeTexture *iface, - const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) { - TRACE("(%p) : relay to BaseTexture\n", iface); - basetexture_apply_state_changes((IWineD3DBaseTexture *)iface, textureStates, samplerStates); -} - - /* ******************************************* IWineD3DCubeTexture IWineD3DCubeTexture parts follow ******************************************* */ @@ -399,7 +391,6 @@ const IWineD3DCubeTextureVtbl IWineD3DCubeTexture_Vtbl = IWineD3DCubeTextureImpl_BindTexture, IWineD3DCubeTextureImpl_GetTextureDimensions, IWineD3DCubeTextureImpl_IsCondNP2, - IWineD3DCubeTextureImpl_ApplyStateChanges, /* IWineD3DCubeTexture */ IWineD3DCubeTextureImpl_Destroy, IWineD3DCubeTextureImpl_GetLevelDesc, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ad1593c..e9f664c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3308,7 +3308,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(!texture) return; /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates - * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the + * basetexture_apply_state_changes() multiplies the set matrix with a fixup matrix. Before the * scaling is reapplied or removed, the texture matrix has to be reapplied * * The mapped stage is already active because the sampler() function below, which is part of the @@ -3356,7 +3356,8 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont IWineD3DBaseTextureImpl *tex_impl = (IWineD3DBaseTextureImpl *) stateblock->textures[sampler]; tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); - IWineD3DBaseTexture_ApplyStateChanges(stateblock->textures[sampler], stateblock->textureState[sampler], stateblock->samplerState[sampler]); + basetexture_apply_state_changes(stateblock->textures[sampler], + stateblock->textureState[sampler], stateblock->samplerState[sampler]); if (GL_SUPPORT(EXT_TEXTURE_LOD_BIAS)) { tmpvalue.d = stateblock->samplerState[sampler][WINED3DSAMP_MIPMAPLODBIAS]; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dda4353..5981a33 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -271,13 +271,6 @@ static BOOL WINAPI IWineD3DTextureImpl_IsCondNP2(IWineD3DTexture *iface) { return This->cond_np2; } -static void WINAPI IWineD3DTextureImpl_ApplyStateChanges(IWineD3DTexture *iface, - const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) { - TRACE("(%p) : relay to BaseTexture\n", iface); - basetexture_apply_state_changes((IWineD3DBaseTexture *)iface, textureStates, samplerStates); -} - /* ******************************************* IWineD3DTexture IWineD3DTexture parts follow ******************************************* */ @@ -401,7 +394,6 @@ const IWineD3DTextureVtbl IWineD3DTexture_Vtbl = IWineD3DTextureImpl_BindTexture, IWineD3DTextureImpl_GetTextureDimensions, IWineD3DTextureImpl_IsCondNP2, - IWineD3DTextureImpl_ApplyStateChanges, /* IWineD3DTexture */ IWineD3DTextureImpl_Destroy, IWineD3DTextureImpl_GetLevelDesc, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 41a1160..680df93 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -211,15 +211,6 @@ static BOOL WINAPI IWineD3DVolumeTextureImpl_IsCondNP2(IWineD3DVolumeTexture *if return FALSE; } -static void WINAPI IWineD3DVolumeTextureImpl_ApplyStateChanges(IWineD3DVolumeTexture *iface, - const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) { - IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - TRACE("(%p) : nothing to do, passing to base texture\n", This); - basetexture_apply_state_changes((IWineD3DBaseTexture *)iface, textureStates, samplerStates); -} - - /* ******************************************* IWineD3DVolumeTexture IWineD3DVolumeTexture parts follow ******************************************* */ @@ -330,7 +321,6 @@ const IWineD3DVolumeTextureVtbl IWineD3DVolumeTexture_Vtbl = IWineD3DVolumeTextureImpl_BindTexture, IWineD3DVolumeTextureImpl_GetTextureDimensions, IWineD3DVolumeTextureImpl_IsCondNP2, - IWineD3DVolumeTextureImpl_ApplyStateChanges, /* volume texture */ IWineD3DVolumeTextureImpl_Destroy, IWineD3DVolumeTextureImpl_GetLevelDesc, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3845ded..7a476e8 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2616,10 +2616,6 @@ interface IWineD3DBaseTexture : IWineD3DResource ); BOOL IsCondNP2( ); - void ApplyStateChanges( - const DWORD texture_states[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1] - ); } [

1 0

Huw Davies : ole32/tests: Add tests to show the WdtpInterfacePointer marshal data looks like the result of CoMarshalInterface .
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: b045342ae891b6ef8570adf33cfd17a57e62043c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b045342ae891b6ef8570adf33… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 12 12:20:32 2009 +0100 ole32/tests: Add tests to show the WdtpInterfacePointer marshal data looks like the result of CoMarshalInterface. --- dlls/ole32/tests/usrmarshal.c | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 51223e5..b6e37fa 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -512,7 +512,6 @@ static void test_marshal_WdtpInterfacePointer(void) IUnknown *unk; IUnknown *unk2; unsigned char *wireip; - const IID *iid; /* shows that the WdtpInterfacePointer functions don't marshal anything for * NULL pointers, so code using these functions must handle that case @@ -538,27 +537,32 @@ static void test_marshal_WdtpInterfacePointer(void) wireip = buffer; if (size >= 0x4c) { + HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); + IStream *stm; + void *ptr; + LARGE_INTEGER pos; + DWORD h_size; + ok(buffer_end == buffer + 0x4c, "buffer_end %p buffer %p\n", buffer_end, buffer); ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0x8 should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 0x1, "wireip + 0xc should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - iid = (const IID *)wireip; - ok(IsEqualIID(iid, &IID_IUnknown), - "wireip + 0x10 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", - iid->Data1, iid->Data2, iid->Data3, - iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3], - iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]); - wireip += sizeof(IID); - ok(*(DWORD *)wireip == 0, "wireip + 0x1c should be 0 instead of 0x%08x\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == 5, "wireip + 0x20 should be 5 instead of %d\n", *(DWORD *)wireip); - wireip += sizeof(DWORD); - /* the rest is dynamic so can't really be tested */ + + /* The remaining 0x44 bytes are the result of CoMarshalInterface */ + + CreateStreamOnHGlobal(h, TRUE, &stm); + CoMarshalInterface(stm, &IID_IUnknown, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + h_size = GlobalSize(h); + ok(h_size == 0x44, "size %x\n", h_size); + + ptr = GlobalLock(h); + ok(!memcmp(ptr, wireip, 0x44), "buffer mismatch\n"); + GlobalUnlock(h); + pos.QuadPart = 0; + IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL); + CoReleaseMarshalData(stm); + IStream_Release(stm); } unk2 = NULL;

1 0

Huw Davies : ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive .
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: 782ec11a0df59dc8a6f4088d12e7ec9b681ead79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782ec11a0df59dc8a6f4088d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 12 11:31:10 2009 +0100 ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive. --- dlls/ole32/tests/usrmarshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 3411cc2..51223e5 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -530,14 +530,15 @@ static void test_marshal_WdtpInterfacePointer(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); todo_wine - ok(size > 28, "size should be > 28 bytes, not %d\n", size); + ok(size >= 0x4c, "size should be >= 0x4c bytes, not %d\n", size); trace("WdtpInterfacePointer_UserSize returned %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); wireip = buffer; - if (size >= 28) + if (size >= 0x4c) { + ok(buffer_end == buffer + 0x4c, "buffer_end %p buffer %p\n", buffer_end, buffer); ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip);

1 0

Nikolay Sivov : comctl32/header: Make Header_* macros match PSDK.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: b4e7e257e07ee21f2189e41101d13dceefe60c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e7e257e07ee21f2189e4110… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 11 21:19:24 2009 +0400 comctl32/header: Make Header_* macros match PSDK. --- dlls/comctl32/listview.c | 7 ++++--- include/commctrl.h | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f268855..f31175f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4698,7 +4698,7 @@ static BOOL LISTVIEW_DeleteColumn(LISTVIEW_INFO *infoPtr, INT nColumn) LISTVIEW_GetHeaderRect(infoPtr, nColumn, &rcCol); - if (!Header_DeleteItem(infoPtr->hwndHeader, nColumn)) + if (!SendMessageW(infoPtr->hwndHeader, HDM_DELETEITEM, nColumn, 0)) return FALSE; Free(DPA_GetPtr(infoPtr->hdpaColumns, nColumn)); @@ -6019,7 +6019,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR } if (infoPtr->hwndHeader) - return Header_GetItemRect(infoPtr->hwndHeader, lprc->top, lprc); + return SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, lprc->top, (LPARAM)lprc); else { memset(lprc, 0, sizeof(RECT)); @@ -6983,7 +6983,8 @@ static INT LISTVIEW_InsertColumnT(LISTVIEW_INFO *infoPtr, INT nColumn, if (DPA_InsertPtr(infoPtr->hdpaColumns, nNewColumn, lpColumnInfo) == -1) goto fail; if (lpColumn->mask & LVCF_FMT) lpColumnInfo->fmt = lpColumn->fmt; - if (!Header_GetItemRect(infoPtr->hwndHeader, nNewColumn, &lpColumnInfo->rcHeader)) goto fail; + if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMRECT, nNewColumn, (LPARAM)&lpColumnInfo->rcHeader)) + goto fail; /* now we have to actually adjust the data */ if (!(infoPtr->dwStyle & LVS_OWNERDATA) && infoPtr->nItemCount > 0) diff --git a/include/commctrl.h b/include/commctrl.h index d3c24cd..5561e1d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -974,14 +974,14 @@ typedef struct tagNMHDFILTERBTNCLICK } NMHDFILTERBTNCLICK, *LPNMHDFILTERBTNCLICK; #define Header_GetItemCount(hwndHD) \ - (INT)SNDMSGA((hwndHD),HDM_GETITEMCOUNT,0,0L) + (INT)SNDMSG((hwndHD),HDM_GETITEMCOUNT,0,0L) #define Header_InsertItemA(hwndHD,i,phdi) \ (INT)SNDMSGA((hwndHD),HDM_INSERTITEMA,(WPARAM)(INT)(i),(LPARAM)(const HDITEMA*)(phdi)) #define Header_InsertItemW(hwndHD,i,phdi) \ (INT)SNDMSGW((hwndHD),HDM_INSERTITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi)) #define Header_InsertItem WINELIB_NAME_AW(Header_InsertItem) #define Header_DeleteItem(hwndHD,i) \ - (BOOL)SNDMSGA((hwndHD),HDM_DELETEITEM,(WPARAM)(INT)(i),0L) + (BOOL)SNDMSG((hwndHD),HDM_DELETEITEM,(WPARAM)(INT)(i),0L) #define Header_GetItemA(hwndHD,i,phdi) \ (BOOL)SNDMSGA((hwndHD),HDM_GETITEMA,(WPARAM)(INT)(i),(LPARAM)(HDITEMA*)(phdi)) #define Header_GetItemW(hwndHD,i,phdi) \ @@ -993,27 +993,27 @@ typedef struct tagNMHDFILTERBTNCLICK (BOOL)SNDMSGW((hwndHD),HDM_SETITEMW,(WPARAM)(INT)(i),(LPARAM)(const HDITEMW*)(phdi)) #define Header_SetItem WINELIB_NAME_AW(Header_SetItem) #define Header_Layout(hwndHD,playout) \ - (BOOL)SNDMSGA((hwndHD),HDM_LAYOUT,0,(LPARAM)(LPHDLAYOUT)(playout)) + (BOOL)SNDMSG((hwndHD),HDM_LAYOUT,0,(LPARAM)(LPHDLAYOUT)(playout)) #define Header_GetItemRect(hwnd,iItem,lprc) \ - (BOOL)SNDMSGA((hwnd),HDM_GETITEMRECT,(WPARAM)iItem,(LPARAM)lprc) + (BOOL)SNDMSG((hwnd),HDM_GETITEMRECT,(WPARAM)iItem,(LPARAM)lprc) #define Header_SetImageList(hwnd,himl) \ - (HIMAGELIST)SNDMSGA((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) + (HIMAGELIST)SNDMSG((hwnd),HDM_SETIMAGELIST,0,(LPARAM)himl) #define Header_GetImageList(hwnd) \ - (HIMAGELIST)SNDMSGA((hwnd),HDM_GETIMAGELIST,0,0) + (HIMAGELIST)SNDMSG((hwnd),HDM_GETIMAGELIST,0,0) #define Header_OrderToIndex(hwnd,i) \ - (INT)SNDMSGA((hwnd),HDM_ORDERTOINDEX,(WPARAM)i,0) + (INT)SNDMSG((hwnd),HDM_ORDERTOINDEX,(WPARAM)i,0) #define Header_CreateDragImage(hwnd,i) \ - (HIMAGELIST)SNDMSGA((hwnd),HDM_CREATEDRAGIMAGE,(WPARAM)i,0) + (HIMAGELIST)SNDMSG((hwnd),HDM_CREATEDRAGIMAGE,(WPARAM)i,0) #define Header_GetOrderArray(hwnd,iCount,lpi) \ - (BOOL)SNDMSGA((hwnd),HDM_GETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi) + (BOOL)SNDMSG((hwnd),HDM_GETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi) #define Header_SetOrderArray(hwnd,iCount,lpi) \ - (BOOL)SNDMSGA((hwnd),HDM_SETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi) + (BOOL)SNDMSG((hwnd),HDM_SETORDERARRAY,(WPARAM)iCount,(LPARAM)lpi) #define Header_SetHotDivider(hwnd,fPos,dw) \ - (INT)SNDMSGA((hwnd),HDM_SETHOTDIVIDER,(WPARAM)fPos,(LPARAM)dw) + (INT)SNDMSG((hwnd),HDM_SETHOTDIVIDER,(WPARAM)fPos,(LPARAM)dw) #define Header_SetUnicodeFormat(hwnd,fUnicode) \ - (BOOL)SNDMSGA((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) + (BOOL)SNDMSG((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define Header_GetUnicodeFormat(hwnd) \ - (BOOL)SNDMSGA((hwnd),HDM_GETUNICODEFORMAT,0,0) + (BOOL)SNDMSG((hwnd),HDM_GETUNICODEFORMAT,0,0) /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button"

1 0

Paul Vriens : comdlg32: Improve the Dutch find and replace dialogs.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: a478d765d3d40b6455d30d84af39bde08d03d6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a478d765d3d40b6455d30d84a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 12 10:17:14 2009 +0200 comdlg32: Improve the Dutch find and replace dialogs. --- dlls/comdlg32/cdlg_Nl.rc | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/cdlg_Nl.rc b/dlls/comdlg32/cdlg_Nl.rc index baeb880..6910405 100644 --- a/dlls/comdlg32/cdlg_Nl.rc +++ b/dlls/comdlg32/cdlg_Nl.rc @@ -182,7 +182,7 @@ FONT 8, "MS Shell Dlg" } -FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62 +FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 246, 72 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Tekst zoeken" FONT 8, "MS Shell Dlg" @@ -190,18 +190,18 @@ FONT 8, "MS Shell Dlg" LTEXT "&Zoek naar:", -1, 4, 8, 42, 8 EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Heel &woord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP - GROUPBOX "Zoekrichting", 1072, 107, 26, 68, 28 - CONTROL "&Omhoog", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12 - CONTROL "Om&laag", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12 - - DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuleren", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Help", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 4, 52, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Zoekrichting", 1072, 117, 26, 58, 38 + CONTROL "&Omhoog", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 121, 38, 40, 12 + CONTROL "Om&laag", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 121, 50, 40, 12 + + DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182, 5, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuleren", IDCANCEL, 182, 23, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Help", pshHelp , 182, 45, 60, 14, WS_GROUP | WS_TABSTOP } -REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94 +REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 240, 94 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Tekst vervangen" FONT 8, "MS Shell Dlg" @@ -211,13 +211,13 @@ FONT 8, "MS Shell Dlg" LTEXT "Vervang &door:", -1, 4, 26, 48, 8 EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Heel &woord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 5, 62, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "Volgende zoeken", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Ve&rvangen", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Alles vervangen", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Annuleren", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Help", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Volgende zoeken", IDOK, 174, 4, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Ve&rvangen", psh1 , 174, 21, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Alles vervangen", psh2 , 174, 38, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 174, 55, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Help", pshHelp , 174, 75, 60, 14, WS_GROUP | WS_TABSTOP } NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164

1 0

Paul Vriens : notepad: Fix the Dutch translations.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: a225aaa8945c79d6305a856b2ebd58d5370cdd9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a225aaa8945c79d6305a856b2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 12 10:11:47 2009 +0200 notepad: Fix the Dutch translations. --- programs/notepad/Nl.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Nl.rc b/programs/notepad/Nl.rc index e2d9213..e4d1221 100644 --- a/programs/notepad/Nl.rc +++ b/programs/notepad/Nl.rc @@ -49,15 +49,16 @@ POPUP "Be&werken" { MENUITEM "&Lettertype instellen...", CMD_FONT } POPUP "&Zoeken" { - MENUITEM "&Zoeken...\tCtrl+Z", CMD_SEARCH - MENUITEM "&Volgende zoeken\tF3", CMD_SEARCH_NEXT + MENUITEM "&Zoeken...\tCtrl+Z", CMD_SEARCH + MENUITEM "V&olgende zoeken\tF3", CMD_SEARCH_NEXT + MENUITEM "&Vervangen...\tCtrl+H", CMD_REPLACE } POPUP "&Help" { MENUITEM "&Help-onderwerpen", CMD_HELP_CONTENTS MENUITEM "&Zoeken...", CMD_HELP_SEARCH MENUITEM "&Hulp bij Help", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Over Notepad", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Alexandre Julliard : user32/tests: Add more systematic support for ignoring certain messages.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: d6c8a003e106921e0a2f1de918b0a71eed3e9dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c8a003e106921e0a2f1de91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 12 12:09:30 2009 +0200 user32/tests: Add more systematic support for ignoring certain messages. --- dlls/user32/tests/msg.c | 77 +++++++++++++++++++--------------------------- dlls/user32/tests/win.c | 12 +++++++- 2 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 782ab8a..6f6b5bd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1557,6 +1557,8 @@ static const struct message WmEnableWindowSeq_1[] = { { WM_CANCELMODE, sent|wparam|lparam, 0, 0 }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook|optional }, + { WM_KILLFOCUS, sent|optional }, { WM_ENABLE, sent|wparam|lparam, FALSE, 0 }, { 0 } }; @@ -1759,6 +1761,16 @@ static const char *get_winpos_flags(UINT flags) #undef DUMP } +static BOOL ignore_message( UINT message ) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DEVICECHANGE); +} + #define add_message(msg) add_message_(__LINE__,msg); static void add_message_(int line, const struct recvd_message *msg) @@ -1863,6 +1875,8 @@ static void add_message_(int line, const struct recvd_message *msg) sprintf( seq->output, "%s: %p %04x wp %08lx lp %08lx", msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); } + if (msg->flags & (sent|posted|parent|defwinproc|beginpaint)) + sprintf( seq->output + strlen(seq->output), " (flags %x)", msg->flags ); } } @@ -3202,9 +3216,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_MDIGETACTIVE && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -3231,9 +3243,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { switch (message) { @@ -3281,9 +3291,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -3898,16 +3906,15 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam { struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { /* ignore */ - case WM_GETICON: - case WM_GETOBJECT: case WM_MOUSEMOVE: case WM_NCMOUSEMOVE: case WM_NCMOUSELEAVE: case WM_SETCURSOR: - case WM_DEVICECHANGE: return 0; case WM_NCHITTEST: return HTCLIENT; @@ -5157,11 +5164,10 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ case WM_SYNCPAINT: break; case BM_SETSTATE: @@ -5318,7 +5324,7 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -5420,9 +5426,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -6657,10 +6661,8 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) /* ignore some unwanted messages */ if (msg.message == WM_MOUSEMOVE || - msg.message == WM_GETICON || - msg.message == WM_GETOBJECT || msg.message == WM_TIMER || - msg.message == WM_DEVICECHANGE) + ignore_message( msg.message )) continue; log_msg.hwnd = msg.hwnd; @@ -6902,8 +6904,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, LRESULT ret; struct recvd_message msg; - /* ignore registered messages */ - if (message >= 0xc000) return 0; + if (ignore_message( message )) return 0; switch (message) { @@ -6966,9 +6967,6 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_MOUSEACTIVATE: case WM_NCMOUSEMOVE: case WM_SETCURSOR: - case WM_GETICON: - case WM_GETOBJECT: - case WM_DEVICECHANGE: case WM_IME_SELECT: return 0; } @@ -7038,11 +7036,10 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ case WM_QUERYENDSESSION: case WM_ENDSESSION: lParam &= ~0x01; /* Vista adds a 0x01 flag */ @@ -7078,10 +7075,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ - - /* ignore registered messages */ - if (message >= 0xc000) return 0; + if (ignore_message( message )) return 0; if (log_all_parent_messages || message == WM_PARENTNOTIFY || message == WM_CANCELMODE || @@ -7145,7 +7139,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; if (test_def_id) { @@ -8773,7 +8767,7 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -10271,12 +10265,7 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR { struct recvd_message msg; - switch (message) - { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ - } + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -11052,9 +11041,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETOBJECT && - message != WM_GETICON && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1f0420e..13e5d67 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -118,6 +118,16 @@ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_ } } +static BOOL ignore_message( UINT message ) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DEVICECHANGE); +} + static BOOL CALLBACK EnumChildProc( HWND hwndChild, LPARAM lParam) { (*(LPINT)lParam)++; @@ -2713,7 +2723,7 @@ static BOOL wait_for_message( MSG *msg ) if (ret) { if (msg->message == WM_PAINT) DispatchMessage(msg); - else if (msg->message < 0xc000) break; /* skip registered messages */ + else if (!ignore_message(msg->message)) break; } else if (MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ) == WAIT_TIMEOUT) break; }

1 0

Paul Vriens : shell32: Improve the Dutch 'about' message box.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: 4082eecc2a004f9dd63826f1545a5ccf5006f58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4082eecc2a004f9dd63826f15… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 12 10:30:17 2009 +0200 shell32: Improve the Dutch 'about' message box. --- dlls/shell32/shell32_Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 7bea2e8..71a0545 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -160,12 +160,12 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Info %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP PUSHBUTTON "Wine &licentie...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30

1 0