ntdll: HACK: Add WINE_DISABLE_SFN option.

MAINTAINERS

@@ -223,6 +223,7 @@ F:	dlls/winegstreamer/mfplat.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(wayland,   AS_HELP_STRING([--without-wayland],[do not build the Wayland driver]))
 AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
@@ -492,7 +493,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()
@@ -1236,6 +1238,7 @@ then
 
     dnl *** All of the following tests require X11/Xlib.h
     AC_CHECK_HEADERS([X11/extensions/shape.h \
+                      X11/extensions/XInput.h \
                       X11/extensions/XInput2.h \
                       X11/extensions/XShm.h \
                       X11/extensions/Xfixes.h \
@@ -1874,6 +1877,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

dlls/advapi32/registry.c

@@ -70,6 +70,9 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override )
  */
 LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExW( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }
@@ -82,6 +85,9 @@ LSTATUS WINAPI RegCreateKeyW( HKEY hkey, LPCWSTR lpSubKey, PHKEY phkResult )
  */
 LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult )
 {
+    if (!phkResult)
+        return ERROR_INVALID_PARAMETER;
+
     return RegCreateKeyExA( hkey, lpSubKey, 0, NULL, REG_OPTION_NON_VOLATILE,
                             MAXIMUM_ALLOWED, NULL, phkResult, NULL );
 }

dlls/advapi32/tests/registry.c

@@ -1268,6 +1268,19 @@ static void test_reg_create_key(void)
     PACL key_acl;
     SECURITY_DESCRIPTOR *sd;
 
+    /* NULL return key check */
+    ret = RegCreateKeyA(hkey_main, "Subkey1", NULL);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyW(hkey_main, L"Subkey1", NULL);
+    ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL);
+    ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret);
+
+    ret = RegCreateKeyExW(hkey_main, L"Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, NULL, NULL);
+    ok(ret == ERROR_BADKEY, "Got unexpected ret %ld.\n", ret);
+
     ret = RegCreateKeyExA(hkey_main, "Subkey1", 0, NULL, 0, KEY_NOTIFY, NULL, &hkey1, NULL);
     ok(!ret, "RegCreateKeyExA failed with error %ld\n", ret);
     /* should succeed: all versions of Windows ignore the access rights
@@ -2763,6 +2776,28 @@ static void test_redirection(void)
     RegCloseKey( root32 );
     RegCloseKey( root64 );
 
+    err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\WOW6432Node\\test1\\test2", 0, NULL, 0,
+                              KEY_WRITE | KEY_WOW64_32KEY, NULL, &key, NULL );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    err = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, NULL, 0, KEY_WRITE | KEY_WOW64_32KEY,
+                              NULL, &key, NULL );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    err = RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\test1\\test2", 0, KEY_WRITE | KEY_WOW64_32KEY, &key );
+    ok(!err, "got %#lx.\n", err);
+    RegCloseKey(key);
+
+    if (pRegDeleteTreeA)
+    {
+        err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\WOW6432Node\\test1");
+        ok(!err, "got %#lx.\n", err);
+        err = pRegDeleteTreeA(HKEY_LOCAL_MACHINE, "Software\\test1");
+        ok(err == ERROR_FILE_NOT_FOUND, "got %#lx.\n", err);
+    }
+
     /* Software\Classes is shared/reflected so behavior is different */
 
     err = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\Wine",

dlls/amd_ags_x64/amd_ags.h

@@ -733,7 +733,39 @@ typedef union AGSConfiguration
     AGSConfiguration_520    agsConfiguration520;
 } AGSConfiguration;
 
+struct AGSGPUInfo_311
+{
+    ArchitectureVersion     version;                        // Set to Unknown if not AMD hardware
+    const char*             adapterString;                  // The adapter name string. NULL if not AMD hardware
+    int                     deviceId;                       // The device id
+    int                     revisionId;                     // The revision id
 
+    const char*             driverVersion;                  // The driver package version
+
+    int                     iNumCUs;                        // Number of GCN compute units. Zero if not GCN
+    int                     iCoreClock;                     // core clock speed at 100% power in MHz
+    int                     iMemoryClock;                   // memory clock speed at 100% power in MHz
+    float                   fTFlops;                        // Teraflops of GPU. Zero if not GCN. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
+};
+
+struct AGSGPUInfo_320
+{
+    int                     agsVersionMajor;                // Major field of Major.Minor.Patch AGS version number
+    int                     agsVersionMinor;                // Minor field of Major.Minor.Patch AGS version number
+    int                     agsVersionPatch;                // Patch field of Major.Minor.Patch AGS version number
+
+    ArchitectureVersion     architectureVersion;            // Set to Unknown if not AMD hardware
+    const char*             adapterString;                  // The adapter name string. NULL if not AMD hardware
+    int                     deviceId;                       // The device id
+    int                     revisionId;                     // The revision id
+
+    const char*             driverVersion;                  // The driver package version
+
+    int                     iNumCUs;                        // Number of GCN compute units. Zero if not GCN
+    int                     iCoreClock;                     // core clock speed at 100% power in MHz
+    int                     iMemoryClock;                   // memory clock speed at 100% power in MHz
+    float                   fTFlops;                        // Teraflops of GPU. Zero if not GCN. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
+};
 
 /// The top level GPU information returned from \ref agsInitialize
 struct AGSGPUInfo_403

dlls/amd_ags_x64/amd_ags_x64.spec

@@ -2,30 +2,40 @@
 @ stdcall agsDeInitialize(ptr)
 @ stdcall agsCheckDriverVersion(ptr long)
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_BeginUAVOverlap() DX11_BeginUAVOverlap_impl
+@ stub agsDriverExtensions_IASetPrimitiveTopology
 @ stub agsDriverExtensionsDX11_CreateBuffer
+@ stub agsDriverExtensions_CreateBuffer
 @ stdcall agsDriverExtensionsDX11_CreateDevice(ptr ptr ptr ptr)
 @ stub agsDriverExtensionsDX11_CreateFromDevice
 @ stub agsDriverExtensionsDX11_CreateTexture1D
 @ stub agsDriverExtensionsDX11_CreateTexture2D
 @ stub agsDriverExtensionsDX11_CreateTexture3D
+@ stub agsDriverExtensions_CreateTexture1D
+@ stub agsDriverExtensions_CreateTexture2D
+@ stub agsDriverExtensions_CreateTexture3D
+@ stdcall agsDriverExtensions_DeInit(ptr)
 @ stdcall agsDriverExtensionsDX11_DeInit(ptr)
 @ stub agsDriverExtensionsDX11_Destroy
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_DestroyDevice()
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_EndUAVOverlap() DX11_EndUAVOverlap_impl
 @ stub agsDriverExtensionsDX11_GetMaxClipRects
 @ stub agsDriverExtensionsDX11_IASetPrimitiveTopology
+@ stdcall agsDriverExtensions_Init(ptr ptr ptr)
 @ stdcall agsDriverExtensionsDX11_Init(ptr ptr long ptr)
-@ stub agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect
-@ stub agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect
-@ stub agsDriverExtensionsDX11_MultiDrawInstancedIndirect
-@ stub agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirect() DX11_MultiDrawIndexedInstancedIndirect_impl
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawIndexedInstancedIndirectCountIndirect() DX11_MultiDrawIndexedInstancedIndirectCountIndirect_impl
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawInstancedIndirect() DX11_MultiDrawInstancedIndirect_impl
+@ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_MultiDrawInstancedIndirectCountIndirect() DX11_MultiDrawInstancedIndirectCountIndirect_impl
 @ stub agsDriverExtensionsDX11_NotifyResourceBeginAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndAllAccess
 @ stub agsDriverExtensionsDX11_NotifyResourceEndWrites
+@ stub agsDriverExtensions_NotifyResourceBeginAllAccess
+@ stub agsDriverExtensions_NotifyResourceEndAllAccess
+@ stub agsDriverExtensions_NotifyResourceEndWrites
 @ stub agsDriverExtensionsDX11_NumPendingAsyncCompileJobs
 @ stub agsDriverExtensionsDX11_SetClipRects
 @ stdcall -norelay -arch=win64 agsDriverExtensionsDX11_SetDepthBounds() DX11_SetDepthBounds_impl
-@ stub agsDriverExtensionsDX11_SetDiskShaderCacheEnabled
+@ stdcall agsDriverExtensionsDX11_SetDiskShaderCacheEnabled(ptr long)
 @ stub agsDriverExtensionsDX11_SetMaxAsyncCompileThreadCount
 @ stub agsDriverExtensionsDX11_SetViewBroadcastMasks
 @ stub agsDriverExtensionsDX11_WriteBreadcrumb
@@ -35,9 +45,9 @@
 @ stub agsDriverExtensionsDX12_Destroy
 @ stdcall agsDriverExtensionsDX12_DestroyDevice(ptr ptr ptr)
 @ stdcall agsDriverExtensionsDX12_Init(ptr ptr ptr)
-@ stub agsDriverExtensionsDX12_PopMarker
-@ stub agsDriverExtensionsDX12_PushMarker
-@ stub agsDriverExtensionsDX12_SetMarker
+@ stdcall agsDriverExtensionsDX12_PopMarker(ptr ptr)
+@ stdcall agsDriverExtensionsDX12_PushMarker(ptr ptr ptr)
+@ stdcall agsDriverExtensionsDX12_SetMarker(ptr ptr ptr)
 @ stdcall agsGetCrossfireGPUCount(ptr ptr)
 @ stdcall agsGetVersionNumber()
 @ stdcall agsInit(ptr ptr ptr)
@@ -46,3 +56,4 @@
 @ stdcall agsGetTotalGPUCount(ptr ptr)
 @ stdcall agsGetGPUMemorySize(ptr long ptr)
 @ stdcall agsGetEyefinityConfigInfo(ptr long ptr ptr ptr)
+@ stdcall agsDriverExtensions_SetCrossfireMode(ptr long)