wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alistair Leslie-Hughes : include: Add IWbemUnsecuredApartment interfaces.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8d834ca945fa7f1b82c562cd2e14a2e9fd7acd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d834ca945fa7f1b82c562cd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 24 04:10:59 2018 +0000 include: Add IWbemUnsecuredApartment interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wbemcli.idl | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 4a0f4e2..54cdb88 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -660,3 +660,46 @@ interface IWbemQualifierSet : IUnknown HRESULT EndEnumeration(); } + + +typedef [v1_enum] enum tag_WBEM_UNSECAPP_FLAG_TYPE +{ + WBEM_FLAG_UNSECAPP_DEFAULT_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_CHECK_ACCESS, + WBEM_FLAG_UNSECAPP_DONT_CHECK_ACCESS +} WBEM_UNSECAPP_FLAG_TYPE; + +[ + object, + restricted, + uuid(1cfaba8c-1523-11d1-ad79-00c04fd8fdff) +] +interface IUnsecuredApartment : IUnknown +{ + HRESULT CreateObjectStub( + [in] IUnknown *object, + [out] IUnknown **stub); +}; + +[ + object, + restricted, + uuid(31739d04-3471-4cf4-9a7c-57a44ae71956) +] +interface IWbemUnsecuredApartment : IUnsecuredApartment +{ + HRESULT CreateSinkStub( + [in] IWbemObjectSink *sink, + [in] DWORD flags, + [in,unique] const WCHAR *reserved, + [out] IWbemObjectSink **stub); +}; + +[ + uuid(49bd2028-1523-11d1-ad79-00c04fd8fdff) +] +coclass UnsecuredApartment +{ + interface IUnsecuredApartment; + interface IWbemUnsecuredApartment; +};

1 0

Zebediah Figura : ntdll: Also accept \?? \ as a global namespace prefix in RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: d683d243f7420785d5207aab1523b4fdd3de066b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d683d243f7420785d5207aab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:07 2018 -0500 ntdll: Also accept \??\ as a global namespace prefix in RtlDosPathNameToNtPathName_U(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45654 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 6 ++++-- dlls/ntdll/tests/path.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 8fe61da..9794b67 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -340,7 +340,8 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, UNICODE_STRING *ntpath, WCHAR **file_part, CURDIR *cd) { - static const WCHAR LongFileNamePfxW[] = {'\\','\\','?','\\'}; + static const WCHAR global_prefix[] = {'\\','\\','?','\\'}; + static const WCHAR global_prefix2[] = {'\\','?','?','\\'}; ULONG sz, offset; WCHAR local[MAX_PATH]; LPWSTR ptr; @@ -356,7 +357,8 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U if (!dos_path || !*dos_path) return STATUS_OBJECT_NAME_INVALID; - if (!strncmpW(dos_path, LongFileNamePfxW, 4)) + if (!memcmp(dos_path, global_prefix, sizeof(global_prefix)) || + (!memcmp(dos_path, global_prefix2, sizeof(global_prefix2)) && dos_path[4])) { ntpath->Length = strlenW(dos_path) * sizeof(WCHAR); ntpath->MaximumLength = ntpath->Length + sizeof(WCHAR); diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index a032092..7baf474 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -396,6 +396,8 @@ static void test_RtlGetFullPathName_U(void) static void test_RtlDosPathNameToNtPathName_U(void) { + static const WCHAR broken_global_prefix[] = {'\\','?','?','\\','C',':','\\','?','?'}; + char curdir[MAX_PATH]; WCHAR path[MAX_PATH]; UNICODE_STRING nameW; @@ -487,6 +489,22 @@ static void test_RtlDosPathNameToNtPathName_U(void) { "\\\\?\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, { "\\\\?\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, { "\\\\?\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, + + { "\\??", "\\??\\C:\\??", 7, STATUS_SUCCESS }, + { "\\??\\", "\\??\\C:\\??\\", -1, STATUS_SUCCESS }, + + { "\\??\\/", "\\??\\/", 4, STATUS_SUCCESS }, + { "\\??\\foo", "\\??\\foo", 4, STATUS_SUCCESS }, + { "\\??\\foo/", "\\??\\foo/", 4, STATUS_SUCCESS }, + { "\\??\\foo/bar", "\\??\\foo/bar", 4, STATUS_SUCCESS }, + { "\\??\\foo/.", "\\??\\foo/.", 4, STATUS_SUCCESS }, + { "\\??\\foo/..", "\\??\\foo/..", 4, STATUS_SUCCESS }, + { "\\??\\\\", "\\??\\\\", -1, STATUS_SUCCESS }, + { "\\??\\\\\\", "\\??\\\\\\", -1, STATUS_SUCCESS }, + { "\\??\\foo\\", "\\??\\foo\\", -1, STATUS_SUCCESS }, + { "\\??\\foo\\bar", "\\??\\foo\\bar", 8, STATUS_SUCCESS }, + { "\\??\\foo\\.", "\\??\\foo\\.", 8, STATUS_SUCCESS }, + { "\\??\\foo\\..", "\\??\\foo\\..", 8, STATUS_SUCCESS }, }; GetCurrentDirectoryA(sizeof(curdir), curdir); @@ -509,6 +527,13 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (ret != TRUE) continue; + if (!strncmp(tests[i].dos, "\\??\\", 4) && tests[i].dos[4] && + broken(!memcmp(nameW.Buffer, broken_global_prefix, sizeof(broken_global_prefix)))) + { + /* Windows version prior to 2003 don't interpret the \??\ prefix */ + continue; + } + MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, sizeof(path)); ok(!lstrcmpW(nameW.Buffer, path), "%s: Expected %s, got %s.\n", tests[i].dos, tests[i].nt, wine_dbgstr_w(nameW.Buffer));

1 0

Zebediah Figura : ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 8c7e141bb187e0a3477977dfa665ef87739908de URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7e141bb187e0a3477977df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:06 2018 -0500 ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 139 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 123 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7e141bb187e0a34779…

1 0

Zebediah Figura : ntdll/tests: Add more tests for RtlGetFullPathName_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: bbafba6d582326aadde37fbe1f1197bda64ecae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbafba6d582326aadde37fbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:05 2018 -0500 ntdll/tests: Add more tests for RtlGetFullPathName_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 56 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 94b76c1..b2a6955 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -266,6 +266,7 @@ static void test_RtlGetFullPathName_U(void) static const struct test tests[] = { { "c:/test", "c:\\test", "test"}, + { "c:/test/", "c:\\test\\", NULL}, { "c:/test ", "c:\\test", "test"}, { "c:/test.", "c:\\test", "test"}, { "c:/test .... .. ", "c:\\test", "test"}, @@ -287,22 +288,61 @@ static void test_RtlGetFullPathName_U(void) { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ { "c:\\test", "c:\\test", "test"}, - { NULL, NULL, NULL} + { "C:\\test", "C:\\test", "test"}, + { "c:/", "c:\\", NULL}, + { "c:.", "C:\\windows", "windows"}, + { "c:foo", "C:\\windows\\foo", "foo"}, + { "c:foo/bar", "C:\\windows\\foo\\bar", "bar"}, + { "c:./foo", "C:\\windows\\foo", "foo"}, + { "\\foo", "C:\\foo", "foo"}, + { "foo", "C:\\windows\\foo", "foo"}, + { ".", "C:\\windows", "windows"}, + { "..", "C:\\", NULL}, + { "...", "C:\\windows\\", NULL}, + { "./foo", "C:\\windows\\foo", "foo"}, + { "foo/..", "C:\\windows", "windows"}, + { "AUX", "\\\\.\\AUX", NULL}, + { "COM1", "\\\\.\\COM1", NULL}, + { "?<>*\"|:", "C:\\windows\\?<>*\"|:", "?<>*\"|:"}, + + { "\\\\foo", "\\\\foo", NULL}, + { "//foo", "\\\\foo", NULL}, + { "\\/foo", "\\\\foo", NULL}, + { "//", "\\\\", NULL}, + { "//foo/", "\\\\foo\\", NULL}, + + { "//.", "\\\\.\\", NULL}, + { "//./", "\\\\.\\", NULL}, + { "//.//", "\\\\.\\", NULL}, + { "//./foo", "\\\\.\\foo", "foo"}, + { "//./foo/", "\\\\.\\foo\\", NULL}, + { "//./foo/bar", "\\\\.\\foo\\bar", "bar"}, + { "//./foo/.", "\\\\.\\foo", "foo"}, + { "//./foo/..", "\\\\.\\", NULL}, + + { "//?/", "\\\\?\\", NULL}, + { "//?//", "\\\\?\\", NULL}, + { "//?/foo", "\\\\?\\foo", "foo"}, + { "//?/foo/", "\\\\?\\foo\\", NULL}, + { "//?/foo/bar", "\\\\?\\foo\\bar", "bar"}, + { "//?/foo/.", "\\\\?\\foo", "foo"}, + { "//?/foo/..", "\\\\?\\", NULL}, + + /* RtlGetFullPathName_U() can't understand the global namespace prefix */ + { "\\??\\foo", "C:\\??\\foo", "foo"}, + { 0 } }; const struct test *test; WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH]; - CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH]; + char rbufferA[MAX_PATH], rfileA[MAX_PATH], curdir[MAX_PATH]; ULONG ret; WCHAR *file_part; DWORD reslen; UINT len; - if (!pRtlGetFullPathName_U) - { - win_skip("RtlGetFullPathName_U is not available\n"); - return; - } + GetCurrentDirectoryA(sizeof(curdir), curdir); + SetCurrentDirectoryA("C:\\windows\\"); file_part = (WCHAR *)0xdeadbeef; lstrcpyW(rbufferW, deadbeefW); @@ -348,6 +388,8 @@ static void test_RtlGetFullPathName_U(void) ok( !test->rfile, "Got NULL expected \"%s\"\n", test->rfile ); } } + + SetCurrentDirectoryA(curdir); } static void test_RtlDosPathNameToNtPathName_U_WithStatus(void)

1 0

Zebediah Figura : ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: ee5c46a55c6f982fe60a95dff4fe9fbcee1f0028 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5c46a55c6f982fe60a95df… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Aug 23 22:50:04 2018 -0500 ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } };

1 0

Francois Gouget : testbot: Let LogUtils detect and return the list of errors.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: tools Branch: master Commit: 2cc1d985807e1b2a748cff9510b0db6cf743be05 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2cc1d985807e1b2a748cff9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 22:58:21 2018 +0200 testbot: Let LogUtils detect and return the list of errors. LogUtils now exports GetLogErrors() which analyzes the specified log and associated extra errors file and returns per-module lists of errors. For test reports modules correspond to dlls or programs and for other types of log there is a single module called "". Errors from the extra errors file go to an extra module. JobDetails now uses that to offload most of the work of identifying errors. It now can also show errors from more than one report / log when in summary mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 140 ++++++++++++++++++++- testbot/web/JobDetails.pl | 237 +++++++++++++++++------------------- 2 files changed, 247 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=2cc1d985807e1b2a748…

1 0

Francois Gouget : testbot/WineRunBuild: Use the new Build.pl parameters and paths.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: tools Branch: master Commit: 56b8799f7b0bae53091e9cff04a5b1aaa831a8e2 URL: https://source.winehq.org/git/tools.git/?a=commit;h=56b8799f7b0bae53091e9cf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 22:58:12 2018 +0200 testbot/WineRunBuild: Use the new Build.pl parameters and paths. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cca96b9..117b065 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,14 +339,14 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Bitnesses, %TestExes); +my (%Builds, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe([0-9]+)$/) + $TestStep->FileType =~ /^exe/) { - $Bitnesses{$1} = 1; - $TestExes{$TestStep->FileName} = 1; + $Builds{$TestStep->FileType} = 1; + $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) my $Local = "$TestInfo->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); - my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; Debug(Elapsed($Start), " Retrieving '$Local'\n"); - if ($TA->GetFile($Remote, "$StepDir/$Local")) + my $BuildDir = "wine-$TestExes{$Local}"; + if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; }

1 0

Ken Thomases : winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: f0ad5b5c546d17b281aef13fde996cda08d0c14e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0ad5b5c546d17b281aef13f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Aug 23 14:34:15 2018 -0500 winemac: Use fallback implementation for screen dimensions in GetDeviceCaps(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret);

1 0

Nikolay Sivov : d2d1/tests: Check implicit target bitmap options.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 68075cf7fb0cd13e74b85fc22e8986978d3776ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=68075cf7fb0cd13e74b85fc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 23 19:50:13 2018 +0300 d2d1/tests: Check implicit target bitmap options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 20478e5..8e58eef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6767,6 +6767,7 @@ static void test_device_context(void) ID2D1DeviceContext *device_context; IDXGISurface *surface, *surface2; ID2D1Device *device, *device2; + D2D1_BITMAP_OPTIONS options; ID2D1DCRenderTarget *dc_rt; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; @@ -6834,6 +6835,9 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface2); ok(SUCCEEDED(hr), "Failed to get bitmap surface, hr %#x.\n", hr); ok(surface2 == surface, "Unexpected surface instance.\n"); @@ -6880,8 +6884,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6907,8 +6914,11 @@ if (SUCCEEDED(hr)) hr = ID2D1RenderTarget_QueryInterface(rt, &IID_ID2D1DeviceContext, (void **)&device_context); ok(SUCCEEDED(hr), "Failed to get device context interface, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -6938,8 +6948,11 @@ if (SUCCEEDED(hr)) ok(SUCCEEDED(hr), "BindDC() failed, hr %#x.\n", hr); ID2D1DeviceContext_GetTarget(device_context, (ID2D1Image **)&bitmap); + options = ID2D1Bitmap1_GetOptions(bitmap); + ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_GDI_COMPATIBLE), + "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); - ok(FAILED(hr), "Unexpected hr %#x.\n", hr); + ok(hr == D2DERR_INVALID_CALL, "Unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL);

1 0

Józef Kucia : wined3d: Store max point size in d3d_info.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 95a051b333777ecbb27d38caa94f8d2bdc041a10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95a051b333777ecbb27d38ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 23 14:34:04 2018 +0200 wined3d: Store max point size in d3d_info. 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/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 8 +++----- dlls/wined3d/device.c | 6 ++---- dlls/wined3d/directx.c | 2 +- dlls/wined3d/stateblock.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3a7270f..8c1cce4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; + adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->limits.vs_version = shader_caps.vs_version; diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d6bc739..7bd51f4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1928,8 +1928,7 @@ static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) state_cleanup(&cs->state); memset(&cs->state, 0, sizeof(cs->state)); - state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, &adapter->d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); } void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) @@ -2795,7 +2794,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_cs *cs; if (!(cs = heap_alloc_zero(sizeof(*cs)))) @@ -2804,8 +2803,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) cs->ops = &wined3d_cs_st_ops; cs->device = device; - state_init(&cs->state, &cs->fb, gl_info, &device->adapter->d3d_info, - WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); + state_init(&cs->state, &cs->fb, d3d_info, WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT); cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = heap_alloc(cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6e788b..ab67a96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4922,8 +4922,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_delete_opengl_contexts(device); memset(&device->state, 0, sizeof(device->state)); - state_init(&device->state, &device->fb, &device->adapter->gl_info, - &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device_init_swapchain_state(device, swapchain); @@ -5163,8 +5162,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, return hr; } - state_init(&device->state, &device->fb, &adapter->gl_info, - &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); + state_init(&device->state, &device->fb, &adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); device->update_state = &device->state; device->max_frame_latency = 3; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 984cdbb..774cd48 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2186,7 +2186,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte } caps->MaxAnisotropy = gl_info->limits.anisotropy; - caps->MaxPointSize = gl_info->limits.pointsize_max; + caps->MaxPointSize = d3d_info->limits.pointsize_max; caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b4d1751..45a4008 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1113,21 +1113,22 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } -static void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) +static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) { union { struct wined3d_line_pattern lp; DWORD d; } lp; - union { + union + { float f; DWORD d; } tmpfloat; unsigned int i; struct wined3d_matrix identity; - TRACE("state %p, gl_info %p.\n", state, gl_info); + TRACE("state %p, d3d_info %p.\n", state, d3d_info); get_identity_matrix(&identity); state->gl_primitive_type = ~0u; @@ -1222,7 +1223,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d tmpfloat.f = 1.0f; state->render_states[WINED3D_RS_PATCHSEGMENTS] = tmpfloat.d; state->render_states[WINED3D_RS_DEBUGMONITORTOKEN] = 0xbaadcafe; - tmpfloat.f = gl_info->limits.pointsize_max; + tmpfloat.f = d3d_info->limits.pointsize_max; state->render_states[WINED3D_RS_POINTSIZE_MAX] = tmpfloat.d; state->render_states[WINED3D_RS_INDEXEDVERTEXBLENDENABLE] = FALSE; state->render_states[WINED3D_RS_COLORWRITEENABLE] = 0x0000000f; @@ -1316,8 +1317,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) + const struct wined3d_d3d_info *d3d_info, DWORD flags) { unsigned int i; @@ -1330,7 +1330,7 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, } if (flags & WINED3D_STATE_INIT_DEFAULT) - state_init_default(state, gl_info); + state_init_default(state, d3d_info); } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1340,7 +1340,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - state_init(&stateblock->state, NULL, &device->adapter->gl_info, d3d_info, 0); + state_init(&stateblock->state, NULL, d3d_info, 0); if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6693a8..de0b486 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -163,6 +163,8 @@ struct wined3d_d3d_limits unsigned int ffp_blend_stages; unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + + float pointsize_max; }; typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); @@ -3537,8 +3539,7 @@ void wined3d_state_enable_light(struct wined3d_state *state, const struct wined3 struct wined3d_light_info *wined3d_state_get_light(const struct wined3d_state *state, unsigned int idx) DECLSPEC_HIDDEN; void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, - DWORD flags) DECLSPEC_HIDDEN; + const struct wined3d_d3d_info *d3d_info, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; enum wined3d_cs_queue_id

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018