April 2019 - Wine-Commits - list.winehq.org

Martin Storsjo : msvcrt: Hook up the unprefixed logb/logbf/ logbl functions for msvcr120/ucrtbase.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 85826158947637f790b68742a5448c483f47234f URL: https://source.winehq.org/git/wine.git/?a=commit;h=85826158947637f790b68742… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Apr 23 13:46:57 2019 +0300 msvcrt: Hook up the unprefixed logb/logbf/logbl functions for msvcr120/ucrtbase. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 22 +++++++++++----------- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index a9deec8..75ecaf1 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -276,9 +276,9 @@ @ cdecl log2(double) ucrtbase.log2 @ cdecl log2f(float) ucrtbase.log2f @ cdecl log2l(double) ucrtbase.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) ucrtbase.logb +@ cdecl logbf(float) ucrtbase.logbf +@ cdecl logbl(double) ucrtbase.logbl @ cdecl -arch=arm,x86_64,arm64 logf(float) ucrtbase.logf @ cdecl lrint(double) ucrtbase.lrint @ cdecl lrintf(float) ucrtbase.lrintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 618b9bc..68284c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2265,9 +2265,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCRT__logb +@ cdecl logbf(float) MSVCRT__logbf +@ cdecl logbl(double) MSVCRT__logb @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint @ cdecl lrintf(float) MSVCR120_lrintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 26ffaf7..a9c21cb 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1928,9 +1928,9 @@ @ cdecl log2(double) msvcr120.log2 @ cdecl log2f(float) msvcr120.log2f @ cdecl log2l(double) msvcr120.log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) msvcr120.logb +@ cdecl logbf(float) msvcr120.logbf +@ cdecl logbl(double) msvcr120.logbl @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) msvcr120.longjmp @ cdecl lrint(double) msvcr120.lrint @ cdecl lrintf(float) msvcr120.lrintf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 21f1f9b..fdd664d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -157,6 +157,17 @@ float CDECL MSVCRT__nextafterf( float num, float next ) return nextafterf( num, next ); } +/********************************************************************* + * _logbf (MSVCRT.@) + */ +float CDECL MSVCRT__logbf( float num ) +{ + float ret = logbf(num); + if (isnan(num)) math_error(_DOMAIN, "_logbf", num, 0, ret); + else if (!num) math_error(_SING, "_logbf", num, 0, ret); + return ret; +} + #endif #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) @@ -180,17 +191,6 @@ INT CDECL MSVCRT__isnanf( float num ) } /********************************************************************* - * _logbf (MSVCRT.@) - */ -float CDECL MSVCRT__logbf( float num ) -{ - float ret = logbf(num); - if (isnan(num)) math_error(_DOMAIN, "_logbf", num, 0, ret); - else if (!num) math_error(_SING, "_logbf", num, 0, ret); - return ret; -} - -/********************************************************************* * MSVCRT_acosf (MSVCRT.@) */ float CDECL MSVCRT_acosf( float x ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1866f1b..b7f814a 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2398,9 +2398,9 @@ @ cdecl log2(double) MSVCR120_log2 @ cdecl log2f(float) MSVCR120_log2f @ cdecl log2l(double) MSVCR120_log2l -@ stub logb -@ stub logbf -@ stub logbl +@ cdecl logb(double) MSVCRT__logb +@ cdecl logbf(float) MSVCRT__logbf +@ cdecl logbl(double) MSVCRT__logb @ cdecl -arch=arm,x86_64,arm64 logf(float) MSVCRT_logf @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl lrint(double) MSVCR120_lrint

1 0

Michael Müller : avifile.dll16: Correctly convert result of AVIStreamGetFrame to a segptr.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 9fd1ec632720fa684b3e38c2f90833c71c6876a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd1ec632720fa684b3e38c2… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 25 09:12:25 2019 +0200 avifile.dll16: Correctly convert result of AVIStreamGetFrame to a segptr. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/Makefile.in | 3 + dlls/avifile.dll16/avifile.dll16.spec | 6 +- dlls/avifile.dll16/main.c | 133 ++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 3 deletions(-) diff --git a/dlls/avifile.dll16/Makefile.in b/dlls/avifile.dll16/Makefile.in index 6050c6c..4152c2f 100644 --- a/dlls/avifile.dll16/Makefile.in +++ b/dlls/avifile.dll16/Makefile.in @@ -1,3 +1,6 @@ MODULE = avifile.dll16 IMPORTS = avifil32 EXTRADLLFLAGS = -m16 -Wb,--main-module,avifil32.dll + +C_SRCS = \ + main.c diff --git a/dlls/avifile.dll16/avifile.dll16.spec b/dlls/avifile.dll16/avifile.dll16.spec index 239d3a4..2b5fb91 100644 --- a/dlls/avifile.dll16/avifile.dll16.spec +++ b/dlls/avifile.dll16/avifile.dll16.spec @@ -20,9 +20,9 @@ 105 stub AVIMAKECOMPRESSEDSTREAM 106 stub AVIMAKEFILEFROMSTREAMS 107 stub AVIMAKESTREAMFROMCLIPBOARD -110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame -111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose -112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen +110 pascal AVIStreamGetFrame(long long) AVIStreamGetFrame16 +111 pascal AVIStreamGetFrameClose(long) AVIStreamGetFrameClose16 +112 pascal AVIStreamGetFrameOpen(long ptr) AVIStreamGetFrameOpen16 120 stub _AVISAVE 121 stub AVISAVEV 122 stub AVISAVEOPTIONS diff --git a/dlls/avifile.dll16/main.c b/dlls/avifile.dll16/main.c new file mode 100644 index 0000000..9e1faac --- /dev/null +++ b/dlls/avifile.dll16/main.c @@ -0,0 +1,133 @@ +/* + * Wrapper for 16 bit avifile functions + * + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/winbase16.h" +#include "winternl.h" +#include "wingdi.h" +#include "vfw.h" + +struct frame_wrapper16 +{ + PGETFRAME pg; + PVOID ptr; + DWORD size; + WORD sel; + WORD count; +}; + +static void free_segptr_frame(struct frame_wrapper16 *wrapper) +{ + int i; + + if (!wrapper->sel) + return; + + for (i = 0; i < wrapper->count; i++) + FreeSelector16(wrapper->sel + (i << __AHSHIFT)); + + wrapper->sel = 0; +} + +static SEGPTR alloc_segptr_frame(struct frame_wrapper16 *wrapper, void *ptr, DWORD size) +{ + int i; + + if (wrapper->sel) + { + if (wrapper->ptr == ptr && wrapper->size == size) + return MAKESEGPTR(wrapper->sel, 0); + free_segptr_frame(wrapper); + } + + wrapper->ptr = ptr; + wrapper->size = size; + wrapper->count = (size + 0xffff) / 0x10000; + wrapper->sel = AllocSelectorArray16(wrapper->count); + if (!wrapper->sel) + return 0; + + for (i = 0; i < wrapper->count; i++) + { + SetSelectorBase(wrapper->sel + (i << __AHSHIFT), (DWORD)ptr + i * 0x10000); + SetSelectorLimit16(wrapper->sel + (i << __AHSHIFT), size - 1); + size -= 0x10000; + } + + return MAKESEGPTR(wrapper->sel, 0); +} + +/*********************************************************************** + * AVIStreamGetFrameOpen (AVIFILE.112) + */ +PGETFRAME WINAPI AVIStreamGetFrameOpen16(PAVISTREAM pstream, LPBITMAPINFOHEADER lpbiWanted) +{ + struct frame_wrapper16 *wrapper; + PGETFRAME pg; + + pg = AVIStreamGetFrameOpen(pstream, lpbiWanted); + if (!pg) return NULL; + + wrapper = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wrapper)); + if (!wrapper) + { + AVIStreamGetFrameClose(pg); + return NULL; + } + + wrapper->pg = pg; + return (PGETFRAME)wrapper; +} + +/*********************************************************************** + * AVIStreamGetFrame (AVIFILE.110) + */ +SEGPTR WINAPI AVIStreamGetFrame16(PGETFRAME pg, LONG pos) +{ + struct frame_wrapper16 *wrapper = (void *)pg; + BITMAPINFOHEADER *bih; + + if (!pg) return 0; + + bih = AVIStreamGetFrame(wrapper->pg, pos); + if (bih) + { + DWORD size = bih->biSize + bih->biSizeImage; + return alloc_segptr_frame(wrapper, bih, size); + } + + return 0; +} + + +/*********************************************************************** + * AVIStreamGetFrameClose (AVIFILE.111) + */ +HRESULT WINAPI AVIStreamGetFrameClose16(PGETFRAME pg) +{ + struct frame_wrapper16 *wrapper = (void *)pg; + HRESULT hr; + + if (!pg) return S_OK; + + hr = AVIStreamGetFrameClose(wrapper->pg); + free_segptr_frame(wrapper); + HeapFree(GetProcessHeap(), 0, wrapper); + return hr; +}

1 0

Dmitry Timoshkov : kernel32: Add MapUserPhysicalPages stub.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: f80059544b9a0cd793b7a93f669ddf1f7ee74796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f80059544b9a0cd793b7a93f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 12:46:14 2019 +0800 kernel32: Add MapUserPhysicalPages stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-2.spec | 2 +- dlls/kernel32/heap.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- include/winbase.h | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec index 9d96da9..85fd48b 100644 --- a/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec +++ b/dlls/api-ms-win-core-memory-l1-1-2/api-ms-win-core-memory-l1-1-2.spec @@ -11,7 +11,7 @@ @ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch -@ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) kernel32.MapUserPhysicalPages @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileFromApp diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e68420a..31931af 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1491,3 +1491,11 @@ BOOL WINAPI FreeUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *u SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI MapUserPhysicalPages(PVOID addr, ULONG_PTR page_count, PULONG_PTR pages) +{ + FIXME("(%p, %lu, %p): stub\n", addr, page_count, pages); + *pages = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 75e7cc5..295a4db 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1076,7 +1076,7 @@ @ stdcall -i386 -private MapLS(ptr) krnl386.exe16.MapLS @ stdcall -i386 -private MapSL(long) krnl386.exe16.MapSL @ stdcall -i386 -private MapSLFix(long) krnl386.exe16.MapSLFix -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) # @ stub MapUserPhysicalPagesScatter @ stdcall MapViewOfFile(long long long long long) @ stdcall MapViewOfFileEx(long long long long long ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ac6fc12..22ea65f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -948,7 +948,7 @@ @ stdcall MakeSelfRelativeSD(ptr ptr ptr) advapi32.MakeSelfRelativeSD @ stdcall MapGenericMask(ptr ptr) advapi32.MapGenericMask # @ stub MapPredefinedHandleInternal -# @ stub MapUserPhysicalPages +@ stdcall MapUserPhysicalPages(ptr long ptr) kernel32.MapUserPhysicalPages @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx @ stub MapViewOfFileExNuma diff --git a/include/winbase.h b/include/winbase.h index c2e216c..6c97afe 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2435,6 +2435,7 @@ WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_ WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); +WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); WINBASEAPI BOOL WINAPI MoveFileA(LPCSTR,LPCSTR);

1 0

Jacek Caban : server: Ensure that IRP_MJ_CLOSE is queued only once.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: a77a1a543373826f92964359a788a8a2f6fa2bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77a1a543373826f92964359… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:54:58 2019 +0200 server: Ensure that IRP_MJ_CLOSE is queued only once. Client may alloc new handle inside IRP_MJ_CLOSE handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/device.c b/server/device.c index 0bb2757..7037a2c 100644 --- a/server/device.c +++ b/server/device.c @@ -171,6 +171,7 @@ struct device_file struct device *device; /* device for this file */ struct fd *fd; /* file descriptor for irp */ client_ptr_t user_ptr; /* opaque ptr for client side */ + int closed; /* closed file flag */ struct list entry; /* entry in device list */ struct list requests; /* list of pending irp requests */ }; @@ -430,6 +431,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if (!(file = alloc_object( &device_file_ops ))) return NULL; file->device = (struct device *)grab_object( device ); + file->closed = 0; file->user_ptr = 0; list_init( &file->requests ); list_add_tail( &device->files, &file->entry ); @@ -496,11 +498,12 @@ static int device_file_close_handle( struct object *obj, struct process *process { struct device_file *file = (struct device_file *)obj; - if (file->device->manager && obj->handle_count == 1) /* last handle */ + if (!file->closed && file->device->manager && obj->handle_count == 1) /* last handle */ { struct irp_call *irp; irp_params_t params; + file->closed = 1; memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE;

1 0

Akihiro Sagawa : comctl32/edit: Implement WM_SETFONT margins in the CJK case.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 7f5f590d271862ac5cf2036245e5987c840a478c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f5f590d271862ac5cf20362… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:49 2019 +0900 comctl32/edit: Implement WM_SETFONT margins in the CJK case. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 30 ++++++++++++++++++++++++++++-- dlls/comctl32/tests/edit.c | 2 -- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index fc3742d..54a5d2b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3708,6 +3708,29 @@ static void EDIT_WM_SetFocus(HTHEME theme, EDITSTATE *es) } +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!(tm->tmPitchAndFamily & (TMPF_VECTOR | TMPF_TRUETYPE))) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!is_cjk(hdc)) + return MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO); + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left ) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + /********************************************************************* * * WM_SETFONT @@ -3723,6 +3746,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) HDC dc; HFONT old_font = 0; RECT clientRect; + DWORD margins; es->font = font; EDIT_InvalidateUniscribeData(es); @@ -3732,6 +3756,7 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) GetTextMetricsW(dc, &tm); es->line_height = tm.tmHeight; es->char_width = tm.tmAveCharWidth; + margins = get_font_margins(dc, &tm); if (font) SelectObject(dc, old_font); ReleaseDC(es->hwndSelf, dc); @@ -3739,8 +3764,9 @@ static void EDIT_WM_SetFont(EDITSTATE *es, HFONT font, BOOL redraw) /* Reset the format rect and the margins */ GetClientRect(es->hwndSelf, &clientRect); EDIT_SetRectNP(es, &clientRect); - EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, - EC_USEFONTINFO, EC_USEFONTINFO, FALSE); + if (margins) + EDIT_EM_SetMargins(es, EC_LEFTMARGIN | EC_RIGHTMARGIN, + LOWORD(margins), HIWORD(margins), FALSE); if (es->style & ES_MULTILINE) EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index c7ca000..f454434 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1703,7 +1703,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); @@ -1722,7 +1721,6 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO));

1 0

Akihiro Sagawa : comctl32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 640c92b807ef7aa3d7d72d12dddc5b33be2f4f89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=640c92b807ef7aa3d7d72d12… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:47 2019 +0900 comctl32/tests: Use calculated WM_SETFONT margins in the CJK case. In comctl32, ANSI version control also uses GetCharABCWidthsW(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index fa273a4..c7ca000 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1613,6 +1613,23 @@ static INT get_cjk_fontinfo_margin(INT width, INT side_bearing) return margin; } +static DWORD get_cjk_font_margins(HDC hdc) +{ + ABC abc[256]; + SHORT left, right; + UINT i; + + if (!GetCharABCWidthsW(hdc, 0, 255, abc)) + return 0; + + left = right = 0; + for (i = 0; i < ARRAY_SIZE(abc); i++) { + if (-abc[i].abcA > right) right = -abc[i].abcA; + if (-abc[i].abcC > left) left = -abc[i].abcC; + } + return MAKELONG(left, right); +} + static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; @@ -1623,7 +1640,7 @@ static void test_margins_default(const char* facename, UINT charset) LOGFONTA lf; HFONT hfont; RECT rect; - INT margins, expect; + INT margins, expect, font_expect; const UINT small_margins = MAKELONG(1, 5); const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; struct char_width_info { @@ -1669,9 +1686,14 @@ static void test_margins_default(const char* facename, UINT charset) left = get_cjk_fontinfo_margin(size.cx, info.lsb); right = get_cjk_fontinfo_margin(size.cx, info.rsb); expect = MAKELONG(left, right); + + font_expect = get_cjk_font_margins(hdc); + if (!font_expect) + /* In this case, margins aren't updated */ + font_expect = small_margins; } else - expect = MAKELONG(size.cx / 2, size.cx / 2); + font_expect = expect = MAKELONG(size.cx / 2, size.cx / 2); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); @@ -1681,8 +1703,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); @@ -1700,8 +1722,8 @@ static void test_margins_default(const char* facename, UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) - ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == font_expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0);

1 0

Michael Müller : avifile.dll16: Convert between AVISTREAMINFO (16 bit) and AVISTREAMINFOA.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: e40dd74d8128483c17839ddeee9dacaed4e7dc22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e40dd74d8128483c17839dde… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 25 09:12:26 2019 +0200 avifile.dll16: Convert between AVISTREAMINFO (16 bit) and AVISTREAMINFOA. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifile.dll16/avifile.dll16.spec | 4 +- dlls/avifile.dll16/main.c | 100 ++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/dlls/avifile.dll16/avifile.dll16.spec b/dlls/avifile.dll16/avifile.dll16.spec index 2b5fb91..5dabd7f 100644 --- a/dlls/avifile.dll16/avifile.dll16.spec +++ b/dlls/avifile.dll16/avifile.dll16.spec @@ -36,13 +36,13 @@ 141 pascal AVIFileRelease(long) AVIFileRelease 142 pascal AVIFileInfo(long ptr long) AVIFileInfoA 143 pascal AVIFileGetStream(long ptr long long) AVIFileGetStream -144 pascal AVIFileCreateStream(long ptr ptr) AVIFileCreateStreamA +144 pascal AVIFileCreateStream(long ptr ptr) AVIFileCreateStream16 146 pascal AVIFileWriteData(long long ptr long) AVIFileWriteData 147 pascal AVIFileReadData(long long ptr ptr) AVIFileReadData 148 pascal AVIFileEndRecord(long) AVIFileEndRecord 160 pascal AVIStreamAddRef(long) AVIStreamAddRef 161 pascal AVIStreamRelease(long) AVIStreamRelease -162 pascal AVIStreamInfo(long ptr long) AVIStreamInfoA +162 pascal AVIStreamInfo(long ptr long) AVIStreamInfo16 163 pascal AVIStreamFindSample(long long long) AVIStreamFindSample 164 pascal AVIStreamReadFormat(long long ptr ptr) AVIStreamReadFormat 165 pascal AVIStreamReadData(long long ptr ptr) AVIStreamReadData diff --git a/dlls/avifile.dll16/main.c b/dlls/avifile.dll16/main.c index 9e1faac..6c2d992 100644 --- a/dlls/avifile.dll16/main.c +++ b/dlls/avifile.dll16/main.c @@ -23,6 +23,27 @@ #include "wingdi.h" #include "vfw.h" +typedef struct _AVISTREAMINFO16 { + DWORD fccType; + DWORD fccHandler; + DWORD dwFlags; + DWORD dwCaps; + WORD wPriority; + WORD wLanguage; + DWORD dwScale; + DWORD dwRate; + DWORD dwStart; + DWORD dwLength; + DWORD dwInitialFrames; + DWORD dwSuggestedBufferSize; + DWORD dwQuality; + DWORD dwSampleSize; + RECT16 rcFrame; + DWORD dwEditCount; + DWORD dwFormatChangeCount; + CHAR szName[64]; +} AVISTREAMINFO16, *LPAVISTREAMINFO16, *PAVISTREAMINFO16; + struct frame_wrapper16 { PGETFRAME pg; @@ -131,3 +152,82 @@ HRESULT WINAPI AVIStreamGetFrameClose16(PGETFRAME pg) HeapFree(GetProcessHeap(), 0, wrapper); return hr; } + +/*********************************************************************** + * AVIFileCreateStream (AVIFILE.144) + */ +HRESULT WINAPI AVIFileCreateStream16(PAVIFILE pfile, PAVISTREAM *ppavi, LPAVISTREAMINFO16 asi16) +{ + AVISTREAMINFOA asi; + + if (!asi16) + return AVIFileCreateStreamA(pfile, ppavi, NULL); + + asi.fccType = asi16->fccType; + asi.fccHandler = asi16->fccHandler; + asi.dwFlags = asi16->dwFlags; + asi.dwCaps = asi16->dwCaps; + asi.wPriority = asi16->wPriority; + asi.wLanguage = asi16->wLanguage; + asi.dwScale = asi16->dwScale; + asi.dwRate = asi16->dwRate; + asi.dwStart = asi16->dwStart; + asi.dwLength = asi16->dwLength; + asi.dwInitialFrames = asi16->dwInitialFrames; + asi.dwSuggestedBufferSize = asi16->dwSuggestedBufferSize; + asi.dwQuality = asi16->dwQuality; + asi.dwSampleSize = asi16->dwSampleSize; + asi.rcFrame.left = asi16->rcFrame.left; + asi.rcFrame.top = asi16->rcFrame.top; + asi.rcFrame.right = asi16->rcFrame.right; + asi.rcFrame.bottom = asi16->rcFrame.bottom; + asi.dwEditCount = asi16->dwEditCount; + asi.dwFormatChangeCount = asi16->dwFormatChangeCount; + strcpy( asi.szName, asi16->szName ); + + return AVIFileCreateStreamA(pfile, ppavi, &asi); +} + + +/*********************************************************************** + * AVIStreamInfo (AVIFILE.162) + */ +HRESULT WINAPI AVIStreamInfo16(PAVISTREAM pstream, LPAVISTREAMINFO16 asi16, LONG size) +{ + AVISTREAMINFOA asi; + HRESULT hr; + + if (!asi16) + return AVIStreamInfoA(pstream, NULL, size); + + if (size < sizeof(AVISTREAMINFO16)) + return AVIERR_BADSIZE; + + hr = AVIStreamInfoA(pstream, &asi, sizeof(asi)); + if (SUCCEEDED(hr)) + { + asi16->fccType = asi.fccType; + asi16->fccHandler = asi.fccHandler; + asi16->dwFlags = asi.dwFlags; + asi16->dwCaps = asi.dwCaps; + asi16->wPriority = asi.wPriority; + asi16->wLanguage = asi.wLanguage; + asi16->dwScale = asi.dwScale; + asi16->dwRate = asi.dwRate; + asi16->dwStart = asi.dwStart; + asi16->dwLength = asi.dwLength; + asi16->dwInitialFrames = asi.dwInitialFrames; + asi16->dwSuggestedBufferSize = asi.dwSuggestedBufferSize; + asi16->dwQuality = asi.dwQuality; + asi16->dwSampleSize = asi.dwSampleSize; + asi16->rcFrame.left = asi.rcFrame.left; + asi16->rcFrame.top = asi.rcFrame.top; + asi16->rcFrame.right = asi.rcFrame.right; + asi16->rcFrame.bottom = asi.rcFrame.bottom; + asi16->dwEditCount = asi.dwEditCount; + asi16->dwFormatChangeCount = asi.dwFormatChangeCount; + strcpy( asi16->szName, asi.szName ); + } + + return hr; +}

1 0

Vijay Kiran Kamuju : include: Add missing ACE and ACL related defines in winnt.h.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: a20014a5e731419a82897306b937680d9106d1ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a20014a5e731419a82897306… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Apr 25 15:09:02 2019 +0200 include: Add missing ACE and ACL related defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index bdcd90a..b5393f5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4289,6 +4289,7 @@ static const WCHAR SE_CREATE_GLOBAL_NAME[] = { 'S','e','C','r','e','a','t','e',' #define SE_PRIVILEGE_ENABLED 0x00000002 #define SE_PRIVILEGE_REMOVED 0x00000004 #define SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000 +#define SE_PRIVILEGE_VALID_ATTRIBUTES 0x80000007 #define PRIVILEGE_SET_ALL_NECESSARY 1 @@ -4356,6 +4357,7 @@ typedef struct _SID_AND_ATTRIBUTES { /* S-1-2 */ #define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} +#define SECURITY_LOCAL_LOGON_RID __MSABI_LONG(0X00000000) /* S-1-3 */ #define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} @@ -4390,16 +4392,35 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_LOCAL_SERVICE_RID __MSABI_LONG(0x00000013) #define SECURITY_NETWORK_SERVICE_RID __MSABI_LONG(0x00000014) #define SECURITY_NT_NON_UNIQUE __MSABI_LONG(0x00000015) +#define SECURITY_ENTERPRISE_READONLY_CONTROLLERS_RID __MSABI_LONG(0x00000016) #define SECURITY_BUILTIN_DOMAIN_RID __MSABI_LONG(0x00000020) +#define SECURITY_WRITE_RESTRICTED_CODE_RID __MSABI_LONG(0x00000021) #define SECURITY_PACKAGE_BASE_RID __MSABI_LONG(0x00000040) #define SECURITY_PACKAGE_NTLM_RID __MSABI_LONG(0x0000000A) #define SECURITY_PACKAGE_SCHANNEL_RID __MSABI_LONG(0x0000000E) #define SECURITY_PACKAGE_DIGEST_RID __MSABI_LONG(0x00000015) +#define SECURITY_CRED_TYPE_BASE_RID __MSABI_LONG(0x00000041) +#define SECURITY_CRED_TYPE_THIS_ORG_CERT_RID __MSABI_LONG(0x00000001) +#define SECURITY_MIN_BASE_RID __MSABI_LONG(0x00000050) +#define SECURITY_SERVICE_ID_BASE_RID __MSABI_LONG(0x00000050) +#define SECURITY_RESERVED_ID_BASE_RID __MSABI_LONG(0x00000051) +#define SECURITY_APPPOOL_ID_BASE_RID __MSABI_LONG(0x00000052) +#define SECURITY_VIRTUALSERVER_ID_BASE_RID __MSABI_LONG(0x00000053) +#define SECURITY_USERMODEDRIVERHOST_ID_BASE_RID __MSABI_LONG(0x00000054) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_BASE_RID __MSABI_LONG(0x00000055) +#define SECURITY_WMIHOST_ID_BASE_RID __MSABI_LONG(0x00000056) +#define SECURITY_TASK_ID_BASE_RID __MSABI_LONG(0x00000057) +#define SECURITY_NFS_ID_BASE_RID __MSABI_LONG(0x00000058) +#define SECURITY_COM_ID_BASE_RID __MSABI_LONG(0x00000059) +#define SECURITY_MAX_BASE_RID __MSABI_LONG(0x0000006F) +#define SECURITY_WINDOWSMOBILE_ID_BASE_RID __MSABI_LONG(0x00000070) #define SECURITY_MAX_ALWAYS_FILTERED __MSABI_LONG(0x000003E7) #define SECURITY_MIN_NEVER_FILTERED __MSABI_LONG(0x000003E8) #define SECURITY_OTHER_ORGANIZATION_RID __MSABI_LONG(0x000003E8) +#define DOMAIN_GROUP_RID_ENTERPRISE_READONLY_DOMAIN_CONTROLLERS __MSABI_LONG(0x000001F2) + #define FOREST_USER_RID_MAX __MSABI_LONG(0x000001F3) #define DOMAIN_USER_RID_ADMIN __MSABI_LONG(0x000001F4) #define DOMAIN_USER_RID_GUEST __MSABI_LONG(0x000001F5) @@ -4415,6 +4436,9 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_SCHEMA_ADMINS __MSABI_LONG(0x00000206) #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS __MSABI_LONG(0x00000207) #define DOMAIN_GROUP_RID_POLICY_ADMINS __MSABI_LONG(0x00000208) +#define DOMAIN_GROUP_RID_READONLY_CONTROLLERS __MSABI_LONG(0x00000209) + +#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9} #define SECURITY_APP_PACKAGE_AUTHORITY {0,0,0,0,0,15} #define SECURITY_APP_PACKAGE_BASE_RID __MSABI_LONG(0x000000002) @@ -4432,9 +4456,13 @@ typedef struct _SID_AND_ATTRIBUTES { #define SECURITY_MANDATORY_UNTRUSTED_RID __MSABI_LONG(0x00000000) #define SECURITY_MANDATORY_LOW_RID __MSABI_LONG(0x00001000) #define SECURITY_MANDATORY_MEDIUM_RID __MSABI_LONG(0x00002000) +#define SECURITY_MANDATORY_MEDIUM_PLUS_RID __MSABI_LONG(0x00002100) #define SECURITY_MANDATORY_HIGH_RID __MSABI_LONG(0x00003000) #define SECURITY_MANDATORY_SYSTEM_RID __MSABI_LONG(0x00004000) #define SECURITY_MANDATORY_PROTECTED_PROCESS_RID __MSABI_LONG(0x00005000) +#define SECURITY_MANDATORY_MAXIMUM_USER_RID SECURITY_MANDATORY_SYSTEM_RID + +#define MANDATORY_LEVEL_TO_MANDATORY_RID(ML) (ML * 0x1000) #define DOMAIN_ALIAS_RID_ADMINS __MSABI_LONG(0x00000220) #define DOMAIN_ALIAS_RID_USERS __MSABI_LONG(0x00000221) @@ -4458,11 +4486,32 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS __MSABI_LONG(0x00000230) #define DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS __MSABI_LONG(0x00000231) #define DOMAIN_ALIAS_RID_DCOM_USERS __MSABI_LONG(0x00000232) +#define DOMAIN_ALIAS_RID_IUSERS __MSABI_LONG(0x00000238) +#define DOMAIN_ALIAS_RID_CRYPTO_OPERATORS __MSABI_LONG(0x00000239) +#define DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP __MSABI_LONG(0x0000023B) +#define DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP __MSABI_LONG(0x0000023C) +#define DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP __MSABI_LONG(0x0000023D) +#define DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP __MSABI_LONG(0x0000023E) #define SECURITY_SERVER_LOGON_RID SECURITY_ENTERPRISE_CONTROLLERS_RID #define SECURITY_PACKAGE_RID_COUNT __MSABI_LONG(2) +#define SECURITY_CRED_TYPE_RID_COUNT __MSABI_LONG(2) #define SECURITY_LOGON_IDS_RID_COUNT __MSABI_LONG(3) +#define SECURITY_NT_NON_UNIQUE_SUB_AUTH_COUNT __MSABI_LONG(3) +#define SECURITY_SERVICE_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_APPPOOL_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_VIRTUALSERVER_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_USERMODEDRIVERHOST_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_CLOUD_INFRASTRUCTURE_SERVICES_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_WMIHOST_ID_RID_COUNT __MSABI_LONG(6) +#define SECURITY_VIRTUALACCOUNT_ID_RID_COUNT __MSABI_LONG(6) + +#define SYSTEM_LUID { 0x3e7, 0x0 } +#define ANONYMOUS_LOGON_LUID { 0x3e6, 0x0 } +#define LOCALSERVICE_LUID { 0x3e5, 0x0 } +#define NETWORKSERVICE_LUID { 0x3e4, 0x0 } +#define IUSER_LUID { 0x3e3, 0x0 } typedef enum { WinNullSid = 0, @@ -4815,11 +4864,30 @@ typedef struct _ACE_HEADER { } ACE_HEADER,*PACE_HEADER; /* AceType */ -#define ACCESS_ALLOWED_ACE_TYPE 0 -#define ACCESS_DENIED_ACE_TYPE 1 -#define SYSTEM_AUDIT_ACE_TYPE 2 -#define SYSTEM_ALARM_ACE_TYPE 3 +#define ACCESS_MIN_MS_ACE_TYPE 0x0 +#define ACCESS_ALLOWED_ACE_TYPE 0x0 +#define ACCESS_DENIED_ACE_TYPE 0x1 +#define SYSTEM_AUDIT_ACE_TYPE 0x2 +#define SYSTEM_ALARM_ACE_TYPE 0x3 +#define ACCESS_MAX_MS_V2_ACE_TYPE 0x3 +#define ACCESS_ALLOWED_COMPOUND_ACE_TYPE 0x4 +#define ACCESS_MAX_MS_V3_ACE_TYPE 0x4 +#define ACCESS_MIN_MS_OBJECT_ACE_TYPE 0x5 +#define ACCESS_ALLOWED_OBJECT_ACE_TYPE 0x5 +#define ACCESS_DENIED_OBJECT_ACE_TYPE 0x6 +#define ACCESS_AUDIT_OBJECT_ACE_TYPE 0x7 +#define ACCESS_ALARM_OBJECT_ACE_TYPE 0x8 +#define ACCESS_MAX_MS_V4_ACE_TYPE 0x8 +#define ACCESS_ALLOWED_CALLBACK_ACE_TYPE 0x9 +#define ACCESS_DENIED_CALLBACK_ACE_TYPE 0xa +#define ACCESS_ALLOWED_CALLBACK_OBJECT_ACE_TYPE 0xb +#define ACCESS_DENIED_CALLBACK_OBJECT_ACE_TYPE 0xc +#define SYSTEM_AUDIT_CALLBACK_ACE_TYPE 0xd +#define SYSTEM_ALARM_CALLBACK_ACE_TYPE 0xe +#define SYSTEM_AUDIT_CALLBACK_OBJECT_ACE_TYPE 0xf +#define SYSTEM_ALARM_CALLBACK_OBJECT_ACE_TYPE 0x10 #define SYSTEM_MANDATORY_LABEL_ACE_TYPE 0x11 +#define ACCESS_MAX_MS_V5_ACE_TYPE 0x11 /* inherit AceFlags */ #define OBJECT_INHERIT_ACE 0x01

1 0

Jacek Caban : server: Use generic kernel object list to store client device file pointer.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 52ff9bd3acb2fa42b63d6a079d3c128d588639e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52ff9bd3acb2fa42b63d6a07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:55:10 2019 +0200 server: Use generic kernel object list to store client device file pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 +-- server/device.c | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1e6a9c..b353839 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -518,8 +518,7 @@ static const WCHAR file_type_name[] = {'F','i','l','e',0}; static struct _OBJECT_TYPE file_type = { file_type_name, - create_file_object, - free_kernel_object + create_file_object }; POBJECT_TYPE IoFileObjectType = &file_type; diff --git a/server/device.c b/server/device.c index 7037a2c..1d864e0 100644 --- a/server/device.c +++ b/server/device.c @@ -170,7 +170,7 @@ struct device_file struct object obj; /* object header */ struct device *device; /* device for this file */ struct fd *fd; /* file descriptor for irp */ - client_ptr_t user_ptr; /* opaque ptr for client side */ + struct list kernel_object; /* list of kernel object pointers */ int closed; /* closed file flag */ struct list entry; /* entry in device list */ struct list requests; /* list of pending irp requests */ @@ -178,6 +178,7 @@ struct device_file static void device_file_dump( struct object *obj, int verbose ); static struct fd *device_file_get_fd( struct object *obj ); +static struct list *device_file_get_kernel_obj_list( struct object *obj ); static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void device_file_destroy( struct object *obj ); static enum server_fd_type device_file_get_fd_type( struct fd *fd ); @@ -204,7 +205,7 @@ static const struct object_ops device_file_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + device_file_get_kernel_obj_list, /* get_kernel_obj_list */ device_file_close_handle, /* close_handle */ device_file_destroy /* destroy */ }; @@ -432,7 +433,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, file->device = (struct device *)grab_object( device ); file->closed = 0; - file->user_ptr = 0; + list_init( &file->kernel_object ); list_init( &file->requests ); list_add_tail( &device->files, &file->entry ); if (device->unix_path) @@ -494,6 +495,12 @@ static struct fd *device_file_get_fd( struct object *obj ) return (struct fd *)grab_object( file->fd ); } +static struct list *device_file_get_kernel_obj_list( struct object *obj ) +{ + struct device_file *file = (struct device_file *)obj; + return &file->kernel_object; +} + static int device_file_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) { struct device_file *file = (struct device_file *)obj; @@ -531,26 +538,26 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void fill_irp_params( struct irp_call *irp, irp_params_t *params ) +static void fill_irp_params( struct device_manager *manager, struct irp_call *irp, irp_params_t *params ) { *params = irp->params; switch (params->major) { case IRP_MJ_CLOSE: - params->close.file = irp->file->user_ptr; + params->close.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_READ: - params->read.file = irp->file->user_ptr; + params->read.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_WRITE: - params->write.file = irp->file->user_ptr; + params->write.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_FLUSH_BUFFERS: - params->flush.file = irp->file->user_ptr; + params->flush.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; case IRP_MJ_DEVICE_CONTROL: - params->ioctl.file = irp->file->user_ptr; + params->ioctl.file = get_kernel_object_ptr( manager, &irp->file->obj ); break; } } @@ -873,7 +880,7 @@ DECL_HANDLER(get_next_device_request) if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { - fill_irp_params( irp, &reply->params ); + fill_irp_params( manager, irp, &reply->params ); set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; @@ -895,7 +902,8 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file) irp->file->user_ptr = req->file_ptr; + if (irp->file && irp->file->device->manager) + set_kernel_object( irp->file->device->manager, &irp->file->obj, req->file_ptr ); set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp );

1 0

Jacek Caban : server: Set file user pointer in get_next_device_request handler.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 31f6f0eec2a23f9e6efe656d4d4037ab42800d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f6f0eec2a23f9e6efe656d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 25 14:54:47 2019 +0200 server: Set file user pointer in get_next_device_request handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/device.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/server/device.c b/server/device.c index c798694..0bb2757 100644 --- a/server/device.c +++ b/server/device.c @@ -503,7 +503,6 @@ static int device_file_close_handle( struct object *obj, struct process *process memset( &params, 0, sizeof(params) ); params.close.major = IRP_MJ_CLOSE; - params.close.file = file->user_ptr; if ((irp = create_irp( file, &params, NULL ))) { @@ -529,26 +528,27 @@ static void device_file_destroy( struct object *obj ) release_object( file->device ); } -static void set_file_user_ptr( struct device_file *file, client_ptr_t ptr ) +static void fill_irp_params( struct irp_call *irp, irp_params_t *params ) { - struct irp_call *irp; - - if (file->user_ptr == ptr) return; /* nothing to do */ - - file->user_ptr = ptr; + *params = irp->params; - /* update already queued irps */ - - LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) + switch (params->major) { - switch (irp->params.major) - { - case IRP_MJ_CLOSE: irp->params.close.file = ptr; break; - case IRP_MJ_READ: irp->params.read.file = ptr; break; - case IRP_MJ_WRITE: irp->params.write.file = ptr; break; - case IRP_MJ_FLUSH_BUFFERS: irp->params.flush.file = ptr; break; - case IRP_MJ_DEVICE_CONTROL: irp->params.ioctl.file = ptr; break; - } + case IRP_MJ_CLOSE: + params->close.file = irp->file->user_ptr; + break; + case IRP_MJ_READ: + params->read.file = irp->file->user_ptr; + break; + case IRP_MJ_WRITE: + params->write.file = irp->file->user_ptr; + break; + case IRP_MJ_FLUSH_BUFFERS: + params->flush.file = irp->file->user_ptr; + break; + case IRP_MJ_DEVICE_CONTROL: + params->ioctl.file = irp->file->user_ptr; + break; } } @@ -580,7 +580,6 @@ static int device_file_read( struct fd *fd, struct async *async, file_pos_t pos params.read.major = IRP_MJ_READ; params.read.key = 0; params.read.pos = pos; - params.read.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -593,7 +592,6 @@ static int device_file_write( struct fd *fd, struct async *async, file_pos_t pos params.write.major = IRP_MJ_WRITE; params.write.key = 0; params.write.pos = pos; - params.write.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -604,7 +602,6 @@ static int device_file_flush( struct fd *fd, struct async *async ) memset( &params, 0, sizeof(params) ); params.flush.major = IRP_MJ_FLUSH_BUFFERS; - params.flush.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -616,7 +613,6 @@ static int device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *as memset( &params, 0, sizeof(params) ); params.ioctl.major = IRP_MJ_DEVICE_CONTROL; params.ioctl.code = code; - params.ioctl.file = file->user_ptr; return queue_irp( file, &params, async ); } @@ -752,7 +748,6 @@ void free_kernel_objects( struct object *obj ) /* abuse IRP_MJ_CLEANUP to request client to free no longer valid kernel object */ memset( &params, 0, sizeof(params) ); params.cleanup.major = IRP_MJ_CLEANUP; - params.cleanup.obj = kernel_object->user_ptr; if ((irp = create_irp( NULL, &params, NULL ))) { @@ -869,13 +864,13 @@ DECL_HANDLER(get_next_device_request) reply->client_thread = get_kernel_object_ptr( manager, &irp->thread->obj ); reply->client_tid = get_thread_id( irp->thread ); } - reply->params = irp->params; iosb = irp->iosb; reply->in_size = iosb->in_size; reply->out_size = iosb->out_size; if (iosb->in_size > get_reply_max_size()) set_error( STATUS_BUFFER_OVERFLOW ); else if (!irp->file || (reply->next = alloc_handle( current->process, irp, 0, 0 ))) { + fill_irp_params( irp, &reply->params ); set_reply_data_ptr( iosb->in_data, iosb->in_size ); iosb->in_data = NULL; iosb->in_size = 0; @@ -897,7 +892,7 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (irp->file) set_file_user_ptr( irp->file, req->file_ptr ); + if (irp->file) irp->file->user_ptr = req->file_ptr; set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp );

1 0

Nikolay Sivov : kernel32/tests: Add a test for critical section DebugInfo initial value.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: bf174815ba8529bfbbda8697503d3c2539f82359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf174815ba8529bfbbda8697… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 25 12:31:55 2019 +0300 kernel32/tests: Add a test for critical section DebugInfo initial value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e..8dea3b3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); }

1 0

Francois Gouget : d3d11/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 4385a3ecb6b6cbfa137b77bd5bb57c5d3ee1abe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4385a3ecb6b6cbfa137b77bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d11/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3d6cbf5..2850d59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25681,6 +25681,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -25691,21 +25692,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -25713,7 +25716,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Nikola Pavlica : dsound: Revised 5.1 to stereo downmix.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 87eaa2f593d3a6b2e1440de3bf4c6b37ef089fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=87eaa2f593d3a6b2e1440de3… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:22 2019 +0200 dsound: Revised 5.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 26dbb32..6171b16 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -216,39 +216,37 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { - /* based on pulseaudio's downmix algorithm */ + /* based on analyzing a recording of a dsound downmix */ switch(channel){ - case 4: /* back left */ - value *= 0.056f; /* (1/9) / (sum of left volumes) */ + case 4: /* surround left */ + value *= 0.24f; dsb->put_aux(dsb, pos, 0, value); break; case 0: /* front left */ - value *= 0.503f; /* 1 / (sum of left volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 0, value); break; - case 5: /* back right */ - value *= 0.056f; /* (1/9) / (sum of right volumes) */ + case 5: /* surround right */ + value *= 0.24f; dsb->put_aux(dsb, pos, 1, value); break; case 1: /* front right */ - value *= 0.503f; /* 1 / (sum of right volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 1, value); break; - case 2: /* front centre */ - value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + case 2: /* centre */ + value *= 0.7; dsb->put_aux(dsb, pos, 0, value); dsb->put_aux(dsb, pos, 1, value); break; - case 3: /* LFE */ - value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ - dsb->put_aux(dsb, pos, 0, value); - dsb->put_aux(dsb, pos, 1, value); + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ break; } }

1 0

Martin Storsjo : msvcrt: Fix the fallback implementation of asinh for large negative values.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: fc1107382b7f965103476babee74e74854f167e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1107382b7f965103476bab… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Apr 23 10:00:04 2019 +0300 msvcrt: Fix the fallback implementation of asinh for large negative values. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c893c83..21f1f9b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3063,7 +3063,10 @@ double CDECL MSVCR120_asinh(double x) #ifdef HAVE_ASINH return asinh(x); #else - if (!isfinite(x*x+1)) return log(2) + log(x); + if (!isfinite(x*x+1)) { + if (x > 0) return log(2) + log(x); + else return -log(2) - log(-x); + } return log(x + sqrt(x*x+1)); #endif }

1 0

Nikola Pavlica : dsound: Added 7.1 to stereo downmix.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: fc84b8675a848683988d1793ea4bc9f95b7ea395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc84b8675a848683988d1793… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:23 2019 +0200 dsound: Added 7.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 54 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6171b16..3519337 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -251,6 +251,53 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on analyzing a recording of a dsound downmix */ + switch(channel){ + + case 6: /* back left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 4: /* surround left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 7: /* back right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 5: /* surround right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* centre */ + value *= 0.7; + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ + break; + } +} + void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { /* based on pulseaudio's downmix algorithm */ diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 45a100e..b04ce06 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 32bde38..05ca99b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_surround512stereo; dsb->put_aux = putieee32_sum; } + else if (ichannels == 8 && ochannels == 2) + { + dsb->mix_channels = 8; + dsb->put = put_surround712stereo; + dsb->put_aux = putieee32_sum; + } else if (ichannels == 4 && ochannels == 2) { dsb->mix_channels = 4;

1 0

Akihiro Sagawa : user32: Make the second parameter of get_font_margins const.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: e78d7b08fe4bffe1b70c92bd0c076d4cec92cb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78d7b08fe4bffe1b70c92bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:51 2019 +0900 user32: Make the second parameter of get_font_margins const. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 24af8ef..3c5331f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3812,7 +3812,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } -static DWORD get_font_margins(HDC hdc, TEXTMETRICW *tm, BOOL unicode) +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm, BOOL unicode) { ABC abc[256]; SHORT left, right;

1 0

Francois Gouget : d3d10core/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: d9150a66b36192b1fe301dfd577a26d83e5c5b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9150a66b36192b1fe301dfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d10core/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f799922..b0ff09d 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15765,6 +15765,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -15775,21 +15776,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -15797,7 +15800,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Alexandre Julliard : msvcrt: Don't export the __p__* functions on 64-bit.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 52bff1fdfe3e041313654765a3b08891de6e9f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bff1fdfe3e041313654765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:49:01 2019 +0200 msvcrt: Don't export the __p__* functions on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++++----------------------- dlls/msvcrt20/msvcrt20.spec | 48 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 50 ++++++++++++++++++++-------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5be4b4c..7958a7a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv -@ cdecl __p___initenv() -@ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv -@ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln -@ cdecl __p__amblksiz() -@ cdecl __p__commode() -@ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc +@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv +@ cdecl -arch=win32 __p___initenv() +@ cdecl -arch=win32 __p___mb_cur_max() +@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=win32 __p___winitenv() +@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=win32 __p__amblksiz() +@ cdecl -arch=win32 __p__commode() +@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ +@ stub -arch=win32 __p__fileinfo() +@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode @ cdecl __p__iob() -@ stub __p__mbcasemap() -@ cdecl __p__mbctype() -@ cdecl __p__osver() -@ cdecl __p__pctype() MSVCRT___p__pctype -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr -@ stub __p__pwctype() -@ cdecl __p__timezone() MSVCRT___p__timezone -@ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__winmajor() -@ cdecl __p__winminor() -@ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=win32 __p__mbcasemap() +@ cdecl -arch=win32 __p__mbctype() +@ cdecl -arch=win32 __p__osver() +@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=win32 __p__pwctype() +@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=win32 __p__tzname() +@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=win32 __p__winmajor() +@ cdecl -arch=win32 __p__winminor() +@ cdecl -arch=win32 __p__winver() +@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 84a1014..f9d36a9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -808,32 +808,32 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e4ef8d7..f0269e7 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -886,33 +886,33 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__dstbias() msvcrt.__p__dstbias -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __set_app_type(long) msvcrt.__set_app_type @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr

1 0

Józef Kucia : vkd3d-shader: Add FIXME() for unknown root signature descriptor flags.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: 070de4dfbb1e9458dbb8d670963e3a3959ba5e7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=070de4dfbb1e9458dbb8d67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:45 2019 +0200 vkd3d-shader: Add FIXME() for unknown root signature descriptor flags. 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> --- libs/vkd3d-shader/dxbc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1230f30..3fe728e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2130,6 +2130,18 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } +static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +{ + unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); +} + static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) { @@ -2157,6 +2169,8 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context ranges[i].range_type, ranges[i].descriptor_count, ranges[i].base_shader_register, ranges[i].register_space, ranges[i].flags, ranges[i].descriptor_table_offset); + + shader_validate_descriptor_range1(&ranges[i]); } return VKD3D_OK; @@ -2259,6 +2273,17 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } +static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +{ + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); +} + static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) { @@ -2278,6 +2303,8 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c TRACE("Shader register %u, register space %u, flags %#x.\n", descriptor->shader_register, descriptor->register_space, descriptor->flags); + shader_validate_root_descriptor1(descriptor); + return VKD3D_OK; }

1 0

Józef Kucia : tests: Add tests for root signature 1.1 bytecode.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: cbab2362ce06f4f7734c0ddbdf334d75a2b928b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cbab2362ce06f4f7734c0dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:43 2019 +0200 tests: Add tests for root signature 1.1 bytecode. 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> --- tests/d3d12.c | 638 ++++++++++++++++++++++++++++++++++++++++++------ tests/d3d12_crosstest.h | 8 + 2 files changed, 578 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cbab2362ce06f4f7734…

1 0

Józef Kucia : vkd3d: Prefer versioned root signature structures.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: aa2d00929e8df59c456081403133a6fbf7ba32fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=aa2d00929e8df59c4560814… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:47 2019 +0200 vkd3d: Prefer versioned root signature structures. 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> --- libs/vkd3d/state.c | 10 +++++----- libs/vkd3d/vkd3d_main.c | 15 ++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index df96ae4..980d9ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,8 +999,8 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const struct vkd3d_shader_code dxbc = {bytecode, bytecode_length}; union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } root_signature_desc; struct d3d12_root_signature *object; HRESULT hr; @@ -1014,12 +1014,12 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) { - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); return E_OUTOFMEMORY; } - hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12); - vkd3d_shader_free_root_signature_v_1_0(&root_signature_desc.vkd3d); + hr = d3d12_root_signature_init(object, device, &root_signature_desc.d3d12.u.Desc_1_0); + vkd3d_shader_free_root_signature(&root_signature_desc.vkd3d); if (FAILED(hr)) { vkd3d_free(object); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index e095fdf..7775077 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -87,8 +87,8 @@ struct d3d12_root_signature_deserializer union { - D3D12_ROOT_SIGNATURE_DESC d3d12; - struct vkd3d_root_signature_desc vkd3d; + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; } desc; }; @@ -140,7 +140,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12R if (!refcount) { - vkd3d_shader_free_root_signature_v_1_0(&deserializer->desc.vkd3d); + vkd3d_shader_free_root_signature(&deserializer->desc.vkd3d); vkd3d_free(deserializer); } @@ -154,7 +154,8 @@ static const D3D12_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE d3d12_root_signature_ TRACE("iface %p.\n", iface); - return &deserializer->desc.d3d12; + assert(deserializer->desc.d3d12.Version == D3D_ROOT_SIGNATURE_VERSION_1_0); + return &deserializer->desc.d3d12.u.Desc_1_0; } static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_deserializer_vtbl = @@ -168,7 +169,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des }; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *out_desc) + struct vkd3d_versioned_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; int ret; @@ -181,7 +182,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - *out_desc = desc.u.v_1_0; + *out_desc = desc; } else { @@ -195,7 +196,7 @@ int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, return ret; } - *out_desc = converted_desc.u.v_1_0; + *out_desc = converted_desc; } return ret; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c680a04..ba586b4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,7 +620,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct vkd3d_versioned_root_signature_desc *desc) DECLSPEC_HIDDEN; struct d3d12_graphics_pipeline_state {

1 0

Józef Kucia : vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: d5d1ee4031e1edbc7085d1d5604c906d4b5ef38a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d5d1ee4031e1edbc7085d1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:48 2019 +0200 vkd3d-shader: Do not export vkd3d_shader_free_root_signature_v_1_0(). 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> --- include/vkd3d_shader.h | 2 -- libs/vkd3d-shader/vkd3d_shader.map | 1 - libs/vkd3d-shader/vkd3d_shader_main.c | 41 ++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 57761af..cfb0263 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -569,7 +569,6 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_versioned_root_signature_desc *root_signature, @@ -602,7 +601,6 @@ typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature_v_1_0)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)( const struct vkd3d_versioned_root_signature_desc *root_signature, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index c2cfcbd..74c38e1 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -5,7 +5,6 @@ global: vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; - vkd3d_shader_free_root_signature_v_1_0; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; vkd3d_shader_parse_input_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef491f7..9848202 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -327,7 +327,7 @@ void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *shader_code) vkd3d_free((void *)shader_code->code); } -void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) +static void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *root_signature) { unsigned int i; @@ -344,28 +344,10 @@ void vkd3d_shader_free_root_signature_v_1_0(struct vkd3d_root_signature_desc *ro memset(root_signature, 0, sizeof(*root_signature)); } -void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +static void vkd3d_shader_free_root_signature_v_1_1(struct vkd3d_root_signature_desc1 *root_signature) { - struct vkd3d_root_signature_desc1 *root_signature; unsigned int i; - if (!desc->version) - return; - - if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); - return; - } - - if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) - { - FIXME("Unknown version %#x.\n", desc->version); - return; - } - - root_signature = &desc->u.v_1_1; - for (i = 0; i < root_signature->parameter_count; ++i) { const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; @@ -379,6 +361,25 @@ void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature_v_1_0(&desc->u.v_1_0); + } + else if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + vkd3d_shader_free_root_signature_v_1_1(&desc->u.v_1_1); + } + else if (desc->version) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + desc->version = 0; +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) {

1 0

Józef Kucia : vkd3d-shader: Remove versioned_ prefix from root signature functions.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: 374bcd276e914f126c3c4fbd73596bbcc7e2fb9b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=374bcd276e914f126c3c4fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:46 2019 +0200 vkd3d-shader: Remove versioned_ prefix from root signature functions. 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> --- include/vkd3d_shader.h | 16 ++++++++-------- libs/vkd3d-shader/dxbc.c | 6 +++--- libs/vkd3d-shader/vkd3d_shader.map | 6 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 6 +++--- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_main.c | 16 ++++++++-------- tests/vkd3d_shader_api.c | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=374bcd276e914f126c3…

1 0

Józef Kucia : tests: Add tests for root signature 1.1 descriptor flags.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: eef0651548cb16879a9c1eb6fd9911ed39695648 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eef0651548cb16879a9c1eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:44 2019 +0200 tests: Add tests for root signature 1.1 descriptor flags. 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> --- tests/d3d12.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6cc6771..199a86f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10035,6 +10035,9 @@ static void check_root_signature_deserialization_(unsigned int line, const D3D12 ULONG refcount; HRESULT hr; + if (!code->BytecodeLength) + return; + hr = D3D12CreateRootSignatureDeserializer(code->pShaderBytecode, code->BytecodeLength, &IID_ID3D12RootSignatureDeserializer, (void **)&deserializer); ok_(line)(hr == S_OK, "Failed to create deserializer, hr %#x.\n", hr); @@ -10132,6 +10135,9 @@ static void check_root_signature_serialization_(unsigned int line, const D3D12_S unsigned int i; HRESULT hr; + if (!bytecode->BytecodeLength) + return; + error_blob = (ID3DBlob *)0xdeadbeef; hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1_0, &blob, &error_blob); ok_(line)(hr == S_OK, "Failed to serialize root signature, hr %#x.\n", hr); @@ -10408,6 +10414,42 @@ static void test_root_signature_byte_code(void) }; #if 0 + #define RS "CBV(b4, space = 1, visibility = SHADER_VISIBILITY_VERTEX), " \ + "SRV(t13, flags = DATA_STATIC), " \ + "UAV(u6, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)" +#endif + static const DWORD root_descriptors_rootsig1[] = + { + 0x43425844, 0x8ddedbbe, 0xbcfea259, 0x6b35bfbb, 0x23e1de24, 0x00000001, 0x0000008c, 0x00000001, + 0x00000024, 0x30535452, 0x00000060, 0x00000002, 0x00000003, 0x00000018, 0x00000000, 0x00000060, + 0x00000000, 0x00000002, 0x00000001, 0x0000003c, 0x00000003, 0x00000000, 0x00000048, 0x00000004, + 0x00000000, 0x00000054, 0x00000004, 0x00000001, 0x00000000, 0x0000000d, 0x00000000, 0x00000008, + 0x00000006, 0x00000000, 0x00000004, + }; + static const D3D12_ROOT_PARAMETER root_descriptors_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC root_descriptors_desc = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters), + .pParameters = root_descriptors_parameters, + }; + static const D3D12_ROOT_PARAMETER1 root_descriptors_parameters1[] = + { + {D3D12_ROOT_PARAMETER_TYPE_CBV, .Descriptor = {4, 1}, D3D12_SHADER_VISIBILITY_VERTEX}, + {D3D12_ROOT_PARAMETER_TYPE_SRV, .Descriptor = {13, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC}}, + {D3D12_ROOT_PARAMETER_TYPE_UAV, .Descriptor = {6, 0, D3D12_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 root_descriptors_desc1 = + { + .NumParameters = ARRAY_SIZE(root_descriptors_parameters1), + .pParameters = root_descriptors_parameters1, + }; + +#if 0 #define RS "RootConstants(num32BitConstants=3, b4), " \ "RootConstants(num32BitConstants=4, b5, space = 3)" #endif @@ -10501,6 +10543,40 @@ static void test_root_signature_byte_code(void) }; #if 0 + #define RS "DescriptorTable(CBV(b1, space = 7, flags = DESCRIPTORS_VOLATILE), " \ + "SRV(t16, numDescriptors = 8, flags = DESCRIPTORS_VOLATILE | DATA_VOLATILE), " \ + "UAV(u3, numDescriptors = unbounded, offset = 44, flags = DATA_STATIC))" +#endif + static const DWORD descriptor_table_flags_rootsig1[] = + { + 0x43425844, 0xe77ffa8f, 0xfab552d5, 0x586e15d4, 0x4c186c26, 0x00000001, 0x000000a0, 0x00000001, + 0x00000024, 0x30535452, 0x00000074, 0x00000002, 0x00000001, 0x00000018, 0x00000000, 0x00000074, + 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000003, 0x0000002c, 0x00000002, 0x00000001, + 0x00000001, 0x00000007, 0x00000001, 0xffffffff, 0x00000000, 0x00000008, 0x00000010, 0x00000000, + 0x00000003, 0xffffffff, 0x00000001, 0xffffffff, 0x00000003, 0x00000000, 0x00000008, 0x0000002c, + }; + static const D3D12_DESCRIPTOR_RANGE1 descriptor_ranges1_flags[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, 1, 1, 7, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 16, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | D3D12_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE, + D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 3, 0, + D3D12_DESCRIPTOR_RANGE_FLAG_DATA_STATIC, 44}, + }; + static const D3D12_ROOT_PARAMETER1 descriptor_table_parameters1_flags[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges1_flags), descriptor_ranges1_flags}}, + }; + static const D3D12_ROOT_SIGNATURE_DESC1 descriptor_table_flags_rootsig_desc1 = + { + .NumParameters = ARRAY_SIZE(descriptor_table_parameters1_flags), + .pParameters = descriptor_table_parameters1_flags, + }; + +#if 0 #define RS "StaticSampler(s4)" #endif static const DWORD default_static_sampler_rootsig[] = @@ -10647,6 +10723,11 @@ static void test_root_signature_byte_code(void) &uav_rootsig_desc, &uav_rootsig_desc1, }, { + {NULL}, + {root_descriptors_rootsig1, sizeof(root_descriptors_rootsig1)}, + &root_descriptors_desc, &root_descriptors_desc1, + }, + { {constants_rootsig, sizeof(constants_rootsig)}, {constants_rootsig1, sizeof(constants_rootsig1)}, &constants_rootsig_desc, &constants_rootsig_desc1, @@ -10657,6 +10738,11 @@ static void test_root_signature_byte_code(void) &descriptor_table_rootsig_desc, &descriptor_table_rootsig_desc1, }, { + {NULL}, + {descriptor_table_flags_rootsig1, sizeof(descriptor_table_flags_rootsig1)}, + &descriptor_table_rootsig_desc, &descriptor_table_flags_rootsig_desc1, + }, + { {default_static_sampler_rootsig, sizeof(default_static_sampler_rootsig)}, {default_static_sampler_rootsig1, sizeof(default_static_sampler_rootsig1)}, &default_static_sampler_rootsig_desc, &default_static_sampler_rootsig_desc1,

1 0

John Thomson : shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS.
by Alexandre Julliard April 24, 2019

April 24, 2019

Module: wine Branch: master Commit: 9b6d198a3c7c8a02aa69c0d3d11829712e9778a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b6d198a3c7c8a02aa69c0d3… Author: John Thomson <git(a)johnthomson.fastmail.com.au> Date: Wed Apr 17 10:34:38 2019 +1000 shell32: Do not fail in SHCreateDirectoryExW for ERROR_ALREADY_EXISTS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47023 Signed-off-by: John Thomson <git(a)johnthomson.fastmail.com.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 4 +++- dlls/shell32/tests/shlfileop.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index c7bd54d..1515ad3 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -763,7 +763,9 @@ int WINAPI SHCreateDirectoryExW(HWND hWnd, LPCWSTR path, LPSECURITY_ATTRIBUTES s } } - if (ret && hWnd && (ERROR_CANCELLED != ret)) + if (ret && hWnd && + ret != ERROR_CANCELLED && + ret != ERROR_ALREADY_EXISTS) { /* We failed and should show a dialog box */ FIXME("Show system error message, creating path %s, failed with error %d\n", debugstr_w(path), ret); diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 8fb4dcf..27c7244 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2543,6 +2543,7 @@ static void test_unicode(void) int ret; HANDLE file; static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; + HWND hwnd; shfoW.hwnd = NULL; shfoW.wFunc = FO_DELETE; @@ -2633,6 +2634,20 @@ static void test_unicode(void) ok(GetLastError() == ERROR_SUCCESS || broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check SHCreateDirectoryExW with a Hwnd + * returns ERROR_ALREADY_EXISTS where a directory already exists */ + /* Get any window handle */ + hwnd = FindWindowA(NULL, NULL); + ok(hwnd != 0, "FindWindowA failed to produce a hwnd\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(!ret, "SHCreateDirectoryExW returned %d\n", ret); + /* Create already-existing directory */ + ok(file_existsW(UNICODE_PATH), "The directory was not created\n"); + ret = SHCreateDirectoryExW(hwnd, UNICODE_PATH, NULL); + ok(ret == ERROR_ALREADY_EXISTS, + "Expected ERROR_ALREADY_EXISTS, got %d\n", ret); + RemoveDirectoryW(UNICODE_PATH); } static void

1 0