January 2019 - Wine-commits

Alexandre Julliard : user32: Cache full name of non-client metrics fonts.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: 8563a2c4f529c3d3b255a1364241169d95ecad43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8563a2c4f529c3d3b255a136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 7 10:20:22 2019 -0600 user32: Cache full name of non-client metrics fonts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 70dce3f..f5dc47c 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -324,6 +324,7 @@ struct sysparam_font_entry struct sysparam_entry hdr; UINT weight; LOGFONTW val; + WCHAR fullname[LF_FACESIZE]; }; struct sysparam_pref_entry @@ -661,15 +662,18 @@ static int map_to_dpi( int val, UINT dpi ) static INT CALLBACK real_fontname_proc(const LOGFONTW *lf, const TEXTMETRICW *ntm, DWORD type, LPARAM lparam) { const ENUMLOGFONTW *elf = (const ENUMLOGFONTW *)lf; - LOGFONTW *lfW = (LOGFONTW *)lparam; + WCHAR *fullname = (WCHAR *)lparam; - lstrcpynW(lfW->lfFaceName, elf->elfFullName, LF_FACESIZE); + lstrcpynW( fullname, elf->elfFullName, LF_FACESIZE ); return 0; } -static void get_real_fontname( HDC hdc, LOGFONTW *lf ) +static void get_real_fontname( LOGFONTW *lf, WCHAR fullname[LF_FACESIZE] ) { - EnumFontFamiliesExW(hdc, lf, real_fontname_proc, (LPARAM)lf, 0); + HDC hdc = get_display_dc(); + strcpyW( fullname, lf->lfFaceName ); + EnumFontFamiliesExW( hdc, lf, real_fontname_proc, (LPARAM)fullname, 0 ); + release_display_dc( hdc ); } /* adjust some of the raw values found in the registry */ @@ -686,16 +690,10 @@ static void normalize_nonclientmetrics( NONCLIENTMETRICSW *pncm) /* adjust some heights to the corresponding font */ get_text_metr_size( hdc, &pncm->lfMenuFont, &tm, NULL); pncm->iMenuHeight = max( pncm->iMenuHeight, 2 + tm.tmHeight + tm.tmExternalLeading ); - get_real_fontname( hdc, &pncm->lfMenuFont ); get_text_metr_size( hdc, &pncm->lfCaptionFont, &tm, NULL); pncm->iCaptionHeight = max( pncm->iCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( hdc, &pncm->lfCaptionFont ); get_text_metr_size( hdc, &pncm->lfSmCaptionFont, &tm, NULL); pncm->iSmCaptionHeight = max( pncm->iSmCaptionHeight, 2 + tm.tmHeight); - get_real_fontname( hdc, &pncm->lfSmCaptionFont ); - - get_real_fontname( hdc, &pncm->lfStatusFont ); - get_real_fontname( hdc, &pncm->lfMessageFont ); release_display_dc( hdc ); } @@ -1004,10 +1002,12 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi entry->font.val = font; break; } + get_real_fontname( &entry->font.val, entry->font.fullname ); entry->hdr.loaded = TRUE; } font = entry->font.val; font.lfHeight = map_to_dpi( font.lfHeight, dpi ); + strcpyW( font.lfFaceName, entry->font.fullname ); *(LOGFONTW *)ptr_param = font; return TRUE; } @@ -1026,6 +1026,7 @@ static BOOL set_font_entry( union sysparam_all_entry *entry, UINT int_param, voi if (!save_entry( &entry->hdr, &font, sizeof(font), REG_BINARY, flags )) return FALSE; entry->font.val = font; + get_real_fontname( &entry->font.val, entry->font.fullname ); entry->hdr.loaded = TRUE; return TRUE; } @@ -1036,6 +1037,7 @@ static BOOL init_font_entry( union sysparam_all_entry *entry ) GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(entry->font.val), &entry->font.val ); entry->font.val.lfHeight = map_from_system_dpi( entry->font.val.lfHeight ); entry->font.val.lfWeight = entry->font.weight; + get_real_fontname( &entry->font.val, entry->font.fullname ); return init_entry( &entry->hdr, &entry->font.val, sizeof(entry->font.val), REG_BINARY ); }

1 0

Roberto Pungartnik : po: Update Portuguese (Brazil) translation.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: d9497e757250360618cc11c241a73c520a464b20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9497e757250360618cc11c2… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Fri Jan 4 23:25:48 2019 -0200 po: Update Portuguese (Brazil) translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 416 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 198 insertions(+), 218 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d9497e757250360618cc…

1 0

Gijs Vermeulen : wtsapi32/tests: Add WTSQueryUserToken parameter test.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: 3bacfc300530016d234e3d7864fb0eafafba4f9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bacfc300530016d234e3d78… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Jan 6 04:17:54 2019 +0100 wtsapi32/tests: Add WTSQueryUserToken parameter test. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 341d9e6..c24bd49 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -105,8 +105,20 @@ static void test_WTSQuerySessionInformationW(void) WTSFreeMemory(buf); } +static void test_WTSQueryUserToken(void) +{ + BOOL ret; + + SetLastError(0xdeadbeef); + ret = WTSQueryUserToken(WTS_CURRENT_SESSION, NULL); + ok(!ret, "expected WTSQueryUserToken to fail\n"); + todo_wine + ok(GetLastError()==ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER got: %d\n", GetLastError()); +} + START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); test_WTSQuerySessionInformationW(); + test_WTSQueryUserToken(); }

1 0

Nikolay Sivov : gdiplus/tests: Add some missing return value checks ( Coverity).
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: a3ed938e4a8000646c063fd717f04685837f0953 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ed938e4a8000646c063fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 6 18:27:58 2019 +0300 gdiplus/tests: Add some missing return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 3 ++- dlls/gdiplus/tests/graphics.c | 36 ++++++++++++++++++++++++------------ dlls/gdiplus/tests/image.c | 2 +- dlls/gdiplus/tests/region.c | 9 ++++++--- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0a3a3be..03e7a04 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -159,7 +159,8 @@ static void test_createfont(void) expect(Ok, stat); GdipGetFontSize (font, &size); ok (size == 24, "Expected 24, got %f (with unit: %d)\n", size, i); - GdipGetFontUnit (font, &unit); + stat = GdipGetFontUnit (font, &unit); + ok (stat == Ok, "Failed to get font unit, %d.\n", stat); expect (i, unit); GdipDeleteFont(font); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b0e3d82..f2ff589 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -347,7 +347,8 @@ static void test_save_restore(void) log_state(state_a, &state_log); /* A state created by BeginContainer cannot be restored with RestoreGraphics. */ - GdipCreateFromHDC(hdc, &graphics1); + stat = GdipCreateFromHDC(hdc, &graphics1); + expect(Ok, stat); GdipSetInterpolationMode(graphics1, InterpolationModeBilinear); stat = GdipBeginContainer2(graphics1, &state_a); expect(Ok, stat); @@ -703,7 +704,8 @@ static void test_BeginContainer2(void) GdipGetTextContrast(graphics, &contrast); ok(defContrast == contrast, "Expected Text Contrast to be restored to %d, got %d\n", defContrast, contrast); - GdipGetTextRenderingHint(graphics, &texthint); + status = GdipGetTextRenderingHint(graphics, &texthint); + expect(Ok, status); ok(defTexthint == texthint, "Expected Text Hint to be restored to %d, got %d\n", defTexthint, texthint); /* test world transform */ @@ -722,7 +724,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix2(10, 20, 30, 40, 50, 60, &transform); expect(Ok, status); - GdipSetWorldTransform(graphics, transform); + status = GdipSetWorldTransform(graphics, transform); + expect(Ok, status); GdipDeleteMatrix(transform); transform = NULL; @@ -731,7 +734,8 @@ static void test_BeginContainer2(void) status = GdipCreateMatrix(&transform); expect(Ok, status); - GdipGetWorldTransform(graphics, transform); + status = GdipGetWorldTransform(graphics, transform); + expect(Ok, status); status = GdipGetMatrixElements(transform, elems); expect(Ok, status); ok(fabs(defTrans[0] - elems[0]) < 0.0001 && @@ -753,12 +757,14 @@ static void test_BeginContainer2(void) status = GdipBeginContainer2(graphics, &cont1); expect(Ok, status); - GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + status = GdipSetClipRect(graphics, defClip[0], defClip[1], defClip[2], defClip[3], CombineModeReplace); + expect(Ok, status); status = GdipBeginContainer2(graphics, &cont2); expect(Ok, status); - GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + status = GdipSetClipRect(graphics, 2, 4, 6, 8, CombineModeReplace); + expect(Ok, status); status = GdipEndContainer(graphics, cont2); expect(Ok, status); @@ -6572,12 +6578,18 @@ static void test_GdipFillRectanglesOnBitmapTextureBrush(void) GdipDeleteBrush((GpBrush*)brush); GdipDeleteGraphics(graphics); - GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); - GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); - GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); - GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); - GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); - GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, 0, &color[0]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, 1, &color[1]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 1, 0, &color[2]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, width/2, 0, &color[3]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, width/2, height/2, &color[4]); + expect(Ok, status); + status = GdipBitmapGetPixel(dst_img.bitmap, 0, height/2, &color[5]); + expect(Ok, status); ok(is_blue_color(color[0]) && is_blue_color(color[1]) && is_blue_color(color[2]) && color[3] == 0 && color[4] == 0 && color[5] == 0, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b31f32e..72a984a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2717,7 +2717,7 @@ static void test_multiframegif(void) expect(Ok, stat); color = 0xdeadbeef; - GdipBitmapGetPixel(bmp, 0, 0, &color); + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); expect(Ok, stat); expect(0xff000000, color); diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index c2cbff0..d69f09d 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -814,7 +814,8 @@ static void test_isinfinite(void) status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); GdipCreateMatrix2(3.0, 0.0, 0.0, 1.0, 20.0, 30.0, &m); @@ -860,7 +861,8 @@ static void test_isempty(void) status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - GdipCreateRegion(&region); + status = GdipCreateRegion(&region); + expect(Ok, status); /* NULL arguments */ status = GdipIsEmptyRegion(NULL, NULL, NULL); @@ -1779,7 +1781,8 @@ static void test_getbounds(void) ok(rectf.Height == 100.0, "Expected height = 0.0, got %.2f\n", rectf.Height); /* the world and page transforms are ignored */ - GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + status = GdipScaleWorldTransform(graphics, 2.0, 2.0, MatrixOrderPrepend); + ok(status == Ok, "status %08x\n", status); GdipSetPageUnit(graphics, UnitInch); GdipSetPageScale(graphics, 2.0); status = GdipGetRegionBounds(region, graphics, &rectf);

1 0

Nikolay Sivov : gdi32/tests: Fix copy-paste issue with test message ( Coverity).
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: a67120f06d5d238e490b8da4c99b22aa414394c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a67120f06d5d238e490b8da4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 6 20:04:26 2019 +0300 gdi32/tests: Fix copy-paste issue with test message (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 15f29d6..f1978f7 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2528,7 +2528,7 @@ static void test_emf_ExtTextOut_on_path(void) ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); if (compare_emf_bits(hMetafile, EMF_TEXTOUT_OUTLINE_ON_PATH_BITS, sizeof(EMF_TEXTOUT_OUTLINE_ON_PATH_BITS), - "emf_TextOut_on_path", FALSE) != 0) + "emf_TextOut_outline_on_path", FALSE) != 0) { dump_emf_bits(hMetafile, "emf_TextOut_outline_on_path"); dump_emf_records(hMetafile, "emf_TextOut_outline_on_path");

1 0

Nikolay Sivov : msi/tests: Use more reasonable buffer sizes for guid strings (Coverity).
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: a853bb6d0a91e5766ff1afbfaf1fcb9b8d27fc76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a853bb6d0a91e5766ff1afbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 6 21:56:12 2019 +0300 msi/tests: Use more reasonable buffer sizes for guid strings (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/msi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 22698d8..1267db3 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -34,6 +34,9 @@ #include "wine/test.h" #include "utils.h" +#define GUID_SIZE (39) +#define SQUASHED_GUID_SIZE (33) + static BOOL is_wow64; static const char msifile[] = "winetest.msi"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; @@ -1224,8 +1227,8 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) static void create_test_guid(LPSTR prodcode, LPSTR squashed) { - WCHAR guidW[MAX_PATH]; - WCHAR squashedW[MAX_PATH]; + WCHAR guidW[GUID_SIZE]; + WCHAR squashedW[SQUASHED_GUID_SIZE]; GUID guid; HRESULT hr; int size; @@ -1233,14 +1236,14 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, guidW, MAX_PATH); - ok(size == 39, "Expected 39, got %d\n", hr); + size = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW)); + ok(size == GUID_SIZE, "Expected %d, got %d.\n", GUID_SIZE, size); - WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, GUID_SIZE, NULL, NULL); if (squashed) { squash_guid(guidW, squashedW); - WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, SQUASHED_GUID_SIZE, NULL, NULL); } }

1 0

Hans Leidekker : msi: Only perform the media check if the label of the disk entry differs from the last.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: 85fea53af80d324a4cf7f80a45f43fed8d8d65e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85fea53af80d324a4cf7f80a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 7 08:55:15 2019 +0100 msi: Only perform the media check if the label of the disk entry differs from the last. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 26 +++++++++++++++++--------- dlls/msi/msipriv.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 5f8c26a..09aac09 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -664,6 +664,7 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); + msi_free(mi->last_volume); msi_free(mi); } @@ -898,20 +899,27 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1) + if (mi->volume_label) { - WCHAR *source = msi_dup_property( package->db, szSourceDir ); - BOOL match = source_matches_volume( mi, source ); - msi_free( source ); - - if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) + /* assume first volume is in the drive */ + if (mi->last_volume && strcmpiW( mi->last_volume, mi->volume_label )) { - if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + WCHAR *source = msi_dup_property( package->db, szSourceDir ); + BOOL match = source_matches_volume( mi, source ); + msi_free( source ); + + if (!match && (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE)) { - msi_free( cabinet_file ); - return rc; + if ((rc = msi_change_media( package, mi )) != ERROR_SUCCESS) + { + msi_free( cabinet_file ); + return rc; + } } } + + msi_free(mi->last_volume); + mi->last_volume = strdupW(mi->volume_label); } if (mi->cabinet) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f9263b5..90ce370 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -173,6 +173,7 @@ typedef struct tagMSIMEDIAINFO LPWSTR disk_prompt; LPWSTR cabinet; LPWSTR volume_label; + LPWSTR last_volume; BOOL is_continuous; BOOL is_extracted; WCHAR sourcedir[MAX_PATH];

1 0

Jacek Caban : kernel32/tests: Initialize input buffer in test_overlapped_transport.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: 0a41f5b0a266f6cf006499858ded6518ba9c2c2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a41f5b0a266f6cf00649985… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 7 13:40:28 2019 +0100 kernel32/tests: Initialize input buffer in test_overlapped_transport. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46341 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 05e23bf..5bf27fa 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3215,6 +3215,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) CloseHandle(server); /* close client with pending writes */ + memset(buf, 0xaa, sizeof(buf)); create_overlapped_pipe(create_flags, &client, &server); overlapped_write_async(server, buf, 7000, &overlapped); flush = test_flush_async(server, ERROR_BROKEN_PIPE);

1 0

Józef Kucia : d3d8: Upload vertex buffer range relative to base vertex index.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: ce8ef46ace50f129659e398e054ab91f03e91e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce8ef46ace50f129659e398e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 7 14:17:43 2019 +0100 d3d8: Upload vertex buffer range relative to base vertex index. Fixes a regression introduced by 75b7ff60562880b6e7b646a8fa84486670162d00. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46357 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index b4d445d..3348125 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2344,6 +2344,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); unsigned int index_count; + int base_vertex_index; HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", @@ -2351,7 +2352,8 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); - d3d8_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); + d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count);

1 0

Józef Kucia : d3d9: Upload vertex buffer range relative to base vertex index.
by Alexandre Julliard 07 Jan '19

07 Jan '19

Module: wine Branch: master Commit: 1519977d2896519d561f582ac31c94df5ca58511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1519977d2896519d561f582a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 7 14:17:44 2019 +0100 d3d9: Upload vertex buffer range relative to base vertex index. Fixes a regression introduced by b18a53a5b44b651cde8e05200c75eacf54f49926. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c1418e9..e28b48e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2708,7 +2708,7 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) } static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, - unsigned int start_vertex, unsigned int vertex_count) + int base_vertex, unsigned int start_vertex, unsigned int vertex_count) { struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct d3d9_vertexbuffer *d3d9_buffer; @@ -2716,6 +2716,14 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, struct wined3d_buffer *dst_buffer; HRESULT hr; + if (!device->sysmem_vb) + return; + + if (base_vertex >= 0 || start_vertex >= -base_vertex) + start_vertex += base_vertex; + else + FIXME("System memory vertex data offset is negative.\n"); + map = device->sysmem_vb; while (map) { @@ -2777,7 +2785,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - d3d9_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); + d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); @@ -2809,7 +2817,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface return D3DERR_INVALIDCALL; } index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - d3d9_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx);

1 0