[PATCH v2 0/2] MR9631: dlls/wmp: Implement the OLEIVERB_SHOW needed by the software Alldup

[pan hui (＠panhui)]

The software "Alldup" uses OLEIVERB_SHOW, but OLEIVERB_SHOW is not implemented in oleobj.c, resulting in errors when running the Alldup via Wine.

--
  v2: sign by:panhui(a)uniontech.com
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9631

[PATCH v2 1/2] sign by:[e-mail]

[panhui]

From: panhui <panhui(a)uniontech.com>

---
 dlls/wmp/oleobj.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c
index 5309194f289..725ab3dd7e6 100644
--- a/dlls/wmp/oleobj.c
+++ b/dlls/wmp/oleobj.c
@@ -421,7 +421,14 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms
 
         ShowWindow(This->hwnd, SW_HIDE);
         return S_OK;
+    case OLEIVERB_SHOW:
+        if(!This->hwnd) {
+            FIXME("No window to show\n");
+            return E_UNEXPECTED;
+        }
 
+        ShowWindow(This->hwnd, SW_SHOW);
+        return S_OK;
     default:
         FIXME("Unsupported iVerb %ld\n", iVerb);
     }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9631

[PATCH v2 2/2] sign by:[e-mail]

[panhui]

From: panhui <panhui(a)uniontech.com>

---
 dlls/hhctrl.ocx/help.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c
index f066d972a5b..1f9375f27ac 100644
--- a/dlls/hhctrl.ocx/help.c
+++ b/dlls/hhctrl.ocx/help.c
@@ -1608,7 +1608,7 @@ static BOOL AddIndexPopup(HHInfo *info)
     hwndPopup = CreateWindowExW(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_APPWINDOW
                                  | WS_EX_WINDOWEDGE | WS_EX_RIGHTSCROLLBAR,
                                 L"HH Popup", window_title, WS_POPUPWINDOW
-                                 | WS_OVERLAPPEDWINDOW | WS_VISIBLE
+                                 | WS_OVERLAPPEDWINDOW
                                  | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT,
                                 CW_USEDEFAULT, 300, 200, info->WinType.hwndHelp,
                                 NULL, hhctrl_hinstance, NULL);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9631