wined3d: Beginnings of an HLSL FFP vertex shader implementation.

This will allow us to replace the GLSL FFP pipes, and is useful for testing
the FFP HLSL backend before the Vulkan backend is mature enough in other
respects.

This patch introduces the d3d setting "ffp_hlsl", set to a DWORD value.
It is disabled by default, and only has an effect on the GL renderer.

.gitattributes

@@ -0,0 +1,64 @@
+[attr]generated gitlab-generated linguist-generated=true
+
+# generated by autotools
+configure generated
+include/config.h.in generated
+
+# generated by dlls/dsound/make_fir
+dlls/dsound/fir.h generated
+
+# generated by dlls/opencl/make_opencl
+dlls/opencl/opencl.spec generated
+dlls/opencl/opencl_types.h generated
+dlls/opencl/pe_thunks.c generated
+dlls/opencl/unix_thunks.c generated
+dlls/opencl/unixlib.h generated
+
+# generated by dlls/opengl32/make_opengl
+dlls/opengl32/opengl32.spec generated
+dlls/opengl32/thunks.c generated
+dlls/opengl32/unix_thunks.c generated
+dlls/opengl32/unixlib.h generated
+include/wine/wgl.h generated
+include/wine/wgl_driver.h generated
+
+# generated by dlls/winevulkan/make_vulkan
+dlls/vulkan-1/vulkan-1.spec generated
+dlls/winevulkan/loader_thunks.c generated
+dlls/winevulkan/loader_thunks.h generated
+dlls/winevulkan/vulkan_thunks.c generated
+dlls/winevulkan/vulkan_thunks.h generated
+dlls/winevulkan/winevulkan.json generated
+dlls/winevulkan/winevulkan.spec generated
+include/wine/vulkan.h generated
+include/wine/vulkan_driver.h generated
+
+# generated by tools/make_requests
+include/wine/server_protocol.h generated
+server/request_handlers.h generated
+server/request_trace.h generated
+
+# generated by tools/make_specfiles
+dlls/ntdll/ntsyscalls.h generated
+dlls/win32u/win32syscalls.h generated
+
+# generated by tools/make_unicode
+dlls/dwrite/bracket.c generated
+dlls/dwrite/direction.c generated
+dlls/dwrite/linebreak.c generated
+dlls/dwrite/mirror.c generated
+dlls/dwrite/scripts.c generated
+dlls/dwrite/scripts.h generated
+dlls/dwrite/shapers/arabic_table.c generated
+dlls/gdi32/uniscribe/bracket.c generated
+dlls/gdi32/uniscribe/direction.c generated
+dlls/gdi32/uniscribe/indicsyllable.c generated
+dlls/gdi32/uniscribe/linebreak.c generated
+dlls/gdi32/uniscribe/mirror.c generated
+dlls/gdi32/uniscribe/shaping.c generated
+dlls/kernelbase/kernelbase.rgs generated
+dlls/tzres/tzres.rc generated
+dlls/win32u/vertical.c generated
+dlls/wineps.drv/direction.c generated
+dlls/wineps.drv/vertical.c generated
+nls/*.nls generated

aclocal.m4

@@ -198,6 +198,9 @@ ac_wine_try_cflags_saved_exeext=$ac_exeext
 CFLAGS="$CFLAGS -nostdlib -nodefaultlibs $1"
 ac_exeext=".exe"
 AC_LINK_IFELSE([AC_LANG_SOURCE([[void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }]])],
                [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
 CFLAGS=$ac_wine_try_cflags_saved

configure

@@ -10407,6 +10407,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10444,6 +10447,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10660,6 +10666,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10696,6 +10705,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10732,6 +10744,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10768,6 +10783,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10804,6 +10822,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10840,6 +10861,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10876,6 +10900,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10912,6 +10939,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10948,6 +10978,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -10984,6 +11017,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11020,6 +11056,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11056,6 +11095,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11092,6 +11134,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11128,6 +11173,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11164,6 +11212,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11200,6 +11251,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11236,6 +11290,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11272,6 +11329,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11308,6 +11368,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11344,6 +11407,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11380,6 +11446,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11403,6 +11472,86 @@ then :
   as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion"
 fi } ;;
 esac
+fi }
+    { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-ffunction-sections" | sed "$as_sed_sh"`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -ffunction-sections" >&5
+printf %s "checking whether $CC supports -ffunction-sections... " >&6; }
+if eval test \${$as_ac_var+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) ac_wine_try_cflags_saved=$CFLAGS
+ac_wine_try_cflags_saved_exeext=$ac_exeext
+CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -ffunction-sections"
+ac_exeext=".exe"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
+int __cdecl mainCRTStartup(void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$as_ac_var=yes"
+else case e in #(
+  e) eval "$as_ac_var=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+ac_exeext=$ac_wine_try_cflags_saved_exeext ;;
+esac
+fi
+eval ac_res=\$$as_ac_var
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_var"\" = x"yes"
+then :
+  as_fn_append ${wine_arch}_EXTRACFLAGS " -ffunction-sections"
+fi }
+
+        { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fms-hotpatch -DMIN_CLANG_VERSION=18" | sed "$as_sed_sh"`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fms-hotpatch -DMIN_CLANG_VERSION=18" >&5
+printf %s "checking whether $CC supports -fms-hotpatch -DMIN_CLANG_VERSION=18... " >&6; }
+if eval test \${$as_ac_var+y}
+then :
+  printf %s "(cached) " >&6
+else case e in #(
+  e) ac_wine_try_cflags_saved=$CFLAGS
+ac_wine_try_cflags_saved_exeext=$ac_exeext
+CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -fms-hotpatch -DMIN_CLANG_VERSION=18"
+ac_exeext=".exe"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
+int __cdecl mainCRTStartup(void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+  eval "$as_ac_var=yes"
+else case e in #(
+  e) eval "$as_ac_var=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+    conftest$ac_exeext conftest.$ac_ext
+CFLAGS=$ac_wine_try_cflags_saved
+ac_exeext=$ac_wine_try_cflags_saved_exeext ;;
+esac
+fi
+eval ac_res=\$$as_ac_var
+	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_var"\" = x"yes"
+then :
+  as_fn_append ${wine_arch}_EXTRACFLAGS " -fms-hotpatch"
+                        as_fn_append ${wine_arch}_LDFLAGS " -fms-hotpatch"
 fi }
 
         { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-flarge-source-files -Wmisleading-indentation" | sed "$as_sed_sh"`
@@ -11419,6 +11568,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11457,6 +11609,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11493,6 +11648,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11529,6 +11687,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11565,6 +11726,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11601,6 +11765,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11637,6 +11804,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11673,6 +11843,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11732,6 +11905,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11768,6 +11944,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11808,6 +11987,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -11844,6 +12026,9 @@ ac_exeext=".exe"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 void *__os_arm64x_dispatch_ret = 0;
+#if defined(__clang_major__) && defined(MIN_CLANG_VERSION) && __clang_major__ < MIN_CLANG_VERSION
+#error Too old clang version
+#endif
 int __cdecl mainCRTStartup(void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"
@@ -22885,6 +23070,7 @@ wine_fn_config_makefile programs/msidb enable_msidb
 wine_fn_config_makefile programs/msiexec enable_msiexec
 wine_fn_config_makefile programs/msinfo32 enable_msinfo32
 wine_fn_config_makefile programs/net enable_net
+wine_fn_config_makefile programs/net/tests enable_tests
 wine_fn_config_makefile programs/netsh enable_netsh
 wine_fn_config_makefile programs/netstat enable_netstat
 wine_fn_config_makefile programs/ngen enable_ngen

configure.ac

@@ -961,6 +961,12 @@ This is an error since --enable-archs=$wine_arch was requested.])])
     WINE_TRY_PE_CFLAGS([-Wlogical-op])
     WINE_TRY_PE_CFLAGS([-Wabsolute-value])
     WINE_TRY_PE_CFLAGS([-Wenum-enum-conversion],[:],WINE_TRY_PE_CFLAGS([-Wenum-conversion]))
+    WINE_TRY_PE_CFLAGS([-ffunction-sections])
+
+    dnl clang had broken -fms-hotpatch support before version 18 (https://github.com/llvm/llvm-project/pull/77245)
+    WINE_TRY_PE_CFLAGS([-fms-hotpatch -DMIN_CLANG_VERSION=18],
+                       [AS_VAR_APPEND([${wine_arch}_EXTRACFLAGS],[" -fms-hotpatch"])
+                        AS_VAR_APPEND([${wine_arch}_LDFLAGS],[" -fms-hotpatch"])])
 
     dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549)
     WINE_TRY_PE_CFLAGS([-flarge-source-files -Wmisleading-indentation],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-misleading-indentation"])])
@@ -3462,6 +3468,7 @@ WINE_CONFIG_MAKEFILE(programs/msidb)
 WINE_CONFIG_MAKEFILE(programs/msiexec)
 WINE_CONFIG_MAKEFILE(programs/msinfo32)
 WINE_CONFIG_MAKEFILE(programs/net)
+WINE_CONFIG_MAKEFILE(programs/net/tests)
 WINE_CONFIG_MAKEFILE(programs/netsh)
 WINE_CONFIG_MAKEFILE(programs/netstat)
 WINE_CONFIG_MAKEFILE(programs/ngen)

dlls/comctl32/listview.c

@@ -4150,6 +4150,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
     /* see if we are supposed to be tracking mouse hovering */
     if (LISTVIEW_IsHotTracking(infoPtr)) {
         TRACKMOUSEEVENT trackinfo;
+        NMLISTVIEW nmlv = { 0 };
         DWORD flags;
 
         trackinfo.cbSize = sizeof(TRACKMOUSEEVENT);
@@ -4170,6 +4171,15 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN
             /* call TRACKMOUSEEVENT so we receive WM_MOUSEHOVER messages */
             _TrackMouseEvent(&trackinfo);
         }
+
+        ht.pt = pt;
+        LISTVIEW_HitTest(infoPtr, &ht, TRUE, TRUE);
+
+        nmlv.iItem = ht.iItem;
+        nmlv.iSubItem = ht.iSubItem;
+        nmlv.ptAction = pt;
+
+        notify_listview(infoPtr, LVN_HOTTRACK, &nmlv);
     }
 
     return 0;
@@ -9585,6 +9595,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, WPARAM wParam, const CREATESTRUCTW *
   infoPtr->iVersion = COMCTL32_VERSION;
   infoPtr->colRectsDirty = FALSE;
   infoPtr->selected_column = -1;
+  infoPtr->hHotCursor = LoadCursorW(NULL, (LPWSTR)IDC_HAND);
 
   /* get default font (icon title) */
   SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0);

dlls/comctl32/tests/listview.c

@@ -7255,6 +7255,19 @@ static void test_LVM_GETNEXTITEM(void)
     DestroyWindow(hwnd);
 }
 
+static void test_LVM_GETHOTCURSOR(void)
+{
+    HCURSOR cursor;
+    HWND hwnd;
+
+    hwnd = create_listview_control(LVS_REPORT);
+
+    cursor = (HCURSOR)SendMessageA(hwnd, LVM_GETHOTCURSOR, 0, 0);
+    ok(!!cursor, "Unexpected cursor %p.\n", cursor);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(listview)
 {
     ULONG_PTR ctx_cookie;
@@ -7322,6 +7335,7 @@ START_TEST(listview)
     test_LVM_SETBKIMAGE(FALSE);
     test_custom_sort();
     test_LVM_GETNEXTITEM();
+    test_LVM_GETHOTCURSOR();
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
     {
@@ -7372,6 +7386,7 @@ START_TEST(listview)
     test_LVM_GETNEXTITEMINDEX();
     test_LVM_GETNEXTITEM();
     test_LVM_SETBKIMAGE(TRUE);
+    test_LVM_GETHOTCURSOR();
 
     unload_v6_module(ctx_cookie, hCtx);
 

dlls/dbghelp/dbghelp.c

@@ -300,20 +300,6 @@ BOOL WINAPI SymGetSearchPath(HANDLE hProcess, PSTR szSearchPath,
     return ret;
 }
 
-/******************************************************************
- *		invade_process
- *
- * SymInitialize helper: loads in dbghelp all known (and loaded modules)
- * this assumes that hProcess is a handle on a valid process
- */
-static BOOL WINAPI process_invade_cb(PCWSTR name, ULONG64 base, ULONG size, PVOID user)
-{
-    HANDLE      hProcess = user;
-
-    SymLoadModuleExW(hProcess, 0, name, NULL, base, size, NULL, 0);
-    return TRUE;
-}
-
 const WCHAR *process_getenv(const struct process *process, const WCHAR *name)
 {
     size_t name_len;
@@ -432,7 +418,10 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64)
 
     TRACE("got debug info address %#I64x from PEB %p\n", base, pbi.PebBaseAddress);
     if (!elf_read_wine_loader_dbg_info(pcs, base) && !macho_read_wine_loader_dbg_info(pcs, base))
+    {
         WARN("couldn't load process debug info at %#I64x\n", base);
+        pcs->loader = &empty_loader_ops;
+    }
     return TRUE;
 }
 
@@ -510,8 +499,9 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP
     if (check_live_target(pcs, wow64, child_wow64))
     {
         if (fInvadeProcess)
-            EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess);
-        if (pcs->loader) pcs->loader->synchronize_module_list(pcs);
+            module_refresh_list(pcs);
+        else
+            pcs->loader->synchronize_module_list(pcs);
     }
     else if (fInvadeProcess)
     {

dlls/dbghelp/dbghelp_private.h

@@ -743,6 +743,7 @@ extern BOOL         module_remove(struct process* pcs,
 extern void         module_set_module(struct module* module, const WCHAR* name);
 extern WCHAR*       get_wine_loader_name(struct process *pcs) __WINE_DEALLOC(HeapFree, 3) __WINE_MALLOC;
 extern BOOL         module_is_wine_host(const WCHAR* module_name, const WCHAR* ext);
+extern BOOL         module_refresh_list(struct process *pcs);
 
 /* msc.c */
 extern BOOL         pe_load_debug_directory(const struct process* pcs,

dlls/dbghelp/elf_module.c

@@ -1785,7 +1785,6 @@ BOOL elf_read_wine_loader_dbg_info(struct process* pcs, ULONG_PTR addr)
     {
         ERR("Unable to access ELF libraries (outside 32bit limit)\n");
         module_remove(pcs, elf_info.module);
-        pcs->loader = &empty_loader_ops;
         return FALSE;
     }
     TRACE("Found ELF debug header %#I64x\n", elf_info.dbg_hdr_addr);

dlls/dbghelp/module.c

@@ -24,6 +24,8 @@
 #include <string.h>
 #include <assert.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "dbghelp_private.h"
 #include "image_private.h"
 #include "psapi.h"
@@ -1317,7 +1319,11 @@ BOOL  WINAPI EnumerateLoadedModulesW64(HANDLE process,
     size_t              sysdir_len = 0, wowdir_len = 0;
 
     /* process might not be a handle to a live process */
-    if (!IsWow64Process2(process, &pcs_machine, &native_machine)) return FALSE;
+    if (!IsWow64Process2(process, &pcs_machine, &native_machine))
+    {
+        SetLastError(STATUS_INVALID_CID);
+        return FALSE;
+    }
     with_32bit_modules = sizeof(void*) > sizeof(int) &&
         pcs_machine != IMAGE_FILE_MACHINE_UNKNOWN &&
         (dbghelp_options & SYMOPT_INCLUDE_32BIT_MODULES);
@@ -1600,6 +1606,30 @@ void module_reset_debug_info(struct module* module)
     module->sources = NULL;
 }
 
+static BOOL WINAPI process_invade_cb(PCWSTR name, ULONG64 base, ULONG size, PVOID user)
+{
+    HANDLE      hProcess = user;
+
+    /* Note: this follows native behavior:
+     * If a PE module has been unloaded from debuggee, it's not immediately removed
+     * from module list in dbghelp.
+     * Removal may eventually happen when loading a another module with SymLoadModule:
+     * if the module to be loaded overlaps an existing one, SymLoadModule will
+     * automatically unload the eldest one.
+     */
+    SymLoadModuleExW(hProcess, 0, name, NULL, base, size, NULL, 0);
+    return TRUE;
+}
+
+BOOL module_refresh_list(struct process *pcs)
+{
+    BOOL ret;
+
+    ret = pcs->loader->synchronize_module_list(pcs);
+    ret = EnumerateLoadedModulesW64(pcs->handle, process_invade_cb, pcs->handle) && ret;
+    return ret;
+}
+
 /******************************************************************
  *              SymRefreshModuleList (DBGHELP.@)
  */
@@ -1610,8 +1640,7 @@ BOOL WINAPI SymRefreshModuleList(HANDLE hProcess)
     TRACE("(%p)\n", hProcess);
 
     if (!(pcs = process_find_by_handle(hProcess))) return FALSE;
-
-    return pcs->loader->synchronize_module_list(pcs);
+    return module_refresh_list(pcs);
 }
 
 /***********************************************************************

dlls/dbghelp/msc.c

@@ -4379,7 +4379,13 @@ static BOOL codeview_process_info(const struct process *pcs,
 
         TRACE("Got RSDS type of PDB file: guid=%s age=%08x name=%s\n",
               wine_dbgstr_guid(&rsds->guid), rsds->age, debugstr_a(rsds->name));
+        /* gcc/mingw and clang can emit build-id information, but with an empty PDB filename.
+         * Don't search for the .pdb file in that case.
+         */
+        if (rsds->name[0])
             ret = pdb_process_file(pcs, msc_dbg, rsds->name, &rsds->guid, 0, rsds->age);
+        else
+            ret = TRUE;
         break;
     }
     default:
@@ -4487,7 +4493,7 @@ typedef struct _FPO_DATA
     __ENDTRY
 
     /* we haven't found yet any debug information, fallback to unmatched pdb */
-    if (module->module.SymType == SymDeferred)
+    if (!ret && module->module.SymType == SymDeferred)
     {
         SYMSRV_INDEX_INFOW info = {.sizeofstruct = sizeof(info)};
         char buffer[MAX_PATH];
@@ -4549,38 +4555,35 @@ DWORD msc_get_file_indexinfo(void* image, const IMAGE_DEBUG_DIRECTORY* debug_dir
             num_misc_records++;
         }
     }
-    return info->stripped && !num_misc_records ? ERROR_BAD_EXE_FORMAT : ERROR_SUCCESS;
+    return (!num_dir || (info->stripped && !num_misc_records)) ? ERROR_BAD_EXE_FORMAT : ERROR_SUCCESS;
 }
 
 DWORD dbg_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info)
 {
     const IMAGE_SEPARATE_DEBUG_HEADER *header;
+    IMAGE_DEBUG_DIRECTORY *dbg;
     DWORD num_directories;
 
-    if (size < sizeof(*header)) return ERROR_BAD_EXE_FORMAT;
+    if (size < sizeof(*header)) return ERROR_BAD_FORMAT;
     header = image;
     if (header->Signature != 0x4944 /* DI */ ||
         size < sizeof(*header) + header->NumberOfSections * sizeof(IMAGE_SECTION_HEADER) + header->ExportedNamesSize + header->DebugDirectorySize)
-        return ERROR_BAD_EXE_FORMAT;
+        return ERROR_BAD_FORMAT;
+
+    info->size = header->SizeOfImage;
+    /* seems to use header's timestamp, not debug_directory one */
+    info->timestamp = header->TimeDateStamp;
+    info->stripped = FALSE; /* FIXME */
 
     /* header is followed by:
      * - header->NumberOfSections of IMAGE_SECTION_HEADER
      * - header->ExportedNameSize
      * - then num_directories of IMAGE_DEBUG_DIRECTORY
      */
+    dbg = (IMAGE_DEBUG_DIRECTORY*)((char*)(header + 1) +
+                                   header->NumberOfSections * sizeof(IMAGE_SECTION_HEADER) +
+                                   header->ExportedNamesSize);
     num_directories = header->DebugDirectorySize / sizeof(IMAGE_DEBUG_DIRECTORY);
 
-    if (!num_directories) return ERROR_BAD_EXE_FORMAT;
-
-    info->age = 0;
-    memset(&info->guid, 0, sizeof(info->guid));
-    info->sig = 0;
-    info->dbgfile[0] = L'\0';
-    info->pdbfile[0] = L'\0';
-    info->size = header->SizeOfImage;
-    /* seems to use header's timestamp, not debug_directory one */
-    info->timestamp = header->TimeDateStamp;
-    info->stripped = FALSE; /* FIXME */
-
-    return ERROR_SUCCESS;
+    return msc_get_file_indexinfo(image, dbg, num_directories, info);
 }

dlls/dbghelp/path.c

@@ -832,7 +832,7 @@ BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info,
     if (hMap) CloseHandle(hMap);
     if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile);
 
-    if (ret == ERROR_SUCCESS) wcscpy(info->file, file_name(file)); /* overflow? */
+    if (ret == ERROR_SUCCESS || ret == ERROR_BAD_EXE_FORMAT) wcscpy(info->file, file_name(file)); /* overflow? */
     SetLastError(ret);
     return ret == ERROR_SUCCESS;
 }

dlls/dbghelp/pe_module.c

@@ -656,7 +656,7 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod
         if (nDbg != 1 || dbg->Type != IMAGE_DEBUG_TYPE_MISC ||
             misc->DataType != IMAGE_DEBUG_MISC_EXENAME)
         {
-            ERR("-Debug info stripped, but no .DBG file in module %s\n",
+            WARN("-Debug info stripped, but no .DBG file in module %s\n",
                  debugstr_w(module->modulename));
         }
         else
@@ -1019,7 +1019,7 @@ DWORD pe_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info)
     if (!(nthdr = RtlImageNtHeader(image))) return ERROR_BAD_FORMAT;
 
     dbg = RtlImageDirectoryEntryToData(image, FALSE, IMAGE_DIRECTORY_ENTRY_DEBUG, &dirsize);
-    if (!dbg || dirsize < sizeof(dbg)) return ERROR_BAD_EXE_FORMAT;
+    if (!dbg) dirsize = 0;
 
     /* fill in information from NT header */
     info->timestamp = nthdr->FileHeader.TimeDateStamp;

dlls/dbghelp/tests/dbghelp.c

@@ -372,6 +372,29 @@ static unsigned get_native_module_count(HANDLE proc)
     return count;
 }
 
+struct module_present
+{
+    const WCHAR* module_name;
+    BOOL found;
+};
+
+static BOOL CALLBACK is_module_present_cb(const WCHAR* name, DWORD64 base, void* usr)
+{
+    struct module_present* present = usr;
+    if (!wcsicmp(name, present->module_name))
+    {
+        present->found = TRUE;
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static BOOL is_module_present(HANDLE proc, const WCHAR* module_name)
+{
+    struct module_present present = { .module_name = module_name };
+    return SymEnumerateModulesW64(proc, is_module_present_cb, &present) && present.found;
+}
+
 struct nth_module
 {
     HANDLE              proc;
@@ -424,6 +447,28 @@ static BOOL wrapper_EnumerateLoadedModulesW64(HANDLE proc, PENUMLOADED_MODULES_C
     return ret;
 }
 
+/* wrapper around SymRefreshModuleList which sometimes fails (it's very likely implemented on top
+ * of EnumerateLoadedModulesW64 on native too)
+ */
+static BOOL wrapper_SymRefreshModuleList(HANDLE proc)
+{
+    BOOL ret;
+    int retry;
+    int retry_count = !strcmp(winetest_platform, "wine") ? 1 : 5;
+
+    for (retry = retry_count - 1; retry >= 0; retry--)
+    {
+        ret = SymRefreshModuleList(proc);
+        if (ret || (GetLastError() != STATUS_INFO_LENGTH_MISMATCH && GetLastError() == STATUS_PARTIAL_COPY))
+            break;
+        Sleep(10);
+    }
+    if (retry + 1 < retry_count)
+        trace("used wrapper retry: ret=%d retry=%d top=%d\n", ret, retry, retry_count);
+
+    return ret;
+}
+
 static BOOL test_modules(void)
 {
     BOOL ret;
@@ -492,6 +537,7 @@ static BOOL test_modules(void)
 
     ret = SymRefreshModuleList(dummy);
     ok(!ret, "SymRefreshModuleList should have failed\n");
+    ok(GetLastError() == STATUS_INVALID_CID, "Unexpected last error %lx\n", GetLastError());
 
     count = get_module_count(dummy);
     ok(count == 0, "Unexpected count (%u instead of 0)\n", count);
@@ -825,6 +871,11 @@ static void test_loaded_modules(void)
     ok(ret, "got error %lu\n", GetLastError());
     strcat(buffer, "\\msinfo32.exe");
 
+    /* testing invalid process handle */
+    ret = wrapper_EnumerateLoadedModulesW64((HANDLE)(ULONG_PTR)0xffffffc0, NULL, FALSE);
+    ok(!ret, "EnumerateLoadedModulesW64 should have failed\n");
+    ok(GetLastError() == STATUS_INVALID_CID, "Unexpected last error %lx\n", GetLastError());
+
     /* testing with child process of different machines */
     ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
     ok(ret, "CreateProcess failed: %lu\n", GetLastError());
@@ -885,9 +936,10 @@ static void test_loaded_modules(void)
 
     pcskind = get_process_kind(pi.hProcess);
 
-    ret = SymRefreshModuleList(pi.hProcess);
-    todo_wine_if(pcskind == PCSKIND_WOW64)
-    ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */), "SymRefreshModuleList failed: %lu\n", GetLastError());
+    ret = wrapper_SymRefreshModuleList(pi.hProcess);
+    ok(ret || broken(GetLastError() == STATUS_PARTIAL_COPY /* Win11 in some cases */ ||
+                             GetLastError() == STATUS_INFO_LENGTH_MISMATCH /* Win11 in some cases */),
+       "SymRefreshModuleList failed: %lx\n", GetLastError());
 
     if (!strcmp(winetest_platform, "wine"))
     {
@@ -945,8 +997,8 @@ static void test_loaded_modules(void)
                    "Wrong directory aggregation count %u %u\n",
                    aggregation.count_systemdir, aggregation.count_wowdir);
             }
-            ret = SymRefreshModuleList(pi.hProcess);
-            ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError());
+            ret = wrapper_SymRefreshModuleList(pi.hProcess);
+            ok(ret, "SymRefreshModuleList failed: %lx\n", GetLastError());
 
             if (!strcmp(winetest_platform, "wine"))
             {
@@ -1007,8 +1059,8 @@ static void test_loaded_modules(void)
                 break;
             }
 
-            ret = SymRefreshModuleList(pi.hProcess);
-            ok(ret, "SymRefreshModuleList failed: %lu\n", GetLastError());
+            ret = wrapper_SymRefreshModuleList(pi.hProcess);
+            ok(ret, "SymRefreshModuleList failed: %lx\n", GetLastError());
 
             if (!strcmp(winetest_platform, "wine"))
             {
@@ -1529,6 +1581,75 @@ static void test_function_tables(void)
     SymCleanup(GetCurrentProcess());
 }
 
+static void test_refresh_modules(void)
+{
+    BOOL ret;
+    unsigned count, count_current;
+    HMODULE hmod;
+    IMAGEHLP_MODULEW64 module_info = { .SizeOfStruct = sizeof(module_info) };
+
+    /* pick a DLL: which isn't already loaded by test, and that will not load other DLLs for deps */
+    static const WCHAR* unused_dll = L"psapi";
+
+    ret = SymInitialize(GetCurrentProcess(), 0, TRUE);
+    ok(ret, "SymInitialize failed: %lu\n", GetLastError());
+
+    count = get_module_count(GetCurrentProcess());
+    ok(count, "Unexpected module count %u\n", count);
+
+    ret = SymCleanup(GetCurrentProcess());
+    ok(ret, "SymCleanup failed: %lu\n", GetLastError());
+
+    ret = SymInitialize(GetCurrentProcess(), 0, FALSE);
+    ok(ret, "SymInitialize failed: %lu\n", GetLastError());
+
+    count_current = get_module_count(GetCurrentProcess());
+    ok(!count_current, "Unexpected module count %u\n", count_current);
+
+    ret = wrapper_SymRefreshModuleList(GetCurrentProcess());
+    ok(ret, "SymRefreshModuleList failed: %lx\n", GetLastError());
+
+    count_current = get_module_count(GetCurrentProcess());
+    ok(count == count_current, "Unexpected module count %u, %u\n", count, count_current);
+
+    hmod = GetModuleHandleW(unused_dll);
+    ok(hmod == NULL, "Expecting DLL %ls not be loaded\n", unused_dll);
+
+    hmod = LoadLibraryW(unused_dll);
+    ok(hmod != NULL, "LoadLibraryW failed: %lu\n", GetLastError());
+
+    count_current = get_module_count(GetCurrentProcess());
+    ok(count == count_current, "Unexpected module count %u, %u\n", count, count_current);
+    ret = is_module_present(GetCurrentProcess(), unused_dll);
+    ok(!ret, "Couldn't find module %ls\n", unused_dll);
+
+    ret = wrapper_SymRefreshModuleList(GetCurrentProcess());
+    ok(ret, "SymRefreshModuleList failed: %lx\n", GetLastError());
+
+    count_current = get_module_count(GetCurrentProcess());
+    ok(count + 1 == count_current, "Unexpected module count %u, %u\n", count, count_current);
+    ret = is_module_present(GetCurrentProcess(), unused_dll);
+    ok(ret, "Couldn't find module %ls\n", unused_dll);
+
+    ret = FreeLibrary(hmod);
+    ok(ret, "LoadLibraryW failed: %lu\n", GetLastError());
+
+    count_current = get_module_count(GetCurrentProcess());
+    ok(count + 1 == count_current, "Unexpected module count %u, %u\n", count, count_current);
+
+    ret = wrapper_SymRefreshModuleList(GetCurrentProcess());
+    ok(ret, "SymRefreshModuleList failed: %lx\n", GetLastError());
+
+    /* SymRefreshModuleList() doesn't remove the unloaded modules... */
+    count_current = get_module_count(GetCurrentProcess());
+    ok(count + 1 == count_current, "Unexpected module count %u != %u\n", count, count_current);
+    ret = is_module_present(GetCurrentProcess(), unused_dll);
+    ok(ret, "Couldn't find module %ls\n", unused_dll);
+
+    ret = SymCleanup(GetCurrentProcess());
+    ok(ret, "SymCleanup failed: %lu\n", GetLastError());
+}
+
 START_TEST(dbghelp)
 {
     BOOL ret;
@@ -1559,6 +1680,7 @@ START_TEST(dbghelp)
         test_modules_overlap();
         test_loaded_modules();
         test_live_modules();
+        test_refresh_modules();
     }
     test_function_tables();
 }

dlls/dbghelp/tests/path.c

@@ -671,20 +671,22 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag
     return TRUE;
 }
 
-static BOOL create_test_dbg(const WCHAR* dbg_name, WORD machine, DWORD timestamp, DWORD size)
+static BOOL create_test_dbg(const WCHAR* dbg_name, WORD machine, DWORD charac, DWORD timestamp, DWORD size, struct debug_directory_blob *blob)
 {
     HANDLE hfile;
 
     /* minimalistic .dbg made of a header and a DEBUG_DIRECTORY without any data */
-    const IMAGE_SEPARATE_DEBUG_HEADER header = {.Signature = 0x4944 /* DI */,
-        .Flags = 0, .Machine = machine, .Characteristics = 0x010E, .TimeDateStamp = timestamp,
+    IMAGE_SEPARATE_DEBUG_HEADER header =
+    {
+        .Signature = 0x4944 /* DI */,
+        .Flags = 0, .Machine = machine, .Characteristics = charac, .TimeDateStamp = timestamp,
         .CheckSum = 0, .ImageBase = 0x00040000, .SizeOfImage = size, .NumberOfSections = 0,
-        .ExportedNamesSize = 0, .DebugDirectorySize = sizeof(IMAGE_DEBUG_DIRECTORY)};
-    const IMAGE_DEBUG_DIRECTORY debug_dir = {.Characteristics = 0, .TimeDateStamp = timestamp + 1,
-                                             .MajorVersion = 0, .MinorVersion = 0, .Type = IMAGE_DEBUG_TYPE_CODEVIEW,
-                                             .SizeOfData = 0, .AddressOfRawData = 0,
-                                             .PointerToRawData = sizeof(header) + header.NumberOfSections * sizeof(IMAGE_SECTION_HEADER) +
-                                             header.DebugDirectorySize};
+        .ExportedNamesSize = 0, .DebugDirectorySize = 0
+    };
+    DWORD where, expected_size;
+
+    if (blob)
+        header.DebugDirectorySize = sizeof(IMAGE_DEBUG_DIRECTORY);
 
     hfile = CreateFileW(dbg_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0);
     ok(hfile != INVALID_HANDLE_VALUE, "failed to create %ls err %lu\n", dbg_name, GetLastError());
@@ -692,8 +694,18 @@ static BOOL create_test_dbg(const WCHAR* dbg_name, WORD machine, DWORD timestamp
 
     check_write_file(hfile, &header, sizeof(header));
     /* FIXME: 0 sections... as header.NumberOfSections */
-    check_write_file(hfile, &debug_dir, sizeof(debug_dir));
-    ok(SetFilePointer(hfile, 0, NULL, FILE_CURRENT) == debug_dir.PointerToRawData, "mismatch\n");
+    if (blob)
+    {
+        where = SetFilePointer(hfile, 0, NULL, FILE_CURRENT);
+        blob->debug_directory.PointerToRawData = (blob->debug_directory.SizeOfData) ?
+            where + sizeof(IMAGE_DEBUG_DIRECTORY) : 0;
+        check_write_file(hfile, &blob->debug_directory, sizeof(IMAGE_DEBUG_DIRECTORY));
+        check_write_file(hfile, blob->content, blob->debug_directory.SizeOfData);
+    }
+    expected_size = sizeof(header) + header.NumberOfSections * sizeof(IMAGE_SECTION_HEADER);
+    if (blob)
+        expected_size += sizeof(IMAGE_DEBUG_DIRECTORY) + blob->debug_directory.SizeOfData;
+    ok(SetFilePointer(hfile, 0, NULL, FILE_CURRENT) == expected_size, "Incorrect file length\n");
 
     CloseHandle(hfile);
     return TRUE;
@@ -725,16 +737,16 @@ static void test_srvgetindexes_pe(void)
         DWORD sig;
         WCHAR pdb_name[16];
         WCHAR dbg_name[16];
-        BOOL in_error;
+        DWORD last_error;
     }
     indexes[] =
     {
         /* error cases */
-/*  0 */{0,                         {-1, -1, -1}, .in_error = TRUE},
-        {IMAGE_FILE_DEBUG_STRIPPED, { 0, -1, -1}, .in_error = TRUE},
-        {IMAGE_FILE_DEBUG_STRIPPED, { 1, -1, -1}, .in_error = TRUE},
-        {IMAGE_FILE_DEBUG_STRIPPED, { 2, -1, -1}, .in_error = TRUE},
-        {IMAGE_FILE_DEBUG_STRIPPED, {-1, -1, -1}, .in_error = TRUE}, /* not 100% logical ! */
+/*  0 */{0,                         {-1, -1, -1}, 0,   &null_guid, 0,                                    .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_DEBUG_STRIPPED, { 0, -1, -1}, 0,   &null_guid, 0,                                    .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_DEBUG_STRIPPED, { 1, -1, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb", .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_DEBUG_STRIPPED, { 2, -1, -1}, 124, &guid1,     0,          .pdb_name = L"pdbds.pdb", .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_DEBUG_STRIPPED, {-1, -1, -1}, 0,   &null_guid, 0,                                    .last_error = ERROR_BAD_EXE_FORMAT}, /* not 100% logical ! */
         /* success */
 /*  5 */{0,                         { 0, -1, -1}, 0,   &null_guid, 0           },
         {0,                         { 1, -1, -1}, 123, &null_guid, 0xaaaabbbb, .pdb_name = L"pdbjg.pdb"},
@@ -796,16 +808,16 @@ static void test_srvgetindexes_pe(void)
             memset(&ssii, 0xa5, sizeof(ssii));
             ssii.sizeofstruct = sizeof(ssii);
             ret = SymSrvGetFileIndexInfoW(filename, &ssii, 0);
-            if (indexes[i].in_error)
+            if (indexes[i].last_error)
             {
                 ok(!ret, "SymSrvGetFileIndexInfo should have failed\n");
-                ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Mismatch in GetLastError: %lu\n", GetLastError());
+                ok(GetLastError() == indexes[i].last_error, "Mismatch in GetLastError: %lu\n", GetLastError());
             }
             else
-            {
                 ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError());
-
-                ok(ssii.age == indexes[i].age, "Mismatch in age: %lx\n", ssii.age);
+            if (ret || indexes[i].last_error == ERROR_BAD_EXE_FORMAT)
+            {
+                ok(ssii.age == indexes[i].age, "Mismatch in age: %lu\n", ssii.age);
                 ok(IsEqualGUID(&ssii.guid, indexes[i].guid),
                    "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid));
 
@@ -882,48 +894,69 @@ static void test_srvgetindexes_dbg(void)
     WCHAR filename[128];
     SYMSRV_INDEX_INFOW ssii;
     BOOL ret;
+    struct debug_directory_blob *blob_refs[1];
 
     static struct
     {
         /* input parameters */
         WORD        machine;
+        DWORD       characteristics;
         DWORD       timestamp;
         DWORD       imagesize;
+        int         blob;
+        /* output parameters */
+        DWORD       age;
+        const GUID *guid;
+        WCHAR       pdbname[16];
+        WCHAR       dbgname[16];
+        DWORD       last_error;
     }
     indexes[] =
     {
-        {IMAGE_FILE_MACHINE_I386,  0x1234, 0x00560000},
-        {IMAGE_FILE_MACHINE_AMD64, 0x1235, 0x00570000},
+        {IMAGE_FILE_MACHINE_I386,  0, 0x1234, 0x00560000, -1, 0, &null_guid, .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_MACHINE_AMD64, 0, 0x1235, 0x00570000, -1, 0, &null_guid, .last_error = ERROR_BAD_EXE_FORMAT},
+        {IMAGE_FILE_MACHINE_I386,  0, 0x1234, 0x00560000, 0, 123, &guid1, .pdbname=L"foo.pdb"},
+        {IMAGE_FILE_MACHINE_AMD64, 0, 0x1235, 0x00570000, 0, 123, &guid1, .pdbname=L"foo.pdb"},
     };
+
+    blob_refs[0] = make_pdb_ds_blob(0x1226, &guid1, 123, "foo.pdb");
     for (i = 0; i < ARRAY_SIZE(indexes); i++)
     {
         winetest_push_context("dbg#%02u", i);
 
         /* create dll */
         swprintf(filename, ARRAY_SIZE(filename), L"winetest%02u.dbg", i);
-        ret = create_test_dbg(filename, indexes[i].machine, indexes[i].timestamp, indexes[i].imagesize);
+        ret = create_test_dbg(filename, indexes[i].machine, indexes[i].characteristics,
+                              indexes[i].timestamp, indexes[i].imagesize,
+                              indexes[i].blob == -1 ? NULL : blob_refs[indexes[i].blob]);
         ok(ret, "Couldn't create dbg file %ls\n", filename);
 
         memset(&ssii, 0x45, sizeof(ssii));
         ssii.sizeofstruct = sizeof(ssii);
         ret = SymSrvGetFileIndexInfoW(filename, &ssii, 0);
+        if (indexes[i].last_error)
+        {
+            ok(!ret, "SymSrvGetFileIndexInfo should have\n");
+            ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Unexpected last error: %lu\n", GetLastError());
+        }
+        else
             ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError());
 
-        ok(ssii.age == 0, "Mismatch in age: %lx\n", ssii.age);
-        ok(!memcmp(&ssii.guid, &null_guid, sizeof(GUID)),
+        ok(ssii.age == indexes[i].age, "Mismatch in age: %lx\n", ssii.age);
+        ok(IsEqualGUID(&ssii.guid, indexes[i].guid),
            "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid));
-
         ok(ssii.sig == 0, "Mismatch in sig: %lx\n", ssii.sig);
         ok(ssii.size == indexes[i].imagesize, "Mismatch in size: %lx\n", ssii.size);
         ok(!ssii.stripped, "Mismatch in stripped: %x\n", ssii.stripped);
         ok(ssii.timestamp == indexes[i].timestamp, "Mismatch in timestamp: %lx\n", ssii.timestamp);
         ok(!wcscmp(ssii.file, filename), "Mismatch in file: %ls\n", ssii.file);
-        ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %ls\n", ssii.pdbfile);
-        ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %ls\n", ssii.dbgfile);
+        ok(!wcscmp(ssii.pdbfile, indexes[i].pdbname), "Mismatch in pdbfile: %ls\n", ssii.pdbfile);
+        ok(!wcscmp(ssii.dbgfile, indexes[i].dbgname), "Mismatch in dbgfile: %ls\n", ssii.dbgfile);
 
         DeleteFileW(filename);
         winetest_pop_context();
     }
+    for (i = 0; i < ARRAY_SIZE(blob_refs); i++) free(blob_refs[i]);
 }
 
 static void make_path(WCHAR file[MAX_PATH], const WCHAR* topdir, const WCHAR* subdir, const WCHAR* base)
@@ -1533,7 +1566,8 @@ static void test_load_modules_path(void)
                 if (test_files[val].guid)
                     create_test_pdb_ds(filename, test_files[val].guid, test_files[val].age_or_timestamp);
                 else
-                    create_test_dbg(filename, IMAGE_FILE_MACHINE_AMD64 /* FIXME */, test_files[val].age_or_timestamp, 0x40000 * val * 0x20000);
+                    /*create_test_dbg(filename, IMAGE_FILE_MACHINE_AMD64, 0x10E, test_files[val].age_or_timestamp, 0x40000 * val * 0x20000, blob); */
+                    ok(0, "not supported yet\n");
             }
             else ok(0, "Unrecognized file reference %c\n", *ptr);
         }
@@ -1754,7 +1788,7 @@ static void test_load_modules_details(void)
                 if (test_files[val].guid)
                     create_test_pdb_ds(filename, test_files[val].guid, test_files[val].age_or_timestamp);
                 else
-                    create_test_dbg(filename, IMAGE_FILE_MACHINE_AMD64 /* FIXME */, test_files[val].age_or_timestamp, 0x40000 * val * 0x20000);
+                    create_test_dbg(filename, IMAGE_FILE_MACHINE_AMD64 /* FIXME */, 0x10E, test_files[val].age_or_timestamp, 0x40000 * val * 0x20000, NULL);
             }
             else ok(0, "Unrecognized file reference %c\n", *ptr);
         }

dlls/dinput/mouse.c

@@ -306,20 +306,13 @@ static void warp_check( struct mouse *impl, BOOL force )
 
     if (force || (impl->need_warp && (now - impl->last_warped > interval)))
     {
-        RECT rect, new_rect;
         POINT mapped_center;
+        RECT rect;
 
         impl->last_warped = now;
         impl->need_warp = FALSE;
         if (!GetClientRect( impl->base.win, &rect )) return;
         MapWindowPoints( impl->base.win, 0, (POINT *)&rect, 2 );
-        if (!impl->clipped)
-        {
-            mapped_center.x = (rect.left + rect.right) / 2;
-            mapped_center.y = (rect.top + rect.bottom) / 2;
-            TRACE( "Warping mouse to x %+ld, y %+ld.\n", mapped_center.x, mapped_center.y );
-            SetCursorPos( mapped_center.x, mapped_center.y );
-        }
         if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE)
         {
             /* make sure we clip even if the window covers the whole screen */
@@ -328,8 +321,14 @@ static void warp_check( struct mouse *impl, BOOL force )
             rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 );
             rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 );
             TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect ));
-            ClipCursor( &rect );
-            impl->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect );
+            impl->clipped = ClipCursor( &rect );
+        }
+        if (!impl->clipped)
+        {
+            mapped_center.x = (rect.left + rect.right) / 2;
+            mapped_center.y = (rect.top + rect.bottom) / 2;
+            TRACE( "Warping mouse to x %+ld, y %+ld.\n", mapped_center.x, mapped_center.y );
+            SetCursorPos( mapped_center.x, mapped_center.y );
         }
     }
 }

dlls/dplayx/dplay.c

@@ -1132,42 +1132,26 @@ static HRESULT WINAPI IDirectPlay4AImpl_AddPlayerToGroup( IDirectPlay4A *iface,
     return IDirectPlayX_AddPlayerToGroup( &This->IDirectPlay4_iface, group, player );
 }
 
-static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DPID group,
-        DPID player )
+HRESULT DP_AddPlayerToGroup( IDirectPlayImpl *This, DPID group, DPID player )
 {
-    IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
+    DPMSG_ADDPLAYERTOGROUP addPlayerToGroupMsg;
     lpGroupData  gdata;
     lpPlayerList plist;
     lpPlayerList newplist;
-
-    TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
-
-    if ( This->dp2->connectionInitialized == NO_PROVIDER )
-        return DPERR_UNINITIALIZED;
-
-    EnterCriticalSection( &This->lock );
+    HRESULT hr;
 
     /* Find the group */
     if ( ( gdata = DP_FindAnyGroup( This, group ) ) == NULL )
-    {
-        LeaveCriticalSection( &This->lock );
         return DPERR_INVALIDGROUP;
-    }
 
     /* Find the player */
     if ( ( plist = DP_FindPlayer( This, player ) ) == NULL )
-    {
-        LeaveCriticalSection( &This->lock );
         return DPERR_INVALIDPLAYER;
-    }
 
     /* Create a player list (ie "shortcut" ) */
     newplist = calloc( 1, sizeof( *newplist ) );
     if ( !newplist )
-    {
-        LeaveCriticalSection( &This->lock );
         return DPERR_CANTADDPLAYER;
-    }
 
     /* Add the shortcut */
     plist->lpPData->uRef++;
@@ -1187,7 +1171,59 @@ static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DP
         data.idGroup  = group;
         data.lpISP    = This->dp2->spData.lpISP;
 
-        (*This->dp2->spData.lpCB->AddPlayerToGroup)( &data );
+        hr = (*This->dp2->spData.lpCB->AddPlayerToGroup)( &data );
+        if ( FAILED( hr ) )
+        {
+            DPQ_REMOVE( gdata->players, newplist, players );
+            --plist->lpPData->uRef;
+            free( newplist );
+            return hr;
+        }
+    }
+
+    addPlayerToGroupMsg.dwType = DPSYS_ADDPLAYERTOGROUP;
+    addPlayerToGroupMsg.dpIdGroup = group;
+    addPlayerToGroupMsg.dpIdPlayer = player;
+
+    hr = DP_QueueMessage( This, DPID_SYSMSG, DPID_ALLPLAYERS, 0, &addPlayerToGroupMsg,
+                          DP_CopyGeneric, sizeof( DPMSG_ADDPLAYERTOGROUP ) );
+    if ( FAILED( hr ) )
+    {
+        if ( This->dp2->spData.lpCB->RemovePlayerFromGroup )
+        {
+            DPSP_REMOVEPLAYERFROMGROUPDATA data;
+            data.idPlayer = player;
+            data.idGroup = group;
+            data.lpISP = This->dp2->spData.lpISP;
+            This->dp2->spData.lpCB->RemovePlayerFromGroup( &data );
+        }
+        DPQ_REMOVE( gdata->players, newplist, players );
+        --plist->lpPData->uRef;
+        free( newplist );
+        return hr;
+    }
+
+    return DP_OK;
+}
+
+static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DPID group,
+        DPID player )
+{
+    IDirectPlayImpl *This = impl_from_IDirectPlay4( iface );
+    HRESULT hr;
+
+    TRACE( "(%p)->(0x%08lx,0x%08lx)\n", This, group, player );
+
+    if ( This->dp2->connectionInitialized == NO_PROVIDER )
+        return DPERR_UNINITIALIZED;
+
+    EnterCriticalSection( &This->lock );
+
+    hr = DP_AddPlayerToGroup( This, group, player );
+    if ( FAILED( hr ) )
+    {
+        LeaveCriticalSection( &This->lock );
+        return hr;
     }
 
     /* Inform all other peers of the addition of player to the group. If there are
@@ -1195,20 +1231,11 @@ static HRESULT WINAPI IDirectPlay4Impl_AddPlayerToGroup( IDirectPlay4 *iface, DP
      * Also, if this event was the result of another machine sending it to us,
      * don't bother rebroadcasting it.
      */
-    if ( This->dp2->lpSessionDesc &&
-            ( This->dp2->lpSessionDesc->dwFlags & DPSESSION_MULTICASTSERVER ) )
+    hr = DP_MSG_SendAddPlayerToGroup( This, DPID_ALLPLAYERS, player, group );
+    if( FAILED( hr ) )
     {
-        DPMSG_ADDPLAYERTOGROUP msg;
-        msg.dwType = DPSYS_ADDPLAYERTOGROUP;
-
-        msg.dpIdGroup  = group;
-        msg.dpIdPlayer = player;
-
-        /* FIXME: Correct to just use send effectively? */
-        /* FIXME: Should size include data w/ message or just message "header" */
-        /* FIXME: Check return code */
-        IDirectPlayX_SendEx( iface, DPID_SERVERPLAYER, DPID_ALLPLAYERS, 0, &msg, sizeof( msg ),
-                0, 0, NULL, NULL );
+        LeaveCriticalSection( &This->lock );
+        return hr;
     }
 
     LeaveCriticalSection( &This->lock );
@@ -1281,17 +1308,28 @@ static HRESULT WINAPI IDirectPlay4Impl_Close( IDirectPlay4 *iface )
     return hr;
 }
 
-static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, const DPNAME *lpName,
-        DWORD dwFlags, DPID idParent, BOOL bAnsi )
+HRESULT DP_CreateGroup( IDirectPlayImpl *This, void *msgHeader, const DPID *lpid,
+        const DPNAME *lpName, void *data, DWORD dataSize, DWORD dwFlags, DPID idParent,
+        BOOL bAnsi )
 {
+  struct GroupList *groupList = NULL;
+  struct GroupData *parent = NULL;
   lpGroupData lpGData;
+  HRESULT hr;
+
+  if( DPID_SYSTEM_GROUP != *lpid )
+  {
+    parent = DP_FindAnyGroup( This, idParent );
+    if( !parent )
+      return DPERR_INVALIDGROUP;
+  }
 
   /* Allocate the new space and add to end of high level group list */
   lpGData = calloc( 1, sizeof( *lpGData ) );
 
   if( lpGData == NULL )
   {
-    return NULL;
+    return DPERR_OUTOFMEMORY;
   }
 
   DPQ_INIT(lpGData->groups);
@@ -1304,7 +1342,7 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
   if ( !lpGData->name )
   {
     free( lpGData );
-    return NULL;
+    return DPERR_OUTOFMEMORY;
   }
 
   lpGData->nameA = DP_DuplicateName( lpName, TRUE, bAnsi );
@@ -1312,10 +1350,9 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
   {
     free( lpGData->name );
     free( lpGData );
-    return NULL;
+    return DPERR_OUTOFMEMORY;
   }
 
-  /* FIXME: Should we check that the parent exists? */
   lpGData->parent = idParent;
 
   /* FIXME: Should we validate the dwFlags? */
@@ -1328,12 +1365,83 @@ static lpGroupData DP_CreateGroup( IDirectPlayImpl *This, const DPID *lpid, cons
     free( lpGData->nameA );
     free( lpGData->name );
     free( lpGData );
-    return NULL;
+    return DPERR_OUTOFMEMORY;
+  }
+
+  if( DPID_SYSTEM_GROUP == *lpid )
+  {
+    This->dp2->lpSysGroup = lpGData;
+    TRACE( "Inserting system group\n" );
+  }
+  else
+  {
+    /* Insert into the parent group */
+    groupList = calloc( 1, sizeof( *groupList ) );
+    if( !groupList )
+    {
+      free( lpGData->nameA );
+      free( lpGData->name );
+      free( lpGData );
+      return DPERR_OUTOFMEMORY;
+    }
+    groupList->lpGData = lpGData;
+
+    DPQ_INSERT( parent->groups, groupList, groups );
+  }
+
+  /* Something is now referencing this data */
+  lpGData->uRef++;
+
+  DP_SetGroupData( lpGData, DPSET_REMOTE, data, dataSize );
+
+  /* FIXME: We should only create the system group if GetCaps returns
+   *        DPCAPS_GROUPOPTIMIZED.
+   */
+
+  /* Let the SP know that we've created this group */
+  if( This->dp2->spData.lpCB->CreateGroup )
+  {
+    DPSP_CREATEGROUPDATA data;
+    DWORD dwCreateFlags = 0;
+
+    TRACE( "Calling SP CreateGroup\n" );
+
+    if( !parent )
+      dwCreateFlags |= DPLAYI_GROUP_SYSGROUP;
+
+    if( !msgHeader )
+      dwCreateFlags |= DPLAYI_PLAYER_PLAYERLOCAL;
+
+    if( dwFlags & DPGROUP_HIDDEN )
+      dwCreateFlags |= DPLAYI_GROUP_HIDDEN;
+
+    data.idGroup           = *lpid;
+    data.dwFlags           = dwCreateFlags;
+    data.lpSPMessageHeader = msgHeader;
+    data.lpISP             = This->dp2->spData.lpISP;
+
+    hr = (*This->dp2->spData.lpCB->CreateGroup)( &data );
+    if( FAILED( hr ) )
+    {
+      if( groupList )
+      {
+        DPQ_REMOVE( parent->groups, groupList, groups );
+        free( groupList );
+      }
+      else
+      {
+        This->dp2->lpSysGroup = NULL;
+      }
+      free( lpGData->nameA );
+      free( lpGData->name );
+      free( lpGData );
+      return hr;
+    }
   }
 
   TRACE( "Created group id 0x%08lx\n", *lpid );
 
-  return lpGData;
+  return DP_OK;
 }
 
 /* This method assumes that all links to it are already deleted */
@@ -1394,7 +1502,7 @@ static lpGroupData DP_FindAnyGroup( IDirectPlayImpl *This, DPID dpid )
 static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *lpidGroup,
         DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags, BOOL bAnsi )
 {
-  lpGroupData lpGData;
+  HRESULT hr;
 
   TRACE( "(%p)->(%p,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
          This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize,
@@ -1421,61 +1529,12 @@ static HRESULT DP_IF_CreateGroup( IDirectPlayImpl *This, void *lpMsgHdr, DPID *l
     }
   }
 
-  lpGData = DP_CreateGroup( This, lpidGroup, lpGroupName, dwFlags,
+  hr = DP_CreateGroup( This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize, dwFlags,
                        DPID_NOPARENT_GROUP, bAnsi );
 
-  if( lpGData == NULL )
+  if( FAILED( hr ) )
   {
-    return DPERR_CANTADDPLAYER; /* yes player not group */
-  }
-
-  if( DPID_SYSTEM_GROUP == *lpidGroup )
-  {
-    This->dp2->lpSysGroup = lpGData;
-    TRACE( "Inserting system group\n" );
-  }
-  else
-  {
-    /* Insert into the system group */
-    lpGroupList lpGroup = calloc( 1, sizeof( *lpGroup ) );
-    lpGroup->lpGData = lpGData;
-
-    DPQ_INSERT( This->dp2->lpSysGroup->groups, lpGroup, groups );
-  }
-
-  /* Something is now referencing this data */
-  lpGData->uRef++;
-
-  /* Set all the important stuff for the group */
-  DP_SetGroupData( lpGData, DPSET_REMOTE, lpData, dwDataSize );
-
-  /* FIXME: We should only create the system group if GetCaps returns
-   *        DPCAPS_GROUPOPTIMIZED.
-   */
-
-  /* Let the SP know that we've created this group */
-  if( This->dp2->spData.lpCB->CreateGroup )
-  {
-    DPSP_CREATEGROUPDATA data;
-    DWORD dwCreateFlags = 0;
-
-    TRACE( "Calling SP CreateGroup\n" );
-
-    if( *lpidGroup == DPID_NOPARENT_GROUP )
-      dwCreateFlags |= DPLAYI_GROUP_SYSGROUP;
-
-    if( lpMsgHdr == NULL )
-      dwCreateFlags |= DPLAYI_PLAYER_PLAYERLOCAL;
-
-    if( dwFlags & DPGROUP_HIDDEN )
-      dwCreateFlags |= DPLAYI_GROUP_HIDDEN;
-
-    data.idGroup           = *lpidGroup;
-    data.dwFlags           = dwCreateFlags;
-    data.lpSPMessageHeader = lpMsgHdr;
-    data.lpISP             = This->dp2->spData.lpISP;
-
-    (*This->dp2->spData.lpCB->CreateGroup)( &data );
+    return hr;
   }
 
   /* Inform all other peers of the creation of a new group. If there are
@@ -3046,12 +3105,11 @@ static HRESULT WINAPI IDirectPlay4Impl_GetGroupData( IDirectPlay4 *iface, DPID g
         src = gdata->lpRemoteData;
     }
 
+    *size = bufsize;
+
     /* Is the user requesting to know how big a buffer is required? */
     if ( !data || *size < bufsize )
-    {
-        *size = bufsize;
         return DPERR_BUFFERTOOSMALL;
-    }
 
     CopyMemory( data, src, bufsize );
 
@@ -4458,9 +4516,7 @@ static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr,
         DPID *lpidGroup, DPNAME *lpGroupName, void *lpData, DWORD dwDataSize, DWORD dwFlags,
         BOOL bAnsi )
 {
-  lpGroupData lpGParentData;
-  lpGroupList lpGList;
-  lpGroupData lpGData;
+  HRESULT hr;
 
   TRACE( "(%p)->(0x%08lx,%p,%p,%p,0x%08lx,0x%08lx,%u)\n",
          This, idParentGroup, lpidGroup, lpGroupName, lpData,
@@ -4471,48 +4527,12 @@ static HRESULT DP_IF_CreateGroupInGroup( IDirectPlayImpl *This, void *lpMsgHdr,
     return DPERR_UNINITIALIZED;
   }
 
-  /* Verify that the specified parent is valid */
-  if( ( lpGParentData = DP_FindAnyGroup(This, idParentGroup ) ) == NULL )
-    return DPERR_INVALIDGROUP;
+  hr = DP_CreateGroup(This, lpMsgHdr, lpidGroup, lpGroupName, lpData, dwDataSize, dwFlags,
+                      idParentGroup, bAnsi );
 
-  lpGData = DP_CreateGroup(This, lpidGroup, lpGroupName, dwFlags, idParentGroup, bAnsi );
-
-  if( lpGData == NULL )
+  if( FAILED( hr ) )
   {
-    return DPERR_CANTADDPLAYER; /* yes player not group */
-  }
-
-  /* Something else is referencing this data */
-  lpGData->uRef++;
-
-  DP_SetGroupData( lpGData, DPSET_REMOTE, lpData, dwDataSize );
-
-  /* The list has now been inserted into the interface group list. We now
-     need to put a "shortcut" to this group in the parent group */
-  lpGList = calloc( 1, sizeof( *lpGList ) );
-  if( lpGList == NULL )
-  {
-    FIXME( "Memory leak\n" );
-    return DPERR_CANTADDPLAYER; /* yes player not group */
-  }
-
-  lpGList->lpGData = lpGData;
-
-  DPQ_INSERT( lpGParentData->groups, lpGList, groups );
-
-  /* Let the SP know that we've created this group */
-  if( This->dp2->spData.lpCB->CreateGroup )
-  {
-    DPSP_CREATEGROUPDATA data;
-
-    TRACE( "Calling SP CreateGroup\n" );
-
-    data.idGroup           = *lpidGroup;
-    data.dwFlags           = dwFlags;
-    data.lpSPMessageHeader = lpMsgHdr;
-    data.lpISP             = This->dp2->spData.lpISP;
-
-    (*This->dp2->spData.lpCB->CreateGroup)( &data );
+    return hr;
   }
 
   /* Inform all other peers of the creation of a new group. If there are
@@ -4959,19 +4979,22 @@ static HRESULT DP_IF_EnumGroupsInGroup( IDirectPlayImpl *This, DPID group, GUID
     if ( ( gdata = DP_FindAnyGroup(This, group ) ) == NULL )
         return DPERR_INVALIDGROUP;
 
-    if ( DPQ_IS_EMPTY( gdata->groups ) )
-        return DP_OK;
-
-
-    for( glist = DPQ_FIRST( gdata->groups ); ; glist = DPQ_NEXT( glist->groups ) )
+    for( glist = DPQ_FIRST( gdata->groups ); glist; glist = DPQ_NEXT( glist->groups ) )
     {
-        /* FIXME: Should check flags for match here */
-        if ( !(*enumplayercb)( glist->lpGData->dpid, DPPLAYERTYPE_GROUP,
-                    ansi ? glist->lpGData->nameA : glist->lpGData->name, flags, context ) )
-            return DP_OK; /* User requested break */
+        DWORD groupFlags;
 
-        if ( DPQ_IS_ENDOFLIST( glist->groups ) )
-            break;
+        if ( (glist->lpGData->dwFlags & flags) != (flags & ~DPENUMGROUPS_REMOTE) )
+            continue;
+        if ( (glist->lpGData->dwFlags & DPENUMGROUPS_LOCAL) && (flags & DPENUMGROUPS_REMOTE) )
+            continue;
+
+        groupFlags = glist->lpGData->dwFlags;
+        groupFlags &= ~(DPENUMGROUPS_LOCAL | DPLAYI_GROUP_DPLAYOWNS);
+        groupFlags |= flags;
+
+        if ( !(*enumplayercb)( glist->lpGData->dpid, DPPLAYERTYPE_GROUP,
+                    ansi ? glist->lpGData->nameA : glist->lpGData->name, groupFlags, context ) )
+            return DP_OK; /* User requested break */
     }
 
     return DP_OK;

dlls/dplayx/dplay_global.h

@@ -218,6 +218,10 @@ HRESULT DP_HandleGameMessage( IDirectPlayImpl *This, void *messageBody, DWORD me
 HRESULT DP_CreatePlayer( IDirectPlayImpl *This, void *msgHeader, DPID *lpid, DPNAME *lpName,
                          void *data, DWORD dataSize, void *spData, DWORD spDataSize, DWORD dwFlags,
                          HANDLE hEvent, struct PlayerData **playerData, BOOL bAnsi );
+HRESULT DP_CreateGroup( IDirectPlayImpl *This, void *msgHeader, const DPID *lpid,
+                        const DPNAME *lpName, void *data, DWORD dataSize, DWORD dwFlags,
+                        DPID idParent, BOOL bAnsi );
+HRESULT DP_AddPlayerToGroup( IDirectPlayImpl *This, DPID group, DPID player );
 
 /* DP SP external interfaces into DirectPlay */
 extern HRESULT DP_GetSPPlayerData( IDirectPlayImpl *lpDP, DPID idPlayer, void **lplpData );

dlls/dplayx/dplayx_messages.c

@@ -676,6 +676,42 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer, WC
           return hr;
         }
       }
+      for( i = 0; i < enumPlayersReply->groupCount; ++i )
+      {
+        DPPLAYERINFO playerInfo;
+        int j;
+
+        hr = DP_MSG_ReadSuperPackedPlayer( (char *) enumPlayersReply, &offset, dwMsgSize,
+                                           &playerInfo );
+        if( FAILED( hr ) )
+        {
+          free( msgHeader );
+          free( lpMsg );
+          return hr;
+        }
+
+        hr = DP_CreateGroup( This, msgHeader, &playerInfo.id, &playerInfo.name,
+                             playerInfo.playerData, playerInfo.playerDataLength,
+                             playerInfo.flags & ~DPLAYI_PLAYER_PLAYERLOCAL, playerInfo.parentId,
+                             FALSE );
+        if( FAILED( hr ) )
+        {
+          free( msgHeader );
+          free( lpMsg );
+          return hr;
+        }
+
+        for( j = 0; j < playerInfo.playerCount; ++j )
+        {
+          hr = DP_AddPlayerToGroup( This, playerInfo.id, playerInfo.playerIds[ j ] );
+          if( FAILED( hr ) )
+          {
+            free( msgHeader );
+            free( lpMsg );
+            return hr;
+          }
+        }
+      }
     }
     else if( envelope->wCommandId == DPMSGCMD_GETNAMETABLEREPLY )
     {
@@ -795,6 +831,49 @@ HRESULT DP_MSG_SendCreatePlayer( IDirectPlayImpl *This, DPID toId, DPID id, DWOR
   return DP_OK;
 }
 
+HRESULT DP_MSG_SendAddPlayerToGroup( IDirectPlayImpl *This, DPID toId, DPID playerId, DPID groupId )
+{
+  DPSP_SENDTOGROUPEXDATA sendData;
+  DPSP_MSG_ADDPLAYERTOGROUP msg;
+  SGBUFFER buffers[ 2 ] = { 0 };
+  HRESULT hr;
+
+  msg.envelope.dwMagic = DPMSGMAGIC_DPLAYMSG;
+  msg.envelope.wCommandId = DPMSGCMD_ADDPLAYERTOGROUP;
+  msg.envelope.wVersion = DPMSGVER_DP6;
+  msg.toId = 0;
+  msg.playerId = playerId;
+  msg.groupId = groupId;
+  msg.createOffset = 0;
+  msg.passwordOffset = 0;
+
+  buffers[ 0 ].len = This->dp2->spData.dwSPHeaderSize;
+  buffers[ 0 ].pData = NULL;
+  buffers[ 1 ].len = sizeof( msg );
+  buffers[ 1 ].pData = (UCHAR *)&msg;
+
+  sendData.lpISP = This->dp2->spData.lpISP;
+  sendData.dwFlags = DPSEND_GUARANTEED;
+  sendData.idGroupTo = toId;
+  sendData.idPlayerFrom = This->dp2->systemPlayerId;
+  sendData.lpSendBuffers = buffers;
+  sendData.cBuffers = ARRAYSIZE( buffers );
+  sendData.dwMessageSize = DP_MSG_ComputeMessageSize( sendData.lpSendBuffers, sendData.cBuffers );
+  sendData.dwPriority = 0;
+  sendData.dwTimeout = 0;
+  sendData.lpDPContext = NULL;
+  sendData.lpdwSPMsgID = NULL;
+
+  hr = (*This->dp2->spData.lpCB->SendToGroupEx)( &sendData );
+  if( FAILED( hr ) )
+  {
+    ERR( "SendToGroupEx failed: %s\n", DPLAYX_HresultToString( hr ) );
+    return hr;
+  }
+
+  return DP_OK;
+}
+
 HRESULT DP_MSG_SendPingReply( IDirectPlayImpl *This, DPID toId, DPID fromId, DWORD tickCount )
 {
   SGBUFFER buffers[ 2 ] = { 0 };

dlls/dplayx/dplayx_messages.h

@@ -57,6 +57,8 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlayImpl *This, DPID dpidServer, WC
 HRESULT DP_MSG_SendCreatePlayer( IDirectPlayImpl *This, DPID toId, DPID id, DWORD flags,
                                  DPNAME *name, void *playerData, DWORD playerDataSize,
                                  DPID systemPlayerId );
+HRESULT DP_MSG_SendAddPlayerToGroup( IDirectPlayImpl *This, DPID toId, DPID playerId,
+                                     DPID groupId );
 HRESULT DP_MSG_SendPingReply( IDirectPlayImpl *This, DPID toId, DPID fromId, DWORD tickCount );
 HRESULT DP_MSG_SendAddForwardAck( IDirectPlayImpl *This, DPID id );
 
@@ -103,6 +105,7 @@ typedef struct
 #define DPMSGCMD_SYSTEMMESSAGE        10
 #define DPMSGCMD_DELETEPLAYER         11
 #define DPMSGCMD_DELETEGROUP          12
+#define DPMSGCMD_ADDPLAYERTOGROUP     13
 
 #define DPMSGCMD_ENUMGROUPS           17
 
@@ -231,6 +234,16 @@ typedef struct tagDPMSG_NEWPLAYERIDREPLY
 } DPMSG_NEWPLAYERIDREPLY, *LPDPMSG_NEWPLAYERIDREPLY;
 typedef const DPMSG_NEWPLAYERIDREPLY* LPCDPMSG_NEWPLAYERIDREPLY;
 
+typedef struct
+{
+  DPMSG_SENDENVELOPE envelope;
+  DPID toId;
+  DPID playerId;
+  DPID groupId;
+  DWORD createOffset;
+  DWORD passwordOffset;
+} DPSP_MSG_ADDPLAYERTOGROUP;
+
 typedef struct tagDPMSG_FORWARDADDPLAYER
 {
   DPMSG_SENDENVELOPE envelope;

dlls/dplayx/tests/dplayx.c

@@ -978,6 +978,16 @@ typedef struct
     DWORD tickCount;
 } Ping;
 
+typedef struct
+{
+    MessageHeader header;
+    DPID toId;
+    DPID playerId;
+    DPID groupId;
+    DWORD createOffset;
+    DWORD passwordOffset;
+} AddPlayerToGroup;
+
 #include "poppack.h"
 
 #define bindUdp( port ) bindUdp_( __LINE__, port )
@@ -1224,12 +1234,14 @@ static void checkGameMessage_( int line, GameMessage *message, DPID expectedFrom
 static unsigned short receiveEnumSessionsRequest_( int line, SOCKET sock, const GUID *expectedAppGuid,
                                                    const WCHAR *expectedPassword, DWORD expectedFlags )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         EnumSessionsRequest request;
         WCHAR password[ 256 ];
     } request;
+#include "poppack.h"
     DWORD expectedPasswordSize;
     unsigned short port;
     DWORD expectedSize;
@@ -1267,6 +1279,7 @@ static unsigned short receiveEnumSessionsRequest_( int line, SOCKET sock, const
 #define sendEnumSessionsReply( sock, port, dpsd ) sendEnumSessionsReply_( __LINE__, sock, port, dpsd )
 static void sendEnumSessionsReply_( int line, SOCKET sock, unsigned short port, const DPSESSIONDESC2 *dpsd )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1295,6 +1308,7 @@ static void sendEnumSessionsReply_( int line, SOCKET sock, unsigned short port,
             .nameOffset = sizeof( reply.reply ),
         },
     };
+#include "poppack.h"
     DWORD passwordSize;
     int wsResult;
     DWORD size;
@@ -1314,11 +1328,13 @@ static void sendEnumSessionsReply_( int line, SOCKET sock, unsigned short port,
 #define receiveRequestPlayerId( sock, expectedFlags, flagsTodo ) receiveRequestPlayerId_( __LINE__, sock, expectedFlags, flagsTodo )
 static unsigned short receiveRequestPlayerId_( int line, SOCKET sock, DWORD expectedFlags )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         RequestPlayerId request;
     } request;
+#include "poppack.h"
     unsigned short port;
     int wsResult;
 
@@ -1335,6 +1351,7 @@ static unsigned short receiveRequestPlayerId_( int line, SOCKET sock, DWORD expe
 #define sendRequestPlayerReply( sock, port, id, result ) sendRequestPlayerReply_( __LINE__, sock, port, id, result )
 static void sendRequestPlayerReply_( int line, SOCKET sock, unsigned short port, DPID id, HRESULT result )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1362,6 +1379,7 @@ static void sendRequestPlayerReply_( int line, SOCKET sock, unsigned short port,
             .result = result,
         },
     };
+#include "poppack.h"
     int wsResult;
 
     wsResult = send( sock, (char *) &reply, sizeof( reply ), 0 );
@@ -1374,11 +1392,13 @@ static unsigned short receiveAddForwardRequest_( int line, SOCKET sock, DPID exp
                                                  const WCHAR *expectedPassword, DWORD expectedTickCount,
                                                  unsigned short *udpPort )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         AddForwardRequest request;
     } request;
+#include "poppack.h"
     DWORD expectedPasswordSize;
     WCHAR password[ 256 ];
     unsigned short port;
@@ -1427,25 +1447,53 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
 {
 #define SHORT_NAME L"short name"
 #define LONG_NAME L"long name"
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         SuperEnumPlayersReply reply;
         DPSESSIONDESC2 dpsd;
         WCHAR sessionName[ 256 ];
-        SuperPackedPlayer superPackedPlayer0;
-        BYTE spDataLength0;
-        SpData spData0;
-        SuperPackedPlayer superPackedPlayer1;
-        BYTE spDataLength1;
-        SpData spData1;
-        SuperPackedPlayer superPackedPlayer2;
+        struct
+        {
+            SuperPackedPlayer superPackedPlayer;
+            BYTE spDataLength;
+            SpData spData;
+        } player0;
+        struct
+        {
+            SuperPackedPlayer superPackedPlayer;
+            BYTE spDataLength;
+            SpData spData;
+        } player1;
+        struct
+        {
+            SuperPackedPlayer superPackedPlayer;
             WCHAR shortName[ ARRAYSIZE( SHORT_NAME ) ];
             WCHAR longName[ ARRAYSIZE( LONG_NAME ) ];
-        BYTE playerDataLength2;
+            BYTE playerDataLength;
             BYTE playerData[ 4 ];
-        BYTE spDataLength2;
-        SpData spData2;
+            BYTE spDataLength;
+            SpData spData;
+        } player2;
+        struct
+        {
+            SuperPackedPlayer superPackedPlayer;
+            BYTE spDataLength;
+            SpData spData;
+        } player3;
+        struct
+        {
+            SuperPackedPlayer superPackedPlayer;
+            WCHAR shortName[ ARRAYSIZE( SHORT_NAME ) ];
+            WCHAR longName[ ARRAYSIZE( LONG_NAME ) ];
+            BYTE playerDataLength;
+            BYTE playerData[ 4 ];
+            BYTE spDataLength;
+            SpData spData;
+            BYTE playerCount;
+            DPID playerIds[ 1 ];
+        } group0;
     } reply =
     {
         .spHeader =
@@ -1465,8 +1513,8 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                 .command = 41,
                 .version = 14,
             },
-            .playerCount = 3,
-            .groupCount = 0,
+            .playerCount = 4,
+            .groupCount = 1,
             .packedOffset = sizeof( reply.reply ) + sizeof( reply.dpsd ) + sizeof( reply.sessionName ),
             .shortcutCount = 0,
             .descriptionOffset = sizeof( reply.reply ),
@@ -1474,7 +1522,9 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
             .passwordOffset = 0,
         },
         .dpsd = *dpsd,
-        .superPackedPlayer0 =
+        .player0 =
+        {
+            .superPackedPlayer =
             {
                 .size = 16,
                 .flags = 0x5,
@@ -1482,8 +1532,8 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                 .infoMask = 0x4,
                 .versionOrSystemPlayerId = 14,
             },
-        .spDataLength0 = sizeof( SpData ),
-        .spData0 =
+            .spDataLength = sizeof( SpData ),
+            .spData =
             {
                 .tcpAddr =
                 {
@@ -1496,7 +1546,10 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                     .sin_port = htons( udpPort ),
                 },
             },
-        .superPackedPlayer1 =
+        },
+        .player1 =
+        {
+            .superPackedPlayer =
             {
                 .size = 16,
                 .flags = 0xf,
@@ -1504,8 +1557,8 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                 .infoMask = 0x4,
                 .versionOrSystemPlayerId = 14,
             },
-        .spDataLength1 = sizeof( SpData ),
-        .spData1 =
+            .spDataLength = sizeof( SpData ),
+            .spData =
             {
                 .tcpAddr =
                 {
@@ -1518,7 +1571,10 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                     .sin_port = htons( udpPort ),
                 },
             },
-        .superPackedPlayer2 =
+        },
+        .player2 =
+        {
+            .superPackedPlayer =
             {
                 .size = 16,
                 .flags = 0x8,
@@ -1528,10 +1584,10 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
             },
             .shortName = SHORT_NAME,
             .longName = LONG_NAME,
-        .playerDataLength2 = 4,
+            .playerDataLength = 4,
             .playerData = { 1, 2, 3, 4, },
-        .spDataLength2 = sizeof( SpData ),
-        .spData2 =
+            .spDataLength = sizeof( SpData ),
+            .spData =
             {
                 .tcpAddr =
                 {
@@ -1544,7 +1600,65 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
                     .sin_port = htons( udpPort ),
                 },
             },
+        },
+        .player3 =
+        {
+            .superPackedPlayer =
+            {
+                .size = 16,
+                .flags = 0x8,
+                .id = 0xd00de,
+                .infoMask = 0x4,
+                .versionOrSystemPlayerId = 0x51573,
+            },
+            .spDataLength = sizeof( SpData ),
+            .spData =
+            {
+                .tcpAddr =
+                {
+                    .sin_family = AF_INET,
+                    .sin_port = htons( tcpPort ),
+                },
+                .udpAddr =
+                {
+                    .sin_family = AF_INET,
+                    .sin_port = htons( udpPort ),
+                },
+            },
+        },
+        .group0 =
+        {
+            .superPackedPlayer =
+            {
+                .size = 16,
+                .flags = 0x48,
+                .id = 0x5e7,
+                .infoMask = 0x57,
+                .versionOrSystemPlayerId = 0x51573,
+            },
+            .shortName = SHORT_NAME,
+            .longName = LONG_NAME,
+            .playerDataLength = 4,
+            .playerData = { 1, 2, 3, 4, },
+            .spDataLength = sizeof( SpData ),
+            .spData =
+            {
+                .tcpAddr =
+                {
+                    .sin_family = AF_INET,
+                    .sin_port = htons( tcpPort ),
+                },
+                .udpAddr =
+                {
+                    .sin_family = AF_INET,
+                    .sin_port = htons( udpPort ),
+                },
+            },
+            .playerCount = 1,
+            .playerIds = { 0xd00de, },
+        },
     };
+#include "poppack.h"
 #undef LONG_NAME
 #undef SHORT_NAME
     int wsResult;
@@ -1561,6 +1675,7 @@ static void sendSuperEnumPlayersReply_( int line, SOCKET sock, unsigned short tc
 #define sendAddForwardReply( sock, port, result ) sendAddForwardReply_( __LINE__, sock, port, result )
 static void sendAddForwardReply_( int line, SOCKET sock, unsigned short port, HRESULT result )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1587,6 +1702,7 @@ static void sendAddForwardReply_( int line, SOCKET sock, unsigned short port, HR
             .result = result,
         },
     };
+#include "poppack.h"
     int wsResult;
 
     wsResult = send( sock, (char *) &reply, sizeof( reply ), 0 );
@@ -1596,6 +1712,7 @@ static void sendAddForwardReply_( int line, SOCKET sock, unsigned short port, HR
 #define sendAddForward( sock, port, tcpPort, udpPort ) sendAddForward_( __LINE__, sock, port, tcpPort, udpPort )
 static void sendAddForward_( int line, SOCKET sock, unsigned short port, unsigned short tcpPort, unsigned short udpPort )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1653,6 +1770,7 @@ static void sendAddForward_( int line, SOCKET sock, unsigned short port, unsigne
             },
         },
     };
+#include "poppack.h"
 
     int wsResult;
 
@@ -1663,11 +1781,13 @@ static void sendAddForward_( int line, SOCKET sock, unsigned short port, unsigne
 #define receiveAddForwardAck( sock, expectedPlayerId ) receiveAddForwardAck_( __LINE__, sock, expectedPlayerId )
 static unsigned short receiveAddForwardAck_( int line, SOCKET sock, DPID expectedPlayerId )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         AddForwardAck request;
     } request;
+#include "poppack.h"
     unsigned short port;
     int wsResult;
 
@@ -1688,11 +1808,13 @@ static unsigned short receiveCreatePlayer_( int line, SOCKET sock, DPID expected
                                             const WCHAR *expectedShortName, const WCHAR *expectedLongName,
                                             void *expectedPlayerData, DWORD expectedPlayerDataSize )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         CreatePlayer request;
     } request;
+#include "poppack.h"
     DWORD expectedShortNameSize;
     DWORD expectedLongNameSize;
     WCHAR shortName[ 256 ];
@@ -1775,6 +1897,7 @@ static unsigned short receiveCreatePlayer_( int line, SOCKET sock, DPID expected
 static void sendCreatePlayer_( int line, SOCKET sock, unsigned short tcpPort, unsigned short udpPort,
                                const WCHAR *shortName, const WCHAR *longName, void *playerData, DWORD playerDataSize )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1820,6 +1943,7 @@ static void sendCreatePlayer_( int line, SOCKET sock, unsigned short tcpPort, un
             },
         },
     };
+#include "poppack.h"
     SpData spData = {
         .tcpAddr.sin_family = AF_INET,
         .tcpAddr.sin_port = htons( tcpPort ),
@@ -1877,12 +2001,14 @@ static void sendCreatePlayer_( int line, SOCKET sock, unsigned short tcpPort, un
 static unsigned short receiveGuaranteedGameMessage_( int line, SOCKET sock, DPID expectedFromId, DPID expectedToId,
                                                      void *expectedData, DWORD expectedDataSize )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         GameMessage request;
         BYTE data[ 256 ];
     } request;
+#include "poppack.h"
     unsigned short port;
     int wsResult;
 
@@ -1903,11 +2029,13 @@ static unsigned short receiveGuaranteedGameMessage_( int line, SOCKET sock, DPID
 static void receiveGameMessage_( int line, SOCKET sock, DPID expectedFromId, DPID expectedToId, void *expectedData,
                                  DWORD expectedDataSize )
 {
+#include "pshpack1.h"
     struct
     {
         GameMessage request;
         BYTE data[ 256 ];
     } request;
+#include "poppack.h"
     int wsResult;
 
     DWORD expectedSize = sizeof( request.request ) + expectedDataSize;
@@ -1924,6 +2052,7 @@ static void receiveGameMessage_( int line, SOCKET sock, DPID expectedFromId, DPI
 static void sendGuaranteedGameMessage_( int line, SOCKET sock, unsigned short port, DPID fromId, DPID toId, void *data,
                                         DWORD dataSize )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -1945,6 +2074,7 @@ static void sendGuaranteedGameMessage_( int line, SOCKET sock, unsigned short po
             .toId = toId,
         }
     };
+#include "poppack.h"
     int wsResult;
 
     wsResult = send( sock, (char *) &request, sizeof( request ), 0 );
@@ -1958,6 +2088,7 @@ static void sendGuaranteedGameMessage_( int line, SOCKET sock, unsigned short po
         sendGameMessage_( __LINE__, sock, fromId, toId, data, dataSize )
 static void sendGameMessage_( int line, SOCKET sock, DPID fromId, DPID toId, void *data, DWORD dataSize )
 {
+#include "pshpack1.h"
     struct
     {
         GameMessage request;
@@ -1970,6 +2101,7 @@ static void sendGameMessage_( int line, SOCKET sock, DPID fromId, DPID toId, voi
             .toId = toId,
         }
     };
+#include "poppack.h"
     int wsResult;
     DWORD size;
 
@@ -1985,6 +2117,7 @@ static void sendGameMessage_( int line, SOCKET sock, DPID fromId, DPID toId, voi
         sendPing_( __LINE__, sock, port, fromId, tickCount )
 static void sendPing_( int line, SOCKET sock, unsigned short port, DPID fromId, DWORD tickCount )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
@@ -2012,6 +2145,7 @@ static void sendPing_( int line, SOCKET sock, unsigned short port, DPID fromId,
             .tickCount = tickCount,
         }
     };
+#include "poppack.h"
     int wsResult;
 
     wsResult = send( sock, (char *) &request, sizeof( request ), 0 );
@@ -2022,11 +2156,13 @@ static void sendPing_( int line, SOCKET sock, unsigned short port, DPID fromId,
         receivePingReply_( __LINE__, sock, expectedFromId, expectedTickCount )
 static unsigned short receivePingReply_( int line, SOCKET sock, DPID expectedFromId, DWORD expectedTickCount )
 {
+#include "pshpack1.h"
     struct
     {
         SpHeader spHeader;
         Ping request;
     } request;
+#include "poppack.h"
     unsigned short port;
     int wsResult;
 
@@ -2042,6 +2178,37 @@ static unsigned short receivePingReply_( int line, SOCKET sock, DPID expectedFro
     return port;
 }
 
+#define receiveAddPlayerToGroup( sock, expectedPlayerId, expectedGroupId ) \
+        receiveAddPlayerToGroup_( __LINE__, sock, expectedPlayerId, expectedGroupId )
+static unsigned short receiveAddPlayerToGroup_( int line, SOCKET sock, DPID expectedPlayerId, DPID expectedGroupId )
+{
+#include "pshpack1.h"
+    struct
+    {
+        SpHeader spHeader;
+        AddPlayerToGroup request;
+    } request;
+#include "poppack.h"
+    unsigned short port;
+    int wsResult;
+
+    wsResult = receiveMessage_( line, sock, &request, sizeof( request ) );
+    ok_( __FILE__, line )( wsResult == sizeof( request ), "recv() returned %d.\n", wsResult );
+
+    port = checkSpHeader_( line, &request.spHeader, sizeof( request ) );
+    checkMessageHeader_( line, &request.request.header, 13 );
+
+    ok_( __FILE__, line )( !request.request.toId, "got destination id %#lx.\n", request.request.toId );
+    ok_( __FILE__, line )( request.request.playerId == expectedPlayerId, "got player id %#lx.\n",
+                           request.request.playerId );
+    ok_( __FILE__, line )( request.request.groupId == expectedGroupId, "got group id %#lx.\n",
+                           request.request.groupId );
+    ok_( __FILE__, line )( !request.request.createOffset, "got create offset %lu.\n", request.request.createOffset );
+    ok_( __FILE__, line )( !request.request.passwordOffset, "got password offset %lu.\n", request.request.passwordOffset );
+
+    return port;
+}
+
 static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, WORD port )
 {
 
@@ -2731,7 +2898,10 @@ static BOOL CALLBACK checkPlayerListCallback( DPID dpid, DWORD playerType, const
 
             memset( &playerData, 0xcc, sizeof( playerData ) );
             playerDataSize = sizeof( playerData );
+            if ( playerType == DPPLAYERTYPE_PLAYER )
                 hr = IDirectPlayX_GetPlayerData( data->dp, dpid, playerData, &playerDataSize, DPGET_REMOTE );
+            else
+                hr = IDirectPlayX_GetGroupData( data->dp, dpid, playerData, &playerDataSize, DPGET_REMOTE );
             ok_( __FILE__, data->line )( hr == DP_OK, "GetPlayerData() returned %#lx.\n", hr );
             ok_( __FILE__, data->line )( playerDataSize == player->expectedPlayerDataSize,
                                          "got player data size %lu.\n", playerDataSize );
@@ -2740,7 +2910,10 @@ static BOOL CALLBACK checkPlayerListCallback( DPID dpid, DWORD playerType, const
 
             memset( &nameData, 0xcc, sizeof( nameData ) );
             nameDataSize = sizeof( nameData );
+            if ( playerType == DPPLAYERTYPE_PLAYER )
                 hr = IDirectPlayX_GetPlayerName( data->dp, dpid, &nameData, &nameDataSize );
+            else
+                hr = IDirectPlayX_GetGroupName( data->dp, dpid, &nameData, &nameDataSize );
             ok_( __FILE__, data->line )( hr == DP_OK, "GetPlayerName() returned %#lx.\n", hr );
             ok_( __FILE__, data->line )( ((DPNAME *) nameData)->dwSize == sizeof( DPNAME ),
                                          "got name size %lu.\n", ((DPNAME *) nameData)->dwSize );
@@ -2796,7 +2969,8 @@ static BOOL CALLBACK checkPlayerListCallback( DPID dpid, DWORD playerType, const
     return TRUE;
 }
 
-#define checkPlayerList( dp, expectedPlayers, expectedPlayerCount ) checkPlayerList_( __LINE__, dp, expectedPlayers, expectedPlayerCount )
+#define checkPlayerList( dp, expectedPlayers, expectedPlayerCount ) \
+        checkPlayerList_( __LINE__, dp, expectedPlayers, expectedPlayerCount )
 static void checkPlayerList_( int line, IDirectPlay4 *dp, ExpectedPlayer *expectedPlayers, int expectedPlayerCount )
 {
     CheckPlayerListCallbackData data = {
@@ -2817,6 +2991,51 @@ static void checkPlayerList_( int line, IDirectPlay4 *dp, ExpectedPlayer *expect
                            data.actualPlayerCount );
 }
 
+#define checkGroupPlayerList( dp, group, expectedPlayers, expectedPlayerCount ) \
+        checkGroupPlayerList_( __LINE__, dp, group, expectedPlayers, expectedPlayerCount )
+static void checkGroupPlayerList_( int line, DPID group, IDirectPlay4 *dp, ExpectedPlayer *expectedPlayers,
+                                   int expectedPlayerCount )
+{
+    CheckPlayerListCallbackData data = {
+        .line = line,
+        .dp = dp,
+        .expectedPlayers = expectedPlayers,
+        .expectedPlayerCount = expectedPlayerCount,
+    };
+    HRESULT hr;
+
+    hr = IDirectPlayX_EnumGroupPlayers( dp, group, NULL, checkPlayerListCallback, &data, DPENUMPLAYERS_LOCAL );
+    ok_( __FILE__, line )( hr == DP_OK, "EnumGroupPlayers() returned %#lx.\n", hr );
+
+    hr = IDirectPlayX_EnumGroupPlayers( dp, group, NULL, checkPlayerListCallback, &data, DPENUMPLAYERS_REMOTE );
+    ok_( __FILE__, line )( hr == DP_OK, "EnumGroupPlayers() returned %#lx.\n", hr );
+
+    ok_( __FILE__, line )( data.actualPlayerCount == data.expectedPlayerCount, "got player count %d.\n",
+                           data.actualPlayerCount );
+}
+
+#define checkGroupList( dp, expectedGroups, expectedGroupCount ) \
+        checkGroupList_( __LINE__, dp, expectedGroups, expectedGroupCount )
+static void checkGroupList_( int line, IDirectPlay4 *dp, ExpectedPlayer *expectedGroups, int expectedGroupCount )
+{
+    CheckPlayerListCallbackData data = {
+        .line = line,
+        .dp = dp,
+        .expectedPlayers = expectedGroups,
+        .expectedPlayerCount = expectedGroupCount,
+    };
+    HRESULT hr;
+
+    hr = IDirectPlayX_EnumGroups( dp, NULL, checkPlayerListCallback, &data, DPENUMGROUPS_LOCAL );
+    ok_( __FILE__, line )( hr == DP_OK, "EnumGroups() returned %#lx.\n", hr );
+
+    hr = IDirectPlayX_EnumGroups( dp, NULL, checkPlayerListCallback, &data, DPENUMGROUPS_REMOTE );
+    ok_( __FILE__, line )( hr == DP_OK, "EnumGroups() returned %#lx.\n", hr );
+
+    ok_( __FILE__, line )( data.actualPlayerCount == data.expectedPlayerCount, "got group count %d.\n",
+                           data.actualPlayerCount );
+}
+
 #define checkPlayerExists( dp, expectedDpid, expectedPlayerType, expectedShortName, expectedLongName, expectedFlags, \
                            expectedPlayerData, expectedPlayerDataSize ) \
         checkPlayerExists_( __LINE__, dp, expectedDpid, expectedPlayerType, expectedShortName, expectedLongName, \
@@ -2918,9 +3137,36 @@ static void check_Open_( int line, IDirectPlay4A *dp, DPSESSIONDESC2 *dpsd, cons
                         .expectedPlayerData = expectedPlayerData,
                         .expectedPlayerDataSize = sizeof( expectedPlayerData ),
                     },
+                    {
+                        .expectedDpid = 0xd00de,
+                        .expectedPlayerType = DPPLAYERTYPE_PLAYER,
+                        .expectedFlags = DPENUMPLAYERS_REMOTE,
+                    },
+                };
+                ExpectedPlayer expectedGroups[] =
+                {
+                    {
+                        .expectedDpid = 0x5e7,
+                        .expectedPlayerType = DPPLAYERTYPE_GROUP,
+                        .expectedShortName = "short name",
+                        .expectedLongName = "long name",
+                        .expectedFlags = DPENUMPLAYERS_REMOTE,
+                        .expectedPlayerData = expectedPlayerData,
+                        .expectedPlayerDataSize = sizeof( expectedPlayerData ),
+                    },
+                };
+                ExpectedPlayer expectedGroupPlayers[] =
+                {
+                    {
+                        .expectedDpid = 0xd00de,
+                        .expectedPlayerType = DPPLAYERTYPE_PLAYER,
+                        .expectedFlags = DPENUMPLAYERS_REMOTE,
+                    },
                 };
 
                 checkPlayerList_( line, dp, expectedPlayers, ARRAYSIZE( expectedPlayers ) );
+                checkGroupList_( line, dp, expectedGroups, ARRAYSIZE( expectedGroups ) );
+                checkGroupPlayerList_( line, 0x5e7, dp, expectedGroupPlayers, ARRAYSIZE( expectedGroupPlayers ) );
 
                 hr = IDirectPlayX_Close( dp );
                 checkHR( DP_OK, hr );
@@ -4648,20 +4894,20 @@ static void test_CreatePlayer(void)
 
     /* Player name */
     dpid = 0xdeadbeef;
-    check_CreatePlayer( dp, &dpid, NULL, 0, DP_OK, 2, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 1 );
+    check_CreatePlayer( dp, &dpid, NULL, 0, DP_OK, 2, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 2 );
 
     dpid = 0xdeadbeef;
     check_CreatePlayer( dp, &dpid, &fullName, 0, DP_OK, 3, recvSock, TRUE, 0x8, L"short player name",
-                        "short player name", L"long player name", "long player name", 2 );
+                        "short player name", L"long player name", "long player name", 3 );
 
     name = fullName;
     name.dwSize = 1;
     dpid = 0xdeadbeef;
     check_CreatePlayer( dp, &dpid, &name, 0, DP_OK, 4, recvSock, TRUE, 0x8, L"short player name", "short player name",
-                        L"long player name", "long player name", 3 );
+                        L"long player name", "long player name", 4 );
 
     dpid = 0xdeadbeef;
-    check_CreatePlayer( dp, &dpid, &nullName, 0, DP_OK, 5, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 4 );
+    check_CreatePlayer( dp, &dpid, &nullName, 0, DP_OK, 5, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 5 );
 
     /* Null dpid */
     dpid = 0xdeadbeef;
@@ -4669,11 +4915,11 @@ static void test_CreatePlayer(void)
 
     /* Flags */
     dpid = 0xdeadbeef;
-    check_CreatePlayer( dp, &dpid, NULL, 0, DP_OK, 6, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 5 );
+    check_CreatePlayer( dp, &dpid, NULL, 0, DP_OK, 6, recvSock, TRUE, 0x8, NULL, NULL, NULL, NULL, 6 );
 
     dpid = 0xdeadbeef;
     check_CreatePlayer( dp, &dpid, NULL, DPPLAYER_SPECTATOR, DP_OK, 7, recvSock, TRUE, 0x208, NULL, NULL, NULL, NULL,
-                        6 );
+                        7 );
 
     closesocket( recvSock );
     closesocket( sendSock );
@@ -4920,7 +5166,7 @@ static void test_CREATEPLAYER(void)
     checkPlayerExists( dp, 0x07734, DPPLAYERTYPE_PLAYER, "new player short name", "new player long name",
                        DPENUMPLAYERS_REMOTE, playerData, sizeof( playerData ) );
 
-    dpid = checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x07734, 3, playerData, sizeof( playerData ),
+    dpid = checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x07734, 4, playerData, sizeof( playerData ),
                                             "new player short name", "new player long name", 0, 0 );
     ok( dpid == 0x11223344, "got destination id %#lx.\n", dpid );
 
@@ -7852,7 +8098,7 @@ static void test_Send(void)
     createPlayer( dp, 0x07734, NULL, NULL, 0, 0, sendSock, recvSock );
     createPlayer( dp, 0x14, NULL, NULL, 0, 0, sendSock, recvSock );
 
-    checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x14, 2, NULL, 0, NULL, NULL, 0, DPPLAYER_LOCAL );
+    checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x14, 3, NULL, 0, NULL, NULL, 0, DPPLAYER_LOCAL );
 
     hr = IDirectPlayX_Send( dp, 0x07734, 0xdeadbeef, DPSEND_GUARANTEED, data, sizeof( data ) );
     todo_wine ok( hr == DPERR_INVALIDPARAM, "got hr %#lx.\n", hr );
@@ -8289,7 +8535,7 @@ static void test_Receive(void)
     waitResult = WaitForSingleObject( event0, 2000 );
     ok( waitResult == WAIT_OBJECT_0, "message wait returned %lu\n", waitResult );
 
-    checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x14, 2, NULL, 0, NULL, NULL, 0, DPPLAYER_LOCAL );
+    checkCreatePlayerOrGroupMessage( dp, DPPLAYERTYPE_PLAYER, 0x14, 3, NULL, 0, NULL, NULL, 0, DPPLAYER_LOCAL );
 
     sendGuaranteedGameMessage( sendSock, 2349, 0x1337, 0x07734, data0, sizeof( data0 ) );
     sendGuaranteedGameMessage( sendSock, 2349, 0x1337, 0x14, data1, sizeof( data1 ) );
@@ -8793,6 +9039,88 @@ static void test_PING(void)
     IDirectPlayX_Release( dp );
 }
 
+/* AddPlayerToGroup */
+
+#define checkAddPlayerToGroupMessage( dp, expectedGroupId, expectedPlayerId ) \
+        checkAddPlayerToGroupMessage_( __LINE__, dp, expectedGroupId, expectedPlayerId )
+static DPID checkAddPlayerToGroupMessage_( int line, IDirectPlay4 *dp, DPID expectedGroupId, DPID expectedPlayerId )
+{
+    DPMSG_ADDPLAYERTOGROUP *msg;
+    BYTE msgData[ 256 ];
+    DWORD msgDataSize;
+    DPID fromId, toId;
+    HRESULT hr;
+
+    memset( &msgData, 0, sizeof( msgData ) );
+    msgDataSize = sizeof( msgData );
+    fromId = 0xdeadbeef;
+    toId = 0xdeadbeef;
+    hr = IDirectPlayX_Receive( dp, &fromId, &toId, 0, msgData, &msgDataSize );
+    ok_( __FILE__, line )( hr == DP_OK, "got hr %#lx.\n", hr );
+    ok_( __FILE__, line )( fromId == DPID_SYSMSG, "got source id %#lx.\n", fromId );
+
+    msg = (DPMSG_ADDPLAYERTOGROUP *) msgData;
+    ok_( __FILE__, line )( msg->dwType == DPSYS_ADDPLAYERTOGROUP, "got message type %#lx.\n", msg->dwType );
+    ok_( __FILE__, line )( msg->dpIdGroup == expectedGroupId, "got id %#lx.\n", msg->dpIdGroup );
+    ok_( __FILE__, line )( msg->dpIdPlayer == expectedPlayerId, "got id %#lx.\n", msg->dpIdPlayer );
+
+    return toId;
+}
+
+static void test_AddPlayerToGroup(void)
+{
+    DPSESSIONDESC2 appGuidDpsd =
+    {
+        .dwSize = sizeof( DPSESSIONDESC2 ),
+        .guidApplication = appGuid,
+        .guidInstance = appGuid,
+    };
+    DPSESSIONDESC2 serverDpsd =
+    {
+        .dwSize = sizeof( DPSESSIONDESC2 ),
+        .guidApplication = appGuid,
+        .guidInstance = appGuid,
+        .lpszSessionName = (WCHAR *) L"normal",
+        .dwReserved1 = 0xaabbccdd,
+    };
+    IDirectPlay4 *dp;
+    SOCKET sendSock;
+    SOCKET recvSock;
+    HRESULT hr;
+    DPID dpid;
+
+    hr = CoCreateInstance( &CLSID_DirectPlay, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay4A, (void **) &dp );
+    ok( hr == DP_OK, "got hr %#lx.\n", hr );
+
+    hr = IDirectPlayX_AddPlayerToGroup( dp, 0x5e7, 0x07734 );
+    ok( hr == DPERR_UNINITIALIZED, "got hr %#lx.\n", hr );
+
+    init_TCPIP_provider( dp, "127.0.0.1", 0 );
+
+    joinSession( dp, &appGuidDpsd, &serverDpsd, &sendSock, &recvSock, NULL );
+
+    hr = IDirectPlayX_AddPlayerToGroup( dp, 0x5e7, 0x07734 );
+    ok( hr == DPERR_INVALIDPLAYER, "got hr %#lx.\n", hr );
+
+    createPlayer( dp, 0x07734, NULL, NULL, 0, 0, sendSock, recvSock );
+
+    hr = IDirectPlayX_AddPlayerToGroup( dp, 0x5e7, 0x07734 );
+    ok( hr == DP_OK, "got hr %#lx.\n", hr );
+
+    dpid = checkAddPlayerToGroupMessage( dp, 0x5e7, 0x07734 );
+    ok( dpid == 0x07734, "got destination id %#lx.\n", dpid );
+
+    receiveAddPlayerToGroup( recvSock, 0x07734, 0x5e7 );
+
+    checkNoMorePlayerMessages( dp );
+    checkNoMoreMessages( recvSock );
+
+    closesocket( recvSock );
+    closesocket( sendSock );
+
+    IDirectPlayX_Release( dp );
+}
+
 /* GetMessageCount */
 
 static void test_GetMessageCount(void)
@@ -10050,6 +10378,7 @@ START_TEST(dplayx)
     test_Send();
     test_Receive();
     test_PING();
+    test_AddPlayerToGroup();
 
     if (!winetest_interactive)
     {

dlls/dpwsockx/dpwsockx_main.c

@@ -516,7 +516,7 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data )
     DPWS_DATA *dpwsData;
     DWORD dpwsDataSize;
     SOCKADDR_IN addr;
-    BOOL true = TRUE;
+    BOOL trueflag = TRUE;
     SOCKET sock;
     HRESULT hr;
 
@@ -539,8 +539,9 @@ static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data )
         return DPERR_UNAVAILABLE;
     }
 
-    if ( SOCKET_ERROR == setsockopt( sock, SOL_SOCKET, SO_BROADCAST, (const char *) &true,
-                                     sizeof( true ) ) )
+    if ( SOCKET_ERROR == setsockopt( sock, SOL_SOCKET, SO_BROADCAST,
+                                     (const char *) &trueflag,
+                                     sizeof( trueflag ) ) )
     {
         ERR( "setsockopt() failed\n" );
         closesocket( sock );

dlls/dwrite/layout.c

@@ -897,7 +897,7 @@ static HRESULT layout_shape_get_user_features(const struct dwrite_textlayout *la
         feature_count = IDWriteTypography_GetFontFeatureCount(typography);
         if (!feature_count)
         {
-            i = range->h.range.length - i + 1;
+            i = range->h.range.startPosition + range->h.range.length;
             continue;
         }
 

dlls/ieframe/ie.c

@@ -875,3 +875,9 @@ void InternetExplorer_WebBrowser_Init(InternetExplorer *This)
     This->IExternalConnection_iface.lpVtbl = &ExternalConnectionVtbl;
     This->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl;
 }
+
+HRESULT WINAPI IERefreshElevationPolicy(void)
+{
+    FIXME("(): stub\n");
+    return S_OK;
+}

dlls/ieframe/ieframe.spec

@@ -6,5 +6,6 @@
 @ stdcall -private DllRegisterServer()
 @ stdcall -private DllUnregisterServer()
 @ stdcall IEGetWriteableHKCU(ptr)
+@ stdcall IERefreshElevationPolicy()
 @ stdcall OpenURL(long long str long)
 @ stdcall SetQueryNetSessionCount(long)

dlls/jscript/dispex.c

@@ -656,7 +656,13 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val)
             TRACE("no prop_put\n");
             return S_OK;
         }
-        return This->builtin_info->prop_put(This, prop->u.id, val);
+        hres = This->builtin_info->prop_put(This, prop->u.id, val);
+        if(hres != S_FALSE)
+            return hres;
+        prop->type = PROP_JSVAL;
+        prop->flags = PROPF_ENUMERABLE | PROPF_CONFIGURABLE | PROPF_WRITABLE;
+        prop->u.val = jsval_undefined();
+        break;
     default:
         ERR("type %d\n", prop->type);
         return E_FAIL;
@@ -2322,10 +2328,23 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IWineJSDispatch *iface, DI
 static HRESULT WINAPI DispatchEx_GetMemberProperties(IWineJSDispatch *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex)
 {
     jsdisp_t *This = impl_from_IWineJSDispatch(iface);
-    FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex);
+    dispex_prop_t *prop;
+
+    TRACE("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex);
+
+    prop = get_prop(This, id);
+    if(!prop)
+        return DISP_E_MEMBERNOTFOUND;
+    *pgrfdex = 0;
+
+    if(grfdexFetch) {
+        FIXME("unimplemented flags %08lx\n", grfdexFetch);
         return E_NOTIMPL;
     }
 
+    return S_OK;
+}
+
 static HRESULT WINAPI DispatchEx_GetMemberName(IWineJSDispatch *iface, DISPID id, BSTR *pbstrName)
 {
     jsdisp_t *This = impl_from_IWineJSDispatch(iface);
@@ -2371,6 +2390,18 @@ static void WINAPI WineJSDispatch_Free(IWineJSDispatch *iface)
    jsdisp_free(This);
 }
 
+static HRESULT WINAPI WineJSDispatch_GetPropertyFlags(IWineJSDispatch *iface, DISPID id, UINT32 *ret)
+{
+    jsdisp_t *This = impl_from_IWineJSDispatch(iface);
+    dispex_prop_t *prop = get_prop(This, id);
+
+    if(!prop || prop->type == PROP_DELETED || prop->type == PROP_PROTREF)
+        return DISP_E_MEMBERNOTFOUND;
+
+    *ret = prop->flags & PROPF_PUBLIC_MASK;
+    return S_OK;
+}
+
 static HRESULT WINAPI WineJSDispatch_GetScriptGlobal(IWineJSDispatch *iface, IWineJSDispatchHost **ret)
 {
    jsdisp_t *This = impl_from_IWineJSDispatch(iface);
@@ -2403,6 +2434,7 @@ static IWineJSDispatchVtbl DispatchExVtbl = {
     DispatchEx_GetNextDispID,
     DispatchEx_GetNameSpaceParent,
     WineJSDispatch_Free,
+    WineJSDispatch_GetPropertyFlags,
     WineJSDispatch_GetScriptGlobal,
 };
 
@@ -3263,8 +3295,14 @@ HRESULT jsdisp_define_property(jsdisp_t *obj, const WCHAR *name, property_desc_t
             if(desc->explicit_value) {
                 if(prop->type == PROP_JSVAL)
                     jsval_release(prop->u.val);
-                else
+                else {
+                    if(prop->type == PROP_EXTERN && obj->builtin_info->prop_delete) {
+                        hres = obj->builtin_info->prop_delete(obj, prop->u.id);
+                        if(FAILED(hres))
+                            return hres;
+                    }
                     prop->type = PROP_JSVAL;
+                }
                 hres = jsval_copy(desc->value, &prop->u.val);
                 if(FAILED(hres)) {
                     prop->u.val = jsval_undefined();

dlls/jscript/global.c

@@ -943,7 +943,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Function", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Function", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->function_constr));
     if(FAILED(hres))
         return hres;
@@ -952,7 +952,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Object", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Object", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->object_constr));
     if(FAILED(hres))
         return hres;
@@ -961,7 +961,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Array", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Array", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->array_constr));
     if(FAILED(hres))
         return hres;
@@ -970,7 +970,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Boolean", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Boolean", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->bool_constr));
     if(FAILED(hres))
         return hres;
@@ -979,7 +979,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Date", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Date", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->date_constr));
     if(FAILED(hres))
         return hres;
@@ -988,7 +988,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Enumerator", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Enumerator", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->enumerator_constr));
     if(FAILED(hres))
         return hres;
@@ -997,42 +997,42 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Error", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Error", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"EvalError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"EvalError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->eval_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"RangeError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"RangeError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->range_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"ReferenceError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"ReferenceError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->reference_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"RegExpError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"RegExpError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->regexp_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"SyntaxError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"SyntaxError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->syntax_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"TypeError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"TypeError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->type_error_constr));
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"URIError", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"URIError", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->uri_error_constr));
     if(FAILED(hres))
         return hres;
@@ -1041,7 +1041,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Number", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Number", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->number_constr));
     if(FAILED(hres))
         return hres;
@@ -1050,7 +1050,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"RegExp", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"RegExp", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->regexp_constr));
     if(FAILED(hres))
         return hres;
@@ -1059,7 +1059,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"String", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"String", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->string_constr));
     if(FAILED(hres))
         return hres;
@@ -1068,7 +1068,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"VBArray", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"VBArray", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(ctx->vbarray_constr));
     if(FAILED(hres))
         return hres;
@@ -1105,7 +1105,7 @@ HRESULT init_global(script_ctx_t *ctx)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Math", PROPF_WRITABLE, jsval_obj(math));
+    hres = jsdisp_define_data_property(ctx->global, L"Math", PROPF_CONFIGURABLE | PROPF_WRITABLE, jsval_obj(math));
     jsdisp_release(math);
     if(FAILED(hres))
         return hres;
@@ -1117,7 +1117,7 @@ HRESULT init_global(script_ctx_t *ctx)
         if(FAILED(hres))
             return hres;
 
-        hres = jsdisp_define_data_property(ctx->global, L"JSON", PROPF_WRITABLE, jsval_obj(json));
+        hres = jsdisp_define_data_property(ctx->global, L"JSON", PROPF_CONFIGURABLE | PROPF_WRITABLE, jsval_obj(json));
         jsdisp_release(json);
         if(FAILED(hres))
             return hres;
@@ -1127,7 +1127,7 @@ HRESULT init_global(script_ctx_t *ctx)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"ActiveXObject", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"ActiveXObject", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(constr));
     jsdisp_release(constr);
     if(FAILED(hres))

dlls/jscript/jsdisp.idl

@@ -51,6 +51,7 @@ interface IWineJSDispatchHost;
 interface IWineJSDispatch : IDispatchEx
 {
     void Free();
+    HRESULT GetPropertyFlags(DISPID id, UINT32 *ret);
     HRESULT GetScriptGlobal(IWineJSDispatchHost **ret);
 }
 

dlls/jscript/set.c

@@ -903,7 +903,7 @@ HRESULT init_set_constructor(script_ctx_t *ctx)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Set", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Set", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(constructor));
     jsdisp_release(constructor);
     if(FAILED(hres))
@@ -918,7 +918,7 @@ HRESULT init_set_constructor(script_ctx_t *ctx)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"Map", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(constructor));
     jsdisp_release(constructor);
     if(FAILED(hres))
@@ -933,7 +933,7 @@ HRESULT init_set_constructor(script_ctx_t *ctx)
     if(FAILED(hres))
         return hres;
 
-    hres = jsdisp_define_data_property(ctx->global, L"WeakMap", PROPF_WRITABLE,
+    hres = jsdisp_define_data_property(ctx->global, L"WeakMap", PROPF_CONFIGURABLE | PROPF_WRITABLE,
                                        jsval_obj(constructor));
     jsdisp_release(constructor);
     return hres;

dlls/jscript/tests/run.c

@@ -3641,6 +3641,85 @@ static void test_invokeex(void)
     IActiveScript_Release(script);
 }
 
+static void test_members(void)
+{
+    DISPID func_id, prop_id;
+    IActiveScript *script;
+    IDispatchEx *dispex;
+    DWORD propflags;
+    HRESULT hres;
+    VARIANT v;
+    BSTR str;
+
+    hres = parse_script_expr(L"var o = { func: function() {}, prop: 1 }; o", &v, &script);
+    ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);
+    ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+
+    hres = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IDispatchEx, (void**)&dispex);
+    ok(hres == S_OK, "Could not get IDispatchEx iface: %08lx\n", hres);
+    VariantClear(&v);
+
+    str = SysAllocString(L"func");
+    hres = IDispatchEx_GetDispID(dispex, str, 0, &func_id);
+    SysFreeString(str);
+    ok(hres == S_OK, "GetDispID failed: %08lx\n", hres);
+
+    str = SysAllocString(L"prop");
+    hres = IDispatchEx_GetDispID(dispex, str, 0, &prop_id);
+    SysFreeString(str);
+    ok(hres == S_OK, "GetDispID failed: %08lx\n", hres);
+
+    hres = IDispatchEx_GetMemberName(dispex, func_id, &str);
+    ok(hres == S_OK, "GetMemberName failed: %08lx\n", hres);
+    ok(!wcscmp(str, L"func"), "GetMemberName returned %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    hres = IDispatchEx_GetMemberName(dispex, prop_id, &str);
+    ok(hres == S_OK, "GetMemberName failed: %08lx\n", hres);
+    ok(!wcscmp(str, L"prop"), "GetMemberName returned %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+
+    propflags = 0xdeadbeef;
+    hres = IDispatchEx_GetMemberProperties(dispex, func_id, 0, &propflags);
+    ok(hres == S_OK, "GetMemberProperties failed: %08lx\n", hres);
+    ok(propflags == 0, "propflags = %08lx", propflags);
+
+    propflags = 0xdeadbeef;
+    hres = IDispatchEx_GetMemberProperties(dispex, prop_id, 0, &propflags);
+    ok(hres == S_OK, "GetMemberProperties failed: %08lx\n", hres);
+    ok(propflags == 0, "propflags = %08lx", propflags);
+
+    hres = IDispatchEx_DeleteMemberByDispID(dispex, func_id);
+    ok(hres == S_OK, "DeleteMemberByDispID failed: %08lx\n", hres);
+
+    hres = IDispatchEx_GetMemberName(dispex, func_id, &str);
+    ok(hres == DISP_E_MEMBERNOTFOUND, "GetMemberName failed: %08lx\n", hres);
+    hres = IDispatchEx_GetMemberProperties(dispex, func_id, 0, &propflags);
+    ok(hres == DISP_E_MEMBERNOTFOUND, "GetMemberProperties failed: %08lx\n", hres);
+
+    hres = IDispatchEx_GetMemberName(dispex, prop_id, &str);
+    ok(hres == S_OK, "GetMemberName failed: %08lx\n", hres);
+    ok(!wcscmp(str, L"prop"), "GetMemberName returned %s\n", wine_dbgstr_w(str));
+    SysFreeString(str);
+    propflags = 0xdeadbeef;
+    hres = IDispatchEx_GetMemberProperties(dispex, prop_id, 0, &propflags);
+    ok(hres == S_OK, "GetMemberProperties failed: %08lx\n", hres);
+    ok(propflags == 0, "propflags = %08lx", propflags);
+
+    str = SysAllocString(L"prop");
+    hres = IDispatchEx_DeleteMemberByName(dispex, str, 0);
+    ok(hres == S_OK, "DeleteMemberByName failed: %08lx\n", hres);
+    SysFreeString(str);
+
+    hres = IDispatchEx_GetMemberName(dispex, prop_id, &str);
+    ok(hres == DISP_E_MEMBERNOTFOUND, "GetMemberName failed: %08lx\n", hres);
+    hres = IDispatchEx_GetMemberProperties(dispex, prop_id, 0, &propflags);
+    ok(hres == DISP_E_MEMBERNOTFOUND, "GetMemberProperties failed: %08lx\n", hres);
+
+    IDispatchEx_Release(dispex);
+    IActiveScript_Release(script);
+}
+
 static void test_destructors(void)
 {
     static const WCHAR cyclic_refs[] = L"(function() {\n"
@@ -4299,6 +4378,7 @@ static BOOL run_tests(void)
 
     test_script_exprs();
     test_invokeex();
+    test_members();
     test_destructors();
     test_eval();
     test_error_reports();

dlls/mshtml/dispex.c

@@ -1764,6 +1764,26 @@ HRESULT dispex_call_builtin(DispatchEx *dispex, DISPID id, DISPPARAMS *dp,
     return call_builtin_function(dispex, func, dp, res, ei, caller);
 }
 
+static VARIANT_BOOL reset_builtin_func(DispatchEx *dispex, func_info_t *func)
+{
+    func_obj_entry_t *entry;
+
+    if(!dispex->dynamic_data || !dispex->dynamic_data->func_disps ||
+       !dispex->dynamic_data->func_disps[func->func_disp_idx].func_obj)
+        return VARIANT_FALSE;
+
+    entry = dispex->dynamic_data->func_disps + func->func_disp_idx;
+    if(V_VT(&entry->val) == VT_DISPATCH &&
+       V_DISPATCH(&entry->val) == (IDispatch*)&entry->func_obj->dispex.IWineJSDispatchHost_iface)
+        return VARIANT_FALSE;
+
+    VariantClear(&entry->val);
+    V_VT(&entry->val) = VT_DISPATCH;
+    V_DISPATCH(&entry->val) = (IDispatch*)&entry->func_obj->dispex.IWineJSDispatchHost_iface;
+    IDispatch_AddRef(V_DISPATCH(&entry->val));
+    return VARIANT_TRUE;
+}
+
 HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success)
 {
     switch(get_dispid_type(id)) {
@@ -1793,26 +1813,7 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success)
 
         /* For builtin functions, we set their value to the original function. */
         if(func->func_disp_idx >= 0) {
-            func_obj_entry_t *entry;
-
-            if(!This->dynamic_data || !This->dynamic_data->func_disps
-                || !This->dynamic_data->func_disps[func->func_disp_idx].func_obj) {
-                *success = VARIANT_FALSE;
-                return S_OK;
-            }
-
-            entry = This->dynamic_data->func_disps + func->func_disp_idx;
-            if(V_VT(&entry->val) == VT_DISPATCH
-                    && V_DISPATCH(&entry->val) == (IDispatch*)&entry->func_obj->dispex.IWineJSDispatchHost_iface) {
-                *success = VARIANT_FALSE;
-                return S_OK;
-            }
-
-            VariantClear(&entry->val);
-            V_VT(&entry->val) = VT_DISPATCH;
-            V_DISPATCH(&entry->val) = (IDispatch*)&entry->func_obj->dispex.IWineJSDispatchHost_iface;
-            IDispatch_AddRef(V_DISPATCH(&entry->val));
-            *success = VARIANT_TRUE;
+            *success = reset_builtin_func(This, func);
             return S_OK;
         }
         *success = VARIANT_TRUE;
@@ -2304,7 +2305,8 @@ static HRESULT dispex_prop_delete(DispatchEx *dispex, DISPID id)
         return E_NOTIMPL;
     }
 
-    if(is_dynamic_dispid(id)) {
+    switch(get_dispid_type(id)) {
+    case DISPEXPROP_DYNAMIC: {
         DWORD idx = id - DISPID_DYNPROP_0;
         dynamic_prop_t *prop;
 
@@ -2316,6 +2318,24 @@ static HRESULT dispex_prop_delete(DispatchEx *dispex, DISPID id)
         prop->flags |= DYNPROP_DELETED;
         return S_OK;
     }
+    case DISPEXPROP_BUILTIN: {
+        func_info_t *func;
+        HRESULT hres;
+
+        if(!ensure_real_info(dispex))
+            return E_OUTOFMEMORY;
+
+        hres = get_builtin_func(dispex->info, id, &func);
+        if(FAILED(hres))
+            return hres;
+
+        if(func->func_disp_idx >= 0)
+            reset_builtin_func(dispex, func);
+        return S_OK;
+    }
+    default:
+        break;
+    }
 
     return S_OK;
 }

dlls/mshtml/htmlscript.h

@@ -48,6 +48,8 @@ IDispatch *script_parse_event(HTMLInnerWindow*,LPCWSTR);
 HRESULT exec_script(HTMLInnerWindow*,const WCHAR*,const WCHAR*,VARIANT*);
 void update_browser_script_mode(GeckoBrowser*,IUri*);
 BOOL find_global_prop(HTMLInnerWindow*,const WCHAR*,DWORD,ScriptHost**,DISPID*);
+HRESULT global_prop_still_exists(HTMLInnerWindow*,global_prop_t*);
 IDispatch *get_script_disp(ScriptHost*);
+IWineJSDispatch *get_script_jsdisp(ScriptHost*);
 IActiveScriptSite *get_first_script_site(HTMLInnerWindow*);
 void initialize_script_global(HTMLInnerWindow*);

dlls/mshtml/htmlwindow.c

@@ -3302,7 +3302,7 @@ static global_prop_t *alloc_global_prop(HTMLInnerWindow *This, global_prop_type_
         This->global_prop_size = new_size;
     }
 
-    This->global_props[This->global_prop_cnt].name = wcsdup(name);
+    This->global_props[This->global_prop_cnt].name = SysAllocString(name);
     if(!This->global_props[This->global_prop_cnt].name)
         return NULL;
 
@@ -3324,8 +3324,10 @@ HRESULT search_window_props(HTMLInnerWindow *This, const WCHAR *name, DWORD grfd
     for(i=0; i < This->global_prop_cnt; i++) {
         /* FIXME: case sensitivity */
         if(!wcscmp(This->global_props[i].name, name)) {
+            HRESULT hres = global_prop_still_exists(This, &This->global_props[i]);
+            if(hres == S_OK)
                 *pid = MSHTML_DISPID_CUSTOM_MIN + i;
-            return S_OK;
+            return (hres == DISP_E_MEMBERNOTFOUND) ? DISP_E_UNKNOWNNAME : hres;
         }
     }
 
@@ -3364,18 +3366,34 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IWineJSDispatchHost *iface, DISPID i
 static HRESULT WINAPI WindowDispEx_DeleteMemberByName(IWineJSDispatchHost *iface, BSTR bstrName, DWORD grfdex)
 {
     HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface);
+    compat_mode_t compat_mode = dispex_compat_mode(&This->base.inner_window->event_target.dispex);
 
     TRACE("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex);
 
+    if(compat_mode < COMPAT_MODE_IE8) {
+        /* Not implemented by IE */
+        return E_NOTIMPL;
+    }
+    if(compat_mode == COMPAT_MODE_IE8)
+        return MSHTML_E_INVALID_ACTION;
+
     return IWineJSDispatchHost_DeleteMemberByName(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, bstrName, grfdex);
 }
 
 static HRESULT WINAPI WindowDispEx_DeleteMemberByDispID(IWineJSDispatchHost *iface, DISPID id)
 {
     HTMLOuterWindow *This = impl_from_IWineJSDispatchHost(iface);
+    compat_mode_t compat_mode = dispex_compat_mode(&This->base.inner_window->event_target.dispex);
 
     TRACE("(%p)->(%lx)\n", This, id);
 
+    if(compat_mode < COMPAT_MODE_IE8) {
+        /* Not implemented by IE */
+        return E_NOTIMPL;
+    }
+    if(compat_mode == COMPAT_MODE_IE8)
+        return MSHTML_E_INVALID_ACTION;
+
     return IWineJSDispatchHost_DeleteMemberByDispID(&This->base.inner_window->event_target.dispex.IWineJSDispatchHost_iface, id);
 }
 
@@ -3763,7 +3781,7 @@ static void HTMLWindow_destructor(DispatchEx *dispex)
     VariantClear(&This->performance);
 
     for(i = 0; i < This->global_prop_cnt; i++)
-        free(This->global_props[i].name);
+        SysFreeString(This->global_props[i].name);
     free(This->global_props);
 
     if(This->mon)
@@ -3910,6 +3928,9 @@ HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags,
         case DISPATCH_PROPERTYPUT: {
             DISPID dispex_id;
 
+            if(This->event_target.dispex.jsdisp)
+                return S_FALSE;
+
             hres = dispex_get_dynid(&This->event_target.dispex, prop->name, TRUE, &dispex_id);
             if(FAILED(hres))
                 return hres;
@@ -3953,6 +3974,44 @@ HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags,
     return hres;
 }
 
+static HRESULT HTMLWindow_delete(DispatchEx *dispex, DISPID id)
+{
+    HTMLInnerWindow *This = impl_from_DispatchEx(dispex);
+    DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN;
+    global_prop_t *prop;
+    HRESULT hres = S_OK;
+
+    if(idx >= This->global_prop_cnt)
+        return DISP_E_MEMBERNOTFOUND;
+
+    prop = This->global_props + idx;
+    switch(prop->type) {
+    case GLOBAL_SCRIPTVAR: {
+        IDispatchEx *iface;
+        IDispatch *disp;
+
+        disp = get_script_disp(prop->script_host);
+        if(!disp)
+            return E_UNEXPECTED;
+
+        hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&iface);
+        if(SUCCEEDED(hres)) {
+            hres = IDispatchEx_DeleteMemberByDispID(iface, prop->id);
+            IDispatchEx_Release(iface);
+        }else {
+            WARN("No IDispatchEx, so can't delete\n");
+            hres = S_OK;
+        }
+        IDispatch_Release(disp);
+        break;
+    }
+    default:
+        break;
+    }
+
+    return hres;
+}
+
 static HRESULT HTMLWindow_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid)
 {
     DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1;
@@ -3970,7 +4029,9 @@ static HRESULT HTMLWindow_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid
 HRESULT HTMLWindow_get_prop_desc(DispatchEx *dispex, DISPID id, struct property_info *desc)
 {
     HTMLInnerWindow *This = impl_from_DispatchEx(dispex);
+    IWineJSDispatch *jsdisp;
     global_prop_t *prop;
+    HRESULT hres = S_OK;
 
     if(id - MSHTML_DISPID_CUSTOM_MIN >= This->global_prop_cnt)
         return DISP_E_MEMBERNOTFOUND;
@@ -3979,10 +4040,22 @@ HRESULT HTMLWindow_get_prop_desc(DispatchEx *dispex, DISPID id, struct property_
     desc->name = prop->name;
     desc->id = id;
     desc->flags = PROPF_WRITABLE | PROPF_CONFIGURABLE;
-    if(prop->type == GLOBAL_DISPEXVAR)
-        desc->flags |= PROPF_ENUMERABLE;
     desc->iid = 0;
-    return S_OK;
+
+    switch(prop->type) {
+    case GLOBAL_SCRIPTVAR: {
+        if((jsdisp = get_script_jsdisp(prop->script_host)))
+            hres = IWineJSDispatch_GetPropertyFlags(jsdisp, prop->id, &desc->flags);
+        break;
+    }
+    case GLOBAL_DISPEXVAR:
+        desc->flags |= PROPF_ENUMERABLE;
+        break;
+    default:
+        break;
+    }
+
+    return hres;
 }
 
 static HTMLInnerWindow *HTMLWindow_get_script_global(DispatchEx *dispex)
@@ -4179,6 +4252,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = {
         .lookup_dispid       = HTMLWindow_lookup_dispid,
         .find_dispid         = HTMLWindow_find_dispid,
         .invoke              = HTMLWindow_invoke,
+        .delete              = HTMLWindow_delete,
         .next_dispid         = HTMLWindow_next_dispid,
         .get_prop_desc       = HTMLWindow_get_prop_desc,
         .get_script_global   = HTMLWindow_get_script_global,

dlls/mshtml/mshtml_private.h

@@ -656,7 +656,7 @@ typedef enum {
 
 typedef struct {
     global_prop_type_t type;
-    WCHAR *name;
+    BSTR name;
     ScriptHost *script_host;
     DISPID id;
 } global_prop_t;

dlls/mshtml/script.c

@@ -85,6 +85,7 @@ struct ScriptHost {
     SCRIPTSTATE script_state;
 
     HTMLInnerWindow *window;
+    IWineJSDispatch *script_jsdisp;
 
     GUID guid;
     struct list entry;
@@ -255,6 +256,18 @@ static BOOL init_script_engine(ScriptHost *script_host, IActiveScript *script)
             if(is_second_init)
                 set_script_prop(first_host->script, SCRIPTPROP_ABBREVIATE_GLOBALNAME_RESOLUTION, &var);
         }
+
+        if(IsEqualGUID(&script_host->guid, &CLSID_JScript)) {
+            IDispatch *script_disp;
+
+            hres = IActiveScript_GetScriptDispatch(script, NULL, &script_disp);
+            if(FAILED(hres))
+                WARN("GetScriptDispatch failed: %08lx\n", hres);
+            else {
+                IDispatch_QueryInterface(script_disp, &IID_IWineJSDispatch, (void**)&script_host->script_jsdisp);
+                IDispatch_Release(script_disp);
+            }
+        }
     }else {
        WARN("AddNamedItem failed: %08lx\n", hres);
     }
@@ -288,6 +301,8 @@ static void release_script_engine(ScriptHost *This)
         unlink_ref(&This->parse);
     }
 
+    if(This->script_jsdisp)
+        IWineJSDispatch_Release(This->script_jsdisp);
     IActiveScript_Release(This->script);
     This->script = NULL;
     This->script_state = SCRIPTSTATE_UNINITIALIZED;
@@ -1573,6 +1588,11 @@ IDispatch *get_script_disp(ScriptHost *script_host)
     return disp;
 }
 
+IWineJSDispatch *get_script_jsdisp(ScriptHost *script_host)
+{
+    return script_host->script_jsdisp;
+}
+
 IActiveScriptSite *get_first_script_site(HTMLInnerWindow *window)
 {
     if(list_empty(&window->script_hosts)) {
@@ -1825,6 +1845,48 @@ BOOL find_global_prop(HTMLInnerWindow *window, const WCHAR *name, DWORD flags, S
     return FALSE;
 }
 
+HRESULT global_prop_still_exists(HTMLInnerWindow *window, global_prop_t *prop)
+{
+    HRESULT hres;
+
+    switch(prop->type) {
+    case GLOBAL_SCRIPTVAR: {
+        DWORD properties;
+
+        if(!prop->script_host->script)
+            return E_UNEXPECTED;
+        if(!prop->script_host->script_jsdisp)
+            return S_OK;
+        return IWineJSDispatch_GetMemberProperties(prop->script_host->script_jsdisp, prop->id, 0, &properties);
+    }
+    case GLOBAL_ELEMENTVAR: {
+        IHTMLElement *elem;
+
+        hres = IHTMLDocument3_getElementById(&window->doc->IHTMLDocument3_iface, prop->name, &elem);
+        if(FAILED(hres))
+            return hres;
+
+        if(!elem)
+            return DISP_E_MEMBERNOTFOUND;
+        IHTMLElement_Release(elem);
+        return S_OK;
+    }
+    case GLOBAL_FRAMEVAR: {
+        HTMLOuterWindow *frame;
+
+        hres = get_frame_by_name(window->base.outer_window, prop->name, FALSE, &frame);
+        if(FAILED(hres))
+            return hres;
+
+        return frame ? S_OK : DISP_E_MEMBERNOTFOUND;
+    }
+    default:
+        break;
+    }
+
+    return S_OK;
+}
+
 static BOOL is_jscript_available(void)
 {
     static BOOL available, checked;

dlls/mshtml/tests/documentmode.js

@@ -1301,7 +1301,7 @@ sync_test("navigator", function() {
 
 sync_test("delete_prop", function() {
     var v = document.documentMode;
-    var obj = document.createElement("div"), r, obj2;
+    var obj = document.createElement("div"), r, obj2, func, prop;
 
     obj.prop1 = true;
     r = false;
@@ -1317,6 +1317,40 @@ sync_test("delete_prop", function() {
     ok(!r, "got an unexpected exception");
     ok(!("prop1" in obj), "prop1 is still in obj");
 
+    /* builtin properties don't throw any exception, but are not really deleted */
+    r = (delete obj.tagName);
+    ok(r, "delete returned " + r);
+    ok("tagName" in obj, "tagName deleted from obj");
+    ok(obj.tagName === "DIV", "tagName = " + obj.tagName);
+
+    prop = obj.id;
+    r = (delete obj.id);
+    ok(r, "delete returned " + r);
+    ok("id" in obj, "id deleted from obj");
+    ok(obj.id === prop, "id = " + obj.id);
+
+    obj.id = "1234";
+    ok(obj.id === "1234", "id after set to 1234 = " + obj.id);
+    r = (delete obj.id);
+    ok(r, "delete returned " + r);
+    ok("id" in obj, "id deleted from obj");
+    ok(obj.id === "1234", "id = " + obj.id);
+
+    /* builtin functions get reset to their original values */
+    func = function() { }
+    prop = obj.setAttribute;
+    r = (delete obj.setAttribute);
+    ok(r, "delete returned " + r);
+    ok("setAttribute" in obj, "setAttribute deleted from obj");
+    ok(obj.setAttribute === prop, "setAttribute = " + obj.setAttribute);
+
+    obj.setAttribute = func;
+    ok(obj.setAttribute === func, "setAttribute after set to func = " + obj.setAttribute);
+    r = (delete obj.setAttribute);
+    ok(r, "delete returned " + r);
+    ok("setAttribute" in obj, "setAttribute deleted from obj");
+    ok(obj.setAttribute === prop, "setAttribute = " + obj.setAttribute);
+
     /* again, this time prop1 does not exist */
     r = false;
     try {
@@ -1326,7 +1360,6 @@ sync_test("delete_prop", function() {
     }
     if(v < 9) {
         ok(r, "did not get an expected exception");
-        return;
     }else {
         ok(!r, "got an unexpected exception");
         ok(!("prop1" in obj), "prop1 is still in obj");
@@ -1337,12 +1370,6 @@ sync_test("delete_prop", function() {
     ok("className" in obj, "className deleted from obj");
     ok(obj.className === "", "className = " + obj.className);
 
-    /* builtin propertiles don't throw any exception, but are not really deleted */
-    r = (delete obj.tagName);
-    ok(r, "delete returned " + r);
-    ok("tagName" in obj, "tagName deleted from obj");
-    ok(obj.tagName === "DIV", "tagName = " + obj.tagName);
-
     obj = document.querySelectorAll("*");
     ok("0" in obj, "0 is not in obj");
     obj2 = obj[0];
@@ -1353,12 +1380,27 @@ sync_test("delete_prop", function() {
     /* test window object and its global scope handling */
     obj = window;
 
+    ok("encodeURIComponent" in obj, "encodeURIComponent not in obj");
+    try {
+        prop = window.encodeURIComponent;
+        r = (delete window.encodeURIComponent);
+        ok(v >= 9, "did not get an expect exception deleting encodeURIComponent");
+        ok(r, "delete returned " + r);
+        ok(!("encodeURIComponent" in obj), "encodeURIComponent is still in obj");
+        window.encodeURIComponent = prop;
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting encodeURIComponent");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting encodeURIComponent threw " + ex.number);
+        ok("encodeURIComponent" in obj, "encodeURIComponent is not in obj");
+    }
+
     obj.globalprop1 = true;
     ok(globalprop1, "globalprop1 = " + globalprop1);
     r = false;
     try {
         delete obj.globalprop1;
     }catch(ex) {
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting globalprop1 threw " + ex.number);
         r = true;
     }
     if(v < 9) {
@@ -1374,13 +1416,13 @@ sync_test("delete_prop", function() {
     try {
         delete obj.globalprop2;
     }catch(ex) {
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting globalprop2 threw " + ex.number);
         r = true;
     }
     if(v < 9) {
         ok(r, "did not get an expected globalprop2 exception");
     }else {
         ok(!r, "got an unexpected exception");
-        todo_wine.
         ok(!("globalprop2" in obj), "globalprop2 is still in obj");
     }
 
@@ -1390,6 +1432,7 @@ sync_test("delete_prop", function() {
     try {
         delete globalprop3;
     }catch(ex) {
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting globalprop3 threw " + ex.number);
         r = true;
     }
     if(v < 9) {
@@ -1404,8 +1447,88 @@ sync_test("delete_prop", function() {
     ok(obj.globalprop4, "globalprop4 = " + globalprop4);
     r = (delete globalprop4);
     ok(r, "delete returned " + r);
-    todo_wine.
     ok(!("globalprop4" in obj), "globalprop4 is still in obj");
+
+    globalprop5 = true;
+    ok(obj.globalprop5, "globalprop5 = " + globalprop5);
+    try {
+        r = (delete window.globalprop5);
+        ok(v >= 9, "did not get an expected exception deleting globalprop5");
+        ok(r, "delete returned " + r);
+        ok(!("globalprop5" in obj), "globalprop5 is still in obj");
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting globalprop5");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting globalprop5 threw " + ex.number);
+        ok("globalprop5" in obj, "globalprop5 is not in obj");
+    }
+
+    document.body.innerHTML = '<div id="winetest"/>';
+    ok("winetest" in obj, "winetest not in obj");
+    try {
+        r = (delete window.winetest);
+        ok(v >= 9, "did not get an expected exception deleting winetest");
+        ok(r, "delete returned " + r);
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting winetest");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting winetest threw " + ex.number);
+    }
+    ok("winetest" in obj, "winetest is not in obj");
+    document.body.innerHTML = "";
+    ok(!("winetest" in obj), "winetest is still in obj");
+
+    document.body.innerHTML = '<div id="foobar"/>';
+    ok("foobar" in obj, "foobar not in obj");
+    window.foobar = "1234";
+    ok(obj.foobar === "1234", "foobar = " + obj.foobar);
+    document.body.innerHTML = "";
+    ok("foobar" in obj, "foobar is not in obj");
+    ok(obj.foobar === "1234", "foobar = " + obj.foobar);
+    try {
+        r = (delete window.foobar);
+        ok(v >= 9, "did not get an expected exception deleting foobar");
+        ok(r, "delete returned " + r);
+        ok(!("foobar" in obj), "foobar is still in obj");
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting foobar");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting foobar threw " + ex.number);
+        ok("foobar" in obj, "foobar is not in obj");
+    }
+
+    document.body.innerHTML = '<div id="barfoo"/>';
+    ok("barfoo" in obj, "barfoo not in obj");
+    window.barfoo = "5678";
+    ok(obj.barfoo === "5678", "barfoo = " + obj.barfoo);
+    try {
+        r = (delete window.barfoo);
+        ok(v >= 9, "did not get an expected exception deleting barfoo");
+        ok(r, "delete returned " + r);
+        ok(obj.barfoo !== "5678", "barfoo is still 5678");
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting barfoo");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting barfoo threw " + ex.number);
+        ok(obj.barfoo === "5678", "barfoo = " + obj.barfoo);
+    }
+    ok("barfoo" in obj, "barfoo is not in obj");
+    document.body.innerHTML = "";
+    if(v < 9)
+        ok("barfoo" in obj, "barfoo is not in obj");
+    else
+        ok(!("barfoo" in obj), "barfoo is still in obj");
+
+    document.body.innerHTML = '<iframe id="testwine"/>';
+    ok("testwine" in obj, "testwine not in obj");
+    try {
+        r = (delete window.testwine);
+        ok(v >= 9, "did not get an expected exception deleting testwine");
+        ok(r, "delete returned " + r);
+    }catch(ex) {
+        ok(v < 9, "expected exception deleting testwine");
+        ok(ex.number === 0xa01bd - 0x80000000, "deleting testwine threw " + ex.number);
+    }
+    ok("testwine" in obj, "testwine is not in obj");
+
+    document.body.innerHTML = "";
+    ok(!("testwine" in obj), "testwine is still in obj");
 });
 
 sync_test("detached arguments", function() {

dlls/mshtml/tests/es5.js

@@ -23,6 +23,7 @@ var JS_E_NUMBER_EXPECTED = 0x800a1389;
 var JS_E_FUNCTION_EXPECTED = 0x800a138a;
 var JS_E_DATE_EXPECTED = 0x800a138e;
 var JS_E_OBJECT_EXPECTED = 0x800a138f;
+var JS_E_UNDEFINED_VARIABLE = 0x800a1391;
 var JS_E_BOOLEAN_EXPECTED = 0x800a1392;
 var JS_E_VBARRAY_EXPECTED = 0x800a1395;
 var JS_E_ENUMERATOR_EXPECTED = 0x800a1397;
@@ -2153,6 +2154,109 @@ sync_test("builtin_context", function() {
     ok(obj.length === 1, "obj.length = " + obj.length);
 });
 
+sync_test("globals override", function() {
+    wineprop = 1337;  /* global */
+    ok(window.hasOwnProperty("wineprop"), "wineprop not a prop of window");
+    ok(window.wineprop === 1337, "window.wineprop = " + window.wineprop);
+    ok(wineprop === 1337, "wineprop = " + wineprop);
+
+    var i, desc, r = Object.defineProperty(window, "wineprop", { value: 42, configurable: true });
+    ok(r === window, "defineProperty(window.wineprop) returned " + r);
+    ok(window.hasOwnProperty("wineprop"), "wineprop not a prop of window after override");
+    ok(window.wineprop === 42, "window.wineprop after override = " + window.wineprop);
+    ok(wineprop === 42, "wineprop after override = " + wineprop);
+
+    r = (delete window.wineprop);
+    ok(r === true, "delete window.wineprop returned " + r);
+    ok(!("wineprop" in window), "wineprop in window after delete");
+
+    /* configurable */
+    var builtins = [
+        "ActiveXObject",
+        "Array",
+        "ArrayBuffer",
+        "Boolean",
+        "CollectGarbage",
+        "DataView",
+        "Date",
+        "decodeURI",
+        "decodeURIComponent",
+        "encodeURI",
+        "encodeURIComponent",
+        "Enumerator",
+        "Error",
+        "escape",
+        "EvalError",
+        "Function",
+        "isFinite",
+        "isNaN",
+        "JSON",
+        "Map",
+        "Math",
+        "Number",
+        "parseFloat",
+        "parseInt",
+        "RangeError",
+        "ReferenceError",
+        "RegExp",
+        "ScriptEngine",
+        "ScriptEngineBuildVersion",
+        "ScriptEngineMajorVersion",
+        "ScriptEngineMinorVersion",
+        "Set",
+        "String",
+        "SyntaxError",
+        "TypeError",
+        "unescape",
+        "URIError",
+        "VBArray",
+        "WeakMap"
+    ];
+    for(i = 0; i < builtins.length; i++) {
+        desc = Object.getOwnPropertyDescriptor(window, builtins[i]);
+        ok(desc !== undefined, "getOwnPropertyDescriptor('" + builtins[i] + "' returned undefined");
+        ok(desc.configurable === true, builtins[i] + " not configurable");
+        ok(desc.enumerable === false, builtins[i] + " is enumerable");
+        ok(desc.writable === true, builtins[i] + " not writable");
+
+        r = Object.defineProperty(window, builtins[i], { value: 12, configurable: true, writable: true });
+        ok(r === window, "defineProperty('" + builtins[i] + "' returned " + r);
+        r = Object.getOwnPropertyDescriptor(window, builtins[i]);
+        ok(r !== undefined, "getOwnPropertyDescriptor('" + builtins[i] + "' after override returned undefined");
+        ok(r.value === 12, builtins[i] + " value = " + r.value);
+
+        r = eval(builtins[i]);
+        ok(r === window[builtins[i]], "Global " + builtins[i] + " does not match redefined window." + builtins[i]);
+        r = (delete window[builtins[i]]);
+        ok(r === true, "delete window." + builtins[i] + " returned " + r);
+        ok(!(builtins[i] in window), builtins[i] + " in window after delete");
+        try {
+            eval(builtins[i]);
+            ok(false, "expected exception retrieving global " + builtins[i] + " after delete.");
+        }catch(ex) {
+            r = ex.number >>> 0;
+            ok(r === JS_E_UNDEFINED_VARIABLE, "retrieving global " + builtins[i] + " after delete threw " + r);
+        }
+
+        r = Object.defineProperty(window, builtins[i], desc);
+        ok(r === window, "defineProperty('" + builtins[i] + "' to restore returned " + r);
+    }
+
+    /* non-configurable */
+    builtins = [
+        "undefined",
+        "Infinity",
+        "NaN"
+    ];
+    for(i = 0; i < builtins.length; i++) {
+        desc = Object.getOwnPropertyDescriptor(window, builtins[i]);
+        ok(desc !== undefined, "getOwnPropertyDescriptor('" + builtins[i] + "' returned undefined");
+        ok(desc.configurable === false, builtins[i] + " is configurable");
+        ok(desc.enumerable === false, builtins[i] + " is enumerable");
+        ok(desc.writable === false, builtins[i] + " is writable");
+    }
+});
+
 sync_test("host this", function() {
     var tests = [ undefined, null, external.nullDisp, function() {}, [0], "foobar", true, 42, new Number(42), external.testHostContext(true), window, document ];
     var i, obj = Object.create(Function.prototype);

dlls/msi/suminfo.c

@@ -515,7 +515,7 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, const WCHAR *szDatab
 
     if( szDatabase && szDatabase[0] )
     {
-        LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY;
+        LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_DIRECT : MSIDBOPEN_READONLY;
 
         ret = MSI_OpenDatabaseW( szDatabase, persist, &db );
         if( ret != ERROR_SUCCESS )

dlls/msi/tests/suminfo.c

@@ -278,6 +278,152 @@ static void test_suminfo(void)
     r = MsiCloseHandle(hsuminfo);
     ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
 
+    /* try persisting on transacted msi */
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    r = MsiSummaryInfoSetPropertyA(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Fabian");
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n");
+
+    r = MsiSummaryInfoPersist(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist wrong error %u\n", r);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_READONLY, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    sz = 0x10;
+    strcpy(buf,"x");
+    r = MsiSummaryInfoGetPropertyA(hsuminfo, PID_AUTHOR, &type, NULL, NULL, buf, &sz);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetPropertyA wrong error\n");
+    ok(!strcmp(buf,"Mike"), "buffer was wrong: %s\n", buf);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    /* try persisting on transacted msi with commit */
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_TRANSACT, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    r = MsiSummaryInfoSetPropertyA(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Fabian");
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n");
+
+    r = MsiSummaryInfoPersist(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist wrong error %u\n", r);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiDatabaseCommit(hdb);
+    ok(r == ERROR_SUCCESS, "MsiDatabaseCommit wrong error %u\n", r);
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_READONLY, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    sz = 0x10;
+    strcpy(buf,"x");
+    r = MsiSummaryInfoGetPropertyA(hsuminfo, PID_AUTHOR, &type, NULL, NULL, buf, &sz);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetPropertyA wrong error\n");
+    ok(!strcmp(buf,"Fabian"), "buffer was wrong: %s\n", buf);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    /* try persisting on direct msi */
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_DIRECT, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    r = MsiSummaryInfoSetPropertyA(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Fabian2");
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n");
+
+    r = MsiSummaryInfoPersist(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist wrong error %u\n", r);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_READONLY, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    sz = 0x10;
+    strcpy(buf,"x");
+    r = MsiSummaryInfoGetPropertyA(hsuminfo, PID_AUTHOR, &type, NULL, NULL, buf, &sz);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetPropertyA wrong error\n");
+    ok(!strcmp(buf,"Fabian2"), "buffer was wrong: %s\n", buf);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    /* try persisting on indirectly opened msi */
+    r = MsiGetSummaryInformationA(0, msifile, 2, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error %u\n", r);
+
+    r = MsiSummaryInfoSetPropertyA(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Fabian3");
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n");
+
+    r = MsiSummaryInfoPersist(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist wrong error %u\n", r);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_READONLY, &hdb);
+    ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n");
+
+    r = MsiGetSummaryInformationA(hdb, NULL, 1, &hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation wrong error\n");
+
+    sz = 0x10;
+    strcpy(buf,"x");
+    r = MsiSummaryInfoGetPropertyA(hsuminfo, PID_AUTHOR, &type, NULL, NULL, buf, &sz);
+    ok(r == ERROR_SUCCESS, "MsiSummaryInfoGetPropertyA wrong error\n");
+    ok(!strcmp(buf,"Fabian3"), "buffer was wrong: %s\n", buf);
+
+    r = MsiCloseHandle(hsuminfo);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    r = MsiCloseHandle(hdb);
+    ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n");
+
+    /* Cleanup */
     r = DeleteFileA(msifile);
     ok(r, "DeleteFile failed\n");
 }

dlls/ntdll/ntdll.spec

@@ -400,6 +400,7 @@
 @ stdcall -syscall NtSetInformationVirtualMemory(long long ptr ptr ptr long)
 @ stdcall -syscall NtSetIntervalProfile(long long)
 @ stdcall -syscall NtSetIoCompletion(ptr long long long long)
+@ stdcall -syscall NtSetIoCompletionEx(ptr ptr long long long long)
 @ stdcall -syscall NtSetLdtEntries(long int64 long int64)
 # @ stub NtSetLowEventPair
 # @ stub NtSetLowWaitHighEventPair
@@ -1460,6 +1461,7 @@
 @ stdcall -private -syscall ZwSetInformationVirtualMemory(long long ptr ptr ptr long) NtSetInformationVirtualMemory
 @ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile
 @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion
+@ stdcall -private -syscall ZwSetIoCompletionEx(ptr ptr long long long long) NtSetIoCompletionEx
 @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries
 # @ stub ZwSetLowEventPair
 # @ stub ZwSetLowWaitHighEventPair

dlls/ntdll/ntsyscalls.h

@@ -203,48 +203,49 @@
     SYSCALL_ENTRY( 0x00c7, NtSetInformationVirtualMemory, 24 ) \
     SYSCALL_ENTRY( 0x00c8, NtSetIntervalProfile, 8 ) \
     SYSCALL_ENTRY( 0x00c9, NtSetIoCompletion, 20 ) \
-    SYSCALL_ENTRY( 0x00ca, NtSetLdtEntries, 24 ) \
-    SYSCALL_ENTRY( 0x00cb, NtSetSecurityObject, 12 ) \
-    SYSCALL_ENTRY( 0x00cc, NtSetSystemInformation, 12 ) \
-    SYSCALL_ENTRY( 0x00cd, NtSetSystemTime, 8 ) \
-    SYSCALL_ENTRY( 0x00ce, NtSetThreadExecutionState, 8 ) \
-    SYSCALL_ENTRY( 0x00cf, NtSetTimer, 28 ) \
-    SYSCALL_ENTRY( 0x00d0, NtSetTimerResolution, 12 ) \
-    SYSCALL_ENTRY( 0x00d1, NtSetValueKey, 24 ) \
-    SYSCALL_ENTRY( 0x00d2, NtSetVolumeInformationFile, 20 ) \
-    SYSCALL_ENTRY( 0x00d3, NtShutdownSystem, 4 ) \
-    SYSCALL_ENTRY( 0x00d4, NtSignalAndWaitForSingleObject, 16 ) \
-    SYSCALL_ENTRY( 0x00d5, NtSuspendProcess, 4 ) \
-    SYSCALL_ENTRY( 0x00d6, NtSuspendThread, 8 ) \
-    SYSCALL_ENTRY( 0x00d7, NtSystemDebugControl, 24 ) \
-    SYSCALL_ENTRY( 0x00d8, NtTerminateJobObject, 8 ) \
-    SYSCALL_ENTRY( 0x00d9, NtTerminateProcess, 8 ) \
-    SYSCALL_ENTRY( 0x00da, NtTerminateThread, 8 ) \
-    SYSCALL_ENTRY( 0x00db, NtTestAlert, 0 ) \
-    SYSCALL_ENTRY( 0x00dc, NtTraceControl, 24 ) \
-    SYSCALL_ENTRY( 0x00dd, NtUnloadDriver, 4 ) \
-    SYSCALL_ENTRY( 0x00de, NtUnloadKey, 4 ) \
-    SYSCALL_ENTRY( 0x00df, NtUnlockFile, 20 ) \
-    SYSCALL_ENTRY( 0x00e0, NtUnlockVirtualMemory, 16 ) \
-    SYSCALL_ENTRY( 0x00e1, NtUnmapViewOfSection, 8 ) \
-    SYSCALL_ENTRY( 0x00e2, NtUnmapViewOfSectionEx, 12 ) \
-    SYSCALL_ENTRY( 0x00e3, NtWaitForAlertByThreadId, 8 ) \
-    SYSCALL_ENTRY( 0x00e4, NtWaitForDebugEvent, 16 ) \
-    SYSCALL_ENTRY( 0x00e5, NtWaitForKeyedEvent, 16 ) \
-    SYSCALL_ENTRY( 0x00e6, NtWaitForMultipleObjects, 20 ) \
-    SYSCALL_ENTRY( 0x00e7, NtWaitForSingleObject, 12 ) \
-    SYSCALL_ENTRY( 0x00e8, NtWow64AllocateVirtualMemory64, 28 ) \
-    SYSCALL_ENTRY( 0x00e9, NtWow64GetNativeSystemInformation, 16 ) \
-    SYSCALL_ENTRY( 0x00ea, NtWow64IsProcessorFeaturePresent, 4 ) \
-    SYSCALL_ENTRY( 0x00eb, NtWow64QueryInformationProcess64, 20 ) \
-    SYSCALL_ENTRY( 0x00ec, NtWow64ReadVirtualMemory64, 28 ) \
-    SYSCALL_ENTRY( 0x00ed, NtWow64WriteVirtualMemory64, 28 ) \
-    SYSCALL_ENTRY( 0x00ee, NtWriteFile, 36 ) \
-    SYSCALL_ENTRY( 0x00ef, NtWriteFileGather, 36 ) \
-    SYSCALL_ENTRY( 0x00f0, NtWriteVirtualMemory, 20 ) \
-    SYSCALL_ENTRY( 0x00f1, NtYieldExecution, 0 ) \
-    SYSCALL_ENTRY( 0x00f2, wine_nt_to_unix_file_name, 16 ) \
-    SYSCALL_ENTRY( 0x00f3, wine_unix_to_nt_file_name, 12 )
+    SYSCALL_ENTRY( 0x00ca, NtSetIoCompletionEx, 24 ) \
+    SYSCALL_ENTRY( 0x00cb, NtSetLdtEntries, 24 ) \
+    SYSCALL_ENTRY( 0x00cc, NtSetSecurityObject, 12 ) \
+    SYSCALL_ENTRY( 0x00cd, NtSetSystemInformation, 12 ) \
+    SYSCALL_ENTRY( 0x00ce, NtSetSystemTime, 8 ) \
+    SYSCALL_ENTRY( 0x00cf, NtSetThreadExecutionState, 8 ) \
+    SYSCALL_ENTRY( 0x00d0, NtSetTimer, 28 ) \
+    SYSCALL_ENTRY( 0x00d1, NtSetTimerResolution, 12 ) \
+    SYSCALL_ENTRY( 0x00d2, NtSetValueKey, 24 ) \
+    SYSCALL_ENTRY( 0x00d3, NtSetVolumeInformationFile, 20 ) \
+    SYSCALL_ENTRY( 0x00d4, NtShutdownSystem, 4 ) \
+    SYSCALL_ENTRY( 0x00d5, NtSignalAndWaitForSingleObject, 16 ) \
+    SYSCALL_ENTRY( 0x00d6, NtSuspendProcess, 4 ) \
+    SYSCALL_ENTRY( 0x00d7, NtSuspendThread, 8 ) \
+    SYSCALL_ENTRY( 0x00d8, NtSystemDebugControl, 24 ) \
+    SYSCALL_ENTRY( 0x00d9, NtTerminateJobObject, 8 ) \
+    SYSCALL_ENTRY( 0x00da, NtTerminateProcess, 8 ) \
+    SYSCALL_ENTRY( 0x00db, NtTerminateThread, 8 ) \
+    SYSCALL_ENTRY( 0x00dc, NtTestAlert, 0 ) \
+    SYSCALL_ENTRY( 0x00dd, NtTraceControl, 24 ) \
+    SYSCALL_ENTRY( 0x00de, NtUnloadDriver, 4 ) \
+    SYSCALL_ENTRY( 0x00df, NtUnloadKey, 4 ) \
+    SYSCALL_ENTRY( 0x00e0, NtUnlockFile, 20 ) \
+    SYSCALL_ENTRY( 0x00e1, NtUnlockVirtualMemory, 16 ) \
+    SYSCALL_ENTRY( 0x00e2, NtUnmapViewOfSection, 8 ) \
+    SYSCALL_ENTRY( 0x00e3, NtUnmapViewOfSectionEx, 12 ) \
+    SYSCALL_ENTRY( 0x00e4, NtWaitForAlertByThreadId, 8 ) \
+    SYSCALL_ENTRY( 0x00e5, NtWaitForDebugEvent, 16 ) \
+    SYSCALL_ENTRY( 0x00e6, NtWaitForKeyedEvent, 16 ) \
+    SYSCALL_ENTRY( 0x00e7, NtWaitForMultipleObjects, 20 ) \
+    SYSCALL_ENTRY( 0x00e8, NtWaitForSingleObject, 12 ) \
+    SYSCALL_ENTRY( 0x00e9, NtWow64AllocateVirtualMemory64, 28 ) \
+    SYSCALL_ENTRY( 0x00ea, NtWow64GetNativeSystemInformation, 16 ) \
+    SYSCALL_ENTRY( 0x00eb, NtWow64IsProcessorFeaturePresent, 4 ) \
+    SYSCALL_ENTRY( 0x00ec, NtWow64QueryInformationProcess64, 20 ) \
+    SYSCALL_ENTRY( 0x00ed, NtWow64ReadVirtualMemory64, 28 ) \
+    SYSCALL_ENTRY( 0x00ee, NtWow64WriteVirtualMemory64, 28 ) \
+    SYSCALL_ENTRY( 0x00ef, NtWriteFile, 36 ) \
+    SYSCALL_ENTRY( 0x00f0, NtWriteFileGather, 36 ) \
+    SYSCALL_ENTRY( 0x00f1, NtWriteVirtualMemory, 20 ) \
+    SYSCALL_ENTRY( 0x00f2, NtYieldExecution, 0 ) \
+    SYSCALL_ENTRY( 0x00f3, wine_nt_to_unix_file_name, 16 ) \
+    SYSCALL_ENTRY( 0x00f4, wine_unix_to_nt_file_name, 12 )
 
 #define ALL_SYSCALLS64 \
     SYSCALL_ENTRY( 0x0000, NtAcceptConnectPort, 48 ) \
@@ -449,39 +450,40 @@
     SYSCALL_ENTRY( 0x00c7, NtSetInformationVirtualMemory, 48 ) \
     SYSCALL_ENTRY( 0x00c8, NtSetIntervalProfile, 16 ) \
     SYSCALL_ENTRY( 0x00c9, NtSetIoCompletion, 40 ) \
-    SYSCALL_ENTRY( 0x00ca, NtSetLdtEntries, 32 ) \
-    SYSCALL_ENTRY( 0x00cb, NtSetSecurityObject, 24 ) \
-    SYSCALL_ENTRY( 0x00cc, NtSetSystemInformation, 24 ) \
-    SYSCALL_ENTRY( 0x00cd, NtSetSystemTime, 16 ) \
-    SYSCALL_ENTRY( 0x00ce, NtSetThreadExecutionState, 16 ) \
-    SYSCALL_ENTRY( 0x00cf, NtSetTimer, 56 ) \
-    SYSCALL_ENTRY( 0x00d0, NtSetTimerResolution, 24 ) \
-    SYSCALL_ENTRY( 0x00d1, NtSetValueKey, 48 ) \
-    SYSCALL_ENTRY( 0x00d2, NtSetVolumeInformationFile, 40 ) \
-    SYSCALL_ENTRY( 0x00d3, NtShutdownSystem, 8 ) \
-    SYSCALL_ENTRY( 0x00d4, NtSignalAndWaitForSingleObject, 32 ) \
-    SYSCALL_ENTRY( 0x00d5, NtSuspendProcess, 8 ) \
-    SYSCALL_ENTRY( 0x00d6, NtSuspendThread, 16 ) \
-    SYSCALL_ENTRY( 0x00d7, NtSystemDebugControl, 48 ) \
-    SYSCALL_ENTRY( 0x00d8, NtTerminateJobObject, 16 ) \
-    SYSCALL_ENTRY( 0x00d9, NtTerminateProcess, 16 ) \
-    SYSCALL_ENTRY( 0x00da, NtTerminateThread, 16 ) \
-    SYSCALL_ENTRY( 0x00db, NtTestAlert, 0 ) \
-    SYSCALL_ENTRY( 0x00dc, NtTraceControl, 48 ) \
-    SYSCALL_ENTRY( 0x00dd, NtUnloadDriver, 8 ) \
-    SYSCALL_ENTRY( 0x00de, NtUnloadKey, 8 ) \
-    SYSCALL_ENTRY( 0x00df, NtUnlockFile, 40 ) \
-    SYSCALL_ENTRY( 0x00e0, NtUnlockVirtualMemory, 32 ) \
-    SYSCALL_ENTRY( 0x00e1, NtUnmapViewOfSection, 16 ) \
-    SYSCALL_ENTRY( 0x00e2, NtUnmapViewOfSectionEx, 24 ) \
-    SYSCALL_ENTRY( 0x00e3, NtWaitForAlertByThreadId, 16 ) \
-    SYSCALL_ENTRY( 0x00e4, NtWaitForDebugEvent, 32 ) \
-    SYSCALL_ENTRY( 0x00e5, NtWaitForKeyedEvent, 32 ) \
-    SYSCALL_ENTRY( 0x00e6, NtWaitForMultipleObjects, 40 ) \
-    SYSCALL_ENTRY( 0x00e7, NtWaitForSingleObject, 24 ) \
-    SYSCALL_ENTRY( 0x00e8, NtWriteFile, 72 ) \
-    SYSCALL_ENTRY( 0x00e9, NtWriteFileGather, 72 ) \
-    SYSCALL_ENTRY( 0x00ea, NtWriteVirtualMemory, 40 ) \
-    SYSCALL_ENTRY( 0x00eb, NtYieldExecution, 0 ) \
-    SYSCALL_ENTRY( 0x00ec, wine_nt_to_unix_file_name, 32 ) \
-    SYSCALL_ENTRY( 0x00ed, wine_unix_to_nt_file_name, 24 )
+    SYSCALL_ENTRY( 0x00ca, NtSetIoCompletionEx, 48 ) \
+    SYSCALL_ENTRY( 0x00cb, NtSetLdtEntries, 32 ) \
+    SYSCALL_ENTRY( 0x00cc, NtSetSecurityObject, 24 ) \
+    SYSCALL_ENTRY( 0x00cd, NtSetSystemInformation, 24 ) \
+    SYSCALL_ENTRY( 0x00ce, NtSetSystemTime, 16 ) \
+    SYSCALL_ENTRY( 0x00cf, NtSetThreadExecutionState, 16 ) \
+    SYSCALL_ENTRY( 0x00d0, NtSetTimer, 56 ) \
+    SYSCALL_ENTRY( 0x00d1, NtSetTimerResolution, 24 ) \
+    SYSCALL_ENTRY( 0x00d2, NtSetValueKey, 48 ) \
+    SYSCALL_ENTRY( 0x00d3, NtSetVolumeInformationFile, 40 ) \
+    SYSCALL_ENTRY( 0x00d4, NtShutdownSystem, 8 ) \
+    SYSCALL_ENTRY( 0x00d5, NtSignalAndWaitForSingleObject, 32 ) \
+    SYSCALL_ENTRY( 0x00d6, NtSuspendProcess, 8 ) \
+    SYSCALL_ENTRY( 0x00d7, NtSuspendThread, 16 ) \
+    SYSCALL_ENTRY( 0x00d8, NtSystemDebugControl, 48 ) \
+    SYSCALL_ENTRY( 0x00d9, NtTerminateJobObject, 16 ) \
+    SYSCALL_ENTRY( 0x00da, NtTerminateProcess, 16 ) \
+    SYSCALL_ENTRY( 0x00db, NtTerminateThread, 16 ) \
+    SYSCALL_ENTRY( 0x00dc, NtTestAlert, 0 ) \
+    SYSCALL_ENTRY( 0x00dd, NtTraceControl, 48 ) \
+    SYSCALL_ENTRY( 0x00de, NtUnloadDriver, 8 ) \
+    SYSCALL_ENTRY( 0x00df, NtUnloadKey, 8 ) \
+    SYSCALL_ENTRY( 0x00e0, NtUnlockFile, 40 ) \
+    SYSCALL_ENTRY( 0x00e1, NtUnlockVirtualMemory, 32 ) \
+    SYSCALL_ENTRY( 0x00e2, NtUnmapViewOfSection, 16 ) \
+    SYSCALL_ENTRY( 0x00e3, NtUnmapViewOfSectionEx, 24 ) \
+    SYSCALL_ENTRY( 0x00e4, NtWaitForAlertByThreadId, 16 ) \
+    SYSCALL_ENTRY( 0x00e5, NtWaitForDebugEvent, 32 ) \
+    SYSCALL_ENTRY( 0x00e6, NtWaitForKeyedEvent, 32 ) \
+    SYSCALL_ENTRY( 0x00e7, NtWaitForMultipleObjects, 40 ) \
+    SYSCALL_ENTRY( 0x00e8, NtWaitForSingleObject, 24 ) \
+    SYSCALL_ENTRY( 0x00e9, NtWriteFile, 72 ) \
+    SYSCALL_ENTRY( 0x00ea, NtWriteFileGather, 72 ) \
+    SYSCALL_ENTRY( 0x00eb, NtWriteVirtualMemory, 40 ) \
+    SYSCALL_ENTRY( 0x00ec, NtYieldExecution, 0 ) \
+    SYSCALL_ENTRY( 0x00ed, wine_nt_to_unix_file_name, 32 ) \
+    SYSCALL_ENTRY( 0x00ee, wine_unix_to_nt_file_name, 24 )

dlls/ntdll/signal_arm64ec.c

@@ -443,6 +443,7 @@ DEFINE_SYSCALL(NtSetInformationToken, (HANDLE token, TOKEN_INFORMATION_CLASS cla
 DEFINE_SYSCALL(NtSetInformationVirtualMemory, (HANDLE process, VIRTUAL_MEMORY_INFORMATION_CLASS info_class, ULONG_PTR count, PMEMORY_RANGE_ENTRY addresses, PVOID ptr, ULONG size))
 DEFINE_SYSCALL(NtSetIntervalProfile, (ULONG interval, KPROFILE_SOURCE source))
 DEFINE_SYSCALL(NtSetIoCompletion, (HANDLE handle, ULONG_PTR key, ULONG_PTR value, NTSTATUS status, SIZE_T count))
+DEFINE_SYSCALL(NtSetIoCompletionEx, (HANDLE completion_handle, HANDLE completion_reserve_handle, ULONG_PTR key, ULONG_PTR value, NTSTATUS status, SIZE_T count))
 DEFINE_SYSCALL(NtSetLdtEntries, (ULONG sel1, LDT_ENTRY entry1, ULONG sel2, LDT_ENTRY entry2))
 DEFINE_SYSCALL(NtSetSecurityObject, (HANDLE handle, SECURITY_INFORMATION info, PSECURITY_DESCRIPTOR descr))
 DEFINE_SYSCALL(NtSetSystemInformation, (SYSTEM_INFORMATION_CLASS class, void *info, ULONG length))

dlls/ntdll/tests/file.c

@@ -51,6 +51,7 @@ static VOID     (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR );
 static BOOL     (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* );
 static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * );
 
+static NTSTATUS (WINAPI *pNtAllocateReserveObject)( HANDLE *, const OBJECT_ATTRIBUTES *, MEMORY_RESERVE_OBJECT_TYPE );
 static NTSTATUS (WINAPI *pNtCreateMailslotFile)( PHANDLE, ULONG, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK,
                                        ULONG, ULONG, ULONG, PLARGE_INTEGER );
 static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG);
@@ -76,6 +77,7 @@ static NTSTATUS (WINAPI *pNtQueryIoCompletion)(HANDLE, IO_COMPLETION_INFORMATION
 static NTSTATUS (WINAPI *pNtRemoveIoCompletion)(HANDLE, PULONG_PTR, PULONG_PTR, PIO_STATUS_BLOCK, PLARGE_INTEGER);
 static NTSTATUS (WINAPI *pNtRemoveIoCompletionEx)(HANDLE,FILE_IO_COMPLETION_INFORMATION*,ULONG,ULONG*,LARGE_INTEGER*,BOOLEAN);
 static NTSTATUS (WINAPI *pNtSetIoCompletion)(HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, SIZE_T);
+static NTSTATUS (WINAPI *pNtSetIoCompletionEx)(HANDLE, HANDLE, ULONG_PTR, ULONG_PTR, NTSTATUS, SIZE_T);
 static NTSTATUS (WINAPI *pNtSetInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS);
 static NTSTATUS (WINAPI *pNtQueryAttributesFile)(const OBJECT_ATTRIBUTES*,FILE_BASIC_INFORMATION*);
 static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, PVOID, ULONG, FILE_INFORMATION_CLASS);
@@ -5932,6 +5934,62 @@ static void test_reparse_points(void)
     CloseHandle( handle );
 }
 
+static void test_set_io_completion_ex(void)
+{
+    HANDLE completion, completion_reserve, apc_reserve;
+    LARGE_INTEGER timeout = {{0}};
+    IO_STATUS_BLOCK iosb;
+    ULONG_PTR key, value;
+    NTSTATUS status;
+    SIZE_T size = 3;
+
+    if (!pNtSetIoCompletionEx || !pNtAllocateReserveObject)
+    {
+        win_skip("NtSetIoCompletionEx() or NtAllocateReserveObject() is unavailable.\n");
+        return;
+    }
+
+    if (sizeof(size) > 4) size |= (ULONGLONG)0x12345678 << 32;
+
+    status = pNtCreateIoCompletion(&completion, IO_COMPLETION_ALL_ACCESS, NULL, 0);
+    ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+    status = pNtAllocateReserveObject(&completion_reserve, NULL, MemoryReserveObjectTypeIoCompletion);
+    ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+    status = pNtAllocateReserveObject(&apc_reserve, NULL, MemoryReserveObjectTypeUserApc);
+    ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+
+    /* Parameter checks */
+    status = pNtSetIoCompletionEx(NULL, completion_reserve, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status);
+
+    status = pNtSetIoCompletionEx(INVALID_HANDLE_VALUE, completion_reserve, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
+
+    status = pNtSetIoCompletionEx(completion, NULL, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_INVALID_HANDLE, "Got unexpected status %#lx.\n", status);
+
+    status = pNtSetIoCompletionEx(completion, INVALID_HANDLE_VALUE, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
+
+    status = pNtSetIoCompletionEx(completion, apc_reserve, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_OBJECT_TYPE_MISMATCH, "Got unexpected status %#lx.\n", status);
+
+    /* Normal call */
+    status = pNtSetIoCompletionEx(completion, completion_reserve, CKEY_FIRST, CVALUE_FIRST, STATUS_INVALID_DEVICE_REQUEST, size);
+    ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+
+    status = pNtRemoveIoCompletion(completion, &key, &value, &iosb, &timeout);
+    ok(status == STATUS_SUCCESS, "Got unexpected status %#lx.\n", status);
+    ok(key == CKEY_FIRST, "Invalid completion key: %#Ix\n", key);
+    ok(iosb.Information == size, "Invalid iosb.Information: %Iu\n", iosb.Information);
+    ok(iosb.Status == STATUS_INVALID_DEVICE_REQUEST, "Invalid iosb.Status: %#lx\n", iosb.Status);
+    ok(value == CVALUE_FIRST, "Invalid completion value: %#Ix\n", value);
+
+    CloseHandle(apc_reserve);
+    CloseHandle(completion_reserve);
+    CloseHandle(completion);
+}
+
 START_TEST(file)
 {
     HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -5949,6 +6007,7 @@ START_TEST(file)
     pRtlInitUnicodeString   = (void *)GetProcAddress(hntdll, "RtlInitUnicodeString");
     pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U");
     pRtlWow64EnableFsRedirectionEx = (void *)GetProcAddress(hntdll, "RtlWow64EnableFsRedirectionEx");
+    pNtAllocateReserveObject= (void *)GetProcAddress(hntdll, "NtAllocateReserveObject");
     pNtCreateMailslotFile   = (void *)GetProcAddress(hntdll, "NtCreateMailslotFile");
     pNtCreateFile           = (void *)GetProcAddress(hntdll, "NtCreateFile");
     pNtOpenFile             = (void *)GetProcAddress(hntdll, "NtOpenFile");
@@ -5965,6 +6024,7 @@ START_TEST(file)
     pNtRemoveIoCompletion   = (void *)GetProcAddress(hntdll, "NtRemoveIoCompletion");
     pNtRemoveIoCompletionEx = (void *)GetProcAddress(hntdll, "NtRemoveIoCompletionEx");
     pNtSetIoCompletion      = (void *)GetProcAddress(hntdll, "NtSetIoCompletion");
+    pNtSetIoCompletionEx    = (void *)GetProcAddress(hntdll, "NtSetIoCompletionEx");
     pNtSetInformationFile   = (void *)GetProcAddress(hntdll, "NtSetInformationFile");
     pNtQueryAttributesFile  = (void *)GetProcAddress(hntdll, "NtQueryAttributesFile");
     pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile");
@@ -5983,6 +6043,7 @@ START_TEST(file)
     append_file_test();
     nt_mailslot_test();
     test_set_io_completion();
+    test_set_io_completion_ex();
     test_file_io_completion();
     test_file_basic_information();
     test_file_all_information();

dlls/ntdll/tests/rtl.c

@@ -4052,10 +4052,9 @@ static void test_user_procs(void)
         status = pRtlInitializeNtUserPfn( dummy, size_A, dummy + 1, size_W, dummy + 2, size_workers );
         if (!status) break;
         ok( status == STATUS_INVALID_PARAMETER, "RtlInitializeNtUserPfn failed %lx\n", status );
-        status = pRtlResetNtUserPfn();
-        ok( status == STATUS_INVALID_PARAMETER, "RtlResetNtUserPfn failed %lx\n", status );
     }
     trace( "got sizes %lx %lx %lx\n", size_A, size_W, size_workers );
+    if (!size_workers) return;  /* something went wrong */
     ok( !memcmp( ptrs, ptr_A, size_A ), "pointers changed by init\n" );
 
     /* can't set twice without a reset */

dlls/ntdll/unix/server.c

@@ -354,7 +354,7 @@ static int wait_select_reply( void *cookie )
 /***********************************************************************
  *              invoke_user_apc
  */
-static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTATUS status )
+static NTSTATUS invoke_user_apc( CONTEXT *context, const struct user_apc *apc, NTSTATUS status )
 {
     return call_user_apc_dispatcher( context, apc->args[0], apc->args[1], apc->args[2],
                                      wine_server_get_ptr( apc->func ), status );
@@ -364,7 +364,7 @@ static NTSTATUS invoke_user_apc( CONTEXT *context, const user_apc_t *apc, NTSTAT
 /***********************************************************************
  *              invoke_system_apc
  */
-static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self )
+static void invoke_system_apc( const union apc_call *call, union apc_result *result, BOOL self )
 {
     SIZE_T size, bits;
     void *addr;
@@ -687,20 +687,20 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO
 /***********************************************************************
  *              server_select
  */
-unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags,
-                            timeout_t abs_timeout, context_t *context, user_apc_t *user_apc )
+unsigned int server_select( const union select_op *select_op, data_size_t size, UINT flags,
+                            timeout_t abs_timeout, context_t *context, struct user_apc *user_apc )
 {
     unsigned int ret;
     int cookie;
     obj_handle_t apc_handle = 0;
     BOOL suspend_context = !!context;
-    apc_result_t result;
+    union apc_result result;
     sigset_t old_set;
     int signaled;
     data_size_t reply_size;
     struct
     {
-        apc_call_t call;
+        union apc_call call;
         context_t  context[2];
     } reply_data;
 
@@ -740,7 +740,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT
 
             /* don't signal multiple times */
             if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT)
-                size = offsetof( select_op_t, signal_and_wait.signal );
+                size = offsetof( union select_op, signal_and_wait.signal );
         }
         pthread_sigmask( SIG_SETMASK, &old_set, NULL );
         if (signaled) break;
@@ -763,12 +763,12 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT
 /***********************************************************************
  *              server_wait
  */
-unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags,
+unsigned int server_wait( const union select_op *select_op, data_size_t size, UINT flags,
                           const LARGE_INTEGER *timeout )
 {
     timeout_t abs_timeout = timeout ? timeout->QuadPart : TIMEOUT_INFINITE;
     unsigned int ret;
-    user_apc_t apc;
+    struct user_apc apc;
 
     if (abs_timeout < 0)
     {
@@ -794,7 +794,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f
  */
 NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable )
 {
-    user_apc_t apc;
+    struct user_apc apc;
     NTSTATUS status;
 
     if (alertable)
@@ -811,7 +811,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable )
  */
 NTSTATUS WINAPI NtTestAlert(void)
 {
-    user_apc_t apc;
+    struct user_apc apc;
     NTSTATUS status;
 
     status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc );
@@ -823,7 +823,7 @@ NTSTATUS WINAPI NtTestAlert(void)
 /***********************************************************************
  *           server_queue_process_apc
  */
-unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, apc_result_t *result )
+unsigned int server_queue_process_apc( HANDLE process, const union apc_call *call, union apc_result *result )
 {
     for (;;)
     {
@@ -1759,8 +1759,8 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE
 
     if ((options & DUPLICATE_CLOSE_SOURCE) && source_process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 

dlls/ntdll/unix/sync.c

@@ -993,7 +993,7 @@ NTSTATUS WINAPI NtSetInformationDebugObject( HANDLE handle, DEBUGOBJECTINFOCLASS
 
 
 /* convert the server event data to an NT state change; helper for NtWaitForDebugEvent */
-static NTSTATUS event_data_to_state_change( const debug_event_t *data, DBGUI_WAIT_STATE_CHANGE *state )
+static NTSTATUS event_data_to_state_change( const union debug_event_data *data, DBGUI_WAIT_STATE_CHANGE *state )
 {
     int i;
 
@@ -1098,7 +1098,7 @@ static NTSTATUS get_image_machine( HANDLE handle, USHORT *machine )
 NTSTATUS WINAPI NtWaitForDebugEvent( HANDLE handle, BOOLEAN alertable, LARGE_INTEGER *timeout,
                                      DBGUI_WAIT_STATE_CHANGE *state )
 {
-    debug_event_t data;
+    union debug_event_data data;
     unsigned int ret;
     BOOL wait = TRUE;
 
@@ -1572,7 +1572,7 @@ NTSTATUS WINAPI NtQueryTimer( HANDLE handle, TIMER_INFORMATION_CLASS class,
 NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
                                           BOOLEAN alertable, const LARGE_INTEGER *timeout )
 {
-    select_op_t select_op;
+    union select_op select_op;
     UINT i, flags = SELECT_INTERRUPTIBLE;
 
     if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1;
@@ -1580,7 +1580,7 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
     if (alertable) flags |= SELECT_ALERTABLE;
     select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL;
     for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] );
-    return server_wait( &select_op, offsetof( select_op_t, wait.handles[count] ), flags, timeout );
+    return server_wait( &select_op, offsetof( union select_op, wait.handles[count] ), flags, timeout );
 }
 
 
@@ -1599,7 +1599,7 @@ NTSTATUS WINAPI NtWaitForSingleObject( HANDLE handle, BOOLEAN alertable, const L
 NTSTATUS WINAPI NtSignalAndWaitForSingleObject( HANDLE signal, HANDLE wait,
                                                 BOOLEAN alertable, const LARGE_INTEGER *timeout )
 {
-    select_op_t select_op;
+    union select_op select_op;
     UINT flags = SELECT_INTERRUPTIBLE;
 
     if (!signal) return STATUS_INVALID_HANDLE;
@@ -1883,7 +1883,7 @@ NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJE
 NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key,
                                      BOOLEAN alertable, const LARGE_INTEGER *timeout )
 {
-    select_op_t select_op;
+    union select_op select_op;
     UINT flags = SELECT_INTERRUPTIBLE;
 
     if (!handle) handle = keyed_event;
@@ -1902,7 +1902,7 @@ NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key,
 NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key,
                                      BOOLEAN alertable, const LARGE_INTEGER *timeout )
 {
-    select_op_t select_op;
+    union select_op select_op;
     UINT flags = SELECT_INTERRUPTIBLE;
 
     if (!handle) handle = keyed_event;
@@ -1992,6 +1992,35 @@ NTSTATUS WINAPI NtSetIoCompletion( HANDLE handle, ULONG_PTR key, ULONG_PTR value
     return ret;
 }
 
+/***********************************************************************
+ *             NtSetIoCompletionEx (NTDLL.@)
+ *
+ * completion_reserve_handle is a handle allocated by NtAllocateReserveObject() for pre-allocating
+ * memory for completion objects to deal with low-memory situations. It's not in use for now.
+ */
+NTSTATUS WINAPI NtSetIoCompletionEx( HANDLE completion_handle, HANDLE completion_reserve_handle,
+                                     ULONG_PTR key, ULONG_PTR value, NTSTATUS status, SIZE_T count )
+{
+    unsigned int ret;
+
+    TRACE( "(%p, %p, %lx, %lx, %x, %lx)\n", completion_handle, completion_reserve_handle,
+           key, value, (int)status, count );
+
+    if (!completion_reserve_handle) return STATUS_INVALID_HANDLE;
+
+    SERVER_START_REQ( add_completion )
+    {
+        req->handle         = wine_server_obj_handle( completion_handle );
+        req->ckey           = key;
+        req->cvalue         = value;
+        req->status         = status;
+        req->information    = count;
+        req->reserve_handle = wine_server_obj_handle( completion_reserve_handle );
+        ret = wine_server_call( req );
+    }
+    SERVER_END_REQ;
+    return ret;
+}
 
 /***********************************************************************
  *             NtRemoveIoCompletion (NTDLL.@)

dlls/ntdll/unix/system.c

@@ -3479,6 +3479,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
             ret = STATUS_INFO_LENGTH_MISMATCH;
             break;
         }
+        len = 0;
 
         switch (sfti->Action)
         {
@@ -3489,7 +3490,6 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class,
             ret = get_firmware_info(sfti, size, &len);
             break;
         default:
-            len = 0;
             ret = STATUS_NOT_IMPLEMENTED;
             FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION action %d\n", sfti->Action);
         }

dlls/ntdll/unix/thread.c

@@ -1323,8 +1323,8 @@ NTSTATUS WINAPI NtCreateThreadEx( HANDLE *handle, ACCESS_MASK access, OBJECT_ATT
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -1512,7 +1512,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c
     DWORD i;
     obj_handle_t handle = 0;
     client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS];
-    select_op_t select_op;
+    union select_op select_op;
     sigset_t old_set;
 
     if (!peb->BeingDebugged) return 0;  /* no debugger present */
@@ -1545,7 +1545,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c
         contexts_to_server( server_contexts, context );
         server_contexts[0].flags |= SERVER_CTX_EXEC_SPACE;
         server_contexts[0].exec_space.space.space = exception ? EXEC_SPACE_EXCEPTION : EXEC_SPACE_SYSCALL;
-        server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE,
+        server_select( &select_op, offsetof( union select_op, wait.handles[1] ), SELECT_INTERRUPTIBLE,
                        TIMEOUT_INFINITE, server_contexts, NULL );
 
         SERVER_START_REQ( get_exception_status )
@@ -1712,7 +1712,7 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1
                                   ULONG_PTR arg2, ULONG_PTR arg3 )
 {
     unsigned int ret;
-    apc_call_t call;
+    union apc_call call;
 
     SERVER_START_REQ( queue_apc )
     {

dlls/ntdll/unix/unix_private.h

@@ -208,12 +208,12 @@ extern void start_server( BOOL debug );
 extern unsigned int server_call_unlocked( void *req_ptr );
 extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset );
 extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset );
-extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags,
-                                   timeout_t abs_timeout, context_t *context, user_apc_t *user_apc );
-extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags,
+extern unsigned int server_select( const union select_op *select_op, data_size_t size, UINT flags,
+                                   timeout_t abs_timeout, context_t *context, struct user_apc *user_apc );
+extern unsigned int server_wait( const union select_op *select_op, data_size_t size, UINT flags,
                                  const LARGE_INTEGER *timeout );
-extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call,
-                                              apc_result_t *result );
+extern unsigned int server_queue_process_apc( HANDLE process, const union apc_call *call,
+                                              union apc_result *result );
 extern int server_get_unix_fd( HANDLE handle, unsigned int wanted_access, int *unix_fd,
                                int *needs_close, enum server_fd_type *type, unsigned int *options );
 extern void wine_server_send_fd( int fd );
@@ -436,10 +436,10 @@ static inline void mutex_unlock( pthread_mutex_t *mutex )
     if (!process_exiting) pthread_mutex_unlock( mutex );
 }
 
-static inline async_data_t server_async( HANDLE handle, struct async_fileio *user, HANDLE event,
+static inline struct async_data server_async( HANDLE handle, struct async_fileio *user, HANDLE event,
                                               PIO_APC_ROUTINE apc, void *apc_context, client_ptr_t iosb )
 {
-    async_data_t async;
+    struct async_data async;
     async.handle      = wine_server_obj_handle( handle );
     async.user        = wine_server_client_ptr( user );
     async.iosb        = iosb;

dlls/ntdll/unix/virtual.c

@@ -4671,8 +4671,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, ULONG_PTR z
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
         unsigned int status;
 
         memset( &call, 0, sizeof(call) );
@@ -4817,8 +4817,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -4864,8 +4864,8 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -4962,8 +4962,8 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5146,8 +5146,8 @@ static unsigned int get_basic_memory_info( HANDLE process, LPCVOID addr,
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5559,8 +5559,8 @@ NTSTATUS WINAPI NtLockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size,
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5596,8 +5596,8 @@ NTSTATUS WINAPI NtUnlockVirtualMemory( HANDLE process, PVOID *addr, SIZE_T *size
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5672,8 +5672,8 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5744,8 +5744,8 @@ NTSTATUS WINAPI NtMapViewOfSectionEx( HANDLE handle, HANDLE process, PVOID *addr
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5788,8 +5788,8 @@ static NTSTATUS unmap_view_of_section( HANDLE process, PVOID addr, ULONG flags )
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -5973,8 +5973,8 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr,
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 
@@ -6359,8 +6359,8 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
 
     if (process != NtCurrentProcess())
     {
-        apc_call_t call;
-        apc_result_t result;
+        union apc_call call;
+        union apc_result result;
 
         memset( &call, 0, sizeof(call) );
 

dlls/ntoskrnl.exe/ntoskrnl.c

@@ -506,7 +506,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp,
 
 struct dispatch_context
 {
-    irp_params_t params;
+    union irp_params params;
     HANDLE handle;
     struct irp_data *irp_data;
     ULONG  in_size;

dlls/ntoskrnl.exe/ntoskrnl.exe.spec

@@ -1525,6 +1525,7 @@
 @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken
 @ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile
 @ stdcall -private ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion
+@ stdcall -private ZwSetIoCompletionEx(ptr ptr long long long long) NtSetIoCompletionEx
 @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject
 @ stdcall -private ZwSetSystemInformation(long ptr long) NtSetSystemInformation
 @ stdcall -private ZwSetSystemTime(ptr ptr) NtSetSystemTime

dlls/opengl32/wgl.c

@@ -1176,7 +1176,7 @@ typedef struct _bezier_vector {
     GLdouble y;
 } bezier_vector;
 
-static double bezier_deviation_squared(const bezier_vector *p)
+static BOOL bezier_fits_deviation(const bezier_vector *p, FLOAT max_deviation)
 {
     bezier_vector deviation;
     bezier_vector vertex;
@@ -1184,13 +1184,23 @@ static double bezier_deviation_squared(const bezier_vector *p)
     double base_length;
     double dot;
 
+    max_deviation *= max_deviation;
+
     vertex.x = (p[0].x + p[1].x*2 + p[2].x)/4 - p[0].x;
     vertex.y = (p[0].y + p[1].y*2 + p[2].y)/4 - p[0].y;
 
     base.x = p[2].x - p[0].x;
     base.y = p[2].y - p[0].y;
 
-    base_length = sqrt(base.x*base.x + base.y*base.y);
+    base_length = base.x * base.x + base.y * base.y;
+    if (base_length <= max_deviation)
+    {
+        base.x = 0.0;
+        base.y = 0.0;
+    }
+    else
+    {
+        base_length = sqrt(base_length);
         base.x /= base_length;
         base.y /= base_length;
 
@@ -1198,11 +1208,12 @@ static double bezier_deviation_squared(const bezier_vector *p)
         dot = min(max(dot, 0.0), base_length);
         base.x *= dot;
         base.y *= dot;
+    }
 
     deviation.x = vertex.x-base.x;
     deviation.y = vertex.y-base.y;
 
-    return deviation.x*deviation.x + deviation.y*deviation.y;
+    return deviation.x*deviation.x + deviation.y*deviation.y <= max_deviation;
 }
 
 static int bezier_approximate(const bezier_vector *p, bezier_vector *points, FLOAT deviation)
@@ -1212,7 +1223,7 @@ static int bezier_approximate(const bezier_vector *p, bezier_vector *points, FLO
     bezier_vector vertex;
     int total_vertices;
 
-    if(bezier_deviation_squared(p) <= deviation*deviation)
+    if (bezier_fits_deviation(p, deviation))
     {
         if(points)
             *points = p[2];

dlls/user.exe16/window.c

@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "wine/winuser16.h"
 #include "wownt32.h"
 #include "user_private.h"
 #include "wine/list.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win);
@@ -192,22 +193,16 @@ BOOL16 WINAPI SetProp16( HWND16 hwnd, LPCSTR str, HANDLE16 handle )
  */
 INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
 {
-    int ret = -1, i, count, total = 32;
-    property_data_t *list;
+    int ret = -1, i;
+    struct ntuser_property_list *list;
+    ULONG count, total = 32;
+    NTSTATUS status;
 
     while (total)
     {
         if (!(list = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*list) ))) break;
-        count = 0;
-        SERVER_START_REQ( get_window_properties )
-        {
-            req->window = wine_server_user_handle( HWND_32(hwnd) );
-            wine_server_set_reply( req, list, total * sizeof(*list) );
-            if (!wine_server_call( req )) count = reply->total;
-        }
-        SERVER_END_REQ;
-
-        if (count && count <= total)
+        status = NtUserBuildPropList( WIN_Handle32(hwnd), total, list, &count );
+        if (!status && count)
         {
             char string[ATOM_BUFFER_SIZE];
             SEGPTR segptr = MapLS( string );
@@ -239,6 +234,7 @@ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func )
             break;
         }
         HeapFree( GetProcessHeap(), 0, list );
+        if (status != STATUS_BUFFER_TOO_SMALL) break;
         total = count;  /* restart with larger buffer */
     }
     return ret;

dlls/user32/clipboard.c

@@ -29,7 +29,6 @@
 #include "winnls.h"
 #include "objidl.h"
 #include "shlobj.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(clipboard);
@@ -164,7 +163,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
         {
             char *ptr;
             if (!(size = GlobalSize( handle ))) return 0;
-            if ((data_size_t)size != size) return 0;
+            if ((UINT)size != size) return 0;
             if (size < sizeof(WCHAR)) return 0;
             if (!(ptr = GlobalLock( handle ))) return 0;
             /* enforce nul-termination the Windows way: ignoring alignment */
@@ -178,7 +177,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
         {
             char *ptr;
             if (!(size = GlobalSize( handle ))) return 0;
-            if ((data_size_t)size != size) return 0;
+            if ((UINT)size != size) return 0;
             if (!(ptr = GlobalLock( handle ))) return 0;
             ptr[size - 1] = 0;  /* enforce null-termination */
             GlobalUnlock( handle );
@@ -187,14 +186,14 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size )
         }
     default:
         if (!(size = GlobalSize( handle ))) return 0;
-        if ((data_size_t)size != size) return 0;
+        if ((UINT)size != size) return 0;
         *ret_size = size;
         return handle;
     }
 }
 
 /* rebuild the target handle from the data received in GetClipboardData */
-static HANDLE unmarshal_data( UINT format, void *data, data_size_t size )
+static HANDLE unmarshal_data( UINT format, void *data, UINT size )
 {
     HANDLE handle = GlobalReAlloc( data, size, GMEM_MOVEABLE );  /* release unused space */
 

dlls/user32/message.c

@@ -333,10 +333,9 @@ static HGLOBAL dde_get_pair(HGLOBAL shm)
  *
  * Post a DDE message
  */
-NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type )
+NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid )
 {
-    void*       ptr = NULL;
-    int         size = 0;
+    struct post_dde_message_call_params params = { .dest_tid = dest_tid };
     UINT_PTR    uiLo, uiHi;
     LPARAM      lp;
     HGLOBAL     hunlock = 0;
@@ -364,8 +363,8 @@ NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DW
             {
                 hpack = pack_ptr( h );
                 /* send back the value of h on the other side */
-                ptr = &hpack;
-                size = sizeof(hpack);
+                params.ptr = &hpack;
+                params.size = sizeof(hpack);
                 lp = uiLo;
                 TRACE( "send dde-ack %Ix %08Ix => %p\n", uiLo, uiHi, h );
             }
@@ -382,10 +381,10 @@ NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DW
     case WM_DDE_POKE:
         if (uiLo)
         {
-            size = GlobalSize( (HGLOBAL)uiLo ) ;
-            if ((msg == WM_DDE_ADVISE && size < sizeof(DDEADVISE)) ||
-                (msg == WM_DDE_DATA   && size < FIELD_OFFSET(DDEDATA, Value)) ||
-                (msg == WM_DDE_POKE   && size < FIELD_OFFSET(DDEPOKE, Value)))
+            params.size = GlobalSize( (HGLOBAL)uiLo ) ;
+            if ((msg == WM_DDE_ADVISE && params.size < sizeof(DDEADVISE)) ||
+                (msg == WM_DDE_DATA   && params.size < FIELD_OFFSET(DDEDATA, Value)) ||
+                (msg == WM_DDE_POKE   && params.size < FIELD_OFFSET(DDEPOKE, Value)))
                 return STATUS_INVALID_PARAMETER;
         }
         else if (msg != WM_DDE_DATA) return STATUS_INVALID_PARAMETER;
@@ -393,23 +392,23 @@ NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DW
         lp = uiHi;
         if (uiLo)
         {
-            if ((ptr = GlobalLock( (HGLOBAL)uiLo) ))
+            if ((params.ptr = GlobalLock( (HGLOBAL)uiLo) ))
             {
-                DDEDATA *dde_data = ptr;
+                DDEDATA *dde_data = params.ptr;
                 TRACE("unused %d, fResponse %d, fRelease %d, fDeferUpd %d, fAckReq %d, cfFormat %d\n",
                        dde_data->unused, dde_data->fResponse, dde_data->fRelease,
                        dde_data->reserved, dde_data->fAckReq, dde_data->cfFormat);
                 hunlock = (HGLOBAL)uiLo;
             }
         }
-        TRACE( "send ddepack %u %Ix\n", size, uiHi );
+        TRACE( "send ddepack %u %Ix\n", params.size, uiHi );
         break;
     case WM_DDE_EXECUTE:
         if (lparam)
         {
-            if ((ptr = GlobalLock( (HGLOBAL)lparam) ))
+            if ((params.ptr = GlobalLock( (HGLOBAL)lparam) ))
             {
-                size = GlobalSize( (HGLOBAL)lparam );
+                params.size = GlobalSize( (HGLOBAL)lparam );
                 /* so that the other side can send it back on ACK */
                 lp = lparam;
                 hunlock = (HGLOBAL)lparam;
@@ -417,20 +416,9 @@ NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DW
         }
         break;
     }
-    SERVER_START_REQ( send_message )
-    {
-        req->id      = dest_tid;
-        req->type    = type;
-        req->flags   = 0;
-        req->win     = wine_server_user_handle( hwnd );
-        req->msg     = msg;
-        req->wparam  = wparam;
-        req->lparam  = lp;
-        req->timeout = TIMEOUT_INFINITE;
-        if (size) wine_server_add_data( req, ptr, size );
-        if (!(res = wine_server_call( req ))) FreeDDElParam( msg, lparam );
-    }
-    SERVER_END_REQ;
+
+    res = NtUserMessageCall( hwnd, msg, wparam, lp, &params, NtUserPostDdeCall, FALSE );
+    if (!res) FreeDDElParam( msg, lparam );
     if (hunlock) GlobalUnlock(hunlock);
 
     return res;
@@ -746,12 +734,7 @@ BOOL WINAPI PostThreadMessageA( DWORD thread, UINT msg, WPARAM wparam, LPARAM lp
  */
 void WINAPI PostQuitMessage( INT exit_code )
 {
-    SERVER_START_REQ( post_quit_message )
-    {
-        req->exit_code = exit_code;
-        wine_server_call( req );
-    }
-    SERVER_END_REQ;
+    NtUserPostQuitMessage( exit_code );
 }
 
 /***********************************************************************

dlls/user32/property.c

@@ -21,11 +21,12 @@
 #include <stdarg.h>
 #include <string.h>
 
+#include "ntstatus.h"
+#define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "winnls.h"
 #include "ntuser.h"
-#include "wine/server.h"
 
 /* size of buffer needed to store an atom string */
 #define ATOM_BUFFER_SIZE 256
@@ -37,30 +38,19 @@
  * Retrieve the list of properties of a given window.
  * Returned buffer must be freed by caller.
  */
-static property_data_t *get_properties( HWND hwnd, int *count )
+static struct ntuser_property_list *get_properties( HWND hwnd, ULONG *count )
 {
-    property_data_t *data;
+    struct ntuser_property_list *props;
     int total = 32;
+    NTSTATUS status;
 
     while (total)
     {
-        int res = 0;
-        if (!(data = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*data) ))) break;
-        *count = 0;
-        SERVER_START_REQ( get_window_properties )
-        {
-            req->window = wine_server_user_handle( hwnd );
-            wine_server_set_reply( req, data, total * sizeof(*data) );
-            if (!wine_server_call( req )) res = reply->total;
-        }
-        SERVER_END_REQ;
-        if (res && res <= total)
-        {
-            *count = res;
-            return data;
-        }
-        HeapFree( GetProcessHeap(), 0, data );
-        total = res;  /* restart with larger buffer */
+        if (!(props = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*props) ))) break;
+        if (!(status = NtUserBuildPropList( hwnd, total, props, count ))) return props;
+        HeapFree( GetProcessHeap(), 0, props );
+        if (status != STATUS_BUFFER_TOO_SMALL) break;
+        total = *count;  /* restart with larger buffer */
     }
     return NULL;
 }
@@ -179,8 +169,9 @@ HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str )
  */
 INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
 {
-    int ret = -1, i, count;
-    property_data_t *list = get_properties( hwnd, &count );
+    int ret = -1;
+    ULONG i, count;
+    struct ntuser_property_list *list = get_properties( hwnd, &count );
 
     if (list)
     {
@@ -201,8 +192,9 @@ INT WINAPI EnumPropsExA(HWND hwnd, PROPENUMPROCEXA func, LPARAM lParam)
  */
 INT WINAPI EnumPropsExW(HWND hwnd, PROPENUMPROCEXW func, LPARAM lParam)
 {
-    int ret = -1, i, count;
-    property_data_t *list = get_properties( hwnd, &count );
+    int ret = -1;
+    ULONG i, count;
+    struct ntuser_property_list *list = get_properties( hwnd, &count );
 
     if (list)
     {

dlls/user32/tests/msg.c

@@ -6187,6 +6187,13 @@ static const struct message WmMove_mouse[] = {
     { 0 }
 };
 
+static const struct message WmMove_mouse2[] = {
+    { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE },
+    { WM_GETTEXT, sent|optional },
+    { WM_GETMINMAXINFO, sent|defwinproc },
+    { 0 }
+};
+
 static void test_setwindowpos(void)
 {
     HWND hwnd;
@@ -6253,6 +6260,11 @@ static void test_setwindowpos(void)
     ok(res == TRUE, "SetWindowPos expected TRUE, got %Id.\n", res);
     flush_events();
     ok_sequence(WmMove_mouse, "MouseMove", FALSE);
+    /* if the window and client rects were not changed WM_MOUSEMOVE is not sent. */
+    res = SetWindowPos( hwnd, 0, 205, 205, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE );
+    ok(res == TRUE, "SetWindowPos expected TRUE, got %Id.\n", res);
+    flush_events();
+    ok_sequence(WmMove_mouse2, "MouseMove2", FALSE);
     ignore_mouse_messages = TRUE;
 
     DestroyWindow(hwnd);

dlls/user32/tests/win.c

@@ -4067,11 +4067,8 @@ static void test_SetForegroundWindow(HWND hwnd)
     while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
     if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0);
 
-    /* FIXME: these tests are failing because of a race condition
-     * between internal focus state applied immediately and X11 focus
-     * message coming late */
-    todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow());
-    todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus());
+    ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow());
+    ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus());
 
     SetForegroundWindow(hwnd);
     check_wnd_state(hwnd, hwnd, hwnd, 0);

dlls/user32/user_main.c

@@ -126,7 +126,7 @@ static NTSTATUS WINAPI User32PostDDEMessage( void *args, ULONG size )
 {
     const struct post_dde_message_params *params = args;
     return post_dde_message( params->hwnd, params->msg, params->wparam, params->lparam,
-                             params->dest_tid, params->type );
+                             params->dest_tid );
 }
 
 static NTSTATUS WINAPI User32RenderSsynthesizedFormat( void *args, ULONG size )

dlls/user32/user_private.h

@@ -46,8 +46,7 @@ struct wm_char_mapping_data
 
 extern HMODULE user32_module;
 
-extern NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid,
-                                  DWORD type );
+extern NTSTATUS post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid );
 extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam,
                                 const void *buffer, size_t size );
 extern void free_cached_data( UINT format, HANDLE handle );

dlls/user32/winstation.c

@@ -30,7 +30,6 @@
 #include "winuser.h"
 #include "winternl.h"
 #include "ddk/wdm.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 #include "user_private.h"
 
@@ -54,6 +53,34 @@ static BOOL CALLBACK enum_names_WtoA( LPWSTR name, LPARAM lparam )
     return data->func( buffer, data->lparam );
 }
 
+static BOOL enum_names( HWINSTA handle, NAMEENUMPROCW func, LPARAM lparam )
+{
+    struct ntuser_name_list *list;
+    ULONG i, size = offsetof( struct ntuser_name_list, strings[256] );
+    WCHAR *name;
+    NTSTATUS status;
+    BOOL ret = TRUE;
+
+    while (size)
+    {
+        if (!(list = HeapAlloc( GetProcessHeap(), 0, size ))) break;
+        if (!(status = NtUserBuildNameList( handle, size, list, &size )))
+        {
+            for (i = 0, name = list->strings; ret && i < list->count; i++, name += wcslen( name ) + 1)
+                ret = func( name, lparam );
+        }
+        HeapFree( GetProcessHeap(), 0, list );
+        if (status != STATUS_BUFFER_TOO_SMALL) break;
+    }
+
+    if (status)
+    {
+        SetLastError( RtlNtStatusToDosError( status ) );
+        return FALSE;
+    }
+    return ret;
+}
+
 /* return a handle to the directory where window station objects are created */
 static HANDLE get_winstations_dir_handle(void)
 {
@@ -194,32 +221,7 @@ BOOL WINAPI EnumWindowStationsA( WINSTAENUMPROCA func, LPARAM lparam )
  */
 BOOL WINAPI EnumWindowStationsW( WINSTAENUMPROCW func, LPARAM lparam )
 {
-    unsigned int index = 0;
-    WCHAR name[MAX_PATH];
-    BOOL ret = TRUE;
-    NTSTATUS status;
-
-    while (ret)
-    {
-        SERVER_START_REQ( enum_winstation )
-        {
-            req->index = index;
-            wine_server_set_reply( req, name, sizeof(name) - sizeof(WCHAR) );
-            status = wine_server_call( req );
-            name[wine_server_reply_size(reply)/sizeof(WCHAR)] = 0;
-            index = reply->next;
-        }
-        SERVER_END_REQ;
-        if (status == STATUS_NO_MORE_ENTRIES)
-            break;
-        if (status)
-        {
-            SetLastError( RtlNtStatusToDosError( status ) );
-            return FALSE;
-        }
-        ret = func( name, lparam );
-    }
-    return ret;
+    return enum_names( 0, func, lparam );
 }
 
 
@@ -327,36 +329,10 @@ BOOL WINAPI EnumDesktopsA( HWINSTA winsta, DESKTOPENUMPROCA func, LPARAM lparam
  */
 BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam )
 {
-    unsigned int index = 0;
-    WCHAR name[MAX_PATH];
-    BOOL ret = TRUE;
-    NTSTATUS status;
-
     if (!winsta)
         winsta = NtUserGetProcessWindowStation();
 
-    while (ret)
-    {
-        SERVER_START_REQ( enum_desktop )
-        {
-            req->winstation = wine_server_obj_handle( winsta );
-            req->index      = index;
-            wine_server_set_reply( req, name, sizeof(name) - sizeof(WCHAR) );
-            status = wine_server_call( req );
-            name[wine_server_reply_size(reply)/sizeof(WCHAR)] = 0;
-            index = reply->next;
-        }
-        SERVER_END_REQ;
-        if (status == STATUS_NO_MORE_ENTRIES)
-            break;
-        if (status)
-        {
-            SetLastError( RtlNtStatusToDosError( status ) );
-            return FALSE;
-        }
-        ret = func(name, lparam);
-    }
-    return ret;
+    return enum_names( winsta, func, lparam );
 }
 
 

dlls/win32u/main.c

@@ -1133,6 +1133,16 @@ NTSTATUS SYSCALL_API NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3,
     SYSCALL_FUNC( NtUserBuildHwndList );
 }
 
+NTSTATUS SYSCALL_API NtUserBuildNameList( HWINSTA winsta, ULONG size, struct ntuser_name_list *buffer, ULONG *ret_size )
+{
+    SYSCALL_FUNC( NtUserBuildNameList );
+}
+
+NTSTATUS SYSCALL_API NtUserBuildPropList( HWND hwnd, ULONG count, struct ntuser_property_list *buffer, ULONG *ret_count )
+{
+    SYSCALL_FUNC( NtUserBuildPropList );
+}
+
 ULONG_PTR SYSCALL_API NtUserCallHwnd( HWND hwnd, DWORD code )
 {
     SYSCALL_FUNC( NtUserCallHwnd );

dlls/win32u/message.c

@@ -34,7 +34,6 @@
 #include "dbt.h"
 #include "dde.h"
 #include "immdev.h"
-#include "wine/server.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msg);
@@ -2729,7 +2728,7 @@ int peek_message( MSG *msg, const struct peek_message_filter *filter )
     {
         NTSTATUS res;
         size_t size = 0;
-        const message_data_t *msg_data = buffer;
+        const union message_data *msg_data = buffer;
         UINT wake_mask, signal_bits, wake_bits, changed_bits, clear_bits = 0;
 
         /* use the same logic as in server/queue.c get_message */
@@ -3320,7 +3319,7 @@ BOOL WINAPI NtUserGetMessage( MSG *msg, HWND hwnd, UINT first, UINT last )
 static BOOL put_message_in_queue( const struct send_message_info *info, size_t *reply_size )
 {
     struct packed_message data;
-    message_data_t msg_data;
+    union message_data msg_data;
     unsigned int res;
     int i;
     timeout_t timeout = TIMEOUT_INFINITE;
@@ -3368,7 +3367,6 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t *
         params.wparam   = info->wparam;
         params.lparam   = info->lparam;
         params.dest_tid = info->dest_tid;
-        params.type     = info->type;
         res = KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len );
         goto done;
     }
@@ -3396,6 +3394,32 @@ done:
     return !res;
 }
 
+/***********************************************************************
+ *           post_dde_message_call
+ */
+static NTSTATUS post_dde_message_call( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
+                                       const struct post_dde_message_call_params *params )
+{
+    NTSTATUS status;
+
+    SERVER_START_REQ( send_message )
+    {
+        req->id      = params->dest_tid;
+        req->type    = MSG_POSTED;
+        req->flags   = 0;
+        req->win     = wine_server_user_handle( hwnd );
+        req->msg     = msg;
+        req->wparam  = wparam;
+        req->lparam  = lparam;
+        req->timeout = TIMEOUT_INFINITE;
+        wine_server_add_data( req, params->ptr, params->size );
+        status = wine_server_call( req );
+    }
+    SERVER_END_REQ;
+    return status;
+}
+
+
 /***********************************************************************
  *           wait_message_reply
  *
@@ -3649,6 +3673,20 @@ NTSTATUS send_hardware_message( HWND hwnd, UINT flags, const INPUT *input, LPARA
     return ret;
 }
 
+/***********************************************************************
+ *		post_quit_message
+ */
+BOOL post_quit_message( int exit_code )
+{
+    SERVER_START_REQ( post_quit_message )
+    {
+        req->exit_code = exit_code;
+        wine_server_call( req );
+    }
+    SERVER_END_REQ;
+    return TRUE;
+}
+
 /**********************************************************************
  *           NtUserDispatchMessage  (win32u.@)
  */
@@ -4433,6 +4471,9 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
     case NtUserDragDropCall:
         return drag_drop_call( hwnd, msg, wparam, lparam, result_info );
 
+    case NtUserPostDdeCall:
+        return post_dde_message_call( hwnd, msg, wparam, lparam, result_info );
+
     default:
         FIXME( "%p %x %lx %lx %p %x %x\n", hwnd, msg, (long)wparam, lparam, result_info, (int)type, ansi );
     }

dlls/win32u/sysparams.c

@@ -7006,6 +7006,9 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code )
     case NtUserCallOneParam_MessageBeep:
         return message_beep( arg );
 
+    case NtUserCallOneParam_PostQuitMessage:
+        return post_quit_message( arg );
+
     case NtUserCallOneParam_ReplyMessage:
         return reply_message_result( arg );
 

dlls/win32u/tests/win32u.c

@@ -120,6 +120,9 @@ static void test_window_props(void)
     ATOM atom;
     HWND hwnd;
     BOOL ret;
+    ULONG i, count;
+    NTSTATUS status;
+    struct ntuser_property_list *props;
 
     hwnd = CreateWindowExA( 0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL );
 
@@ -134,12 +137,40 @@ static void test_window_props(void)
     prop = NtUserGetProp( hwnd, UlongToPtr(atom) );
     ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop );
 
+    props = malloc( 32 * sizeof(*props) );
+    count = 0xdead;
+    status = NtUserBuildPropList( hwnd, 32, NULL, &count );
+    ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_HANDLE,
+        "NtUserBuildPropList failed %lx\n", status );
+    ok( count == 0xdead, "wrong count %lu\n", count );
+
+    status = NtUserBuildPropList( hwnd, 32, props, NULL );
+    ok( status == STATUS_INVALID_PARAMETER || status == STATUS_INVALID_HANDLE,
+        "NtUserBuildPropList failed %lx\n", status );
+    ok( count == 0xdead, "wrong count %lu\n", count );
+
+    status = NtUserBuildPropList( hwnd, 32, props, &count );
+    ok( !status, "NtUserBuildPropList failed %lx\n", status );
+    ok( count, "wrong count %lu\n", count );
+    for (i = 0; i < count; i++)
+    {
+        if (props[i].data != (INT_PTR)0xdeadbeef) continue;
+        ok( props[i].atom == atom, "prop = %x / %x\n", props[i].atom, atom );
+        break;
+    }
+    ok( i < count, "property not found\n" );
+
     prop = NtUserRemoveProp( hwnd, UlongToPtr(atom) );
     ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop );
 
     prop = GetPropW(hwnd, L"test");
     ok(!prop, "prop = %p\n", prop);
 
+    status = NtUserBuildPropList( hwnd, 32, props, &count );
+    ok( !status, "NtUserBuildPropList failed %lx\n", status );
+    for (i = 0; i < count; i++) ok( props[i].atom != atom, "property still exists\n" );
+    free( props );
+
     GlobalDeleteAtom( atom );
     DestroyWindow( hwnd );
 }
@@ -532,6 +563,106 @@ static void test_NtUserBuildHwndList(void)
     DestroyWindow( hwnd );
 }
 
+static BOOL CALLBACK enum_names( LPWSTR name, LPARAM lp )
+{
+    struct ntuser_name_list *buffer = (struct ntuser_name_list *)lp;
+    WCHAR *p;
+    UINT i;
+
+    for (i = 0, p = buffer->strings; i < buffer->count; i++, p += wcslen(p) + 1)
+        if (!wcscmp( p, name )) break;
+    ok( i < buffer->count, "string %s not found\n", debugstr_w(name) );
+    return TRUE;
+}
+
+static void test_NtUserBuildNameList(void)
+{
+    struct ntuser_name_list *buffer;
+    WCHAR *p;
+    NTSTATUS status;
+    ULONG i, count, ret_size, expect, size = offsetof( struct ntuser_name_list, strings[256] );
+
+    buffer = malloc( size );
+    memset( buffer, 0xcc, size );
+    status = NtUserBuildNameList( 0, size, buffer, &ret_size );
+    ok( !status, "NtUserBuildNameList failed %lx\n", status );
+    count = buffer->count;
+    for (i = 0, p = buffer->strings; i < count; i++)
+    {
+        trace( "%lu: %s\n", i, debugstr_w(p) );
+        p += wcslen(p) + 1;
+    }
+    ok( *p == 0, "missing final null\n" );
+    ok( (char *)(p + 1) == (char *)buffer + buffer->size, "wrong size %lx / %lx\n",
+        (ULONG)((char *)(p + 1) - (char *)buffer), buffer->size );
+    ok( ret_size == buffer->size, "wrong ret size %lx / %lx\n", ret_size, buffer->size );
+
+    EnumWindowStationsW( enum_names, (LPARAM)buffer );
+
+    memset( buffer, 0xcc, size );
+    status = NtUserBuildNameList( 0, ret_size - sizeof(WCHAR), buffer, &ret_size );
+    ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildNameList failed %lx\n", status );
+    p = buffer->strings;
+    while (*p) p += wcslen(p) + 1;
+    expect = (char *)(p + 1) - (char *)buffer;
+    ok( buffer->size == expect, "wrong size %lx / %lx\n", buffer->size, expect );
+    ok( buffer->count == count, "wrong count %lx / %lx\n", buffer->count, count );
+    ok( ret_size > expect, "wrong size %lx / %lx\n", ret_size, expect );
+
+    memset( buffer, 0xcc, size );
+    ret_size = 0xdead;
+    status = NtUserBuildNameList( 0, offsetof( struct ntuser_name_list, strings[3] ), buffer, &ret_size );
+    ok( status == STATUS_BUFFER_TOO_SMALL, "NtUserBuildNameList failed %lx\n", status );
+    ok( buffer->size == offsetof( struct ntuser_name_list, strings[1] ), "wrong size %lx\n", buffer->size );
+    ok( buffer->count == count, "wrong count %lx / %lx\n", buffer->count, count );
+    ok( buffer->strings[0] == 0, "missing final null\n" );
+    ok( ret_size > offsetof( struct ntuser_name_list, strings[1] ), "wrong size %lx\n", ret_size );
+
+    memset( buffer, 0xcc, size );
+    ret_size = 0xdead;
+    status = NtUserBuildNameList( 0, offsetof( struct ntuser_name_list, strings[1] ), buffer, &ret_size );
+    ok( status == STATUS_INVALID_HANDLE, "NtUserBuildNameList failed %lx\n", status );
+    ok( buffer->size == 0xcccccccc, "wrong size %lx\n", buffer->size );
+    ok( buffer->count == 0xcccccccc, "wrong count %lx\n", buffer->count );
+    ok( ret_size == 0xdead, "wrong size %lx\n", ret_size );
+
+    memset( buffer, 0xcc, size );
+    ret_size = 0xdead;
+    status = NtUserBuildNameList( 0, offsetof( struct ntuser_name_list, strings ) - 1, buffer, &ret_size );
+    ok( status == STATUS_INVALID_HANDLE, "NtUserBuildNameList failed %lx\n", status );
+    ok( buffer->size == 0xcccccccc, "wrong size %lx\n", buffer->size );
+    ok( buffer->count == 0xcccccccc, "wrong count %lx\n", buffer->count );
+    ok( ret_size == 0xdead, "wrong size %lx\n", ret_size );
+
+    memset( buffer, 0xcc, size );
+    ret_size = 0xdead;
+    status = NtUserBuildNameList( 0, 0, NULL, &ret_size );
+    ok( status == STATUS_INVALID_HANDLE, "NtUserBuildNameList failed %lx\n", status );
+    ok( buffer->size == 0xcccccccc, "wrong size %lx\n", buffer->size );
+    ok( buffer->count == 0xcccccccc, "wrong count %lx\n", buffer->count );
+    ok( ret_size == 0xdead, "wrong size %lx\n", ret_size );
+
+    status = NtUserBuildNameList( (HANDLE)0xdeadbeef, 1024, buffer, &ret_size );
+    ok( status == STATUS_INVALID_HANDLE, "NtUserBuildNameList failed %lx\n", status );
+
+    memset( buffer, 0xcc, size );
+    status = NtUserBuildNameList( GetProcessWindowStation(), size, buffer, &ret_size );
+    ok( !status, "NtUserBuildNameList failed %lx\n", status );
+    for (i = 0, p = buffer->strings; i < buffer->count; i++)
+    {
+        trace( "%lu: %s\n", i, debugstr_w(p) );
+        p += wcslen(p) + 1;
+    }
+    ok( *p == 0, "missing final null\n" );
+    ok( (char *)(p + 1) == (char *)buffer + buffer->size, "wrong size %lx / %lx\n",
+        (ULONG)((char *)(p + 1) - (char *)buffer), buffer->size );
+    ok( ret_size == buffer->size, "wrong ret size %lx / %lx\n", ret_size, buffer->size );
+
+    EnumDesktopsW( GetProcessWindowStation(), enum_names, (LPARAM)buffer );
+
+    free( buffer );
+}
+
 static void test_cursoricon(void)
 {
     WCHAR module[MAX_PATH], res_buf[MAX_PATH];
@@ -2195,6 +2326,7 @@ START_TEST(win32u)
     test_NtUserCreateInputContext();
     test_NtUserBuildHimcList();
     test_NtUserBuildHwndList();
+    test_NtUserBuildNameList();
     test_cursoricon();
     test_message_call();
     test_window_text();

dlls/win32u/win32syscalls.h

@@ -206,229 +206,231 @@
     SYSCALL_ENTRY( 0x00ca, NtUserBeginPaint, 8 ) \
     SYSCALL_ENTRY( 0x00cb, NtUserBuildHimcList, 16 ) \
     SYSCALL_ENTRY( 0x00cc, NtUserBuildHwndList, 32 ) \
-    SYSCALL_ENTRY( 0x00cd, NtUserCallHwnd, 8 ) \
-    SYSCALL_ENTRY( 0x00ce, NtUserCallHwndParam, 12 ) \
-    SYSCALL_ENTRY( 0x00cf, NtUserCallMsgFilter, 8 ) \
-    SYSCALL_ENTRY( 0x00d0, NtUserCallNextHookEx, 16 ) \
-    SYSCALL_ENTRY( 0x00d1, NtUserCallNoParam, 4 ) \
-    SYSCALL_ENTRY( 0x00d2, NtUserCallOneParam, 8 ) \
-    SYSCALL_ENTRY( 0x00d3, NtUserCallTwoParam, 12 ) \
-    SYSCALL_ENTRY( 0x00d4, NtUserChangeClipboardChain, 8 ) \
-    SYSCALL_ENTRY( 0x00d5, NtUserChangeDisplaySettings, 20 ) \
-    SYSCALL_ENTRY( 0x00d6, NtUserCheckMenuItem, 12 ) \
-    SYSCALL_ENTRY( 0x00d7, NtUserChildWindowFromPointEx, 16 ) \
-    SYSCALL_ENTRY( 0x00d8, NtUserClipCursor, 4 ) \
-    SYSCALL_ENTRY( 0x00d9, NtUserCloseClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x00da, NtUserCloseDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x00db, NtUserCloseWindowStation, 4 ) \
-    SYSCALL_ENTRY( 0x00dc, NtUserCopyAcceleratorTable, 12 ) \
-    SYSCALL_ENTRY( 0x00dd, NtUserCountClipboardFormats, 0 ) \
-    SYSCALL_ENTRY( 0x00de, NtUserCreateAcceleratorTable, 8 ) \
-    SYSCALL_ENTRY( 0x00df, NtUserCreateCaret, 16 ) \
-    SYSCALL_ENTRY( 0x00e0, NtUserCreateDesktopEx, 24 ) \
-    SYSCALL_ENTRY( 0x00e1, NtUserCreateInputContext, 4 ) \
-    SYSCALL_ENTRY( 0x00e2, NtUserCreateWindowEx, 68 ) \
-    SYSCALL_ENTRY( 0x00e3, NtUserCreateWindowStation, 28 ) \
-    SYSCALL_ENTRY( 0x00e4, NtUserDeferWindowPosAndBand, 40 ) \
-    SYSCALL_ENTRY( 0x00e5, NtUserDeleteMenu, 12 ) \
-    SYSCALL_ENTRY( 0x00e6, NtUserDestroyAcceleratorTable, 4 ) \
-    SYSCALL_ENTRY( 0x00e7, NtUserDestroyCursor, 8 ) \
-    SYSCALL_ENTRY( 0x00e8, NtUserDestroyInputContext, 4 ) \
-    SYSCALL_ENTRY( 0x00e9, NtUserDestroyMenu, 4 ) \
-    SYSCALL_ENTRY( 0x00ea, NtUserDestroyWindow, 4 ) \
-    SYSCALL_ENTRY( 0x00eb, NtUserDisableThreadIme, 4 ) \
-    SYSCALL_ENTRY( 0x00ec, NtUserDispatchMessage, 4 ) \
-    SYSCALL_ENTRY( 0x00ed, NtUserDisplayConfigGetDeviceInfo, 4 ) \
-    SYSCALL_ENTRY( 0x00ee, NtUserDragDetect, 12 ) \
-    SYSCALL_ENTRY( 0x00ef, NtUserDragObject, 20 ) \
-    SYSCALL_ENTRY( 0x00f0, NtUserDrawCaptionTemp, 28 ) \
-    SYSCALL_ENTRY( 0x00f1, NtUserDrawIconEx, 36 ) \
-    SYSCALL_ENTRY( 0x00f2, NtUserDrawMenuBarTemp, 20 ) \
-    SYSCALL_ENTRY( 0x00f3, NtUserEmptyClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x00f4, NtUserEnableMenuItem, 12 ) \
-    SYSCALL_ENTRY( 0x00f5, NtUserEnableMouseInPointer, 4 ) \
-    SYSCALL_ENTRY( 0x00f6, NtUserEnableMouseInPointerForThread, 0 ) \
-    SYSCALL_ENTRY( 0x00f7, NtUserEnableScrollBar, 12 ) \
-    SYSCALL_ENTRY( 0x00f8, NtUserEndDeferWindowPosEx, 8 ) \
-    SYSCALL_ENTRY( 0x00f9, NtUserEndMenu, 0 ) \
-    SYSCALL_ENTRY( 0x00fa, NtUserEndPaint, 8 ) \
-    SYSCALL_ENTRY( 0x00fb, NtUserEnumDisplayDevices, 16 ) \
-    SYSCALL_ENTRY( 0x00fc, NtUserEnumDisplayMonitors, 16 ) \
-    SYSCALL_ENTRY( 0x00fd, NtUserEnumDisplaySettings, 16 ) \
-    SYSCALL_ENTRY( 0x00fe, NtUserExcludeUpdateRgn, 8 ) \
-    SYSCALL_ENTRY( 0x00ff, NtUserFindExistingCursorIcon, 12 ) \
-    SYSCALL_ENTRY( 0x0100, NtUserFindWindowEx, 20 ) \
-    SYSCALL_ENTRY( 0x0101, NtUserFlashWindowEx, 4 ) \
-    SYSCALL_ENTRY( 0x0102, NtUserGetAncestor, 8 ) \
-    SYSCALL_ENTRY( 0x0103, NtUserGetAsyncKeyState, 4 ) \
-    SYSCALL_ENTRY( 0x0104, NtUserGetAtomName, 8 ) \
-    SYSCALL_ENTRY( 0x0105, NtUserGetCaretBlinkTime, 0 ) \
-    SYSCALL_ENTRY( 0x0106, NtUserGetCaretPos, 4 ) \
-    SYSCALL_ENTRY( 0x0107, NtUserGetClassInfoEx, 20 ) \
-    SYSCALL_ENTRY( 0x0108, NtUserGetClassName, 12 ) \
-    SYSCALL_ENTRY( 0x0109, NtUserGetClipboardData, 8 ) \
-    SYSCALL_ENTRY( 0x010a, NtUserGetClipboardFormatName, 12 ) \
-    SYSCALL_ENTRY( 0x010b, NtUserGetClipboardOwner, 0 ) \
-    SYSCALL_ENTRY( 0x010c, NtUserGetClipboardSequenceNumber, 0 ) \
-    SYSCALL_ENTRY( 0x010d, NtUserGetClipboardViewer, 0 ) \
-    SYSCALL_ENTRY( 0x010e, NtUserGetCursor, 0 ) \
-    SYSCALL_ENTRY( 0x010f, NtUserGetCursorFrameInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0110, NtUserGetCursorInfo, 4 ) \
-    SYSCALL_ENTRY( 0x0111, NtUserGetDC, 4 ) \
-    SYSCALL_ENTRY( 0x0112, NtUserGetDCEx, 12 ) \
-    SYSCALL_ENTRY( 0x0113, NtUserGetDisplayConfigBufferSizes, 12 ) \
-    SYSCALL_ENTRY( 0x0114, NtUserGetDoubleClickTime, 0 ) \
-    SYSCALL_ENTRY( 0x0115, NtUserGetDpiForMonitor, 16 ) \
-    SYSCALL_ENTRY( 0x0116, NtUserGetForegroundWindow, 0 ) \
-    SYSCALL_ENTRY( 0x0117, NtUserGetGUIThreadInfo, 8 ) \
-    SYSCALL_ENTRY( 0x0118, NtUserGetIconInfo, 24 ) \
-    SYSCALL_ENTRY( 0x0119, NtUserGetIconSize, 16 ) \
-    SYSCALL_ENTRY( 0x011a, NtUserGetInternalWindowPos, 12 ) \
-    SYSCALL_ENTRY( 0x011b, NtUserGetKeyNameText, 12 ) \
-    SYSCALL_ENTRY( 0x011c, NtUserGetKeyState, 4 ) \
-    SYSCALL_ENTRY( 0x011d, NtUserGetKeyboardLayout, 4 ) \
-    SYSCALL_ENTRY( 0x011e, NtUserGetKeyboardLayoutList, 8 ) \
-    SYSCALL_ENTRY( 0x011f, NtUserGetKeyboardLayoutName, 4 ) \
-    SYSCALL_ENTRY( 0x0120, NtUserGetKeyboardState, 4 ) \
-    SYSCALL_ENTRY( 0x0121, NtUserGetLayeredWindowAttributes, 16 ) \
-    SYSCALL_ENTRY( 0x0122, NtUserGetMenuBarInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0123, NtUserGetMenuItemRect, 16 ) \
-    SYSCALL_ENTRY( 0x0124, NtUserGetMessage, 16 ) \
-    SYSCALL_ENTRY( 0x0125, NtUserGetMouseMovePointsEx, 20 ) \
-    SYSCALL_ENTRY( 0x0126, NtUserGetObjectInformation, 20 ) \
-    SYSCALL_ENTRY( 0x0127, NtUserGetOpenClipboardWindow, 0 ) \
-    SYSCALL_ENTRY( 0x0128, NtUserGetPointerInfoList, 32 ) \
-    SYSCALL_ENTRY( 0x0129, NtUserGetPriorityClipboardFormat, 8 ) \
-    SYSCALL_ENTRY( 0x012a, NtUserGetProcessDpiAwarenessContext, 4 ) \
-    SYSCALL_ENTRY( 0x012b, NtUserGetProcessWindowStation, 0 ) \
-    SYSCALL_ENTRY( 0x012c, NtUserGetProp, 8 ) \
-    SYSCALL_ENTRY( 0x012d, NtUserGetQueueStatus, 4 ) \
-    SYSCALL_ENTRY( 0x012e, NtUserGetRawInputBuffer, 12 ) \
-    SYSCALL_ENTRY( 0x012f, NtUserGetRawInputData, 20 ) \
-    SYSCALL_ENTRY( 0x0130, NtUserGetRawInputDeviceInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0131, NtUserGetRawInputDeviceList, 12 ) \
-    SYSCALL_ENTRY( 0x0132, NtUserGetRegisteredRawInputDevices, 12 ) \
-    SYSCALL_ENTRY( 0x0133, NtUserGetScrollBarInfo, 12 ) \
-    SYSCALL_ENTRY( 0x0134, NtUserGetSystemDpiForProcess, 4 ) \
-    SYSCALL_ENTRY( 0x0135, NtUserGetSystemMenu, 8 ) \
-    SYSCALL_ENTRY( 0x0136, NtUserGetThreadDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x0137, NtUserGetTitleBarInfo, 8 ) \
-    SYSCALL_ENTRY( 0x0138, NtUserGetUpdateRect, 12 ) \
-    SYSCALL_ENTRY( 0x0139, NtUserGetUpdateRgn, 12 ) \
-    SYSCALL_ENTRY( 0x013a, NtUserGetUpdatedClipboardFormats, 12 ) \
-    SYSCALL_ENTRY( 0x013b, NtUserGetWindowDC, 4 ) \
-    SYSCALL_ENTRY( 0x013c, NtUserGetWindowPlacement, 8 ) \
-    SYSCALL_ENTRY( 0x013d, NtUserGetWindowRgnEx, 12 ) \
-    SYSCALL_ENTRY( 0x013e, NtUserHideCaret, 4 ) \
-    SYSCALL_ENTRY( 0x013f, NtUserHiliteMenuItem, 16 ) \
-    SYSCALL_ENTRY( 0x0140, NtUserInitializeClientPfnArrays, 16 ) \
-    SYSCALL_ENTRY( 0x0141, NtUserInternalGetWindowIcon, 8 ) \
-    SYSCALL_ENTRY( 0x0142, NtUserInternalGetWindowText, 12 ) \
-    SYSCALL_ENTRY( 0x0143, NtUserInvalidateRect, 12 ) \
-    SYSCALL_ENTRY( 0x0144, NtUserInvalidateRgn, 12 ) \
-    SYSCALL_ENTRY( 0x0145, NtUserIsClipboardFormatAvailable, 4 ) \
-    SYSCALL_ENTRY( 0x0146, NtUserIsMouseInPointerEnabled, 0 ) \
-    SYSCALL_ENTRY( 0x0147, NtUserKillTimer, 8 ) \
-    SYSCALL_ENTRY( 0x0148, NtUserLockWindowUpdate, 4 ) \
-    SYSCALL_ENTRY( 0x0149, NtUserLogicalToPerMonitorDPIPhysicalPoint, 8 ) \
-    SYSCALL_ENTRY( 0x014a, NtUserMapVirtualKeyEx, 12 ) \
-    SYSCALL_ENTRY( 0x014b, NtUserMenuItemFromPoint, 16 ) \
-    SYSCALL_ENTRY( 0x014c, NtUserMessageCall, 28 ) \
-    SYSCALL_ENTRY( 0x014d, NtUserMoveWindow, 24 ) \
-    SYSCALL_ENTRY( 0x014e, NtUserMsgWaitForMultipleObjectsEx, 20 ) \
-    SYSCALL_ENTRY( 0x014f, NtUserNotifyIMEStatus, 8 ) \
-    SYSCALL_ENTRY( 0x0150, NtUserNotifyWinEvent, 16 ) \
-    SYSCALL_ENTRY( 0x0151, NtUserOpenClipboard, 8 ) \
-    SYSCALL_ENTRY( 0x0152, NtUserOpenDesktop, 12 ) \
-    SYSCALL_ENTRY( 0x0153, NtUserOpenInputDesktop, 12 ) \
-    SYSCALL_ENTRY( 0x0154, NtUserOpenWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x0155, NtUserPeekMessage, 20 ) \
-    SYSCALL_ENTRY( 0x0156, NtUserPerMonitorDPIPhysicalToLogicalPoint, 8 ) \
-    SYSCALL_ENTRY( 0x0157, NtUserPostMessage, 16 ) \
-    SYSCALL_ENTRY( 0x0158, NtUserPostThreadMessage, 16 ) \
-    SYSCALL_ENTRY( 0x0159, NtUserPrintWindow, 12 ) \
-    SYSCALL_ENTRY( 0x015a, NtUserQueryDisplayConfig, 24 ) \
-    SYSCALL_ENTRY( 0x015b, NtUserQueryInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x015c, NtUserRealChildWindowFromPoint, 12 ) \
-    SYSCALL_ENTRY( 0x015d, NtUserRedrawWindow, 16 ) \
-    SYSCALL_ENTRY( 0x015e, NtUserRegisterClassExWOW, 28 ) \
-    SYSCALL_ENTRY( 0x015f, NtUserRegisterHotKey, 16 ) \
-    SYSCALL_ENTRY( 0x0160, NtUserRegisterRawInputDevices, 12 ) \
-    SYSCALL_ENTRY( 0x0161, NtUserRegisterTouchPadCapable, 4 ) \
-    SYSCALL_ENTRY( 0x0162, NtUserReleaseDC, 8 ) \
-    SYSCALL_ENTRY( 0x0163, NtUserRemoveClipboardFormatListener, 4 ) \
-    SYSCALL_ENTRY( 0x0164, NtUserRemoveMenu, 12 ) \
-    SYSCALL_ENTRY( 0x0165, NtUserRemoveProp, 8 ) \
-    SYSCALL_ENTRY( 0x0166, NtUserScrollDC, 28 ) \
-    SYSCALL_ENTRY( 0x0167, NtUserScrollWindowEx, 32 ) \
-    SYSCALL_ENTRY( 0x0168, NtUserSelectPalette, 12 ) \
-    SYSCALL_ENTRY( 0x0169, NtUserSendInput, 12 ) \
-    SYSCALL_ENTRY( 0x016a, NtUserSetActiveWindow, 4 ) \
-    SYSCALL_ENTRY( 0x016b, NtUserSetCapture, 4 ) \
-    SYSCALL_ENTRY( 0x016c, NtUserSetClassLong, 16 ) \
-    SYSCALL_ENTRY( 0x016d, NtUserSetClassLongPtr, 16 ) \
-    SYSCALL_ENTRY( 0x016e, NtUserSetClassWord, 12 ) \
-    SYSCALL_ENTRY( 0x016f, NtUserSetClipboardData, 12 ) \
-    SYSCALL_ENTRY( 0x0170, NtUserSetClipboardViewer, 4 ) \
-    SYSCALL_ENTRY( 0x0171, NtUserSetCursor, 4 ) \
-    SYSCALL_ENTRY( 0x0172, NtUserSetCursorIconData, 16 ) \
-    SYSCALL_ENTRY( 0x0173, NtUserSetCursorPos, 8 ) \
-    SYSCALL_ENTRY( 0x0174, NtUserSetFocus, 4 ) \
-    SYSCALL_ENTRY( 0x0175, NtUserSetInternalWindowPos, 16 ) \
-    SYSCALL_ENTRY( 0x0176, NtUserSetKeyboardState, 4 ) \
-    SYSCALL_ENTRY( 0x0177, NtUserSetLayeredWindowAttributes, 16 ) \
-    SYSCALL_ENTRY( 0x0178, NtUserSetMenu, 8 ) \
-    SYSCALL_ENTRY( 0x0179, NtUserSetMenuContextHelpId, 8 ) \
-    SYSCALL_ENTRY( 0x017a, NtUserSetMenuDefaultItem, 12 ) \
-    SYSCALL_ENTRY( 0x017b, NtUserSetObjectInformation, 16 ) \
-    SYSCALL_ENTRY( 0x017c, NtUserSetParent, 8 ) \
-    SYSCALL_ENTRY( 0x017d, NtUserSetProcessDpiAwarenessContext, 8 ) \
-    SYSCALL_ENTRY( 0x017e, NtUserSetProcessWindowStation, 4 ) \
-    SYSCALL_ENTRY( 0x017f, NtUserSetProp, 12 ) \
-    SYSCALL_ENTRY( 0x0180, NtUserSetScrollInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0181, NtUserSetShellWindowEx, 8 ) \
-    SYSCALL_ENTRY( 0x0182, NtUserSetSysColors, 12 ) \
-    SYSCALL_ENTRY( 0x0183, NtUserSetSystemMenu, 8 ) \
-    SYSCALL_ENTRY( 0x0184, NtUserSetSystemTimer, 12 ) \
-    SYSCALL_ENTRY( 0x0185, NtUserSetThreadDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x0186, NtUserSetTimer, 20 ) \
-    SYSCALL_ENTRY( 0x0187, NtUserSetWinEventHook, 32 ) \
-    SYSCALL_ENTRY( 0x0188, NtUserSetWindowLong, 16 ) \
-    SYSCALL_ENTRY( 0x0189, NtUserSetWindowLongPtr, 16 ) \
-    SYSCALL_ENTRY( 0x018a, NtUserSetWindowPlacement, 8 ) \
-    SYSCALL_ENTRY( 0x018b, NtUserSetWindowPos, 28 ) \
-    SYSCALL_ENTRY( 0x018c, NtUserSetWindowRgn, 12 ) \
-    SYSCALL_ENTRY( 0x018d, NtUserSetWindowWord, 12 ) \
-    SYSCALL_ENTRY( 0x018e, NtUserSetWindowsHookEx, 24 ) \
-    SYSCALL_ENTRY( 0x018f, NtUserShowCaret, 4 ) \
-    SYSCALL_ENTRY( 0x0190, NtUserShowCursor, 4 ) \
-    SYSCALL_ENTRY( 0x0191, NtUserShowScrollBar, 12 ) \
-    SYSCALL_ENTRY( 0x0192, NtUserShowWindow, 8 ) \
-    SYSCALL_ENTRY( 0x0193, NtUserShowWindowAsync, 8 ) \
-    SYSCALL_ENTRY( 0x0194, NtUserSwitchDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x0195, NtUserSystemParametersInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0196, NtUserSystemParametersInfoForDpi, 20 ) \
-    SYSCALL_ENTRY( 0x0197, NtUserThunkedMenuInfo, 8 ) \
-    SYSCALL_ENTRY( 0x0198, NtUserThunkedMenuItemInfo, 24 ) \
-    SYSCALL_ENTRY( 0x0199, NtUserToUnicodeEx, 28 ) \
-    SYSCALL_ENTRY( 0x019a, NtUserTrackMouseEvent, 4 ) \
-    SYSCALL_ENTRY( 0x019b, NtUserTrackPopupMenuEx, 24 ) \
-    SYSCALL_ENTRY( 0x019c, NtUserTranslateAccelerator, 12 ) \
-    SYSCALL_ENTRY( 0x019d, NtUserTranslateMessage, 8 ) \
-    SYSCALL_ENTRY( 0x019e, NtUserUnhookWinEvent, 4 ) \
-    SYSCALL_ENTRY( 0x019f, NtUserUnhookWindowsHookEx, 4 ) \
-    SYSCALL_ENTRY( 0x01a0, NtUserUnregisterClass, 12 ) \
-    SYSCALL_ENTRY( 0x01a1, NtUserUnregisterHotKey, 8 ) \
-    SYSCALL_ENTRY( 0x01a2, NtUserUpdateInputContext, 12 ) \
-    SYSCALL_ENTRY( 0x01a3, NtUserUpdateLayeredWindow, 40 ) \
-    SYSCALL_ENTRY( 0x01a4, NtUserValidateRect, 8 ) \
-    SYSCALL_ENTRY( 0x01a5, NtUserVkKeyScanEx, 8 ) \
-    SYSCALL_ENTRY( 0x01a6, NtUserWaitForInputIdle, 12 ) \
-    SYSCALL_ENTRY( 0x01a7, NtUserWaitMessage, 0 ) \
-    SYSCALL_ENTRY( 0x01a8, NtUserWindowFromDC, 4 ) \
-    SYSCALL_ENTRY( 0x01a9, NtUserWindowFromPoint, 8 ) \
-    SYSCALL_ENTRY( 0x01aa, __wine_get_file_outline_text_metric, 16 ) \
-    SYSCALL_ENTRY( 0x01ab, __wine_get_icm_profile, 16 )
+    SYSCALL_ENTRY( 0x00cd, NtUserBuildNameList, 16 ) \
+    SYSCALL_ENTRY( 0x00ce, NtUserBuildPropList, 16 ) \
+    SYSCALL_ENTRY( 0x00cf, NtUserCallHwnd, 8 ) \
+    SYSCALL_ENTRY( 0x00d0, NtUserCallHwndParam, 12 ) \
+    SYSCALL_ENTRY( 0x00d1, NtUserCallMsgFilter, 8 ) \
+    SYSCALL_ENTRY( 0x00d2, NtUserCallNextHookEx, 16 ) \
+    SYSCALL_ENTRY( 0x00d3, NtUserCallNoParam, 4 ) \
+    SYSCALL_ENTRY( 0x00d4, NtUserCallOneParam, 8 ) \
+    SYSCALL_ENTRY( 0x00d5, NtUserCallTwoParam, 12 ) \
+    SYSCALL_ENTRY( 0x00d6, NtUserChangeClipboardChain, 8 ) \
+    SYSCALL_ENTRY( 0x00d7, NtUserChangeDisplaySettings, 20 ) \
+    SYSCALL_ENTRY( 0x00d8, NtUserCheckMenuItem, 12 ) \
+    SYSCALL_ENTRY( 0x00d9, NtUserChildWindowFromPointEx, 16 ) \
+    SYSCALL_ENTRY( 0x00da, NtUserClipCursor, 4 ) \
+    SYSCALL_ENTRY( 0x00db, NtUserCloseClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x00dc, NtUserCloseDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x00dd, NtUserCloseWindowStation, 4 ) \
+    SYSCALL_ENTRY( 0x00de, NtUserCopyAcceleratorTable, 12 ) \
+    SYSCALL_ENTRY( 0x00df, NtUserCountClipboardFormats, 0 ) \
+    SYSCALL_ENTRY( 0x00e0, NtUserCreateAcceleratorTable, 8 ) \
+    SYSCALL_ENTRY( 0x00e1, NtUserCreateCaret, 16 ) \
+    SYSCALL_ENTRY( 0x00e2, NtUserCreateDesktopEx, 24 ) \
+    SYSCALL_ENTRY( 0x00e3, NtUserCreateInputContext, 4 ) \
+    SYSCALL_ENTRY( 0x00e4, NtUserCreateWindowEx, 68 ) \
+    SYSCALL_ENTRY( 0x00e5, NtUserCreateWindowStation, 28 ) \
+    SYSCALL_ENTRY( 0x00e6, NtUserDeferWindowPosAndBand, 40 ) \
+    SYSCALL_ENTRY( 0x00e7, NtUserDeleteMenu, 12 ) \
+    SYSCALL_ENTRY( 0x00e8, NtUserDestroyAcceleratorTable, 4 ) \
+    SYSCALL_ENTRY( 0x00e9, NtUserDestroyCursor, 8 ) \
+    SYSCALL_ENTRY( 0x00ea, NtUserDestroyInputContext, 4 ) \
+    SYSCALL_ENTRY( 0x00eb, NtUserDestroyMenu, 4 ) \
+    SYSCALL_ENTRY( 0x00ec, NtUserDestroyWindow, 4 ) \
+    SYSCALL_ENTRY( 0x00ed, NtUserDisableThreadIme, 4 ) \
+    SYSCALL_ENTRY( 0x00ee, NtUserDispatchMessage, 4 ) \
+    SYSCALL_ENTRY( 0x00ef, NtUserDisplayConfigGetDeviceInfo, 4 ) \
+    SYSCALL_ENTRY( 0x00f0, NtUserDragDetect, 12 ) \
+    SYSCALL_ENTRY( 0x00f1, NtUserDragObject, 20 ) \
+    SYSCALL_ENTRY( 0x00f2, NtUserDrawCaptionTemp, 28 ) \
+    SYSCALL_ENTRY( 0x00f3, NtUserDrawIconEx, 36 ) \
+    SYSCALL_ENTRY( 0x00f4, NtUserDrawMenuBarTemp, 20 ) \
+    SYSCALL_ENTRY( 0x00f5, NtUserEmptyClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x00f6, NtUserEnableMenuItem, 12 ) \
+    SYSCALL_ENTRY( 0x00f7, NtUserEnableMouseInPointer, 4 ) \
+    SYSCALL_ENTRY( 0x00f8, NtUserEnableMouseInPointerForThread, 0 ) \
+    SYSCALL_ENTRY( 0x00f9, NtUserEnableScrollBar, 12 ) \
+    SYSCALL_ENTRY( 0x00fa, NtUserEndDeferWindowPosEx, 8 ) \
+    SYSCALL_ENTRY( 0x00fb, NtUserEndMenu, 0 ) \
+    SYSCALL_ENTRY( 0x00fc, NtUserEndPaint, 8 ) \
+    SYSCALL_ENTRY( 0x00fd, NtUserEnumDisplayDevices, 16 ) \
+    SYSCALL_ENTRY( 0x00fe, NtUserEnumDisplayMonitors, 16 ) \
+    SYSCALL_ENTRY( 0x00ff, NtUserEnumDisplaySettings, 16 ) \
+    SYSCALL_ENTRY( 0x0100, NtUserExcludeUpdateRgn, 8 ) \
+    SYSCALL_ENTRY( 0x0101, NtUserFindExistingCursorIcon, 12 ) \
+    SYSCALL_ENTRY( 0x0102, NtUserFindWindowEx, 20 ) \
+    SYSCALL_ENTRY( 0x0103, NtUserFlashWindowEx, 4 ) \
+    SYSCALL_ENTRY( 0x0104, NtUserGetAncestor, 8 ) \
+    SYSCALL_ENTRY( 0x0105, NtUserGetAsyncKeyState, 4 ) \
+    SYSCALL_ENTRY( 0x0106, NtUserGetAtomName, 8 ) \
+    SYSCALL_ENTRY( 0x0107, NtUserGetCaretBlinkTime, 0 ) \
+    SYSCALL_ENTRY( 0x0108, NtUserGetCaretPos, 4 ) \
+    SYSCALL_ENTRY( 0x0109, NtUserGetClassInfoEx, 20 ) \
+    SYSCALL_ENTRY( 0x010a, NtUserGetClassName, 12 ) \
+    SYSCALL_ENTRY( 0x010b, NtUserGetClipboardData, 8 ) \
+    SYSCALL_ENTRY( 0x010c, NtUserGetClipboardFormatName, 12 ) \
+    SYSCALL_ENTRY( 0x010d, NtUserGetClipboardOwner, 0 ) \
+    SYSCALL_ENTRY( 0x010e, NtUserGetClipboardSequenceNumber, 0 ) \
+    SYSCALL_ENTRY( 0x010f, NtUserGetClipboardViewer, 0 ) \
+    SYSCALL_ENTRY( 0x0110, NtUserGetCursor, 0 ) \
+    SYSCALL_ENTRY( 0x0111, NtUserGetCursorFrameInfo, 16 ) \
+    SYSCALL_ENTRY( 0x0112, NtUserGetCursorInfo, 4 ) \
+    SYSCALL_ENTRY( 0x0113, NtUserGetDC, 4 ) \
+    SYSCALL_ENTRY( 0x0114, NtUserGetDCEx, 12 ) \
+    SYSCALL_ENTRY( 0x0115, NtUserGetDisplayConfigBufferSizes, 12 ) \
+    SYSCALL_ENTRY( 0x0116, NtUserGetDoubleClickTime, 0 ) \
+    SYSCALL_ENTRY( 0x0117, NtUserGetDpiForMonitor, 16 ) \
+    SYSCALL_ENTRY( 0x0118, NtUserGetForegroundWindow, 0 ) \
+    SYSCALL_ENTRY( 0x0119, NtUserGetGUIThreadInfo, 8 ) \
+    SYSCALL_ENTRY( 0x011a, NtUserGetIconInfo, 24 ) \
+    SYSCALL_ENTRY( 0x011b, NtUserGetIconSize, 16 ) \
+    SYSCALL_ENTRY( 0x011c, NtUserGetInternalWindowPos, 12 ) \
+    SYSCALL_ENTRY( 0x011d, NtUserGetKeyNameText, 12 ) \
+    SYSCALL_ENTRY( 0x011e, NtUserGetKeyState, 4 ) \
+    SYSCALL_ENTRY( 0x011f, NtUserGetKeyboardLayout, 4 ) \
+    SYSCALL_ENTRY( 0x0120, NtUserGetKeyboardLayoutList, 8 ) \
+    SYSCALL_ENTRY( 0x0121, NtUserGetKeyboardLayoutName, 4 ) \
+    SYSCALL_ENTRY( 0x0122, NtUserGetKeyboardState, 4 ) \
+    SYSCALL_ENTRY( 0x0123, NtUserGetLayeredWindowAttributes, 16 ) \
+    SYSCALL_ENTRY( 0x0124, NtUserGetMenuBarInfo, 16 ) \
+    SYSCALL_ENTRY( 0x0125, NtUserGetMenuItemRect, 16 ) \
+    SYSCALL_ENTRY( 0x0126, NtUserGetMessage, 16 ) \
+    SYSCALL_ENTRY( 0x0127, NtUserGetMouseMovePointsEx, 20 ) \
+    SYSCALL_ENTRY( 0x0128, NtUserGetObjectInformation, 20 ) \
+    SYSCALL_ENTRY( 0x0129, NtUserGetOpenClipboardWindow, 0 ) \
+    SYSCALL_ENTRY( 0x012a, NtUserGetPointerInfoList, 32 ) \
+    SYSCALL_ENTRY( 0x012b, NtUserGetPriorityClipboardFormat, 8 ) \
+    SYSCALL_ENTRY( 0x012c, NtUserGetProcessDpiAwarenessContext, 4 ) \
+    SYSCALL_ENTRY( 0x012d, NtUserGetProcessWindowStation, 0 ) \
+    SYSCALL_ENTRY( 0x012e, NtUserGetProp, 8 ) \
+    SYSCALL_ENTRY( 0x012f, NtUserGetQueueStatus, 4 ) \
+    SYSCALL_ENTRY( 0x0130, NtUserGetRawInputBuffer, 12 ) \
+    SYSCALL_ENTRY( 0x0131, NtUserGetRawInputData, 20 ) \
+    SYSCALL_ENTRY( 0x0132, NtUserGetRawInputDeviceInfo, 16 ) \
+    SYSCALL_ENTRY( 0x0133, NtUserGetRawInputDeviceList, 12 ) \
+    SYSCALL_ENTRY( 0x0134, NtUserGetRegisteredRawInputDevices, 12 ) \
+    SYSCALL_ENTRY( 0x0135, NtUserGetScrollBarInfo, 12 ) \
+    SYSCALL_ENTRY( 0x0136, NtUserGetSystemDpiForProcess, 4 ) \
+    SYSCALL_ENTRY( 0x0137, NtUserGetSystemMenu, 8 ) \
+    SYSCALL_ENTRY( 0x0138, NtUserGetThreadDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x0139, NtUserGetTitleBarInfo, 8 ) \
+    SYSCALL_ENTRY( 0x013a, NtUserGetUpdateRect, 12 ) \
+    SYSCALL_ENTRY( 0x013b, NtUserGetUpdateRgn, 12 ) \
+    SYSCALL_ENTRY( 0x013c, NtUserGetUpdatedClipboardFormats, 12 ) \
+    SYSCALL_ENTRY( 0x013d, NtUserGetWindowDC, 4 ) \
+    SYSCALL_ENTRY( 0x013e, NtUserGetWindowPlacement, 8 ) \
+    SYSCALL_ENTRY( 0x013f, NtUserGetWindowRgnEx, 12 ) \
+    SYSCALL_ENTRY( 0x0140, NtUserHideCaret, 4 ) \
+    SYSCALL_ENTRY( 0x0141, NtUserHiliteMenuItem, 16 ) \
+    SYSCALL_ENTRY( 0x0142, NtUserInitializeClientPfnArrays, 16 ) \
+    SYSCALL_ENTRY( 0x0143, NtUserInternalGetWindowIcon, 8 ) \
+    SYSCALL_ENTRY( 0x0144, NtUserInternalGetWindowText, 12 ) \
+    SYSCALL_ENTRY( 0x0145, NtUserInvalidateRect, 12 ) \
+    SYSCALL_ENTRY( 0x0146, NtUserInvalidateRgn, 12 ) \
+    SYSCALL_ENTRY( 0x0147, NtUserIsClipboardFormatAvailable, 4 ) \
+    SYSCALL_ENTRY( 0x0148, NtUserIsMouseInPointerEnabled, 0 ) \
+    SYSCALL_ENTRY( 0x0149, NtUserKillTimer, 8 ) \
+    SYSCALL_ENTRY( 0x014a, NtUserLockWindowUpdate, 4 ) \
+    SYSCALL_ENTRY( 0x014b, NtUserLogicalToPerMonitorDPIPhysicalPoint, 8 ) \
+    SYSCALL_ENTRY( 0x014c, NtUserMapVirtualKeyEx, 12 ) \
+    SYSCALL_ENTRY( 0x014d, NtUserMenuItemFromPoint, 16 ) \
+    SYSCALL_ENTRY( 0x014e, NtUserMessageCall, 28 ) \
+    SYSCALL_ENTRY( 0x014f, NtUserMoveWindow, 24 ) \
+    SYSCALL_ENTRY( 0x0150, NtUserMsgWaitForMultipleObjectsEx, 20 ) \
+    SYSCALL_ENTRY( 0x0151, NtUserNotifyIMEStatus, 8 ) \
+    SYSCALL_ENTRY( 0x0152, NtUserNotifyWinEvent, 16 ) \
+    SYSCALL_ENTRY( 0x0153, NtUserOpenClipboard, 8 ) \
+    SYSCALL_ENTRY( 0x0154, NtUserOpenDesktop, 12 ) \
+    SYSCALL_ENTRY( 0x0155, NtUserOpenInputDesktop, 12 ) \
+    SYSCALL_ENTRY( 0x0156, NtUserOpenWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x0157, NtUserPeekMessage, 20 ) \
+    SYSCALL_ENTRY( 0x0158, NtUserPerMonitorDPIPhysicalToLogicalPoint, 8 ) \
+    SYSCALL_ENTRY( 0x0159, NtUserPostMessage, 16 ) \
+    SYSCALL_ENTRY( 0x015a, NtUserPostThreadMessage, 16 ) \
+    SYSCALL_ENTRY( 0x015b, NtUserPrintWindow, 12 ) \
+    SYSCALL_ENTRY( 0x015c, NtUserQueryDisplayConfig, 24 ) \
+    SYSCALL_ENTRY( 0x015d, NtUserQueryInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x015e, NtUserRealChildWindowFromPoint, 12 ) \
+    SYSCALL_ENTRY( 0x015f, NtUserRedrawWindow, 16 ) \
+    SYSCALL_ENTRY( 0x0160, NtUserRegisterClassExWOW, 28 ) \
+    SYSCALL_ENTRY( 0x0161, NtUserRegisterHotKey, 16 ) \
+    SYSCALL_ENTRY( 0x0162, NtUserRegisterRawInputDevices, 12 ) \
+    SYSCALL_ENTRY( 0x0163, NtUserRegisterTouchPadCapable, 4 ) \
+    SYSCALL_ENTRY( 0x0164, NtUserReleaseDC, 8 ) \
+    SYSCALL_ENTRY( 0x0165, NtUserRemoveClipboardFormatListener, 4 ) \
+    SYSCALL_ENTRY( 0x0166, NtUserRemoveMenu, 12 ) \
+    SYSCALL_ENTRY( 0x0167, NtUserRemoveProp, 8 ) \
+    SYSCALL_ENTRY( 0x0168, NtUserScrollDC, 28 ) \
+    SYSCALL_ENTRY( 0x0169, NtUserScrollWindowEx, 32 ) \
+    SYSCALL_ENTRY( 0x016a, NtUserSelectPalette, 12 ) \
+    SYSCALL_ENTRY( 0x016b, NtUserSendInput, 12 ) \
+    SYSCALL_ENTRY( 0x016c, NtUserSetActiveWindow, 4 ) \
+    SYSCALL_ENTRY( 0x016d, NtUserSetCapture, 4 ) \
+    SYSCALL_ENTRY( 0x016e, NtUserSetClassLong, 16 ) \
+    SYSCALL_ENTRY( 0x016f, NtUserSetClassLongPtr, 16 ) \
+    SYSCALL_ENTRY( 0x0170, NtUserSetClassWord, 12 ) \
+    SYSCALL_ENTRY( 0x0171, NtUserSetClipboardData, 12 ) \
+    SYSCALL_ENTRY( 0x0172, NtUserSetClipboardViewer, 4 ) \
+    SYSCALL_ENTRY( 0x0173, NtUserSetCursor, 4 ) \
+    SYSCALL_ENTRY( 0x0174, NtUserSetCursorIconData, 16 ) \
+    SYSCALL_ENTRY( 0x0175, NtUserSetCursorPos, 8 ) \
+    SYSCALL_ENTRY( 0x0176, NtUserSetFocus, 4 ) \
+    SYSCALL_ENTRY( 0x0177, NtUserSetInternalWindowPos, 16 ) \
+    SYSCALL_ENTRY( 0x0178, NtUserSetKeyboardState, 4 ) \
+    SYSCALL_ENTRY( 0x0179, NtUserSetLayeredWindowAttributes, 16 ) \
+    SYSCALL_ENTRY( 0x017a, NtUserSetMenu, 8 ) \
+    SYSCALL_ENTRY( 0x017b, NtUserSetMenuContextHelpId, 8 ) \
+    SYSCALL_ENTRY( 0x017c, NtUserSetMenuDefaultItem, 12 ) \
+    SYSCALL_ENTRY( 0x017d, NtUserSetObjectInformation, 16 ) \
+    SYSCALL_ENTRY( 0x017e, NtUserSetParent, 8 ) \
+    SYSCALL_ENTRY( 0x017f, NtUserSetProcessDpiAwarenessContext, 8 ) \
+    SYSCALL_ENTRY( 0x0180, NtUserSetProcessWindowStation, 4 ) \
+    SYSCALL_ENTRY( 0x0181, NtUserSetProp, 12 ) \
+    SYSCALL_ENTRY( 0x0182, NtUserSetScrollInfo, 16 ) \
+    SYSCALL_ENTRY( 0x0183, NtUserSetShellWindowEx, 8 ) \
+    SYSCALL_ENTRY( 0x0184, NtUserSetSysColors, 12 ) \
+    SYSCALL_ENTRY( 0x0185, NtUserSetSystemMenu, 8 ) \
+    SYSCALL_ENTRY( 0x0186, NtUserSetSystemTimer, 12 ) \
+    SYSCALL_ENTRY( 0x0187, NtUserSetThreadDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x0188, NtUserSetTimer, 20 ) \
+    SYSCALL_ENTRY( 0x0189, NtUserSetWinEventHook, 32 ) \
+    SYSCALL_ENTRY( 0x018a, NtUserSetWindowLong, 16 ) \
+    SYSCALL_ENTRY( 0x018b, NtUserSetWindowLongPtr, 16 ) \
+    SYSCALL_ENTRY( 0x018c, NtUserSetWindowPlacement, 8 ) \
+    SYSCALL_ENTRY( 0x018d, NtUserSetWindowPos, 28 ) \
+    SYSCALL_ENTRY( 0x018e, NtUserSetWindowRgn, 12 ) \
+    SYSCALL_ENTRY( 0x018f, NtUserSetWindowWord, 12 ) \
+    SYSCALL_ENTRY( 0x0190, NtUserSetWindowsHookEx, 24 ) \
+    SYSCALL_ENTRY( 0x0191, NtUserShowCaret, 4 ) \
+    SYSCALL_ENTRY( 0x0192, NtUserShowCursor, 4 ) \
+    SYSCALL_ENTRY( 0x0193, NtUserShowScrollBar, 12 ) \
+    SYSCALL_ENTRY( 0x0194, NtUserShowWindow, 8 ) \
+    SYSCALL_ENTRY( 0x0195, NtUserShowWindowAsync, 8 ) \
+    SYSCALL_ENTRY( 0x0196, NtUserSwitchDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x0197, NtUserSystemParametersInfo, 16 ) \
+    SYSCALL_ENTRY( 0x0198, NtUserSystemParametersInfoForDpi, 20 ) \
+    SYSCALL_ENTRY( 0x0199, NtUserThunkedMenuInfo, 8 ) \
+    SYSCALL_ENTRY( 0x019a, NtUserThunkedMenuItemInfo, 24 ) \
+    SYSCALL_ENTRY( 0x019b, NtUserToUnicodeEx, 28 ) \
+    SYSCALL_ENTRY( 0x019c, NtUserTrackMouseEvent, 4 ) \
+    SYSCALL_ENTRY( 0x019d, NtUserTrackPopupMenuEx, 24 ) \
+    SYSCALL_ENTRY( 0x019e, NtUserTranslateAccelerator, 12 ) \
+    SYSCALL_ENTRY( 0x019f, NtUserTranslateMessage, 8 ) \
+    SYSCALL_ENTRY( 0x01a0, NtUserUnhookWinEvent, 4 ) \
+    SYSCALL_ENTRY( 0x01a1, NtUserUnhookWindowsHookEx, 4 ) \
+    SYSCALL_ENTRY( 0x01a2, NtUserUnregisterClass, 12 ) \
+    SYSCALL_ENTRY( 0x01a3, NtUserUnregisterHotKey, 8 ) \
+    SYSCALL_ENTRY( 0x01a4, NtUserUpdateInputContext, 12 ) \
+    SYSCALL_ENTRY( 0x01a5, NtUserUpdateLayeredWindow, 40 ) \
+    SYSCALL_ENTRY( 0x01a6, NtUserValidateRect, 8 ) \
+    SYSCALL_ENTRY( 0x01a7, NtUserVkKeyScanEx, 8 ) \
+    SYSCALL_ENTRY( 0x01a8, NtUserWaitForInputIdle, 12 ) \
+    SYSCALL_ENTRY( 0x01a9, NtUserWaitMessage, 0 ) \
+    SYSCALL_ENTRY( 0x01aa, NtUserWindowFromDC, 4 ) \
+    SYSCALL_ENTRY( 0x01ab, NtUserWindowFromPoint, 8 ) \
+    SYSCALL_ENTRY( 0x01ac, __wine_get_file_outline_text_metric, 16 ) \
+    SYSCALL_ENTRY( 0x01ad, __wine_get_icm_profile, 16 )
 
 #define ALL_SYSCALLS64 \
     SYSCALL_ENTRY( 0x0000, NtGdiAbortDoc, 8 ) \
@@ -636,226 +638,228 @@
     SYSCALL_ENTRY( 0x00ca, NtUserBeginPaint, 16 ) \
     SYSCALL_ENTRY( 0x00cb, NtUserBuildHimcList, 32 ) \
     SYSCALL_ENTRY( 0x00cc, NtUserBuildHwndList, 64 ) \
-    SYSCALL_ENTRY( 0x00cd, NtUserCallHwnd, 16 ) \
-    SYSCALL_ENTRY( 0x00ce, NtUserCallHwndParam, 24 ) \
-    SYSCALL_ENTRY( 0x00cf, NtUserCallMsgFilter, 16 ) \
-    SYSCALL_ENTRY( 0x00d0, NtUserCallNextHookEx, 32 ) \
-    SYSCALL_ENTRY( 0x00d1, NtUserCallNoParam, 8 ) \
-    SYSCALL_ENTRY( 0x00d2, NtUserCallOneParam, 16 ) \
-    SYSCALL_ENTRY( 0x00d3, NtUserCallTwoParam, 24 ) \
-    SYSCALL_ENTRY( 0x00d4, NtUserChangeClipboardChain, 16 ) \
-    SYSCALL_ENTRY( 0x00d5, NtUserChangeDisplaySettings, 40 ) \
-    SYSCALL_ENTRY( 0x00d6, NtUserCheckMenuItem, 24 ) \
-    SYSCALL_ENTRY( 0x00d7, NtUserChildWindowFromPointEx, 32 ) \
-    SYSCALL_ENTRY( 0x00d8, NtUserClipCursor, 8 ) \
-    SYSCALL_ENTRY( 0x00d9, NtUserCloseClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x00da, NtUserCloseDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x00db, NtUserCloseWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x00dc, NtUserCopyAcceleratorTable, 24 ) \
-    SYSCALL_ENTRY( 0x00dd, NtUserCountClipboardFormats, 0 ) \
-    SYSCALL_ENTRY( 0x00de, NtUserCreateAcceleratorTable, 16 ) \
-    SYSCALL_ENTRY( 0x00df, NtUserCreateCaret, 32 ) \
-    SYSCALL_ENTRY( 0x00e0, NtUserCreateDesktopEx, 48 ) \
-    SYSCALL_ENTRY( 0x00e1, NtUserCreateInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x00e2, NtUserCreateWindowEx, 136 ) \
-    SYSCALL_ENTRY( 0x00e3, NtUserCreateWindowStation, 56 ) \
-    SYSCALL_ENTRY( 0x00e4, NtUserDeferWindowPosAndBand, 80 ) \
-    SYSCALL_ENTRY( 0x00e5, NtUserDeleteMenu, 24 ) \
-    SYSCALL_ENTRY( 0x00e6, NtUserDestroyAcceleratorTable, 8 ) \
-    SYSCALL_ENTRY( 0x00e7, NtUserDestroyCursor, 16 ) \
-    SYSCALL_ENTRY( 0x00e8, NtUserDestroyInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x00e9, NtUserDestroyMenu, 8 ) \
-    SYSCALL_ENTRY( 0x00ea, NtUserDestroyWindow, 8 ) \
-    SYSCALL_ENTRY( 0x00eb, NtUserDisableThreadIme, 8 ) \
-    SYSCALL_ENTRY( 0x00ec, NtUserDispatchMessage, 8 ) \
-    SYSCALL_ENTRY( 0x00ed, NtUserDisplayConfigGetDeviceInfo, 8 ) \
-    SYSCALL_ENTRY( 0x00ee, NtUserDragDetect, 24 ) \
-    SYSCALL_ENTRY( 0x00ef, NtUserDragObject, 40 ) \
-    SYSCALL_ENTRY( 0x00f0, NtUserDrawCaptionTemp, 56 ) \
-    SYSCALL_ENTRY( 0x00f1, NtUserDrawIconEx, 72 ) \
-    SYSCALL_ENTRY( 0x00f2, NtUserDrawMenuBarTemp, 40 ) \
-    SYSCALL_ENTRY( 0x00f3, NtUserEmptyClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x00f4, NtUserEnableMenuItem, 24 ) \
-    SYSCALL_ENTRY( 0x00f5, NtUserEnableMouseInPointer, 8 ) \
-    SYSCALL_ENTRY( 0x00f6, NtUserEnableMouseInPointerForThread, 0 ) \
-    SYSCALL_ENTRY( 0x00f7, NtUserEnableScrollBar, 24 ) \
-    SYSCALL_ENTRY( 0x00f8, NtUserEndDeferWindowPosEx, 16 ) \
-    SYSCALL_ENTRY( 0x00f9, NtUserEndMenu, 0 ) \
-    SYSCALL_ENTRY( 0x00fa, NtUserEndPaint, 16 ) \
-    SYSCALL_ENTRY( 0x00fb, NtUserEnumDisplayDevices, 32 ) \
-    SYSCALL_ENTRY( 0x00fc, NtUserEnumDisplayMonitors, 32 ) \
-    SYSCALL_ENTRY( 0x00fd, NtUserEnumDisplaySettings, 32 ) \
-    SYSCALL_ENTRY( 0x00fe, NtUserExcludeUpdateRgn, 16 ) \
-    SYSCALL_ENTRY( 0x00ff, NtUserFindExistingCursorIcon, 24 ) \
-    SYSCALL_ENTRY( 0x0100, NtUserFindWindowEx, 40 ) \
-    SYSCALL_ENTRY( 0x0101, NtUserFlashWindowEx, 8 ) \
-    SYSCALL_ENTRY( 0x0102, NtUserGetAncestor, 16 ) \
-    SYSCALL_ENTRY( 0x0103, NtUserGetAsyncKeyState, 8 ) \
-    SYSCALL_ENTRY( 0x0104, NtUserGetAtomName, 16 ) \
-    SYSCALL_ENTRY( 0x0105, NtUserGetCaretBlinkTime, 0 ) \
-    SYSCALL_ENTRY( 0x0106, NtUserGetCaretPos, 8 ) \
-    SYSCALL_ENTRY( 0x0107, NtUserGetClassInfoEx, 40 ) \
-    SYSCALL_ENTRY( 0x0108, NtUserGetClassName, 24 ) \
-    SYSCALL_ENTRY( 0x0109, NtUserGetClipboardData, 16 ) \
-    SYSCALL_ENTRY( 0x010a, NtUserGetClipboardFormatName, 24 ) \
-    SYSCALL_ENTRY( 0x010b, NtUserGetClipboardOwner, 0 ) \
-    SYSCALL_ENTRY( 0x010c, NtUserGetClipboardSequenceNumber, 0 ) \
-    SYSCALL_ENTRY( 0x010d, NtUserGetClipboardViewer, 0 ) \
-    SYSCALL_ENTRY( 0x010e, NtUserGetCursor, 0 ) \
-    SYSCALL_ENTRY( 0x010f, NtUserGetCursorFrameInfo, 32 ) \
-    SYSCALL_ENTRY( 0x0110, NtUserGetCursorInfo, 8 ) \
-    SYSCALL_ENTRY( 0x0111, NtUserGetDC, 8 ) \
-    SYSCALL_ENTRY( 0x0112, NtUserGetDCEx, 24 ) \
-    SYSCALL_ENTRY( 0x0113, NtUserGetDisplayConfigBufferSizes, 24 ) \
-    SYSCALL_ENTRY( 0x0114, NtUserGetDoubleClickTime, 0 ) \
-    SYSCALL_ENTRY( 0x0115, NtUserGetDpiForMonitor, 32 ) \
-    SYSCALL_ENTRY( 0x0116, NtUserGetForegroundWindow, 0 ) \
-    SYSCALL_ENTRY( 0x0117, NtUserGetGUIThreadInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0118, NtUserGetIconInfo, 48 ) \
-    SYSCALL_ENTRY( 0x0119, NtUserGetIconSize, 32 ) \
-    SYSCALL_ENTRY( 0x011a, NtUserGetInternalWindowPos, 24 ) \
-    SYSCALL_ENTRY( 0x011b, NtUserGetKeyNameText, 24 ) \
-    SYSCALL_ENTRY( 0x011c, NtUserGetKeyState, 8 ) \
-    SYSCALL_ENTRY( 0x011d, NtUserGetKeyboardLayout, 8 ) \
-    SYSCALL_ENTRY( 0x011e, NtUserGetKeyboardLayoutList, 16 ) \
-    SYSCALL_ENTRY( 0x011f, NtUserGetKeyboardLayoutName, 8 ) \
-    SYSCALL_ENTRY( 0x0120, NtUserGetKeyboardState, 8 ) \
-    SYSCALL_ENTRY( 0x0121, NtUserGetLayeredWindowAttributes, 32 ) \
-    SYSCALL_ENTRY( 0x0122, NtUserGetMenuBarInfo, 32 ) \
-    SYSCALL_ENTRY( 0x0123, NtUserGetMenuItemRect, 32 ) \
-    SYSCALL_ENTRY( 0x0124, NtUserGetMessage, 32 ) \
-    SYSCALL_ENTRY( 0x0125, NtUserGetMouseMovePointsEx, 40 ) \
-    SYSCALL_ENTRY( 0x0126, NtUserGetObjectInformation, 40 ) \
-    SYSCALL_ENTRY( 0x0127, NtUserGetOpenClipboardWindow, 0 ) \
-    SYSCALL_ENTRY( 0x0128, NtUserGetPointerInfoList, 64 ) \
-    SYSCALL_ENTRY( 0x0129, NtUserGetPriorityClipboardFormat, 16 ) \
-    SYSCALL_ENTRY( 0x012a, NtUserGetProcessDpiAwarenessContext, 8 ) \
-    SYSCALL_ENTRY( 0x012b, NtUserGetProcessWindowStation, 0 ) \
-    SYSCALL_ENTRY( 0x012c, NtUserGetProp, 16 ) \
-    SYSCALL_ENTRY( 0x012d, NtUserGetQueueStatus, 8 ) \
-    SYSCALL_ENTRY( 0x012e, NtUserGetRawInputBuffer, 24 ) \
-    SYSCALL_ENTRY( 0x012f, NtUserGetRawInputData, 40 ) \
-    SYSCALL_ENTRY( 0x0130, NtUserGetRawInputDeviceInfo, 32 ) \
-    SYSCALL_ENTRY( 0x0131, NtUserGetRawInputDeviceList, 24 ) \
-    SYSCALL_ENTRY( 0x0132, NtUserGetRegisteredRawInputDevices, 24 ) \
-    SYSCALL_ENTRY( 0x0133, NtUserGetScrollBarInfo, 24 ) \
-    SYSCALL_ENTRY( 0x0134, NtUserGetSystemDpiForProcess, 8 ) \
-    SYSCALL_ENTRY( 0x0135, NtUserGetSystemMenu, 16 ) \
-    SYSCALL_ENTRY( 0x0136, NtUserGetThreadDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x0137, NtUserGetTitleBarInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0138, NtUserGetUpdateRect, 24 ) \
-    SYSCALL_ENTRY( 0x0139, NtUserGetUpdateRgn, 24 ) \
-    SYSCALL_ENTRY( 0x013a, NtUserGetUpdatedClipboardFormats, 24 ) \
-    SYSCALL_ENTRY( 0x013b, NtUserGetWindowDC, 8 ) \
-    SYSCALL_ENTRY( 0x013c, NtUserGetWindowPlacement, 16 ) \
-    SYSCALL_ENTRY( 0x013d, NtUserGetWindowRgnEx, 24 ) \
-    SYSCALL_ENTRY( 0x013e, NtUserHideCaret, 8 ) \
-    SYSCALL_ENTRY( 0x013f, NtUserHiliteMenuItem, 32 ) \
-    SYSCALL_ENTRY( 0x0140, NtUserInitializeClientPfnArrays, 32 ) \
-    SYSCALL_ENTRY( 0x0141, NtUserInternalGetWindowIcon, 16 ) \
-    SYSCALL_ENTRY( 0x0142, NtUserInternalGetWindowText, 24 ) \
-    SYSCALL_ENTRY( 0x0143, NtUserInvalidateRect, 24 ) \
-    SYSCALL_ENTRY( 0x0144, NtUserInvalidateRgn, 24 ) \
-    SYSCALL_ENTRY( 0x0145, NtUserIsClipboardFormatAvailable, 8 ) \
-    SYSCALL_ENTRY( 0x0146, NtUserIsMouseInPointerEnabled, 0 ) \
-    SYSCALL_ENTRY( 0x0147, NtUserKillTimer, 16 ) \
-    SYSCALL_ENTRY( 0x0148, NtUserLockWindowUpdate, 8 ) \
-    SYSCALL_ENTRY( 0x0149, NtUserLogicalToPerMonitorDPIPhysicalPoint, 16 ) \
-    SYSCALL_ENTRY( 0x014a, NtUserMapVirtualKeyEx, 24 ) \
-    SYSCALL_ENTRY( 0x014b, NtUserMenuItemFromPoint, 32 ) \
-    SYSCALL_ENTRY( 0x014c, NtUserMessageCall, 56 ) \
-    SYSCALL_ENTRY( 0x014d, NtUserMoveWindow, 48 ) \
-    SYSCALL_ENTRY( 0x014e, NtUserMsgWaitForMultipleObjectsEx, 40 ) \
-    SYSCALL_ENTRY( 0x014f, NtUserNotifyIMEStatus, 16 ) \
-    SYSCALL_ENTRY( 0x0150, NtUserNotifyWinEvent, 32 ) \
-    SYSCALL_ENTRY( 0x0151, NtUserOpenClipboard, 16 ) \
-    SYSCALL_ENTRY( 0x0152, NtUserOpenDesktop, 24 ) \
-    SYSCALL_ENTRY( 0x0153, NtUserOpenInputDesktop, 24 ) \
-    SYSCALL_ENTRY( 0x0154, NtUserOpenWindowStation, 16 ) \
-    SYSCALL_ENTRY( 0x0155, NtUserPeekMessage, 40 ) \
-    SYSCALL_ENTRY( 0x0156, NtUserPerMonitorDPIPhysicalToLogicalPoint, 16 ) \
-    SYSCALL_ENTRY( 0x0157, NtUserPostMessage, 32 ) \
-    SYSCALL_ENTRY( 0x0158, NtUserPostThreadMessage, 32 ) \
-    SYSCALL_ENTRY( 0x0159, NtUserPrintWindow, 24 ) \
-    SYSCALL_ENTRY( 0x015a, NtUserQueryDisplayConfig, 48 ) \
-    SYSCALL_ENTRY( 0x015b, NtUserQueryInputContext, 16 ) \
-    SYSCALL_ENTRY( 0x015c, NtUserRealChildWindowFromPoint, 24 ) \
-    SYSCALL_ENTRY( 0x015d, NtUserRedrawWindow, 32 ) \
-    SYSCALL_ENTRY( 0x015e, NtUserRegisterClassExWOW, 56 ) \
-    SYSCALL_ENTRY( 0x015f, NtUserRegisterHotKey, 32 ) \
-    SYSCALL_ENTRY( 0x0160, NtUserRegisterRawInputDevices, 24 ) \
-    SYSCALL_ENTRY( 0x0161, NtUserRegisterTouchPadCapable, 8 ) \
-    SYSCALL_ENTRY( 0x0162, NtUserReleaseDC, 16 ) \
-    SYSCALL_ENTRY( 0x0163, NtUserRemoveClipboardFormatListener, 8 ) \
-    SYSCALL_ENTRY( 0x0164, NtUserRemoveMenu, 24 ) \
-    SYSCALL_ENTRY( 0x0165, NtUserRemoveProp, 16 ) \
-    SYSCALL_ENTRY( 0x0166, NtUserScrollDC, 56 ) \
-    SYSCALL_ENTRY( 0x0167, NtUserScrollWindowEx, 64 ) \
-    SYSCALL_ENTRY( 0x0168, NtUserSelectPalette, 24 ) \
-    SYSCALL_ENTRY( 0x0169, NtUserSendInput, 24 ) \
-    SYSCALL_ENTRY( 0x016a, NtUserSetActiveWindow, 8 ) \
-    SYSCALL_ENTRY( 0x016b, NtUserSetCapture, 8 ) \
-    SYSCALL_ENTRY( 0x016c, NtUserSetClassLong, 32 ) \
-    SYSCALL_ENTRY( 0x016d, NtUserSetClassLongPtr, 32 ) \
-    SYSCALL_ENTRY( 0x016e, NtUserSetClassWord, 24 ) \
-    SYSCALL_ENTRY( 0x016f, NtUserSetClipboardData, 24 ) \
-    SYSCALL_ENTRY( 0x0170, NtUserSetClipboardViewer, 8 ) \
-    SYSCALL_ENTRY( 0x0171, NtUserSetCursor, 8 ) \
-    SYSCALL_ENTRY( 0x0172, NtUserSetCursorIconData, 32 ) \
-    SYSCALL_ENTRY( 0x0173, NtUserSetCursorPos, 16 ) \
-    SYSCALL_ENTRY( 0x0174, NtUserSetFocus, 8 ) \
-    SYSCALL_ENTRY( 0x0175, NtUserSetInternalWindowPos, 32 ) \
-    SYSCALL_ENTRY( 0x0176, NtUserSetKeyboardState, 8 ) \
-    SYSCALL_ENTRY( 0x0177, NtUserSetLayeredWindowAttributes, 32 ) \
-    SYSCALL_ENTRY( 0x0178, NtUserSetMenu, 16 ) \
-    SYSCALL_ENTRY( 0x0179, NtUserSetMenuContextHelpId, 16 ) \
-    SYSCALL_ENTRY( 0x017a, NtUserSetMenuDefaultItem, 24 ) \
-    SYSCALL_ENTRY( 0x017b, NtUserSetObjectInformation, 32 ) \
-    SYSCALL_ENTRY( 0x017c, NtUserSetParent, 16 ) \
-    SYSCALL_ENTRY( 0x017d, NtUserSetProcessDpiAwarenessContext, 16 ) \
-    SYSCALL_ENTRY( 0x017e, NtUserSetProcessWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x017f, NtUserSetProp, 24 ) \
-    SYSCALL_ENTRY( 0x0180, NtUserSetScrollInfo, 32 ) \
-    SYSCALL_ENTRY( 0x0181, NtUserSetShellWindowEx, 16 ) \
-    SYSCALL_ENTRY( 0x0182, NtUserSetSysColors, 24 ) \
-    SYSCALL_ENTRY( 0x0183, NtUserSetSystemMenu, 16 ) \
-    SYSCALL_ENTRY( 0x0184, NtUserSetSystemTimer, 24 ) \
-    SYSCALL_ENTRY( 0x0185, NtUserSetThreadDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x0186, NtUserSetTimer, 40 ) \
-    SYSCALL_ENTRY( 0x0187, NtUserSetWinEventHook, 64 ) \
-    SYSCALL_ENTRY( 0x0188, NtUserSetWindowLong, 32 ) \
-    SYSCALL_ENTRY( 0x0189, NtUserSetWindowLongPtr, 32 ) \
-    SYSCALL_ENTRY( 0x018a, NtUserSetWindowPlacement, 16 ) \
-    SYSCALL_ENTRY( 0x018b, NtUserSetWindowPos, 56 ) \
-    SYSCALL_ENTRY( 0x018c, NtUserSetWindowRgn, 24 ) \
-    SYSCALL_ENTRY( 0x018d, NtUserSetWindowWord, 24 ) \
-    SYSCALL_ENTRY( 0x018e, NtUserSetWindowsHookEx, 48 ) \
-    SYSCALL_ENTRY( 0x018f, NtUserShowCaret, 8 ) \
-    SYSCALL_ENTRY( 0x0190, NtUserShowCursor, 8 ) \
-    SYSCALL_ENTRY( 0x0191, NtUserShowScrollBar, 24 ) \
-    SYSCALL_ENTRY( 0x0192, NtUserShowWindow, 16 ) \
-    SYSCALL_ENTRY( 0x0193, NtUserShowWindowAsync, 16 ) \
-    SYSCALL_ENTRY( 0x0194, NtUserSwitchDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x0195, NtUserSystemParametersInfo, 32 ) \
-    SYSCALL_ENTRY( 0x0196, NtUserSystemParametersInfoForDpi, 40 ) \
-    SYSCALL_ENTRY( 0x0197, NtUserThunkedMenuInfo, 16 ) \
-    SYSCALL_ENTRY( 0x0198, NtUserThunkedMenuItemInfo, 48 ) \
-    SYSCALL_ENTRY( 0x0199, NtUserToUnicodeEx, 56 ) \
-    SYSCALL_ENTRY( 0x019a, NtUserTrackMouseEvent, 8 ) \
-    SYSCALL_ENTRY( 0x019b, NtUserTrackPopupMenuEx, 48 ) \
-    SYSCALL_ENTRY( 0x019c, NtUserTranslateAccelerator, 24 ) \
-    SYSCALL_ENTRY( 0x019d, NtUserTranslateMessage, 16 ) \
-    SYSCALL_ENTRY( 0x019e, NtUserUnhookWinEvent, 8 ) \
-    SYSCALL_ENTRY( 0x019f, NtUserUnhookWindowsHookEx, 8 ) \
-    SYSCALL_ENTRY( 0x01a0, NtUserUnregisterClass, 24 ) \
-    SYSCALL_ENTRY( 0x01a1, NtUserUnregisterHotKey, 16 ) \
-    SYSCALL_ENTRY( 0x01a2, NtUserUpdateInputContext, 24 ) \
-    SYSCALL_ENTRY( 0x01a3, NtUserUpdateLayeredWindow, 80 ) \
-    SYSCALL_ENTRY( 0x01a4, NtUserValidateRect, 16 ) \
-    SYSCALL_ENTRY( 0x01a5, NtUserVkKeyScanEx, 16 ) \
-    SYSCALL_ENTRY( 0x01a6, NtUserWaitForInputIdle, 24 ) \
-    SYSCALL_ENTRY( 0x01a7, NtUserWaitMessage, 0 ) \
-    SYSCALL_ENTRY( 0x01a8, NtUserWindowFromDC, 8 ) \
-    SYSCALL_ENTRY( 0x01a9, NtUserWindowFromPoint, 16 ) \
-    SYSCALL_ENTRY( 0x01aa, __wine_get_file_outline_text_metric, 32 ) \
-    SYSCALL_ENTRY( 0x01ab, __wine_get_icm_profile, 32 )
+    SYSCALL_ENTRY( 0x00cd, NtUserBuildNameList, 32 ) \
+    SYSCALL_ENTRY( 0x00ce, NtUserBuildPropList, 32 ) \
+    SYSCALL_ENTRY( 0x00cf, NtUserCallHwnd, 16 ) \
+    SYSCALL_ENTRY( 0x00d0, NtUserCallHwndParam, 24 ) \
+    SYSCALL_ENTRY( 0x00d1, NtUserCallMsgFilter, 16 ) \
+    SYSCALL_ENTRY( 0x00d2, NtUserCallNextHookEx, 32 ) \
+    SYSCALL_ENTRY( 0x00d3, NtUserCallNoParam, 8 ) \
+    SYSCALL_ENTRY( 0x00d4, NtUserCallOneParam, 16 ) \
+    SYSCALL_ENTRY( 0x00d5, NtUserCallTwoParam, 24 ) \
+    SYSCALL_ENTRY( 0x00d6, NtUserChangeClipboardChain, 16 ) \
+    SYSCALL_ENTRY( 0x00d7, NtUserChangeDisplaySettings, 40 ) \
+    SYSCALL_ENTRY( 0x00d8, NtUserCheckMenuItem, 24 ) \
+    SYSCALL_ENTRY( 0x00d9, NtUserChildWindowFromPointEx, 32 ) \
+    SYSCALL_ENTRY( 0x00da, NtUserClipCursor, 8 ) \
+    SYSCALL_ENTRY( 0x00db, NtUserCloseClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x00dc, NtUserCloseDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x00dd, NtUserCloseWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x00de, NtUserCopyAcceleratorTable, 24 ) \
+    SYSCALL_ENTRY( 0x00df, NtUserCountClipboardFormats, 0 ) \
+    SYSCALL_ENTRY( 0x00e0, NtUserCreateAcceleratorTable, 16 ) \
+    SYSCALL_ENTRY( 0x00e1, NtUserCreateCaret, 32 ) \
+    SYSCALL_ENTRY( 0x00e2, NtUserCreateDesktopEx, 48 ) \
+    SYSCALL_ENTRY( 0x00e3, NtUserCreateInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x00e4, NtUserCreateWindowEx, 136 ) \
+    SYSCALL_ENTRY( 0x00e5, NtUserCreateWindowStation, 56 ) \
+    SYSCALL_ENTRY( 0x00e6, NtUserDeferWindowPosAndBand, 80 ) \
+    SYSCALL_ENTRY( 0x00e7, NtUserDeleteMenu, 24 ) \
+    SYSCALL_ENTRY( 0x00e8, NtUserDestroyAcceleratorTable, 8 ) \
+    SYSCALL_ENTRY( 0x00e9, NtUserDestroyCursor, 16 ) \
+    SYSCALL_ENTRY( 0x00ea, NtUserDestroyInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x00eb, NtUserDestroyMenu, 8 ) \
+    SYSCALL_ENTRY( 0x00ec, NtUserDestroyWindow, 8 ) \
+    SYSCALL_ENTRY( 0x00ed, NtUserDisableThreadIme, 8 ) \
+    SYSCALL_ENTRY( 0x00ee, NtUserDispatchMessage, 8 ) \
+    SYSCALL_ENTRY( 0x00ef, NtUserDisplayConfigGetDeviceInfo, 8 ) \
+    SYSCALL_ENTRY( 0x00f0, NtUserDragDetect, 24 ) \
+    SYSCALL_ENTRY( 0x00f1, NtUserDragObject, 40 ) \
+    SYSCALL_ENTRY( 0x00f2, NtUserDrawCaptionTemp, 56 ) \
+    SYSCALL_ENTRY( 0x00f3, NtUserDrawIconEx, 72 ) \
+    SYSCALL_ENTRY( 0x00f4, NtUserDrawMenuBarTemp, 40 ) \
+    SYSCALL_ENTRY( 0x00f5, NtUserEmptyClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x00f6, NtUserEnableMenuItem, 24 ) \
+    SYSCALL_ENTRY( 0x00f7, NtUserEnableMouseInPointer, 8 ) \
+    SYSCALL_ENTRY( 0x00f8, NtUserEnableMouseInPointerForThread, 0 ) \
+    SYSCALL_ENTRY( 0x00f9, NtUserEnableScrollBar, 24 ) \
+    SYSCALL_ENTRY( 0x00fa, NtUserEndDeferWindowPosEx, 16 ) \
+    SYSCALL_ENTRY( 0x00fb, NtUserEndMenu, 0 ) \
+    SYSCALL_ENTRY( 0x00fc, NtUserEndPaint, 16 ) \
+    SYSCALL_ENTRY( 0x00fd, NtUserEnumDisplayDevices, 32 ) \
+    SYSCALL_ENTRY( 0x00fe, NtUserEnumDisplayMonitors, 32 ) \
+    SYSCALL_ENTRY( 0x00ff, NtUserEnumDisplaySettings, 32 ) \
+    SYSCALL_ENTRY( 0x0100, NtUserExcludeUpdateRgn, 16 ) \
+    SYSCALL_ENTRY( 0x0101, NtUserFindExistingCursorIcon, 24 ) \
+    SYSCALL_ENTRY( 0x0102, NtUserFindWindowEx, 40 ) \
+    SYSCALL_ENTRY( 0x0103, NtUserFlashWindowEx, 8 ) \
+    SYSCALL_ENTRY( 0x0104, NtUserGetAncestor, 16 ) \
+    SYSCALL_ENTRY( 0x0105, NtUserGetAsyncKeyState, 8 ) \
+    SYSCALL_ENTRY( 0x0106, NtUserGetAtomName, 16 ) \
+    SYSCALL_ENTRY( 0x0107, NtUserGetCaretBlinkTime, 0 ) \
+    SYSCALL_ENTRY( 0x0108, NtUserGetCaretPos, 8 ) \
+    SYSCALL_ENTRY( 0x0109, NtUserGetClassInfoEx, 40 ) \
+    SYSCALL_ENTRY( 0x010a, NtUserGetClassName, 24 ) \
+    SYSCALL_ENTRY( 0x010b, NtUserGetClipboardData, 16 ) \
+    SYSCALL_ENTRY( 0x010c, NtUserGetClipboardFormatName, 24 ) \
+    SYSCALL_ENTRY( 0x010d, NtUserGetClipboardOwner, 0 ) \
+    SYSCALL_ENTRY( 0x010e, NtUserGetClipboardSequenceNumber, 0 ) \
+    SYSCALL_ENTRY( 0x010f, NtUserGetClipboardViewer, 0 ) \
+    SYSCALL_ENTRY( 0x0110, NtUserGetCursor, 0 ) \
+    SYSCALL_ENTRY( 0x0111, NtUserGetCursorFrameInfo, 32 ) \
+    SYSCALL_ENTRY( 0x0112, NtUserGetCursorInfo, 8 ) \
+    SYSCALL_ENTRY( 0x0113, NtUserGetDC, 8 ) \
+    SYSCALL_ENTRY( 0x0114, NtUserGetDCEx, 24 ) \
+    SYSCALL_ENTRY( 0x0115, NtUserGetDisplayConfigBufferSizes, 24 ) \
+    SYSCALL_ENTRY( 0x0116, NtUserGetDoubleClickTime, 0 ) \
+    SYSCALL_ENTRY( 0x0117, NtUserGetDpiForMonitor, 32 ) \
+    SYSCALL_ENTRY( 0x0118, NtUserGetForegroundWindow, 0 ) \
+    SYSCALL_ENTRY( 0x0119, NtUserGetGUIThreadInfo, 16 ) \
+    SYSCALL_ENTRY( 0x011a, NtUserGetIconInfo, 48 ) \
+    SYSCALL_ENTRY( 0x011b, NtUserGetIconSize, 32 ) \
+    SYSCALL_ENTRY( 0x011c, NtUserGetInternalWindowPos, 24 ) \
+    SYSCALL_ENTRY( 0x011d, NtUserGetKeyNameText, 24 ) \
+    SYSCALL_ENTRY( 0x011e, NtUserGetKeyState, 8 ) \
+    SYSCALL_ENTRY( 0x011f, NtUserGetKeyboardLayout, 8 ) \
+    SYSCALL_ENTRY( 0x0120, NtUserGetKeyboardLayoutList, 16 ) \
+    SYSCALL_ENTRY( 0x0121, NtUserGetKeyboardLayoutName, 8 ) \
+    SYSCALL_ENTRY( 0x0122, NtUserGetKeyboardState, 8 ) \
+    SYSCALL_ENTRY( 0x0123, NtUserGetLayeredWindowAttributes, 32 ) \
+    SYSCALL_ENTRY( 0x0124, NtUserGetMenuBarInfo, 32 ) \
+    SYSCALL_ENTRY( 0x0125, NtUserGetMenuItemRect, 32 ) \
+    SYSCALL_ENTRY( 0x0126, NtUserGetMessage, 32 ) \
+    SYSCALL_ENTRY( 0x0127, NtUserGetMouseMovePointsEx, 40 ) \
+    SYSCALL_ENTRY( 0x0128, NtUserGetObjectInformation, 40 ) \
+    SYSCALL_ENTRY( 0x0129, NtUserGetOpenClipboardWindow, 0 ) \
+    SYSCALL_ENTRY( 0x012a, NtUserGetPointerInfoList, 64 ) \
+    SYSCALL_ENTRY( 0x012b, NtUserGetPriorityClipboardFormat, 16 ) \
+    SYSCALL_ENTRY( 0x012c, NtUserGetProcessDpiAwarenessContext, 8 ) \
+    SYSCALL_ENTRY( 0x012d, NtUserGetProcessWindowStation, 0 ) \
+    SYSCALL_ENTRY( 0x012e, NtUserGetProp, 16 ) \
+    SYSCALL_ENTRY( 0x012f, NtUserGetQueueStatus, 8 ) \
+    SYSCALL_ENTRY( 0x0130, NtUserGetRawInputBuffer, 24 ) \
+    SYSCALL_ENTRY( 0x0131, NtUserGetRawInputData, 40 ) \
+    SYSCALL_ENTRY( 0x0132, NtUserGetRawInputDeviceInfo, 32 ) \
+    SYSCALL_ENTRY( 0x0133, NtUserGetRawInputDeviceList, 24 ) \
+    SYSCALL_ENTRY( 0x0134, NtUserGetRegisteredRawInputDevices, 24 ) \
+    SYSCALL_ENTRY( 0x0135, NtUserGetScrollBarInfo, 24 ) \
+    SYSCALL_ENTRY( 0x0136, NtUserGetSystemDpiForProcess, 8 ) \
+    SYSCALL_ENTRY( 0x0137, NtUserGetSystemMenu, 16 ) \
+    SYSCALL_ENTRY( 0x0138, NtUserGetThreadDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x0139, NtUserGetTitleBarInfo, 16 ) \
+    SYSCALL_ENTRY( 0x013a, NtUserGetUpdateRect, 24 ) \
+    SYSCALL_ENTRY( 0x013b, NtUserGetUpdateRgn, 24 ) \
+    SYSCALL_ENTRY( 0x013c, NtUserGetUpdatedClipboardFormats, 24 ) \
+    SYSCALL_ENTRY( 0x013d, NtUserGetWindowDC, 8 ) \
+    SYSCALL_ENTRY( 0x013e, NtUserGetWindowPlacement, 16 ) \
+    SYSCALL_ENTRY( 0x013f, NtUserGetWindowRgnEx, 24 ) \
+    SYSCALL_ENTRY( 0x0140, NtUserHideCaret, 8 ) \
+    SYSCALL_ENTRY( 0x0141, NtUserHiliteMenuItem, 32 ) \
+    SYSCALL_ENTRY( 0x0142, NtUserInitializeClientPfnArrays, 32 ) \
+    SYSCALL_ENTRY( 0x0143, NtUserInternalGetWindowIcon, 16 ) \
+    SYSCALL_ENTRY( 0x0144, NtUserInternalGetWindowText, 24 ) \
+    SYSCALL_ENTRY( 0x0145, NtUserInvalidateRect, 24 ) \
+    SYSCALL_ENTRY( 0x0146, NtUserInvalidateRgn, 24 ) \
+    SYSCALL_ENTRY( 0x0147, NtUserIsClipboardFormatAvailable, 8 ) \
+    SYSCALL_ENTRY( 0x0148, NtUserIsMouseInPointerEnabled, 0 ) \
+    SYSCALL_ENTRY( 0x0149, NtUserKillTimer, 16 ) \
+    SYSCALL_ENTRY( 0x014a, NtUserLockWindowUpdate, 8 ) \
+    SYSCALL_ENTRY( 0x014b, NtUserLogicalToPerMonitorDPIPhysicalPoint, 16 ) \
+    SYSCALL_ENTRY( 0x014c, NtUserMapVirtualKeyEx, 24 ) \
+    SYSCALL_ENTRY( 0x014d, NtUserMenuItemFromPoint, 32 ) \
+    SYSCALL_ENTRY( 0x014e, NtUserMessageCall, 56 ) \
+    SYSCALL_ENTRY( 0x014f, NtUserMoveWindow, 48 ) \
+    SYSCALL_ENTRY( 0x0150, NtUserMsgWaitForMultipleObjectsEx, 40 ) \
+    SYSCALL_ENTRY( 0x0151, NtUserNotifyIMEStatus, 16 ) \
+    SYSCALL_ENTRY( 0x0152, NtUserNotifyWinEvent, 32 ) \
+    SYSCALL_ENTRY( 0x0153, NtUserOpenClipboard, 16 ) \
+    SYSCALL_ENTRY( 0x0154, NtUserOpenDesktop, 24 ) \
+    SYSCALL_ENTRY( 0x0155, NtUserOpenInputDesktop, 24 ) \
+    SYSCALL_ENTRY( 0x0156, NtUserOpenWindowStation, 16 ) \
+    SYSCALL_ENTRY( 0x0157, NtUserPeekMessage, 40 ) \
+    SYSCALL_ENTRY( 0x0158, NtUserPerMonitorDPIPhysicalToLogicalPoint, 16 ) \
+    SYSCALL_ENTRY( 0x0159, NtUserPostMessage, 32 ) \
+    SYSCALL_ENTRY( 0x015a, NtUserPostThreadMessage, 32 ) \
+    SYSCALL_ENTRY( 0x015b, NtUserPrintWindow, 24 ) \
+    SYSCALL_ENTRY( 0x015c, NtUserQueryDisplayConfig, 48 ) \
+    SYSCALL_ENTRY( 0x015d, NtUserQueryInputContext, 16 ) \
+    SYSCALL_ENTRY( 0x015e, NtUserRealChildWindowFromPoint, 24 ) \
+    SYSCALL_ENTRY( 0x015f, NtUserRedrawWindow, 32 ) \
+    SYSCALL_ENTRY( 0x0160, NtUserRegisterClassExWOW, 56 ) \
+    SYSCALL_ENTRY( 0x0161, NtUserRegisterHotKey, 32 ) \
+    SYSCALL_ENTRY( 0x0162, NtUserRegisterRawInputDevices, 24 ) \
+    SYSCALL_ENTRY( 0x0163, NtUserRegisterTouchPadCapable, 8 ) \
+    SYSCALL_ENTRY( 0x0164, NtUserReleaseDC, 16 ) \
+    SYSCALL_ENTRY( 0x0165, NtUserRemoveClipboardFormatListener, 8 ) \
+    SYSCALL_ENTRY( 0x0166, NtUserRemoveMenu, 24 ) \
+    SYSCALL_ENTRY( 0x0167, NtUserRemoveProp, 16 ) \
+    SYSCALL_ENTRY( 0x0168, NtUserScrollDC, 56 ) \
+    SYSCALL_ENTRY( 0x0169, NtUserScrollWindowEx, 64 ) \
+    SYSCALL_ENTRY( 0x016a, NtUserSelectPalette, 24 ) \
+    SYSCALL_ENTRY( 0x016b, NtUserSendInput, 24 ) \
+    SYSCALL_ENTRY( 0x016c, NtUserSetActiveWindow, 8 ) \
+    SYSCALL_ENTRY( 0x016d, NtUserSetCapture, 8 ) \
+    SYSCALL_ENTRY( 0x016e, NtUserSetClassLong, 32 ) \
+    SYSCALL_ENTRY( 0x016f, NtUserSetClassLongPtr, 32 ) \
+    SYSCALL_ENTRY( 0x0170, NtUserSetClassWord, 24 ) \
+    SYSCALL_ENTRY( 0x0171, NtUserSetClipboardData, 24 ) \
+    SYSCALL_ENTRY( 0x0172, NtUserSetClipboardViewer, 8 ) \
+    SYSCALL_ENTRY( 0x0173, NtUserSetCursor, 8 ) \
+    SYSCALL_ENTRY( 0x0174, NtUserSetCursorIconData, 32 ) \
+    SYSCALL_ENTRY( 0x0175, NtUserSetCursorPos, 16 ) \
+    SYSCALL_ENTRY( 0x0176, NtUserSetFocus, 8 ) \
+    SYSCALL_ENTRY( 0x0177, NtUserSetInternalWindowPos, 32 ) \
+    SYSCALL_ENTRY( 0x0178, NtUserSetKeyboardState, 8 ) \
+    SYSCALL_ENTRY( 0x0179, NtUserSetLayeredWindowAttributes, 32 ) \
+    SYSCALL_ENTRY( 0x017a, NtUserSetMenu, 16 ) \
+    SYSCALL_ENTRY( 0x017b, NtUserSetMenuContextHelpId, 16 ) \
+    SYSCALL_ENTRY( 0x017c, NtUserSetMenuDefaultItem, 24 ) \
+    SYSCALL_ENTRY( 0x017d, NtUserSetObjectInformation, 32 ) \
+    SYSCALL_ENTRY( 0x017e, NtUserSetParent, 16 ) \
+    SYSCALL_ENTRY( 0x017f, NtUserSetProcessDpiAwarenessContext, 16 ) \
+    SYSCALL_ENTRY( 0x0180, NtUserSetProcessWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x0181, NtUserSetProp, 24 ) \
+    SYSCALL_ENTRY( 0x0182, NtUserSetScrollInfo, 32 ) \
+    SYSCALL_ENTRY( 0x0183, NtUserSetShellWindowEx, 16 ) \
+    SYSCALL_ENTRY( 0x0184, NtUserSetSysColors, 24 ) \
+    SYSCALL_ENTRY( 0x0185, NtUserSetSystemMenu, 16 ) \
+    SYSCALL_ENTRY( 0x0186, NtUserSetSystemTimer, 24 ) \
+    SYSCALL_ENTRY( 0x0187, NtUserSetThreadDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x0188, NtUserSetTimer, 40 ) \
+    SYSCALL_ENTRY( 0x0189, NtUserSetWinEventHook, 64 ) \
+    SYSCALL_ENTRY( 0x018a, NtUserSetWindowLong, 32 ) \
+    SYSCALL_ENTRY( 0x018b, NtUserSetWindowLongPtr, 32 ) \
+    SYSCALL_ENTRY( 0x018c, NtUserSetWindowPlacement, 16 ) \
+    SYSCALL_ENTRY( 0x018d, NtUserSetWindowPos, 56 ) \
+    SYSCALL_ENTRY( 0x018e, NtUserSetWindowRgn, 24 ) \
+    SYSCALL_ENTRY( 0x018f, NtUserSetWindowWord, 24 ) \
+    SYSCALL_ENTRY( 0x0190, NtUserSetWindowsHookEx, 48 ) \
+    SYSCALL_ENTRY( 0x0191, NtUserShowCaret, 8 ) \
+    SYSCALL_ENTRY( 0x0192, NtUserShowCursor, 8 ) \
+    SYSCALL_ENTRY( 0x0193, NtUserShowScrollBar, 24 ) \
+    SYSCALL_ENTRY( 0x0194, NtUserShowWindow, 16 ) \
+    SYSCALL_ENTRY( 0x0195, NtUserShowWindowAsync, 16 ) \
+    SYSCALL_ENTRY( 0x0196, NtUserSwitchDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x0197, NtUserSystemParametersInfo, 32 ) \
+    SYSCALL_ENTRY( 0x0198, NtUserSystemParametersInfoForDpi, 40 ) \
+    SYSCALL_ENTRY( 0x0199, NtUserThunkedMenuInfo, 16 ) \
+    SYSCALL_ENTRY( 0x019a, NtUserThunkedMenuItemInfo, 48 ) \
+    SYSCALL_ENTRY( 0x019b, NtUserToUnicodeEx, 56 ) \
+    SYSCALL_ENTRY( 0x019c, NtUserTrackMouseEvent, 8 ) \
+    SYSCALL_ENTRY( 0x019d, NtUserTrackPopupMenuEx, 48 ) \
+    SYSCALL_ENTRY( 0x019e, NtUserTranslateAccelerator, 24 ) \
+    SYSCALL_ENTRY( 0x019f, NtUserTranslateMessage, 16 ) \
+    SYSCALL_ENTRY( 0x01a0, NtUserUnhookWinEvent, 8 ) \
+    SYSCALL_ENTRY( 0x01a1, NtUserUnhookWindowsHookEx, 8 ) \
+    SYSCALL_ENTRY( 0x01a2, NtUserUnregisterClass, 24 ) \
+    SYSCALL_ENTRY( 0x01a3, NtUserUnregisterHotKey, 16 ) \
+    SYSCALL_ENTRY( 0x01a4, NtUserUpdateInputContext, 24 ) \
+    SYSCALL_ENTRY( 0x01a5, NtUserUpdateLayeredWindow, 80 ) \
+    SYSCALL_ENTRY( 0x01a6, NtUserValidateRect, 16 ) \
+    SYSCALL_ENTRY( 0x01a7, NtUserVkKeyScanEx, 16 ) \
+    SYSCALL_ENTRY( 0x01a8, NtUserWaitForInputIdle, 24 ) \
+    SYSCALL_ENTRY( 0x01a9, NtUserWaitMessage, 0 ) \
+    SYSCALL_ENTRY( 0x01aa, NtUserWindowFromDC, 8 ) \
+    SYSCALL_ENTRY( 0x01ab, NtUserWindowFromPoint, 16 ) \
+    SYSCALL_ENTRY( 0x01ac, __wine_get_file_outline_text_metric, 32 ) \
+    SYSCALL_ENTRY( 0x01ad, __wine_get_icm_profile, 32 )

dlls/win32u/win32u.spec

@@ -813,8 +813,8 @@
 @ stub NtUserBroadcastThemeChangeEvent
 @ stdcall -syscall NtUserBuildHimcList(long long ptr ptr)
 @ stdcall -syscall NtUserBuildHwndList(long long long long long long ptr ptr)
-@ stub NtUserBuildNameList
-@ stub NtUserBuildPropList
+@ stdcall -syscall NtUserBuildNameList(long long ptr ptr)
+@ stdcall -syscall NtUserBuildPropList(long long ptr ptr)
 @ stub NtUserCalcMenuBar
 @ stub NtUserCalculatePopupWindowPosition
 @ stdcall -syscall NtUserCallHwnd(long long)

dlls/win32u/win32u_private.h

@@ -132,6 +132,7 @@ extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y );
 /* message.c */
 extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id );
 extern BOOL reply_message_result( LRESULT result );
+extern BOOL post_quit_message( int exit_code );
 extern NTSTATUS send_hardware_message( HWND hwnd, UINT flags, const INPUT *input, LPARAM lparam );
 extern LRESULT send_internal_message_timeout( DWORD dest_pid, DWORD dest_tid, UINT msg, WPARAM wparam,
                                               LPARAM lparam, UINT flags, UINT timeout,

dlls/win32u/window.c

@@ -1561,6 +1561,43 @@ HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str )
     return (HANDLE)ret;
 }
 
+
+/***********************************************************************
+ *           NtUserBuildPropList   (win32u.@)
+ */
+NTSTATUS WINAPI NtUserBuildPropList( HWND hwnd, ULONG count, struct ntuser_property_list *buffer, ULONG *ret_count )
+{
+    property_data_t *data;
+    ULONG i;
+    NTSTATUS status;
+
+    if (!buffer || !ret_count) return STATUS_INVALID_PARAMETER;
+
+    if (!(data = malloc( count * sizeof(*data) ))) return STATUS_NO_MEMORY;
+
+    SERVER_START_REQ( get_window_properties )
+    {
+        req->window = wine_server_user_handle( hwnd );
+        wine_server_set_reply( req, data, count * sizeof(*data) );
+        if (!(status = wine_server_call( req )))
+        {
+            for (i = 0; i < wine_server_reply_size(reply) / sizeof(*data); i++)
+            {
+                buffer[i].data   = data[i].data;
+                buffer[i].atom   = data[i].atom;
+                buffer[i].string = data[i].string;
+            }
+            *ret_count = reply->total;
+            if (reply->total > count) status = STATUS_BUFFER_TOO_SMALL;
+        }
+    }
+    SERVER_END_REQ;
+
+    free( data );
+    return status;
+}
+
+
 static void mirror_rect( const RECT *window_rect, RECT *rect )
 {
     int width = window_rect->right - window_rect->left;

dlls/win32u/winstation.c

@@ -602,6 +602,43 @@ BOOL WINAPI NtUserSwitchDesktop( HDESK desktop )
     return TRUE;
 }
 
+/******************************************************************************
+ *              NtUserBuildNameList   (win32u.@)
+ */
+NTSTATUS WINAPI NtUserBuildNameList( HWINSTA handle, ULONG size, struct ntuser_name_list *list,
+                                     ULONG *ret_size )
+{
+    const ULONG header_size = offsetof( struct ntuser_name_list, strings[1] ); /* header + final null */
+    WCHAR *buffer;
+    NTSTATUS status;
+    ULONG count, result, total;
+
+    if (size <= header_size) return STATUS_INVALID_HANDLE;
+    if (!(buffer = malloc( size - header_size ))) return STATUS_NO_MEMORY;
+
+    SERVER_START_REQ( enum_winstation )
+    {
+        req->handle = wine_server_obj_handle( handle );
+        wine_server_set_reply( req, buffer, size - header_size );
+        status = wine_server_call( req );
+        result = wine_server_reply_size( reply );
+        total  = reply->total;
+        count  = reply->count;
+    }
+    SERVER_END_REQ;
+
+    if (!status || status == STATUS_BUFFER_TOO_SMALL)
+    {
+        list->size = header_size + result;
+        list->count = count;
+        memcpy( list->strings, buffer, result );
+        list->strings[result / sizeof(WCHAR)] = 0;
+        *ret_size = header_size + total;
+    }
+    return status;
+}
+
+
 /***********************************************************************
  *           NtUserGetObjectInformation   (win32u.@)
  */

dlls/winebus.sys/bus_iohid.c

@@ -275,10 +275,11 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *
         .serialnumber = {'0','0','0','0',0},
     };
     struct iohid_device *impl;
+    USAGE_AND_PAGE usages;
     CFStringRef str;
 
-    desc.usages.UsagePage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey)));
-    desc.usages.Usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey)));
+    usages.UsagePage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsagePageKey)));
+    usages.Usage = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDPrimaryUsageKey)));
 
     desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey)));
     desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey)));
@@ -289,8 +290,8 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *
         desc.is_bluetooth = !CFStringCompare(str, CFSTR(kIOHIDTransportBluetoothValue), 0) ||
                             !CFStringCompare(str, CFSTR(kIOHIDTransportBluetoothLowEnergyValue), 0);
 
-    if (desc.usages.UsagePage != HID_USAGE_PAGE_GENERIC ||
-        !(desc.usages.Usage == HID_USAGE_GENERIC_JOYSTICK || desc.usages.Usage == HID_USAGE_GENERIC_GAMEPAD))
+    if (usages.UsagePage != HID_USAGE_PAGE_GENERIC ||
+        !(usages.Usage == HID_USAGE_GENERIC_JOYSTICK || usages.Usage == HID_USAGE_GENERIC_GAMEPAD))
     {
         /* winebus isn't currently meant to handle anything but these, and
          * opening keyboards, mice, or the Touch Bar on older MacBooks triggers

dlls/winebus.sys/bus_sdl.c

@@ -198,7 +198,7 @@ static void set_hat_value(struct unix_device *iface, int index, int value)
     hid_device_set_hatswitch_y(iface, index, y);
 }
 
-static BOOL descriptor_add_haptic(struct sdl_device *impl)
+static BOOL descriptor_add_haptic(struct sdl_device *impl, BOOL force)
 {
     USHORT i, count = 0;
     USAGE usages[16];
@@ -227,16 +227,16 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl)
     if ((impl->effect_support & EFFECT_SUPPORT_PHYSICAL))
     {
         /* SDL_HAPTIC_SQUARE doesn't exist */
-        if (impl->effect_support & SDL_HAPTIC_SINE) usages[count++] = PID_USAGE_ET_SINE;
-        if (impl->effect_support & SDL_HAPTIC_TRIANGLE) usages[count++] = PID_USAGE_ET_TRIANGLE;
-        if (impl->effect_support & SDL_HAPTIC_SAWTOOTHUP) usages[count++] = PID_USAGE_ET_SAWTOOTH_UP;
-        if (impl->effect_support & SDL_HAPTIC_SAWTOOTHDOWN) usages[count++] = PID_USAGE_ET_SAWTOOTH_DOWN;
-        if (impl->effect_support & SDL_HAPTIC_SPRING) usages[count++] = PID_USAGE_ET_SPRING;
-        if (impl->effect_support & SDL_HAPTIC_DAMPER) usages[count++] = PID_USAGE_ET_DAMPER;
-        if (impl->effect_support & SDL_HAPTIC_INERTIA) usages[count++] = PID_USAGE_ET_INERTIA;
-        if (impl->effect_support & SDL_HAPTIC_FRICTION) usages[count++] = PID_USAGE_ET_FRICTION;
-        if (impl->effect_support & SDL_HAPTIC_CONSTANT) usages[count++] = PID_USAGE_ET_CONSTANT_FORCE;
-        if (impl->effect_support & SDL_HAPTIC_RAMP) usages[count++] = PID_USAGE_ET_RAMP;
+        if (force || (impl->effect_support & SDL_HAPTIC_SINE)) usages[count++] = PID_USAGE_ET_SINE;
+        if (force || (impl->effect_support & SDL_HAPTIC_TRIANGLE)) usages[count++] = PID_USAGE_ET_TRIANGLE;
+        if (force || (impl->effect_support & SDL_HAPTIC_SAWTOOTHUP)) usages[count++] = PID_USAGE_ET_SAWTOOTH_UP;
+        if (force || (impl->effect_support & SDL_HAPTIC_SAWTOOTHDOWN)) usages[count++] = PID_USAGE_ET_SAWTOOTH_DOWN;
+        if (force || (impl->effect_support & SDL_HAPTIC_SPRING)) usages[count++] = PID_USAGE_ET_SPRING;
+        if (force || (impl->effect_support & SDL_HAPTIC_DAMPER)) usages[count++] = PID_USAGE_ET_DAMPER;
+        if (force || (impl->effect_support & SDL_HAPTIC_INERTIA)) usages[count++] = PID_USAGE_ET_INERTIA;
+        if (force || (impl->effect_support & SDL_HAPTIC_FRICTION)) usages[count++] = PID_USAGE_ET_FRICTION;
+        if (force || (impl->effect_support & SDL_HAPTIC_CONSTANT)) usages[count++] = PID_USAGE_ET_CONSTANT_FORCE;
+        if (force || (impl->effect_support & SDL_HAPTIC_RAMP)) usages[count++] = PID_USAGE_ET_RAMP;
 
         if (!hid_device_add_physical(&impl->unix_device, usages, count))
             return FALSE;
@@ -360,7 +360,7 @@ static NTSTATUS build_joystick_report_descriptor(struct unix_device *iface)
     if (!hid_device_end_input_report(iface))
         return STATUS_NO_MEMORY;
 
-    if (!descriptor_add_haptic(impl))
+    if (!descriptor_add_haptic(impl, physical_usage.Usage == HID_USAGE_SIMULATION_AUTOMOBILE_SIMULATION_DEVICE))
         return STATUS_NO_MEMORY;
 
     if (!hid_device_end_report_descriptor(iface))
@@ -414,7 +414,7 @@ static NTSTATUS build_controller_report_descriptor(struct unix_device *iface)
     if (!hid_device_end_input_report(iface))
         return STATUS_NO_MEMORY;
 
-    if (!descriptor_add_haptic(impl))
+    if (!descriptor_add_haptic(impl, FALSE))
         return STATUS_NO_MEMORY;
 
     if (!hid_device_end_report_descriptor(iface))
@@ -443,17 +443,12 @@ static void sdl_device_destroy(struct unix_device *iface)
 static NTSTATUS sdl_device_start(struct unix_device *iface)
 {
     struct sdl_device *impl = impl_from_unix_device(iface);
-    NTSTATUS status;
 
     pthread_mutex_lock(&sdl_cs);
-
-    if (impl->sdl_controller) status = build_controller_report_descriptor(iface);
-    else status = build_joystick_report_descriptor(iface);
-    impl->started = !status;
-
+    impl->started = TRUE;
     pthread_mutex_unlock(&sdl_cs);
 
-    return status;
+    return STATUS_SUCCESS;
 }
 
 static void sdl_device_stop(struct unix_device *iface)
@@ -595,7 +590,7 @@ static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BY
 
     TRACE("iface %p, index %u, control %04x, iterations %u.\n", iface, index, control, iterations);
 
-    if (impl->effect_ids[index] < 0) return STATUS_UNSUCCESSFUL;
+    if (id < 0) return STATUS_SUCCESS;
 
     switch (control)
     {
@@ -991,8 +986,6 @@ static void sdl_add_device(unsigned int index)
     if (controller)
     {
         desc.is_gamepad = TRUE;
-        desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC;
-        desc.usages.Usage = HID_USAGE_GENERIC_GAMEPAD;
         axis_count = 6;
     }
     else
@@ -1000,12 +993,12 @@ static void sdl_add_device(unsigned int index)
         int button_count = pSDL_JoystickNumButtons(joystick);
         axis_count = pSDL_JoystickNumAxes(joystick);
         desc.is_gamepad = (axis_count == 6  && button_count >= 14);
-        desc.usages.UsagePage = HID_USAGE_PAGE_GENERIC;
-        desc.usages.Usage = HID_USAGE_GENERIC_JOYSTICK;
     }
 
     for (axis_offset = 0; axis_offset < axis_count; axis_offset += (options.split_controllers ? 6 : axis_count))
     {
+        NTSTATUS status;
+
         if (!axis_offset) strcpy(buffer, product);
         else snprintf(buffer, ARRAY_SIZE(buffer), "%s %d", product, axis_offset / 6);
         ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.product, ARRAY_SIZE(desc.product));
@@ -1019,6 +1012,15 @@ static void sdl_add_device(unsigned int index)
         impl->id = id;
         impl->axis_offset = axis_offset;
 
+        if (impl->sdl_controller) status = build_controller_report_descriptor(&impl->unix_device);
+        else status = build_joystick_report_descriptor(&impl->unix_device);
+        if (status)
+        {
+            list_remove(&impl->unix_device.entry);
+            impl->unix_device.vtbl->destroy(&impl->unix_device);
+            return;
+        }
+
         bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc);
     }
 }

dlls/winebus.sys/bus_udev.c

@@ -728,12 +728,6 @@ static void lnxev_device_destroy(struct unix_device *iface)
 
 static NTSTATUS lnxev_device_start(struct unix_device *iface)
 {
-    struct lnxev_device *impl = lnxev_impl_from_unix_device(iface);
-    NTSTATUS status;
-
-    if ((status = build_report_descriptor(iface, impl->base.udev_device)))
-        return status;
-
     pthread_mutex_lock(&udev_cs);
     start_polling_device(iface);
     pthread_mutex_unlock(&udev_cs);
@@ -1254,7 +1248,6 @@ static void udev_add_device(struct udev_device *dev, int fd)
 #ifdef HAS_PROPER_INPUT_HEADER
     else if (!strcmp(subsystem, "input"))
     {
-        const USAGE_AND_PAGE device_usage = *what_am_I(dev, fd);
         static const WCHAR evdev[] = {'e','v','d','e','v',0};
         struct input_id device_id = {0};
         char buffer[MAX_PATH];
@@ -1275,8 +1268,6 @@ static void udev_add_device(struct udev_device *dev, int fd)
 
         if (!desc.serialnumber[0] && ioctl(fd, EVIOCGUNIQ(sizeof(buffer)), buffer) >= 0)
             ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber));
-
-        desc.usages = device_usage;
     }
 #endif
 
@@ -1321,6 +1312,13 @@ static void udev_add_device(struct udev_device *dev, int fd)
         strcpy(impl->devnode, devnode);
         impl->device_fd = fd;
 
+        if (build_report_descriptor(&impl->unix_device, impl->udev_device))
+        {
+            list_remove(&impl->unix_device.entry);
+            impl->unix_device.vtbl->destroy(&impl->unix_device);
+            return;
+        }
+
         bus_event_queue_device_created(&event_queue, &impl->unix_device, &desc);
     }
 #endif

dlls/winebus.sys/main.c

@@ -417,7 +417,7 @@ static DWORD check_bus_option(const WCHAR *option, DWORD default_value)
     return default_value;
 }
 
-static BOOL is_hidraw_enabled(WORD vid, WORD pid, const USAGE_AND_PAGE *usages)
+static BOOL is_hidraw_enabled(WORD vid, WORD pid, const USAGE_AND_PAGE *usages, UINT buttons)
 {
     char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[1024])];
     KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer;
@@ -436,6 +436,48 @@ static BOOL is_hidraw_enabled(WORD vid, WORD pid, const USAGE_AND_PAGE *usages)
     if (is_dualshock4_gamepad(vid, pid)) prefer_hidraw = TRUE;
     if (is_dualsense_gamepad(vid, pid)) prefer_hidraw = TRUE;
 
+    switch (vid)
+    {
+    case 0x044f:
+        if (pid == 0xb679) prefer_hidraw = TRUE; /* ThrustMaster T-Rudder */
+        if (pid == 0xb687) prefer_hidraw = TRUE; /* ThrustMaster TWCS Throttle */
+        if (pid == 0xb10a) prefer_hidraw = TRUE; /* ThrustMaster T.16000M Joystick */
+        break;
+    case 0x16d0:
+        if (pid == 0x0d61) prefer_hidraw = TRUE; /* Simucube 2 Sport */
+        if (pid == 0x0d60) prefer_hidraw = TRUE; /* Simucube 2 Pro */
+        if (pid == 0x0d5f) prefer_hidraw = TRUE; /* Simucube 2 Ultimate */
+        if (pid == 0x0d5a) prefer_hidraw = TRUE; /* Simucube 1 */
+        break;
+    case 0x0eb7:
+        if (pid == 0x183b) prefer_hidraw = TRUE; /* Fanatec ClubSport Pedals v3 */
+        if (pid == 0x1839) prefer_hidraw = TRUE; /* Fanatec ClubSport Pedals v1/v2 */
+        break;
+    case 0x231d:
+        /* comes with 128 buttons in the default configuration */
+        if (buttons == 128) prefer_hidraw = TRUE;
+        /* if customized, less than 128 buttons may be shown, decide by PID */
+        if (pid == 0x0200) prefer_hidraw = TRUE; /* VKBsim Gladiator EVO Right Grip */
+        if (pid == 0x0201) prefer_hidraw = TRUE; /* VKBsim Gladiator EVO Left Grip */
+        if (pid == 0x0126) prefer_hidraw = TRUE; /* VKB-Sim Space Gunfighter */
+        if (pid == 0x0127) prefer_hidraw = TRUE; /* VKB-Sim Space Gunfighter L */
+        break;
+    case 0x3344:
+        /* comes with 31 buttons in the default configuration, or 128 max */
+        if ((buttons == 31) || (buttons == 128)) prefer_hidraw = TRUE;
+        /* users may have configured button limits, usually 32/50/64 */
+        if ((buttons == 32) || (buttons == 50) || (buttons == 64)) prefer_hidraw = TRUE;
+        /* if customized, arbitrary amount of buttons may be shown, decide by PID */
+        if (pid == 0x412f) prefer_hidraw = TRUE; /* Virpil Constellation ALPHA-R */
+        if (pid == 0x812c) prefer_hidraw = TRUE; /* Virpil Constellation ALPHA-L */
+        break;
+    case 0x03eb:
+        /* users may have configured button limits, usually 32/50/64 */
+        if ((buttons == 32) || (buttons == 50) || (buttons == 64)) prefer_hidraw = TRUE;
+        if (pid == 0x2055) prefer_hidraw = TRUE; /* ATMEL/VIRPIL/200325 VPC Throttle MT-50 CM2 */
+        break;
+    }
+
     RtlInitUnicodeString(&str, L"EnableHidraw");
     if (!NtQueryValueKey(driver_key, &str, KeyValuePartialInformation, info,
                          sizeof(buffer) - sizeof(WCHAR), &size))
@@ -684,22 +726,41 @@ static NTSTATUS get_device_descriptors(UINT64 unix_device, BYTE **report_desc, U
     return STATUS_SUCCESS;
 }
 
-static USAGE_AND_PAGE get_hidraw_device_usages(UINT64 unix_device)
+static USAGE_AND_PAGE get_device_usages(UINT64 unix_device, UINT *buttons)
 {
     HIDP_DEVICE_DESC device_desc;
     USAGE_AND_PAGE usages = {0};
-    UINT report_desc_length;
+    UINT i, count = 0, report_desc_length;
+    HIDP_BUTTON_CAPS *button_caps;
     BYTE *report_desc;
     NTSTATUS status;
+    HIDP_CAPS caps;
 
     if (!(status = get_device_descriptors(unix_device, &report_desc, &report_desc_length, &device_desc)))
     {
+        PHIDP_PREPARSED_DATA preparsed = device_desc.CollectionDesc[0].PreparsedData;
         usages.UsagePage = device_desc.CollectionDesc[0].UsagePage;
         usages.Usage = device_desc.CollectionDesc[0].Usage;
+
+        if ((status = HidP_GetCaps(preparsed, &caps)) == HIDP_STATUS_SUCCESS &&
+            (button_caps = malloc(sizeof(*button_caps) * caps.NumberInputButtonCaps)))
+        {
+            status = HidP_GetButtonCaps(HidP_Input, button_caps, &caps.NumberInputButtonCaps, preparsed);
+            if (status != HIDP_STATUS_SUCCESS) WARN("HidP_GetButtonCaps returned %#lx\n", status);
+            else for (i = 0; i < caps.NumberInputButtonCaps; i++)
+            {
+                if (button_caps[i].UsagePage != HID_USAGE_PAGE_BUTTON) continue;
+                if (button_caps[i].IsRange) count = max(count, button_caps[i].Range.UsageMax);
+                else count = max(count, button_caps[i].NotRange.Usage);
+            }
+            free(button_caps);
+        }
+
         HidP_FreeCollectionDescription(&device_desc);
         RtlFreeHeap(GetProcessHeap(), 0, report_desc);
     }
 
+    *buttons = count;
     return usages;
 }
 
@@ -749,18 +810,21 @@ static DWORD CALLBACK bus_main_thread(void *args)
         case BUS_EVENT_TYPE_DEVICE_CREATED:
         {
             struct device_desc desc = event->device_created.desc;
-            if (desc.is_hidraw && !desc.usages.UsagePage) desc.usages = get_hidraw_device_usages(event->device);
-            if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid, &desc.usages))
+            USAGE_AND_PAGE usages;
+            UINT buttons;
+
+            usages = get_device_usages(event->device, &buttons);
+            if (!desc.is_hidraw != !is_hidraw_enabled(desc.vid, desc.pid, &usages, buttons))
             {
                 struct device_remove_params params = {.device = event->device};
                 WARN("ignoring %shidraw device %04x:%04x with usages %04x:%04x\n", desc.is_hidraw ? "" : "non-",
-                     desc.vid, desc.pid, desc.usages.UsagePage, desc.usages.Usage);
+                     desc.vid, desc.pid, usages.UsagePage, usages.Usage);
                 winebus_call(device_remove, &params);
                 break;
             }
 
             TRACE("creating %shidraw device %04x:%04x with usages %04x:%04x\n", desc.is_hidraw ? "" : "non-",
-                  desc.vid, desc.pid, desc.usages.UsagePage, desc.usages.Usage);
+                  desc.vid, desc.pid, usages.UsagePage, usages.Usage);
 
             device = bus_create_hid_device(&event->device_created.desc, event->device);
             if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations);

dlls/winebus.sys/unixlib.c

@@ -49,14 +49,6 @@ static void mouse_destroy(struct unix_device *iface)
 
 static NTSTATUS mouse_start(struct unix_device *iface)
 {
-    const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_MOUSE};
-    if (!hid_device_begin_report_descriptor(iface, &device_usage))
-        return STATUS_NO_MEMORY;
-    if (!hid_device_add_buttons(iface, HID_USAGE_PAGE_BUTTON, 1, 3))
-        return STATUS_NO_MEMORY;
-    if (!hid_device_end_report_descriptor(iface))
-        return STATUS_NO_MEMORY;
-
     return STATUS_SUCCESS;
 }
 
@@ -123,9 +115,21 @@ static const struct device_desc mouse_device_desc =
 
 static NTSTATUS mouse_device_create(void *args)
 {
+    const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_MOUSE};
     struct device_create_params *params = args;
+    struct unix_device *iface;
+
+    if (!(iface = hid_device_create(&mouse_vtbl, sizeof(struct mouse_device))))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_begin_report_descriptor(iface, &device_usage))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_add_buttons(iface, HID_USAGE_PAGE_BUTTON, 1, 3))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_end_report_descriptor(iface))
+        return STATUS_NO_MEMORY;
+
     params->desc = mouse_device_desc;
-    params->device = (UINT_PTR)hid_device_create(&mouse_vtbl, sizeof(struct mouse_device));
+    params->device = (UINT_PTR)iface;
     return STATUS_SUCCESS;
 }
 
@@ -140,14 +144,6 @@ static void keyboard_destroy(struct unix_device *iface)
 
 static NTSTATUS keyboard_start(struct unix_device *iface)
 {
-    const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_KEYBOARD};
-    if (!hid_device_begin_report_descriptor(iface, &device_usage))
-        return STATUS_NO_MEMORY;
-    if (!hid_device_add_buttons(iface, HID_USAGE_PAGE_KEYBOARD, 0, 101))
-        return STATUS_NO_MEMORY;
-    if (!hid_device_end_report_descriptor(iface))
-        return STATUS_NO_MEMORY;
-
     return STATUS_SUCCESS;
 }
 
@@ -214,9 +210,21 @@ static const struct device_desc keyboard_device_desc =
 
 static NTSTATUS keyboard_device_create(void *args)
 {
+    const USAGE_AND_PAGE device_usage = {.UsagePage = HID_USAGE_PAGE_GENERIC, .Usage = HID_USAGE_GENERIC_KEYBOARD};
     struct device_create_params *params = args;
+    struct unix_device *iface;
+
+    if (!(iface = hid_device_create(&keyboard_vtbl, sizeof(struct keyboard_device))))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_begin_report_descriptor(iface, &device_usage))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_add_buttons(iface, HID_USAGE_PAGE_KEYBOARD, 0, 101))
+        return STATUS_NO_MEMORY;
+    if (!hid_device_end_report_descriptor(iface))
+        return STATUS_NO_MEMORY;
+
     params->desc = keyboard_device_desc;
-    params->device = (UINT_PTR)hid_device_create(&keyboard_vtbl, sizeof(struct keyboard_device));
+    params->device = (UINT_PTR)iface;
     return STATUS_SUCCESS;
 }
 

dlls/winebus.sys/unixlib.h

@@ -38,7 +38,6 @@ struct device_desc
     UINT version;
     UINT input;
     UINT uid;
-    USAGE_AND_PAGE usages;
     BOOL is_gamepad;
     BOOL is_hidraw;
     BOOL is_bluetooth;
@@ -151,8 +150,8 @@ enum unix_funcs
 static inline const char *debugstr_device_desc(struct device_desc *desc)
 {
     if (!desc) return "(null)";
-    return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, usage %04x:%04x, is_gamepad %u, is_hidraw %u, is_bluetooth %u}",
-                            desc->vid, desc->pid, desc->version, desc->input, desc->uid, desc->usages.UsagePage, desc->usages.Usage,
+    return wine_dbg_sprintf("{vid %04x, pid %04x, version %04x, input %d, uid %08x, is_gamepad %u, is_hidraw %u, is_bluetooth %u}",
+                            desc->vid, desc->pid, desc->version, desc->input, desc->uid,
                             desc->is_gamepad, desc->is_hidraw, desc->is_bluetooth);
 }
 

dlls/wined3d/Makefile.in

@@ -14,6 +14,7 @@ SOURCES = \
 	device.c \
 	directx.c \
 	ffp_gl.c \
+	ffp_hlsl.c \
 	gl_compat.c \
 	glsl_shader.c \
 	palette.c \

dlls/wined3d/adapter_gl.c

@@ -4928,6 +4928,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_
     d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &d3d_info->ffp_fragment_caps);
     d3d_info->filling_convention_offset = gl_info->filling_convention_offset;
     d3d_info->persistent_map = !!gl_info->supported[ARB_BUFFER_STORAGE];
+    d3d_info->ffp_hlsl = wined3d_settings.ffp_hlsl;
 
     if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE])
         d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB;

dlls/wined3d/adapter_vk.c

@@ -2359,6 +2359,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_
     d3d_info->fences = true;
     d3d_info->persistent_map = true;
     d3d_info->gpu_push_constants = true;
+    d3d_info->ffp_hlsl = true;
 
     /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a
      * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles.

dlls/wined3d/context.c

@@ -161,8 +161,8 @@ void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_inf
         const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info)
 {
     /* We need to deal with frequency data! */
+    BOOL use_vshader = use_vs(state) || (d3d_info->ffp_hlsl && state->shader[WINED3D_SHADER_TYPE_VERTEX]);
     struct wined3d_vertex_declaration *declaration = state->vertex_declaration;
-    BOOL use_vshader = use_vs(state);
     unsigned int i;
 
     stream_info->use_map = 0;

dlls/wined3d/cs.c

@@ -2123,15 +2123,23 @@ static void wined3d_cs_exec_push_constants(struct wined3d_cs *cs, const void *da
 {
     const struct wined3d_cs_push_constants *op = data;
     struct wined3d_device *device = cs->c.device;
+    unsigned int ffp_start_idx, ffp_end_idx;
     unsigned int context_count, i;
 
     /* The constant buffers were already updated; this op is just to mark the
      * constants as invalid in the device state. */
 
+    ffp_start_idx = op->start_idx / sizeof(struct wined3d_vec4);
+    ffp_end_idx = (op->start_idx + op->count + sizeof(struct wined3d_vec4)) / sizeof(struct wined3d_vec4);
+
     if (op->type == WINED3D_PUSH_CONSTANTS_VS_F)
         device->shader_backend->shader_update_float_vertex_constants(device, op->start_idx, op->count);
     else if (op->type == WINED3D_PUSH_CONSTANTS_PS_F)
         device->shader_backend->shader_update_float_pixel_constants(device, op->start_idx, op->count);
+    else if (op->type == WINED3D_PUSH_CONSTANTS_VS_FFP)
+        device->shader_backend->shader_update_float_vertex_constants(device, ffp_start_idx, ffp_end_idx - ffp_start_idx);
+    else if (op->type == WINED3D_PUSH_CONSTANTS_PS_FFP)
+        device->shader_backend->shader_update_float_pixel_constants(device, ffp_start_idx, ffp_end_idx - ffp_start_idx);
 
     for (i = 0, context_count = device->context_count; i < context_count; ++i)
         device->contexts[i]->constant_update_mask |= op->update_mask;

dlls/wined3d/device.c

@@ -1667,6 +1667,22 @@ static void device_free_depth_stencil_state(struct wine_rb_entry *entry, void *c
     wined3d_depth_stencil_state_decref(state);
 }
 
+static void device_free_ffp_vertex_shader(struct wine_rb_entry *entry, void *context)
+{
+    struct wined3d_ffp_vs *vs = WINE_RB_ENTRY_VALUE(entry, struct wined3d_ffp_vs, entry);
+
+    wined3d_shader_decref(vs->shader);
+    free(vs);
+}
+
+static void device_free_ffp_pixel_shader(struct wine_rb_entry *entry, void *context)
+{
+    struct wined3d_ffp_ps *ps = WINE_RB_ENTRY_VALUE(entry, struct wined3d_ffp_ps, entry);
+
+    wined3d_shader_decref(ps->shader);
+    free(ps);
+}
+
 void wined3d_device_uninit_3d(struct wined3d_device *device)
 {
     struct wined3d_state *state = device->cs->c.state;
@@ -1714,6 +1730,8 @@ void wined3d_device_uninit_3d(struct wined3d_device *device)
     wine_rb_destroy(&device->rasterizer_states, device_free_rasterizer_state, NULL);
     wine_rb_destroy(&device->blend_states, device_free_blend_state, NULL);
     wine_rb_destroy(&device->depth_stencil_states, device_free_depth_stencil_state, NULL);
+    wine_rb_destroy(&device->ffp_vertex_shaders, device_free_ffp_vertex_shader, NULL);
+    wine_rb_destroy(&device->ffp_pixel_shaders, device_free_ffp_pixel_shader, NULL);
 
     LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry)
     {
@@ -5515,6 +5533,8 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined
     wine_rb_init(&device->rasterizer_states, wined3d_rasterizer_state_compare);
     wine_rb_init(&device->blend_states, wined3d_blend_state_compare);
     wine_rb_init(&device->depth_stencil_states, wined3d_depth_stencil_state_compare);
+    wine_rb_init(&device->ffp_vertex_shaders, wined3d_ffp_vertex_program_key_compare);
+    wine_rb_init(&device->ffp_pixel_shaders, wined3d_ffp_frag_program_key_compare);
 
     if (vertex_pipeline->vp_states && fragment_pipeline->states
             && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs,
@@ -5527,6 +5547,8 @@ HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined
         wine_rb_destroy(&device->blend_states, NULL, NULL);
         wine_rb_destroy(&device->depth_stencil_states, NULL, NULL);
         wine_rb_destroy(&device->so_descs, NULL, NULL);
+        wine_rb_destroy(&device->ffp_vertex_shaders, NULL, NULL);
+        wine_rb_destroy(&device->ffp_pixel_shaders, NULL, NULL);
         wined3d_decref(device->wined3d);
         return hr;
     }
@@ -5554,6 +5576,8 @@ err:
     wine_rb_destroy(&device->blend_states, NULL, NULL);
     wine_rb_destroy(&device->depth_stencil_states, NULL, NULL);
     wine_rb_destroy(&device->so_descs, NULL, NULL);
+    wine_rb_destroy(&device->ffp_vertex_shaders, NULL, NULL);
+    wine_rb_destroy(&device->ffp_pixel_shaders, NULL, NULL);
     wined3d_decref(device->wined3d);
     return hr;
 }

dlls/wined3d/ffp_hlsl.c

@@ -0,0 +1,246 @@
+/*
+ * Fixed-function pipeline replacement implemented using HLSL shaders
+ *
+ * Copyright 2006 Jason Green
+ * Copyright 2006-2007 Henri Verbeet
+ * Copyright 2007-2009,2013 Stefan Dösinger for CodeWeavers
+ * Copyright 2009-2011 Henri Verbeet for CodeWeavers
+ * Copyright 2022,2024 Elizabeth Figura for CodeWeavers
+ *
+ * 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 "wined3d_private.h"
+#include <vkd3d_shader.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader);
+
+static bool ffp_hlsl_generate_vertex_shader(const struct wined3d_ffp_vs_settings *settings,
+        struct wined3d_string_buffer *buffer)
+{
+    if (settings->lighting)
+        FIXME("Ignoring lighting.\n");
+
+    if (settings->point_size)
+        FIXME("Ignoring point size.\n");
+
+    if (settings->transformed)
+        FIXME("Ignoring pretransformed vertices.\n");
+
+    if (settings->vertexblends)
+        FIXME("Ignoring vertex blend.\n");
+
+    if (settings->normal)
+        FIXME("Ignoring normals.\n");
+
+    if (settings->fog_mode != WINED3D_FFP_VS_FOG_OFF)
+        FIXME("Ignoring fog.\n");
+
+    /* This must be kept in sync with struct wined3d_ffp_vs_constants. */
+    shader_addline(buffer, "uniform struct\n");
+    shader_addline(buffer, "{\n");
+    shader_addline(buffer, "    float4x4 modelview_matrices[%u];\n", MAX_VERTEX_BLENDS);
+    shader_addline(buffer, "    float4x4 projection_matrix;\n");
+    shader_addline(buffer, "    float4x4 texture_matrices[%u];\n", WINED3D_MAX_FFP_TEXTURES);
+    shader_addline(buffer, "    float4 point_params;\n");
+    shader_addline(buffer, "    struct\n");
+    shader_addline(buffer, "    {\n");
+    shader_addline(buffer, "        float4 diffuse;\n");
+    shader_addline(buffer, "        float4 ambient;\n");
+    shader_addline(buffer, "        float4 specular;\n");
+    shader_addline(buffer, "        float4 emissive;\n");
+    shader_addline(buffer, "        float power;\n");
+    shader_addline(buffer, "    } material;\n");
+    shader_addline(buffer, "    float4 ambient_colour;\n");
+    shader_addline(buffer, "    struct\n");
+    shader_addline(buffer, "    {\n");
+    shader_addline(buffer, "        float4 diffuse, specular, ambient;\n");
+    shader_addline(buffer, "        float4 position, direction;\n");
+    shader_addline(buffer, "        float4 packed_params;\n");
+    shader_addline(buffer, "        float4 attenuation;\n");
+    shader_addline(buffer, "    } lights[%u];\n", WINED3D_MAX_ACTIVE_LIGHTS);
+    shader_addline(buffer, "} c;\n");
+
+    shader_addline(buffer, "struct input\n");
+    shader_addline(buffer, "{\n");
+    shader_addline(buffer, "    float4 pos : POSITION;\n");
+    shader_addline(buffer, "    float4 blend_weight : BLENDWEIGHT;\n");
+    shader_addline(buffer, "    uint blend_indices : BLENDINDICES;\n");
+    shader_addline(buffer, "    float3 normal : NORMAL;\n");
+    shader_addline(buffer, "    float point_size : PSIZE;\n");
+    shader_addline(buffer, "    float4 diffuse : COLOR0;\n");
+    shader_addline(buffer, "    float4 specular : COLOR1;\n");
+    shader_addline(buffer, "    float4 texcoord[%u] : TEXCOORD;\n", WINED3D_MAX_FFP_TEXTURES);
+    shader_addline(buffer, "};\n\n");
+
+    shader_addline(buffer, "struct output\n");
+    shader_addline(buffer, "{\n");
+    shader_addline(buffer, "    float4 pos : POSITION;\n");
+    shader_addline(buffer, "    float4 diffuse : COLOR0;\n");
+    shader_addline(buffer, "    float4 specular : COLOR1;\n");
+    for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i)
+    {
+        if (((settings->texgen[i] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU) || (settings->texcoords & (1u << i)))
+            shader_addline(buffer, "    float4 texcoord%u : TEXCOORD%u;\n", i, i);
+    }
+    shader_addline(buffer, "};\n\n");
+
+    shader_addline(buffer, "void main(in struct input i, out struct output o)\n");
+    shader_addline(buffer, "{\n");
+    shader_addline(buffer, "    float4 ec_pos = 0.0;\n\n");
+
+    shader_addline(buffer, "    ec_pos += mul(c.modelview_matrices[0], float4(i.pos.xyz, 1.0));\n\n");
+
+    shader_addline(buffer, "    o.pos = mul(c.projection_matrix, ec_pos);\n");
+    shader_addline(buffer, "    ec_pos /= ec_pos.w;\n\n");
+
+    /* No lighting. */
+    if (settings->diffuse)
+        shader_addline(buffer, "    o.diffuse = i.diffuse;\n");
+    else
+        shader_addline(buffer, "    o.diffuse = 1.0;\n");
+    shader_addline(buffer, "    o.specular = i.specular;\n\n");
+
+    for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i)
+    {
+        switch (settings->texgen[i] & 0xffff0000)
+        {
+            case WINED3DTSS_TCI_PASSTHRU:
+                if (settings->texcoords & (1u << i))
+                    shader_addline(buffer, "    o.texcoord%u = mul(c.texture_matrices[%u], i.texcoord[%u]);\n",
+                            i, i, settings->texgen[i] & 0x0000ffff);
+                else
+                    continue;
+                break;
+
+            default:
+                FIXME("Unhandled texgen %#x.\n", settings->texgen[i]);
+                break;
+        }
+    }
+
+    switch (settings->fog_mode)
+    {
+        case WINED3D_FFP_VS_FOG_OFF:
+            break;
+
+        default:
+            FIXME("Unhandled fog mode %#x.\n", settings->fog_mode);
+            break;
+    }
+
+    shader_addline(buffer, "}\n");
+
+    return true;
+}
+
+static bool ffp_hlsl_generate_pixel_shader(const struct ffp_frag_settings *settings,
+        struct wined3d_string_buffer *string)
+{
+    FIXME("Not yet implemented.\n");
+    return false;
+}
+
+static bool compile_hlsl_shader(const struct wined3d_string_buffer *hlsl,
+        struct vkd3d_shader_code *sm1, const char *profile)
+{
+    struct vkd3d_shader_hlsl_source_info hlsl_source_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO};
+    struct vkd3d_shader_compile_info compile_info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO};
+    char *messages;
+    int ret;
+
+    compile_info.source.code = hlsl->buffer;
+    compile_info.source.size = hlsl->content_size;
+    compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL;
+    compile_info.target_type = VKD3D_SHADER_TARGET_D3D_BYTECODE;
+    compile_info.log_level = VKD3D_SHADER_LOG_WARNING;
+
+    compile_info.next = &hlsl_source_info;
+    hlsl_source_info.profile = profile;
+
+    ret = vkd3d_shader_compile(&compile_info, sm1, &messages);
+    if (messages && *messages && FIXME_ON(d3d_shader))
+    {
+        const char *ptr, *end, *line;
+
+        FIXME("Shader log:\n");
+        ptr = messages;
+        end = ptr + strlen(ptr);
+        while ((line = wined3d_get_line(&ptr, end)))
+            FIXME("    %.*s", (int)(ptr - line), line);
+        FIXME("\n");
+    }
+    vkd3d_shader_free_messages(messages);
+
+    if (ret < 0)
+    {
+        ERR("Failed to compile HLSL, ret %d.\n", ret);
+        return false;
+    }
+
+    return true;
+}
+
+bool ffp_hlsl_compile_vs(const struct wined3d_ffp_vs_settings *settings, struct wined3d_shader_desc *shader_desc)
+{
+    struct wined3d_string_buffer string;
+    struct vkd3d_shader_code sm1;
+
+    if (!string_buffer_init(&string))
+        return false;
+
+    if (!ffp_hlsl_generate_vertex_shader(settings, &string))
+    {
+        string_buffer_free(&string);
+        return false;
+    }
+
+    if (!compile_hlsl_shader(&string, &sm1, "vs_2_0"))
+    {
+        string_buffer_free(&string);
+        return false;
+    }
+    string_buffer_free(&string);
+
+    shader_desc->byte_code = sm1.code;
+    shader_desc->byte_code_size = ~(size_t)0;
+    return true;
+}
+
+bool ffp_hlsl_compile_ps(const struct ffp_frag_settings *settings, struct wined3d_shader_desc *shader_desc)
+{
+    struct wined3d_string_buffer string;
+    struct vkd3d_shader_code sm1;
+
+    if (!string_buffer_init(&string))
+        return false;
+
+    if (!ffp_hlsl_generate_pixel_shader(settings, &string))
+    {
+        string_buffer_free(&string);
+        return false;
+    }
+
+    if (!compile_hlsl_shader(&string, &sm1, "ps_2_0"))
+    {
+        string_buffer_free(&string);
+        return false;
+    }
+    string_buffer_free(&string);
+
+    shader_desc->byte_code = sm1.code;
+    shader_desc->byte_code_size = ~(size_t)0;
+    return true;
+}

dlls/wined3d/glsl_shader.c

@@ -1735,6 +1735,26 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv,
     constant_version = prog->constant_version;
     update_mask = context->constant_update_mask & prog->constant_update_mask;
 
+    if (vshader && vshader->is_ffp_vs)
+    {
+        /* The shader's constant update mask is WINED3D_SHADER_CONST_VS_F.
+         * This may be set from shader_glsl_update_graphics_program().
+         * However, we also need to update constants when FFP flags change. */
+        static const uint32_t vs_update_mask = WINED3D_SHADER_CONST_VS_F
+                | WINED3D_SHADER_CONST_FFP_LIGHTS
+                | WINED3D_SHADER_CONST_FFP_MATERIAL
+                | WINED3D_SHADER_CONST_FFP_MODELVIEW
+                | WINED3D_SHADER_CONST_FFP_PROJ
+                | WINED3D_SHADER_CONST_FFP_TEXMATRIX
+                | WINED3D_SHADER_CONST_FFP_VERTEXBLEND
+                | WINED3D_SHADER_CONST_VS_POINTSIZE;
+
+        if (context->constant_update_mask & vs_update_mask)
+            shader_glsl_load_constants_f(vshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_VS_FFP],
+                    prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version);
+    }
+    else
+    {
         if (update_mask & WINED3D_SHADER_CONST_VS_F)
             shader_glsl_load_constants_f(vshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_VS_F],
                     prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version);
@@ -1746,6 +1766,7 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv,
         if (update_mask & WINED3D_SHADER_CONST_VS_B)
             shader_glsl_load_constants_b(vshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_VS_B],
                     prog->vs.uniform_b_locations, vshader->reg_maps.boolean_constants);
+    }
 
     if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES)
     {
@@ -1890,6 +1911,18 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv,
                     WINED3D_LIGHT_PARALLELPOINT, &constants->light.lights[i], prog);
     }
 
+    if (pshader && pshader->is_ffp_ps)
+    {
+        static const uint32_t ps_update_mask = WINED3D_SHADER_CONST_PS_F
+                | WINED3D_SHADER_CONST_FFP_COLOR_KEY
+                | WINED3D_SHADER_CONST_FFP_PS;
+
+        if (context->constant_update_mask & ps_update_mask)
+            shader_glsl_load_constants_f(pshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_PS_FFP],
+                    prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version);
+    }
+    else
+    {
         if (update_mask & WINED3D_SHADER_CONST_PS_F)
             shader_glsl_load_constants_f(pshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_PS_F],
                     prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version);
@@ -1901,6 +1934,7 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv,
         if (update_mask & WINED3D_SHADER_CONST_PS_B)
             shader_glsl_load_constants_b(pshader, context_gl, device->push_constants[WINED3D_PUSH_CONSTANTS_PS_B],
                     prog->ps.uniform_b_locations, pshader->reg_maps.boolean_constants);
+    }
 
     if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV)
     {
@@ -10391,10 +10425,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
         vs_id = ctx_data->glsl_program->vs.id;
         vs_list = &ctx_data->glsl_program->vs.shader_entry;
 
-        if (use_vs(state))
+        if (use_vs(state) || d3d_info->ffp_hlsl)
             vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX];
     }
-    else if (use_vs(state))
+    else if (use_vs(state) || d3d_info->ffp_hlsl)
     {
         struct vs_compile_args vs_compile_args;
 
@@ -12113,7 +12147,7 @@ static void glsl_fragment_pipe_fogparams(struct wined3d_context *context,
 static void glsl_fragment_pipe_fog(struct wined3d_context *context,
         const struct wined3d_state *state, DWORD state_id)
 {
-    BOOL use_vshader = use_vs(state);
+    BOOL use_vshader = use_vs(state) && !state->shader[WINED3D_SHADER_TYPE_VERTEX]->is_ffp_vs;
     enum fogsource new_source;
     DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART];
     DWORD fogend = state->render_states[WINED3D_RS_FOGEND];

dlls/wined3d/shader.c

@@ -2268,7 +2268,55 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader,
     return WINED3D_OK;
 }
 
-static HRESULT shader_set_function(struct wined3d_shader *shader,
+static void shader_trace(const void *code, size_t size, enum vkd3d_shader_source_type source_type)
+{
+    struct vkd3d_shader_compile_info info = {.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO};
+    struct vkd3d_shader_code d3d_asm;
+    const char *ptr, *end, *line;
+    char *messages;
+    int ret;
+
+    static const struct vkd3d_shader_compile_option compile_options[] =
+    {
+        {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_6},
+    };
+
+    info.source.code = code;
+    info.source.size = size;
+    info.source_type = source_type;
+    info.target_type = VKD3D_SHADER_TARGET_D3D_ASM;
+    info.options = compile_options;
+    info.option_count = ARRAY_SIZE(compile_options);
+    info.log_level = VKD3D_SHADER_LOG_WARNING;
+
+    ret = vkd3d_shader_compile(&info, &d3d_asm, &messages);
+    if (messages && *messages && FIXME_ON(d3d_shader))
+    {
+        FIXME("Shader log:\n");
+        ptr = messages;
+        end = ptr + strlen(ptr);
+        while ((line = wined3d_get_line(&ptr, end)))
+            FIXME("    %.*s", (int)(ptr - line), line);
+        FIXME("\n");
+    }
+    vkd3d_shader_free_messages(messages);
+
+    if (ret < 0)
+    {
+        ERR("Failed to disassemble, ret %d.\n", ret);
+        return;
+    }
+
+    ptr = d3d_asm.code;
+    end = ptr + d3d_asm.size;
+    while ((line = wined3d_get_line(&ptr, end)))
+        TRACE("    %.*s", (int)(ptr - line), line);
+    TRACE("\n");
+
+    vkd3d_shader_free_shader_code(&d3d_asm);
+}
+
+static HRESULT shader_set_function(struct wined3d_shader *shader, const struct wined3d_shader_desc *desc,
         enum wined3d_shader_type type, const struct wined3d_stream_output_desc *so_desc, unsigned int float_const_count)
 {
     const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info;
@@ -2279,8 +2327,88 @@ static HRESULT shader_set_function(struct wined3d_shader *shader,
     unsigned int backend_version;
     HRESULT hr;
 
-    TRACE("shader %p, type %s, float_const_count %u.\n",
-            shader, debug_shader_type(type), float_const_count);
+    TRACE("shader %p, byte_code %p, size %#Ix, type %s, float_const_count %u.\n",
+            shader, desc->byte_code, desc->byte_code_size, debug_shader_type(type), float_const_count);
+
+    if (!desc->byte_code)
+        return WINED3DERR_INVALIDCALL;
+
+    if (desc->byte_code_size == ~(size_t)0)
+    {
+        struct wined3d_shader_version shader_version;
+        const struct wined3d_shader_frontend *fe;
+        struct wined3d_shader_instruction ins;
+        const DWORD *ptr;
+        void *fe_data;
+
+        shader->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE;
+        if (!(shader->frontend = shader_select_frontend(shader->source_type)))
+        {
+            FIXME("Unable to find frontend for shader.\n");
+            shader_cleanup(shader);
+            return WINED3DERR_INVALIDCALL;
+        }
+
+        fe = shader->frontend;
+        if (!(fe_data = fe->shader_init(desc->byte_code, desc->byte_code_size, &shader->output_signature)))
+        {
+            WARN("Failed to initialise frontend data.\n");
+            shader_cleanup(shader);
+            return WINED3DERR_INVALIDCALL;
+        }
+
+        fe->shader_read_header(fe_data, &ptr, &shader_version);
+        while (!fe->shader_is_end(fe_data, &ptr))
+            fe->shader_read_instruction(fe_data, &ptr, &ins);
+
+        fe->shader_free(fe_data);
+
+        shader->byte_code_size = (ptr - desc->byte_code) * sizeof(*ptr);
+
+        if (!(shader->byte_code = malloc(shader->byte_code_size)))
+        {
+            shader_cleanup(shader);
+            return E_OUTOFMEMORY;
+        }
+        memcpy(shader->byte_code, desc->byte_code, shader->byte_code_size);
+
+        shader->function = shader->byte_code;
+        shader->functionLength = shader->byte_code_size;
+    }
+    else
+    {
+        unsigned int max_version;
+
+        if (!(shader->byte_code = malloc(desc->byte_code_size)))
+        {
+            shader_cleanup(shader);
+            return E_OUTOFMEMORY;
+        }
+        memcpy(shader->byte_code, desc->byte_code, desc->byte_code_size);
+        shader->byte_code_size = desc->byte_code_size;
+
+        max_version = shader_max_version_from_feature_level(shader->device->cs->c.state->feature_level);
+        if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &shader->source_type)))
+        {
+            shader_cleanup(shader);
+            return hr;
+        }
+
+        if (!(shader->frontend = shader_select_frontend(shader->source_type)))
+        {
+            FIXME("Unable to find frontend for shader.\n");
+            shader_cleanup(shader);
+            return WINED3DERR_INVALIDCALL;
+        }
+    }
+
+    if (TRACE_ON(d3d_shader))
+    {
+        if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE)
+            shader_trace(shader->function, shader->functionLength, shader->source_type);
+        else
+            shader_trace(shader->byte_code, shader->byte_code_size, shader->source_type);
+    }
 
     if (type == WINED3D_SHADER_TYPE_GEOMETRY)
     {
@@ -2308,7 +2436,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader,
         WARN("Wrong shader type %s.\n", debug_shader_type(reg_maps->shader_version.type));
         return WINED3DERR_INVALIDCALL;
     }
-    if (version->major > shader_max_version_from_feature_level(shader->device->cs->c.state->feature_level))
+    if (!shader->is_ffp_vs && !shader->is_ffp_ps
+            && version->major > shader_max_version_from_feature_level(shader->device->cs->c.state->feature_level))
     {
         WARN("Shader version %u not supported by this device.\n", version->major);
         return WINED3DERR_INVALIDCALL;
@@ -2421,6 +2550,30 @@ static void wined3d_shader_init_object(void *object)
 
     list_add_head(&device->shaders, &shader->shader_list_entry);
 
+    if (shader->is_ffp_vs)
+    {
+        struct wined3d_ffp_vs_settings *settings = shader->byte_code;
+        struct wined3d_shader_desc desc;
+
+        if (!ffp_hlsl_compile_vs(settings, &desc))
+            return;
+        free(settings);
+        shader_set_function(shader, &desc, WINED3D_SHADER_TYPE_VERTEX, NULL,
+                device->adapter->d3d_info.limits.vs_uniform_count);
+    }
+
+    if (shader->is_ffp_ps)
+    {
+        struct ffp_frag_settings *settings = shader->byte_code;
+        struct wined3d_shader_desc desc;
+
+        if (!ffp_hlsl_compile_ps(settings, &desc))
+            return;
+        free(settings);
+        shader_set_function(shader, &desc, WINED3D_SHADER_TYPE_PIXEL, NULL,
+                device->adapter->d3d_info.limits.ps_uniform_count);
+    }
+
     device->shader_backend->shader_precompile(device->shader_priv, shader);
 }
 
@@ -2548,10 +2701,28 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3
                 && state->transforms[WINED3D_TS_PROJECTION]._24 == 0.0f
                 && state->transforms[WINED3D_TS_PROJECTION]._34 == 0.0f
                 && state->transforms[WINED3D_TS_PROJECTION]._44 == 1.0f)
-            args->fog_src = VS_FOG_Z;
+        {
+            /* Fog source is vertex output Z.
+             *
+             * However, if drawing RHW (which means we are using an HLSL
+             * replacement shader, since we got here), and depth testing is
+             * disabled, primitives are not supposed to be clipped by the
+             * viewport. We handle this in the vertex shader by essentially
+             * flushing output Z to zero.
+             *
+             * Fog needs to still read from the original Z, however. In this
+             * case we read from oFog, which contains the original Z. */
+
+            if (state->vertex_declaration->position_transformed)
+                args->fog_src = VS_FOG_COORD;
             else
+                args->fog_src = VS_FOG_Z;
+        }
+        else
+        {
             args->fog_src = VS_FOG_W;
         }
+    }
     else
     {
         args->fog_src = VS_FOG_COORD;
@@ -2613,71 +2784,9 @@ bool vshader_get_input(const struct wined3d_shader *shader,
     return false;
 }
 
-static void shader_trace(const void *code, size_t size, enum vkd3d_shader_source_type source_type)
+static void shader_init(struct wined3d_shader *shader, struct wined3d_device *device,
+        void *parent, const struct wined3d_parent_ops *parent_ops)
 {
-    struct vkd3d_shader_compile_info info;
-    struct vkd3d_shader_code d3d_asm;
-    const char *ptr, *end, *line;
-    char *messages;
-    int ret;
-
-    static const struct vkd3d_shader_compile_option compile_options[] =
-    {
-        {VKD3D_SHADER_COMPILE_OPTION_API_VERSION, VKD3D_SHADER_API_VERSION_1_6},
-    };
-
-    info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO;
-    info.next = NULL;
-    info.source.code = code;
-    info.source.size = size;
-    info.source_type = source_type;
-    info.target_type = VKD3D_SHADER_TARGET_D3D_ASM;
-    info.options = compile_options;
-    info.option_count = ARRAY_SIZE(compile_options);
-    info.log_level = VKD3D_SHADER_LOG_WARNING;
-    info.source_name = NULL;
-
-    ret = vkd3d_shader_compile(&info, &d3d_asm, &messages);
-    if (messages && *messages && FIXME_ON(d3d_shader))
-    {
-        FIXME("Shader log:\n");
-        ptr = messages;
-        end = ptr + strlen(ptr);
-        while ((line = wined3d_get_line(&ptr, end)))
-        {
-            FIXME("    %.*s", (int)(ptr - line), line);
-        }
-        FIXME("\n");
-    }
-    vkd3d_shader_free_messages(messages);
-
-    if (ret < 0)
-    {
-        ERR("Failed to disassemble, ret %d.\n", ret);
-        return;
-    }
-
-    ptr = d3d_asm.code;
-    end = ptr + d3d_asm.size;
-    while ((line = wined3d_get_line(&ptr, end)))
-    {
-        TRACE("    %.*s", (int)(ptr - line), line);
-    }
-    TRACE("\n");
-
-    vkd3d_shader_free_shader_code(&d3d_asm);
-}
-
-static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device,
-        const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops)
-{
-    HRESULT hr;
-
-    TRACE("byte_code %p, byte_code_size %#lx.\n", desc->byte_code, (long)desc->byte_code_size);
-
-    if (!desc->byte_code)
-        return WINED3DERR_INVALIDCALL;
-
     shader->ref = 1;
     shader->device = device;
     shader->parent = parent;
@@ -2690,87 +2799,6 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device
     shader->lconst_inf_or_nan = FALSE;
     list_init(&shader->reg_maps.indexable_temps);
     list_init(&shader->shader_list_entry);
-
-    if (desc->byte_code_size == ~(size_t)0)
-    {
-        struct wined3d_shader_version shader_version;
-        const struct wined3d_shader_frontend *fe;
-        struct wined3d_shader_instruction ins;
-        const DWORD *ptr;
-        void *fe_data;
-
-        shader->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE;
-        if (!(shader->frontend = shader_select_frontend(shader->source_type)))
-        {
-            FIXME("Unable to find frontend for shader.\n");
-            hr = WINED3DERR_INVALIDCALL;
-            goto fail;
-        }
-
-        fe = shader->frontend;
-        if (!(fe_data = fe->shader_init(desc->byte_code, desc->byte_code_size, &shader->output_signature)))
-        {
-            WARN("Failed to initialise frontend data.\n");
-            hr = WINED3DERR_INVALIDCALL;
-            goto fail;
-        }
-
-        fe->shader_read_header(fe_data, &ptr, &shader_version);
-        while (!fe->shader_is_end(fe_data, &ptr))
-            fe->shader_read_instruction(fe_data, &ptr, &ins);
-
-        fe->shader_free(fe_data);
-
-        shader->byte_code_size = (ptr - desc->byte_code) * sizeof(*ptr);
-
-        if (!(shader->byte_code = malloc(shader->byte_code_size)))
-        {
-            hr = E_OUTOFMEMORY;
-            goto fail;
-        }
-        memcpy(shader->byte_code, desc->byte_code, shader->byte_code_size);
-
-        shader->function = shader->byte_code;
-        shader->functionLength = shader->byte_code_size;
-    }
-    else
-    {
-        unsigned int max_version;
-
-        if (!(shader->byte_code = malloc(desc->byte_code_size)))
-        {
-            hr = E_OUTOFMEMORY;
-            goto fail;
-        }
-        memcpy(shader->byte_code, desc->byte_code, desc->byte_code_size);
-        shader->byte_code_size = desc->byte_code_size;
-
-        max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level);
-        if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &shader->source_type)))
-            goto fail;
-
-        if (!(shader->frontend = shader_select_frontend(shader->source_type)))
-        {
-            FIXME("Unable to find frontend for shader.\n");
-            hr = WINED3DERR_INVALIDCALL;
-            goto fail;
-        }
-    }
-
-    if (TRACE_ON(d3d_shader))
-    {
-        if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE)
-            shader_trace(shader->function, shader->functionLength, shader->source_type);
-        else
-            shader_trace(shader->byte_code, shader->byte_code_size, shader->source_type);
-    }
-
-
-    return WINED3D_OK;
-
-fail:
-    shader_cleanup(shader);
-    return hr;
 }
 
 static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_device *device,
@@ -2778,10 +2806,9 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_
 {
     HRESULT hr;
 
-    if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops)))
-        return hr;
+    shader_init(shader, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(shader,
+    if (FAILED(hr = shader_set_function(shader, desc,
             WINED3D_SHADER_TYPE_VERTEX, NULL, device->adapter->d3d_info.limits.vs_uniform_count)))
     {
         shader_cleanup(shader);
@@ -2797,10 +2824,9 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3
 {
     HRESULT hr;
 
-    if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops)))
-        return hr;
+    shader_init(shader, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(shader, WINED3D_SHADER_TYPE_GEOMETRY, so_desc, 0)))
+    if (FAILED(hr = shader_set_function(shader, desc, WINED3D_SHADER_TYPE_GEOMETRY, so_desc, 0)))
         goto fail;
 
     return WINED3D_OK;
@@ -2846,6 +2872,7 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3
 void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader,
         BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context)
 {
+    const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX];
     const struct wined3d_d3d_info *d3d_info = context->d3d_info;
     struct wined3d_shader_resource_view *view;
     struct wined3d_texture *texture;
@@ -2873,7 +2900,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
             {
                 uint32_t tex_transform = flags & ~WINED3D_TTFF_PROJECTED;
 
-                if (!state->shader[WINED3D_SHADER_TYPE_VERTEX])
+                if (!vs || vs->is_ffp_vs)
                 {
                     enum wined3d_shader_resource_type resource_type = shader->reg_maps.resource_info[i].type;
                     unsigned int j;
@@ -3043,7 +3070,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3
             switch (state->render_states[WINED3D_RS_FOGTABLEMODE])
             {
                 case WINED3D_FOG_NONE:
-                    if (position_transformed || use_vs(state))
+                    if (position_transformed || (vs && !vs->is_ffp_vs))
                     {
                         args->fog = WINED3D_FFP_PS_FOG_LINEAR;
                         break;
@@ -3127,10 +3154,9 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d
     const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
     HRESULT hr;
 
-    if (FAILED(hr = shader_init(shader, device, desc, parent, parent_ops)))
-        return hr;
+    shader_init(shader, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(shader,
+    if (FAILED(hr = shader_set_function(shader, desc,
             WINED3D_SHADER_TYPE_PIXEL, NULL, d3d_info->limits.ps_uniform_count)))
     {
         shader_cleanup(shader);
@@ -3175,14 +3201,9 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru
     if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops)))
-    {
-        WARN("Failed to initialize compute shader, hr %#lx.\n", hr);
-        free(object);
-        return hr;
-    }
+    shader_init(object, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(object, WINED3D_SHADER_TYPE_COMPUTE, NULL, 0)))
+    if (FAILED(hr = shader_set_function(object, desc, WINED3D_SHADER_TYPE_COMPUTE, NULL, 0)))
     {
         shader_cleanup(object);
         free(object);
@@ -3209,14 +3230,9 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru
     if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops)))
-    {
-        WARN("Failed to initialize domain shader, hr %#lx.\n", hr);
-        free(object);
-        return hr;
-    }
+    shader_init(object, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(object, WINED3D_SHADER_TYPE_DOMAIN, NULL, 0)))
+    if (FAILED(hr = shader_set_function(object, desc, WINED3D_SHADER_TYPE_DOMAIN, NULL, 0)))
     {
         shader_cleanup(object);
         free(object);
@@ -3271,14 +3287,9 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru
     if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
 
-    if (FAILED(hr = shader_init(object, device, desc, parent, parent_ops)))
-    {
-        WARN("Failed to initialize hull shader, hr %#lx.\n", hr);
-        free(object);
-        return hr;
-    }
+    shader_init(object, device, parent, parent_ops);
 
-    if (FAILED(hr = shader_set_function(object, WINED3D_SHADER_TYPE_HULL, NULL, 0)))
+    if (FAILED(hr = shader_set_function(object, desc, WINED3D_SHADER_TYPE_HULL, NULL, 0)))
     {
         shader_cleanup(object);
         free(object);
@@ -3346,3 +3357,53 @@ HRESULT CDECL wined3d_shader_create_vs(struct wined3d_device *device, const stru
 
     return WINED3D_OK;
 }
+
+HRESULT wined3d_shader_create_ffp_vs(struct wined3d_device *device,
+        const struct wined3d_ffp_vs_settings *settings, struct wined3d_shader **shader)
+{
+    struct wined3d_shader *object;
+
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    shader_init(object, device, NULL, &wined3d_null_parent_ops);
+    object->is_ffp_vs = true;
+    if (!(object->byte_code = malloc(sizeof(*settings))))
+    {
+        free(object);
+        return E_OUTOFMEMORY;
+    }
+    memcpy(object->byte_code, settings, sizeof(*settings));
+
+    wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object);
+
+    TRACE("Created FFP vertex shader %p.\n", object);
+    *shader = object;
+
+    return WINED3D_OK;
+}
+
+HRESULT wined3d_shader_create_ffp_ps(struct wined3d_device *device,
+        const struct ffp_frag_settings *settings, struct wined3d_shader **shader)
+{
+    struct wined3d_shader *object;
+
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
+
+    shader_init(object, device, NULL, &wined3d_null_parent_ops);
+    object->is_ffp_ps = true;
+    if (!(object->byte_code = malloc(sizeof(*settings))))
+    {
+        free(object);
+        return E_OUTOFMEMORY;
+    }
+    memcpy(object->byte_code, settings, sizeof(*settings));
+
+    wined3d_cs_init_object(device->cs, wined3d_shader_init_object, object);
+
+    TRACE("Created FFP pixel shader %p.\n", object);
+    *shader = object;
+
+    return WINED3D_OK;
+}

dlls/wined3d/stateblock.c

@@ -6,7 +6,7 @@
  * Copyright 2005 Oliver Stieber
  * Copyright 2007 Stefan Dösinger for CodeWeavers
  * Copyright 2009 Henri Verbeet for CodeWeavers
- * Copyright 2019,2020,2022 Zebediah Figura for CodeWeavers
+ * Copyright 2019,2020,2022-2024 Elizabeth Figura for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1299,6 +1299,7 @@ void CDECL wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *state
         wined3d_shader_decref(stateblock->stateblock_state.vs);
     stateblock->stateblock_state.vs = shader;
     stateblock->changed.vertexShader = TRUE;
+    stateblock->changed.ffp_vs_settings = 1;
 }
 
 static void wined3d_bitmap_set_bits(uint32_t *bitmap, unsigned int start, unsigned int count)
@@ -1439,6 +1440,7 @@ void CDECL wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateb
         wined3d_shader_decref(stateblock->stateblock_state.ps);
     stateblock->stateblock_state.ps = shader;
     stateblock->changed.pixelShader = TRUE;
+    stateblock->changed.ffp_ps_settings = 1;
 }
 
 HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock,
@@ -1573,6 +1575,9 @@ void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *
                     || declaration->normal != prev->normal || declaration->point_size != prev->point_size)
                 stateblock->changed.ffp_vs_settings = 1;
         }
+
+        if (declaration->position_transformed != prev->position_transformed)
+            stateblock->changed.ffp_vs_settings = 1;
     }
     else
     {
@@ -2379,10 +2384,10 @@ static void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state
 
 }
 
-/* FFP push constant buffers do not have a "default" state on the CS side.
- * We need to explicitly invalidate them when initializing the context or
- * resetting. */
-static void wined3d_stateblock_invalidate_push_constants(struct wined3d_stateblock *stateblock)
+/* Some states, e.g. FFP push constant buffers, do not have a "default" state
+ * on the CS side. We need to explicitly invalidate them when initializing the
+ * context or resetting. */
+static void wined3d_stateblock_invalidate_initial_states(struct wined3d_stateblock *stateblock)
 {
     stateblock->changed.ffp_ps_constants = 1;
     stateblock->changed.lights = 1;
@@ -2392,6 +2397,8 @@ static void wined3d_stateblock_invalidate_push_constants(struct wined3d_stateblo
     memset(stateblock->changed.transform, 0xff, sizeof(stateblock->changed.transform));
     stateblock->changed.modelview_matrices = 1;
     stateblock->changed.point_scale = 1;
+    stateblock->changed.ffp_vs_settings = 1;
+    stateblock->changed.ffp_ps_settings = 1;
 }
 
 static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const struct wined3d_stateblock *device_state,
@@ -2409,7 +2416,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, const stru
     list_init(&stateblock->changed.changed_lights);
 
     if (type == WINED3D_SBT_PRIMARY)
-        wined3d_stateblock_invalidate_push_constants(stateblock);
+        wined3d_stateblock_invalidate_initial_states(stateblock);
 
     if (type == WINED3D_SBT_RECORDED || type == WINED3D_SBT_PRIMARY)
         return WINED3D_OK;
@@ -2486,7 +2493,7 @@ void CDECL wined3d_stateblock_reset(struct wined3d_stateblock *stateblock)
     memset(&stateblock->stateblock_state, 0, sizeof(stateblock->stateblock_state));
     stateblock->stateblock_state.light_state = &stateblock->light_state;
     wined3d_stateblock_state_init(&stateblock->stateblock_state, stateblock->device, WINED3D_STATE_INIT_DEFAULT);
-    wined3d_stateblock_invalidate_push_constants(stateblock);
+    wined3d_stateblock_invalidate_initial_states(stateblock);
 }
 
 static void wined3d_device_set_base_vertex_index(struct wined3d_device *device, int base_index)
@@ -2909,6 +2916,65 @@ void CDECL wined3d_stateblock_apply_clear_state(struct wined3d_stateblock *state
         wined3d_device_set_render_state(device, WINED3D_RS_SRGBWRITEENABLE, state->rs[WINED3D_RS_SRGBWRITEENABLE]);
 }
 
+static struct wined3d_shader *get_ffp_vertex_shader(struct wined3d_device *device, const struct wined3d_state *state)
+{
+    static const struct wined3d_stream_info dummy_stream_info;
+    struct wined3d_ffp_vs_settings settings;
+    const struct wine_rb_entry *entry;
+    struct wined3d_ffp_vs *vs;
+
+    /* XXX: wined3d_ffp_get_vs_settings() only needs the stream info for the
+     * swizzle map, which the HLSL pipeline doesn't use (it will be computed and
+     * used later as part of struct vs_compile_args).
+     *
+     * This is nevertheless janky, and we'd like to get rid of it. Eventually
+     * once the HLSL backend is used everywhere, we can get rid of the swizzle
+     * map from wined3d_ffp_vs_settings. */
+    wined3d_ffp_get_vs_settings(state, &dummy_stream_info, &device->adapter->d3d_info, &settings);
+
+    if ((entry = wine_rb_get(&device->ffp_vertex_shaders, &settings)))
+        return WINE_RB_ENTRY_VALUE(entry, struct wined3d_ffp_vs, entry.entry)->shader;
+
+    if (!(vs = malloc(sizeof(*vs))))
+        return NULL;
+
+    vs->entry.settings = settings;
+    if (FAILED(wined3d_shader_create_ffp_vs(device, &settings, &vs->shader)))
+    {
+        free(vs);
+        return NULL;
+    }
+    if (wine_rb_put(&device->ffp_vertex_shaders, &vs->entry.settings, &vs->entry.entry) == -1)
+        ERR("Failed to insert FFP vertex shader.\n");
+
+    return vs->shader;
+}
+
+static struct wined3d_shader *get_ffp_pixel_shader(struct wined3d_device *device, const struct wined3d_state *state)
+{
+    struct ffp_frag_settings settings;
+    const struct ffp_frag_desc *desc;
+    struct wined3d_ffp_ps *ps;
+
+    wined3d_ffp_get_fs_settings(state, &device->adapter->d3d_info, &settings);
+
+    if ((desc = find_ffp_frag_shader(&device->ffp_pixel_shaders, &settings)))
+        return CONTAINING_RECORD(desc, struct wined3d_ffp_ps, entry)->shader;
+
+    if (!(ps = malloc(sizeof(*ps))))
+        return NULL;
+
+    ps->entry.settings = settings;
+    if (FAILED(wined3d_shader_create_ffp_ps(device, &settings, &ps->shader)))
+    {
+        free(ps);
+        return NULL;
+    }
+    add_ffp_frag_shader(&device->ffp_pixel_shaders, &ps->entry);
+
+    return ps->shader;
+}
+
 void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
         struct wined3d_stateblock *stateblock)
 {
@@ -3746,17 +3812,41 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
                 WINED3D_SHADER_CONST_FFP_PS, 0, offsetof(struct wined3d_ffp_ps_constants, color_key), &constants);
     }
 
-    if (changed->ffp_vs_settings && !state->vs)
+    /* XXX: We don't invalidate HLSL shaders for every field contained in
+     * wined3d_ffp_vs_settings / ffp_frag_settings; only the ones that the HLSL
+     * FFP pipeline cares about. The rest should eventually be removed from
+     * those structs and left only in vs_compile_args / ps_compile_args. */
+
+    if (changed->ffp_vs_settings
+            && (!state->vs || !state->vertex_declaration || state->vertex_declaration->position_transformed))
+    {
+        if (device->adapter->d3d_info.ffp_hlsl)
+        {
+            struct wined3d_shader *shader = get_ffp_vertex_shader(device, device->cs->c.state);
+
+            wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, shader);
+        }
+        else
         {
             /* Force invalidation of the vertex shader. */
             wined3d_device_context_emit_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, NULL);
         }
+    }
 
     if (changed->ffp_ps_settings && !state->ps)
+    {
+        if (device->adapter->d3d_info.ffp_hlsl)
+        {
+            struct wined3d_shader *shader = get_ffp_pixel_shader(device, device->cs->c.state);
+
+            wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, shader);
+        }
+        else
         {
             /* Force invalidation of the pixel shader. */
             wined3d_device_context_emit_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, NULL);
         }
+    }
 
     assert(list_empty(&stateblock->changed.changed_lights));
     memset(&stateblock->changed, 0, sizeof(stateblock->changed));

dlls/wined3d/utils.c

@@ -6448,7 +6448,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct
 
     memset(settings, 0, sizeof(*settings));
 
-    if (si->position_transformed)
+    if (vdecl->position_transformed)
     {
         settings->transformed = 1;
         settings->point_size = state->primitive_type == WINED3D_PT_POINTLIST;

dlls/wined3d/wined3d_main.c

@@ -463,6 +463,11 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL)
             TRACE("Forcing all constant buffers to be write-mappable.\n");
             wined3d_settings.cb_access_map_w = TRUE;
         }
+        if (!get_config_key_dword(hkey, appkey, env, "ffp_hlsl", &tmpvalue))
+        {
+            ERR_(winediag)("Using the HLSL-based FFP backend.\n");
+            wined3d_settings.ffp_hlsl = tmpvalue;
+        }
     }
 
     if (appkey) RegCloseKey( appkey );

dlls/wined3d/wined3d_private.h

@@ -242,6 +242,7 @@ struct wined3d_d3d_info
     uint32_t fences : 1;
     uint32_t persistent_map : 1;
     uint32_t gpu_push_constants : 1;
+    uint32_t ffp_hlsl : 1;
     enum wined3d_feature_level feature_level;
 
     DWORD multisample_draw_location;
@@ -475,7 +476,6 @@ struct wined3d_settings
     char *logo;
     unsigned int multisample_textures;
     unsigned int sample_count;
-    BOOL check_float_constants;
     unsigned int strict_shader_math;
     unsigned int max_sm_vs;
     unsigned int max_sm_hs;
@@ -485,7 +485,9 @@ struct wined3d_settings
     unsigned int max_sm_cs;
     enum wined3d_renderer renderer;
     enum wined3d_shader_backend shader_backend;
-    BOOL cb_access_map_w;
+    bool check_float_constants;
+    bool cb_access_map_w;
+    bool ffp_hlsl;
 };
 
 extern struct wined3d_settings wined3d_settings;
@@ -2048,10 +2050,11 @@ void context_state_fb(struct wined3d_context *context,
 
 struct wined3d_light_constants
 {
+    /* Padding is needed for the HLSL backend. */
     struct wined3d_color diffuse, specular, ambient;
     struct wined3d_vec4 position, direction;
     float range, falloff, cos_half_theta, cos_half_phi;
-    float const_att, linear_att, quad_att;
+    float const_att, linear_att, quad_att, padding;
 };
 
 /*****************************************************************************
@@ -2662,6 +2665,12 @@ struct ffp_frag_desc
 int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_entry *entry);
 int wined3d_ffp_vertex_program_key_compare(const void *key, const struct wine_rb_entry *entry);
 
+struct wined3d_ffp_ps
+{
+    struct ffp_frag_desc entry;
+    struct wined3d_shader *shader;
+};
+
 extern const struct wined3d_parent_ops wined3d_null_parent_ops;
 
 void wined3d_ffp_get_fs_settings(const struct wined3d_state *state,
@@ -2724,6 +2733,12 @@ struct wined3d_ffp_vs_desc
     struct wined3d_ffp_vs_settings settings;
 };
 
+struct wined3d_ffp_vs
+{
+    struct wined3d_ffp_vs_desc entry;
+    struct wined3d_shader *shader;
+};
+
 void wined3d_ffp_get_vs_settings(const struct wined3d_state *state, const struct wined3d_stream_info *si,
         const struct wined3d_d3d_info *d3d_info, struct wined3d_ffp_vs_settings *settings);
 
@@ -2769,8 +2784,10 @@ struct wined3d_ffp_vs_constants
     struct wined3d_ffp_point_constants
     {
         float scale_const, scale_linear, scale_quad;
+        float padding; /* For the HLSL backend. */
     } point;
     struct wined3d_material material;
+    float padding[3]; /* For the HLSL backend. */
     struct wined3d_ffp_light_constants
     {
         struct wined3d_color ambient;
@@ -2983,6 +3000,7 @@ struct wined3d_device
     struct list             shaders;   /* a linked list to track shaders (pixel and vertex)      */
     struct wine_rb_tree so_descs;
     struct wine_rb_tree samplers, rasterizer_states, blend_states, depth_stencil_states;
+    struct wine_rb_tree ffp_vertex_shaders, ffp_pixel_shaders;
 
     /* Render Target Support */
     struct wined3d_rendertarget_view *auto_depth_stencil_view;
@@ -4206,7 +4224,9 @@ struct wined3d_shader
     unsigned int functionLength;
     void *byte_code;
     unsigned int byte_code_size;
-    BOOL load_local_constsF;
+    bool load_local_constsF;
+    bool is_ffp_vs;
+    bool is_ffp_ps;
     enum vkd3d_shader_source_type source_type;
     const struct wined3d_shader_frontend *frontend;
     void *frontend_data;
@@ -4244,6 +4264,11 @@ struct wined3d_shader
     } u;
 };
 
+HRESULT wined3d_shader_create_ffp_vs(struct wined3d_device *device,
+        const struct wined3d_ffp_vs_settings *settings, struct wined3d_shader **shader);
+HRESULT wined3d_shader_create_ffp_ps(struct wined3d_device *device,
+        const struct ffp_frag_settings *settings, struct wined3d_shader **shader);
+
 enum wined3d_shader_resource_type pixelshader_get_resource_type(const struct wined3d_shader_reg_maps *reg_maps,
         unsigned int resource_idx, DWORD tex_types);
 void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader,
@@ -4273,6 +4298,9 @@ BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage us
 
 enum vkd3d_shader_visibility vkd3d_shader_visibility_from_wined3d(enum wined3d_shader_type shader_type);
 
+bool ffp_hlsl_compile_vs(const struct wined3d_ffp_vs_settings *settings, struct wined3d_shader_desc *shader_desc);
+bool ffp_hlsl_compile_ps(const struct ffp_frag_settings *settings, struct wined3d_shader_desc *shader_desc);
+
 static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg)
 {
     switch (reg->type)

dlls/winex11.drv/desktop.c

@@ -73,7 +73,8 @@ BOOL X11DRV_CreateDesktop( const WCHAR *name, UINT width, UINT height )
 
     /* Create window */
     win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask |
-                          PointerMotionMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask;
+                          PointerMotionMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask |
+                          PropertyChangeMask;
     win_attr.cursor = XCreateFontCursor( display, XC_top_left_arrow );
 
     if (default_visual.visual != DefaultVisual( display, DefaultScreen(display) ))

dlls/winex11.drv/event.c

@@ -171,13 +171,49 @@ static inline void free_event_data( XEvent *event )
 #endif
 }
 
-static BOOL host_window_filter_event( XEvent *event )
+static void host_window_send_configure_events( struct host_window *win, Display *display, unsigned long serial, XEvent *previous )
+{
+    XConfigureEvent configure = {.type = ConfigureNotify, .serial = serial, .display = display};
+    unsigned int i;
+
+    for (i = 0; i < win->children_count; i++)
+    {
+        RECT rect = win->children[i].rect;
+        struct x11drv_win_data *data;
+        HWND hwnd;
+
+        configure.event = win->children[i].window;
+        configure.window = configure.event;
+        configure.x = rect.left;
+        configure.y = rect.top;
+        configure.width = rect.right - rect.left;
+        configure.height = rect.bottom - rect.top;
+        configure.send_event = 0;
+
+        /* Only send a fake event if we're not expecting one from a state/config request.
+         * We may know what was requested, but not what the WM will decide to reply, and our
+         * fake event might trigger some undesired changes before the real ConfigureNotify.
+         */
+        if (!XFindContext( configure.display, configure.window, winContext, (char **)&hwnd ) &&
+            (data = get_win_data( hwnd )))
+        {
+            /* embedded windows won't receive synthetic ConfigureNotify and are positioned by the WM */
+            BOOL has_serial = !data->embedded && (data->wm_state_serial || data->configure_serial);
+            release_win_data( data );
+            if (has_serial) continue;
+        }
+
+        if (previous->type == ConfigureNotify && previous->xconfigure.window == configure.window) continue;
+        TRACE( "generating ConfigureNotify for window %p/%lx, rect %s\n", hwnd, configure.window, wine_dbgstr_rect(&rect) );
+        XPutBackEvent( configure.display, (XEvent *)&configure );
+    }
+}
+
+static BOOL host_window_filter_event( XEvent *event, XEvent *previous )
 {
     struct host_window *win;
-    RECT old_rect;
 
     if (!(win = get_host_window( event->xany.window, FALSE ))) return FALSE;
-    old_rect = win->rect;
 
     switch (event->type)
     {
@@ -190,6 +226,7 @@ static BOOL host_window_filter_event( XEvent *event )
         XReparentEvent *reparent = (XReparentEvent *)event;
         TRACE( "host window %p/%lx ReparentNotify, parent %lx\n", win, win->window, reparent->parent );
         host_window_set_parent( win, reparent->parent );
+        host_window_send_configure_events( win, event->xany.display, event->xany.serial, previous );
         break;
     }
     case GravityNotify:
@@ -198,6 +235,7 @@ static BOOL host_window_filter_event( XEvent *event )
         OffsetRect( &win->rect, gravity->x - win->rect.left, gravity->y - win->rect.top );
         if (win->parent) win->rect = host_window_configure_child( win->parent, win->window, win->rect, FALSE );
         TRACE( "host window %p/%lx GravityNotify, rect %s\n", win, win->window, wine_dbgstr_rect(&win->rect) );
+        host_window_send_configure_events( win, event->xany.display, event->xany.serial, previous );
         break;
     }
     case ConfigureNotify:
@@ -206,44 +244,11 @@ static BOOL host_window_filter_event( XEvent *event )
         SetRect( &win->rect, configure->x, configure->y, configure->x + configure->width, configure->y + configure->height );
         if (win->parent) win->rect = host_window_configure_child( win->parent, win->window, win->rect, configure->send_event );
         TRACE( "host window %p/%lx ConfigureNotify, rect %s\n", win, win->window, wine_dbgstr_rect(&win->rect) );
+        host_window_send_configure_events( win, event->xany.display, event->xany.serial, previous );
         break;
     }
     }
 
-    if (old_rect.left != win->rect.left || old_rect.top != win->rect.top)
-    {
-        XConfigureEvent configure = {.type = ConfigureNotify, .serial = event->xany.serial, .display = event->xany.display};
-        unsigned int i;
-
-        for (i = 0; i < win->children_count; i++)
-        {
-            RECT rect = win->children[i].rect;
-            struct x11drv_win_data *data;
-            BOOL has_serial;
-            HWND hwnd;
-
-            /* Only send a fake event if we're not expecting one from a state/config request.
-             * We may know what was requested, but not what the WM will decide to reply, and our
-             * fake event might trigger some undesired changes before the real ConfigureNotify.
-             */
-            if (XFindContext( event->xany.display, event->xany.window, winContext, (char **)&hwnd )) continue;
-            if (!(data = get_win_data( hwnd ))) continue;
-            has_serial = data->wm_state_serial || data->configure_serial;
-            release_win_data( data );
-            if (has_serial) continue;
-
-            configure.event = win->children[i].window;
-            configure.window = configure.event;
-            configure.x = rect.left;
-            configure.y = rect.top;
-            configure.width = rect.right - rect.left;
-            configure.height = rect.bottom - rect.top;
-            configure.send_event = 0;
-
-            XPutBackEvent( configure.display, (XEvent *)&configure );
-        }
-    }
-
     return TRUE;
 }
 
@@ -521,7 +526,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X
                 continue;  /* filtered, ignore it */
         }
 
-        if (host_window_filter_event( &event )) continue;
+        if (host_window_filter_event( &event, &prev_event )) continue;
 
         get_event_data( &event );
         if (prev_event.type) action = merge_events( &prev_event, &event );
@@ -756,12 +761,20 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
     }
     else if (protocol == x11drv_atom(WM_TAKE_FOCUS))
     {
-        HWND last_focus = x11drv_thread_data()->last_focus;
+        HWND last_focus = x11drv_thread_data()->last_focus, foreground = NtUserGetForegroundWindow();
 
-        TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08x), focus=%p, active=%p, fg=%p, last=%p\n",
-               hwnd, NtUserIsWindowEnabled(hwnd), NtUserIsWindowVisible(hwnd),
-               (int)NtUserGetWindowLongW(hwnd, GWL_STYLE),
-               get_focus(), get_active_window(), NtUserGetForegroundWindow(), last_focus );
+        if (window_has_pending_wm_state( hwnd, -1 ))
+        {
+            WARN( "Ignoring window %p/%lx WM_TAKE_FOCUS serial %lu, event_time %ld, foreground %p during WM_STATE change\n",
+                  hwnd, event->window, event->serial, event_time, foreground );
+            return;
+        }
+
+        TRACE( "window %p/%lx WM_TAKE_FOCUS serial %lu, event_time %ld, foreground %p\n", hwnd, event->window,
+               event->serial, event_time, foreground );
+        TRACE( "  enabled %u, visible %u, style %#x, focus %p, active %p, last %p\n",
+                NtUserIsWindowEnabled( hwnd ), NtUserIsWindowVisible( hwnd ), (int)NtUserGetWindowLongW( hwnd, GWL_STYLE ),
+                get_focus(), get_active_window(), last_focus );
 
         if (can_activate_window(hwnd))
         {
@@ -778,7 +791,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
         }
         else if (hwnd == NtUserGetDesktopWindow())
         {
-            hwnd = NtUserGetForegroundWindow();
+            hwnd = foreground;
             if (!hwnd) hwnd = last_focus;
             if (!hwnd) hwnd = NtUserGetDesktopWindow();
             set_focus( event->display, hwnd, event_time );
@@ -840,14 +853,23 @@ BOOL is_current_process_focused(void)
  */
 static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev )
 {
+    HWND foreground = NtUserGetForegroundWindow();
     XFocusChangeEvent *event = &xev->xfocus;
     BOOL was_grabbed;
 
+    if (event->detail == NotifyPointer) return FALSE;
     if (!hwnd) return FALSE;
 
-    TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] );
+    if (window_has_pending_wm_state( hwnd, -1 ))
+    {
+        WARN( "Ignoring window %p/%lx FocusIn serial %lu, detail %s, mode %s, foreground %p during WM_STATE change\n",
+              hwnd, event->window, event->serial, focus_details[event->detail], focus_modes[event->mode], foreground );
+        return FALSE;
+    }
+
+    TRACE( "window %p/%lx FocusIn serial %lu, detail %s, mode %s, foreground %p\n", hwnd, event->window,
+           event->serial, focus_details[event->detail], focus_modes[event->mode], foreground );
 
-    if (event->detail == NotifyPointer) return FALSE;
     /* when focusing in the virtual desktop window, re-apply the cursor clipping rect */
     if (is_virtual_desktop() && hwnd == NtUserGetDesktopWindow()) reapply_cursor_clipping();
     if (hwnd == NtUserGetDesktopWindow()) return FALSE;
@@ -916,10 +938,9 @@ static void focus_out( Display *display , HWND hwnd )
  */
 static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev )
 {
+    HWND foreground = NtUserGetForegroundWindow();
     XFocusChangeEvent *event = &xev->xfocus;
 
-    TRACE( "win %p xwin %lx detail=%s mode=%s\n", hwnd, event->window, focus_details[event->detail], focus_modes[event->mode] );
-
     if (event->detail == NotifyPointer)
     {
         if (!hwnd && event->window == x11drv_thread_data()->clip_window)
@@ -933,6 +954,16 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev )
     }
     if (!hwnd) return FALSE;
 
+    if (window_has_pending_wm_state( hwnd, NormalState )) /* ignore FocusOut only if the window is being shown */
+    {
+        WARN( "Ignoring window %p/%lx FocusOut serial %lu, detail %s, mode %s, foreground %p during WM_STATE change\n",
+              hwnd, event->window, event->serial, focus_details[event->detail], focus_modes[event->mode], foreground );
+        return FALSE;
+    }
+
+    TRACE( "window %p/%lx FocusOut serial %lu, detail %s, mode %s, foreground %p\n", hwnd, event->window,
+           event->serial, focus_details[event->detail], focus_modes[event->mode], foreground );
+
     /* in virtual desktop mode or when keyboard is grabbed, release any cursor grab but keep the clipping rect */
     keyboard_grabbed = event->mode == NotifyGrab || event->mode == NotifyWhileGrabbed;
     if (is_virtual_desktop() || keyboard_grabbed) ungrab_clipping_window();
@@ -1073,8 +1104,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
     struct x11drv_win_data *data;
     RECT rect;
     POINT pos = {event->x, event->y};
-    UINT style, flags = 0, config_cmd = 0;
-    int cx, cy, x, y;
+    UINT config_cmd, state_cmd;
 
     if (!hwnd) return FALSE;
     if (!(data = get_win_data( hwnd ))) return FALSE;
@@ -1093,78 +1123,24 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
     SetRect( &rect, pos.x, pos.y, pos.x + event->width, pos.y + event->height );
     window_configure_notify( data, event->serial, &rect );
 
-    if (!data->mapped || data->iconic) goto done;
-    if (!data->whole_window || !data->managed) goto done;
-    if (data->configure_serial && (long)(data->configure_serial - event->serial) > 0)
-    {
-        TRACE( "win %p/%lx event %d,%d,%dx%d ignoring old serial %lu/%lu\n",
-               hwnd, data->whole_window, event->x, event->y, event->width, event->height,
-               event->serial, data->configure_serial );
-        goto done;
-    }
-
-    rect = window_rect_from_visible( &data->rects, rect );
-
-    TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n",
-           hwnd, data->whole_window, (int)rect.left, (int)rect.top,
-           (int)(rect.right-rect.left), (int)(rect.bottom-rect.top),
-           event->x, event->y, event->width, event->height );
-
-    /* Compare what has changed */
-
-    x     = rect.left;
-    y     = rect.top;
-    cx    = rect.right - rect.left;
-    cy    = rect.bottom - rect.top;
-    flags = SWP_NOACTIVATE | SWP_NOZORDER;
-
-    if (!data->whole_window) flags |= SWP_NOCOPYBITS;  /* we can't copy bits of foreign windows */
-
-    if (data->rects.window.left == x && data->rects.window.top == y) flags |= SWP_NOMOVE;
-    else
-        TRACE( "%p moving from (%d,%d) to (%d,%d)\n",
-               hwnd, (int)data->rects.window.left, (int)data->rects.window.top, x, y );
-
-    if ((data->rects.window.right - data->rects.window.left == cx &&
-         data->rects.window.bottom - data->rects.window.top == cy) ||
-        IsRectEmpty( &data->rects.window ))
-        flags |= SWP_NOSIZE;
-    else
-        TRACE( "%p resizing from (%dx%d) to (%dx%d)\n",
-               hwnd, (int)(data->rects.window.right - data->rects.window.left),
-               (int)(data->rects.window.bottom - data->rects.window.top), cx, cy );
-
-    style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE );
-    if ((style & WS_CAPTION) == WS_CAPTION || !data->is_fullscreen)
-    {
-        data->net_wm_state = get_window_net_wm_state( event->display, data->whole_window );
-        if ((data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)) && !(style & WS_MAXIMIZE))
-        {
-            TRACE( "window %p/%lx is maximized\n", data->hwnd, data->whole_window );
-            config_cmd = SC_MAXIMIZE;
-        }
-        else if (!(data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)) && (style & WS_MAXIMIZE))
-        {
-            TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window );
-            config_cmd = SC_RESTORE;
-        }
-    }
-    if (!config_cmd && (flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE))
-    {
-        TRACE( "window %p/%lx config changed %s -> %s, flags %#x\n", data->hwnd, data->whole_window,
-               wine_dbgstr_rect(&data->rects.window), wine_dbgstr_rect(&rect), flags );
-        config_cmd = MAKELONG(SC_MOVE, flags);
-    }
-done:
+    state_cmd = window_update_client_state( data );
+    config_cmd = window_update_client_config( data );
+    rect = window_rect_from_visible( &data->rects, data->current_state.rect );
     release_win_data( data );
 
+    if (state_cmd)
+    {
+        if (LOWORD(state_cmd) == SC_RESTORE && HIWORD(state_cmd)) NtUserSetActiveWindow( hwnd );
+        send_message( hwnd, WM_SYSCOMMAND, LOWORD(state_cmd), 0 );
+    }
+
     if (config_cmd)
     {
         if (LOWORD(config_cmd) == SC_MOVE) NtUserSetRawWindowPos( hwnd, rect, HIWORD(config_cmd), FALSE );
         else send_message( hwnd, WM_SYSCOMMAND, LOWORD(config_cmd), 0 );
     }
 
-    return !!config_cmd;
+    return config_cmd || state_cmd;
 }
 
 
@@ -1224,74 +1200,20 @@ static int get_window_xembed_info( Display *display, Window window )
  *
  * Handle a PropertyNotify for WM_STATE.
  */
-static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL update_window )
+static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event )
 {
     struct x11drv_win_data *data;
-    UINT style, value = 0, state_cmd = 0;
+    UINT value = 0, state_cmd = 0, config_cmd = 0;
+    RECT rect;
 
     if (!(data = get_win_data( hwnd ))) return;
     if (event->state == PropertyNewValue) value = get_window_wm_state( event->display, event->window );
-    if (update_window) window_wm_state_notify( data, event->serial, value );
+    window_wm_state_notify( data, event->serial, value );
 
-    switch(event->state)
-    {
-    case PropertyDelete:
-        TRACE( "%p/%lx: WM_STATE deleted from %d\n", data->hwnd, data->whole_window, data->wm_state );
-        data->wm_state = WithdrawnState;
-        break;
-    case PropertyNewValue:
-        {
-            int old_state = data->wm_state;
-            int new_state = get_window_wm_state( event->display, data->whole_window );
-            if (new_state != -1 && new_state != data->wm_state)
-            {
-                TRACE( "%p/%lx: new WM_STATE %d from %d\n",
-                       data->hwnd, data->whole_window, new_state, old_state );
-                data->wm_state = new_state;
-                /* ignore the initial state transition out of withdrawn state */
-                /* metacity does Withdrawn->NormalState->IconicState when mapping an iconic window */
-                if (!old_state) goto done;
-            }
-        }
-        break;
-    }
+    state_cmd = window_update_client_state( data );
+    config_cmd = window_update_client_config( data );
+    rect = window_rect_from_visible( &data->rects, data->current_state.rect );
 
-    if (!update_window || !data->managed || !data->mapped) goto done;
-
-    style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE );
-
-    if (data->iconic && data->wm_state == NormalState)  /* restore window */
-    {
-        data->iconic = FALSE;
-        data->net_wm_state = get_window_net_wm_state( event->display, data->whole_window );
-        if ((style & WS_CAPTION) == WS_CAPTION && (data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)))
-        {
-            if ((style & WS_MAXIMIZEBOX) && !(style & WS_DISABLED))
-            {
-                TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window );
-                state_cmd = SC_MAXIMIZE;
-            }
-        }
-        else
-        {
-            if (style & (WS_MINIMIZE | WS_MAXIMIZE))
-            {
-                BOOL activate = (style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE);
-                TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window );
-                state_cmd = MAKELONG(SC_RESTORE, activate);
-            }
-        }
-    }
-    else if (!data->iconic && data->wm_state == IconicState)
-    {
-        data->iconic = TRUE;
-        if ((style & WS_MINIMIZEBOX) && !(style & WS_DISABLED))
-        {
-            TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window );
-            state_cmd = SC_MINIMIZE;
-        }
-    }
-done:
     release_win_data( data );
 
     if (state_cmd)
@@ -1299,6 +1221,12 @@ done:
         if (LOWORD(state_cmd) == SC_RESTORE && HIWORD(state_cmd)) NtUserSetActiveWindow( hwnd );
         send_message( hwnd, WM_SYSCOMMAND, LOWORD(state_cmd), 0 );
     }
+
+    if (config_cmd)
+    {
+        if (LOWORD(config_cmd) == SC_MOVE) NtUserSetRawWindowPos( hwnd, rect, HIWORD(config_cmd), FALSE );
+        else send_message( hwnd, WM_SYSCOMMAND, LOWORD(config_cmd), 0 );
+    }
 }
 
 static void handle_xembed_info_notify( HWND hwnd, XPropertyEvent *event )
@@ -1315,12 +1243,30 @@ static void handle_xembed_info_notify( HWND hwnd, XPropertyEvent *event )
 static void handle_net_wm_state_notify( HWND hwnd, XPropertyEvent *event )
 {
     struct x11drv_win_data *data;
-    UINT value = 0;
+    UINT value = 0, state_cmd = 0, config_cmd = 0;
+    RECT rect;
 
     if (!(data = get_win_data( hwnd ))) return;
     if (event->state == PropertyNewValue) value = get_window_net_wm_state( event->display, event->window );
     window_net_wm_state_notify( data, event->serial, value );
+
+    state_cmd = window_update_client_state( data );
+    config_cmd = window_update_client_config( data );
+    rect = window_rect_from_visible( &data->rects, data->current_state.rect );
+
     release_win_data( data );
+
+    if (state_cmd)
+    {
+        if (LOWORD(state_cmd) == SC_RESTORE && HIWORD(state_cmd)) NtUserSetActiveWindow( hwnd );
+        send_message( hwnd, WM_SYSCOMMAND, LOWORD(state_cmd), 0 );
+    }
+
+    if (config_cmd)
+    {
+        if (LOWORD(config_cmd) == SC_MOVE) NtUserSetRawWindowPos( hwnd, rect, HIWORD(config_cmd), FALSE );
+        else send_message( hwnd, WM_SYSCOMMAND, LOWORD(config_cmd), 0 );
+    }
 }
 
 /***********************************************************************
@@ -1331,79 +1277,13 @@ static BOOL X11DRV_PropertyNotify( HWND hwnd, XEvent *xev )
     XPropertyEvent *event = &xev->xproperty;
 
     if (!hwnd) return FALSE;
-    if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( hwnd, event, TRUE );
+    if (event->atom == x11drv_atom(WM_STATE)) handle_wm_state_notify( hwnd, event );
     if (event->atom == x11drv_atom(_XEMBED_INFO)) handle_xembed_info_notify( hwnd, event );
     if (event->atom == x11drv_atom(_NET_WM_STATE)) handle_net_wm_state_notify( hwnd, event );
     return TRUE;
 }
 
 
-/* event filter to wait for a WM_STATE change notification on a window */
-static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg )
-{
-    if (event->xany.window != (Window)arg) return 0;
-    return (event->type == DestroyNotify ||
-            (event->type == PropertyNotify && event->xproperty.atom == x11drv_atom(WM_STATE)));
-}
-
-/***********************************************************************
- *           wait_for_withdrawn_state
- */
-void wait_for_withdrawn_state( HWND hwnd, BOOL set )
-{
-    Display *display = thread_display();
-    struct x11drv_win_data *data;
-    DWORD end = NtGetTickCount() + 2000;
-
-    TRACE( "waiting for window %p to become %swithdrawn\n", hwnd, set ? "" : "not " );
-
-    for (;;)
-    {
-        XEvent event;
-        Window window;
-        int count = 0;
-
-        if (!(data = get_win_data( hwnd ))) break;
-        if (!data->managed || data->embedded || data->display != display) break;
-        if (!(window = data->whole_window)) break;
-        if (!data->mapped == !set)
-        {
-            TRACE( "window %p/%lx now %smapped\n", hwnd, window, data->mapped ? "" : "un" );
-            break;
-        }
-        if ((data->wm_state == WithdrawnState) != !set)
-        {
-            TRACE( "window %p/%lx state now %d\n", hwnd, window, data->wm_state );
-            break;
-        }
-        release_win_data( data );
-
-        while (XCheckIfEvent( display, &event, is_wm_state_notify, (char *)window ))
-        {
-            count++;
-            if (XFilterEvent( &event, None )) continue;  /* filtered, ignore it */
-            if (event.type == DestroyNotify) call_event_handler( display, &event );
-            else handle_wm_state_notify( hwnd, &event.xproperty, FALSE );
-        }
-
-        if (!count)
-        {
-            struct pollfd pfd;
-            int timeout = end - NtGetTickCount();
-
-            pfd.fd = ConnectionNumber(display);
-            pfd.events = POLLIN;
-            if (timeout <= 0 || poll( &pfd, 1, timeout ) != 1)
-            {
-                FIXME( "window %p/%lx wait timed out\n", hwnd, window );
-                return;
-            }
-        }
-    }
-    release_win_data( data );
-}
-
-
 /*****************************************************************
  *		SetFocus   (X11DRV.@)
  *

dlls/winex11.drv/keyboard.c

@@ -46,7 +46,7 @@
 #include "winuser.h"
 #include "winreg.h"
 #include "winnls.h"
-#include "ime.h"
+#include "kbd.h"
 #include "wine/server.h"
 #include "wine/debug.h"
 

dlls/winex11.drv/window.c

@@ -1160,7 +1160,7 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data )
     long monitors[4];
     XEvent xev;
 
-    if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()
+    if (!(data->pending_state.net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()
         || NtUserGetWindowLongW( data->hwnd, GWL_STYLE ) & WS_MINIMIZE)
         return;
 
@@ -1213,7 +1213,10 @@ static void window_set_net_wm_state( struct x11drv_win_data *data, UINT new_stat
 {
     UINT i, count, old_state = data->pending_state.net_wm_state;
 
+    data->desired_state.net_wm_state = new_state;
     if (!data->whole_window) return; /* no window, nothing to update */
+    if (data->wm_state_serial) return; /* another WM_STATE update is pending, wait for it to complete */
+    /* we ignore and override previous _NET_WM_STATE update requests */
     if (old_state == new_state) return; /* states are the same, nothing to update */
 
     if (data->pending_state.wm_state == IconicState) return; /* window is iconic, don't update its state now */
@@ -1267,6 +1270,8 @@ static void window_set_net_wm_state( struct x11drv_win_data *data, UINT new_stat
                         SubstructureRedirectMask | SubstructureNotifyMask, &xev );
         }
     }
+
+    XFlush( data->display );
 }
 
 static void window_set_config( struct x11drv_win_data *data, const RECT *new_rect, BOOL above )
@@ -1275,6 +1280,7 @@ static void window_set_config( struct x11drv_win_data *data, const RECT *new_rec
     const RECT *old_rect = &data->pending_state.rect;
     XWindowChanges changes;
 
+    data->desired_state.rect = *new_rect;
     if (!data->whole_window) return; /* no window, nothing to update */
     if (EqualRect( old_rect, new_rect )) return; /* rects are the same, nothing to update */
 
@@ -1328,7 +1334,7 @@ static void update_net_wm_states( struct x11drv_win_data *data )
 
     style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE );
     if (style & WS_MINIMIZE)
-        new_state |= data->net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED));
+        new_state |= data->desired_state.net_wm_state & ((1 << NET_WM_STATE_FULLSCREEN)|(1 << NET_WM_STATE_MAXIMIZED));
     if (data->is_fullscreen)
     {
         if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION)
@@ -1352,7 +1358,6 @@ static void update_net_wm_states( struct x11drv_win_data *data )
     }
 
     window_set_net_wm_state( data, new_state );
-    data->net_wm_state = new_state;
     update_net_wm_fullscreen_monitors( data );
 }
 
@@ -1413,13 +1418,15 @@ static void window_set_wm_state( struct x11drv_win_data *data, UINT new_state )
 {
     UINT old_state = data->pending_state.wm_state;
 
+    data->desired_state.wm_state = new_state;
     if (!data->whole_window) return; /* no window, nothing to update */
+    if (data->wm_state_serial) return; /* another WM_STATE update is pending, wait for it to complete */
     if (old_state == new_state) return; /* states are the same, nothing to update */
 
     data->pending_state.wm_state = new_state;
     data->wm_state_serial = NextRequest( data->display );
-    TRACE( "window %p/%lx, requesting WM_STATE %#x -> %#x serial %lu\n", data->hwnd, data->whole_window,
-           old_state, new_state, data->wm_state_serial );
+    TRACE( "window %p/%lx, requesting WM_STATE %#x -> %#x serial %lu, foreground %p\n", data->hwnd, data->whole_window,
+           old_state, new_state, data->wm_state_serial, NtUserGetForegroundWindow() );
 
     switch (MAKELONG(old_state, new_state))
     {
@@ -1439,6 +1446,11 @@ static void window_set_wm_state( struct x11drv_win_data *data, UINT new_state )
         if (!data->embedded) XIconifyWindow( data->display, data->whole_window, data->vis.screen );
         break;
     }
+
+    /* override redirect windows won't receive WM_STATE property changes */
+    if (!data->managed) data->wm_state_serial = 0;
+
+    XFlush( data->display );
 }
 
 
@@ -1450,7 +1462,6 @@ static void map_window( HWND hwnd, DWORD new_style )
     struct x11drv_win_data *data;
 
     make_owner_managed( hwnd );
-    wait_for_withdrawn_state( hwnd, TRUE );
 
     if (!(data = get_win_data( hwnd ))) return;
 
@@ -1464,7 +1475,6 @@ static void map_window( HWND hwnd, DWORD new_style )
         sync_window_style( data );
 
         window_set_wm_state( data, (new_style & WS_MINIMIZE) ? IconicState : NormalState );
-        XFlush( data->display );
 
         data->mapped = TRUE;
         data->iconic = (new_style & WS_MINIMIZE) != 0;
@@ -1481,8 +1491,6 @@ static void unmap_window( HWND hwnd )
 {
     struct x11drv_win_data *data;
 
-    wait_for_withdrawn_state( hwnd, FALSE );
-
     if (!(data = get_win_data( hwnd ))) return;
 
     if (data->mapped)
@@ -1490,14 +1498,96 @@ static void unmap_window( HWND hwnd )
         TRACE( "win %p/%lx\n", data->hwnd, data->whole_window );
         window_set_wm_state( data, WithdrawnState );
         data->mapped = FALSE;
-        data->net_wm_state = 0;
     }
     release_win_data( data );
 }
 
+UINT window_update_client_state( struct x11drv_win_data *data )
+{
+    UINT old_style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE );
+
+    if (!data->managed) return 0; /* unmanaged windows are managed by the Win32 side */
+    if (!data->mapped) return 0; /* ignore state changes on invisible windows */
+
+    if (data->wm_state_serial) return 0; /* another WM_STATE update is pending, wait for it to complete */
+    if (data->net_wm_state_serial) return 0; /* another _NET_WM_STATE update is pending, wait for it to complete */
+    if (data->configure_serial) return 0; /* another config update is pending, wait for it to complete */
+
+    if (data->iconic && data->current_state.wm_state == NormalState)  /* restore window */
+    {
+        data->iconic = FALSE;
+        if ((old_style & WS_CAPTION) == WS_CAPTION && (data->current_state.net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)))
+        {
+            if ((old_style & WS_MAXIMIZEBOX) && !(old_style & WS_DISABLED))
+            {
+                TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window );
+                return SC_MAXIMIZE;
+            }
+        }
+        else if (old_style & (WS_MINIMIZE | WS_MAXIMIZE))
+        {
+            BOOL activate = (old_style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE);
+            TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window );
+            return MAKELONG(SC_RESTORE, activate);
+        }
+    }
+    else if (!data->iconic && data->current_state.wm_state == IconicState)
+    {
+        data->iconic = TRUE;
+        if ((old_style & WS_MINIMIZEBOX) && !(old_style & WS_DISABLED))
+        {
+            TRACE( "minimizing win %p/%lx\n", data->hwnd, data->whole_window );
+            return SC_MINIMIZE;
+        }
+    }
+
+    return 0;
+}
+
+UINT window_update_client_config( struct x11drv_win_data *data )
+{
+    UINT old_style = NtUserGetWindowLongW( data->hwnd, GWL_STYLE ), flags;
+    RECT rect, old_rect = data->rects.window, new_rect;
+
+    if (!data->managed) return 0; /* unmanaged windows are managed by the Win32 side */
+    if (!data->mapped) return 0; /* ignore config changes on invisible windows */
+    if (data->iconic) return 0; /* ignore config changes on minimized windows */
+
+    if (data->wm_state_serial) return 0; /* another WM_STATE update is pending, wait for it to complete */
+    if (data->net_wm_state_serial) return 0; /* another _NET_WM_STATE update is pending, wait for it to complete */
+    if (data->configure_serial) return 0; /* another config update is pending, wait for it to complete */
+
+    if ((old_style & WS_CAPTION) == WS_CAPTION || !data->is_fullscreen)
+    {
+        if ((data->current_state.net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)) && !(old_style & WS_MAXIMIZE))
+        {
+            TRACE( "window %p/%lx is maximized\n", data->hwnd, data->whole_window );
+            return SC_MAXIMIZE;
+        }
+        if (!(data->current_state.net_wm_state & (1 << NET_WM_STATE_MAXIMIZED)) && (old_style & WS_MAXIMIZE))
+        {
+            TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window );
+            return SC_RESTORE;
+        }
+    }
+
+    flags = SWP_NOACTIVATE | SWP_NOZORDER;
+    rect = new_rect = window_rect_from_visible( &data->rects, data->current_state.rect );
+    if (new_rect.left == old_rect.left && new_rect.top == old_rect.top) flags |= SWP_NOMOVE;
+    else OffsetRect( &rect, old_rect.left - new_rect.left, old_rect.top - new_rect.top );
+    if (rect.right == old_rect.right && rect.bottom == old_rect.bottom) flags |= SWP_NOSIZE;
+    else if (IsRectEmpty( &rect )) flags |= SWP_NOSIZE;
+
+    if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) == (SWP_NOSIZE | SWP_NOMOVE)) return 0;
+
+    TRACE( "window %p/%lx config changed %s -> %s, flags %#x\n", data->hwnd, data->whole_window,
+           wine_dbgstr_rect(&old_rect), wine_dbgstr_rect(&new_rect), flags );
+    return MAKELONG(SC_MOVE, flags);
+}
+
 void window_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, UINT value )
 {
-    UINT *pending = &data->pending_state.wm_state, *current = &data->current_state.wm_state;
+    UINT *desired = &data->desired_state.wm_state, *pending = &data->pending_state.wm_state, *current = &data->current_state.wm_state;
     unsigned long *expect_serial = &data->wm_state_serial;
     const char *reason = NULL, *expected, *received;
 
@@ -1522,16 +1612,20 @@ void window_wm_state_notify( struct x11drv_win_data *data, unsigned long serial,
     else
     {
         WARN( "window %p/%lx, %s%s%s\n", data->hwnd, data->whole_window, reason, received, expected );
-        *pending = value; /* avoid requesting the same state again */
+        *desired = *pending = value; /* avoid requesting the same state again */
     }
 
     *current = value;
     *expect_serial = 0;
+
+    /* send any pending changes from the desired state */
+    window_set_wm_state( data, data->desired_state.wm_state );
+    window_set_net_wm_state( data, data->desired_state.net_wm_state );
 }
 
 void window_net_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, UINT value )
 {
-    UINT *pending = &data->pending_state.net_wm_state, *current = &data->current_state.net_wm_state;
+    UINT *desired = &data->desired_state.net_wm_state, *pending = &data->pending_state.net_wm_state, *current = &data->current_state.net_wm_state;
     unsigned long *expect_serial = &data->net_wm_state_serial;
     const char *reason = NULL, *expected, *received;
 
@@ -1554,16 +1648,20 @@ void window_net_wm_state_notify( struct x11drv_win_data *data, unsigned long ser
     else
     {
         WARN( "window %p/%lx, %s%s%s\n", data->hwnd, data->whole_window, reason, received, expected );
-        *pending = value; /* avoid requesting the same state again */
+        *desired = *pending = value; /* avoid requesting the same state again */
     }
 
     *current = value;
     *expect_serial = 0;
+
+    /* send any pending changes from the desired state */
+    window_set_wm_state( data, data->desired_state.wm_state );
+    window_set_net_wm_state( data, data->desired_state.net_wm_state );
 }
 
 void window_configure_notify( struct x11drv_win_data *data, unsigned long serial, const RECT *value )
 {
-    RECT *pending = &data->pending_state.rect, *current = &data->current_state.rect;
+    RECT *desired = &data->desired_state.rect, *pending = &data->pending_state.rect, *current = &data->current_state.rect;
     unsigned long *expect_serial = &data->configure_serial;
     const char *reason = NULL, *expected, *received;
 
@@ -1586,13 +1684,26 @@ void window_configure_notify( struct x11drv_win_data *data, unsigned long serial
     else
     {
         WARN( "window %p/%lx, %s%s%s\n", data->hwnd, data->whole_window, reason, received, expected );
-        *pending = *value; /* avoid requesting the same state again */
+        *desired = *pending = *value; /* avoid requesting the same state again */
     }
 
     *current = *value;
     *expect_serial = 0;
 }
 
+BOOL window_has_pending_wm_state( HWND hwnd, UINT state )
+{
+    struct x11drv_win_data *data;
+    BOOL pending;
+
+    if (!(data = get_win_data( hwnd ))) return FALSE;
+    if (state != -1 && data->desired_state.wm_state != state) pending = FALSE;
+    else pending = !!data->wm_state_serial;
+    release_win_data( data );
+
+    return pending;
+}
+
 /***********************************************************************
  *     make_window_embedded
  */
@@ -1600,7 +1711,6 @@ void make_window_embedded( struct x11drv_win_data *data )
 {
     /* the window cannot be mapped before being embedded */
     window_set_wm_state( data, WithdrawnState );
-    data->net_wm_state = 0;
     data->embedded = TRUE;
     data->managed = TRUE;
     sync_window_style( data );
@@ -1957,6 +2067,7 @@ static void create_whole_window( struct x11drv_win_data *data )
     if (!data->whole_window) goto done;
     SetRect( &data->current_state.rect, pos.x, pos.y, pos.x + cx, pos.y + cy );
     data->pending_state.rect = data->current_state.rect;
+    data->desired_state.rect = data->current_state.rect;
 
     x11drv_xinput2_enable( data->display, data->whole_window );
     set_initial_wm_hints( data->display, data->whole_window );
@@ -2011,10 +2122,9 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des
     if (data->whole_colormap) XFreeColormap( data->display, data->whole_colormap );
     data->whole_window = data->client_window = 0;
     data->whole_colormap = 0;
-    data->wm_state = WithdrawnState;
-    data->net_wm_state = 0;
     data->mapped = FALSE;
 
+    memset( &data->desired_state, 0, sizeof(data->desired_state) );
     memset( &data->pending_state, 0, sizeof(data->pending_state) );
     memset( &data->current_state, 0, sizeof(data->current_state) );
     data->wm_state_serial = 0;
@@ -2320,7 +2430,12 @@ void set_window_parent( struct x11drv_win_data *data, Window parent )
     if (!data->whole_window) return; /* only keep track of parent if we have a toplevel */
     TRACE( "window %p/%lx, parent %lx\n", data->hwnd, data->whole_window, parent );
     host_window_reparent( &data->parent, parent, data->whole_window );
-    if (data->parent) host_window_configure_child( data->parent, data->whole_window, data->rects.visible, TRUE );
+    if (data->parent)
+    {
+        RECT rect = data->rects.visible;
+        OffsetRect( &rect, -rect.left, -rect.top );
+        host_window_configure_child( data->parent, data->whole_window, rect, TRUE );
+    }
     data->parent_invalid = 0;
 }
 
@@ -2474,6 +2589,7 @@ BOOL X11DRV_SystrayDockInsert( HWND hwnd, UINT cx, UINT cy, void *icon )
     window = data->whole_window;
     release_win_data( data );
 
+    NtUserSetWindowPos( hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOZORDER );
     NtUserShowWindow( hwnd, SW_SHOWNA );
 
     TRACE_(systray)( "icon window %p/%lx\n", hwnd, window );

dlls/winex11.drv/x11drv.h

@@ -633,14 +633,13 @@ struct x11drv_win_data
     UINT        net_wm_fullscreen_monitors_set : 1; /* is _NET_WM_FULLSCREEN_MONITORS set */
     UINT        is_fullscreen : 1; /* is the window visible rect fullscreen */
     UINT        parent_invalid : 1; /* is the parent host window possibly invalid */
-    int         wm_state;       /* current value of the WM_STATE property */
-    DWORD       net_wm_state;   /* bit mask of active x11drv_net_wm_state values */
     Window      embedder;       /* window id of embedder */
     Pixmap         icon_pixmap;
     Pixmap         icon_mask;
     unsigned long *icon_bits;
     unsigned int   icon_size;
 
+    struct window_state desired_state; /* window state tracking the desired / win32 state */
     struct window_state pending_state; /* window state tracking the pending / requested state */
     struct window_state current_state; /* window state tracking the current X11 state */
     unsigned long wm_state_serial;     /* serial of last pending WM_STATE request */
@@ -659,10 +658,13 @@ extern void set_gl_drawable_parent( HWND hwnd, HWND parent );
 extern void destroy_gl_drawable( HWND hwnd );
 extern void destroy_vk_surface( HWND hwnd );
 
+extern BOOL window_has_pending_wm_state( HWND hwnd, UINT state );
 extern void window_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, UINT value );
 extern void window_net_wm_state_notify( struct x11drv_win_data *data, unsigned long serial, UINT value );
 extern void window_configure_notify( struct x11drv_win_data *data, unsigned long serial, const RECT *rect );
-extern void wait_for_withdrawn_state( HWND hwnd, BOOL set );
+extern UINT window_update_client_state( struct x11drv_win_data *data );
+extern UINT window_update_client_config( struct x11drv_win_data *data );
+
 extern Window init_clip_window(void);
 extern void update_user_time( Time time );
 extern UINT get_window_net_wm_state( Display *display, Window window );

dlls/wininet/http.c

@@ -3886,26 +3886,23 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel,
     }
     else if (dwInfoLevel & HTTP_QUERY_FLAG_SYSTEMTIME && lpBuffer)
     {
-        time_t tmpTime;
-        struct tm tmpTM;
-        SYSTEMTIME *STHook;
+        SYSTEMTIME st;
 
-        tmpTime = ConvertTimeString(lphttpHdr->lpszValue);
-
-        tmpTM = *gmtime(&tmpTime);
-        STHook = (SYSTEMTIME *)lpBuffer;
-        STHook->wDay = tmpTM.tm_mday;
-        STHook->wHour = tmpTM.tm_hour;
-        STHook->wMilliseconds = 0;
-        STHook->wMinute = tmpTM.tm_min;
-        STHook->wDayOfWeek = tmpTM.tm_wday;
-        STHook->wMonth = tmpTM.tm_mon + 1;
-        STHook->wSecond = tmpTM.tm_sec;
-        STHook->wYear = 1900+tmpTM.tm_year;
-
-        TRACE(" returning time: %04d/%02d/%02d - %d - %02d:%02d:%02d.%02d\n",
-              STHook->wYear, STHook->wMonth, STHook->wDay, STHook->wDayOfWeek,
-              STHook->wHour, STHook->wMinute, STHook->wSecond, STHook->wMilliseconds);
+        if (!InternetTimeToSystemTimeW(lphttpHdr->lpszValue, &st, 0))
+        {
+            LeaveCriticalSection( &request->headers_section );
+            return ERROR_HTTP_INVALID_HEADER;
+        }
+        if (*lpdwBufferLength < sizeof(st))
+        {
+            *lpdwBufferLength = sizeof(st);
+            LeaveCriticalSection( &request->headers_section );
+            return ERROR_INSUFFICIENT_BUFFER;
+        }
+        TRACE(" returning time: %04u/%02u/%02u - %u - %02u:%02u:%02u.%02u\n",
+              st.wYear, st.wMonth, st.wDay, st.wDayOfWeek, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds);
+        memcpy(lpBuffer, &st, sizeof(st));
+        *lpdwBufferLength = sizeof(st);
     }
     else if (lphttpHdr->lpszValue)
     {
@@ -4521,7 +4518,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft)
     /* asctime() doesn't report a timezone, but some web servers do, so accept
      * with or without GMT.
      */
-    if (*ptr && wcscmp(ptr, L"GMT"))
+    if (*ptr && (wcscmp(ptr, L"GMT") && wcscmp(ptr, L"UTC")))
     {
         ERR("unexpected timezone %s\n", debugstr_w(ptr));
         return FALSE;
@@ -4598,7 +4595,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft)
     while (iswspace(*ptr))
         ptr++;
 
-    if (wcscmp(ptr, L"GMT"))
+    if (wcscmp(ptr, L"GMT") && wcscmp(ptr, L"UTC"))
     {
         ERR("unexpected time zone %s\n", debugstr_w(ptr));
         return FALSE;
@@ -4715,7 +4712,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft)
     while (iswspace(*ptr))
         ptr++;
 
-    if (wcscmp(ptr, L"GMT"))
+    if (wcscmp(ptr, L"GMT") && wcscmp(ptr, L"UTC"))
     {
         ERR("unexpected time zone %s\n", debugstr_w(ptr));
         return FALSE;

dlls/wininet/tests/http.c

@@ -2412,6 +2412,7 @@ static const char okmsg2[] =
 "Content-Length: 0\r\n"
 "Set-Cookie: one\r\n"
 "Set-Cookie: two\r\n"
+"Last-Modified: Mon, 01 Dec 2008 13:44:34 UTC\r\n"
 "\r\n";
 
 static DWORD64 content_length;
@@ -4566,9 +4567,11 @@ static void test_head_request(int port)
 
 static void test_HttpQueryInfo(int port)
 {
+    static const SYSTEMTIME expect = {2008, 12, 1, 1, 13, 44, 34};
     test_request_t req;
     DWORD size, index, error;
     char buffer[1024];
+    SYSTEMTIME st;
     BOOL ret;
 
     open_simple_request(&req, "localhost", port, NULL, "/testD");
@@ -4589,9 +4592,27 @@ static void test_HttpQueryInfo(int port)
     ok(index == 1, "expected 1 got %lu\n", index);
 
     index = 0;
-    size = sizeof(buffer);
-    ret = HttpQueryInfoA(req.request, HTTP_QUERY_DATE | HTTP_QUERY_FLAG_SYSTEMTIME, buffer, &size, &index);
+    size = 0;
+    ret = HttpQueryInfoA(req.request, HTTP_QUERY_DATE | HTTP_QUERY_FLAG_SYSTEMTIME, &st, &size, &index);
+    ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError());
+    ok(size == sizeof(st), "got %lu\n", size);
+
+    index = 0;
+    size = sizeof(st) + 1;
+    memset(&st, 0, sizeof(st));
+    ret = HttpQueryInfoA(req.request, HTTP_QUERY_DATE | HTTP_QUERY_FLAG_SYSTEMTIME, &st, &size, &index);
     ok(ret, "HttpQueryInfo failed %lu\n", GetLastError());
+    ok(!memcmp(&st, &expect, sizeof(st)), "wrong time\n");
+    ok(size == sizeof(st), "got %lu\n", size);
+    ok(index == 1, "expected 1 got %lu\n", index);
+
+    index = 0;
+    size = sizeof(st);
+    memset(&st, 0, sizeof(st));
+    ret = HttpQueryInfoA(req.request, HTTP_QUERY_LAST_MODIFIED | HTTP_QUERY_FLAG_SYSTEMTIME, &st, &size, &index);
+    ok(ret, "HttpQueryInfo failed %lu\n", GetLastError());
+    ok(!memcmp(&st, &expect, sizeof(st)), "wrong time\n");
+    ok(size == sizeof(st), "got %lu\n", size);
     ok(index == 1, "expected 1 got %lu\n", index);
 
     index = 0;

dlls/wininet/tests/internet.c

@@ -1116,9 +1116,11 @@ static void test_InternetTimeToSystemTime(void)
     test_data[] =
     {
         { "Fri, 07 Jan 2005 12:06:35 GMT", &expect1, TRUE },
+        { "Fri, 07 Jan 2005 12:06:35 UTC", &expect1, TRUE },
         { " fri, 7 jan 2005 12 06 35",     &expect1, TRUE },
         { "Fri, 07-01-2005 12:06:35",      &expect1, TRUE },
         { "5, 07-01-2005 12:06:35 GMT",    &expect1, TRUE },
+        { "5, 07-01-2005 12:06:35 UTC",    &expect1, TRUE },
         { "5, 07-01-2005 12:06:35 GMT;",   &expect1, TRUE },
         { "5, 07-01-2005 12:06:35 GMT123", &expect1, TRUE },
         { "2, 11 01 2022 11 13 05",        &expect2, TRUE },
@@ -1126,6 +1128,9 @@ static void test_InternetTimeToSystemTime(void)
         { "2, 11*01/2022 11+13=05",        &expect2, TRUE },
         { "2, 11-Jan-2022 11:13:05",       &expect2, TRUE },
         { "Fr",                            NULL,     FALSE },
+        { "Fri Jan 7 12:06:35 2005",       &expect1, TRUE, TRUE },
+        { "Fri Jan 7 12:06:35 2005 GMT",   &expect1, TRUE, TRUE },
+        { "Fri Jan 7 12:06:35 2005 UTC",   &expect1, TRUE, TRUE },
     };
 
     ret = pInternetTimeToSystemTimeA(NULL, NULL, 0);

dlls/wininet/utility.c

@@ -39,92 +39,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wininet);
 
-#define TIME_STRING_LEN  30
-
-time_t ConvertTimeString(LPCWSTR asctime)
-{
-    WCHAR tmpChar[TIME_STRING_LEN];
-    WCHAR *tmpChar2;
-    struct tm t;
-    int timelen = lstrlenW(asctime);
-
-    if(!timelen)
-        return 0;
-
-    /* FIXME: the atoiWs below rely on that tmpChar is \0 padded */
-    memset( tmpChar, 0, sizeof(tmpChar) );
-    lstrcpynW(tmpChar, asctime, TIME_STRING_LEN);
-
-    /* Assert that the string is the expected length */
-    if (lstrlenW(asctime) >= TIME_STRING_LEN) FIXME("\n");
-
-    /* Convert a time such as 'Mon, 15 Nov 1999 16:09:35 GMT' into a SYSTEMTIME structure
-     * We assume the time is in this format
-     * and divide it into easy to swallow chunks
-     */
-    tmpChar[3]='\0';
-    tmpChar[7]='\0';
-    tmpChar[11]='\0';
-    tmpChar[16]='\0';
-    tmpChar[19]='\0';
-    tmpChar[22]='\0';
-    tmpChar[25]='\0';
-
-    memset( &t, 0, sizeof(t) );
-    t.tm_year = wcstol(tmpChar+12, NULL, 10) - 1900;
-    t.tm_mday = wcstol(tmpChar+5, NULL, 10);
-    t.tm_hour = wcstol(tmpChar+17, NULL, 10);
-    t.tm_min = wcstol(tmpChar+20, NULL, 10);
-    t.tm_sec = wcstol(tmpChar+23, NULL, 10);
-
-    /* and month */
-    tmpChar2 = tmpChar + 8;
-    switch(tmpChar2[2])
-    {
-        case 'n':
-            if(tmpChar2[1]=='a')
-                t.tm_mon = 0;
-            else
-                t.tm_mon = 5;
-            break;
-        case 'b':
-            t.tm_mon = 1;
-            break;
-        case 'r':
-            if(tmpChar2[1]=='a')
-                t.tm_mon = 2;
-            else
-                t.tm_mon = 3;
-            break;
-        case 'y':
-            t.tm_mon = 4;
-            break;
-        case 'l':
-            t.tm_mon = 6;
-            break;
-        case 'g':
-            t.tm_mon = 7;
-            break;
-        case 'p':
-            t.tm_mon = 8;
-            break;
-        case 't':
-            t.tm_mon = 9;
-            break;
-        case 'v':
-            t.tm_mon = 10;
-            break;
-        case 'c':
-            t.tm_mon = 11;
-            break;
-        default:
-            FIXME("\n");
-    }
-
-    return mktime(&t);
-}
-
-
 BOOL GetAddress(const WCHAR *name, INTERNET_PORT port, struct sockaddr *psa, int *sa_len, char *addr_str)
 {
     ADDRINFOW *res, hints;

dlls/wintypes/main.c

@@ -1240,3 +1240,211 @@ HRESULT WINAPI RoResolveNamespace(HSTRING name, HSTRING windowsMetaDataDir,
 
     return RO_E_METADATA_NAME_NOT_FOUND;
 }
+
+struct parse_type_context
+{
+    DWORD allocated_parts_count;
+    DWORD parts_count;
+    HSTRING *parts;
+};
+
+static HRESULT add_part(struct parse_type_context *context, const WCHAR *part, size_t length)
+{
+    DWORD new_parts_count;
+    HSTRING *new_parts;
+    HRESULT hr;
+
+    if (context->parts_count == context->allocated_parts_count)
+    {
+        new_parts_count = context->allocated_parts_count ? context->allocated_parts_count * 2 : 4;
+        new_parts = CoTaskMemRealloc(context->parts, new_parts_count * sizeof(*context->parts));
+        if (!new_parts)
+            return E_OUTOFMEMORY;
+
+        context->allocated_parts_count = new_parts_count;
+        context->parts = new_parts;
+    }
+
+    if (FAILED(hr = WindowsCreateString(part, length, &context->parts[context->parts_count])))
+        return hr;
+
+    context->parts_count++;
+    return S_OK;
+}
+
+static HRESULT parse_part(struct parse_type_context *context, const WCHAR *input, unsigned int length)
+{
+    const WCHAR *start, *end, *ptr;
+
+    start = input;
+    end = start + length;
+
+    /* Remove leading spaces */
+    while (start < end && *start == ' ')
+        start++;
+
+    /* Remove trailing spaces */
+    while (end - 1 >= start && end[-1] == ' ')
+        end--;
+
+    /* Only contains spaces */
+    if (start == end)
+        return RO_E_METADATA_INVALID_TYPE_FORMAT;
+
+    /* Has spaces in the middle */
+    for (ptr = start; ptr < end; ptr++)
+    {
+        if (*ptr == ' ')
+            return RO_E_METADATA_INVALID_TYPE_FORMAT;
+    }
+
+    return add_part(context, start, end - start);
+}
+
+static HRESULT parse_type(struct parse_type_context *context, const WCHAR *input, unsigned int length)
+{
+    unsigned int i, parameter_count, nested_level;
+    const WCHAR *start, *end, *part_start, *ptr;
+    HRESULT hr;
+
+    start = input;
+    end = start + length;
+    part_start = start;
+    ptr = start;
+
+    /* Read until the end of input or '`' or '<' or '>' or ',' */
+    while (ptr < end && *ptr != '`' && *ptr != '<' && *ptr != '>' && *ptr != ',')
+        ptr++;
+
+    /* If the type name has '`' and there are characters before '`' */
+    if (ptr > start && ptr < end && *ptr == '`')
+    {
+        /* Move past the '`' */
+        ptr++;
+
+        /* Read the number of type parameters, expecting '1' to '9' */
+        if (!(ptr < end && *ptr >= '1' && *ptr <= '9'))
+            return RO_E_METADATA_INVALID_TYPE_FORMAT;
+        parameter_count = *ptr - '0';
+
+        /* Move past the number of type parameters, expecting '<' */
+        ptr++;
+        if (!(ptr < end && *ptr == '<'))
+            return RO_E_METADATA_INVALID_TYPE_FORMAT;
+
+        /* Add the name of parameterized interface, e.g., the "interface`1" in "interface`1<parameter>" */
+        if (FAILED(hr = parse_part(context, part_start, ptr - part_start)))
+            return hr;
+
+        /* Move past the '<' */
+        ptr++;
+        nested_level = 1;
+
+        /* Read parameters inside brackets, e.g., the "p1" and "p2" in "interface`2<p1, p2>" */
+        for (i = 0; i < parameter_count; i++)
+        {
+            /* Read a new parameter */
+            part_start = ptr;
+
+            /* Read until ','. The comma must be at the same nested bracket level */
+            while (ptr < end)
+            {
+                if (*ptr == '<')
+                {
+                    nested_level++;
+                    ptr++;
+                }
+                else if (*ptr == '>')
+                {
+                    /* The last parameter before '>' */
+                    if (i == parameter_count - 1 && nested_level == 1)
+                    {
+                        if (FAILED(hr = parse_type(context, part_start, ptr - part_start)))
+                            return hr;
+
+                        nested_level--;
+                        ptr++;
+
+                        /* Finish reading all parameters */
+                        break;
+                    }
+
+                    nested_level--;
+                    ptr++;
+                }
+                else if (*ptr == ',' && nested_level == 1)
+                {
+                    /* Parse the parameter, which can be another parameterized type */
+                    if (FAILED(hr = parse_type(context, part_start, ptr - part_start)))
+                        return hr;
+
+                    /* Move past the ',' */
+                    ptr++;
+
+                    /* Finish reading one parameter */
+                    break;
+                }
+                else
+                {
+                    ptr++;
+                }
+            }
+        }
+
+        /* Mismatching brackets or not enough parameters */
+        if (nested_level != 0 || i != parameter_count)
+            return RO_E_METADATA_INVALID_TYPE_FORMAT;
+
+        /* The remaining characters must be spaces */
+        while (ptr < end)
+        {
+            if (*ptr++ != ' ')
+                return RO_E_METADATA_INVALID_TYPE_FORMAT;
+        }
+
+        return S_OK;
+    }
+    /* Contain invalid '`', '<', '>' or ',' */
+    else if (ptr != end)
+    {
+        return RO_E_METADATA_INVALID_TYPE_FORMAT;
+    }
+    /* Non-parameterized */
+    else
+    {
+        return parse_part(context, part_start, ptr - part_start);
+    }
+}
+
+HRESULT WINAPI RoParseTypeName(HSTRING type_name, DWORD *parts_count, HSTRING **parts)
+{
+    struct parse_type_context context = {0};
+    const WCHAR *input;
+    unsigned int i;
+    HRESULT hr;
+
+    TRACE("%s %p %p.\n", debugstr_hstring(type_name), parts_count, parts);
+
+    /* Empty string */
+    if (!WindowsGetStringLen(type_name))
+        return E_INVALIDARG;
+
+    input = WindowsGetStringRawBuffer(type_name, NULL);
+    /* The string has a leading space */
+    if (input[0] == ' ')
+        return RO_E_METADATA_INVALID_TYPE_FORMAT;
+
+    *parts_count = 0;
+    *parts = NULL;
+    if (FAILED(hr = parse_type(&context, input, wcslen(input))))
+    {
+        for (i = 0; i < context.parts_count; i++)
+            WindowsDeleteString(context.parts[i]);
+        CoTaskMemFree(context.parts);
+        return hr;
+    }
+
+    *parts_count = context.parts_count;
+    *parts = context.parts;
+    return S_OK;
+}