June 2020 - Wine-Commits - list.winehq.org

Shawn M. Chapla : gdiplus/tests: Add GDI/GDI+ graphics interop test.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 739d0a1dfa92d65c7f9839b2e682933b67ee3fee URL: https://source.winehq.org/git/wine.git/?a=commit;h=739d0a1dfa92d65c7f9839b2… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jun 19 13:21:16 2020 -0400 gdiplus/tests: Add GDI/GDI+ graphics interop test. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index f2ff589ab5..7040327e67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6792,6 +6792,97 @@ static void test_hdc_caching(void) DeleteObject(hbm); } +static void test_gdi_interop(void) +{ + GpBitmap *bitmap; + GpGraphics *graphics; + GpMatrix *transform; + GpBrush *brush; + GpStatus stat; + HDC hdc; + HBRUSH hbrush, holdbrush; + ARGB color; + + stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, stat); + + stat = GdipCreateMatrix(&transform); + expect(Ok, stat); + + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 1.0, 50.0, 50.0); + expect(Ok, stat); + + /* GDI+: Set world transform. Should not matter to GDI. */ + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + hbrush = CreateSolidBrush(0xff0000); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (5, 5) to (12, 10). */ + Rectangle(hdc, 5, 5, 12, 10); + + holdbrush = SelectObject(hdc, holdbrush); + + /* GDI: Set view port origin. Should not matter to GDI+. */ + SetViewportOrgEx(hdc, 20, 20, NULL); + + GdipReleaseDC(graphics, hdc); + + stat = GdipCreateSolidFill((ARGB)0xff0000ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + /* GDI+: Draw a rectangle at physical coords (85, 85) to (88, 95). */ + stat = GdipFillRectangleI(graphics, brush, 35, 35, 3, 10); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + + stat = GdipGetDC(graphics, &hdc); + expect(Ok, stat); + + holdbrush = SelectObject(hdc, hbrush); + + /* GDI: Draw a rectangle at physical coords (25, 25) to (30, 34). + Updated view port origin should still be in effect. */ + Rectangle(hdc, 5, 5, 10, 14); + + SelectObject(hdc, holdbrush); + + DeleteObject(hbrush); + stat = GdipReleaseDC(graphics, hdc); + expect(Ok, stat); + + stat = GdipDeleteMatrix(transform); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 6, 6, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + + stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)bitmap); + expect(Ok, stat); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -6885,6 +6976,7 @@ START_TEST(graphics) test_GdipGraphicsSetAbort(); test_cliphrgn_transform(); test_hdc_caching(); + test_gdi_interop(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

Shawn M. Chapla : gdiplus: Preserve temp DC state for bitmap backed graphics objects.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 34aa117278a01bddb53ee4e3cc9f003a1859a3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34aa117278a01bddb53ee4e3… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Fri Jun 19 13:21:17 2020 -0400 gdiplus: Preserve temp DC state for bitmap backed graphics objects. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 18 +++++++++++++++--- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4b141e19b6..3c5e25ec41 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2536,6 +2536,12 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) return stat; } + if (graphics->temp_hdc) + { + DeleteDC(graphics->temp_hdc); + graphics->temp_hdc = NULL; + } + if(graphics->owndc) ReleaseDC(graphics->hwnd, graphics->hdc); @@ -6662,7 +6668,15 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) if (!hbitmap) return GenericError; - temp_hdc = CreateCompatibleDC(0); + if (!graphics->temp_hdc) + { + temp_hdc = CreateCompatibleDC(0); + } + else + { + temp_hdc = graphics->temp_hdc; + } + if (!temp_hdc) { DeleteObject(hbitmap); @@ -6723,9 +6737,7 @@ GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics *graphics, HDC hdc) graphics->temp_hbitmap_width * 4, PixelFormat32bppARGB); /* Clean up. */ - DeleteDC(graphics->temp_hdc); DeleteObject(graphics->temp_hbitmap); - graphics->temp_hdc = NULL; graphics->temp_hbitmap = NULL; } else if (hdc != graphics->hdc) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 7040327e67..da15392732 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -6870,7 +6870,7 @@ static void test_gdi_interop(void) stat = GdipBitmapGetPixel(bitmap, 26, 26, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipBitmapGetPixel(bitmap, 86, 86, &color); expect(Ok, stat);

1 0

Jeff Smith : gdiplus: Simplify modulo 8 math used for rendering origin.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 47b0155f96a00e201abeaa01b05aea2084923dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=47b0155f96a00e201abeaa01… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Jun 17 16:39:53 2020 -0500 gdiplus: Simplify modulo 8 math used for rendering origin. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 10 +++++----- dlls/gdiplus/tests/brush.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6619be9b58..4b141e19b6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -159,8 +159,8 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch, INT origin_x, INT origi * degree of shading needed. */ for (y = 0; y < 8; y++) { - const int hy = (((y + origin_y) % 8) + 8) % 8; - const int hx = ((origin_x % 8) + 8) % 8; + const int hy = (y + origin_y) & 7; + const int hx = origin_x & 7; unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < 8; x++, row >>= 1) @@ -1198,13 +1198,13 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* See create_hatch_bitmap for an explanation of how index is derived. */ for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) { - const int hy = (7 - ((y + fill_area->Y - graphics->origin_y) % 8)) % 8; - const int hx = ((graphics->origin_x % 8) + 8) % 8; + const int hy = ~(y + fill_area->Y - graphics->origin_y) & 7; + const int hx = graphics->origin_x & 7; const unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < fill_area->Width; x++) { - const unsigned int srow = row >> (7 - ((x + fill_area->X) % 8)); + const unsigned int srow = row >> (~(x + fill_area->X) & 7); int index; if (hatch_data[8]) index = (srow & 1) ? 2 : (srow & 0x82) ? 1 : 0; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 5d5280c7f9..78939e6899 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1814,8 +1814,8 @@ static void test_renderingOrigin(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { - const INT exp_x = ((tests[i][0] % 8) + 8) % 8; - const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + const INT exp_x = tests[i][0] & 7; + const INT exp_y = tests[i][1] & 7; status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); expect(Ok, status);

1 0

Zebediah Figura : quartz/vmr9: Align the source pitch to a multiple of 4.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: d4178020151b9c70affebc31fe354354585dbb9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4178020151b9c70affebc31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:13 2020 -0500 quartz/vmr9: Align the source pitch to a multiple of 4. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f81d806705..5c2cf33820 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -211,8 +211,8 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + unsigned int data_size, width, depth, src_pitch; const BITMAPINFOHEADER *bitmap_header; - unsigned int data_size, width, depth; REFERENCE_TIME start_time, end_time; VMR9PresentationInfo info = {}; D3DLOCKED_RECT locked_rect; @@ -261,6 +261,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi width = bitmap_header->biWidth; height = bitmap_header->biHeight; depth = bitmap_header->biBitCount; + src_pitch = ((width * depth / 8) + 3) & ~3; info.rtStart = start_time; info.rtEnd = end_time; @@ -285,21 +286,21 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi { dst -= locked_rect.Pitch; memcpy(dst, src, width * depth / 8); - src += width * depth / 8; + src += src_pitch; } } - else if (locked_rect.Pitch != width * depth / 8) + else if (locked_rect.Pitch != src_pitch) { BYTE *dst = locked_rect.pBits; const BYTE *src = data; TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", - width * depth / 8, locked_rect.Pitch); + src_pitch, locked_rect.Pitch); while (height--) { memcpy(dst, src, width * depth / 8); - src += width * depth / 8; + src += src_pitch; dst += locked_rect.Pitch; } }

1 0

Alexandre Julliard : ntdll: Use unix_to_nt_file_name() to convert Unix paths in RtlGetFullPathName_U().
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: c468a36903aea9ddac12b25c93cc5b65f293d6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c468a36903aea9ddac12b25c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 14:36:18 2020 +0200 ntdll: Use unix_to_nt_file_name() to convert Unix paths in RtlGetFullPathName_U(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 129 ------------------------------------------------ dlls/ntdll/ntdll_misc.h | 9 ---- dlls/ntdll/path.c | 129 +++++++----------------------------------------- 3 files changed, 19 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c468a36903aea9ddac12…

1 0

Derek Lesho : ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 8f1d1c533c8988e897984f2c0fd7ad1ad2eb7228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1d1c533c8988e897984f2c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Fri Jun 19 13:11:37 2020 -0500 ntoskrnl: Set DriverStart and DriverSize fields in DRIVER_OBJECT. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2da58dc104..f952e5d53b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3645,6 +3645,8 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return STATUS_DLL_INIT_FAILED; driver_object->DriverSection = find_ldr_module( module ); + driver_object->DriverStart = ((LDR_DATA_TABLE_ENTRY *)driver_object->DriverSection)->DllBase; + driver_object->DriverSize = ((LDR_DATA_TABLE_ENTRY *)driver_object->DriverSection)->SizeOfImage; nt = RtlImageNtHeader( module ); if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS;

1 0

Zebediah Figura : bcrypt/tests: Fix some failures on Windows 7.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 46eac8de74a411a5e61dde2461ebfbec3940f532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46eac8de74a411a5e61dde24… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 20 10:31:54 2020 -0500 bcrypt/tests: Fix some failures on Windows 7. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index e4a99d6304..f6e5c84e8d 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2381,16 +2381,37 @@ static void test_BcryptDeriveKeyCapi(void) } ret = pBCryptDeriveKeyCapi(NULL, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || ret == STATUS_INVALID_HANDLE /* win7 */, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, NULL, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 0, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); + + memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 41, 0); - ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ok(ret == STATUS_INVALID_PARAMETER || !ret /* win7 */, "got %08x\n", ret); + if (!ret) + ok(!memcmp(key, expect, sizeof(expect) - 1), "wrong key data\n"); + + ret = pBCryptDestroyHash(hash); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCreateHash(alg, &hash, NULL, 0, NULL, 0, 0); + ok(!ret, "got %08x\n", ret); memset(key, 0, sizeof(key)); ret = pBCryptDeriveKeyCapi(hash, NULL, key, 20, 0);

1 0

Alexandre Julliard : ntdll: Implement FSCTL_GET_OBJECT_ID to retrieve a file id.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 251335cdf35d4ff1fcae9c73f77136c9b85e7d96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=251335cdf35d4ff1fcae9c73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 21 16:25:59 2020 +0200 ntdll: Implement FSCTL_GET_OBJECT_ID to retrieve a file id. It can be used instead of FileIdInformation to avoid depending on mountmgr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 +++++++++++++++++++++++ include/winternl.h | 15 +++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index ca6899b50f..bf1354f46e 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5666,6 +5666,29 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap } break; } + + case FSCTL_GET_OBJECT_ID: + { + FILE_OBJECTID_BUFFER *info = out_buffer; + int fd, needs_close; + struct stat st; + + io->Information = 0; + if (out_size >= sizeof(*info)) + { + status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); + if (status) break; + fstat( fd, &st ); + if (needs_close) close( fd ); + memset( info, 0, sizeof(*info) ); + memcpy( info->ObjectId, &st.st_dev, sizeof(st.st_dev) ); + memcpy( info->ObjectId + 8, &st.st_ino, sizeof(st.st_ino) ); + io->Information = sizeof(*info); + } + else status = STATUS_BUFFER_TOO_SMALL; + break; + } + case FSCTL_SET_SPARSE: TRACE("FSCTL_SET_SPARSE: Ignoring request\n"); io->Information = 0; diff --git a/include/winternl.h b/include/winternl.h index 0957561063..3ff15f28c1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -744,6 +744,21 @@ typedef struct _FILE_PIPE_LOCAL_INFORMATION { #define FILE_PIPE_CONNECTED_STATE 0x00000003 #define FILE_PIPE_CLOSING_STATE 0x00000004 +typedef struct _FILE_OBJECTID_BUFFER +{ + BYTE ObjectId[16]; + union + { + struct + { + BYTE BirthVolumeId[16]; + BYTE BirthObjectId[16]; + BYTE DomainId[16]; + } DUMMYSTRUCTNAME; + BYTE ExtendedInfo[48]; + } DUMMYUNIONNAME; +} FILE_OBJECTID_BUFFER, *PFILE_OBJECTID_BUFFER; + typedef struct _FILE_OBJECTID_INFORMATION { LONGLONG FileReference; UCHAR ObjectId[16];

1 0

Alexandre Julliard : ntdll: Make the client cpu constant global.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: 67949d96a7c49b95801723e8cfdf327e907822cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=67949d96a7c49b95801723e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 22 16:16:17 2020 +0200 ntdll: Make the client cpu constant global. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/process.c | 6 ++---- dlls/ntdll/unix/server.c | 12 ------------ dlls/ntdll/unix/unix_private.h | 10 ++++++++++ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 804985da4d..758f47a1e9 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -417,10 +417,8 @@ static NTSTATUS get_pe_file_info( UNICODE_STRING *path, HANDLE *handle, pe_image /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) info->cpu = is_64bit ? CPU_x86_64 : CPU_x86; -#elif defined(__arm__) - info->cpu = CPU_ARM; -#elif defined(__aarch64__) - info->cpu = CPU_ARM64; +#else + info->cpu = client_cpu; #endif *handle = 0; return STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d81fb3b89a..299a311496 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -100,18 +100,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(server); #define SOCKETNAME "socket" /* name of the socket file */ #define LOCKNAME "lock" /* name of the lock file */ -#ifdef __i386__ -static const enum cpu_type client_cpu = CPU_x86; -#elif defined(__x86_64__) -static const enum cpu_type client_cpu = CPU_x86_64; -#elif defined(__arm__) -static const enum cpu_type client_cpu = CPU_ARM; -#elif defined(__aarch64__) -static const enum cpu_type client_cpu = CPU_ARM64; -#else -#error Unsupported CPU -#endif - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); static const char *server_dir; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e353a17a7d..e0bc5a9603 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -28,6 +28,16 @@ #define InterlockedCompareExchange64(dest,xchg,cmp) RtlInterlockedCompareExchange64(dest,xchg,cmp) #endif +#ifdef __i386__ +static const enum cpu_type client_cpu = CPU_x86; +#elif defined(__x86_64__) +static const enum cpu_type client_cpu = CPU_x86_64; +#elif defined(__arm__) +static const enum cpu_type client_cpu = CPU_ARM; +#elif defined(__aarch64__) +static const enum cpu_type client_cpu = CPU_ARM64; +#endif + struct debug_info { unsigned int str_pos; /* current position in strings buffer */

1 0

Zebediah Figura : quartz/vmr9: Invert only RGB video.
by Alexandre Julliard June 22, 2020

June 22, 2020

Module: wine Branch: master Commit: c4f92087af906e869253f1d184f414691155d3ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f92087af906e869253f1d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 19 19:50:15 2020 -0500 quartz/vmr9: Invert only RGB video. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index bee5a10718..d4331d321d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -279,7 +279,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return hr; } - if (height > 0) + if (height > 0 && bitmap_header->biCompression == BI_RGB) { BYTE *dst = (BYTE *)locked_rect.pBits + (height * locked_rect.Pitch); const BYTE *src = data; @@ -298,6 +298,8 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi BYTE *dst = locked_rect.pBits; const BYTE *src = data; + height = abs(height); + TRACE("Source pitch %u does not match dest pitch %u; copying manually.\n", src_pitch, locked_rect.Pitch);

1 0