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

Zebediah Figura : winex11: Resize the screen when changing CRTC modes.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 70d842b106d3ccbb0a786a41474903bddc4ea879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d842b106d3ccbb0a786a41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:30:32 2019 -0500 winex11: Resize the screen when changing CRTC modes. Based on a patch by Gabriel Corona. According to the RandR spec for RRSetCrtcConfig: "The entire area of the CRTC must fit within the screen size, else a Match error results. As an example, rotating the screen so that a single CRTC fills the entire screen before and after may necessitate disabling the CRTC, resizing the screen, then re-enabling the CRTC at the new configuration to avoid an invalid intermediate configuration." This patch involves resizing the screen also when shrinking a CRTC, not just when expanding it past the current screen size. This is partially because we have no way to reliably determine the current display width (DisplayWidth() is never updated past opening the connection, and RandR exposes no way to retrieve the screen dimensions), and partially because it's probably what the user wants anyway (e.g. it's what the `xrandr` configuration app does when the screen size is not expliticly specified). This patch fixes TestBot failures on the Debian machines for ddraw, d3d8, and d3d9 device tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33290 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2fee851..9f63310 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -58,6 +58,7 @@ MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) +MAKE_FUNCPTR(XRRSetScreenSize) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; static int primary_crtc; @@ -102,6 +103,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRGetOutputInfo) LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) + LOAD_FUNCPTR(XRRSetScreenSize) r = 2; #endif #undef LOAD_FUNCPTR @@ -320,8 +322,30 @@ static int xrandr12_get_current_mode(void) return ret; } +static void get_screen_size( XRRScreenResources *resources, unsigned int *width, unsigned int *height ) +{ + XRRCrtcInfo *crtc_info; + int i; + *width = *height = 0; + + for (i = 0; i < resources->ncrtc; ++i) + { + if (!(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ))) + continue; + + if (crtc_info->mode != None) + { + *width = max(*width, crtc_info->x + crtc_info->width); + *height = max(*height, crtc_info->y + crtc_info->height); + } + + pXRRFreeCrtcInfo( crtc_info ); + } +} + static LONG xrandr12_set_current_mode( int mode ) { + unsigned int screen_width, screen_height; Status status = RRSetConfigFailed; XRRScreenResources *resources; XRRCrtcInfo *crtc_info; @@ -345,10 +369,41 @@ static LONG xrandr12_set_current_mode( int mode ) TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); + /* According to the RandR spec, the entire CRTC must fit inside the screen. + * Since we use the union of all enabled CRTCs to determine the necessary + * screen size, this might involve shrinking the screen, so we must disable + * the CRTC in question first. */ + + XGrabServer( gdi_display ); + + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], + CurrentTime, crtc_info->x, crtc_info->y, None, + crtc_info->rotation, NULL, 0 ); + if (status != RRSetConfigSuccess) + { + XUngrabServer( gdi_display ); + ERR("Failed to disable CRTC.\n"); + pXRRFreeCrtcInfo( crtc_info ); + pXRRFreeScreenResources( resources ); + return DISP_CHANGE_FAILED; + } + + get_screen_size( resources, &screen_width, &screen_height ); + screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width ); + screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height ); + + pXRRSetScreenSize( gdi_display, root_window, screen_width, screen_height, + screen_width * DisplayWidthMM( gdi_display, default_visual.screen ) + / DisplayWidth( gdi_display, default_visual.screen ), + screen_height * DisplayHeightMM( gdi_display, default_visual.screen ) + / DisplayHeight( gdi_display, default_visual.screen )); + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); + XUngrabServer( gdi_display ); + pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources );

1 0

Zebediah Figura : qcap: Get rid of an unnecessary allocation and copy.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 2011518d30b7af6ff715d59cc1edcf5aa5ead45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2011518d30b7af6ff715d59c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:02 2019 -0500 qcap: Get rid of an unnecessary allocation and copy. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fb10cce..7444329 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -367,7 +367,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pOutput; + unsigned char *pTarget; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -378,8 +378,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) return 0; } - pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); - while (1) { EnterCriticalSection(&capBox->CritSect); @@ -410,8 +408,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - memcpy(pOutput, capBox->image_data, len); - Resize(capBox, pTarget, pOutput); + Resize(capBox, pTarget, capBox->image_data); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -428,7 +425,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } LeaveCriticalSection(&capBox->CritSect); - CoTaskMemFree(pOutput); return 0; }

1 0

Zebediah Figura : qcap: Get rid of V4l_Unprepare().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: b42f79129d416db4c791ac732c5ec37b043bbf6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b42f79129d416db4c791ac73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:31:59 2019 -0500 qcap: Get rid of V4l_Unprepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 809ce7a..752751a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,11 +131,6 @@ static HRESULT V4l_Prepare(Capture *device) return S_OK; } -static void V4l_Unprepare(Capture *device) -{ - heap_free(device->image_data); -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -439,7 +434,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - V4l_Unprepare(capBox); + heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -559,7 +554,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - V4l_Unprepare(capBox); + heap_free(capBox->image_data); } *state = State_Stopped;

1 0

Zebediah Figura : qcap: Get rid of V4l_GetFrame().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: e32dead36300cb79510a86c6417dd17995939370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32dead36300cb79510a86c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:01 2019 -0500 qcap: Get rid of V4l_GetFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ab39b71..fb10cce 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -361,27 +361,13 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) } } -static void V4l_GetFrame(Capture *device, unsigned char **buffer) -{ - while (video_read(device->fd, device->image_data, device->image_size) == -1) - { - if (errno != EAGAIN) - { - ERR("Failed to read frame: %s\n", strerror(errno)); - break; - } - } - TRACE("Successfully read a frame.\n"); - *buffer = device->image_data; -} - static DWORD WINAPI ReadThread(LPVOID lParam) { Capture * capBox = lParam; HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pInput, *pOutput; + unsigned char *pTarget, *pOutput; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -414,9 +400,17 @@ static DWORD WINAPI ReadThread(LPVOID lParam) TRACE("Data length: %d KB\n", len / 1024); IMediaSample_GetPointer(pSample, &pTarget); - /* FIXME: Check return values.. */ - V4l_GetFrame(capBox, &pInput); - memcpy(pOutput, pInput, len); + + while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1) + { + if (errno != EAGAIN) + { + ERR("Failed to read frame: %s\n", strerror(errno)); + break; + } + } + + memcpy(pOutput, capBox->image_data, len); Resize(capBox, pTarget, pOutput); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr);

1 0

Zebediah Figura : qcap: Make the image buffer a local variable.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 7aa9a04f26be828b5db0200f2c59d00f99afa586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa9a04f26be828b5db0200f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:03 2019 -0500 qcap: Make the image buffer a local variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 7444329..32c2c02 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -105,9 +105,6 @@ struct _Capture int fd, mmap; BOOL iscommitted, stopped; - int image_size; - unsigned char *image_data; - HANDLE thread; }; @@ -367,10 +364,11 @@ static DWORD WINAPI ReadThread(LPVOID lParam) HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget; + unsigned char *pTarget, *image_data; + unsigned int image_size; - capBox->image_size = capBox->height * capBox->width * 3; - if (!(capBox->image_data = heap_alloc(capBox->image_size))) + image_size = capBox->height * capBox->width * 3; + if (!(image_data = heap_alloc(image_size))) { ERR("Failed to allocate memory.\n"); capBox->thread = 0; @@ -399,7 +397,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1) + while (video_read(capBox->fd, image_data, image_size) == -1) { if (errno != EAGAIN) { @@ -408,7 +406,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - Resize(capBox, pTarget, capBox->image_data); + Resize(capBox, pTarget, image_data); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -416,7 +414,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -425,6 +422,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } LeaveCriticalSection(&capBox->CritSect); + heap_free(image_data); return 0; } @@ -535,7 +533,6 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - heap_free(capBox->image_data); } *state = State_Stopped;

1 0

Alexandre Julliard : msvcirt: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: e79b0fd7524fff38a289dd81120abb9764892a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e79b0fd7524fff38a289dd81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:13:59 2019 +0200 msvcirt: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 18 +++++++++--------- dlls/msvcirt/msvcirt.spec | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7f48346..c129e0f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -332,7 +332,7 @@ struct { struct { ostream os; ios vbase; -} cout = { { 0 } }, cerr = { { 0 } }, clog = { { 0 } }; +} cout = { { 0 } }, cerr = { { 0 } }, MSVCP_clog = { { 0 } }; /* ??0streambuf@@IAE(a)PADH@Z */ @@ -4455,11 +4455,11 @@ void __cdecl ios_sync_with_stdio(void) if ((new_buf = MSVCRT_operator_new(sizeof(stdiobuf)))) { stdiobuf_file_ctor(new_buf, stderr); stdiobuf_setrwbuf(new_buf, 0, 512); - ostream_assign_sb(&clog.os, &new_buf->base); + ostream_assign_sb(&MSVCP_clog.os, &new_buf->base); } else - ostream_assign_sb(&clog.os, NULL); - clog.vbase.delbuf = 1; - ios_setf(&clog.vbase, FLAGS_stdio); + ostream_assign_sb(&MSVCP_clog.os, NULL); + MSVCP_clog.vbase.delbuf = 1; + ios_setf(&MSVCP_clog.vbase, FLAGS_stdio); } } @@ -4555,10 +4555,10 @@ static void init_io(void *base) if ((fb = MSVCRT_operator_new(sizeof(filebuf)))) { filebuf_fd_ctor(fb, 2); - ostream_withassign_sb_ctor(&clog.os, &fb->base, TRUE); + ostream_withassign_sb_ctor(&MSVCP_clog.os, &fb->base, TRUE); } else - ostream_withassign_sb_ctor(&clog.os, NULL, TRUE); - Iostream_init_ios_ctor(NULL, &clog.vbase, 0); + ostream_withassign_sb_ctor(&MSVCP_clog.os, NULL, TRUE); + Iostream_init_ios_ctor(NULL, &MSVCP_clog.vbase, 0); } static void free_io(void) @@ -4567,7 +4567,7 @@ static void free_io(void) istream_vbase_dtor(&cin.is); ostream_vbase_dtor(&cout.os); ostream_vbase_dtor(&cerr.os); - ostream_vbase_dtor(&clog.os); + ostream_vbase_dtor(&MSVCP_clog.os); } BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 2e5154c..f2e8756 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -423,7 +423,7 @@ @ extern ?cin@@3Vistream_withassign@@A cin @ thiscall -arch=win32 ?clear(a)ios@@QAEXH(a)Z(ptr long) ios_clear @ cdecl -arch=win64 ?clear(a)ios@@QEAAXH(a)Z(ptr long) ios_clear -@ extern ?clog@@3Vostream_withassign@@A clog +@ extern ?clog@@3Vostream_withassign@@A MSVCP_clog @ thiscall -arch=win32 ?close(a)filebuf@@QAEPAV1(a)XZ(ptr) filebuf_close @ cdecl -arch=win64 ?close(a)filebuf@@QEAAPEAV1(a)XZ(ptr) filebuf_close @ stub -arch=win32 ?close(a)fstream@@QAEXXZ # void __thiscall fstream::close(void)

1 0

Zebediah Figura : qcap: Get rid of V4l_Prepare().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: bc42cc42795ef04624cb7b3ec98b24a8db44554d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc42cc42795ef04624cb7b3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:00 2019 -0500 qcap: Get rid of V4l_Prepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 752751a..ab39b71 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -122,15 +122,6 @@ static int xioctl(int fd, int request, void * arg) return r; } -/* Prepare the capture buffers */ -static HRESULT V4l_Prepare(Capture *device) -{ - device->image_size = device->height * device->width * 3; - if (!(device->image_data = heap_alloc(device->image_size))) - return E_OUTOFMEMORY; - return S_OK; -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -392,10 +383,10 @@ static DWORD WINAPI ReadThread(LPVOID lParam) ULONG framecount = 0; unsigned char *pTarget, *pInput, *pOutput; - hr = V4l_Prepare(capBox); - if (FAILED(hr)) + capBox->image_size = capBox->height * capBox->width * 3; + if (!(capBox->image_data = heap_alloc(capBox->image_size))) { - ERR("Stop IFilterGraph: %x\n", hr); + ERR("Failed to allocate memory.\n"); capBox->thread = 0; capBox->stopped = TRUE; return 0;

1 0

Alexandre Julliard : ntoskrnl.exe/tests: Avoid standard C functions in kernel drivers.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: c4433a06b7b03c3ffc7d80b5cce46ee9f408eb95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4433a06b7b03c3ffc7d80b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 16:45:01 2019 +0200 ntoskrnl.exe/tests: Avoid standard C functions in kernel drivers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46993 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 3796ee5..c3839da 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -59,9 +59,8 @@ static void kvprintf(const char *format, __ms_va_list ap) { static char buffer[512]; IO_STATUS_BLOCK io; - - _vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, strlen(buffer), NULL, NULL); + int len = _vsnprintf(buffer, sizeof(buffer), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); } static void WINAPIV kprintf(const char *format, ...) @@ -193,6 +192,13 @@ static void *kmemcpy(void *dest, const void *src, SIZE_T n) return dest; } +static void *kmemset(void *dest, int c, SIZE_T n) +{ + unsigned char *d = dest; + while (n--) *d++ = (unsigned char)c; + return dest; +} + static void *get_proc_address(const char *name) { UNICODE_STRING name_u; @@ -943,7 +949,7 @@ static void test_resource(void) BOOLEAN ret; HANDLE thread, thread2; - memset(&resource, 0xcc, sizeof(resource)); + kmemset(&resource, 0xcc, sizeof(resource)); status = ExInitializeResourceLite(&resource); ok(status == STATUS_SUCCESS, "got status %#x\n", status); @@ -1230,7 +1236,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * if (length < sizeof(teststr)) return STATUS_BUFFER_TOO_SMALL; - strcpy(buffer, teststr); + kmemcpy(buffer, teststr, sizeof(teststr)); *info = sizeof(teststr); return STATUS_SUCCESS;

1 0

Alexandre Julliard : include: Add wcsicmp() inline wrapper.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 1f38c1abf62505786534a3324a82d0e798b4c185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f38c1abf62505786534a332… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 11:50:18 2019 +0200 include: Add wcsicmp() inline wrapper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/string.h | 1 + programs/reg/reg.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index d1dca89..0b36d2c 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -147,6 +147,7 @@ static inline char* strupr(char* str) { return _strupr(str); } static inline wchar_t* wcsdup(const wchar_t* str) { return _wcsdup(str); } static inline int wcsicoll(const wchar_t* str1, const wchar_t* str2) { return _wcsicoll(str1, str2); } static inline wchar_t* wcslwr(wchar_t* str) { return _wcslwr(str); } +static inline int wcsicmp(const wchar_t* s1, const wchar_t* s2) { return _wcsicmp(s1, s2); } static inline int wcsnicmp(const wchar_t* str1, const wchar_t* str2, size_t n) { return _wcsnicmp(str1, str2, n); } static inline wchar_t* wcsnset(wchar_t* str, wchar_t c, size_t n) { return _wcsnset(str, c, n); } static inline wchar_t* wcsrev(wchar_t* str) { return _wcsrev(str); } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index fe52568..987a556 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -230,7 +230,7 @@ static DWORD wchar_get_type(const WCHAR *type_name) for (i = 0; i < ARRAY_SIZE(type_rels); i++) { - if (!_wcsicmp(type_rels[i].name, type_name)) + if (!wcsicmp(type_rels[i].name, type_name)) return type_rels[i].type; }

1 0

Józef Kucia : winevulkan: Generate conversion function for VkDeviceCreateInfo structure extensions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: df6b2381f8f1017c6a58a113438f7a36f12fcfb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6b2381f8f1017c6a58a113… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:50 2019 +0200 winevulkan: Generate conversion function for VkDeviceCreateInfo structure extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 168 +++--------- dlls/winevulkan/vulkan_thunks.c | 579 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 + 4 files changed, 622 insertions(+), 128 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=df6b2381f8f1017c6a58…

1 0

Józef Kucia : winevulkan: Enable VK_EXT_memory_priority.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 4b269f029324e8b47644cc6234c644edaae3c7e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b269f029324e8b47644cc62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:52 2019 +0200 winevulkan: Enable VK_EXT_memory_priority. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 46294f7..f6a63cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -105,7 +105,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. - "VK_EXT_memory_priority", "VK_EXT_pipeline_creation_feedback", "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9919642..b2b0037 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1894,6 +1894,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT: + { + const VkPhysicalDeviceMemoryPriorityFeaturesEXT *in = (const VkPhysicalDeviceMemoryPriorityFeaturesEXT *)in_header; + VkPhysicalDeviceMemoryPriorityFeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->memoryPriority = in->memoryPriority; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT: { const VkPhysicalDeviceBufferAddressFeaturesEXT *in = (const VkPhysicalDeviceBufferAddressFeaturesEXT *)in_header; @@ -4268,6 +4284,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_host_query_reset", "VK_EXT_inline_uniform_block", "VK_EXT_memory_budget", + "VK_EXT_memory_priority", "VK_EXT_pci_bus_info", "VK_EXT_post_depth_coverage", "VK_EXT_queue_family_foreign", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 5a48441..7a98951 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -300,6 +300,8 @@ #define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string" #define VK_EXT_MEMORY_BUDGET_SPEC_VERSION 1 #define VK_EXT_MEMORY_BUDGET_EXTENSION_NAME "VK_EXT_memory_budget" +#define VK_EXT_MEMORY_PRIORITY_SPEC_VERSION 1 +#define VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME "VK_EXT_memory_priority" #define VK_EXT_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 2 #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 @@ -2101,6 +2103,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_RENDER_PASS_FRAGMENT_DENSITY_MAP_CREATE_INFO_EXT = 1000218002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES_EXT = 1000221000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, + VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, @@ -2966,6 +2970,13 @@ typedef struct VkPhysicalDeviceLimits VkDeviceSize WINE_VK_ALIGN(8) nonCoherentAtomSize; } VkPhysicalDeviceLimits; +typedef struct VkPhysicalDeviceMemoryPriorityFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 memoryPriority; +} VkPhysicalDeviceMemoryPriorityFeaturesEXT; + typedef struct VkPhysicalDeviceMeshShaderPropertiesNV { VkStructureType sType; @@ -3659,6 +3670,13 @@ typedef struct VkMemoryDedicatedRequirements VkBool32 requiresDedicatedAllocation; } VkMemoryDedicatedRequirements; +typedef struct VkMemoryPriorityAllocateInfoEXT +{ + VkStructureType sType; + const void *pNext; + float priority; +} VkMemoryPriorityAllocateInfoEXT; + typedef struct VkMemoryType { VkMemoryPropertyFlags propertyFlags;

1 0

Józef Kucia : winevulkan: Enable VK_EXT_external_memory_host.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 59b5394eefe25f3c3cf0ad9c7c2a528203307925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b5394eefe25f3c3cf0ad9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:53 2019 +0200 winevulkan: Enable VK_EXT_external_memory_host. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 8 ++++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ include/wine/vulkan.h | 31 +++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f6a63cb..be3996c 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -102,7 +102,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_AMD_display_native_hdr", "VK_EXT_calibrated_timestamps", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter - "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index b2b0037..e80bb7c 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3495,6 +3495,12 @@ void WINAPI wine_vkGetImageSubresourceLayout(VkDevice device, VkImage image, con #endif } +static VkResult WINAPI wine_vkGetMemoryHostPointerPropertiesEXT(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties) +{ + TRACE("%p, %#x, %p, %p\n", device, handleType, pHostPointer, pMemoryHostPointerProperties); + return device->funcs.p_vkGetMemoryHostPointerPropertiesEXT(device->device, handleType, pHostPointer, pMemoryHostPointerProperties); +} + void WINAPI wine_vkGetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures) { TRACE("%p, %p\n", physicalDevice, pFeatures); @@ -4143,6 +4149,7 @@ static const struct vulkan_func vk_device_dispatch_table[] = {"vkGetImageSparseMemoryRequirements2", &wine_vkGetImageSparseMemoryRequirements2}, {"vkGetImageSparseMemoryRequirements2KHR", &wine_vkGetImageSparseMemoryRequirements2KHR}, {"vkGetImageSubresourceLayout", &wine_vkGetImageSubresourceLayout}, + {"vkGetMemoryHostPointerPropertiesEXT", &wine_vkGetMemoryHostPointerPropertiesEXT}, {"vkGetPipelineCacheData", &wine_vkGetPipelineCacheData}, {"vkGetQueryPoolResults", &wine_vkGetQueryPoolResults}, {"vkGetQueueCheckpointDataNV", &wine_vkGetQueueCheckpointDataNV}, @@ -4278,6 +4285,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_depth_range_unrestricted", "VK_EXT_descriptor_indexing", "VK_EXT_discard_rectangles", + "VK_EXT_external_memory_host", "VK_EXT_filter_cubic", "VK_EXT_fragment_density_map", "VK_EXT_global_priority", diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 5da9aa9..71ede94 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -1124,6 +1124,7 @@ struct vulkan_device_funcs #else void (*p_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *); #endif + VkResult (*p_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); VkResult (*p_vkGetPipelineCacheData)(VkDevice, VkPipelineCache, size_t *, void *); VkResult (*p_vkGetQueryPoolResults)(VkDevice, VkQueryPool, uint32_t, uint32_t, size_t, void *, VkDeviceSize, VkQueryResultFlags); void (*p_vkGetQueueCheckpointDataNV)(VkQueue, uint32_t *, VkCheckpointDataNV *); @@ -1425,6 +1426,7 @@ struct vulkan_instance_funcs USE_VK_FUNC(vkGetImageSparseMemoryRequirements2) \ USE_VK_FUNC(vkGetImageSparseMemoryRequirements2KHR) \ USE_VK_FUNC(vkGetImageSubresourceLayout) \ + USE_VK_FUNC(vkGetMemoryHostPointerPropertiesEXT) \ USE_VK_FUNC(vkGetPipelineCacheData) \ USE_VK_FUNC(vkGetQueryPoolResults) \ USE_VK_FUNC(vkGetQueueCheckpointDataNV) \ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7a98951..3a80b88 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -254,6 +254,8 @@ #define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" #define VK_KHR_8BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_8BIT_STORAGE_EXTENSION_NAME "VK_KHR_8bit_storage" +#define VK_EXT_EXTERNAL_MEMORY_HOST_SPEC_VERSION 1 +#define VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME "VK_EXT_external_memory_host" #define VK_AMD_BUFFER_MARKER_SPEC_VERSION 1 #define VK_AMD_BUFFER_MARKER_EXTENSION_NAME "VK_AMD_buffer_marker" #define VK_KHR_SHADER_ATOMIC_INT64_SPEC_VERSION 1 @@ -970,6 +972,8 @@ typedef enum VkExternalMemoryHandleTypeFlagBits VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D11_TEXTURE_KMT_BIT = 0x00000010, VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP_BIT = 0x00000020, VK_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE_BIT = 0x00000040, + VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_ALLOCATION_BIT_EXT = 0x00000080, + VK_EXTERNAL_MEMORY_HANDLE_TYPE_HOST_MAPPED_FOREIGN_MEMORY_BIT_EXT = 0x00000100, VK_EXTERNAL_MEMORY_HANDLE_TYPE_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkExternalMemoryHandleTypeFlagBits; @@ -2077,6 +2081,9 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_FILTER_CUBIC_IMAGE_VIEW_IMAGE_FORMAT_PROPERTIES_EXT = 1000170001, VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = 1000177000, + VK_STRUCTURE_TYPE_IMPORT_MEMORY_HOST_POINTER_INFO_EXT = 1000178000, + VK_STRUCTURE_TYPE_MEMORY_HOST_POINTER_PROPERTIES_EXT = 1000178001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_MEMORY_HOST_PROPERTIES_EXT = 1000178002, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, @@ -2637,6 +2644,13 @@ typedef struct VkMemoryBarrier VkAccessFlags dstAccessMask; } VkMemoryBarrier; +typedef struct VkMemoryHostPointerPropertiesEXT +{ + VkStructureType sType; + void *pNext; + uint32_t memoryTypeBits; +} VkMemoryHostPointerPropertiesEXT; + typedef struct VkMemoryRequirements { VkDeviceSize WINE_VK_ALIGN(8) size; @@ -4258,6 +4272,13 @@ typedef struct VkPhysicalDeviceDriverPropertiesKHR VkConformanceVersionKHR conformanceVersion; } VkPhysicalDeviceDriverPropertiesKHR; +typedef struct VkPhysicalDeviceExternalMemoryHostPropertiesEXT +{ + VkStructureType sType; + void *pNext; + VkDeviceSize WINE_VK_ALIGN(8) minImportedHostPointerAlignment; +} VkPhysicalDeviceExternalMemoryHostPropertiesEXT; + typedef struct VkPhysicalDeviceFragmentDensityMapFeaturesEXT { VkStructureType sType; @@ -4867,6 +4888,14 @@ typedef struct VkImageFormatProperties2 VkImageFormatProperties WINE_VK_ALIGN(8) imageFormatProperties; } VkImageFormatProperties2; +typedef struct VkImportMemoryHostPointerInfoEXT +{ + VkStructureType sType; + const void *pNext; + VkExternalMemoryHandleTypeFlagBits handleType; + void *pHostPointer; +} VkImportMemoryHostPointerInfoEXT; + typedef struct VkMemoryHeap { VkDeviceSize WINE_VK_ALIGN(8) size; @@ -5442,6 +5471,7 @@ typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2)(VkDevice, cons typedef void (VKAPI_PTR *PFN_vkGetImageSparseMemoryRequirements2KHR)(VkDevice, const VkImageSparseMemoryRequirementsInfo2 *, uint32_t *, VkSparseImageMemoryRequirements2 *); typedef void (VKAPI_PTR *PFN_vkGetImageSubresourceLayout)(VkDevice, VkImage, const VkImageSubresource *, VkSubresourceLayout *); typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_vkGetInstanceProcAddr)(VkInstance, const char *); +typedef VkResult (VKAPI_PTR *PFN_vkGetMemoryHostPointerPropertiesEXT)(VkDevice, VkExternalMemoryHandleTypeFlagBits, const void *, VkMemoryHostPointerPropertiesEXT *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferProperties)(VkPhysicalDevice, const VkPhysicalDeviceExternalBufferInfo *, VkExternalBufferProperties *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR)(VkPhysicalDevice, const VkPhysicalDeviceExternalBufferInfo *, VkExternalBufferProperties *); typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalFenceProperties)(VkPhysicalDevice, const VkPhysicalDeviceExternalFenceInfo *, VkExternalFenceProperties *); @@ -5702,6 +5732,7 @@ void VKAPI_CALL vkGetImageSparseMemoryRequirements2(VkDevice device, const VkIma void VKAPI_CALL vkGetImageSparseMemoryRequirements2KHR(VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, VkSparseImageMemoryRequirements2 *pSparseMemoryRequirements); void VKAPI_CALL vkGetImageSubresourceLayout(VkDevice device, VkImage image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout); PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkInstance instance, const char *pName); +VkResult VKAPI_CALL vkGetMemoryHostPointerPropertiesEXT(VkDevice device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalBufferProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalBufferPropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties); void VKAPI_CALL vkGetPhysicalDeviceExternalFenceProperties(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties);

1 0

Józef Kucia : winevulkan: Enable VK_KHR_shader_float16_int8.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: bbfc4f6f0d0a3a94508444e3b11f1edb8260b3fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfc4f6f0d0a3a94508444e3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:54 2019 +0200 winevulkan: Enable VK_KHR_shader_float16_int8. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 18 ++++++++++++++++++ include/wine/vulkan.h | 11 +++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index be3996c..851c554 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -110,7 +110,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_KHR_external_fence_win32", "VK_KHR_external_memory_win32", "VK_KHR_external_semaphore_win32", - "VK_KHR_shader_float16_int8", # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index e80bb7c..8794465 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1526,6 +1526,23 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR: + { + const VkPhysicalDeviceFloat16Int8FeaturesKHR *in = (const VkPhysicalDeviceFloat16Int8FeaturesKHR *)in_header; + VkPhysicalDeviceFloat16Int8FeaturesKHR *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->shaderFloat16 = in->shaderFloat16; + out->shaderInt8 = in->shaderInt8; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT: { const VkPhysicalDeviceHostQueryResetFeaturesEXT *in = (const VkPhysicalDeviceHostQueryResetFeaturesEXT *)in_header; @@ -4337,6 +4354,7 @@ static const char * const vk_device_extensions[] = "VK_KHR_sampler_ycbcr_conversion", "VK_KHR_shader_atomic_int64", "VK_KHR_shader_draw_parameters", + "VK_KHR_shader_float16_int8", "VK_KHR_shader_float_controls", "VK_KHR_storage_buffer_storage_class", "VK_KHR_swapchain", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 3a80b88..ecdabe4 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -158,6 +158,8 @@ #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" #define VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION 1 #define VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME "VK_EXT_conditional_rendering" +#define VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION 1 +#define VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME "VK_KHR_shader_float16_int8" #define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage" #define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1 @@ -1988,6 +1990,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001, VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = 1000082000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES = 1000083000, VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000, VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO = 1000085000, @@ -3752,6 +3755,14 @@ typedef struct VkPhysicalDeviceExternalImageFormatInfo VkExternalMemoryHandleTypeFlagBits handleType; } VkPhysicalDeviceExternalImageFormatInfo; +typedef struct VkPhysicalDeviceFloat16Int8FeaturesKHR +{ + VkStructureType sType; + void *pNext; + VkBool32 shaderFloat16; + VkBool32 shaderInt8; +} VkPhysicalDeviceFloat16Int8FeaturesKHR; + typedef struct VkPhysicalDeviceGroupProperties { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Enable VK_EXT_ycbcr_image_arrays.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: af3d82ddbea3743b6912aa393a86fc7c9fe5e594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af3d82ddbea3743b6912aa39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:55 2019 +0200 winevulkan: Enable VK_EXT_ycbcr_image_arrays. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 851c554..0aed365 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -105,7 +105,6 @@ BLACKLISTED_EXTENSIONS = [ "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. "VK_EXT_pipeline_creation_feedback", - "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_display_timing", "VK_KHR_external_fence_win32", "VK_KHR_external_memory_win32", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 8794465..8c9b670 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1945,6 +1945,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT: + { + const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *in = (const VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *)in_header; + VkPhysicalDeviceYcbcrImageArraysFeaturesEXT *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->ycbcrImageArrays = in->ycbcrImageArrays; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + default: FIXME("Application requested a linked structure of type %u.\n", in_header->sType); } @@ -4324,6 +4340,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_transform_feedback", "VK_EXT_validation_cache", "VK_EXT_vertex_attribute_divisor", + "VK_EXT_ycbcr_image_arrays", "VK_GOOGLE_decorate_string", "VK_GOOGLE_hlsl_functionality1", "VK_IMG_filter_cubic", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index ecdabe4..4545873 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -310,6 +310,8 @@ #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 #define VK_EXT_SEPARATE_STENCIL_USAGE_EXTENSION_NAME "VK_EXT_separate_stencil_usage" +#define VK_EXT_YCBCR_IMAGE_ARRAYS_SPEC_VERSION 1 +#define VK_EXT_YCBCR_IMAGE_ARRAYS_EXTENSION_NAME "VK_EXT_ycbcr_image_arrays" #define VK_EXT_HOST_QUERY_RESET_SPEC_VERSION 1 #define VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME "VK_EXT_host_query_reset" @@ -2119,6 +2121,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO_EXT = 1000246000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_YCBCR_IMAGE_ARRAYS_FEATURES_EXT = 1000252000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HOST_QUERY_RESET_FEATURES_EXT = 1000261000, VK_STRUCTURE_TYPE_MAX_ENUM = 0x7fffffff, } VkStructureType; @@ -3126,6 +3129,13 @@ typedef struct VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT uint32_t maxVertexAttribDivisor; } VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT; +typedef struct VkPhysicalDeviceYcbcrImageArraysFeaturesEXT +{ + VkStructureType sType; + void *pNext; + VkBool32 ycbcrImageArrays; +} VkPhysicalDeviceYcbcrImageArraysFeaturesEXT; + typedef struct VkPipelineColorBlendAdvancedStateCreateInfoEXT { VkStructureType sType;

1 0

Józef Kucia : winevulkan: Enable VK_NV_dedicated_allocation_image_aliasing.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: ad82739dda15b44510f6003302f0ad17848a35a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad82739dda15b44510f60033… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:57 2019 +0200 winevulkan: Enable VK_NV_dedicated_allocation_image_aliasing. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 10 ++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 9d76f80..2d872e2 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -112,7 +112,6 @@ BLACKLISTED_EXTENSIONS = [ # Relates to external_semaphore and needs type conversions in bitflags. "VK_KHR_shared_presentable_image", # Needs WSI work. "VK_KHR_win32_keyed_mutex", - "VK_NV_dedicated_allocation_image_aliasing", # Extensions for other platforms "VK_EXT_external_memory_dma_buf", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 03842f2..f48db3d 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1811,6 +1811,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV: + { + const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *in = (const VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *)in_header; + VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->dedicatedAllocationImageAliasing = in->dedicatedAllocationImageAliasing; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADING_RATE_IMAGE_FEATURES_NV: { const VkPhysicalDeviceShadingRateImageFeaturesNV *in = (const VkPhysicalDeviceShadingRateImageFeaturesNV *)in_header; @@ -4407,6 +4423,7 @@ static const char * const vk_device_extensions[] = "VK_NV_cooperative_matrix", "VK_NV_corner_sampled_image", "VK_NV_dedicated_allocation", + "VK_NV_dedicated_allocation_image_aliasing", "VK_NV_device_diagnostic_checkpoints", "VK_NV_fill_rectangle", "VK_NV_fragment_coverage_to_color", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 50513a1..407b7ef 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -306,6 +306,8 @@ #define VK_EXT_MEMORY_BUDGET_EXTENSION_NAME "VK_EXT_memory_budget" #define VK_EXT_MEMORY_PRIORITY_SPEC_VERSION 1 #define VK_EXT_MEMORY_PRIORITY_EXTENSION_NAME "VK_EXT_memory_priority" +#define VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_SPEC_VERSION 1 +#define VK_NV_DEDICATED_ALLOCATION_IMAGE_ALIASING_EXTENSION_NAME "VK_NV_dedicated_allocation_image_aliasing" #define VK_EXT_BUFFER_DEVICE_ADDRESS_SPEC_VERSION 2 #define VK_EXT_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME "VK_EXT_buffer_device_address" #define VK_EXT_SEPARATE_STENCIL_USAGE_SPEC_VERSION 1 @@ -2144,6 +2146,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT = 1000237000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PRIORITY_FEATURES_EXT = 1000238000, VK_STRUCTURE_TYPE_MEMORY_PRIORITY_ALLOCATE_INFO_EXT = 1000238001, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEDICATED_ALLOCATION_IMAGE_ALIASING_FEATURES_NV = 1000240000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_ADDRESS_FEATURES_EXT = 1000244000, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO_EXT = 1000244001, VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_CREATE_INFO_EXT = 1000244002, @@ -2770,6 +2773,13 @@ typedef struct VkPhysicalDeviceCooperativeMatrixPropertiesNV VkShaderStageFlags cooperativeMatrixSupportedStages; } VkPhysicalDeviceCooperativeMatrixPropertiesNV; +typedef struct VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV +{ + VkStructureType sType; + void *pNext; + VkBool32 dedicatedAllocationImageAliasing; +} VkPhysicalDeviceDedicatedAllocationImageAliasingFeaturesNV; + typedef struct VkPhysicalDeviceDepthStencilResolvePropertiesKHR { VkStructureType sType;

1 0

Alexandre Julliard : msvcrt/tests: Use existing function pointers to call functions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 2e01a48440d9a0a08ec40f02e148a10838cf7d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e01a48440d9a0a08ec40f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:11:08 2019 +0200 msvcrt/tests: Use existing function pointers to call functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a5a2df1..e9edb57 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -609,47 +609,47 @@ static void test_strftime(void) ok(gmt_tm != NULL, "gmtime failed\n"); errno = 0xdeadbeef; - retA = strftime(NULL, 0, "copy", gmt_tm); + retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - retA = strftime(bufA, 256, "copy", NULL); + retA = p_strftime(bufA, 256, "copy", NULL); ok(retA == 4, "expected 4, got %ld\n", retA); ok(!strcmp(bufA, "copy"), "got %s\n", bufA); - retA = strftime(bufA, 256, "copy it", gmt_tm); + retA = p_strftime(bufA, 256, "copy it", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "copy it"), "got %s\n", bufA); errno = 0xdeadbeef; - retA = strftime(bufA, 2, "copy", gmt_tm); + retA = p_strftime(bufA, 2, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "copy it")), "got %s\n", bufA); ok(errno==ERANGE || errno==0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; - retA = strftime(bufA, 256, "a%e", gmt_tm); + retA = p_strftime(bufA, 256, "a%e", gmt_tm); ok(retA==0 || broken(retA==1), "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "a")), "got %s\n", bufA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); if(0) { /* crashes on Win2k */ errno = 0xdeadbeef; - retA = strftime(bufA, 256, "%c", NULL); + retA = p_strftime(bufA, 256, "%c", NULL); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, ""), "got %s\n", bufA); ok(errno == EINVAL, "errno = %d\n", errno); } - retA = strftime(bufA, 256, "e%#%e", gmt_tm); + retA = p_strftime(bufA, 256, "e%#%e", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); ok(retA == 17, "expected 17, got %ld\n", retA); ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); - retW = wcsftime(bufW, 256, cW, gmt_tm); + retW = p_wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); buf[0] = 0; @@ -657,91 +657,91 @@ static void test_strftime(void) buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); - retA = strftime(bufA, 256, "%x", gmt_tm); + retA = p_strftime(bufA, 256, "%x", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%X", gmt_tm); + retA = p_strftime(bufA, 256, "%X", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%a", gmt_tm); + retA = p_strftime(bufA, 256, "%a", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%A", gmt_tm); + retA = p_strftime(bufA, 256, "%A", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%b", gmt_tm); + retA = p_strftime(bufA, 256, "%b", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%B", gmt_tm); + retA = p_strftime(bufA, 256, "%B", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "January"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%d", gmt_tm); + retA = p_strftime(bufA, 256, "%d", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#d", gmt_tm); + retA = p_strftime(bufA, 256, "%#d", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "1"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%H", gmt_tm); + retA = p_strftime(bufA, 256, "%H", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%I", gmt_tm); + retA = p_strftime(bufA, 256, "%I", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "12"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%j", gmt_tm); + retA = p_strftime(bufA, 256, "%j", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "001"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%m", gmt_tm); + retA = p_strftime(bufA, 256, "%m", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#M", gmt_tm); + retA = p_strftime(bufA, 256, "%#M", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "0"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%p", gmt_tm); + retA = p_strftime(bufA, 256, "%p", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_wday = 0; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_yday = 365; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "53"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "52"), "got %s\n", bufA); gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); todo_wine { ok(retA == 17, "expected 17, got %ld\n", retA); ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); @@ -753,7 +753,7 @@ static void test_strftime(void) } /* test with multibyte character */ - retA = strftime(bufA, 256, "\x82%c", gmt_tm); + retA = p_strftime(bufA, 256, "\x82%c", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); }

1 0

Józef Kucia : winevulkan: Enable VK_NV_cooperative_matrix.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: a69ed950203c4716f1ef8d371c25f3909a3c86e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a69ed950203c4716f1ef8d37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:56 2019 +0200 winevulkan: Enable VK_NV_cooperative_matrix. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 25 +++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ include/wine/vulkan.h | 61 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a69ed950203c4716f1ef…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite() .
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: ab22796ab05bd516186500640f961700cce7f3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab22796ab05bd51618650064… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:10 2019 -0500 ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 25 +++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d3e6070..ab952e5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -166,7 +166,7 @@ @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stub ExIsProcessorFeaturePresent @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) -@ stub ExIsResourceAcquiredSharedLite +@ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime @ stub ExNotifyCallback @ stub ExQueryPoolBlockSize diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 94b9778..fbe9dbe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1144,3 +1144,28 @@ BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource ) return ret; } + +/*********************************************************************** + * ExIsResourceAcquiredSharedLite (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) +{ + ULONG ret; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + ret = resource->ActiveEntries; + else + { + OWNER_ENTRY *entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + ret = entry->OwnerCount; + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return ret; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5a84602..dae83af 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1532,6 +1532,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); +ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Alexandre Julliard : msvcp: Remove some redundant clearing of buffers.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 612fce30140b315eeb37f80bc60a931cce81df92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612fce30140b315eeb37f80b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:09:04 2019 +0200 msvcp: Remove some redundant clearing of buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 31 ++++++++----------------------- dlls/msvcp140/tests/msvcp140.c | 35 ++++++++++------------------------- 2 files changed, 18 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612fce30140b315eeb37…

1 0

Józef Kucia : winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: a4b9460ad68bad6675f9e50b390503db9ef94d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b9460ad68bad6675f9e50b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:49 2019 +0200 winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 145 ++++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan.c | 31 ++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 3 + 4 files changed, 177 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4b9460ad68bad6675f9…

1 0

Alexandre Julliard : msvcp: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 8b7b4e514035c40151b5704be37eb5555e768a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7b4e514035c40151b5704b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:08:42 2019 +0200 msvcp: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/ios.c | 12 ++++++------ dlls/msvcp90/msvcp90.spec | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 55217a6..2ae4e4c 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1309,7 +1309,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=win32 ?copyfmt@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_wchar_copyfmt diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 882dbbe..5f2b664 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1892,7 +1892,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 73024a0..c2a2d7e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1852,7 +1852,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 96dff34..5bd627c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1757,7 +1757,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH(a)Z(ptr long) ios_base_clear @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 4e75c20..b7c97a3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2433,7 +2433,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6d3e931..ff6de62 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2624,7 +2624,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 8cf9e54..8a2f695 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3047,7 +3047,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7f792d6..6b94737 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15454,11 +15454,11 @@ struct { int vtordisp; #endif basic_ios_char vbase; -} clog = { { 0 } }; -C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); +} MSVCP_clog = { { 0 } }; +C_ASSERT(sizeof(MSVCP_clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ -basic_ostream_char *_Ptr_clog = &clog.obj; +basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj; static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ @@ -15529,7 +15529,7 @@ void __cdecl ios_base_Init__Init_dtor(void *this) if(!ios_base_Init__Init_cnt) { basic_ostream_char_flush(&cout.obj); basic_ostream_char_flush(&cerr.obj); - basic_ostream_char_flush(&clog.obj); + basic_ostream_char_flush(&MSVCP_clog.obj); } } @@ -15907,7 +15907,7 @@ void init_io(void *base) basic_ostream_wchar_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE); basic_filebuf_char_ctor_file(&filebuf_char_log, stderr); - basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE); + basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE); basic_filebuf_short_ctor_file(&filebuf_short_log, stderr); basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE); @@ -15945,7 +15945,7 @@ void free_io(void) basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_vbase_dtor(&clog.obj); + basic_ostream_char_vbase_dtor(&MSVCP_clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); basic_ostream_wchar_vbase_dtor(&uclog.obj); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1df283a..2c1c0d7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3411,7 +3411,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close

1 0

Alistair Leslie-Hughes : winex11: Implement PK_CHANGE for wintab.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 0652a2ccc967c6d1ca04c67f58112ff491ab9a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0652a2ccc967c6d1ca04c67f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 10 03:42:53 2019 +0000 winex11: Implement PK_CHANGE for wintab. Based on a patch by Eriks Dobelis. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wintab32/context.c | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 48fcb22..486c356 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -267,6 +267,7 @@ static int proximity_out_type; static HWND hwndTabletDefault; static WTPACKET gMsgPacket; static DWORD gSerial; +static WTPACKET last_packet; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -839,6 +840,40 @@ static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) return -1; } +static DWORD get_changed_state( WTPACKET *pkt) +{ + DWORD change = 0; + + if (pkt->pkX != last_packet.pkX) + change |= PK_X; + if (pkt->pkY != last_packet.pkY) + change |= PK_Y; + if (pkt->pkZ != last_packet.pkZ) + change |= PK_Z; + if (pkt->pkSerialNumber != last_packet.pkSerialNumber) + change |= PK_SERIAL_NUMBER; + if (pkt->pkTime != last_packet.pkTime) + change |= PK_TIME; + if (pkt->pkNormalPressure != last_packet.pkNormalPressure) + change |= PK_NORMAL_PRESSURE; + if (pkt->pkTangentPressure != last_packet.pkTangentPressure) + change |= PK_TANGENT_PRESSURE; + if (pkt->pkCursor != last_packet.pkCursor) + change |= PK_CURSOR; + if (pkt->pkButtons != last_packet.pkButtons) + change |= PK_BUTTONS; + if (pkt->pkOrientation.orAzimuth != last_packet.pkOrientation.orAzimuth || + pkt->pkOrientation.orAltitude != last_packet.pkOrientation.orAltitude || + pkt->pkOrientation.orTwist != last_packet.pkOrientation.orTwist) + change |= PK_ORIENTATION; + if (pkt->pkRotation.roPitch != last_packet.pkRotation.roPitch || + pkt->pkRotation.roRoll != last_packet.pkRotation.roRoll || + pkt->pkRotation.roYaw != last_packet.pkRotation.roYaw) + change |= PK_ROTATION; + + return change; +} + static BOOL motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; @@ -865,7 +900,9 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } @@ -895,7 +932,9 @@ static BOOL button_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2993c47..095e258 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -215,6 +215,7 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) packet->pkContext = ptr->handle; /* translate packet data to the context */ + packet->pkChanged = packet->pkChanged & ptr->context.lcPktData; /* Scale as per documentation */ packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY,

1 0

Fabian Maurer : sxs: Implement SxsLookupClrGuid and add tests.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 4c7ffaecaf50cee91e74d509f64f4aecca6e237c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7ffaecaf50cee91e74d509… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 9 19:27:44 2019 +0200 sxs: Implement SxsLookupClrGuid and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 150 ++++++++++++++++++++++++ dlls/sxs/sxs.spec | 1 + dlls/sxs/tests/Makefile.in | 8 +- dlls/sxs/tests/comtest_dll.manifest | 16 +++ dlls/sxs/tests/comtest_exe.manifest | 11 ++ dlls/sxs/tests/interfaces.idl | 35 ++++++ dlls/sxs/tests/resource.rc | 27 +++++ dlls/sxs/tests/sxs.c | 224 ++++++++++++++++++++++++++++++++++++ 8 files changed, 470 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7ffaecaf50cee91e74…

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 368f35edd773647fe75073127f46d46d8ba8d896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368f35edd773647fe7507312… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Apr 9 05:02:10 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 99 +++++++++++++++++++++++++--------------------------------------- 1 file changed, 39 insertions(+), 60 deletions(-) diff --git a/po/si.po b/po/si.po index 5bf28e5..d4bb595 100644 --- a/po/si.po +++ b/po/si.po @@ -3803,7 +3803,7 @@ msgstr "අවලංගු ධාවකය.\n" #: winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "" +msgstr "වත්මන් ඩිරෙක්ටරිය මකන්න බැහැ.\n" #: winerror.mc:113 msgid "Not same device.\n" @@ -3903,7 +3903,7 @@ msgstr "" #: winerror.mc:233 msgid "Bad network path.\n" -msgstr "" +msgstr "හොඳ නැති ජාලය පෙත.\n" #: winerror.mc:238 msgid "Network busy.\n" @@ -4080,9 +4080,8 @@ msgid "Invalid IOCTL.\n" msgstr "අවලංගු IOCTL.\n" #: winerror.mc:458 -#, fuzzy msgid "Invalid verify switch.\n" -msgstr "අවලංගු" +msgstr "අවලංගු verify ස්විචය.\n" #: winerror.mc:463 msgid "Bad driver level.\n" @@ -4553,7 +4552,7 @@ msgstr "අවලංගු සලකුණු.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "" +msgstr "හඳුනගත්තු නැති පංගුවක්.\n" #: winerror.mc:1048 msgid "File invalid.\n" @@ -4711,9 +4710,8 @@ msgid "Invalid service lock.\n" msgstr "අවලංගු සේවාව අගුල.\n" #: winerror.mc:1238 -#, fuzzy msgid "Service marked for delete.\n" -msgstr "සේවාව" +msgstr "සේවාව සලකුණු කරලා මැකීමට.\n" #: winerror.mc:1243 msgid "Service exists.\n" @@ -6151,11 +6149,11 @@ msgstr "" #: winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "" +msgstr "RPC සේවාදායකය ලද නොහැකි.\n" #: winerror.mc:3048 msgid "RPC server too busy.\n" -msgstr "" +msgstr "RPC සේවාදායකය කාර්යබහුල වැඩි.\n" #: winerror.mc:3053 msgid "Invalid network options.\n" @@ -6211,7 +6209,7 @@ msgstr "" #: winerror.mc:3123 msgid "Unknown authentication type.\n" -msgstr "" +msgstr "දන්නේ නැති සත්‍යාපනය වර්ගයක්.\n" #: winerror.mc:3128 msgid "Maximum calls too low.\n" @@ -6247,7 +6245,7 @@ msgstr "අවලංගු සත්‍යාපන අනන්‍යතාව #: winerror.mc:3168 msgid "Unknown authorization service.\n" -msgstr "" +msgstr "දන්නේ නැති අනුමැතිය සේවාවක්.\n" #: winerror.mc:3173 msgid "Invalid entry.\n" @@ -6799,10 +6797,8 @@ msgid "Object is not initialized.\n" msgstr "වස්තුව ආරම්භනය කරල නැහැ.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Error: Process self-termination is not permitted.\n" msgid "Representation is not supported.\n" -msgstr "දෝෂය: ක්රියාවලියක් තමංම නතර කරන්න බැහැ.\n" +msgstr "ඉදිරිපත්කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" @@ -6865,10 +6861,8 @@ msgid "Unsupported thinning.\n" msgstr "Thinning සහාය නොදක්වයි.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Reversing is not supported.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ප්‍රතිවර්තනය කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:214 msgid "Unsupported rate transition.\n" @@ -6941,10 +6935,8 @@ msgid "Attribute is not found.\n" msgstr "උපලක්ෂණය හම්බු උනේ නැහැ.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property type is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංග වර්ගය අවසර නැහැ.\n" #: mferror.mc:354 msgid "Property type is not supported.\n" @@ -7000,10 +6992,8 @@ msgid "No events available.\n" msgstr "සිද්ධීන් ලද හැකි නැහැ.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය\n" +msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය.\n" #: mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -7020,28 +7010,20 @@ msgid "Media stream has no duration set.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ\n" +msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "ගුණාංගය හම්බු උනේ නැහැ\n" +msgstr "ගුණාංගය හම්බු උනේ නැහැ.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "ගුණාංගය කියවීම් පමණි\n" +msgstr "ගුණාංගය කියවීම් පමණි.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංගය අවසර නැහැ.\n" #: mferror.mc:501 #, fuzzy @@ -7050,26 +7032,20 @@ msgid "Media source is not started.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" +msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ.\n" #: mferror.mc:522 msgid "No media streams were selected.\n" msgstr "" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n" @@ -7763,7 +7739,7 @@ msgstr "" #: msvfw32.rc:53 msgid "&Data Rate" -msgstr "" +msgstr "දත්ත අනුපාතය (&D)" #: msvfw32.rc:55 msgid "kB/s" @@ -8917,7 +8893,7 @@ msgstr "හංගලා (&I)" #: shell32.rc:372 shell32.rc:409 winefile.rc:175 msgid "&Archive" -msgstr "" +msgstr "සංරක්ෂිතය (&A)" #: shell32.rc:386 msgid "Open with:" @@ -11872,7 +11848,7 @@ msgstr "අපේක්ෂා කරේ මෙහෙයුම්කාරකය #: cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "වරහන් ගැලපෙන්නේ නැහැ.\n" #: cmd.rc:409 msgid "" @@ -12142,7 +12118,7 @@ msgstr "තත්වය" #: netstat.rc:35 msgid "Interface Statistics" -msgstr "" +msgstr "අතුරුමුහුණත සංඛ්‍යාලේඛන" #: netstat.rc:36 msgid "Sent" @@ -12573,11 +12549,11 @@ msgstr "පද්ධති සිටුවම්" #: oleview.rc:171 msgid "&Enable Distributed COM" -msgstr "" +msgstr "DCOM සබල කරන්න (&E)" #: oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "" +msgstr "දුරස්ථ සබැඳුම් සබල කරන්න (Win95 විතරක්)" #: oleview.rc:173 msgid "" @@ -12860,7 +12836,7 @@ msgstr "ක්‍රමලේඛ කළමනාකාරකය ගැන (&A)" #: progman.rc:103 msgid "Program &group" -msgstr "" +msgstr "ක්‍රමලේඛ සමූහය (&G)" #: progman.rc:105 msgid "&Program" @@ -12896,7 +12872,7 @@ msgstr "" #: progman.rc:156 msgid "&Group file:" -msgstr "" +msgstr "සමූහය ගොනුව (&G):" #: progman.rc:168 msgid "Program Attributes" @@ -13156,7 +13132,7 @@ msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න #: reg.rc:69 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" @@ -13168,7 +13144,7 @@ msgstr "reg: අවලංගු පද්ධතිය යතුර [%1]\n" #: reg.rc:72 msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "" +msgstr "'%1' ගොනුව දැනටමත් තියෙනවා. ඔබට ඒක උඩින් ලියන්න ඕනෙද?" #: regedit.rc:34 msgid "&Registry" @@ -13488,7 +13464,7 @@ msgstr "" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: අවලංගු හෝ දන්නෙ නැති ස්විචයක් [%1]\n" +msgstr "regedit: අවලංගු හෝ හඳුනගත්තු නැති ස්විචයක් [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -13530,7 +13506,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -13772,7 +13748,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: අවලංගු හෝ දන්නේ නැති ස්විචය [%1]\n" +"regsvr32: අවලංගු හෝ හඳුනගත්තු නැති ස්විචය [%1]\n" "\n" #: regsvr32.rc:42 @@ -15518,7 +15494,7 @@ msgstr "wineconsole: අවලංගු බැකන්ඩ් එකක්\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: දන්නෙ නැති විධාන රේඛා විකල්පය\n" +msgstr "wineconsole: හඳුනගත්තු නැති විධාන රේඛා විකල්පය\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -16062,7 +16038,7 @@ msgstr "අනුලකුණ ආකෘතිය (&F)" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "" +msgstr "පෙරනිමි අනුලකුණ ආකෘතිය (&D)" #: wordpad.rc:65 msgid "Paragrap&h format" @@ -16186,7 +16162,7 @@ msgstr "පෙළ ගැසුම" #: wordpad.rc:250 msgid "Tabs" -msgstr "" +msgstr "ටැබ" #: wordpad.rc:253 msgid "Tab stops" @@ -16434,6 +16410,9 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"'%1' කියන්නේ ගොනුවක නමක් හෝ ඩිරෙක්ටරියක් ද\n" +"ඉලක්කය උඩ?\n" +"(F - ගොනුවක්, D - ඩිරෙක්ටරියක්)\n" #: xcopy.rc:38 msgid "%1? (Yes|No)\n"

1 0

Józef Kucia : winevulkan: Enable VK_AMD_memory_overallocation_behavior.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: abc83d1b3447e731f01f144d88c5d919efcab8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=abc83d1b3447e731f01f144d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:51 2019 +0200 winevulkan: Enable VK_AMD_memory_overallocation_behavior. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index af37657..46294f7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -101,7 +101,6 @@ BLACKLISTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", "VK_EXT_calibrated_timestamps", - "VK_AMD_memory_overallocation_behavior", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fc41fb0..9919642 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1828,6 +1828,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: + { + const VkDeviceMemoryOverallocationCreateInfoAMD *in = (const VkDeviceMemoryOverallocationCreateInfoAMD *)in_header; + VkDeviceMemoryOverallocationCreateInfoAMD *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->overallocationBehavior = in->overallocationBehavior; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT: { const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *in = (const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *)in_header; @@ -4225,6 +4241,7 @@ static const char * const vk_device_extensions[] = "VK_AMD_gcn_shader", "VK_AMD_gpu_shader_half_float", "VK_AMD_gpu_shader_int16", + "VK_AMD_memory_overallocation_behavior", "VK_AMD_mixed_attachment_samples", "VK_AMD_negative_viewport_height", "VK_AMD_rasterization_order", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 2a86277..5a48441 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -260,6 +260,8 @@ #define VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME "VK_KHR_shader_atomic_int64" #define VK_AMD_SHADER_CORE_PROPERTIES_SPEC_VERSION 1 #define VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME "VK_AMD_shader_core_properties" +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_SPEC_VERSION 1 +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_EXTENSION_NAME "VK_AMD_memory_overallocation_behavior" #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 3 #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 @@ -1445,6 +1447,14 @@ typedef enum VkMemoryHeapFlagBits VK_MEMORY_HEAP_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkMemoryHeapFlagBits; +typedef enum VkMemoryOverallocationBehaviorAMD +{ + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DEFAULT_AMD = 0, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_ALLOWED_AMD = 1, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DISALLOWED_AMD = 2, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_AMD_MAX_ENUM = 0x7fffffff, +} VkMemoryOverallocationBehaviorAMD; + typedef enum VkMemoryPropertyFlagBits { VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT = 0x00000001, @@ -2067,6 +2077,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = 1000177000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, + VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, @@ -2429,6 +2440,13 @@ typedef struct VkDeviceGroupPresentInfoKHR VkDeviceGroupPresentModeFlagBitsKHR mode; } VkDeviceGroupPresentInfoKHR; +typedef struct VkDeviceMemoryOverallocationCreateInfoAMD +{ + VkStructureType sType; + const void *pNext; + VkMemoryOverallocationBehaviorAMD overallocationBehavior; +} VkDeviceMemoryOverallocationCreateInfoAMD; + typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { VkStructureType sType;

1 0