April 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 4.6
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: website Branch: master Commit: d79de0dd2e6205d6b521fdc44f2909bc224887e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=d79de0dd2e6205d6b521f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 20:12:02 2019 +0200 Wine release 4.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019041201.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/news/en/2019041201.xml b/news/en/2019041201.xml new file mode 100644 index 0000000..788afba --- /dev/null +++ b/news/en/2019041201.xml @@ -0,0 +1,20 @@ +<news> +<date>April 12, 2019</date> +<title>Wine 4.6 Released</title> +<body> + The Wine development release 4.6 is now available. + <a href="{$root}/announce/4.6">What's new</a> in this release: +<ul> + <li>Beginnings of a Vulkan backend for WineD3D.</li> + <li>Support for loading Mono libraries from a shared location.</li> + <li>Libwine.dll no longer needed when using Wine DLLs on Windows.</li> + <li>Regression tests compiled directly to PE format.</li> + <li>Support for the Split Button Common Control.</li> + <li>Complex structs support in the typelib marshaller.</li> + <li>Video capture ported to Video4Linux version 2.</li> + <li>Initial version of the Debug Engine DLL.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : wmc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: cd372015174205555eb6819b3828c39928795574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd372015174205555eb6819b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:14:59 2019 +0200 wmc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- tools/wmc/lang.h | 6 ++++-- tools/wmc/mcl.c | 9 ++------- tools/wmc/mcy.y | 4 ++-- tools/wmc/po.c | 6 +++--- tools/wmc/write.c | 29 +++++------------------------ 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index 07022f7..99a27cf 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -168,7 +168,7 @@ void show_languages(void) printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf("-------+--------+--------+--------------+---------\n"); for(i = 0; i < ARRAY_SIZE(languages); i++) - printf("0x%04x | %5d | %5d | %-12s | %s\n", + printf("0x%04x | %5d | %5d | %-12s | %s\n", languages[i].id, languages[i].doscp, languages[i].wincp, @@ -187,6 +187,41 @@ const language_t *find_language(unsigned id) sizeof(languages[0]), langcmp); } +#ifdef _WIN32 + +static BOOL CALLBACK proc( char *cp ) +{ + CPINFOEXA info; + GetCPInfoExA( atoi(cp), 0, &info ); + printf("%-5s %s\n", cp, info.CodePageName ); + return TRUE; +} + +void show_codepages(void) +{ + printf("Codepages:\n"); + EnumSystemCodePagesA( proc, 0 ); +} + +int is_valid_codepage(int id) +{ + return IsValidCodePage( id ); +} + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + return WideCharToMultiByte( codepage, flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#else /* _WIN32 */ + +#include "wine/unicode.h" + void show_codepages(void) { unsigned i; @@ -198,7 +233,21 @@ void show_codepages(void) } } -const union cptable *find_codepage(int id) +int is_valid_codepage(int id) { - return wine_cp_get_table(id); + return id == CP_UTF8 || wine_cp_get_table(id); } + +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_mbstowcs( flags, src, srclen, dst, dstlen ); + return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); +} + +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ) +{ + if (codepage == CP_UTF8) return wine_utf8_wcstombs( flags, src, srclen, dst, dstlen ); + return wine_cp_wcstombs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen, NULL, NULL ); +} + +#endif /* _WIN32 */ diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index 5a11c5b..660995b 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -21,7 +21,7 @@ #ifndef __WMC_LANG_H #define __WMC_LANG_H -#include "wine/unicode.h" +#include "winnls.h" typedef struct language { unsigned id; @@ -34,6 +34,8 @@ typedef struct language { void show_languages(void); const language_t *find_language(unsigned id); void show_codepages(void); -const union cptable *find_codepage(int id); +int is_valid_codepage(int id); +int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); +int wmc_wcstombs( int codepage, int flags, const WCHAR *src, int srclen, char *dst, int dstlen ); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 0a57e2b..68d2444 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -149,13 +149,11 @@ static int isisochar(int ch) } static int codepage; -static const union cptable *codepage_def; void set_codepage(int cp) { codepage = cp; - codepage_def = find_codepage(codepage); - if(!codepage_def && codepage != CP_UTF8) + if (!is_valid_codepage( cp )) xyyerror("Codepage %d not found; cannot process\n", codepage); } @@ -200,10 +198,7 @@ try_again: xyyerror(err_fatalread); else if(!cptr) return 0; - if (codepage_def) - n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); - else - n = wine_utf8_mbstowcs(0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + n = wmc_mbstowcs(codepage, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 54403d5..f1d3458 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -254,9 +254,9 @@ cmap : clan '=' tNUMBER ':' tNUMBER { static const char err_nocp[] = "Codepage %d not builtin; cannot convert\n"; if(find_cpxlat($1)) xyyerror("Codepage translation already defined for language 0x%x\n", $1); - if($3 && $3 != CP_UTF8 && !find_codepage($3)) + if($3 && !is_valid_codepage($3)) xyyerror(err_nocp, $3); - if($5 && $5 != CP_UTF8 && !find_codepage($5)) + if($5 && !is_valid_codepage($5)) xyyerror(err_nocp, $5); add_cpxlat($1, $3, $5); } diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6986bc9..8a8064a 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -405,7 +405,7 @@ static char *get_message_context( char **msgid ) static char *convert_string_utf8( const lanmsg_t *msg ) { char *buffer = xmalloc( msg->len * 4 + 1 ); - int len = wine_utf8_wcstombs( 0, msg->msg, msg->len, buffer, msg->len * 4 ); + int len = wmc_wcstombs( CP_UTF8, 0, msg->msg, msg->len, buffer, msg->len * 4 ); buffer[len] = 0; return buffer; } @@ -656,9 +656,9 @@ static lanmsg_t *translate_string( lanmsg_t *str, int lang, int *found ) new->cp = 0; /* FIXME */ new->file = str->file; new->line = str->line; - new->len = wine_utf8_mbstowcs( 0, transl, strlen(transl) + 1, NULL, 0 ); + new->len = wmc_mbstowcs( CP_UTF8, 0, transl, strlen(transl) + 1, NULL, 0 ); new->msg = xmalloc( new->len * sizeof(WCHAR) ); - res = wine_utf8_mbstowcs( MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); + res = wmc_mbstowcs( CP_UTF8, MB_ERR_INVALID_CHARS, transl, strlen(transl) + 1, new->msg, new->len ); if (res == -2) error( "Invalid utf-8 character in string '%s'\n", transl ); free( buffer ); diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 19cd5b3..59cb869 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -98,17 +98,11 @@ static char *dup_u2c(int cp, const WCHAR *uc) { int len; char *cptr; - const union cptable *cpdef = find_codepage(cp); - if(cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); + if (!cp) cp = CP_UTF8; + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, NULL, 0); cptr = xmalloc(len); - if (cpdef) - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL); - else - len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, cptr, len); + len = wmc_wcstombs(cp, 0, uc, unistrlen(uc)+1, cptr, len); if (len < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; @@ -385,21 +379,8 @@ static char *make_string(WCHAR *uc, int len, int codepage) else { char *tmp, *cc; - int mlen; - const union cptable *cpdef = find_codepage(codepage); - - if (cpdef) - mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); - else - mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); - cc = tmp = xmalloc(mlen); - if (cpdef) { - if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } else { - if((i = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, tmp, mlen)) < 0) - internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i); - } + + cc = tmp = dup_u2c(codepage, uc); *cptr++ = ' '; *cptr++ = '"'; for(i = b = 0; i < len; i++, cc++)

1 0

Alexandre Julliard : wrc: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: ab6e4c8b735aa28112fbc6ec876d8881ef6498f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6e4c8b735aa28112fbc6ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 12:59:59 2019 +0200 wrc: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.l | 2 +- tools/wrc/parser.y | 46 ++++++++++++++++++++---------------- tools/wrc/po.c | 37 +++++++++++++---------------- tools/wrc/utils.c | 67 ++++++++++++++++++++++++++++++++++++++-------------- tools/wrc/utils.h | 1 + tools/wrc/wrc.h | 1 - tools/wrc/wrctypes.h | 3 --- 7 files changed, 94 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab6e4c8b735aa28112fb…

1 0

Alexandre Julliard : sfnt2fon: Avoid using wine/unicode.h on Windows.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 3c29cc446bfbe69dd17dcab2061677f5a63af741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c29cc446bfbe69dd17dcab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 13:29:49 2019 +0200 sfnt2fon: Avoid using wine/unicode.h on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 64 ++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index 25f0763..9dfc178 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -41,7 +41,8 @@ #include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TAGS_H -#include "wine/unicode.h" +#include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "basetsd.h" @@ -340,15 +341,40 @@ static int lookup_charset(int enc) return OEM_CHARSET; } -static int get_char(const union cptable *cptable, int enc, int index) +#ifdef _WIN32 + +static void get_char_table(int enc, WCHAR tableW[0x100]) { - /* Korean has the Won sign in place of '\\' */ - if(enc == 949 && index == '\\') - return 0x20a9; + int i; + char tableA[0x100]; - return cptable->sbcs.cp2uni[index]; + if (!GetCPInfo( enc, &info )) error("Can't find codepage %d\n", enc); + if (info.MaxCharSize > 1) enc = 1252; + + for (i = 0; i < 0x100; i++) tableA[i] = i; + MultiByteToWideChar( enc, 0, tableA, 0x100, tableW, 0x100 ); } +#else /* _WIN32 */ + +#include "wine/unicode.h" + +static void get_char_table(int enc, WCHAR tableW[0x100]) +{ + int i; + char tableA[0x100]; + const union cptable *cptable = wine_cp_get_table(enc); + + if (!cptable) error("Can't find codepage %d\n", enc); + /* for double byte charsets we actually want to use cp1252 */ + if (cptable->info.char_size != 1) cptable = wine_cp_get_table(1252); + + for (i = 0; i < 0x100; i++) tableA[i] = i; + wine_cp_mbstowcs( cptable, 0, tableA, 0x100, tableW, 0x100 ); +} + +#endif /* _WIN32 */ + static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int dpi, unsigned char def_char, int avg_width ) { @@ -359,7 +385,6 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int i, x, y, x_off, x_end, first_char; FT_UInt gi; int num_names; - const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; FT_ULong needed; @@ -368,22 +393,17 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, int num_sizes; struct fontinfo *info; size_t data_pos; + WCHAR table[0x100]; if (FT_New_Face(ft_library, face_name, 0, &face)) error( "Cannot open face %s\n", face_name ); if (FT_Set_Pixel_Sizes(face, ppem, ppem)) error( "cannot set face size to %u\n", ppem ); - cptable = wine_cp_get_table(enc); - if(!cptable) - error("Can't find codepage %d\n", enc); + assert( face->size->metrics.y_ppem == ppem ); - if(cptable->info.char_size != 1) { - /* for double byte charsets we actually want to use cp1252 */ - cptable = wine_cp_get_table(1252); - if(!cptable) - error("Can't find codepage 1252\n"); - } + get_char_table( enc, table ); - assert( face->size->metrics.y_ppem == ppem ); + /* Korean has the Won sign in place of '\\' */ + if (enc == 949) table['\\'] = 0x20a9; needed = 0; if (FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) @@ -462,12 +482,11 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2); for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - gi = FT_Get_Char_Index(face, c); + gi = FT_Get_Char_Index(face, table[i]); if(gi == 0 && !option_quiet) fprintf(stderr, "warning: %s %u: missing glyph for char %04x\n", - face->family_name, ppem, cptable->sbcs.cp2uni[i]); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + face->family_name, ppem, table[i]); + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { fprintf(stderr, "error loading char %d - bad news!\n", i); continue; } @@ -546,8 +565,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, data_pos = 0; for(i = first_char; i < 0x100; i++) { - int c = get_char(cptable, enc, i); - if(FT_Load_Char(face, c, FT_LOAD_DEFAULT)) { + if(FT_Load_Char(face, table[i], FT_LOAD_DEFAULT)) { continue; } assert(info->dfCharTable[i].width == face->glyph->metrics.horiAdvance >> 6);

1 0

Alexandre Julliard : makefiles: Stop installing wine/unicode.h.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 0ffb1535517301d28c7c004eac639a9a0cc26c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ffb1535517301d28c7c004e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 15:30:45 2019 +0200 makefiles: Stop installing wine/unicode.h. Third party code should be using exported C runtime APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 - tools/make_makefiles | 1 - 2 files changed, 2 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index c478c34..74198af 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -683,7 +683,6 @@ SOURCES = \ wine/itss.idl \ wine/library.h \ wine/svcctl.idl \ - wine/unicode.h \ wine/winedxgi.idl \ winerror.h \ winevt.h \ diff --git a/tools/make_makefiles b/tools/make_makefiles index 3936310..111bc8f 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -42,7 +42,6 @@ my %exported_wine_headers = ( "wine/debug.h" => 1, "wine/exception.h" => 1, "wine/library.h" => 1, - "wine/unicode.h" => 1, "wine/itss.idl" => 1, "wine/svcctl.idl" => 1, );

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_init_gdi().
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: b599e8e3a04cc80bd09647fd784eac70dc2e411d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b599e8e3a04cc80bd09647fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:44 2019 +0430 wined3d: Get rid of wined3d_device_init_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 13 +++---- dlls/wined3d/device.c | 87 ++++++++++++++++------------------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 34 insertions(+), 68 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8467fbf..f4aabf4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -569,6 +569,9 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, TRACE("ddraw %p.\n", ddraw); + if (ddraw->flags & DDRAW_NO3D) + return wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); + if (!window || window == GetDesktopWindow()) { window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "Hidden D3D Window", @@ -594,8 +597,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ ddraw->flags |= DDRAW_D3D_INITIALIZED; - hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc))) { ddraw->flags &= ~DDRAW_D3D_INITIALIZED; return hr; @@ -638,12 +640,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win swapchain_desc.windowed = windowed; swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; - if (!(ddraw->flags & DDRAW_NO3D)) - hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc); - else - hr = wined3d_device_init_gdi(ddraw->wined3d_device, &swapchain_desc); - - if (FAILED(hr)) + if (FAILED(hr = ddraw_attach_d3d_device(ddraw, &swapchain_desc))) { ERR("Failed to create swapchain, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1d870c0..1424ed4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1079,8 +1079,6 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (device->wined3d->flags & WINED3D_NO3D) - return WINED3DERR_INVALIDCALL; memset(device->fb.render_targets, 0, sizeof(device->fb.render_targets)); @@ -1120,26 +1118,40 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, } device->swapchains[0] = swapchain; - if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) - goto err_out; - device_init_swapchain_state(device, swapchain); + if (device->wined3d->flags & WINED3D_NO3D) + { + if (!(device->blitter = wined3d_cpu_blitter_create())) + { + ERR("Failed to create CPU blitter.\n"); + heap_free(device->swapchains); + device->swapchain_count = 0; + goto err_out; + } + } + else + { + if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) + goto err_out; + device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; + device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); + TRACE("All defaults now set up.\n"); - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + /* Clear the screen */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); - device->d3d_initialized = TRUE; + device->d3d_initialized = TRUE; + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); + } - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); return WINED3D_OK; err_out: @@ -1153,47 +1165,6 @@ err_out: return hr; } -HRESULT CDECL wined3d_device_init_gdi(struct wined3d_device *device, - struct wined3d_swapchain_desc *swapchain_desc) -{ - struct wined3d_swapchain *swapchain = NULL; - HRESULT hr; - - TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); - - /* Setup the implicit swapchain */ - TRACE("Creating implicit swapchain\n"); - hr = device->device_parent->ops->create_swapchain(device->device_parent, - swapchain_desc, &swapchain); - if (FAILED(hr)) - { - WARN("Failed to create implicit swapchain\n"); - goto err_out; - } - - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Out of memory!\n"); - goto err_out; - } - device->swapchains[0] = swapchain; - - if (!(device->blitter = wined3d_cpu_blitter_create())) - { - ERR("Failed to create CPU blitter.\n"); - heap_free(device->swapchains); - device->swapchain_count = 0; - goto err_out; - } - - return WINED3D_OK; - -err_out: - wined3d_swapchain_decref(swapchain); - return hr; -} - static void device_free_sampler(struct wine_rb_entry *entry, void *context) { struct wined3d_sampler *sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 75b9fe1..1422c65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -121,7 +121,6 @@ @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) -@ cdecl wined3d_device_init_gdi(ptr ptr) @ cdecl wined3d_device_multiply_transform(ptr long ptr) @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 51fb7e6..e943e0d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,7 +2364,6 @@ struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wine struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); -HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Get rid of wined3d_device_uninit_gdi().
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 15d52fec683bf79c37b37b82498d127c09cf1ddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d52fec683bf79c37b37b82… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:45 2019 +0430 wined3d: Get rid of wined3d_device_uninit_gdi(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/device.c | 27 ++++++--------------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f4aabf4..cb7c12a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -400,7 +400,7 @@ static void ddraw_destroy_swapchain(struct ddraw *ddraw) } else { - wined3d_device_uninit_gdi(ddraw->wined3d_device); + wined3d_device_uninit_3d(ddraw->wined3d_device); } ddraw_set_swapchain_window(ddraw, NULL); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1424ed4..a0c44b5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1174,11 +1174,12 @@ static void device_free_sampler(struct wine_rb_entry *entry, void *context) HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) { + BOOL no3d = device->wined3d->flags & WINED3D_NO3D; unsigned int i; TRACE("device %p.\n", device); - if (!device->d3d_initialized) + if (!device->d3d_initialized && !no3d) return WINED3DERR_INVALIDCALL; wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); @@ -1192,7 +1193,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) wine_rb_clear(&device->samplers, device_free_sampler, NULL); - wined3d_device_delete_opengl_contexts(device); + if (no3d) + device->blitter->ops->blitter_destroy(device->blitter, NULL); + else + wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) { @@ -1239,25 +1243,6 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) return WINED3D_OK; } -HRESULT CDECL wined3d_device_uninit_gdi(struct wined3d_device *device) -{ - unsigned int i; - - device->blitter->ops->blitter_destroy(device->blitter, NULL); - - for (i = 0; i < device->swapchain_count; ++i) - { - TRACE("Releasing the implicit swapchain %u.\n", i); - if (wined3d_swapchain_decref(device->swapchains[i])) - FIXME("Something's still holding the implicit swapchain.\n"); - } - - heap_free(device->swapchains); - device->swapchains = NULL; - device->swapchain_count = 0; - return WINED3D_OK; -} - /* Enables thread safety in the wined3d device and its resources. Called by DirectDraw * from SetCooperativeLevel if DDSCL_MULTITHREADED is specified, and by d3d8/9 from * CreateDevice if D3DCREATE_MULTITHREADED is passed. diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1422c65..704e19d 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -189,7 +189,6 @@ @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_uninit_3d(ptr) -@ cdecl wined3d_device_uninit_gdi(ptr) @ cdecl wined3d_device_update_sub_resource(ptr ptr long ptr ptr long long long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e943e0d..8a29ef6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2481,7 +2481,6 @@ void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_setup_fullscreen_window(struct wined3d_device *device, HWND window, UINT w, UINT h); BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_uninit_3d(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_uninit_gdi(struct wined3d_device *device); void __cdecl wined3d_device_update_sub_resource(struct wined3d_device *device, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int depth_pitch, unsigned int flags);

1 0

Henri Verbeet : ddraw: Simplify ddraw_destroy_swapchain().
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: f485816d102e517bc092934348ec9cddf624696b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f485816d102e517bc0929343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:46 2019 +0430 ddraw: Simplify ddraw_destroy_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cb7c12a..b209772 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -365,44 +365,34 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) static void ddraw_destroy_swapchain(struct ddraw *ddraw) { + unsigned int i; + HRESULT hr; + TRACE("Destroying the swapchain.\n"); wined3d_swapchain_decref(ddraw->wined3d_swapchain); ddraw->wined3d_swapchain = NULL; - if (!(ddraw->flags & DDRAW_NO3D)) + for (i = 0; i < ddraw->numConvertedDecls; ++i) { - UINT i; + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + heap_free(ddraw->decls); + ddraw->numConvertedDecls = 0; - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - heap_free(ddraw->decls); - ddraw->numConvertedDecls = 0; + if (FAILED(hr = wined3d_device_uninit_3d(ddraw->wined3d_device))) + ERR("Failed to uninit 3D, hr %#x.\n", hr); - if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) - { - ERR("Failed to uninit 3D.\n"); - } - else - { - /* Free the d3d window if one was created. */ - if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) - { - TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - } - - ddraw->flags &= ~DDRAW_D3D_INITIALIZED; - } - else + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) { - wined3d_device_uninit_3d(ddraw->wined3d_device); + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; } + ddraw->flags &= ~DDRAW_D3D_INITIALIZED; + ddraw_set_swapchain_window(ddraw, NULL); TRACE("Swapchain destroyed.\n");

1 0

Henri Verbeet : wined3d: Explicitly create the implicit swapchain.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: b15685355c45c0fffb4f0dc5518c8c6ee0f595c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b15685355c45c0fffb4f0dc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:47 2019 +0430 wined3d: Explicitly create the implicit swapchain. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 28 ----------- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 59 +++++++++-------------- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 75 ++++++++++++------------------ dlls/ddraw/ddraw.c | 97 ++++++++++++++++---------------------- dlls/dxgi/device.c | 74 ++++++++++++++--------------- dlls/dxgi/dxgi_private.h | 1 + dlls/wined3d/device.c | 103 ++++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 21 ++++++++- dlls/wined3d/wined3d.spec | 2 - dlls/wined3d/wined3d_private.h | 3 ++ include/wine/wined3d.h | 5 +- include/wine/winedxgi.idl | 5 -- 14 files changed, 201 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b15685355c45c0fffb4f…

1 0

Henri Verbeet : dxgi: Slightly simplify d3d11_swapchain_init().
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 7d351e1168b4f41ca43e67f3b038abaecbefa6b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d351e1168b4f41ca43e67f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 12 17:38:48 2019 +0430 dxgi: Slightly simplify d3d11_swapchain_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 4 ++-- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index d6dd041..e3dc52b 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -474,7 +474,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_factory_create_swapchain(IWineDX return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc, FALSE))) + if (FAILED(hr = d3d11_swapchain_init(object, device, &wined3d_desc))) { WARN("Failed to initialise swapchain, hr %#x.\n", hr); heap_free(object); @@ -578,7 +578,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l return E_OUTOFMEMORY; } - if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc, TRUE))) + if (FAILED(hr = d3d11_swapchain_init(swapchain, device, &swapchain_desc))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); heap_free(swapchain); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 5c5775c..b6999c7 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -178,7 +178,7 @@ struct d3d11_swapchain }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 17f9a1e..53da208 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -779,16 +779,14 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc, BOOL implicit) + struct wined3d_swapchain_desc *desc) { HRESULT hr; - /* - * A reference to the implicit swapchain is held by the wined3d device. - * In order to avoid circular references we do not keep a reference - * to the device in the implicit swapchain. - */ - if (!implicit) + /* A reference to the implicit swapchain is held by the wined3d device. In + * order to avoid circular references we do not keep a reference to the + * device in the implicit swapchain. */ + if (!(desc->flags & WINED3D_SWAPCHAIN_IMPLICIT)) { if (desc->backbuffer_format == WINED3DFMT_UNKNOWN) return E_INVALIDARG;

1 0