August 2011 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Actually use the dib driver's Get/ PutImage if the bitmap is a dib.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: e81e73149fb66e776cbd768f600bc8bb547b7052 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81e73149fb66e776cbd768f6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 2 14:11:11 2011 +0100 gdi32: Actually use the dib driver's Get/PutImage if the bitmap is a dib. --- dlls/gdi32/dib.c | 17 +++++++++++++---- dlls/gdi32/tests/bitmap.c | 3 +-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 5adafcb..4fc3f3a 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -509,6 +509,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, struct bitblt_coords src, dst; INT src_to_dst_offset; HRGN clip = 0; + const struct gdi_dc_funcs *funcs; src_bits.ptr = (void *)bits; src_bits.is_copy = FALSE; @@ -578,9 +579,14 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (lines < src.visrect.bottom) src.visrect.bottom = lines; } - physdev = GET_DC_PHYSDEV( dc, pPutImage ); + /* Hack to ensure we don't get the nulldrv if the bmp hasn't been selected + into a dc yet */ + physdev = GET_DC_PHYSDEV( dc, pCreateBitmap ); if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; + funcs = bitmap->funcs; + if (bitmap->dib) funcs = dc->dibdrv.dev.funcs; + result = lines; offset_rect( &src.visrect, 0, src_to_dst_offset ); @@ -600,7 +606,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - err = physdev->funcs->pPutImage( physdev, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); if (err == ERROR_BAD_FORMAT) { void *ptr; @@ -616,7 +622,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.is_copy = TRUE; src_bits.free = free_heap_bits; if (!err) - err = physdev->funcs->pPutImage( physdev, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } } else err = ERROR_OUTOFMEMORY; @@ -915,6 +921,7 @@ INT WINAPI GetDIBits( char dst_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info = (BITMAPINFO *)dst_bmibuf; unsigned int colors = 0; + const struct gdi_dc_funcs *funcs; if (!info) return 0; @@ -936,6 +943,8 @@ INT WINAPI GetDIBits( return 0; } + funcs = bmp->funcs; + if (bmp->dib) funcs = dc->dibdrv.dev.funcs; if (bpp == 0) /* query bitmap info only */ { @@ -1104,7 +1113,7 @@ INT WINAPI GetDIBits( lines = src.height; - err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); + err = funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); if(err) { diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index bf51b4a..f12a40e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -437,8 +437,7 @@ static void test_dib_bits_access( HBITMAP hdib, void *bits ) ok(info.AllocationProtect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.AllocationProtect); ok(info.State == MEM_COMMIT, "%x != MEM_COMMIT\n", info.State); ok(info.Type == MEM_PRIVATE, "%x != MEM_PRIVATE\n", info.Type); - /* it has been protected now */ - todo_wine ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); + ok(info.Protect == PAGE_READWRITE, "%x != PAGE_READWRITE\n", info.Protect); /* try writing protected bits to a file */

1 0

Michael Mc Donnell : d3dx9/tests: Implemented ConvertPointRepsToAdjacency test.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 5552613b81f8ce9a0044640b2ec2450f8abbdefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5552613b81f8ce9a0044640b2… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Thu Jun 23 17:46:51 2011 +0200 d3dx9/tests: Implemented ConvertPointRepsToAdjacency test. --- dlls/d3dx9_36/tests/mesh.c | 548 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 548 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5552613b81f8ce9a00446…

1 0

Alexandre Julliard : makefiles: Remove some redundant registration scripts.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: c091a3fc8394380e769962162251df6db46ac37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c091a3fc8394380e769962162… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:16:57 2011 +0200 makefiles: Remove some redundant registration scripts. --- dlls/gameux/Makefile.in | 1 - dlls/hhctrl.ocx/Makefile.in | 1 - dlls/msxml/Makefile.in | 1 - dlls/msxml2/Makefile.in | 1 - dlls/msxml3/Makefile.in | 1 - dlls/msxml4/Makefile.in | 1 - dlls/msxml6/Makefile.in | 1 - dlls/winhttp/Makefile.in | 1 - dlls/wuapi/Makefile.in | 1 - 9 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index ab7a742..3b52a63 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ main.c IDL_TLB_SRCS = gameux_tlb.idl -IDL_R_SRCS = gameux_tlb.idl RC_SRCS = rsrc.rc diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 7382f42..05b3e35 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -12,7 +12,6 @@ C_SRCS = \ webbrowser.c IDL_TLB_SRCS = hhctrl_tlb.idl -IDL_R_SRCS = hhctrl_tlb.idl RC_SRCS = hhctrl.rc PO_SRCS = hhctrl.rc diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in index 25c45bc..a50888d 100644 --- a/dlls/msxml/Makefile.in +++ b/dlls/msxml/Makefile.in @@ -3,7 +3,6 @@ MODULE = msxml.dll C_SRCS = main.c IDL_TLB_SRCS = msxml_tlb.idl -IDL_R_SRCS = msxml_tlb.idl RC_SRCS = rsrc.rc diff --git a/dlls/msxml2/Makefile.in b/dlls/msxml2/Makefile.in index 7db4c7b..418de00 100644 --- a/dlls/msxml2/Makefile.in +++ b/dlls/msxml2/Makefile.in @@ -3,6 +3,5 @@ MODULE = msxml2.dll C_SRCS = main.c IDL_TLB_SRCS = msxml2_tlb.idl -IDL_R_SRCS = msxml2_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 70ae282..e7223bb 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -44,6 +44,5 @@ RC_SRCS = \ version.rc IDL_TLB_SRCS = msxml3_v1.idl -IDL_R_SRCS = msxml3_v1.idl @MAKE_DLL_RULES@ diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in index 59809ea..c4115b2 100644 --- a/dlls/msxml4/Makefile.in +++ b/dlls/msxml4/Makefile.in @@ -6,7 +6,6 @@ C_SRCS = \ main.c IDL_TLB_SRCS = msxml4_tlb.idl -IDL_R_SRCS = msxml4_tlb.idl RC_SRCS = rsrc.rc diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 9d1ea00..4a7f756 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ RC_SRCS = rsrc.rc -IDL_R_SRCS = msxml6_tlb.idl IDL_TLB_SRCS = msxml6_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index b85e700..d64cd70 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -14,7 +14,6 @@ C_SRCS = \ url.c IDL_TLB_SRCS = winhttp_tlb.idl -IDL_R_SRCS = winhttp_tlb.idl RC_SRCS = version.rc diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 3f748a0..6387f07 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -11,6 +11,5 @@ C_SRCS = \ updates.c IDL_TLB_SRCS = wuapi_tlb.idl -IDL_R_SRCS = wuapi_tlb.idl @MAKE_DLL_RULES@

1 0

Alexandre Julliard : oleaut32: Remove typelib registrations.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 0d37433d659010954b505b3a598d890d2d8c1580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d37433d659010954b505b3a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:37:14 2011 +0200 oleaut32: Remove typelib registrations. --- dlls/oleaut32/oleaut.c | 38 +------------------------------------- tools/wine.inf.in | 1 - 2 files changed, 1 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 1fe6dcf..95c4b6a 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -843,48 +843,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); } - -static HRESULT register_typelib( const WCHAR *name ) -{ - static const WCHAR backslash[] = {'\\',0}; - HRESULT hr; - ITypeLib *typelib; - WCHAR *path; - DWORD len; - - len = GetSystemDirectoryW( NULL, 0 ) + strlenW( name ) + 1; - if (!(path = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - GetSystemDirectoryW( path, len ); - strcatW( path, backslash ); - strcatW( path, name ); - hr = LoadTypeLib( path, &typelib ); - if (SUCCEEDED(hr)) - { - hr = RegisterTypeLib( typelib, path, NULL ); - ITypeLib_Release( typelib ); - } - HeapFree( GetProcessHeap(), 0, path ); - return hr; -} - /*********************************************************************** * DllRegisterServer (OLEAUT32.@) */ HRESULT WINAPI DllRegisterServer(void) { - HRESULT hr; - - TRACE("\n"); - - hr = OLEAUTPS_DllRegisterServer(); - if (SUCCEEDED(hr)) - { - const WCHAR stdole32W[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; - const WCHAR stdole2W[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; - hr = register_typelib( stdole2W ); - if (SUCCEEDED(hr)) hr = register_typelib( stdole32W ); - } - return hr; + return OLEAUTPS_DllRegisterServer(); } /*********************************************************************** diff --git a/tools/wine.inf.in b/tools/wine.inf.in index af68d8f..c27524d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2486,7 +2486,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first -11,,oleaut32.dll,1 11,,shell32.dll,1 11,,comctl32.dll,2

1 0

Alexandre Julliard : mshtml: Remove typelib registrations.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 6adfeeacf9f577762c6f86d61f2be333a6fa21a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6adfeeacf9f577762c6f86d61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:38:12 2011 +0200 mshtml: Remove typelib registrations. --- dlls/mshtml/Makefile.in | 4 +--- dlls/mshtml/main.c | 19 +------------------ dlls/mshtml/mshtml_classes.idl | 9 +++++++++ dlls/mshtml/mshtml_tlb.idl | 19 ------------------- include/mshtml.idl | 1 - 5 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 1732951..3933645 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -104,8 +104,6 @@ PO_SRCS = mshtml.rc IDL_H_SRCS = nsiface.idl -IDL_R_SRCS = \ - mshtml_classes.idl \ - mshtml_tlb.idl +IDL_R_SRCS = mshtml_classes.idl @MAKE_DLL_RULES@ diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1661c26..f7a2d71 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -451,25 +451,8 @@ static HRESULT register_server(BOOL do_register) for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) heap_free(pse[i].pszValue); - if(FAILED(hres)) { - ERR("RegInstall failed: %08x\n", hres); - return hres; - } - - if(do_register) { - ITypeLib *typelib; - - static const WCHAR wszMSHTML[] = {'m','s','h','t','m','l','.','t','l','b',0}; - - hres = LoadTypeLibEx(wszMSHTML, REGKIND_REGISTER, &typelib); - if(SUCCEEDED(hres)) - ITypeLib_Release(typelib); - }else { - hres = UnRegisterTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); - } - if(FAILED(hres)) - ERR("typelib registration failed: %08x\n", hres); + ERR("RegInstall failed: %08x\n", hres); return hres; } diff --git a/dlls/mshtml/mshtml_classes.idl b/dlls/mshtml/mshtml_classes.idl index a5aef84..9766031 100644 --- a/dlls/mshtml/mshtml_classes.idl +++ b/dlls/mshtml/mshtml_classes.idl @@ -285,6 +285,15 @@ coclass MHTMLDocument { } coclass ResProtocol { } [ + helpstring("Microsoft Scriptlet Component"), + progid("ScriptBridge.ScriptBridge.1"), + vi_progid("ScriptBridge.ScriptBridge"), + threading(apartment), + uuid(ae24fdae-03c6-11d1-8b76-0080c744f389) +] +coclass Scriptlet { } + +[ helpstring("Microsoft HTML Resource Pluggable Protocol"), threading(apartment), uuid(76e67a63-06e9-11d2-a840-006008059382) diff --git a/dlls/mshtml/mshtml_tlb.idl b/dlls/mshtml/mshtml_tlb.idl deleted file mode 100644 index 371cdaf..0000000 --- a/dlls/mshtml/mshtml_tlb.idl +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2007 Jacek Caban 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 "mshtml.idl" diff --git a/include/mshtml.idl b/include/mshtml.idl index ff2c6ba..13c0fa3 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -13700,7 +13700,6 @@ interface IWebBridge : IDispatch helpstring("Microsoft Scriptlet Component"), progid("ScriptBridge.ScriptBridge.1"), vi_progid("ScriptBridge.ScriptBridge"), - threading(apartment), uuid(ae24fdae-03c6-11d1-8b76-0080c744f389) ] coclass Scriptlet

1 0

Alexandre Julliard : ieframe: Remove registrations that are duplicated in mshtml.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 1380a77074541514c3e9bd83ab2f98019e931e39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1380a77074541514c3e9bd83a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:38:37 2011 +0200 ieframe: Remove registrations that are duplicated in mshtml. --- dlls/ieframe/ieframe.rgs | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/ieframe.rgs b/dlls/ieframe/ieframe.rgs index f40dbd1..cf8f3b4 100644 --- a/dlls/ieframe/ieframe.rgs +++ b/dlls/ieframe/ieframe.rgs @@ -50,14 +50,6 @@ HKCR { command = s 'rundll32.exe ieframe.dll,OpenURL %%l' } - print - { - command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1""' - } - printto - { - command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1"" ""%%2"" ""%%3"" ""%%4""' - } } } ForceRemove '.url' = s 'InternetShortcut'

1 0

Alexandre Julliard : winecrt0: No longer register typelibs, they use IRegistrar scripts now.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: e76db63c02ee62ce894f315afc87ac68eb4c5de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76db63c02ee62ce894f315af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:46:48 2011 +0200 winecrt0: No longer register typelibs, they use IRegistrar scripts now. --- dlls/winecrt0/register.c | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diff --git a/dlls/winecrt0/register.c b/dlls/winecrt0/register.c index 28ce3c5..275ed32 100644 --- a/dlls/winecrt0/register.c +++ b/dlls/winecrt0/register.c @@ -31,11 +31,9 @@ #include "atliface.h" static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; -static const WCHAR oleaut32W[] = {'o','l','e','a','u','t','3','2','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','_','P','S','F','a','c','t','o','r','y','B','u','f','f','e','r',0}; -static const WCHAR typelibW[] = {'T','Y','P','E','L','I','B',0}; struct reg_info { @@ -47,13 +45,10 @@ struct reg_info }; static HMODULE ole32; -static HMODULE oleaut32; static HRESULT (WINAPI *pCoInitialize)(LPVOID); static void (WINAPI *pCoUninitialize)(void); static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); static INT (WINAPI *pStringFromGUID2)(REFGUID,LPOLESTR,INT); -static HRESULT (WINAPI *pLoadTypeLibEx)(LPCOLESTR,REGKIND,ITypeLib**); -static HRESULT (WINAPI *pUnRegisterTypeLib)(REFGUID,WORD,WORD,LCID,SYSKIND); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { @@ -116,40 +111,6 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam return SUCCEEDED(info->result); } -static HRESULT register_typelib( HMODULE module, BOOL do_register ) -{ - WCHAR name[MAX_PATH]; - ITypeLib *typelib; - HRESULT ret; - - if (!pUnRegisterTypeLib) - { - if (!(oleaut32 = LoadLibraryW( oleaut32W )) || - !(pLoadTypeLibEx = (void *)GetProcAddress( oleaut32, "LoadTypeLibEx" )) || - !(pUnRegisterTypeLib = (void *)GetProcAddress( oleaut32, "UnRegisterTypeLib" ))) - return E_FAIL; - } - GetModuleFileNameW( module, name, MAX_PATH ); - if (do_register) - { - ret = pLoadTypeLibEx( name, REGKIND_REGISTER, &typelib ); - } - else - { - ret = pLoadTypeLibEx( name, REGKIND_NONE, &typelib ); - if (SUCCEEDED( ret )) - { - TLIBATTR *attr; - ITypeLib_GetLibAttr( typelib, &attr ); - ret = pUnRegisterTypeLib( &attr->guid, attr->wMajorVerNum, attr->wMinorVerNum, - attr->lcid, attr->syskind ); - ITypeLib_ReleaseTLibAttr( typelib, attr ); - } - } - if (SUCCEEDED( ret )) ITypeLib_Release( typelib ); - return ret; -} - HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) { struct reg_info info; @@ -161,8 +122,6 @@ HRESULT __wine_register_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) - info.result = register_typelib( module, TRUE ); if (info.uninit) pCoUninitialize(); return info.result; } @@ -178,8 +137,6 @@ HRESULT __wine_unregister_resources( HMODULE module, const CLSID *clsid ) info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (SUCCEEDED(info.result) && FindResourceW( module, MAKEINTRESOURCEW(1), typelibW )) - info.result = register_typelib( module, FALSE ); if (info.uninit) pCoUninitialize(); return info.result; }

1 0

Alexandre Julliard : winecrt0: Remove the clsid parameter in __wine_(un) register_resources.
by Alexandre Julliard 02 Aug '11

02 Aug '11

1 0

Jay Yang : shell32: Have the system context menus respect idCmdFirst.
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: 2e5e7dbeba77b6cd8b58132b72d9f4b030f39845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5e7dbeba77b6cd8b58132b7… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Aug 1 17:47:43 2011 -0400 shell32: Have the system context menus respect idCmdFirst. --- dlls/shell32/shv_bg_cmenu.c | 14 +++++---- dlls/shell32/shv_item_cmenu.c | 67 +++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 7f59b6d..5b1b434 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -42,10 +42,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - const IContextMenu2Vtbl *lpVtbl; - IShellFolder* pSFParent; - LONG ref; - BOOL bDesktop; + const IContextMenu2Vtbl *lpVtbl; + IShellFolder* pSFParent; + LONG ref; + BOOL bDesktop; + UINT verb_offset; } BgCmImpl; @@ -157,6 +158,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n", This, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + This->verb_offset=idCmdFirst; hMyMenu = LoadMenuA(shell32_hInstance, "MENU_002"); if (uFlags & CMF_DEFAULTONLY) @@ -175,7 +177,7 @@ static HRESULT WINAPI ISVBgCm_fnQueryContextMenu( { idMax = Shell_MergeMenus (hMenu, GetSubMenu(hMyMenu,0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); - hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst+1); + hr = MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, idMax-idCmdFirst); } DestroyMenu(hMyMenu); @@ -358,7 +360,7 @@ static HRESULT WINAPI ISVBgCm_fnInvokeCommand( } else { - switch(LOWORD(lpcmi->lpVerb)) + switch(LOWORD(lpcmi->lpVerb)-This->verb_offset) { case FCIDM_SHVIEW_REFRESH: if (lpSV) IShellView_Refresh(lpSV); diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 62c4c7f..2dd8cd6 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -47,13 +47,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - IContextMenu2 IContextMenu2_iface; - LONG ref; - IShellFolder* pSFParent; - LPITEMIDLIST pidl; /* root pidl */ - LPITEMIDLIST *apidl; /* array of child pidls */ - UINT cidl; - BOOL bAllValues; + IContextMenu2 IContextMenu2_iface; + LONG ref; + IShellFolder* pSFParent; + LPITEMIDLIST pidl; /* root pidl */ + LPITEMIDLIST *apidl; /* array of child pidls */ + UINT cidl; + BOOL bAllValues; + UINT verb_offset; } ItemCmImpl; static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) @@ -223,27 +224,26 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = impl_from_IContextMenu2(iface); - INT uIDMax; + ItemCmImpl *This = impl_from_IContextMenu2(iface); + INT uIDMax; - TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); - if (idCmdFirst != 0) - FIXME("We should use idCmdFirst=%d and idCmdLast=%d for command ids\n", idCmdFirst, idCmdLast); + This->verb_offset=idCmdFirst; - if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) - { - HMENU hmenures = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(MENU_SHV_FILE)); + if(!(CMF_DEFAULTONLY & uFlags) && This->cidl>0) + { + HMENU hmenures = LoadMenuW(shell32_hInstance, MAKEINTRESOURCEW(MENU_SHV_FILE)); - if(uFlags & CMF_EXPLORE) + if(uFlags & CMF_EXPLORE) RemoveMenu(hmenures, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - uIDMax = Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); + uIDMax = Shell_MergeMenus(hmenu, GetSubMenu(hmenures, 0), indexMenu, idCmdFirst, idCmdLast, MM_SUBMENUSHAVEIDS); - DestroyMenu(hmenures); + DestroyMenu(hmenures); - if(This->bAllValues) - { + if(This->bAllValues) + { MENUITEMINFOW mi; WCHAR str[255]; mi.cbSize = sizeof(mi); @@ -253,18 +253,18 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi); RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND); _InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, FCIDM_SHVIEW_EXPLORE, MFT_STRING, str, MFS_ENABLED); - } + } - SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); + SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION); - if(uFlags & ~CMF_CANRENAME) + if(uFlags & ~CMF_CANRENAME) RemoveMenu(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND); - else + else EnableMenuItem(hmenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND | ISvItemCm_CanRenameItems(This) ? MFS_ENABLED : MFS_DISABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax); - } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, uIDMax-idCmdFirst); + } + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); } /************************************************************************** @@ -520,7 +520,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( if (HIWORD(lpcmi->lpVerb) == 0) { - switch(LOWORD(lpcmi->lpVerb)) + switch(LOWORD(lpcmi->lpVerb-This->verb_offset)) { case FCIDM_SHVIEW_EXPLORE: TRACE("Verb FCIDM_SHVIEW_EXPLORE\n"); @@ -551,7 +551,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( DoOpenProperties(This, lpcmi->hwnd); break; default: - FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); + FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)-This->verb_offset); return E_INVALIDARG; } } @@ -595,9 +595,9 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( break; case GCS_VERBA: - switch(idCommand) + switch(idCommand-This->verb_offset) { - case FCIDM_SHVIEW_RENAME: + case FCIDM_SHVIEW_RENAME: strcpy(lpszName, "rename"); hr = NOERROR; break; @@ -607,8 +607,9 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( /* NT 4.0 with IE 3.0x or no IE will always call This with GCS_VERBW. In This case, you need to do the lstrcpyW to the pointer passed.*/ case GCS_VERBW: - switch(idCommand) - { case FCIDM_SHVIEW_RENAME: + switch(idCommand-This->verb_offset) + { + case FCIDM_SHVIEW_RENAME: MultiByteToWideChar( CP_ACP, 0, "rename", -1, (LPWSTR)lpszName, uMaxNameLen ); hr = NOERROR; break;

1 0

Jay Yang : include: Add header entries required for SHCreateDefaultContextMenu and CDefFolderMenu_Create2 .
by Alexandre Julliard 02 Aug '11

02 Aug '11

Module: wine Branch: master Commit: ae3108e66f14cd5f7697999377e9e1426bc6c300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3108e66f14cd5f769799937… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Aug 1 17:47:47 2011 -0400 include: Add header entries required for SHCreateDefaultContextMenu and CDefFolderMenu_Create2. --- include/shlobj.h | 24 ++++++++++++++++++++++++ include/shobjidl.idl | 17 +++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 07981b6..3e9df2c 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1701,6 +1701,30 @@ static inline BOOL ILIsEmpty(LPCITEMIDLIST pidl) return !(pidl && pidl->mkid.cb); } +#include <pshpack8.h> + +typedef struct { + HWND hwnd; + IContextMenuCB *pcmcb; + PCIDLIST_ABSOLUTE pidlFolder; + IShellFolder *psf; + UINT cidl; + PCUITEMID_CHILD_ARRAY apidl; + IUnknown *punkAssociationInfo; + UINT cKeys; + const HKEY *aKeys; +} DEFCONTEXTMENU; + +#include <poppack.h> + +HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv); + +typedef HRESULT (CALLBACK *LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); + +HRESULT WINAPI CDefFolderMenu_Create2(LPCITEMIDLIST pidlFolder, HWND hwnd, UINT cidl, + LPCITEMIDLIST *apidl, IShellFolder *psf, + LPFNDFMCALLBACK lpfn, UINT nKeys, const HKEY *ahkeys, + IContextMenu **ppcm); #include <poppack.h> diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 910118d..e129371 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1586,6 +1586,23 @@ interface IContextMenu3 : IContextMenu2 } +[ + object, + uuid(3409e930-5a39-11d1-83fa-00a0c90dc849), + pointer_default(unique), + local +] +interface IContextMenuCB : IUnknown +{ + HRESULT CallBack( + [in] IShellFolder *psf, + [in] HWND hwndOwner, + [in] IDataObject *pdtobj, + [in] UINT uMsg, + [in] WPARAM wParam, + [in] LPARAM lParam); +} + /***************************************************************************** * IShellExecuteHookA interface */

1 0