Support VK_NV_low_latency2

MAINTAINERS

@@ -181,8 +181,12 @@ F:	dlls/win32u/rawinput.c
 F:	server/queue.c
 
 Input methods
-M:	Aric Stewart <aric@codeweavers.com>
+M:	Rémi Bernon <rbernon@codeweavers.com>
+P:	Aric Stewart <aric@codeweavers.com>
 F:	dlls/imm32/
+F:	dlls/win32u/imm.c
+F:	dlls/winemac.drv/ime.c
+F:	dlls/winex11.drv/ime.c
 
 JavaScript
 M:	Jacek Caban <jacek@codeweavers.com>
@@ -214,6 +218,7 @@ F:	dlls/winegstreamer/h264_decoder.c
 F:	dlls/winegstreamer/resampler.c
 F:	dlls/winegstreamer/video_decoder.c
 F:	dlls/winegstreamer/video_processor.c
+F:	dlls/winegstreamer/wg_source.c
 F:	dlls/winegstreamer/wg_sample.c
 F:	dlls/winegstreamer/wg_transform.c
 F:	dlls/winegstreamer/wma_decoder.c

configure.ac

@@ -60,6 +60,7 @@ AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug an
 AC_ARG_WITH(unwind,    AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)]))
 AC_ARG_WITH(usb,       AS_HELP_STRING([--without-usb],[do not use the libusb library]))
 AC_ARG_WITH(v4l2,      AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
+AC_ARG_WITH(vosk,      AS_HELP_STRING([--without-vosk],[do not use Vosk]))
 AC_ARG_WITH(vulkan,    AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
@@ -488,7 +489,8 @@ AC_CHECK_HEADERS(\
 	syscall.h \
 	utime.h \
 	valgrind/memcheck.h \
-	valgrind/valgrind.h
+	valgrind/valgrind.h \
+	vosk_api.h
 )
 WINE_HEADER_MAJOR()
 AC_HEADER_STAT()
@@ -1196,13 +1198,6 @@ then
 # include <X11/Xutil.h>
 #endif])
 
-        dnl *** Check for X keyboard extension
-        if test "$ac_cv_header_X11_XKBlib_h" = "yes"
-        then
-              AC_CHECK_LIB(X11, XkbQueryExtension,
-              AC_DEFINE(HAVE_XKB, 1, [Define if you have the XKB extension]),,[$X_LIBS $X_EXTRA_LIBS])
-        fi
-
         dnl *** Check for X cursor
         if test "$ac_cv_header_X11_Xcursor_Xcursor_h" = "yes"
         then
@@ -1800,6 +1795,14 @@ then
     WINE_WARNING([No sound system was found. Windows applications will be silent.])
 fi
 
+dnl **** Check for Vosk ****
+if test x$with_vosk != xno
+then
+    WINE_CHECK_SONAME(vosk,vosk_recognizer_new)
+fi
+WINE_NOTICE_WITH(vosk,[test x$ac_cv_lib_soname_vosk = x],
+                 [libvosk ${notice_platform}development files not found, speech recognition won't be supported.])
+
 dnl *** Check for Vulkan ***
 if test "x$with_vulkan" != "xno"
 then
@@ -2710,6 +2713,7 @@ WINE_CONFIG_MAKEFILE(dlls/inseng)
 WINE_CONFIG_MAKEFILE(dlls/iphlpapi)
 WINE_CONFIG_MAKEFILE(dlls/iphlpapi/tests)
 WINE_CONFIG_MAKEFILE(dlls/iprop)
+WINE_CONFIG_MAKEFILE(dlls/ir50_32)
 WINE_CONFIG_MAKEFILE(dlls/irprops.cpl)
 WINE_CONFIG_MAKEFILE(dlls/itircl)
 WINE_CONFIG_MAKEFILE(dlls/itss)

dlls/cfgmgr32/Makefile.in

@@ -1,3 +1,6 @@
 MODULE    = cfgmgr32.dll
 IMPORTLIB = cfgmgr32
 IMPORTS   = setupapi
+
+C_SRCS = \
+	main.c

dlls/cfgmgr32/cfgmgr32.spec

@@ -126,6 +126,7 @@
 @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW
 @ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA
 @ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW
+@ stdcall CM_MapCrToWin32Err(long long)
 @ stub CM_Merge_Range_List
 @ stub CM_Modify_Res_Des
 @ stub CM_Modify_Res_Des_Ex

dlls/cfgmgr32/main.c

@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2023 Mohamad Al-Jaf
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wine/debug.h"
+#include "cfgmgr32.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
+
+/***********************************************************************
+ *           CM_MapCrToWin32Err (cfgmgr32.@)
+ */
+DWORD WINAPI CM_MapCrToWin32Err( CONFIGRET code, DWORD default_error )
+{
+    TRACE( "code: %#lx, default_error: %ld\n", code, default_error );
+
+    switch (code)
+    {
+    case CR_SUCCESS:                  return ERROR_SUCCESS;
+    case CR_OUT_OF_MEMORY:            return ERROR_NOT_ENOUGH_MEMORY;
+    case CR_INVALID_POINTER:          return ERROR_INVALID_USER_BUFFER;
+    case CR_INVALID_FLAG:             return ERROR_INVALID_FLAGS;
+    case CR_INVALID_DEVNODE:
+    case CR_INVALID_DEVICE_ID:
+    case CR_INVALID_MACHINENAME:
+    case CR_INVALID_PROPERTY:
+    case CR_INVALID_REFERENCE_STRING: return ERROR_INVALID_DATA;
+    case CR_NO_SUCH_DEVNODE:
+    case CR_NO_SUCH_VALUE:
+    case CR_NO_SUCH_DEVICE_INTERFACE: return ERROR_NOT_FOUND;
+    case CR_ALREADY_SUCH_DEVNODE:     return ERROR_ALREADY_EXISTS;
+    case CR_BUFFER_SMALL:             return ERROR_INSUFFICIENT_BUFFER;
+    case CR_NO_REGISTRY_HANDLE:       return ERROR_INVALID_HANDLE;
+    case CR_REGISTRY_ERROR:           return ERROR_REGISTRY_CORRUPT;
+    case CR_NO_SUCH_REGISTRY_KEY:     return ERROR_FILE_NOT_FOUND;
+    case CR_REMOTE_COMM_FAILURE:
+    case CR_MACHINE_UNAVAILABLE:
+    case CR_NO_CM_SERVICES:           return ERROR_SERVICE_NOT_ACTIVE;
+    case CR_ACCESS_DENIED:            return ERROR_ACCESS_DENIED;
+    case CR_CALL_NOT_IMPLEMENTED:     return ERROR_CALL_NOT_IMPLEMENTED;
+    }
+
+    return default_error;
+}

dlls/combase/apartment.c

@@ -1159,6 +1159,11 @@ void leave_apartment(struct tlsdata *data)
         if (data->ole_inits)
             WARN( "Uninitializing apartment while Ole is still initialized\n" );
         apartment_release(data->apt);
+        if (data->implicit_mta)
+        {
+            apartment_release(data->implicit_mta);
+            data->implicit_mta = NULL;
+        }
         data->apt = NULL;
         data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED);
     }
@@ -1290,3 +1295,30 @@ void apartment_global_cleanup(void)
     apartment_release_dlls();
     DeleteCriticalSection(&apt_cs);
 }
+
+HRESULT reference_implicit_mta_from_sta(void)
+{
+    struct tlsdata *data;
+    HRESULT hr;
+    struct apartment *apt, *apt_mt;
+
+    if (FAILED(hr = com_get_tlsdata(&data)))
+        return hr;
+    if ((apt = data->apt) && (data->implicit_mta || apt->multi_threaded))
+        return S_OK;
+
+    EnterCriticalSection(&apt_cs);
+    if (apt && !mta)
+        apt_mt = mta = apartment_construct(COINIT_MULTITHREADED);
+    else if ((apt_mt = mta))
+        apartment_addref(mta);
+    LeaveCriticalSection(&apt_cs);
+
+    if (!apt_mt)
+    {
+        ERR("Apartment not initialized.\n");
+        return CO_E_NOTINITIALIZED;
+    }
+    data->implicit_mta = apt_mt;
+    return S_OK;
+}

dlls/combase/combase.c

@@ -410,6 +410,9 @@ static void com_cleanup_tlsdata(void)
 
     if (tlsdata->apt)
         apartment_release(tlsdata->apt);
+    if (tlsdata->implicit_mta)
+        apartment_release(tlsdata->implicit_mta);
+
     if (tlsdata->errorinfo)
         IErrorInfo_Release(tlsdata->errorinfo);
     if (tlsdata->state)

dlls/combase/combase_private.h

@@ -92,6 +92,7 @@ struct tlsdata
     struct list       spies;         /* Spies installed with CoRegisterInitializeSpy */
     DWORD             spies_lock;
     DWORD             cancelcount;
+    struct apartment *implicit_mta;  /* mta referenced by roapi from sta thread */
 };
 
 extern HRESULT WINAPI InternalTlsAllocData(struct tlsdata **data);
@@ -161,6 +162,7 @@ void apartment_release(struct apartment *apt) DECLSPEC_HIDDEN;
 struct apartment * apartment_get_current_or_mta(void) DECLSPEC_HIDDEN;
 HRESULT apartment_increment_mta_usage(CO_MTA_USAGE_COOKIE *cookie) DECLSPEC_HIDDEN;
 void apartment_decrement_mta_usage(CO_MTA_USAGE_COOKIE cookie) DECLSPEC_HIDDEN;
+HRESULT reference_implicit_mta_from_sta(void) DECLSPEC_HIDDEN;
 struct apartment * apartment_get_mta(void) DECLSPEC_HIDDEN;
 HRESULT apartment_get_inproc_class_object(struct apartment *apt, const struct class_reg_data *regdata,
         REFCLSID rclsid, REFIID riid, DWORD class_context, void **ppv) DECLSPEC_HIDDEN;

dlls/combase/roapi.c

@@ -24,6 +24,8 @@
 #include "roerrorapi.h"
 #include "winstring.h"
 
+#include "combase_private.h"
+
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(combase);
@@ -163,6 +165,9 @@ HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_
     if (!iid || !class_factory)
         return E_INVALIDARG;
 
+    if (FAILED(hr = reference_implicit_mta_from_sta()))
+        return hr;
+
     hr = get_library_for_classid(WindowsGetStringRawBuffer(classid, NULL), &library);
     if (FAILED(hr))
     {