January 2020 - Wine-commits

Dmitry Timoshkov : gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 506f3bf53df421e453549127c74f1af98ddfde56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506f3bf53df421e453549127… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:48 2020 +0800 gdiplus: Reimplement GdipCreateBitmapFromGdiDib by using GdipCreateBitmapFromHBITMAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 47 +++++++++++++---------------------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bfa0c8afa7..9fa2aaee95 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1381,50 +1381,29 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO* info, VOID *bits, GpBitmap **bitmap) { DWORD height, stride; - PixelFormat format; + HBITMAP hbm; + void *bmbits; + GpStatus status; - FIXME("(%p, %p, %p) - partially implemented\n", info, bits, bitmap); + TRACE("(%p, %p, %p)\n", info, bits, bitmap); if (!info || !bits || !bitmap) return InvalidParameter; + hbm = CreateDIBSection(0, info, DIB_RGB_COLORS, &bmbits, NULL, 0); + if (!hbm) + return InvalidParameter; + height = abs(info->bmiHeader.biHeight); stride = ((info->bmiHeader.biWidth * info->bmiHeader.biBitCount + 31) >> 3) & ~3; + TRACE("height %u, stride %u, image size %u\n", height, stride, height * stride); - if(info->bmiHeader.biHeight > 0) /* bottom-up */ - { - bits = (BYTE*)bits + (height - 1) * stride; - stride = -stride; - } + memcpy(bmbits, bits, height * stride); - switch(info->bmiHeader.biBitCount) { - case 1: - format = PixelFormat1bppIndexed; - break; - case 4: - format = PixelFormat4bppIndexed; - break; - case 8: - format = PixelFormat8bppIndexed; - break; - case 16: - format = PixelFormat16bppRGB555; - break; - case 24: - format = PixelFormat24bppRGB; - break; - case 32: - format = PixelFormat32bppRGB; - break; - default: - FIXME("don't know how to handle %d bpp\n", info->bmiHeader.biBitCount); - *bitmap = NULL; - return InvalidParameter; - } - - return GdipCreateBitmapFromScan0(info->bmiHeader.biWidth, height, stride, format, - bits, bitmap); + status = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + return status; } /* FIXME: no icm */

1 0

Dmitry Timoshkov : gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: cf6546fb3b914dc1d87b23d6920526b7487cfd6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf6546fb3b914dc1d87b23d6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jan 27 12:13:54 2020 +0800 gdiplus/tests: Add more tests for GdipCreateBitmapFromHBITMAP and palette images. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 88 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 62cd79fec6..eeeea8746a 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -866,7 +866,7 @@ static void test_LockBits_UserBuf(void) struct BITMAPINFOWITHBITFIELDS { BITMAPINFOHEADER bmiHeader; - DWORD masks[3]; + DWORD masks[255]; }; union BITMAPINFOUNION @@ -882,7 +882,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) HPALETTE hpal = NULL; GpStatus stat; BYTE buff[1000]; - LOGPALETTE* LogPal = NULL; + char logpalette_buf[sizeof(LOGPALETTE) + sizeof(PALETTEENTRY) * 255]; + LOGPALETTE *LogPal = (LOGPALETTE *)logpalette_buf; + char colorpalette_buf[sizeof(ColorPalette) + sizeof(ARGB) * 255]; + ColorPalette *palette = (ColorPalette *)colorpalette_buf; REAL width, height; const REAL WIDTH1 = 5; const REAL HEIGHT1 = 15; @@ -892,6 +895,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) union BITMAPINFOUNION bmi; BYTE *bits; PixelFormat format; + int i; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -905,6 +909,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); if (stat == Ok) GdipDisposeImage((GpImage*)gpbm); DeleteObject(hbm); @@ -916,6 +923,10 @@ static void test_GdipCreateBitmapFromHBITMAP(void) /* raw format */ expect_rawformat(&ImageFormatMemoryBMP, (GpImage*)gpbm, __LINE__, FALSE); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat1bppIndexed, format); + expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH2, width); expectf(HEIGHT2, height); @@ -943,6 +954,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) expect(Ok, GdipGetImageDimension((GpImage*) gpbm, &width, &height)); expectf(WIDTH1, width); expectf(HEIGHT1, height); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat24bppRGB, format); if (stat == Ok) { /* test whether writing to the bitmap affects the original */ @@ -954,21 +968,77 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipDisposeImage((GpImage*)gpbm); } - LogPal = GdipAlloc(sizeof(LOGPALETTE)); - ok(LogPal != NULL, "unable to allocate LOGPALETTE\n"); LogPal->palVersion = 0x300; - LogPal->palNumEntries = 1; + LogPal->palNumEntries = 8; + for (i = 0; i < 8; i++) + { + LogPal->palPalEntry[i].peRed = i; + LogPal->palPalEntry[i].peGreen = i; + LogPal->palPalEntry[i].peBlue = i; + LogPal->palPalEntry[i].peFlags = 0; + } + hpal = CreatePalette(LogPal); ok(hpal != NULL, "CreatePalette failed\n"); - GdipFree(LogPal); stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); expect(Ok, stat); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(0, palette->Count); + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); - if (stat == Ok) - GdipDisposeImage((GpImage*)gpbm); + for (i = 0; i < 16; i++) + { + RGBQUAD *colors = bmi.bi.bmiColors; + BYTE clr = 255 - i; + colors[i].rgbBlue = clr; + colors[i].rgbGreen = clr; + colors[i].rgbRed = clr; + colors[i].rgbReserved = 0; + } + + bmi.bi.bmiHeader.biBitCount = 8; + bmi.bi.bmiHeader.biClrUsed = 16; + bmi.bi.bmiHeader.biClrImportant = 16; + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + stat = GdipCreateBitmapFromHBITMAP(hbm, hpal, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); DeleteObject(hpal); + + stat = GdipCreateBitmapFromHBITMAP(hbm, 0, &gpbm); + expect(Ok, stat); + stat = GdipGetImagePixelFormat((GpImage*)gpbm, &format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, format); + stat = GdipGetImagePalette((GpImage *)gpbm, palette, sizeof(colorpalette_buf)); + expect(Ok, stat); + expect(256, palette->Count); + for (i = 0; i < 16; i++) + { + BYTE clr = 255 - i; + ARGB argb = 0xff000000 | (clr << 16) | (clr << 8) | clr; + ok(palette->Entries[i] == argb, "got %08x, expected %08x\n", palette->Entries[i], argb); + } + GdipDisposeImage((GpImage*)gpbm); + DeleteObject(hbm); /* 16-bit 555 dib, rgb */ @@ -999,7 +1069,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) DeleteObject(hbm); /* 16-bit 555 dib, with bitfields */ - bmi.bi.bmiHeader.biSize = sizeof(bmi); + bmi.bi.bmiHeader.biSize = sizeof(bmi.bi.bmiHeader); bmi.bi.bmiHeader.biCompression = BI_BITFIELDS; bmi.bf.masks[0] = 0x7c00; bmi.bf.masks[1] = 0x3e0;

1 0

Michael Cronenworth : webservices: Global variable compatibility update for gcc 10.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: bc51c5d589de709e1d393b58b0cc5985c78061ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc51c5d589de709e1d393b58… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:28 2020 -0600 webservices: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6f2b90dad2..b352aa52d4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,7 +18,7 @@ #include "winhttp.h" -_locale_t c_locale DECLSPEC_HIDDEN; +extern _locale_t c_locale DECLSPEC_HIDDEN; #define STREAM_BUFSIZE 4096 @@ -50,8 +50,8 @@ struct dictionary ULONG current_sequence; ULONG *sequence; }; -struct dictionary dict_builtin DECLSPEC_HIDDEN; -const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; +extern struct dictionary dict_builtin DECLSPEC_HIDDEN; +extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN;

1 0

Michael Cronenworth : gphoto2.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 453980e13015e20dd551531be69b3361b63f22b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=453980e13015e20dd551531b… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:21 2020 -0600 gphoto2.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_i.h | 4 +++- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 9ab8bbbf33..4171fcae4f 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -100,7 +100,9 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 28100414cc..4d71c89e2e 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2

1 0

Michael Cronenworth : sane.ds: Global variable compatibility update for gcc 10.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: c13d58780f78393571dfdeb5b4952e3dcd7ded90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13d58780f78393571dfdeb5… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:24 2020 -0600 sane.ds: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/sane_i.h | 6 ++++-- dlls/sane.ds/sane_main.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 941e8b9e1b..9351bdc222 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -36,7 +36,7 @@ #include "twain.h" #ifdef SONAME_LIBSANE -#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; +#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) MAKE_FUNCPTR(sane_get_devices) @@ -84,7 +84,9 @@ struct tagActiveDS TW_FIX32 defaultXResolution; BOOL YResolutionSet; TW_FIX32 defaultYResolution; -} activeDS DECLSPEC_HIDDEN; +}; + +extern struct tagActiveDS activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 7af0a2321a..0cf211d098 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,9 +30,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC SANE_dsmentry; #ifdef SONAME_LIBSANE +#define MAKE_FUNCPTR(f) typeof(f) * p##f; +MAKE_FUNCPTR(sane_init) +MAKE_FUNCPTR(sane_exit) +MAKE_FUNCPTR(sane_get_devices) +MAKE_FUNCPTR(sane_open) +MAKE_FUNCPTR(sane_close) +MAKE_FUNCPTR(sane_get_option_descriptor) +MAKE_FUNCPTR(sane_control_option) +MAKE_FUNCPTR(sane_get_parameters) +MAKE_FUNCPTR(sane_start) +MAKE_FUNCPTR(sane_read) +MAKE_FUNCPTR(sane_cancel) +MAKE_FUNCPTR(sane_set_io_mode) +MAKE_FUNCPTR(sane_get_select_fd) +MAKE_FUNCPTR(sane_strstatus) +#undef MAKE_FUNCPTR HINSTANCE SANE_instance;

1 0

Jacek Caban : scrrun: Add MoveFile implementation.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: c8c00d6f4ab7adf8ca64723125c25250e2888198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8c00d6f4ab7adf8ca647231… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 27 15:40:22 2020 +0100 scrrun: Add MoveFile implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 7 ++--- dlls/scrrun/tests/filesystem.c | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 5893435af7..d537239b3a 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3638,12 +3638,11 @@ static HRESULT WINAPI filesys_DeleteFolder(IFileSystem3 *iface, BSTR FolderSpec, return delete_folder(FolderSpec, SysStringLen(FolderSpec), Force); } -static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR Source, - BSTR Destination) +static HRESULT WINAPI filesys_MoveFile(IFileSystem3 *iface, BSTR source, BSTR destination) { - FIXME("%p %s %s\n", iface, debugstr_w(Source), debugstr_w(Destination)); + TRACE("%p %s %s\n", iface, debugstr_w(source), debugstr_w(destination)); - return E_NOTIMPL; + return MoveFileW(source, destination) ? S_OK : create_error(GetLastError()); } static HRESULT WINAPI filesys_MoveFolder(IFileSystem3 *iface,BSTR Source, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 68ac70ce3a..c96f704ca7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -2467,6 +2467,67 @@ static void test_GetSpecialFolder(void) IFolder_Release(folder); } +static void test_MoveFile(void) +{ + ITextStream *stream; + BSTR str, src, dst; + HRESULT hr; + + str = SysAllocString(L"test.txt"); + hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(L"test"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "Write failed: %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + str = SysAllocString(L"test2.txt"); + hr = IFileSystem3_CreateTextFile(fs3, str, VARIANT_FALSE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + src = SysAllocString(L"test.txt"); + dst = SysAllocString(L"test3.txt"); + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(src); + SysFreeString(dst); + + str = SysAllocString(L"test.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == CTL_E_FILENOTFOUND, "DeleteFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); + SysFreeString(str); + + src = SysAllocString(L"test3.txt"); + dst = SysAllocString(L"test2.txt"); /* already exists */ + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x, expected CTL_E_FILEALREADYEXISTS\n", hr); + SysFreeString(src); + SysFreeString(dst); + + src = SysAllocString(L"nonexistent.txt"); + dst = SysAllocString(L"test4.txt"); + hr = IFileSystem3_MoveFile(fs3, src, dst); + ok(hr == CTL_E_FILENOTFOUND, "got 0x%08x, expected CTL_E_FILENOTFOUND\n", hr); + SysFreeString(src); + SysFreeString(dst); + + str = SysAllocString(L"test3.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + + str = SysAllocString(L"test2.txt"); + hr = IFileSystem3_DeleteFile(fs3, str, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); +} + START_TEST(filesystem) { HRESULT hr; @@ -2506,6 +2567,7 @@ START_TEST(filesystem) test_SerialNumber(); test_GetExtensionName(); test_GetSpecialFolder(); + test_MoveFile(); IFileSystem3_Release(fs3);

1 0

Kevin Puetz : rpcrt4: Fix ITypeInfo leak in get_iface_info.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: a09c08f17a1ace1205e4c579c4f08b548258d539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a09c08f17a1ace1205e4c579… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Jan 27 16:02:27 2020 +0100 rpcrt4: Fix ITypeInfo leak in get_iface_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_typelib.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 7cb7da18ad..fb78c9b5ab 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1265,14 +1265,16 @@ static HRESULT get_iface_info(ITypeInfo *typeinfo, WORD *funcs, WORD *parentfunc if (FAILED(hr)) goto err; hr = ITypeInfo_GetRefTypeInfo(*real_typeinfo, reftype, &parentinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); + ITypeInfo_Release(parentinfo); + } if (FAILED(hr)) goto err; - hr = ITypeInfo_GetTypeAttr(parentinfo, &typeattr); - if (FAILED(hr)) - goto err; + *parentiid = typeattr->guid; ITypeInfo_ReleaseTypeAttr(parentinfo, typeattr); - ITypeInfo_Release(parentinfo); return S_OK;

1 0

Evan Tang : kernel32/lzexpand: Fix uninitialized read in read_header.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 4e9dae37767462c531f489fab13980f210b32da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e9dae37767462c531f489fa… Author: Evan Tang <etang110(a)gmail.com> Date: Mon Jan 27 02:13:41 2020 -0600 kernel32/lzexpand: Fix uninitialized read in read_header. read_header calls _lread which can either return the number of characters read or HFILE_ERROR (-1), cast to a UINT. Signed-off-by: Evan Tang <etang110(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lzexpand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 4b2ec2ed45..73c9ddc031 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -139,7 +139,7 @@ static INT read_header(HFILE fd,struct lzfileheader *head) /* We can't directly read the lzfileheader struct due to * structure element alignment */ - if (_lread(fd,buf,LZ_HEADER_LEN)<LZ_HEADER_LEN) + if (_lread(fd,buf,LZ_HEADER_LEN) != LZ_HEADER_LEN) return 0; memcpy(head->magic,buf,LZ_MAGIC_LEN); memcpy(&(head->compressiontype),buf+LZ_MAGIC_LEN,1);

1 0

Michael Cronenworth : msi: Global variable compatibility update for gcc 10.
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: cc7f698b8245a48669d248569e7589ff824f2c70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7f698b8245a48669d24856… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:23 2020 -0600 msi: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 2 ++ dlls/msi/msipriv.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7bf5004bed..6387b0a937 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL is_wow64; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fca2f9e7b4..6b87cfb3d8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100

1 0

Henri Verbeet : d3d9/tests: Introduce adapter_is_amd().
by Alexandre Julliard 27 Jan '20

27 Jan '20

Module: wine Branch: master Commit: 05a5e606d5da0c0b6a8adb28f9e3b6262ecc4b8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a5e606d5da0c0b6a8adb28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 27 15:55:26 2020 +0330 d3d9/tests: Introduce adapter_is_amd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb0746f58b..366862a05a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -104,6 +104,16 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +static BOOL adapter_is_vendor(const D3DADAPTER_IDENTIFIER9 *identifier, DWORD vendor) +{ + return identifier->VendorId == vendor; +} + +static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return adapter_is_vendor(identifier, 0x1002); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -26592,7 +26602,7 @@ static void test_alpha_to_coverage(void) nvidia_mode = FALSE; hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - if (identifier.VendorId != 0x1002 /* AMD */) + if (!adapter_is_amd(&identifier)) { skip("Alpha to coverage is not supported.\n"); refcount = IDirect3DDevice9_Release(device);

1 0