October 2018 - Wine-commits

Dmitry Timoshkov : shell32: Add bitmap resources for ids 133 and 134.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ed24889dad5a6aeea4867be1056ca76ab6953c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed24889dad5a6aeea4867be1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 24 15:28:10 2018 +0300 shell32: Add bitmap resources for ids 133 and 134. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/idb_sort_decr.bmp | Bin 0 -> 838 bytes dlls/shell32/resources/idb_sort_incr.bmp | Bin 0 -> 838 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) diff --git a/dlls/shell32/resources/idb_sort_decr.bmp b/dlls/shell32/resources/idb_sort_decr.bmp new file mode 100644 index 0000000..6956552 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_decr.bmp differ diff --git a/dlls/shell32/resources/idb_sort_incr.bmp b/dlls/shell32/resources/idb_sort_incr.bmp new file mode 100644 index 0000000..0d9b6a2 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_incr.bmp differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590..46f0b6f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico +/* @makedep: resources/idb_sort_incr.bmp */ +IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp + +/* @makedep: resources/idb_sort_decr.bmp */ +IDB_SORT_DECR BITMAP resources/idb_sort_decr.bmp + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c9293..92185d6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -424,6 +424,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_FPROP_ARCHIVE 13021 /* bitmaps */ +#define IDB_SORT_INCR 133 +#define IDB_SORT_DECR 134 + /* explorer toolbar icons * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now */

1 0

Nikolay Sivov : ntdll/tests: Add a test for qsort() stability.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: dd7230d1bce94c02449aead6eca352da57b89608 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd7230d1bce94c02449aead6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 16:34:31 2018 +0300 ntdll/tests: Add a test for qsort() stability. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 708d6e7..0ab28ff 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1189,6 +1189,16 @@ static int __cdecl strcomparefunc(const void *a, const void *b) return lstrcmpA(*p, *q); } +static int __cdecl istrcomparefunc(const void *a, const void *b) +{ + const char * const *p = a; + const char * const *q = b; + + ok (a != b, "must never get the same pointer\n"); + + return lstrcmpiA(*p, *q); +} + static void test_qsort(void) { int arr[5] = { 23, 42, 8, 4, 16 }; @@ -1202,6 +1212,15 @@ static void test_qsort(void) "Sorted", "." }; + const char *strarr2[7] = { + "Hello", + "Wine", + "World", + "!", + "wine", + "Sorted", + "WINE" + }; p_qsort ((void*)arr, 0, sizeof(int), intcomparefunc); ok(arr[0] == 23, "badly sorted, nmemb=0, arr[0] is %d\n", arr[0]); @@ -1246,6 +1265,17 @@ static void test_qsort(void) ok(!strcmp(strarr[4],"Sorted"), "badly sorted, strarr[4] is %s\n", strarr[4]); ok(!strcmp(strarr[5],"Wine"), "badly sorted, strarr[5] is %s\n", strarr[5]); ok(!strcmp(strarr[6],"World"), "badly sorted, strarr[6] is %s\n", strarr[6]); + + p_qsort ((void*)strarr2, 7, sizeof(char*), istrcomparefunc); + ok(!strcmp(strarr2[0], "!"), "badly sorted, strar2r[0] is %s\n", strarr2[0]); + ok(!strcmp(strarr2[1], "Hello"), "badly sorted, strarr2[1] is %s\n", strarr2[1]); + ok(!strcmp(strarr2[2], "Sorted"), "badly sorted, strarr2[2] is %s\n", strarr2[2]); +todo_wine { + ok(!strcmp(strarr2[3], "wine"), "badly sorted, strarr2[3] is %s\n", strarr2[3]); + ok(!strcmp(strarr2[4], "WINE"), "badly sorted, strarr2[4] is %s\n", strarr2[4]); + ok(!strcmp(strarr2[5], "Wine"), "badly sorted, strarr2[5] is %s\n", strarr2[5]); +} + ok(!strcmp(strarr2[6], "World"), "badly sorted, strarr2[6] is %s\n", strarr2[6]); } static void test_bsearch(void)

1 0

Nikolay Sivov : start: Try cycling through extensions if original path failed to execute.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 1c9365488553ff5fe21b710b25d2808583bf1a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9365488553ff5fe21b710b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 14:32:14 2018 +0300 start: Try cycling through extensions if original path failed to execute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 32372ec..ccec9bc 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -403,7 +403,55 @@ int wmain (int argc, WCHAR *argv[]) } if (!ShellExecuteExW(&sei)) - fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); + { + static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; + const WCHAR *filename = sei.lpFile; + DWORD size, filename_len; + WCHAR *name, *env; + + size = GetEnvironmentVariableW(pathextW, NULL, 0); + if (size) + { + WCHAR *start, *ptr; + + env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!env) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + GetEnvironmentVariableW(pathextW, env, size); + + filename_len = strlenW(filename); + name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + if (!name) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + + sei.lpFile = name; + start = env; + while ((ptr = strchrW(start, ';'))) + { + if (start == ptr) + { + start = ptr + 1; + continue; + } + + strcpyW(name, filename); + memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); + name[filename_len + (ptr - start)] = 0; + + if (ShellExecuteExW(&sei)) + { + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, env); + goto done; + } + + start = ptr + 1; + } + + } + + fatal_string_error(STRING_EXECFAIL, GetLastError(), filename); + } done: HeapFree( GetProcessHeap(), 0, args );

1 0

Nikolay Sivov : gdiplus: Implement GdipRotatePenTransform().
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 363326678cd2f473b6fcf3d141846fa79007837d URL: https://source.winehq.org/git/wine.git/?a=commit;h=363326678cd2f473b6fcf3d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 00:04:18 2018 +0300 gdiplus: Implement GdipRotatePenTransform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 38 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index ad45bcb..8bcb918 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -480,17 +480,12 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%u)\n", pen, angle, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipRotateMatrix(&pen->transform, angle, order); } GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 530967a..ceab92a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -588,6 +588,44 @@ static void test_transform(void) expectf(-15.0, values[4]); expectf(-76.0, values[5]); + /* Rotate */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipSetPenTransform(pen, matrix); + expect(Ok, status); + + status = GdipRotatePenTransform(NULL, 10.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipRotatePenTransform(pen, 45.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.12, values[0]); + expectf(3.54, values[1]); + expectf(-0.71, values[2]); + expectf(2.12, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipRotatePenTransform(pen, 180.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-4.24, values[0]); + expectf(35.36, values[1]); + expectf(1.41, values[2]); + expectf(21.21, values[3]); + expectf(-2.0, values[4]); + expectf(20.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5593ac5..ad944d6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -631,6 +631,7 @@ GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); +GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);

1 0

Jactry Zeng : kernel32: Don't check a discarded variable.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ebc0e5ffb595d92bca7a38a3710e494662298e96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc0e5ffb595d92bca7a38a3… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 24 13:30:17 2018 +0800 kernel32: Don't check a discarded variable. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 32e7517..799519e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2146,7 +2146,7 @@ static NTSTATUS exec_loader( const RTL_USER_PROCESS_PARAMETERS *params, int sock wine_exec_wine_binary( loader, argv, getenv("WINELOADER") ); } #ifdef __APPLE__ - while (errno == ENOTSUP && exec_only && terminate_main_thread()); + while (errno == ENOTSUP && terminate_main_thread()); #else while (0); #endif

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: ec8425bab43e285a343c7329676a46438f368baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8425bab43e285a343c7329… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 24 08:55:58 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4c56e9b..b714392 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-06 08:19+0300\n" +"PO-Revision-Date: 2018-10-24 08:54+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -309,25 +309,23 @@ msgstr "Atsisakoma..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "liko %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "liko %1!u! %2 ir %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "S&ekundės" +msgstr "sek." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "min." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "val." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s"

1 0

Alex Henrie : dwmapi: Fill in function names of documented ordinals.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 6955e368f477ac962d93494cbfc4ca3ef9b17b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6955e368f477ac962d93494c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:38 2018 -0600 dwmapi: Fill in function names of documented ordinals. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 3744719..27523b7 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -1,33 +1,33 @@ 100 stub DwmpDxGetWindowSharedSurface 101 stub DwmpDxUpdateWindowSharedSurface 102 stdcall DwmEnableComposition(long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -112 stub @ -113 stub @ -114 stub @ -115 stub @ -118 stub @ -119 stub @ -120 stub @ -121 stub @ -124 stub @ +103 stub -noname DwmpRestartComposition +104 stub -noname DwmpSetColorizationColor +105 stub -noname DwmpStartOrStopFlip3D +106 stub -noname DwmpIsCompositionCapable +107 stub -noname DwmpGetGlobalState +108 stub -noname DwmpEnableRedirection +109 stub -noname DwmpOpenGraphicsStream +110 stub -noname DwmpCloseGraphicsStream +112 stub -noname DwmpSetGraphicsStreamTransformHint +113 stub -noname DwmpActivateLivePreview +114 stub -noname DwmpQueryThumbnailType +115 stub -noname DwmpStartupViaUserInit +118 stub -noname DwmpGetAssessment +119 stub -noname DwmpGetAssessmentUsage +120 stub -noname DwmpSetAssessmentUsage +121 stub -noname DwmpIsSessionDWM +124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub @ +127 stub -noname DwmpGetColorizationParameters 128 stub DwmpDxgiIsThreadDesktopComposited -129 stub @ -130 stub @ -131 stub @ -132 stub @ +129 stub -noname DwmpDxgiDisableRedirection +130 stub -noname DwmpDxgiEnableRedirection +131 stub -noname DwmpSetColorizationParameters +132 stub -noname DwmpGetCompositionTimingInfoEx 133 stub DwmpDxUpdateWindowRedirectionBltSurface -134 stub @ +134 stub -noname DwmpDxSetContentHostingInformation 135 stub DwmpRenderFlick 136 stub DwmpAllocateSecurityDescriptor 137 stub DwmpFreeSecurityDescriptor

1 0

Alex Henrie : dwmapi: Add stub DwmpGetColorizationParameters.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 32f3918108e1fa911bc3e28f7350940aa56b7b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=32f3918108e1fa911bc3e28f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 23 21:43:39 2018 -0600 dwmapi: Add stub DwmpGetColorizationParameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43177 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 27523b7..23380a9 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -20,7 +20,7 @@ 124 stub -noname DwmpRegisterThumbnail 125 stub DwmpDxBindSwapChain 126 stub DwmpDxUnbindSwapChain -127 stub -noname DwmpGetColorizationParameters +127 stdcall -noname DwmpGetColorizationParameters(ptr) 128 stub DwmpDxgiIsThreadDesktopComposited 129 stub -noname DwmpDxgiDisableRedirection 130 stub -noname DwmpDxgiEnableRedirection diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 76e225f..c1ee067 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -286,3 +286,12 @@ HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); return S_OK; }; + +/********************************************************************** + * DwmpGetColorizationParameters (DWMAPI.@) + */ +HRESULT WINAPI DwmpGetColorizationParameters(void *params) +{ + FIXME("(%p) stub\n", params); + return E_NOTIMPL; +}

1 0

Matteo Bruni : wined3d: Invalidate shader resource bindings when blitting.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: a27dbb2d5c27e6d932fc4b0839d3adb1c9d74a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a27dbb2d5c27e6d932fc4b08… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 23 19:08:50 2018 +0200 wined3d: Invalidate shader resource bindings when blitting. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37abf19..bdd291b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2846,6 +2846,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } context_invalidate_state(context, STATE_SAMPLER(sampler)); } + context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) {

1 0

Nikolay Sivov : dxgi: Add IDXGIAdapter4 stub.
by Alexandre Julliard 24 Oct '18

24 Oct '18

Module: wine Branch: master Commit: 7e7d03ed590af0c3379875bbfe7f717d87224da7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e7d03ed590af0c3379875bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 08:22:02 2018 +0300 dxgi: Add IDXGIAdapter4 stub. 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/d3d11/d3d11_private.h | 1 + dlls/dxgi/adapter.c | 10 ++++++++++ include/wine/winedxgi.idl | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 771e923..787fe87 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -30,6 +30,7 @@ #include "winuser.h" #include "objbase.h" +#include "dxgi1_6.h" #include "d3d11_4.h" #ifdef D3D11_INIT_GUID #include "initguid.h" diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 0079759..a913870 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter4) || IsEqualGUID(iid, &IID_IDXGIAdapter3) || IsEqualGUID(iid, &IID_IDXGIAdapter2) || IsEqualGUID(iid, &IID_IDXGIAdapter1) @@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_SetVideoMemoryReservation, dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent, dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, + /* IDXGIAdapter4 methods */ + dxgi_adapter_GetDesc3, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 3a1d6fa..fccf45d 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi1_5.idl"; +import "dxgi1_6.idl"; [ object, @@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown local, uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) ] -interface IWineDXGIAdapter : IDXGIAdapter3 +interface IWineDXGIAdapter : IDXGIAdapter4 { }

1 0