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

Jacek Caban : shdocvw: Register .url extension.
by Alexandre Julliard 08 Apr '11

08 Apr '11

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

Jacek Caban : shdocvw: intshcut.c COM clean up.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: c6dba02ef519de6b74317e76407de4facd6f80d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dba02ef519de6b74317e764… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:58:00 2011 +0200 shdocvw: intshcut.c COM clean up. --- dlls/shdocvw/intshcut.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 6658c5d..f86f122 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -44,9 +44,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); typedef struct { - IUniformResourceLocatorA uniformResourceLocatorA; - IUniformResourceLocatorW uniformResourceLocatorW; - IPersistFile persistFile; + IUniformResourceLocatorA IUniformResourceLocatorA_iface; + IUniformResourceLocatorW IUniformResourceLocatorW_iface; + IPersistFile IPersistFile_iface; IPropertySetStorage IPropertySetStorage_iface; LONG refCount; @@ -61,17 +61,17 @@ typedef struct static inline InternetShortcut* impl_from_IUniformResourceLocatorA(IUniformResourceLocatorA *iface) { - return CONTAINING_RECORD(iface, InternetShortcut, uniformResourceLocatorA); + return CONTAINING_RECORD(iface, InternetShortcut, IUniformResourceLocatorA_iface); } static inline InternetShortcut* impl_from_IUniformResourceLocatorW(IUniformResourceLocatorW *iface) { - return CONTAINING_RECORD(iface, InternetShortcut, uniformResourceLocatorW); + return CONTAINING_RECORD(iface, InternetShortcut, IUniformResourceLocatorW_iface); } static inline InternetShortcut* impl_from_IPersistFile(IPersistFile *iface) { - return CONTAINING_RECORD(iface, InternetShortcut, persistFile); + return CONTAINING_RECORD(iface, InternetShortcut, IPersistFile_iface); } static inline InternetShortcut* impl_from_IPropertySetStorage(IPropertySetStorage *iface) @@ -146,13 +146,13 @@ static HRESULT Unknown_QueryInterface(InternetShortcut *This, REFIID riid, PVOID TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); *ppvObject = NULL; if (IsEqualGUID(&IID_IUnknown, riid)) - *ppvObject = &This->uniformResourceLocatorA; + *ppvObject = &This->IUniformResourceLocatorA_iface; else if (IsEqualGUID(&IID_IUniformResourceLocatorA, riid)) - *ppvObject = &This->uniformResourceLocatorA; + *ppvObject = &This->IUniformResourceLocatorA_iface; else if (IsEqualGUID(&IID_IUniformResourceLocatorW, riid)) - *ppvObject = &This->uniformResourceLocatorW; + *ppvObject = &This->IUniformResourceLocatorW_iface; else if (IsEqualGUID(&IID_IPersistFile, riid)) - *ppvObject = &This->persistFile; + *ppvObject = &This->IPersistFile_iface; else if (IsEqualGUID(&IID_IPropertySetStorage, riid)) *ppvObject = &This->IPropertySetStorage_iface; else if (IsEqualGUID(&IID_IShellLinkA, riid)) @@ -371,7 +371,7 @@ static HRESULT WINAPI UniformResourceLocatorA_InvokeCommand(IUniformResourceLoca wideCommandInfo.pcszVerb = wideVerb; - res = UniformResourceLocatorW_InvokeCommand(&This->uniformResourceLocatorW, &wideCommandInfo); + res = UniformResourceLocatorW_InvokeCommand(&This->IUniformResourceLocatorW_iface, &wideCommandInfo); heap_free(wideVerb); return res; @@ -806,9 +806,9 @@ static InternetShortcut *create_shortcut(void) HRESULT hr; IPropertyStorage *dummy; - newshortcut->uniformResourceLocatorA.lpVtbl = &uniformResourceLocatorAVtbl; - newshortcut->uniformResourceLocatorW.lpVtbl = &uniformResourceLocatorWVtbl; - newshortcut->persistFile.lpVtbl = &persistFileVtbl; + newshortcut->IUniformResourceLocatorA_iface.lpVtbl = &uniformResourceLocatorAVtbl; + newshortcut->IUniformResourceLocatorW_iface.lpVtbl = &uniformResourceLocatorWVtbl; + newshortcut->IPersistFile_iface.lpVtbl = &persistFileVtbl; newshortcut->IPropertySetStorage_iface.lpVtbl = &propertySetStorageVtbl; newshortcut->refCount = 0; hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); @@ -877,7 +877,7 @@ void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) urlfilepath = heap_alloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, lpcstrUrl, -1, urlfilepath, len); - if(SUCCEEDED(IPersistFile_Load(&shortcut->persistFile, urlfilepath, 0))) + if(SUCCEEDED(IPersistFile_Load(&shortcut->IPersistFile_iface, urlfilepath, 0))) { URLINVOKECOMMANDINFOW ici; @@ -886,7 +886,7 @@ void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) ici.dwFlags = IURL_INVOKECOMMAND_FL_USE_DEFAULT_VERB; ici.hwndParent = hWnd; - if FAILED(UniformResourceLocatorW_InvokeCommand(&shortcut->uniformResourceLocatorW, (PURLINVOKECOMMANDINFOW) &ici)) + if(FAILED(UniformResourceLocatorW_InvokeCommand(&shortcut->IUniformResourceLocatorW_iface, (PURLINVOKECOMMANDINFOW) &ici))) TRACE("failed to open URL: %s\n", debugstr_a(lpcstrUrl)); }

1 0

Jacek Caban : shdocvw: Clean tests skipping.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 29ce9a1ff8233ff6bc84db07180fd80f2c462f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ce9a1ff8233ff6bc84db071… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 8 11:58:32 2011 +0200 shdocvw: Clean tests skipping. --- dlls/shdocvw/tests/intshcut.c | 96 +++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 47 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index e8afb74..023df4d 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -120,15 +120,12 @@ static void test_QueryInterface(void) IUnknown *pUnknown; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); - if (SUCCEEDED(hr)) - { - can_query_interface(pUnknown, &IID_IUniformResourceLocatorA); - can_query_interface(pUnknown, &IID_IUniformResourceLocatorW); - can_query_interface(pUnknown, &IID_IPersistFile); - IUnknown_Release(pUnknown); - } - else - skip("could not create a CLSID_InternetShortcut for QueryInterface tests, hr=0x%x\n", hr); + ok(hr == S_OK, "Could not create InternetShortcut object: %08x\n", hr); + + can_query_interface(pUnknown, &IID_IUniformResourceLocatorA); + can_query_interface(pUnknown, &IID_IUniformResourceLocatorW); + can_query_interface(pUnknown, &IID_IPersistFile); + IUnknown_Release(pUnknown); } static CHAR *set_and_get_url(IUniformResourceLocatorA *urlA, LPCSTR input, DWORD flags) @@ -176,15 +173,17 @@ static BOOL check_ie(void) static void test_ReadAndWriteProperties(void) { + int iconIndex = 7; + PROPSPEC ps[2]; HRESULT hr; IUniformResourceLocatorA *urlA; IUniformResourceLocatorA *urlAFromFile; WCHAR fileNameW[MAX_PATH]; + static const WCHAR shortcutW[] = {'t','e','s','t','s','h','o','r','t','c','u','t','.','u','r','l',0}; WCHAR iconPath[] = {'f','i','l','e',':','/','/','/','C',':','/','a','r','b','i','t','r','a','r','y','/','i','c','o','n','/','p','a','t','h',0}; - int iconIndex = 7; char testurl[] = "http://some/bogus/url.html"; - PROPSPEC ps[2]; + ps[0].ulKind = PRSPEC_PROPID; U(ps[0]).propid = PID_IS_ICONFILE; ps[1].ulKind = PRSPEC_PROPID; @@ -290,29 +289,25 @@ static void test_ReadAndWriteProperties(void) static void test_NullURLs(void) { + LPSTR url = NULL; HRESULT hr; IUniformResourceLocatorA *urlA; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); - if (SUCCEEDED(hr)) - { - LPSTR url = NULL; + ok(hr == S_OK, "Could not create InternetShortcut object: %08x\n", hr); - hr = urlA->lpVtbl->GetURL(urlA, &url); - ok(SUCCEEDED(hr), "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); - ok(url == NULL, "uninitialized URL is not NULL but %s\n", url); + hr = urlA->lpVtbl->GetURL(urlA, &url); + ok(SUCCEEDED(hr), "getting uninitialized URL unexpectedly failed, hr=0x%x\n", hr); + ok(url == NULL, "uninitialized URL is not NULL but %s\n", url); - hr = urlA->lpVtbl->SetURL(urlA, NULL, 0); - ok(SUCCEEDED(hr), "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); + hr = urlA->lpVtbl->SetURL(urlA, NULL, 0); + ok(SUCCEEDED(hr), "setting NULL URL unexpectedly failed, hr=0x%x\n", hr); - hr = urlA->lpVtbl->GetURL(urlA, &url); - ok(SUCCEEDED(hr), "getting NULL URL unexpectedly failed, hr=0x%x\n", hr); - ok(url == NULL, "URL unexpectedly not NULL but %s\n", url); + hr = urlA->lpVtbl->GetURL(urlA, &url); + ok(SUCCEEDED(hr), "getting NULL URL unexpectedly failed, hr=0x%x\n", hr); + ok(url == NULL, "URL unexpectedly not NULL but %s\n", url); - urlA->lpVtbl->Release(urlA); - } - else - skip("could not create a CLSID_InternetShortcut for NullURL tests, hr=0x%x\n", hr); + urlA->lpVtbl->Release(urlA); } static void test_SetURLFlags(void) @@ -321,38 +316,45 @@ static void test_SetURLFlags(void) IUniformResourceLocatorA *urlA; hr = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&urlA); - if (SUCCEEDED(hr)) - { - check_string_transform(urlA, "somerandomstring", 0, "somerandomstring"); - check_string_transform(urlA, "www.winehq.org", 0, "www.winehq.org"); + ok(hr == S_OK, "Could not create InternetShortcut object: %08x\n", hr); - todo_wine - { - check_string_transform(urlA, "www.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "http://www.winehq.org/"); - check_string_transform(urlA, "ftp.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "ftp://ftp.winehq.org/"); - } + check_string_transform(urlA, "somerandomstring", 0, "somerandomstring"); + check_string_transform(urlA, "www.winehq.org", 0, "www.winehq.org"); - urlA->lpVtbl->Release(urlA); - } - else - skip("could not create a CLSID_InternetShortcut for SetUrl tests, hr=0x%x\n", hr); + todo_wine + check_string_transform(urlA, "www.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "http://www.winehq.org/"); + todo_wine + check_string_transform(urlA, "ftp.winehq.org", IURL_SETURL_FL_GUESS_PROTOCOL, "ftp://ftp.winehq.org/"); + + urlA->lpVtbl->Release(urlA); } static void test_InternetShortcut(void) { - if (check_ie()) - { - test_Aggregability(); - test_QueryInterface(); - test_NullURLs(); - test_SetURLFlags(); - test_ReadAndWriteProperties(); + IUniformResourceLocatorA *url; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_InternetShortcut, NULL, CLSCTX_ALL, &IID_IUniformResourceLocatorA, (void**)&url); + if(FAILED(hres)) { + win_skip("Could not create CLSID_InternetShortcut instance: %08x\n", hres); + return; } + + test_Aggregability(); + test_QueryInterface(); + test_NullURLs(); + test_SetURLFlags(); + test_ReadAndWriteProperties(); } START_TEST(intshcut) { OleInitialize(NULL); - test_InternetShortcut(); + + if(check_ie()) + test_InternetShortcut(); + else + win_skip("Too old IE\n"); + OleUninitialize(); }

1 0

Henri Verbeet : wined3d: Merge swapchain_base.c into swapchain.c.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 032c3743079cad81099bc3ff3b57b1696c39771a URL: http://source.winehq.org/git/wine.git/?a=commit;h=032c3743079cad81099bc3ff3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:59 2011 +0200 wined3d: Merge swapchain_base.c into swapchain.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/swapchain.c | 192 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain_base.c | 197 ---------------------------------------- dlls/wined3d/wined3d_private.h | 22 ----- 4 files changed, 187 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032c3743079cad81099bc…

1 0

Nikolay Sivov : ole32: Handle null argument in OleIsRunning().
by Alexandre Julliard 08 Apr '11

08 Apr '11

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 08 Apr '11

08 Apr '11

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 : msxml3/tests: Fix variable initializations to conform to C89.
by Alexandre Julliard 08 Apr '11

08 Apr '11

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

Francois Gouget : programs: NOINVERT is an obsolete flag so remove it.
by Alexandre Julliard 08 Apr '11

08 Apr '11

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 : cmdlgtst: Use the human readable application name in the window title.
by Alexandre Julliard 08 Apr '11

08 Apr '11

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 : progman: Fix accelerator support.
by Alexandre Julliard 08 Apr '11

08 Apr '11

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