Release v9.0-rc2

patches/programs-where/0001-where-Implement-search-with-default-options.patch

@@ -0,0 +1,166 @@
+From 5c637f58cad289f9cbb46517ba29f16b66973cea Mon Sep 17 00:00:00 2001
+From: Alex Henrie <alexhenrie24@gmail.com>
+Date: Sat, 22 Jul 2023 13:45:54 -0600
+Subject: [PATCH] where: Implement search with default options.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55282
+---
+ programs/where/Makefile.in |   1 +
+ programs/where/main.c      | 116 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 114 insertions(+), 3 deletions(-)
+
+diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in
+index bca42590176..125c550fa37 100644
+--- a/programs/where/Makefile.in
++++ b/programs/where/Makefile.in
+@@ -1,4 +1,5 @@
+ MODULE    = where.exe
++IMPORTS   = shlwapi
+ 
+ EXTRADLLFLAGS = -mconsole -municode
+ 
+diff --git a/programs/where/main.c b/programs/where/main.c
+index 6f90a222dce..bcabb812aa0 100644
+--- a/programs/where/main.c
++++ b/programs/where/main.c
+@@ -1,5 +1,6 @@
+ /*
+  * Copyright 2020 Louis Lenders
++ * Copyright 2023 Alex Henrie
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -16,18 +17,127 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++#include <windows.h>
++#include <fileapi.h>
++#include <shlwapi.h>
++
+ #include "wine/debug.h"
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(where);
+ 
++static BOOL found;
++
++static void search(const WCHAR *search_path, const WCHAR *pattern)
++{
++    static const WCHAR *extensions[] = {L"", L".bat", L".cmd", L".com", L".exe"};
++    WCHAR glob[MAX_PATH];
++    WCHAR match_path[MAX_PATH];
++    WIN32_FIND_DATAW match;
++    HANDLE handle;
++    BOOL more;
++    int i;
++
++    for (i = 0; i < ARRAY_SIZE(extensions); i++)
++    {
++        if (wcslen(search_path) + 1 + wcslen(pattern) + wcslen(extensions[i]) + 1 > ARRAY_SIZE(glob))
++        {
++            ERR("Path too long\n");
++            return;
++        }
++        /* Treat the extension as part of the pattern */
++        wcscpy(glob, search_path);
++        wcscat(glob, L"\\");
++        wcscat(glob, pattern);
++        wcscat(glob, extensions[i]);
++
++        handle = FindFirstFileExW(glob, FindExInfoBasic, &match, 0, NULL, 0);
++        more = (handle != INVALID_HANDLE_VALUE);
++
++        while (more)
++        {
++            if (PathCombineW(match_path, search_path, match.cFileName))
++            {
++                printf("%ls\n", match_path);
++                found = TRUE;
++            }
++            more = FindNextFileW(handle, &match);
++        }
++    }
++}
++
+ int __cdecl wmain(int argc, WCHAR *argv[])
+ {
++    WCHAR *pattern, *colon, *search_paths, *semicolon, *search_path;
+     int i;
+ 
+-    WINE_FIXME("stub:");
+     for (i = 0; i < argc; i++)
+-        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
+-    WINE_FIXME("\n");
++    {
++        if (argv[i][0] == '/')
++        {
++            FIXME("Unsupported option %ls\n", argv[i]);
++            return 1;
++        }
++    }
++
++    for (i = 1; i < argc; i++)
++    {
++        pattern = argv[i];
++        colon = wcsrchr(pattern, ':');
++
++        /* Check for a set of search paths prepended to the pattern */
++        if (colon)
++        {
++            *colon = 0;
++            search_paths = pattern;
++            pattern = colon + 1;
++        }
++        else
++        {
++            DWORD len = GetEnvironmentVariableW(L"PATH", NULL, 0);
++            search_paths = malloc(len * sizeof(WCHAR));
++            if (!search_paths)
++            {
++                ERR("Out of memory\n");
++                return 1;
++            }
++            GetEnvironmentVariableW(L"PATH", search_paths, len);
++        }
++
++        if (wcspbrk(pattern, L"\\/\r\n"))
++        {
++            /* Silently ignore invalid patterns */
++            if (!colon) free(search_paths);
++            continue;
++        }
++
++        if (!colon)
++        {
++            /* If the search paths were not explicitly specified, search the current directory first */
++            WCHAR current_dir[MAX_PATH];
++            if (GetCurrentDirectoryW(ARRAY_SIZE(current_dir), current_dir))
++                search(current_dir, pattern);
++        }
++
++        search_path = search_paths;
++        do
++        {
++            semicolon = wcschr(search_path, ';');
++            if (semicolon)
++                *semicolon = 0;
++            if (*search_path)
++                search(search_path, pattern);
++            search_path = semicolon + 1;
++        }
++        while (semicolon);
++
++        if (!colon) free(search_paths);
++    }
++
++    if (!found)
++    {
++        fputs("File not found\n", stderr);
++        return 1;
++    }
+ 
+     return 0;
+ }
+-- 
+2.43.0
+

patches/programs-where/definition

@@ -0,0 +1,3 @@
+Fixes: [55282] where: Implement search with default options.
+
+# https://gitlab.winehq.org/wine/wine/-/merge_requests/3368

patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch

@@ -1,4 +1,4 @@
-From 64bdd8316ca10dd8bd474abb1fe7377dfd678762 Mon Sep 17 00:00:00 2001
+From 7685969c358fbfb68d623d6eb4fc80231f07b604 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 15 Mar 2015 01:05:48 +0100
 Subject: [PATCH] server: Fix handling of GetMessage after previous PeekMessage
@@ -15,10 +15,10 @@ Changes in v3:
  2 files changed, 65 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 8b89d92cbf1..e7f133899ed 100644
+index 0059afcbac7..cf01e156458 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -14012,13 +14012,10 @@ static void test_PeekMessage3(void)
+@@ -14113,13 +14113,10 @@ static void test_PeekMessage3(void)
      ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
      PostMessageA(hwnd, WM_USER, 0, 0);
      ret = PeekMessageA(&msg, hwnd, 0, 0, PM_NOREMOVE);
@@ -32,7 +32,7 @@ index 8b89d92cbf1..e7f133899ed 100644
      ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
      ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
      ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
-@@ -14028,10 +14025,8 @@ static void test_PeekMessage3(void)
+@@ -14129,10 +14126,8 @@ static void test_PeekMessage3(void)
      ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
      PostMessageA(hwnd, WM_USER, 0, 0);
      ret = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE);
@@ -43,7 +43,7 @@ index 8b89d92cbf1..e7f133899ed 100644
      ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
      ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
      ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
-@@ -14043,10 +14038,11 @@ static void test_PeekMessage3(void)
+@@ -14144,10 +14139,11 @@ static void test_PeekMessage3(void)
      ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message);
      PostMessageA(hwnd, WM_USER, 0, 0);
      ret = GetMessageA(&msg, hwnd, 0, 0);
@@ -57,7 +57,7 @@ index 8b89d92cbf1..e7f133899ed 100644
      ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
      ret = PeekMessageA(&msg, hwnd, 0, 0, 0);
      ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret);
-@@ -14074,14 +14070,32 @@ static void test_PeekMessage3(void)
+@@ -14175,14 +14171,32 @@ static void test_PeekMessage3(void)
      ret = GetMessageA(&msg, hwnd, 0, 0);
      ok(ret && msg.message == WM_USER, "msg.message = %u instead of WM_USER\n", msg.message);
      ret = GetMessageA(&msg, hwnd, 0, 0);
@@ -93,7 +93,7 @@ index 8b89d92cbf1..e7f133899ed 100644
       * because both messages are in the same queue. */
  
 diff --git a/server/queue.c b/server/queue.c
-index fcc946ff0cb..348fdac3214 100644
+index 9007438e082..1d7a31a318a 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -142,6 +142,7 @@ struct msg_queue
@@ -112,7 +112,7 @@ index fcc946ff0cb..348fdac3214 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -634,13 +636,21 @@ static inline struct msg_queue *get_current_queue(void)
+@@ -643,13 +645,21 @@ static inline struct msg_queue *get_current_queue(void)
  }
  
  /* get a (pseudo-)unique id to tag hardware messages */
@@ -135,7 +135,7 @@ index fcc946ff0cb..348fdac3214 100644
  /* try to merge a WM_MOUSEMOVE message with the last in the list; return 1 if successful */
  static int merge_mousemove( struct thread_input *input, const struct message *msg )
  {
-@@ -951,7 +961,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
+@@ -960,7 +970,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
  }
  
  /* retrieve a posted message */
@@ -144,7 +144,7 @@ index fcc946ff0cb..348fdac3214 100644
                                 unsigned int first, unsigned int last, unsigned int flags,
                                 struct get_message_reply *reply )
  {
-@@ -962,6 +972,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
+@@ -971,6 +981,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
      {
          if (!match_window( win, msg->win )) continue;
          if (!check_msg_filter( msg->msg, first, last )) continue;
@@ -152,7 +152,7 @@ index fcc946ff0cb..348fdac3214 100644
          goto found; /* found one */
      }
      return 0;
-@@ -1576,6 +1587,7 @@ found:
+@@ -1585,6 +1596,7 @@ found:
      msg->msg       = WM_HOTKEY;
      msg->wparam    = hotkey->id;
      msg->lparam    = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@@ -160,7 +160,7 @@ index fcc946ff0cb..348fdac3214 100644
  
      free( msg->data );
      msg->data      = NULL;
-@@ -2267,7 +2279,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
+@@ -2276,7 +2288,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
          }
  
          /* now we can return it */
@@ -169,7 +169,7 @@ index fcc946ff0cb..348fdac3214 100644
          reply->type   = MSG_HARDWARE;
          reply->win    = win;
          reply->msg    = msg_code;
-@@ -2373,6 +2385,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
+@@ -2382,6 +2394,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
          msg->result    = NULL;
          msg->data      = NULL;
          msg->data_size = 0;
@@ -177,7 +177,7 @@ index fcc946ff0cb..348fdac3214 100644
  
          get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
  
-@@ -2617,6 +2630,7 @@ DECL_HANDLER(send_message)
+@@ -2626,6 +2639,7 @@ DECL_HANDLER(send_message)
              set_queue_bits( recv_queue, QS_SENDMESSAGE );
              break;
          case MSG_POSTED:
@@ -185,7 +185,7 @@ index fcc946ff0cb..348fdac3214 100644
              list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry );
              set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE );
              if (msg->msg == WM_HOTKEY)
-@@ -2735,12 +2749,12 @@ DECL_HANDLER(get_message)
+@@ -2744,12 +2758,12 @@ DECL_HANDLER(get_message)
  
      /* then check for posted messages */
      if ((filter & QS_POSTMESSAGE) &&
@@ -200,16 +200,16 @@ index fcc946ff0cb..348fdac3214 100644
          return;
  
      /* only check for quit messages if not posted messages pending */
-@@ -2751,7 +2765,7 @@ DECL_HANDLER(get_message)
+@@ -2760,7 +2774,7 @@ DECL_HANDLER(get_message)
      if ((filter & QS_INPUT) &&
          filter_contains_hw_range( req->get_first, req->get_last ) &&
          get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply ))
 -        return;
 +        goto found_msg;
  
-     /* now check for WM_PAINT */
-     if ((filter & QS_PAINT) &&
-@@ -2764,7 +2778,7 @@ DECL_HANDLER(get_message)
+     /* check for any internal driver message */
+     if (get_hardware_message( current, req->hw_id, get_win, WM_WINE_FIRST_DRIVER_MSG,
+@@ -2778,7 +2792,7 @@ DECL_HANDLER(get_message)
          reply->wparam = 0;
          reply->lparam = 0;
          get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@@ -218,7 +218,7 @@ index fcc946ff0cb..348fdac3214 100644
      }
  
      /* now check for timer */
-@@ -2780,13 +2794,30 @@ DECL_HANDLER(get_message)
+@@ -2794,13 +2808,30 @@ DECL_HANDLER(get_message)
          get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
          if (!(req->flags & PM_NOYIELD) && current->process->idle_event)
              set_event( current->process->idle_event );
@@ -250,7 +250,7 @@ index fcc946ff0cb..348fdac3214 100644
  }
  
  
-@@ -2804,7 +2835,10 @@ DECL_HANDLER(reply_message)
+@@ -2818,7 +2849,10 @@ DECL_HANDLER(reply_message)
  DECL_HANDLER(accept_hardware_message)
  {
      if (current->queue)
@@ -262,5 +262,5 @@ index fcc946ff0cb..348fdac3214 100644
          set_error( STATUS_ACCESS_DENIED );
  }
 -- 
-2.40.1
+2.43.0
 

patches/setupapi-DriverStoreFindDriverPackageW/0001-setupapi-Add-stub-for-DriverStoreFindDriverPackageW.patch

@@ -0,0 +1,131 @@
+From 49f12af6d899f3a44f0619c059c59bf8b57be59f Mon Sep 17 00:00:00 2001
+From: Fabian Maurer <dark.shadow4@web.de>
+Date: Wed, 8 Nov 2023 22:01:59 +0100
+Subject: [PATCH] setupapi: Add stub for DriverStoreFindDriverPackageW
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45455
+---
+ dlls/setupapi/query.c       | 10 ++++++
+ dlls/setupapi/setupapi.spec |  1 +
+ dlls/setupapi/tests/query.c | 67 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 78 insertions(+)
+
+diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c
+index 88efea17473..24f0537fe9c 100644
+--- a/dlls/setupapi/query.c
++++ b/dlls/setupapi/query.c
+@@ -732,6 +732,16 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW(
+     return FALSE;
+ }
+ 
++HRESULT WINAPI DriverStoreFindDriverPackageW(const WCHAR *path_in, void *unk2, void *unk3, DWORD flags, void *unk5, WCHAR *path_out, DWORD *path_size)
++{
++    FIXME("%s, %p, %p, %lu, %p, %p, %p, %lu stub!\n", debugstr_w(path_in), unk2, unk3, flags, unk5, path_out, path_size, path_size ? *path_size : 0);
++    if (!path_in || !path_out || !path_size || *path_size < MAX_PATH)
++        return E_INVALIDARG;
++
++    wcscpy(path_out, path_in);
++    return S_OK;
++}
++
+ BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff,
+     DWORD size, DWORD *req_size)
+ {
+diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
+index 74f430a415f..6a392f687f8 100644
+--- a/dlls/setupapi/setupapi.spec
++++ b/dlls/setupapi/setupapi.spec
+@@ -208,6 +208,7 @@
+ @ stub DelimStringToMultiSz
+ @ stub DestroyTextFileReadBuffer
+ @ stdcall DoesUserHavePrivilege(wstr)
++@ stdcall DriverStoreFindDriverPackageW(ptr ptr ptr long ptr ptr ptr)
+ @ stdcall DuplicateString(wstr)
+ @ stdcall EnablePrivilege(wstr long)
+ @ stub ExtensionPropSheetPageProc
+diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c
+index f7aeba41153..864c8d6939b 100644
+--- a/dlls/setupapi/tests/query.c
++++ b/dlls/setupapi/tests/query.c
+@@ -513,6 +513,72 @@ static void test_SetupGetTargetPath(void)
+     DeleteFileA(inf_filename);
+ }
+ 
++static void test_DriverStoreFindDriverPackageW(void)
++{
++    HMODULE library;
++    HRESULT result;
++    WCHAR buffer[500];
++    DWORD len;
++    HRESULT (WINAPI *pDriverStoreFindDriverPackageW)(const WCHAR*, void*, void*, DWORD, void*, WCHAR*, DWORD*);
++
++    library = LoadLibraryA("setupapi.dll");
++    ok(library != NULL, "Failed to load setupapi.dll\n");
++    if (!library) return;
++
++    pDriverStoreFindDriverPackageW = (void *)GetProcAddress(library, "DriverStoreFindDriverPackageW");
++    if (!pDriverStoreFindDriverPackageW)
++    {
++        win_skip("Can't find DriverStoreFindDriverPackageW\n");
++        return;
++    }
++
++    len = ARRAY_SIZE(buffer);
++
++    /* No invalid parameters, with flags */
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, buffer, &len);
++    todo_wine
++    ok(result == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got %lx\n", result);
++
++    /* No invalid parameters, no flags */
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 0, 0, buffer, &len);
++    if (sizeof(void *) == 4)
++        todo_wine
++        ok(result == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got %lx\n", result);
++    else
++        todo_wine
++        ok(result == E_INVALIDARG, "Got %lx\n", result); /* Win64 needs flags 0x9, or it gives invalid parameter */
++
++    /* Invalid parameter tests */
++
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, 0, &len);
++    ok(result == E_INVALIDARG, "Got %lx\n", result);
++
++    result = pDriverStoreFindDriverPackageW(0, 0, 0, 9, 0, buffer, &len);
++    ok(result == E_INVALIDARG, "Got %lx\n", result);
++
++    result = pDriverStoreFindDriverPackageW(L"", 0, 0, 9, 0, buffer, &len);
++    todo_wine
++    ok(result == HRESULT_FROM_WIN32(ERROR_INVALID_NAME) /* win7 */ || result == E_INVALIDARG /* win10 */, "Got %lx\n", result);
++
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, buffer, 0);
++    ok(result == E_INVALIDARG, "Got %lx\n", result);
++
++    /* Tests with different length parameter */
++
++    len = 0;
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, buffer, &len);
++    ok(result == E_INVALIDARG, "Got %lx\n", result);
++
++    len = 259;
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, buffer, &len);
++    ok(result == E_INVALIDARG, "Got %lx\n", result);
++
++    len = 260;
++    result = pDriverStoreFindDriverPackageW(L"c:\\nonexistent.inf", 0, 0, 9, 0, buffer, &len);
++    todo_wine
++    ok(result == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got %lx\n", result);
++}
++
+ START_TEST(query)
+ {
+     get_directories();
+@@ -521,4 +587,5 @@ START_TEST(query)
+     test_SetupGetSourceFileLocation();
+     test_SetupGetSourceInfo();
+     test_SetupGetTargetPath();
++    test_DriverStoreFindDriverPackageW();
+ }
+-- 
+2.43.0
+

patches/setupapi-DriverStoreFindDriverPackageW/definition

@@ -0,0 +1,3 @@
+Fixes: [45455] setupapi: Add stub for DriverStoreFindDriverPackageW
+
+# https://gitlab.winehq.org/wine/wine/-/merge_requests/4343

patches/vkd3d-latest/0001-Updated-vkd3d-to-45679a966c73669bdb7fa371569dcc34a44.patch

@@ -1,4 +1,4 @@
-From d28e399844f151103e79af3a30112a4daf130649 Mon Sep 17 00:00:00 2001
+From b68e960703095111f31a57b291a710a7be409745 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 8 Dec 2023 13:21:19 +1100
 Subject: [PATCH] Updated vkd3d to 45679a966c73669bdb7fa371569dcc34a448d8d4.

patches/widl-SLTG_Typelib_Support/0024-oleaut32-Add-support-for-decoding-SLTG-function-help.patch

@@ -1,4 +1,4 @@
-From fc31e1c213619af67684a99aa1d3b4c27ee9617d Mon Sep 17 00:00:00 2001
+From 94e6e18f72a5586fc8077dadc4ea50bd994e02a3 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 26 Jan 2016 15:41:06 +0800
 Subject: [PATCH] oleaut32: Add support for decoding SLTG function help
@@ -9,10 +9,10 @@ Subject: [PATCH] oleaut32: Add support for decoding SLTG function help
  1 file changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
-index d5c8191abba..ebf186edc2a 100644
+index 988e6c1b457..9c15254727d 100644
 --- a/dlls/oleaut32/typelib.c
 +++ b/dlls/oleaut32/typelib.c
-@@ -4203,7 +4203,8 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign
+@@ -4199,7 +4199,8 @@ static void SLTG_DoVars(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, unsign
  }
  
  static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI,
@@ -22,9 +22,9 @@ index d5c8191abba..ebf186edc2a 100644
  {
      SLTG_Function *pFunc;
      unsigned short i;
-@@ -4244,6 +4245,9 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI,
+@@ -4240,6 +4241,9 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI,
          else
- 	    pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size;
+ 	    pFuncDesc->funcdesc.oVft = (unsigned short)(pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size;
  
 +	if (pFunc->helpstring != 0xffff)
 +		pFuncDesc->HelpString = decode_string(hlp_strings, pBlk + pFunc->helpstring, pNameTable - pBlk, pTI->pTypeLib);
@@ -32,7 +32,7 @@ index d5c8191abba..ebf186edc2a 100644
  	if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT)
  	    pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags;
  
-@@ -4330,7 +4334,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4326,7 +4330,7 @@ static void SLTG_ProcessCoClass(char *pBlk, ITypeInfoImpl *pTI,
  
  static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
  				  char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
@@ -41,7 +41,7 @@ index d5c8191abba..ebf186edc2a 100644
  {
      char *pFirstItem;
      sltg_ref_lookup_t *ref_lookup = NULL;
-@@ -4347,7 +4351,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4343,7 +4347,7 @@ static void SLTG_ProcessInterface(char *pBlk, ITypeInfoImpl *pTI,
      }
  
      if (pTITail->funcs_off != 0xffff)
@@ -50,7 +50,7 @@ index d5c8191abba..ebf186edc2a 100644
  
      free(ref_lookup);
  
-@@ -4392,7 +4396,7 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4388,7 +4392,7 @@ static void SLTG_ProcessAlias(char *pBlk, ITypeInfoImpl *pTI,
  
  static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
  				 char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
@@ -59,7 +59,7 @@ index d5c8191abba..ebf186edc2a 100644
  {
    sltg_ref_lookup_t *ref_lookup = NULL;
    if (pTIHeader->href_table != 0xffffffff)
-@@ -4403,7 +4407,7 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4399,7 +4403,7 @@ static void SLTG_ProcessDispatch(char *pBlk, ITypeInfoImpl *pTI,
      SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, ref_lookup);
  
    if (pTITail->funcs_off != 0xffff)
@@ -68,7 +68,7 @@ index d5c8191abba..ebf186edc2a 100644
  
    if (pTITail->impls_off != 0xffff)
      SLTG_DoImpls(pBlk + pTITail->impls_off, pTI, FALSE, ref_lookup);
-@@ -4427,7 +4431,7 @@ static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4423,7 +4427,7 @@ static void SLTG_ProcessEnum(char *pBlk, ITypeInfoImpl *pTI,
  
  static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI,
  			       char *pNameTable, SLTG_TypeInfoHeader *pTIHeader,
@@ -77,7 +77,7 @@ index d5c8191abba..ebf186edc2a 100644
  {
    sltg_ref_lookup_t *ref_lookup = NULL;
    if (pTIHeader->href_table != 0xffffffff)
-@@ -4438,7 +4442,7 @@ static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI,
+@@ -4434,7 +4438,7 @@ static void SLTG_ProcessModule(char *pBlk, ITypeInfoImpl *pTI,
      SLTG_DoVars(pBlk, pBlk + pTITail->vars_off, pTI, pTITail->cVars, pNameTable, ref_lookup);
  
    if (pTITail->funcs_off != 0xffff)
@@ -86,7 +86,7 @@ index d5c8191abba..ebf186edc2a 100644
    free(ref_lookup);
    if (TRACE_ON(typelib))
      dump_TypeInfo(pTI);
-@@ -4700,7 +4704,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
+@@ -4696,7 +4700,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
  
        case TKIND_INTERFACE:
  	SLTG_ProcessInterface((char *)(pMemHeader + 1), *ppTypeInfoImpl, pNameTable,
@@ -95,7 +95,7 @@ index d5c8191abba..ebf186edc2a 100644
  	break;
  
        case TKIND_COCLASS:
-@@ -4715,12 +4719,12 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
+@@ -4711,12 +4715,12 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength)
  
        case TKIND_DISPATCH:
  	SLTG_ProcessDispatch((char *)(pMemHeader + 1), *ppTypeInfoImpl, pNameTable,
@@ -111,5 +111,5 @@ index d5c8191abba..ebf186edc2a 100644
  
        default:
 -- 
-2.40.1
+2.43.0
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 9.0-rc1
+Wine Staging 9.0-rc2

staging/upstream-commit

@@ -1 +1 @@
-93f7ef86701f0b5f0828c8e0c4581b00873a7676
+7a8c039a5c34fe0c625b3684b4c7026a21dd290e