wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Alexandre Julliard : wineandroid: Initial version of the OpenGL driver.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 1f736b5f7c0ab298a3535cac6b099c7b6dad61ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f736b5f7c0ab298a3535cac6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 21:39:08 2017 +0200 wineandroid: Initial version of the OpenGL driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 1 + dlls/wineandroid.drv/android.h | 8 + dlls/wineandroid.drv/init.c | 18 +- dlls/wineandroid.drv/opengl.c | 865 +++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 5 files changed, 892 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f736b5f7c0ab298a3535…

1 0

Alexandre Julliard : configure: Add check for OpenGL ES libraries.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: ad9fbf8e0aaeb56f50a0dcd8d6aa572796736af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9fbf8e0aaeb56f50a0dcd8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 20:07:29 2017 +0200 configure: Add check for OpenGL ES libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++ include/config.h.in | 9 +++++ 3 files changed, 121 insertions(+) diff --git a/configure b/configure index 02de880..c1e3c2a 100755 --- a/configure +++ b/configure @@ -6830,6 +6830,7 @@ for ac_header in \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ + EGL/egl.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ @@ -8489,6 +8490,113 @@ fi LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lEGL" >&5 +$as_echo_n "checking for -lEGL... " >&6; } +if ${ac_cv_lib_soname_EGL+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lEGL $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char eglGetProcAddress (); +int +main () +{ +return eglGetProcAddress (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_EGL=`$ac_cv_path_LDD conftest.exe | grep "EGL" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_EGL=`$OTOOL -L conftest$ac_exeext | grep "libEGL\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libEGL\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_EGL=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libEGL\\.$LIBEXT" | sed -e "s/^.*\\[\$libEGL\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_EGL:+false} :; then : + ac_cv_lib_soname_EGL=`$LDD conftest$ac_exeext | grep "libEGL\\.$LIBEXT" | sed -e "s/^.*$libEGL\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_EGL:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_EGL" >&5 +$as_echo "$ac_cv_lib_soname_EGL" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBEGL "$ac_cv_lib_soname_EGL" +_ACEOF + + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGLESv2" >&5 +$as_echo_n "checking for -lGLESv2... " >&6; } +if ${ac_cv_lib_soname_GLESv2+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-lGLESv2 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char glFlush (); +int +main () +{ +return glFlush (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_GLESv2=`$ac_cv_path_LDD conftest.exe | grep "GLESv2" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_GLESv2=`$OTOOL -L conftest$ac_exeext | grep "libGLESv2\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libGLESv2\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_GLESv2=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libGLESv2\\.$LIBEXT" | sed -e "s/^.*\\[\$libGLESv2\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + if ${ac_cv_lib_soname_GLESv2:+false} :; then : + ac_cv_lib_soname_GLESv2=`$LDD conftest$ac_exeext | grep "libGLESv2\\.$LIBEXT" | sed -e "s/^.*$libGLESv2\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` +fi ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if ${ac_cv_lib_soname_GLESv2:+false} :; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GLESv2" >&5 +$as_echo "$ac_cv_lib_soname_GLESv2" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBGLESV2 "$ac_cv_lib_soname_GLESv2" +_ACEOF + + +fi + if test "x$exec_prefix" = xNONE then case $host_cpu in diff --git a/configure.ac b/configure.ac index 7ae29f7..687d546 100644 --- a/configure.ac +++ b/configure.ac @@ -394,6 +394,7 @@ AC_CHECK_HEADERS(\ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ + EGL/egl.h \ IOKit/IOKitLib.h \ IOKit/hid/IOHIDLib.h \ OpenAL/al.h \ @@ -869,6 +870,9 @@ case $host_os in AC_SUBST(LIBWINE_INSTALL_LIB,"libwine.so") AC_SUBST(LIBWINE_LDFLAGS,["-shared -Wl,-soname,libwine.so"]) + WINE_CHECK_SONAME(EGL,eglGetProcAddress) + WINE_CHECK_SONAME(GLESv2,glFlush) + if test "x$exec_prefix" = xNONE then case $host_cpu in diff --git a/include/config.h.in b/include/config.h.in index 18cacd5..c287559 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -117,6 +117,9 @@ /* Define to 1 if you have the `dlopen' function. */ #undef HAVE_DLOPEN +/* Define to 1 if you have the <EGL/egl.h> header file. */ +#undef HAVE_EGL_EGL_H + /* Define to 1 if you have the <elf.h> header file. */ #undef HAVE_ELF_H @@ -1415,6 +1418,9 @@ /* Define to the soname of the libdbus-1 library. */ #undef SONAME_LIBDBUS_1 +/* Define to the soname of the libEGL library. */ +#undef SONAME_LIBEGL + /* Define to the soname of the libfontconfig library. */ #undef SONAME_LIBFONTCONFIG @@ -1424,6 +1430,9 @@ /* Define to the soname of the libGL library. */ #undef SONAME_LIBGL +/* Define to the soname of the libGLESv2 library. */ +#undef SONAME_LIBGLESV2 + /* Define to the soname of the libGLU library. */ #undef SONAME_LIBGLU

1 0

Alexandre Julliard : wineandroid: Also create HWND_MESSAGE windows on the Java side.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f39e021006fe4131618f26138c7e7ddc6223ad92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39e021006fe4131618f26138… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 20:04:43 2017 +0200 wineandroid: Also create HWND_MESSAGE windows on the Java side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 5 +++++ dlls/wineandroid.drv/device.c | 12 +++++++++--- dlls/wineandroid.drv/window.c | 27 ++------------------------- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 742fabc..295ecc4 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -62,6 +62,7 @@ public class WineActivity extends Activity private ProgressDialog progress_dialog; protected WineWindow desktop_window; + protected WineWindow message_window; @Override public void onCreate(Bundle savedInstanceState) @@ -290,6 +291,7 @@ public class WineActivity extends Activity protected class WineWindow extends Object { + static protected final int HWND_MESSAGE = 0xfffffffd; static protected final int WS_VISIBLE = 0x10000000; protected int hwnd; @@ -617,6 +619,9 @@ public class WineActivity extends Activity desktop_window = new WineWindow( hwnd, null ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); + + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window.create_window_groups(); } @Override diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index d17b7c5..54c409b 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -251,6 +251,13 @@ static struct native_win_data *get_ioctl_native_win_data( const struct ioctl_hea return get_native_win_data( LongToHandle(hdr->hwnd), hdr->opengl ); } +static int get_ioctl_win_parent( HWND parent ) +{ + if (parent != GetDesktopWindow() && !GetAncestor( parent, GA_PARENT )) + return HandleToLong( HWND_MESSAGE ); + return HandleToLong( parent ); +} + static void wait_fence_and_close( int fence ) { __s32 timeout = 1000; /* FIXME: should be -1 for infinite timeout */ @@ -1353,7 +1360,6 @@ struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl ) { struct ioctl_android_create_window req; struct native_win_wrapper *win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*win) ); - HWND parent = GetAncestor( hwnd, GA_PARENT ); if (!win) return NULL; @@ -1378,7 +1384,7 @@ struct ANativeWindow *create_ioctl_window( HWND hwnd, BOOL opengl ) req.hdr.hwnd = HandleToLong( win->hwnd ); req.hdr.opengl = win->opengl; - req.parent = HandleToLong( parent ); + req.parent = get_ioctl_win_parent( GetAncestor( hwnd, GA_PARENT )); android_ioctl( IOCTL_CREATE_WINDOW, &req, sizeof(req), NULL, NULL ); return &win->win; @@ -1438,7 +1444,7 @@ int ioctl_set_window_parent( HWND hwnd, HWND parent ) req.hdr.hwnd = HandleToLong( hwnd ); req.hdr.opengl = FALSE; - req.parent = HandleToLong( parent ); + req.parent = get_ioctl_win_parent( parent ); return android_ioctl( IOCTL_SET_WINDOW_PARENT, &req, sizeof(req), NULL, NULL ); } diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3bfd0a8..5def81e 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1018,34 +1018,11 @@ static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_r if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop or HWND_MESSAGE */ - if (parent != GetDesktopWindow()) - { - if (!(data = get_win_data( parent )) && - !(data = create_win_data( parent, NULL, NULL ))) - return NULL; - release_win_data( data ); - } - if (!(data = alloc_win_data( hwnd ))) return NULL; data->parent = (parent == GetDesktopWindow()) ? 0 : parent; - - if (window_rect) - { - data->whole_rect = data->window_rect = *window_rect; - data->client_rect = *client_rect; - } - else - { - GetWindowRect( hwnd, &data->window_rect ); - MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); - data->whole_rect = data->window_rect; - GetClientRect( hwnd, &data->client_rect ); - MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); - ioctl_window_pos_changed( hwnd, &data->window_rect, &data->client_rect, &data->whole_rect, - GetWindowLongW( hwnd, GWL_STYLE ), SWP_NOACTIVATE, - GetWindow( hwnd, GW_HWNDPREV ), GetWindow( hwnd, GW_OWNER )); - } + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; return data; }

1 0

Alexandre Julliard : wineandroid: Create window groups inside every window to support a client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: cd2b41a2b4fc64efcef168d1f833f0adc62ef1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2b41a2b4fc64efcef168d1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:38:36 2017 +0200 wineandroid: Create window groups inside every window to support a client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 189 +++++++++++++++++++++++++++------ dlls/wineandroid.drv/device.c | 4 +- 2 files changed, 160 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd2b41a2b4fc64efcef16…

1 0

Alexandre Julliard : wineandroid: Add infrastructure to support a separate TextureView for the window client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: f77bbd45d6b475dbed23a66ba4f5495f8ea12932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77bbd45d6b475dbed23a66ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:36:54 2017 +0200 wineandroid: Add infrastructure to support a separate TextureView for the window client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 50 ++++++++++++++++++++++------------ dlls/wineandroid.drv/android.h | 4 ++- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/window.c | 14 ++++++---- 4 files changed, 45 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f77bbd45d6b475dbed23a…

1 0

Alexandre Julliard : wineandroid: Support creating a separate native window for OpenGL rendering in the client area.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 95c4516b653f93fcd2f2d5e89de210a444a3ee0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c4516b653f93fcd2f2d5e89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 19:28:57 2017 +0200 wineandroid: Support creating a separate native window for OpenGL rendering in the client area. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 6 ++-- dlls/wineandroid.drv/android.h | 6 ++-- dlls/wineandroid.drv/device.c | 66 +++++++++++++++++++++------------- dlls/wineandroid.drv/window.c | 6 ++-- 4 files changed, 51 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95c4516b653f93fcd2f2d…

1 0

Hugh McMaster : reg/tests: Add tests for parsing hex data.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 116f8d2efe928af25e3c88289db0cc3c9d648308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116f8d2efe928af25e3c88289… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 22 09:34:38 2017 +0000 reg/tests: Add tests for parsing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2c1cc67..c821bec 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1761,6 +1761,43 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,69,6e,65,20, \\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine48b\"=hex(7):4c,69,6e,65,20,\t\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine49\"=hex(2):25,50,41,54,48,25,00,\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine49", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,50,41,54,48,25,00 ;comment\n" + "\"Wine50b\"=hex(2):25,50,41,54,48,25,00\t;comment\n" + "\"Wine50c\"=hex(2):25,50,41,54,48,25,00 #comment\n" + "\"Wine50d\"=hex(2):25,50,41,54,48,25,00\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine50c"); + todo_wine verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine51a"); + todo_wine verify_reg_nonexist(hkey, "Wine51b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2690,6 +2727,45 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00, \\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00, \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine48b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\t\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\t \t \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + todo_wine verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine49\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine49", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 ;comment\n" + "\"Wine50b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t;comment\n" + "\"Wine50c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 #comment\n" + "\"Wine50d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t#comment\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine50c"); + todo_wine verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine51a"); + todo_wine verify_reg_nonexist(hkey, "Wine51b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Add tests for parsing hex data.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: a1b35b3bc4322b80441a9d60d1cb55b34dad88dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b35b3bc4322b80441a9d60d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 22 09:34:29 2017 +0000 regedit/tests: Add tests for parsing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79f7571..c70cccc 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -466,6 +466,20 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); verify_reg_nonexist(hkey, "Wine13i"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine14a\"=hex(7):4c,69,6e,65,20, \\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine14b\"=hex(7):4c,69,6e,65,20,\t\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine14a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine14b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine15\"=hex(2):25,50,41,54,48,25,00,\n\n"); + verify_reg(hkey, "Wine15", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -801,6 +815,14 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Test21e"); verify_reg_nonexist(hkey, "Test21f"); + /* Test support for characters greater than 0xff */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine22a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine22b\"=hex(0):25,1a4,100,164,124,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine22a"); + verify_reg_nonexist(hkey, "Wine22b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1023,6 +1045,17 @@ static void test_comments(void) " 61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine27a\"=hex(2):25,50,41,54,48,25,00 ;comment\n" + "\"Wine27b\"=hex(2):25,50,41,54,48,25,00\t;comment\n" + "\"Wine27c\"=hex(2):25,50,41,54,48,25,00 #comment\n" + "\"Wine27d\"=hex(2):25,50,41,54,48,25,00\t#comment\n\n"); + todo_wine verify_reg(hkey, "Wine27a", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg(hkey, "Wine27b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine27c"); + verify_reg_nonexist(hkey, "Wine27d"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Nikolay Sivov : d3drm: Make it possible to create meshes with CreateObject ().
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: d72c858693c22e7103f670548de8ed90903c2420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72c858693c22e7103f670548… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:32 2017 +0300 d3drm: Make it possible to create meshes with CreateObject(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm.c | 25 +++++++++++++++++++++++- dlls/d3drm/d3drm_private.h | 26 ++++++++++++++++++++++++- dlls/d3drm/meshbuilder.c | 47 ++++++++++++++++------------------------------ dlls/d3drm/tests/d3drm.c | 4 +++- 4 files changed, 68 insertions(+), 34 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8ee3d56..b475844 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -149,6 +149,19 @@ static HRESULT d3drm_create_material_object(void **object, IDirect3DRM *d3drm) return hr; } +static HRESULT d3drm_create_mesh_object(void **object, IDirect3DRM *d3drm) +{ + struct d3drm_mesh *mesh; + HRESULT hr; + + if (FAILED(hr = d3drm_mesh_create(&mesh, d3drm))) + return hr; + + *object = &mesh->IDirect3DRMMesh_iface; + + return hr; +} + struct d3drm { IDirect3DRM IDirect3DRM_iface; @@ -1299,6 +1312,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, {&CLSID_CDirect3DRMFrame, d3drm_create_frame_object}, {&CLSID_CDirect3DRMLight, d3drm_create_light_object}, {&CLSID_CDirect3DRMMaterial, d3drm_create_material_object}, + {&CLSID_CDirect3DRMMesh, d3drm_create_mesh_object}, }; TRACE("iface %p, clsid %s, outer %p, iid %s, out %p.\n", @@ -1365,9 +1379,18 @@ static HRESULT WINAPI d3drm3_CreateFrame(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_CreateMesh(IDirect3DRM3 *iface, IDirect3DRMMesh **mesh) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); + struct d3drm_mesh *object; + HRESULT hr; + TRACE("iface %p, mesh %p.\n", iface, mesh); - return Direct3DRMMesh_create(mesh); + if (FAILED(hr = d3drm_mesh_create(&object, &d3drm->IDirect3DRM_iface))) + return hr; + + *mesh = &object->IDirect3DRMMesh_iface; + + return S_OK; } static HRESULT WINAPI d3drm3_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 1b00e1a..af79b43 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -147,6 +147,30 @@ struct d3drm_mesh_builder DWORD *material_indices; }; +struct mesh_group +{ + unsigned nb_vertices; + D3DRMVERTEX* vertices; + unsigned nb_faces; + unsigned vertex_per_face; + DWORD face_data_size; + unsigned* face_data; + D3DCOLOR color; + IDirect3DRMMaterial2* material; + IDirect3DRMTexture3* texture; +}; + +struct d3drm_mesh +{ + struct d3drm_object obj; + IDirect3DRMMesh IDirect3DRMMesh_iface; + LONG ref; + IDirect3DRM *d3drm; + DWORD groups_capacity; + DWORD nb_groups; + struct mesh_group *groups; +}; + struct d3drm_light { struct d3drm_object obj; @@ -207,7 +231,7 @@ HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3d HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; -HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN; +HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 2afff7a..4f6c760 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -26,29 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); -struct mesh_group -{ - unsigned nb_vertices; - D3DRMVERTEX* vertices; - unsigned nb_faces; - unsigned vertex_per_face; - DWORD face_data_size; - unsigned* face_data; - D3DCOLOR color; - IDirect3DRMMaterial2* material; - IDirect3DRMTexture3* texture; -}; - -struct d3drm_mesh -{ - struct d3drm_object obj; - IDirect3DRMMesh IDirect3DRMMesh_iface; - LONG ref; - DWORD groups_capacity; - DWORD nb_groups; - struct mesh_group *groups; -}; - struct coords_2d { D3DVALUE u; @@ -1977,7 +1954,7 @@ static HRESULT WINAPI d3drm_mesh_builder3_CreateMesh(IDirect3DRMMeshBuilder3 *if if (!mesh) return E_POINTER; - hr = Direct3DRMMesh_create(mesh); + hr = IDirect3DRM_CreateMesh(mesh_builder->d3drm, mesh); if (FAILED(hr)) return hr; @@ -2422,6 +2399,8 @@ static ULONG WINAPI d3drm_mesh_Release(IDirect3DRMMesh *iface) { DWORD i; + d3drm_object_cleanup((IDirect3DRMObject *)iface, &mesh->obj); + IDirect3DRM_Release(mesh->d3drm); for (i = 0; i < mesh->nb_groups; ++i) { HeapFree(GetProcessHeap(), 0, mesh->groups[i].vertices); @@ -2449,17 +2428,21 @@ static HRESULT WINAPI d3drm_mesh_Clone(IDirect3DRMMesh *iface, static HRESULT WINAPI d3drm_mesh_AddDestroyCallback(IDirect3DRMMesh *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_add_destroy_callback(&mesh->obj, cb, ctx); } static HRESULT WINAPI d3drm_mesh_DeleteDestroyCallback(IDirect3DRMMesh *iface, D3DRMOBJECTCALLBACK cb, void *ctx) { - FIXME("iface %p, cb %p, ctx %p stub!\n", iface, cb, ctx); + struct d3drm_mesh *mesh = impl_from_IDirect3DRMMesh(iface); - return E_NOTIMPL; + TRACE("iface %p, cb %p, ctx %p.\n", iface, cb, ctx); + + return d3drm_object_delete_destroy_callback(&mesh->obj, cb, ctx); } static HRESULT WINAPI d3drm_mesh_SetAppData(IDirect3DRMMesh *iface, DWORD data) @@ -2874,22 +2857,24 @@ static const struct IDirect3DRMMeshVtbl d3drm_mesh_vtbl = d3drm_mesh_GetGroupTexture, }; -HRESULT Direct3DRMMesh_create(IDirect3DRMMesh **mesh) +HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm) { static const char classname[] = "Mesh"; struct d3drm_mesh *object; - TRACE("mesh %p.\n", mesh); + TRACE("mesh %p, d3drm %p.\n", mesh, d3drm); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; object->IDirect3DRMMesh_iface.lpVtbl = &d3drm_mesh_vtbl; object->ref = 1; + object->d3drm = d3drm; + IDirect3DRM_AddRef(object->d3drm); d3drm_object_init(&object->obj, classname); - *mesh = &object->IDirect3DRMMesh_iface; + *mesh = object; return S_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 82e0166..a432816 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1487,6 +1487,7 @@ static void test_object(void) { &CLSID_CDirect3DRMLight, &IID_IDirect3DRMLight }, { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial }, { &CLSID_CDirect3DRMMaterial, &IID_IDirect3DRMMaterial2 }, + { &CLSID_CDirect3DRMMesh, &IID_IDirect3DRMMesh }, }; IDirect3DRM *d3drm1; IDirect3DRM2 *d3drm2; @@ -1513,7 +1514,8 @@ static void test_object(void) BOOL takes_ref = IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMeshBuilder) || IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMFrame) || IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMLight) || - IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial); + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMaterial) || + IsEqualGUID(tests[i].clsid, &CLSID_CDirect3DRMMesh); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown);

1 0

Nikolay Sivov : d3drm: Implement appdata property for the rest of objects.
by Alexandre Julliard 22 Jun '17

22 Jun '17

Module: wine Branch: master Commit: 4e258f2985b076036f09c2fd5d490883fd0f79fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e258f2985b076036f09c2fd5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 15:39:31 2017 +0300 d3drm: Implement appdata property for the rest of objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 14 +++++++---- dlls/d3drm/face.c | 46 ++++++++++++++++++++++--------------- dlls/d3drm/frame.c | 38 ++++++++++++++++++++---------- dlls/d3drm/light.c | 14 +++++++---- dlls/d3drm/material.c | 14 +++++++---- dlls/d3drm/meshbuilder.c | 60 ++++++++++++++++++++++++++++++------------------ 6 files changed, 122 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e258f2985b076036f09c…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017