May 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32: Add a test for the menu resource loader, make it pass under Wine.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 34015b93a4af1d9387e32bad070a6ac6fdcd0a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34015b93a4af1d9387e32bad0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 15 16:33:29 2007 +0900 user32: Add a test for the menu resource loader, make it pass under Wine. --- dlls/user32/menu.c | 2 + dlls/user32/tests/menu.c | 86 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 2 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 789f769..b57b0dc 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2032,6 +2032,8 @@ static BOOL MENU_SetItemData( MENUITEM *item, UINT flags, UINT_PTR id, item->text = NULL; } + if (flags & MF_SEPARATOR) flags |= MF_GRAYED | MF_DISABLED; + if (flags & MF_OWNERDRAW) item->dwItemData = (DWORD_PTR)str; else diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 141d6c5..5c94b4c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1914,9 +1914,7 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, if (mii.fType == MFT_SEPARATOR) { -todo_wine { ok(mii.fState == MFS_GRAYED, "id %u: expected fState MFS_GRAYED, got %04x\n", checked_cmd, mii.fState); -} ok(mii.wID == 0, "id %u: expected wID 0, got %u\n", checked_cmd, mii.wID); } else @@ -1988,6 +1986,89 @@ static void test_CheckMenuRadioItem(void) check_menu_items(hmenu, -1, 0, 0); } +static void test_menu_resource_layout(void) +{ + static const struct + { + MENUITEMTEMPLATEHEADER mith; + WORD data[]; + } menu_template = + { + { 0, 0 }, /* versionNumber, offset */ + { + /* mtOption, mtID, mtString[] '\0' terminated */ + MF_STRING, 1, 'F', 0, + MF_STRING, 2, 0, + MF_SEPARATOR, 3, 0, + /* MF_SEPARATOR, 4, 'S', 0, FIXME: Wine ignores 'S' */ + MF_STRING|MF_GRAYED|MF_END, 5, 'E', 0 + } + }; + static const struct + { + UINT type, state, id; + const char *str; + } menu_data[] = + { + { MF_STRING, MF_ENABLED, 1, "F" }, + { MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 2, "" }, + { MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 3, "" }, + /*{ MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 4, "S" }, FIXME: Wine ignores 'S'*/ + { MF_STRING, MF_GRAYED, 5, "E" }, + { MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 6, "" }, + { MF_STRING, MF_ENABLED, 7, "" }, + { MF_SEPARATOR, MF_GRAYED|MF_DISABLED, 8, "" } + }; + HMENU hmenu; + UINT count, i; + BOOL ret; + + hmenu = LoadMenuIndirect(&menu_template); + ok(hmenu != 0, "LoadMenuIndirect error %u\n", GetLastError()); + + ret = AppendMenu(hmenu, MF_STRING, 6, NULL); + ok(ret, "AppendMenu failed\n"); + ret = AppendMenu(hmenu, MF_STRING, 7, "\0"); + ok(ret, "AppendMenu failed\n"); + ret = AppendMenu(hmenu, MF_SEPARATOR, 8, "separator"); + ok(ret, "AppendMenu failed\n"); + + count = GetMenuItemCount(hmenu); + ok(count == sizeof(menu_data)/sizeof(menu_data[0]), + "expected %u menu items, got %u\n", + (UINT)sizeof(menu_data)/sizeof(menu_data[0]), count); + + for (i = 0; i < count; i++) + { + char buf[20]; + MENUITEMINFO mii; + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.dwTypeData = buf; + mii.cch = sizeof(buf); + mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; + ret = GetMenuItemInfo(hmenu, i, TRUE, &mii); + ok(ret, "GetMenuItemInfo(%u) failed\n", i); +#if 0 + trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", + i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); +#endif + ok(mii.fType == menu_data[i].type, + "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); + ok(mii.fState == menu_data[i].state, + "%u: expected fState %04x, got %04x\n", i, menu_data[i].state, mii.fState); + ok(mii.wID == menu_data[i].id, + "%u: expected wID %04x, got %04x\n", i, menu_data[i].id, mii.wID); + ok(mii.cch == strlen(menu_data[i].str), + "%u: expected cch %u, got %u\n", i, (UINT)strlen(menu_data[i].str), mii.cch); + ok(!strcmp((LPCSTR)mii.dwTypeData, menu_data[i].str), + "%u: expected dwTypeData %s, got %s\n", i, menu_data[i].str, (LPCSTR)mii.dwTypeData); + } + + DestroyMenu(hmenu); +} + START_TEST(menu) { pSetMenuInfo = @@ -2007,4 +2088,5 @@ START_TEST(menu) test_menu_flags(); test_menu_hilitemenuitem(); test_CheckMenuRadioItem(); + test_menu_resource_layout(); }

1 0

Jacek Caban : mshtml: Improve some exec command stubs.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 757192ebceb8cad9049954fbf5b1dda5d605ab3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=757192ebceb8cad9049954fbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 23:56:39 2007 +0200 mshtml: Improve some exec command stubs. --- dlls/mshtml/olecmd.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index deac11e..a309e9d 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -577,6 +577,24 @@ static void set_ns_align(HTMLDocument *This, const char *align_str) nsICommandParams_Release(nsparam); } +static HRESULT exec_mshtml_copy(HTMLDocument *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT exec_mshtml_cut(HTMLDocument *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT exec_mshtml_paste(HTMLDocument *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + static HRESULT exec_fontname(HTMLDocument *This, VARIANT *in, VARIANT *out) { TRACE("(%p)->(%p %p)\n", This, in, out); @@ -911,9 +929,9 @@ static HRESULT exec_outdent(HTMLDocument *This) return S_OK; } -static HRESULT exec_htmleditmode(HTMLDocument *This) +static HRESULT exec_htmleditmode(HTMLDocument *This, VARIANT *in) { - FIXME("(%p)\n", This); + FIXME("(%p)->(%p)\n", This, in); return S_OK; } @@ -929,6 +947,12 @@ static HRESULT exec_composesettings(HTMLDocument *This, VARIANT *in) return S_OK; } +static HRESULT exec_setdirty(HTMLDocument *This, VARIANT *in) +{ + FIXME("(%p)->(%p)\n", This, in); + return E_NOTIMPL; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -1162,10 +1186,22 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return OLECMDERR_E_NOTSUPPORTED; }else if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { switch(nCmdID) { + case IDM_COPY: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_mshtml_copy(This); + case IDM_CUT: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_mshtml_cut(This); case IDM_FONTNAME: return exec_fontname(This, pvaIn, pvaOut); case IDM_FONTSIZE: return exec_fontsize(This, pvaIn, pvaOut); + case IDM_PASTE: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_mshtml_paste(This); case IDM_PRINT: return exec_print(This, nCmdexecopt, pvaIn, pvaOut); case IDM_BOLD: @@ -1225,13 +1261,17 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID FIXME("unsupported arguments\n"); return exec_outdent(This); case IDM_HTMLEDITMODE: - if(pvaIn || pvaOut) + if(pvaOut) FIXME("unsupported arguments\n"); - return exec_htmleditmode(This); + return exec_htmleditmode(This, pvaIn); case IDM_COMPOSESETTINGS: if(pvaOut) FIXME("unsupported arguments\n"); return exec_composesettings(This, pvaIn); + case IDM_SETDIRTY: + if(pvaOut) + FIXME("unsupported arguments\n"); + return exec_setdirty(This, pvaIn); default: FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED;

1 0

Misha Koshelev : msi: automation: Implement Record::IntegerData.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 18cab64b42c0f5c8d61fbd3772a2d7da15b2dea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18cab64b42c0f5c8d61fbd377… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:14:00 2007 -0500 msi: automation: Implement Record::IntegerData. --- dlls/msi/automation.c | 20 +++++++++++++++++ dlls/msi/msiserver.idl | 6 +++++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 49 +++++++++++++++++++---------------------- 4 files changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index b9dcb5a..c7b8181 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -608,6 +608,26 @@ static HRESULT WINAPI RecordImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_RECORD_INTEGERDATA: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = MsiRecordGetInteger(This->msiHandle, V_I4(&varg0)); + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiRecordSetInteger(This->msiHandle, V_I4(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiRecordSetInteger returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + default: return DISP_E_MEMBERNOTFOUND; } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 560b572..25008dd 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -88,6 +88,12 @@ library WindowsInstaller void StringData( [in] long Field, [in] BSTR rhs); + [id(DISPID_RECORD_INTEGERDATA), propget] + long IntegerData([in] long Field); + [id(DISPID_RECORD_INTEGERDATA), propput] + void IntegerData( + [in] long Field, + [in] long rhs); [id(DISPID_RECORD_FIELDCOUNT), propget] long FieldCount(); } diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index ebcab7d..c9906b4 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -24,6 +24,7 @@ #define DISPID_RECORD_FIELDCOUNT 0 #define DISPID_RECORD_STRINGDATA 1 +#define DISPID_RECORD_INTEGERDATA 2 #define DISPID_STRINGLIST_ITEM 0 #define DISPID_STRINGLIST_COUNT 1 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 4aaa671..5eb0bc2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1478,32 +1478,29 @@ static void test_Installer(void) ok(SUCCEEDED(hr), "Record_FiledCountGet failed, hresult 0x%08x\n", hr); ok(iValue == 1, "Record_FieldCountGet result was %d but expected 1\n", iValue); - todo_wine - { - /* Record::IntegerDataGet */ - hr = Record_IntegerDataGet(pRecord, 1, &iValue); - ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); - ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); - - /* Record::IntegerDataGet, bad index */ - hr = Record_IntegerDataGet(pRecord, 10, &iValue); - ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); - ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); - - /* Record::IntegerDataPut */ - hr = Record_IntegerDataPut(pRecord, 1, 100); - ok(SUCCEEDED(hr), "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); - - /* Record::IntegerDataPut, bad index */ - hr = Record_IntegerDataPut(pRecord, 10, 100); - ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); - ok_exception(hr, szIntegerDataException); - - /* Record::IntegerDataGet */ - hr = Record_IntegerDataGet(pRecord, 1, &iValue); - ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); - ok(iValue == 100, "Record_IntegerDataGet result was %d but expected 100\n", iValue); - } + /* Record::IntegerDataGet */ + hr = Record_IntegerDataGet(pRecord, 1, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); + + /* Record::IntegerDataGet, bad index */ + hr = Record_IntegerDataGet(pRecord, 10, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); + + /* Record::IntegerDataPut */ + hr = Record_IntegerDataPut(pRecord, 1, 100); + ok(SUCCEEDED(hr), "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + + /* Record::IntegerDataPut, bad index */ + hr = Record_IntegerDataPut(pRecord, 10, 100); + ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + ok_exception(hr, szIntegerDataException); + + /* Record::IntegerDataGet */ + hr = Record_IntegerDataGet(pRecord, 1, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == 100, "Record_IntegerDataGet result was %d but expected 100\n", iValue); IDispatch_Release(pRecord); }

1 0

Misha Koshelev : msi/tests: automation: Add test for Installer:: InstallProduct.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: b75b224822d14186f22f0f6ce8200bff505dbbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75b224822d14186f22f0f6ce… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:14:42 2007 -0500 msi/tests: automation: Add test for Installer::InstallProduct. --- dlls/msi/tests/automation.c | 306 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 299 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75b224822d14186f22f0…

1 0

Misha Koshelev : msi: automation: Implement Installer::InstallProduct.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 5b37ba6f04e0d101c840e3294b91611c94263a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b37ba6f04e0d101c840e3294… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon May 14 12:14:51 2007 -0500 msi: automation: Implement Installer::InstallProduct. --- dlls/msi/automation.c | 22 +++++++ dlls/msi/msiserver.idl | 4 + dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 126 +++++++++++++++++++---------------------- 4 files changed, 85 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b37ba6f04e0d101c840e…

1 0

Andrew Talbot : netapi32: Exclude unused headers.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 2fb8c8aad06ab9e1f7cd35716453deef57a9e737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb8c8aad06ab9e1f7cd35716… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon May 14 20:50:45 2007 +0100 netapi32: Exclude unused headers. --- dlls/netapi32/access.c | 1 - dlls/netapi32/wksta.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index ea2ddd8..467c124 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -29,7 +29,6 @@ #include "lmaccess.h" #include "lmapibuf.h" #include "lmerr.h" -#include "winreg.h" #include "ntsecapi.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 380dcab..fbc4670 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -35,7 +35,6 @@ #include "lmwksta.h" #include "iphlpapi.h" #include "winerror.h" -#include "winreg.h" #include "ntsecapi.h" #include "netbios.h" #include "wine/debug.h"

1 0

Maarten Lankhorst : dsound: IDirectSound_Compact should return DS_OK on priolevel >= DSSCL_PRIORITY.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 2e9fa34d678c348e2e8b4c520726c63a1cf1896a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9fa34d678c348e2e8b4c520… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 14 20:32:19 2007 +0200 dsound: IDirectSound_Compact should return DS_OK on priolevel >= DSSCL_PRIORITY. --- dlls/dsound/dsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index fbcc798..a9c0230 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1707,7 +1707,7 @@ HRESULT DirectSoundDevice_Compact( return DSERR_UNINITIALIZED; } - if (device->priolevel != DSSCL_PRIORITY) { + if (device->priolevel < DSSCL_PRIORITY) { WARN("incorrect priority level\n"); return DSERR_PRIOLEVELNEEDED; }

1 0

Mounir IDRASSI : rsaenh: Fix crash in RSAENH_CPVerifySignature if pbSignature is set to NULL or if dwSigLen is lesser than the expected value .
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: e61eddd6a56e1a0befc25a96216156e9ae07e8f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61eddd6a56e1a0befc25a962… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Tue May 15 00:35:46 2007 +0200 rsaenh: Fix crash in RSAENH_CPVerifySignature if pbSignature is set to NULL or if dwSigLen is lesser than the expected value. --- dlls/rsaenh/rsaenh.c | 15 +++++++++++++++ dlls/rsaenh/tests/rsaenh.c | 12 ++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 3e7ac8e..ca9e4a9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3611,6 +3611,21 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, CONST B return FALSE; } + /* in Microsoft implementation, the signature length is checked before + * the signature pointer. + */ + if (dwSigLen != pCryptKey->dwKeyLen) + { + SetLastError(NTE_BAD_SIGNATURE); + return FALSE; + } + + if (!hHash || !pbSignature) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (sDescription) { if (!RSAENH_CPHashData(hProv, hHash, (CONST BYTE*)sDescription, (DWORD)lstrlenW(sDescription)*sizeof(WCHAR), 0)) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 466a43c..5d17be2 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1043,6 +1043,18 @@ static void test_verify_signature(void) { ok(result, "%08x\n", GetLastError()); if (!result) return; + /*check that a NULL pointer signature is correctly handled*/ + result = CryptVerifySignature(hHash, NULL, 128, hPubSignKey, NULL, 0); + ok(!result && ERROR_INVALID_PARAMETER == GetLastError(), + "Expected ERROR_INVALID_PARAMETER error, got %08x\n", GetLastError()); + if (result) return; + + /* check that we get a bad signature error when the signature is too short*/ + result = CryptVerifySignature(hHash, abSignatureMD2, 64, hPubSignKey, NULL, 0); + ok(!result && NTE_BAD_SIGNATURE == GetLastError(), + "Expected NTE_BAD_SIGNATURE error, got %08x\n", GetLastError()); + if (result) return; + result = CryptVerifySignature(hHash, abSignatureMD2, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); if (!result) return;

1 0

Dmitry Timoshkov : user32: Add a test for CheckMenuRadioItem and make it pass under Wine.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 7f189eccb97b6c949f75d22207079c73415bb845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f189eccb97b6c949f75d2220… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 14 23:46:32 2007 +0900 user32: Add a test for CheckMenuRadioItem and make it pass under Wine. --- dlls/user32/menu.c | 61 +++++++++++++-------- dlls/user32/tests/menu.c | 119 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/resource.rc | 21 +++++++ 3 files changed, 177 insertions(+), 24 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 4aca343..789f769 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4817,34 +4817,49 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last, UINT check, UINT bypos) { - MENUITEM *mifirst, *milast, *micheck; - HMENU mfirst = hMenu, mlast = hMenu, mcheck = hMenu; + BOOL done = FALSE; + UINT i; + MENUITEM *mi_first = NULL, *mi_check; + HMENU m_first, m_check; - TRACE("%p: %d-%d, check %d, bypos=%d\n", hMenu, first, last, check, bypos); + TRACE("%p: %u-%u, check %u, flags %04x\n", hMenu, first, last, check, bypos); - mifirst = MENU_FindItem (&mfirst, &first, bypos); - milast = MENU_FindItem (&mlast, &last, bypos); - micheck = MENU_FindItem (&mcheck, &check, bypos); + for (i = first; i <= last; i++) + { + UINT pos = i; - if (mifirst == NULL || milast == NULL || micheck == NULL || - mifirst > milast || mfirst != mlast || mfirst != mcheck || - micheck > milast || micheck < mifirst) - return FALSE; + if (!mi_first) + { + m_first = hMenu; + mi_first = MENU_FindItem(&m_first, &pos, bypos); + if (!mi_first) continue; + mi_check = mi_first; + m_check = m_first; + } + else + { + m_check = hMenu; + mi_check = MENU_FindItem(&m_check, &pos, bypos); + if (!mi_check) continue; + } - while (mifirst <= milast) - { - if (mifirst == micheck) - { - mifirst->fType |= MFT_RADIOCHECK; - mifirst->fState |= MFS_CHECKED; - } else { - mifirst->fType &= ~MFT_RADIOCHECK; - mifirst->fState &= ~MFS_CHECKED; - } - mifirst++; - } + if (m_first != m_check) continue; + if (mi_check->fType == MFT_SEPARATOR) continue; - return TRUE; + if (i == check) + { + mi_check->fType |= MFT_RADIOCHECK; + mi_check->fState |= MFS_CHECKED; + done = TRUE; + } + else + { + /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ + mi_check->fState &= ~MFS_CHECKED; + } + } + + return done; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 0fb2ced..141d6c5 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2,6 +2,7 @@ * Unit tests for menus * * Copyright 2005 Robert Shearman + * Copyright 2007 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> +#define _WIN32_WINNT 0x0501 + #include <stdarg.h> #include <stdio.h> #include <string.h> @@ -1872,6 +1874,120 @@ static void test_menu_hilitemenuitem( void ) DestroyMenu(hMenu); } +static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, + UINT checked_state) +{ + UINT i, count; + + count = GetMenuItemCount(hmenu); + + for (i = 0; i < count; i++) + { + BOOL ret; + MENUITEMINFO mii; + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; + ret = GetMenuItemInfo(hmenu, i, TRUE, &mii); + ok(ret, "GetMenuItemInfo(%u) failed\n", i); +#if 0 + trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", + i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); +#endif + if (mii.hSubMenu) + { + ok((HMENU)mii.wID == mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd); + check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state); + } + else + { + if (mii.wID == checked_cmd) + { + ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType); + ok(mii.fState == checked_state, "id %u: expected fState %04x, got %04x\n", checked_cmd, checked_state, mii.fState); + ok(mii.wID != 0, "id %u: not expected wID 0\n", checked_cmd); + } + else + { + ok(mii.fType != MFT_RADIOCHECK, "id %u: not expected fType MFT_RADIOCHECK on cmd %u\n", checked_cmd, mii.wID); + + if (mii.fType == MFT_SEPARATOR) + { +todo_wine { + ok(mii.fState == MFS_GRAYED, "id %u: expected fState MFS_GRAYED, got %04x\n", checked_cmd, mii.fState); +} + ok(mii.wID == 0, "id %u: expected wID 0, got %u\n", checked_cmd, mii.wID); + } + else + { + ok(mii.fState == 0, "id %u: expected fState 0, got %04x\n", checked_cmd, mii.fState); + ok(mii.wID != 0, "id %u: not expected wID 0\n", checked_cmd); + } + } + } + } +} + +static void clear_ftype_and_state(HMENU hmenu, UINT id, UINT flags) +{ + BOOL ret; + MENUITEMINFO mii; + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_FTYPE | MIIM_STATE; + ret = SetMenuItemInfo(hmenu, id, (flags & MF_BYPOSITION) != 0, &mii); + ok(ret, "SetMenuItemInfo(%u) failed\n", id); +} + +static void test_CheckMenuRadioItem(void) +{ + BOOL ret; + HMENU hmenu; + + hmenu = LoadMenu(GetModuleHandle(0), MAKEINTRESOURCE(1)); + assert(hmenu != 0); + + check_menu_items(hmenu, -1, 0, 0); + + ret = CheckMenuRadioItem(hmenu, 100, 100, 100, MF_BYCOMMAND); + ok(ret, "CheckMenuRadioItem failed\n"); + check_menu_items(hmenu, 100, MFT_RADIOCHECK, MFS_CHECKED); + + /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ + ret = CheckMenuRadioItem(hmenu, 100, 100, -1, MF_BYCOMMAND); + ok(!ret, "CheckMenuRadioItem should return FALSE\n"); + check_menu_items(hmenu, 100, MFT_RADIOCHECK, 0); + + /* clear check */ + clear_ftype_and_state(hmenu, 100, MF_BYCOMMAND); + check_menu_items(hmenu, -1, 0, 0); + + /* first and checked items are on different menus */ + ret = CheckMenuRadioItem(hmenu, 0, 300, 202, MF_BYCOMMAND); + ok(!ret, "CheckMenuRadioItem should return FALSE\n"); + check_menu_items(hmenu, -1, 0, 0); + + ret = CheckMenuRadioItem(hmenu, 200, 300, 202, MF_BYCOMMAND); + ok(ret, "CheckMenuRadioItem failed\n"); + check_menu_items(hmenu, 202, MFT_RADIOCHECK, MFS_CHECKED); + + /* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */ + ret = CheckMenuRadioItem(hmenu, 202, 202, -1, MF_BYCOMMAND); + ok(!ret, "CheckMenuRadioItem should return FALSE\n"); + check_menu_items(hmenu, 202, MFT_RADIOCHECK, 0); + + /* clear check */ + clear_ftype_and_state(hmenu, 202, MF_BYCOMMAND); + check_menu_items(hmenu, -1, 0, 0); + + /* just for fun, try to check separator */ + ret = CheckMenuRadioItem(hmenu, 0, 300, 0, MF_BYCOMMAND); + ok(!ret, "CheckMenuRadioItem should return FALSE\n"); + check_menu_items(hmenu, -1, 0, 0); +} + START_TEST(menu) { pSetMenuInfo = @@ -1890,4 +2006,5 @@ START_TEST(menu) test_menu_input(); test_menu_flags(); test_menu_hilitemenuitem(); + test_CheckMenuRadioItem(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 47328fc..c2d5c30 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -106,3 +106,24 @@ END '00 00 00 00 00 00 00 00 00 00 FF FF FF 00 40 00' '00 00' } */ + +1 MENU +{ + POPUP "&File" + { + MENUITEM "&New", 100 + MENUITEM "&Open", 101 + MENUITEM "&Save", 102 + MENUITEM SEPARATOR + MENUITEM "E&xit", 103 + } + POPUP "Edit" + { + MENUITEM "&Undo", 200 + MENUITEM SEPARATOR + MENUITEM "Cu&t", 201 + MENUITEM "&Copy", 202 + MENUITEM "&Paste", 203 + MENUITEM "&Delete", 204 + } +}

1 0

Andrew Talbot : msvcrt20: Exclude unused header.
by Alexandre Julliard 15 May '07

15 May '07

Module: wine Branch: master Commit: 99504c0e47d1788986acd7e3e5c0af7fa4eb2ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99504c0e47d1788986acd7e3e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat May 12 13:59:58 2007 +0100 msvcrt20: Exclude unused header. --- dlls/msvcrt20/msvcrt20.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c index 8f8b448..e8d2b3c 100644 --- a/dlls/msvcrt20/msvcrt20.c +++ b/dlls/msvcrt20/msvcrt20.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include "windef.h" -#include "winbase.h" extern void CDECL __getmainargs(int *argc, char** *argv, char** *envp, int expand_wildcards, int *new_mode);

1 0