wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

André Hentschel : shell32: Fix some more spec file entries.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 995a27472e0010c24d968fd22e051c07506732dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=995a27472e0010c24d968fd22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:16 2017 +0100 shell32: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shell-shellfolders-l1-1-0.spec | 2 +- dlls/shell32/shell32.spec | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec index 5860527..a7f752d 100644 --- a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec +++ b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec @@ -2,7 +2,7 @@ @ stdcall PathIsExe(ptr) shell32.PathIsExe @ stdcall SHCreateDirectoryExW(long wstr ptr) shell32.SHCreateDirectoryExW @ stdcall SHGetDesktopFolder(ptr) shell32.SHGetDesktopFolder -@ stdcall SHGetFileInfoW(ptr long ptr long long) shell32.SHGetFileInfoW +@ stdcall SHGetFileInfoW(wstr long ptr long long) shell32.SHGetFileInfoW @ stdcall SHGetFolderLocation(long long long long ptr) shell32.SHGetFolderLocation @ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA @ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) shell32.SHGetFolderPathAndSubDirW diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 0f26a34..f758b3c 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -57,7 +57,7 @@ 59 stdcall -ordinal RestartDialog(long wstr long) 60 stdcall -noname ExitWindowsDialog(long) 61 stdcall -noname RunFileDlg(long long str str str long) RunFileDlgAW - 62 stdcall -ordinal PickIconDlg(long long long ptr) + 62 stdcall -ordinal PickIconDlg(long ptr long ptr) 63 stdcall -ordinal GetFileNameFromBrowse(long ptr long str str str str) GetFileNameFromBrowseAW 64 stdcall -ordinal DriveType(long) 65 stdcall -noname InvalidateDriveType(long) @@ -65,7 +65,7 @@ 67 stdcall -ordinal Shell_MergeMenus(long long long long long long) 68 stdcall -ordinal SHGetSetSettings(ptr long long) 69 stub -noname SHGetNetResource - 70 stdcall -noname SHCreateDefClassObject(long long long ptr long) + 70 stdcall -noname SHCreateDefClassObject(ptr ptr long ptr ptr) 71 stdcall -ordinal Shell_GetImageLists(ptr ptr) 72 stdcall -ordinal Shell_GetCachedImageIndex(str long long) Shell_GetCachedImageIndexAW 73 stdcall -ordinal SHShellFolderView_Message(long long long) @@ -118,7 +118,7 @@ 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) - 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) + 126 stdcall -noname SHOutOfMemoryMessageBox(long str long) 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject 129 stdcall -ordinal DAD_AutoScroll(long ptr ptr) @@ -155,11 +155,11 @@ 163 stdcall -noname StrToOleStr(wstr str) StrToOleStrAW 164 stdcall -ordinal Win32DeleteFile(str) Win32DeleteFileAW 165 stdcall -ordinal SHCreateDirectory(long ptr) - 166 stdcall -noname CallCPLEntry16(long long long long long long) - 167 stdcall -ordinal SHAddFromPropSheetExtArray(long long long) + 166 stdcall -noname CallCPLEntry16(long ptr long long long long) + 167 stdcall -ordinal SHAddFromPropSheetExtArray(long ptr long) 168 stdcall -ordinal SHCreatePropSheetExtArray(long wstr long) 169 stdcall -ordinal SHDestroyPropSheetExtArray(long) - 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long long long) + 170 stdcall -ordinal SHReplaceFromPropSheetExtArray(long long ptr long) 171 stdcall -ordinal PathCleanupSpec(ptr ptr) 172 stdcall -noname SHCreateLinks(long str ptr long ptr) 173 stdcall -ordinal SHValidateUNC(long wstr long) @@ -173,7 +173,7 @@ 181 stdcall -noname RegisterShellHook(long long) 182 varargs -ordinal ShellMessageBoxW(long long wstr wstr long) 183 varargs -ordinal ShellMessageBoxA(long long str str long) - 184 stdcall -noname ArrangeWindows(long long ptr long long) + 184 stdcall -noname ArrangeWindows(long long ptr long ptr) 185 stub SHHandleDiskFull 186 stdcall -noname ILGetDisplayNameEx(ptr ptr ptr long) 187 stub ILGetPseudoNameW @@ -300,7 +300,7 @@ @ stdcall ExtractAssociatedIconExW(long wstr ptr ptr) @ stdcall ExtractAssociatedIconW(long wstr ptr) @ stdcall ExtractIconA(long str long) -@ stdcall ExtractIconEx(ptr long ptr ptr long) ExtractIconExA +@ stdcall ExtractIconEx(str long ptr ptr long) ExtractIconExA @ stdcall ExtractIconExA(str long ptr ptr long) @ stdcall ExtractIconExW(wstr long ptr ptr long) @ stub ExtractIconResInfoA @@ -365,9 +365,9 @@ @ stdcall SHGetDiskFreeSpaceA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA @ stdcall SHGetDiskFreeSpaceExA(str ptr ptr ptr) kernel32.GetDiskFreeSpaceExA @ stdcall SHGetDiskFreeSpaceExW(wstr ptr ptr ptr) kernel32.GetDiskFreeSpaceExW -@ stdcall SHGetFileInfo(ptr long ptr long long) SHGetFileInfoA -@ stdcall SHGetFileInfoA(ptr long ptr long long) -@ stdcall SHGetFileInfoW(ptr long ptr long long) +@ stdcall SHGetFileInfo(str long ptr long long) SHGetFileInfoA +@ stdcall SHGetFileInfoA(str long ptr long long) +@ stdcall SHGetFileInfoW(wstr long ptr long long) @ stdcall SHGetFolderLocation(long long long long ptr) @ stdcall SHGetFolderPathA(long long long long ptr) @ stdcall SHGetFolderPathEx(ptr long ptr ptr long) @@ -404,7 +404,7 @@ @ stub SHInvokePrinterCommandA @ stub SHInvokePrinterCommandW @ stdcall SHIsFileAvailableOffline(wstr ptr) -@ stdcall SHLoadInProc(long) +@ stdcall SHLoadInProc(ptr) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() @ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) @ stdcall SHParseDisplayName(wstr ptr ptr long ptr)

1 0

André Hentschel : wintrust: Fix CryptCATAdminAcquireContext spec file entry.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: f1dfc53ba2469c81c38024715101b8afa2d1f640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1dfc53ba2469c81c38024715… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:13 2017 +0100 wintrust: Fix CryptCATAdminAcquireContext spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/wintrust.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index b0332cf..b8c70ad 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -1,6 +1,6 @@ @ stub AddPersonalTrustDBPages @ stub CatalogCompactHashDatabase -@ stdcall CryptCATAdminAcquireContext(long ptr long) +@ stdcall CryptCATAdminAcquireContext(ptr ptr long) @ stdcall CryptCATAdminAddCatalog(long wstr wstr long) @ stdcall CryptCATAdminCalcHashFromFileHandle(long ptr ptr long) @ stdcall CryptCATAdminEnumCatalogFromHash(long ptr long long ptr)

1 0

André Hentschel : ntoskrnl.exe: Fix some spec file entries.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 96b443ae396d0c4d68a8eb9b2f15061e1cacf15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b443ae396d0c4d68a8eb9b2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:11 2017 +0100 ntoskrnl.exe: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index efa69fe..62c7fb4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -304,7 +304,7 @@ @ stub InbvSolidColorFill @ extern InitSafeBootMode @ stdcall IoAcquireCancelSpinLock(ptr) -@ stdcall IoAcquireRemoveLockEx(ptr ptr ptr long long) +@ stdcall IoAcquireRemoveLockEx(ptr ptr str long long) @ stub IoAcquireVpbSpinLock @ stub IoAdapterObjectType @ stub IoAllocateAdapterChannel @@ -339,7 +339,7 @@ @ stdcall IoCreateDevice(ptr long ptr long long long ptr) @ stub IoCreateDisk @ stdcall IoCreateDriver(ptr ptr) -@ stdcall IoCreateFile(ptr long ptr ptr long long long ptr long long ptr long ptr long) +@ stdcall IoCreateFile(ptr long ptr ptr ptr long long long long ptr long long ptr long) @ stub IoCreateFileSpecifyDeviceObjectHint @ stub IoCreateNotificationEvent @ stub IoCreateStreamFileObject

1 0

André Hentschel : setupapi: Fix some more spec file entries.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: a0ec931a1b571b4bbb2d64d4c2b6404f5a608fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec931a1b571b4bbb2d64d4c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:27:59 2017 +0100 setupapi: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index ab2090d..12de7da 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -286,7 +286,7 @@ @ stdcall SetupDiClassGuidsFromNameExW(wstr ptr long ptr wstr ptr) @ stdcall SetupDiClassGuidsFromNameW(wstr ptr long ptr) @ stdcall SetupDiClassNameFromGuidA(ptr str long ptr) -@ stdcall SetupDiClassNameFromGuidExA(ptr str long ptr wstr ptr) +@ stdcall SetupDiClassNameFromGuidExA(ptr str long ptr str ptr) @ stdcall SetupDiClassNameFromGuidExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr) @ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str) @@ -298,8 +298,8 @@ @ stdcall SetupDiCreateDeviceInfoW(long wstr ptr wstr long long ptr) @ stdcall SetupDiCreateDeviceInterfaceA(ptr ptr ptr str long ptr) @ stdcall SetupDiCreateDeviceInterfaceW(ptr ptr ptr wstr long ptr) -@ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr ptr) -@ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr ptr) +@ stdcall SetupDiCreateDeviceInterfaceRegKeyA(ptr ptr long long ptr str) +@ stdcall SetupDiCreateDeviceInterfaceRegKeyW(ptr ptr long long ptr wstr) @ stdcall SetupDiDeleteDevRegKey(ptr ptr long long long) @ stdcall SetupDiDeleteDeviceInfo(ptr ptr) @ stub SetupDiDeleteDeviceInterfaceData @@ -322,10 +322,10 @@ @ stdcall SetupDiGetClassDescriptionW(ptr wstr long ptr) @ stub SetupDiGetClassDevPropertySheetsA @ stub SetupDiGetClassDevPropertySheetsW -@ stdcall SetupDiGetClassDevsA(ptr ptr long long) +@ stdcall SetupDiGetClassDevsA(ptr str long long) @ stdcall SetupDiGetClassDevsExA(ptr str ptr long ptr str ptr) @ stdcall SetupDiGetClassDevsExW(ptr wstr ptr long ptr wstr ptr) -@ stdcall SetupDiGetClassDevsW(ptr ptr long long) +@ stdcall SetupDiGetClassDevsW(ptr wstr long long) @ stdcall SetupDiGetClassImageIndex(ptr ptr ptr) @ stdcall SetupDiGetClassImageList(ptr) @ stub SetupDiGetClassImageListExA

1 0

Alexandre Julliard : include: Add back a typecast that's needed for C++.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 70d8503d5ec602be0dd9f5e390f703402bdd5edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=70d8503d5ec602be0dd9f5e39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 23 12:54:29 2017 +0100 include: Add back a typecast that's needed for C++. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index de7622f..450499c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5438,7 +5438,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE static FORCEINLINE void *RtlSecureZeroMemory(void *buffer, SIZE_T length) { - volatile char *ptr = buffer; + volatile char *ptr = (volatile char *)buffer; while (length--) *ptr++ = 0; return buffer;

1 0

André Hentschel : widl: Initialize decoded_size.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 028b2bddfcd2e7ccb9e3243c07c7a96f625a1537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=028b2bddfcd2e7ccb9e3243c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:01:28 2017 +0100 widl: Initialize decoded_size. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 137bb2d..7904e45 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -798,6 +798,7 @@ static int encode_type( if (!alignment) alignment = &scratch; if (!decoded_size) decoded_size = &scratch; + *decoded_size = 0; switch (vt) { case VT_I1:

1 0

Henri Verbeet : d2d1: Create open, hollow geometry in d2d_d3d_render_target_DrawLine().
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 0be8d44665ec6d31ecb555896b37dc97c7bc125d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be8d44665ec6d31ecb555896… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:28 2017 +0100 d2d1: Create open, hollow geometry in d2d_d3d_render_target_DrawLine(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 4 ++-- dlls/d2d1/tests/d2d1.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f9e2e3a..a9f7485 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -494,9 +494,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget * return; } - ID2D1GeometrySink_BeginFigure(sink, p0, D2D1_FIGURE_BEGIN_FILLED); + ID2D1GeometrySink_BeginFigure(sink, p0, D2D1_FIGURE_BEGIN_HOLLOW); ID2D1GeometrySink_AddLine(sink, p1); - ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_OPEN); if (FAILED(hr = ID2D1GeometrySink_Close(sink))) WARN("Close() failed, %#x.\n", hr); ID2D1GeometrySink_Release(sink); diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4119149..941c938 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -3749,23 +3749,23 @@ static void test_draw_geometry(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, ""); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 160, 0, 160, 160, 0xff652e89, 0, "yGBQUFBQUFBQUFDoYQAA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 320, 0, 160, 160, 0xff652e89, 0, "xjIUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" "jAEUjAEUjAEUjAEUxjIA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 480, 0, 160, 160, 0xff652e89, 2, "zjECnQETjAEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" "igEVigEVigEVigEVjAETnQECzjEA"); - todo_wine ok(match, "Figure does not match.\n"); + ok(match, "Figure does not match.\n"); match = compare_figure(surface, 0, 160, 160, 160, 0xff652e89, 0, "5mAUjAEUjAEUjAEUjAEUhmIA"); todo_wine ok(match, "Figure does not match.\n");

1 0

Henri Verbeet : d2d1/tests: Add tests for drawing simple shapes.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: d7fb78184f29c7e8da690d6f3fea5bab8828dd1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fb78184f29c7e8da690d6f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:27 2017 +0100 d2d1/tests: Add tests for drawing simple shapes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 106 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 19efd73..4119149 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -71,6 +71,13 @@ static void set_rect_u(D2D1_RECT_U *rect, UINT32 left, UINT32 top, UINT32 right, rect->bottom = bottom; } +static void set_ellipse(D2D1_ELLIPSE *ellipse, float x, float y, float rx, float ry) +{ + set_point(&ellipse->point, x, y); + ellipse->radiusX = rx; + ellipse->radiusY = ry; +} + static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) { color->r = r; @@ -486,6 +493,7 @@ static BOOL compare_figure(IDXGISurface *surface, unsigned int x, unsigned int y } if (diff > max_diff) { + trace("diff %u > max_diff %u.\n", diff, max_diff); read_figure(&figure, mapped_texture.pData, mapped_texture.RowPitch, x, y, w, h, prev); serialize_figure(&figure); } @@ -3675,6 +3683,8 @@ static void test_draw_geometry(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Factory *factory; + D2D1_POINT_2F p0, p1; + D2D1_ELLIPSE ellipse; D2D1_COLOR_F color; D2D1_RECT_F rect; ULONG refcount; @@ -3701,6 +3711,102 @@ static void test_draw_geometry(void) hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + ID2D1RenderTarget_BeginDraw(rt); + set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + set_point(&p0, 40.0f, 160.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p0, (ID2D1Brush *)brush, 10.0f, NULL); + set_point(&p0, 100.0f, 160.0f); + set_point(&p1, 140.0f, 160.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p1, (ID2D1Brush *)brush, 10.0f, NULL); + set_point(&p0, 200.0f, 80.0f); + set_point(&p1, 200.0f, 240.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p1, (ID2D1Brush *)brush, 10.0f, NULL); + set_point(&p0, 260.0f, 240.0f); + set_point(&p1, 300.0f, 80.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p1, (ID2D1Brush *)brush, 10.0f, NULL); + + set_rect(&rect, 40.0f, 480.0f, 40.0f, 480.0f); + ID2D1RenderTarget_DrawRectangle(rt, &rect, (ID2D1Brush *)brush, 10.0f, NULL); + set_rect(&rect, 100.0f, 480.0f, 140.0f, 480.0f); + ID2D1RenderTarget_DrawRectangle(rt, &rect, (ID2D1Brush *)brush, 10.0f, NULL); + set_rect(&rect, 200.0f, 400.0f, 200.0f, 560.0f); + ID2D1RenderTarget_DrawRectangle(rt, &rect, (ID2D1Brush *)brush, 10.0f, NULL); + set_rect(&rect, 260.0f, 560.0f, 300.0f, 400.0f); + ID2D1RenderTarget_DrawRectangle(rt, &rect, (ID2D1Brush *)brush, 10.0f, NULL); + + set_ellipse(&ellipse, 40.0f, 800.0f, 0.0f, 0.0f); + ID2D1RenderTarget_DrawEllipse(rt, &ellipse, (ID2D1Brush *)brush, 10.0f, NULL); + set_ellipse(&ellipse, 120.0f, 800.0f, 20.0f, 0.0f); + ID2D1RenderTarget_DrawEllipse(rt, &ellipse, (ID2D1Brush *)brush, 10.0f, NULL); + set_ellipse(&ellipse, 200.0f, 800.0f, 0.0f, 80.0f); + ID2D1RenderTarget_DrawEllipse(rt, &ellipse, (ID2D1Brush *)brush, 10.0f, NULL); + set_ellipse(&ellipse, 280.0f, 800.0f, 20.0f, 80.0f); + ID2D1RenderTarget_DrawEllipse(rt, &ellipse, (ID2D1Brush *)brush, 10.0f, NULL); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + + match = compare_figure(surface, 0, 0, 160, 160, 0xff652e89, 0, ""); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 0, 160, 160, 0xff652e89, 0, "yGBQUFBQUFBQUFDoYQAA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 320, 0, 160, 160, 0xff652e89, 0, + "xjIUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUxjIA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 480, 0, 160, 160, 0xff652e89, 2, + "zjECnQETjAEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" + "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" + "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" + "igEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEVigEV" + "igEVigEVigEVigEVjAETnQECzjEA"); + todo_wine ok(match, "Figure does not match.\n"); + + match = compare_figure(surface, 0, 160, 160, 160, 0xff652e89, 0, "5mAUjAEUjAEUjAEUjAEUhmIA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 160, 160, 160, 0xff652e89, 0, "vmBkPGQ8ZDxkPGTeYQAA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 320, 160, 160, 160, 0xff652e89, 0, + "5i4UjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUhjAA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 480, 160, 160, 160, 0xff652e89, 0, + "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" + "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" + "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" + "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" + "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" + "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8ZDxkPGQ8ZDxk3i8A"); + ok(match, "Figure does not match.\n"); + + match = compare_figure(surface, 0, 320, 160, 160, 0xff652e89, 0, "iGIQjgEUjAEUjgEQiGIA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 160, 320, 160, 160, 0xff652e89, 0, "yGBQSGA+ZDxkPmDgYQAA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 320, 320, 160, 160, 0xff652e89, 0, + "iDAQjgEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEUjAEU" + "jAEUjAEUjAEUjAEUjAEUjAEUjAEUjgEQiDAA"); + todo_wine ok(match, "Figure does not match.\n"); + match = compare_figure(surface, 480, 320, 160, 160, 0xff652e89, 10, + "hDAYgwEieyh1LnAybBcIF2gWDhZkFhIWYRUWFV4VGhVbFRwVWRUeFVcVIBVVFCQUUxQmFFEUKBRP" + "FSgVTRUqFUwULBRLFC4USRQwFEgUMBRHFDIURhQyFEUUNBREFDQUQxQ2FEIUNhRBFDgUQBQ4FEAU" + "OBQ/FDoUPhQ6FD4UOhQ+FDoUPhQ6FD0UPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" + "FDwUPBQ8FDwUPBQ8FD0UOhQ+FDoUPhQ6FD4UOhQ+FDoUPxQ4FEAUOBRAFDgUQRQ2FEIUNhRDFDQU" + "RBQ0FEUUMhRGFDIURxQwFEgUMBRJFC4USxQsFEwVKhVNFSgVTxQoFFEUJhRTFCQUVRUgFVcVHhVZ" + "FRwVWxUaFV4VFhVhFhIWZBYOFmgXCBdsMnAudSh7IoMBGIQw"); + todo_wine ok(match, "Figure does not match.\n"); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); hr = ID2D1PathGeometry_Open(geometry, &sink); @@ -3778,7 +3884,6 @@ static void test_draw_geometry(void) ID2D1GeometrySink_Release(sink); ID2D1RenderTarget_BeginDraw(rt); - set_color(&color, 0.396f, 0.180f, 0.537f, 1.0f); ID2D1RenderTarget_Clear(rt, &color); ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, 5.0f, NULL); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);

1 0

Henri Verbeet : wined3d: Validate WINED3D_LOCATION_BUFFER on WINED3D_MAP_DISCARD buffer maps.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 4aea36184d0ae39f8c6eede0d6d13bf75841cdc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aea36184d0ae39f8c6eede0d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:26 2017 +0100 wined3d: Validate WINED3D_LOCATION_BUFFER on WINED3D_MAP_DISCARD buffer maps. Usually when doing a WINED3D_MAP_DISCARD map on a buffer with a buffer object WINED3D_LOCATION_BUFFER will already be current. However, if the previous map on that buffer loaded WINED3D_LOCATION_SYSMEM, that's not necessarily true. This also brings the code further in line with the corresponding code for textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 91ab130..0c172d0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1054,7 +1054,9 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI context = context_acquire(device, NULL, 0); gl_info = context->gl_info; - if (!(flags & WINED3D_MAP_DISCARD)) + if (flags & WINED3D_MAP_DISCARD) + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + else wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); if (!(flags & WINED3D_MAP_READONLY))

1 0

Henri Verbeet : wined3d: Copy the shader byte-code before initialising the front-end.
by Alexandre Julliard 23 Feb '17

23 Feb '17

Module: wine Branch: master Commit: 67007e010e83ac8c7c72eca196be8a6dc4cb58ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=67007e010e83ac8c7c72eca19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:25 2017 +0100 wined3d: Copy the shader byte-code before initialising the front-end. This fixes a regression introduced by commit 12f5887a2358b4f91a882eeac57c9f1dd28c50ba. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 88 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 519d029..3b5d6ee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -866,7 +866,7 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, - struct wined3d_shader_signature *output_signature, const DWORD *byte_code, DWORD constf_size) + struct wined3d_shader_signature *output_signature, DWORD constf_size) { struct wined3d_shader_signature_element input_signature_elements[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature_elements[MAX_REG_OUTPUT]; @@ -1412,8 +1412,6 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (shader_version.major < 2 && shader_version.type == WINED3D_SHADER_TYPE_PIXEL) reg_maps->rt_mask |= (1u << 0); - shader->functionLength = ((const char *)ptr - (const char *)byte_code); - if (input_signature->elements) { for (i = 0; i < input_signature->element_count; ++i) @@ -2856,9 +2854,8 @@ const struct wined3d_shader_backend_ops none_shader_backend = shader_none_has_ffp_proj_control, }; -static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *byte_code, - size_t byte_code_size, enum wined3d_shader_byte_code_format format, - DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version) +static HRESULT shader_set_function(struct wined3d_shader *shader, DWORD float_const_count, + enum wined3d_shader_type type, unsigned int max_version) { struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_frontend *fe; @@ -2866,24 +2863,12 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b unsigned int backend_version; const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info; - TRACE("shader %p, byte_code %p, byte_code_size %#lx, format %#x, " - "float_const_count %u, type %#x, max_version %u.\n", - shader, byte_code, (long)byte_code_size, format, float_const_count, type, max_version); - - list_init(&shader->constantsF); - list_init(&shader->constantsB); - list_init(&shader->constantsI); - shader->lconst_inf_or_nan = FALSE; - list_init(&reg_maps->indexable_temps); + TRACE("shader %p, float_const_count %u, type %#x, max_version %u.\n", + shader, float_const_count, type, max_version); - if (!(fe = shader_select_frontend(format))) - { - FIXME("Unable to find frontend for shader.\n"); - return WINED3DERR_INVALIDCALL; - } - shader->frontend = fe; - shader->frontend_data = fe->shader_init(byte_code, byte_code_size, &shader->output_signature); - if (!shader->frontend_data) + fe = shader->frontend; + if (!(shader->frontend_data = fe->shader_init(shader->function, + shader->functionLength, &shader->output_signature))) { FIXME("Failed to initialize frontend.\n"); return WINED3DERR_INVALIDCALL; @@ -2895,7 +2880,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b /* Second pass: figure out which registers are used, what the semantics are, etc. */ if (FAILED(hr = shader_get_registers_used(shader, fe, reg_maps, &shader->input_signature, - &shader->output_signature, byte_code, float_const_count))) + &shader->output_signature, float_const_count))) return hr; if (reg_maps->shader_version.type != type) @@ -2939,10 +2924,6 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b return WINED3DERR_INVALIDCALL; } - if (!(shader->function = HeapAlloc(GetProcessHeap(), 0, shader->functionLength))) - return E_OUTOFMEMORY; - memcpy(shader->function, byte_code, shader->functionLength); - return WINED3D_OK; } @@ -3145,14 +3126,24 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device void *parent, const struct wined3d_parent_ops *parent_ops) { struct wined3d_shader_signature_element *e; + size_t byte_code_size; SIZE_T total, len; unsigned int i; HRESULT hr; char *ptr; + TRACE("byte_code %p, byte_code_size %#lx, format %#x, max_version %#x.\n", + desc->byte_code, (long)desc->byte_code_size, desc->format, desc->max_version); + if (!desc->byte_code) return WINED3DERR_INVALIDCALL; + if (!(shader->frontend = shader_select_frontend(desc->format))) + { + FIXME("Unable to find frontend for shader.\n"); + return WINED3DERR_INVALIDCALL; + } + shader->ref = 1; shader->device = device; shader->parent = parent; @@ -3194,10 +3185,47 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device } list_init(&shader->linked_programs); + list_init(&shader->constantsF); + list_init(&shader->constantsB); + list_init(&shader->constantsI); + shader->lconst_inf_or_nan = FALSE; + list_init(&shader->reg_maps.indexable_temps); list_add_head(&device->shaders, &shader->shader_list_entry); - if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->byte_code_size, - desc->format, float_const_count, type, desc->max_version))) + byte_code_size = desc->byte_code_size; + if (byte_code_size == ~(size_t)0) + { + const struct wined3d_shader_frontend *fe = shader->frontend; + struct wined3d_shader_version shader_version; + struct wined3d_shader_instruction ins; + const DWORD *ptr; + void *fe_data; + + if (!(fe_data = fe->shader_init(desc->byte_code, byte_code_size, &shader->output_signature))) + { + WARN("Failed to initialise frontend data.\n"); + shader_cleanup(shader); + return WINED3DERR_INVALIDCALL; + } + + fe->shader_read_header(fe_data, &ptr, &shader_version); + while (!fe->shader_is_end(fe_data, &ptr)) + fe->shader_read_instruction(fe_data, &ptr, &ins); + + fe->shader_free(fe_data); + + byte_code_size = (ptr - desc->byte_code) * sizeof(*ptr); + } + + if (!(shader->function = HeapAlloc(GetProcessHeap(), 0, byte_code_size))) + { + shader_cleanup(shader); + return E_OUTOFMEMORY; + } + memcpy(shader->function, desc->byte_code, byte_code_size); + shader->functionLength = byte_code_size; + + if (FAILED(hr = shader_set_function(shader, float_const_count, type, desc->max_version))) { WARN("Failed to set function, hr %#x.\n", hr); shader_cleanup(shader);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
84
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 February 2017