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

Hans Leidekker : hnetcfg: Add a stub implementation of INetFwAuthorizedApplication and INetFwAuthorizedApplications .
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 68d64de4acc1303d7b697bc0e686734ca4113816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d64de4acc1303d7b697bc0e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:15:11 2009 +0200 hnetcfg: Add a stub implementation of INetFwAuthorizedApplication and INetFwAuthorizedApplications. --- dlls/hnetcfg/Makefile.in | 1 + dlls/hnetcfg/apps.c | 500 ++++++++++++++++++++++++++++++++++++++++ dlls/hnetcfg/hnetcfg_private.h | 2 + dlls/hnetcfg/profile.c | 4 +- 4 files changed, 505 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68d64de4acc1303d7b697…

1 0

Hans Leidekker : hnetcfg: Add a stub implementation of INetFwProfile.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: b915aadb37b6cb977743f21c31a0cb87212d90f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b915aadb37b6cb977743f21c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:14:47 2009 +0200 hnetcfg: Add a stub implementation of INetFwProfile. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/policy.c | 4 +- dlls/hnetcfg/profile.c | 329 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 334 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b915aadb37b6cb977743f…

1 0

Hans Leidekker : hnetcfg: Add a stub implementation of INetFwPolicy.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 49270f4bb6fa81581bbfcc28e054f8bae20e94a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49270f4bb6fa81581bbfcc28e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:14:23 2009 +0200 hnetcfg: Add a stub implementation of INetFwPolicy. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/manager.c | 4 +- dlls/hnetcfg/policy.c | 196 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 201 insertions(+), 3 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index adb4a70..f506e27 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = kernel32 C_SRCS = \ hnetcfg.c \ - manager.c + manager.c \ + policy.c @MAKE_DLL_RULES@ diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 641b989..ba59ae9 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -17,3 +17,4 @@ */ HRESULT NetFwMgr_create(IUnknown *, LPVOID *); +HRESULT NetFwPolicy_create(IUnknown *, LPVOID *); diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index b5504c0..7d6a7a5 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -150,8 +150,8 @@ static HRESULT WINAPI fw_manager_get_LocalPolicy( { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p, %p\n", This, localPolicy); - return E_NOTIMPL; + TRACE("%p, %p\n", This, localPolicy); + return NetFwPolicy_create( NULL, (void **)localPolicy ); } static HRESULT WINAPI fw_manager_get_CurrentProfileType( diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c new file mode 100644 index 0000000..bc065a5 --- /dev/null +++ b/dlls/hnetcfg/policy.c @@ -0,0 +1,196 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * 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.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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_policy +{ + const INetFwPolicyVtbl *vtbl; + LONG refs; +} fw_policy; + +static inline fw_policy *impl_from_INetFwPolicy( INetFwPolicy *iface ) +{ + return (fw_policy *)((char *)iface - FIELD_OFFSET( fw_policy, vtbl )); +} + +static ULONG WINAPI fw_policy_AddRef( + INetFwPolicy *iface ) +{ + fw_policy *fw_policy = impl_from_INetFwPolicy( iface ); + return InterlockedIncrement( &fw_policy->refs ); +} + +static ULONG WINAPI fw_policy_Release( + INetFwPolicy *iface ) +{ + fw_policy *fw_policy = impl_from_INetFwPolicy( iface ); + LONG refs = InterlockedDecrement( &fw_policy->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_policy); + HeapFree( GetProcessHeap(), 0, fw_policy ); + } + return refs; +} + +static HRESULT WINAPI fw_policy_QueryInterface( + INetFwPolicy *iface, + REFIID riid, + void **ppvObject ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwPolicy ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwPolicy_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_policy_GetTypeInfoCount( + INetFwPolicy *iface, + UINT *pctinfo ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_GetTypeInfo( + INetFwPolicy *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_GetIDsOfNames( + INetFwPolicy *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_Invoke( + INetFwPolicy *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_get_CurrentProfile( + INetFwPolicy *iface, + INetFwProfile **profile ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p, %p\n", This, profile); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_policy_GetProfileByType( + INetFwPolicy *iface, + NET_FW_PROFILE_TYPE profileType, + INetFwProfile **profile ) +{ + fw_policy *This = impl_from_INetFwPolicy( iface ); + + FIXME("%p, %u, %p\n", This, profileType, profile); + return E_NOTIMPL; +} + +static const struct INetFwPolicyVtbl fw_policy_vtbl = +{ + fw_policy_QueryInterface, + fw_policy_AddRef, + fw_policy_Release, + fw_policy_GetTypeInfoCount, + fw_policy_GetTypeInfo, + fw_policy_GetIDsOfNames, + fw_policy_Invoke, + fw_policy_get_CurrentProfile, + fw_policy_GetProfileByType +}; + +HRESULT NetFwPolicy_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_policy *fp; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); + if (!fp) return E_OUTOFMEMORY; + + fp->vtbl = &fw_policy_vtbl; + fp->refs = 1; + + *ppObj = &fp->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Hans Leidekker : hnetcfg: Add a stub implementation of INetFwMgr.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: a3337935e9b81d17229a96987c1272772322b3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3337935e9b81d17229a96987… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 30 11:13:45 2009 +0200 hnetcfg: Add a stub implementation of INetFwMgr. --- dlls/hnetcfg/Makefile.in | 3 +- dlls/hnetcfg/hnetcfg_private.h | 19 +++ dlls/hnetcfg/manager.c | 240 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 261 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index b858b5a..adb4a70 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -6,7 +6,8 @@ MODULE = hnetcfg.dll IMPORTS = kernel32 C_SRCS = \ - hnetcfg.c + hnetcfg.c \ + manager.c @MAKE_DLL_RULES@ diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h new file mode 100644 index 0000000..641b989 --- /dev/null +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * 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.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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +HRESULT NetFwMgr_create(IUnknown *, LPVOID *); diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c new file mode 100644 index 0000000..b5504c0 --- /dev/null +++ b/dlls/hnetcfg/manager.c @@ -0,0 +1,240 @@ +/* + * Copyright 2009 Hans Leidekker for CodeWeavers + * + * 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.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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "initguid.h" +#include "ole2.h" +#include "netfw.h" + +#include "wine/debug.h" +#include "wine/unicode.h" +#include "hnetcfg_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); + +typedef struct fw_manager +{ + const INetFwMgrVtbl *vtbl; + LONG refs; +} fw_manager; + +static inline fw_manager *impl_from_INetFwMgr( INetFwMgr *iface ) +{ + return (fw_manager *)((char *)iface - FIELD_OFFSET( fw_manager, vtbl )); +} + +static ULONG WINAPI fw_manager_AddRef( + INetFwMgr *iface ) +{ + fw_manager *fw_manager = impl_from_INetFwMgr( iface ); + return InterlockedIncrement( &fw_manager->refs ); +} + +static ULONG WINAPI fw_manager_Release( + INetFwMgr *iface ) +{ + fw_manager *fw_manager = impl_from_INetFwMgr( iface ); + LONG refs = InterlockedDecrement( &fw_manager->refs ); + if (!refs) + { + TRACE("destroying %p\n", fw_manager); + HeapFree( GetProcessHeap(), 0, fw_manager ); + } + return refs; +} + +static HRESULT WINAPI fw_manager_QueryInterface( + INetFwMgr *iface, + REFIID riid, + void **ppvObject ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_INetFwMgr ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + INetFwMgr_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI fw_manager_GetTypeInfoCount( + INetFwMgr *iface, + UINT *pctinfo ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %p\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_GetTypeInfo( + INetFwMgr *iface, + UINT iTInfo, + LCID lcid, + ITypeInfo **ppTInfo ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_GetIDsOfNames( + INetFwMgr *iface, + REFIID riid, + LPOLESTR *rgszNames, + UINT cNames, + LCID lcid, + DISPID *rgDispId ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_Invoke( + INetFwMgr *iface, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS *pDispParams, + VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, + UINT *puArgErr ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_get_LocalPolicy( + INetFwMgr *iface, + INetFwPolicy **localPolicy ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %p\n", This, localPolicy); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_get_CurrentProfileType( + INetFwMgr *iface, + NET_FW_PROFILE_TYPE *profileType ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %p\n", This, profileType); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_RestoreDefaults( + INetFwMgr *iface ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_IsPortAllowed( + INetFwMgr *iface, + BSTR imageFileName, + NET_FW_IP_VERSION ipVersion, + LONG portNumber, + BSTR localAddress, + NET_FW_IP_PROTOCOL ipProtocol, + VARIANT *allowed, + VARIANT *restricted ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %s, %u, %d, %s, %u, %p, %p\n", This, debugstr_w(imageFileName), + ipVersion, portNumber, debugstr_w(localAddress), ipProtocol, allowed, restricted); + return E_NOTIMPL; +} + +static HRESULT WINAPI fw_manager_IsIcmpTypeAllowed( + INetFwMgr *iface, + NET_FW_IP_VERSION ipVersion, + BSTR localAddress, + BYTE type, + VARIANT *allowed, + VARIANT *restricted ) +{ + fw_manager *This = impl_from_INetFwMgr( iface ); + + FIXME("%p, %u, %s, %u, %p, %p\n", This, ipVersion, debugstr_w(localAddress), + type, allowed, restricted); + return E_NOTIMPL; +} + +static const struct INetFwMgrVtbl fw_manager_vtbl = +{ + fw_manager_QueryInterface, + fw_manager_AddRef, + fw_manager_Release, + fw_manager_GetTypeInfoCount, + fw_manager_GetTypeInfo, + fw_manager_GetIDsOfNames, + fw_manager_Invoke, + fw_manager_get_LocalPolicy, + fw_manager_get_CurrentProfileType, + fw_manager_RestoreDefaults, + fw_manager_IsPortAllowed, + fw_manager_IsIcmpTypeAllowed +}; + +HRESULT NetFwMgr_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + fw_manager *fm; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + fm = HeapAlloc( GetProcessHeap(), 0, sizeof(*fm) ); + if (!fm) return E_OUTOFMEMORY; + + fm->vtbl = &fw_manager_vtbl; + fm->refs = 1; + + *ppObj = &fm->vtbl; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +}

1 0

Rein Klazes : user32: When all items in a menu have either a bitmap or text but not both, then texts should be aligned with the bitmaps.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: c18cd1b46fdedd713b0c4113f0f57d433021c5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18cd1b46fdedd713b0c4113f… Author: Rein Klazes <wijn(a)online.nl> Date: Mon Jul 27 08:20:58 2009 +0200 user32: When all items in a menu have either a bitmap or text but not both, then texts should be aligned with the bitmaps. --- dlls/user32/menu.c | 22 ++++++---- dlls/user32/tests/menu.c | 106 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 203340a..5299c60 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -112,7 +112,7 @@ typedef struct { DWORD dwContextHelpID; DWORD dwMenuData; /* application defined value */ HMENU hSysMenuOwner; /* Handle to the dummy sys menu holder */ - SIZE maxBmpSize; /* Maximum size of the bitmap items */ + WORD textOffset; /* Offset of text when items have both bitmaps and text */ } POPUPMENU, *LPPOPUPMENU; /* internal flags for menu tracking */ @@ -1071,8 +1071,7 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner, /* Keep the size of the bitmap in callback mode to be able * to draw it correctly */ lpitem->bmpsize = size; - lppop->maxBmpSize.cx = max( lppop->maxBmpSize.cx, size.cx); - lppop->maxBmpSize.cy = max( lppop->maxBmpSize.cy, size.cy); + lppop->textOffset = max( lppop->textOffset, size.cx); lpitem->rect.right += size.cx + 2; itemheight = size.cy + 2; } @@ -1166,6 +1165,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) MENUITEM *lpitem; HDC hdc; UINT start, i; + int textandbmp = FALSE; int orgX, orgY, maxX, maxTab, maxTabWidth, maxHeight; lppop->Width = lppop->Height = 0; @@ -1177,8 +1177,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) start = 0; maxX = 2 + 1; - lppop->maxBmpSize.cx = 0; - lppop->maxBmpSize.cy = 0; + lppop->textOffset = 0; while (start < lppop->nItems) { @@ -1203,6 +1202,7 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) maxTab = max( maxTab, lpitem->xTab ); maxTabWidth = max(maxTabWidth,lpitem->rect.right-lpitem->xTab); } + if( lpitem->text && lpitem->hbmpItem) textandbmp = TRUE; } /* Finish the column (set all items to the largest width found) */ @@ -1218,6 +1218,12 @@ static void MENU_PopupMenuCalcSize( LPPOPUPMENU lppop ) } lppop->Width = maxX; + /* if none of the items have both text and bitmap then + * the text and bitmaps are all aligned on the left. If there is at + * least one item with both text and bitmap then bitmaps are + * on the left and texts left aligned with the right hand side + * of the bitmaps */ + if( !textandbmp) lppop->textOffset = 0; /* space for 3d border */ lppop->Height += MENU_BOTTOM_MARGIN; @@ -1264,8 +1270,7 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, maxY = lprect->top+1; start = 0; helpPos = ~0U; - lppop->maxBmpSize.cx = 0; - lppop->maxBmpSize.cy = 0; + lppop->textOffset = 0; while (start < lppop->nItems) { lpitem = &lppop->items[start]; @@ -1658,7 +1663,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, DT_LEFT | DT_VCENTER | DT_SINGLELINE; if( !(menu->dwStyle & MNS_CHECKORBMP)) - rect.left += menu->maxBmpSize.cx; + rect.left += menu->textOffset; if ( lpitem->fState & MFS_DEFAULT ) { @@ -1760,6 +1765,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) if( (menu = MENU_GetMenu( hmenu ))) { + TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); /* draw menu items */ if( menu->nItems) { diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a1af944..7ffe29a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -536,7 +536,7 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, mi.cbSize = sizeof(mi); mi.fMask = MIM_STYLE; pGetMenuInfo( hmenu, &mi); - mi.dwStyle |= mnuopt == 1 ? MNS_NOCHECK : MNS_CHECKORBMP; + if( mnuopt) mi.dwStyle |= mnuopt == 1 ? MNS_NOCHECK : MNS_CHECKORBMP; ret = pSetMenuInfo( hmenu, &mi); ok( ret, "SetMenuInfo failed with error %d\n", GetLastError()); } @@ -3067,6 +3067,109 @@ static void test_menu_circref(void) DestroyMenu( menu1); } +/* test how the menu texts are aligned when the menu items have + * different combinations of text and bitmaps (bug #13350) */ +static void test_menualign(void) +{ + BYTE bmfill[300]; + HMENU menu; + HBITMAP hbm1, hbm2, hbm3; + MENUITEMINFO mii = { sizeof(MENUITEMINFO)}; + DWORD ret; + HWND hwnd; + MENUINFO mi = { sizeof( MENUINFO)}; + + if( !winetest_interactive) { + skip( "interactive alignment tests.\n"); + return; + } + hwnd = CreateWindowEx(0, + "STATIC", + "Menu text alignment Test\nPlease make a selection.", + WS_OVERLAPPEDWINDOW, + 100, 100, + 300, 300, + NULL, NULL, 0, NULL); + ShowWindow( hwnd, SW_SHOW); + /* create bitmaps */ + memset( bmfill, 0xcc, sizeof( bmfill)); + hbm1 = CreateBitmap( 10,10,1,1,bmfill); + hbm2 = CreateBitmap( 20,20,1,1,bmfill); + hbm3 = CreateBitmap( 50,6,1,1,bmfill); + ok( hbm1 && hbm2 && hbm3, "Creating bitmaps failed\n"); + menu = CreatePopupMenu(); + ok( menu != NULL, "CreatePopupMenu() failed\n"); + if( pGetMenuInfo) { + mi.fMask = MIM_STYLE; + ret = pGetMenuInfo( menu, &mi); + ok( menu != NULL, "GetMenuInfo() failed\n"); + ok( 0 == mi.dwStyle, "menuinfo style is %x\n", mi.dwStyle); + } + /* test 1 */ + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = hbm1; + mii.dwTypeData = (LPSTR) " OK: menu texts are correctly left-aligned."; + ret = InsertMenuItem( menu, -1, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID ; + mii.wID = 2; + mii.hbmpItem = hbm2; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are NOT left-aligned."; + ret = InsertMenuItem( menu, -1, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 1 failed %d\n", ret); + /* test 2*/ + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 3; + mii.hbmpItem = hbm3; + mii.dwTypeData = NULL; + ret = InsertMenuItem( menu, 0, TRUE, &mii); + ok( ret, "InsertMenuItem() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = hbm1; + /* make the text a bit longer, to keep it readable */ + /* this bug is on winXP and reproduced on wine */ + mii.dwTypeData = (LPSTR) " OK: menu texts are to the right of the bitmaps........"; + ret = SetMenuItemInfo( menu, 1, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.wID = 2; + mii.hbmpItem = hbm2; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are below the first bitmap. "; + ret = SetMenuItemInfo( menu, 2, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 2 failed %d\n", ret); + /* test 3 */ + mii.fMask = MIIM_TYPE | MIIM_ID; + mii.wID = 3; + mii.fType = MFT_BITMAP; + mii.dwTypeData = (LPSTR) hbm3; + ret = SetMenuItemInfo( menu, 0, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.fMask = MIIM_BITMAP | MIIM_STRING | MIIM_ID; + mii.wID = 1; + mii.hbmpItem = NULL; + mii.dwTypeData = (LPSTR) " OK: menu texts are below the bitmap."; + ret = SetMenuItemInfo( menu, 1, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + mii.wID = 2; + mii.hbmpItem = NULL; + mii.dwTypeData = (LPSTR) " FAIL: menu texts are NOT below the bitmap."; + ret = SetMenuItemInfo( menu, 2, TRUE, &mii); + ok( ret, "SetMenuItemInfo() failed\n"); + ret = TrackPopupMenu( menu, TPM_RETURNCMD, 110, 200, 0, hwnd, NULL); + ok( ret != 2, "User indicated that menu text alignment test 3 failed %d\n", ret); + /* cleanup */ + DeleteObject( hbm1); + DeleteObject( hbm2); + DeleteObject( hbm3); + DestroyMenu( menu); + DestroyWindow( hwnd); +} + START_TEST(menu) { init_function_pointers(); @@ -3082,6 +3185,7 @@ START_TEST(menu) test_CheckMenuRadioItem(); test_menu_resource_layout(); test_InsertMenu(); + test_menualign(); } register_menu_check_class();

1 0

Luke Benstead : gdiplus: Implement stub for GdipGetImagePalette.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: ea96cd3a52875e4fd883fffb93c340f17ca44778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea96cd3a52875e4fd883fffb9… Author: Luke Benstead <kazade(a)gmail.com> Date: Fri Jul 24 12:48:15 2009 +0100 gdiplus: Implement stub for GdipGetImagePalette. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 16 ++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 008841d..c9dcd30 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -291,7 +291,7 @@ @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) @ stub GdipGetImageItemData -@ stub GdipGetImagePalette +@ stdcall GdipGetImagePalette(ptr ptr long) @ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) @ stdcall GdipGetImageRawFormat(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index a603adb..f06eb02 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1458,6 +1458,22 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, } /***************************************************************************** + * GdipGetImagePalette [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, INT size) +{ + static int calls = 0; + + if(!image) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +/***************************************************************************** * GdipSetImagePalette [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2ee24bd..71101ce 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -346,6 +346,7 @@ GpStatus WINGDIPAPI GdipGetImageFlags(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageItemData(GpImage*,ImageItemData*); +GpStatus WINGDIPAPI GdipGetImagePalette(GpImage*,ColorPalette*,INT); GpStatus WINGDIPAPI GdipGetImagePixelFormat(GpImage*,PixelFormat*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage*,UINT,UINT,GpImage**,GetThumbnailImageAbort,VOID*);

1 0

Nicolas Le Cam : shell32/tests: Fix test on temp paths that have a different long form.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: ab6ee61bd316e83810d880f21b5c9a6e4ac6851a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6ee61bd316e83810d880f21… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Jul 30 01:23:04 2009 +0200 shell32/tests: Fix test on temp paths that have a different long form. --- dlls/shell32/tests/shlexec.c | 75 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5f0776a..7ddeee3 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -587,7 +587,79 @@ static int _okChildInt(const char* file, int line, const char* key, int expected #define okChildPath(key, expected) _okChildPath(__FILE__, __LINE__, (key), (expected)) #define okChildInt(key, expected) _okChildInt(__FILE__, __LINE__, (key), (expected)) +/*** + * + * GetLongPathNameA equivalent that supports Win95 and WinNT + * + ***/ + +static DWORD get_long_path_name(const char* shortpath, char* longpath, DWORD longlen) +{ + char tmplongpath[MAX_PATH]; + const char* p; + DWORD sp = 0, lp = 0; + DWORD tmplen; + WIN32_FIND_DATAA wfd; + HANDLE goit; + + if (!shortpath || !shortpath[0]) + return 0; + + if (shortpath[1] == ':') + { + tmplongpath[0] = shortpath[0]; + tmplongpath[1] = ':'; + lp = sp = 2; + } + + while (shortpath[sp]) + { + /* check for path delimiters and reproduce them */ + if (shortpath[sp] == '\\' || shortpath[sp] == '/') + { + if (!lp || tmplongpath[lp-1] != '\\') + { + /* strip double "\\" */ + tmplongpath[lp++] = '\\'; + } + tmplongpath[lp] = 0; /* terminate string */ + sp++; + continue; + } + + p = shortpath + sp; + if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) + { + tmplongpath[lp++] = *p++; + tmplongpath[lp++] = *p++; + } + for (; *p && *p != '/' && *p != '\\'; p++); + tmplen = p - (shortpath + sp); + lstrcpyn(tmplongpath + lp, shortpath + sp, tmplen + 1); + /* Check if the file exists and use the existing file name */ + goit = FindFirstFileA(tmplongpath, &wfd); + if (goit == INVALID_HANDLE_VALUE) + return 0; + FindClose(goit); + strcpy(tmplongpath + lp, wfd.cFileName); + lp += strlen(tmplongpath + lp); + sp += tmplen; + } + tmplen = strlen(shortpath) - 1; + if ((shortpath[tmplen] == '/' || shortpath[tmplen] == '\\') && + (tmplongpath[lp - 1] != '/' && tmplongpath[lp - 1] != '\\')) + tmplongpath[lp++] = shortpath[tmplen]; + tmplongpath[lp] = 0; + + tmplen = strlen(tmplongpath) + 1; + if (tmplen <= longlen) + { + strcpy(longpath, tmplongpath); + tmplen--; /* length without 0 */ + } + return tmplen; +} /*** * @@ -986,7 +1058,8 @@ static void test_lnks(void) GetLastError()); okChildInt("argcA", 5); okChildString("argvA3", "Open"); - sprintf(filename, "%s\\test file.shlexec", tmpdir); + sprintf(params, "%s\\test file.shlexec", tmpdir); + get_long_path_name(params, filename, sizeof(filename)); okChildPath("argvA4", filename); sprintf(filename, "%s\\test_shortcut_exe.lnk", tmpdir);

1 0

Nicolas Le Cam : shell32/tests: Add test for shell links to short path containing double backslashes.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 41b2296ac0d125cc9e0966976c019aaecbf44bb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b2296ac0d125cc9e0966976… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun Jul 26 22:35:34 2009 +0200 shell32/tests: Add test for shell links to short path containing double backslashes. --- dlls/shell32/tests/shelllink.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 3ab3766..15a93db 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -48,6 +48,7 @@ static fnSHILCreateFromPath pSHILCreateFromPath; static fnSHDefExtractIconA pSHDefExtractIconA; static DWORD (WINAPI *pGetLongPathNameA)(LPCSTR, LPSTR, DWORD); +static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static const GUID _IID_IShellLinkDataList = { 0x45e2b4ae, 0xb1c3, 0x11d0, @@ -223,6 +224,7 @@ static void test_get_set(void) r = IShellLinkA_SetPath(sl, "\"c:\\nonexistent\\file\""); ok(r==S_FALSE || r == S_OK, "SetPath failed (0x%08x)\n", r); + strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); ok(!lstrcmp(buffer, "C:\\nonexistent\\file") || @@ -615,6 +617,25 @@ static void test_load_save(void) create_lnk(lnkfile, &desc, 0); check_lnk(lnkfile, &desc, 0x0); + r=pGetShortPathNameA(mydir, mypath, sizeof(mypath)); + strcpy(realpath, mypath); + strcat(realpath, "\\test.txt"); + strcat(mypath, "\\\\test.txt"); + + /* Overwrite the existing lnk file and test link to a short path with double backslashes */ + desc.description="non-executable file"; + desc.workdir=mydir; + desc.path=mypath; + desc.pidl=NULL; + desc.arguments=""; + desc.showcmd=SW_SHOWNORMAL; + desc.icon=mypath; + desc.icon_id=0; + desc.hotkey=0x1234; + create_lnk(lnkfile, &desc, 0); + desc.path=realpath; + check_lnk(lnkfile, &desc, 0x0); + r = DeleteFileA(mypath); ok(r, "failed to delete file %s (%d)\n", mypath, GetLastError()); @@ -750,6 +771,7 @@ START_TEST(shelllink) pSHDefExtractIconA = (fnSHDefExtractIconA) GetProcAddress(hmod, "SHDefExtractIconA"); pGetLongPathNameA = (void *)GetProcAddress(hkernel32, "GetLongPathNameA"); + pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x)\n", r);

1 0

Maarten Lankhorst : Revert "winealsa.drv: Re-allow fallback to waveout ( regression in dsound).".
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 9d649202bb53074f991c9c6cd1a56bcf505860d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d649202bb53074f991c9c6cd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 28 22:22:02 2009 +0200 Revert "winealsa.drv: Re-allow fallback to waveout (regression in dsound).". This reverts commit 0addd3ba5a7c1de970d1829f77969e5331ad2be0. It doesn't fix anything, it just hides the bug. --- dlls/winealsa.drv/dsoutput.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index dd95ad0..9c6d7fd 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -927,13 +927,6 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv) TRACE("driver created\n"); - /* the HAL isn't much better than the HEL if we can't do mmap() */ - if (!(WOutDev[wDevID].outcaps.dwSupport & WAVECAPS_DIRECTSOUND)) - { - WARN("MMAP not supported for this device, falling back to waveout, should be harmless\n"); - return MMSYSERR_NOTSUPPORTED; - } - *idrv = HeapAlloc(GetProcessHeap(),0,sizeof(IDsDriverImpl)); if (!*idrv) return MMSYSERR_NOMEM;

1 0

Hwang YunSong : appwiz.cpl: Updated Korean resource.
by Alexandre Julliard Aug. 3, 2009

Aug. 3, 2009

Module: wine Branch: master Commit: 227f17c3df9cc9e4300a33fe380147580ef5a593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=227f17c3df9cc9e4300a33fe3… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Jul 28 16:24:30 2009 +0900 appwiz.cpl: Updated Korean resource. --- dlls/appwiz.cpl/Ko.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/Ko.rc b/dlls/appwiz.cpl/Ko.rc index 19076e0..4c98829 100644 --- a/dlls/appwiz.cpl/Ko.rc +++ b/dlls/appwiz.cpl/Ko.rc @@ -37,8 +37,8 @@ STRINGTABLE IDS_COLUMN_VERSION, "��" IDS_INSTALL_FILTER, "��ġ ��α׷�0*instal*.exe;*setup*.exe;*.msi\0��α׷� (*.exe)\0*.exe\0�� ϵ� (*.*)\0*.*\0\0" - IDS_REMOVE, "&Remove..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_REMOVE, "��(&R)..." + IDS_MODIFY_REMOVE, "��ġ��(&M)/��..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -53,8 +53,8 @@ FONT 9, "MS Shell Dlg" CONTROL "�� Ʈ�� ڵ�� Ǿ�� ֽ��ϴ�.��ġ�� Ҹ� ��ġ�ų� ��α׷�� , �߰�/�� Ͽ�� Ͻʽÿ�..", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 36 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "�� (&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "��ġ��(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "��(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0