August 2016 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Add more Unicode tests for 'reg import'.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 5df297206debc1256bfa479488e1941fce108cc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df297206debc1256bfa47948… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 15 09:19:24 2016 +0000 reg/tests: Add more Unicode tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index a275db9..bd25a94 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -913,6 +913,45 @@ static void test_import(void) todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); /* Test file contents - Unicode */ + test_import_wstr("REGEDIT\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("REGEDIT4\n", &r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, + "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode1\"=\"Value1\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode1", REG_SZ, "Value1", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode2\"=\"Value2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode2", REG_SZ, "Value2", 7, 0); + + test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode3\"=\"Value3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode3", REG_SZ, "Value3", 7, 0); + test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -953,6 +992,30 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode4\"=\"Value4\"\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode4", REG_SZ, "Value4", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode5\"=\"Value5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode5", REG_SZ, "Value5", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Unicode6\"=\"Value6\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); + + err = RegCloseKey(hkey); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } START_TEST(reg)

1 0

Andrew Eikum : Revert "dsound: Allow inactive devices to change the primary format.".
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: b25e1aefc7b868266042f842955a001618ef3b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25e1aefc7b868266042f8429… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 15 09:02:36 2016 -0500 Revert "dsound: Allow inactive devices to change the primary format.". This reverts commit 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 830764a..f9720f8 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -478,30 +478,35 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + if (device->priolevel == DSSCL_WRITEPRIMARY) { + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } - if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; + if (FAILED(err)) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; + } else + HeapFree(GetProcessHeap(), 0, old_fmt); } else { - /* ignore failures */ - err = S_OK; - HeapFree(GetProcessHeap(), 0, old_fmt); + WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); + if (wfx) { + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = wfx; + } else + err = DSERR_OUTOFMEMORY; } out:

1 0

Peter Beutner : kernel32/tests: Add path tests for double delimiters.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 1fe0b84ffc26fab222195b4a451cfda0ff0e9555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe0b84ffc26fab222195b4a4… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:49 2016 +0200 kernel32/tests: Add path tests for double delimiters. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 6520513..764141d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -945,6 +945,36 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) test_ShortPathCase(curdir,SHORTDIR,LONGFILE); test_ShortPathCase(curdir,LONGDIR,SHORTFILE); test_ShortPathCase(curdir,LONGDIR,LONGFILE); + + /* test double delimiters */ + sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); + todo_wine + { + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + + sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); + todo_wine + { + ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + } } static void test_GetTempPathA(char* tmp_dir) @@ -2170,6 +2200,18 @@ static void test_relative_path(void) ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + /* test double delimiters */ + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetLongPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo");

1 0

Peter Beutner : kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: c90e46b66ded518dbfb88f1efdc366e7986defb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c90e46b66ded518dbfb88f1ef… Author: Peter Beutner <p.beutner(a)gmx.net> Date: Sun Aug 14 22:04:50 2016 +0200 kernel32: Properly handle double delimiters in GetShortPathName/GetLongPathName. Signed-off-by: Peter Beutner <p.beutner(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 27 ++------------------------- dlls/kernel32/tests/path.c | 10 ---------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 620401d..eadd2e7 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -335,23 +335,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) - { - /* strip double delimiters */ - tmplongpath[lp++] = shortpath[sp]; - } + tmplongpath[lp++] = shortpath[sp++]; tmplongpath[lp] = 0; /* terminate string */ - sp++; continue; } p = shortpath + sp; - if (sp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmplongpath[lp++] = *p++; - tmplongpath[lp++] = *p++; - sp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); lstrcpynW(tmplongpath + lp, shortpath + sp, tmplen + 1); @@ -498,24 +487,12 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) - { - /* strip double delimiters */ - tmpshortpath[sp] = longpath[lp]; - sp++; - } + tmpshortpath[sp++] = longpath[lp++]; tmpshortpath[sp] = 0; /* terminate string */ - lp++; continue; } p = longpath + lp; - if (lp == 0 && p[0] == '.' && (p[1] == '/' || p[1] == '\\')) - { - tmpshortpath[sp++] = *p++; - tmpshortpath[sp++] = *p++; - lp += 2; - } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (longpath + lp); lstrcpynW(tmpshortpath + sp, longpath + lp, tmplen + 1); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 764141d..7eb9e75 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -949,31 +949,23 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* test double delimiters */ sprintf(tmpstr,"%s\\\\%s", SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s", SHORTDIR,SHORTFILE); - todo_wine - { ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } if (pGetLongPathNameA) { sprintf(tmpstr,"%s\\\\%s",LONGDIR,LONGFILE); ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,".\\\\%s\\\\%s",LONGDIR,LONGFILE); - todo_wine - { ok(pGetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); - } } } @@ -2204,12 +2196,10 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA("..\\\\foo\\file", buf, MAX_PATH); ok(ret, "GetShortPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, "..\\\\foo\\file"), "expected ..\\\\foo\\file, got %s\n", buf); SetCurrentDirectoryA("..");

1 0

Vincent Povirk : gdiplus: Implement recording/ playback for TranslateWorldTransform.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: af500612f26db776629d470ca8b4cdbb70592a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af500612f26db776629d470ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 12 15:47:14 2016 -0500 gdiplus: Implement recording/playback for TranslateWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 43 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 31 ++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index a4a2c53..1a028a5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -94,6 +94,7 @@ extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMat extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c04a847..e3b34fc 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5517,6 +5517,8 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, REAL dy, GpMatrixOrder order) { + GpStatus stat; + TRACE("(%p, %.2f, %.2f, %d)\n", graphics, dx, dy, order); if(!graphics) @@ -5525,6 +5527,13 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_TranslateWorldTransform((GpMetafile*)graphics->image, dx, dy, order); + + if (stat != Ok) + return stat; + } + return GdipTranslateMatrix(&graphics->worldtrans, dx, dy, order); } diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 7dbbf6d..63d9e22 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -109,6 +109,13 @@ typedef struct EmfPlusRotateWorldTransform REAL Angle; } EmfPlusRotateWorldTransform; +typedef struct EmfPlusTranslateWorldTransform +{ + EmfPlusRecordHeader Header; + REAL dx; + REAL dy; +} EmfPlusTranslateWorldTransform; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -673,6 +680,30 @@ GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixO return Ok; } +GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy, MatrixOrder order) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusTranslateWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusTranslateWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeTranslateWorldTransform; + record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); + record->dx = dx; + record->dy = dy; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1082,6 +1113,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeTranslateWorldTransform: + { + EmfPlusTranslateWorldTransform *record = (EmfPlusTranslateWorldTransform*)header; + MatrixOrder order = (flags & 0x2000) ? MatrixOrderAppend : MatrixOrderPrepend; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusTranslateWorldTransform)) + return InvalidParameter; + + GdipTranslateMatrix(real_metafile->world_transform, record->dx, record->dy, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeResetWorldTransform: { GdipSetMatrixElements(real_metafile->world_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 49a1dd7..c2cc400 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1298,6 +1298,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeSetWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeTranslateWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1478,6 +1480,31 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* translate transform */ + stat = GdipTranslateWorldTransform(graphics, -1.0, 0.0, MatrixOrderAppend); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(3.0, elements[3]); + expectf(-1.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xffffffff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, 1.0, 1.0, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1524,6 +1551,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xffffff00, color); + stat = GdipBitmapGetPixel(bitmap, 10, 90, &color); + expect(Ok, stat); + expect(0xffffffff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus/tests: Test mixing Begin/EndContainer and Save/ Restore.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 8fbdd670cab2abff8d01d3b3110a58075cfc5bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbdd670cab2abff8d01d3b31… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 12 15:47:15 2016 -0500 gdiplus/tests: Test mixing Begin/EndContainer and Save/Restore. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 56be8eb..4a762cc 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -326,6 +326,64 @@ static void test_save_restore(void) log_state(state_a, &state_log); + /* A state created by SaveGraphics cannot be restored with EndContainer. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + stat = GdipSaveGraphics(graphics1, &state_a); + expect(Ok, stat); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + stat = GdipEndContainer(graphics1, state_a); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine expect(InterpolationModeBicubic, mode); + stat = GdipRestoreGraphics(graphics1, state_a); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + + /* A state created by BeginContainer cannot be restored with RestoreGraphics. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + stat = GdipBeginContainer2(graphics1, &state_a); + expect(Ok, stat); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + stat = GdipRestoreGraphics(graphics1, state_a); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + todo_wine expect(InterpolationModeBicubic, mode); + stat = GdipEndContainer(graphics1, state_a); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + + /* BeginContainer and SaveGraphics use the same stack. */ + GdipCreateFromHDC(hdc, &graphics1); + GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); + stat = GdipBeginContainer2(graphics1, &state_a); + expect(Ok, stat); + GdipSetInterpolationMode(graphics1, InterpolationModeBicubic); + stat = GdipSaveGraphics(graphics1, &state_b); + expect(Ok, stat); + GdipSetInterpolationMode(graphics1, InterpolationModeNearestNeighbor); + stat = GdipEndContainer(graphics1, state_a); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + expect(InterpolationModeBilinear, mode); + stat = GdipRestoreGraphics(graphics1, state_b); + expect(Ok, stat); + GdipGetInterpolationMode(graphics1, &mode); + expect(InterpolationModeBilinear, mode); + GdipDeleteGraphics(graphics1); + + log_state(state_a, &state_log); + log_state(state_b, &state_log); + /* The same state value should never be returned twice. */ todo_wine check_no_duplicates(state_log);

1 0

Jacek Caban : wininet: Don' t return available data sizes larger than the read buffer.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 7d9a4392741f1d9fd68d3fd26496f29c4e2e484b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9a4392741f1d9fd68d3fd26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 12 18:08:21 2016 +0200 wininet: Don't return available data sizes larger than the read buffer. Based on patch by Hans Leidekker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 11 +++++++- dlls/wininet/tests/http.c | 65 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac79404..b51c6c9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2621,7 +2621,16 @@ static DWORD refill_read_buffer(http_request_t *req, blocking_mode_t blocking_mo /* return the size of data available to be read immediately (the read section must be held) */ static DWORD get_avail_data( http_request_t *req ) { - return req->read_size + req->data_stream->vtbl->get_avail_data(req->data_stream, req); + DWORD avail = req->read_size; + + /* + * Different Windows versions have different limits of returned data, but all + * of them return no more than centrain amount. We use READ_BUFFER_SIZE as a limit. + */ + if(avail < READ_BUFFER_SIZE) + avail += req->data_stream->vtbl->get_avail_data(req->data_stream, req); + + return min(avail, READ_BUFFER_SIZE); } static DWORD netconn_get_avail_data(data_stream_t *stream, http_request_t *req) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf3f690..fc68fe1 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4622,11 +4622,10 @@ static void open_read_test_request(int port, test_request_t *req, const char *re CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } -#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) -static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, - DWORD buf_size, const char *exdata) +#define readex_expect_sync_data_len(a,b,c,d,e,f) _readex_expect_sync_data_len(__LINE__,a,b,c,d,e,f) +static void _readex_expect_sync_data_len(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata, DWORD len) { - DWORD len = strlen(exdata); BOOL ret; SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); @@ -4636,12 +4635,19 @@ static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, ret = InternetReadFileExW(req, buf, flags, 0xdeadbeef); ok_(__FILE__,line)(ret, "InternetReadFileExW failed: %u\n", GetLastError()); ok_(__FILE__,line)(buf->dwBufferLength == len, "dwBufferLength = %u, expected %u\n", buf->dwBufferLength, len); - if(len) + if(len && exdata) ok_(__FILE__,line)(!memcmp(buf->lpvBuffer, exdata, len), "Unexpected data\n"); CLEAR_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); } +#define readex_expect_sync_data(a,b,c,d,e) _readex_expect_sync_data(__LINE__,a,b,c,d,e) +static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, + DWORD buf_size, const char *exdata) +{ + _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); +} + static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) { DWORD orig_size = buf->dwBufferLength; @@ -4666,6 +4672,17 @@ static void send_response_and_wait(const char *response, BOOL close_connection, ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); } +static void send_response_len_and_wait(unsigned len, BOOL close_connection, INTERNET_BUFFERSW *buf) +{ + char *response; + + response = HeapAlloc(GetProcessHeap(), 0, len+1); + memset(response, 'x', len); + response[len] = 0; + send_response_and_wait(response, close_connection, buf); + HeapFree(GetProcessHeap(), 0, response); +} + static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *buf, DWORD buf_size) { BOOL ret; @@ -4678,11 +4695,26 @@ static void readex_expect_async(HINTERNET req, DWORD flags, INTERNET_BUFFERSW *b ok(!*(int*)buf->lpvBuffer, "buffer data changed\n"); } +#define expect_data_available(a,b) _expect_data_available(__LINE__,a,b) +static DWORD _expect_data_available(unsigned line, HINTERNET req, int exsize) +{ + DWORD size = 0; + BOOL res; + + res = InternetQueryDataAvailable(req, &size, 0, 0); + ok_(__FILE__,line)(res, "InternetQueryDataAvailable failed: %u\n", GetLastError()); + if(exsize != -1) + ok_(__FILE__,line)(size == exsize, "size = %u, expected %u\n", size, exsize); + + return size; +} + static void test_http_read(int port) { INTERNET_BUFFERSW ib; test_request_t req; - char buf[4096]; + char buf[24000]; + DWORD avail; if(!is_ie7plus) return; @@ -4759,6 +4791,27 @@ static void test_http_read(int port) close_async_handle(req.session, hCompleteEvent, 2); + trace("Testing InternetQueryDataAvailable...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "\r\n" + "123"); + expect_data_available(req.request, 3); + readex_expect_sync_data(req.request, IRF_NO_WAIT, &ib, sizeof(buf), "123"); + readex_expect_async(req.request, IRF_NO_WAIT, &ib, sizeof(buf)); + + send_response_len_and_wait(20000, TRUE, &ib); + avail = expect_data_available(req.request, -1); + ok(avail < 17000, "avail = %u\n", avail); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CloseHandle(hCompleteEvent); CloseHandle(conn_wait_event); CloseHandle(server_req_rec_event);

1 0

Vincent Povirk : gdiplus: Fix mismatched use of Begin/ EndContainer and Save/RestoreGraphics.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: cc8cc65f79f35758976ad454128c3cf4d3b19d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8cc65f79f35758976ad4541… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 12 15:47:16 2016 -0500 gdiplus: Fix mismatched use of Begin/EndContainer and Save/RestoreGraphics. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 59 ++++++++++++++++++++++++++++--------------- dlls/gdiplus/tests/graphics.c | 4 +-- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e3b34fc..f0cf98c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1924,9 +1924,15 @@ GpStatus trace_path(GpGraphics *graphics, GpPath *path) return result; } +typedef enum GraphicsContainerType { + BEGIN_CONTAINER, + SAVE_GRAPHICS +} GraphicsContainerType; + typedef struct _GraphicsContainerItem { struct list entry; GraphicsContainer contid; + GraphicsContainerType type; SmoothingMode smoothing; CompositingQuality compqual; @@ -1943,7 +1949,7 @@ typedef struct _GraphicsContainerItem { } GraphicsContainerItem; static GpStatus init_container(GraphicsContainerItem** container, - GDIPCONST GpGraphics* graphics){ + GDIPCONST GpGraphics* graphics, GraphicsContainerType type){ GpStatus sts; *container = heap_alloc_zero(sizeof(GraphicsContainerItem)); @@ -1951,6 +1957,7 @@ static GpStatus init_container(GraphicsContainerItem** container, return OutOfMemory; (*container)->contid = graphics->contid + 1; + (*container)->type = type; (*container)->smoothing = graphics->smoothing; (*container)->compqual = graphics->compqual; @@ -5148,11 +5155,6 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) return GdipSetMatrixElements(&graphics->worldtrans, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); } -GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) -{ - return GdipEndContainer(graphics, state); -} - GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, GpMatrixOrder order) { @@ -5176,23 +5178,16 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, return GdipRotateMatrix(&graphics->worldtrans, angle, order); } -GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) -{ - return GdipBeginContainer2(graphics, state); -} - -GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, - GraphicsContainer *state) +static GpStatus begin_container(GpGraphics *graphics, + GraphicsContainerType type, GraphicsContainer *state) { GraphicsContainerItem *container; GpStatus sts; - TRACE("(%p, %p)\n", graphics, state); - if(!graphics || !state) return InvalidParameter; - sts = init_container(&container, graphics); + sts = init_container(&container, graphics, type); if(sts != Ok) return sts; @@ -5202,6 +5197,19 @@ GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, return Ok; } +GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) +{ + TRACE("(%p, %p)\n", graphics, state); + return begin_container(graphics, SAVE_GRAPHICS, state); +} + +GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, + GraphicsContainer *state) +{ + TRACE("(%p, %p)\n", graphics, state); + return begin_container(graphics, BEGIN_CONTAINER, state); +} + GpStatus WINGDIPAPI GdipBeginContainer(GpGraphics *graphics, GDIPCONST GpRectF *dstrect, GDIPCONST GpRectF *srcrect, GpUnit unit, GraphicsContainer *state) { FIXME("(%p, %p, %p, %d, %p): stub\n", graphics, dstrect, srcrect, unit, state); @@ -5220,18 +5228,17 @@ GpStatus WINGDIPAPI GdipComment(GpGraphics *graphics, UINT sizeData, GDIPCONST B return NotImplemented; } -GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) +static GpStatus end_container(GpGraphics *graphics, GraphicsContainerType type, + GraphicsContainer state) { GpStatus sts; GraphicsContainerItem *container, *container2; - TRACE("(%p, %x)\n", graphics, state); - if(!graphics) return InvalidParameter; LIST_FOR_EACH_ENTRY(container, &graphics->containers, GraphicsContainerItem, entry){ - if(container->contid == state) + if(container->contid == state && container->type == type) break; } @@ -5257,6 +5264,18 @@ GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer sta return Ok; } +GpStatus WINGDIPAPI GdipEndContainer(GpGraphics *graphics, GraphicsContainer state) +{ + TRACE("(%p, %x)\n", graphics, state); + return end_container(graphics, BEGIN_CONTAINER, state); +} + +GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) +{ + TRACE("(%p, %x)\n", graphics, state); + return end_container(graphics, SAVE_GRAPHICS, state); +} + GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics *graphics, REAL sx, REAL sy, GpMatrixOrder order) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4a762cc..f747a2d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -335,7 +335,7 @@ static void test_save_restore(void) stat = GdipEndContainer(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); @@ -353,7 +353,7 @@ static void test_save_restore(void) stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); stat = GdipEndContainer(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode);

1 0

Nikolay Sivov : dwrite: Sanitize specified stretch value, valid range is [ 1, 9].
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: ff57b1febba846fe30f420519b4aec2a1f23dc35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff57b1febba846fe30f420519… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 22:21:13 2016 +0300 dwrite: Sanitize specified stretch value, valid range is [1, 9]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b35f1df..7f4a208 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1291,9 +1291,10 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d USHORT version = GET_BE_WORD(tt_os2->version); USHORT fsSelection = GET_BE_WORD(tt_os2->fsSelection); USHORT usWeightClass = GET_BE_WORD(tt_os2->usWeightClass); + USHORT usWidthClass = GET_BE_WORD(tt_os2->usWidthClass); - if (GET_BE_WORD(tt_os2->usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - props->stretch = GET_BE_WORD(tt_os2->usWidthClass); + if (usWidthClass > DWRITE_FONT_STRETCH_UNDEFINED && usWidthClass <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + props->stretch = usWidthClass; if (usWeightClass >= 1 && usWeightClass <= 9) usWeightClass *= 100;

1 0

Sebastian Lackner : dwrite: Fix font stretch name conversion table.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 1540a19359ff14a8380578c1ce7f81f16a859dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1540a19359ff14a8380578c1c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 13 22:21:14 2016 +0300 dwrite: Fix font stretch name conversion table. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d354eaf..cc82c26 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3109,6 +3109,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA static const WCHAR ultraexpandedW[] = {'U','l','t','r','a',' ','E','x','p','a','n','d','e','d',0}; static const WCHAR *stretchnamesW[] = { + NULL, /* DWRITE_FONT_STRETCH_UNDEFINED */ ultracondensedW, extracondensedW, condensedW,

1 0