June 2017 - Wine-commits - list.winehq.org

Alexandre Julliard : Release 2.11.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 4005e6e659107c29f93e7a35a3bb933b22416598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4005e6e659107c29f93e7a35a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:05:30 2017 +0200 Release 2.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 668 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 289 insertions(+), 400 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4005e6e659107c29f93e7…

1 0

Tag wine-2.11 : Alexandre Julliard : Release 2.11
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: refs/tags/wine-2.11 Tag: c21b7a342d6208b7bc109366206ff63c5d5e2278 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c21b7a342d6208b7bc109366206f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 20:05:30 2017 +0200 Release 2.11

1 0

Alexandre Julliard : wineandroid: Implement wglMakeContextCurrentARB.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: f5a512498b0486ce65ed82c0349b3029d16e63e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a512498b0486ce65ed82c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:19:05 2017 +0200 wineandroid: Implement wglMakeContextCurrentARB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index e55b253..c3d4e57 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -331,6 +331,51 @@ static struct wgl_context *android_wglCreateContextAttribsARB( HDC hdc, struct w } /*********************************************************************** + * android_wglMakeContextCurrentARB + */ +static BOOL android_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context *ctx ) +{ + BOOL ret = FALSE; + struct gl_drawable *draw_gl, *read_gl = NULL; + EGLSurface draw_surface, read_surface; + HWND draw_hwnd; + + TRACE( "%p %p %p\n", draw_hdc, read_hdc, ctx ); + + if (!ctx) + { + p_eglMakeCurrent( display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT ); + NtCurrentTeb()->glContext = NULL; + return TRUE; + } + + draw_hwnd = WindowFromDC( draw_hdc ); + if ((draw_gl = get_gl_drawable( draw_hwnd, draw_hdc ))) + { + read_gl = get_gl_drawable( WindowFromDC( read_hdc ), read_hdc ); + draw_surface = draw_gl->surface ? draw_gl->surface : draw_gl->pbuffer; + read_surface = read_gl->surface ? read_gl->surface : read_gl->pbuffer; + TRACE( "%p/%p context %p surface %p/%p\n", + draw_hdc, read_hdc, ctx->context, draw_surface, read_surface ); + ret = p_eglMakeCurrent( display, draw_surface, read_surface, ctx->context ); + if (ret) + { + ctx->surface = draw_gl->surface; + ctx->hwnd = draw_hwnd; + ctx->refresh = FALSE; + NtCurrentTeb()->glContext = ctx; + goto done; + } + } + SetLastError( ERROR_INVALID_HANDLE ); + +done: + release_gl_drawable( read_gl ); + release_gl_drawable( draw_gl ); + return ret; +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -556,6 +601,10 @@ static void init_extensions(void) register_extension("WGL_ARB_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringARB = android_wglGetExtensionsStringARB; + register_extension("WGL_ARB_make_current_read"); + egl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ + egl_funcs.ext.p_wglMakeContextCurrentARB = android_wglMakeContextCurrentARB; + register_extension("WGL_EXT_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringEXT = android_wglGetExtensionsStringEXT;

1 0

Alexandre Julliard : wineandroid: Implement wglCreateContextAttribsARB.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: a3eda7257cc2812d7e3f6f4b0188d5d084d6b767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3eda7257cc2812d7e3f6f4b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:18:55 2017 +0200 wineandroid: Implement wglCreateContextAttribsARB. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index 910652b..e55b253 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -290,6 +290,47 @@ static const char *android_wglGetExtensionsStringEXT(void) } /*********************************************************************** + * android_wglCreateContextAttribsARB + */ +static struct wgl_context *android_wglCreateContextAttribsARB( HDC hdc, struct wgl_context *share, + const int *attribs ) +{ + int count = 0, egl_attribs[3]; + BOOL opengl_es = FALSE; + + while (attribs && *attribs && count < 2) + { + switch (*attribs) + { + case WGL_CONTEXT_PROFILE_MASK_ARB: + if (attribs[1] == WGL_CONTEXT_ES2_PROFILE_BIT_EXT) + opengl_es = TRUE; + break; + case WGL_CONTEXT_MAJOR_VERSION_ARB: + egl_attribs[count++] = EGL_CONTEXT_CLIENT_VERSION; + egl_attribs[count++] = attribs[1]; + break; + default: + FIXME("Unhandled attributes: %#x %#x\n", attribs[0], attribs[1]); + } + attribs += 2; + } + if (!opengl_es) + { + WARN("Requested creation of an OpenGL (non ES) context, that's not supported.\n"); + return NULL; + } + if (!count) /* FIXME: force version if not specified */ + { + egl_attribs[count++] = EGL_CONTEXT_CLIENT_VERSION; + egl_attribs[count++] = egl_client_version; + } + egl_attribs[count] = EGL_NONE; + + return create_context( hdc, share, egl_attribs ); +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -508,6 +549,10 @@ static void init_extensions(void) { void *ptr; + register_extension("WGL_ARB_create_context"); + register_extension("WGL_ARB_create_context_profile"); + egl_funcs.ext.p_wglCreateContextAttribsARB = android_wglCreateContextAttribsARB; + register_extension("WGL_ARB_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringARB = android_wglGetExtensionsStringARB;

1 0

Alexandre Julliard : wineandroid: Implement wglSwapIntervalEXT.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 75cb584e28af55fadd13c6cbf2ed8e38e92aa4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cb584e28af55fadd13c6cbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 23 09:19:15 2017 +0200 wineandroid: Implement wglSwapIntervalEXT. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/opengl.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index c3d4e57..ec26000 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -97,6 +97,7 @@ static void *opengl_handle; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static EGLDisplay display; +static int swap_interval; static char wgl_extensions[4096]; static struct opengl_funcs egl_funcs; @@ -376,6 +377,39 @@ done: } /*********************************************************************** + * android_wglSwapIntervalEXT + */ +static BOOL android_wglSwapIntervalEXT( int interval ) +{ + BOOL ret = TRUE; + + TRACE("(%d)\n", interval); + + if (interval < 0) + { + SetLastError(ERROR_INVALID_DATA); + return FALSE; + } + + ret = p_eglSwapInterval( display, interval ); + + if (ret) + swap_interval = interval; + else + SetLastError( ERROR_DC_NOT_FOUND ); + + return ret; +} + +/*********************************************************************** + * android_wglGetSwapIntervalEXT + */ +static int android_wglGetSwapIntervalEXT(void) +{ + return swap_interval; +} + +/*********************************************************************** * android_wglSetPixelFormatWINE */ static BOOL android_wglSetPixelFormatWINE( HDC hdc, int format ) @@ -608,6 +642,10 @@ static void init_extensions(void) register_extension("WGL_EXT_extensions_string"); egl_funcs.ext.p_wglGetExtensionsStringEXT = android_wglGetExtensionsStringEXT; + register_extension("WGL_EXT_swap_control"); + egl_funcs.ext.p_wglSwapIntervalEXT = android_wglSwapIntervalEXT; + egl_funcs.ext.p_wglGetSwapIntervalEXT = android_wglGetSwapIntervalEXT; + register_extension("WGL_EXT_framebuffer_sRGB"); /* In WineD3D we need the ability to set the pixel format more than once (e.g. after a device reset).

1 0

Andrey Gusev : api-ms-win-core-crt-l1-1-0: Add dll.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 001e4ffe356a25fc964d8e737fa72ed37d53fadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=001e4ffe356a25fc964d8e737… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 22 16:32:56 2017 +0300 api-ms-win-core-crt-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/api-ms-win-core-crt-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-crt-l1-1-0.spec | 98 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 103 insertions(+) diff --git a/configure b/configure index c1e3c2a..512862b 100755 --- a/configure +++ b/configure @@ -889,6 +889,7 @@ enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 +enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 @@ -17888,6 +17889,7 @@ wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 +wine_fn_config_dll api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 diff --git a/configure.ac b/configure.ac index 687d546..401ec62 100644 --- a/configure.ac +++ b/configure.ac @@ -2725,6 +2725,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-core-crt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) diff --git a/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in new file mode 100644 index 0000000..e0b0fd6 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-crt-l1-1-0.dll diff --git a/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec b/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec new file mode 100644 index 0000000..177a541 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l1-1-0/api-ms-win-core-crt-l1-1-0.spec @@ -0,0 +1,98 @@ +@ cdecl __isascii(long) msvcrt.__isascii +@ cdecl -ret64 _atoi64(str) msvcrt._atoi64 +@ cdecl _errno() msvcrt._errno +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) msvcrt._except_handler4_common +@ stub _fltused +@ cdecl -arch=i386 -ret64 _ftol() msvcrt._ftol +@ cdecl -arch=i386 -ret64 _ftol2() msvcrt._ftol2 +@ cdecl -arch=i386 -ret64 _ftol2_sse() msvcrt._ftol2_sse +@ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) msvcrt._local_unwind4 +@ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s +@ varargs _snprintf_s(ptr long long str) msvcrt._snprintf_s +@ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s +@ cdecl _stricmp(str str) msvcrt._stricmp +@ cdecl _strlwr_s(ptr long) msvcrt._strlwr_s +@ cdecl _strnicmp(str str long) msvcrt._strnicmp +@ cdecl _strupr_s(str long) msvcrt._strupr_s +@ cdecl _ui64tow_s(int64 ptr long long) msvcrt._ui64tow_s +@ cdecl _ultow(long ptr long) msvcrt._ultow +@ cdecl _ultow_s(long ptr long long) msvcrt._ultow_s +@ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp +@ cdecl _wcslwr_s(wstr long) msvcrt._wcslwr_s +@ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl _wcsupr_s(wstr long) msvcrt._wcsupr_s +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s +@ cdecl _wtoi(wstr) msvcrt._wtoi +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl _wtol(wstr) msvcrt._wtol +@ cdecl atoi(str) msvcrt.atoi +@ cdecl atol(str) msvcrt.atol +@ cdecl isalnum(long) msvcrt.isalnum +@ cdecl isdigit(long) msvcrt.isdigit +@ cdecl isgraph(long) msvcrt.isgraph +@ cdecl islower(long) msvcrt.islower +@ cdecl isprint(long) msvcrt.isprint +@ cdecl isspace(long) msvcrt.isspace +@ cdecl isupper(long) msvcrt.isupper +@ cdecl iswalnum(long) msvcrt.iswalnum +@ cdecl iswascii(long) msvcrt.iswascii +@ cdecl iswctype(long long) msvcrt.iswctype +@ cdecl iswdigit(long) msvcrt.iswdigit +@ cdecl iswgraph(long) msvcrt.iswgraph +@ cdecl iswprint(long) msvcrt.iswprint +@ cdecl iswspace(long) msvcrt.iswspace +@ cdecl memcmp(ptr ptr long) msvcrt.memcmp +@ cdecl memcpy(ptr ptr long) msvcrt.memcpy +@ cdecl memcpy_s(ptr long ptr long) msvcrt.memcpy_s +@ cdecl memmove(ptr ptr long) msvcrt.memmove +@ cdecl memmove_s(ptr long ptr long) msvcrt.memmove_s +@ cdecl memset(ptr long long) msvcrt.memset +@ cdecl qsort_s(ptr long long ptr ptr) msvcrt.qsort_s +@ varargs sprintf_s(ptr long str) msvcrt.sprintf_s +@ varargs sscanf_s(str str) msvcrt.sscanf_s +@ cdecl strcat_s(str long str) msvcrt.strcat_s +@ cdecl strchr(str long) msvcrt.strchr +@ cdecl strcmp(str str) msvcrt.strcmp +@ cdecl strcpy_s(ptr long str) msvcrt.strcpy_s +@ cdecl strcspn(str str) msvcrt.strcspn +@ cdecl strlen(str) msvcrt.strlen +@ cdecl strncat_s(str long str long) msvcrt.strncat_s +@ cdecl strncmp(str str long) msvcrt.strncmp +@ cdecl strncpy_s(ptr long str long) msvcrt.strncpy_s +@ cdecl strnlen(str long) msvcrt.strnlen +@ cdecl strpbrk(str str) msvcrt.strpbrk +@ cdecl strrchr(str long) msvcrt.strrchr +@ cdecl strstr(str str) msvcrt.strstr +@ cdecl strtok_s(ptr str ptr) msvcrt.strtok_s +@ cdecl strtol(str ptr long) msvcrt.strtol +@ cdecl strtoul(str ptr long) msvcrt.strtoul +@ varargs swprintf_s(ptr long wstr) msvcrt.swprintf_s +@ cdecl tolower(long) msvcrt.tolower +@ cdecl toupper(long) msvcrt.toupper +@ cdecl towlower(long) msvcrt.towlower +@ cdecl towupper(long) msvcrt.towupper +@ cdecl vsprintf_s(ptr long str ptr) msvcrt.vsprintf_s +@ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s +@ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s +@ cdecl wcschr(wstr long) msvcrt.wcschr +@ cdecl wcscmp(wstr wstr) msvcrt.wcscmp +@ cdecl wcscpy_s(ptr long wstr) msvcrt.wcscpy_s +@ cdecl wcscspn(wstr wstr) msvcrt.wcscspn +@ cdecl wcslen(wstr) msvcrt.wcslen +@ cdecl wcsncat_s(wstr long wstr long) msvcrt.wcsncat_s +@ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp +@ cdecl wcsncpy_s(ptr long wstr long) msvcrt.wcsncpy_s +@ cdecl wcsnlen(wstr long) msvcrt.wcsnlen +@ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk +@ cdecl wcsrchr(wstr long) msvcrt.wcsrchr +@ cdecl wcsstr(wstr wstr) msvcrt.wcsstr +@ cdecl wcstok_s(ptr wstr ptr) msvcrt.wcstok_s +@ cdecl wcstol(wstr ptr long) msvcrt.wcstol +@ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul diff --git a/tools/make_specfiles b/tools/make_specfiles index ca620da..0c8ac00 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -331,6 +331,7 @@ my @dll_groups = "api-ms-win-core-apiquery-l1-1-0", "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", + "api-ms-win-core-crt-l1-1-0", ], [ "gdi32",

1 0

Andrey Gusev : api-ms-win-core-crt-l2-1-0: Add dll.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 4dc61a2ca6b77294c082d876b689d9a54cd18d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc61a2ca6b77294c082d876b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 22 16:32:57 2017 +0300 api-ms-win-core-crt-l2-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-crt-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-crt-l2-1-0.spec | 18 ++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 23 insertions(+) diff --git a/configure b/configure index 512862b..114f302 100755 --- a/configure +++ b/configure @@ -890,6 +890,7 @@ enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_console_l1_1_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 +enable_api_ms_win_core_crt_l2_1_0 enable_api_ms_win_core_datetime_l1_1_0 enable_api_ms_win_core_datetime_l1_1_1 enable_api_ms_win_core_debug_l1_1_0 @@ -17890,6 +17891,7 @@ wine_fn_config_dll api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 wine_fn_config_dll api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_dll api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 +wine_fn_config_dll api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-0 enable_api_ms_win_core_datetime_l1_1_0 wine_fn_config_dll api-ms-win-core-datetime-l1-1-1 enable_api_ms_win_core_datetime_l1_1_1 wine_fn_config_dll api-ms-win-core-debug-l1-1-0 enable_api_ms_win_core_debug_l1_1_0 diff --git a/configure.ac b/configure.ac index 401ec62..06ab763 100644 --- a/configure.ac +++ b/configure.ac @@ -2726,6 +2726,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-crt-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-crt-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-0) diff --git a/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in b/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in new file mode 100644 index 0000000..2ac004c --- /dev/null +++ b/dlls/api-ms-win-core-crt-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-crt-l2-1-0.dll diff --git a/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec new file mode 100644 index 0000000..69f2629 --- /dev/null +++ b/dlls/api-ms-win-core-crt-l2-1-0/api-ms-win-core-crt-l2-1-0.spec @@ -0,0 +1,18 @@ +@ stub __dllonexit3 +@ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs +@ cdecl _amsg_exit(long) msvcrt._amsg_exit +@ cdecl _c_exit() msvcrt._c_exit +@ cdecl _cexit() msvcrt._cexit +@ cdecl _exit(long) msvcrt._exit +@ cdecl _initterm(ptr ptr) msvcrt._initterm +@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e +@ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter +@ cdecl _onexit(ptr) msvcrt._onexit +@ cdecl _purecall() msvcrt._purecall +@ cdecl _time64(ptr) msvcrt._time64 +@ cdecl -private atexit(ptr) msvcrt.atexit +@ cdecl exit(long) msvcrt.exit +@ stub hgets +@ stub hwprintf +@ cdecl time(ptr) msvcrt.time +@ varargs wprintf(wstr) msvcrt.wprintf diff --git a/tools/make_specfiles b/tools/make_specfiles index 0c8ac00..7feb1b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -332,6 +332,7 @@ my @dll_groups = "api-ms-win-core-rtlsupport-l1-1-0", "api-ms-win-core-rtlsupport-l1-2-0", "api-ms-win-core-crt-l1-1-0", + "api-ms-win-core-crt-l2-1-0", ], [ "gdi32",

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderAccelerator in IWMReader.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 94af0276c142b6d9afe2fa37afd78eda00551b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94af0276c142b6d9afe2fa37a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 23 04:12:11 2017 +0000 wmvcore: Support IWMReaderAccelerator in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index a190013..4d3a6d7 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -121,7 +121,7 @@ static void test_wmreader_interfaces(void) todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderAccelerator, (void **)&accel); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index eb5e9e9..4023152 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -66,6 +66,7 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) typedef struct { IWMReader IWMReader_iface; IWMReaderAdvanced6 IWMReaderAdvanced6_iface; + IWMReaderAccelerator IWMReaderAccelerator_iface; LONG ref; } WMReader; @@ -102,6 +103,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderAdvanced6)) { TRACE("(%p)->(IID_IWMReaderAdvanced6 %p)\n", This, ppv); *ppv = &This->IWMReaderAdvanced6_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderAccelerator)) { + TRACE("(%p)->(IID_IWMReaderAccelerator %p)\n", This, ppv); + *ppv = &This->IWMReaderAccelerator_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -656,6 +660,55 @@ static const IWMReaderAdvanced6Vtbl WMReaderAdvanced6Vtbl = { WMReaderAdvanced6_SetProtextStreamSamples }; +static inline WMReader *impl_from_IWMReaderAccelerator(IWMReaderAccelerator *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderAccelerator_iface); +} + +static HRESULT WINAPI reader_accl_QueryInterface(IWMReaderAccelerator *iface, REFIID riid, void **object) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, object); +} + +static ULONG WINAPI reader_accl_AddRef(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI reader_accl_Release(IWMReaderAccelerator *iface) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI reader_accl_GetCodecInterface(IWMReaderAccelerator *iface, DWORD output, REFIID riid, void **codec) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %s, %p\n", This, output, debugstr_guid(riid), codec); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reader_accl_Notify(IWMReaderAccelerator *iface, DWORD output, WM_MEDIA_TYPE *subtype) +{ + WMReader *This = impl_from_IWMReaderAccelerator(iface); + + FIXME("%p, %d, %p\n", This, output, subtype); + + return E_NOTIMPL; +} + +static const IWMReaderAcceleratorVtbl WMReaderAcceleratorVtbl = { + reader_accl_QueryInterface, + reader_accl_AddRef, + reader_accl_Release, + reader_accl_GetCodecInterface, + reader_accl_Notify +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -668,6 +721,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReader_iface.lpVtbl = &WMReaderVtbl; reader->IWMReaderAdvanced6_iface.lpVtbl = &WMReaderAdvanced6Vtbl; + reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Daniel Lehman : opengl32/tests: Add tests for ChoosePixelFormat.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 53ac519915e80b8d07cbb509e9741cd1695a7bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ac519915e80b8d07cbb509e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 21 16:00:04 2017 -0700 opengl32/tests: Add tests for ChoosePixelFormat. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 0593465..3366cb2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -232,6 +232,101 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } +static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) +{ + int pf; + HDC hdc; + HWND hwnd; + + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); + if (!hwnd) + return 0; + + hdc = GetDC( hwnd ); + pf = ChoosePixelFormat( hdc, pfd ); + ReleaseDC( hwnd, hdc ); + DestroyWindow( hwnd ); + + return pf; +} + +static void test_choosepixelformat(void) +{ + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_TYPE_RGBA, + 0, /* color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 0, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + todo_wine ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + + pfd.cColorBits = 32; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cColorBits = 0; + + pfd.cAlphaBits = 8; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cAlphaBits = 0; + + pfd.cStencilBits = 8; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cStencilBits = 0; + + pfd.cAuxBuffers = 1; + ok( test_pfd(&pfd), "Simple pfd failed\n" ); + pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + pfd.dwFlags |= PFD_STEREO_DONTCARE; + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; + ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.cAuxBuffers = 0; +} + static void test_setpixelformat(HDC winhdc) { int res = 0; @@ -1689,6 +1784,7 @@ START_TEST(opengl) return; } + test_choosepixelformat(); test_setpixelformat(hdc); test_destroy(hdc); test_sharelists(hdc);

1 0

Daniel Lehman : opengl32: Don' t fail with both PFD_DOUBLEBUFFER_DONTCARE and PFD_STEREO_DONTCARE.
by Alexandre Julliard 23 Jun '17

23 Jun '17

Module: wine Branch: master Commit: 079463828c35400e4761642dfa02c99d59761f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079463828c35400e4761642df… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 21 16:00:22 2017 -0700 opengl32: Don't fail with both PFD_DOUBLEBUFFER_DONTCARE and PFD_STEREO_DONTCARE. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3366cb2..5d3a245 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -277,7 +277,7 @@ static void test_choosepixelformat(void) pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - todo_wine ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 73be013..dafafb6 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -517,6 +517,8 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (bestDBuffer != -1 && (format.dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) continue; } + else if (!best_format) + goto found; /* Stereo, see the comments above. */ if (!(ppfd->dwFlags & PFD_STEREO_DONTCARE)) @@ -527,6 +529,8 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) if (bestStereo != -1 && (format.dwFlags & PFD_STEREO) != bestStereo) continue; } + else if (!best_format) + goto found; /* Below we will do a number of checks to select the 'best' pixelformat. * We assume the precedence cColorBits > cAlphaBits > cDepthBits > cStencilBits -> cAuxBuffers.

1 0