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

Francois Gouget : winhlp32: Add support for accelerators in general and F1 in particular.
by Alexandre Julliard April 8, 2011

April 8, 2011

1 0

Jacek Caban : shdocvw: Moved more registration to .rgs file.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 439f9109fcd5c7049f894899a55b92c7daa4d1ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=439f9109fcd5c7049f894899a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:57:24 2011 +0200 shdocvw: Moved more registration to .rgs file. --- dlls/shdocvw/shdocvw.inf | 21 +-------------- dlls/shdocvw/shdocvw.rc | 3 ++ dlls/shdocvw/shdocvw.rgs | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/shdocvw/shdocvw.inf b/dlls/shdocvw/shdocvw.inf index ea6effa..2cf9d6e 100644 --- a/dlls/shdocvw/shdocvw.inf +++ b/dlls/shdocvw/shdocvw.inf @@ -3,11 +3,11 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Classes.Reg, URL.Reg +AddReg=Classes.Reg [UnregisterDll] -DelReg=Classes.Reg, URL.Reg +DelReg=Classes.Reg [RegisterIE] @@ -30,23 +30,6 @@ HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage",,,"Open &Home Page" HKCR,"CLSID\%CLSID_Internet%\Shell\OpenHomePage\Command",,,"""%16422%\Internet Explorer\iexplore.exe""" HKCR,"CLSID\%CLSID_Internet%\ShellFolder",,2,"0x24" -HKCR,"CLSID\%CLSID_InternetShortcut%\shellex\MayChangeDefaultMenu",,16 -HKCR,"InternetShortcut","EditFlags",2,"2" -HKCR,"InternetShortcut","IsShortcut",, -HKCR,"InternetShortcut","NeverShowExt",, -HKCR,"InternetShortcut\DefaultIcon",,,"url.dll,0" -HKCR,"InternetShortcut\shell\open\command",,,"rundll32.exe shdocvw.dll,OpenURL %l" -HKCR,"InternetShortcut\shell\print\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1""" -HKCR,"InternetShortcut\shell\printto\command",,,"rundll32.exe mshtml.dll,PrintHTML ""%1"" ""%2"" ""%3"" ""%4""" - -[URL.Reg] -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\DefaultPrefix",,,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","ftp",,"ftp://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","gopher",,"gopher://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","home",,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","mosaic",,"http://" -HKLM,"Software\Microsoft\Windows\CurrentVersion\URL\Prefixes","www",,"http://" - [Settings.Reg] HKCU,"Software\Microsoft\Internet Explorer\Main","Start Page",2,"http://www.winehq.org" diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 1c73163..943d7a5 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -91,5 +91,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: shdocvw.inf */ REGINST REGINST shdocvw.inf +/* @makedep: shdocvw.rgs */ +2 WINE_REGISTRY shdocvw.rgs + /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/shdocvw/shdocvw.rgs new file mode 100644 index 0000000..a983458 --- /dev/null +++ b/dlls/shdocvw/shdocvw.rgs @@ -0,0 +1,63 @@ +HKLM +{ + NoRemove 'Software' + { + NoRemove 'Microsoft' + { + NoRemove 'Windows' + { + NoRemove 'CurrentVersion' + { + NoRemove 'URL' + { + DefaultPrefix = s 'http://' + Prefixes + { + val 'ftp' = s 'ftp://' + val 'gopher' = s 'gopher://' + val 'home' = s 'http://' + val 'mosaic' = s 'http://' + val 'www' = s 'http://' + } + } + } + } + } + } +} + +HKCR +{ + NoRemove CLSID + { + '{fbf23b40-e3f0-101b-8488-00aa003e56f8}' + { + shellex + { + MayChangeDefaultMenu {} + } + } + } + 'InternetShortcut' + { + val 'EditFlags' = s '2' + val 'IsShortcut' = s '' + val 'NeverShowExt' = s '' + DefaultIcon = s 'url.dll,0' + shell + { + open + { + command = s 'rundll32.exe shdocvw.dll,OpenURL %%l' + } + print + { + command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1""' + } + printto + { + command = s 'rundll32.exe mshtml.dll,PrintHTML ""%%1"" ""%%2"" ""%%3"" ""%%4""' + } + } + } +}

1 0

Jacek Caban : shdocvw: Register .url extension.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 0a4dfa666542531abf77924a9c406e970a9a6762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4dfa666542531abf77924a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:57:40 2011 +0200 shdocvw: Register .url extension. --- dlls/shdocvw/shdocvw.rgs | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.rgs b/dlls/shdocvw/shdocvw.rgs index a983458..9e9fcb4 100644 --- a/dlls/shdocvw/shdocvw.rgs +++ b/dlls/shdocvw/shdocvw.rgs @@ -60,4 +60,5 @@ HKCR } } } + ForceRemove '.url' = s 'InternetShortcut' }

1 0

Francois Gouget : msxml3/tests: Fix variable initializations to conform to C89.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: ffbde17b3287b65906b087a0de3c3a72d8072c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbde17b3287b65906b087a0d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 11:57:19 2011 +0200 msxml3/tests: Fix variable initializations to conform to C89. --- dlls/msxml3/tests/domdoc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 650f3d5..46a4188 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -254,7 +254,7 @@ typedef struct IUnknown IUnknown_iface; } testsite_t; -static testsite_t testsite = { .IUnknown_iface.lpVtbl = &testsiteVtbl }; +static testsite_t testsite = { { &testsiteVtbl } }; /* test IHTMLElementCollection */ static HRESULT WINAPI htmlecoll_QueryInterface(IHTMLElementCollection *iface, REFIID riid, void **ppvObject) @@ -361,7 +361,7 @@ typedef struct IHTMLElementCollection IHTMLElementCollection_iface; } testhtmlecoll_t; -static testhtmlecoll_t htmlecoll = { .IHTMLElementCollection_iface.lpVtbl = &TestHTMLECollectionVtbl }; +static testhtmlecoll_t htmlecoll = { { &TestHTMLECollectionVtbl } }; /* test IHTMLDocument2 */ static HRESULT WINAPI htmldoc2_QueryInterface(IHTMLDocument2 *iface, REFIID riid, void **ppvObject) @@ -1203,7 +1203,7 @@ typedef struct IHTMLDocument2 IHTMLDocument2_iface; } testhtmldoc2_t; -static testhtmldoc2_t htmldoc2 = { .IHTMLDocument2_iface.lpVtbl = &TestHTMLDocumentVtbl }; +static testhtmldoc2_t htmldoc2 = { { &TestHTMLDocumentVtbl } }; static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppvObject) { @@ -1282,7 +1282,7 @@ static const IServiceProviderVtbl testprovVtbl = sp_QueryService }; -testprov_t testprov = { .IServiceProvider_iface.lpVtbl = &testprovVtbl }; +testprov_t testprov = { { &testprovVtbl } }; #define EXPECT_CHILDREN(node) _expect_children((IXMLDOMNode*)node, __LINE__) static void _expect_children(IXMLDOMNode *node, int line)

1 0

Nikolay Sivov : ole32: Handle null argument in OleIsRunning().
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 0c33682330dae057e5984a5f2d19ac119fb14c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c33682330dae057e5984a5f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 13:31:33 2011 +0400 ole32: Handle null argument in OleIsRunning(). --- dlls/ole32/ole2.c | 8 +++++--- dlls/ole32/tests/ole2.c | 14 +++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index d5fd2c2..3254619 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2628,15 +2628,17 @@ HRESULT WINAPI OleDoAutoConvert(LPSTORAGE pStg, LPCLSID pClsidNew) /****************************************************************************** * OleIsRunning [OLE32.@] */ -BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject) +BOOL WINAPI OleIsRunning(LPOLEOBJECT object) { IRunnableObject *pRunnable; HRESULT hr; BOOL running; - TRACE("(%p)\n", pObject); + TRACE("(%p)\n", object); - hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnable); + if (!object) return FALSE; + + hr = IOleObject_QueryInterface(object, &IID_IRunnableObject, (void **)&pRunnable); if (FAILED(hr)) return TRUE; running = IRunnableObject_IsRunning(pRunnable); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8961186..f38af3b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1784,20 +1784,28 @@ static void test_runnable(void) { NULL, 0 } }; + BOOL ret; IOleObject *object = &OleObject; + /* null argument */ + ret = OleIsRunning(NULL); + ok(ret == FALSE, "got %d\n", ret); + expected_method_list = methods_query_runnable; - ok(OleIsRunning(object), "Object should be running\n"); + ret = OleIsRunning(object); + ok(ret == TRUE, "Object should be running\n"); CHECK_NO_EXTRA_METHODS(); g_isRunning = FALSE; expected_method_list = methods_query_runnable; - ok(OleIsRunning(object) == FALSE, "Object should not be running\n"); + ret = OleIsRunning(object); + ok(ret == FALSE, "Object should not be running\n"); CHECK_NO_EXTRA_METHODS(); g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ expected_method_list = methods_no_runnable; - ok(OleIsRunning(object), "Object without IRunnableObject should be running\n"); + ret = OleIsRunning(object); + ok(ret == TRUE, "Object without IRunnableObject should be running\n"); CHECK_NO_EXTRA_METHODS(); g_isRunning = TRUE;

1 0

Maarten Lankhorst : include: Add missing defines to mddk.h.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 16f285cc157fec169bd79acc883028e361832bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f285cc157fec169bd79acc8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 7 22:58:31 2011 +0200 include: Add missing defines to mddk.h. --- include/mmddk.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index f7e260f..17366db 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -89,6 +89,8 @@ typedef struct { #define DRV_QUERYSTRINGID (DRV_RESERVED + 14) #define DRV_QUERYSTRINGIDSIZE (DRV_RESERVED + 15) #define DRV_QUERYIDFROMSTRINGID (DRV_RESERVED + 16) +#define DRV_QUERYFUNCTIONINSTANCEID (DRV_RESERVED + 17) +#define DRV_QUERYFUNCTIONINSTANCEIDSIZE (DRV_RESERVED + 18) #ifdef __WINESRC__ #define DRV_QUERYDSOUNDIFACE (DRV_RESERVED + 20) #define DRV_QUERYDSOUNDDESC (DRV_RESERVED + 21)

1 0

Francois Gouget : cmdlgtst: Use the human readable application name in the window title.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 01839d190bdb93d73145d12fc7e949f424191fd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01839d190bdb93d73145d12fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 11:59:58 2011 +0200 cmdlgtst: Use the human readable application name in the window title. --- programs/cmdlgtst/cmdlgtst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index ac992ca..9d58fa6 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -67,7 +67,7 @@ struct FlagTableEntry { static const char menuName[] = "CmdlgtstMenu"; static const char className[] = "CmdlgtstClass"; -static const char windowName[] = "Cmdlgtst Window"; +static const char windowName[] = "Common Dialog Test"; /* * global hInstance variable. This makes the code non-threadable,

1 0

Francois Gouget : programs: NOINVERT is an obsolete flag so remove it.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: f6544699d1d705fe452f775c3ee43f5011002fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6544699d1d705fe452f775c3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 11:59:09 2011 +0200 programs: NOINVERT is an obsolete flag so remove it. --- programs/oleview/oleview.rc | 2 +- programs/winefile/En.rc | 20 ++++++++++---------- programs/winemine/En.rc | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/oleview/oleview.rc b/programs/oleview/oleview.rc index 132f1f8..d57fafa 100644 --- a/programs/oleview/oleview.rc +++ b/programs/oleview/oleview.rc @@ -153,7 +153,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDA_OLEVIEW ACCELERATORS { - VK_F5, IDM_REFRESH, VIRTKEY, NOINVERT + VK_F5, IDM_REFRESH, VIRTKEY } /* @makedep: toolbar.bmp */ diff --git a/programs/winefile/En.rc b/programs/winefile/En.rc index 2569c6b..256009e 100644 --- a/programs/winefile/En.rc +++ b/programs/winefile/En.rc @@ -92,16 +92,16 @@ END IDA_WINEFILE ACCELERATORS { - VK_F1, ID_HELP, VIRTKEY, NOINVERT - VK_F5, ID_REFRESH, VIRTKEY, NOINVERT - VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT - VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT - VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT - VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT - VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT, NOINVERT + VK_F1, ID_HELP, VIRTKEY + VK_F5, ID_REFRESH, VIRTKEY + VK_F7, ID_FILE_MOVE, VIRTKEY + VK_F8, ID_FILE_COPY, VIRTKEY + VK_DELETE, ID_FILE_DELETE, VIRTKEY + VK_RETURN, ID_ACTIVATE, VIRTKEY + VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT #ifndef _NO_EXTENSIONS - "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT - "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT - VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL, NOINVERT + "X", ID_FILE_EXIT, VIRTKEY, ALT + "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL + VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL #endif } diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index 354e339..3488621 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -69,6 +69,6 @@ CAPTION "Custom Game" IDA_WINEMINE ACCELERATORS { - VK_F2, IDM_NEW, VIRTKEY, NOINVERT - "X", IDM_EXIT, VIRTKEY, ALT, NOINVERT + VK_F2, IDM_NEW, VIRTKEY + "X", IDM_EXIT, VIRTKEY, ALT }

1 0

Francois Gouget : progman: Fix accelerator support.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 1ea1c3d0e5b881884ad85a1c04ac07cbef8881d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea1c3d0e5b881884ad85a1c0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 12:00:44 2011 +0200 progman: Fix accelerator support. --- programs/progman/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/progman/main.c b/programs/progman/main.c index f67a62f..4d9393f 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -180,8 +180,8 @@ static LRESULT CALLBACK MAIN_MainWndProc(HWND hWnd, UINT msg, break; case WM_COMMAND: - if (wParam < PM_FIRST_CHILD){ - MAIN_MenuCommand(hWnd, wParam, lParam); + if (LOWORD(wParam) < PM_FIRST_CHILD){ + MAIN_MenuCommand(hWnd, LOWORD(wParam), lParam); } break;

1 0

Francois Gouget : shell32: Fix the *CPLINFO* lData field type.
by Alexandre Julliard April 8, 2011

April 8, 2011

Module: wine Branch: master Commit: 4cb9c161436fb7fd1223f257a18cf297596198ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb9c161436fb7fd1223f257a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 8 12:03:39 2011 +0200 shell32: Fix the *CPLINFO* lData field type. --- include/cpl.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/cpl.h b/include/cpl.h index 5c382ff..adabeba 100644 --- a/include/cpl.h +++ b/include/cpl.h @@ -36,7 +36,7 @@ typedef struct tagCPLINFO { int idIcon; int idName; int idInfo; - LONG lData; + LONG_PTR lData; } CPLINFO, *LPCPLINFO; typedef struct tagNEWCPLINFOA @@ -44,7 +44,7 @@ typedef struct tagNEWCPLINFOA DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; CHAR szName[32]; CHAR szInfo[64]; @@ -56,7 +56,7 @@ typedef struct tagNEWCPLINFOW DWORD dwSize; DWORD dwFlags; DWORD dwHelpContext; - LONG lData; + LONG_PTR lData; HICON hIcon; WCHAR szName[32]; WCHAR szInfo[64];

1 0