March 2009 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Add some tests for MsiQueryFeatureState.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: c2221f325fdb383699b1469ade75c2a5e2b4d742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2221f325fdb383699b1469ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 13:52:04 2009 +0100 msi: Add some tests for MsiQueryFeatureState. These tests confirm that a feature is reported as advertised if only one of its components is missing. --- dlls/msi/tests/msi.c | 83 +++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 65 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2221f325fdb383699b14…

1 0

Hans Leidekker : msi: Detect privately installed assemblies.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 9c6e6efa32976e9a91330bf5bd1c0be02d6b6167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6e6efa32976e9a91330bf5b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 25 13:52:56 2009 +0100 msi: Detect privately installed assemblies. Another fix for the office 2007 sp1 installer. --- dlls/msi/action.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index ce038a1..92b95df 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6070,9 +6070,24 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param) assembly->manifest = strdupW(MSI_RecordGetString(rec, 3)); assembly->application = strdupW(MSI_RecordGetString(rec, 4)); assembly->attributes = MSI_RecordGetInteger(rec, 5); - assembly->installed = check_assembly_installed(list->package->db, - list->cache, - assembly->component); + + if (assembly->application) + { + WCHAR version[24]; + DWORD size = sizeof(version)/sizeof(WCHAR); + + /* FIXME: we should probably check the manifest file here */ + + if (!MsiGetFileVersionW(assembly->file->TargetPath, version, &size, NULL, NULL) && + strcmpW(version, assembly->file->Version) >= 0) + { + assembly->installed = TRUE; + } + } + else + assembly->installed = check_assembly_installed(list->package->db, + list->cache, + assembly->component); list_add_head(list->assemblies, &assembly->entry); return ERROR_SUCCESS;

1 0

Rob Shearman : rpcrt4: Implement stubless asynchronous NDR interpreter.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 834c5b4275c376c55cbb27182069793bfd95226d URL: http://source.winehq.org/git/wine.git/?a=commit;h=834c5b4275c376c55cbb27182… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 18 10:59:35 2009 +0000 rpcrt4: Implement stubless asynchronous NDR interpreter. CodeWeavers did this work for supporting Outlook 2007. --- dlls/rpcrt4/ndr_stubless.c | 336 ++++++++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_stubless.h | 1 + dlls/rpcrt4/rpc_assoc.c | 1 + dlls/rpcrt4/rpc_async.c | 16 ++- dlls/rpcrt4/rpcrt4.spec | 3 +- 5 files changed, 354 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=834c5b4275c376c55cbb2…

1 0

Rob Shearman : rpcrt4: Implement RPC over HTTP support.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 5f6ae94ad0163341c2cd79a89f29b2187367b5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6ae94ad0163341c2cd79a89… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 18 11:13:19 2009 +0000 rpcrt4: Implement RPC over HTTP support. CodeWeavers did this work for supporting the optional HTTP connection method of Outlook 2003/2007 (must be running with Windows versions set to XP or higher to see this option). This was written before Microsoft publicly released a specification for the RPC over HTTP protocol and so was developed by examining traffic flowing between a Windows client and an IIS server. --- dlls/rpcrt4/Makefile.in | 2 +- dlls/rpcrt4/rpc_assoc.c | 1 + dlls/rpcrt4/rpc_assoc.h | 1 + dlls/rpcrt4/rpc_binding.h | 3 + dlls/rpcrt4/rpc_defs.h | 10 + dlls/rpcrt4/rpc_message.c | 332 ++++++++++++++- dlls/rpcrt4/rpc_message.h | 11 + dlls/rpcrt4/rpc_transport.c | 994 ++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 1337 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6ae94ad0163341c2cd7…

1 0

Kusanagi Kouichi : winex11.drv: Make import/export functions static.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: bcdf8f6edd82bc41e70eca32cdd9e2064ec7f12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcdf8f6edd82bc41e70eca32c… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Mar 13 22:03:18 2009 +0900 winex11.drv: Make import/export functions static. --- dlls/winex11.drv/clipboard.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 7cea221..0b27a87 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1124,7 +1124,7 @@ static BOOL X11DRV_CLIPBOARD_RenderSynthesizedBitmap(Display *display) * * Import XA_STRING, converting the string to CF_TEXT. */ -HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1168,7 +1168,7 @@ HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *display, Window w, Atom prop) * * Import XA_STRING, converting the string to CF_UNICODE. */ -HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1290,7 +1290,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At * * Import XA_PIXMAP, converting the image to CF_DIB. */ -HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) { HWND hwnd; HDC hdc; @@ -1322,7 +1322,7 @@ HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom prop) * * Import MetaFilePict. */ -HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1346,7 +1346,7 @@ HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *display, Window w, Atom prop * * Import EnhMetaFile. */ -HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) { LPBYTE lpdata; unsigned long cbytes; @@ -1370,7 +1370,7 @@ HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *display, Window w, Atom prop) * * Generic import clipboard data routine. */ -HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom prop) +static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom prop) { LPVOID lpClipData; LPBYTE lpdata; @@ -1411,7 +1411,7 @@ HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, Atom pro * * Generic export clipboard data routine. */ -HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requestor, Atom aTarget, +static HANDLE X11DRV_CLIPBOARD_ExportClipboardData(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { LPVOID lpClipData; @@ -1596,7 +1596,7 @@ static HANDLE X11DRV_CLIPBOARD_ExportCompoundText(Display *display, Window reque * * Export string */ -HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpData, LPDWORD lpBytes) { if (X11DRV_CLIPBOARD_RenderFormat(display, lpData)) @@ -1624,7 +1624,7 @@ HANDLE X11DRV_CLIPBOARD_ExportString(Display *display, Window requestor, Atom aT * * Export CF_DIB to XA_PIXMAP. */ -HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { HDC hdc; @@ -1662,7 +1662,7 @@ HANDLE X11DRV_CLIPBOARD_ExportXAPIXMAP(Display *display, Window requestor, Atom * * Export MetaFilePict. */ -HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) @@ -1680,7 +1680,7 @@ HANDLE X11DRV_CLIPBOARD_ExportMetaFilePict(Display *display, Window requestor, A * * Export EnhMetaFile. */ -HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, Atom rprop, +static HANDLE X11DRV_CLIPBOARD_ExportEnhMetaFile(Display *display, Window requestor, Atom aTarget, Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) { if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata))

1 0

Ricardo Filipe : comdlg32: Send CDN_INCLUDEITEM notification for each object in an Open/Save dialog.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 13f1988720ac4829574ec6847257f71808589c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f1988720ac4829574ec6847… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Mar 13 00:58:35 2009 +0000 comdlg32: Send CDN_INCLUDEITEM notification for each object in an Open/Save dialog. --- dlls/comdlg32/filedlg.c | 5 +-- dlls/comdlg32/filedlgbrowser.c | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a2826c8..4c2164d 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -37,7 +37,7 @@ * FIXME: add to recent docs * * FIXME: flags not implemented: OFN_DONTADDTORECENT, - * OFN_ENABLEINCLUDENOTIFY, OFN_ENABLESIZING, + * OFN_ENABLESIZING, * OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN, * OFN_NOTESTFILECREATE, OFN_USEMONIKERS * @@ -82,8 +82,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ -(OFN_DONTADDTORECENT |\ -OFN_ENABLEINCLUDENOTIFY | OFN_ENABLESIZING |\ +(OFN_DONTADDTORECENT | OFN_ENABLESIZING |\ OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 704fb98..f630f14 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -846,6 +846,47 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr return NOERROR; } +/* send_includeitem_notification + * + * Sends a CDN_INCLUDEITEM notification for "pidl" to hwndParentDlg + */ +static LRESULT send_includeitem_notification(HWND hwndParentDlg, LPCITEMIDLIST pidl) +{ + LRESULT hook_result = 0; + FileOpenDlgInfos *fodInfos = GetPropA(hwndParentDlg, FileOpenDlgInfosStr); + + if(!fodInfos) return 0; + + if(fodInfos->DlgInfos.hwndCustomDlg) + { + TRACE("call notify CDN_INCLUDEITEM for pidl=%p\n", pidl); + if(fodInfos->unicode) + { + OFNOTIFYEXW ofnNotify; + ofnNotify.psf = fodInfos->Shell.FOIShellFolder; + ofnNotify.pidl = (LPITEMIDLIST)pidl; + ofnNotify.hdr.hwndFrom = hwndParentDlg; + ofnNotify.hdr.idFrom = 0; + ofnNotify.hdr.code = CDN_INCLUDEITEM; + ofnNotify.lpOFN = fodInfos->ofnInfos; + hook_result = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + } + else + { + OFNOTIFYEXA ofnNotify; + ofnNotify.psf = fodInfos->Shell.FOIShellFolder; + ofnNotify.pidl = (LPITEMIDLIST)pidl; + ofnNotify.hdr.hwndFrom = hwndParentDlg; + ofnNotify.hdr.idFrom = 0; + ofnNotify.hdr.code = CDN_INCLUDEITEM; + ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; + hook_result = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg, WM_NOTIFY, 0, (LPARAM)&ofnNotify); + } + } + TRACE("Retval: 0x%08lx\n", hook_result); + return hook_result; +} + /************************************************************************** * IShellBrowserImpl_ICommDlgBrowser_IncludeObject */ @@ -875,6 +916,11 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr if(ulAttr & (SFGAO_FOLDER | SFGAO_LINK)) return S_OK; + /* if the application takes care of including the item we are done */ + if(fodInfos->ofnInfos->Flags & OFN_ENABLEINCLUDENOTIFY && + send_includeitem_notification(This->hwndOwner, pidl)) + return S_OK; + /* Check if there is a mask to apply if not */ if(!fodInfos->ShellInfos.lpstrCurrentFilter || !lstrlenW(fodInfos->ShellInfos.lpstrCurrentFilter)) return S_OK;

1 0

Roman Mindalev : ntdll: Check for arch and name fields in assembly_identity structure.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: b653679e6a1dfd86ae5b457fb296ebe619e1b8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b653679e6a1dfd86ae5b457fb… Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:14:03 2009 +0300 ntdll: Check for arch and name fields in assembly_identity structure. --- dlls/ntdll/actctx.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 79d475f..25c590a 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -496,17 +496,19 @@ static WCHAR *build_assembly_dir(struct assembly_identity* ai) static const WCHAR noneW[] = {'n','o','n','e',0}; static const WCHAR mskeyW[] = {'d','e','a','d','b','e','e','f',0}; + const WCHAR *arch = ai->arch ? ai->arch : noneW; const WCHAR *key = ai->public_key ? ai->public_key : noneW; const WCHAR *lang = ai->language ? ai->language : noneW; - SIZE_T size = (strlenW(ai->arch) + 1 + strlenW(ai->name) + 1 + strlenW(key) + 24 + 1 + - strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); + const WCHAR *name = ai->name ? ai->name : noneW; + SIZE_T size = (strlenW(arch) + 1 + strlenW(name) + 1 + strlenW(key) + 24 + 1 + + strlenW(lang) + 1) * sizeof(WCHAR) + sizeof(mskeyW); WCHAR *ret; if (!(ret = RtlAllocateHeap( GetProcessHeap(), 0, size ))) return NULL; - strcpyW( ret, ai->arch ); + strcpyW( ret, arch ); strcatW( ret, undW ); - strcatW( ret, ai->name ); + strcatW( ret, name ); strcatW( ret, undW ); strcatW( ret, key ); strcatW( ret, undW );

1 0

Roman Mindalev : ntdll: Free memory for type field of an assembly_identity.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: cbd935eff4f6634ebd2e1ba785ce0280d515743c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd935eff4f6634ebd2e1ba78… Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:15:33 2009 +0300 ntdll: Free memory for type field of an assembly_identity. --- dlls/ntdll/actctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 25c590a..f864033 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -338,6 +338,7 @@ static void free_assembly_identity(struct assembly_identity *ai) RtlFreeHeap( GetProcessHeap(), 0, ai->arch ); RtlFreeHeap( GetProcessHeap(), 0, ai->public_key ); RtlFreeHeap( GetProcessHeap(), 0, ai->language ); + RtlFreeHeap( GetProcessHeap(), 0, ai->type ); } static struct entity* add_entity(struct entity_array *array, DWORD kind)

1 0

Roman Mindalev : ntdll: Move search for assemblyIdentity element.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: 9925785eef43a04fd8b745c6ac4f05d0dcafbf0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9925785eef43a04fd8b745c6a… Author: Roman Mindalev <lists(a)r000n.net> Date: Fri Mar 13 20:16:35 2009 +0300 ntdll: Move search for assemblyIdentity element. --- dlls/ntdll/actctx.c | 60 ++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index f864033..3744904 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1390,37 +1390,6 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, assembly->no_inherit) return FALSE; - if (xmlstr_cmp(&elem, assemblyIdentityW)) - { - if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; - ret = next_xml_elem(xmlbuf, &elem); - - if (expected_ai) - { - /* FIXME: more tests */ - if (assembly->type == ASSEMBLY_MANIFEST && - memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) - { - FIXME("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", - expected_ai->version.major, expected_ai->version.minor, - expected_ai->version.build, expected_ai->version.revision, - assembly->id.version.major, assembly->id.version.minor, - assembly->id.version.build, assembly->id.version.revision); - return FALSE; - } - else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && - (assembly->id.version.major != expected_ai->version.major || - assembly->id.version.minor != expected_ai->version.minor || - assembly->id.version.build < expected_ai->version.build || - (assembly->id.version.build == expected_ai->version.build && - assembly->id.version.revision < expected_ai->version.revision))) - { - FIXME("wrong version for shared assembly manifest\n"); - return FALSE; - } - } - } - while (ret) { if (xmlstr_cmp_end(&elem, assemblyW)) @@ -1452,6 +1421,35 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, { ret = parse_clr_surrogate_elem(xmlbuf, assembly); } + else if (xmlstr_cmp(&elem, assemblyIdentityW)) + { + if (!parse_assembly_identity_elem(xmlbuf, acl->actctx, &assembly->id)) return FALSE; + + if (expected_ai) + { + /* FIXME: more tests */ + if (assembly->type == ASSEMBLY_MANIFEST && + memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) + { + FIXME("wrong version for assembly manifest: %u.%u.%u.%u / %u.%u.%u.%u\n", + expected_ai->version.major, expected_ai->version.minor, + expected_ai->version.build, expected_ai->version.revision, + assembly->id.version.major, assembly->id.version.minor, + assembly->id.version.build, assembly->id.version.revision); + ret = FALSE; + } + else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && + (assembly->id.version.major != expected_ai->version.major || + assembly->id.version.minor != expected_ai->version.minor || + assembly->id.version.build < expected_ai->version.build || + (assembly->id.version.build == expected_ai->version.build && + assembly->id.version.revision < expected_ai->version.revision))) + { + FIXME("wrong version for shared assembly manifest\n"); + ret = FALSE; + } + } + } else { WARN("unknown element %s\n", debugstr_xmlstr(&elem));

1 0

Rein Klazes : user32: In MENU_SuspendPopup() make sure the right message is removed.
by Alexandre Julliard 25 Mar '09

25 Mar '09

Module: wine Branch: master Commit: d75b0cdc986f464f3067767cd53aca6b85feb366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d75b0cdc986f464f3067767cd… Author: Rein Klazes <wijn(a)online.nl> Date: Wed Mar 18 08:47:00 2009 +0100 user32: In MENU_SuspendPopup() make sure the right message is removed. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index fc6f981..ff6af76 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2841,7 +2841,7 @@ static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg ) msg.hwnd = pmt->hOwnerWnd; - PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE); + PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); pmt->trackFlags |= TF_SKIPREMOVE; switch( uMsg )

1 0