November 2022 - Wine-Commits

Rémi Bernon : opengl32: Avoid using internal functions in wglUseFontBitmaps.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: c656fcf3098835dc93ed20e381e2f6a8599341a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c656fcf3098835dc93ed20e381e2f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:12:07 2022 +0200 opengl32: Avoid using internal functions in wglUseFontBitmaps. --- dlls/opengl32/wgl.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 7c8bbfa378f..d40e3b1c0ea 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1236,15 +1236,14 @@ BOOL WINAPI wglQueryPbufferARB( HPBUFFERARB handle, int attrib, int *value ) */ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD listBase, BOOL unicode ) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; GLYPHMETRICS gm; unsigned int glyph, size = 0; void *bitmap = NULL, *gl_bitmap = NULL; int org_alignment; BOOL ret = TRUE; - funcs->gl.p_glGetIntegerv(GL_UNPACK_ALIGNMENT, &org_alignment); - funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 4); + glGetIntegerv( GL_UNPACK_ALIGNMENT, &org_alignment ); + glPixelStorei( GL_UNPACK_ALIGNMENT, 4 ); for (glyph = first; glyph < first + count; glyph++) { unsigned int needed_size, height, width, width_int; @@ -1317,20 +1316,18 @@ static BOOL wglUseFontBitmaps_common( HDC hdc, DWORD first, DWORD count, DWORD l } } - funcs->gl.p_glNewList(listBase++, GL_COMPILE); + glNewList( listBase++, GL_COMPILE ); if (needed_size != 0) { - funcs->gl.p_glBitmap(gm.gmBlackBoxX, gm.gmBlackBoxY, - 0 - gm.gmptGlyphOrigin.x, (int) gm.gmBlackBoxY - gm.gmptGlyphOrigin.y, - gm.gmCellIncX, gm.gmCellIncY, - gl_bitmap); + glBitmap( gm.gmBlackBoxX, gm.gmBlackBoxY, 0 - gm.gmptGlyphOrigin.x, + (int)gm.gmBlackBoxY - gm.gmptGlyphOrigin.y, gm.gmCellIncX, gm.gmCellIncY, gl_bitmap ); } else { /* This is the case of 'empty' glyphs like the space character */ - funcs->gl.p_glBitmap(0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL); + glBitmap( 0, 0, 0, 0, gm.gmCellIncX, gm.gmCellIncY, NULL ); } - funcs->gl.p_glEndList(); + glEndList(); } - funcs->gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, org_alignment); + glPixelStorei( GL_UNPACK_ALIGNMENT, org_alignment ); HeapFree(GetProcessHeap(), 0, bitmap); HeapFree(GetProcessHeap(), 0, gl_bitmap); return ret;

1 0

Rémi Bernon : opengl32: Avoid using internal functions in wglUseFontOutlines.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: df74066f47f7c6a3092918f3e87183403b2e109b URL: https://gitlab.winehq.org/wine/wine/-/commit/df74066f47f7c6a3092918f3e87183… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 6 03:12:07 2022 +0200 opengl32: Avoid using internal functions in wglUseFontOutlines. --- dlls/opengl32/wgl.c | 78 +++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 57 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d40e3b1c0ea..987fa36ce2a 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1356,28 +1356,6 @@ static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) vertex[2] = 0.0; } -static void WINAPI tess_callback_vertex(GLvoid *vertex) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - GLdouble *dbl = vertex; - TRACE("%f, %f, %f\n", dbl[0], dbl[1], dbl[2]); - funcs->gl.p_glVertex3dv(vertex); -} - -static void WINAPI tess_callback_begin(GLenum which) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("%d\n", which); - funcs->gl.p_glBegin(which); -} - -static void WINAPI tess_callback_end(void) -{ - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - TRACE("\n"); - funcs->gl.p_glEnd(); -} - typedef struct _bezier_vector { GLdouble x; GLdouble y; @@ -1459,7 +1437,6 @@ static BOOL wglUseFontOutlines_common(HDC hdc, LPGLYPHMETRICSFLOAT lpgmf, BOOL unicode) { - const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; UINT glyph; GLUtesselator *tess = NULL; LOGFONTW lf; @@ -1481,9 +1458,9 @@ static BOOL wglUseFontOutlines_common(HDC hdc, ERR("glu32 is required for this function but isn't available\n"); return FALSE; } - gluTessCallback(tess, GLU_TESS_VERTEX, (void *)tess_callback_vertex); - gluTessCallback(tess, GLU_TESS_BEGIN, (void *)tess_callback_begin); - gluTessCallback(tess, GLU_TESS_END, tess_callback_end); + gluTessCallback( tess, GLU_TESS_VERTEX, (void *)glVertex3dv ); + gluTessCallback( tess, GLU_TESS_BEGIN, (void *)glBegin ); + gluTessCallback( tess, GLU_TESS_END, glEnd ); } GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); @@ -1536,11 +1513,11 @@ static BOOL wglUseFontOutlines_common(HDC hdc, lpgmf++; } - funcs->gl.p_glNewList(listBase++, GL_COMPILE); - funcs->gl.p_glFrontFace(GL_CCW); + glNewList( listBase++, GL_COMPILE ); + glFrontFace( GL_CCW ); if(format == WGL_FONT_POLYGONS) { - funcs->gl.p_glNormal3d(0.0, 0.0, 1.0); + glNormal3d( 0.0, 0.0, 1.0 ); gluTessNormal(tess, 0, 0, 1); gluTessBeginPolygon(tess, NULL); } @@ -1560,18 +1537,14 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(vertices) TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); - if(format == WGL_FONT_POLYGONS) - gluTessBeginContour(tess); - else - funcs->gl.p_glBegin(GL_LINE_LOOP); + if (format == WGL_FONT_POLYGONS) gluTessBeginContour( tess ); + else glBegin( GL_LINE_LOOP ); if(vertices) { fixed_to_double(pph->pfxStart, em_size, vertices); - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } vertex_total++; @@ -1591,10 +1564,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, TRACE("\t\tline to %d, %d\n", ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } fixed_to_double(ppc->apfx[i], em_size, previous); @@ -1639,10 +1610,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices[0] = points[j].x; vertices[1] = points[j].y; vertices[2] = 0.0; - if(format == WGL_FONT_POLYGONS) - gluTessVertex(tess, vertices, vertices); - else - funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); + if (format == WGL_FONT_POLYGONS) gluTessVertex( tess, vertices, vertices ); + else glVertex3d( vertices[0], vertices[1], vertices[2] ); vertices += 3; } } @@ -1653,29 +1622,24 @@ static BOOL wglUseFontOutlines_common(HDC hdc, break; default: ERR("\t\tcurve type = %d\n", ppc->wType); - if(format == WGL_FONT_POLYGONS) - gluTessEndContour(tess); - else - funcs->gl.p_glEnd(); + if (format == WGL_FONT_POLYGONS) gluTessEndContour( tess ); + else glEnd(); goto error_in_list; } ppc = (TTPOLYCURVE*)((char*)ppc + sizeof(*ppc) + (ppc->cpfx - 1) * sizeof(POINTFX)); } - if(format == WGL_FONT_POLYGONS) - gluTessEndContour(tess); - else - funcs->gl.p_glEnd(); + if (format == WGL_FONT_POLYGONS) gluTessEndContour( tess ); + else glEnd(); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); } } error_in_list: - if(format == WGL_FONT_POLYGONS) - gluTessEndPolygon(tess); - funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); - funcs->gl.p_glEndList(); + if (format == WGL_FONT_POLYGONS) gluTessEndPolygon( tess ); + glTranslated( (GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0 ); + glEndList(); HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, vertices); }

1 0

Evan Tang : kernel32: Null-terminate the atom names passed to NtAddAtom.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: f181e25a4755dc16a0704dea00e46da002a946f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f181e25a4755dc16a0704dea00e46d… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Nov 2 16:14:17 2022 -0500 kernel32: Null-terminate the atom names passed to NtAddAtom. Adobe Reader XI patches NtAddAtom() and expects the name to be null-terminated Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53872 --- dlls/kernel32/atom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/atom.c b/dlls/kernel32/atom.c index 2330131fb65..5b3128e5c05 100644 --- a/dlls/kernel32/atom.c +++ b/dlls/kernel32/atom.c @@ -110,8 +110,10 @@ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ ) { if (!check_integral_atom( str, &atom )) { - WCHAR buffer[MAX_ATOM_LEN]; + /* Note: Adobe Reader XI in protected mode hijacks NtAddAtom and its replacement expects the string to be null terminated. */ + WCHAR buffer[MAX_ATOM_LEN+1]; DWORD len = MultiByteToWideChar( CP_ACP, 0, str, strlen(str), buffer, MAX_ATOM_LEN ); + buffer[len] = 0; if (!len) SetLastError( ERROR_INVALID_PARAMETER ); else if (!set_ntstatus( NtAddAtom( buffer, len * sizeof(WCHAR), &atom ))) atom = 0; }

1 0

Ziqing Hui : gdi32/uniscribe: Add fallback font for Kana and CJK script.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: b558c87c50a7fe4e751646811d823a95c98c7c1b URL: https://gitlab.winehq.org/wine/wine/-/commit/b558c87c50a7fe4e751646811d823a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 13:04:34 2022 +0800 gdi32/uniscribe: Add fallback font for Kana and CJK script. This fixes Chinese and Japanese text display issue for Sins of a Solar Empire: Rebellion. --- dlls/gdi32/uniscribe/usp10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index eb86048a6bd..75fc7b380a7 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -465,7 +465,7 @@ const scriptData scriptInformation[] = { MS_MAKE_TAG('k','h','m','r'), L"DaunPenh"}, {{Script_CJK_Han, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - MS_MAKE_TAG('h','a','n','i'), L""}, + MS_MAKE_TAG('h','a','n','i'), L"SimSun"}, {{Script_Ideograph, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','i'), L""}, @@ -474,7 +474,7 @@ const scriptData scriptInformation[] = { MS_MAKE_TAG('b','o','p','o'), L""}, {{Script_Kana, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_ENGLISH, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - MS_MAKE_TAG('k','a','n','a'), L""}, + MS_MAKE_TAG('k','a','n','a'), L"SimSun"}, {{Script_Hangul, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_KOREAN, 0, 1, 0, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 1, 0, 0}, MS_MAKE_TAG('h','a','n','g'), L""},

1 0

Ziqing Hui : usp10/tests: Add Katakana shaping test.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 6f8c5195eca5de9aabac98d1ab22e9920428aff5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8c5195eca5de9aabac98d1ab22e9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 13:02:24 2022 +0800 usp10/tests: Add Katakana shaping test. --- dlls/usp10/tests/usp10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 432e4bdce07..7516bfb2a97 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1625,6 +1625,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + + /* Katakana */ + static const WCHAR test_katakana[] = {0x30b3, 0x30fc, 0x30c9}; + static const shapeTest_char katakana_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}}}; + static const shapeTest_glyph katakana_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; /* CJK */ static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; @@ -1828,6 +1836,14 @@ static void test_ScriptShapeOpenType(HDC hdc) DeleteObject(hfont); } + test_valid = find_font_for_range(hdc, "SimSun", 50, test_katakana[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_katakana, 3, &Control, &State, 0, 3, katakana_c, katakana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); if (hfont != NULL) {

1 0

Alex Henrie : cmd: Remove inapplicable comment from WCMD_getfileowner.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 6ee8f819cfed710c70d539c584aa50954b6754cd URL: https://gitlab.winehq.org/wine/wine/-/commit/6ee8f819cfed710c70d539c584aa50… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 3 19:10:04 2022 -0600 cmd: Remove inapplicable comment from WCMD_getfileowner. --- programs/cmd/directory.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 8417687939a..c556746d7ad 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -177,8 +177,6 @@ static int __cdecl WCMD_dir_sort (const void *a, const void *b) /***************************************************************************** * WCMD_getfileowner - * - * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). */ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) {

1 0

Alex Henrie : cmd: Use the wcsrev function instead of reimplementing it.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 212e319dce4deb77f27a65f10e5be2b069cb1d01 URL: https://gitlab.winehq.org/wine/wine/-/commit/212e319dce4deb77f27a65f10e5be2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 3 19:30:31 2022 -0600 cmd: Use the wcsrev function instead of reimplementing it. --- programs/cmd/directory.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c556746d7ad..86c9b387c82 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -49,25 +49,6 @@ static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; static BOOL paged_mode, recurse, wide, bare, lower, shortname, usernames, separator; static ULONG showattrs, attrsbits; -/***************************************************************************** - * WCMD_strrev - * - * Reverse a WCHARacter string in-place (strrev() is not available under unixen :-( ). - */ -static WCHAR * WCMD_strrev (WCHAR *buff) { - - int r, i; - WCHAR b; - - r = lstrlenW (buff); - for (i=0; i<r/2; i++) { - b = buff[i]; - buff[i] = buff[r-i-1]; - buff[r-i-1] = b; - } - return (buff); -} - /***************************************************************************** * WCMD_filesize64 * @@ -92,7 +73,7 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { *p = '\0'; n = q; } while (n != 0); - WCMD_strrev (buff); + wcsrev(buff); return buff; }

1 0

Ziqing Hui : usp10/tests: Add CJK shaping test.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 1e07b77b515b784f4dae9cbdc847f6aaac07dede URL: https://gitlab.winehq.org/wine/wine/-/commit/1e07b77b515b784f4dae9cbdc847f6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 12:38:12 2022 +0800 usp10/tests: Add CJK shaping test. --- dlls/usp10/tests/usp10.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index aee751423b3..35d25d46ccc 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1617,6 +1617,16 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* CJK */ + static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; + static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph cjk_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; + static const font_fingerprint fingerprint_estrangelo = { {'A','a','B','b','C','c','D','d',0,0}, {284,310,285,311,286,312,287,313,0,0}}; @@ -1801,6 +1811,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_cjk, 5, &Control, &State, 0, 5, cjk_c, cjk_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Ziqing Hui : usp10/tests: Add Hiragana shaping test.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: 0e7415389c8617160cf3017361cc316f5f630208 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e7415389c8617160cf3017361cc31… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 3 12:48:07 2022 +0800 usp10/tests: Add Hiragana shaping test. --- dlls/usp10/tests/usp10.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 35d25d46ccc..432e4bdce07 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1617,6 +1617,14 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Hiragana */ + static const WCHAR test_hiragana[] = {0x306b, 0x307b, 0x3093, 0x3054}; + static const shapeTest_char hiragana_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph hiragana_g[] = { + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_CHARACTER,1,0,0,0,0},0}} }; /* CJK */ static const WCHAR test_cjk[] = {0x4e2d, 0x6587, 0x65e5, 0x672c, 0x8a9e}; static const shapeTest_char cjk_c[] = {{0,{0,0}},{1,{0,0}},{2,{0,0}},{3,{0,0}},{4,{0,0}}}; @@ -1812,6 +1820,14 @@ static void test_ScriptShapeOpenType(HDC hdc) DeleteObject(hfont); } + test_valid = find_font_for_range(hdc, "SimSun", 49, test_hiragana[0], &hfont, &hfont_orig, NULL); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_hiragana, 4, &Control, &State, 0, 4, hiragana_c, hiragana_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } + test_valid = find_font_for_range(hdc, "SimSun", 59, test_cjk[0], &hfont, &hfont_orig, NULL); if (hfont != NULL) {

1 0

Paul Gofman : server: Support SO_EXCLUSIVEADDRUSE socket option.
by Alexandre Julliard Nov. 4, 2022

Nov. 4, 2022

Module: wine Branch: master Commit: a9ae1e041c078fda48a5a0de7c7ccf95dd90a73a URL: https://gitlab.winehq.org/wine/wine/-/commit/a9ae1e041c078fda48a5a0de7c7ccf… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 31 12:20:10 2022 -0600 server: Support SO_EXCLUSIVEADDRUSE socket option. --- dlls/ws2_32/tests/sock.c | 22 +++++++++------------- server/sock.c | 33 ++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 44a1691950a..9b39ecff3c5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2043,19 +2043,18 @@ static void test_reuseaddr(void) } s[2]; int error; - BOOL todo; } tests_exclusive[] = { { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2065,7 +2064,7 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), TRUE, }, @@ -2075,12 +2074,12 @@ static void test_reuseaddr(void) { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_loopback, sizeof(saddr_in_loopback), FALSE, }, { AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback, sizeof(saddr_in6_loopback), FALSE, }, @@ -2095,17 +2094,17 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_loopback_v4mapped, sizeof(saddr_in6_loopback_v4mapped), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - WSAEADDRINUSE, TRUE, + WSAEADDRINUSE, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), TRUE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - WSAEACCES, TRUE, + WSAEACCES, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), TRUE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }, @@ -2120,7 +2119,7 @@ static void test_reuseaddr(void) { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any, sizeof(saddr_in6_any), FALSE, }, { AF_INET, (struct sockaddr *)&saddr_in_any, sizeof(saddr_in_any), FALSE, }}, - NOERROR, TRUE, + NOERROR, }, { {{ AF_INET6, (struct sockaddr *)&saddr_in6_any_v4mapped, sizeof(saddr_in6_any_v4mapped), FALSE, }, @@ -2398,14 +2397,11 @@ static void test_reuseaddr(void) rc = bind(s[1], tests_exclusive[i].s[1].addr, tests_exclusive[i].s[1].addrlen); - todo_wine_if(tests_exclusive[i].todo) - { if (tests_exclusive[i].error) ok(rc == SOCKET_ERROR && WSAGetLastError() == tests_exclusive[i].error, "got rc %d, error %d, expected error %d.\n", rc, WSAGetLastError(), tests_exclusive[i].error); else ok(!rc, "got error %d.\n", WSAGetLastError()); - } closesocket(s[0]); closesocket(s[1]); diff --git a/server/sock.c b/server/sock.c index d1c63dc47c3..c130821b7f4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -187,6 +187,7 @@ struct bound_addr { struct rb_entry entry; union unix_sockaddr addr; + int match_any_addr; int reuse_count; }; @@ -276,7 +277,8 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) { if (addr->addr.in.sin_port != bound_addr->addr.in.sin_port) return addr->addr.in.sin_port < bound_addr->addr.in.sin_port ? -1 : 1; - if (addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) + if (bound_addr->match_any_addr || addr->match_any_addr + || addr->addr.in.sin_addr.s_addr == bound_addr->addr.in.sin_addr.s_addr) return 0; return addr->addr.in.sin_addr.s_addr < bound_addr->addr.in.sin_addr.s_addr ? -1 : 1; } @@ -284,14 +286,16 @@ static int addr_compare( const void *key, const struct wine_rb_entry *entry ) assert( addr->addr.addr.sa_family == AF_INET6 ); if (addr->addr.in6.sin6_port != bound_addr->addr.in6.sin6_port) return addr->addr.in6.sin6_port < bound_addr->addr.in6.sin6_port ? -1 : 1; + if (bound_addr->match_any_addr || addr->match_any_addr) return 0; return memcmp( &addr->addr.in6.sin6_addr, &bound_addr->addr.in6.sin6_addr, sizeof(addr->addr.in6.sin6_addr) ); } -static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6 ) +static int ipv4addr_from_v6( union unix_sockaddr *v4addr, const struct sockaddr_in6 *in6, int map_unspecified ) { v4addr->in.sin_family = AF_INET; v4addr->in.sin_port = in6->sin6_port; - if (IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) + + if (map_unspecified && IN6_IS_ADDR_UNSPECIFIED(&in6->sin6_addr)) { v4addr->in.sin_addr.s_addr = htonl( INADDR_ANY ); return 1; @@ -318,6 +322,15 @@ static int should_track_conflicts_for_addr( struct sock *sock, const union unix_ return 0; } +static int is_any_addr( const union unix_sockaddr *addr ) +{ + if (addr->addr.sa_family == AF_INET && addr->in.sin_addr.s_addr == htonl( INADDR_ANY )) + return 1; + if (addr->addr.sa_family == AF_INET6 && IN6_IS_ADDR_UNSPECIFIED(&addr->in6.sin6_addr)) + return 1; + return 0; +} + static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, int v6only ) { struct bound_addr *bound_addr, search_addr; @@ -326,26 +339,30 @@ static int check_addr_usage( struct sock *sock, const union unix_sockaddr *addr, if (!should_track_conflicts_for_addr( sock, addr )) return 0; search_addr.addr = *addr; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } if (sock->family != WS_AF_INET6 || v6only) return 0; - if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6 )) return 0; + if (!ipv4addr_from_v6( &search_addr.addr, &addr->in6, sock->exclusiveaddruse )) return 0; + search_addr.match_any_addr = sock->exclusiveaddruse && is_any_addr( &search_addr.addr ); if ((entry = rb_get( &bound_addresses_tree, &search_addr ))) { bound_addr = WINE_RB_ENTRY_VALUE(entry, struct bound_addr, entry); if (bound_addr->reuse_count == -1 || !sock->reuseaddr) { - set_error( sock->reuseaddr ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); + set_error( sock->reuseaddr || bound_addr->match_any_addr + ? STATUS_ACCESS_DENIED : STATUS_SHARING_VIOLATION ); return 1; } } @@ -360,6 +377,7 @@ static struct bound_addr *register_bound_address( struct sock *sock, const union return NULL; bound_addr->addr = *addr; + bound_addr->match_any_addr = sock->exclusiveaddruse && is_any_addr( addr ); if (rb_put( &bound_addresses_tree, bound_addr, &bound_addr->entry )) { @@ -392,7 +410,8 @@ static void update_addr_usage( struct sock *sock, const union unix_sockaddr *add sock->bound_addr[0] = register_bound_address( sock, addr ); if (sock->family != WS_AF_INET6 || v6only) return; - if (!ipv4addr_from_v6( &v4addr, &addr->in6 )) return; + + if (!ipv4addr_from_v6( &v4addr, &addr->in6, sock->exclusiveaddruse )) return; sock->bound_addr[1] = register_bound_address( sock, &v4addr ); }

1 0