- wine-devel - winehq.org

[PATCH 4/4] gdi32: Support LUID in D3DKMTOpenAdapterFromGdiDisplayName().
by Zhiyi Zhang 21 Apr '20

21 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 100 ++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 2 + 3 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index e1ac922ce52..32b2e6959c1 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 +DELAYIMPORTS = usp10 setupapi C_SRCS = \ bidi.c \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 90977383a58..8eedc821146 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -31,10 +31,14 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "ddk/d3dkmthk.h" #include "gdi_private.h" @@ -45,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct graphics_driver { struct list entry; @@ -84,6 +90,7 @@ static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HWND (WINAPI *pGetDesktopWindow)(void); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static BOOL (WINAPI *pEnumDisplayDevicesW)(LPCWSTR, DWORD, DISPLAY_DEVICEW *, DWORD); /********************************************************************** * create_driver @@ -159,6 +166,20 @@ static BOOL is_display_device( LPCWSTR name ) return TRUE; } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutex[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutex ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} /********************************************************************** * DRIVER_load_driver @@ -1351,16 +1372,89 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; + static const WCHAR pciW[] = {'P','C','I',0}; static D3DKMT_HANDLE handle_start = 0; + DWORD size, type, device_index = 0; + DISPLAY_DEVICEW display_device; struct d3dkmt_adapter *adapter; + SP_DEVINFO_DATA device_data; + WCHAR buffer[MAX_PATH]; + BOOL found = FALSE; + HDEVINFO devinfo; + HMODULE user32; + HANDLE mutex; + LSTATUS ls; WCHAR *end; + HKEY hkey; + LUID luid; int id; TRACE("(%p) semi-stub\n", desc); - if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) + if (!desc) return STATUS_UNSUCCESSFUL; + if (!pEnumDisplayDevicesW) + { + user32 = LoadLibraryA( "user32.dll" ); + pEnumDisplayDevicesW = (void *)GetProcAddress( user32, "EnumDisplayDevicesW" ); + } + + display_device.cb = sizeof( display_device ); + while (pEnumDisplayDevicesW( NULL, device_index++, &display_device, 0 )) + { + if (lstrcmpiW( display_device.DeviceName, desc->DeviceName )) + continue; + + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + found = TRUE; + break; + } + } + + if (!found) + return STATUS_UNSUCCESSFUL; + + /* Get the GPU LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_DISPLAY, pciW, NULL, 0 ); + + found = FALSE; + device_index = 0; + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo( devinfo, device_index++, &device_data )) + { + hkey = SetupDiOpenDevRegKey( devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ ); + if (hkey == INVALID_HANDLE_VALUE) + continue; + + size = sizeof(buffer); + ls = RegQueryValueExW( hkey, video_idW, 0, NULL, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + if (ls) + continue; + + /* Compare GPU UUID. DeviceKey from EnumDisplayDevices is of form + * \Registry\Machine\System\CurrentControlSet\Control\Video\{GPU UUID}\0000 */ + if (strncmpiW( buffer, display_device.DeviceKey + 57, 38 )) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + &type, (BYTE *)&luid, sizeof(luid), NULL, 0) ) + { + found = TRUE; + break; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + if (!found) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Using display index as VidPnSourceId */ id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; if (*end) return STATUS_UNSUCCESSFUL; @@ -1376,9 +1470,7 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); desc->hAdapter = handle_start; - /* FIXME: Support AdapterLuid */ - desc->AdapterLuid.LowPart = 0; - desc->AdapterLuid.HighPart = 0; + desc->AdapterLuid = luid; desc->VidPnSourceId = id; return STATUS_SUCCESS; } diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 6172d4a7983..c656eb4245a 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,6 +86,8 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + ok(open_adapter_gdi_desc.AdapterLuid.LowPart || open_adapter_gdi_desc.AdapterLuid.HighPart, + "Expect LUID not zero.\n"); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); -- 2.20.1

1 0

[PATCH 3/4] gdi32/tests: Remove tests for VidPnSourceId.
by Zhiyi Zhang 21 Apr '20

21 Apr '20

VidPnSourceId may be zero for non-primary adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ed83a728131..6172d4a7983 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,11 +86,6 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_gdi_desc.VidPnSourceId); - else - ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); @@ -135,12 +130,6 @@ static void test_D3DKMTOpenAdapterFromHdc(void) status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); - else - todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); DeleteDC(hdc); if (status == STATUS_SUCCESS) -- 2.20.1

1 0

[PATCH 1/4] winex11.drv: Allocate LUID for GPUs.
by Zhiyi Zhang 21 Apr '20

21 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ad74c9b4e1..4429cb89224 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -278,9 +280,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR bufferW[1024]; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -306,6 +310,20 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), + wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); -- 2.20.1

1 0

[PATCH] user32: Added LoadKeyboardLayoutEx stub.
by Vijay Kiran Kamuju 21 Apr '20

21 Apr '20

Checked metasploit related documentation for function signature. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28170 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 5/5] vcruntime140_1: Add __CxxFrameHandler4 implementation.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/cppexcept.h | 65 ++++ dlls/vcruntime140_1/except_x86_64.c | 470 +++++++++++++++++++++++++++- 2 files changed, 533 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] vcruntime140_1: Implement function description version 4 structures reading.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/cppexcept.h | 54 ++++++ dlls/vcruntime140_1/except_x86_64.c | 289 ++++++++++++++++++++++++++++ 2 files changed, 343 insertions(+) create mode 100644 dlls/vcruntime140_1/cppexcept.h

1 0

[PATCH 3/5] vcruntime140_1: Add __CxxFrameHandler4 stub.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/Makefile.in | 5 ++++ dlls/vcruntime140_1/except_x86_64.c | 34 +++++++++++++++++++++++++ dlls/vcruntime140_1/vcruntime140_1.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 dlls/vcruntime140_1/except_x86_64.c

1 0

[PATCH 2/5] vcruntime140_1: Export functions only on x86_64.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/vcruntime140_1.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 1/5] ucrtbase: Change ptd fields offsets to match with native.
by Piotr Caban 21 Apr '20

21 Apr '20

Makes it possible to use native vcruntime140_1.dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 3 +-- dlls/msvcrt/msvcrt.h | 5 ++--- dlls/ucrtbase/tests/misc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-)

1 0

[PATCH] msi: Add support for bitmap buttons.
by Hans Leidekker 21 Apr '20

21 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48974 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/dialog.c | 166 +++++++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 75 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 67a0633991..81b0d3dba0 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1014,38 +1014,120 @@ static UINT msi_dialog_button_handler( msi_dialog *dialog, msi_control *control, return r; } +static HBITMAP msi_load_picture( MSIDATABASE *db, const WCHAR *name, INT cx, INT cy, DWORD flags ) +{ + HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; + MSIRECORD *rec = NULL; + IStream *stm = NULL; + IPicture *pic = NULL; + HDC srcdc, destdc; + BITMAP bm; + UINT r; + + rec = msi_get_binary_record( db, name ); + if (!rec) + goto end; + + r = MSI_RecordGetIStream( rec, 2, &stm ); + msiobj_release( &rec->hdr ); + if (r != ERROR_SUCCESS) + goto end; + + r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (void **)&pic ); + IStream_Release( stm ); + if (FAILED( r )) + { + ERR("failed to load picture\n"); + goto end; + } + + r = IPicture_get_Handle( pic, (OLE_HANDLE *)&hOleBitmap ); + if (FAILED( r )) + { + ERR("failed to get bitmap handle\n"); + goto end; + } + + /* make the bitmap the desired size */ + r = GetObjectW( hOleBitmap, sizeof(bm), &bm ); + if (r != sizeof(bm)) + { + ERR("failed to get bitmap size\n"); + goto end; + } + + if (flags & LR_DEFAULTSIZE) + { + cx = bm.bmWidth; + cy = bm.bmHeight; + } + + srcdc = CreateCompatibleDC( NULL ); + hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); + destdc = CreateCompatibleDC( NULL ); + hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); + hOldDestBitmap = SelectObject( destdc, hBitmap ); + StretchBlt( destdc, 0, 0, cx, cy, srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY ); + SelectObject( srcdc, hOldSrcBitmap ); + SelectObject( destdc, hOldDestBitmap ); + DeleteDC( srcdc ); + DeleteDC( destdc ); + +end: + if (pic) IPicture_Release( pic ); + return hBitmap; +} + static UINT msi_dialog_button_control( msi_dialog *dialog, MSIRECORD *rec ) { msi_control *control; - UINT attributes, style; + UINT attributes, style, cx = 0, cy = 0, flags = 0; + WCHAR *name = NULL; TRACE("%p %p\n", dialog, rec); style = WS_TABSTOP; attributes = MSI_RecordGetInteger( rec, 8 ); - if( attributes & msidbControlAttributesIcon ) - style |= BS_ICON; + if (attributes & msidbControlAttributesIcon) style |= BS_ICON; + else if (attributes & msidbControlAttributesBitmap) + { + style |= BS_BITMAP; + if (attributes & msidbControlAttributesFixedSize) flags |= LR_DEFAULTSIZE; + else + { + cx = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 6) ); + cy = msi_dialog_scale_unit( dialog, MSI_RecordGetInteger(rec, 7) ); + } + } control = msi_dialog_add_control( dialog, rec, szButton, style ); - if( !control ) + if (!control) return ERROR_FUNCTION_FAILED; control->handler = msi_dialog_button_handler; if (attributes & msidbControlAttributesIcon) { - /* set the icon */ - LPWSTR name = msi_get_binary_name( dialog->package, rec ); + name = msi_get_binary_name( dialog->package, rec ); control->hIcon = msi_load_icon( dialog->package->db, name, attributes ); if (control->hIcon) { SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM) control->hIcon ); } - else - ERR("Failed to load icon %s\n", debugstr_w(name)); - msi_free( name ); + else ERR("Failed to load icon %s\n", debugstr_w(name)); + } + else if (attributes & msidbControlAttributesBitmap) + { + name = msi_get_binary_name( dialog->package, rec ); + control->hBitmap = msi_load_picture( dialog->package->db, name, cx, cy, flags ); + if (control->hBitmap) + { + SendMessageW( control->hwnd, BM_SETIMAGE, IMAGE_BITMAP, (LPARAM) control->hBitmap ); + } + else ERR("Failed to load bitmap %s\n", debugstr_w(name)); } + msi_free( name ); return ERROR_SUCCESS; } @@ -1341,72 +1423,6 @@ static UINT msi_dialog_scrolltext_control( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } -static HBITMAP msi_load_picture( MSIDATABASE *db, LPCWSTR name, - INT cx, INT cy, DWORD flags ) -{ - HBITMAP hOleBitmap = 0, hBitmap = 0, hOldSrcBitmap, hOldDestBitmap; - MSIRECORD *rec = NULL; - IStream *stm = NULL; - IPicture *pic = NULL; - HDC srcdc, destdc; - BITMAP bm; - UINT r; - - rec = msi_get_binary_record( db, name ); - if( !rec ) - goto end; - - r = MSI_RecordGetIStream( rec, 2, &stm ); - msiobj_release( &rec->hdr ); - if( r != ERROR_SUCCESS ) - goto end; - - r = OleLoadPicture( stm, 0, TRUE, &IID_IPicture, (LPVOID*) &pic ); - IStream_Release( stm ); - if( FAILED( r ) ) - { - ERR("failed to load picture\n"); - goto end; - } - - r = IPicture_get_Handle( pic, (OLE_HANDLE*) &hOleBitmap ); - if( FAILED( r ) ) - { - ERR("failed to get bitmap handle\n"); - goto end; - } - - /* make the bitmap the desired size */ - r = GetObjectW( hOleBitmap, sizeof bm, &bm ); - if (r != sizeof bm ) - { - ERR("failed to get bitmap size\n"); - goto end; - } - - if (flags & LR_DEFAULTSIZE) - { - cx = bm.bmWidth; - cy = bm.bmHeight; - } - - srcdc = CreateCompatibleDC( NULL ); - hOldSrcBitmap = SelectObject( srcdc, hOleBitmap ); - destdc = CreateCompatibleDC( NULL ); - hBitmap = CreateCompatibleBitmap( srcdc, cx, cy ); - hOldDestBitmap = SelectObject( destdc, hBitmap ); - StretchBlt( destdc, 0, 0, cx, cy, - srcdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); - SelectObject( srcdc, hOldSrcBitmap ); - SelectObject( destdc, hOldDestBitmap ); - DeleteDC( srcdc ); - DeleteDC( destdc ); - -end: - if ( pic ) - IPicture_Release( pic ); - return hBitmap; -} static UINT msi_dialog_bitmap_control( msi_dialog *dialog, MSIRECORD *rec ) { -- 2.20.1

1 0

Wine theme
by Олег 21 Apr '20

21 Apr '20

Hi, There is a great theme for Wine in the form of a registry file wine_breeze_colors.reg . I suggest that you enable this theme by default in Wine, since the existing theme is very outdated. -- Олег *****

1 0

[PATCH 9/9] windowscodecs/tests: Add a separate test for 4bps BGRA TIFF format.
by Dmitry Timoshkov 21 Apr '20

21 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 104 ++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 2a03dc19af..504a053983 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -302,6 +302,47 @@ static const struct tiff_24bpp_data { 900, 3 }, { 0x11, 0x22, 0x33 } }; + +static const struct tiff_4bps_bgra +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[14]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[4]; +} tiff_4bps_bgra = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_4bps_bgra, number_of_entries), + 14, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 3 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 2 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 1 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_4bps_bgra, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 4 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 2 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 4 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_4bps_bgra, res) }, /* YRESOLUTION */ + { 0x11c, IFD_SHORT, 1, 1 }, /* PLANARCONFIGURATION */ + { 0x128, IFD_SHORT, 1, 2 } /* RESOLUTIONUNIT */ + }, + 0, + { 96, 1 }, + { 0x12,0x30, 0x47,0xe0 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -1177,6 +1218,68 @@ static void test_color_formats(void) } } +static void test_tiff_4bps_bgra(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT frame_count, width, height, i; + double dpi_x, dpi_y; + IWICPalette *palette; + GUID format; + WICRect rc; + BYTE data[24]; + static const BYTE expected_data[24] = { 0,0,0,0xff, 0xff,0,0,0, 0xff,0,0,0xff, + 0,0xff,0,0, 0xff,0xff,0,0xff, 0xff,0xff,0xff,0 }; + + hr = create_decoder(&tiff_4bps_bgra, sizeof(tiff_4bps_bgra), &decoder); + ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr); + if (hr != S_OK) return; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(frame_count == 1, "expected 1, got %u\n", frame_count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 3, "got %u\n", width); + ok(height == 2, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 96.0, "expected 96.0, got %f\n", dpi_x); + ok(dpi_y == 96.0, "expected 96.0, got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat32bppBGRA), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + hr = IWICBitmapFrameDecode_CopyPalette(frame, palette); + ok(hr == WINCODEC_ERR_PALETTEUNAVAILABLE, + "expected WINCODEC_ERR_PALETTEUNAVAILABLE, got %#x\n", hr); + IWICPalette_Release(palette); + + memset(data, 0xaa, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 3; + rc.Height = 2; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, 12, sizeof(data), data); + ok(hr == S_OK, "CopyPixels error %#x\n", hr); + + for (i = 0; i < sizeof(data); i++) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -1188,6 +1291,7 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; + test_tiff_4bps_bgra(); test_color_formats(); test_tiff_1bpp_palette(); test_tiff_8bpp_palette(); -- 2.25.2

2 1

d2d1: Which tests to add for cubic bezier path geometries?
by Connor McAdams 20 Apr '20

20 Apr '20

Hi! Currently I'm trying to write tests for implementing cubic bezier support, however, I'm not sure which tests need to be added within the test_path geometry function. There are tests currently for transformation, and some for reading back a surface to compare against. Since my first patch series only implements bounds checking, bezier-bezier intersection, and bezier-line intersection, comparing against a surface won't really be applicable. Transformation is a more generic path geometry thing, I can add that, but I'm not sure it's necessary. Currently, I imagine the tests that will be necessary in test_path_geometry will be simplification and bounds checking. I'm thinking the bezier-bezier and bezier-line intersection checking would go into test_bezier_intersect, but I'd like confirmation of that. If there's any I missed, let me know. Mainly, I want to be sure I'm writing the correct tests/enough tests, and that they're contained within the correct test functions. Thanks, Connor McAdams

1 0

[PATCH v2 1/5] strmbase: Make the pin_get_media_type() callback optional.
by Zebediah Figura 20 Apr '20

20 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 36 ++++++++++++++++++++++++++---------- dlls/strmbase/renderer.c | 1 - 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4676c9d82b..d9d25f7627 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,10 +57,13 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + if (pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++object->count; + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++object->count; + } } TRACE("Created enumerator %p.\n", object); @@ -121,6 +124,13 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count); + if (!enummt->pin->ops->pin_get_media_type) + { + if (ret_count) + *ret_count = 0; + return count ? S_FALSE : S_OK; + } + for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) @@ -169,10 +179,13 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + if (enummt->pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++enummt->count; + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++enummt->count; + } } enummt->index = 0; @@ -397,10 +410,13 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) - return hr; - if (hr == S_OK) - FreeMediaType(&mt); + if (pin->ops->pin_get_media_type) + { + if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) + return hr; + if (hr == S_OK) + FreeMediaType(&mt); + } return enum_media_types_create(pin, enum_media_types); } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd999d3ae9..f1e74f6476 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -257,7 +257,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, .sink_connect = sink_connect, .sink_disconnect = sink_disconnect, -- 2.26.0

2 7

[PATCH 5/5] wined3d: Introduce a slab allocator for small buffers.
by Henri Verbeet 20 Apr '20

20 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 29 ++++- dlls/wined3d/context_vk.c | 192 +++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 4 +- dlls/wined3d/wined3d_private.h | 29 +++++ include/wine/rbtree.h | 16 +++ 5 files changed, 264 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 35b4e8da6aa..8a6bc2b01cf 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -553,13 +553,23 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + struct wined3d_bo_slab_vk *slab; void *map_ptr; VkResult vr; vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); - if (bo->memory) + if ((slab = bo->slab)) + { + if (!(map_ptr = slab->map_ptr) && !(map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + { + ERR("Failed to map slab.\n"); + return NULL; + } + ++slab->map_count; + } + else if (bo->memory) { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); @@ -582,6 +592,17 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context { const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + struct wined3d_bo_slab_vk *slab; + + if ((slab = bo->slab)) + { + if (--slab->map_count) + return; + + wined3d_bo_vk_unmap(&slab->bo, context_vk); + slab->map_ptr = NULL; + return; + } vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); @@ -628,7 +649,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.offset = bo->buffer_offset + (uintptr_t)data->addr; vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); @@ -718,8 +739,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } - region.srcOffset = (uintptr_t)src->addr; - region.dstOffset = (uintptr_t)dst->addr; + region.srcOffset = src_bo->buffer_offset + (uintptr_t)src->addr; + region.dstOffset = dst_bo->buffer_offset + (uintptr_t)dst->addr; region.size = size; vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 0d90c40fe64..76aafa4c110 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -110,6 +110,97 @@ struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3 return block; } +static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, + VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); + const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; + struct wined3d_bo_slab_vk_key key; + struct wined3d_bo_slab_vk *slab; + struct wine_rb_entry *entry; + size_t object_size, idx; + size_t alignment; + + if (size > WINED3D_ALLOCATOR_MIN_BLOCK_SIZE / 2) + return false; + + alignment = WINED3D_SLAB_BO_MIN_OBJECT_ALIGN; + if ((usage & (VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT)) + && limits->minTexelBufferOffsetAlignment > alignment) + alignment = limits->minTexelBufferOffsetAlignment; + if ((usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT) && limits->minUniformBufferOffsetAlignment) + alignment = limits->minUniformBufferOffsetAlignment; + if ((usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) && limits->minStorageBufferOffsetAlignment) + alignment = limits->minStorageBufferOffsetAlignment; + + object_size = (size + (alignment - 1)) & ~(alignment - 1); + if (object_size < WINED3D_ALLOCATOR_MIN_BLOCK_SIZE / 32) + object_size = WINED3D_ALLOCATOR_MIN_BLOCK_SIZE / 32; + key.memory_type = memory_type; + key.usage = usage; + key.size = 32 * object_size; + + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) + { + slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); + TRACE("Using existing bo slab %p.\n", slab); + } + else + { + if (!(slab = heap_alloc_zero(sizeof(*slab)))) + { + ERR("Failed to allocate bo slab.\n"); + return false; + } + + if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) + { + ERR("Failed to create slab bo.\n"); + heap_free(slab); + return false; + } + slab->map = ~0u; + + if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + { + ERR("Failed to add slab to available tree.\n"); + wined3d_context_vk_destroy_bo(context_vk, &slab->bo); + heap_free(slab); + return false; + } + + TRACE("Created new bo slab %p.\n", slab); + } + + idx = wined3d_bit_scan(&slab->map); + if (!slab->map) + { + if (slab->next) + { + wine_rb_replace(&context_vk->bo_slab_available, &slab->entry, &slab->next->entry); + slab->next = NULL; + } + else + { + wine_rb_remove(&context_vk->bo_slab_available, &slab->entry); + } + } + + *bo = slab->bo; + bo->memory = NULL; + bo->slab = slab; + bo->buffer_offset = idx * object_size; + bo->memory_offset = slab->bo.memory_offset + bo->buffer_offset; + bo->size = size; + bo->command_buffer_id = 0; + + TRACE("Using buffer 0x%s, memory 0x%s, offset 0x%s for bo %p.\n", + wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), + wine_dbgstr_longlong(bo->buffer_offset), bo); + + return true; +} + BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { @@ -121,6 +212,9 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic unsigned int memory_type_idx; VkResult vr; + if (wined3d_context_vk_create_slab_bo(context_vk, size, usage, memory_type, bo)) + return TRUE; + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; @@ -170,8 +264,12 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->buffer_offset = 0; + bo->size = size; + bo->usage = usage; bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; bo->command_buffer_id = 0; + bo->slab = NULL; TRACE("Created buffer 0x%s, memory 0x%s for bo %p.\n", wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), bo); @@ -246,6 +344,56 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte o->command_buffer_id = command_buffer_id; } +static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, + size_t idx, struct wined3d_context_vk *context_vk) +{ + struct wined3d_bo_slab_vk_key key; + struct wine_rb_entry *entry; + + TRACE("slab %p, idx %zu, context_vk %p.\n", slab, idx, context_vk); + + if (!slab->map) + { + key.memory_type = slab->bo.memory_type; + key.usage = slab->bo.usage; + key.size = slab->bo.size; + + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) + { + slab->next = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); + wine_rb_replace(&context_vk->bo_slab_available, entry, &slab->entry); + } + else if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + { + ERR("Unable to return slab %p (map 0x%08x) to available tree.\n", slab, slab->map); + } + } + slab->map |= 1u << idx; +} + +static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *context_vk, + struct wined3d_bo_slab_vk *slab, size_t idx, uint64_t command_buffer_id) +{ + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + wined3d_bo_slab_vk_free_slice(slab, idx, context_vk); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking slab %p, slice %#zx.\n", slab, idx); + return; + } + + o->type = WINED3D_RETIRED_BO_SLAB_SLICE_VK; + o->u.slice.slab = slab; + o->u.slice.idx = idx; + o->command_buffer_id = command_buffer_id; +} + static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context_vk, VkBuffer vk_buffer, uint64_t command_buffer_id) { @@ -298,8 +446,18 @@ void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { + size_t object_size, idx; + TRACE("context_vk %p, bo %p.\n", context_vk, bo); + if (bo->slab) + { + object_size = bo->slab->bo.size / 32; + idx = bo->buffer_offset / object_size; + wined3d_context_vk_destroy_bo_slab_slice(context_vk, bo->slab, idx, bo->command_buffer_id); + return; + } + wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { @@ -365,6 +523,10 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont wined3d_allocator_block_free(o->u.block); break; + case WINED3D_RETIRED_BO_SLAB_SLICE_VK: + wined3d_bo_slab_vk_free_slice(o->u.slice.slab, o->u.slice.idx, context_vk); + break; + case WINED3D_RETIRED_BUFFER_VK: VK_CALL(vkDestroyBuffer(device_vk->vk_device, o->u.vk_buffer, NULL)); TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(o->u.vk_buffer)); @@ -392,6 +554,21 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont } } +static void wined3d_context_vk_destroy_bo_slab(struct wine_rb_entry *entry, void *ctx) +{ + struct wined3d_context_vk *context_vk = ctx; + struct wined3d_bo_slab_vk *slab, *next; + + slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); + while (slab) + { + next = slab->next; + wined3d_context_vk_destroy_bo(context_vk, &slab->bo); + heap_free(slab); + slab = next; + } +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; @@ -409,6 +586,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); context_vk->completed_command_buffer_id = buffer->id; wined3d_context_vk_cleanup_resources(context_vk); + wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->submitted.buffers); heap_free(context_vk->retired.objects); @@ -576,6 +754,18 @@ void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier)); } +static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); + const struct wined3d_bo_slab_vk_key *k = key; + + if (k->memory_type != slab->bo.memory_type) + return k->memory_type - slab->bo.memory_type; + if (k->usage != slab->bo.usage) + return k->usage - slab->bo.usage; + return k->size - slab->bo.size; +} + HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { VkCommandPoolCreateInfo command_pool_info; @@ -604,5 +794,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi } context_vk->current_command_buffer.id = 1; + wine_rb_init(&context_vk->bo_slab_available, wined3d_bo_slab_vk_compare); + return WINED3D_OK; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9adb978b1c7..89d7096f3c1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4326,7 +4326,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->vk_image, aspect_mask); - region.bufferOffset = dst_offset; + region.bufferOffset = staging_bo.buffer_offset + dst_offset; region.bufferRowLength = (dst_row_pitch / src_format->block_byte_count) * src_format->block_width; if (dst_row_pitch) region.bufferImageHeight = (dst_slice_pitch / dst_row_pitch) * src_format->block_height; @@ -4461,7 +4461,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->vk_image, aspect_mask); - region.bufferOffset = 0; + region.bufferOffset = staging_bo.buffer_offset; region.bufferRowLength = 0; region.bufferImageHeight = 0; region.imageSubresource.aspectMask = aspect_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fee61266c16..244c320734c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1523,15 +1523,36 @@ struct wined3d_bo_vk { VkBuffer vk_buffer; struct wined3d_allocator_block *memory; + struct wined3d_bo_slab_vk *slab; VkDeviceMemory vk_memory; + VkDeviceSize buffer_offset; VkDeviceSize memory_offset; + VkDeviceSize size; + VkBufferUsageFlags usage; VkMemoryPropertyFlags memory_type; uint64_t command_buffer_id; }; +struct wined3d_bo_slab_vk_key +{ + VkMemoryPropertyFlags memory_type; + VkBufferUsageFlags usage; + VkDeviceSize size; +}; + +struct wined3d_bo_slab_vk +{ + struct wine_rb_entry entry; + struct wined3d_bo_slab_vk *next; + struct wined3d_bo_vk bo; + unsigned int map_count; + void *map_ptr; + uint32_t map; +}; + struct wined3d_bo_address { UINT_PTR buffer_object; @@ -2194,6 +2215,7 @@ enum wined3d_retired_object_type_vk WINED3D_RETIRED_FREE_VK, WINED3D_RETIRED_MEMORY_VK, WINED3D_RETIRED_ALLOCATOR_BLOCK_VK, + WINED3D_RETIRED_BO_SLAB_SLICE_VK, WINED3D_RETIRED_BUFFER_VK, WINED3D_RETIRED_IMAGE_VK, }; @@ -2206,6 +2228,11 @@ struct wined3d_retired_object_vk struct wined3d_retired_object_vk *next; VkDeviceMemory vk_memory; struct wined3d_allocator_block *block; + struct + { + struct wined3d_bo_slab_vk *slab; + size_t idx; + } slice; VkBuffer vk_buffer; VkImage vk_image; } u; @@ -2238,6 +2265,7 @@ struct wined3d_context_vk } submitted; struct wined3d_retired_objects_vk retired; + struct wine_rb_tree bo_slab_available; }; static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) @@ -3448,6 +3476,7 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device #define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) #define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 #define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) +#define WINED3D_SLAB_BO_MIN_OBJECT_ALIGN 16 struct wined3d_allocator_chunk { diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index dc50b5e712f..8aae29c8c10 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -389,4 +389,20 @@ static inline void wine_rb_remove_key(struct wine_rb_tree *tree, const void *key if (entry) wine_rb_remove(tree, entry); } +static inline void wine_rb_replace(struct wine_rb_tree *tree, struct wine_rb_entry *dst, struct wine_rb_entry *src) +{ + if (!(src->parent = dst->parent)) + tree->root = src; + else if (dst->parent->left == dst) + dst->parent->left = src; + else + dst->parent->right = src; + + if ((src->left = dst->left)) + src->left->parent = src; + if ((src->right = dst->right)) + src->right->parent = src; + src->flags = dst->flags; +} + #endif /* __WINE_WINE_RBTREE_H */ -- 2.20.1

1 0

[PATCH 4/5] wined3d: Implement Vulkan texture downloads.
by Henri Verbeet 20 Apr '20

20 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 174 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 98bc8a510ce..9adb978b1c7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4363,7 +4363,151 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, unsigned int dst_row_pitch, unsigned int dst_slice_pitch) { - FIXME("Not implemented.\n"); + struct wined3d_texture_vk *src_texture_vk = wined3d_texture_vk(src_texture); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + unsigned int src_level, src_width, src_height, src_depth; + struct wined3d_texture_sub_resource *sub_resource; + unsigned int src_row_pitch, src_slice_pitch; + struct wined3d_bo_address staging_bo_addr; + const struct wined3d_vk_info *vk_info; + VkCommandBuffer vk_command_buffer; + struct wined3d_bo_vk staging_bo; + VkImageAspectFlags aspect_mask; + struct wined3d_range range; + VkBufferImageCopy region; + void *map_ptr; + + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } + + if (dst_bo_addr->buffer_object) + { + FIXME("Unhandled buffer object %#lx.\n", dst_bo_addr->buffer_object); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(dst_format->id), + debug_d3dformat(src_texture->resource.format->id)); + return; + } + + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) + { + FIXME("Not supported for multisample textures.\n"); + return; + } + + aspect_mask = vk_aspect_mask_from_format(src_texture->resource.format); + if (wined3d_popcount(aspect_mask) > 1) + { + FIXME("Unhandled multi-aspect format %s.\n", debug_d3dformat(src_texture->resource.format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_texture->resource.type == WINED3D_RTYPE_TEXTURE_1D) + src_row_pitch = dst_row_pitch = 0; + if (src_texture->resource.type != WINED3D_RTYPE_TEXTURE_3D) + src_slice_pitch = dst_slice_pitch = 0; + + sub_resource = &src_texture_vk->t.sub_resources[src_sub_resource_idx]; + vk_info = context_vk->vk_info; + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return; + } + + if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) + { + ERR("Failed to create staging bo.\n"); + return; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_READ_BIT, + src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + src_texture_vk->vk_image, aspect_mask); + + region.bufferOffset = 0; + region.bufferRowLength = 0; + region.bufferImageHeight = 0; + region.imageSubresource.aspectMask = aspect_mask; + region.imageSubresource.mipLevel = src_level; + region.imageSubresource.baseArrayLayer = src_sub_resource_idx / src_texture_vk->t.level_count; + region.imageSubresource.layerCount = 1; + region.imageOffset.x = 0; + region.imageOffset.y = 0; + region.imageOffset.z = 0; + region.imageExtent.width = src_width; + region.imageExtent.height = src_height; + region.imageExtent.depth = src_depth; + + VK_CALL(vkCmdCopyImageToBuffer(vk_command_buffer, src_texture_vk->vk_image, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, staging_bo.vk_buffer, 1, &region)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_TRANSFER_READ_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, + src_texture_vk->vk_image, aspect_mask); + + src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + staging_bo.command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->command_buffer_id); + + staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; + staging_bo_addr.addr = (uint8_t *)NULL; + if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, + sub_resource->size, 0, WINED3D_MAP_READ))) + { + ERR("Failed to map staging bo.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + return; + } + + wined3d_format_copy_data(dst_format, map_ptr, src_row_pitch, src_slice_pitch, + dst_bo_addr->addr, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + src_box->bottom - src_box->top, src_box->back - src_box->front); + + range.offset = 0; + range.size = sub_resource->size; + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, 1, &range); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, @@ -4392,6 +4536,31 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v return TRUE; } +static BOOL wined3d_texture_vk_load_sysmem(struct wined3d_texture_vk *texture_vk, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture_sub_resource *sub_resource; + unsigned int level, row_pitch, slice_pitch; + struct wined3d_bo_address data; + struct wined3d_box src_box; + + sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; + if (!(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Unimplemented load from %s.\n", wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + + level = sub_resource_idx % texture_vk->t.level_count; + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); + wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); + wined3d_texture_vk_download_data(context, &texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, + &src_box, &data, texture_vk->t.resource.format, 0, 0, 0, row_pitch, slice_pitch); + + return TRUE; +} + static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk) { @@ -4584,6 +4753,9 @@ static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, case WINED3D_LOCATION_TEXTURE_RGB: return wined3d_texture_vk_load_texture(wined3d_texture_vk(texture), sub_resource_idx, context); + case WINED3D_LOCATION_SYSMEM: + return wined3d_texture_vk_load_sysmem(wined3d_texture_vk(texture), sub_resource_idx, context); + default: FIXME("Unimplemented location %s.\n", wined3d_debug_location(location)); return FALSE; -- 2.20.1

1 0

[PATCH 3/5] wined3d: Implement Vulkan texture uploads.
by Henri Verbeet 20 Apr '20

20 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 26 ++++ dlls/wined3d/texture.c | 213 ++++++++++++++++++++++++++++++++- dlls/wined3d/utils.c | 30 +++++ dlls/wined3d/wined3d_private.h | 22 ++++ 4 files changed, 288 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 35a0c655ef3..0d90c40fe64 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -550,6 +550,32 @@ void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_v ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); } +void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, + VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, VkImageLayout old_layout, + VkImageLayout new_layout, VkImage image, VkImageAspectFlags aspect_mask) +{ + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkImageMemoryBarrier barrier; + + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = src_access_mask; + barrier.dstAccessMask = dst_access_mask; + barrier.oldLayout = old_layout; + barrier.newLayout = new_layout; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = image; + barrier.subresourceRange.aspectMask = aspect_mask; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier)); +} + HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { VkCommandPoolCreateInfo command_pool_info; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 66cee442ff9..98bc8a510ce 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4218,7 +4218,143 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, unsigned int dst_location, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - FIXME("Not implemented.\n"); + struct wined3d_texture_vk *dst_texture_vk = wined3d_texture_vk(dst_texture); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + unsigned int dst_level, dst_row_pitch, dst_slice_pitch; + struct wined3d_texture_sub_resource *sub_resource; + struct wined3d_bo_address staging_bo_addr; + const struct wined3d_vk_info *vk_info; + VkCommandBuffer vk_command_buffer; + struct wined3d_bo_vk staging_bo; + VkImageAspectFlags aspect_mask; + size_t src_offset, dst_offset; + struct wined3d_range range; + VkBufferImageCopy region; + void *map_ptr; + + TRACE("context %p, src_bo_addr %s, src_format %s, src_box %s, src_row_pitch %u, src_slice_pitch %u, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_x %u, dst_y %u, dst_z %u.\n", + context, debug_const_bo_address(src_bo_addr), debug_d3dformat(src_format->id), debug_box(src_box), + src_row_pitch, src_slice_pitch, dst_texture, dst_sub_resource_idx, + wined3d_debug_location(dst_location), dst_x, dst_y, dst_z); + + if (src_bo_addr->buffer_object) + { + FIXME("Unhandled buffer object %#lx.\n", src_bo_addr->buffer_object); + return; + } + + if (src_format->id != dst_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_format->id), + debug_d3dformat(dst_texture->resource.format->id)); + return; + } + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + wined3d_texture_get_pitch(dst_texture, dst_level, &dst_row_pitch, &dst_slice_pitch); + if (dst_texture->resource.type == WINED3D_RTYPE_TEXTURE_1D) + src_row_pitch = dst_row_pitch = 0; + if (dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_3D) + src_slice_pitch = dst_slice_pitch = 0; + + if (dst_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(dst_location)); + return; + } + + if (wined3d_resource_get_sample_count(&dst_texture_vk->t.resource) > 1) + { + FIXME("Not supported for multisample textures.\n"); + return; + } + + aspect_mask = vk_aspect_mask_from_format(dst_texture->resource.format); + if (wined3d_popcount(aspect_mask) > 1) + { + FIXME("Unhandled multi-aspect format %s.\n", debug_d3dformat(dst_texture->resource.format->id)); + return; + } + + sub_resource = &dst_texture_vk->t.sub_resources[dst_sub_resource_idx]; + vk_info = context_vk->vk_info; + + src_offset = src_box->front * src_slice_pitch + + (src_box->top / src_format->block_height) * src_row_pitch + + (src_box->left / src_format->block_width) * src_format->block_byte_count; + dst_offset = dst_z * src_slice_pitch + + (dst_y / src_format->block_height) * src_row_pitch + + (dst_x / src_format->block_width) * src_format->block_byte_count; + + if (!wined3d_context_vk_create_bo(context_vk, sub_resource->size, + VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo)) + { + ERR("Failed to create staging bo.\n"); + return; + } + + staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; + staging_bo_addr.addr = NULL; + if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, + sub_resource->size, 0, WINED3D_MAP_DISCARD | WINED3D_MAP_WRITE))) + { + ERR("Failed to map staging bo.\n"); + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + return; + } + + wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, src_slice_pitch, + (uint8_t *)map_ptr + dst_offset, dst_row_pitch, dst_slice_pitch, src_box->right - src_box->left, + src_box->bottom - src_box->top, src_box->back - src_box->front); + + range.offset = 0; + range.size = sub_resource->size; + wined3d_context_unmap_bo_address(context, &staging_bo_addr, 0, 1, &range); + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + dst_texture_vk->vk_image, aspect_mask); + + region.bufferOffset = dst_offset; + region.bufferRowLength = (dst_row_pitch / src_format->block_byte_count) * src_format->block_width; + if (dst_row_pitch) + region.bufferImageHeight = (dst_slice_pitch / dst_row_pitch) * src_format->block_height; + else + region.bufferImageHeight = 1; + region.imageSubresource.aspectMask = aspect_mask; + region.imageSubresource.mipLevel = dst_level; + region.imageSubresource.baseArrayLayer = dst_sub_resource_idx / dst_texture_vk->t.level_count; + region.imageSubresource.layerCount = 1; + region.imageOffset.x = dst_x; + region.imageOffset.y = dst_y; + region.imageOffset.z = dst_z; + region.imageExtent.width = src_box->right - src_box->left; + region.imageExtent.height = src_box->bottom - src_box->top; + region.imageExtent.depth = src_box->back - src_box->front; + + VK_CALL(vkCmdCopyBufferToImage(vk_command_buffer, staging_bo.vk_buffer, + dst_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_TRANSFER_WRITE_BIT, + vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout, + dst_texture_vk->vk_image, aspect_mask); + dst_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + staging_bo.command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } static void wined3d_texture_vk_download_data(struct wined3d_context *context, @@ -4230,6 +4366,32 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, FIXME("Not implemented.\n"); } +static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, + unsigned int sub_resource_idx, struct wined3d_context *context) +{ + struct wined3d_texture_sub_resource *sub_resource; + unsigned int level, row_pitch, slice_pitch; + struct wined3d_bo_address data; + struct wined3d_box src_box; + + sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; + if (!(sub_resource->locations & WINED3D_LOCATION_SYSMEM)) + { + ERR("Unimplemented load from %s.\n", wined3d_debug_location(sub_resource->locations)); + return FALSE; + } + + level = sub_resource_idx % texture_vk->t.level_count; + wined3d_texture_get_memory(&texture_vk->t, sub_resource_idx, &data, WINED3D_LOCATION_SYSMEM); + wined3d_texture_get_level_box(&texture_vk->t, level, &src_box); + wined3d_texture_get_pitch(&texture_vk->t, level, &row_pitch, &slice_pitch); + wined3d_texture_vk_upload_data(context, wined3d_const_bo_address(&data), texture_vk->t.resource.format, + &src_box, row_pitch, slice_pitch, &texture_vk->t, sub_resource_idx, + WINED3D_LOCATION_TEXTURE_RGB, 0, 0, 0); + + return TRUE; +} + static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, struct wined3d_context_vk *context_vk) { @@ -4239,6 +4401,7 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur struct wined3d_adapter_vk *adapter_vk; struct wined3d_device_vk *device_vk; struct wined3d_resource *resource; + VkCommandBuffer vk_command_buffer; VkImageCreateInfo create_info; unsigned int memory_type_idx; VkResult vr; @@ -4246,6 +4409,12 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur if (texture_vk->t.flags & WINED3D_TEXTURE_RGB_ALLOCATED) return TRUE; + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return FALSE; + } + resource = &texture_vk->t.resource; device_vk = wined3d_device_vk(resource->device); adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -4299,6 +4468,28 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur if (resource->bind_flags & WINED3D_BIND_UNORDERED_ACCESS) create_info.usage |= VK_IMAGE_USAGE_STORAGE_BIT; + texture_vk->layout = VK_IMAGE_LAYOUT_GENERAL; + if (wined3d_popcount(resource->bind_flags == 1)) + { + switch (resource->bind_flags) + { + case WINED3D_BIND_RENDER_TARGET: + texture_vk->layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + break; + + case WINED3D_BIND_DEPTH_STENCIL: + texture_vk->layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + break; + + case WINED3D_BIND_SHADER_RESOURCE: + texture_vk->layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; + break; + + default: + break; + } + } + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; create_info.queueFamilyIndexCount = 0; create_info.pQueueFamilyIndices = NULL; @@ -4345,6 +4536,13 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur return FALSE; } + texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + 0, 0, + VK_IMAGE_LAYOUT_UNDEFINED, texture_vk->layout, + texture_vk->vk_image, vk_aspect_mask_from_format(&format_vk->f)); + texture_vk->t.flags |= WINED3D_TEXTURE_RGB_ALLOCATED; TRACE("Created image 0x%s, memory 0x%s for texture %p.\n", @@ -4378,9 +4576,18 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) { - FIXME("Not implemented.\n"); + if (!wined3d_texture_vk_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; - return FALSE; + switch (location) + { + case WINED3D_LOCATION_TEXTURE_RGB: + return wined3d_texture_vk_load_texture(wined3d_texture_vk(texture), sub_resource_idx, context); + + default: + FIXME("Unimplemented location %s.\n", wined3d_debug_location(location)); + return FALSE; + } } static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 926a6a51edf..d08485c8d4b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5977,6 +5977,36 @@ enum wined3d_format_id pixelformat_for_depth(DWORD depth) } } +void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src, + unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) +{ + unsigned int row_block_count, row_count, row_size, slice, row; + unsigned int slice_count = d; + const uint8_t *src_row; + uint8_t *dst_row; + + row_block_count = (w + format->block_width - 1) / format->block_width; + row_count = (h + format->block_height - 1) / format->block_height; + row_size = row_block_count * format->block_byte_count; + + if (src_row_pitch == row_size && dst_row_pitch == row_size && src_slice_pitch == dst_slice_pitch) + { + memcpy(dst, src, slice_count * row_count * row_size); + return; + } + + for (slice = 0; slice < slice_count; ++slice) + { + for (row = 0; row < row_count; ++row) + { + src_row = &src[slice * src_slice_pitch + row * src_row_pitch]; + dst_row = &dst[slice * dst_slice_pitch + row * dst_row_pitch]; + memcpy(dst_row, src_row, row_size); + } + } +} + void multiply_matrix(struct wined3d_matrix *dst, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) { struct wined3d_matrix tmp; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de07c5909aa..fee61266c16 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2261,6 +2261,10 @@ void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_context_vk_image_barrier(struct wined3d_context_vk *context_vk, + VkCommandBuffer vk_command_buffer, VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, + VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, VkImageLayout old_layout, + VkImageLayout new_layout, VkImage image, VkImageAspectFlags aspect_mask) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk, @@ -3958,6 +3962,7 @@ struct wined3d_texture_vk VkImage vk_image; struct wined3d_allocator_block *memory; VkDeviceMemory vk_memory; + enum VkImageLayout layout; uint64_t command_buffer_id; }; @@ -5155,6 +5160,9 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) DECLSPEC_HIDDEN; +void wined3d_format_copy_data(const struct wined3d_format *format, const uint8_t *src, + unsigned int src_row_pitch, unsigned int src_slice_pitch, uint8_t *dst, unsigned int dst_row_pitch, + unsigned int dst_slice_pitch, unsigned int w, unsigned int h, unsigned int d) DECLSPEC_HIDDEN; void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key *key, struct wined3d_color *float_colors) DECLSPEC_HIDDEN; BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, @@ -5538,6 +5546,20 @@ static inline BOOL wined3d_bitmap_get_range(const DWORD *bitmap, unsigned int bi return TRUE; } +static inline VkImageAspectFlags vk_aspect_mask_from_format(const struct wined3d_format *format) +{ + VkImageAspectFlags mask = 0; + + if (format->depth_size) + mask |= VK_IMAGE_ASPECT_DEPTH_BIT; + if (format->stencil_size) + mask |= VK_IMAGE_ASPECT_STENCIL_BIT; + if (!mask || format->red_size || format->green_size || format->blue_size || format->alpha_size) + mask |= VK_IMAGE_ASPECT_COLOR_BIT; + + return mask; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.20.1

1 0

[PATCH 2/5] wined3d: Create Vulkan images for texture resources.
by Henri Verbeet 20 Apr '20

20 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 36 +++++++- dlls/wined3d/texture.c | 160 ++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 ++++ 3 files changed, 205 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b3239a4f9ee..35a0c655ef3 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -86,7 +86,7 @@ VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_cont return vk_memory; } -static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, +struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -198,7 +198,7 @@ static struct wined3d_retired_object_vk *wined3d_context_vk_get_retired_object_v return &retired->objects[retired->count++]; } -static void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); @@ -223,7 +223,7 @@ static void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context o->command_buffer_id = command_buffer_id; } -static void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *context_vk, +void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block, uint64_t command_buffer_id) { struct wined3d_retired_object_vk *o; @@ -271,6 +271,31 @@ static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context o->command_buffer_id = command_buffer_id; } +void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, + VkImage vk_image, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroyImage(device_vk->vk_device, vk_image, NULL)); + TRACE("Destroyed image 0x%s.\n", wine_dbgstr_longlong(vk_image)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking image 0x%s.\n", wine_dbgstr_longlong(vk_image)); + return; + } + + o->type = WINED3D_RETIRED_IMAGE_VK; + o->u.vk_image = vk_image; + o->command_buffer_id = command_buffer_id; +} + void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { TRACE("context_vk %p, bo %p.\n", context_vk, bo); @@ -345,6 +370,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(o->u.vk_buffer)); break; + case WINED3D_RETIRED_IMAGE_VK: + VK_CALL(vkDestroyImage(device_vk->vk_device, o->u.vk_image, NULL)); + TRACE("Destroyed image 0x%s.\n", wine_dbgstr_longlong(o->u.vk_image)); + break; + default: ERR("Unhandled object type %#x.\n", o->type); break; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 85f09ee3489..66cee442ff9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4230,6 +4230,129 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, FIXME("Not implemented.\n"); } +static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, + struct wined3d_context_vk *context_vk) +{ + const struct wined3d_format_vk *format_vk; + VkMemoryRequirements memory_requirements; + const struct wined3d_vk_info *vk_info; + struct wined3d_adapter_vk *adapter_vk; + struct wined3d_device_vk *device_vk; + struct wined3d_resource *resource; + VkImageCreateInfo create_info; + unsigned int memory_type_idx; + VkResult vr; + + if (texture_vk->t.flags & WINED3D_TEXTURE_RGB_ALLOCATED) + return TRUE; + + resource = &texture_vk->t.resource; + device_vk = wined3d_device_vk(resource->device); + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + format_vk = wined3d_format_vk(resource->format); + vk_info = context_vk->vk_info; + + create_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + create_info.pNext = NULL; + + create_info.flags = 0; + if (wined3d_format_is_typeless(&format_vk->f)) + create_info.flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + + switch (resource->type) + { + case WINED3D_RTYPE_TEXTURE_1D: + create_info.imageType = VK_IMAGE_TYPE_1D; + break; + case WINED3D_RTYPE_TEXTURE_2D: + create_info.imageType = VK_IMAGE_TYPE_2D; + if (texture_vk->t.layer_count >= 6 && resource->width == resource->height) + create_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + break; + case WINED3D_RTYPE_TEXTURE_3D: + create_info.imageType = VK_IMAGE_TYPE_3D; + if (resource->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_UNORDERED_ACCESS)) + create_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT; + break; + default: + ERR("Invalid resource type %s.\n", debug_d3dresourcetype(resource->type)); + create_info.imageType = VK_IMAGE_TYPE_2D; + break; + } + + create_info.format = format_vk->vk_format; + create_info.extent.width = resource->width; + create_info.extent.height = resource->height; + create_info.extent.depth = resource->depth; + create_info.mipLevels = texture_vk->t.level_count; + create_info.arrayLayers = texture_vk->t.layer_count; + create_info.samples = max(1, wined3d_resource_get_sample_count(resource)); + create_info.tiling = VK_IMAGE_TILING_OPTIMAL; + + create_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (resource->bind_flags & WINED3D_BIND_SHADER_RESOURCE) + create_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; + if (resource->bind_flags & WINED3D_BIND_RENDER_TARGET) + create_info.usage |= VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + if (resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL) + create_info.usage |= VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + if (resource->bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + create_info.usage |= VK_IMAGE_USAGE_STORAGE_BIT; + + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + create_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + if ((vr = VK_CALL(vkCreateImage(device_vk->vk_device, &create_info, NULL, &texture_vk->vk_image))) < 0) + { + ERR("Failed to create Vulkan image, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetImageMemoryRequirements(device_vk->vk_device, texture_vk->vk_image, &memory_requirements)); + + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); + if (memory_type_idx == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, texture_vk->vk_image, NULL)); + texture_vk->vk_image = VK_NULL_HANDLE; + return FALSE; + } + + texture_vk->memory = wined3d_context_vk_allocate_memory(context_vk, + memory_type_idx, memory_requirements.size, &texture_vk->vk_memory); + if (!texture_vk->vk_memory) + { + ERR("Failed to allocate image memory.\n"); + VK_CALL(vkDestroyImage(device_vk->vk_device, texture_vk->vk_image, NULL)); + texture_vk->vk_image = VK_NULL_HANDLE; + return FALSE; + } + + if ((vr = VK_CALL(vkBindImageMemory(device_vk->vk_device, texture_vk->vk_image, + texture_vk->vk_memory, texture_vk->memory ? texture_vk->memory->offset : 0))) < 0) + { + WARN("Failed to bind memory, vr %s.\n", wined3d_debug_vkresult(vr)); + if (texture_vk->memory) + wined3d_allocator_block_free(texture_vk->memory); + else + VK_CALL(vkFreeMemory(device_vk->vk_device, texture_vk->vk_memory, NULL)); + texture_vk->vk_memory = VK_NULL_HANDLE; + VK_CALL(vkDestroyImage(device_vk->vk_device, texture_vk->vk_image, NULL)); + texture_vk->vk_image = VK_NULL_HANDLE; + return FALSE; + } + + texture_vk->t.flags |= WINED3D_TEXTURE_RGB_ALLOCATED; + + TRACE("Created image 0x%s, memory 0x%s for texture %p.\n", + wine_dbgstr_longlong(texture_vk->vk_image), wine_dbgstr_longlong(texture_vk->vk_memory), texture_vk); + + return TRUE; +} + static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { @@ -4244,8 +4367,7 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, return TRUE; case WINED3D_LOCATION_TEXTURE_RGB: - /* The Vulkan image is created during resource creation. */ - return TRUE; + return wined3d_texture_vk_prepare_texture(wined3d_texture_vk(texture), wined3d_context_vk(context)); default: FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -4264,7 +4386,39 @@ static BOOL wined3d_texture_vk_load_location(struct wined3d_texture *texture, static void wined3d_texture_vk_unload_location(struct wined3d_texture *texture, struct wined3d_context *context, unsigned int location) { - FIXME("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); + struct wined3d_texture_vk *texture_vk = wined3d_texture_vk(texture); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + + TRACE("texture %p, context %p, location %s.\n", texture, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_TEXTURE_RGB: + if (texture_vk->vk_image) + { + wined3d_context_vk_destroy_image(context_vk, texture_vk->vk_image, texture_vk->command_buffer_id); + texture_vk->vk_image = VK_NULL_HANDLE; + if (texture_vk->memory) + wined3d_context_vk_destroy_allocator_block(context_vk, + texture_vk->memory, texture_vk->command_buffer_id); + else + wined3d_context_vk_destroy_memory(context_vk, + texture_vk->vk_memory, texture_vk->command_buffer_id); + texture_vk->vk_memory = VK_NULL_HANDLE; + texture_vk->memory = NULL; + } + break; + + case WINED3D_LOCATION_BUFFER: + case WINED3D_LOCATION_TEXTURE_SRGB: + case WINED3D_LOCATION_RB_MULTISAMPLE: + case WINED3D_LOCATION_RB_RESOLVED: + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } } static const struct wined3d_texture_ops wined3d_texture_vk_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e78cb60df5..de07c5909aa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2195,6 +2195,7 @@ enum wined3d_retired_object_type_vk WINED3D_RETIRED_MEMORY_VK, WINED3D_RETIRED_ALLOCATOR_BLOCK_VK, WINED3D_RETIRED_BUFFER_VK, + WINED3D_RETIRED_IMAGE_VK, }; struct wined3d_retired_object_vk @@ -2206,6 +2207,7 @@ struct wined3d_retired_object_vk VkDeviceMemory vk_memory; struct wined3d_allocator_block *block; VkBuffer vk_buffer; + VkImage vk_image; } u; uint64_t command_buffer_id; }; @@ -2243,13 +2245,21 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_vk, c); } +struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, + unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, unsigned int pool, size_t size) DECLSPEC_HIDDEN; void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *context_vk, + struct wined3d_allocator_block *block, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, + VkImage vk_image, uint64_t command_buffer_id) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, + VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -3944,6 +3954,11 @@ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *t struct wined3d_texture_vk { struct wined3d_texture t; + + VkImage vk_image; + struct wined3d_allocator_block *memory; + VkDeviceMemory vk_memory; + uint64_t command_buffer_id; }; static inline struct wined3d_texture_vk *wined3d_texture_vk(struct wined3d_texture *texture) -- 2.20.1

1 0

[PATCH 1/5] wined3d: Implement Vulkan GPU buffer copies.
by Henri Verbeet 20 Apr '20

20 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 101 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 78a8df6b8b4..35b4e8da6aa 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -697,8 +697,109 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, uint32_t dst_bind_flags, const struct wined3d_bo_address *src, uint32_t src_bind_flags, size_t size) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; + VkBufferMemoryBarrier vk_barrier[2]; + struct wined3d_bo_address staging; + VkCommandBuffer vk_command_buffer; struct wined3d_range range; void *dst_ptr, *src_ptr; + VkBufferCopy region; + + src_bo = (struct wined3d_bo_vk *)src->buffer_object; + dst_bo = (struct wined3d_bo_vk *)dst->buffer_object; + + if (src_bo && dst_bo) + { + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return; + } + + region.srcOffset = (uintptr_t)src->addr; + region.dstOffset = (uintptr_t)dst->addr; + region.size = size; + + vk_barrier[0].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier[0].pNext = NULL; + vk_barrier[0].srcAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + vk_barrier[0].dstAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + vk_barrier[0].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[0].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[0].buffer = src_bo->vk_buffer; + vk_barrier[0].offset = region.srcOffset; + vk_barrier[0].size = region.size; + + vk_barrier[1].sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier[1].pNext = NULL; + vk_barrier[1].srcAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + vk_barrier[1].dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier[1].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[1].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier[1].buffer = dst_bo->vk_buffer; + vk_barrier[1].offset = region.dstOffset; + vk_barrier[1].size = region.size; + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); + + VK_CALL(vkCmdCopyBuffer(vk_command_buffer, src_bo->vk_buffer, dst_bo->vk_buffer, 1, &region)); + + vk_barrier[0].srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; + vk_barrier[0].dstAccessMask = vk_access_mask_from_bind_flags(src_bind_flags); + + vk_barrier[1].srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + vk_barrier[1].dstAccessMask = vk_access_mask_from_bind_flags(dst_bind_flags); + + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); + + src_bo->command_buffer_id = context_vk->current_command_buffer.id; + dst_bo->command_buffer_id = context_vk->current_command_buffer.id; + + return; + } + + if (src_bo && !(src_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + { + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) + { + ERR("Failed to create staging bo.\n"); + return; + } + + staging.buffer_object = (uintptr_t)&staging_bo; + staging.addr = NULL; + adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); + adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + + return; + } + + if (dst_bo && (dst_bo->command_buffer_id > context_vk->completed_command_buffer_id + || !(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))) + { + if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) + { + ERR("Failed to create staging bo.\n"); + return; + } + + staging.buffer_object = (uintptr_t)&staging_bo; + staging.addr = NULL; + adapter_vk_copy_bo_address(context, &staging, 0, src, src_bind_flags, size); + adapter_vk_copy_bo_address(context, dst, dst_bind_flags, &staging, 0, size); + + wined3d_context_vk_destroy_bo(context_vk, &staging_bo); + + return; + } src_ptr = adapter_vk_map_bo_address(context, src, size, src_bind_flags, WINED3D_MAP_READ); dst_ptr = adapter_vk_map_bo_address(context, dst, size, dst_bind_flags, WINED3D_MAP_WRITE); -- 2.20.1

1 0

[PATCH v2 3/3] kernel32/tests: Use DECLSPEC_ALIGNED in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 2/3] httpapi/tests: Use DECLSPEC_ALIGNED in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/httpapi/tests/httpapi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH v2 1/3] widl: Use DECLSPEC_ALIGN in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/5] mf: Merge SAR sink and steam instances.
by Nikolay Sivov 20 Apr '20

20 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 169 +++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 118 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 7fefadeef2..3edaf06f01 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -30,22 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -struct audio_renderer; - -struct audio_renderer_stream -{ - IMFStreamSink IMFStreamSink_iface; - IMFMediaTypeHandler IMFMediaTypeHandler_iface; - LONG refcount; - struct audio_renderer *sink; - IMFMediaEventQueue *event_queue; - CRITICAL_SECTION cs; -}; - struct audio_renderer { IMFMediaSink IMFMediaSink_iface; IMFMediaSinkPreroll IMFMediaSinkPreroll_iface; + IMFStreamSink IMFStreamSink_iface; + IMFMediaTypeHandler IMFMediaTypeHandler_iface; IMFClockStateSink IMFClockStateSink_iface; IMFMediaEventGenerator IMFMediaEventGenerator_iface; IMFGetService IMFGetService_iface; @@ -54,9 +44,9 @@ struct audio_renderer IMFAudioPolicy IMFAudioPolicy_iface; LONG refcount; IMFMediaEventQueue *event_queue; + IMFMediaEventQueue *stream_event_queue; IMFPresentationClock *clock; BOOL is_shut_down; - struct audio_renderer_stream *stream; CRITICAL_SECTION cs; }; @@ -100,14 +90,14 @@ static struct audio_renderer *impl_from_IMFAudioPolicy(IMFAudioPolicy *iface) return CONTAINING_RECORD(iface, struct audio_renderer, IMFAudioPolicy_iface); } -static struct audio_renderer_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) +static struct audio_renderer *impl_from_IMFStreamSink(IMFStreamSink *iface) { - return CONTAINING_RECORD(iface, struct audio_renderer_stream, IMFStreamSink_iface); + return CONTAINING_RECORD(iface, struct audio_renderer, IMFStreamSink_iface); } -static struct audio_renderer_stream *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +static struct audio_renderer *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) { - return CONTAINING_RECORD(iface, struct audio_renderer_stream, IMFMediaTypeHandler_iface); + return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaTypeHandler_iface); } static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) @@ -168,6 +158,8 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) { if (renderer->event_queue) IMFMediaEventQueue_Release(renderer->event_queue); + if (renderer->stream_event_queue) + IMFMediaEventQueue_Release(renderer->stream_event_queue); if (renderer->clock) IMFPresentationClock_Release(renderer->clock); DeleteCriticalSection(&renderer->cs); @@ -246,7 +238,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *ifa hr = MF_E_INVALIDINDEX; else { - *stream = &renderer->stream->IMFStreamSink_iface; + *stream = &renderer->IMFStreamSink_iface; IMFStreamSink_AddRef(*stream); } @@ -271,7 +263,7 @@ static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, hr = MF_E_INVALIDSTREAMNUMBER; else { - *stream = &renderer->stream->IMFStreamSink_iface; + *stream = &renderer->IMFStreamSink_iface; IMFStreamSink_AddRef(*stream); } @@ -348,20 +340,9 @@ static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) return MF_E_SHUTDOWN; EnterCriticalSection(&renderer->cs); - renderer->is_shut_down = TRUE; IMFMediaEventQueue_Shutdown(renderer->event_queue); - - /* Detach stream. */ - IMFMediaSink_Release(&renderer->stream->sink->IMFMediaSink_iface); - EnterCriticalSection(&renderer->stream->cs); - renderer->stream->sink = NULL; - IMFMediaEventQueue_Shutdown(renderer->stream->event_queue); - LeaveCriticalSection(&renderer->stream->cs); - - IMFStreamSink_Release(&renderer->stream->IMFStreamSink_iface); - renderer->stream = NULL; - + IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); LeaveCriticalSection(&renderer->cs); return S_OK; @@ -880,18 +861,18 @@ static HRESULT sar_create_mmdevice(IMFAttributes *attributes, IMMDevice **device static HRESULT WINAPI audio_renderer_stream_QueryInterface(IMFStreamSink *iface, REFIID riid, void **obj) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFStreamSink) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = &stream->IMFStreamSink_iface; + *obj = &renderer->IMFStreamSink_iface; } else if (IsEqualIID(riid, &IID_IMFMediaTypeHandler)) { - *obj = &stream->IMFMediaTypeHandler_iface; + *obj = &renderer->IMFMediaTypeHandler_iface; } else { @@ -907,98 +888,77 @@ static HRESULT WINAPI audio_renderer_stream_QueryInterface(IMFStreamSink *iface, static ULONG WINAPI audio_renderer_stream_AddRef(IMFStreamSink *iface) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - ULONG refcount = InterlockedIncrement(&stream->refcount); - - TRACE("%p, refcount %u.\n", iface, refcount); - - return refcount; + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); } static ULONG WINAPI audio_renderer_stream_Release(IMFStreamSink *iface) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); - ULONG refcount = InterlockedDecrement(&stream->refcount); - - TRACE("%p, refcount %u.\n", iface, refcount); - - if (!refcount) - { - if (stream->sink) - IMFMediaSink_Release(&stream->sink->IMFMediaSink_iface); - if (stream->event_queue) - { - IMFMediaEventQueue_Shutdown(stream->event_queue); - IMFMediaEventQueue_Release(stream->event_queue); - } - DeleteCriticalSection(&stream->cs); - heap_free(stream); - } - - return refcount; + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); } static HRESULT WINAPI audio_renderer_stream_GetEvent(IMFStreamSink *iface, DWORD flags, IMFMediaEvent **event) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %#x, %p.\n", iface, flags, event); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); + return IMFMediaEventQueue_GetEvent(renderer->stream_event_queue, flags, event); } static HRESULT WINAPI audio_renderer_stream_BeginGetEvent(IMFStreamSink *iface, IMFAsyncCallback *callback, IUnknown *state) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %p, %p.\n", iface, callback, state); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); + return IMFMediaEventQueue_BeginGetEvent(renderer->stream_event_queue, callback, state); } static HRESULT WINAPI audio_renderer_stream_EndGetEvent(IMFStreamSink *iface, IMFAsyncResult *result, IMFMediaEvent **event) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %p, %p.\n", iface, result, event); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); + return IMFMediaEventQueue_EndGetEvent(renderer->stream_event_queue, result, event); } static HRESULT WINAPI audio_renderer_stream_QueueEvent(IMFStreamSink *iface, MediaEventType event_type, REFGUID ext_type, HRESULT hr, const PROPVARIANT *value) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); + return IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, event_type, ext_type, hr, value); } static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, IMFMediaSink **sink) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %p.\n", iface, sink); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *sink = &stream->sink->IMFMediaSink_iface; + *sink = &renderer->IMFMediaSink_iface; IMFMediaSink_AddRef(*sink); return S_OK; @@ -1006,11 +966,11 @@ static HRESULT WINAPI audio_renderer_stream_GetMediaSink(IMFStreamSink *iface, I static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, DWORD *identifier) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %p.\n", iface, identifier); - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; *identifier = 0; @@ -1020,17 +980,17 @@ static HRESULT WINAPI audio_renderer_stream_GetIdentifier(IMFStreamSink *iface, static HRESULT WINAPI audio_renderer_stream_GetMediaTypeHandler(IMFStreamSink *iface, IMFMediaTypeHandler **handler) { - struct audio_renderer_stream *stream = impl_from_IMFStreamSink(iface); + struct audio_renderer *renderer = impl_from_IMFStreamSink(iface); TRACE("%p, %p.\n", iface, handler); if (!handler) return E_POINTER; - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; - *handler = &stream->IMFMediaTypeHandler_iface; + *handler = &renderer->IMFMediaTypeHandler_iface; IMFMediaTypeHandler_AddRef(*handler); return S_OK; @@ -1078,20 +1038,20 @@ static const IMFStreamSinkVtbl audio_renderer_stream_vtbl = static HRESULT WINAPI audio_renderer_stream_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, void **obj) { - struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return IMFStreamSink_QueryInterface(&stream->IMFStreamSink_iface, riid, obj); + struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_QueryInterface(&renderer->IMFStreamSink_iface, riid, obj); } static ULONG WINAPI audio_renderer_stream_type_handler_AddRef(IMFMediaTypeHandler *iface) { - struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return IMFStreamSink_AddRef(&stream->IMFStreamSink_iface); + struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_AddRef(&renderer->IMFStreamSink_iface); } static ULONG WINAPI audio_renderer_stream_type_handler_Release(IMFMediaTypeHandler *iface) { - struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); - return IMFStreamSink_Release(&stream->IMFStreamSink_iface); + struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); + return IMFStreamSink_Release(&renderer->IMFStreamSink_iface); } static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, @@ -1135,14 +1095,14 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetCurrentMediaType(IMF static HRESULT WINAPI audio_renderer_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { - struct audio_renderer_stream *stream = impl_from_IMFMediaTypeHandler(iface); + struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); TRACE("%p, %p.\n", iface, type); if (!type) return E_POINTER; - if (!stream->sink) + if (renderer->is_shut_down) return MF_E_STREAMSINK_REMOVED; memcpy(type, &MFMediaType_Audio, sizeof(*type)); @@ -1162,35 +1122,6 @@ static const IMFMediaTypeHandlerVtbl audio_renderer_stream_type_handler_vtbl = audio_renderer_stream_type_handler_GetMajorType, }; -static HRESULT audio_renderer_create_stream(struct audio_renderer *sink, struct audio_renderer_stream **stream) -{ - struct audio_renderer_stream *object; - HRESULT hr; - - object = heap_alloc_zero(sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - object->IMFStreamSink_iface.lpVtbl = &audio_renderer_stream_vtbl; - object->IMFMediaTypeHandler_iface.lpVtbl = &audio_renderer_stream_type_handler_vtbl; - object->refcount = 1; - object->sink = sink; - IMFMediaSink_AddRef(&object->sink->IMFMediaSink_iface); - InitializeCriticalSection(&object->cs); - - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto failed; - - *stream = object; - - return S_OK; - -failed: - IMFStreamSink_Release(&object->IMFStreamSink_iface); - - return hr; -} - static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct audio_renderer *renderer; @@ -1204,6 +1135,8 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; renderer->IMFMediaSinkPreroll_iface.lpVtbl = &audio_renderer_preroll_vtbl; + renderer->IMFStreamSink_iface.lpVtbl = &audio_renderer_stream_vtbl; + renderer->IMFMediaTypeHandler_iface.lpVtbl = &audio_renderer_stream_type_handler_vtbl; renderer->IMFClockStateSink_iface.lpVtbl = &audio_renderer_clock_sink_vtbl; renderer->IMFMediaEventGenerator_iface.lpVtbl = &audio_renderer_events_vtbl; renderer->IMFGetService_iface.lpVtbl = &audio_renderer_get_service_vtbl; @@ -1213,10 +1146,10 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->refcount = 1; InitializeCriticalSection(&renderer->cs); - if (FAILED(hr = audio_renderer_create_stream(renderer, &renderer->stream))) + if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) goto failed; - if (FAILED(hr = MFCreateEventQueue(&renderer->event_queue))) + if (FAILED(hr = MFCreateEventQueue(&renderer->stream_event_queue))) goto failed; if (FAILED(hr = sar_create_mmdevice(attributes, &device))) -- 2.26.1

2 8

[PATCH] cryptext: Implement CryptExtOpenCER.
by Vijay Kiran Kamuju 20 Apr '20

20 Apr '20

Moved the strings to resource file Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/4] winevulkan: don't mark alias functions as required
by Liam Middlebrook 20 Apr '20

20 Apr '20

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ccbb74e626..482d9805cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2659,9 +2659,6 @@ class VkRegistry(object): elif type_info["category"] == "bitmask": mark_bitmask_dependencies(type_info["data"], self.types) - if func.is_alias(): - func.alias.required = True - def _parse_commands(self, root): """ Parse command section containing the Vulkan function calls. """ funcs = {} -- 2.25.1

1 3

[PATCH 2/3] httpapi/tests: Use DECLSPED_ALIGNED in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/httpapi/tests/httpapi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

2 1

[PATCH 1/4] quartz/filesource: Store file size on load.
by Paul Gofman 20 Apr '20

20 Apr '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/quartz/filesource.c | 13 ++++++++----- dlls/quartz/tests/filesource.c | 3 +++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 3b19d6e7df..8983f7317b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -64,6 +64,7 @@ struct async_reader LPOLESTR pszFileName; AM_MEDIA_TYPE mt; HANDLE file, port, io_thread; + LARGE_INTEGER file_size; CRITICAL_SECTION sample_cs; BOOL flushing; struct request *requests; @@ -474,6 +475,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi return HRESULT_FROM_WIN32(GetLastError()); } + if (!GetFileSizeEx(hFile, &This->file_size)) + { + WARN("Could not get file size.\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (This->pszFileName) { free(This->pszFileName); @@ -883,14 +890,10 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) { struct async_reader *filter = impl_from_IAsyncReader(iface); - DWORD low, high; TRACE("iface %p, total %p, available %p.\n", iface, total, available); - if ((low = GetFileSize(filter->file, &high)) == -1 && GetLastError() != NO_ERROR) - return HRESULT_FROM_WIN32(GetLastError()); - - *available = *total = (LONGLONG)low | (LONGLONG)high << (sizeof(DWORD) * 8); + *available = *total = filter->file_size.QuadPart; return S_OK; } diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 2040910516..87bbf1ee13 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -1035,6 +1035,9 @@ static void test_async_reader(void) } CloseHandle(file); + hr = IBaseFilter_FindPin(filter, L"Output", &pin); + ok(hr == VFW_E_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + IBaseFilter_QueryInterface(filter, &IID_IFileSourceFilter, (void **)&filesource); IFileSourceFilter_Load(filesource, filename, NULL); IBaseFilter_FindPin(filter, L"Output", &pin); -- 2.25.3

3 6

[PATCH v2 1/4] quartz/filesource: Store file size on load.
by Paul Gofman 20 Apr '20

20 Apr '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - remove redundant test. dlls/quartz/filesource.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 3b19d6e7df..8983f7317b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -64,6 +64,7 @@ struct async_reader LPOLESTR pszFileName; AM_MEDIA_TYPE mt; HANDLE file, port, io_thread; + LARGE_INTEGER file_size; CRITICAL_SECTION sample_cs; BOOL flushing; struct request *requests; @@ -474,6 +475,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi return HRESULT_FROM_WIN32(GetLastError()); } + if (!GetFileSizeEx(hFile, &This->file_size)) + { + WARN("Could not get file size.\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + if (This->pszFileName) { free(This->pszFileName); @@ -883,14 +890,10 @@ static HRESULT WINAPI FileAsyncReader_SyncRead(IAsyncReader *iface, static HRESULT WINAPI FileAsyncReader_Length(IAsyncReader *iface, LONGLONG *total, LONGLONG *available) { struct async_reader *filter = impl_from_IAsyncReader(iface); - DWORD low, high; TRACE("iface %p, total %p, available %p.\n", iface, total, available); - if ((low = GetFileSize(filter->file, &high)) == -1 && GetLastError() != NO_ERROR) - return HRESULT_FROM_WIN32(GetLastError()); - - *available = *total = (LONGLONG)low | (LONGLONG)high << (sizeof(DWORD) * 8); + *available = *total = filter->file_size.QuadPart; return S_OK; } -- 2.25.3

2 1

[PATCH] ntdll: Properly return errors when failing to unwind
by Martin Storsjo 20 Apr '20

20 Apr '20

If libunwind is unavailable, make libunwind_virtual_unwind return an error. Likewise if there was no PE exception info and we didn't try unwinding using libunwind, we need to return an error when realizing we were unable to unwind, instead of just warning and returning success. This fixes hangs/infinite loops on crashes when unwinding fails. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/signal_arm64.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 3ed2953c33..c37e80df85 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -599,8 +599,10 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX context->u.s.X24, context->u.s.X25, context->u.s.X26, context->u.s.X27 ); TRACE(" x28=%016lx fp=%016lx lr=%016lx sp=%016lx\n", context->u.s.X28, context->u.s.Fp, context->u.s.Lr, context->Sp ); -#endif return STATUS_SUCCESS; +#else + return STATUS_INVALID_DISPOSITION; +#endif } @@ -647,7 +649,11 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX return STATUS_SUCCESS; } } - else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + else + { + WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + return STATUS_INVALID_DISPOSITION; + } dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL; -- 2.17.1

2 1

[PATCH 3/3] kernel32/tests: Use DECLSPED_ALIGNED in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/3] widl: Use DECLSPED_ALIGN in MSVC compatible way.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] appwiz.cpl: Explicitly compare strcmp result to 0.
by Jacek Caban 20 Apr '20

20 Apr '20

Fixes clang warning: addons.c:318:29: warning: use of logical '&&' with constant operand [-Wconstant-logical-operand] Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] kernel32/tests: Avoid arithmetic on pointer to stack variable.
by Jacek Caban 20 Apr '20

20 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes GCC warning: virtual.c:2869:56: error: array subscript -1 is outside array bounds of ‘DWORD[1]’ {aka ‘unsigned int[1]’} dlls/kernel32/tests/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/1] winecfg: Return 0 on success when setting Windows version.
by Owen Rudge 20 Apr '20

20 Apr '20

The /V switch to winecfg was incorrectly passing the BOOL result through as the application exit code. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- programs/winecfg/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] comctl32/edit: Avoid division by zero during initialization.
by Roman Pišl 20 Apr '20

20 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 4 +-- dlls/comctl32/tests/edit.c | 66 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..b0c32445b0 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -406,7 +406,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN static inline INT get_vertical_line_count(EDITSTATE *es) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; return max(1,vlc); } @@ -1543,7 +1543,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = es->line_count - 1; - si.nPage = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + si.nPage = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; si.nPos = es->y_offset; TRACE("SB_VERT, nMin=%d, nMax=%d, nPage=%d, nPos=%d\n", si.nMin, si.nMax, si.nPage, si.nPos); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..763ade4831 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,71 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result, r; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + return result; + + case WM_CREATE: + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_initialization(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", + ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL | WS_VSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3458,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_initialization(); test_margins(); test_margins_font_change(); test_text_position(); -- 2.20.1

2 7

[PATCH 1/2] comctl32/edit: Avoid division by zero during initialization.
by Roman Pišl 20 Apr '20

20 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48803 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/edit.c | 4 +-- dlls/comctl32/tests/edit.c | 66 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index d02d7af7b9..b0c32445b0 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -406,7 +406,7 @@ static SCRIPT_STRING_ANALYSIS EDIT_UpdateUniscribeData(EDITSTATE *es, HDC dc, IN static inline INT get_vertical_line_count(EDITSTATE *es) { - INT vlc = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + INT vlc = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; return max(1,vlc); } @@ -1543,7 +1543,7 @@ static void EDIT_UpdateScrollInfo(EDITSTATE *es) si.fMask = SIF_PAGE | SIF_POS | SIF_RANGE | SIF_DISABLENOSCROLL; si.nMin = 0; si.nMax = es->line_count - 1; - si.nPage = (es->format_rect.bottom - es->format_rect.top) / es->line_height; + si.nPage = es->line_height ? (es->format_rect.bottom - es->format_rect.top) / es->line_height : 0; si.nPos = es->y_offset; TRACE("SB_VERT, nMin=%d, nMax=%d, nPage=%d, nPos=%d\n", si.nMin, si.nMax, si.nPage, si.nPos); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index cec6025077..a32d9dec86 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1768,6 +1768,71 @@ static BOOL is_font_installed(const char*name) return ret; } +static WNDPROC orig_class_proc; + +static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + RECT rect; + LRESULT result, r; + + switch (message) + { + case WM_NCCREATE: + result = CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); + + memset(&rect, 0, sizeof(rect)); + SendMessageA(hwnd, EM_GETRECT, 0, (LPARAM)&rect); + ok(!rect.right && !rect.bottom, "Invalid size after NCCREATE: %d x %d\n", rect.right, rect.bottom); + + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %x, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %x, expected 1.\n", r); + + return result; + + case WM_CREATE: + /* test that messages between WM_NCCREATE and WM_CREATE + don't crash or cause unexpected behavior */ + r = SendMessageA(hwnd, EM_SETSEL, 0, 0); + ok(r == 1, "Returned %x, expected 1.\n", r); + r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); + todo_wine ok(r == 1, "Returned %x, expected 1.\n", r); + + break; + } + + return CallWindowProcA(orig_class_proc, hwnd, message, wParam, lParam); +} + +static void test_initialization(void) +{ + BOOL ret; + ATOM atom; + HWND hwEdit; + WNDCLASSA cls; + + ret = GetClassInfoA(NULL, "Edit", &cls); + ok(ret, "Failed to get class info.\n"); + + orig_class_proc = cls.lpfnWndProc; + cls.lpfnWndProc = test_class_proc; + cls.lpszClassName = "TestClassName"; + + atom = RegisterClassA(&cls); + ok(atom != 0, "Failed to register class.\n"); + + hwEdit = CreateWindowExA(0, (LPCSTR)MAKEINTATOM(atom), "Text Text", + ES_MULTILINE | WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL | WS_VSCROLL, + 10, 10, 300, 300, NULL, NULL, hinst, NULL); + ok(hwEdit != NULL, "Failed to create a window.\n"); + + DestroyWindow(hwEdit); + UnregisterClassA((LPCSTR)MAKEINTATOM(atom), hinst); +} + static void test_margins(void) { DWORD old_margins, new_margins; @@ -3393,6 +3458,7 @@ START_TEST(edit) test_edit_control_6(); test_edit_control_limittext(); test_edit_control_scroll(); + test_initialization(); test_margins(); test_margins_font_change(); test_text_position(); -- 2.20.1

2 4

[PATCH v2 2/2] winex11.drv: Fix incorrect frequency for double scan and interlaced modes.
by Zhiyi Zhang 20 Apr '20

20 Apr '20

Double scan modes have double the dots to be scanned and interlaced modes only have half the dots to be scanned. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Don't add a 0.05 rounding to the frequency value. dlls/winex11.drv/xrandr.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index bef52128f21..95e4a5d6dba 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -482,6 +482,21 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource return NULL; } +static unsigned int get_frequency( const XRRModeInfo *mode ) +{ + unsigned int dots = mode->hTotal * mode->vTotal; + + if (!dots) + return 0; + + if (mode->modeFlags & RR_DoubleScan) + dots *= 2; + if (mode->modeFlags & RR_Interlace) + dots /= 2; + + return (mode->dotClock + dots / 2) / dots; +} + static int xrandr12_init_modes(void) { unsigned int only_one_resolution = 1, mode_count; @@ -540,8 +555,7 @@ static int xrandr12_init_modes(void) if (mode->id == output_info->modes[i]) { - unsigned int dots = mode->hTotal * mode->vTotal; - unsigned int refresh = dots ? (mode->dotClock + dots / 2) / dots : 0; + unsigned int refresh = get_frequency( mode ); TRACE("Adding mode %#lx: %ux%u(a)%u.\n", mode->id, mode->width, mode->height, refresh); X11DRV_Settings_AddOneMode( mode->width, mode->height, 0, refresh ); -- 2.20.1

1 0

[PATCH 2/2] wbemprox: Implement Win32_VideoController.AdapterCompatibility.
by Hans Leidekker 20 Apr '20

20 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48973 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5035ca7b98..24badb7bf9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -399,6 +399,7 @@ static const struct column col_systemsecurity[] = }; static const struct column col_videocontroller[] = { + { L"AdapterCompatibility", CIM_STRING }, { L"AdapterDACType", CIM_STRING }, { L"AdapterRAM", CIM_UINT32 }, { L"Availability", CIM_UINT16 }, @@ -783,6 +784,7 @@ struct record_systemenclosure }; struct record_videocontroller { + const WCHAR *adapter_compatibility; const WCHAR *adapter_dactype; UINT32 adapter_ram; UINT16 availability; @@ -3842,6 +3844,7 @@ static enum fill_status fill_videocontroller( struct table *table, const struct done: rec = (struct record_videocontroller *)table->data; + rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 77aa5ee882..a9b4910ebf 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1282,6 +1282,7 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); check_property( obj, L"DriverDate", VT_BSTR, CIM_DATETIME ); -- 2.20.1

1 0

[PATCH 1/2] wbemprox: Use wide character string literals.
by Hans Leidekker 20 Apr '20

20 Apr '20

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 1661 +++++++++--------------------- dlls/wbemprox/class.c | 40 +- dlls/wbemprox/process.c | 8 +- dlls/wbemprox/qualifier.c | 31 +- dlls/wbemprox/query.c | 78 +- dlls/wbemprox/reg.c | 42 +- dlls/wbemprox/security.c | 15 +- dlls/wbemprox/service.c | 24 +- dlls/wbemprox/services.c | 24 +- dlls/wbemprox/table.c | 21 +- dlls/wbemprox/wbemlocator.c | 11 +- dlls/wbemprox/wbemprox_private.h | 30 - 12 files changed, 614 insertions(+), 1371 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 06c9d722aa..5035ca7b98 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -50,926 +50,390 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -static const WCHAR class_associatorsW[] = - {'_','_','A','S','S','O','C','I','A','T','O','R','S',0}; -static const WCHAR class_baseboardW[] = - {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; -static const WCHAR class_biosW[] = - {'W','i','n','3','2','_','B','I','O','S',0}; -static const WCHAR class_cdromdriveW[] = - {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; -static const WCHAR class_compsysW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; -static const WCHAR class_compsysproductW[] = - {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m','P','r','o','d','u','c','t',0}; -static const WCHAR class_datafileW[] = - {'C','I','M','_','D','a','t','a','F','i','l','e',0}; -static const WCHAR class_desktopmonitorW[] = - {'W','i','n','3','2','_','D','e','s','k','t','o','p','M','o','n','i','t','o','r',0}; -static const WCHAR class_directoryW[] = - {'W','i','n','3','2','_','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR class_diskdriveW[] = - {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; -static const WCHAR class_diskdrivetodiskpartitionW[] = - {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e','T','o','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; -static const WCHAR class_diskpartitionW[] = - {'W','i','n','3','2','_','D','i','s','k','P','a','r','t','i','t','i','o','n',0}; -static const WCHAR class_displaycontrollerconfigW[] = - {'W','i','n','3','2','_','D','i','s','p','l','a','y','C','o','n','t','r','o','l','l','e','r', - 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; -static const WCHAR class_ip4routetableW[] = - {'W','i','n','3','2','_','I','P','4','R','o','u','t','e','T','a','b','l','e',0}; -static const WCHAR class_logicaldiskW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR class_logicaldisk2W[] = - {'C','I','M','_','L','o','g','i','c','a','l','D','i','s','k',0}; -static const WCHAR class_logicaldisktopartitionW[] = - {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0}; -static const WCHAR class_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; -static const WCHAR class_networkadapterconfigW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r', - 'C','o','n','f','i','g','u','r','a','t','i','o','n',0}; -static const WCHAR class_operatingsystemW[] = - {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR class_paramsW[] = - {'_','_','P','A','R','A','M','E','T','E','R','S',0}; -static const WCHAR class_physicalmediaW[] = - {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; -static const WCHAR class_physicalmemoryW[] = - {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; -static const WCHAR class_pnpentityW[] = - {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; -static const WCHAR class_printerW[] = - {'W','i','n','3','2','_','P','r','i','n','t','e','r',0}; -static const WCHAR class_process_getowner_outW[] = - {'_','_','W','I','N','3','2','_','P','R','O','C','E','S','S','_','G','E','T','O','W', - 'N','E','R','_','O','U','T',0}; -static const WCHAR class_processorW[] = - {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR class_processor2W[] = - {'C','I','M','_','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR class_qualifiersW[] = - {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; -static const WCHAR class_quickfixengineeringW[] = - {'W','i','n','3','2','_','Q','u','i','c','k','F','i','x','E','n','g','i','n','e','e','r','i','n','g',0}; -static const WCHAR class_sidW[] = - {'W','i','n','3','2','_','S','I','D',0}; -static const WCHAR class_sounddeviceW[] = - {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; -static const WCHAR class_systemenclosureW[] = - {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; -static const WCHAR class_videocontrollerW[] = - {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; -static const WCHAR class_winsatW[] = - {'W','i','n','3','2','_','W','i','n','S','A','T',0}; - -static const WCHAR prop_accountnameW[] = - {'A','c','c','o','u','n','t','N','a','m','e',0}; -static const WCHAR prop_acceptpauseW[] = - {'A','c','c','e','p','t','P','a','u','s','e',0}; -static const WCHAR prop_acceptstopW[] = - {'A','c','c','e','p','t','S','t','o','p',0}; -static const WCHAR prop_accessmaskW[] = - {'A','c','c','e','s','s','M','a','s','k',0}; -static const WCHAR prop_adapterdactypeW[] = - {'A','d','a','p','t','e','r','D','A','C','T','y','p','e',0}; -static const WCHAR prop_adapterramW[] = - {'A','d','a','p','t','e','r','R','A','M',0}; -static const WCHAR prop_adaptertypeW[] = - {'A','d','a','p','t','e','r','T','y','p','e',0}; -static const WCHAR prop_adaptertypeidW[] = - {'A','d','a','p','t','e','r','T','y','p','e','I','D',0}; -static const WCHAR prop_addresswidthW[] = - {'A','d','d','r','e','s','s','W','i','d','t','h',0}; -static const WCHAR prop_antecedentW[] = - {'A','n','t','e','c','e','d','e','n','t',0}; -static const WCHAR prop_architectureW[] = - {'A','r','c','h','i','t','e','c','t','u','r','e',0}; -static const WCHAR prop_assocclassW[] = - {'A','s','s','o','c','C','l','a','s','s',0}; -static const WCHAR prop_associatorW[] = - {'A','s','s','o','c','i','a','t','o','r',0}; -static const WCHAR prop_attributesW[] = - {'A','t','t','r','i','b','u','t','e','s',0}; -static const WCHAR prop_availabilityW[] = - {'A','v','a','i','l','a','b','i','l','i','t','y',0}; -static const WCHAR prop_binaryrepresentationW[] = - {'B','i','n','a','r','y','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; -static const WCHAR prop_bitsperpixelW[] = - {'B','i','t','s','P','e','r','P','i','x','e','l',0}; -static const WCHAR prop_boolvalueW[] = - {'B','o','o','l','V','a','l','u','e',0}; -static const WCHAR prop_bootableW[] = - {'B','o','o','t','a','b','l','e',0}; -static const WCHAR prop_bootpartitionW[] = - {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; -static const WCHAR prop_buildnumberW[] = - {'B','u','i','l','d','N','u','m','b','e','r',0}; -static const WCHAR prop_capacityW[] = - {'C','a','p','a','c','i','t','y',0}; -static const WCHAR prop_captionW[] = - {'C','a','p','t','i','o','n',0}; -static const WCHAR prop_chassistypesW[] = - {'C','h','a','s','s','i','s','T','y','p','e','s',0}; -static const WCHAR prop_classW[] = - {'C','l','a','s','s',0}; -static const WCHAR prop_codesetW[] = - {'C','o','d','e','S','e','t',0}; -static const WCHAR prop_commandlineW[] = - {'C','o','m','m','a','n','d','L','i','n','e',0}; -static const WCHAR prop_configmanagererrorcodeW[] = - {'C','o','n','f','i','g','M','a','n','a','g','e','r','E','r','r','o','r','C','o','d','e',0}; -static const WCHAR prop_configuredclockspeedW[] = - {'C','o','n','f','i','g','u','r','e','d','C','l','o','c','k','S','p','e','e','d',0}; -static const WCHAR prop_countrycodeW[] = - {'C','o','u','n','t','r','y','C','o','d','e',0}; -static const WCHAR prop_cpuscoreW[] = - {'C','P','U','S','c','o','r','e',0}; -static const WCHAR prop_cpustatusW[] = - {'C','p','u','S','t','a','t','u','s',0}; -static const WCHAR prop_csdversionW[] = - {'C','S','D','V','e','r','s','i','o','n',0}; -static const WCHAR prop_csnameW[] = - {'C','S','N','a','m','e',0}; -static const WCHAR prop_currentbitsperpixelW[] = - {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; -static const WCHAR prop_currentclockspeedW[] = - {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; -static const WCHAR prop_currenthorizontalresW[] = - {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR prop_currentlanguageW[] = - {'C','u','r','r','e','n','t','L','a','n','g','u','a','g','e',0}; -static const WCHAR prop_currentrefreshrateW[] = - {'C','u','r','r','e','n','t','R','e','f','r','e','s','h','R','a','t','e',0}; -static const WCHAR prop_currentscanmodeW[] = - {'C','u','r','r','e','n','t','S','c','a','n','M','o','d','e',0}; -static const WCHAR prop_currenttimezoneW[] = - {'C','u','r','r','e','n','t','T','i','m','e','Z','o','n','e',0}; -static const WCHAR prop_currentverticalresW[] = - {'C','u','r','r','e','n','t','V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR prop_d3dscoreW[] = - {'D','3','D','S','c','o','r','e',0}; -static const WCHAR prop_datawidthW[] = - {'D','a','t','a','W','i','d','t','h',0}; -static const WCHAR prop_defaultipgatewayW[] = - {'D','e','f','a','u','l','t','I','P','G','a','t','e','w','a','y',0}; -static const WCHAR prop_defaultvalueW[] = - {'D','e','f','a','u','l','t','V','a','l','u','e',0}; -static const WCHAR prop_dependentW[] = - {'D','e','p','e','n','d','e','n','t',0}; -static const WCHAR prop_descriptionW[] = - {'D','e','s','c','r','i','p','t','i','o','n',0}; -static const WCHAR prop_destinationW[] = - {'D','e','s','t','i','n','a','t','i','o','n',0}; -static const WCHAR prop_deviceidW[] = - {'D','e','v','i','c','e','I','d',0}; -static const WCHAR prop_devicelocatorW[] = - {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; -static const WCHAR prop_dhcpenabledW[] = - {'D','H','C','P','E','n','a','b','l','e','d',0}; -static const WCHAR prop_directionW[] = - {'D','i','r','e','c','t','i','o','n',0}; -static const WCHAR prop_diskscoreW[] = - {'D','i','s','k','S','c','o','r','e',0}; -static const WCHAR prop_displaynameW[] = - {'D','i','s','p','l','a','y','N','a','m','e',0}; -static const WCHAR prop_diskindexW[] = - {'D','i','s','k','I','n','d','e','x',0}; -static const WCHAR prop_dnshostnameW[] = - {'D','N','S','H','o','s','t','N','a','m','e',0}; -static const WCHAR prop_dnsserversearchorderW[] = - {'D','N','S','S','e','r','v','e','r','S','e','a','r','c','h','O','r','d','e','r',0}; -static const WCHAR prop_domainW[] = - {'D','o','m','a','i','n',0}; -static const WCHAR prop_domainroleW[] = - {'D','o','m','a','i','n','R','o','l','e',0}; -static const WCHAR prop_driveW[] = - {'D','r','i','v','e',0}; -static const WCHAR prop_driverdateW[] = - {'D','r','i','v','e','r','D','a','t','e',0}; -static const WCHAR prop_drivernameW[] = - {'D','r','i','v','e','r','N','a','m','e',0}; -static const WCHAR prop_driverversionW[] = - {'D','r','i','v','e','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_drivetypeW[] = - {'D','r','i','v','e','T','y','p','e',0}; -static const WCHAR prop_embeddedcontrollermajorversionW[] = - {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','a','j','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_embeddedcontrollerminorversionW[] = - {'E','m','b','e','d','d','e','d','C','o','n','t','r','o','l','l','e','r','M','i','n','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_familyW[] = - {'F','a','m','i','l','y',0}; -static const WCHAR prop_filesystemW[] = - {'F','i','l','e','S','y','s','t','e','m',0}; -static const WCHAR prop_flavorW[] = - {'F','l','a','v','o','r',0}; -static const WCHAR prop_formfactorW[] = - {'F','o','r','m','F','a','c','t','o','r',0}; -static const WCHAR prop_freespaceW[] = - {'F','r','e','e','S','p','a','c','e',0}; -static const WCHAR prop_freephysicalmemoryW[] = - {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; -static const WCHAR prop_handleW[] = - {'H','a','n','d','l','e',0}; -static const WCHAR prop_graphicsscoreW[] = - {'G','r','a','p','h','i','c','s','S','c','o','r','e',0}; -static const WCHAR prop_horizontalresolutionW[] = - {'H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR prop_hotfixidW[] = - {'H','o','t','F','i','x','I','D',0}; -static const WCHAR prop_idW[] = - {'I','D',0}; -static const WCHAR prop_identificationcodeW[] = - {'I','d','e','n','t','i','f','i','c','a','t','i','o','n','C','o','d','e',0}; -static const WCHAR prop_identifyingnumberW[] = - {'I','d','e','n','t','i','f','y','i','n','g','N','u','m','b','e','r',0}; -static const WCHAR prop_indexW[] = - {'I','n','d','e','x',0}; -static const WCHAR prop_installdateW[] = - {'I','n','s','t','a','l','l','D','a','t','e',0}; -static const WCHAR prop_installeddisplaydriversW[]= - {'I','n','s','t','a','l','l','e','d','D','i','s','p','l','a','y','D','r','i','v','e','r','s',0}; -static const WCHAR prop_interfaceindexW[] = - {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; -static const WCHAR prop_interfacetypeW[] = - {'I','n','t','e','r','f','a','c','e','T','y','p','e',0}; -static const WCHAR prop_intvalueW[] = - {'I','n','t','e','g','e','r','V','a','l','u','e',0}; -static const WCHAR prop_ipaddressW[] = - {'I','P','A','d','d','r','e','s','s',0}; -static const WCHAR prop_ipconnectionmetricW[] = - {'I','P','C','o','n','n','e','c','t','i','o','n','M','e','t','r','i','c',0}; -static const WCHAR prop_ipenabledW[] = - {'I','P','E','n','a','b','l','e','d',0}; -static const WCHAR prop_ipsubnet[] = - {'I','P','S','u','b','n','e','t',0}; -static const WCHAR prop_lastbootuptimeW[] = - {'L','a','s','t','B','o','o','t','U','p','T','i','m','e',0}; -static const WCHAR prop_levelW[] = - {'L','e','v','e','l',0}; -static const WCHAR prop_localW[] = - {'L','o','c','a','l',0}; -static const WCHAR prop_localdatetimeW[] = - {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; -static const WCHAR prop_localeW[] = - {'L','o','c','a','l','e',0}; -static const WCHAR prop_locationW[] = - {'L','o','c','a','t','i','o','n',0}; -static const WCHAR prop_lockpresentW[] = - {'L','o','c','k','P','r','e','s','e','n','t',0}; -static const WCHAR prop_macaddressW[] = - {'M','A','C','A','d','d','r','e','s','s',0}; -static const WCHAR prop_manufacturerW[] = - {'M','a','n','u','f','a','c','t','u','r','e','r',0}; -static const WCHAR prop_maxclockspeedW[] = - {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; -static const WCHAR prop_mediatypeW[] = - {'M','e','d','i','a','T','y','p','e',0}; -static const WCHAR prop_memberW[] = - {'M','e','m','b','e','r',0}; -static const WCHAR prop_memoryscoreW[] = - {'M','e','m','o','r','y','S','c','o','r','e',0}; -static const WCHAR prop_memorytypeW[] = - {'M','e','m','o','r','y','T','y','p','e',0}; -static const WCHAR prop_methodW[] = - {'M','e','t','h','o','d',0}; -static const WCHAR prop_modelW[] = - {'M','o','d','e','l',0}; -static const WCHAR prop_netconnectionstatusW[] = - {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; -static const WCHAR prop_networkW[] = - {'N','e','t','w','o','r','k',0}; -static const WCHAR prop_nexthopW[] = - {'N','e','x','t','H','o','p',0}; -static const WCHAR prop_numcoresW[] = - {'N','u','m','b','e','r','O','f','C','o','r','e','s',0}; -static const WCHAR prop_numlogicalprocessorsW[] = - {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; -static const WCHAR prop_numprocessorsW[] = - {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; -static const WCHAR prop_operatingsystemskuW[] = - {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; -static const WCHAR prop_osarchitectureW[] = - {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; -static const WCHAR prop_oslanguageW[] = - {'O','S','L','a','n','g','u','a','g','e',0}; -static const WCHAR prop_osproductsuiteW[] = - {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; -static const WCHAR prop_ostypeW[] = - {'O','S','T','y','p','e',0}; -static const WCHAR prop_parameterW[] = - {'P','a','r','a','m','e','t','e','r',0}; -static const WCHAR prop_partnumberW[] = - {'P','a','r','t','N','u','m','b','e','r',0}; -static const WCHAR prop_physicaladapterW[] = - {'P','h','y','s','i','c','a','l','A','d','a','p','t','e','r',0}; -static const WCHAR prop_pixelsperxlogicalinchW[] = - {'P','i','x','e','l','s','P','e','r','X','L','o','g','i','c','a','l','I','n','c','h',0}; -static const WCHAR prop_pnpdeviceidW[] = - {'P','N','P','D','e','v','i','c','e','I','D',0}; -static const WCHAR prop_portnameW[] = - {'P','o','r','t','N','a','m','e',0}; -static const WCHAR prop_pprocessidW[] = - {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; -static const WCHAR prop_primaryW[] = - {'P','r','i','m','a','r','y',0}; -static const WCHAR prop_processidW[] = - {'P','r','o','c','e','s','s','I','D',0}; -static const WCHAR prop_processoridW[] = - {'P','r','o','c','e','s','s','o','r','I','d',0}; -static const WCHAR prop_processortypeW[] = - {'P','r','o','c','e','s','s','o','r','T','y','p','e',0}; -static const WCHAR prop_productW[] = - {'P','r','o','d','u','c','t',0}; -static const WCHAR prop_productnameW[] = - {'P','r','o','d','u','c','t','N','a','m','e',0}; -static const WCHAR prop_referenceddomainnameW[] = - {'R','e','f','e','r','e','n','c','e','d','D','o','m','a','i','n','N','a','m','e',0}; -static const WCHAR prop_releasedateW[] = - {'R','e','l','e','a','s','e','D','a','t','e',0}; -static const WCHAR prop_revisionW[] = - {'R','e','v','i','s','i','o','n',0}; -static const WCHAR prop_serialnumberW[] = - {'S','e','r','i','a','l','N','u','m','b','e','r',0}; -static const WCHAR prop_servicepackmajorW[] = - {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_servicepackminorW[] = - {'S','e','r','v','i','c','e','P','a','c','k','M','i','n','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_servicetypeW[] = - {'S','e','r','v','i','c','e','T','y','p','e',0}; -static const WCHAR prop_settingidW[] = - {'S','e','t','t','i','n','g','I','D',0}; -static const WCHAR prop_skunumberW[] = - {'S','K','U','N','u','m','b','e','r',0}; -static const WCHAR prop_smbiosbiosversionW[] = - {'S','M','B','I','O','S','B','I','O','S','V','e','r','s','i','o','n',0}; -static const WCHAR prop_smbiosmajorversionW[] = - {'S','M','B','I','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_smbiosminorversionW[] = - {'S','M','B','I','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_startmodeW[] = - {'S','t','a','r','t','M','o','d','e',0}; -static const WCHAR prop_sidW[] = - {'S','I','D',0}; -static const WCHAR prop_sidlengthW[] = - {'S','i','d','L','e','n','g','t','h',0}; -static const WCHAR prop_sizeW[] = - {'S','i','z','e',0}; -static const WCHAR prop_speedW[] = - {'S','p','e','e','d',0}; -static const WCHAR prop_startingoffsetW[] = - {'S','t','a','r','t','i','n','g','O','f','f','s','e','t',0}; -static const WCHAR prop_stateW[] = - {'S','t','a','t','e',0}; -static const WCHAR prop_statusW[] = - {'S','t','a','t','u','s',0}; -static const WCHAR prop_statusinfoW[] = - {'S','t','a','t','u','s','I','n','f','o',0}; -static const WCHAR prop_strvalueW[] = - {'S','t','r','i','n','g','V','a','l','u','e',0}; -static const WCHAR prop_suitemaskW[] = - {'S','u','i','t','e','M','a','s','k',0}; -static const WCHAR prop_systembiosmajorversionW[] = - {'S','y','s','t','e','m','B','i','o','s','M','a','j','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_systembiosminorversionW[] = - {'S','y','s','t','e','m','B','i','o','s','M','i','n','o','r','V','e','r','s','i','o','n',0}; -static const WCHAR prop_systemdirectoryW[] = - {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR prop_systemdriveW[] = - {'S','y','s','t','e','m','D','r','i','v','e',0}; -static const WCHAR prop_systemnameW[] = - {'S','y','s','t','e','m','N','a','m','e',0}; -static const WCHAR prop_tagW[] = - {'T','a','g',0}; -static const WCHAR prop_threadcountW[] = - {'T','h','r','e','a','d','C','o','u','n','t',0}; -static const WCHAR prop_timetakenW[] = - {'T','i','m','e','T','a','k','e','n',0}; -static const WCHAR prop_totalphysicalmemoryW[] = - {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; -static const WCHAR prop_totalvirtualmemorysizeW[] = - {'T','o','t','a','l','V','i','r','t','u','a','l','M','e','m','o','r','y','S','i','z','e',0}; -static const WCHAR prop_totalvisiblememorysizeW[] = - {'T','o','t','a','l','V','i','s','i','b','l','e','M','e','m','o','r','y','S','i','z','e',0}; -static const WCHAR prop_typeW[] = - {'T','y','p','e',0}; -static const WCHAR prop_uniqueidW[] = - {'U','n','i','q','u','e','I','d',0}; -static const WCHAR prop_usernameW[] = - {'U','s','e','r','N','a','m','e',0}; -static const WCHAR prop_uuidW[] = - {'U','U','I','D',0}; -static const WCHAR prop_vendorW[] = - {'V','e','n','d','o','r',0}; -static const WCHAR prop_versionW[] = - {'V','e','r','s','i','o','n',0}; -static const WCHAR prop_verticalresolutionW[] = - {'V','e','r','t','i','c','a','l','R','e','s','o','l','u','t','i','o','n',0}; -static const WCHAR prop_videoarchitectureW[] = - {'V','i','d','e','o','A','r','c','h','i','t','e','c','t','u','r','e',0}; -static const WCHAR prop_videomemorytypeW[] = - {'V','i','d','e','o','M','e','m','o','r','y','T','y','p','e',0}; -static const WCHAR prop_videomodedescriptionW[] = - {'V','i','d','e','o','M','o','d','e','D','e','s','c','r','i','p','t','i','o','n',0}; -static const WCHAR prop_videoprocessorW[] = - {'V','i','d','e','o','P','r','o','c','e','s','s','o','r',0}; -static const WCHAR prop_volumenameW[] = - {'V','o','l','u','m','e','N','a','m','e',0}; -static const WCHAR prop_volumeserialnumberW[] = - {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; -static const WCHAR prop_winsatassessmentstateW[] = - {'W','i','n','S','A','T','A','s','s','e','s','s','m','e','n','t','S','t','a','t','e',0}; -static const WCHAR prop_winsprlevelW[] = - {'W','i','n','S','P','R','L','e','v','e','l',0}; -static const WCHAR prop_workingsetsizeW[] = - {'W','o','r','k','i','n','g','S','e','t','S','i','z','e',0}; - /* column definitions must be kept in sync with record structures below */ static const struct column col_associator[] = { - { prop_assocclassW, CIM_STRING }, - { prop_classW, CIM_STRING }, - { prop_associatorW, CIM_STRING } + { L"AssocClass", CIM_STRING }, + { L"Class", CIM_STRING }, + { L"Associator", CIM_STRING } }; static const struct column col_baseboard[] = { - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_modelW, CIM_STRING }, - { prop_nameW, CIM_STRING }, - { prop_productW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_serialnumberW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_tagW, CIM_STRING|COL_FLAG_KEY }, - { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Model", CIM_STRING }, + { L"Name", CIM_STRING }, + { L"Product", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Tag", CIM_STRING|COL_FLAG_KEY }, + { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_bios[] = { - { prop_currentlanguageW, CIM_STRING }, - { prop_descriptionW, CIM_STRING }, - { prop_embeddedcontrollermajorversionW, CIM_UINT8 }, - { prop_embeddedcontrollerminorversionW, CIM_UINT8 }, - { prop_identificationcodeW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING }, - { prop_releasedateW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_serialnumberW, CIM_STRING }, - { prop_smbiosbiosversionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_smbiosmajorversionW, CIM_UINT16 }, - { prop_smbiosminorversionW, CIM_UINT16 }, - { prop_systembiosmajorversionW, CIM_UINT8 }, - { prop_systembiosminorversionW, CIM_UINT8 }, - { prop_versionW, CIM_STRING|COL_FLAG_KEY } + { L"CurrentLanguage", CIM_STRING }, + { L"Description", CIM_STRING }, + { L"EmbeddedControllerMajorVersion", CIM_UINT8 }, + { L"EmbeddedControllerMinorVersion", CIM_UINT8 }, + { L"IdentificationCode", CIM_STRING }, + { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Name", CIM_STRING }, + { L"ReleaseDate", CIM_DATETIME|COL_FLAG_DYNAMIC }, + { L"SerialNumber", CIM_STRING }, + { L"SMBIOSBIOSVersion", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SMBIOSMajorVersion", CIM_UINT16 }, + { L"SMBIOSMinorVersion", CIM_UINT16 }, + { L"SystemBiosMajorVersion", CIM_UINT8 }, + { L"SystemBiosMinorVersion", CIM_UINT8 }, + { L"Version", CIM_STRING|COL_FLAG_KEY }, }; static const struct column col_cdromdrive[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_driveW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_mediatypeW, CIM_STRING }, - { prop_nameW, CIM_STRING }, - { prop_pnpdeviceidW, CIM_STRING } + { L"DeviceId", CIM_STRING|COL_FLAG_KEY }, + { L"Drive", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"MediaType", CIM_STRING }, + { L"Name", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING }, }; static const struct column col_compsys[] = { - { prop_descriptionW, CIM_STRING }, - { prop_domainW, CIM_STRING }, - { prop_domainroleW, CIM_UINT16 }, - { prop_manufacturerW, CIM_STRING }, - { prop_modelW, CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, - { prop_numprocessorsW, CIM_UINT32 }, - { prop_totalphysicalmemoryW, CIM_UINT64 }, - { prop_usernameW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"Description", CIM_STRING }, + { L"Domain", CIM_STRING }, + { L"DomainRole", CIM_UINT16 }, + { L"Manufacturer", CIM_STRING }, + { L"Model", CIM_STRING }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"NumberOfLogicalProcessors", CIM_UINT32 }, + { L"NumberOfProcessors", CIM_UINT32 }, + { L"TotalPhysicalMemory", CIM_UINT64 }, + { L"UserName", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_compsysproduct[] = { - { prop_identifyingnumberW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_skunumberW, CIM_STRING }, - { prop_uuidW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_vendorW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY } + { L"IdentifyingNumber", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"SKUNumber", CIM_STRING }, + { L"UUID", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Vendor", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Version", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, }; static const struct column col_datafile[] = { - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_desktopmonitor[] = { - { prop_nameW, CIM_STRING }, - { prop_pixelsperxlogicalinchW, CIM_UINT32 } + { L"Name", CIM_STRING }, + { L"PixelsPerXLogicalInch", CIM_UINT32 }, }; static const struct column col_directory[] = { - { prop_accessmaskW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY } + { L"AccessMask", CIM_UINT32 }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, }; static const struct column col_diskdrive[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_indexW, CIM_UINT32 }, - { prop_interfacetypeW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_mediatypeW, CIM_STRING }, - { prop_modelW, CIM_STRING }, - { prop_pnpdeviceidW, CIM_STRING }, - { prop_serialnumberW, CIM_STRING }, - { prop_sizeW, CIM_UINT64 } + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Index", CIM_UINT32 }, + { L"InterfaceType", CIM_STRING }, + { L"Manufacturer", CIM_STRING }, + { L"MediaType", CIM_STRING }, + { L"Model", CIM_STRING }, + { L"PNPDeviceID", CIM_STRING }, + { L"SerialNumber", CIM_STRING }, + { L"Size", CIM_UINT64 }, }; static const struct column col_diskdrivetodiskpartition[] = { - { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } + { L"Antecedent", CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Dependent", CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, }; static const struct column col_diskpartition[] = { - { prop_bootableW, CIM_BOOLEAN }, - { prop_bootpartitionW, CIM_BOOLEAN }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_diskindexW, CIM_UINT32 }, - { prop_indexW, CIM_UINT32 }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_sizeW, CIM_UINT64 }, - { prop_startingoffsetW, CIM_UINT64 }, - { prop_typeW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"Bootable", CIM_BOOLEAN }, + { L"BootPartition", CIM_BOOLEAN }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"DiskIndex", CIM_UINT32 }, + { L"Index", CIM_UINT32 }, + { L"PNPDeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Size", CIM_UINT64 }, + { L"StartingOffset", CIM_UINT64 }, + { L"Type", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_displaycontrollerconfig[] = { - { prop_bitsperpixelW, CIM_UINT32 }, - { prop_captionW, CIM_STRING }, - { prop_horizontalresolutionW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_KEY }, - { prop_verticalresolutionW, CIM_UINT32 } + { L"BitsPerPixel", CIM_UINT32 }, + { L"Caption", CIM_STRING }, + { L"HorizontalResolution", CIM_UINT32 }, + { L"Name", CIM_STRING|COL_FLAG_KEY }, + { L"VerticalResolution", CIM_UINT32 }, }; static const struct column col_ip4routetable[] = { - { prop_destinationW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_interfaceindexW, CIM_SINT32|COL_FLAG_KEY }, - { prop_nexthopW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Destination", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"InterfaceIndex", CIM_SINT32|COL_FLAG_KEY }, + { L"NextHop", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, }; static const struct column col_logicaldisk[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivetypeW, CIM_UINT32 }, - { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_freespaceW, CIM_UINT64 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_sizeW, CIM_UINT64 }, - { prop_volumenameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"DriveType", CIM_UINT32 }, + { L"FileSystem", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"FreeSpace", CIM_UINT64 }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Size", CIM_UINT64 }, + { L"VolumeName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"VolumeSerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_logicaldisktopartition[] = { - { prop_antecedentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_dependentW, CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY } + { L"Antecedent", CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Dependent", CIM_REFERENCE|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, }; static const struct column col_networkadapter[] = { - { prop_adaptertypeW, CIM_STRING }, - { prop_adaptertypeidW, CIM_UINT16 }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_indexW, CIM_UINT32 }, - { prop_interfaceindexW, CIM_UINT32 }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_manufacturerW, CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_netconnectionstatusW, CIM_UINT16 }, - { prop_physicaladapterW, CIM_BOOLEAN }, - { prop_pnpdeviceidW, CIM_STRING }, - { prop_speedW, CIM_UINT64 } + { L"AdapterType", CIM_STRING }, + { L"AdapterTypeID", CIM_UINT16 }, + { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Index", CIM_UINT32 }, + { L"InterfaceIndex", CIM_UINT32 }, + { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"NetConnectionStatus", CIM_UINT16 }, + { L"PhysicalAdapter", CIM_BOOLEAN }, + { L"PNPDeviceID", CIM_STRING }, + { L"Speed", CIM_UINT64 }, }; static const struct column col_networkadapterconfig[] = { - { prop_defaultipgatewayW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_dhcpenabledW, CIM_BOOLEAN }, - { prop_dnshostnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_dnsserversearchorderW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_indexW, CIM_UINT32|COL_FLAG_KEY }, - { prop_ipaddressW, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_ipconnectionmetricW, CIM_UINT32 }, - { prop_ipenabledW, CIM_BOOLEAN }, - { prop_ipsubnet, CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_settingidW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"DefaultIPGateway", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DHCPEnabled", CIM_BOOLEAN }, + { L"DNSHostName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DNSServerSearchOrder", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"Index", CIM_UINT32|COL_FLAG_KEY }, + { L"IPAddress", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"IPConnectionMetric", CIM_UINT32 }, + { L"IPEnabled", CIM_BOOLEAN }, + { L"IPSubnet", CIM_STRING|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"MACAddress", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SettingID", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_operatingsystem[] = { - { prop_buildnumberW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_codesetW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_countrycodeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_csdversionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_csnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_currenttimezoneW, CIM_SINT16 }, - { prop_freephysicalmemoryW, CIM_UINT64 }, - { prop_installdateW, CIM_DATETIME }, - { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_manufacturerW, CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_operatingsystemskuW, CIM_UINT32 }, - { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32 }, - { prop_osproductsuiteW, CIM_UINT32 }, - { prop_ostypeW, CIM_UINT16 }, - { prop_primaryW, CIM_BOOLEAN }, - { prop_serialnumberW, CIM_STRING }, - { prop_servicepackmajorW, CIM_UINT16 }, - { prop_servicepackminorW, CIM_UINT16 }, - { prop_suitemaskW, CIM_UINT32 }, - { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_systemdriveW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_totalvirtualmemorysizeW, CIM_UINT64 }, - { prop_totalvisiblememorysizeW, CIM_UINT64 }, - { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CodeSet", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CountryCode", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CSDVersion", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CSName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CurrentTimeZone", CIM_SINT16 }, + { L"FreePhysicalMemory", CIM_UINT64 }, + { L"InstallDate", CIM_DATETIME }, + { L"LastBootUpTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, + { L"LocalDateTime", CIM_DATETIME|COL_FLAG_DYNAMIC }, + { L"Locale", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"OperatingSystemSKU", CIM_UINT32 }, + { L"OSArchitecture", CIM_STRING }, + { L"OSLanguage", CIM_UINT32 }, + { L"OSProductSuite", CIM_UINT32 }, + { L"OSType", CIM_UINT16 }, + { L"Primary", CIM_BOOLEAN }, + { L"SerialNumber", CIM_STRING }, + { L"ServicePackMajorVersion", CIM_UINT16 }, + { L"ServicePackMinorVersion", CIM_UINT16 }, + { L"SuiteMask", CIM_UINT32 }, + { L"SystemDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SystemDrive", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"TotalVirtualMemorySize", CIM_UINT64 }, + { L"TotalVisibleMemorySize", CIM_UINT64 }, + { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_param[] = { - { prop_classW, CIM_STRING }, - { prop_methodW, CIM_STRING }, - { prop_directionW, CIM_SINT32 }, - { prop_parameterW, CIM_STRING }, - { prop_typeW, CIM_UINT32 }, - { prop_defaultvalueW, CIM_UINT32 } + { L"Class", CIM_STRING }, + { L"Method", CIM_STRING }, + { L"Direction", CIM_SINT32 }, + { L"Parameter", CIM_STRING }, + { L"Type", CIM_UINT32 }, + { L"DefaultValue", CIM_UINT32 }, }; static const struct column col_physicalmedia[] = { - { prop_serialnumberW, CIM_STRING }, - { prop_tagW, CIM_STRING } + { L"SerialNumber", CIM_STRING }, + { L"Tag", CIM_STRING }, }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 }, - { prop_configuredclockspeedW, CIM_UINT32 }, - { prop_devicelocatorW, CIM_STRING }, - { prop_formfactorW, CIM_UINT16 }, - { prop_memorytypeW, CIM_UINT16 }, - { prop_partnumberW, CIM_STRING } + { L"Capacity", CIM_UINT64 }, + { L"ConfiguredClockSpeed", CIM_UINT32 }, + { L"DeviceLocator", CIM_STRING }, + { L"FormFactor", CIM_UINT16 }, + { L"MemoryType", CIM_UINT16 }, + { L"PartNumber", CIM_STRING }, }; static const struct column col_pnpentity[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_printer[] = { - { prop_attributesW, CIM_UINT32 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivernameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_horizontalresolutionW, CIM_UINT32 }, - { prop_localW, CIM_BOOLEAN }, - { prop_locationW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_networkW, CIM_BOOLEAN }, - { prop_portnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Attributes", CIM_UINT32 }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"DriverName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"HorizontalResolution", CIM_UINT32 }, + { L"Local", CIM_BOOLEAN }, + { L"Location", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Network", CIM_BOOLEAN }, + { L"PortName", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_process[] = { - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_commandlineW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_handleW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pprocessidW, CIM_UINT32 }, - { prop_processidW, CIM_UINT32 }, - { prop_threadcountW, CIM_UINT32 }, - { prop_workingsetsizeW, CIM_UINT64 }, + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CommandLine", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Handle", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"ParentProcessID", CIM_UINT32 }, + { L"ProcessID", CIM_UINT32 }, + { L"ThreadCount", CIM_UINT32 }, + { L"WorkingSetSize", CIM_UINT64 }, /* methods */ - { method_getownerW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { L"GetOwner", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_processor[] = { - { prop_addresswidthW, CIM_UINT16 }, - { prop_architectureW, CIM_UINT16 }, - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_cpustatusW, CIM_UINT16 }, - { prop_currentclockspeedW, CIM_UINT32 }, - { prop_datawidthW, CIM_UINT16 }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_familyW, CIM_UINT16 }, - { prop_levelW, CIM_UINT16 }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_numcoresW, CIM_UINT32 }, - { prop_numlogicalprocessorsW, CIM_UINT32 }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_processortypeW, CIM_UINT16 }, - { prop_revisionW, CIM_UINT16 }, - { prop_uniqueidW, CIM_STRING }, - { prop_versionW, CIM_STRING|COL_FLAG_DYNAMIC } + { L"AddressWidth", CIM_UINT16 }, + { L"Architecture", CIM_UINT16 }, + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"CpuStatus", CIM_UINT16 }, + { L"CurrentClockSpeed", CIM_UINT32 }, + { L"DataWidth", CIM_UINT16 }, + { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"Family", CIM_UINT16 }, + { L"Level", CIM_UINT16 }, + { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"MaxClockSpeed", CIM_UINT32 }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"NumberOfCores", CIM_UINT32 }, + { L"NumberOfLogicalProcessors", CIM_UINT32 }, + { L"ProcessorId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"ProcessorType", CIM_UINT16 }, + { L"Revision", CIM_UINT16 }, + { L"UniqueId", CIM_STRING }, + { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_qualifier[] = { - { prop_classW, CIM_STRING }, - { prop_memberW, CIM_STRING }, - { prop_typeW, CIM_UINT32 }, - { prop_flavorW, CIM_SINT32 }, - { prop_nameW, CIM_STRING }, - { prop_intvalueW, CIM_SINT32 }, - { prop_strvalueW, CIM_STRING }, - { prop_boolvalueW, CIM_BOOLEAN } + { L"Class", CIM_STRING }, + { L"Member", CIM_STRING }, + { L"Type", CIM_UINT32 }, + { L"Flavor", CIM_SINT32 }, + { L"Name", CIM_STRING }, + { L"IntegerValue", CIM_SINT32 }, + { L"StringValue", CIM_STRING }, + { L"BoolValue", CIM_BOOLEAN }, }; static const struct column col_quickfixengineering[] = { - { prop_captionW, CIM_STRING }, - { prop_hotfixidW, CIM_STRING|COL_FLAG_KEY } + { L"Caption", CIM_STRING }, + { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, }; static const struct column col_service[] = { - { prop_acceptpauseW, CIM_BOOLEAN }, - { prop_acceptstopW, CIM_BOOLEAN }, - { prop_displaynameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_processidW, CIM_UINT32 }, - { prop_servicetypeW, CIM_STRING }, - { prop_startmodeW, CIM_STRING }, - { prop_stateW, CIM_STRING }, - { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { L"AcceptPause", CIM_BOOLEAN }, + { L"AcceptStop", CIM_BOOLEAN }, + { L"DisplayName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"ProcessID", CIM_UINT32 }, + { L"ServiceType", CIM_STRING }, + { L"StartMode", CIM_STRING }, + { L"State", CIM_STRING }, + { L"SystemName", CIM_STRING|COL_FLAG_DYNAMIC }, /* methods */ - { method_pauseserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_resumeserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_startserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_stopserviceW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { L"PauseService", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"ResumeService", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"StartService", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"StopService", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_sid[] = { - { prop_accountnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_binaryrepresentationW, CIM_UINT8|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_referenceddomainnameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_sidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_sidlengthW, CIM_UINT32 } + { L"AccountName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"BinaryRepresentation", CIM_UINT8|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"ReferencedDomainName", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"SID", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"SidLength", CIM_UINT32 }, }; static const struct column col_sounddevice[] = { - { prop_nameW, CIM_STRING }, - { prop_productnameW, CIM_STRING }, - { prop_statusinfoW, CIM_UINT16 } + { L"Name", CIM_STRING }, + { L"ProductName", CIM_STRING }, + { L"StatusInfo", CIM_UINT16 }, }; static const struct column col_stdregprov[] = { - { method_createkeyW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_enumkeyW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_enumvaluesW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_getstringvalueW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } + { L"CreateKey", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"EnumKey", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"EnumValues", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetStringValue", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_systemenclosure[] = { - { prop_captionW, CIM_STRING }, - { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, - { prop_descriptionW, CIM_STRING }, - { prop_lockpresentW, CIM_BOOLEAN }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING }, - { prop_tagW, CIM_STRING }, + { L"Caption", CIM_STRING }, + { L"ChassisTypes", CIM_UINT16|CIM_FLAG_ARRAY|COL_FLAG_DYNAMIC }, + { L"Description", CIM_STRING }, + { L"LockPresent", CIM_BOOLEAN }, + { L"Manufacturer", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Name", CIM_STRING }, + { L"Tag", CIM_STRING }, }; static const struct column col_systemsecurity[] = { - { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, - { method_setsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"GetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, + { L"SetSD", CIM_FLAG_ARRAY|COL_FLAG_METHOD }, }; static const struct column col_videocontroller[] = { - { prop_adapterdactypeW, CIM_STRING }, - { prop_adapterramW, CIM_UINT32 }, - { prop_availabilityW, CIM_UINT16 }, - { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_configmanagererrorcodeW, CIM_UINT32 }, - { prop_currentbitsperpixelW, CIM_UINT32 }, - { prop_currenthorizontalresW, CIM_UINT32 }, - { prop_currentrefreshrateW, CIM_UINT32 }, - { prop_currentscanmodeW, CIM_UINT16 }, - { prop_currentverticalresW, CIM_UINT32 }, - { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, - { prop_driverdateW, CIM_DATETIME }, - { prop_driverversionW, CIM_STRING }, - { prop_installeddisplaydriversW,CIM_STRING }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_pnpdeviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_statusW, CIM_STRING }, - { prop_videoarchitectureW, CIM_UINT16 }, - { prop_videomemorytypeW, CIM_UINT16 }, - { prop_videomodedescriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_videoprocessorW, CIM_STRING|COL_FLAG_DYNAMIC }, + { L"AdapterDACType", CIM_STRING }, + { L"AdapterRAM", CIM_UINT32 }, + { L"Availability", CIM_UINT16 }, + { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"ConfigManagerErrorCode", CIM_UINT32 }, + { L"CurrentBitsPerPixel", CIM_UINT32 }, + { L"CurrentHorizontalResolution", CIM_UINT32 }, + { L"CurrentRefreshRate", CIM_UINT32 }, + { L"CurrentScanMode", CIM_UINT16 }, + { L"CurrentVerticalResolution", CIM_UINT32 }, + { L"Description", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_KEY }, + { L"DriverDate", CIM_DATETIME }, + { L"DriverVersion", CIM_STRING }, + { L"InstalledDisplayDrivers", CIM_STRING }, + { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"PNPDeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Status", CIM_STRING }, + { L"VideoArchitecture", CIM_UINT16 }, + { L"VideoMemoryType", CIM_UINT16 }, + { L"VideoModeDescription", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"VideoProcessor", CIM_STRING|COL_FLAG_DYNAMIC }, }; static const struct column col_winsat[] = { - { prop_cpuscoreW, CIM_REAL32 }, - { prop_d3dscoreW, CIM_REAL32 }, - { prop_diskscoreW, CIM_REAL32 }, - { prop_graphicsscoreW, CIM_REAL32 }, - { prop_memoryscoreW, CIM_REAL32 }, - { prop_timetakenW, CIM_STRING|COL_FLAG_KEY }, - { prop_winsatassessmentstateW, CIM_UINT32 }, - { prop_winsprlevelW, CIM_REAL32 }, + { L"CPUScore", CIM_REAL32 }, + { L"D3DScore", CIM_REAL32 }, + { L"DiskScore", CIM_REAL32 }, + { L"GraphicsScore", CIM_REAL32 }, + { L"MemoryScore", CIM_REAL32 }, + { L"TimeTaken", CIM_STRING|COL_FLAG_KEY }, + { L"WinSATAssessmentState", CIM_UINT32 }, + { L"WinSPRLevel", CIM_REAL32 }, }; -static const WCHAR baseboard_manufacturerW[] = - {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; -static const WCHAR baseboard_serialnumberW[] = - {'N','o','n','e',0}; -static const WCHAR baseboard_tagW[] = - {'B','a','s','e',' ','B','o','a','r','d',0}; -static const WCHAR baseboard_versionW[] = - {'1','.','0',0}; -static const WCHAR bios_descriptionW[] = - {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; -static const WCHAR bios_manufacturerW[] = - {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; -static const WCHAR bios_releasedateW[] = - {'2','0','1','2','0','6','0','8','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; -static const WCHAR bios_serialnumberW[] = - {'0',0}; -static const WCHAR bios_smbiosbiosversionW[] = - {'W','i','n','e',0}; -static const WCHAR bios_versionW[] = - {'W','I','N','E',' ',' ',' ','-',' ','1',0}; -static const WCHAR cdromdrive_mediatypeW[] = - {'C','D','-','R','O','M',0}; -static const WCHAR cdromdrive_nameW[] = - {'W','i','n','e',' ','C','D','-','R','O','M',' ','A','T','A',' ','D','e','v','i','c','e',0}; -static const WCHAR cdromdrive_pnpdeviceidW[]= - {'I','D','E','\\','C','D','R','O','M','W','I','N','E','_','C','D','-','R','O','M', - '_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_','_', - '_','_','_','_','_','_','_','1','.','0','_','_','_','_','_','\\','5','&','3','A','2', - 'A','5','8','5','4','&','0','&','1','.','0','.','0',0}; -static const WCHAR compsys_descriptionW[] = - {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; -static const WCHAR compsys_domainW[] = - {'W','O','R','K','G','R','O','U','P',0}; -static const WCHAR compsys_manufacturerW[] = - {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; -static const WCHAR compsys_modelW[] = - {'W','i','n','e',0}; -static const WCHAR compsysproduct_identifyingnumberW[] = - {'0',0}; -static const WCHAR compsysproduct_nameW[] = - {'W','i','n','e',0}; -static const WCHAR compsysproduct_uuidW[] = - {'d','e','a','d','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-','d','e','a','d','-', - 'd','e','a','d','d','e','a','d','d','e','a','d',0}; -static const WCHAR compsysproduct_vendorW[] = - {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; -static const WCHAR compsysproduct_versionW[] = - {'1','.','0',0}; -static const WCHAR diskdrive_interfacetypeW[] = - {'I','D','E',0}; -static const WCHAR diskdrive_manufacturerW[] = - {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; -static const WCHAR diskdrive_mediatype_fixedW[] = - {'F','i','x','e','d',' ','h','a','r','d',' ','d','i','s','k',0}; -static const WCHAR diskdrive_mediatype_removableW[] = - {'R','e','m','o','v','a','b','l','e',' ','m','e','d','i','a',0}; -static const WCHAR diskdrive_modelW[] = - {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; -static const WCHAR diskdrive_pnpdeviceidW[] = - {'I','D','E','\\','D','i','s','k','\\','V','E','N','_','W','I','N','E',0}; -static const WCHAR diskdrive_serialW[] = - {'W','I','N','E','H','D','I','S','K',0}; -static const WCHAR networkadapter_pnpdeviceidW[]= - {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', - 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', - '3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0}; -static const WCHAR os_32bitW[] = - {'3','2','-','b','i','t',0}; -static const WCHAR os_64bitW[] = - {'6','4','-','b','i','t',0}; -static const WCHAR os_installdateW[] = - {'2','0','1','4','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; -static const WCHAR os_serialnumberW[] = - {'1','2','3','4','5','-','O','E','M','-','1','2','3','4','5','6','7','-','1','2','3','4','5',0}; -static const WCHAR physicalmedia_tagW[] = - {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; -static const WCHAR quickfixengineering_captionW[] = - {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR quickfixengineering_hotfixidW[] = - {'K','B','1','2','3','4','5','6','7',0}; -static const WCHAR sounddevice_productnameW[] = - {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; -static const WCHAR systemenclosure_systemenclosureW[] = - {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',0}; -static const WCHAR systemenclosure_tagW[] = - {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',' ','0',0}; -static const WCHAR systemenclosure_manufacturerW[] = - {'W','i','n','e',0}; -static const WCHAR videocontroller_dactypeW[] = - {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; -static const WCHAR videocontroller_deviceidW[] = - {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; -static const WCHAR videocontroller_driverdateW[] = - {'2','0','1','7','0','1','0','1','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; -static const WCHAR videocontroller_driverversionW[] = - {'1','.','0',0}; -static const WCHAR videocontroller_statusW[] = - {'O','K',0}; -static const WCHAR winsat_timetakenW[] = - {'M','o','s','t','R','e','c','e','n','t','A','s','s','e','s','s','m','e','n','t',0}; - #include "pshpack1.h" struct record_associator { @@ -1357,39 +821,39 @@ struct record_winsat static const struct record_associator data_associator[] = { - { class_diskdrivetodiskpartitionW, class_diskpartitionW, class_diskdriveW }, - { class_logicaldisktopartitionW, class_logicaldiskW, class_diskpartitionW }, + { L"Win32_DiskDriveToDiskPartition", L"Win32_DiskPartition", L"Win32_DiskDrive" }, + { L"Win32_LogicalDiskToPartition", L"Win32_LogicalDisk", L"Win32_DiskPartition" }, }; static const struct record_param data_param[] = { - { class_processW, method_getownerW, -1, param_returnvalueW, CIM_UINT32 }, - { class_processW, method_getownerW, -1, param_userW, CIM_STRING }, - { class_processW, method_getownerW, -1, param_domainW, CIM_STRING }, - { class_serviceW, method_pauseserviceW, -1, param_returnvalueW, CIM_UINT32 }, - { class_serviceW, method_resumeserviceW, -1, param_returnvalueW, CIM_UINT32 }, - { class_serviceW, method_startserviceW, -1, param_returnvalueW, CIM_UINT32 }, - { class_serviceW, method_stopserviceW, -1, param_returnvalueW, CIM_UINT32 }, - { class_stdregprovW, method_createkeyW, 1, param_defkeyW, CIM_SINT32, 0x80000002 }, - { class_stdregprovW, method_createkeyW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_createkeyW, -1, param_returnvalueW, CIM_UINT32 }, - { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_SINT32, 0x80000002 }, - { class_stdregprovW, method_enumkeyW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_enumkeyW, -1, param_returnvalueW, CIM_UINT32 }, - { class_stdregprovW, method_enumkeyW, -1, param_namesW, CIM_STRING|CIM_FLAG_ARRAY }, - { class_stdregprovW, method_enumvaluesW, 1, param_defkeyW, CIM_SINT32, 0x80000002 }, - { class_stdregprovW, method_enumvaluesW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_enumvaluesW, -1, param_returnvalueW, CIM_UINT32 }, - { class_stdregprovW, method_enumvaluesW, -1, param_namesW, CIM_STRING|CIM_FLAG_ARRAY }, - { class_stdregprovW, method_enumvaluesW, -1, param_typesW, CIM_SINT32|CIM_FLAG_ARRAY }, - { class_stdregprovW, method_getstringvalueW, 1, param_defkeyW, CIM_SINT32, 0x80000002 }, - { class_stdregprovW, method_getstringvalueW, 1, param_subkeynameW, CIM_STRING }, - { class_stdregprovW, method_getstringvalueW, 1, param_valuenameW, CIM_STRING }, - { class_stdregprovW, method_getstringvalueW, -1, param_returnvalueW, CIM_UINT32 }, - { class_stdregprovW, method_getstringvalueW, -1, param_valueW, CIM_STRING }, - { class_systemsecurityW, method_getsdW, -1, param_returnvalueW, CIM_UINT32 }, - { class_systemsecurityW, method_getsdW, -1, param_sdW, CIM_UINT8|CIM_FLAG_ARRAY }, - { class_systemsecurityW, method_setsdW, 1, param_sdW, CIM_UINT8|CIM_FLAG_ARRAY }, - { class_systemsecurityW, method_setsdW, -1, param_returnvalueW, CIM_UINT32 }, + { L"__SystemSecurity", L"GetSD", -1, L"ReturnValue", CIM_UINT32 }, + { L"__SystemSecurity", L"GetSD", -1, L"SD", CIM_UINT8|CIM_FLAG_ARRAY }, + { L"__SystemSecurity", L"SetSD", 1, L"SD", CIM_UINT8|CIM_FLAG_ARRAY }, + { L"__SystemSecurity", L"SetSD", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"CreateKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"CreateKey", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"CreateKey", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"EnumKey", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"EnumKey", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"EnumKey", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"EnumKey", -1, L"sNames", CIM_STRING|CIM_FLAG_ARRAY }, + { L"StdRegProv", L"EnumValues", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"EnumValues", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"EnumValues", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"EnumValues", -1, L"sNames", CIM_STRING|CIM_FLAG_ARRAY }, + { L"StdRegProv", L"EnumValues", -1, L"Types", CIM_SINT32|CIM_FLAG_ARRAY }, + { L"StdRegProv", L"GetStringValue", 1, L"hDefKey", CIM_SINT32, 0x80000002 }, + { L"StdRegProv", L"GetStringValue", 1, L"sSubKeyName", CIM_STRING }, + { L"StdRegProv", L"GetStringValue", 1, L"sValueName", CIM_STRING }, + { L"StdRegProv", L"GetStringValue", -1, L"ReturnValue", CIM_UINT32 }, + { L"StdRegProv", L"GetStringValue", -1, L"sValue", CIM_STRING }, + { L"Win32_Process", L"GetOwner", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Process", L"GetOwner", -1, L"User", CIM_STRING }, + { L"Win32_Process", L"GetOwner", -1, L"Domain", CIM_STRING }, + { L"Win32_Service", L"PauseService", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Service", L"ResumeService", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Service", L"StartService", -1, L"ReturnValue", CIM_UINT32 }, + { L"Win32_Service", L"StopService", -1, L"ReturnValue", CIM_UINT32 }, }; #define FLAVOR_ID (WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE | WBEM_FLAVOR_NOT_OVERRIDABLE |\ @@ -1397,20 +861,20 @@ static const struct record_param data_param[] = static const struct record_physicalmedia data_physicalmedia[] = { - { diskdrive_serialW, physicalmedia_tagW } + { L"WINEHDISK", L"\\\\.\\PHYSICALDRIVE0" } }; static const struct record_qualifier data_qualifier[] = { - { class_process_getowner_outW, param_userW, CIM_SINT32, FLAVOR_ID, prop_idW, 0 }, - { class_process_getowner_outW, param_domainW, CIM_SINT32, FLAVOR_ID, prop_idW, 1 } + { L"__WIN32_PROCESS_GETOWNER_OUT", L"User", CIM_SINT32, FLAVOR_ID, L"ID", 0 }, + { L"__WIN32_PROCESS_GETOWNER_OUT", L"Domain", CIM_SINT32, FLAVOR_ID, L"ID", 1 } }; static const struct record_quickfixengineering data_quickfixengineering[] = { - { quickfixengineering_captionW, quickfixengineering_hotfixidW }, + { L"http://winehq.org", L"KB1234567" }, }; static const struct record_sounddevice data_sounddevice[] = { - { sounddevice_productnameW, sounddevice_productnameW, 3 /* enabled */ } + { L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = { @@ -1432,7 +896,7 @@ static const struct record_systemsecurity data_systemsecurity[] = }; static const struct record_winsat data_winsat[] = { - { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, winsat_timetakenW, 1 /* Valid */, 8.0f }, + { 8.0f, 8.0f, 8.0f, 8.0f, 8.0f, L"MostRecentAssessment", 1 /* Valid */, 8.0f }, }; /* check if row matches condition and update status */ @@ -1619,28 +1083,28 @@ static WCHAR *get_baseboard_string( BYTE id, const char *buf, UINT len ) static WCHAR *get_baseboard_manufacturer( const char *buf, UINT len ) { WCHAR *ret = get_baseboard_string( 1, buf, len ); - if (!ret) return heap_strdupW( baseboard_manufacturerW ); + if (!ret) return heap_strdupW( L"Intel Corporation" ); return ret; } static WCHAR *get_baseboard_product( const char *buf, UINT len ) { WCHAR *ret = get_baseboard_string( 2, buf, len ); - if (!ret) return heap_strdupW( baseboard_tagW ); + if (!ret) return heap_strdupW( L"Base Board" ); return ret; } static WCHAR *get_baseboard_serialnumber( const char *buf, UINT len ) { WCHAR *ret = get_baseboard_string( 4, buf, len ); - if (!ret) return heap_strdupW( baseboard_serialnumberW ); + if (!ret) return heap_strdupW( L"None" ); return ret; } static WCHAR *get_baseboard_version( const char *buf, UINT len ) { WCHAR *ret = get_baseboard_string( 3, buf, len ); - if (!ret) return heap_strdupW( baseboard_versionW ); + if (!ret) return heap_strdupW( L"1.0" ); return ret; } @@ -1659,11 +1123,11 @@ static enum fill_status fill_baseboard( struct table *table, const struct expr * rec = (struct record_baseboard *)table->data; rec->manufacturer = get_baseboard_manufacturer( buf, len ); - rec->model = baseboard_tagW; - rec->name = baseboard_tagW; + rec->model = L"Base Board"; + rec->name = L"Base Board"; rec->product = get_baseboard_product( buf, len ); rec->serialnumber = get_baseboard_serialnumber( buf, len ); - rec->tag = baseboard_tagW; + rec->tag = L"Base Board"; rec->version = get_baseboard_version( buf, len ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -1705,14 +1169,13 @@ static WCHAR *get_bios_string( BYTE id, const char *buf, UINT len ) static WCHAR *get_bios_manufacturer( const char *buf, UINT len ) { WCHAR *ret = get_bios_string( 1, buf, len ); - if (!ret) return heap_strdupW( bios_manufacturerW ); + if (!ret) return heap_strdupW( L"The Wine Project" ); return ret; } static WCHAR *convert_bios_date( const WCHAR *str ) { - static const WCHAR fmtW[] = - {'%','0','4','u','%','0','2','u','%','0','2','u','0','0','0','0','0','0','.','0','0','0','0','0','0','+','0','0','0',0}; + static const WCHAR fmtW[] = L"%04u%02u%02u000000.000000+000"; UINT year, month, day, len = lstrlenW( str ); const WCHAR *p = str, *q; WCHAR *ret; @@ -1744,7 +1207,7 @@ static WCHAR *convert_bios_date( const WCHAR *str ) static WCHAR *get_bios_releasedate( const char *buf, UINT len ) { WCHAR *ret, *date = get_bios_string( 3, buf, len ); - if (!date || !(ret = convert_bios_date( date ))) ret = heap_strdupW( bios_releasedateW ); + if (!date || !(ret = convert_bios_date( date ))) ret = heap_strdupW( L"20120608000000.000000+000" ); heap_free( date ); return ret; } @@ -1752,7 +1215,7 @@ static WCHAR *get_bios_releasedate( const char *buf, UINT len ) static WCHAR *get_bios_smbiosbiosversion( const char *buf, UINT len ) { WCHAR *ret = get_bios_string( 2, buf, len ); - if (!ret) return heap_strdupW( bios_smbiosbiosversionW ); + if (!ret) return heap_strdupW( L"Wine" ); return ret; } @@ -1818,21 +1281,21 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_bios *)table->data; - rec->currentlanguage = NULL; - rec->description = bios_descriptionW; - rec->ecmajorversion = get_bios_ec_firmware_major_release( buf, len ); - rec->ecminorversion = get_bios_ec_firmware_minor_release( buf, len ); - rec->identificationcode = NULL; - rec->manufacturer = get_bios_manufacturer( buf, len ); - rec->name = bios_descriptionW; - rec->releasedate = get_bios_releasedate( buf, len ); - rec->serialnumber = bios_serialnumberW; - rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); - rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); - rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); + rec->currentlanguage = NULL; + rec->description = L"Default System BIOS"; + rec->ecmajorversion = get_bios_ec_firmware_major_release( buf, len ); + rec->ecminorversion = get_bios_ec_firmware_minor_release( buf, len ); + rec->identificationcode = NULL; + rec->manufacturer = get_bios_manufacturer( buf, len ); + rec->name = L"Default System BIOS"; + rec->releasedate = get_bios_releasedate( buf, len ); + rec->serialnumber = L"0"; + rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); + rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); + rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); rec->systembiosmajorversion = get_bios_system_bios_major_release( buf, len ); rec->systembiosminorversion = get_bios_system_bios_minor_release( buf, len ); - rec->version = bios_versionW; + rec->version = L"WINE - 1"; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -1845,7 +1308,6 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond static enum fill_status fill_cdromdrive( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'%','c',':',0}; WCHAR drive[3], root[] = {'A',':','\\',0}; struct record_cdromdrive *rec; UINT i, row = 0, offset = 0; @@ -1865,12 +1327,12 @@ static enum fill_status fill_cdromdrive( struct table *table, const struct expr if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_cdromdrive *)(table->data + offset); - rec->device_id = cdromdrive_pnpdeviceidW; - swprintf( drive, ARRAY_SIZE( drive ), fmtW, 'A' + i ); + rec->device_id = L"IDE\\CDROMWINE_CD-ROM_____________________________1.0_____\\5&3A2A5854&0&1.0.0"; + swprintf( drive, ARRAY_SIZE( drive ), L"%c:", 'A' + i ); rec->drive = heap_strdupW( drive ); - rec->mediatype = cdromdrive_mediatypeW; - rec->name = cdromdrive_nameW; - rec->pnpdevice_id = cdromdrive_pnpdeviceidW; + rec->mediatype = L"CR-ROM"; + rec->name = L"Wine CD_ROM ATA Device"; + rec->pnpdevice_id = L"IDE\\CDROMWINE_CD-ROM_____________________________1.0_____\\5&3A2A5854&0&1.0.0"; if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -1991,11 +1453,11 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_computersystem *)table->data; - rec->description = compsys_descriptionW; - rec->domain = compsys_domainW; + rec->description = L"AT/AT COMPATIBLE"; + rec->domain = L"WORKGROUP"; rec->domainrole = 0; /* standalone workstation */ - rec->manufacturer = compsys_manufacturerW; - rec->model = compsys_modelW; + rec->manufacturer = L"The Wine Project"; + rec->model = L"Wine"; rec->name = get_computername(); rec->num_logical_processors = get_logical_processor_count( NULL, &rec->num_processors ); rec->total_physical_memory = get_total_physical_memory(); @@ -2024,23 +1486,19 @@ static WCHAR *get_compsysproduct_string( BYTE id, const char *buf, UINT len ) static WCHAR *get_compsysproduct_identifyingnumber( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 4, buf, len ); - if (!ret) return heap_strdupW( compsysproduct_identifyingnumberW ); + if (!ret) return heap_strdupW( L"0" ); return ret; } static WCHAR *get_compsysproduct_name( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 2, buf, len ); - if (!ret) return heap_strdupW( compsysproduct_nameW ); + if (!ret) return heap_strdupW( L"Wine" ); return ret; } static WCHAR *get_compsysproduct_uuid( const char *buf, UINT len ) { - static const WCHAR fmtW[] = - {'%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; static const BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; const struct smbios_header *hdr; const struct smbios_system *system; @@ -2052,25 +1510,25 @@ static WCHAR *get_compsysproduct_uuid( const char *buf, UINT len ) if (!memcmp( system->uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; ptr = system->uuid; - swprintf( ret, 37, fmtW, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9], - ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15] ); - + swprintf( ret, 37, L"%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", ptr[0], ptr[1], + ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], + ptr[14], ptr[15] ); done: - if (!ret) ret = heap_strdupW( compsysproduct_uuidW ); + if (!ret) ret = heap_strdupW( L"deaddead-dead-dead-dead-deaddeaddead" ); return ret; } static WCHAR *get_compsysproduct_vendor( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 1, buf, len ); - if (!ret) return heap_strdupW( compsysproduct_vendorW ); + if (!ret) return heap_strdupW( L"The Wine Project" ); return ret; } static WCHAR *get_compsysproduct_version( const char *buf, UINT len ) { WCHAR *ret = get_compsysproduct_string( 3, buf, len ); - if (!ret) return heap_strdupW( compsysproduct_versionW ); + if (!ret) return heap_strdupW( L"1.0" ); return ret; } @@ -2292,13 +1750,13 @@ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR const WCHAR *str = NULL; if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && - !wcscmp( left->u.propval->name, prop_nameW ) && + !wcscmp( left->u.propval->name, L"Name" ) && towupper( right->u.sval[0] ) == towupper( root )) { str = right->u.sval; } else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && - !wcscmp( right->u.propval->name, prop_nameW ) && + !wcscmp( right->u.propval->name, L"Name" ) && towupper( left->u.sval[0] ) == towupper( root )) { str = left->u.sval; @@ -2348,9 +1806,8 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) static WCHAR *get_file_version( const WCHAR *filename ) { - static const WCHAR slashW[] = {'\\',0}, fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; VS_FIXEDFILEINFO *info; - DWORD size, len = 4 * 5 + ARRAY_SIZE( fmtW ); + DWORD size, len = 4 * 5 + ARRAY_SIZE( L"%u.%u.%u.%u" ); void *block; WCHAR *ret; @@ -2361,21 +1818,20 @@ static WCHAR *get_file_version( const WCHAR *filename ) return NULL; } if (!GetFileVersionInfoW( filename, 0, size, block ) || - !VerQueryValueW( block, slashW, (void **)&info, &size )) + !VerQueryValueW( block, L"\\", (void **)&info, &size )) { heap_free( block ); heap_free( ret ); return NULL; } - swprintf( ret, len, fmtW, info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, - info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); + swprintf( ret, len, L"%u.%u.%u.%u", info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, + info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); heap_free( block ); return ret; } static enum fill_status fill_datafile( struct table *table, const struct expr *cond ) { - static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; struct record_datafile *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; @@ -2419,7 +1875,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c FindClose( handle ); goto done; } - if (!wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) continue; + if (!wcscmp( data.cFileName, L"." ) || !wcscmp( data.cFileName, L".." )) continue; if (!(new_path = append_path( path, data.cFileName, &len ))) { @@ -2504,7 +1960,6 @@ static enum fill_status fill_desktopmonitor( struct table *table, const struct e static enum fill_status fill_directory( struct table *table, const struct expr *cond ) { - static const WCHAR dotW[] = {'.',0}, dotdotW[] = {'.','.',0}; struct record_directory *rec; UINT i, len, row = 0, offset = 0, num_expected_rows; WCHAR *glob = NULL, *path = NULL, *new_path, root[] = {'A',':','\\',0}; @@ -2549,7 +2004,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * goto done; } if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !wcscmp( data.cFileName, dotW ) || !wcscmp( data.cFileName, dotdotW )) + !wcscmp( data.cFileName, L"." ) || !wcscmp( data.cFileName, L".." )) continue; if (!(new_path = append_path( path, data.cFileName, &len ))) @@ -2626,8 +2081,7 @@ static UINT64 get_freespace( const WCHAR *dir, UINT64 *disksize ) static enum fill_status fill_diskdrive( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = - {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0}; + static const WCHAR fmtW[] = L"\\\\\\\\.\\\\PHYSICALDRIVE%u"; WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; @@ -2652,12 +2106,12 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->index = index++; - rec->interfacetype = diskdrive_interfacetypeW; - rec->manufacturer = diskdrive_manufacturerW; - rec->mediatype = (type == DRIVE_FIXED) ? diskdrive_mediatype_fixedW : diskdrive_mediatype_removableW; - rec->model = diskdrive_modelW; - rec->pnpdevice_id = diskdrive_pnpdeviceidW; - rec->serialnumber = diskdrive_serialW; + rec->interfacetype = L"IDE"; + rec->manufacturer = L"(Standard disk drives)"; + rec->mediatype = (type == DRIVE_FIXED) ? L"Fixed hard disk" : L"Removable media"; + rec->model = L"Wine Disk Drive"; + rec->pnpdevice_id = L"IDE\\Disk\\VEN_WINE"; + rec->serialnumber = L"WINEHDISK"; get_freespace( root, &size ); rec->size = size; if (!match_row( table, row, cond, &status )) @@ -2694,14 +2148,6 @@ static void free_associations( struct association *assoc, UINT count ) static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) { - static const WCHAR pathW[] = - {'_','_','P','A','T','H',0}; - static const WCHAR selectW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','k','D','r','i','v','e',0}; - static const WCHAR select2W[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; struct association *ret = NULL; struct query *query, *query2 = NULL; VARIANT val; @@ -2709,22 +2155,22 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) UINT i; if (!(query = create_query())) return NULL; - if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = parse_query( L"SELECT * FROM Win32_DiskDrive", &query->view, &query->mem )) != S_OK) goto done; if ((hr = execute_view( query->view )) != S_OK) goto done; if (!(query2 = create_query())) return FALSE; - if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = parse_query( L"SELECT * FROM Win32_DiskPartition", &query2->view, &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; for (i = 0; i < query->view->result_count; i++) { - if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if ((hr = get_propval( query->view, i, L"__PATH", &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; VariantClear( &val ); - if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if ((hr = get_propval( query2->view, i, L"__PATH", &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; VariantClear( &val ); } @@ -2780,18 +2226,15 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons static WCHAR *get_filesystem( const WCHAR *root ) { - static const WCHAR ntfsW[] = {'N','T','F','S',0}; WCHAR buffer[MAX_PATH + 1]; if (GetVolumeInformationW( root, NULL, 0, NULL, NULL, NULL, buffer, MAX_PATH + 1 )) return heap_strdupW( buffer ); - return heap_strdupW( ntfsW ); + return heap_strdupW( L"NTFS" ); } static enum fill_status fill_diskpartition( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = - {'D','i','s','k',' ','#','%','u',',',' ','P','a','r','t','i','t','i','o','n',' ','#','0',0}; WCHAR device_id[32], root[] = {'A',':','\\',0}; struct record_diskpartition *rec; UINT i, row = 0, offset = 0, type, index = 0; @@ -2815,7 +2258,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex rec = (struct record_diskpartition *)(table->data + offset); rec->bootable = (i == 2) ? -1 : 0; rec->bootpartition = (i == 2) ? -1 : 0; - swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); + swprintf( device_id, ARRAY_SIZE( device_id ), L"Disk #%u, Partition #0", index ); rec->device_id = heap_strdupW( device_id ); rec->diskindex = index++; rec->index = 0; @@ -2861,9 +2304,9 @@ static enum fill_status fill_displaycontrollerconfig( struct table *table, const rec = (struct record_displaycontrollerconfig *)table->data; rec->bitsperpixel = get_bitsperpixel( &hres, &vres ); - rec->caption = videocontroller_deviceidW; + rec->caption = L"VideoController1"; rec->horizontalresolution = hres; - rec->name = videocontroller_deviceidW; + rec->name = L"VideoController1"; rec->verticalresolution = vres; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -2875,12 +2318,11 @@ static enum fill_status fill_displaycontrollerconfig( struct table *table, const static WCHAR *get_ip4_string( DWORD addr ) { - static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; DWORD len = sizeof("ddd.ddd.ddd.ddd"); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - swprintf( ret, len, fmtW, (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); + swprintf( ret, len, L"%u.%u.%u.%u", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); return ret; } @@ -2935,18 +2377,16 @@ static WCHAR *get_volumename( const WCHAR *root ) } static WCHAR *get_volumeserialnumber( const WCHAR *root ) { - static const WCHAR fmtW[] = {'%','0','8','X',0}; DWORD serial = 0; WCHAR buffer[9]; GetVolumeInformationW( root, NULL, 0, &serial, NULL, NULL, NULL, 0 ); - swprintf( buffer, ARRAY_SIZE( buffer ), fmtW, serial ); + swprintf( buffer, ARRAY_SIZE( buffer ), L"%08X", serial ); return heap_strdupW( buffer ); } static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'%','c',':',0}; WCHAR device_id[3], root[] = {'A',':','\\',0}; struct record_logicaldisk *rec; UINT i, row = 0, offset = 0, type; @@ -2968,7 +2408,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_logicaldisk *)(table->data + offset); - swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, 'A' + i ); + swprintf( device_id, ARRAY_SIZE( device_id ), L"%c:", 'A' + i ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); @@ -2993,15 +2433,6 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr static struct association *get_logicaldisktopartition_pairs( UINT *count ) { - static const WCHAR pathW[] = - {'_','_','P','A','T','H',0}; - static const WCHAR selectW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'D','i','s','k','P','a','r','t','i','t','i','o','n',0}; - static const WCHAR select2W[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', - 'L','o','g','i','c','a','l','D','i','s','k',' ','W','H','E','R','E',' ', - 'D','r','i','v','e','T','y','p','e','=','2',' ','O','R',' ','D','r','i','v','e','T','y','p','e','=','3',0}; struct association *ret = NULL; struct query *query, *query2 = NULL; VARIANT val; @@ -3009,11 +2440,12 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) UINT i; if (!(query = create_query())) return NULL; - if ((hr = parse_query( selectW, &query->view, &query->mem )) != S_OK) goto done; + if ((hr = parse_query( L"SELECT * FROM Win32_DiskPartition", &query->view, &query->mem )) != S_OK) goto done; if ((hr = execute_view( query->view )) != S_OK) goto done; if (!(query2 = create_query())) return FALSE; - if ((hr = parse_query( select2W, &query2->view, &query2->mem )) != S_OK) goto done; + if ((hr = parse_query( L"SELECT * FROM Win32_LogicalDisk WHERE DriveType=2 OR DriveType=3", &query2->view, + &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; @@ -3021,11 +2453,11 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) /* assume fixed and removable disks are enumerated in the same order as partitions */ for (i = 0; i < query->view->result_count; i++) { - if ((hr = get_propval( query->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if ((hr = get_propval( query->view, i, L"__PATH", &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref = heap_strdupW( V_BSTR(&val) ))) goto done; VariantClear( &val ); - if ((hr = get_propval( query2->view, i, pathW, &val, NULL, NULL )) != S_OK) goto done; + if ((hr = get_propval( query2->view, i, L"__PATH", &val, NULL, NULL )) != S_OK) goto done; if (!(ret[i].ref2 = heap_strdupW( V_BSTR(&val) ))) goto done; VariantClear( &val ); } @@ -3095,40 +2527,35 @@ static UINT16 get_connection_status( IF_OPER_STATUS status ) } static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) { - static const WCHAR fmtW[] = - {'%','0','2','x',':','%','0','2','x',':','%','0','2','x',':', - '%','0','2','x',':','%','0','2','x',':','%','0','2','x',0}; WCHAR *ret; - if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; - swprintf( ret, 18, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); + swprintf( ret, 18, L"%02x:%02x:%02x:%02x:%02x:%02x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) { - static const WCHAR ethernetW[] = {'E','t','h','e','r','n','e','t',' ','8','0','2','.','3',0}; - static const WCHAR wirelessW[] = {'W','i','r','e','l','e','s','s',0}; - static const WCHAR firewireW[] = {'1','3','9','4',0}; - static const WCHAR tunnelW[] = {'T','u','n','n','e','l',0}; - switch (type) { case IF_TYPE_ETHERNET_CSMACD: *id = 0; *physical = -1; - return ethernetW; + return L"Ethernet 802.3"; + case IF_TYPE_IEEE80211: *id = 9; *physical = -1; - return wirelessW; + return L"Wireless"; + case IF_TYPE_IEEE1394: *id = 13; *physical = -1; - return firewireW; + return L"1394"; + case IF_TYPE_TUNNEL: *id = 15; *physical = 0; - return tunnelW; + return L"Tunnel"; + default: *id = -1; *physical = 0; @@ -3138,7 +2565,6 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) static enum fill_status fill_networkadapter( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR device_id[11]; struct record_networkadapter *rec; IP_ADAPTER_ADDRESSES *aa, *buffer; @@ -3170,7 +2596,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapter *)(table->data + offset); - swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, aa->u.s.IfIndex ); + swprintf( device_id, ARRAY_SIZE( device_id ), L"%u", aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); @@ -3178,11 +2604,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->index = aa->u.s.IfIndex; rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); - rec->manufacturer = compsys_manufacturerW; + rec->manufacturer = L"The Wine Project"; rec->name = heap_strdupW( aa->FriendlyName ); rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->physicaladapter = physical; - rec->pnpdevice_id = networkadapter_pnpdeviceidW; + rec->pnpdevice_id = L"PCI\\VEN_8086&DEV_100E&SUBSYS_001E8086&REV_02\\3&267A616A&1&18"; rec->speed = 1000000; if (!match_row( table, row, cond, &status )) { @@ -3343,10 +2769,8 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } else { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR buf[11]; - - swprintf( buf, ARRAY_SIZE( buf ), fmtW, address->OnLinkPrefixLength ); + swprintf( buf, ARRAY_SIZE( buf ), L"%u", address->OnLinkPrefixLength ); ptr[i] = heap_strdupW( buf ); } if (!ptr[i++]) @@ -3434,7 +2858,6 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond ) { - static const WCHAR dimm0W[] = {'D','I','M','M',' ','0',0}; struct record_physicalmemory *rec; enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; @@ -3444,7 +2867,7 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e rec = (struct record_physicalmemory *)table->data; rec->capacity = get_total_physical_memory(); rec->configuredclockspeed = 0; - rec->devicelocator = dimm0W; + rec->devicelocator = L"DIMM 0"; rec->formfactor = 8; /* DIMM */ rec->memorytype = 9; /* RAM */ rec->partnumber = NULL; @@ -3505,7 +2928,6 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; struct record_printer *rec; enum fill_status status = FILL_STATUS_UNFILTERED; PRINTER_INFO_2W *info; @@ -3531,7 +2953,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co { rec = (struct record_printer *)(table->data + offset); rec->attributes = info[i].Attributes; - swprintf( id, ARRAY_SIZE( id ), fmtW, i ); + swprintf( id, ARRAY_SIZE( id ), L"Printer%u", i ); rec->device_id = heap_strdupW( id ); rec->drivername = heap_strdupW( info[i].pDriverName ); rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; @@ -3563,7 +2985,6 @@ static WCHAR *get_cmdline( DWORD process_id ) static enum fill_status fill_process( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR handle[11]; struct record_process *rec; PROCESSENTRY32W entry; @@ -3590,7 +3011,7 @@ static enum fill_status fill_process( struct table *table, const struct expr *co rec->caption = heap_strdupW( entry.szExeFile ); rec->commandline = get_cmdline( entry.th32ProcessID ); rec->description = heap_strdupW( entry.szExeFile ); - swprintf( handle, ARRAY_SIZE( handle ), fmtW, entry.th32ProcessID ); + swprintf( handle, ARRAY_SIZE( handle ), L"%u", entry.th32ProcessID ); rec->handle = heap_strdupW( handle ); rec->name = heap_strdupW( entry.szExeFile ); rec->process_id = entry.th32ProcessID; @@ -3693,42 +3114,33 @@ static const WCHAR *get_osarchitecture(void) { SYSTEM_INFO info; GetNativeSystemInfo( &info ); - if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; - return os_32bitW; + if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return L"64-bit"; + return L"32-bit"; } static void get_processor_caption( WCHAR *caption, UINT len ) { - static const WCHAR fmtW[] = - {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ', - 'M','o','d','e','l',' ','%','u',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; - static const WCHAR x86W[] = {'x','8','6',0}; - static const WCHAR intel64W[] = {'I','n','t','e','l','6','4',0}; - static const WCHAR amd64W[] = {'A','M','D','6','4',0}; - static const WCHAR authenticamdW[] = {'A','u','t','h','e','n','t','i','c','A','M','D',0}; const WCHAR *arch; WCHAR manufacturer[13]; unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); - if (get_osarchitecture() == os_32bitW) arch = x86W; - else if (!wcscmp( manufacturer, authenticamdW )) arch = amd64W; - else arch = intel64W; + if (!wcscmp( get_osarchitecture(), L"32-bit" )) arch = L"x86"; + else if (!wcscmp( manufacturer, L"AuthenticAMD" )) arch = L"AMD64"; + else arch = L"Intel64"; do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, &family ); - swprintf( caption, len, fmtW, arch, family, model, stepping ); + swprintf( caption, len, L"%s Family %u Model %u Stepping %u", arch, family, model, stepping ); } static void get_processor_version( WCHAR *version, UINT len ) { - static const WCHAR fmtW[] = - {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; unsigned int regs[4] = {0, 0, 0, 0}, model, stepping; do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, NULL ); - swprintf( version, len, fmtW, model, stepping ); + swprintf( version, len, L"Model %u Stepping %u", model, stepping ); } static UINT16 get_processor_revision(void) { @@ -3738,11 +3150,10 @@ static UINT16 get_processor_revision(void) } static void get_processor_id( WCHAR *processor_id, UINT len ) { - static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; unsigned int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); - swprintf( processor_id, len, fmtW, regs[3], regs[0] ); + swprintf( processor_id, len, L"%08X%08X", regs[3], regs[0] ); } static void get_processor_name( WCHAR *name ) { @@ -3792,7 +3203,6 @@ static UINT get_processor_maxclockspeed( UINT index ) static enum fill_status fill_processor( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR caption[100], device_id[14], processor_id[17], manufacturer[13], name[49] = {0}, version[50]; struct record_processor *rec; UINT i, offset = 0, num_rows = 0, num_logical, num_physical, num_packages; @@ -3811,14 +3221,14 @@ static enum fill_status fill_processor( struct table *table, const struct expr * for (i = 0; i < num_packages; i++) { rec = (struct record_processor *)(table->data + offset); - rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; - rec->architecture = get_osarchitecture() == os_32bitW ? 0 : 9; + rec->addresswidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; + rec->architecture = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 0 : 9; rec->caption = heap_strdupW( caption ); rec->cpu_status = 1; /* CPU Enabled */ rec->currentclockspeed = get_processor_currentclockspeed( i ); - rec->datawidth = get_osarchitecture() == os_32bitW ? 32 : 64; + rec->datawidth = !wcscmp( get_osarchitecture(), L"32-bit" ) ? 32 : 64; rec->description = heap_strdupW( caption ); - swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, i ); + swprintf( device_id, ARRAY_SIZE( device_id ), L"CPU%u", i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ rec->level = 15; @@ -3848,9 +3258,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static WCHAR *get_lastbootuptime(void) { - static const WCHAR fmtW[] = - {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', - '.','%','0','6','u','+','0','0','0',0}; SYSTEM_TIMEOFDAY_INFORMATION ti; TIME_FIELDS tf; WCHAR *ret; @@ -3859,14 +3266,12 @@ static WCHAR *get_lastbootuptime(void) NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); RtlTimeToTimeFields( &ti.liKeBootTime, &tf ); - swprintf( ret, 26, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); + swprintf( ret, 26, L"%04u%02u%02u%02u%02u%02u.%06u+000", tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, + tf.Second, tf.Milliseconds * 1000 ); return ret; } static WCHAR *get_localdatetime(void) { - static const WCHAR fmtW[] = - {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', - '.','%','0','6','u','%','+','0','3','d',0}; TIME_ZONE_INFORMATION tzi; SYSTEMTIME st; WCHAR *ret; @@ -3884,7 +3289,8 @@ static WCHAR *get_localdatetime(void) if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; GetLocalTime(&st); - swprintf( ret, 26, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias ); + swprintf( ret, 26, L"%04u%02u%02u%02u%02u%02u.%06u%+03d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, + st.wSecond, st.wMilliseconds * 1000, -Bias ); return ret; } static WCHAR *get_systemdirectory(void) @@ -3901,15 +3307,14 @@ static WCHAR *get_systemdirectory(void) static WCHAR *get_systemdrive(void) { WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ - if (ret && GetEnvironmentVariableW( prop_systemdriveW, ret, 3 )) return ret; + if (ret && GetEnvironmentVariableW( L"SystemDrive", ret, 3 )) return ret; heap_free( ret ); return NULL; } static WCHAR *get_codeset(void) { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); - if (ret) swprintf( ret, 11, fmtW, GetACP() ); + if (ret) swprintf( ret, 11, L"%u", GetACP() ); return ret; } static WCHAR *get_countrycode(void) @@ -3926,38 +3331,25 @@ static WCHAR *get_locale(void) } static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { - static const WCHAR fmtW[] = {'%','u',0}; WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); - if (ret) swprintf( ret, 11, fmtW, ver->dwBuildNumber ); + if (ret) swprintf( ret, 11, L"%u", ver->dwBuildNumber ); return ret; } static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) { - static const WCHAR windowsW[] = - {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' '}; - static const WCHAR win2000W[] = - {'2','0','0','0',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; - static const WCHAR win2003W[] = - {'S','e','r','v','e','r',' ','2','0','0','3',' ','S','t','a','n','d','a','r','d',' ','E','d','i','t','i','o','n',0}; - static const WCHAR winxpW[] = - {'X','P',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; - static const WCHAR winxp64W[] = - {'X','P',' ','P','r','o','f','e','s','s','i','o','n','a','l',' ','x','6','4',' ','E','d','i','t','i','o','n',0}; - static const WCHAR vistaW[] = - {'V','i','s','t','a',' ','U','l','t','i','m','a','t','e',0}; - static const WCHAR win2008W[] = - {'S','e','r','v','e','r',' ','2','0','0','8',' ','S','t','a','n','d','a','r','d',0}; - static const WCHAR win7W[] = - {'7',' ','P','r','o','f','e','s','s','i','o','n','a','l',0}; - static const WCHAR win2008r2W[] = - {'S','e','r','v','e','r',' ','2','0','0','8',' ','R','2',' ','S','t','a','n','d','a','r','d',0}; - static const WCHAR win8W[] = - {'8',' ','P','r','o',0}; - static const WCHAR win81W[] = - {'8','.','1',' ','P','r','o',0}; - static const WCHAR win10W[] = - {'1','0',' ','P','r','o',0}; - int len = ARRAY_SIZE( windowsW ); + static const WCHAR windowsW[] = L"Microsoft Windows "; + static const WCHAR win2000W[] = L"2000 Professional"; + static const WCHAR win2003W[] = L"Server 2003 Standard Edition"; + static const WCHAR winxpW[] = L"XP Professional"; + static const WCHAR winxp64W[] = L"XP Professional x64 Edition"; + static const WCHAR vistaW[] = L"Vista Ultimate"; + static const WCHAR win2008W[] = L"Server 2008 Standard"; + static const WCHAR win7W[] = L"7 Professional"; + static const WCHAR win2008r2W[] = L"Server 2008 R2 Standard"; + static const WCHAR win8W[] = L"8 Pro"; + static const WCHAR win81W[] = L"8.1 Pro"; + static const WCHAR win10W[] = L"10 Pro"; + int len = ARRAY_SIZE( windowsW ) - 1; WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; @@ -3986,9 +3378,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) } static WCHAR *get_osname( const WCHAR *caption ) { - static const WCHAR partitionW[] = - {'|','C',':','\\','W','I','N','D','O','W','S','|','\\','D','e','v','i','c','e','\\', - 'H','a','r','d','d','i','s','k','0','\\','P','a','r','t','i','t','i','o','n','1',0}; + static const WCHAR partitionW[] = L"|C:\\WINDOWS|\\Device\\Harddisk0\\Partition1"; int len = lstrlenW( caption ); WCHAR *ret; @@ -3999,9 +3389,8 @@ static WCHAR *get_osname( const WCHAR *caption ) } static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { - static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u',0}; WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); - if (ret) swprintf( ret, 33, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); + if (ret) swprintf( ret, 33, L"%u.%u.%u", ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } static DWORD get_operatingsystemsku(void) @@ -4021,7 +3410,6 @@ static INT16 get_currenttimezone(void) static enum fill_status fill_operatingsystem( struct table *table, const struct expr *cond ) { - static const WCHAR wineprojectW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; OSVERSIONINFOEXW ver; @@ -4041,11 +3429,11 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->csname = get_computername(); rec->currenttimezone = get_currenttimezone(); rec->freephysicalmemory = get_available_physical_memory() / 1024; - rec->installdate = os_installdateW; + rec->installdate = L"20140101000000.000000+000"; rec->lastbootuptime = get_lastbootuptime(); rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); - rec->manufacturer = wineprojectW; + rec->manufacturer = L"The Wine Project"; rec->name = get_osname( rec->caption ); rec->operatingsystemsku = get_operatingsystemsku(); rec->osarchitecture = get_osarchitecture(); @@ -4053,7 +3441,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ rec->primary = -1; - rec->serialnumber = os_serialnumberW; + rec->serialnumber = L"12345-OEM-1234567-12345"; rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; rec->suitemask = 272; /* Single User + Terminal */ @@ -4072,65 +3460,38 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct static const WCHAR *get_service_type( DWORD type ) { - static const WCHAR filesystem_driverW[] = - {'F','i','l','e',' ','S','y','s','t','e','m',' ','D','r','i','v','e','r',0}; - static const WCHAR kernel_driverW[] = - {'K','e','r','n','e','l',' ','D','r','i','v','e','r',0}; - static const WCHAR own_processW[] = - {'O','w','n',' ','P','r','o','c','e','s','s',0}; - static const WCHAR share_processW[] = - {'S','h','a','r','e',' ','P','r','o','c','e','s','s',0}; - - if (type & SERVICE_KERNEL_DRIVER) return kernel_driverW; - else if (type & SERVICE_FILE_SYSTEM_DRIVER) return filesystem_driverW; - else if (type & SERVICE_WIN32_OWN_PROCESS) return own_processW; - else if (type & SERVICE_WIN32_SHARE_PROCESS) return share_processW; + if (type & SERVICE_KERNEL_DRIVER) return L"Kernel Driver"; + else if (type & SERVICE_FILE_SYSTEM_DRIVER) return L"File System Driver"; + else if (type & SERVICE_WIN32_OWN_PROCESS) return L"Own Process"; + else if (type & SERVICE_WIN32_SHARE_PROCESS) return L"Share Process"; else ERR("unhandled type 0x%08x\n", type); return NULL; } static const WCHAR *get_service_state( DWORD state ) { - static const WCHAR runningW[] = - {'R','u','n','n','i','n','g',0}; - static const WCHAR start_pendingW[] = - {'S','t','a','r','t',' ','P','e','n','d','i','n','g',0}; - static const WCHAR stop_pendingW[] = - {'S','t','o','p',' ','P','e','n','d','i','n','g',0}; - static const WCHAR stoppedW[] = - {'S','t','o','p','p','e','d',0}; - static const WCHAR unknownW[] = - {'U','n','k','n','o','w','n',0}; - switch (state) { - case SERVICE_STOPPED: return stoppedW; - case SERVICE_START_PENDING: return start_pendingW; - case SERVICE_STOP_PENDING: return stop_pendingW; - case SERVICE_RUNNING: return runningW; + case SERVICE_STOPPED: return L"Stopped"; + case SERVICE_START_PENDING: return L"Start Pending"; + case SERVICE_STOP_PENDING: return L"Stop Pending"; + case SERVICE_RUNNING: return L"Running"; default: ERR("unknown state %u\n", state); - return unknownW; + return L"Unknown"; } } static const WCHAR *get_service_startmode( DWORD mode ) { - static const WCHAR bootW[] = {'B','o','o','t',0}; - static const WCHAR systemW[] = {'S','y','s','t','e','m',0}; - static const WCHAR autoW[] = {'A','u','t','o',0}; - static const WCHAR manualW[] = {'M','a','n','u','a','l',0}; - static const WCHAR disabledW[] = {'D','i','s','a','b','l','e','d',0}; - static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; - switch (mode) { - case SERVICE_BOOT_START: return bootW; - case SERVICE_SYSTEM_START: return systemW; - case SERVICE_AUTO_START: return autoW; - case SERVICE_DEMAND_START: return manualW; - case SERVICE_DISABLED: return disabledW; + case SERVICE_BOOT_START: return L"Boot"; + case SERVICE_SYSTEM_START: return L"System"; + case SERVICE_AUTO_START: return L"Auto"; + case SERVICE_DEMAND_START: return L"Manual"; + case SERVICE_DISABLED: return L"Disabled"; default: ERR("unknown mode 0x%x\n", mode); - return unknownW; + return L"Unknown"; } } static QUERY_SERVICE_CONFIGW *query_service_config( SC_HANDLE manager, const WCHAR *name ) @@ -4262,11 +3623,11 @@ static const WCHAR *find_sid_str( const struct expr *cond ) left = cond->u.expr.left; right = cond->u.expr.right; - if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !wcsicmp( left->u.propval->name, prop_sidW )) + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !wcsicmp( left->u.propval->name, L"SID" )) { ret = right->u.sval; } - else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !wcsicmp( right->u.propval->name, prop_sidW )) + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !wcsicmp( right->u.propval->name, L"SID" )) { ret = left->u.sval; } @@ -4337,7 +3698,7 @@ static WCHAR *get_systemenclosure_string( BYTE id, const char *buf, UINT len ) static WCHAR *get_systemenclosure_manufacturer( const char *buf, UINT len ) { WCHAR *ret = get_systemenclosure_string( 1, buf, len ); - if (!ret) return heap_strdupW( systemenclosure_manufacturerW ); + if (!ret) return heap_strdupW( L"Wine" ); return ret; } @@ -4408,13 +3769,13 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_systemenclosure *)table->data; - rec->caption = systemenclosure_systemenclosureW; + rec->caption = L"System Enclosure"; rec->chassistypes = get_systemenclosure_chassistypes( buf, len ); - rec->description = systemenclosure_systemenclosureW; + rec->description = L"System Enclosure"; rec->lockpresent = get_systemenclosure_lockpresent( buf, len ); rec->manufacturer = get_systemenclosure_manufacturer( buf, len ); - rec->name = systemenclosure_systemenclosureW; - rec->tag = systemenclosure_tagW; + rec->name = L"System Enclosure"; + rec->tag = L"System Enclosure 0"; if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; @@ -4427,10 +3788,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { - static const WCHAR fmtW[] = - {'P','C','I','\\','V','E','N','_','%','0','4','X','&','D','E','V','_','%','0','4','X', - '&','S','U','B','S','Y','S','_','%','0','8','X','&','R','E','V','_','%','0','2','X','\\', - '0','&','D','E','A','D','B','E','E','F','&','0','&','D','E','A','D',0}; + static const WCHAR *fmtW = L"PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\0&DEADBEEF&0&DEAD"; UINT len = sizeof(fmtW) + 2; WCHAR *ret; @@ -4446,32 +3804,23 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) static const WCHAR *get_installeddriver( UINT vendorid ) { - static const WCHAR driver_amdW[] = {'a','t','i','c','f','x','3','2','.','d','l','l',0}; - static const WCHAR driver_intelW[] = {'i','g','d','u','m','d','i','m','3','2','.','d','l','l',0}; - static const WCHAR driver_nvidiaW[] = {'n','v','d','3','d','u','m','.','d','l','l',0}; - static const WCHAR driver_wineW[] = {'w','i','n','e','.','d','l','l',0}; - /* FIXME: wined3d has a better table, but we cannot access this information through dxgi */ - if (vendorid == HW_VENDOR_AMD) - return driver_amdW; - else if (vendorid == HW_VENDOR_NVIDIA) - return driver_nvidiaW; - else if (vendorid == HW_VENDOR_INTEL) - return driver_intelW; - return driver_wineW; + if (vendorid == HW_VENDOR_AMD) return L"aticfx32.dll"; + else if (vendorid == HW_VENDOR_NVIDIA) return L"nvd3dum.dll"; + else if (vendorid == HW_VENDOR_INTEL) return L"igdudim32.dll"; + return L"wine.dll"; } static enum fill_status fill_videocontroller( struct table *table, const struct expr *cond ) { - static const WCHAR fmtW[] = {'%','u',' ','x',' ','%','u',' ','x',' ','%','I','6','4','u',' ','c','o','l','o','r','s',0}; struct record_videocontroller *rec; HRESULT hr; IDXGIFactory *factory = NULL; IDXGIAdapter *adapter = NULL; DXGI_ADAPTER_DESC desc; UINT row = 0, hres = 1024, vres = 768, vidmem = 512 * 1024 * 1024; - const WCHAR *name = videocontroller_deviceidW; + const WCHAR *name = L"VideoController1"; enum fill_status status = FILL_STATUS_UNFILTERED; WCHAR mode[44]; @@ -4493,7 +3842,7 @@ static enum fill_status fill_videocontroller( struct table *table, const struct done: rec = (struct record_videocontroller *)table->data; - rec->adapter_dactype = videocontroller_dactypeW; + rec->adapter_dactype = L"Integrated RAMDAC"; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ rec->config_errorcode = 0; /* no error */ @@ -4504,16 +3853,16 @@ done: rec->current_scanmode = 2; /* Unknown */ rec->current_verticalres = vres; rec->description = heap_strdupW( name ); - rec->device_id = videocontroller_deviceidW; - rec->driverdate = videocontroller_driverdateW; - rec->driverversion = videocontroller_driverversionW; + rec->device_id = L"VideoController1"; + rec->driverdate = L"20170101000000.000000+000"; + rec->driverversion = L"1.0"; rec->installeddriver = get_installeddriver( desc.VendorId ); rec->name = heap_strdupW( name ); rec->pnpdevice_id = get_pnpdeviceid( &desc ); - rec->status = videocontroller_statusW; + rec->status = L"OK"; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ - swprintf( mode, ARRAY_SIZE( mode ), fmtW, hres, vres, (UINT64)1 << rec->current_bitsperpixel ); + swprintf( mode, ARRAY_SIZE( mode ), L"%u x %u x %I64u colors", hres, vres, (UINT64)1 << rec->current_bitsperpixel ); rec->videomodedescription = heap_strdupW( mode ); rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); @@ -4531,44 +3880,44 @@ done: #define D(d) sizeof(d)/sizeof(d[0]), 0, (BYTE *)d static struct table builtin_classes[] = { - { class_associatorsW, C(col_associator), D(data_associator) }, - { class_baseboardW, C(col_baseboard), 0, 0, NULL, fill_baseboard }, - { class_biosW, C(col_bios), 0, 0, NULL, fill_bios }, - { class_cdromdriveW, C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, - { class_compsysW, C(col_compsys), 0, 0, NULL, fill_compsys }, - { class_compsysproductW, C(col_compsysproduct), 0, 0, NULL, fill_compsysproduct }, - { class_datafileW, C(col_datafile), 0, 0, NULL, fill_datafile }, - { class_desktopmonitorW, C(col_desktopmonitor), 0, 0, NULL, fill_desktopmonitor }, - { class_directoryW, C(col_directory), 0, 0, NULL, fill_directory }, - { class_diskdriveW, C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, - { class_diskdrivetodiskpartitionW, C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, - { class_diskpartitionW, C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, - { class_displaycontrollerconfigW, C(col_displaycontrollerconfig), 0, 0, NULL, fill_displaycontrollerconfig }, - { class_ip4routetableW, C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, - { class_logicaldiskW, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, - { class_logicaldisk2W, C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, - { class_logicaldisktopartitionW, C(col_logicaldisktopartition), 0, 0, NULL, fill_logicaldisktopartition }, - { class_networkadapterW, C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, - { class_networkadapterconfigW, C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, - { class_operatingsystemW, C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, - { class_paramsW, C(col_param), D(data_param) }, - { class_physicalmediaW, C(col_physicalmedia), D(data_physicalmedia) }, - { class_physicalmemoryW, C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, - { class_pnpentityW, C(col_pnpentity), 0, 0, NULL, fill_pnpentity }, - { class_printerW, C(col_printer), 0, 0, NULL, fill_printer }, - { class_processW, C(col_process), 0, 0, NULL, fill_process }, - { class_processorW, C(col_processor), 0, 0, NULL, fill_processor }, - { class_processor2W, C(col_processor), 0, 0, NULL, fill_processor }, - { class_qualifiersW, C(col_qualifier), D(data_qualifier) }, - { class_quickfixengineeringW, C(col_quickfixengineering), D(data_quickfixengineering) }, - { class_serviceW, C(col_service), 0, 0, NULL, fill_service }, - { class_sidW, C(col_sid), 0, 0, NULL, fill_sid }, - { class_sounddeviceW, C(col_sounddevice), D(data_sounddevice) }, - { class_stdregprovW, C(col_stdregprov), D(data_stdregprov) }, - { class_systemsecurityW, C(col_systemsecurity), D(data_systemsecurity) }, - { class_systemenclosureW, C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, - { class_videocontrollerW, C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, - { class_winsatW, C(col_winsat), D(data_winsat) }, + { L"__ASSOCIATORS", C(col_associator), D(data_associator) }, + { L"__PARAMETERS", C(col_param), D(data_param) }, + { L"__QUALIFIERS", C(col_qualifier), D(data_qualifier) }, + { L"__SystemSecurity", C(col_systemsecurity), D(data_systemsecurity) }, + { L"CIM_DataFile", C(col_datafile), 0, 0, NULL, fill_datafile }, + { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, + { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, + { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, + { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, + { L"Win32_BaseBoard", C(col_baseboard), 0, 0, NULL, fill_baseboard }, + { L"Win32_CDROMDrive", C(col_cdromdrive), 0, 0, NULL, fill_cdromdrive }, + { L"Win32_ComputerSystem", C(col_compsys), 0, 0, NULL, fill_compsys }, + { L"Win32_ComputerSystemProduct", C(col_compsysproduct), 0, 0, NULL, fill_compsysproduct }, + { L"Win32_DesktopMonitor", C(col_desktopmonitor), 0, 0, NULL, fill_desktopmonitor }, + { L"Win32_Directory", C(col_directory), 0, 0, NULL, fill_directory }, + { L"Win32_DiskDrive", C(col_diskdrive), 0, 0, NULL, fill_diskdrive }, + { L"Win32_DiskDriveToDiskPartition", C(col_diskdrivetodiskpartition), 0, 0, NULL, fill_diskdrivetodiskpartition }, + { L"Win32_DiskPartition", C(col_diskpartition), 0, 0, NULL, fill_diskpartition }, + { L"Win32_DisplayControllerConfiguration", C(col_displaycontrollerconfig), 0, 0, NULL, fill_displaycontrollerconfig }, + { L"Win32_IP4RouteTable", C(col_ip4routetable), 0, 0, NULL, fill_ip4routetable }, + { L"Win32_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, + { L"Win32_LogicalDiskToPartition", C(col_logicaldisktopartition), 0, 0, NULL, fill_logicaldisktopartition }, + { L"Win32_NetworkAdapter", C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, + { L"Win32_NetworkAdapterConfiguration", C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, + { L"Win32_OperatingSystem", C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, + { L"Win32_PhysicalMedia", C(col_physicalmedia), D(data_physicalmedia) }, + { L"Win32_PhysicalMemory", C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, + { L"Win32_PnPEntity", C(col_pnpentity), 0, 0, NULL, fill_pnpentity }, + { L"Win32_Printer", C(col_printer), 0, 0, NULL, fill_printer }, + { L"Win32_Process", C(col_process), 0, 0, NULL, fill_process }, + { L"Win32_Processor", C(col_processor), 0, 0, NULL, fill_processor }, + { L"Win32_QuickFixEngineering", C(col_quickfixengineering), D(data_quickfixengineering) }, + { L"Win32_SID", C(col_sid), 0, 0, NULL, fill_sid }, + { L"Win32_Service", C(col_service), 0, 0, NULL, fill_service }, + { L"Win32_SoundDevice", C(col_sounddevice), D(data_sounddevice) }, + { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, + { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, + { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; #undef C #undef D diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 3ee5771e6b..ba7720b098 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -577,7 +577,6 @@ static HRESULT WINAPI class_object_Clone( static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { - static const WCHAR fmtW[] = {'\n','\t','%','s',' ','=',' ','%','s',';',0}; BSTR value, ret; WCHAR *p; UINT i; @@ -587,7 +586,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - *len += ARRAY_SIZE( fmtW ); + *len += ARRAY_SIZE( L"\n\t%s = %s;" ); *len += lstrlenW( table->columns[i].name ); *len += SysStringLen( value ); SysFreeString( value ); @@ -599,7 +598,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - p += swprintf( p, *len - (p - ret), fmtW, table->columns[i].name, value ); + p += swprintf( p, *len - (p - ret), L"\n\t%s = %s;", table->columns[i].name, value ); SysFreeString( value ); } } @@ -608,19 +607,17 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) static BSTR get_object_text( const struct view *view, UINT index ) { - static const WCHAR fmtW[] = - {'\n','i','n','s','t','a','n','c','e',' ','o','f',' ','%','s','\n','{','%','s','\n','}',';',0}; UINT len, len_body, row = view->result[index]; struct table *table = get_view_table( view, index ); BSTR ret, body; - len = ARRAY_SIZE( fmtW ); + len = ARRAY_SIZE( L"\ninstance of %s\n{%s\n};" ); len += lstrlenW( table->name ); if (!(body = get_body_text( table, row, &len_body ))) return NULL; len += len_body; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - swprintf( ret, len, fmtW, table->name, body ); + swprintf( ret, len, L"\ninstance of %s\n{%s\n};", table->name, body ); SysFreeString( body ); return ret; } @@ -729,9 +726,6 @@ static void set_default_value( CIMTYPE type, UINT val, BYTE *ptr ) static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UINT *num_cols, struct column **cols, BYTE **data ) { - static const WCHAR parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; - static const WCHAR typeW[] = {'T','y','p','e',0}; - static const WCHAR defaultvalueW[] = {'D','e','f','a','u','l','t','V','a','l','u','e',0}; struct column *columns; BYTE *row; IWbemClassObject *param; @@ -750,16 +744,16 @@ static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UI IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &param, &count ); if (!count) break; - hr = IWbemClassObject_Get( param, parameterW, 0, &val, NULL, NULL ); + hr = IWbemClassObject_Get( param, L"Parameter", 0, &val, NULL, NULL ); if (hr != S_OK) goto error; columns[i].name = heap_strdupW( V_BSTR( &val ) ); VariantClear( &val ); - hr = IWbemClassObject_Get( param, typeW, 0, &val, NULL, NULL ); + hr = IWbemClassObject_Get( param, L"Type", 0, &val, NULL, NULL ); if (hr != S_OK) goto error; columns[i].type = V_UI4( &val ); - hr = IWbemClassObject_Get( param, defaultvalueW, 0, &val, NULL, NULL ); + hr = IWbemClassObject_Get( param, L"DefaultValue", 0, &val, NULL, NULL ); if (hr != S_OK) goto error; if (V_UI4( &val )) set_default_value( columns[i].type, V_UI4( &val ), row + offset ); offset += get_type_size( columns[i].type ); @@ -802,36 +796,26 @@ static HRESULT create_signature_table( IEnumWbemClassObject *iter, WCHAR *name ) static WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *method, enum param_direction dir ) { - static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; - static const WCHAR outW[] = {'O','U','T',0}; - static const WCHAR inW[] = {'I','N',0}; - UINT len = ARRAY_SIZE(fmtW) + ARRAY_SIZE(outW) + lstrlenW( class ) + lstrlenW( method ); + UINT len = ARRAY_SIZE(L"__%s_%s_%s") + ARRAY_SIZE(L"OUT") + lstrlenW( class ) + lstrlenW( method ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - swprintf( ret, len, fmtW, class, method, dir == PARAM_IN ? inW : outW ); + swprintf( ret, len, L"__%s_%s_%s", class, method, dir == PARAM_IN ? L"IN" : L"OUT" ); return wcsupr( ret ); } HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_direction dir, IWbemClassObject **sig ) { - static const WCHAR selectW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '_','_','P','A','R','A','M','E','T','E','R','S',' ','W','H','E','R','E',' ', - 'C','l','a','s','s','=','\'','%','s','\'',' ','A','N','D',' ', - 'M','e','t','h','o','d','=','\'','%','s','\'',' ','A','N','D',' ', - 'D','i','r','e','c','t','i','o','n','%','s',0}; - static const WCHAR geW[] = {'>','=','0',0}; - static const WCHAR leW[] = {'<','=','0',0}; - UINT len = ARRAY_SIZE(selectW) + ARRAY_SIZE(geW); + static const WCHAR selectW[] = L"SELECT * FROM __PARAMETERS WHERE Class='%s' AND Method='%s' AND Direction%s"; + UINT len = ARRAY_SIZE(selectW) + ARRAY_SIZE(L">=0"); IEnumWbemClassObject *iter; WCHAR *query, *name; HRESULT hr; len += lstrlenW( class ) + lstrlenW( method ); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - swprintf( query, len, selectW, class, method, dir >= 0 ? geW : leW ); + swprintf( query, len, selectW, class, method, dir >= 0 ? L">=0" : L"<=0" ); hr = exec_query( query, &iter ); heap_free( query ); diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index de9b03f708..0ee81e8b52 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -70,7 +70,7 @@ HRESULT process_get_owner( IWbemClassObject *obj, IWbemClassObject *in, IWbemCla TRACE("%p, %p, %p\n", obj, in, out); - hr = create_signature( class_processW, method_getownerW, PARAM_OUT, &sig ); + hr = create_signature( L"Win32_Process", L"GetOwner", PARAM_OUT, &sig ); if (hr != S_OK) return hr; if (out) @@ -90,12 +90,12 @@ HRESULT process_get_owner( IWbemClassObject *obj, IWbemClassObject *in, IWbemCla { if (!V_UI4( &retval )) { - hr = IWbemClassObject_Put( out_params, param_userW, 0, &user, CIM_STRING ); + hr = IWbemClassObject_Put( out_params, L"User", 0, &user, CIM_STRING ); if (hr != S_OK) goto done; - hr = IWbemClassObject_Put( out_params, param_domainW, 0, &domain, CIM_STRING ); + hr = IWbemClassObject_Put( out_params, L"Domain", 0, &domain, CIM_STRING ); if (hr != S_OK) goto done; } - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); } done: diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index d29abd3f38..1cc4087ff3 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -92,19 +92,9 @@ static HRESULT WINAPI qualifier_set_QueryInterface( static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, const WCHAR *name, IEnumWbemClassObject **iter ) { - static const WCHAR fmtW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','Q','U','A','L', - 'I','F','I','E','R','S',' ','W','H','E','R','E',' ','C','l','a','s','s','=', - '\'','%','s','\'',' ','A','N','D',' ','M','e','m','b','e','r','=','\'','%','s','\'',' ', - 'A','N','D',' ','N','a','m','e','=','\'','%','s','\'',0}; - static const WCHAR fmt2W[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','Q','U','A','L', - 'I','F','I','E','R','S',' ','W','H','E','R','E',' ','C','l','a','s','s','=', - '\'','%','s','\'',' ','A','N','D',' ','M','e','m','b','e','r','=','\'','%','s','\'',0}; - static const WCHAR fmt3W[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','Q','U','A','L', - 'I','F','I','E','R','S',' ','W','H','E','R','E',' ','C','l','a','s','s','=', - '\'','%','s','\'',0}; + static const WCHAR fmtW[] = L"SELECT * FROM __QUALIFIERS WHERE Class='%s' AND Member='%s' AND Name='%s'"; + static const WCHAR fmt2W[] = L"SELECT * FROM __QUALIFIERS WHERE Class='%s' AND Member='%s'"; + static const WCHAR fmt3W[] = L"SELECT * FROM __QUALIFIERS WHERE Class='%s'"; WCHAR *query; HRESULT hr; int len; @@ -136,11 +126,6 @@ static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, c static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, const WCHAR *name, VARIANT *val, LONG *flavor ) { - static const WCHAR intvalueW[] = {'I','n','t','e','g','e','r','V','a','l','u','e',0}; - static const WCHAR strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; - static const WCHAR boolvalueW[] = {'B','o','o','l','V','a','l','u','e',0}; - static const WCHAR flavorW[] = {'F','l','a','v','o','r',0}; - static const WCHAR typeW[] = {'T','y','p','e',0}; IEnumWbemClassObject *iter; IWbemClassObject *obj; VARIANT var; @@ -155,22 +140,22 @@ static HRESULT get_qualifier_value( const WCHAR *class, const WCHAR *member, con if (flavor) { - hr = IWbemClassObject_Get( obj, flavorW, 0, &var, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Flavor", 0, &var, NULL, NULL ); if (hr != S_OK) goto done; *flavor = V_I4( &var ); } - hr = IWbemClassObject_Get( obj, typeW, 0, &var, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Type", 0, &var, NULL, NULL ); if (hr != S_OK) goto done; switch (V_UI4( &var )) { case CIM_STRING: - hr = IWbemClassObject_Get( obj, strvalueW, 0, val, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"StringValue", 0, val, NULL, NULL ); break; case CIM_SINT32: - hr = IWbemClassObject_Get( obj, intvalueW, 0, val, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"IntegerValue", 0, val, NULL, NULL ); break; case CIM_BOOLEAN: - hr = IWbemClassObject_Get( obj, boolvalueW, 0, val, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"BoolValue", 0, val, NULL, NULL ); break; default: ERR("unhandled type %u\n", V_UI4( &var )); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f46dcd922f..6ac5ad5b77 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -180,10 +180,8 @@ static inline BOOL is_boolcmp( const struct complex_expr *expr, UINT ltype, UINT static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, UINT rtype, LONGLONG *val ) { - static const WCHAR trueW[] = {'T','r','u','e',0}; - - if (ltype == CIM_STRING) lval = !wcsicmp( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; - else if (rtype == CIM_STRING) rval = !wcsicmp( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; + if (ltype == CIM_STRING) lval = !wcsicmp( (const WCHAR *)(INT_PTR)lval, L"True" ) ? -1 : 0; + else if (rtype == CIM_STRING) rval = !wcsicmp( (const WCHAR *)(INT_PTR)rval, L"True" ) ? -1 : 0; switch (op) { @@ -276,31 +274,26 @@ static UINT resolve_type( UINT left, UINT right ) static const WCHAR *format_int( WCHAR *buf, UINT len, CIMTYPE type, LONGLONG val ) { - static const WCHAR fmt_signedW[] = {'%','d',0}; - static const WCHAR fmt_unsignedW[] = {'%','u',0}; - static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; - static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; - switch (type) { case CIM_SINT8: case CIM_SINT16: case CIM_SINT32: - swprintf( buf, len, fmt_signedW, val ); + swprintf( buf, len, L"%d", val ); return buf; case CIM_UINT8: case CIM_UINT16: case CIM_UINT32: - swprintf( buf, len, fmt_unsignedW, val ); + swprintf( buf, len, L"%u", val ); return buf; case CIM_SINT64: - wsprintfW( buf, fmt_signed64W, val ); + wsprintfW( buf, L"%I64d", val ); return buf; case CIM_UINT64: - wsprintfW( buf, fmt_unsigned64W, val ); + wsprintfW( buf, L"%I64u", val ); return buf; default: @@ -477,9 +470,7 @@ HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, static WCHAR *build_assoc_query( const WCHAR *class, UINT class_len ) { - static const WCHAR fmtW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','_','_','A','S','S','O','C','I','A','T','O','R','S', - ' ','W','H','E','R','E',' ','C','l','a','s','s','=','\'','%','s','\'',0}; + static const WCHAR fmtW[] = L"SELECT * FROM __ASSOCIATORS WHERE Class='%s'"; UINT len = class_len + ARRAY_SIZE(fmtW); WCHAR *ret; @@ -501,9 +492,7 @@ static HRESULT create_assoc_enum( const WCHAR *class, UINT class_len, IEnumWbemC static WCHAR *build_antecedent_query( const WCHAR *assocclass, const WCHAR *dependent ) { - static const WCHAR fmtW[] = - {'S','E','L','E','C','T',' ','A','n','t','e','c','e','d','e','n','t',' ','F','R','O','M',' ','%','s',' ', - 'W','H','E','R','E',' ','D','e','p','e','n','d','e','n','t','=','\'','%','s','\'',0}; + static const WCHAR fmtW[] = L"SELECT Antecedent FROM %s WHERE Dependent='%s'"; UINT len = lstrlenW(assocclass) + lstrlenW(dependent) + ARRAY_SIZE(fmtW); WCHAR *ret; @@ -524,13 +513,11 @@ static BSTR build_servername(void) static BSTR build_namespace(void) { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; - return SysAllocString( cimv2W ); + return SysAllocString( L"ROOT\\CIMV2" ); } static WCHAR *build_canonical_path( const WCHAR *relpath ) { - static const WCHAR fmtW[] = {'\\','\\','%','s','\\','%','s',':',0}; BSTR server, namespace; WCHAR *ret; UINT len, i; @@ -542,10 +529,10 @@ static WCHAR *build_canonical_path( const WCHAR *relpath ) return NULL; } - len = ARRAY_SIZE( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + lstrlenW( relpath ); + len = ARRAY_SIZE( L"\\\\%s\\%s:" ) + SysStringLen( server ) + SysStringLen( namespace ) + lstrlenW( relpath ); if ((ret = heap_alloc( len * sizeof(WCHAR ) ))) { - len = swprintf( ret, len, fmtW, server, namespace ); + len = swprintf( ret, len, L"\\\\%s\\%s:", server, namespace ); for (i = 0; i < lstrlenW( relpath ); i ++) { if (relpath[i] == '\'') ret[len++] = '"'; @@ -561,7 +548,6 @@ static WCHAR *build_canonical_path( const WCHAR *relpath ) static HRESULT get_antecedent( const WCHAR *assocclass, const WCHAR *dependent, BSTR *ret ) { - static const WCHAR antecedentW[] = {'A','n','t','e','c','e','d','e','n','t',0}; WCHAR *fullpath, *str; IEnumWbemClassObject *iter = NULL; IWbemClassObject *obj; @@ -580,7 +566,7 @@ static HRESULT get_antecedent( const WCHAR *assocclass, const WCHAR *dependent, goto done; } - hr = IWbemClassObject_Get( obj, antecedentW, 0, &var, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Antecedent", 0, &var, NULL, NULL ); IWbemClassObject_Release( obj ); if (hr != S_OK) goto done; *ret = V_BSTR( &var ); @@ -642,7 +628,6 @@ done: static HRESULT exec_assoc_view( struct view *view ) { - static const WCHAR assocclassW[] = {'A','s','s','o','c','C','l','a','s','s',0}; IEnumWbemClassObject *iter = NULL; struct path *path; HRESULT hr; @@ -661,7 +646,7 @@ static HRESULT exec_assoc_view( struct view *view ) IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; - if ((hr = IWbemClassObject_Get( obj, assocclassW, 0, &var, NULL, NULL )) != S_OK) + if ((hr = IWbemClassObject_Get( obj, L"AssocClass", 0, &var, NULL, NULL )) != S_OK) { IWbemClassObject_Release( obj ); goto done; @@ -817,7 +802,6 @@ static BOOL is_system_prop( const WCHAR *name ) static BSTR build_proplist( const struct table *table, UINT row, UINT count, UINT *len ) { - static const WCHAR fmtW[] = {'%','s','=','%','s',0}; UINT i, j, offset; BSTR *values, ret = NULL; @@ -830,7 +814,7 @@ static BSTR build_proplist( const struct table *table, UINT row, UINT count, UIN { const WCHAR *name = table->columns[i].name; values[j] = get_value_bstr( table, row, i ); - *len += lstrlenW( fmtW ) + lstrlenW( name ) + lstrlenW( values[j] ); + *len += lstrlenW( L"%s=%s" ) + lstrlenW( name ) + lstrlenW( values[j] ); j++; } } @@ -842,7 +826,7 @@ static BSTR build_proplist( const struct table *table, UINT row, UINT count, UIN if (table->columns[i].type & COL_FLAG_KEY) { const WCHAR *name = table->columns[i].name; - offset += swprintf( ret + offset, *len - offset, fmtW, name, values[j] ); + offset += swprintf( ret + offset, *len - offset, L"%s=%s", name, values[j] ); if (j < count - 1) ret[offset++] = ','; j++; } @@ -866,7 +850,6 @@ static UINT count_key_columns( const struct table *table ) static BSTR build_relpath( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name ) { - static const WCHAR fmtW[] = {'%','s','.','%','s',0}; BSTR class, proplist, ret = NULL; struct table *table = view->table[table_index]; UINT row = view->result[result_index]; @@ -878,9 +861,9 @@ static BSTR build_relpath( const struct view *view, UINT table_index, UINT resul if (!(num_keys = count_key_columns( table ))) return class; if (!(proplist = build_proplist( table, row, num_keys, &len ))) goto done; - len += lstrlenW( fmtW ) + SysStringLen( class ); + len += lstrlenW( L"%s.%s" ) + SysStringLen( class ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; - swprintf( ret, len, fmtW, class, proplist ); + swprintf( ret, len, L"%s.%s", class, proplist ); done: SysFreeString( class ); @@ -890,7 +873,6 @@ done: static BSTR build_path( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name ) { - static const WCHAR fmtW[] = {'\\','\\','%','s','\\','%','s',':','%','s',0}; BSTR server, namespace = NULL, relpath = NULL, ret = NULL; UINT len; @@ -900,9 +882,9 @@ static BSTR build_path( const struct view *view, UINT table_index, UINT result_i if (!(namespace = build_namespace())) goto done; if (!(relpath = build_relpath( view, table_index, result_index, name ))) goto done; - len = lstrlenW( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); + len = lstrlenW( L"\\\\%s\\%s:%s" ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; - swprintf( ret, len, fmtW, server, namespace, relpath ); + swprintf( ret, len, L"\\\\%s\\%s:%s", server, namespace, relpath ); done: SysFreeString( server ); @@ -942,17 +924,9 @@ static UINT count_result_properties( const struct view *view, UINT table_index ) static HRESULT get_system_propval( const struct view *view, UINT table_index, UINT result_index, const WCHAR *name, VARIANT *ret, CIMTYPE *type, LONG *flavor ) { - static const WCHAR classW[] = {'_','_','C','L','A','S','S',0}; - static const WCHAR genusW[] = {'_','_','G','E','N','U','S',0}; - static const WCHAR pathW[] = {'_','_','P','A','T','H',0}; - static const WCHAR namespaceW[] = {'_','_','N','A','M','E','S','P','A','C','E',0}; - static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; - static const WCHAR relpathW[] = {'_','_','R','E','L','P','A','T','H',0}; - static const WCHAR serverW[] = {'_','_','S','E','R','V','E','R',0}; - if (flavor) *flavor = WBEM_FLAVOR_ORIGIN_SYSTEM; - if (!wcsicmp( name, classW )) + if (!wcsicmp( name, L"__CLASS" )) { if (ret) { @@ -962,7 +936,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } - if (!wcsicmp( name, genusW )) + if (!wcsicmp( name, L"__GENUS" )) { if (ret) { @@ -972,7 +946,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, namespaceW )) + else if (!wcsicmp( name, L"__NAMESPACE" )) { if (ret) { @@ -982,7 +956,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, pathW )) + else if (!wcsicmp( name, L"__PATH" )) { if (ret) { @@ -992,7 +966,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } - if (!wcsicmp( name, propcountW )) + if (!wcsicmp( name, L"__PROPERTY_COUNT" )) { if (ret) { @@ -1002,7 +976,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, relpathW )) + else if (!wcsicmp( name, L"__RELPATH" )) { if (ret) { @@ -1012,7 +986,7 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, serverW )) + else if (!wcsicmp( name, L"__SERVER" )) { if (ret) { diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 64e94f6e1f..ec5a819142 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -100,12 +100,12 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassO TRACE("%p, %p\n", in, out); - hr = IWbemClassObject_Get( in, param_defkeyW, 0, &defkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = IWbemClassObject_Get( in, param_subkeynameW, 0, &subkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_stdregprovW, method_createkeyW, PARAM_OUT, &sig ); + hr = create_signature( L"StdRegProv", L"CreateKey", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &subkey ); @@ -123,7 +123,7 @@ HRESULT reg_create_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassO } hr = create_key( (HKEY)(INT_PTR)V_I4(&defkey), V_BSTR(&subkey), &retval ); if (hr == S_OK && out_params) - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); VariantClear( &subkey ); IWbemClassObject_Release( sig ); @@ -199,12 +199,12 @@ HRESULT reg_enum_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObj TRACE("%p, %p\n", in, out); - hr = IWbemClassObject_Get( in, param_defkeyW, 0, &defkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = IWbemClassObject_Get( in, param_subkeynameW, 0, &subkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_stdregprovW, method_enumkeyW, PARAM_OUT, &sig ); + hr = create_signature( L"StdRegProv", L"EnumKey", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &subkey ); @@ -227,10 +227,10 @@ HRESULT reg_enum_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObj { if (!V_UI4( &retval )) { - hr = IWbemClassObject_Put( out_params, param_namesW, 0, &names, CIM_STRING|CIM_FLAG_ARRAY ); + hr = IWbemClassObject_Put( out_params, L"sNames", 0, &names, CIM_STRING|CIM_FLAG_ARRAY ); if (hr != S_OK) goto done; } - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); } done: @@ -309,12 +309,12 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass TRACE("%p, %p\n", in, out); - hr = IWbemClassObject_Get( in, param_defkeyW, 0, &defkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = IWbemClassObject_Get( in, param_subkeynameW, 0, &subkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_stdregprovW, method_enumvaluesW, PARAM_OUT, &sig ); + hr = create_signature( L"StdRegProv", L"EnumValues", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &subkey ); @@ -338,12 +338,12 @@ HRESULT reg_enum_values( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass { if (!V_UI4( &retval )) { - hr = IWbemClassObject_Put( out_params, param_namesW, 0, &names, CIM_STRING|CIM_FLAG_ARRAY ); + hr = IWbemClassObject_Put( out_params, L"sNames", 0, &names, CIM_STRING|CIM_FLAG_ARRAY ); if (hr != S_OK) goto done; - hr = IWbemClassObject_Put( out_params, param_typesW, 0, &types, CIM_SINT32|CIM_FLAG_ARRAY ); + hr = IWbemClassObject_Put( out_params, L"Types", 0, &types, CIM_SINT32|CIM_FLAG_ARRAY ); if (hr != S_OK) goto done; } - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); } done: @@ -392,14 +392,14 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemC TRACE("%p, %p\n", in, out); - hr = IWbemClassObject_Get( in, param_defkeyW, 0, &defkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"hDefKey", 0, &defkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = IWbemClassObject_Get( in, param_subkeynameW, 0, &subkey, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"sSubKeyName", 0, &subkey, NULL, NULL ); if (hr != S_OK) return hr; - hr = IWbemClassObject_Get( in, param_valuenameW, 0, &name, NULL, NULL ); + hr = IWbemClassObject_Get( in, L"sValueName", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_stdregprovW, method_getstringvalueW, PARAM_OUT, &sig ); + hr = create_signature( L"StdRegProv", L"GetStringValue", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &name ); @@ -424,10 +424,10 @@ HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemC { if (!V_UI4( &retval )) { - hr = IWbemClassObject_Put( out_params, param_valueW, 0, &value, CIM_STRING ); + hr = IWbemClassObject_Put( out_params, L"sValue", 0, &value, CIM_STRING ); if (hr != S_OK) goto done; } - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); } done: diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index 3ad7321a60..b8c5d90e30 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -119,9 +119,10 @@ static HRESULT get_sd( SECURITY_DESCRIPTOR **sd, DWORD *size ) if (SUCCEEDED(hr)) { - if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) { + if (!MakeSelfRelativeSD(&absolute_sd, *sd, size)) + { HeapFree( GetProcessHeap(), 0, *sd ); - *sd = NULL; + *sd = NULL; hr = E_FAIL; } } @@ -139,7 +140,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass TRACE("%p, %p\n", in, out); - hr = create_signature( class_systemsecurityW, method_getsdW, PARAM_OUT, &sig ); + hr = create_signature( L"__SystemSecurity", L"GetSD", PARAM_OUT, &sig ); if (SUCCEEDED(hr)) { @@ -159,7 +160,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass hr = to_byte_array( sd, sd_size, &var_sd ); if (SUCCEEDED(hr)) - hr = IWbemClassObject_Put( out_params, param_sdW, 0, &var_sd, CIM_UINT8|CIM_FLAG_ARRAY ); + hr = IWbemClassObject_Put( out_params, L"SD", 0, &var_sd, CIM_UINT8|CIM_FLAG_ARRAY ); HeapFree( GetProcessHeap(), 0, sd ); VariantClear( &var_sd ); @@ -168,7 +169,7 @@ HRESULT security_get_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass if (SUCCEEDED(hr)) { set_variant( VT_UI4, ret, NULL, &retval ); - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); } if (SUCCEEDED(hr) && out) @@ -192,7 +193,7 @@ HRESULT security_set_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass FIXME("stub\n"); - hr = create_signature( class_systemsecurityW, method_setsdW, PARAM_OUT, &sig ); + hr = create_signature( L"__SystemSecurity", L"SetSD", PARAM_OUT, &sig ); if (SUCCEEDED(hr)) { @@ -204,7 +205,7 @@ HRESULT security_set_sd( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass if (SUCCEEDED(hr)) { set_variant( VT_UI4, S_OK, NULL, &retval ); - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); if (SUCCEEDED(hr) && out) { diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index 53010bc100..56bc2c5016 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -84,10 +84,10 @@ HRESULT service_pause_service( IWbemClassObject *obj, IWbemClassObject *in, IWbe TRACE("%p, %p, %p\n", obj, in, out); - hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_serviceW, method_pauseserviceW, PARAM_OUT, &sig ); + hr = create_signature( L"Win32_Service", L"PauseService", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &name ); @@ -107,7 +107,7 @@ HRESULT service_pause_service( IWbemClassObject *obj, IWbemClassObject *in, IWbe if (hr != S_OK) goto done; if (out_params) - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); done: VariantClear( &name ); @@ -129,10 +129,10 @@ HRESULT service_resume_service( IWbemClassObject *obj, IWbemClassObject *in, IWb TRACE("%p, %p, %p\n", obj, in, out); - hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_serviceW, method_resumeserviceW, PARAM_OUT, &sig ); + hr = create_signature( L"Win32_Service", L"ResumeService", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &name ); @@ -152,7 +152,7 @@ HRESULT service_resume_service( IWbemClassObject *obj, IWbemClassObject *in, IWb if (hr != S_OK) goto done; if (out_params) - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); done: VariantClear( &name ); @@ -198,10 +198,10 @@ HRESULT service_start_service( IWbemClassObject *obj, IWbemClassObject *in, IWbe TRACE("%p, %p, %p\n", obj, in, out); - hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_serviceW, method_startserviceW, PARAM_OUT, &sig ); + hr = create_signature( L"Win32_Service", L"StartService", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &name ); @@ -221,7 +221,7 @@ HRESULT service_start_service( IWbemClassObject *obj, IWbemClassObject *in, IWbe if (hr != S_OK) goto done; if (out_params) - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); done: VariantClear( &name ); @@ -243,10 +243,10 @@ HRESULT service_stop_service( IWbemClassObject *obj, IWbemClassObject *in, IWbem TRACE("%p, %p, %p\n", obj, in, out); - hr = IWbemClassObject_Get( obj, prop_nameW, 0, &name, NULL, NULL ); + hr = IWbemClassObject_Get( obj, L"Name", 0, &name, NULL, NULL ); if (hr != S_OK) return hr; - hr = create_signature( class_serviceW, method_stopserviceW, PARAM_OUT, &sig ); + hr = create_signature( L"Win32_Service", L"StopService", PARAM_OUT, &sig ); if (hr != S_OK) { VariantClear( &name ); @@ -266,7 +266,7 @@ HRESULT service_stop_service( IWbemClassObject *obj, IWbemClassObject *in, IWbem if (hr != S_OK) goto done; if (out_params) - hr = IWbemClassObject_Put( out_params, param_returnvalueW, 0, &retval, CIM_UINT32 ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); done: VariantClear( &name ); diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 5909c02e61..e2b452e217 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -103,9 +103,8 @@ static HRESULT WINAPI client_security_SetBlanket( void *pAuthInfo, DWORD Capabilities ) { - static const OLECHAR defaultW[] = - {'<','C','O','L','E','_','D','E','F','A','U','L','T','_','P','R','I','N','C','I','P','A','L','>',0}; - const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ? defaultW : pServerPrincName; + const OLECHAR *princname = (pServerPrincName == COLE_DEFAULT_PRINCIPAL) ? + L"<COLE_DEFAULT_PRINCIPAL>" : pServerPrincName; FIXME("%p, %p, %u, %u, %s, %u, %u, %p, 0x%08x\n", iface, pProxy, AuthnSvc, AuthzSvc, debugstr_w(princname), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); @@ -270,17 +269,15 @@ static HRESULT WINAPI wbem_services_OpenNamespace( IWbemServices **ppWorkingNamespace, IWbemCallResult **ppResult ) { - static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; - static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; struct wbem_services *ws = impl_from_IWbemServices( iface ); TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, pCtx, ppWorkingNamespace, ppResult); - if ((wcsicmp( strNamespace, cimv2W ) && wcsicmp( strNamespace, defaultW )) || ws->namespace) + if ((wcsicmp( strNamespace, L"cimv2" ) && wcsicmp( strNamespace, L"default" )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; - return WbemServices_create( cimv2W, (void **)ppWorkingNamespace ); + return WbemServices_create( L"cimv2", (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -330,7 +327,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) if (*p == '\\') { - static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; + static const WCHAR cimv2W[] = L"ROOT\\CIMV2"; WCHAR server[MAX_COMPUTERNAME_LENGTH+1]; DWORD server_len = ARRAY_SIZE(server); @@ -417,11 +414,8 @@ void free_path( struct path *path ) WCHAR *query_from_path( const struct path *path ) { - static const WCHAR selectW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','%','s',' ', - 'W','H','E','R','E',' ','%','s',0}; - static const WCHAR select_allW[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + static const WCHAR selectW[] = L"SELECT * FROM %s WHERE %s"; + static const WCHAR select_allW[] = L"SELECT * FROM "; WCHAR *query; UINT len; @@ -654,13 +648,11 @@ static HRESULT WINAPI wbem_services_ExecQuery( IWbemContext *pCtx, IEnumWbemClassObject **ppEnum ) { - static const WCHAR wqlW[] = {'W','Q','L',0}; - TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), lFlags, pCtx, ppEnum); if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; - if (wcsicmp( strQueryLanguage, wqlW )) return WBEM_E_INVALID_QUERY_TYPE; + if (wcsicmp( strQueryLanguage, L"WQL" )) return WBEM_E_INVALID_QUERY_TYPE; return exec_query( strQuery, ppEnum ); } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 7d531f5ec5..42971a420e 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -154,13 +154,6 @@ HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *v BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { - static const WCHAR fmt_signedW[] = {'%','d',0}; - static const WCHAR fmt_unsignedW[] = {'%','u',0}; - static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; - static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; - static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; - static const WCHAR trueW[] = {'T','R','U','E',0}; - static const WCHAR falseW[] = {'F','A','L','S','E',0}; LONGLONG val; BSTR ret; WCHAR number[22]; @@ -176,8 +169,8 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_BOOLEAN: - if (val) return SysAllocString( trueW ); - else return SysAllocString( falseW ); + if (val) return SysAllocString( L"TRUE" ); + else return SysAllocString( L"FALSE" ); case CIM_DATETIME: case CIM_REFERENCE: @@ -185,25 +178,25 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) if (!val) return NULL; len = lstrlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - swprintf( ret, len, fmt_strW, (const WCHAR *)(INT_PTR)val ); + swprintf( ret, len, L"\"%s\"", (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16: case CIM_SINT32: - swprintf( number, ARRAY_SIZE( number ), fmt_signedW, val ); + swprintf( number, ARRAY_SIZE( number ), L"%d", val ); return SysAllocString( number ); case CIM_UINT16: case CIM_UINT32: - swprintf( number, ARRAY_SIZE( number ), fmt_unsignedW, val ); + swprintf( number, ARRAY_SIZE( number ), L"%u", val ); return SysAllocString( number ); case CIM_SINT64: - wsprintfW( number, fmt_signed64W, val ); + wsprintfW( number, L"%I64d", val ); return SysAllocString( number ); case CIM_UINT64: - wsprintfW( number, fmt_unsigned64W, val ); + wsprintfW( number, L"%I64u", val ); return SysAllocString( number ); default: diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 18c37275ed..9b6f2cbc74 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -86,21 +86,16 @@ static HRESULT WINAPI wbem_locator_QueryInterface( static BOOL is_local_machine( const WCHAR *server ) { - static const WCHAR dotW[] = {'.',0}; - static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !wcscmp( server, dotW ) || !wcsicmp( server, localhostW )) return TRUE; + if (!server || !wcscmp( server, L"." ) || !wcsicmp( server, L"localhost" )) return TRUE; if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; } static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **namespace ) { - static const WCHAR rootW[] = {'R','O','O','T',0}; - static const WCHAR cimv2W[] = {'C','I','M','V','2',0}; - static const WCHAR defaultW[] = {'D','E','F','A','U','L','T',0}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -131,7 +126,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) - 1 && wcsnicmp( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( L"root" ) - 1 && wcsnicmp( L"root", p, len )) goto done; if (!*q) { hr = S_OK; @@ -139,7 +134,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = lstrlenW( q ); - if (wcsicmp( q, cimv2W ) && wcsicmp( q, defaultW )) + if (wcsicmp( q, L"cimv2" ) && wcsicmp( q, L"default" )) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 57ac793a4e..3064925764 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -276,33 +276,3 @@ static inline BOOL is_digit(WCHAR c) { return '0' <= c && c <= '9'; } - -static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; -static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; -static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; -static const WCHAR class_systemsecurityW[] = {'_','_','S','y','s','t','e','m','S','e','c','u','r','i','t','y',0}; - -static const WCHAR prop_nameW[] = {'N','a','m','e',0}; - -static const WCHAR method_createkeyW[] = {'C','r','e','a','t','e','K','e','y',0}; -static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; -static const WCHAR method_enumvaluesW[] = {'E','n','u','m','V','a','l','u','e','s',0}; -static const WCHAR method_getownerW[] = {'G','e','t','O','w','n','e','r',0}; -static const WCHAR method_getsdW[] = {'G','e','t','S','D',0}; -static const WCHAR method_getstringvalueW[] = {'G','e','t','S','t','r','i','n','g','V','a','l','u','e',0}; -static const WCHAR method_pauseserviceW[] = {'P','a','u','s','e','S','e','r','v','i','c','e',0}; -static const WCHAR method_resumeserviceW[] = {'R','e','s','u','m','e','S','e','r','v','i','c','e',0}; -static const WCHAR method_setsdW[] = {'S','e','t','S','D',0}; -static const WCHAR method_startserviceW[] = {'S','t','a','r','t','S','e','r','v','i','c','e',0}; -static const WCHAR method_stopserviceW[] = {'S','t','o','p','S','e','r','v','i','c','e',0}; - -static const WCHAR param_defkeyW[] = {'h','D','e','f','K','e','y',0}; -static const WCHAR param_domainW[] = {'D','o','m','a','i','n',0}; -static const WCHAR param_namesW[] = {'s','N','a','m','e','s',0}; -static const WCHAR param_returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0}; -static const WCHAR param_sdW[] = {'S','D',0}; -static const WCHAR param_subkeynameW[] = {'s','S','u','b','K','e','y','N','a','m','e',0}; -static const WCHAR param_typesW[] = {'T','y','p','e','s',0}; -static const WCHAR param_userW[] = {'U','s','e','r',0}; -static const WCHAR param_valueW[] = {'s','V','a','l','u','e',0}; -static const WCHAR param_valuenameW[] = {'s','V','a','l','u','e','N','a','m','e',0}; -- 2.20.1

1 0

[PATCH 1/2] winex11.drv: Ignore disconnected outputs when finding mirroring slaves.
by Zhiyi Zhang 20 Apr '20

20 Apr '20

Some graphics drivers keep CRTCs attached to disconnected outputs. This could cause the XRandR 1.4 display device handler to incorrectly mark outputs as mirrored. So enumerate outputs instead of CRTCs when finding mirroring slaves. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48932 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 578b68269e4..bef52128f21 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -769,7 +769,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new XRRScreenResources *screen_resources = NULL; XRRProviderInfo *provider_info = NULL; XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; - XRROutputInfo *output_info = NULL; + XRROutputInfo *enum_output_info, *output_info = NULL; RROutput *outputs; INT crtc_count, output_count; INT primary_adapter = 0; @@ -833,24 +833,34 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!output_info->crtc || !crtc_info->mode) detached = TRUE; - /* Ignore crtc mirroring slaves because mirrored monitors are under the same adapter */ + /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ mirrored = FALSE; if (!detached) { - for (j = 0; j < screen_resources->ncrtc; ++j) + for (j = 0; j < screen_resources->noutput; ++j) { - enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, screen_resources->crtcs[j] ); - if (!enum_crtc_info) - goto done; + enum_output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[j] ); + if (!enum_output_info) + continue; - /* Some crtcs on different providers may have the same coordinates, aka mirrored. - * Choose the crtc with the lowest value as primary and the rest will then be slaves - * in a mirroring set */ + if (enum_output_info->connection != RR_Connected || !enum_output_info->crtc) + { + pXRRFreeOutputInfo( enum_output_info ); + continue; + } + + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, enum_output_info->crtc ); + pXRRFreeOutputInfo( enum_output_info ); + if (!enum_crtc_info) + continue; + + /* Some outputs may have the same coordinates, aka mirrored. Choose the output with + * the lowest value as primary and the rest will then be slaves in a mirroring set */ if (crtc_info->x == enum_crtc_info->x && crtc_info->y == enum_crtc_info->y && crtc_info->width == enum_crtc_info->width && crtc_info->height == enum_crtc_info->height && - output_info->crtc > screen_resources->crtcs[j]) + outputs[i] > screen_resources->outputs[j]) { mirrored = TRUE; pXRRFreeCrtcInfo( enum_crtc_info ); -- 2.20.1

1 0

[PATCH 1/5] ole32: Do not allocate spyed memory array on freeing attempts.
by Nikolay Sivov 20 Apr '20

20 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/ifs.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 1b19be424c..dfced20de2 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -128,22 +128,19 @@ static void** mallocspy_is_allocation_spyed(const void *mem) return current; } -static BOOL RemoveMemoryLocation(LPCVOID pMem) +static BOOL mallocspy_remove_spyed_memory(const void *mem) { - LPVOID * Current; + void **current; - /* allocate the table if not already allocated */ - if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) - return FALSE; + if (!Malloc32.SpyedBlockTableLength) + return FALSE; - if (!(Current = mallocspy_is_allocation_spyed(pMem))) - return FALSE; + if (!(current = mallocspy_is_allocation_spyed(mem))) + return FALSE; - /* location found */ - Malloc32.SpyedAllocationsLeft--; - /*TRACE("%lu\n",Malloc32.SpyedAllocationsLeft);*/ - *Current = NULL; - return TRUE; + Malloc32.SpyedAllocationsLeft--; + *current = NULL; + return TRUE; } /****************************************************************************** @@ -216,7 +213,7 @@ static void * WINAPI IMalloc_fnRealloc(IMalloc *iface, void *pv, SIZE_T cb) BOOL fSpyed; EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); cb = IMallocSpy_PreRealloc(Malloc32.pSpy, pv, cb, &pRealMemory, fSpyed); /* check if can release the spy */ @@ -268,7 +265,7 @@ static void WINAPI IMalloc_fnFree(IMalloc *iface, void *pv) if(Malloc32.pSpy) { EnterCriticalSection(&IMalloc32_SpyCS); - fSpyed = RemoveMemoryLocation(pv); + fSpyed = mallocspy_remove_spyed_memory(pv); pv = IMallocSpy_PreFree(Malloc32.pSpy, pv, fSpyed); } -- 2.25.1

1 4

[PATCH 1/3] msi: Report the real NT version number up to 6.3.
by Zebediah Figura 20 Apr '20

20 Apr '20

MSI always reports 6.3 even without a manifest, but does not report anything higher. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48959 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/package.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5065558827..7b64362b10 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" +#include "winternl.h" #include "shlwapi.h" #include "wingdi.h" #include "msi.h" @@ -668,7 +669,7 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { WCHAR *ptr; - OSVERSIONINFOEXW OSVersion; + RTL_OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len, type; WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; @@ -860,9 +861,14 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_set_property( package->db, szPrivileged, szOne, -1 ); /* set the os things */ - OSVersion.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); - GetVersionExW((OSVERSIONINFOW *)&OSVersion); + OSVersion.dwOSVersionInfoSize = sizeof(OSVersion); + RtlGetVersion(&OSVersion); verval = OSVersion.dwMinorVersion + OSVersion.dwMajorVersion * 100; + if (verval > 603) + { + verval = 603; + OSVersion.dwBuildNumber = 9600; + } len = swprintf( verstr, ARRAY_SIZE(verstr), szFormat, verval ); switch (OSVersion.dwPlatformId) { -- 2.26.0

2 3

[PATCH 2/2] wldap32: Set count and result to 0 when returning LDAP_NO_RESULTS_RETURNED.
by Dmitry Timoshkov 20 Apr '20

20 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 2 ++ dlls/wldap32/tests/parse.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 32e7e91fb2..959567c2bf 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -185,6 +185,8 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, if (search->cookie && search->cookie->bv_len == 0) { /* end of paged results */ + *count = 0; + *results = NULL; return WLDAP32_LDAP_NO_RESULTS_RETURNED; } diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 5fc11bd955..284193758b 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -264,9 +264,7 @@ static void test_ldap_paged_search(void) res = (void *)0xdeadbeef; ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); -todo_wine ok( !res, "expected res == NULL\n" ); -todo_wine ok( count == 0, "got %u\n", count ); ldap_search_abandon_page( ld, search ); -- 2.25.2

1 0

[PATCH 1/2] wldap32/tests: Add a test for LDAP paged search.
by Dmitry Timoshkov 20 Apr '20

20 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/tests/parse.c | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 5a49b9c69d..5fc11bd955 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -212,10 +212,72 @@ static void test_ldap_server_control( void ) ldap_unbind( ld ); } +static void test_ldap_paged_search(void) +{ + LDAP *ld; + ULONG ret, count; + int version; + LDAPSearch *search; + LDAPMessage *res, *entry; + BerElement *ber; + WCHAR *attr; + + ld = ldap_initA( (char *)"ldap.forumsys.com", 389 ); + ok( ld != NULL, "ldap_init failed\n" ); + + version = LDAP_VERSION3; + ret = ldap_set_optionW( ld, LDAP_OPT_PROTOCOL_VERSION, &version ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip( "test server can't be reached\n" ); + ldap_unbind( ld ); + return; + } + + search = ldap_search_init_pageW( ld, (WCHAR *)L"", LDAP_SCOPE_BASE, (WCHAR *)L"(objectclass=*)", + NULL, FALSE, NULL, NULL, 0, 0, NULL); + ok( search != NULL, "ldap_search_init_page failed\n" ); + + count = 0xdeadbeef; + res = NULL; + ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); + ok( !ret, "ldap_get_next_page_s failed 0x%x\n", ret ); + ok( res != NULL, "expected res != NULL\n" ); + ok( count == 0, "got %u\n", count ); + + count = ldap_count_entries( ld, res); + ok( count == 1, "got %u\n", count ); + + entry = ldap_first_entry( ld, res); + ok( res != NULL, "expected entry != NULL\n" ); + + attr = ldap_first_attributeW( ld, entry, &ber ); + ok( !wcscmp( attr, L"objectClass" ), "got %s\n", wine_dbgstr_w( attr ) ); + ldap_memfreeW( attr ); + attr = ldap_next_attributeW( ld, entry, ber ); + ok( !attr, "got %s\n", attr ); + + ber_free(ber, 0); + ldap_msgfree( res ); + + count = 0xdeadbeef; + res = (void *)0xdeadbeef; + ret = ldap_get_next_page_s( ld, search, NULL, 1, &count, &res ); + ok( ret == LDAP_NO_RESULTS_RETURNED, "got 0x%x\n", ret ); +todo_wine + ok( !res, "expected res == NULL\n" ); +todo_wine + ok( count == 0, "got %u\n", count ); + + ldap_search_abandon_page( ld, search ); + ldap_unbind( ld ); +} + START_TEST (parse) { LDAP *ld; + test_ldap_paged_search(); test_ldap_server_control(); test_ldap_bind_sA(); -- 2.25.2

1 0

[PATCH v2 1/4] wined3d: Enable multisampling for GPU surface blits.
by Chip Davis 20 Apr '20

20 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Hoist a couple of GL_MULTISAMPLE enables into wined3d_context_gl_apply_blit_state(). --- dlls/wined3d/context_gl.c | 5 +++++ dlls/wined3d/surface.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9dbd0346ff3..fa2f117fe9c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2773,6 +2773,11 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, gl_info->gl_ops.gl.p_glDisable(GL_BLEND); gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); context_invalidate_state(context, STATE_BLEND); + if (gl_info->supported[ARB_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_MULTISAMPLE); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS)); + } gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RASTERIZER); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e965203950e..6ab5bd10325 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -130,6 +130,11 @@ static void texture2d_depth_blt_fbo(const struct wined3d_device *device, struct context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILWRITEMASK)); } + if (gl_info->supported[ARB_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_MULTISAMPLE); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS)); + } gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RASTERIZER); @@ -251,6 +256,11 @@ void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *co gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); context_invalidate_state(context, STATE_BLEND); + if (gl_info->supported[ARB_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_MULTISAMPLE); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS)); + } gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); context_invalidate_state(context, STATE_RASTERIZER); @@ -848,6 +858,12 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(&texture_gl->t)); checkGLcall("glReadBuffer"); + if (gl_info->supported[ARB_MULTISAMPLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_MULTISAMPLE); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS)); + } + level = sub_resource_idx % texture_gl->t.level_count; target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, level, 0, 0, 0, 0, -- 2.24.0

1 3

[PATCH] comctl32/tests: Fix ImageList_DrawIndirect() test failures on winxp.
by Ziqing Hui 20 Apr '20

20 Apr '20

GetDeviceCaps(BITSPIXEL) is always 32 in our test cases. So we can ignore it. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

1 0

[PATCH] adsldp: Fix typos and spelling issues in FIXME() messages.
by Francois Gouget 20 Apr '20

20 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/adsldp/adsldp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c39221ec02c..13bd73c1296 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1150,7 +1150,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_SEARCH_SCOPE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supported dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SEARCH_SCOPE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1224,7 +1224,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_PAGESIZE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_PAGESIZE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_PAGESIZE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1237,7 +1237,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_CACHE_RESULTS: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_CACHE_RESULTS: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_CACHE_RESULTS: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1250,7 +1250,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_ATTRIBTYPES_ONLY: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_ATTRIBTYPES_ONLY: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1263,7 +1263,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_TOMBSTONE: if (prefs[i].vValue.dwType != ADSTYPE_BOOLEAN) { - FIXME("ADS_SEARCHPREF_TOMBSTONE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_TOMBSTONE: unsupported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } -- 2.20.1

1 0

[PATCH v2] amstream: Implement AMAudioStream::SetState.
by Zebediah Figura 19 Apr '20

19 Apr '20

From: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Resent with style changes (avoid "This", trace arguments) dlls/amstream/audiostream.c | 13 ++++++++++--- dlls/amstream/tests/amstream.c | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 1f9aed7338c..4e34b2549eb 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -184,6 +184,7 @@ struct audio_stream IMemAllocator *allocator; AM_MEDIA_TYPE mt; WAVEFORMATEX format; + FILTER_STATE state; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -340,11 +341,17 @@ static HRESULT WINAPI audio_IAMMediaStream_Initialize(IAMMediaStream *iface, IUn static HRESULT WINAPI audio_IAMMediaStream_SetState(IAMMediaStream *iface, FILTER_STATE state) { - struct audio_stream *This = impl_from_IAMMediaStream(iface); + struct audio_stream *stream = impl_from_IAMMediaStream(iface); - FIXME("(%p/%p)->(%u) stub!\n", This, iface, state); + TRACE("stream %p, state %u.\n", stream, state); - return S_FALSE; + EnterCriticalSection(&stream->cs); + + stream->state = state; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAMMediaStream_JoinAMMultiMediaStream(IAMMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 82a833ad6f9..472c6558fc4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2780,6 +2780,40 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostream_set_state(void) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAMMediaStream *am_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAMMediaStream, (void **)&am_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Running); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Paused); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMediaStream_SetState(am_stream, State_Stopped); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAMMediaStream_Release(am_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -2951,6 +2985,7 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); test_audiostream_receive_connection(); + test_audiostream_set_state(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); -- 2.26.0

1 0

[PATCH 2/2] ntdll: Leave critical section before blocking in RtlWaitOnAddress.
by Jacek Caban 19 Apr '20

19 Apr '20

Fixes regression from commit 4f673d5386f44d4af4459a95b3059cfb887db8c9. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 4 ++-- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 9 +++++++-- dlls/ntdll/sync.c | 4 +--- 4 files changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] ntdll: Remove APC handling from RtlWaitOnAddress.
by Jacek Caban 19 Apr '20

19 Apr '20

It uses non-alertable wait anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/server.c | 4 ++-- dlls/ntdll/sync.c | 34 +++++++++++----------------------- 3 files changed, 13 insertions(+), 27 deletions(-)

1 0

[PATCH] ntdll: Improve portability of call_constructor (and port to FreeBSD)
by Gerald Pfeifer 19 Apr '20

19 Apr '20

The new function call_constructors in dlls/ntdll/loader.c introduced via 081c8e1c73bb8d79a060da7816b5c429180b35b7 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 16 12:22:24 2020 +0200 ntdll: Execute .so constructors during module initialization. breaks the build on FreeBSD and presumably others. Specifically, struct link_map *map; : if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; while (map->l_ld->d_tag) : fails to compile: loader.c: In function ‘call_constructors’: loader.c:1329:21: warning: dereferencing ‘void *’ pointer 1329 | while (map->l_ld->d_tag) | ^~ loader.c:1329:21: error: request for member ‘d_tag’ in something not a structure or union This is due to /usr/include/link.h (via /usr/include/sys/link_elf.h) defining link_map.l_ld as a void* as opposed to a more specific type like on Linux: typedef struct link_map { caddr_t l_addr; /* Base Address of library */ #ifdef __mips__ caddr_t l_offs; /* Load Offset of library */ #endif const char *l_name; /* Absolute Path to Library */ const void *l_ld; /* Pointer to .dynamic in memory */ struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ } Link_map; Luckily FreeBSD does feature Elf64_Dyn and Elf32_Dyn which do match their Linux equivalents, so introducing a new variable holding a pointer to one of those and using implicit type conversions with void* addresses this. If further platforms require similar adjustments, this should now be a question of extending one condition or adding two lines. Gerald Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/loader.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c713a5d0a6..e9140145e1 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1324,17 +1324,25 @@ static void call_constructors( WINE_MODREF *wm ) void (*init_func)(int, char **, char **) = NULL; void (**init_array)(int, char **, char **) = NULL; ULONG_PTR i, init_arraysz = 0; +#if defined (__FreeBSD__) && defined (__LP64__) + const Elf64_Dyn *l_ld; +#elif defined (__FreeBSD__) + const Elf32_Dyn *l_ld; +#else + const ElfW(Dyn) *l_ld; +#endif if (dlinfo( wm->so_handle, RTLD_DI_LINKMAP, &map ) == -1) return; - while (map->l_ld->d_tag) + l_ld = map->l_ld; + while (l_ld->d_tag) { - switch (map->l_ld->d_tag) + switch (l_ld->d_tag) { - case 0x60009990: init_array = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; - case 0x60009991: init_arraysz = map->l_ld->d_un.d_val; break; - case 0x60009992: init_func = (void *)((char *)map->l_addr + map->l_ld->d_un.d_val); break; + case 0x60009990: init_array = (void *)((char *)map->l_addr + l_ld->d_un.d_val); break; + case 0x60009991: init_arraysz = l_ld->d_un.d_val; break; + case 0x60009992: init_func = (void *)((char *)map->l_addr + l_ld->d_un.d_val); break; } - map->l_ld++; + l_ld++; } TRACE( "%s: got init_func %p init_array %p %lu\n", debugstr_us( &wm->ldr.BaseDllName ), -- 2.25.0

1 0

[PATCH 3/3] mscoree: Update Wine Mono to 5.0.0.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 12 +++++++++--- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 48a84f39589..c1405d5ec8a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,8 +58,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.9.4" -#define MONO_SHA "51a6ff38323fcda71d70ead90c252b5eaeacec542ba737dbd1d676787b210fdd" +#define MONO_VERSION "5.0.0" +#if defined(__i386__) || defined(__x86_64__) +#define MONO_ARCH "x86" +#define MONO_SHA "17da208645a82a5e45e84fc75c73a8440acda484411cb8fae8e9b72db9886cd5" +#else +#define MONO_ARCH "" +#define MONO_SHA "???" +#endif typedef struct { const char *version; @@ -88,7 +94,7 @@ static const addon_info_t addons_info[] = { }, { MONO_VERSION, - L"wine-mono-" MONO_VERSION ".msi", + L"wine-mono-" MONO_VERSION "-" MONO_ARCH ".msi", L"mono", MONO_SHA, "http://source.winehq.org/winemono.php", diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index f824cc9d5c1..cd032aefc06 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.9.4" +#define WINE_MONO_VERSION "5.0.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.17.1

1 0

[PATCH 2/3] mscoree: Replace uses of mono_domain_assembly_open.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> This function is only intended to be used for the entry point assembly. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 10 ++++++---- dlls/mscoree/metahost.c | 2 -- dlls/mscoree/mscoree_private.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c79c4fd8d11..9f53555ee94 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -206,10 +206,11 @@ static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, } else { - assembly = mono_domain_assembly_open(domain, assemblyname); + MonoImageOpenStatus status; + assembly = mono_assembly_open(assemblyname, &status); if (!assembly) { - ERR("Cannot load assembly %s\n", assemblyname); + ERR("Cannot load assembly %s, status=%i\n", assemblyname, status); return FALSE; } @@ -1819,6 +1820,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) MonoClass *klass; MonoObject *result; MonoDomain *prev_domain; + MonoImageOpenStatus status; IUnknown *unk = NULL; char *filenameA, *ns; char *classA; @@ -1828,11 +1830,11 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) prev_domain = domain_attach(domain); filenameA = WtoA(filename); - assembly = mono_domain_assembly_open(domain, filenameA); + assembly = mono_assembly_open(filenameA, &status); HeapFree(GetProcessHeap(), 0, filenameA); if (!assembly) { - ERR("Cannot open assembly %s\n", filenameA); + ERR("Cannot open assembly %s, status=%i\n", filenameA, status); domain_restore(prev_domain); goto cleanup; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9fa7978340d..9a299662e38 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -93,7 +93,6 @@ MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); static void (CDECL *mono_config_parse)(const char *filename); -MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); MonoDomain* (CDECL *mono_domain_get)(void); MonoDomain* (CDECL *mono_domain_get_by_id)(int id); BOOL (CDECL *mono_domain_set)(MonoDomain *domain,BOOL force); @@ -199,7 +198,6 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_class_from_mono_type); LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); - LOAD_MONO_FUNCTION(mono_domain_assembly_open); LOAD_MONO_FUNCTION(mono_domain_get); LOAD_MONO_FUNCTION(mono_domain_get_by_id); LOAD_MONO_FUNCTION(mono_domain_set); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 8ad95e385eb..f824cc9d5c1 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -157,7 +157,6 @@ extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN; extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN; extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN; -extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get)(void) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get_by_id)(int id) DECLSPEC_HIDDEN; extern BOOL (CDECL *mono_domain_set)(MonoDomain *domain, BOOL force) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH 1/3] mscoree: Use mono_get_corlib to get mscorlib image.
by Esme 19 Apr '20

19 Apr '20

From: Vincent Povirk <vincent(a)codeweavers.com> Apparently, mono_domain_assembly_open is intended for the entry point assembly only, and no longer works when mscorlib is passed in. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 39 ++++++++++++++++++++-------------- dlls/mscoree/metahost.c | 2 ++ dlls/mscoree/mscoree_private.h | 1 + 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 7eb43854940..c79c4fd8d11 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -200,18 +200,25 @@ static BOOL RuntimeHost_GetMethod(MonoDomain *domain, const char *assemblyname, MonoImage *image; MonoClass *klass; - assembly = mono_domain_assembly_open(domain, assemblyname); - if (!assembly) + if (!assemblyname) { - ERR("Cannot load assembly %s\n", assemblyname); - return FALSE; + image = mono_get_corlib(); } - - image = mono_assembly_get_image(assembly); - if (!image) + else { - ERR("Couldn't get assembly image for %s\n", assemblyname); - return FALSE; + assembly = mono_domain_assembly_open(domain, assemblyname); + if (!assembly) + { + ERR("Cannot load assembly %s\n", assemblyname); + return FALSE; + } + + image = mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image for %s\n", assemblyname); + return FALSE; + } } klass = mono_class_from_name(image, namespace, typename); @@ -250,7 +257,7 @@ static HRESULT RuntimeHost_DoInvoke(RuntimeHost *This, MonoDomain *domain, if (methodname != get_hresult) { /* Map the exception to an HRESULT. */ - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Exception", get_hresult, + hr = RuntimeHost_Invoke(This, domain, NULL, "System", "Exception", get_hresult, exc, NULL, 0, &hr_object); if (SUCCEEDED(hr)) hr = *(HRESULT*)mono_object_unbox(hr_object); @@ -348,7 +355,7 @@ static HRESULT RuntimeHost_GetObjectForIUnknown(RuntimeHost *This, MonoDomain *d MonoObject *result; args[0] = &unk; - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetObjectForIUnknown", + hr = RuntimeHost_Invoke(This, domain, NULL, "System.Runtime.InteropServices", "Marshal", "GetObjectForIUnknown", NULL, args, 1, &result); if (SUCCEEDED(hr)) @@ -413,7 +420,7 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, const WCHAR *name, IUnkn args[2] = NULL; } - res = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "CreateDomain", + res = RuntimeHost_Invoke(This, domain, NULL, "System", "AppDomain", "CreateDomain", NULL, args, 3, &new_domain); if (FAILED(res)) @@ -427,7 +434,7 @@ static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, const WCHAR *name, IUnkn * Instead, do a vcall. */ - res = RuntimeHost_VirtualInvoke(This, domain, "mscorlib", "System", "AppDomain", "get_Id", + res = RuntimeHost_VirtualInvoke(This, domain, NULL, "System", "AppDomain", "get_Id", new_domain, NULL, 0, &id); if (FAILED(res)) @@ -448,7 +455,7 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d MonoObject *appdomain_object; IUnknown *unk; - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System", "AppDomain", "get_CurrentDomain", + hr = RuntimeHost_Invoke(This, domain, NULL, "System", "AppDomain", "get_CurrentDomain", NULL, NULL, 0, &appdomain_object); if (SUCCEEDED(hr)) @@ -480,7 +487,7 @@ void RuntimeHost_ExitProcess(RuntimeHost *This, INT exitcode) args[0] = &exitcode; args[1] = NULL; - RuntimeHost_Invoke(This, domain, "mscorlib", "System", "Environment", "Exit", + RuntimeHost_Invoke(This, domain, NULL, "System", "Environment", "Exit", NULL, args, 1, &dummy); ERR("Process should have exited\n"); @@ -1048,7 +1055,7 @@ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, domain = mono_object_get_domain(obj); - hr = RuntimeHost_Invoke(This, domain, "mscorlib", "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", + hr = RuntimeHost_Invoke(This, domain, NULL, "System.Runtime.InteropServices", "Marshal", "GetIUnknownForObject", NULL, (void**)&obj, 1, &result); if (SUCCEEDED(hr)) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index df01f9b77ff..9fa7978340d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -99,6 +99,7 @@ MonoDomain* (CDECL *mono_domain_get_by_id)(int id); BOOL (CDECL *mono_domain_set)(MonoDomain *domain,BOOL force); void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name); static void (CDECL *mono_free)(void *); +MonoImage* (CDECL *mono_get_corlib)(void); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); @@ -204,6 +205,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_MONO_FUNCTION(mono_domain_set); LOAD_MONO_FUNCTION(mono_domain_set_config); LOAD_MONO_FUNCTION(mono_free); + LOAD_MONO_FUNCTION(mono_get_corlib); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 5b6c3987615..8ad95e385eb 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -162,6 +162,7 @@ extern MonoDomain* (CDECL *mono_domain_get)(void) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_domain_get_by_id)(int id) DECLSPEC_HIDDEN; extern BOOL (CDECL *mono_domain_set)(MonoDomain *domain, BOOL force) DECLSPEC_HIDDEN; extern void (CDECL *mono_domain_set_config)(MonoDomain *domain,const char *base_dir,const char *config_file_name) DECLSPEC_HIDDEN; +extern MonoImage* (CDECL *mono_get_corlib)(void) DECLSPEC_HIDDEN; extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]) DECLSPEC_HIDDEN; extern MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version) DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH] gdiplus/tests: Use originating line when ok_path reports failures.
by Jeff Smith 19 Apr '20

19 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/graphicspath.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index a02500bc1d..a987cd165d 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -75,8 +75,10 @@ typedef struct int todo; } path_test_t; -#define ok_path(a,b,c,d) ok_path_fudge(a,b,c,d,2.0) -static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, BOOL todo_size, REAL fudge) +#define ok_path(a,b,c,d) _ok_path_fudge(a,b,c,d,2.0,__LINE__) +#define ok_path_fudge(a,b,c,d,e) _ok_path_fudge(a,b,c,d,e,__LINE__) +static void _ok_path_fudge(GpPath* path, const path_test_t *expected, INT expected_size, + BOOL todo_size, REAL fudge, int line) { BYTE * types; INT size, idx = 0, eidx = 0, numskip; @@ -89,7 +91,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte } todo_wine_if (todo_size) - ok(size == expected_size, "Path size %d does not match expected size %d\n", + ok_(__FILE__,line)(size == expected_size, "Path size %d does not match expected size %d\n", size, expected_size); points = HeapAlloc(GetProcessHeap(), 0, size * sizeof(GpPointF)); @@ -112,7 +114,7 @@ static void ok_path_fudge(GpPath* path, const path_test_t *expected, INT expecte stringify_point_type(types[idx], name); todo_wine_if (expected[eidx].todo || numskip) - ok(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, + ok_(__FILE__,line)(match, "Expected #%d: %s (%.1f,%.1f) but got %s (%.1f,%.1f)\n", eidx, ename, expected[eidx].X, expected[eidx].Y, name, points[idx].X, points[idx].Y); -- 2.23.0

2 1

[PATCH] kernelbase: Fix a string leak in CreateProcessInternal (Valgrind).
by Sven Baars 18 Apr '20

18 Apr '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/kernelbase/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index b125f100f6..3369180206 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -182,10 +182,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (envW != env) RtlFreeHeap( GetProcessHeap(), 0, envW ); return NULL; } + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1; -- 2.24.0

1 2

[PATCH] kernel32: Fix a memory leak in MoveFileWithProgressW (Valgrind).
by Sven Baars 18 Apr '20

18 Apr '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 334fc25e87..93759592c4 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -502,6 +502,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, memcpy( rename_info->FileName, nt_name.Buffer, nt_name.Length ); RtlFreeUnicodeString( &nt_name ); status = NtSetInformationFile( source_handle, &io, rename_info, size, FileRenameInformation ); + HeapFree( GetProcessHeap(), 0, rename_info ); if (status == STATUS_NOT_SAME_DEVICE && (flag & MOVEFILE_COPY_ALLOWED)) { NtClose( source_handle ); -- 2.24.0

2 1

[PATCH] configure: Install wineusb.inf.
by Zebediah Figura 18 Apr '20

18 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48958 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index e09072c935..46d51caf92 100644 --- a/configure.ac +++ b/configure.ac @@ -4100,6 +4100,7 @@ fonts \ loader/wine.inf \ loader/winebus.inf \ loader/winehid.inf \ +loader/wineusb.inf \ nls \ programs/msidb/msidb \ programs/msiexec/msiexec \ -- 2.26.0

1 0

[PATCH 1/3] mshtml: for res:// URLs, numeric resource type ids don't need a leading '#'
by Damjan Jovanovic 18 Apr '20

18 Apr '20

Numeric resource type ids are either specified as the number with MAKEINTRESOURCEW(), or as a string prefixed by '#'. But mshtml's res:// protocol also allows the resource type id to be a numeric string without the '#' prefix. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 27 +++++++++++++++++++-------- dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 26 insertions(+), 8 deletions(-)

2 1

[PATCH] include: Avoid subscript is above array bounds warning.
by Mathew Hodson 18 Apr '20

18 Apr '20

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> --- include/wingdi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index 0a456f8..bdd1506 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -1916,7 +1916,7 @@ typedef struct { typedef struct tagBITMAPINFO { BITMAPINFOHEADER bmiHeader; - RGBQUAD bmiColors[1]; + RGBQUAD bmiColors[256]; } BITMAPINFO, *PBITMAPINFO, *LPBITMAPINFO; typedef struct @@ -1931,7 +1931,7 @@ typedef struct typedef struct { BITMAPCOREHEADER bmciHeader; - RGBTRIPLE bmciColors[1]; + RGBTRIPLE bmciColors[256]; } BITMAPCOREINFO, *PBITMAPCOREINFO, *LPBITMAPCOREINFO; #define DIB_RGB_COLORS 0 -- 2.7.4

3 2

[PATCH 3/3] mshtml v3: if unspecified, the res:// protocol also searches for resource type id 2110 (RT_FILE)
by Damjan Jovanovic 18 Apr '20

18 Apr '20

If the resource type id isn't specified in the res:// URL, mshtml searches for both RT_HTML and RT_FILE ids. Try 3 reuses existing html test files instead of adding a new gif file, and adds more tests, proving pretty conclusively that RT_FILE is used only (1) when specified explicitly, with /2110/ or /#2110/, and (2) implicitly, when no resource type is specified. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47999 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/mshtml/protocol.c | 18 ++++++++++--- dlls/mshtml/tests/protocol.c | 49 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ 3 files changed, 66 insertions(+), 4 deletions(-)

1 0

[PATCH 2/3] include/winuser.h: define the undocumented RT_FILE resource type
by Damjan Jovanovic 18 Apr '20

18 Apr '20

On https://docs.microsoft.com/en-us/previous-versions//aa767740(v=vs.85) the only mentioned resource types are RT_HTML and RT_FILE. RT_FILE is completely undocumented and doesn't appear in any headers, but by a process of elimination, the 2110 magic number used in https://www.codeproject.com/Articles/435/How-to-use-the-res-protocol-in-Dev… and tested in later tests in this patch series, must be RT_FILE. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- include/winuser.h | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v4 1/4] qedit: Implement IMediaDet::get_StreamType().
by Zebediah Figura 17 Apr '20

17 Apr '20

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/mediadet.c | 22 ++++++++++++++++++---- dlls/qedit/tests/mediadet.c | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index ecfafc44cbb..92c154a50a5 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,6 +28,7 @@ #include "ole2.h" #include "qedit_private.h" +#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); @@ -280,11 +281,24 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) return S_OK; } -static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) +static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet *iface, GUID *majortype) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); - return E_NOTIMPL; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + AM_MEDIA_TYPE mt; + HRESULT hr; + + TRACE("detector %p, majortype %p.\n", detector, majortype); + + if (!majortype) + return E_POINTER; + + if (SUCCEEDED(hr = IMediaDet_get_StreamMediaType(iface, &mt))) + { + *majortype = mt.majortype; + FreeMediaType(&mt); + } + + return hr; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 65f5af79c7e..1d8db732c88 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -192,6 +192,7 @@ static void test_mediadet(void) BSTR filename = NULL; LONG nstrms = 0; LONG strm; + GUID guid; AM_MEDIA_TYPE mt; double fps; int flags; @@ -242,6 +243,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamMediaType(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_StreamType(pM, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -258,6 +265,10 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -311,6 +322,10 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -370,6 +385,10 @@ static void test_mediadet(void) if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) { + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); } -- 2.26.0

1 3

[PATCH v4 1/2] dinput: Block Acquire() until hooks are installed to prevent input being lost.
by Brendan Shanks 17 Apr '20

17 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v4: Only block Acquire(), blocking Unacquire() was causing a deadlock. dlls/dinput/dinput_main.c | 19 ++++++++++++++++--- dlls/dinput8/tests/device.c | 3 --- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0855cb41cd..5eaa32bd0b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1717,10 +1717,11 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { IDirectInputImpl *dinput; + HANDLE finished_event = (HANDLE)msg.lParam; - TRACE( "Processing hook change notification lp:%ld\n", msg.lParam ); + TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); - if (!msg.wParam && !msg.lParam) + if (!msg.wParam) { if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); @@ -1765,6 +1766,9 @@ static DWORD WINAPI hook_thread_proc(void *param) UnhookWindowsHookEx( mouse_hook ); mouse_hook = NULL; } + + if (finished_event) + SetEvent(finished_event); } TranslateMessage(&msg); DispatchMessageW(&msg); @@ -1824,6 +1828,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) static HHOOK callwndproc_hook; static ULONG foreground_cnt; IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); + HANDLE hook_change_finished_event = NULL; EnterCriticalSection(&dinput_hook_crit); @@ -1851,9 +1856,17 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) hook_thread_event = NULL; } - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); + if (acquired) + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); + + if (acquired) + { + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); + } } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index ea5ab75109..bb82855d40 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -798,12 +798,10 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); - todo_wine ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); @@ -812,7 +810,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); /* Test injecting keyboard events with scancode=0. -- 2.25.3

3 6

[PATCH] maintainers: Take Media Foundation core modules section.
by Nikolay Sivov 17 Apr '20

17 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d5b9133c79..cfbeaeb12b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -281,6 +281,17 @@ F: dlls/wbemdisp/ F: dlls/wbemprox/ F: dlls/wmiutils/ +Windows Media Foundation +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/mf/ +F: dlls/mferror/ +F: dlls/mfmediaengine/ +F: dlls/mfplat/ +F: dlls/mfplay/ +F: dlls/mfreadwrite/ +F: dlls/mfuuid/ +F: dlls/rtworkq/ + Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> -- 2.25.1

1 0

[PATCH] mfreadwrite: Clear STREAM_FLAG_SAMPLE_REQUESTED flag on MEEndOfStream event.
by Derek Lesho 17 Apr '20

17 Apr '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mfreadwrite/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index a381c7cc6f..25b0050256 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -727,6 +727,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re { case MEEndOfStream: stream->state = STREAM_STATE_EOS; + stream->flags &= ~STREAM_FLAG_SAMPLE_REQUESTED; if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, MFT_MESSAGE_COMMAND_DRAIN, 0))) -- 2.26.0

2 1

[PATCH 1/4] setupapi: Fix a memory leak (Valgrind).
by Sven Baars 17 Apr '20

17 Apr '20

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a21959a262..7be1a34669 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -736,6 +736,7 @@ static void delete_device(struct device *device) RegCloseKey(device->key); heap_free(device->instanceId); + heap_free(device->drivers); LIST_FOR_EACH_ENTRY_SAFE(iface, next, &device->interfaces, struct device_iface, entry) -- 2.24.0

1 3

[PATCH v2 01/13] qedit: Implement MediaDet_get_StreamType.
by Gabriel Ivăncescu 17 Apr '20

17 Apr '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/qedit/mediadet.c | 17 +++++++++++++++-- dlls/qedit/tests/mediadet.c | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index ecfafc4..a6b52c0 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -283,8 +283,21 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); - return E_NOTIMPL; + AM_MEDIA_TYPE mt; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) + return E_POINTER; + + hr = IMediaDet_get_StreamMediaType(&This->IMediaDet_iface, &mt); + if (FAILED(hr)) + return hr; + CoTaskMemFree(mt.pbFormat); + + *pVal = mt.majortype; + return hr; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 65f5af7..c92c187 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -192,6 +192,7 @@ static void test_mediadet(void) BSTR filename = NULL; LONG nstrms = 0; LONG strm; + GUID guid; AM_MEDIA_TYPE mt; double fps; int flags; @@ -242,6 +243,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamMediaType(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamType failed: %08x\n", hr); + + hr = IMediaDet_get_StreamType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamType failed: %08x\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -258,6 +265,10 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -311,6 +322,10 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -370,6 +385,10 @@ static void test_mediadet(void) if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) { + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); } -- 2.21.0

2 22

[PATCH 14/15] dxgi/tests: Add test for colour space support APIs.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183539. Use create_window(), avoid leaking the window on skips. dlls/dxgi/tests/dxgi.c | 107 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 0fe247016ba..32aae2567f0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6306,6 +6306,112 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); } +static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + IDXGISwapChain3 *swapchain3; + IDXGISwapChain1 *swapchain1; + IDXGIFactory2 *factory2; + IDXGIFactory *factory; + ULONG ref_count; + unsigned int i; + UINT support; + HWND window; + HRESULT hr; + + static const DXGI_COLOR_SPACE_TYPE colour_spaces[] = + { + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709, + DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020, + DXGI_COLOR_SPACE_RESERVED, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020, + DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020, + DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020, + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020, + DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020, + DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020, + }; + + get_factory(device, is_d3d12, &factory); + + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory2, (void**)&factory2); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + win_skip("IDXGIFactory2 not available.\n"); + return; + } + + window = create_window(); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, + window, &swapchain_desc, NULL, NULL, &swapchain1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void**)&swapchain3); + IDXGISwapChain1_Release(swapchain1); + if (FAILED(hr)) + { + win_skip("IDXGISwapChain3 not available.\n"); + IDXGIFactory2_Release(factory2); + DestroyWindow(window); + return; + } + + for (i = 0; i < ARRAY_SIZE(colour_spaces); ++i) + { + support = 0xdeadbeef; + hr = IDXGISwapChain3_CheckColorSpaceSupport(swapchain3, colour_spaces[i], &support); + ok(hr == S_OK, "Got unexpected hr %#x for test %u.\n", hr, i); + ok(!(support & ~DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT), + "Got unexpected support flags %#x for test %u.\n", support, i); + + if (colour_spaces[i] == DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709) + { + ok(support & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT, + "Required colour space not supported for test %u.\n", i); + } + else if (colour_spaces[i] == DXGI_COLOR_SPACE_RESERVED) + { + ok(!support, "Invalid colour space supported for test %u.\n", i); + } + + hr = IDXGISwapChain3_SetColorSpace1(swapchain3, colour_spaces[i]); + ok(hr == (support & DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT) ? S_OK : E_INVALIDARG, + "Got unexpected hr %#x for text %u.\n", hr, i); + } + + ref_count = IDXGISwapChain3_Release(swapchain3); + ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + DestroyWindow(window); + ref_count = IDXGIFactory2_Release(factory2); + ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6444,6 +6550,7 @@ START_TEST(dxgi) run_on_d3d12(test_output_ownership); run_on_d3d12(test_cursor_clipping); run_on_d3d12(test_frame_latency_event); + run_on_d3d12(test_colour_space_support); FreeLibrary(d3d12_module); } -- 2.20.1

2 1

[PATCH v3 01/13] qedit: Implement MediaDet_get_StreamType.
by Gabriel Ivăncescu 17 Apr '20

17 Apr '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: So since there were quite a few changes to the patch series, I haven't applied all of them yet, since I wasn't sure; but at least we should be able to get the first few patches out of the way now. I did add a test to show the downstream source is still used with put_Filter. In fact, I even test the filter first to show it has only one pin with MEDIATYPE_Stream, but the detector reports 2 pins (because of the splitter). But here's the things I did not do. Perhaps they may not be needed now. However, if you think they are still needed to be changed, please let me know again and I'll change them. I didn't use strmbase on the tests. I didn't split the tests into a separate function. This is needed for proper testing. I kept the QueryFilterInfo for the custom filter since I was uncomfortable otherwise. Maybe they make more sense now that the tests are split. Unless I missed something, all the other things should have been changed as suggested. I also dropped IMediaPosition so it matches Windows more. It can always be added as a separate patch later, if needed. dlls/qedit/mediadet.c | 18 ++++++++++++++++-- dlls/qedit/tests/mediadet.c | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index ecfafc4..94bc1be 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,6 +28,7 @@ #include "ole2.h" #include "qedit_private.h" +#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); @@ -283,8 +284,21 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); - return E_NOTIMPL; + AM_MEDIA_TYPE mt; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) + return E_POINTER; + + hr = IMediaDet_get_StreamMediaType(&This->IMediaDet_iface, &mt); + if (FAILED(hr)) + return hr; + FreeMediaType(&mt); + + *pVal = mt.majortype; + return hr; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 65f5af7..c92c187 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -192,6 +192,7 @@ static void test_mediadet(void) BSTR filename = NULL; LONG nstrms = 0; LONG strm; + GUID guid; AM_MEDIA_TYPE mt; double fps; int flags; @@ -242,6 +243,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamMediaType(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamType failed: %08x\n", hr); + + hr = IMediaDet_get_StreamType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamType failed: %08x\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -258,6 +265,10 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -311,6 +322,10 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -370,6 +385,10 @@ static void test_mediadet(void) if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) { + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); } -- 2.21.0

1 12

[PATCH v2 1/5] wined3d: Remove WINED3D_RS_EDGEANTIALIAS.
by Chip Davis 17 Apr '20

17 Apr '20

Handle this render state similarly to D3DRS_ZFUNC, by mapping it in the client DLLs. As far as I can tell, save for the fact that it's only supposed to apply to lines forming a convex outline, it's roughly equivalent to D3DRS_ANTIALIASEDLINEENABLE. We definitely handled it the same way. Curiously, even though we supported the render state, we didn't set the corresponding capability bit. Do that now. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Fix formatting. --- dlls/d3d8/device.c | 15 ++++++++++++--- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/device.c | 12 +++++++++--- dlls/wined3d/state.c | 13 +++++-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 -- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a67f817785..e123502dab6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -422,6 +422,9 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + if (caps->LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->RasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; + caps->LineCaps &= ~WINED3DLINECAPS_ANTIALIAS; caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER @@ -446,9 +449,15 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) { - if (state == D3DRS_ZBIAS) - return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + switch (state) + { + case D3DRS_ZBIAS: + return WINED3D_RS_DEPTHBIAS; + case D3DRS_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba9011..4ebf51d040c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1340,6 +1340,8 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) if (caps->dpcLineCaps.dwRasterCaps & WINED3DPRASTERCAPS_DEPTHBIAS) caps->dpcLineCaps.dwRasterCaps = (caps->dpcLineCaps.dwRasterCaps | D3DPRASTERCAPS_ZBIAS) & ~WINED3DPRASTERCAPS_DEPTHBIAS; + if (wined3d_caps.LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->dpcLineCaps.dwRasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; caps->dpcLineCaps.dwZCmpCaps &= ( D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e09100dfdc7..3f1fe08c11e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -74,9 +74,15 @@ static inline WORD d3d_fpu_setup(void) static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) { - if (state == D3DRENDERSTATE_ZBIAS) - return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + switch (state) + { + case D3DRENDERSTATE_ZBIAS: + return WINED3D_RS_DEPTHBIAS; + case D3DRENDERSTATE_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d375122781b..1cb9f222eab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,12 +1798,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta } } -static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void line_antialias(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_rasterizer_state *r = state->rasterizer_state; - - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) + if (r && r->desc.line_antialias) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4427,7 +4424,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4445,7 +4442,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4602,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, @@ -5504,6 +5500,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 8, 8}, { 17, 22}, { 27, 27}, + { 40, 40}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48d133485b8..7e97c84c19e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1665,7 +1665,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_FOGEND] = tmpfloat.d; tmpfloat.f = 1.0f; rs[WINED3D_RS_FOGDENSITY] = tmpfloat.d; - rs[WINED3D_RS_EDGEANTIALIAS] = FALSE; rs[WINED3D_RS_RANGEFOGENABLE] = FALSE; rs[WINED3D_RS_STENCILENABLE] = FALSE; rs[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 335d502ab0b..004c33f8ea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4919,7 +4919,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_FOGEND); D3DSTATE_TO_STR(WINED3D_RS_FOGDENSITY); D3DSTATE_TO_STR(WINED3D_RS_STIPPLEENABLE); - D3DSTATE_TO_STR(WINED3D_RS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3D_RS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3D_RS_MIPMAPLODBIAS); D3DSTATE_TO_STR(WINED3D_RS_RANGEFOGENABLE); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3b41896e4..d3eb8100cd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -310,7 +310,6 @@ enum wined3d_render_state WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, WINED3D_RS_STIPPLEENABLE = 39, - WINED3D_RS_EDGEANTIALIAS = 40, WINED3D_RS_COLORKEYENABLE = 41, WINED3D_RS_MIPMAPLODBIAS = 46, WINED3D_RS_RANGEFOGENABLE = 48, @@ -1209,7 +1208,6 @@ enum wined3d_shader_type #define WINED3DPRASTERCAPS_STIPPLE 0x00000200 #define WINED3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 #define WINED3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 -#define WINED3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 #define WINED3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 #define WINED3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 #define WINED3DPRASTERCAPS_FOGRANGE 0x00010000 -- 2.24.0

2 5

[PATCH v4 1/5] ddraw: Convert BOOL flags to bitfields in ddraw_surface.
by Paul Gofman 17 Apr '20

17 Apr '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - add patch; v4: - use bitfield. dlls/ddraw/ddraw_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 83e3ee10c0..aa90972bc1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -195,8 +195,8 @@ struct ddraw_surface /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ - BOOL is_complex_root; - BOOL is_lost; + unsigned int is_complex_root : 1; + unsigned int is_lost : 1; /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc; -- 2.25.2

2 3

[PATCH v3 1/5] ddraw: Convert BOOL flags to bitmask in ddraw_surface.
by Paul Gofman 17 Apr '20

17 Apr '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v3: - add patch. dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 7 +++++-- dlls/ddraw/surface.c | 34 +++++++++++++++++----------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba901..0a916048bc 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4899,7 +4899,7 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) { - surface->is_lost = TRUE; + surface->flags |= DDRAW_SURFACE_LOST; } ddraw->device_state = DDRAW_DEVICE_STATE_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 83e3ee10c0..b99ad1f805 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -154,6 +154,9 @@ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_H void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration *ddraw_find_decl(struct ddraw *ddraw, DWORD fvf) DECLSPEC_HIDDEN; +#define DDRAW_SURFACE_COMPLEX_ROOT 0x00000001 +#define DDRAW_SURFACE_LOST 0x00000002 + struct ddraw_surface { /* IUnknown fields */ @@ -195,8 +198,8 @@ struct ddraw_surface /* You can't traverse the tree upwards. Only a flag for Surface::Release because it's needed there, * but no pointer to prevent temptations to traverse it in the wrong direction. */ - BOOL is_complex_root; - BOOL is_lost; + + unsigned int flags; /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 20143891d3..0a681caf07 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -35,7 +35,7 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) { - return surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost; + return surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->flags & DDRAW_SURFACE_LOST; } /* This is slow, of course. Also, in case of locks, we can't prevent other @@ -528,7 +528,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - if (!surf->is_complex_root) + if (!(surf->flags & DDRAW_SURFACE_COMPLEX_ROOT)) { struct ddraw_texture *texture = wined3d_texture_get_parent(surf->wined3d_texture); struct wined3d_device *wined3d_device = texture->wined3d_device; @@ -558,33 +558,33 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) wined3d_texture_decref(surface->wined3d_texture); } -static ULONG ddraw_surface_release_iface(struct ddraw_surface *This) +static ULONG ddraw_surface_release_iface(struct ddraw_surface *surface) { ULONG iface_count; /* Prevent the surface from being destroyed if it's still attached to * another surface. It will be destroyed when the root is destroyed. */ - if (This->iface_count == 1 && This->attached_iface) - IUnknown_AddRef(This->attached_iface); - iface_count = InterlockedDecrement(&This->iface_count); + if (surface->iface_count == 1 && surface->attached_iface) + IUnknown_AddRef(surface->attached_iface); + iface_count = InterlockedDecrement(&surface->iface_count); - TRACE("%p decreasing iface count to %u.\n", This, iface_count); + TRACE("%p decreasing iface count to %u.\n", surface, iface_count); if (iface_count == 0) { - struct ddraw_texture *texture = wined3d_texture_get_parent(This->wined3d_texture); + struct ddraw_texture *texture = wined3d_texture_get_parent(surface->wined3d_texture); struct wined3d_device *wined3d_device = texture->wined3d_device; - IUnknown *release_iface = This->ifaceToRelease; + IUnknown *release_iface = surface->ifaceToRelease; /* Complex attached surfaces are destroyed implicitly when the root is released */ wined3d_mutex_lock(); - if(!This->is_complex_root) + if(!(surface->flags & DDRAW_SURFACE_COMPLEX_ROOT)) { - WARN("(%p) Attempt to destroy a surface that is not a complex root\n", This); + WARN("(%p) Attempt to destroy a surface that is not a complex root\n", surface); wined3d_mutex_unlock(); return iface_count; } - ddraw_surface_cleanup(This); + ddraw_surface_cleanup(surface); wined3d_mutex_unlock(); if (release_iface) @@ -2565,7 +2565,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO WARN("Called on offscreenplain surface, returning DDERR_INVALIDOBJECT.\n"); hr = DDERR_INVALIDOBJECT; } - else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !surface->is_complex_root) + else if (!(surface->surface_desc.ddsCaps.dwCaps2 & managed) || !(surface->flags & DDRAW_SURFACE_COMPLEX_ROOT)) { WARN("Called on non-managed texture or non-root surface, returning DDERR_INVALIDPARAMS.\n"); hr = DDERR_INVALIDPARAMS; @@ -3780,12 +3780,12 @@ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) } ddraw_update_lost_surfaces(surface->ddraw); - surface->is_lost = FALSE; + surface->flags &= ~DDRAW_SURFACE_LOST; for(i = 0; i < MAX_COMPLEX_ATTACHED; i++) { if (surface->complex_array[i]) - surface->complex_array[i]->is_lost = FALSE; + surface->complex_array[i]->flags &= ~DDRAW_SURFACE_LOST; } return DD_OK; @@ -4910,7 +4910,7 @@ static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD } } - if (surface->is_complex_root) + if (surface->flags & DDRAW_SURFACE_COMPLEX_ROOT) hr = wined3d_texture_set_color_key(surface->wined3d_texture, flags, color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); @@ -6388,7 +6388,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); - root->is_complex_root = TRUE; + root->flags |= DDRAW_SURFACE_COMPLEX_ROOT; texture->root = root; wined3d_device_incref(texture->wined3d_device = ddraw->wined3d_device); -- 2.25.2

2 7

[PATCH 15/15] wined3d: Use GL_APPLE_rgb_422 for UYVY and YUY2 surfaces.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Chip Davis <cdavis(a)codeweavers.com> Theoretically, we could use it to support UYVY and YUY2 *textures* as well, but it would still require converting from YUV to RGB after sampling. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183627. dlls/wined3d/arb_program_shader.c | 6 +++++- dlls/wined3d/glsl_shader.c | 11 +++++++++++ dlls/wined3d/utils.c | 20 +++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 36c920dc6e0..e6daa88afd5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7649,11 +7649,15 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine case COMPLEX_FIXUP_NV12: shader = gen_yuv_shader(gl_info, &type); break; + + default: + FIXME("Unsupported fixup %#x.\n", fixup); + return E_NOTIMPL; } if (!shader) { - FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); + ERR("Failed to get shader for fixup %#x.\n", fixup); return E_NOTIMPL; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7feff85efb..6a247f46441 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12713,6 +12713,15 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe gen_nv12_read(buffer, gl_info, tex_type); break; + case COMPLEX_FIXUP_YUV: + /* With APPLE_rgb_422, things are much simpler. The only thing we + * have to do here is Y'CbCr to RGB conversion. */ + shader_addline(buffer, " vec3 yuv = vec3(texture%s(sampler, out_texcoord.xy));\n", + needs_legacy_glsl_syntax(gl_info) ? tex_type : ""); + shader_addline(buffer, " luminance = yuv.y;\n"); + shader_addline(buffer, " chroma = yuv.xz;\n"); + break; + default: FIXME("Unsupported fixup %#x.\n", complex_fixup); string_buffer_free(buffer); @@ -12836,6 +12845,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); break; case COMPLEX_FIXUP_NONE: @@ -13183,6 +13193,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: src_level = src_sub_resource_idx % src_texture->level_count; location = GL_EXTCALL(glGetUniformLocation(program->id, "size")); GL_EXTCALL(glUniform2f(location, wined3d_texture_get_level_pow2_width(src_texture, src_level), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a2765774c8d..43a69ae8890 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1320,6 +1320,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_UYVY, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_UYVY, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -1332,6 +1336,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_YUY2, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_YUY2, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -3577,7 +3585,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->f.color_fixup = create_color_fixup_desc_from_string(fixups[i].fixup); } - if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] + if (!gl_info->supported[APPLE_YCBCR_422] && !gl_info->supported[APPLE_RGB_422] + && (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); @@ -3586,6 +3595,14 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } + else if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[APPLE_RGB_422]) + { + format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + + format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { @@ -5390,6 +5407,7 @@ static const char *debug_complex_fixup(enum complex_fixup fixup) WINED3D_TO_STR(COMPLEX_FIXUP_YV12); WINED3D_TO_STR(COMPLEX_FIXUP_NV12); WINED3D_TO_STR(COMPLEX_FIXUP_P8); + WINED3D_TO_STR(COMPLEX_FIXUP_YUV); #undef WINED3D_TO_STR default: FIXME("Unrecognized complex fixup %#x\n", fixup); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ade1eae352c..7e78cb60df5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -154,6 +154,7 @@ enum complex_fixup COMPLEX_FIXUP_YV12 = 3, COMPLEX_FIXUP_P8 = 4, COMPLEX_FIXUP_NV12 = 5, + COMPLEX_FIXUP_YUV = 6, }; #include <pshpack2.h> -- 2.20.1

1 0

[PATCH 13/15] dxgi: Improve the d3d12_swapchain_SetColorSpace1() stub.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183538. Mostly unmodified. dlls/dxgi/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ad1a74e1b62..f57183879d4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2703,9 +2703,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_CheckColorSpaceSupport(IDXGISwa static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetColorSpace1(IDXGISwapChain3 *iface, DXGI_COLOR_SPACE_TYPE colour_space) { - FIXME("iface %p, colour_space %#x stub!\n", iface, colour_space); + FIXME("iface %p, colour_space %#x semi-stub!\n", iface, colour_space); - return E_NOTIMPL; + if (colour_space != DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709) + { + WARN("Colour space %u not supported.\n", colour_space); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers1(IDXGISwapChain3 *iface, -- 2.20.1

1 0

[PATCH 12/15] dxgi: Improve the d3d12_swapchain_CheckColorSpaceSupport() stub.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Monster Hunter World needs this function to succeed. This behaves correctly under the assumption that the system has no HDR support, and only reports standard sRGB as supported. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183537. Mostly unmodified. dlls/dxgi/swapchain.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index bd200dddf08..ad1a74e1b62 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2685,10 +2685,19 @@ static UINT STDMETHODCALLTYPE d3d12_swapchain_GetCurrentBackBufferIndex(IDXGISwa static HRESULT STDMETHODCALLTYPE d3d12_swapchain_CheckColorSpaceSupport(IDXGISwapChain3 *iface, DXGI_COLOR_SPACE_TYPE colour_space, UINT *colour_space_support) { - FIXME("iface %p, colour_space %#x, colour_space_support %p stub!\n", + UINT support_flags = 0; + + FIXME("iface %p, colour_space %#x, colour_space_support %p semi-stub!\n", iface, colour_space, colour_space_support); - return E_NOTIMPL; + if (!colour_space_support) + return E_INVALIDARG; + + if (colour_space == DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709) + support_flags |= DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT; + + *colour_space_support = support_flags; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetColorSpace1(IDXGISwapChain3 *iface, -- 2.20.1

1 0

[PATCH 11/15] dxgi/tests: Add a test for frame latency events using d3d12.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183597. Avoid leaking the window on skips. dlls/dxgi/tests/dxgi.c | 119 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3887982634f..0fe247016ba 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6188,6 +6188,124 @@ static void test_factory_check_feature_support(void) ok(!ref_count, "Factory has %u references left.\n", ref_count); } +static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + IDXGISwapChain2 *swapchain2; + IDXGISwapChain1 *swapchain1; + IDXGIFactory2 *factory2; + IDXGIFactory *factory; + UINT frame_latency; + DWORD wait_result; + ULONG ref_count; + unsigned int i; + HANDLE event; + HWND window; + HRESULT hr; + + get_factory(device, is_d3d12, &factory); + + hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory2, (void**)&factory2); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + win_skip("IDXGIFactory2 not available.\n"); + return; + } + + window = create_window(); + + swapchain_desc.Width = 640; + swapchain_desc.Height = 480; + swapchain_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 2; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + swapchain_desc.Flags = 0; + + hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, + window, &swapchain_desc, NULL, NULL, &swapchain1); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2); + IDXGISwapChain1_Release(swapchain1); + if (FAILED(hr)) + { + win_skip("IDXGISwapChain2 not available.\n"); + IDXGIFactory2_Release(factory2); + DestroyWindow(window); + return; + } + + /* test swap chain without waitable object */ + frame_latency = 0xdeadbeef; + hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(frame_latency == 0xdeadbeef, "Got unexpected frame latency %#x.\n", frame_latency); + hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); + ok(!event, "Got unexpected event %p.\n", event); + + ref_count = IDXGISwapChain2_Release(swapchain2); + ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + + /* test swap chain with waitable object */ + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT; + + hr = IDXGIFactory2_CreateSwapChainForHwnd(factory2, device, + window, &swapchain_desc, NULL, NULL, &swapchain1); + ok(hr == S_OK, "Failed to create swap chain, hr %#x.\n", hr); + hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain2, (void**)&swapchain2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain1_Release(swapchain1); + + event = IDXGISwapChain2_GetFrameLatencyWaitableObject(swapchain2); + ok(!!event, "Got unexpected event %p.\n", event); + + /* auto-reset event */ + wait_result = WaitForSingleObject(event, 0); + ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + wait_result = WaitForSingleObject(event, 0); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); + + hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency); + + hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency); + + hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 2); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(frame_latency == 2, "Got unexpected frame latency %#x.\n", frame_latency); + + for (i = 0; i < 5; i++) + { + hr = IDXGISwapChain2_Present(swapchain2, 0, 0); + ok(hr == S_OK, "Present %u failed with hr %#x.\n", i, hr); + } + + wait_result = WaitForSingleObject(event, 1000); + ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + + ref_count = IDXGISwapChain2_Release(swapchain2); + ok(!ref_count, "Swap chain has %u references left.\n", ref_count); + DestroyWindow(window); + ref_count = IDXGIFactory2_Release(factory2); + ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6325,6 +6443,7 @@ START_TEST(dxgi) run_on_d3d12(test_swapchain_formats); run_on_d3d12(test_output_ownership); run_on_d3d12(test_cursor_clipping); + run_on_d3d12(test_frame_latency_event); FreeLibrary(d3d12_module); } -- 2.20.1

1 0

[PATCH 10/15] dxgi: Implement d3d12_swapchain_GetMaximumFrameLatency().
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183594. Mostly unmodified. dlls/dxgi/swapchain.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8e0f2b2239b..bd200dddf08 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2630,9 +2630,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetMaximumFrameLatency(IDXGISwa static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetMaximumFrameLatency(IDXGISwapChain3 *iface, UINT *max_latency) { - FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return E_NOTIMPL; + TRACE("iface %p, max_latency %p.\n", iface, max_latency); + + if (!(swapchain->desc.Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) + { + WARN("DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT not set for swap chain %p.\n", iface); + return DXGI_ERROR_INVALID_CALL; + } + + *max_latency = swapchain->frame_latency; + return S_OK; } static HANDLE STDMETHODCALLTYPE d3d12_swapchain_GetFrameLatencyWaitableObject(IDXGISwapChain3 *iface) -- 2.20.1

1 0

[PATCH 09/15] dxgi: Implement d3d12_swapchain_SetMaximumFrameLatency().
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183593. Change the other FIXME to WARN as well. dlls/dxgi/swapchain.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index c13868fdc2d..8e0f2b2239b 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2608,9 +2608,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetSourceSize(IDXGISwapChain3 * static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetMaximumFrameLatency(IDXGISwapChain3 *iface, UINT max_latency) { - FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return E_NOTIMPL; + TRACE("iface %p, max_latency %u.\n", iface, max_latency); + + if (!(swapchain->desc.Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) + { + WARN("DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT not set for swap chain %p.\n", iface); + return DXGI_ERROR_INVALID_CALL; + } + + if (!max_latency) + { + WARN("Invalid maximum frame latency %u.\n", max_latency); + return DXGI_ERROR_INVALID_CALL; + } + + swapchain->frame_latency = max_latency; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetMaximumFrameLatency(IDXGISwapChain3 *iface, UINT *max_latency) -- 2.20.1

1 0

[PATCH 08/15] dxgi: Implement d3d12_swapchain_GetFrameLatencyWaitableObject().
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183591. Mostly unmodifed. dlls/dxgi/swapchain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 40accb2a931..c13868fdc2d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2622,9 +2622,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetMaximumFrameLatency(IDXGISwa static HANDLE STDMETHODCALLTYPE d3d12_swapchain_GetFrameLatencyWaitableObject(IDXGISwapChain3 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return NULL; + TRACE("iface %p.\n", iface); + + return swapchain->frame_latency_event; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetMatrixTransform(IDXGISwapChain3 *iface, -- 2.20.1

1 0

[PATCH 07/15] dxgi: Signal the frame latency event on present.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183590. Test for the event handle instead of the flag, since we need to fetch it anyway. Otherwise unmodified. dlls/dxgi/swapchain.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0cb7d922f4d..40accb2a931 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1097,6 +1097,9 @@ struct d3d12_swapchain ID3D12Fence *frame_latency_fence; HANDLE frame_latency_event; + + uint64_t frame_number; + uint32_t frame_latency; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -2104,6 +2107,7 @@ static VkResult d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + HANDLE frame_latency_event; VkQueue vk_queue; VkResult vr; HRESULT hr; @@ -2166,6 +2170,25 @@ static HRESULT d3d12_swapchain_present(struct d3d12_swapchain *swapchain, return hresult_from_vk_result(vr); } + if ((frame_latency_event = swapchain->frame_latency_event)) + { + ++swapchain->frame_number; + + if (FAILED(hr = ID3D12CommandQueue_Signal(swapchain->command_queue, + swapchain->frame_latency_fence, swapchain->frame_number))) + { + ERR("Failed to signal frame latency fence, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(swapchain->frame_latency_fence, + swapchain->frame_number - swapchain->frame_latency, frame_latency_event))) + { + ERR("Failed to enqueue frame latency event, hr %#x.\n", hr); + return hr; + } + } + swapchain->current_buffer_index = (swapchain->current_buffer_index + 1) % swapchain->desc.BufferCount; vr = d3d12_swapchain_acquire_next_back_buffer(swapchain); if (vr == VK_ERROR_OUT_OF_DATE_KHR) @@ -2994,6 +3017,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT) { + swapchain->frame_number = DXGI_MAX_SWAP_CHAIN_BUFFERS; + swapchain->frame_latency = 1; + if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) { -- 2.20.1

1 0

[PATCH 06/15] dxgi: Create frame latency events for d3d12 swapchains if requested.
by Henri Verbeet 17 Apr '20

17 Apr '20

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 183588. %d -> %#x for HRESULTs, which I should have noticed in the original patch. dlls/dxgi/swapchain.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f19b58da2e6..0cb7d922f4d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1094,6 +1094,9 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + + ID3D12Fence *frame_latency_fence; + HANDLE frame_latency_event; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1887,6 +1890,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_buffers(swapchain, TRUE); + if (swapchain->frame_latency_event) + CloseHandle(swapchain->frame_latency_event); + + if (swapchain->frame_latency_fence) + ID3D12Fence_Release(swapchain->frame_latency_fence); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -2906,7 +2915,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (swapchain_desc->Flags) + if (swapchain_desc->Flags & ~(DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); if (fullscreen_desc->RefreshRate.Numerator || fullscreen_desc->RefreshRate.Denominator) @@ -2983,6 +2992,25 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT) + { + if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, + 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) + { + WARN("Failed to create frame latency fence, hr %#x.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + + if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create frame latency event, hr %#x.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; -- 2.20.1

1 0

[PATCH 05/15] wined3d: Implement Vulkan buffer uploads.
by Henri Verbeet 17 Apr '20

17 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c45ddae7e59..8c4ca425451 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1649,7 +1649,32 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { - FIXME("Not implemented.\n"); + struct wined3d_resource *resource = &buffer->resource; + const struct wined3d_range *range; + struct wined3d_bo_address dst; + unsigned int i = range_count; + void *map_ptr; + + if (!range_count) + return; + + dst.buffer_object = buffer->buffer_object; + dst.addr = NULL; + + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, + resource->size, resource->bind_flags, WINED3D_MAP_WRITE))) + { + FIXME("Failed to map buffer.\n"); + return; + } + + while (i--) + { + range = &ranges[i]; + memcpy((uint8_t *)map_ptr + range->offset, (uint8_t *)data + range->offset - data_offset, range->size); + } + + wined3d_context_unmap_bo_address(context, &dst, resource->bind_flags, range_count, ranges); } static void wined3d_buffer_vk_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, -- 2.20.1

1 0

[PATCH 04/15] wined3d: Implement WINED3D_MAP_NOOVERWRITE support in adapter_vk_map_bo_address().
by Henri Verbeet 17 Apr '20

17 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1bca53ac7f9..b31af2afb5b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -610,6 +610,9 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); + if (map_flags & WINED3D_MAP_NOOVERWRITE) + goto map; + if (map_flags & WINED3D_MAP_READ) { if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) @@ -647,6 +650,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); wined3d_context_vk_wait_command_buffer(context_vk, bo->command_buffer_id); +map: if (!(map_ptr = wined3d_bo_vk_map(bo, context_vk))) { ERR("Failed to map bo.\n"); -- 2.20.1

1 0

[PATCH 03/15] wined3d: Implement a Vulkan device memory allocator.
by Henri Verbeet 17 Apr '20

17 Apr '20

Note that the constants like WINED3D_ALLOCATOR_CHUNK_SIZE and WINED3D_ALLOCATOR_MIN_BLOCK_SIZE are somewhat arbitrary, rather than the result of careful tuning. That's mostly because we have a couple of known stalls in e.g. the command stream that would largely invalidate such tuning. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 121 +++++++++++++++++-- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 137 +++++++++++++++++++-- dlls/wined3d/utils.c | 215 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 81 +++++++++++++ 5 files changed, 537 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e51eeccc02c..1bca53ac7f9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -176,6 +176,57 @@ static void wined3d_disable_vulkan_features(VkPhysicalDeviceFeatures *features) features->inheritedQueries = VK_FALSE; } +static struct wined3d_allocator_chunk *wined3d_allocator_vk_create_chunk(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t chunk_size) +{ + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + struct wined3d_allocator_chunk_vk *chunk_vk; + + if (!(chunk_vk = heap_alloc(sizeof(*chunk_vk)))) + return NULL; + + if (!wined3d_allocator_chunk_init(&chunk_vk->c, allocator)) + { + heap_free(chunk_vk); + return NULL; + } + + if (!(chunk_vk->vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, chunk_size))) + { + wined3d_allocator_chunk_cleanup(&chunk_vk->c); + heap_free(chunk_vk); + return NULL; + } + list_add_head(&allocator->pools[memory_type].chunks, &chunk_vk->c.entry); + + return &chunk_vk->c; +} + +static void wined3d_allocator_vk_destroy_chunk(struct wined3d_allocator_chunk *chunk) +{ + struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(chunk); + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + + TRACE("chunk %p.\n", chunk); + + device_vk = CONTAINING_RECORD(chunk_vk->c.allocator, struct wined3d_device_vk, allocator); + vk_info = &device_vk->vk_info; + + if (chunk_vk->c.map_ptr) + VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + VK_CALL(vkFreeMemory(device_vk->vk_device, chunk_vk->vk_memory, NULL)); + TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(chunk_vk->vk_memory)); + wined3d_allocator_chunk_cleanup(&chunk_vk->c); + heap_free(chunk_vk); +} + +static const struct wined3d_allocator_ops wined3d_allocator_vk_ops = +{ + .allocator_create_chunk = wined3d_allocator_vk_create_chunk, + .allocator_destroy_chunk = wined3d_allocator_vk_destroy_chunk, +}; + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, @@ -247,10 +298,19 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi VK_DEVICE_FUNCS() #undef VK_DEVICE_PFN + if (!wined3d_allocator_init(&device_vk->allocator, + adapter_vk->memory_properties.memoryTypeCount, &wined3d_allocator_vk_ops)) + { + WARN("Failed to initialise allocator.\n"); + hr = E_FAIL; + goto fail; + } + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); + wined3d_allocator_cleanup(&device_vk->allocator); goto fail; } @@ -270,6 +330,7 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) const struct wined3d_vk_info *vk_info = &device_vk->vk_info; wined3d_device_cleanup(&device_vk->d); + wined3d_allocator_cleanup(&device_vk->allocator); VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } @@ -488,6 +549,49 @@ static void adapter_vk_uninit_3d(struct wined3d_device *device) wined3d_context_vk_cleanup(context_vk); } +static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + void *map_ptr; + VkResult vr; + + vk_info = context_vk->vk_info; + device_vk = wined3d_device_vk(context_vk->c.device); + + if (bo->memory) + { + struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); + + if (!(map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + { + ERR("Failed to map chunk.\n"); + return NULL; + } + } + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &map_ptr))) < 0) + { + ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); + return NULL; + } + + return map_ptr; +} + +static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) +{ + const struct wined3d_vk_info *vk_info; + struct wined3d_device_vk *device_vk; + + vk_info = context_vk->vk_info; + device_vk = wined3d_device_vk(context_vk->c.device); + + if (bo->memory) + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); + else + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +} + static void *adapter_vk_map_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, size_t size, uint32_t bind_flags, uint32_t map_flags) { @@ -499,7 +603,6 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, VkMappedMemoryRange range; struct wined3d_bo_vk *bo; void *map_ptr; - VkResult vr; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) return data->addr; @@ -532,7 +635,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; range.pNext = NULL; range.memory = bo->vk_memory; - range.offset = (uintptr_t)data->addr; + range.offset = bo->memory_offset + (uintptr_t)data->addr; range.size = size; VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); } @@ -544,19 +647,19 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); wined3d_context_vk_wait_command_buffer(context_vk, bo->command_buffer_id); - if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, - (uintptr_t)data->addr, size, 0, &map_ptr))) < 0) + if (!(map_ptr = wined3d_bo_vk_map(bo, context_vk))) { - ERR("Failed to map buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + ERR("Failed to map bo.\n"); return NULL; } - return map_ptr; + return (uint8_t *)map_ptr + bo->memory_offset + (uintptr_t)data->addr; } static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, uint32_t bind_flags, unsigned int range_count, const struct wined3d_range *ranges) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; VkMappedMemoryRange range; @@ -566,7 +669,7 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) return; - vk_info = wined3d_context_vk(context)->vk_info; + vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) @@ -577,13 +680,13 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s for (i = 0; i < range_count; ++i) { - range.offset = ranges[i].offset; + range.offset = bo->memory_offset + ranges[i].offset; range.size = ranges[i].size; VK_CALL(vkFlushMappedMemoryRanges(device_vk->vk_device, 1, &range)); } } - VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); + wined3d_bo_vk_unmap(bo, context_vk); } static void adapter_vk_copy_bo_address(struct wined3d_context *context, diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2e2ae239210..c45ddae7e59 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1636,7 +1636,7 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: wined3d_context_vk_destroy_bo(context_vk, &buffer_vk->bo); buffer_vk->bo.vk_buffer = VK_NULL_HANDLE; - buffer_vk->bo.vk_memory = VK_NULL_HANDLE; + buffer_vk->bo.memory = NULL; buffer_vk->b.buffer_object = 0u; break; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 3fa3ce8207f..b3239a4f9ee 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -29,6 +29,87 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkResult vr; + + TRACE("chunk %p, memory 0x%s, map_ptr %p.\n", chunk_vk, + wine_dbgstr_longlong(chunk_vk->vk_memory), chunk_vk->c.map_ptr); + + if (!chunk_vk->c.map_ptr && (vr = VK_CALL(vkMapMemory(device_vk->vk_device, + chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) + { + ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + return NULL; + } + + ++chunk_vk->c.map_count; + + return chunk_vk->c.map_ptr; +} + +void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + TRACE("chunk_vk %p, context_vk %p.\n", chunk_vk, context_vk); + + if (!--chunk_vk->c.map_count) + VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + chunk_vk->c.map_ptr = NULL; +} + +VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, + unsigned int pool, size_t size) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryAllocateInfo allocate_info; + VkDeviceMemory vk_memory; + VkResult vr; + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = size; + allocate_info.memoryTypeIndex = pool; + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &vk_memory))) < 0) + { + ERR("Failed to allocate memory, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + return vk_memory; +} + +static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, + unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + struct wined3d_allocator *allocator = &device_vk->allocator; + struct wined3d_allocator_block *block; + + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) + { + *vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, size); + return NULL; + } + + if (!(block = wined3d_allocator_allocate(allocator, &context_vk->c, memory_type, size))) + { + *vk_memory = VK_NULL_HANDLE; + return NULL; + } + + *vk_memory = wined3d_allocator_chunk_vk(block->chunk)->vk_memory; + + return block; +} + BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { @@ -36,7 +117,6 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic const struct wined3d_vk_info *vk_info = context_vk->vk_info; VkMemoryRequirements memory_requirements; struct wined3d_adapter_vk *adapter_vk; - VkMemoryAllocateInfo allocate_info; VkBufferCreateInfo create_info; unsigned int memory_type_idx; VkResult vr; @@ -60,9 +140,6 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); - allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.allocationSize = memory_requirements.size; memory_type_idx = wined3d_adapter_vk_get_memory_type_index(adapter_vk, memory_requirements.memoryTypeBits, memory_type); if (memory_type_idx == ~0u) @@ -71,18 +148,24 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } - allocate_info.memoryTypeIndex = memory_type_idx; - if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + bo->memory = wined3d_context_vk_allocate_memory(context_vk, + memory_type_idx, memory_requirements.size, &bo->vk_memory); + if (!bo->vk_memory) { - ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + ERR("Failed to allocate buffer memory.\n"); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } + bo->memory_offset = bo->memory ? bo->memory->offset : 0; - if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, + bo->vk_memory, bo->memory_offset))) < 0) { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + if (bo->memory) + wined3d_allocator_block_free(bo->memory); + else + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } @@ -140,6 +223,29 @@ static void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context o->command_buffer_id = command_buffer_id; } +static void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *context_vk, + struct wined3d_allocator_block *block, uint64_t command_buffer_id) +{ + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + wined3d_allocator_block_free(block); + TRACE("Freed block %p.\n", block); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking block %p.\n", block); + return; + } + + o->type = WINED3D_RETIRED_ALLOCATOR_BLOCK_VK; + o->u.block = block; + o->command_buffer_id = command_buffer_id; +} + static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context_vk, VkBuffer vk_buffer, uint64_t command_buffer_id) { @@ -167,7 +273,15 @@ static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) { + TRACE("context_vk %p, bo %p.\n", context_vk, bo); + wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); + if (bo->memory) + { + wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); + return; + } + wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } @@ -221,6 +335,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(o->u.vk_memory)); break; + case WINED3D_RETIRED_ALLOCATOR_BLOCK_VK: + TRACE("Destroying block %p.\n", o->u.block); + wined3d_allocator_block_free(o->u.block); + break; + case WINED3D_RETIRED_BUFFER_VK: VK_CALL(vkDestroyBuffer(device_vk->vk_device, o->u.vk_buffer, NULL)); TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(o->u.vk_buffer)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 211160ad4db..a2765774c8d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -7061,3 +7061,218 @@ void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, for (j = 0; j < 3; ++j) normal_matrix[i * 3 + j] = (&mv._11)[j * 4 + i]; } + +static void wined3d_allocator_release_block(struct wined3d_allocator *allocator, + struct wined3d_allocator_block *block) +{ + block->parent = allocator->free; + allocator->free = block; +} + +static struct wined3d_allocator_block *wined3d_allocator_acquire_block(struct wined3d_allocator *allocator) +{ + struct wined3d_allocator_block *block; + + if (!allocator->free) + return heap_alloc(sizeof(*block)); + + block = allocator->free; + allocator->free = block->parent; + + return block; +} + +void wined3d_allocator_block_free(struct wined3d_allocator_block *block) +{ + struct wined3d_allocator *allocator = block->chunk->allocator; + struct wined3d_allocator_block *parent; + + while ((parent = block->parent) && block->sibling->free) + { + list_remove(&block->sibling->entry); + wined3d_allocator_release_block(allocator, block->sibling); + wined3d_allocator_release_block(allocator, block); + block = parent; + } + + block->free = true; + list_add_head(&block->chunk->available[block->order], &block->entry); +} + +static void wined3d_allocator_block_init(struct wined3d_allocator_block *block, + struct wined3d_allocator_chunk *chunk, struct wined3d_allocator_block *parent, + struct wined3d_allocator_block *sibling, unsigned int order, size_t offset, bool free) +{ + list_init(&block->entry); + block->chunk = chunk; + block->parent = parent; + block->sibling = sibling; + block->order = order; + block->offset = offset; + block->free = free; +} + +void wined3d_allocator_chunk_cleanup(struct wined3d_allocator_chunk *chunk) +{ + struct wined3d_allocator_block *block; + size_t i; + + if (list_empty(&chunk->available[0])) + { + ERR("Chunk %p is not empty.\n", chunk); + return; + } + + for (i = 1; i < ARRAY_SIZE(chunk->available); ++i) + { + if (!list_empty(&chunk->available[i])) + { + ERR("Chunk %p is not empty.\n", chunk); + return; + } + } + + block = LIST_ENTRY(list_head(&chunk->available[0]), struct wined3d_allocator_block, entry); + wined3d_allocator_release_block(chunk->allocator, block); +} + +bool wined3d_allocator_chunk_init(struct wined3d_allocator_chunk *chunk, struct wined3d_allocator *allocator) +{ + struct wined3d_allocator_block *block; + unsigned int i; + + if (!(block = wined3d_allocator_acquire_block(allocator))) + return false; + wined3d_allocator_block_init(block, chunk, NULL, NULL, 0, 0, true); + + list_init(&chunk->entry); + for (i = 0; i < ARRAY_SIZE(chunk->available); ++i) + { + list_init(&chunk->available[i]); + } + list_add_head(&chunk->available[0], &block->entry); + chunk->allocator = allocator; + chunk->map_count = 0; + chunk->map_ptr = NULL; + + return true; +} + +void wined3d_allocator_cleanup(struct wined3d_allocator *allocator) +{ + struct wined3d_allocator_chunk *chunk, *chunk2; + struct wined3d_allocator_block *block, *next; + size_t i; + + for (i = 0; i < allocator->pool_count; ++i) + { + LIST_FOR_EACH_ENTRY_SAFE(chunk, chunk2, &allocator->pools[i].chunks, struct wined3d_allocator_chunk, entry) + { + list_remove(&chunk->entry); + allocator->ops->allocator_destroy_chunk(chunk); + } + } + heap_free(allocator->pools); + + next = allocator->free; + while ((block = next)) + { + next = block->parent; + heap_free(block); + } +} + +static struct wined3d_allocator_block *wined3d_allocator_chunk_allocate(struct wined3d_allocator_chunk *chunk, + unsigned int order) +{ + struct wined3d_allocator_block *block, *left, *right; + unsigned int i = order; + + while (i) + { + if (!list_empty(&chunk->available[i])) + break; + --i; + } + + if (list_empty(&chunk->available[i])) + return NULL; + + block = LIST_ENTRY(list_head(&chunk->available[i]), struct wined3d_allocator_block, entry); + list_remove(&block->entry); + block->free = false; + + while (i < order) + { + if (!(left = wined3d_allocator_acquire_block(chunk->allocator))) + { + ERR("Failed to allocate left.\n"); + break; + } + + if (!(right = wined3d_allocator_acquire_block(chunk->allocator))) + { + ERR("Failed to allocate right.\n"); + wined3d_allocator_release_block(chunk->allocator, left); + break; + } + + wined3d_allocator_block_init(left, chunk, block, right, block->order + 1, block->offset, false); + wined3d_allocator_block_init(right, chunk, block, left, block->order + 1, + block->offset + (WINED3D_ALLOCATOR_CHUNK_SIZE >> left->order), true); + list_add_head(&chunk->available[right->order], &right->entry); + + block = left; + ++i; + } + + return block; +} + +struct wined3d_allocator_block *wined3d_allocator_allocate(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t size) +{ + struct wined3d_allocator_chunk *chunk; + struct wined3d_allocator_block *block; + unsigned int order; + + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) + return NULL; + + if (size < WINED3D_ALLOCATOR_MIN_BLOCK_SIZE) + order = WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1; + else + order = wined3d_log2i(WINED3D_ALLOCATOR_CHUNK_SIZE / size); + + LIST_FOR_EACH_ENTRY(chunk, &allocator->pools[memory_type].chunks, struct wined3d_allocator_chunk, entry) + { + if ((block = wined3d_allocator_chunk_allocate(chunk, order))) + return block; + } + + if (!(chunk = allocator->ops->allocator_create_chunk(allocator, + context, memory_type, WINED3D_ALLOCATOR_CHUNK_SIZE))) + return NULL; + + if (!(block = wined3d_allocator_chunk_allocate(chunk, order))) + return NULL; + + return block; +} + +bool wined3d_allocator_init(struct wined3d_allocator *allocator, + size_t pool_count, const struct wined3d_allocator_ops *allocator_ops) +{ + size_t i; + + allocator->ops = allocator_ops; + allocator->pool_count = pool_count; + if (!(allocator->pools = heap_calloc(pool_count, sizeof(*allocator->pools)))) + return false; + for (i = 0; i < pool_count; ++i) + { + list_init(&allocator->pools[i].chunks); + } + + return true; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe44a6edb0c..ade1eae352c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -33,6 +33,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdbool.h> #include <math.h> #include <limits.h> #include "ntstatus.h" @@ -1520,8 +1521,11 @@ do { \ struct wined3d_bo_vk { VkBuffer vk_buffer; + struct wined3d_allocator_block *memory; + VkDeviceMemory vk_memory; + VkDeviceSize memory_offset; VkMemoryPropertyFlags memory_type; uint64_t command_buffer_id; @@ -2188,6 +2192,7 @@ enum wined3d_retired_object_type_vk { WINED3D_RETIRED_FREE_VK, WINED3D_RETIRED_MEMORY_VK, + WINED3D_RETIRED_ALLOCATOR_BLOCK_VK, WINED3D_RETIRED_BUFFER_VK, }; @@ -2198,6 +2203,7 @@ struct wined3d_retired_object_vk { struct wined3d_retired_object_vk *next; VkDeviceMemory vk_memory; + struct wined3d_allocator_block *block; VkBuffer vk_buffer; } u; uint64_t command_buffer_id; @@ -2236,6 +2242,8 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_vk, c); } +VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk, + unsigned int pool, size_t size) DECLSPEC_HIDDEN; void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; @@ -3422,6 +3430,77 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +#define WINED3D_ALLOCATOR_CHUNK_SIZE (64 * 1024 * 1024) +#define WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT 15 +#define WINED3D_ALLOCATOR_MIN_BLOCK_SIZE (WINED3D_ALLOCATOR_CHUNK_SIZE >> (WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT - 1)) + +struct wined3d_allocator_chunk +{ + struct list entry; + struct list available[WINED3D_ALLOCATOR_CHUNK_ORDER_COUNT]; + struct wined3d_allocator *allocator; + unsigned int map_count; + void *map_ptr; +}; + +void wined3d_allocator_chunk_cleanup(struct wined3d_allocator_chunk *chunk) DECLSPEC_HIDDEN; +bool wined3d_allocator_chunk_init(struct wined3d_allocator_chunk *chunk, + struct wined3d_allocator *allocator) DECLSPEC_HIDDEN; + +struct wined3d_allocator_chunk_vk +{ + struct wined3d_allocator_chunk c; + VkDeviceMemory vk_memory; +}; + +static inline struct wined3d_allocator_chunk_vk *wined3d_allocator_chunk_vk(struct wined3d_allocator_chunk *chunk) +{ + return CONTAINING_RECORD(chunk, struct wined3d_allocator_chunk_vk, c); +} + +void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + +struct wined3d_allocator_block +{ + struct list entry; + struct wined3d_allocator_chunk *chunk; + struct wined3d_allocator_block *parent, *sibling; + unsigned int order; + size_t offset; + bool free; +}; + +void wined3d_allocator_block_free(struct wined3d_allocator_block *block) DECLSPEC_HIDDEN; + +struct wined3d_allocator_pool +{ + struct list chunks; +}; + +struct wined3d_allocator_ops +{ + struct wined3d_allocator_chunk *(*allocator_create_chunk)(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t chunk_size); + void (*allocator_destroy_chunk)(struct wined3d_allocator_chunk *chunk); +}; + +struct wined3d_allocator +{ + const struct wined3d_allocator_ops *ops; + struct wined3d_allocator_pool *pools; + size_t pool_count; + struct wined3d_allocator_block *free; +}; + +struct wined3d_allocator_block *wined3d_allocator_allocate(struct wined3d_allocator *allocator, + struct wined3d_context *context, unsigned int memory_type, size_t size) DECLSPEC_HIDDEN; +void wined3d_allocator_cleanup(struct wined3d_allocator *allocator) DECLSPEC_HIDDEN; +bool wined3d_allocator_init(struct wined3d_allocator *allocator, + size_t pool_count, const struct wined3d_allocator_ops *allocator_ops) DECLSPEC_HIDDEN; + struct wined3d_device_vk { struct wined3d_device d; @@ -3433,6 +3512,8 @@ struct wined3d_device_vk uint32_t vk_queue_family_index; struct wined3d_vk_info vk_info; + + struct wined3d_allocator allocator; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) -- 2.20.1

1 0

[PATCH 02/15] wined3d: Track buffer usage.
by Henri Verbeet 17 Apr '20

17 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 7 +- dlls/wined3d/context_vk.c | 144 ++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 35 +++++++- 3 files changed, 172 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1773f26ae7f..e51eeccc02c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -536,10 +536,13 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, range.size = size; VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); } + + bo->command_buffer_id = context_vk->current_command_buffer.id; } - wined3d_context_vk_submit_command_buffer(context_vk); - wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1); + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); + wined3d_context_vk_wait_command_buffer(context_vk, bo->command_buffer_id); if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, (uintptr_t)data->addr, size, 0, &map_ptr))) < 0) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index b0e65231f25..3fa3ce8207f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -88,24 +88,97 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic } bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + bo->command_buffer_id = 0; + + TRACE("Created buffer 0x%s, memory 0x%s for bo %p.\n", + wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), bo); return TRUE; } -void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +static struct wined3d_retired_object_vk *wined3d_context_vk_get_retired_object_vk(struct wined3d_context_vk *context_vk) +{ + struct wined3d_retired_objects_vk *retired = &context_vk->retired; + struct wined3d_retired_object_vk *o; + + if (retired->free) + { + o = retired->free; + retired->free = o->u.next; + return o; + } + + if (!wined3d_array_reserve((void **)&retired->objects, &retired->size, + retired->count + 1, sizeof(*retired->objects))) + return NULL; + + return &retired->objects[retired->count++]; +} + +static void wined3d_context_vk_destroy_memory(struct wined3d_context_vk *context_vk, + VkDeviceMemory vk_memory, uint64_t command_buffer_id) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkFreeMemory(device_vk->vk_device, vk_memory, NULL)); + TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(vk_memory)); + return; + } - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking memory 0x%s.\n", wine_dbgstr_longlong(vk_memory)); + return; + } + + o->type = WINED3D_RETIRED_MEMORY_VK; + o->u.vk_memory = vk_memory; + o->command_buffer_id = command_buffer_id; +} + +static void wined3d_context_vk_destroy_buffer(struct wined3d_context_vk *context_vk, + VkBuffer vk_buffer, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroyBuffer(device_vk->vk_device, vk_buffer, NULL)); + TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(vk_buffer)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking buffer 0x%s.\n", wine_dbgstr_longlong(vk_buffer)); + return; + } + + o->type = WINED3D_RETIRED_BUFFER_VK; + o->u.vk_buffer = vk_buffer; + o->command_buffer_id = command_buffer_id; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); + wined3d_context_vk_destroy_memory(context_vk, bo->vk_memory, bo->command_buffer_id); } static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + struct wined3d_retired_objects_vk *retired = &context_vk->retired; const struct wined3d_vk_info *vk_info = context_vk->vk_info; struct wined3d_command_buffer_vk *buffer; + struct wined3d_retired_object_vk *o; + uint64_t command_buffer_id; SIZE_T i = 0; while (i < context_vk->submitted.buffer_count) @@ -127,6 +200,47 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont context_vk->completed_command_buffer_id = buffer->id; *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; } + command_buffer_id = context_vk->completed_command_buffer_id; + + retired->free = NULL; + for (i = retired->count; i; --i) + { + o = &retired->objects[i - 1]; + + if (o->type != WINED3D_RETIRED_FREE_VK && o->command_buffer_id > command_buffer_id) + continue; + + switch (o->type) + { + case WINED3D_RETIRED_FREE_VK: + /* Nothing to do. */ + break; + + case WINED3D_RETIRED_MEMORY_VK: + VK_CALL(vkFreeMemory(device_vk->vk_device, o->u.vk_memory, NULL)); + TRACE("Freed memory 0x%s.\n", wine_dbgstr_longlong(o->u.vk_memory)); + break; + + case WINED3D_RETIRED_BUFFER_VK: + VK_CALL(vkDestroyBuffer(device_vk->vk_device, o->u.vk_buffer, NULL)); + TRACE("Destroyed buffer 0x%s.\n", wine_dbgstr_longlong(o->u.vk_buffer)); + break; + + default: + ERR("Unhandled object type %#x.\n", o->type); + break; + } + + if (i == retired->count) + { + --retired->count; + continue; + } + + o->type = WINED3D_RETIRED_FREE_VK; + o->u.next = retired->free; + retired->free = o; + } } void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) @@ -147,6 +261,8 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) context_vk->completed_command_buffer_id = buffer->id; wined3d_context_vk_cleanup_resources(context_vk); heap_free(context_vk->submitted.buffers); + heap_free(context_vk->retired.objects); + wined3d_context_cleanup(&context_vk->c); } @@ -199,7 +315,9 @@ VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk return buffer->vk_command_buffer; } -void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk, + unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, + unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -208,7 +326,10 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context VkSubmitInfo submit_info; VkResult vr; - TRACE("context_vk %p.\n", context_vk); + TRACE("context_vk %p, wait_semaphore_count %u, wait_semaphores %p, wait_stages %p," + "signal_semaphore_count %u, signal_semaphores %p.\n", + context_vk, wait_semaphore_count, wait_semaphores, wait_stages, + signal_semaphore_count, signal_semaphores); buffer = &context_vk->current_command_buffer; if (!buffer->vk_command_buffer) @@ -227,13 +348,13 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; + submit_info.waitSemaphoreCount = wait_semaphore_count; + submit_info.pWaitSemaphores = wait_semaphores; + submit_info.pWaitDstStageMask = wait_stages; submit_info.commandBufferCount = 1; submit_info.pCommandBuffers = &buffer->vk_command_buffer; - submit_info.signalSemaphoreCount = 0; - submit_info.pSignalSemaphores = NULL; + submit_info.signalSemaphoreCount = signal_semaphore_count; + submit_info.pSignalSemaphores = signal_semaphores; if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) ERR("Failed to submit command buffer %p, vr %s.\n", @@ -262,7 +383,8 @@ void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_v const struct wined3d_vk_info *vk_info = context_vk->vk_info; SIZE_T i; - if (id <= context_vk->completed_command_buffer_id) + if (id <= context_vk->completed_command_buffer_id + || id > context_vk->current_command_buffer.id) /* In case the buffer ID wrapped. */ return; for (i = 0; i < context_vk->submitted.buffer_count; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2b3cd9548e..fe44a6edb0c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1523,6 +1523,8 @@ struct wined3d_bo_vk VkDeviceMemory vk_memory; VkMemoryPropertyFlags memory_type; + + uint64_t command_buffer_id; }; struct wined3d_bo_address @@ -2182,6 +2184,33 @@ struct wined3d_command_buffer_vk VkFence vk_fence; }; +enum wined3d_retired_object_type_vk +{ + WINED3D_RETIRED_FREE_VK, + WINED3D_RETIRED_MEMORY_VK, + WINED3D_RETIRED_BUFFER_VK, +}; + +struct wined3d_retired_object_vk +{ + enum wined3d_retired_object_type_vk type; + union + { + struct wined3d_retired_object_vk *next; + VkDeviceMemory vk_memory; + VkBuffer vk_buffer; + } u; + uint64_t command_buffer_id; +}; + +struct wined3d_retired_objects_vk +{ + struct wined3d_retired_object_vk *objects; + struct wined3d_retired_object_vk *free; + SIZE_T size; + SIZE_T count; +}; + struct wined3d_context_vk { struct wined3d_context c; @@ -2198,6 +2227,8 @@ struct wined3d_context_vk SIZE_T buffers_size; SIZE_T buffer_count; } submitted; + + struct wined3d_retired_objects_vk retired; }; static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) @@ -2213,7 +2244,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk, + unsigned int wait_semaphore_count, const VkSemaphore *wait_semaphores, const VkPipelineStageFlags *wait_stages, + unsigned int signal_semaphore_count, const VkSemaphore *signal_semaphores) DECLSPEC_HIDDEN; void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) DECLSPEC_HIDDEN; typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); -- 2.20.1

1 0

[PATCH 01/15] wined3d: Move OpenGL specific context functions to context_gl.c.
by Henri Verbeet 17 Apr '20

17 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 6270 ++-------------------- dlls/wined3d/{context.c => context_gl.c} | 459 -- dlls/wined3d/wined3d_private.h | 17 + 4 files changed, 496 insertions(+), 6251 deletions(-) rewrite dlls/wined3d/context.c (92%) copy dlls/wined3d/{context.c => context_gl.c} (92%) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 0f8be5bd18b..35f329120b3 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ ati_fragment_shader.c \ buffer.c \ context.c \ + context_gl.c \ context_vk.c \ cs.c \ device.c \ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c dissimilarity index 92% index d20e9e6835e..7959199e1f4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1,5792 +1,478 @@ -/* - * Context and render target management in wined3d - * - * Copyright 2002-2004 Jason Edmeades - * Copyright 2002-2004 Raphael Junqueira - * Copyright 2004 Christian Costa - * Copyright 2005 Oliver Stieber - * Copyright 2006, 2008 Henri Verbeet - * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers - * Copyright 2009-2011 Henri Verbeet for CodeWeavers - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif - -#include "wined3d_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); - -#define WINED3D_MAX_FBO_ENTRIES 64 -#define WINED3D_ALL_LAYERS (~0u) - -static DWORD wined3d_context_tls_idx; - -/* FBO helper functions */ - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_bind_fbo(struct wined3d_context_gl *context_gl, GLenum target, GLuint fbo) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - switch (target) - { - case GL_READ_FRAMEBUFFER: - if (context_gl->fbo_read_binding == fbo) - return; - context_gl->fbo_read_binding = fbo; - break; - - case GL_DRAW_FRAMEBUFFER: - if (context_gl->fbo_draw_binding == fbo) - return; - context_gl->fbo_draw_binding = fbo; - break; - - case GL_FRAMEBUFFER: - if (context_gl->fbo_read_binding == fbo - && context_gl->fbo_draw_binding == fbo) - return; - context_gl->fbo_read_binding = fbo; - context_gl->fbo_draw_binding = fbo; - break; - - default: - FIXME("Unhandled target %#x.\n", target); - break; - } - - gl_info->fbo_ops.glBindFramebuffer(target, fbo); - checkGLcall("glBindFramebuffer()"); -} - -/* Context activation is done by the caller. */ -static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, GLenum target) -{ - unsigned int i; - - for (i = 0; i < gl_info->limits.buffers; ++i) - { - gl_info->fbo_ops.glFramebufferTexture2D(target, GL_COLOR_ATTACHMENT0 + i, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - } - gl_info->fbo_ops.glFramebufferTexture2D(target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - - gl_info->fbo_ops.glFramebufferTexture2D(target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl, GLuint fbo) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo); - context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - - gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); - checkGLcall("glDeleteFramebuffers()"); -} - -static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_info, - GLenum fbo_target, DWORD flags, GLuint rb) -{ - if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - { - gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rb); - checkGLcall("glFramebufferRenderbuffer()"); - } - - if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - { - gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, rb); - checkGLcall("glFramebufferRenderbuffer()"); - } -} - -static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl *context_gl, - GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!resource) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0); - } - else if (resource->layer == WINED3D_ALL_LAYERS) - { - if (!gl_info->fbo_ops.glFramebufferTexture) - { - FIXME("OpenGL implementation doesn't support glFramebufferTexture().\n"); - return; - } - - gl_info->fbo_ops.glFramebufferTexture(fbo_target, attachment, - resource->object, resource->level); - } - else if (resource->target == GL_TEXTURE_1D_ARRAY || resource->target == GL_TEXTURE_2D_ARRAY - || resource->target == GL_TEXTURE_3D) - { - if (!gl_info->fbo_ops.glFramebufferTextureLayer) - { - FIXME("OpenGL implementation doesn't support glFramebufferTextureLayer().\n"); - return; - } - - gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, - resource->object, resource->level, resource->layer); - } - else if (resource->target == GL_TEXTURE_1D) - { - gl_info->fbo_ops.glFramebufferTexture1D(fbo_target, attachment, - resource->target, resource->object, resource->level); - } - else - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, - resource->target, resource->object, resource->level); - } - checkGLcall("attach texture to fbo"); -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_attach_depth_stencil_fbo(struct wined3d_context_gl *context_gl, - GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, - uint32_t flags) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (resource->object) - { - TRACE("Attach depth stencil %u.\n", resource->object); - - if (rb_namespace) - { - context_attach_depth_stencil_rb(gl_info, fbo_target, - flags, resource->object); - } - else - { - if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, resource); - - if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, resource); - } - - if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); - - if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); - } - else - { - TRACE("Attach depth stencil 0.\n"); - - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); - } -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_attach_surface_fbo(struct wined3d_context_gl *context_gl, - GLenum fbo_target, unsigned int idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - TRACE("Attach GL object %u to %u.\n", resource->object, idx); - - if (resource->object) - { - if (rb_namespace) - { - gl_info->fbo_ops.glFramebufferRenderbuffer(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - GL_RENDERBUFFER, resource->object); - checkGLcall("glFramebufferRenderbuffer()"); - } - else - { - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); - } - } - else - { - wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); - } -} - -static void context_dump_fbo_attachment(const struct wined3d_gl_info *gl_info, GLenum target, - GLenum attachment) -{ - static const struct - { - GLenum target; - GLenum binding; - const char *str; - enum wined3d_gl_extension extension; - } - texture_type[] = - { - {GL_TEXTURE_1D, GL_TEXTURE_BINDING_1D, "1d", WINED3D_GL_EXT_NONE}, - {GL_TEXTURE_1D_ARRAY, GL_TEXTURE_BINDING_1D_ARRAY, "1d-array", EXT_TEXTURE_ARRAY}, - {GL_TEXTURE_2D, GL_TEXTURE_BINDING_2D, "2d", WINED3D_GL_EXT_NONE}, - {GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB, "rectangle", ARB_TEXTURE_RECTANGLE}, - {GL_TEXTURE_2D_ARRAY, GL_TEXTURE_BINDING_2D_ARRAY, "2d-array" , EXT_TEXTURE_ARRAY}, - {GL_TEXTURE_CUBE_MAP, GL_TEXTURE_BINDING_CUBE_MAP, "cube", ARB_TEXTURE_CUBE_MAP}, - {GL_TEXTURE_2D_MULTISAMPLE, GL_TEXTURE_BINDING_2D_MULTISAMPLE, "2d-ms", ARB_TEXTURE_MULTISAMPLE}, - {GL_TEXTURE_2D_MULTISAMPLE_ARRAY, GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY, "2d-array-ms", ARB_TEXTURE_MULTISAMPLE}, - }; - - GLint type, name, samples, width, height, old_texture, level, face, fmt, tex_target; - const char *tex_type_str; - unsigned int i; - - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, - GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &name); - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, - GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE, &type); - - if (type == GL_RENDERBUFFER) - { - gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, name); - gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &width); - gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &height); - if (gl_info->limits.samples > 1) - gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_SAMPLES, &samples); - else - samples = 1; - gl_info->fbo_ops.glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_INTERNAL_FORMAT, &fmt); - FIXME(" %s: renderbuffer %d, %dx%d, %d samples, format %#x.\n", - debug_fboattachment(attachment), name, width, height, samples, fmt); - } - else if (type == GL_TEXTURE) - { - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, - GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL, &level); - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv(target, attachment, - GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE, &face); - - if (gl_info->gl_ops.ext.p_glGetTextureParameteriv) - { - GL_EXTCALL(glGetTextureParameteriv(name, GL_TEXTURE_TARGET, &tex_target)); - - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) - { - if (texture_type[i].target == tex_target) - { - tex_type_str = texture_type[i].str; - break; - } - } - if (i == ARRAY_SIZE(texture_type)) - tex_type_str = wine_dbg_sprintf("%#x", tex_target); - } - else if (face) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP, &old_texture); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, name); - - tex_target = GL_TEXTURE_CUBE_MAP; - tex_type_str = "cube"; - } - else - { - tex_type_str = NULL; - - for (i = 0; i < ARRAY_SIZE(texture_type); ++i) - { - if (!gl_info->supported[texture_type[i].extension]) - continue; - - gl_info->gl_ops.gl.p_glGetIntegerv(texture_type[i].binding, &old_texture); - while (gl_info->gl_ops.gl.p_glGetError()); - - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, name); - if (!gl_info->gl_ops.gl.p_glGetError()) - { - tex_target = texture_type[i].target; - tex_type_str = texture_type[i].str; - break; - } - gl_info->gl_ops.gl.p_glBindTexture(texture_type[i].target, old_texture); - } - - if (!tex_type_str) - { - FIXME("Cannot find type of texture %d.\n", name); - return; - } - } - - if (gl_info->gl_ops.ext.p_glGetTextureParameteriv) - { - GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt)); - GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_WIDTH, &width)); - GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_HEIGHT, &height)); - GL_EXTCALL(glGetTextureLevelParameteriv(name, level, GL_TEXTURE_SAMPLES, &samples)); - } - else - { - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_INTERNAL_FORMAT, &fmt); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_WIDTH, &width); - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_HEIGHT, &height); - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(tex_target, level, GL_TEXTURE_SAMPLES, &samples); - else - samples = 1; - - gl_info->gl_ops.gl.p_glBindTexture(tex_target, old_texture); - } - - FIXME(" %s: %s texture %d, %dx%d, %d samples, format %#x.\n", - debug_fboattachment(attachment), tex_type_str, name, width, height, samples, fmt); - } - else if (type == GL_NONE) - { - FIXME(" %s: NONE.\n", debug_fboattachment(attachment)); - } - else - { - ERR(" %s: Unknown attachment %#x.\n", debug_fboattachment(attachment), type); - } - - checkGLcall("dump FBO attachment"); -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum status; - - if (!FIXME_ON(d3d)) - return; - - status = gl_info->fbo_ops.glCheckFramebufferStatus(target); - if (status == GL_FRAMEBUFFER_COMPLETE) - { - TRACE("FBO complete.\n"); - } - else - { - unsigned int i; - - FIXME("FBO status %s (%#x).\n", debug_fbostatus(status), status); - - if (!context_gl->current_fbo) - { - ERR("FBO 0 is incomplete, driver bug?\n"); - return; - } - - context_dump_fbo_attachment(gl_info, target, GL_DEPTH_ATTACHMENT); - context_dump_fbo_attachment(gl_info, target, GL_STENCIL_ATTACHMENT); - - for (i = 0; i < gl_info->limits.buffers; ++i) - context_dump_fbo_attachment(gl_info, target, GL_COLOR_ATTACHMENT0 + i); - } -} - -static inline DWORD context_generate_rt_mask(GLenum buffer) -{ - /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ - return buffer ? (1u << 31) | buffer : 0; -} - -static inline DWORD context_generate_rt_mask_from_resource(struct wined3d_resource *resource) -{ - if (resource->type != WINED3D_RTYPE_TEXTURE_2D) - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); - return 0; - } - - return (1u << 31) | wined3d_texture_get_gl_buffer(texture_from_resource(resource)); -} - -static inline void wined3d_context_gl_set_fbo_key_for_render_target(const struct wined3d_context_gl *context_gl, - struct wined3d_fbo_entry_key *key, unsigned int idx, const struct wined3d_rendertarget_info *render_target, - DWORD location) -{ - unsigned int sub_resource_idx = render_target->sub_resource_idx; - struct wined3d_resource *resource = render_target->resource; - struct wined3d_texture_gl *texture_gl; - - if (!resource || resource->format->id == WINED3DFMT_NULL || resource->type == WINED3D_RTYPE_BUFFER) - { - if (resource && resource->type == WINED3D_RTYPE_BUFFER) - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); - key->objects[idx].object = 0; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - return; - } - - if (render_target->gl_view.name) - { - key->objects[idx].object = render_target->gl_view.name; - key->objects[idx].target = render_target->gl_view.target; - key->objects[idx].level = 0; - key->objects[idx].layer = WINED3D_ALL_LAYERS; - return; - } - - texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(resource)); - if (texture_gl->current_renderbuffer) - { - key->objects[idx].object = texture_gl->current_renderbuffer->id; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - key->rb_namespace |= 1 << idx; - return; - } - - key->objects[idx].target = wined3d_texture_gl_get_sub_resource_target(texture_gl, sub_resource_idx); - key->objects[idx].level = sub_resource_idx % texture_gl->t.level_count; - key->objects[idx].layer = sub_resource_idx / texture_gl->t.level_count; - - if (render_target->layer_count != 1) - key->objects[idx].layer = WINED3D_ALL_LAYERS; - - switch (location) - { - case WINED3D_LOCATION_TEXTURE_RGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); - break; - - case WINED3D_LOCATION_TEXTURE_SRGB: - key->objects[idx].object = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, TRUE); - break; - - case WINED3D_LOCATION_RB_MULTISAMPLE: - key->objects[idx].object = texture_gl->rb_multisample; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - key->rb_namespace |= 1 << idx; - break; - - case WINED3D_LOCATION_RB_RESOLVED: - key->objects[idx].object = texture_gl->rb_resolved; - key->objects[idx].target = 0; - key->objects[idx].level = key->objects[idx].layer = 0; - key->rb_namespace |= 1 << idx; - break; - } -} - -static void wined3d_context_gl_generate_fbo_key(const struct wined3d_context_gl *context_gl, - struct wined3d_fbo_entry_key *key, const struct wined3d_rendertarget_info *render_targets, - const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) -{ - unsigned int buffers = context_gl->gl_info->limits.buffers; - unsigned int i; - - key->rb_namespace = 0; - wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, 0, depth_stencil, ds_location); - - for (i = 0; i < buffers; ++i) - wined3d_context_gl_set_fbo_key_for_render_target(context_gl, key, i + 1, &render_targets[i], color_location); - - memset(&key->objects[buffers + 1], 0, (ARRAY_SIZE(key->objects) - buffers - 1) * sizeof(*key->objects)); -} - -static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3d_context_gl *context_gl, - const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, - DWORD color_location, DWORD ds_location) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct fbo_entry *entry; - - entry = heap_alloc(sizeof(*entry)); - wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, - render_targets, depth_stencil, color_location, ds_location); - entry->flags = 0; - if (depth_stencil->resource) - { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) - entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) - entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; - } - entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); - gl_info->fbo_ops.glGenFramebuffers(1, &entry->id); - checkGLcall("glGenFramebuffers()"); - TRACE("Created FBO %u.\n", entry->id); - - return entry; -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, - const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, - DWORD color_location, DWORD ds_location, struct fbo_entry *entry) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - wined3d_context_gl_bind_fbo(context_gl, target, entry->id); - context_clean_fbo_attachments(gl_info, target); - - wined3d_context_gl_generate_fbo_key(context_gl, &entry->key, - render_targets, depth_stencil, color_location, ds_location); - entry->flags = 0; - if (depth_stencil->resource) - { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) - entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) - entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; - } -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *context_gl, struct fbo_entry *entry) -{ - if (entry->id) - { - TRACE("Destroy FBO %u.\n", entry->id); - wined3d_context_gl_destroy_fbo(context_gl, entry->id); - } - --context_gl->fbo_entry_count; - list_remove(&entry->entry); - heap_free(entry); -} - -/* Context activation is done by the caller. */ -static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, - const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, - DWORD color_location, DWORD ds_location) -{ - static const struct wined3d_rendertarget_info ds_null = {{0}}; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_texture *rt_texture, *ds_texture; - struct wined3d_fbo_entry_key fbo_key; - unsigned int i, ds_level, rt_level; - struct fbo_entry *entry; - - if (depth_stencil->resource && depth_stencil->resource->type != WINED3D_RTYPE_BUFFER - && render_targets[0].resource && render_targets[0].resource->type != WINED3D_RTYPE_BUFFER) - { - rt_texture = wined3d_texture_from_resource(render_targets[0].resource); - rt_level = render_targets[0].sub_resource_idx % rt_texture->level_count; - ds_texture = wined3d_texture_from_resource(depth_stencil->resource); - ds_level = depth_stencil->sub_resource_idx % ds_texture->level_count; - - if (wined3d_texture_get_level_width(ds_texture, ds_level) - < wined3d_texture_get_level_width(rt_texture, rt_level) - || wined3d_texture_get_level_height(ds_texture, ds_level) - < wined3d_texture_get_level_height(rt_texture, rt_level)) - { - WARN("Depth stencil is smaller than the primary color buffer, disabling.\n"); - depth_stencil = &ds_null; - } - else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type - || (ds_texture->resource.multisample_type - && ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality)) - { - WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality, - ds_texture->resource.multisample_type, ds_texture->resource.multisample_quality); - depth_stencil = &ds_null; - } - else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) - { - wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - context_gl, ds_level, &render_targets[0]); - } - } - - wined3d_context_gl_generate_fbo_key(context_gl, &fbo_key, - render_targets, depth_stencil, color_location, ds_location); - - if (TRACE_ON(d3d)) - { - struct wined3d_resource *resource; - unsigned int width, height; - const char *resource_type; - - TRACE("Dumping FBO attachments:\n"); - for (i = 0; i < gl_info->limits.buffers; ++i) - { - if ((resource = render_targets[i].resource)) - { - if (resource->type == WINED3D_RTYPE_BUFFER) - { - width = resource->size; - height = 1; - resource_type = "buffer"; - } - else - { - rt_texture = wined3d_texture_from_resource(resource); - rt_level = render_targets[i].sub_resource_idx % rt_texture->level_count; - width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); - height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); - resource_type = "texture"; - } - - TRACE(" Color attachment %u: %p, %u format %s, %s %u, %ux%u, %u samples.\n", - i, resource, render_targets[i].sub_resource_idx, debug_d3dformat(resource->format->id), - fbo_key.rb_namespace & (1 << (i + 1)) ? "renderbuffer" : resource_type, - fbo_key.objects[i + 1].object, width, height, resource->multisample_type); - } - } - if ((resource = depth_stencil->resource)) - { - if (resource->type == WINED3D_RTYPE_BUFFER) - { - width = resource->size; - height = 1; - resource_type = "buffer"; - } - else - { - ds_texture = wined3d_texture_from_resource(resource); - ds_level = depth_stencil->sub_resource_idx % ds_texture->level_count; - width = wined3d_texture_get_level_pow2_width(ds_texture, ds_level); - height = wined3d_texture_get_level_pow2_height(ds_texture, ds_level); - resource_type = "texture"; - } - - TRACE(" Depth attachment: %p, %u format %s, %s %u, %ux%u, %u samples.\n", - resource, depth_stencil->sub_resource_idx, debug_d3dformat(resource->format->id), - fbo_key.rb_namespace & (1 << 0) ? "renderbuffer" : resource_type, - fbo_key.objects[0].object, width, height, resource->multisample_type); - } - } - - LIST_FOR_EACH_ENTRY(entry, &context_gl->fbo_list, struct fbo_entry, entry) - { - if (memcmp(&fbo_key, &entry->key, sizeof(fbo_key))) - continue; - - list_remove(&entry->entry); - list_add_head(&context_gl->fbo_list, &entry->entry); - return entry; - } - - if (context_gl->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) - { - entry = wined3d_context_gl_create_fbo_entry(context_gl, - render_targets, depth_stencil, color_location, ds_location); - list_add_head(&context_gl->fbo_list, &entry->entry); - ++context_gl->fbo_entry_count; - } - else - { - entry = LIST_ENTRY(list_tail(&context_gl->fbo_list), struct fbo_entry, entry); - wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, - depth_stencil, color_location, ds_location, entry); - list_remove(&entry->entry); - list_add_head(&context_gl->fbo_list, &entry->entry); - } - - return entry; -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *context_gl, - GLenum target, struct fbo_entry *entry) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLuint read_binding, draw_binding; - unsigned int i; - - if (entry->flags & WINED3D_FBO_ENTRY_FLAG_ATTACHED) - { - wined3d_context_gl_bind_fbo(context_gl, target, entry->id); - return; - } - - read_binding = context_gl->fbo_read_binding; - draw_binding = context_gl->fbo_draw_binding; - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); - - if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) - { - GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, - GL_FRAMEBUFFER_DEFAULT_WIDTH, gl_info->limits.framebuffer_width)); - GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, - GL_FRAMEBUFFER_DEFAULT_HEIGHT, gl_info->limits.framebuffer_height)); - GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_LAYERS, 1)); - GL_EXTCALL(glFramebufferParameteri(GL_FRAMEBUFFER, GL_FRAMEBUFFER_DEFAULT_SAMPLES, 1)); - } - - /* Apply render targets */ - for (i = 0; i < gl_info->limits.buffers; ++i) - { - wined3d_context_gl_attach_surface_fbo(context_gl, target, i, - &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); - } - - wined3d_context_gl_attach_depth_stencil_fbo(context_gl, target, - &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); - - /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility - * GL contexts requirements. */ - gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); - wined3d_context_gl_set_draw_buffer(context_gl, GL_NONE); - if (target != GL_FRAMEBUFFER) - { - if (target == GL_READ_FRAMEBUFFER) - wined3d_context_gl_bind_fbo(context_gl, GL_DRAW_FRAMEBUFFER, draw_binding); - else - wined3d_context_gl_bind_fbo(context_gl, GL_READ_FRAMEBUFFER, read_binding); - } - - entry->flags |= WINED3D_FBO_ENTRY_FLAG_ATTACHED; -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *context_gl, GLenum target, - const struct wined3d_rendertarget_info *render_targets, - const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) -{ - struct fbo_entry *entry, *entry2; - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_destroy_list, struct fbo_entry, entry) - { - wined3d_context_gl_destroy_fbo_entry(context_gl, entry); - } - - if (context_gl->rebind_fbo) - { - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context_gl->rebind_fbo = FALSE; - } - - if (color_location == WINED3D_LOCATION_DRAWABLE) - { - context_gl->current_fbo = NULL; - wined3d_context_gl_bind_fbo(context_gl, target, 0); - } - else - { - context_gl->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, - target, render_targets, depth_stencil, color_location, ds_location); - wined3d_context_gl_apply_fbo_entry(context_gl, target, context_gl->current_fbo); - } -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_gl, GLenum target, - struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, - struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) -{ - struct wined3d_rendertarget_info ds_info = {{0}}; - - memset(context_gl->blit_targets, 0, sizeof(context_gl->blit_targets)); - if (rt) - { - context_gl->blit_targets[0].resource = rt; - context_gl->blit_targets[0].sub_resource_idx = rt_sub_resource_idx; - context_gl->blit_targets[0].layer_count = 1; - } - - if (ds) - { - ds_info.resource = ds; - ds_info.sub_resource_idx = ds_sub_resource_idx; - ds_info.layer_count = 1; - } - - wined3d_context_gl_apply_fbo_state(context_gl, target, context_gl->blit_targets, &ds_info, location, location); -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_alloc_occlusion_query(struct wined3d_context_gl *context_gl, - struct wined3d_occlusion_query *query) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->free_occlusion_query_count) - { - query->id = context_gl->free_occlusion_queries[--context_gl->free_occlusion_query_count]; - } - else - { - if (gl_info->supported[ARB_OCCLUSION_QUERY]) - { - GL_EXTCALL(glGenQueries(1, &query->id)); - checkGLcall("glGenQueries"); - - TRACE("Allocated occlusion query %u in context %p.\n", query->id, context_gl); - } - else - { - WARN("Occlusion queries not supported, not allocating query id.\n"); - query->id = 0; - } - } - - query->context_gl = context_gl; - list_add_head(&context_gl->occlusion_queries, &query->entry); -} - -void wined3d_context_gl_free_occlusion_query(struct wined3d_occlusion_query *query) -{ - struct wined3d_context_gl *context_gl = query->context_gl; - - list_remove(&query->entry); - query->context_gl = NULL; - - if (!wined3d_array_reserve((void **)&context_gl->free_occlusion_queries, - &context_gl->free_occlusion_query_size, context_gl->free_occlusion_query_count + 1, - sizeof(*context_gl->free_occlusion_queries))) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context_gl); - return; - } - - context_gl->free_occlusion_queries[context_gl->free_occlusion_query_count++] = query->id; -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_alloc_fence(struct wined3d_context_gl *context_gl, struct wined3d_fence *fence) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->free_fence_count) - { - fence->object = context_gl->free_fences[--context_gl->free_fence_count]; - } - else - { - if (gl_info->supported[ARB_SYNC]) - { - /* Using ARB_sync, not much to do here. */ - fence->object.sync = NULL; - TRACE("Allocated sync object in context %p.\n", context_gl); - } - else if (gl_info->supported[APPLE_FENCE]) - { - GL_EXTCALL(glGenFencesAPPLE(1, &fence->object.id)); - checkGLcall("glGenFencesAPPLE"); - - TRACE("Allocated fence %u in context %p.\n", fence->object.id, context_gl); - } - else if(gl_info->supported[NV_FENCE]) - { - GL_EXTCALL(glGenFencesNV(1, &fence->object.id)); - checkGLcall("glGenFencesNV"); - - TRACE("Allocated fence %u in context %p.\n", fence->object.id, context_gl); - } - else - { - WARN("Fences not supported, not allocating fence.\n"); - fence->object.id = 0; - } - } - - fence->context_gl = context_gl; - list_add_head(&context_gl->fences, &fence->entry); -} - -void wined3d_context_gl_free_fence(struct wined3d_fence *fence) -{ - struct wined3d_context_gl *context_gl = fence->context_gl; - - list_remove(&fence->entry); - fence->context_gl = NULL; - - if (!wined3d_array_reserve((void **)&context_gl->free_fences, - &context_gl->free_fence_size, context_gl->free_fence_count + 1, - sizeof(*context_gl->free_fences))) - { - ERR("Failed to grow free list, leaking fence %u in context %p.\n", fence->object.id, context_gl); - return; - } - - context_gl->free_fences[context_gl->free_fence_count++] = fence->object; -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_alloc_timestamp_query(struct wined3d_context_gl *context_gl, - struct wined3d_timestamp_query *query) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->free_timestamp_query_count) - { - query->id = context_gl->free_timestamp_queries[--context_gl->free_timestamp_query_count]; - } - else - { - GL_EXTCALL(glGenQueries(1, &query->id)); - checkGLcall("glGenQueries"); - - TRACE("Allocated timestamp query %u in context %p.\n", query->id, context_gl); - } - - query->context_gl = context_gl; - list_add_head(&context_gl->timestamp_queries, &query->entry); -} - -void wined3d_context_gl_free_timestamp_query(struct wined3d_timestamp_query *query) -{ - struct wined3d_context_gl *context_gl = query->context_gl; - - list_remove(&query->entry); - query->context_gl = NULL; - - if (!wined3d_array_reserve((void **)&context_gl->free_timestamp_queries, - &context_gl->free_timestamp_query_size, context_gl->free_timestamp_query_count + 1, - sizeof(*context_gl->free_timestamp_queries))) - { - ERR("Failed to grow free list, leaking query %u in context %p.\n", query->id, context_gl); - return; - } - - context_gl->free_timestamp_queries[context_gl->free_timestamp_query_count++] = query->id; -} - -void wined3d_context_gl_alloc_so_statistics_query(struct wined3d_context_gl *context_gl, - struct wined3d_so_statistics_query *query) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->free_so_statistics_query_count) - { - query->u = context_gl->free_so_statistics_queries[--context_gl->free_so_statistics_query_count]; - } - else - { - GL_EXTCALL(glGenQueries(ARRAY_SIZE(query->u.id), query->u.id)); - checkGLcall("glGenQueries"); - - TRACE("Allocated SO statistics queries %u, %u in context %p.\n", - query->u.id[0], query->u.id[1], context_gl); - } - - query->context_gl = context_gl; - list_add_head(&context_gl->so_statistics_queries, &query->entry); -} - -void wined3d_context_gl_free_so_statistics_query(struct wined3d_so_statistics_query *query) -{ - struct wined3d_context_gl *context_gl = query->context_gl; - - list_remove(&query->entry); - query->context_gl = NULL; - - if (!wined3d_array_reserve((void **)&context_gl->free_so_statistics_queries, - &context_gl->free_so_statistics_query_size, context_gl->free_so_statistics_query_count + 1, - sizeof(*context_gl->free_so_statistics_queries))) - { - ERR("Failed to grow free list, leaking GL queries %u, %u in context %p.\n", - query->u.id[0], query->u.id[1], context_gl); - return; - } - - context_gl->free_so_statistics_queries[context_gl->free_so_statistics_query_count++] = query->u; -} - -void wined3d_context_gl_alloc_pipeline_statistics_query(struct wined3d_context_gl *context_gl, - struct wined3d_pipeline_statistics_query *query) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->free_pipeline_statistics_query_count) - { - query->u = context_gl->free_pipeline_statistics_queries[--context_gl->free_pipeline_statistics_query_count]; - } - else - { - GL_EXTCALL(glGenQueries(ARRAY_SIZE(query->u.id), query->u.id)); - checkGLcall("glGenQueries"); - } - - query->context_gl = context_gl; - list_add_head(&context_gl->pipeline_statistics_queries, &query->entry); -} - -void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_statistics_query *query) -{ - struct wined3d_context_gl *context_gl = query->context_gl; - - list_remove(&query->entry); - query->context_gl = NULL; - - if (!wined3d_array_reserve((void **)&context_gl->free_pipeline_statistics_queries, - &context_gl->free_pipeline_statistics_query_size, context_gl->free_pipeline_statistics_query_count + 1, - sizeof(*context_gl->free_pipeline_statistics_queries))) - { - ERR("Failed to grow free list, leaking GL queries in context %p.\n", context_gl); - return; - } - - context_gl->free_pipeline_statistics_queries[context_gl->free_pipeline_statistics_query_count++] = query->u; -} - -typedef void (context_fbo_entry_func_t)(struct wined3d_context_gl *context_gl, struct fbo_entry *entry); - -static void wined3d_context_gl_enum_fbo_entries(const struct wined3d_device *device, - GLuint name, BOOL rb_namespace, context_fbo_entry_func_t *callback) -{ - unsigned int i, j; - - for (i = 0; i < device->context_count; ++i) - { - struct wined3d_context_gl *context_gl = wined3d_context_gl(device->contexts[i]); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct fbo_entry *entry, *entry2; - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_list, struct fbo_entry, entry) - { - for (j = 0; j < gl_info->limits.buffers + 1; ++j) - { - if (entry->key.objects[j].object == name - && !(entry->key.rb_namespace & (1 << j)) == !rb_namespace) - { - callback(context_gl, entry); - break; - } - } - } - } -} - -static void wined3d_context_gl_queue_fbo_entry_destruction(struct wined3d_context_gl *context_gl, - struct fbo_entry *entry) -{ - list_remove(&entry->entry); - list_add_head(&context_gl->fbo_destroy_list, &entry->entry); -} - -void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) -{ - unsigned int i; - - if (!device->d3d_initialized) - return; - - for (i = 0; i < device->context_count; ++i) - { - struct wined3d_context *context = device->contexts[i]; - - if (&context->current_rt.texture->resource == resource) - { - context->current_rt.texture = NULL; - context->current_rt.sub_resource_idx = 0; - } - } -} - -void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) -{ - wined3d_context_gl_enum_fbo_entries(device, name, rb_namespace, - wined3d_context_gl_queue_fbo_entry_destruction); -} - -void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, - const struct wined3d_texture_gl *texture_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct fbo_entry *entry = context_gl->current_fbo; - unsigned int i; - - if (!entry || context_gl->rebind_fbo) - return; - - for (i = 0; i < gl_info->limits.buffers + 1; ++i) - { - if (texture_gl->texture_rgb.name == entry->key.objects[i].object - || texture_gl->texture_srgb.name == entry->key.objects[i].object) - { - TRACE("Updated texture %p is bound as attachment %u to the current FBO.\n", texture_gl, i); - context_gl->rebind_fbo = TRUE; - return; - } - } -} - -static BOOL wined3d_context_gl_restore_pixel_format(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - BOOL ret = FALSE; - - if (context_gl->restore_pf && IsWindow(context_gl->restore_pf_win)) - { - if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) - { - HDC dc = GetDCEx(context_gl->restore_pf_win, 0, DCX_USESTYLE | DCX_CACHE); - if (dc) - { - if (!(ret = GL_EXTCALL(wglSetPixelFormatWINE(dc, context_gl->restore_pf)))) - { - ERR("Failed to restore pixel format %d on window %p.\n", - context_gl->restore_pf, context_gl->restore_pf_win); - } - ReleaseDC(context_gl->restore_pf_win, dc); - } - } - else - { - ERR("Unable to restore pixel format %d on window %p.\n", - context_gl->restore_pf, context_gl->restore_pf_win); - } - } - - context_gl->restore_pf = 0; - context_gl->restore_pf_win = NULL; - return ret; -} - -static BOOL wined3d_context_gl_set_pixel_format(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - BOOL private = context_gl->dc_is_private; - int format = context_gl->pixel_format; - HDC dc = context_gl->dc; - int current; - - if (private && context_gl->dc_has_format) - return TRUE; - - if (!private && WindowFromDC(dc) != context_gl->window) - return FALSE; - - current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); - if (current == format) goto success; - - if (!current) - { - if (!SetPixelFormat(dc, format, NULL)) - { - /* This may also happen if the dc belongs to a destroyed window. */ - WARN("Failed to set pixel format %d on device context %p, last error %#x.\n", - format, dc, GetLastError()); - return FALSE; - } - - context_gl->restore_pf = 0; - context_gl->restore_pf_win = private ? NULL : WindowFromDC(dc); - goto success; - } - - /* By default WGL doesn't allow pixel format adjustments but we need it - * here. For this reason there's a Wine specific wglSetPixelFormat() - * which allows us to set the pixel format multiple times. Only use it - * when really needed. */ - if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) - { - HWND win; - - if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) - { - ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", - format, dc); - return FALSE; - } - - win = private ? NULL : WindowFromDC(dc); - if (win != context_gl->restore_pf_win) - { - wined3d_context_gl_restore_pixel_format(context_gl); - - context_gl->restore_pf = private ? 0 : current; - context_gl->restore_pf_win = win; - } - - goto success; - } - - /* OpenGL doesn't allow pixel format adjustments. Print an error and - * continue using the old format. There's a big chance that the old - * format works although with a performance hit and perhaps rendering - * errors. */ - ERR("Unable to set pixel format %d on device context %p. Already using format %d.\n", - format, dc, current); - return TRUE; - -success: - if (private) - context_gl->dc_has_format = TRUE; - return TRUE; -} - -static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) -{ - struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(context_gl->c.swapchain); - BOOL backup = FALSE; - - if (!wined3d_context_gl_set_pixel_format(context_gl)) - { - WARN("Failed to set pixel format %d on device context %p.\n", - context_gl->pixel_format, context_gl->dc); - backup = TRUE; - } - - if (backup || !wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) - { - WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", - context_gl->gl_ctx, context_gl->dc, GetLastError()); - context_gl->valid = 0; - WARN("Trying fallback to the backup window.\n"); - - /* FIXME: If the context is destroyed it's no longer associated with - * a swapchain, so we can't use the swapchain to get a backup dc. To - * make this work windowless contexts would need to be handled by the - * device. */ - if (context_gl->c.destroyed || !swapchain_gl) - { - FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); - wined3d_context_gl_set_current(NULL); - return FALSE; - } - - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) - { - wined3d_context_gl_set_current(NULL); - return FALSE; - } - - context_gl->dc_is_private = TRUE; - context_gl->dc_has_format = FALSE; - - if (!wined3d_context_gl_set_pixel_format(context_gl)) - { - ERR("Failed to set pixel format %d on device context %p.\n", - context_gl->pixel_format, context_gl->dc); - wined3d_context_gl_set_current(NULL); - return FALSE; - } - - if (!wglMakeCurrent(context_gl->dc, context_gl->gl_ctx)) - { - ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - context_gl->dc, GetLastError()); - wined3d_context_gl_set_current(NULL); - return FALSE; - } - - context_gl->valid = 1; - } - context_gl->needs_set = 0; - - return TRUE; -} - -static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx) -{ - if (!wglMakeCurrent(dc, gl_ctx)) - { - ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", - gl_ctx, dc, GetLastError()); - wined3d_context_gl_set_current(NULL); - } -} - -static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_gl) -{ - if (!context_gl->c.swapchain) - return; - - if (context_gl->window == context_gl->c.swapchain->win_handle) - return; - - TRACE("Updating context %p window from %p to %p.\n", - context_gl, context_gl->window, context_gl->c.swapchain->win_handle); - - if (context_gl->dc) - wined3d_release_dc(context_gl->window, context_gl->dc); - - context_gl->window = context_gl->c.swapchain->win_handle; - context_gl->dc_is_private = FALSE; - context_gl->dc_has_format = FALSE; - context_gl->needs_set = 1; - context_gl->valid = 1; - - if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) - { - ERR("Failed to get a device context for window %p.\n", context_gl->window); - context_gl->valid = 0; - } -} - -void wined3d_context_cleanup(struct wined3d_context *context) -{ -} - -static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) -{ - struct wined3d_pipeline_statistics_query *pipeline_statistics_query; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_so_statistics_query *so_statistics_query; - struct wined3d_timestamp_query *timestamp_query; - struct wined3d_occlusion_query *occlusion_query; - struct fbo_entry *entry, *entry2; - struct wined3d_fence *fence; - HGLRC restore_ctx; - HDC restore_dc; - unsigned int i; - - restore_ctx = wglGetCurrentContext(); - restore_dc = wglGetCurrentDC(); - - if (restore_ctx == context_gl->gl_ctx) - restore_ctx = NULL; - else if (context_gl->valid) - wined3d_context_gl_set_gl_context(context_gl); - - if (context_gl->valid) - { - if (context_gl->dummy_arbfp_prog) - GL_EXTCALL(glDeleteProgramsARB(1, &context_gl->dummy_arbfp_prog)); - - if (context_gl->blit_vbo) - GL_EXTCALL(glDeleteBuffers(1, &context_gl->blit_vbo)); - - for (i = 0; i < context_gl->free_pipeline_statistics_query_count; ++i) - { - union wined3d_gl_pipeline_statistics_query *q = &context_gl->free_pipeline_statistics_queries[i]; - GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(q->id), q->id)); - } - - for (i = 0; i < context_gl->free_so_statistics_query_count; ++i) - { - union wined3d_gl_so_statistics_query *q = &context_gl->free_so_statistics_queries[i]; - GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(q->id), q->id)); - } - - if (context_gl->free_timestamp_query_count) - GL_EXTCALL(glDeleteQueries(context_gl->free_timestamp_query_count, context_gl->free_timestamp_queries)); - - if (gl_info->supported[ARB_SYNC]) - { - for (i = 0; i < context_gl->free_fence_count; ++i) - { - GL_EXTCALL(glDeleteSync(context_gl->free_fences[i].sync)); - } - } - else if (gl_info->supported[APPLE_FENCE]) - { - for (i = 0; i < context_gl->free_fence_count; ++i) - { - GL_EXTCALL(glDeleteFencesAPPLE(1, &context_gl->free_fences[i].id)); - } - } - else if (gl_info->supported[NV_FENCE]) - { - for (i = 0; i < context_gl->free_fence_count; ++i) - { - GL_EXTCALL(glDeleteFencesNV(1, &context_gl->free_fences[i].id)); - } - } - - if (context_gl->free_occlusion_query_count) - GL_EXTCALL(glDeleteQueries(context_gl->free_occlusion_query_count, context_gl->free_occlusion_queries)); - - checkGLcall("context cleanup"); - } - heap_free(context_gl->free_pipeline_statistics_queries); - heap_free(context_gl->free_so_statistics_queries); - heap_free(context_gl->free_timestamp_queries); - heap_free(context_gl->free_fences); - heap_free(context_gl->free_occlusion_queries); - - LIST_FOR_EACH_ENTRY(pipeline_statistics_query, &context_gl->pipeline_statistics_queries, - struct wined3d_pipeline_statistics_query, entry) - { - if (context_gl->valid) - GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(pipeline_statistics_query->u.id), pipeline_statistics_query->u.id)); - pipeline_statistics_query->context_gl = NULL; - } - - LIST_FOR_EACH_ENTRY(so_statistics_query, &context_gl->so_statistics_queries, - struct wined3d_so_statistics_query, entry) - { - if (context_gl->valid) - GL_EXTCALL(glDeleteQueries(ARRAY_SIZE(so_statistics_query->u.id), so_statistics_query->u.id)); - so_statistics_query->context_gl = NULL; - } - - LIST_FOR_EACH_ENTRY(timestamp_query, &context_gl->timestamp_queries, struct wined3d_timestamp_query, entry) - { - if (context_gl->valid) - GL_EXTCALL(glDeleteQueries(1, &timestamp_query->id)); - timestamp_query->context_gl = NULL; - } - - LIST_FOR_EACH_ENTRY(fence, &context_gl->fences, struct wined3d_fence, entry) - { - if (context_gl->valid) - { - if (gl_info->supported[ARB_SYNC]) - { - if (fence->object.sync) - GL_EXTCALL(glDeleteSync(fence->object.sync)); - } - else if (gl_info->supported[APPLE_FENCE]) - { - GL_EXTCALL(glDeleteFencesAPPLE(1, &fence->object.id)); - } - else if (gl_info->supported[NV_FENCE]) - { - GL_EXTCALL(glDeleteFencesNV(1, &fence->object.id)); - } - } - fence->context_gl = NULL; - } - - LIST_FOR_EACH_ENTRY(occlusion_query, &context_gl->occlusion_queries, struct wined3d_occlusion_query, entry) - { - if (context_gl->valid) - GL_EXTCALL(glDeleteQueries(1, &occlusion_query->id)); - occlusion_query->context_gl = NULL; - } - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_destroy_list, struct fbo_entry, entry) - { - if (!context_gl->valid) - entry->id = 0; - wined3d_context_gl_destroy_fbo_entry(context_gl, entry); - } - - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->fbo_list, struct fbo_entry, entry) - { - if (!context_gl->valid) - entry->id = 0; - wined3d_context_gl_destroy_fbo_entry(context_gl, entry); - } - - heap_free(context_gl->texture_type); - - wined3d_context_gl_restore_pixel_format(context_gl); - if (restore_ctx) - context_restore_gl_context(gl_info, restore_dc, restore_ctx); - else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) - ERR("Failed to disable GL context.\n"); - - wined3d_release_dc(context_gl->window, context_gl->dc); - - if (!wglDeleteContext(context_gl->gl_ctx)) - { - DWORD err = GetLastError(); - ERR("Failed to delete GL context %p, last error %#x.\n", context_gl->gl_ctx, err); - } - - wined3d_context_cleanup(&context_gl->c); -} - -DWORD context_get_tls_idx(void) -{ - return wined3d_context_tls_idx; -} - -void context_set_tls_idx(DWORD idx) -{ - wined3d_context_tls_idx = idx; -} - -struct wined3d_context_gl *wined3d_context_gl_get_current(void) -{ - return TlsGetValue(wined3d_context_tls_idx); -} - -BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) -{ - struct wined3d_context_gl *old = wined3d_context_gl_get_current(); - - if (old == context_gl) - { - TRACE("Already using D3D context %p.\n", context_gl); - return TRUE; - } - - if (old) - { - if (old->c.destroyed) - { - TRACE("Switching away from destroyed context %p.\n", old); - wined3d_context_gl_cleanup(old); - heap_free((void *)old->gl_info); - heap_free(old); - } - else - { - if (wglGetCurrentContext()) - { - const struct wined3d_gl_info *gl_info = old->gl_info; - TRACE("Flushing context %p before switching to %p.\n", old, context_gl); - gl_info->gl_ops.gl.p_glFlush(); - } - old->c.current = 0; - } - } - - if (context_gl) - { - if (!context_gl->valid) - { - ERR("Trying to make invalid context %p current.\n", context_gl); - return FALSE; - } - - TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", - context_gl, context_gl->gl_ctx, context_gl->dc); - if (!wined3d_context_gl_set_gl_context(context_gl)) - return FALSE; - context_gl->c.current = 1; - } - else if (wglGetCurrentContext()) - { - TRACE("Clearing current D3D context.\n"); - if (!wglMakeCurrent(NULL, NULL)) - { - DWORD err = GetLastError(); - ERR("Failed to clear current GL context, last error %#x.\n", err); - TlsSetValue(wined3d_context_tls_idx, NULL); - return FALSE; - } - } - - return TlsSetValue(wined3d_context_tls_idx, context_gl); -} - -void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) -{ - TRACE("Releasing context %p, level %u.\n", context_gl, context_gl->level); - - if (WARN_ON(d3d)) - { - if (!context_gl->level) - WARN("Context %p is not active.\n", context_gl); - else if (context_gl != wined3d_context_gl_get_current()) - WARN("Context %p is not the current context.\n", context_gl); - } - - if (!--context_gl->level) - { - if (wined3d_context_gl_restore_pixel_format(context_gl)) - context_gl->needs_set = 1; - if (context_gl->restore_ctx) - { - TRACE("Restoring GL context %p on device context %p.\n", context_gl->restore_ctx, context_gl->restore_dc); - context_restore_gl_context(context_gl->gl_info, context_gl->restore_dc, context_gl->restore_ctx); - context_gl->restore_ctx = NULL; - context_gl->restore_dc = NULL; - } - - if (context_gl->c.destroy_delayed) - { - TRACE("Destroying context %p.\n", context_gl); - wined3d_context_gl_destroy(context_gl); - } - } -} - -/* This is used when a context for render target A is active, but a separate context is - * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt - * A to avoid breaking caller code. */ -void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - if (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx) - { - context_release(context); - context = context_acquire(texture->resource.device, texture, sub_resource_idx); - } - - context_release(context); -} - -static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) -{ - TRACE("Entering context %p, level %u.\n", context_gl, context_gl->level + 1); - - if (!context_gl->level++) - { - const struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); - HGLRC current_gl = wglGetCurrentContext(); - - if (current_gl && (!current_context || current_context->gl_ctx != current_gl)) - { - TRACE("Another GL context (%p on device context %p) is already current.\n", - current_gl, wglGetCurrentDC()); - context_gl->restore_ctx = current_gl; - context_gl->restore_dc = wglGetCurrentDC(); - context_gl->needs_set = 1; - } - else if (!context_gl->needs_set && !(context_gl->dc_is_private && context_gl->dc_has_format) - && context_gl->pixel_format != context_gl->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->dc)) - context_gl->needs_set = 1; - } -} - -void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) -{ - DWORD representative = context->state_table[state_id].representative - STATE_COMPUTE_OFFSET; - unsigned int index, shift; - - index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); - shift = representative & (sizeof(*context->dirty_compute_states) * CHAR_BIT - 1); - context->dirty_compute_states[index] |= (1u << shift); -} - -void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) -{ - unsigned int representative = context->state_table[state_id].representative; - unsigned int index, shift; - - index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); - shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); - context->dirty_graphics_states[index] |= (1u << shift); -} - -/* This function takes care of wined3d pixel format selection. */ -static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, - const struct wined3d_format *color_format, const struct wined3d_format *ds_format, - BOOL auxBuffers) -{ - unsigned int cfg_count = wined3d_adapter_gl(device->adapter)->pixel_format_count; - unsigned int current_value; - PIXELFORMATDESCRIPTOR pfd; - int iPixelFormat = 0; - unsigned int i; - - TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n", - device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), - auxBuffers); - - current_value = 0; - for (i = 0; i < cfg_count; ++i) - { - const struct wined3d_pixel_format *cfg = &wined3d_adapter_gl(device->adapter)->pixel_formats[i]; - unsigned int value; - - /* For now only accept RGBA formats. Perhaps some day we will - * allow floating point formats for pbuffers. */ - if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) - continue; - /* In window mode we need a window drawable format and double buffering. */ - if (!(cfg->windowDrawable && cfg->doubleBuffer)) - continue; - if (cfg->redSize < color_format->red_size) - continue; - if (cfg->greenSize < color_format->green_size) - continue; - if (cfg->blueSize < color_format->blue_size) - continue; - if (cfg->alphaSize < color_format->alpha_size) - continue; - if (cfg->depthSize < ds_format->depth_size) - continue; - if (ds_format->stencil_size && cfg->stencilSize != ds_format->stencil_size) - continue; - /* Check multisampling support. */ - if (cfg->numSamples) - continue; - - value = 1; - /* We try to locate a format which matches our requirements exactly. In case of - * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if (cfg->depthSize == ds_format->depth_size) - value += 1; - if (cfg->stencilSize == ds_format->stencil_size) - value += 2; - if (cfg->alphaSize == color_format->alpha_size) - value += 4; - /* We like to have aux buffers in backbuffer mode */ - if (auxBuffers && cfg->auxBuffers) - value += 8; - if (cfg->redSize == color_format->red_size - && cfg->greenSize == color_format->green_size - && cfg->blueSize == color_format->blue_size) - value += 16; - - if (value > current_value) - { - iPixelFormat = cfg->iPixelFormat; - current_value = value; - } - } - - if (!iPixelFormat) - { - ERR("Trying to locate a compatible pixel format because an exact match failed.\n"); - - memset(&pfd, 0, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cAlphaBits = color_format->alpha_size; - pfd.cColorBits = color_format->red_size + color_format->green_size - + color_format->blue_size + color_format->alpha_size; - pfd.cDepthBits = ds_format->depth_size; - pfd.cStencilBits = ds_format->stencil_size; - pfd.iLayerType = PFD_MAIN_PLANE; - - if (!(iPixelFormat = ChoosePixelFormat(hdc, &pfd))) - { - /* Something is very wrong as ChoosePixelFormat() barely fails. */ - ERR("Can't find a suitable pixel format.\n"); - return 0; - } - } - - TRACE("Found iPixelFormat=%d for ColorFormat=%s, DepthStencilFormat=%s.\n", - iPixelFormat, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id)); - return iPixelFormat; -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_bind_dummy_textures(const struct wined3d_context_gl *context_gl) -{ - const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context_gl->c.device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int i; - - for (i = 0; i < gl_info->limits.combined_samplers; ++i) - { - GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + i)); - - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, textures->tex_1d); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); - - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures->tex_rect); - - if (gl_info->supported[EXT_TEXTURE3D]) - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, textures->tex_3d); - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, textures->tex_cube); - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP_ARRAY]) - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, textures->tex_cube_array); - - if (gl_info->supported[EXT_TEXTURE_ARRAY]) - { - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D_ARRAY, textures->tex_1d_array); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, textures->tex_2d_array); - } - - if (gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, textures->tex_buffer); - - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - { - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures->tex_2d_ms); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, textures->tex_2d_ms_array); - } - } - - checkGLcall("bind dummy textures"); -} - -void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, - const char *file, unsigned int line, const char *name) -{ - GLint err; - - if (gl_info->supported[ARB_DEBUG_OUTPUT] || (err = gl_info->gl_ops.gl.p_glGetError()) == GL_NO_ERROR) - { - TRACE("%s call ok %s / %u.\n", name, file, line); - return; - } - - do - { - ERR(">>>>>>> %s (%#x) from %s @ %s / %u.\n", - debug_glerror(err), err, name, file,line); - err = gl_info->gl_ops.gl.p_glGetError(); - } while (err != GL_NO_ERROR); -} - -static BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) -{ - return gl_info->supported[ARB_DEBUG_OUTPUT] - && (ERR_ON(d3d) || FIXME_ON(d3d) || WARN_ON(d3d_perf)); -} - -static void WINE_GLAPI wined3d_debug_callback(GLenum source, GLenum type, GLuint id, - GLenum severity, GLsizei length, const char *message, void *ctx) -{ - switch (type) - { - case GL_DEBUG_TYPE_ERROR_ARB: - ERR("%p: %s.\n", ctx, debugstr_an(message, length)); - break; - - case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB: - case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB: - case GL_DEBUG_TYPE_PORTABILITY_ARB: - FIXME("%p: %s.\n", ctx, debugstr_an(message, length)); - break; - - case GL_DEBUG_TYPE_PERFORMANCE_ARB: - WARN_(d3d_perf)("%p: %s.\n", ctx, debugstr_an(message, length)); - break; - - default: - FIXME("ctx %p, type %#x: %s.\n", ctx, type, debugstr_an(message, length)); - break; - } -} - -HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) -{ - HGLRC ctx; - unsigned int ctx_attrib_idx = 0; - GLint ctx_attribs[7], ctx_flags = 0; - - if (context_debug_output_enabled(gl_info)) - ctx_flags = WGL_CONTEXT_DEBUG_BIT_ARB; - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MAJOR_VERSION_ARB; - ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version >> 16; - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MINOR_VERSION_ARB; - ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version & 0xffff; - if (ctx_flags) - { - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; - ctx_attribs[ctx_attrib_idx++] = ctx_flags; - } - ctx_attribs[ctx_attrib_idx] = 0; - - if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) - { - if (gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 2)) - { - if (ctx_flags) - { - ctx_flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; - ctx_attribs[ctx_attrib_idx - 1] = ctx_flags; - } - else - { - ctx_flags = WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; - ctx_attribs[ctx_attrib_idx++] = ctx_flags; - ctx_attribs[ctx_attrib_idx] = 0; - } - if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) - WARN("Failed to create a WGL context with wglCreateContextAttribsARB, last error %#x.\n", - GetLastError()); - } - } - return ctx; -} - -void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) -{ - struct wined3d_device *device = swapchain->device; - DWORD state; - - context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->state_table; - - /* Mark all states dirty to force a proper initialization of the states on - * the first use of the context. Compute states do not need initialization. */ - for (state = 0; state <= STATE_HIGHEST; ++state) - { - if (context->state_table[state].representative && !STATE_IS_COMPUTE(state)) - context_invalidate_state(context, state); - } - - context->device = device; - context->swapchain = swapchain; - context->current_rt.texture = swapchain->front_buffer; - context->current_rt.sub_resource_idx = 0; - - context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) - | (1u << WINED3D_SHADER_TYPE_VERTEX) - | (1u << WINED3D_SHADER_TYPE_GEOMETRY) - | (1u << WINED3D_SHADER_TYPE_HULL) - | (1u << WINED3D_SHADER_TYPE_DOMAIN) - | (1u << WINED3D_SHADER_TYPE_COMPUTE); -} - -HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) -{ - TRACE("context_no3d %p, swapchain %p.\n", context_no3d, swapchain); - - wined3d_context_init(context_no3d, swapchain); - - return WINED3D_OK; -} - -static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, - struct wined3d_swapchain_gl *swapchain_gl) -{ - const struct wined3d_format *colour_format, *ds_format; - struct wined3d_context *context = &context_gl->c; - const struct wined3d_gl_info *gl_info; - struct wined3d_resource *target; - struct wined3d_adapter *adapter; - unsigned int target_bind_flags; - struct wined3d_device *device; - HGLRC ctx, share_ctx; - unsigned int i; - - device = context->device; - adapter = device->adapter; - gl_info = &adapter->gl_info; - - target = &context->current_rt.texture->resource; - target_bind_flags = target->bind_flags; - - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - static const enum wined3d_format_id ds_formats[] = - { - WINED3DFMT_D24_UNORM_S8_UINT, - WINED3DFMT_D32_UNORM, - WINED3DFMT_R24_UNORM_X8_TYPELESS, - WINED3DFMT_D16_UNORM, - WINED3DFMT_S1_UINT_D15_UNORM, - }; - - colour_format = target->format; - - /* In case of ORM_BACKBUFFER, make sure to request an alpha component for - * X4R4G4B4/X8R8G8B8 as we might need it for the backbuffer. */ - if (colour_format->id == WINED3DFMT_B4G4R4X4_UNORM) - colour_format = wined3d_get_format(adapter, WINED3DFMT_B4G4R4A4_UNORM, target_bind_flags); - else if (colour_format->id == WINED3DFMT_B8G8R8X8_UNORM) - colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); - - /* DirectDraw supports 8bit paletted render targets and these are used by - * old games like StarCraft and C&C. Most modern hardware doesn't support - * 8bit natively so we perform some form of 8bit -> 32bit conversion. The - * conversion (ab)uses the alpha component for storing the palette index. - * For this reason we require a format with 8bit alpha, so request - * A8R8G8B8. */ - if (colour_format->id == WINED3DFMT_P8_UINT) - colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); - - /* Try to find a pixel format which matches our requirements. */ - if (!swapchain_gl->s.ds_format) - { - for (i = 0; i < ARRAY_SIZE(ds_formats); ++i) - { - ds_format = wined3d_get_format(adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL); - if ((context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, TRUE))) - { - swapchain_gl->s.ds_format = ds_format; - break; - } - - TRACE("Depth stencil format %s is not supported, trying next format.\n", - debug_d3dformat(ds_format->id)); - } - } - else - { - context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, swapchain_gl->s.ds_format, TRUE); - } - } - else - { - /* When using FBOs for off-screen rendering, we only use the drawable for - * presentation blits, and don't do any rendering to it. That means we - * don't need depth or stencil buffers, and can mostly ignore the render - * target format. This wouldn't necessarily be quite correct for 10bpc - * display modes, but we don't currently support those. - * Using the same format regardless of the colour/depth/stencil targets - * makes it much less likely that different wined3d instances will set - * conflicting pixel formats. */ - colour_format = wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags); - ds_format = wined3d_get_format(adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL); - context_gl->pixel_format = context_choose_pixel_format(device, - context_gl->dc, colour_format, ds_format, FALSE); - } - - if (!context_gl->pixel_format) - { - ERR("Failed to choose pixel format.\n"); - return FALSE; - } - - wined3d_context_gl_enter(context_gl); - - if (!wined3d_context_gl_set_pixel_format(context_gl)) - { - context_release(context); - - if (context_gl->dc_is_private) - { - ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); - - return FALSE; - } - - WARN("Failed to set pixel format %d on device context %p, trying backup DC.\n", - context_gl->pixel_format, context_gl->dc); - - wined3d_release_dc(context_gl->window, context_gl->dc); - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) - { - ERR("Failed to retrieve the backup device context.\n"); - return FALSE; - } - context_gl->dc_is_private = TRUE; - - return wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl); - } - - share_ctx = device->context_count ? wined3d_context_gl(device->contexts[0])->gl_ctx : NULL; - if (gl_info->p_wglCreateContextAttribsARB) - { - if (!(ctx = context_create_wgl_attribs(gl_info, context_gl->dc, share_ctx))) - { - ERR("Failed to create a WGL context.\n"); - context_release(context); - return FALSE; - } - } - else - { - if (!(ctx = wglCreateContext(context_gl->dc))) - { - ERR("Failed to create a WGL context.\n"); - context_release(context); - return FALSE; - } - - if (share_ctx && !wglShareLists(share_ctx, ctx)) - { - ERR("wglShareLists(%p, %p) failed, last error %#x.\n", share_ctx, ctx, GetLastError()); - context_release(context); - if (!wglDeleteContext(ctx)) - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, GetLastError()); - return FALSE; - } - } - - context_gl->dc_has_format = TRUE; - context_gl->needs_set = 1; - context_gl->valid = 1; - context_gl->gl_ctx = ctx; - - return TRUE; -} - -HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) -{ - struct wined3d_context *context = &context_gl->c; - const struct wined3d_d3d_info *d3d_info; - const struct wined3d_gl_info *gl_info; - struct wined3d_device *device; - unsigned int i; - - TRACE("context_gl %p, swapchain %p.\n", context_gl, swapchain_gl); - - wined3d_context_init(&context_gl->c, &swapchain_gl->s); - - device = context->device; - gl_info = &device->adapter->gl_info; - context_gl->gl_info = gl_info; - d3d_info = context->d3d_info; - - context_gl->tid = GetCurrentThreadId(); - context_gl->window = context->swapchain->win_handle; - if (context_gl->window == GetDesktopWindow()) - { - TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); - context_gl->dc = NULL; - } - else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) - WARN("Failed to retrieve device context, trying swapchain backup.\n"); - - if (!context_gl->dc) - { - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) - { - ERR("Failed to retrieve a device context.\n"); - return E_FAIL; - } - context_gl->dc_is_private = TRUE; - } - - list_init(&context_gl->fbo_list); - list_init(&context_gl->fbo_destroy_list); - - list_init(&context_gl->occlusion_queries); - list_init(&context_gl->fences); - list_init(&context_gl->timestamp_queries); - list_init(&context_gl->so_statistics_queries); - list_init(&context_gl->pipeline_statistics_queries); - - for (i = 0; i < ARRAY_SIZE(context_gl->tex_unit_map); ++i) - context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - for (i = 0; i < ARRAY_SIZE(context_gl->rev_tex_unit_map); ++i) - context_gl->rev_tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS) - { - /* Initialize the texture unit mapping to a 1:1 mapping. */ - unsigned int base, count; - - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_PIXEL, &base, &count); - if (base + WINED3D_MAX_FRAGMENT_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) - { - ERR("Unexpected texture unit base index %u.\n", base); - goto fail; - } - for (i = 0; i < min(count, WINED3D_MAX_FRAGMENT_SAMPLERS); ++i) - { - context_gl->tex_unit_map[i] = base + i; - context_gl->rev_tex_unit_map[base + i] = i; - } - - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_VERTEX, &base, &count); - if (base + WINED3D_MAX_VERTEX_SAMPLERS > ARRAY_SIZE(context_gl->rev_tex_unit_map)) - { - ERR("Unexpected texture unit base index %u.\n", base); - goto fail; - } - for (i = 0; i < min(count, WINED3D_MAX_VERTEX_SAMPLERS); ++i) - { - context_gl->tex_unit_map[WINED3D_MAX_FRAGMENT_SAMPLERS + i] = base + i; - context_gl->rev_tex_unit_map[base + i] = WINED3D_MAX_FRAGMENT_SAMPLERS + i; - } - } - - if (!(context_gl->texture_type = heap_calloc(gl_info->limits.combined_samplers, - sizeof(*context_gl->texture_type)))) - goto fail; - - if (!wined3d_context_gl_create_wgl_ctx(context_gl, swapchain_gl)) - goto fail; - - /* Set up the context defaults. */ - - context->render_offscreen = wined3d_resource_is_offscreen(&context->current_rt.texture->resource); - context_gl->draw_buffers_mask = context_generate_rt_mask(GL_BACK); - - if (!wined3d_context_gl_set_current(context_gl)) - { - ERR("Cannot activate context to set up defaults.\n"); - context_release(context); - if (!wglDeleteContext(context_gl->gl_ctx)) - ERR("wglDeleteContext(%p) failed, last error %#x.\n", context_gl->gl_ctx, GetLastError()); - goto fail; - } - - if (context_debug_output_enabled(gl_info)) - { - GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, context)); - if (TRACE_ON(d3d_synchronous)) - gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); - if (ERR_ON(d3d)) - { - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_ERROR, - GL_DONT_CARE, 0, NULL, GL_TRUE)); - } - if (FIXME_ON(d3d)) - { - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR, - GL_DONT_CARE, 0, NULL, GL_TRUE)); - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR, - GL_DONT_CARE, 0, NULL, GL_TRUE)); - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_PORTABILITY, - GL_DONT_CARE, 0, NULL, GL_TRUE)); - } - if (WARN_ON(d3d_perf)) - { - GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DEBUG_TYPE_PERFORMANCE, - GL_DONT_CARE, 0, NULL, GL_TRUE)); - } - } - - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - gl_info->gl_ops.gl.p_glGetIntegerv(GL_AUX_BUFFERS, &context_gl->aux_buffers); - - TRACE("Setting up the screen\n"); - - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); - checkGLcall("glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE);"); - - gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT); - checkGLcall("glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT);"); - - gl_info->gl_ops.gl.p_glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); - checkGLcall("glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);"); - } - else - { - GLuint vao; - - GL_EXTCALL(glGenVertexArrays(1, &vao)); - GL_EXTCALL(glBindVertexArray(vao)); - checkGLcall("creating VAO"); - } - - gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment); - checkGLcall("glPixelStorei(GL_PACK_ALIGNMENT, device->surface_alignment);"); - gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - checkGLcall("glPixelStorei(GL_UNPACK_ALIGNMENT, 1);"); - - if (gl_info->supported[NV_TEXTURE_SHADER2]) - { - /* Set up the previous texture input for all shader units. This applies to bump mapping, and in d3d - * the previous texture where to source the offset from is always unit - 1. - */ - for (i = 1; i < gl_info->limits.textures; ++i) - { - wined3d_context_gl_active_texture(context_gl, gl_info, i); - gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_SHADER_NV, - GL_PREVIOUS_TEXTURE_INPUT_NV, GL_TEXTURE0_ARB + i - 1); - checkGLcall("glTexEnvi(GL_TEXTURE_SHADER_NV, GL_PREVIOUS_TEXTURE_INPUT_NV, ..."); - } - } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - { - /* MacOS(radeon X1600 at least, but most likely others too) refuses to draw if GLSL and ARBFP are - * enabled, but the currently bound arbfp program is 0. Enabling ARBFP with prog 0 is invalid, but - * GLSL should bypass this. This causes problems in programs that never use the fixed function pipeline, - * because the ARBFP extension is enabled by the ARBFP pipeline at context creation, but no program - * is ever assigned. - * - * So make sure a program is assigned to each context. The first real ARBFP use will set a different - * program and the dummy program is destroyed when the context is destroyed. - */ - static const char dummy_program[] = - "!!ARBfp1.0\n" - "MOV result.color, fragment.color.primary;\n" - "END\n"; - GL_EXTCALL(glGenProgramsARB(1, &context_gl->dummy_arbfp_prog)); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, context_gl->dummy_arbfp_prog)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, - GL_PROGRAM_FORMAT_ASCII_ARB, strlen(dummy_program), dummy_program)); - } - - if (gl_info->supported[ARB_POINT_SPRITE]) - { - for (i = 0; i < gl_info->limits.textures; ++i) - { - wined3d_context_gl_active_texture(context_gl, gl_info, i); - gl_info->gl_ops.gl.p_glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE); - checkGLcall("glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE)"); - } - } - - if (gl_info->supported[ARB_PROVOKING_VERTEX]) - { - GL_EXTCALL(glProvokingVertex(GL_FIRST_VERTEX_CONVENTION)); - } - else if (gl_info->supported[EXT_PROVOKING_VERTEX]) - { - GL_EXTCALL(glProvokingVertexEXT(GL_FIRST_VERTEX_CONVENTION_EXT)); - } - if (!(d3d_info->wined3d_creation_flags & WINED3D_NO_PRIMITIVE_RESTART)) - { - if (gl_info->supported[ARB_ES3_COMPATIBILITY]) - { - gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); - checkGLcall("enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); - } - else - { - FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); - } - } - if (!(d3d_info->wined3d_creation_flags & WINED3D_LEGACY_CUBEMAP_FILTERING) - && gl_info->supported[ARB_SEAMLESS_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); - checkGLcall("enable seamless cube map filtering"); - } - if (gl_info->supported[ARB_CLIP_CONTROL]) - GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); - - /* If this happens to be the first context for the device, dummy textures - * are not created yet. In that case, they will be created (and bound) by - * create_dummy_textures right after this context is initialized. */ - if (wined3d_device_gl(device)->dummy_textures.tex_2d) - wined3d_context_gl_bind_dummy_textures(context_gl); - - /* Initialise all rectangles to avoid resetting unused ones later. */ - gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); - checkGLcall("glScissor"); - - return WINED3D_OK; - -fail: - heap_free(context_gl->texture_type); - wined3d_release_dc(context_gl->window, context_gl->dc); - return E_FAIL; -} - -void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) -{ - struct wined3d_device *device = context_gl->c.device; - - TRACE("Destroying context %p.\n", context_gl); - - wined3d_from_cs(device->cs); - - /* We delay destroying a context when it is active. The context_release() - * function invokes wined3d_context_gl_destroy() again while leaving the - * last level. */ - if (context_gl->level) - { - TRACE("Delaying destruction of context %p.\n", context_gl); - context_gl->c.destroy_delayed = 1; - /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ - context_gl->c.swapchain = NULL; - return; - } - - device_context_remove(device, &context_gl->c); - - if (context_gl->c.current && context_gl->tid != GetCurrentThreadId()) - { - struct wined3d_gl_info *gl_info; - - /* Make a copy of gl_info for wined3d_context_gl_cleanup() use, the - * one in wined3d_adapter may go away in the meantime. */ - gl_info = heap_alloc(sizeof(*gl_info)); - *gl_info = *context_gl->gl_info; - context_gl->gl_info = gl_info; - context_gl->c.destroyed = 1; - - return; - } - - wined3d_context_gl_cleanup(context_gl); - TlsSetValue(context_get_tls_idx(), NULL); - heap_free(context_gl); -} - -const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, - const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!shader_version) - { - *base = 0; - *count = WINED3D_MAX_TEXTURES; - return context_gl->tex_unit_map; - } - - if (shader_version->major >= 4) - { - wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, shader_version->type, base, count); - return NULL; - } - - switch (shader_version->type) - { - case WINED3D_SHADER_TYPE_PIXEL: - *base = 0; - *count = WINED3D_MAX_FRAGMENT_SAMPLERS; - break; - case WINED3D_SHADER_TYPE_VERTEX: - *base = WINED3D_MAX_FRAGMENT_SAMPLERS; - *count = WINED3D_MAX_VERTEX_SAMPLERS; - break; - default: - ERR("Unhandled shader type %#x.\n", shader_version->type); - *base = 0; - *count = 0; - } - - return context_gl->tex_unit_map; -} - -static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *context_gl, SIZE *size) -{ - const struct wined3d_texture *rt = context_gl->c.current_rt.texture; - unsigned int level; - - if (rt->swapchain) - { - RECT window_size; - - GetClientRect(context_gl->window, &window_size); - size->cx = window_size.right - window_size.left; - size->cy = window_size.bottom - window_size.top; - - return; - } - - level = context_gl->c.current_rt.sub_resource_idx % rt->level_count; - size->cx = wined3d_texture_get_level_width(rt, level); - size->cy = wined3d_texture_get_level_height(rt, level); -} - -void wined3d_context_gl_enable_clip_distances(struct wined3d_context_gl *context_gl, uint32_t enable_mask) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int clip_distance_count, i; - uint32_t disable_mask, current_mask; - - clip_distance_count = gl_info->limits.user_clip_distances; - disable_mask = ~enable_mask; - enable_mask &= (1u << clip_distance_count) - 1; - disable_mask &= (1u << clip_distance_count) - 1; - current_mask = context_gl->c.clip_distance_mask; - context_gl->c.clip_distance_mask = enable_mask; - - enable_mask &= ~current_mask; - while (enable_mask) - { - i = wined3d_bit_scan(&enable_mask); - gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); - } - disable_mask &= current_mask; - while (disable_mask) - { - i = wined3d_bit_scan(&disable_mask); - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); - } - checkGLcall("toggle clip distances"); -} - -static inline BOOL is_rt_mask_onscreen(DWORD rt_mask) -{ - return rt_mask & (1u << 31); -} - -static inline GLenum draw_buffer_from_rt_mask(DWORD rt_mask) -{ - return rt_mask & ~(1u << 31); -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_apply_draw_buffers(struct wined3d_context_gl *context_gl, uint32_t rt_mask) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum draw_buffers[WINED3D_MAX_RENDER_TARGETS]; - - if (!rt_mask) - { - gl_info->gl_ops.gl.p_glDrawBuffer(GL_NONE); - } - else if (is_rt_mask_onscreen(rt_mask)) - { - gl_info->gl_ops.gl.p_glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); - } - else - { - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - unsigned int i = 0; - - while (rt_mask) - { - if (rt_mask & 1) - draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; - else - draw_buffers[i] = GL_NONE; - - rt_mask >>= 1; - ++i; - } - - if (gl_info->supported[ARB_DRAW_BUFFERS]) - { - GL_EXTCALL(glDrawBuffers(i, draw_buffers)); - } - else - { - gl_info->gl_ops.gl.p_glDrawBuffer(draw_buffers[0]); - } - } - else - { - ERR("Unexpected draw buffers mask with backbuffer ORM.\n"); - } - } - - checkGLcall("apply draw buffers"); -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct fbo_entry *current_fbo = context_gl->current_fbo; - uint32_t new_mask = context_generate_rt_mask(buffer); - uint32_t *current_mask; - - current_mask = current_fbo ? &current_fbo->rt_mask : &context_gl->draw_buffers_mask; - if (new_mask == *current_mask) - return; - - gl_info->gl_ops.gl.p_glDrawBuffer(buffer); - checkGLcall("glDrawBuffer()"); - - *current_mask = new_mask; -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_active_texture(struct wined3d_context_gl *context_gl, - const struct wined3d_gl_info *gl_info, unsigned int unit) -{ - GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit)); - checkGLcall("glActiveTexture"); - context_gl->active_texture = unit; -} - -void wined3d_context_gl_bind_bo(struct wined3d_context_gl *context_gl, GLenum binding, GLuint name) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (binding == GL_ELEMENT_ARRAY_BUFFER) - context_invalidate_state(&context_gl->c, STATE_INDEXBUFFER); - - GL_EXTCALL(glBindBuffer(binding, name)); -} - -void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) -{ - const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context_gl->c.device)->dummy_textures; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum old_texture_type; - unsigned int unit; - - if (name) - gl_info->gl_ops.gl.p_glBindTexture(target, name); - else - target = GL_NONE; - - unit = context_gl->active_texture; - old_texture_type = context_gl->texture_type[unit]; - if (old_texture_type != target) - { - switch (old_texture_type) - { - case GL_NONE: - /* nothing to do */ - break; - case GL_TEXTURE_1D: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D, textures->tex_1d); - break; - case GL_TEXTURE_1D_ARRAY: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_1D_ARRAY, textures->tex_1d_array); - break; - case GL_TEXTURE_2D: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, textures->tex_2d); - break; - case GL_TEXTURE_2D_ARRAY: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, textures->tex_2d_array); - break; - case GL_TEXTURE_RECTANGLE_ARB: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_RECTANGLE_ARB, textures->tex_rect); - break; - case GL_TEXTURE_CUBE_MAP: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, textures->tex_cube); - break; - case GL_TEXTURE_CUBE_MAP_ARRAY: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP_ARRAY, textures->tex_cube_array); - break; - case GL_TEXTURE_3D: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_3D, textures->tex_3d); - break; - case GL_TEXTURE_BUFFER: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_BUFFER, textures->tex_buffer); - break; - case GL_TEXTURE_2D_MULTISAMPLE: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, textures->tex_2d_ms); - break; - case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_MULTISAMPLE_ARRAY, textures->tex_2d_ms_array); - break; - default: - ERR("Unexpected texture target %#x.\n", old_texture_type); - } - - context_gl->texture_type[unit] = target; - } - - checkGLcall("bind texture"); -} - -void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) -{ - const struct wined3d_gl_info *gl_info; - BYTE *memory; - - if (!data->buffer_object) - return data->addr; - - gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, - size, wined3d_resource_gl_map_flags(flags))); - } - else - { - memory = GL_EXTCALL(glMapBuffer(binding, wined3d_resource_gl_legacy_map_flags(flags))); - memory += (INT_PTR)data->addr; - } - - wined3d_context_gl_bind_bo(context_gl, binding, 0); - checkGLcall("Map buffer object"); - - return memory; -} - -void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, - GLenum binding, unsigned int range_count, const struct wined3d_range *ranges) -{ - const struct wined3d_gl_info *gl_info; - unsigned int i; - - if (!data->buffer_object) - return; - - gl_info = context_gl->gl_info; - wined3d_context_gl_bind_bo(context_gl, binding, data->buffer_object); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - for (i = 0; i < range_count; ++i) - { - GL_EXTCALL(glFlushMappedBufferRange(binding, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); - } - } - - GL_EXTCALL(glUnmapBuffer(binding)); - wined3d_context_gl_bind_bo(context_gl, binding, 0); - checkGLcall("Unmap buffer object"); -} - -void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, - const struct wined3d_bo_address *dst, GLenum dst_binding, - const struct wined3d_bo_address *src, GLenum src_binding, size_t size) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_range range; - BYTE *dst_ptr, *src_ptr; - - gl_info = context_gl->gl_info; - - if (dst->buffer_object && src->buffer_object) - { - if (gl_info->supported[ARB_COPY_BUFFER]) - { - GL_EXTCALL(glBindBuffer(GL_COPY_READ_BUFFER, src->buffer_object)); - GL_EXTCALL(glBindBuffer(GL_COPY_WRITE_BUFFER, dst->buffer_object)); - GL_EXTCALL(glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, - (GLintptr)src->addr, (GLintptr)dst->addr, size)); - checkGLcall("direct buffer copy"); - } - else - { - src_ptr = wined3d_context_gl_map_bo_address(context_gl, src, size, src_binding, WINED3D_MAP_READ); - dst_ptr = wined3d_context_gl_map_bo_address(context_gl, dst, size, dst_binding, WINED3D_MAP_WRITE); - - memcpy(dst_ptr, src_ptr, size); - - range.offset = 0; - range.size = size; - wined3d_context_gl_unmap_bo_address(context_gl, dst, dst_binding, 1, &range); - wined3d_context_gl_unmap_bo_address(context_gl, src, src_binding, 0, NULL); - } - } - else if (!dst->buffer_object && src->buffer_object) - { - wined3d_context_gl_bind_bo(context_gl, src_binding, src->buffer_object); - GL_EXTCALL(glGetBufferSubData(src_binding, (GLintptr)src->addr, size, dst->addr)); - checkGLcall("buffer download"); - } - else if (dst->buffer_object && !src->buffer_object) - { - wined3d_context_gl_bind_bo(context_gl, dst_binding, dst->buffer_object); - GL_EXTCALL(glBufferSubData(dst_binding, (GLintptr)dst->addr, size, src->addr)); - checkGLcall("buffer upload"); - } - else - { - memcpy(dst->addr, src->addr, size); - } -} - -static void wined3d_context_gl_set_render_offscreen(struct wined3d_context_gl *context_gl, BOOL offscreen) -{ - if (context_gl->c.render_offscreen == offscreen) - return; - - context_invalidate_state(&context_gl->c, STATE_VIEWPORT); - context_invalidate_state(&context_gl->c, STATE_SCISSORRECT); - if (!context_gl->gl_info->supported[ARB_CLIP_CONTROL]) - { - context_invalidate_state(&context_gl->c, STATE_RASTERIZER); - context_invalidate_state(&context_gl->c, STATE_POINTSPRITECOORDORIGIN); - context_invalidate_state(&context_gl->c, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - } - context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); - if (context_gl->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) - context_invalidate_state(&context_gl->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); - context_gl->c.render_offscreen = offscreen; -} - -GLenum wined3d_context_gl_get_offscreen_gl_buffer(const struct wined3d_context_gl *context_gl) -{ - switch (wined3d_settings.offscreen_rendering_mode) - { - case ORM_FBO: - return GL_COLOR_ATTACHMENT0; - - case ORM_BACKBUFFER: - return context_gl->aux_buffers > 0 ? GL_AUX0 : GL_BACK; - - default: - FIXME("Unhandled offscreen rendering mode %#x.\n", wined3d_settings.offscreen_rendering_mode); - return GL_BACK; - } -} - -static uint32_t wined3d_context_gl_generate_rt_mask_no_fbo(const struct wined3d_context_gl *context_gl, - struct wined3d_resource *rt) -{ - if (!rt || rt->format->id == WINED3DFMT_NULL) - return 0; - else if (rt->type != WINED3D_RTYPE_BUFFER && texture_from_resource(rt)->swapchain) - return context_generate_rt_mask_from_resource(rt); - else - return context_generate_rt_mask(wined3d_context_gl_get_offscreen_gl_buffer(context_gl)); -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) -{ - struct wined3d_context *context = &context_gl->c; - const struct wined3d_gl_info *gl_info; - uint32_t rt_mask, *cur_mask; - struct wined3d_texture *rt; - unsigned int sampler; - SIZE rt_size; - - TRACE("Setting up context %p for blitting.\n", context); - - gl_info = context_gl->gl_info; - rt = context->current_rt.texture; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if (context->render_offscreen) - { - wined3d_texture_load(rt, context, FALSE); - - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_FRAMEBUFFER, &rt->resource, - context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding); - if (rt->resource.format->id != WINED3DFMT_NULL) - rt_mask = 1; - else - rt_mask = 0; - } - else - { - context_gl->current_fbo = NULL; - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - rt_mask = context_generate_rt_mask_from_resource(&rt->resource); - } - } - else - { - rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, &rt->resource); - } - - cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - - if (rt_mask != *cur_mask) - { - wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); - *cur_mask = rt_mask; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); - - wined3d_context_gl_get_rt_size(context_gl, &rt_size); - - if (context->last_was_blit) - { - if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) - { - gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); - context->viewport_count = WINED3D_MAX_VIEWPORTS; - context_gl->blit_size = rt_size; - /* No need to dirtify here, the states are still dirtified because - * they weren't applied since the last context_apply_blit_state() - * call. */ - } - checkGLcall("blit state application"); - TRACE("Context is already set up for blitting, nothing to do.\n"); - return; - } - context->last_was_blit = TRUE; - - if (gl_info->supported[ARB_SAMPLER_OBJECTS]) - GL_EXTCALL(glBindSampler(0, 0)); - wined3d_context_gl_active_texture(context_gl, gl_info, 0); - - sampler = context_gl->rev_tex_unit_map[0]; - if (sampler != WINED3D_UNMAPPED_STAGE) - { - if (sampler < WINED3D_MAX_TEXTURES) - { - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_TEXTURE0 + sampler)); - context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP)); - } - context_invalidate_state(context, STATE_SAMPLER(sampler)); - } - context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); - context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHATESTENABLE)); - } - gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZENABLE)); - gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); - context_invalidate_state(context, STATE_BLEND); - gl_info->gl_ops.gl.p_glDisable(GL_CULL_FACE); - gl_info->gl_ops.gl.p_glDisable(GL_SCISSOR_TEST); - context_invalidate_state(context, STATE_RASTERIZER); - gl_info->gl_ops.gl.p_glDisable(GL_STENCIL_TEST); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_STENCILENABLE)); - if (gl_info->supported[ARB_POINT_SPRITE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_POINT_SPRITE_ARB); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE)); - } - if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) - { - gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); - } - - context->last_was_rhw = TRUE; - context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ - - wined3d_context_gl_enable_clip_distances(context_gl, 0); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING)); - - /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */ - if (gl_info->supported[ARB_CLIP_CONTROL]) - GL_EXTCALL(glClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE)); - gl_info->gl_ops.gl.p_glViewport(0, 0, rt_size.cx, rt_size.cy); - context->viewport_count = WINED3D_MAX_VIEWPORTS; - context_invalidate_state(context, STATE_VIEWPORT); - - device->shader_backend->shader_disable(device->shader_priv, context); - - context_gl->blit_size = rt_size; - - checkGLcall("blit state application"); -} - -static void wined3d_context_gl_apply_blit_projection(const struct wined3d_context_gl *context_gl, - unsigned int w, unsigned int h) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const GLdouble projection[] = - { - 2.0 / w, 0.0, 0.0, 0.0, - 0.0, 2.0 / h, 0.0, 0.0, - 0.0, 0.0, 2.0, 0.0, - -1.0, -1.0, -1.0, 1.0, - }; - - gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); -} - -/* Setup OpenGL states for fixed-function blitting. */ -/* Context activation is done by the caller. */ -void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, - const struct wined3d_device *device) -{ - struct wined3d_context *context = &context_gl->c; - const struct wined3d_gl_info *gl_info; - unsigned int i, sampler; - - gl_info = context_gl->gl_info; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - ERR("Applying fixed-function state without legacy context support.\n"); - - if (context->last_was_ffp_blit) - { - SIZE rt_size; - - wined3d_context_gl_get_rt_size(context_gl, &rt_size); - if (context_gl->blit_size.cx != rt_size.cx || context_gl->blit_size.cy != rt_size.cy) - wined3d_context_gl_apply_blit_projection(context_gl, rt_size.cx, rt_size.cy); - wined3d_context_gl_apply_blit_state(context_gl, device); - - checkGLcall("ffp blit state application"); - return; - } - context->last_was_ffp_blit = TRUE; - - wined3d_context_gl_apply_blit_state(context_gl, device); - - /* Disable all textures. The caller can then bind a texture it wants to blit - * from. */ - for (i = gl_info->limits.textures - 1; i > 0 ; --i) - { - wined3d_context_gl_active_texture(context_gl, gl_info, i); - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - - gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - - sampler = context_gl->rev_tex_unit_map[i]; - if (sampler != WINED3D_UNMAPPED_STAGE) - { - if (sampler < WINED3D_MAX_TEXTURES) - context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP)); - context_invalidate_state(context, STATE_SAMPLER(sampler)); - } - } - - wined3d_context_gl_active_texture(context_gl, gl_info, 0); - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - - gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) - gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 0.0f); - - gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); - gl_info->gl_ops.gl.p_glLoadIdentity(); - - /* Setup transforms. */ - gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); - gl_info->gl_ops.gl.p_glLoadIdentity(); - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - wined3d_context_gl_apply_blit_projection(context_gl, context_gl->blit_size.cx, context_gl->blit_size.cy); - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - - /* Other misc states. */ - gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_LIGHTING)); - gl_info->p_glDisableWINE(GL_FOG); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_FOGENABLE)); - - if (gl_info->supported[EXT_SECONDARY_COLOR]) - { - gl_info->gl_ops.gl.p_glDisable(GL_COLOR_SUM_EXT); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); - } - checkGLcall("ffp blit state application"); -} - -static BOOL have_framebuffer_attachment(unsigned int rt_count, struct wined3d_rendertarget_view * const *rts, - const struct wined3d_rendertarget_view *ds) -{ - unsigned int i; - - if (ds) - return TRUE; - - for (i = 0; i < rt_count; ++i) - { - if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) - return TRUE; - } - - return FALSE; -} - -/* Context activation is done by the caller. */ -BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state, unsigned int rt_count, const struct wined3d_fb_state *fb) -{ - struct wined3d_rendertarget_view * const *rts = fb->render_targets; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_rendertarget_view *dsv = fb->depth_stencil; - uint32_t rt_mask = 0, *cur_mask; - unsigned int i; - - if (isStateDirty(&context_gl->c, STATE_FRAMEBUFFER) || fb != &state->fb - || rt_count != gl_info->limits.buffers) - { - if (!have_framebuffer_attachment(rt_count, rts, dsv)) - { - WARN("Invalid render target config, need at least one attachment.\n"); - return FALSE; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - struct wined3d_rendertarget_info ds_info = {{0}}; - - if (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource)) - { - memset(context_gl->blit_targets, 0, sizeof(context_gl->blit_targets)); - for (i = 0; i < rt_count; ++i) - { - if (rts[i]) - { - struct wined3d_rendertarget_view_gl *rtv_gl = wined3d_rendertarget_view_gl(rts[i]); - context_gl->blit_targets[i].gl_view = rtv_gl->gl_view; - context_gl->blit_targets[i].resource = rtv_gl->v.resource; - context_gl->blit_targets[i].sub_resource_idx = rtv_gl->v.sub_resource_idx; - context_gl->blit_targets[i].layer_count = rtv_gl->v.layer_count; - } - if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) - rt_mask |= (1u << i); - } - - if (dsv) - { - struct wined3d_rendertarget_view_gl *dsv_gl = wined3d_rendertarget_view_gl(dsv); - ds_info.gl_view = dsv_gl->gl_view; - ds_info.resource = dsv_gl->v.resource; - ds_info.sub_resource_idx = dsv_gl->v.sub_resource_idx; - ds_info.layer_count = dsv_gl->v.layer_count; - } - - wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context_gl->blit_targets, &ds_info, - rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); - } - else - { - wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, - WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); - rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); - } - - /* If the framebuffer is not the device's fb the device's fb has to be reapplied - * next draw. Otherwise we could mark the framebuffer state clean here, once the - * state management allows this */ - context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - } - else - { - rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); - } - } - else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && (!rt_count || wined3d_resource_is_offscreen(rts[0]->resource))) - { - for (i = 0; i < rt_count; ++i) - { - if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) - rt_mask |= (1u << i); - } - } - else - { - rt_mask = wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rt_count ? rts[0]->resource : NULL); - } - - cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - - if (rt_mask != *cur_mask) - { - wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); - *cur_mask = rt_mask; - context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); - - context_gl->c.last_was_blit = FALSE; - context_gl->c.last_was_ffp_blit = FALSE; - - /* Blending and clearing should be orthogonal, but tests on the nvidia - * driver show that disabling blending when clearing improves the clearing - * performance incredibly. */ - gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); - if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) - { - if (needs_srgb_write(context_gl->c.d3d_info, state, fb)) - gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); - else - gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); - } - checkGLcall("setting up state for clear"); - - context_invalidate_state(&context_gl->c, STATE_BLEND); - context_invalidate_state(&context_gl->c, STATE_RASTERIZER); - context_invalidate_state(&context_gl->c, STATE_SCISSORRECT); - - return TRUE; -} - -static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state) -{ - struct wined3d_rendertarget_view * const *rts = state->fb.render_targets; - struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int rt_mask, mask; - unsigned int i; - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return wined3d_context_gl_generate_rt_mask_no_fbo(context_gl, rts[0]->resource); - else if (!context_gl->c.render_offscreen) - return context_generate_rt_mask_from_resource(rts[0]->resource); - - rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= (1u << gl_info->limits.buffers) - 1; - if (state->blend_state && state->blend_state->dual_source) - rt_mask = 1; - - mask = rt_mask; - while (mask) - { - i = wined3d_bit_scan(&mask); - if (!rts[i] || rts[i]->format->id == WINED3DFMT_NULL) - rt_mask &= ~(1u << i); - } - - return rt_mask; -} - -/* Context activation is done by the caller. */ -void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - uint32_t rt_mask = find_draw_buffers_mask(context_gl, state); - const struct wined3d_fb_state *fb = &state->fb; - DWORD color_location = 0; - DWORD *cur_mask; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - struct wined3d_rendertarget_info ds_info = {{0}}; - - if (!context->render_offscreen) - { - wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, - WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); - } - else - { - const struct wined3d_rendertarget_view_gl *view_gl; - unsigned int i; - - memset(context_gl->blit_targets, 0, sizeof(context_gl->blit_targets)); - for (i = 0; i < context_gl->gl_info->limits.buffers; ++i) - { - if (!fb->render_targets[i]) - continue; - - view_gl = wined3d_rendertarget_view_gl(fb->render_targets[i]); - context_gl->blit_targets[i].gl_view = view_gl->gl_view; - context_gl->blit_targets[i].resource = view_gl->v.resource; - context_gl->blit_targets[i].sub_resource_idx = view_gl->v.sub_resource_idx; - context_gl->blit_targets[i].layer_count = view_gl->v.layer_count; - - if (!color_location) - color_location = view_gl->v.resource->draw_binding; - } - - if (fb->depth_stencil) - { - view_gl = wined3d_rendertarget_view_gl(fb->depth_stencil); - ds_info.gl_view = view_gl->gl_view; - ds_info.resource = view_gl->v.resource; - ds_info.sub_resource_idx = view_gl->v.sub_resource_idx; - ds_info.layer_count = view_gl->v.layer_count; - } - - wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context_gl->blit_targets, &ds_info, - color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); - } - } - - cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - if (rt_mask != *cur_mask) - { - wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); - *cur_mask = rt_mask; - } - context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; -} - -static void wined3d_context_gl_map_stage(struct wined3d_context_gl *context_gl, unsigned int stage, unsigned int unit) -{ - unsigned int i = context_gl->rev_tex_unit_map[unit]; - unsigned int j = context_gl->tex_unit_map[stage]; - - TRACE("Mapping stage %u to unit %u.\n", stage, unit); - context_gl->tex_unit_map[stage] = unit; - if (i != WINED3D_UNMAPPED_STAGE && i != stage) - context_gl->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - - context_gl->rev_tex_unit_map[unit] = stage; - if (j != WINED3D_UNMAPPED_STAGE && j != unit) - context_gl->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; -} - -static void context_invalidate_texture_stage(struct wined3d_context *context, DWORD stage) -{ - DWORD i; - - for (i = 0; i <= WINED3D_HIGHEST_TEXTURE_STATE; ++i) - context_invalidate_state(context, STATE_TEXTURESTAGE(stage, i)); -} - -static void context_update_fixed_function_usage_map(struct wined3d_context *context, - const struct wined3d_state *state) -{ - UINT i, start, end; - - context->fixed_function_usage_map = 0; - for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - { - enum wined3d_texture_op color_op = state->texture_states[i][WINED3D_TSS_COLOR_OP]; - enum wined3d_texture_op alpha_op = state->texture_states[i][WINED3D_TSS_ALPHA_OP]; - DWORD color_arg1 = state->texture_states[i][WINED3D_TSS_COLOR_ARG1] & WINED3DTA_SELECTMASK; - DWORD color_arg2 = state->texture_states[i][WINED3D_TSS_COLOR_ARG2] & WINED3DTA_SELECTMASK; - DWORD color_arg3 = state->texture_states[i][WINED3D_TSS_COLOR_ARG0] & WINED3DTA_SELECTMASK; - DWORD alpha_arg1 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] & WINED3DTA_SELECTMASK; - DWORD alpha_arg2 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] & WINED3DTA_SELECTMASK; - DWORD alpha_arg3 = state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] & WINED3DTA_SELECTMASK; - - /* Not used, and disable higher stages. */ - if (color_op == WINED3D_TOP_DISABLE) - break; - - if (((color_arg1 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG2) - || ((color_arg2 == WINED3DTA_TEXTURE) && color_op != WINED3D_TOP_SELECT_ARG1) - || ((color_arg3 == WINED3DTA_TEXTURE) - && (color_op == WINED3D_TOP_MULTIPLY_ADD || color_op == WINED3D_TOP_LERP)) - || ((alpha_arg1 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG2) - || ((alpha_arg2 == WINED3DTA_TEXTURE) && alpha_op != WINED3D_TOP_SELECT_ARG1) - || ((alpha_arg3 == WINED3DTA_TEXTURE) - && (alpha_op == WINED3D_TOP_MULTIPLY_ADD || alpha_op == WINED3D_TOP_LERP))) - context->fixed_function_usage_map |= (1u << i); - - if ((color_op == WINED3D_TOP_BUMPENVMAP || color_op == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - && i < WINED3D_MAX_TEXTURES - 1) - context->fixed_function_usage_map |= (1u << (i + 1)); - } - - if (i < context->lowest_disabled_stage) - { - start = i; - end = context->lowest_disabled_stage; - } - else - { - start = context->lowest_disabled_stage; - end = i; - } - - context->lowest_disabled_stage = i; - for (i = start + 1; i < end; ++i) - { - context_invalidate_state(context, STATE_TEXTURESTAGE(i, WINED3D_TSS_COLOR_OP)); - } -} - -static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state) -{ - const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; - unsigned int i, tex; - WORD ffu_map; - - ffu_map = context_gl->c.fixed_function_usage_map; - - if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages - || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) - { - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (!(ffu_map & 1)) - continue; - - if (context_gl->tex_unit_map[i] != i) - { - wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); - context_invalidate_texture_stage(&context_gl->c, i); - } - } - return; - } - - /* Now work out the mapping */ - tex = 0; - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (!(ffu_map & 1)) - continue; - - if (context_gl->tex_unit_map[i] != tex) - { - wined3d_context_gl_map_stage(context_gl, i, tex); - context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); - context_invalidate_texture_stage(&context_gl->c, i); - } - - ++tex; - } -} - -static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) -{ - const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; - const struct wined3d_shader_resource_info *resource_info = - state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; - unsigned int i; - - for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) - { - if (resource_info[i].type && context_gl->tex_unit_map[i] != i) - { - wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); - if (i < d3d_info->limits.ffp_blend_stages) - context_invalidate_texture_stage(&context_gl->c, i); - } - } -} - -static BOOL wined3d_context_gl_unit_free_for_vs(const struct wined3d_context_gl *context_gl, - const struct wined3d_shader_resource_info *ps_resource_info, unsigned int unit) -{ - unsigned int current_mapping = context_gl->rev_tex_unit_map[unit]; - - /* Not currently used */ - if (current_mapping == WINED3D_UNMAPPED_STAGE) - return TRUE; - - if (current_mapping < WINED3D_MAX_FRAGMENT_SAMPLERS) - { - /* Used by a fragment sampler */ - - if (!ps_resource_info) - { - /* No pixel shader, check fixed function */ - return current_mapping >= WINED3D_MAX_TEXTURES - || !(context_gl->c.fixed_function_usage_map & (1u << current_mapping)); - } - - /* Pixel shader, check the shader's sampler map */ - return !ps_resource_info[current_mapping].type; - } - - return TRUE; -} - -static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_gl, - BOOL ps, const struct wined3d_state *state) -{ - const struct wined3d_shader_resource_info *vs_resource_info = - state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; - const struct wined3d_shader_resource_info *ps_resource_info = NULL; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; - int i; - - /* Note that we only care if a resource is used or not, not the - * resource's specific type. Otherwise we'd need to call - * shader_update_samplers() here for 1.x pixelshaders. */ - if (ps) - ps_resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; - - for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) - { - DWORD vsampler_idx = i + WINED3D_MAX_FRAGMENT_SAMPLERS; - if (vs_resource_info[i].type) - { - while (start >= 0) - { - if (wined3d_context_gl_unit_free_for_vs(context_gl, ps_resource_info, start)) - { - if (context_gl->tex_unit_map[vsampler_idx] != start) - { - wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); - context_invalidate_state(&context_gl->c, STATE_SAMPLER(vsampler_idx)); - } - - --start; - break; - } - - --start; - } - if (context_gl->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) - WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); - } - } -} - -static void wined3d_context_gl_update_tex_unit_map(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - BOOL vs = use_vs(state); - BOOL ps = use_ps(state); - - if (!ps) - context_update_fixed_function_usage_map(&context_gl->c, state); - - /* Try to go for a 1:1 mapping of the samplers when possible. Pixel shaders - * need a 1:1 map at the moment. - * When the mapping of a stage is changed, sampler and ALL texture stage - * states have to be reset. */ - - if (gl_info->limits.graphics_samplers >= WINED3D_MAX_COMBINED_SAMPLERS) - return; - - if (ps) - wined3d_context_gl_map_psamplers(context_gl, state); - else - wined3d_context_gl_map_fixed_function_samplers(context_gl, state); - - if (vs) - wined3d_context_gl_map_vsamplers(context_gl, ps, state); -} - -/* Context activation is done by the caller. */ -void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - uint32_t rt_mask, *cur_mask; - - if (isStateDirty(context, STATE_FRAMEBUFFER)) return; - - cur_mask = context_gl->current_fbo ? &context_gl->current_fbo->rt_mask : &context_gl->draw_buffers_mask; - rt_mask = find_draw_buffers_mask(context_gl, state); - if (rt_mask != *cur_mask) - { - wined3d_context_gl_apply_draw_buffers(context_gl, rt_mask); - *cur_mask = rt_mask; - } -} - -static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) -{ - if ((usage == WINED3D_DECL_USAGE_POSITION || usage == WINED3D_DECL_USAGE_POSITIONT) && !usage_idx) - *regnum = WINED3D_FFP_POSITION; - else if (usage == WINED3D_DECL_USAGE_BLEND_WEIGHT && !usage_idx) - *regnum = WINED3D_FFP_BLENDWEIGHT; - else if (usage == WINED3D_DECL_USAGE_BLEND_INDICES && !usage_idx) - *regnum = WINED3D_FFP_BLENDINDICES; - else if (usage == WINED3D_DECL_USAGE_NORMAL && !usage_idx) - *regnum = WINED3D_FFP_NORMAL; - else if (usage == WINED3D_DECL_USAGE_PSIZE && !usage_idx) - *regnum = WINED3D_FFP_PSIZE; - else if (usage == WINED3D_DECL_USAGE_COLOR && !usage_idx) - *regnum = WINED3D_FFP_DIFFUSE; - else if (usage == WINED3D_DECL_USAGE_COLOR && usage_idx == 1) - *regnum = WINED3D_FFP_SPECULAR; - else if (usage == WINED3D_DECL_USAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) - *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; - else - { - WARN("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); - *regnum = ~0u; - return FALSE; - } - - return TRUE; -} - -/* Context activation is done by the caller. */ -void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) -{ - /* We need to deal with frequency data! */ - struct wined3d_vertex_declaration *declaration = state->vertex_declaration; - BOOL generic_attributes = d3d_info->ffp_generic_attributes; - BOOL use_vshader = use_vs(state); - unsigned int i; - - stream_info->use_map = 0; - stream_info->swizzle_map = 0; - stream_info->position_transformed = 0; - - if (!declaration) - return; - - stream_info->position_transformed = declaration->position_transformed; - - /* Translate the declaration into strided data. */ - for (i = 0; i < declaration->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; - const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; - BOOL stride_used; - unsigned int idx; - - TRACE("%p Element %p (%u of %u).\n", declaration->elements, - element, i + 1, declaration->element_count); - - if (!stream->buffer) - continue; - - TRACE("offset %u input_slot %u usage_idx %d.\n", element->offset, element->input_slot, element->usage_idx); - - if (use_vshader) - { - if (element->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) - { - stride_used = FALSE; - } - else if (element->output_slot == WINED3D_OUTPUT_SLOT_SEMANTIC) - { - /* TODO: Assuming vertexdeclarations are usually used with the - * same or a similar shader, it might be worth it to store the - * last used output slot and try that one first. */ - stride_used = vshader_get_input(state->shader[WINED3D_SHADER_TYPE_VERTEX], - element->usage, element->usage_idx, &idx); - } - else - { - idx = element->output_slot; - stride_used = TRUE; - } - } - else - { - if (!generic_attributes && !element->ffp_valid) - { - WARN("Skipping unsupported fixed function element of format %s and usage %s.\n", - debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); - stride_used = FALSE; - } - else - { - stride_used = fixed_get_input(element->usage, element->usage_idx, &idx); - } - } - - if (stride_used) - { - TRACE("Load %s array %u [usage %s, usage_idx %u, " - "input_slot %u, offset %u, stride %u, format %s, class %s, step_rate %u].\n", - use_vshader ? "shader": "fixed function", idx, - debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, - element->offset, stream->stride, debug_d3dformat(element->format->id), - debug_d3dinput_classification(element->input_slot_class), element->instance_data_step_rate); - - stream_info->elements[idx].format = element->format; - stream_info->elements[idx].data.buffer_object = 0; - stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; - stream_info->elements[idx].stride = stream->stride; - stream_info->elements[idx].stream_idx = element->input_slot; - if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - { - stream_info->elements[idx].divisor = 1; - } - else if (element->input_slot_class == WINED3D_INPUT_PER_INSTANCE_DATA) - { - stream_info->elements[idx].divisor = element->instance_data_step_rate; - if (!element->instance_data_step_rate) - FIXME("Instance step rate 0 not implemented.\n"); - } - else - { - stream_info->elements[idx].divisor = 0; - } - - if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) - { - stream_info->swizzle_map |= 1u << idx; - } - stream_info->use_map |= 1u << idx; - } - } -} - -/* Context activation is done by the caller. */ -static void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) -{ - struct wined3d_stream_info *stream_info = &context->stream_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - DWORD prev_all_vbo = stream_info->all_vbo; - unsigned int i; - WORD map; - - wined3d_stream_info_from_declaration(stream_info, state, d3d_info); - - stream_info->all_vbo = 1; - context->buffer_fence_count = 0; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) - { - struct wined3d_stream_info_element *element; - struct wined3d_bo_address data; - struct wined3d_buffer *buffer; - - if (!(map & 1)) - continue; - - element = &stream_info->elements[i]; - buffer = state->streams[element->stream_idx].buffer; - - /* We can't use VBOs if the base vertex index is negative. OpenGL - * doesn't accept negative offsets (or rather offsets bigger than the - * VBO, because the pointer is unsigned), so use system memory - * sources. In most sane cases the pointer - offset will still be > 0, - * otherwise it will wrap around to some big value. Hope that with the - * indices the driver wraps it back internally. If not, - * draw_primitive_immediate_mode() is needed, including a vertex buffer - * path. */ - if (state->load_base_vertex_index < 0) - { - WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", - state->load_base_vertex_index); - element->data.buffer_object = 0; - element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); - if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride) - FIXME("System memory vertex data load offset is negative!\n"); - } - else - { - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data, buffer->locations); - element->data.buffer_object = data.buffer_object; - element->data.addr += (ULONG_PTR)data.addr; - } - - if (!element->data.buffer_object) - stream_info->all_vbo = 0; - - if (buffer->fence) - context->buffer_fences[context->buffer_fence_count++] = buffer->fence; - - TRACE("Load array %u %s.\n", i, debug_bo_address(&element->data)); - } - - if (prev_all_vbo != stream_info->all_vbo) - context_invalidate_state(context, STATE_INDEXBUFFER); - - context->use_immediate_mode_draw = FALSE; - - if (stream_info->all_vbo) - return; - - if (!use_vs(state)) - { - WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) - & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); - - if ((stream_info->position_transformed && !d3d_info->xyzrhw) - || (stream_info->use_map & slow_mask)) - context->use_immediate_mode_draw = TRUE; - } -} - -/* Context activation is done by the caller. */ -static void context_preload_texture(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int idx) -{ - struct wined3d_texture *texture; - - if (!(texture = state->textures[idx])) - return; - - if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) - context->uses_fbo_attached_resources = 1; - - wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); -} - -/* Context activation is done by the caller. */ -static void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) -{ - unsigned int i; - - if (use_vs(state)) - { - for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) - { - if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); - } - } - - if (use_ps(state)) - { - for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) - { - if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, i); - } - } - else - { - WORD ffu_map = context->fixed_function_usage_map; - - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (ffu_map & 1) - context_preload_texture(context, state, i); - } - } -} - -static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, - unsigned int shader_mask) -{ - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; - unsigned int i, j; - - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader_mask & (1u << i))) - continue; - - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], context, state); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_load(buffer_from_resource(view->resource), context, state); - else - wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); - } - } -} - -static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state, enum wined3d_shader_type shader_type) -{ - unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_device *device = context_gl->c.device; - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - const struct wined3d_shader *shader; - const unsigned int *tex_unit_map; - struct wined3d_sampler *sampler; - - if (!(shader = state->shader[shader_type])) - return; - - tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, - &shader->reg_maps.shader_version, &base, &count); - - shader_sampler_count = shader->reg_maps.sampler_map.count; - if (shader_sampler_count > count) - FIXME("Shader %p needs %u samplers, but only %u are supported.\n", - shader, shader_sampler_count, count); - count = min(shader_sampler_count, count); - - for (i = 0; i < count; ++i) - { - entry = &shader->reg_maps.sampler_map.entries[i]; - bind_idx = base + entry->bind_idx; - if (tex_unit_map) - bind_idx = tex_unit_map[bind_idx]; - - if (!(view = state->shader_resource_view[shader_type][entry->resource_idx])) - { - WARN("No resource view bound at index %u, %u.\n", shader_type, entry->resource_idx); - continue; - } - - if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler = device->default_sampler; - else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) - sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), - bind_idx, wined3d_sampler_gl(sampler), context_gl); - } -} - -static void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) -{ - struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; - struct wined3d_buffer *buffer; - unsigned int i; - - context->uses_uavs = 0; - - if (!shader) - return; - - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!(view = views[i])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - { - buffer = buffer_from_resource(view->resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - } - else - { - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context->uses_uavs = 1; - } -} - -static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_context_gl *context_gl, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_unordered_access_view_gl *view_gl; - const struct wined3d_format_gl *format_gl; - GLuint texture_name; - unsigned int i; - GLint level; - - if (!shader) - return; - - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!views[i]) - { - if (shader->reg_maps.uav_resource_info[i].type) - WARN("No unordered access view bound at index %u.\n", i); - GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); - continue; - } - - view_gl = wined3d_unordered_access_view_gl(views[i]); - if (view_gl->gl_view.name) - { - texture_name = view_gl->gl_view.name; - level = 0; - } - else if (view_gl->v.resource->type != WINED3D_RTYPE_BUFFER) - { - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); - texture_name = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); - level = view_gl->v.desc.u.texture.level_idx; - } - else - { - FIXME("Unsupported buffer unordered access view.\n"); - GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); - continue; - } - - format_gl = wined3d_format_gl(view_gl->v.format); - GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, - format_gl->internal)); - - if (view_gl->counter_bo) - GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo)); - } - checkGLcall("Bind unordered access views"); -} - -static void context_load_stream_output_buffers(struct wined3d_context *context, - const struct wined3d_state *state) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - struct wined3d_buffer *buffer; - if (!(buffer = state->stream_output[i].buffer)) - continue; - - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - } -} - -/* Context activation is done by the caller. */ -static BOOL context_apply_draw_state(struct wined3d_context *context, - const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) -{ - const struct wined3d_state_entry *state_table = context->state_table; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_fb_state *fb = &state->fb; - unsigned int i, base; - WORD map; - - context->uses_fbo_attached_resources = 0; - - if (!have_framebuffer_attachment(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) - { - if (!gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) - { - FIXME("OpenGL implementation does not support framebuffers with no attachments.\n"); - return FALSE; - } - - wined3d_context_gl_set_render_offscreen(context_gl, TRUE); - } - - /* Preload resources before FBO setup. Texture preload in particular may - * result in changes to the current FBO, due to using e.g. FBO blits for - * updating a resource location. */ - wined3d_context_gl_update_tex_unit_map(context_gl, state); - context_preload_textures(context, state); - context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_PIXEL], - state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); - context_load_stream_output_buffers(context, state); - /* TODO: Right now the dependency on the vertex shader is necessary - * since wined3d_stream_info_from_declaration() depends on the reg_maps of - * the current VS but maybe it's possible to relax the coupling in some - * situations at least. */ - if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC) - || isStateDirty(context, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) - { - context_update_stream_info(context, state); - } - else - { - for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) - { - if (map & 1) - wined3d_buffer_load(state->streams[context->stream_info.elements[i].stream_idx].buffer, - context, state); - } - /* Loading the buffers above may have invalidated the stream info. */ - if (isStateDirty(context, STATE_STREAMSRC)) - context_update_stream_info(context, state); - } - if (indexed && state->index_buffer) - { - if (context->stream_info.all_vbo) - wined3d_buffer_load(state->index_buffer, context, state); - else - wined3d_buffer_load_sysmem(state->index_buffer, context); - } - - for (i = 0, base = 0; i < ARRAY_SIZE(context->dirty_graphics_states); ++i) - { - uint32_t dirty_mask = context->dirty_graphics_states[i]; - - while (dirty_mask) - { - unsigned int state_id = base + wined3d_bit_scan(&dirty_mask); - - state_table[state_id].apply(context, state, state_id); - context->dirty_graphics_states[i] &= ~(1u << (state_id - base)); - } - base += sizeof(dirty_mask) * CHAR_BIT; - } - - if (context->shader_update_mask & ~(1u << WINED3D_SHADER_TYPE_COMPUTE)) - { - device->shader_backend->shader_select(device->shader_priv, context, state); - context->shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; - } - - if (context->constant_update_mask) - { - device->shader_backend->shader_load_constants(device->shader_priv, context, state); - context->constant_update_mask = 0; - } - - if (context->update_shader_resource_bindings) - { - for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - wined3d_context_gl_bind_shader_resources(context_gl, state, i); - context->update_shader_resource_bindings = 0; - if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) - context->update_compute_shader_resource_bindings = 1; - } - - if (context->update_unordered_access_view_bindings) - { - wined3d_context_gl_bind_unordered_access_views(context_gl, - state->shader[WINED3D_SHADER_TYPE_PIXEL], - state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); - context->update_unordered_access_view_bindings = 0; - context->update_compute_unordered_access_view_bindings = 1; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); - - context->last_was_blit = FALSE; - context->last_was_ffp_blit = FALSE; - - return TRUE; -} - -static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *context_gl, - const struct wined3d_device *device, const struct wined3d_state *state) -{ - const struct wined3d_state_entry *state_table = context_gl->c.state_table; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int state_id, i; - - context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], - state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - - for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) - { - unsigned int dirty_mask = context_gl->c.dirty_compute_states[i]; - - while (dirty_mask) - { - unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); - state_table[current_state_id].apply(&context_gl->c, state, current_state_id); - } - state_id += sizeof(*context_gl->c.dirty_compute_states) * CHAR_BIT; - } - memset(context_gl->c.dirty_compute_states, 0, sizeof(*context_gl->c.dirty_compute_states)); - - if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) - { - device->shader_backend->shader_select_compute(device->shader_priv, &context_gl->c, state); - context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); - } - - if (context_gl->c.update_compute_shader_resource_bindings) - { - wined3d_context_gl_bind_shader_resources(context_gl, state, WINED3D_SHADER_TYPE_COMPUTE); - context_gl->c.update_compute_shader_resource_bindings = 0; - if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) - context_gl->c.update_shader_resource_bindings = 1; - } - - if (context_gl->c.update_compute_unordered_access_view_bindings) - { - wined3d_context_gl_bind_unordered_access_views(context_gl, - state->shader[WINED3D_SHADER_TYPE_COMPUTE], - state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - context_gl->c.update_compute_unordered_access_view_bindings = 0; - context_gl->c.update_unordered_access_view_bindings = 1; - } - - /* Updates to currently bound render targets aren't necessarily coherent - * between the graphics and compute pipelines. Unbind any currently bound - * FBO here to ensure preceding updates to its attachments by the graphics - * pipeline are visible to the compute pipeline. - * - * Without this, the bloom effect in Nier:Automata is too bright on the - * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - - context_gl->c.last_was_blit = FALSE; - context_gl->c.last_was_ffp_blit = FALSE; -} - -static BOOL use_transform_feedback(const struct wined3d_state *state) -{ - const struct wined3d_shader *shader; - if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) - return FALSE; - return shader->u.gs.so_desc.element_count; -} - -void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (context_gl->c.transform_feedback_active) - { - GL_EXTCALL(glEndTransformFeedback()); - checkGLcall("glEndTransformFeedback"); - context_gl->c.transform_feedback_active = 0; - context_gl->c.transform_feedback_paused = 0; - } -} - -static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_gl *context_gl, BOOL force) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!context_gl->c.transform_feedback_active || context_gl->c.transform_feedback_paused) - return; - - if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) - { - GL_EXTCALL(glPauseTransformFeedback()); - checkGLcall("glPauseTransformFeedback"); - context_gl->c.transform_feedback_paused = 1; - return; - } - - WARN("Cannot pause transform feedback operations.\n"); - - if (force) - wined3d_context_gl_end_transform_feedback(context_gl); -} - -static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_gl, - struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - BOOL old_render_offscreen = context_gl->c.render_offscreen, render_offscreen; - - render_offscreen = wined3d_resource_is_offscreen(&texture->resource); - if (context_gl->c.current_rt.texture == texture - && context_gl->c.current_rt.sub_resource_idx == sub_resource_idx - && render_offscreen == old_render_offscreen) - return; - - /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers - * the alpha blend state changes with different render target formats. */ - if (!context_gl->c.current_rt.texture) - { - context_invalidate_state(&context_gl->c, STATE_BLEND); - } - else - { - const struct wined3d_format *old = context_gl->c.current_rt.texture->resource.format; - const struct wined3d_format *new = texture->resource.format; - - if (old->id != new->id) - { - /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ - if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) - || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - context_invalidate_state(&context_gl->c, STATE_BLEND); - - /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) - != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); - } - - /* When switching away from an offscreen render target, and we're not - * using FBOs, we have to read the drawable into the texture. This is - * done via PreLoad (and WINED3D_LOCATION_DRAWABLE set on the surface). - * There are some things that need care though. PreLoad needs a GL context, - * and FindContext is called before the context is activated. It also - * has to be called with the old rendertarget active, otherwise a - * wrong drawable is read. */ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && (context_gl->c.current_rt.texture != texture - || context_gl->c.current_rt.sub_resource_idx != sub_resource_idx)) - { - struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context_gl->c.current_rt.texture); - unsigned int prev_sub_resource_idx = context_gl->c.current_rt.sub_resource_idx; - - /* Read the back buffer of the old drawable into the destination texture. */ - if (prev_texture->texture_srgb.name) - wined3d_texture_load(&prev_texture->t, &context_gl->c, TRUE); - wined3d_texture_load(&prev_texture->t, &context_gl->c, FALSE); - wined3d_texture_invalidate_location(&prev_texture->t, prev_sub_resource_idx, WINED3D_LOCATION_DRAWABLE); - } - } - - context_gl->c.current_rt.texture = texture; - context_gl->c.current_rt.sub_resource_idx = sub_resource_idx; - wined3d_context_gl_set_render_offscreen(context_gl, render_offscreen); -} - -static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, - struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - wined3d_context_gl_enter(context_gl); - wined3d_context_gl_update_window(context_gl); - wined3d_context_gl_setup_target(context_gl, texture, sub_resource_idx); - if (!context_gl->valid) - return; - - if (context_gl != wined3d_context_gl_get_current()) - { - if (!wined3d_context_gl_set_current(context_gl)) - ERR("Failed to activate the new context.\n"); - } - else if (context_gl->needs_set) - { - wined3d_context_gl_set_gl_context(context_gl); - } -} - -struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device *device, - struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - struct wined3d_context_gl *current_context = wined3d_context_gl_get_current(); - struct wined3d_context_gl *context_gl; - - TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - - if (current_context && current_context->c.destroyed) - current_context = NULL; - - if (!texture) - { - if (current_context - && current_context->c.current_rt.texture - && current_context->c.device == device) - { - texture = current_context->c.current_rt.texture; - sub_resource_idx = current_context->c.current_rt.sub_resource_idx; - } - else - { - struct wined3d_swapchain *swapchain = device->swapchains[0]; - - if (swapchain->back_buffers) - texture = swapchain->back_buffers[0]; - else - texture = swapchain->front_buffer; - sub_resource_idx = 0; - } - } - - if (current_context && current_context->c.current_rt.texture == texture) - { - context_gl = current_context; - } - else if (!wined3d_resource_is_offscreen(&texture->resource)) - { - TRACE("Rendering onscreen.\n"); - - if (!(context_gl = wined3d_swapchain_gl_get_context(wined3d_swapchain_gl(texture->swapchain)))) - return NULL; - } - else - { - TRACE("Rendering offscreen.\n"); - - /* Stay with the current context if possible. Otherwise use the - * context for the primary swapchain. */ - if (current_context && current_context->c.device == device) - context_gl = current_context; - else if (!(context_gl = wined3d_swapchain_gl_get_context(wined3d_swapchain_gl(device->swapchains[0])))) - return NULL; - } - - wined3d_context_gl_activate(context_gl, texture, sub_resource_idx); - - return &context_gl->c; -} - -struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) -{ - struct wined3d_context *acquired_context; - struct wined3d_device *device; - - if (!context_gl || context_gl->tid != GetCurrentThreadId()) - return NULL; - - device = context_gl->c.device; - wined3d_from_cs(device->cs); - - if (context_gl->c.current_rt.texture) - { - wined3d_context_gl_activate(context_gl, context_gl->c.current_rt.texture, - context_gl->c.current_rt.sub_resource_idx); - return context_gl; - } - - acquired_context = context_acquire(device, NULL, 0); - if (acquired_context != &context_gl->c) - ERR("Acquired context %p instead of %p.\n", acquired_context, &context_gl->c); - return wined3d_context_gl(acquired_context); -} - -void dispatch_compute(struct wined3d_device *device, const struct wined3d_state *state, - const struct wined3d_dispatch_parameters *parameters) -{ - const struct wined3d_gl_info *gl_info; - struct wined3d_context_gl *context_gl; - - context_gl = wined3d_context_gl(context_acquire(device, NULL, 0)); - if (!context_gl->valid) - { - context_release(&context_gl->c); - WARN("Invalid context, skipping dispatch.\n"); - return; - } - gl_info = context_gl->gl_info; - - if (!gl_info->supported[ARB_COMPUTE_SHADER]) - { - context_release(&context_gl->c); - FIXME("OpenGL implementation does not support compute shaders.\n"); - return; - } - - if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, &context_gl->c, state); - - wined3d_context_gl_apply_compute_state(context_gl, device, state); - - if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) - { - context_release(&context_gl->c); - WARN("No compute shader bound, skipping dispatch.\n"); - return; - } - - if (parameters->indirect) - { - const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; - struct wined3d_buffer *buffer = indirect->buffer; - - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); - GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); - } - else - { - const struct wined3d_direct_dispatch_parameters *direct = &parameters->u.direct; - GL_EXTCALL(glDispatchCompute(direct->group_count_x, direct->group_count_y, direct->group_count_z)); - } - checkGLcall("dispatch compute"); - - GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); - checkGLcall("glMemoryBarrier"); - - context_release(&context_gl->c); -} - -/* Context activation is done by the caller. */ -static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, - unsigned int start_idx, unsigned int count, unsigned int start_instance, unsigned int instance_count) -{ - const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; - GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - const struct wined3d_stream_info *si = &context_gl->c.stream_info; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; - unsigned int instanced_element_count = 0; - GLenum mode = state->gl_primitive_type; - const void *indices; - unsigned int i, j; - - indices = (const char *)idx_data + idx_size * start_idx; - - if (!instance_count) - { - if (!idx_size) - { - gl_info->gl_ops.gl.p_glDrawArrays(mode, start_idx, count); - checkGLcall("glDrawArrays"); - return; - } - - if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) - { - GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); - checkGLcall("glDrawElementsBaseVertex"); - return; - } - - gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); - checkGLcall("glDrawElements"); - return; - } - - if (start_instance && !(gl_info->supported[ARB_BASE_INSTANCE] && gl_info->supported[ARB_INSTANCED_ARRAYS])) - FIXME("Start instance (%u) not supported.\n", start_instance); - - if (gl_info->supported[ARB_INSTANCED_ARRAYS]) - { - if (!idx_size) - { - if (gl_info->supported[ARB_BASE_INSTANCE]) - { - GL_EXTCALL(glDrawArraysInstancedBaseInstance(mode, start_idx, count, instance_count, start_instance)); - checkGLcall("glDrawArraysInstancedBaseInstance"); - return; - } - - GL_EXTCALL(glDrawArraysInstanced(mode, start_idx, count, instance_count)); - checkGLcall("glDrawArraysInstanced"); - return; - } - - if (gl_info->supported[ARB_BASE_INSTANCE]) - { - GL_EXTCALL(glDrawElementsInstancedBaseVertexBaseInstance(mode, count, idx_type, - indices, instance_count, base_vertex_idx, start_instance)); - checkGLcall("glDrawElementsInstancedBaseVertexBaseInstance"); - return; - } - if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) - { - GL_EXTCALL(glDrawElementsInstancedBaseVertex(mode, count, idx_type, - indices, instance_count, base_vertex_idx)); - checkGLcall("glDrawElementsInstancedBaseVertex"); - return; - } - - GL_EXTCALL(glDrawElementsInstanced(mode, count, idx_type, indices, instance_count)); - checkGLcall("glDrawElementsInstanced"); - return; - } - - /* Instancing emulation by mixing immediate mode and arrays. */ - - /* This is a nasty thing. MSDN says no hardware supports this and - * applications have to use software vertex processing. We don't support - * this for now. - * - * Shouldn't be too hard to support with OpenGL, in theory just call - * glDrawArrays() instead of drawElements(). But the stream frequency value - * has a different meaning in that situation. */ - if (!idx_size) - { - FIXME("Non-indexed instanced drawing is not supported.\n"); - return; - } - - for (i = 0; i < ARRAY_SIZE(si->elements); ++i) - { - if (!(si->use_map & (1u << i))) - continue; - - if (state->streams[si->elements[i].stream_idx].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - instanced_elements[instanced_element_count++] = i; - } - - for (i = 0; i < instance_count; ++i) - { - /* Specify the instanced attributes using immediate mode calls. */ - for (j = 0; j < instanced_element_count; ++j) - { - const struct wined3d_stream_info_element *element; - unsigned int element_idx; - const BYTE *ptr; - - element_idx = instanced_elements[j]; - element = &si->elements[element_idx]; - ptr = element->data.addr + element->stride * i; - if (element->data.buffer_object) - ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, - &context_gl->c); - ops->generic[element->format->emit_idx](element_idx, ptr); - } - - if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) - { - GL_EXTCALL(glDrawElementsBaseVertex(mode, count, idx_type, indices, base_vertex_idx)); - checkGLcall("glDrawElementsBaseVertex"); - } - else - { - gl_info->gl_ops.gl.p_glDrawElements(mode, count, idx_type, indices); - checkGLcall("glDrawElements"); - } - } -} - -static unsigned int get_stride_idx(const void *idx_data, unsigned int idx_size, - unsigned int base_vertex_idx, unsigned int start_idx, unsigned int vertex_idx) -{ - if (!idx_data) - return start_idx + vertex_idx; - if (idx_size == 2) - return ((const WORD *)idx_data)[start_idx + vertex_idx] + base_vertex_idx; - return ((const DWORD *)idx_data)[start_idx + vertex_idx] + base_vertex_idx; -} - -/* Context activation is done by the caller. */ -static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, - const struct wined3d_stream_info *si, const void *idx_data, unsigned int idx_size, - int base_vertex_idx, unsigned int start_idx, unsigned int vertex_count, unsigned int instance_count) -{ - const BYTE *position = NULL, *normal = NULL, *diffuse = NULL, *specular = NULL; - const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int coord_idx, stride_idx, texture_idx, vertex_idx; - const struct wined3d_stream_info_element *element; - const BYTE *tex_coords[WINED3DDP_MAXTEXCOORD]; - unsigned int texture_unit, texture_stages; - const struct wined3d_ffp_attrib_ops *ops; - unsigned int untracked_material_count; - unsigned int tex_mask = 0; - BOOL specular_fog = FALSE; - BOOL ps = use_ps(state); - const void *ptr; - - static unsigned int once; - - if (!once++) - FIXME_(d3d_perf)("Drawing using immediate mode.\n"); - else - WARN_(d3d_perf)("Drawing using immediate mode.\n"); - - if (!idx_size && idx_data) - ERR("Non-NULL idx_data with 0 idx_size, this should never happen.\n"); - - if (instance_count) - FIXME("Instancing not implemented.\n"); - - /* Immediate mode drawing can't make use of indices in a VBO - get the - * data from the index buffer. */ - if (idx_size) - idx_data = wined3d_buffer_load_sysmem(state->index_buffer, &context_gl->c) + state->index_offset; - - ops = &d3d_info->ffp_attrib_ops; - - gl_info->gl_ops.gl.p_glBegin(state->gl_primitive_type); - - if (use_vs(state) || d3d_info->ffp_generic_attributes) - { - for (vertex_idx = 0; vertex_idx < vertex_count; ++vertex_idx) - { - unsigned int use_map = si->use_map; - unsigned int element_idx; - - stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); - for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) - { - if (!(use_map & 1u << element_idx)) - continue; - - ptr = si->elements[element_idx].data.addr + si->elements[element_idx].stride * stride_idx; - ops->generic[si->elements[element_idx].format->emit_idx](element_idx, ptr); - } - } - - gl_info->gl_ops.gl.p_glEnd(); - return; - } - - if (si->use_map & (1u << WINED3D_FFP_POSITION)) - position = si->elements[WINED3D_FFP_POSITION].data.addr; - - if (si->use_map & (1u << WINED3D_FFP_NORMAL)) - normal = si->elements[WINED3D_FFP_NORMAL].data.addr; - else - gl_info->gl_ops.gl.p_glNormal3f(0.0f, 0.0f, 0.0f); - - untracked_material_count = context_gl->untracked_material_count; - if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) - { - element = &si->elements[WINED3D_FFP_DIFFUSE]; - diffuse = element->data.addr; - - if (untracked_material_count && element->format->id != WINED3DFMT_B8G8R8A8_UNORM) - FIXME("Implement diffuse color tracking from %s.\n", debug_d3dformat(element->format->id)); - } - else - { - gl_info->gl_ops.gl.p_glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - } - - if (si->use_map & (1u << WINED3D_FFP_SPECULAR)) - { - element = &si->elements[WINED3D_FFP_SPECULAR]; - specular = element->data.addr; - - /* Special case where the fog density is stored in the specular alpha channel. */ - if (state->render_states[WINED3D_RS_FOGENABLE] - && (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE - || si->elements[WINED3D_FFP_POSITION].format->id == WINED3DFMT_R32G32B32A32_FLOAT) - && state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE) - { - if (gl_info->supported[EXT_FOG_COORD]) - { - if (element->format->id == WINED3DFMT_B8G8R8A8_UNORM) - specular_fog = TRUE; - else - FIXME("Implement fog coordinates from %s.\n", debug_d3dformat(element->format->id)); - } - else - { - static unsigned int once; - - if (!once++) - FIXME("Implement fog for transformed vertices in software.\n"); - } - } - } - else if (gl_info->supported[EXT_SECONDARY_COLOR]) - { - GL_EXTCALL(glSecondaryColor3fEXT)(0.0f, 0.0f, 0.0f); - } - - texture_stages = d3d_info->limits.ffp_blend_stages; - for (texture_idx = 0; texture_idx < texture_stages; ++texture_idx) - { - if (!gl_info->supported[ARB_MULTITEXTURE] && texture_idx > 0) - { - FIXME("Program using multiple concurrent textures which this OpenGL implementation doesn't support.\n"); - continue; - } - - if (!ps && !state->textures[texture_idx]) - continue; - - texture_unit = context_gl->tex_unit_map[texture_idx]; - if (texture_unit == WINED3D_UNMAPPED_STAGE) - continue; - - coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - if (coord_idx > 7) - { - TRACE("Skipping generated coordinates (%#x) for texture %u.\n", coord_idx, texture_idx); - continue; - } - - if (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))) - { - tex_coords[coord_idx] = si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].data.addr; - tex_mask |= (1u << texture_idx); - } - else - { - TRACE("Setting default coordinates for texture %u.\n", texture_idx); - if (gl_info->supported[ARB_MULTITEXTURE]) - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_unit, 0.0f, 0.0f, 0.0f, 1.0f)); - else - gl_info->gl_ops.gl.p_glTexCoord4f(0.0f, 0.0f, 0.0f, 1.0f); - } - } - - /* Blending data and point sizes are not supported by this function. They - * are not supported by the fixed function pipeline at all. A FIXME for - * them is printed after decoding the vertex declaration. */ - for (vertex_idx = 0; vertex_idx < vertex_count; ++vertex_idx) - { - unsigned int tmp_tex_mask; - - stride_idx = get_stride_idx(idx_data, idx_size, base_vertex_idx, start_idx, vertex_idx); - - if (normal) - { - ptr = normal + stride_idx * si->elements[WINED3D_FFP_NORMAL].stride; - ops->normal[si->elements[WINED3D_FFP_NORMAL].format->emit_idx](ptr); - } - - if (diffuse) - { - ptr = diffuse + stride_idx * si->elements[WINED3D_FFP_DIFFUSE].stride; - ops->diffuse[si->elements[WINED3D_FFP_DIFFUSE].format->emit_idx](ptr); - - if (untracked_material_count) - { - struct wined3d_color color; - unsigned int i; - - wined3d_color_from_d3dcolor(&color, *(const DWORD *)ptr); - for (i = 0; i < untracked_material_count; ++i) - { - gl_info->gl_ops.gl.p_glMaterialfv(GL_FRONT_AND_BACK, - context_gl->untracked_materials[i], &color.r); - } - } - } - - if (specular) - { - ptr = specular + stride_idx * si->elements[WINED3D_FFP_SPECULAR].stride; - ops->specular[si->elements[WINED3D_FFP_SPECULAR].format->emit_idx](ptr); - - if (specular_fog) - GL_EXTCALL(glFogCoordfEXT((float)(*(const DWORD *)ptr >> 24))); - } - - tmp_tex_mask = tex_mask; - for (texture_idx = 0; tmp_tex_mask; tmp_tex_mask >>= 1, ++texture_idx) - { - if (!(tmp_tex_mask & 1)) - continue; - - coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - ptr = tex_coords[coord_idx] + (stride_idx * si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].stride); - ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( - GL_TEXTURE0_ARB + context_gl->tex_unit_map[texture_idx], ptr); - } - - if (position) - { - ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; - ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); - } - } - - gl_info->gl_ops.gl.p_glEnd(); - checkGLcall("draw immediate mode"); -} - -static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, - const struct wined3d_indirect_draw_parameters *parameters, unsigned int idx_size) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_buffer *buffer = parameters->buffer; - const void *offset; - - if (!gl_info->supported[ARB_DRAW_INDIRECT]) - { - FIXME("OpenGL implementation does not support indirect draws.\n"); - return; - } - - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); - - offset = (void *)(GLintptr)parameters->offset; - if (idx_size) - { - GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - if (state->index_offset) - FIXME("Ignoring index offset %u.\n", state->index_offset); - GL_EXTCALL(glDrawElementsIndirect(state->gl_primitive_type, idx_type, offset)); - } - else - { - GL_EXTCALL(glDrawArraysIndirect(state->gl_primitive_type, offset)); - } - - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0)); - - checkGLcall("draw indirect"); -} - -static void remove_vbos(struct wined3d_context *context, - const struct wined3d_state *state, struct wined3d_stream_info *s) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(s->elements); ++i) - { - struct wined3d_stream_info_element *e; - - if (!(s->use_map & (1u << i))) - continue; - - e = &s->elements[i]; - if (e->data.buffer_object) - { - struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; - e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context); - } - } -} - -static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) -{ - GLenum gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); - switch (gl_primitive_type) - { - case GL_POINTS: - return GL_POINTS; - - case GL_LINE_STRIP: - case GL_LINE_STRIP_ADJACENCY: - case GL_LINES_ADJACENCY: - case GL_LINES: - return GL_LINES; - - case GL_TRIANGLE_FAN: - case GL_TRIANGLE_STRIP: - case GL_TRIANGLE_STRIP_ADJACENCY: - case GL_TRIANGLES_ADJACENCY: - case GL_TRIANGLES: - return GL_TRIANGLES; - - default: - return gl_primitive_type; - } -} - -static unsigned int get_render_target_writemask(const struct wined3d_blend_state *state, unsigned int index) -{ - if (!state) - return 0xf; - if (!state->desc.independent) - index = 0; - return state->desc.rt[index].writemask; -} - -/* Routine common to the draw primitive and draw indexed primitive routines */ -void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, - const struct wined3d_draw_parameters *parameters) -{ - BOOL emulation = FALSE, rasterizer_discard = FALSE; - const struct wined3d_fb_state *fb = &state->fb; - const struct wined3d_stream_info *stream_info; - struct wined3d_rendertarget_view *dsv, *rtv; - struct wined3d_stream_info si_emulated; - struct wined3d_fence *ib_fence = NULL; - const struct wined3d_gl_info *gl_info; - struct wined3d_context_gl *context_gl; - struct wined3d_context *context; - unsigned int i, idx_size = 0; - const void *idx_data = NULL; - - TRACE("device %p, state %p, parameters %p.\n", device, state, parameters); - - if (!parameters->indirect && !parameters->u.direct.index_count) - return; - - if (!parameters->indirect) - TRACE("base_vertex_idx %d, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", - parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, - parameters->u.direct.index_count, parameters->u.direct.start_instance, - parameters->u.direct.instance_count); - - if (!(rtv = fb->render_targets[0])) - rtv = fb->depth_stencil; - - if (rtv && rtv->resource->type == WINED3D_RTYPE_BUFFER) - { - FIXME("Buffer render targets not implemented.\n"); - return; - } - - if (rtv) - context = context_acquire(device, wined3d_texture_from_resource(rtv->resource), rtv->sub_resource_idx); - else - context = context_acquire(device, NULL, 0); - context_gl = wined3d_context_gl(context); - if (!context_gl->valid) - { - context_release(context); - WARN("Invalid context, skipping draw.\n"); - return; - } - gl_info = context_gl->gl_info; - - if (!use_transform_feedback(state)) - wined3d_context_gl_pause_transform_feedback(context_gl, TRUE); - - for (i = 0; i < gl_info->limits.buffers; ++i) - { - if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) - continue; - - if (get_render_target_writemask(state->blend_state, i)) - { - wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); - wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); - } - else - { - wined3d_rendertarget_view_prepare_location(rtv, context, rtv->resource->draw_binding); - } - } - - if ((dsv = fb->depth_stencil)) - { - /* Note that this depends on the context_acquire() call above to set - * context->render_offscreen properly. We don't currently take the - * Z-compare function into account, but we could skip loading the - * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note - * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - wined3d_rendertarget_view_load_location(dsv, context, location); - else - wined3d_rendertarget_view_prepare_location(dsv, context, location); - } - - if (parameters->indirect) - wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - - if (!context_apply_draw_state(context, device, state, parameters->indexed)) - { - context_release(context); - WARN("Unable to apply draw state, skipping draw.\n"); - return; - } - - if (dsv && state->render_states[WINED3D_RS_ZWRITEENABLE]) - { - DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - - wined3d_rendertarget_view_validate_location(dsv, location); - wined3d_rendertarget_view_invalidate_location(dsv, ~location); - } - - stream_info = &context->stream_info; - - if (parameters->indexed) - { - struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object || !stream_info->all_vbo) - { - idx_data = index_buffer->resource.heap_memory; - } - else - { - ib_fence = index_buffer->fence; - idx_data = NULL; - } - idx_data = (const BYTE *)idx_data + state->index_offset; - - if (state->index_format == WINED3DFMT_R16_UINT) - idx_size = 2; - else - idx_size = 4; - } - - if (!use_vs(state)) - { - if (!stream_info->position_transformed && context_gl->untracked_material_count - && state->render_states[WINED3D_RS_LIGHTING]) - { - static BOOL warned; - - if (!warned++) - FIXME("Using software emulation because not all material properties could be tracked.\n"); - else - WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); - emulation = TRUE; - } - else if (context->fog_coord && state->render_states[WINED3D_RS_FOGENABLE]) - { - static BOOL warned; - - /* Either write a pipeline replacement shader or convert the - * specular alpha from unsigned byte to a float in the vertex - * buffer. */ - if (!warned++) - FIXME("Using software emulation because manual fog coordinates are provided.\n"); - else - WARN_(d3d_perf)("Using software emulation because manual fog coordinates are provided.\n"); - emulation = TRUE; - } - - if (emulation) - { - si_emulated = context->stream_info; - remove_vbos(context, state, &si_emulated); - stream_info = &si_emulated; - } - } - - if (use_transform_feedback(state)) - { - const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - - if (is_rasterization_disabled(shader)) - { - glEnable(GL_RASTERIZER_DISCARD); - checkGLcall("enable rasterizer discard"); - rasterizer_discard = TRUE; - } - - if (context->transform_feedback_paused) - { - GL_EXTCALL(glResumeTransformFeedback()); - checkGLcall("glResumeTransformFeedback"); - context->transform_feedback_paused = 0; - } - else if (!context->transform_feedback_active) - { - enum wined3d_primitive_type primitive_type = shader->u.gs.output_type - ? shader->u.gs.output_type : d3d_primitive_type_from_gl(state->gl_primitive_type); - GLenum mode = gl_tfb_primitive_type_from_d3d(primitive_type); - GL_EXTCALL(glBeginTransformFeedback(mode)); - checkGLcall("glBeginTransformFeedback"); - context->transform_feedback_active = 1; - } - } - - if (state->gl_primitive_type == GL_PATCHES) - { - GL_EXTCALL(glPatchParameteri(GL_PATCH_VERTICES, state->gl_patch_vertices)); - checkGLcall("glPatchParameteri"); - } - - if (context->uses_fbo_attached_resources) - { - static unsigned int fixme_once; - - if (gl_info->supported[ARB_TEXTURE_BARRIER]) - { - GL_EXTCALL(glTextureBarrier()); - } - else if (gl_info->supported[NV_TEXTURE_BARRIER]) - { - GL_EXTCALL(glTextureBarrierNV()); - } - else - { - if (!fixme_once++) - FIXME("Sampling attached render targets is not supported.\n"); - - WARN("Sampling attached render targets is not supported, skipping draw.\n"); - context_release(context); - return; - } - checkGLcall("glTextureBarrier"); - } - - if (parameters->indirect) - { - if (!context->use_immediate_mode_draw && !emulation) - wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); - else - FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); - } - else - { - unsigned int instance_count = parameters->u.direct.instance_count; - if (context->instance_count) - instance_count = context->instance_count; - - if (context->use_immediate_mode_draw || emulation) - draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, - idx_size, parameters->u.direct.base_vertex_idx, - parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); - else - wined3d_context_gl_draw_primitive_arrays(context_gl, state, idx_data, idx_size, - parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, - parameters->u.direct.index_count, parameters->u.direct.start_instance, instance_count); - } - - if (context->uses_uavs) - { - GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); - checkGLcall("glMemoryBarrier"); - } - - wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); - - if (rasterizer_discard) - { - glDisable(GL_RASTERIZER_DISCARD); - checkGLcall("disable rasterizer discard"); - } - - if (ib_fence) - wined3d_fence_issue(ib_fence, device); - for (i = 0; i < context->buffer_fence_count; ++i) - wined3d_fence_issue(context->buffer_fences[i], device); - - context_release(context); - - TRACE("Draw completed.\n"); -} - -void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int texture_idx; - - for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) - { - gl_info->gl_ops.ext.p_glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx); - gl_info->gl_ops.gl.p_glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } -} - -void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, - const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_format_gl *format_gl; - unsigned int mapped_stage = 0; - unsigned int texture_idx; - - for (texture_idx = 0; texture_idx < context_gl->c.d3d_info->limits.ffp_blend_stages; ++texture_idx) - { - unsigned int coord_idx = state->texture_states[texture_idx][WINED3D_TSS_TEXCOORD_INDEX]; - - if ((mapped_stage = context_gl->tex_unit_map[texture_idx]) == WINED3D_UNMAPPED_STAGE) - continue; - - if (mapped_stage >= gl_info->limits.texture_coords) - { - FIXME("Attempted to load unsupported texture coordinate %u.\n", mapped_stage); - continue; - } - - if (coord_idx < WINED3D_MAX_TEXTURES && (si->use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)))) - { - const struct wined3d_stream_info_element *e = &si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx]; - - TRACE("Setting up texture %u, idx %u, coord_idx %u, data %s.\n", - texture_idx, mapped_stage, coord_idx, debug_bo_address(&e->data)); - - if (*current_bo != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - *current_bo = e->data.buffer_object; - } - - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); - checkGLcall("glClientActiveTextureARB"); - - /* The coords to supply depend completely on the fvf/vertex shader. */ - format_gl = wined3d_format_gl(e->format); - gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); - } - else - { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } - } - if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - /* The number of the mapped stages increases monotonically, so it's fine to use the last used one. */ - for (texture_idx = mapped_stage + 1; texture_idx < gl_info->limits.textures; ++texture_idx) - { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, 0, 0, 0, 1)); - } - } - - checkGLcall("loadTexCoords"); -} - -/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ -static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!context_gl->c.namedArraysLoaded) - return; - gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); - if (gl_info->supported[EXT_SECONDARY_COLOR]) - gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - wined3d_context_gl_unload_tex_coords(context_gl); - context_gl->c.namedArraysLoaded = FALSE; -} - -static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *context_gl, - const struct wined3d_stream_info *si, const struct wined3d_state *state) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_stream_info_element *e; - const struct wined3d_format_gl *format_gl; - GLuint current_bo; - - TRACE("context_gl %p, si %p, state %p.\n", context_gl, si, state); - - /* This is used for the fixed-function pipeline only, and the - * fixed-function pipeline doesn't do instancing. */ - context_gl->c.instance_count = 0; - current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; - - /* Blend data */ - if ((si->use_map & (1u << WINED3D_FFP_BLENDWEIGHT)) - || si->use_map & (1u << WINED3D_FFP_BLENDINDICES)) - { - /* TODO: Support vertex blending in immediate mode draws. No need to - * write a FIXME here, this is done after the general vertex - * declaration decoding. */ - WARN("Vertex blending not supported.\n"); - } - - /* Point Size */ - if (si->use_map & (1u << WINED3D_FFP_PSIZE)) - { - /* No such functionality in the fixed-function GL pipeline. */ - WARN("Per-vertex point size not supported.\n"); - } - - /* Position */ - if (si->use_map & (1u << WINED3D_FFP_POSITION)) - { - e = &si->elements[WINED3D_FFP_POSITION]; - format_gl = wined3d_format_gl(e->format); - - if (current_bo != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - current_bo = e->data.buffer_object; - } - - TRACE("glVertexPointer(%#x, %#x, %#x, %p);\n", - format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glVertexPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - checkGLcall("glVertexPointer(...)"); - gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); - checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); - } - - /* Normals */ - if (si->use_map & (1u << WINED3D_FFP_NORMAL)) - { - e = &si->elements[WINED3D_FFP_NORMAL]; - format_gl = wined3d_format_gl(e->format); - - if (current_bo != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - current_bo = e->data.buffer_object; - } - - TRACE("glNormalPointer(%#x, %#x, %p);\n", format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glNormalPointer(format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - checkGLcall("glNormalPointer(...)"); - gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); - checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); - - } - else - { - gl_info->gl_ops.gl.p_glNormal3f(0, 0, 0); - checkGLcall("glNormal3f(0, 0, 0)"); - } - - /* Diffuse colour */ - if (si->use_map & (1u << WINED3D_FFP_DIFFUSE)) - { - e = &si->elements[WINED3D_FFP_DIFFUSE]; - format_gl = wined3d_format_gl(e->format); - - if (current_bo != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - current_bo = e->data.buffer_object; - } - - TRACE("glColorPointer(%#x, %#x %#x, %p);\n", - format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - gl_info->gl_ops.gl.p_glColorPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); - gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); - checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); - - } - else - { - gl_info->gl_ops.gl.p_glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - checkGLcall("glColor4f(1, 1, 1, 1)"); - } - - /* Specular colour */ - if (si->use_map & (1u << WINED3D_FFP_SPECULAR)) - { - TRACE("Setting specular colour.\n"); - - e = &si->elements[WINED3D_FFP_SPECULAR]; - - if (gl_info->supported[EXT_SECONDARY_COLOR]) - { - GLint format; - GLenum type; - - format_gl = wined3d_format_gl(e->format); - type = format_gl->vtx_type; - format = format_gl->vtx_format; - - if (current_bo != e->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, e->data.buffer_object)); - checkGLcall("glBindBuffer"); - current_bo = e->data.buffer_object; - } - - if (format != 4 || (gl_info->quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) - { - /* Usually specular colors only allow 3 components, since they have no alpha. In D3D, the specular alpha - * contains the fog coordinate, which is passed to GL with GL_EXT_fog_coord. However, the fixed function - * vertex pipeline can pass the specular alpha through, and pixel shaders can read it. So it GL accepts - * 4 component secondary colors use it - */ - TRACE("glSecondaryColorPointer(%#x, %#x, %#x, %p);\n", format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(format, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); - checkGLcall("glSecondaryColorPointerEXT(format, type, ...)"); - } - else - { - switch (type) - { - case GL_UNSIGNED_BYTE: - TRACE("glSecondaryColorPointer(3, GL_UNSIGNED_BYTE, %#x, %p);\n", e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); - checkGLcall("glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, ...)"); - break; - - default: - FIXME("Add 4 component specular colour pointers for type %#x.\n", type); - /* Make sure that the right colour component is dropped. */ - TRACE("glSecondaryColorPointer(3, %#x, %#x, %p);\n", type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride); - GL_EXTCALL(glSecondaryColorPointerEXT(3, type, e->stride, - e->data.addr + state->load_base_vertex_index * e->stride)); - checkGLcall("glSecondaryColorPointerEXT(3, type, ...)"); - } - } - gl_info->gl_ops.gl.p_glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); - } - else - { - WARN("Specular colour is not supported in this GL implementation.\n"); - } - } - else - { - if (gl_info->supported[EXT_SECONDARY_COLOR]) - { - GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); - checkGLcall("glSecondaryColor3fEXT(0, 0, 0)"); - } - else - { - WARN("Specular colour is not supported in this GL implementation.\n"); - } - } - - /* Texture coordinates */ - wined3d_context_gl_load_tex_coords(context_gl, si, &current_bo, state); -} - -static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - GL_EXTCALL(glDisableVertexAttribArray(i)); - checkGLcall("glDisableVertexAttribArray"); - if (gl_info->supported[ARB_INSTANCED_ARRAYS]) - GL_EXTCALL(glVertexAttribDivisor(i, 0)); - - context_gl->c.numbered_array_mask &= ~(1u << i); -} - -static void wined3d_context_gl_unload_numbered_arrays(struct wined3d_context_gl *context_gl) -{ - uint32_t mask = context_gl->c.numbered_array_mask; - unsigned int i; - - while (mask) - { - i = wined3d_bit_scan(&mask); - wined3d_context_gl_unload_numbered_array(context_gl, i); - } -} - -static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *context_gl, - const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) -{ - struct wined3d_context *context = &context_gl->c; - const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLuint current_bo; - unsigned int i; - - /* Default to no instancing. */ - context->instance_count = 0; - current_bo = gl_info->supported[ARB_VERTEX_BUFFER_OBJECT] ? ~0u : 0; - - for (i = 0; i < MAX_ATTRIBS; ++i) - { - const struct wined3d_stream_info_element *element = &stream_info->elements[i]; - const struct wined3d_stream_state *stream; - const struct wined3d_format_gl *format_gl; - - if (!(stream_info->use_map & (1u << i))) - { - if (context->numbered_array_mask & (1u << i)) - wined3d_context_gl_unload_numbered_array(context_gl, i); - if (!use_vs(state) && i == WINED3D_FFP_DIFFUSE) - { - if (!(context_gl->default_attrib_value_set & (1u << i)) || !context_gl->diffuse_attrib_to_1) - { - GL_EXTCALL(glVertexAttrib4f(i, 1.0f, 1.0f, 1.0f, 1.0f)); - context_gl->diffuse_attrib_to_1 = 1; - } - } - else - { - if (!(context_gl->default_attrib_value_set & (1u << i))) - { - GL_EXTCALL(glVertexAttrib4f(i, 0.0f, 0.0f, 0.0f, 0.0f)); - if (i == WINED3D_FFP_DIFFUSE) - context_gl->diffuse_attrib_to_1 = 0; - } - } - context_gl->default_attrib_value_set |= 1u << i; - continue; - } - - format_gl = wined3d_format_gl(element->format); - stream = &state->streams[element->stream_idx]; - - if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency; - - if (gl_info->supported[ARB_INSTANCED_ARRAYS]) - { - GL_EXTCALL(glVertexAttribDivisor(i, element->divisor)); - } - else if (element->divisor) - { - /* Unload instanced arrays, they will be loaded using immediate - * mode instead. */ - if (context->numbered_array_mask & (1u << i)) - wined3d_context_gl_unload_numbered_array(context_gl, i); - context_gl->default_attrib_value_set &= ~(1u << i); - continue; - } - - TRACE("Loading array %u %s.\n", i, debug_bo_address(&element->data)); - - if (element->stride) - { - DWORD format_flags = format_gl->f.flags[WINED3D_GL_RES_TYPE_BUFFER]; - - if (current_bo != element->data.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, element->data.buffer_object)); - checkGLcall("glBindBuffer"); - current_bo = element->data.buffer_object; - } - /* Use the VBO to find out if a vertex buffer exists, not the vb - * pointer. vb can point to a user pointer data blob. In that case - * current_bo will be 0. If there is a vertex buffer but no vbo we - * won't be load converted attributes anyway. */ - if (vs && vs->reg_maps.shader_version.major >= 4 && (format_flags & WINED3DFMT_FLAG_INTEGER)) - { - GL_EXTCALL(glVertexAttribIPointer(i, format_gl->vtx_format, format_gl->vtx_type, - element->stride, element->data.addr + state->load_base_vertex_index * element->stride)); - } - else - { - GL_EXTCALL(glVertexAttribPointer(i, format_gl->vtx_format, format_gl->vtx_type, - !!(format_flags & WINED3DFMT_FLAG_NORMALISED), element->stride, - element->data.addr + state->load_base_vertex_index * element->stride)); - } - - if (!(context->numbered_array_mask & (1u << i))) - { - GL_EXTCALL(glEnableVertexAttribArray(i)); - context->numbered_array_mask |= (1u << i); - } - } - else - { - /* Stride = 0 means always the same values. - * glVertexAttribPointer() doesn't do that. Instead disable the - * pointer and set up the attribute statically. But we have to - * figure out the system memory address. */ - const BYTE *ptr = element->data.addr; - if (element->data.buffer_object) - ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(stream->buffer, context); - - if (context->numbered_array_mask & (1u << i)) - wined3d_context_gl_unload_numbered_array(context_gl, i); - - switch (format_gl->f.id) - { - case WINED3DFMT_R32_FLOAT: - GL_EXTCALL(glVertexAttrib1fv(i, (const GLfloat *)ptr)); - break; - case WINED3DFMT_R32G32_FLOAT: - GL_EXTCALL(glVertexAttrib2fv(i, (const GLfloat *)ptr)); - break; - case WINED3DFMT_R32G32B32_FLOAT: - GL_EXTCALL(glVertexAttrib3fv(i, (const GLfloat *)ptr)); - break; - case WINED3DFMT_R32G32B32A32_FLOAT: - GL_EXTCALL(glVertexAttrib4fv(i, (const GLfloat *)ptr)); - break; - case WINED3DFMT_R8G8B8A8_UINT: - GL_EXTCALL(glVertexAttrib4ubv(i, ptr)); - break; - case WINED3DFMT_B8G8R8A8_UNORM: - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - { - const DWORD *src = (const DWORD *)ptr; - DWORD c = *src & 0xff00ff00u; - c |= (*src & 0xff0000u) >> 16; - c |= (*src & 0xffu) << 16; - GL_EXTCALL(glVertexAttrib4Nubv(i, (GLubyte *)&c)); - break; - } - /* else fallthrough */ - case WINED3DFMT_R8G8B8A8_UNORM: - GL_EXTCALL(glVertexAttrib4Nubv(i, ptr)); - break; - case WINED3DFMT_R16G16_SINT: - GL_EXTCALL(glVertexAttrib2sv(i, (const GLshort *)ptr)); - break; - case WINED3DFMT_R16G16B16A16_SINT: - GL_EXTCALL(glVertexAttrib4sv(i, (const GLshort *)ptr)); - break; - case WINED3DFMT_R16G16_SNORM: - { - const GLshort s[4] = {((const GLshort *)ptr)[0], ((const GLshort *)ptr)[1], 0, 1}; - GL_EXTCALL(glVertexAttrib4Nsv(i, s)); - break; - } - case WINED3DFMT_R16G16_UNORM: - { - const GLushort s[4] = {((const GLushort *)ptr)[0], ((const GLushort *)ptr)[1], 0, 1}; - GL_EXTCALL(glVertexAttrib4Nusv(i, s)); - break; - } - case WINED3DFMT_R16G16B16A16_SNORM: - GL_EXTCALL(glVertexAttrib4Nsv(i, (const GLshort *)ptr)); - break; - case WINED3DFMT_R16G16B16A16_UNORM: - GL_EXTCALL(glVertexAttrib4Nusv(i, (const GLushort *)ptr)); - break; - case WINED3DFMT_R10G10B10X2_UINT: - FIXME("Unsure about WINED3DDECLTYPE_UDEC3.\n"); - /*glVertexAttrib3usvARB(i, (const GLushort *)ptr); Does not exist */ - break; - case WINED3DFMT_R10G10B10X2_SNORM: - FIXME("Unsure about WINED3DDECLTYPE_DEC3N.\n"); - /*glVertexAttrib3NusvARB(i, (const GLushort *)ptr); Does not exist */ - break; - case WINED3DFMT_R16G16_FLOAT: - if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) - { - /* Not supported by GL_ARB_half_float_vertex. */ - GL_EXTCALL(glVertexAttrib2hvNV(i, (const GLhalfNV *)ptr)); - } - else - { - float x = float_16_to_32(((const unsigned short *)ptr) + 0); - float y = float_16_to_32(((const unsigned short *)ptr) + 1); - GL_EXTCALL(glVertexAttrib2f(i, x, y)); - } - break; - case WINED3DFMT_R16G16B16A16_FLOAT: - if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) - { - /* Not supported by GL_ARB_half_float_vertex. */ - GL_EXTCALL(glVertexAttrib4hvNV(i, (const GLhalfNV *)ptr)); - } - else - { - float x = float_16_to_32(((const unsigned short *)ptr) + 0); - float y = float_16_to_32(((const unsigned short *)ptr) + 1); - float z = float_16_to_32(((const unsigned short *)ptr) + 2); - float w = float_16_to_32(((const unsigned short *)ptr) + 3); - GL_EXTCALL(glVertexAttrib4f(i, x, y, z, w)); - } - break; - default: - ERR("Unexpected declaration in stride 0 attributes.\n"); - break; - - } - context_gl->default_attrib_value_set &= ~(1u << i); - } - } - checkGLcall("Loading numbered arrays"); -} - -void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, - const struct wined3d_state *state) -{ - if (context_gl->c.use_immediate_mode_draw) - return; - - wined3d_context_gl_unload_vertex_data(context_gl); - if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) - { - TRACE("Loading numbered arrays.\n"); - wined3d_context_gl_load_numbered_arrays(context_gl, &context_gl->c.stream_info, state); - return; - } - - TRACE("Loading named arrays.\n"); - wined3d_context_gl_unload_numbered_arrays(context_gl); - wined3d_context_gl_load_vertex_data(context_gl, &context_gl->c.stream_info, state); - context_gl->c.namedArraysLoaded = TRUE; -} - -static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, - GLenum target, unsigned int level, enum wined3d_texture_filter_type filter) -{ - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(filter)); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, - wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, level); - - /* We changed the filtering settings on the texture. Make sure they get - * reset on subsequent draws. */ - texture->sampler_desc.mag_filter = WINED3D_TEXF_POINT; - texture->sampler_desc.min_filter = WINED3D_TEXF_POINT; - texture->sampler_desc.mip_filter = WINED3D_TEXF_NONE; - texture->sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; - texture->sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; - texture->sampler_desc.srgb_decode = FALSE; - texture->base_level = level; -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, - unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, - enum wined3d_texture_filter_type filter) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_blt_info info; - unsigned int level, w, h, i; - SIZE dst_size; - struct blit_vertex - { - float x, y; - struct wined3d_vec3 texcoord; - } - quad[4]; - - texture2d_get_blt_info(texture_gl, sub_resource_idx, src_rect, &info); - - level = sub_resource_idx % texture_gl->t.level_count; - wined3d_context_gl_bind_texture(context_gl, info.bind_target, texture_gl->texture_rgb.name); - apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); - - wined3d_context_gl_get_rt_size(context_gl, &dst_size); - w = dst_size.cx; - h = dst_size.cy; - - quad[0].x = dst_rect->left * 2.0f / w - 1.0f; - quad[0].y = dst_rect->top * 2.0f / h - 1.0f; - quad[0].texcoord = info.texcoords[0]; - - quad[1].x = dst_rect->right * 2.0f / w - 1.0f; - quad[1].y = dst_rect->top * 2.0f / h - 1.0f; - quad[1].texcoord = info.texcoords[1]; - - quad[2].x = dst_rect->left * 2.0f / w - 1.0f; - quad[2].y = dst_rect->bottom * 2.0f / h - 1.0f; - quad[2].texcoord = info.texcoords[2]; - - quad[3].x = dst_rect->right * 2.0f / w - 1.0f; - quad[3].y = dst_rect->bottom * 2.0f / h - 1.0f; - quad[3].texcoord = info.texcoords[3]; - - /* Draw a quad. */ - if (gl_info->supported[ARB_VERTEX_BUFFER_OBJECT]) - { - if (!context_gl->blit_vbo) - GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - - wined3d_context_gl_unload_vertex_data(context_gl); - wined3d_context_gl_unload_numbered_arrays(context_gl); - - GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); - GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL)); - GL_EXTCALL(glVertexAttribPointer(1, 3, GL_FLOAT, FALSE, sizeof(*quad), - (void *)FIELD_OFFSET(struct blit_vertex, texcoord))); - - GL_EXTCALL(glEnableVertexAttribArray(0)); - GL_EXTCALL(glEnableVertexAttribArray(1)); - - gl_info->gl_ops.gl.p_glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, 0)); - GL_EXTCALL(glDisableVertexAttribArray(1)); - GL_EXTCALL(glDisableVertexAttribArray(0)); - } - else - { - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - - for (i = 0; i < ARRAY_SIZE(quad); ++i) - { - GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); - GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); - } - - gl_info->gl_ops.gl.p_glEnd(); - } - checkGLcall("draw"); - - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); - wined3d_context_gl_bind_texture(context_gl, info.bind_target, 0); -} - -/* Context activation is done by the caller. */ -void wined3d_context_gl_draw_textured_quad(struct wined3d_context_gl *context_gl, - struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, - const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_blt_info info; - unsigned int level; - - texture2d_get_blt_info(texture_gl, sub_resource_idx, src_rect, &info); - - gl_info->gl_ops.gl.p_glEnable(info.bind_target); - checkGLcall("glEnable(bind_target)"); - - level = sub_resource_idx % texture_gl->t.level_count; - wined3d_context_gl_bind_texture(context_gl, info.bind_target, texture_gl->texture_rgb.name); - apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); - gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - checkGLcall("glTexEnvi"); - - /* Draw a quad. */ - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glTexCoord3fv(&info.texcoords[0].x); - gl_info->gl_ops.gl.p_glVertex2i(dst_rect->left, dst_rect->top); - - gl_info->gl_ops.gl.p_glTexCoord3fv(&info.texcoords[1].x); - gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->top); - - gl_info->gl_ops.gl.p_glTexCoord3fv(&info.texcoords[2].x); - gl_info->gl_ops.gl.p_glVertex2i(dst_rect->left, dst_rect->bottom); - - gl_info->gl_ops.gl.p_glTexCoord3fv(&info.texcoords[3].x); - gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); - gl_info->gl_ops.gl.p_glEnd(); - - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture_gl->t.level_count - 1); - wined3d_context_gl_bind_texture(context_gl, info.bind_target, 0); -} +/* + * Context and render target management in wined3d + * + * Copyright 2002-2004 Jason Edmeades + * Copyright 2002-2004 Raphael Junqueira + * Copyright 2004 Christian Costa + * Copyright 2005 Oliver Stieber + * Copyright 2006, 2008 Henri Verbeet + * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers + * Copyright 2009-2011 Henri Verbeet for CodeWeavers + * + * 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 "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); +WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); + +void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) +{ + unsigned int i; + + if (!device->d3d_initialized) + return; + + for (i = 0; i < device->context_count; ++i) + { + struct wined3d_context *context = device->contexts[i]; + + if (&context->current_rt.texture->resource == resource) + { + context->current_rt.texture = NULL; + context->current_rt.sub_resource_idx = 0; + } + } +} + +void wined3d_context_cleanup(struct wined3d_context *context) +{ +} + +/* This is used when a context for render target A is active, but a separate context is + * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt + * A to avoid breaking caller code. */ +void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + if (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx) + { + context_release(context); + context = context_acquire(texture->resource.device, texture, sub_resource_idx); + } + + context_release(context); +} + +void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) +{ + DWORD representative = context->state_table[state_id].representative - STATE_COMPUTE_OFFSET; + unsigned int index, shift; + + index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); + shift = representative & (sizeof(*context->dirty_compute_states) * CHAR_BIT - 1); + context->dirty_compute_states[index] |= (1u << shift); +} + +void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) +{ + unsigned int representative = context->state_table[state_id].representative; + unsigned int index, shift; + + index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); + shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); + context->dirty_graphics_states[index] |= (1u << shift); +} + +void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) +{ + struct wined3d_device *device = swapchain->device; + DWORD state; + + context->d3d_info = &device->adapter->d3d_info; + context->state_table = device->state_table; + + /* Mark all states dirty to force a proper initialization of the states on + * the first use of the context. Compute states do not need initialization. */ + for (state = 0; state <= STATE_HIGHEST; ++state) + { + if (context->state_table[state].representative && !STATE_IS_COMPUTE(state)) + context_invalidate_state(context, state); + } + + context->device = device; + context->swapchain = swapchain; + context->current_rt.texture = swapchain->front_buffer; + context->current_rt.sub_resource_idx = 0; + + context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) + | (1u << WINED3D_SHADER_TYPE_VERTEX) + | (1u << WINED3D_SHADER_TYPE_GEOMETRY) + | (1u << WINED3D_SHADER_TYPE_HULL) + | (1u << WINED3D_SHADER_TYPE_DOMAIN) + | (1u << WINED3D_SHADER_TYPE_COMPUTE); +} + +HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) +{ + TRACE("context_no3d %p, swapchain %p.\n", context_no3d, swapchain); + + wined3d_context_init(context_no3d, swapchain); + + return WINED3D_OK; +} + +static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) +{ + if ((usage == WINED3D_DECL_USAGE_POSITION || usage == WINED3D_DECL_USAGE_POSITIONT) && !usage_idx) + *regnum = WINED3D_FFP_POSITION; + else if (usage == WINED3D_DECL_USAGE_BLEND_WEIGHT && !usage_idx) + *regnum = WINED3D_FFP_BLENDWEIGHT; + else if (usage == WINED3D_DECL_USAGE_BLEND_INDICES && !usage_idx) + *regnum = WINED3D_FFP_BLENDINDICES; + else if (usage == WINED3D_DECL_USAGE_NORMAL && !usage_idx) + *regnum = WINED3D_FFP_NORMAL; + else if (usage == WINED3D_DECL_USAGE_PSIZE && !usage_idx) + *regnum = WINED3D_FFP_PSIZE; + else if (usage == WINED3D_DECL_USAGE_COLOR && !usage_idx) + *regnum = WINED3D_FFP_DIFFUSE; + else if (usage == WINED3D_DECL_USAGE_COLOR && usage_idx == 1) + *regnum = WINED3D_FFP_SPECULAR; + else if (usage == WINED3D_DECL_USAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) + *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; + else + { + WARN("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); + *regnum = ~0u; + return FALSE; + } + + return TRUE; +} + +/* Context activation is done by the caller. */ +void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, + const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) +{ + /* We need to deal with frequency data! */ + struct wined3d_vertex_declaration *declaration = state->vertex_declaration; + BOOL generic_attributes = d3d_info->ffp_generic_attributes; + BOOL use_vshader = use_vs(state); + unsigned int i; + + stream_info->use_map = 0; + stream_info->swizzle_map = 0; + stream_info->position_transformed = 0; + + if (!declaration) + return; + + stream_info->position_transformed = declaration->position_transformed; + + /* Translate the declaration into strided data. */ + for (i = 0; i < declaration->element_count; ++i) + { + const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; + const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; + BOOL stride_used; + unsigned int idx; + + TRACE("%p Element %p (%u of %u).\n", declaration->elements, + element, i + 1, declaration->element_count); + + if (!stream->buffer) + continue; + + TRACE("offset %u input_slot %u usage_idx %d.\n", element->offset, element->input_slot, element->usage_idx); + + if (use_vshader) + { + if (element->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) + { + stride_used = FALSE; + } + else if (element->output_slot == WINED3D_OUTPUT_SLOT_SEMANTIC) + { + /* TODO: Assuming vertexdeclarations are usually used with the + * same or a similar shader, it might be worth it to store the + * last used output slot and try that one first. */ + stride_used = vshader_get_input(state->shader[WINED3D_SHADER_TYPE_VERTEX], + element->usage, element->usage_idx, &idx); + } + else + { + idx = element->output_slot; + stride_used = TRUE; + } + } + else + { + if (!generic_attributes && !element->ffp_valid) + { + WARN("Skipping unsupported fixed function element of format %s and usage %s.\n", + debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); + stride_used = FALSE; + } + else + { + stride_used = fixed_get_input(element->usage, element->usage_idx, &idx); + } + } + + if (stride_used) + { + TRACE("Load %s array %u [usage %s, usage_idx %u, " + "input_slot %u, offset %u, stride %u, format %s, class %s, step_rate %u].\n", + use_vshader ? "shader": "fixed function", idx, + debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, + element->offset, stream->stride, debug_d3dformat(element->format->id), + debug_d3dinput_classification(element->input_slot_class), element->instance_data_step_rate); + + stream_info->elements[idx].format = element->format; + stream_info->elements[idx].data.buffer_object = 0; + stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; + stream_info->elements[idx].stride = stream->stride; + stream_info->elements[idx].stream_idx = element->input_slot; + if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) + { + stream_info->elements[idx].divisor = 1; + } + else if (element->input_slot_class == WINED3D_INPUT_PER_INSTANCE_DATA) + { + stream_info->elements[idx].divisor = element->instance_data_step_rate; + if (!element->instance_data_step_rate) + FIXME("Instance step rate 0 not implemented.\n"); + } + else + { + stream_info->elements[idx].divisor = 0; + } + + if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) + { + stream_info->swizzle_map |= 1u << idx; + } + stream_info->use_map |= 1u << idx; + } + } +} + +/* Context activation is done by the caller. */ +void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) +{ + struct wined3d_stream_info *stream_info = &context->stream_info; + const struct wined3d_d3d_info *d3d_info = context->d3d_info; + DWORD prev_all_vbo = stream_info->all_vbo; + unsigned int i; + WORD map; + + wined3d_stream_info_from_declaration(stream_info, state, d3d_info); + + stream_info->all_vbo = 1; + context->buffer_fence_count = 0; + for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + { + struct wined3d_stream_info_element *element; + struct wined3d_bo_address data; + struct wined3d_buffer *buffer; + + if (!(map & 1)) + continue; + + element = &stream_info->elements[i]; + buffer = state->streams[element->stream_idx].buffer; + + /* We can't use VBOs if the base vertex index is negative. OpenGL + * doesn't accept negative offsets (or rather offsets bigger than the + * VBO, because the pointer is unsigned), so use system memory + * sources. In most sane cases the pointer - offset will still be > 0, + * otherwise it will wrap around to some big value. Hope that with the + * indices the driver wraps it back internally. If not, + * draw_primitive_immediate_mode() is needed, including a vertex buffer + * path. */ + if (state->load_base_vertex_index < 0) + { + WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", + state->load_base_vertex_index); + element->data.buffer_object = 0; + element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); + if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride) + FIXME("System memory vertex data load offset is negative!\n"); + } + else + { + wined3d_buffer_load(buffer, context, state); + wined3d_buffer_get_memory(buffer, &data, buffer->locations); + element->data.buffer_object = data.buffer_object; + element->data.addr += (ULONG_PTR)data.addr; + } + + if (!element->data.buffer_object) + stream_info->all_vbo = 0; + + if (buffer->fence) + context->buffer_fences[context->buffer_fence_count++] = buffer->fence; + + TRACE("Load array %u %s.\n", i, debug_bo_address(&element->data)); + } + + if (prev_all_vbo != stream_info->all_vbo) + context_invalidate_state(context, STATE_INDEXBUFFER); + + context->use_immediate_mode_draw = FALSE; + + if (stream_info->all_vbo) + return; + + if (!use_vs(state)) + { + WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); + slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) + & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); + + if ((stream_info->position_transformed && !d3d_info->xyzrhw) + || (stream_info->use_map & slow_mask)) + context->use_immediate_mode_draw = TRUE; + } +} + +/* Context activation is done by the caller. */ +static void context_preload_texture(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int idx) +{ + struct wined3d_texture *texture; + + if (!(texture = state->textures[idx])) + return; + + if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) + context->uses_fbo_attached_resources = 1; + + wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); +} + +/* Context activation is done by the caller. */ +void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) +{ + unsigned int i; + + if (use_vs(state)) + { + for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) + { + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) + context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); + } + } + + if (use_ps(state)) + { + for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) + { + if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info[i].type) + context_preload_texture(context, state, i); + } + } + else + { + WORD ffu_map = context->fixed_function_usage_map; + + for (i = 0; ffu_map; ffu_map >>= 1, ++i) + { + if (ffu_map & 1) + context_preload_texture(context, state, i); + } + } +} + +void context_load_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int shader_mask) +{ + struct wined3d_shader_sampler_map_entry *entry; + struct wined3d_shader_resource_view *view; + struct wined3d_shader *shader; + unsigned int i, j; + + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + { + if (!(shader_mask & (1u << i))) + continue; + + if (!(shader = state->shader[i])) + continue; + + for (j = 0; j < WINED3D_MAX_CBS; ++j) + { + if (state->cb[i][j]) + wined3d_buffer_load(state->cb[i][j], context, state); + } + + for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) + { + entry = &shader->reg_maps.sampler_map.entries[j]; + + if (!(view = state->shader_resource_view[i][entry->resource_idx])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + wined3d_buffer_load(buffer_from_resource(view->resource), context, state); + else + wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); + } + } +} + +void context_load_unordered_access_resources(struct wined3d_context *context, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) +{ + struct wined3d_unordered_access_view *view; + struct wined3d_texture *texture; + struct wined3d_buffer *buffer; + unsigned int i; + + context->uses_uavs = 0; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!(view = views[i])) + continue; + + if (view->resource->type == WINED3D_RTYPE_BUFFER) + { + buffer = buffer_from_resource(view->resource); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); + } + else + { + texture = texture_from_resource(view->resource); + wined3d_texture_load(texture, context, FALSE); + wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context->uses_uavs = 1; + } +} + +void context_load_stream_output_buffers(struct wined3d_context *context, const struct wined3d_state *state) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) + { + struct wined3d_buffer *buffer; + if (!(buffer = state->stream_output[i].buffer)) + continue; + + wined3d_buffer_load(buffer, context, state); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); + } +} diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context_gl.c similarity index 92% copy from dlls/wined3d/context.c copy to dlls/wined3d/context_gl.c index d20e9e6835e..9dbd0346ff3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context_gl.c @@ -27,11 +27,6 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> -#ifdef HAVE_FLOAT_H -# include <float.h> -#endif - #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); @@ -1077,25 +1072,6 @@ static void wined3d_context_gl_queue_fbo_entry_destruction(struct wined3d_contex list_add_head(&context_gl->fbo_destroy_list, &entry->entry); } -void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) -{ - unsigned int i; - - if (!device->d3d_initialized) - return; - - for (i = 0; i < device->context_count; ++i) - { - struct wined3d_context *context = device->contexts[i]; - - if (&context->current_rt.texture->resource == resource) - { - context->current_rt.texture = NULL; - context->current_rt.sub_resource_idx = 0; - } - } -} - void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) { wined3d_context_gl_enum_fbo_entries(device, name, rb_namespace, @@ -1328,10 +1304,6 @@ static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_ } } -void wined3d_context_cleanup(struct wined3d_context *context) -{ -} - static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) { struct wined3d_pipeline_statistics_query *pipeline_statistics_query; @@ -1600,20 +1572,6 @@ void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) } } -/* This is used when a context for render target A is active, but a separate context is - * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt - * A to avoid breaking caller code. */ -void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) -{ - if (context->current_rt.texture != texture || context->current_rt.sub_resource_idx != sub_resource_idx) - { - context_release(context); - context = context_acquire(texture->resource.device, texture, sub_resource_idx); - } - - context_release(context); -} - static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) { TRACE("Entering context %p, level %u.\n", context_gl, context_gl->level + 1); @@ -1637,26 +1595,6 @@ static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) } } -void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) -{ - DWORD representative = context->state_table[state_id].representative - STATE_COMPUTE_OFFSET; - unsigned int index, shift; - - index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); - shift = representative & (sizeof(*context->dirty_compute_states) * CHAR_BIT - 1); - context->dirty_compute_states[index] |= (1u << shift); -} - -void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) -{ - unsigned int representative = context->state_table[state_id].representative; - unsigned int index, shift; - - index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); - shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); - context->dirty_graphics_states[index] |= (1u << shift); -} - /* This function takes care of wined3d pixel format selection. */ static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, @@ -1892,44 +1830,6 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) -{ - struct wined3d_device *device = swapchain->device; - DWORD state; - - context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->state_table; - - /* Mark all states dirty to force a proper initialization of the states on - * the first use of the context. Compute states do not need initialization. */ - for (state = 0; state <= STATE_HIGHEST; ++state) - { - if (context->state_table[state].representative && !STATE_IS_COMPUTE(state)) - context_invalidate_state(context, state); - } - - context->device = device; - context->swapchain = swapchain; - context->current_rt.texture = swapchain->front_buffer; - context->current_rt.sub_resource_idx = 0; - - context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) - | (1u << WINED3D_SHADER_TYPE_VERTEX) - | (1u << WINED3D_SHADER_TYPE_GEOMETRY) - | (1u << WINED3D_SHADER_TYPE_HULL) - | (1u << WINED3D_SHADER_TYPE_DOMAIN) - | (1u << WINED3D_SHADER_TYPE_COMPUTE); -} - -HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) -{ - TRACE("context_no3d %p, swapchain %p.\n", context_no3d, swapchain); - - wined3d_context_init(context_no3d, swapchain); - - return WINED3D_OK; -} - static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context_gl, struct wined3d_swapchain_gl *swapchain_gl) { @@ -3498,306 +3398,6 @@ void context_state_drawbuf(struct wined3d_context *context, const struct wined3d } } -static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) -{ - if ((usage == WINED3D_DECL_USAGE_POSITION || usage == WINED3D_DECL_USAGE_POSITIONT) && !usage_idx) - *regnum = WINED3D_FFP_POSITION; - else if (usage == WINED3D_DECL_USAGE_BLEND_WEIGHT && !usage_idx) - *regnum = WINED3D_FFP_BLENDWEIGHT; - else if (usage == WINED3D_DECL_USAGE_BLEND_INDICES && !usage_idx) - *regnum = WINED3D_FFP_BLENDINDICES; - else if (usage == WINED3D_DECL_USAGE_NORMAL && !usage_idx) - *regnum = WINED3D_FFP_NORMAL; - else if (usage == WINED3D_DECL_USAGE_PSIZE && !usage_idx) - *regnum = WINED3D_FFP_PSIZE; - else if (usage == WINED3D_DECL_USAGE_COLOR && !usage_idx) - *regnum = WINED3D_FFP_DIFFUSE; - else if (usage == WINED3D_DECL_USAGE_COLOR && usage_idx == 1) - *regnum = WINED3D_FFP_SPECULAR; - else if (usage == WINED3D_DECL_USAGE_TEXCOORD && usage_idx < WINED3DDP_MAXTEXCOORD) - *regnum = WINED3D_FFP_TEXCOORD0 + usage_idx; - else - { - WARN("Unsupported input stream [usage=%s, usage_idx=%u].\n", debug_d3ddeclusage(usage), usage_idx); - *regnum = ~0u; - return FALSE; - } - - return TRUE; -} - -/* Context activation is done by the caller. */ -void wined3d_stream_info_from_declaration(struct wined3d_stream_info *stream_info, - const struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info) -{ - /* We need to deal with frequency data! */ - struct wined3d_vertex_declaration *declaration = state->vertex_declaration; - BOOL generic_attributes = d3d_info->ffp_generic_attributes; - BOOL use_vshader = use_vs(state); - unsigned int i; - - stream_info->use_map = 0; - stream_info->swizzle_map = 0; - stream_info->position_transformed = 0; - - if (!declaration) - return; - - stream_info->position_transformed = declaration->position_transformed; - - /* Translate the declaration into strided data. */ - for (i = 0; i < declaration->element_count; ++i) - { - const struct wined3d_vertex_declaration_element *element = &declaration->elements[i]; - const struct wined3d_stream_state *stream = &state->streams[element->input_slot]; - BOOL stride_used; - unsigned int idx; - - TRACE("%p Element %p (%u of %u).\n", declaration->elements, - element, i + 1, declaration->element_count); - - if (!stream->buffer) - continue; - - TRACE("offset %u input_slot %u usage_idx %d.\n", element->offset, element->input_slot, element->usage_idx); - - if (use_vshader) - { - if (element->output_slot == WINED3D_OUTPUT_SLOT_UNUSED) - { - stride_used = FALSE; - } - else if (element->output_slot == WINED3D_OUTPUT_SLOT_SEMANTIC) - { - /* TODO: Assuming vertexdeclarations are usually used with the - * same or a similar shader, it might be worth it to store the - * last used output slot and try that one first. */ - stride_used = vshader_get_input(state->shader[WINED3D_SHADER_TYPE_VERTEX], - element->usage, element->usage_idx, &idx); - } - else - { - idx = element->output_slot; - stride_used = TRUE; - } - } - else - { - if (!generic_attributes && !element->ffp_valid) - { - WARN("Skipping unsupported fixed function element of format %s and usage %s.\n", - debug_d3dformat(element->format->id), debug_d3ddeclusage(element->usage)); - stride_used = FALSE; - } - else - { - stride_used = fixed_get_input(element->usage, element->usage_idx, &idx); - } - } - - if (stride_used) - { - TRACE("Load %s array %u [usage %s, usage_idx %u, " - "input_slot %u, offset %u, stride %u, format %s, class %s, step_rate %u].\n", - use_vshader ? "shader": "fixed function", idx, - debug_d3ddeclusage(element->usage), element->usage_idx, element->input_slot, - element->offset, stream->stride, debug_d3dformat(element->format->id), - debug_d3dinput_classification(element->input_slot_class), element->instance_data_step_rate); - - stream_info->elements[idx].format = element->format; - stream_info->elements[idx].data.buffer_object = 0; - stream_info->elements[idx].data.addr = (BYTE *)NULL + stream->offset + element->offset; - stream_info->elements[idx].stride = stream->stride; - stream_info->elements[idx].stream_idx = element->input_slot; - if (stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - { - stream_info->elements[idx].divisor = 1; - } - else if (element->input_slot_class == WINED3D_INPUT_PER_INSTANCE_DATA) - { - stream_info->elements[idx].divisor = element->instance_data_step_rate; - if (!element->instance_data_step_rate) - FIXME("Instance step rate 0 not implemented.\n"); - } - else - { - stream_info->elements[idx].divisor = 0; - } - - if (!d3d_info->vertex_bgra && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) - { - stream_info->swizzle_map |= 1u << idx; - } - stream_info->use_map |= 1u << idx; - } - } -} - -/* Context activation is done by the caller. */ -static void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) -{ - struct wined3d_stream_info *stream_info = &context->stream_info; - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - DWORD prev_all_vbo = stream_info->all_vbo; - unsigned int i; - WORD map; - - wined3d_stream_info_from_declaration(stream_info, state, d3d_info); - - stream_info->all_vbo = 1; - context->buffer_fence_count = 0; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) - { - struct wined3d_stream_info_element *element; - struct wined3d_bo_address data; - struct wined3d_buffer *buffer; - - if (!(map & 1)) - continue; - - element = &stream_info->elements[i]; - buffer = state->streams[element->stream_idx].buffer; - - /* We can't use VBOs if the base vertex index is negative. OpenGL - * doesn't accept negative offsets (or rather offsets bigger than the - * VBO, because the pointer is unsigned), so use system memory - * sources. In most sane cases the pointer - offset will still be > 0, - * otherwise it will wrap around to some big value. Hope that with the - * indices the driver wraps it back internally. If not, - * draw_primitive_immediate_mode() is needed, including a vertex buffer - * path. */ - if (state->load_base_vertex_index < 0) - { - WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", - state->load_base_vertex_index); - element->data.buffer_object = 0; - element->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(buffer, context); - if ((UINT_PTR)element->data.addr < -state->load_base_vertex_index * element->stride) - FIXME("System memory vertex data load offset is negative!\n"); - } - else - { - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data, buffer->locations); - element->data.buffer_object = data.buffer_object; - element->data.addr += (ULONG_PTR)data.addr; - } - - if (!element->data.buffer_object) - stream_info->all_vbo = 0; - - if (buffer->fence) - context->buffer_fences[context->buffer_fence_count++] = buffer->fence; - - TRACE("Load array %u %s.\n", i, debug_bo_address(&element->data)); - } - - if (prev_all_vbo != stream_info->all_vbo) - context_invalidate_state(context, STATE_INDEXBUFFER); - - context->use_immediate_mode_draw = FALSE; - - if (stream_info->all_vbo) - return; - - if (!use_vs(state)) - { - WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) - & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); - - if ((stream_info->position_transformed && !d3d_info->xyzrhw) - || (stream_info->use_map & slow_mask)) - context->use_immediate_mode_draw = TRUE; - } -} - -/* Context activation is done by the caller. */ -static void context_preload_texture(struct wined3d_context *context, - const struct wined3d_state *state, unsigned int idx) -{ - struct wined3d_texture *texture; - - if (!(texture = state->textures[idx])) - return; - - if (wined3d_resource_check_fbo_attached(state, &texture->resource, NULL)) - context->uses_fbo_attached_resources = 1; - - wined3d_texture_load(texture, context, is_srgb_enabled(state->sampler_states[idx])); -} - -/* Context activation is done by the caller. */ -static void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) -{ - unsigned int i; - - if (use_vs(state)) - { - for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i) - { - if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, WINED3D_MAX_FRAGMENT_SAMPLERS + i); - } - } - - if (use_ps(state)) - { - for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) - { - if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info[i].type) - context_preload_texture(context, state, i); - } - } - else - { - WORD ffu_map = context->fixed_function_usage_map; - - for (i = 0; ffu_map; ffu_map >>= 1, ++i) - { - if (ffu_map & 1) - context_preload_texture(context, state, i); - } - } -} - -static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, - unsigned int shader_mask) -{ - struct wined3d_shader_sampler_map_entry *entry; - struct wined3d_shader_resource_view *view; - struct wined3d_shader *shader; - unsigned int i, j; - - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - if (!(shader_mask & (1u << i))) - continue; - - if (!(shader = state->shader[i])) - continue; - - for (j = 0; j < WINED3D_MAX_CBS; ++j) - { - if (state->cb[i][j]) - wined3d_buffer_load(state->cb[i][j], context, state); - } - - for (j = 0; j < shader->reg_maps.sampler_map.count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[i][entry->resource_idx])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - wined3d_buffer_load(buffer_from_resource(view->resource), context, state); - else - wined3d_texture_load(texture_from_resource(view->resource), context, FALSE); - } - } -} - static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { @@ -3843,41 +3443,6 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl * } } -static void context_load_unordered_access_resources(struct wined3d_context *context, - const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) -{ - struct wined3d_unordered_access_view *view; - struct wined3d_texture *texture; - struct wined3d_buffer *buffer; - unsigned int i; - - context->uses_uavs = 0; - - if (!shader) - return; - - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!(view = views[i])) - continue; - - if (view->resource->type == WINED3D_RTYPE_BUFFER) - { - buffer = buffer_from_resource(view->resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - } - else - { - texture = texture_from_resource(view->resource); - wined3d_texture_load(texture, context, FALSE); - wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context->uses_uavs = 1; - } -} - static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { @@ -3930,22 +3495,6 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex checkGLcall("Bind unordered access views"); } -static void context_load_stream_output_buffers(struct wined3d_context *context, - const struct wined3d_state *state) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) - { - struct wined3d_buffer *buffer; - if (!(buffer = state->stream_output[i].buffer)) - continue; - - wined3d_buffer_load(buffer, context, state); - wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - } -} - /* Context activation is done by the caller. */ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state, BOOL indexed) @@ -4122,14 +3671,6 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co context_gl->c.last_was_ffp_blit = FALSE; } -static BOOL use_transform_feedback(const struct wined3d_state *state) -{ - const struct wined3d_shader *shader; - if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) - return FALSE; - return shader->u.gs.so_desc.element_count; -} - void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 55243050b03..f2b3cd9548e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1997,6 +1997,14 @@ struct wined3d_context void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void context_load_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state, unsigned int shader_mask) DECLSPEC_HIDDEN; +void context_load_stream_output_buffers(struct wined3d_context *context, + const struct wined3d_state *state) DECLSPEC_HIDDEN; +void context_load_unordered_access_resources(struct wined3d_context *context, + const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) DECLSPEC_HIDDEN; +void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -5079,6 +5087,15 @@ static inline BOOL use_ps(const struct wined3d_state *state) return !!state->shader[WINED3D_SHADER_TYPE_PIXEL]; } +static inline BOOL use_transform_feedback(const struct wined3d_state *state) +{ + const struct wined3d_shader *shader; + + if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) + return FALSE; + return shader->u.gs.so_desc.element_count; +} + static inline void context_apply_state(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { -- 2.20.1

1 0

[PATCH v2 1/3] windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

2 1

[PATCH] setupapi: Fix a registry key handle leak.
by Zhiyi Zhang 17 Apr '20

17 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Thanks to Sven for spotting this. dlls/setupapi/devinst.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a21959a262a..617e3f54c37 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4230,6 +4230,7 @@ static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop { value_size = prop_buff_size; ls = RegQueryValueExW(hkey, NULL, NULL, &value_type, prop_buff, &value_size); + RegCloseKey(hkey); } switch (ls) -- 2.20.1

1 0

[PATCH] ntdll: Correct compile error under macos
by Alistair Leslie-Hughes 17 Apr '20

17 Apr '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cdc1fcef178..946db7d0193 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -31,6 +31,10 @@ # include <sys/mman.h> #endif +#if defined(__APPLE__) +# include <mach-o/getsect.h> +#endif + #include "ntstatus.h" #define WIN32_NO_STATUS #define NONAMELESSUNION -- 2.25.1

1 0

[PATCH] d3dx9_36/tests: Remove useless \n within some ok messages.
by Vijay Kiran Kamuju 17 Apr '20

17 Apr '20

From: Christian Costa <titan.costa(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winapi_test: Remove useless common headers for shlwapi test, in tests.dat.
by Serge Gautherie 17 Apr '20

17 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..4d36b27 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1226,10 +1226,7 @@ Unit tests for data structure packing %header -basetsd.h winnt.h -windef.h -wtypes.h shlwapi.h %include -- 2.10.0.windows.1

1 0

[PATCH] opengl32: Treat invalid pixel types as PFD_TYPE_RGBA in wglChoosePixelFormat.
by Paul Gofman 17 Apr '20

17 Apr '20

From: Michael Müller <michael(a)fds-team.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43638 Also fixes "Plebby Quest: The Crusades". Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/opengl32/tests/opengl.c | 59 +++++++++++++++++++++++------------- dlls/opengl32/wgl.c | 2 +- 2 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c2fc4f4092..db5ad0ad76 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -220,7 +220,7 @@ static void test_pbuffers(HDC hdc) else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) +static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt) { int pf; HDC hdc; @@ -233,6 +233,12 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd) hdc = GetDC( hwnd ); pf = ChoosePixelFormat( hdc, pfd ); + if (pf && fmt) + { + memset(fmt, 0, sizeof(*fmt)); + ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), + "DescribePixelFormat failed with error: %u\n", GetLastError()); + } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); @@ -259,57 +265,68 @@ static void test_choosepixelformat(void) 0, /* reserved */ 0, 0, 0 /* layer masks */ }; + PIXELFORMATDESCRIPTOR ret_fmt; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; + pfd.iPixelType = 32; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 32 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = 33; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 33 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = 15; + ok( test_pfd(&pfd, &ret_fmt), "Invalid pixel format 15 failed\n" ); + ok( ret_fmt.iPixelType == PFD_TYPE_RGBA, "Expected pixel type PFD_TYPE_RGBA, got %d\n", ret_fmt.iPixelType ); + pfd.iPixelType = PFD_TYPE_RGBA; pfd.cColorBits = 32; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cColorBits = 0; pfd.cAlphaBits = 8; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAlphaBits = 0; pfd.cStencilBits = 8; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cStencilBits = 0; pfd.cAuxBuffers = 1; - ok( test_pfd(&pfd), "Simple pfd failed\n" ); + ok( test_pfd(&pfd, NULL), "Simple pfd failed\n" ); pfd.dwFlags |= PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE failed\n" ); pfd.dwFlags |= PFD_STEREO_DONTCARE; - ok( test_pfd(&pfd), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_DOUBLEBUFFER_DONTCARE|PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_DOUBLEBUFFER_DONTCARE; - ok( test_pfd(&pfd), "PFD_STEREO_DONTCARE failed\n" ); + ok( test_pfd(&pfd, NULL), "PFD_STEREO_DONTCARE failed\n" ); pfd.dwFlags &= ~PFD_STEREO_DONTCARE; pfd.cAuxBuffers = 0; } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index c6018b0c7b..008778c532 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -475,7 +475,7 @@ INT WINAPI wglChoosePixelFormat(HDC hdc, const PIXELFORMATDESCRIPTOR* ppfd) { if (!wglDescribePixelFormat( hdc, i, sizeof(format), &format )) continue; - if (ppfd->iPixelType != format.iPixelType) + if ((ppfd->iPixelType == PFD_TYPE_COLORINDEX) != (format.iPixelType == PFD_TYPE_COLORINDEX)) { TRACE( "pixel type mismatch for iPixelFormat=%d\n", i ); continue; -- 2.25.2

1 0

[PATCH 7/7] adsldp/tests: Fix memory leaks (Valgrind).
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/tests/ldap.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 01a3aec90e..fe9801a397 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -235,8 +235,12 @@ static void do_search(const struct search *s) trace("search DN %s\n", wine_dbgstr_w(s->dn)); hr = ADsGetObject(s->dn, &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) return; pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; pref.vValue.dwType = ADSTYPE_INTEGER; @@ -282,6 +286,7 @@ static void do_search(const struct search *s) ok(!res->values[i], "expected extra value %s\n", wine_dbgstr_w(res->values[i])); + IDirectorySearch_FreeColumn(ds, &col); FreeADsMem(name); res++; } @@ -485,6 +490,7 @@ static void test_DirectoryObject(void) hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); + if (hr == S_OK) IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); ok(hr == S_OK, "got %#x\n", hr); IUnknown_Release(unk); -- 2.25.2

1 0

[PATCH 6/7] adsldp: Fix memory leaks (Valgrind).
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 7 +++++++ dlls/adsldp/schema.c | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index b532b95fe5..c39221ec02 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -785,12 +785,14 @@ static HRESULT WINAPI ldapns_GetInfoEx(IADs *iface, VARIANT prop, LONG reserved) { ldap_value_freeW(values); ldap_memfreeW(attr); + ber_free(ber, 0); goto exit; } attr = ldap_next_attributeW(ldap->ld, entry, ber); } + ber_free(ber, 0); entry = ldap_next_entry(ldap->ld, res); } @@ -1812,6 +1814,8 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL if (!col) return E_ADS_BAD_PARAMETER; + if (!wcsicmp(col->pszAttrName, L"ADsPath")) + heap_free(col->pADsValues[0].u.CaseIgnoreString); heap_free(col->pADsValues); heap_free(col->pszAttrName); @@ -1839,6 +1843,9 @@ static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEAR ldap_search_abandon_page(ldap->ld, ldap_ctx->page); if (ldap_ctx->res) ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->ber) + ber_free(ldap_ctx->ber, 0); + heap_free(ldap_ctx); return S_OK; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index c8bcf3de66..abf8793b84 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -433,6 +433,7 @@ struct attribute_type *load_schema(LDAP *ld, ULONG *at_single_count, ULONG *at_m } exit: + ldap_value_freeW(schema); ldap_msgfree(res); if (at) { -- 2.25.2

1 0

[PATCH 5/7] adsldp: Add support for paged search.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 56 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c2f7ca8023..b532b95fe5 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -409,6 +409,7 @@ typedef struct struct ldap_search_context { + LDAPSearch *page; LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; @@ -1329,12 +1330,26 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte ctrls = ctrls_a; } - err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + if (ldap->search.pagesize) + { + ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, + filter, props, ldap->search.attribtypes_only, + ctrls, NULL, 0, 0, NULL); + if (ldap_ctx->page) + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, + ldap->search.pagesize, &count, &ldap_ctx->res); + else + err = LDAP_NO_MEMORY; + } + else + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { TRACE("ldap_search_sW error %#x\n", err); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); heap_free(ldap_ctx); return HRESULT_FROM_WIN32(map_ldap_error(err)); } @@ -1384,11 +1399,42 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND else { if (ldap_ctx->pos >= ldap_ctx->count) + { + if (ldap_ctx->page) + { + ULONG err, count; + + ldap_msgfree(ldap_ctx->res); + ldap_ctx->res = NULL; + + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); + if (err == LDAP_SUCCESS) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + goto exit; + } + + if (err != LDAP_NO_RESULTS_RETURNED) + { + TRACE("ldap_get_next_page_s error %#x\n", err); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + /* fall through */ + } + return S_ADS_NOMORE_ROWS; + } ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } +exit: if (!ldap_ctx->entry) return S_ADS_NOMORE_ROWS; @@ -1782,13 +1828,17 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); struct ldap_search_context *ldap_ctx = res; TRACE("%p,%p\n", iface, res); if (!res) return E_ADS_BAD_PARAMETER; - ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); + if (ldap_ctx->res) + ldap_msgfree(ldap_ctx->res); return S_OK; } -- 2.25.2

1 0

[PATCH v3 4/7] wldap32: Implement ldap_get_next_page_s.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 45fb35ef4d..32e7e91fb2 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -175,10 +175,38 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, struct l_timeval *timeout, ULONG pagesize, ULONG *count, WLDAP32_LDAPMessage **results ) { - FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, +#ifdef HAVE_LDAP + ULONG ret; + + TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + if (!ld || !search || !count || !results) return ~0u; - if (!ld) return ~0u; + if (search->cookie && search->cookie->bv_len == 0) + { + /* end of paged results */ + return WLDAP32_LDAP_NO_RESULTS_RETURNED; + } + + if (search->serverctrls[0]) + { + controlfreeW( search->serverctrls[0] ); + search->serverctrls[0] = NULL; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_controlW( ld, pagesize, (struct WLDAP32_berval *)search->cookie, 1, &search->serverctrls[0] ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + ret = ldap_search_ext_sW( ld, search->dn, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; } -- 2.25.2

1 0

[PATCH v3 3/7] wldap32: Implement ldap_get_paged_count.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 09ca19c6c3..45fb35ef4d 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static struct berval null_cookie = { 0, NULL }; +#endif + /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) * @@ -77,7 +81,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, LDAPControlW *ctrl; BerElement *ber; ber_tag_t tag; - struct berval *berval, null_cookie = { 0, NULL }; + struct berval *berval; INT ret, len; char *val; @@ -181,15 +185,41 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG *count, WLDAP32_LDAPMessage *results ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results ); + ULONG ret; + LDAPControlW **server_ctrls = NULL; - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); + + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; + + ret = ldap_parse_resultW( ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != WLDAP32_LDAP_SUCCESS) return ret; + + if (!server_ctrls) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + + ret = ldap_parse_page_controlW( ld, server_ctrls, count, (struct WLDAP32_berval **)&search->cookie ); + if (ret == WLDAP32_LDAP_SUCCESS) + TRACE("new search->cookie: %s, count %u\n", debugstr_an(search->cookie->bv_val, search->cookie->bv_len), *count); + + ldap_controls_freeW( server_ctrls ); -#endif return ret; + +#endif + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -278,7 +308,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) while (*ctrls) controlfreeW( *ctrls++ ); heap_free( search->serverctrls ); controlarrayfreeW( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search ); -- 2.25.2

1 0

[PATCH v3 2/7] wldap32: Implement ldap_search_abandon_page.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index d2d86e34af..09ca19c6c3 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,10 +262,31 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) { - FIXME( "(%p, %p)\n", ld, search ); +#ifdef HAVE_LDAP + LDAPControlW **ctrls; + + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeW( search->dn ); + strfreeW( search->filter ); + strarrayfreeW( search->attrs ); + ctrls = search->serverctrls; + controlfreeW( ctrls[0] ); /* page control */ + ctrls++; + while (*ctrls) controlfreeW( *ctrls++ ); + heap_free( search->serverctrls ); + controlarrayfreeW( search->clientctrls ); + if (search->cookie) + ber_bvfree( search->cookie ); + heap_free( search ); - if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; + +#else + return WLDAP32_LDAP_NOT_SUPPORTED; +#endif } PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope, -- 2.25.2

1 0

[PATCH v3 1/7] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 17 Apr '20

17 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++- dlls/wldap32/winldap_private.h | 11 +++++- dlls/wldap32/wldap32.h | 70 +++++++++++++++++++++++++++++++++- 3 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..d2d86e34af 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -281,7 +281,67 @@ PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG sco PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); +#ifdef HAVE_LDAP + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(dn), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (dn) + { + search->dn = strdupW( dn ); + if (!search->dn) goto fail; + } + if (filter) + { + search->filter = strdupW( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarraydupW( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controldupW( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarraydupW( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..6903505096 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + WCHAR *dn, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControlW **serverctrls; + LDAPControlW **clientctrls; + struct l_timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index c329a5b76b..537de67a87 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -241,6 +241,26 @@ static inline LPWSTR *strarrayUtoW( char **strarray ) return strarrayW; } +static inline LPWSTR *strarraydupW( LPWSTR *strarray ) +{ + LPWSTR *strarrayW = NULL; + DWORD size; + + if (strarray) + { + size = sizeof(WCHAR*) * (strarraylenW( strarray ) + 1); + if ((strarrayW = heap_alloc( size ))) + { + LPWSTR *p = strarray; + LPWSTR *q = strarrayW; + + while (*p) *q++ = strdupW( *p++ ); + *q = NULL; + } + } + return strarrayW; +} + static inline void strarrayfreeA( LPSTR *strarray ) { if (strarray) @@ -546,8 +566,34 @@ static inline LDAPControlW *controlUtoW( LDAPControl *control ) } controlW->ldctl_oid = strUtoW( control->ldctl_oid ); - controlW->ldctl_value.bv_len = len; - controlW->ldctl_value.bv_val = val; + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; + controlW->ldctl_iscritical = control->ldctl_iscritical; + + return controlW; +} + +static inline LDAPControlW *controldupW( LDAPControlW *control ) +{ + LDAPControlW *controlW; + DWORD len = control->ldctl_value.bv_len; + char *val = NULL; + + if (control->ldctl_value.bv_val) + { + if (!(val = heap_alloc( len ))) return NULL; + memcpy( val, control->ldctl_value.bv_val, len ); + } + + if (!(controlW = heap_alloc( sizeof(LDAPControlW) ))) + { + heap_free( val ); + return NULL; + } + + controlW->ldctl_oid = strdupW( control->ldctl_oid ); + controlW->ldctl_value.bv_len = len; + controlW->ldctl_value.bv_val = val; controlW->ldctl_iscritical = control->ldctl_iscritical; return controlW; @@ -684,6 +730,26 @@ static inline LDAPControlW **controlarrayUtoW( LDAPControl **controlarray ) return controlarrayW; } +static inline LDAPControlW **controlarraydupW( LDAPControlW **controlarray ) +{ + LDAPControlW **controlarrayW = NULL; + DWORD size; + + if (controlarray) + { + size = sizeof(LDAPControlW*) * (controlarraylenW( controlarray ) + 1); + if ((controlarrayW = heap_alloc( size ))) + { + LDAPControlW **p = controlarray; + LDAPControlW **q = controlarrayW; + + while (*p) *q++ = controldupW( *p++ ); + *q = NULL; + } + } + return controlarrayW; +} + static inline void controlarrayfreeA( LDAPControlA **controlarray ) { if (controlarray) -- 2.25.2

1 0

[PATCH] comctl32/tests: Remove duplicate ImageList_DrawIndirect() tests.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/tests/imagelist.c | 4 ---- 1 file changed, 4 deletions(-)

2 1

[PATCH] d3d10: Remove superfluous TRUE : FALSE conditional expression
by Michael Stefaniuc 17 Apr '20

17 Apr '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04376efe9c..86ef50aac0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5337,7 +5337,7 @@ static void write_matrix_to_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *dst = dst_void; unsigned int row, col; @@ -5415,7 +5415,7 @@ static void read_matrix_from_buffer(struct d3d10_effect_variable *variable, void { unsigned int col_count = !transpose ? variable->type->column_count : variable->type->row_count; unsigned int row_count = !transpose ? variable->type->row_count : variable->type->column_count; - BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS ? TRUE : FALSE; + BOOL major = variable->type->type_class == D3D10_SVC_MATRIX_COLUMNS; float *src = src_void; unsigned int row, col; -- 2.25.2

2 1

[PATCH v2 3/3] windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

1 0

[PATCH v2 2/3] windowscodecs: Implement global property functions for DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

v2: Fix a spell fault Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-)

1 0

[PATCH 3/3] windowscodecs/tests: Avoid using SUCCEEDED() and FAILED() in ddsformat.c
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

2 1

[PATCH 2/3] windowscodecs: Implement global property functions for DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 20 +++++++++++--------- dlls/windowscodecs/tests/ddsformat.c | 6 +----- 2 files changed, 12 insertions(+), 14 deletions(-)

2 1

[PATCH 1/3] windowscodecs/tests: Add tests for global properties of DdsDecoder.
by Ziqing Hui 17 Apr '20

17 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 44 ++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

1 0

[PATCH] kernelbase: Implement LoadAppInitDlls
by Alex Henrie 17 Apr '20

17 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47061 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- According to MSDN,[1] this feature does not work on Windows 8 and later when secure boot is enabled, so we don't need to bother with a real implementation. [1] https://docs.microsoft.com/en-us/windows/win32/dlls/secure-boot-and-appinit… --- .../api-ms-win-core-appinit-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/loader.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec index 7ace09e92c..e8f2acefad 100644 --- a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec +++ b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec @@ -1 +1 @@ -@ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() kernel32.LoadAppInitDlls diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 01bfdd37f1..86575c2b99 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1044,7 +1044,7 @@ @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall -import LoadAppInitDlls() @ stdcall -import LoadLibraryA(str) @ stdcall -import LoadLibraryExA( str long long) @ stdcall -import LoadLibraryExW(wstr long long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 631e5c02c7..fe687c132c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -920,7 +920,7 @@ # @ stub LeaveCriticalPolicySectionInternal @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion -# @ stub LoadAppInitDlls +@ stdcall LoadAppInitDlls() # @ stub LoadEnclaveData @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 59b775b844..db36873e73 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -544,6 +544,15 @@ HMODULE WINAPI /* DECLSPEC_HOTPATCH */ LoadPackagedLibrary( LPCWSTR name, DWORD } +/*********************************************************************** + * LoadAppInitDlls (kernelbase.@) + */ +void WINAPI LoadAppInitDlls( void ) +{ + TRACE( "\n" ); +} + + /**************************************************************************** * RemoveDllDirectory (kernelbase.@) */ -- 2.26.1

2 1

[PATCH v4 1/3] ntdll: Implement RtlIpv6StringToAddress(Ex)[AW]
by Alex Henrie 17 Apr '20

17 Apr '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: Update ntoskrnl.exe.spec --- dlls/ntdll/ntdll.spec | 6 +- dlls/ntdll/rtl.c | 221 ++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 +- 3 files changed, 216 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4f5fa8c21d..b56a076b64 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -781,10 +781,10 @@ # @ stub RtlIpv6AddressToStringExA # @ stub RtlIpv6AddressToStringExW # @ stub RtlIpv6AddressToStringW -# @ stub RtlIpv6StringToAddressA -# @ stub RtlIpv6StringToAddressExA +@ stdcall RtlIpv6StringToAddressA(str ptr ptr) +@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) @ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -# @ stub RtlIpv6StringToAddressW +@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) @ stdcall RtlIsCriticalSectionLockedByThread(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 64853369a3..a4e220bcf2 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -97,6 +97,16 @@ static const DWORD CRC_table[256] = 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; +static const int hex_table[] = { + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ + -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ + -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ +}; + /* * resource functions */ @@ -885,15 +895,6 @@ void WINAPI RtlCopyLuidAndAttributesArray( static BOOL parse_ipv4_component(const WCHAR **str, BOOL strict, ULONG *value) { - static const int hex_table[] = { - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x00-0x0F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x10-0x1F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x20-0x2F */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -1, -1, -1, -1, -1, -1, /* 0x30-0x3F */ - -1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x40-0x4F */ - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /* 0x50-0x5F */ - -1, 10, 11, 12, 13, 14, 15 /* 0x60-0x66 */ - }; int base = 10, d; WCHAR c; ULONG cur_value, prev_value = 0; @@ -1073,13 +1074,211 @@ NTSTATUS WINAPI RtlIpv4StringToAddressA(const char *str, BOOLEAN strict, const c return ret; } +static BOOL parse_ipv6_component(const WCHAR **str, int base, ULONG *value) +{ + WCHAR *terminator; + if (**str >= ARRAY_SIZE(hex_table) || hex_table[**str] == -1) return FALSE; + *value = min(wcstoul(*str, &terminator, base), 0x7FFFFFFF); + if (*terminator == '0') terminator++; /* "0x" but nothing valid after */ + else if (terminator == *str) return FALSE; + *str = terminator; + return TRUE; +} + +static NTSTATUS ipv6_string_to_address(const WCHAR *str, BOOL ex, + const WCHAR **terminator, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + BOOL expecting_port = FALSE, has_0x = FALSE, too_big = FALSE; + int n_bytes = 0, n_ipv4_bytes = 0, gap = -1; + ULONG ip_component, scope_component = 0, port_component = 0; + const WCHAR *prev_str; + + if (str[0] == '[') + { + if (!ex) goto error; + expecting_port = TRUE; + str++; + } + + if (str[0] == ':') + { + if (str[1] != ':') goto error; + str++; + /* Windows bug: a double colon at the beginning is treated as 4 bytes of zeros instead of 2 */ + address->u.Word[0] = 0; + n_bytes = 2; + } + + for (;;) + { + if (!n_ipv4_bytes && *str == ':') + { + /* double colon */ + if (gap != -1) goto error; + str++; + prev_str = str; + gap = n_bytes; + if (n_bytes == 14 || !parse_ipv6_component(&str, 16, &ip_component)) break; + str = prev_str; + } + else + { + prev_str = str; + } + + if (!n_ipv4_bytes && n_bytes <= (gap != -1 ? 10 : 12)) + { + if (parse_ipv6_component(&str, 10, &ip_component) && *str == '.') + n_ipv4_bytes = 1; + str = prev_str; + } + + if (n_ipv4_bytes) + { + /* IPv4 component */ + if (!parse_ipv6_component(&str, 10, &ip_component)) goto error; + if (str - prev_str > 3 || ip_component > 255) + { + too_big = TRUE; + } + else + { + if (*str != '.' && (n_ipv4_bytes < 4 || (n_bytes < 15 && gap == -1))) goto error; + address->u.Byte[n_bytes] = ip_component; + n_bytes++; + } + if (n_ipv4_bytes == 4 || *str != '.') break; + n_ipv4_bytes++; + } + else + { + /* IPv6 component */ + if (!parse_ipv6_component(&str, 16, &ip_component)) goto error; + if (prev_str[0] == '0' && (prev_str[1] == 'x' || prev_str[1] == 'X')) + { + /* Windows "feature": the last IPv6 component can start with "0x" and be longer than 4 digits */ + if (terminator) *terminator = prev_str + 1; /* Windows says that the "x" is the terminator */ + if (n_bytes < 14 && gap == -1) return STATUS_INVALID_PARAMETER; + address->u.Word[n_bytes/2] = htons(ip_component); + n_bytes += 2; + has_0x = TRUE; + goto fill_gap; + } + if (*str != ':' && n_bytes < 14 && gap == -1) goto error; + if (str - prev_str > 4) + too_big = TRUE; + else + address->u.Word[n_bytes/2] = htons(ip_component); + n_bytes += 2; + if (*str != ':' || (gap != -1 && str[1] == ':')) break; + } + if (n_bytes == (gap != -1 ? 14 : 16)) break; + if (too_big) return STATUS_INVALID_PARAMETER; + str++; + } + + if (terminator) *terminator = str; + if (too_big) return STATUS_INVALID_PARAMETER; + +fill_gap: + if (gap == -1) + { + if (n_bytes < 16) goto error; + } + else + { + memmove(address->u.Byte + 16 - (n_bytes - gap), address->u.Byte + gap, n_bytes - gap); + memset(address->u.Byte + gap, 0, 16 - n_bytes); + } + + if (ex) + { + if (has_0x) goto error; + + if (*str == '%') + { + str++; + if (!parse_ipv4_component(&str, TRUE, &scope_component)) goto error; + } + + if (expecting_port) + { + if (*str != ']') goto error; + str++; + if (*str == ':') + { + str++; + if (!parse_ipv4_component(&str, FALSE, &port_component)) goto error; + if (!port_component || port_component > 0xFFFF || *str) goto error; + port_component = htons(port_component); + } + } + } + + if (!terminator && *str) return STATUS_INVALID_PARAMETER; + + if (scope) *scope = scope_component; + if (port) *port = port_component; + + return STATUS_SUCCESS; + +error: + if (terminator) *terminator = str; + return STATUS_INVALID_PARAMETER; +} + /*********************************************************************** * RtlIpv6StringToAddressExW [NTDLL.@] */ NTSTATUS NTAPI RtlIpv6StringToAddressExW(const WCHAR *str, IN6_ADDR *address, ULONG *scope, USHORT *port) { - FIXME("(%s, %p, %p, %p): stub\n", debugstr_w(str), address, scope, port); - return STATUS_NOT_IMPLEMENTED; + TRACE("(%s, %p, %p, %p)\n", debugstr_w(str), address, scope, port); + if (!str || !address || !scope || !port) return STATUS_INVALID_PARAMETER; + return ipv6_string_to_address(str, TRUE, NULL, address, scope, port); +} + +/*********************************************************************** + * RtlIpv6StringToAddressW [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressW(const WCHAR *str, const WCHAR **terminator, IN6_ADDR *address) +{ + TRACE("(%s, %p, %p)\n", debugstr_w(str), terminator, address); + return ipv6_string_to_address(str, FALSE, terminator, address, NULL, NULL); +} + +/*********************************************************************** + * RtlIpv6StringToAddressExA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressExA(const char *str, IN6_ADDR *address, ULONG *scope, USHORT *port) +{ + WCHAR wstr[64]; + + TRACE("(%s, %p, %p, %p)\n", debugstr_a(str), address, scope, port); + + if (!str || !address || !scope || !port) + return STATUS_INVALID_PARAMETER; + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + return ipv6_string_to_address(wstr, TRUE, NULL, address, scope, port); +} + +/*********************************************************************** + * RtlIpv6StringToAddressA [NTDLL.@] + */ +NTSTATUS WINAPI RtlIpv6StringToAddressA(const char *str, const char **terminator, IN6_ADDR *address) +{ + WCHAR wstr[64]; + const WCHAR *wterminator = NULL; + NTSTATUS ret; + + TRACE("(%s, %p, %p)\n", debugstr_a(str), terminator, address); + + RtlMultiByteToUnicodeN(wstr, sizeof(wstr), NULL, str, strlen(str) + 1); + wstr[ARRAY_SIZE(wstr) - 1] = 0; + ret = ipv6_string_to_address(wstr, FALSE, &wterminator, address, NULL, NULL); + if (terminator && wterminator) *terminator = str + (wterminator - wstr); + return ret; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 40341d8f0c..598669f93d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1110,10 +1110,10 @@ @ stub RtlIpv6AddressToStringExA @ stub RtlIpv6AddressToStringExW @ stub RtlIpv6AddressToStringW -@ stub RtlIpv6StringToAddressA -@ stub RtlIpv6StringToAddressExA +@ stdcall RtlIpv6StringToAddressA(str ptr ptr) ntdll.RtlIpv6StringToAddressA +@ stdcall RtlIpv6StringToAddressExA(str ptr ptr ptr) ntdll.RtlIpv6StringToAddressExA @ stdcall RtlIpv6StringToAddressExW(wstr ptr ptr ptr) -@ stub RtlIpv6StringToAddressW +@ stdcall RtlIpv6StringToAddressW(wstr ptr ptr) ntdll.RtlIpv6StringToAddressW @ stub RtlIsGenericTableEmpty @ stub RtlIsGenericTableEmptyAvl @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) -- 2.26.1

1 0

[PATCH 1/5] wineusb.sys: Implement device and instance IDs.
by Zebediah Figura 17 Apr '20

17 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wineusb.sys/wineusb.c | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b60d496e9e..918c7a584b 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -278,15 +278,58 @@ static NTSTATUS fdo_pnp(IRP *irp) return IoCallDriver(bus_pdo, irp); } +static void get_device_id(const struct usb_device *device, WCHAR *buffer) +{ + static const WCHAR formatW[] = {'U','S','B','\\','V','I','D','_','%','0','4','X', + '&','P','I','D','_','%','0','4','X',0}; + struct libusb_device_descriptor desc; + + libusb_get_device_descriptor(device->libusb_device, &desc); + sprintfW(buffer, formatW, desc.idVendor, desc.idProduct); +} + +static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type) +{ + WCHAR *id = NULL; + + switch (type) + { + case BusQueryDeviceID: + if ((id = ExAllocatePool(PagedPool, 28 * sizeof(WCHAR)))) + get_device_id(device, id); + break; + + case BusQueryInstanceID: + if ((id = ExAllocatePool(PagedPool, 2 * sizeof(WCHAR)))) + { + id[0] = '0'; + id[1] = 0; + } + break; + + default: + FIXME("Unhandled ID query type %#x.\n", type); + return irp->IoStatus.Status; + } + + irp->IoStatus.Information = (ULONG_PTR)id; + return STATUS_SUCCESS; +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct usb_device *device = device_obj->DeviceExtension; NTSTATUS ret = irp->IoStatus.Status; TRACE("device_obj %p, irp %p, minor function %#x.\n", device_obj, irp, stack->MinorFunction); switch (stack->MinorFunction) { + case IRP_MN_QUERY_ID: + ret = query_id(device, irp, stack->Parameters.QueryId.IdType); + break; + case IRP_MN_START_DEVICE: case IRP_MN_QUERY_CAPABILITIES: ret = STATUS_SUCCESS; -- 2.26.0

1 4

[PATCH 1/5] strmbase: Make the pin_get_media_type callback optional.
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 27 ++++++++++++++++++++------- dlls/strmbase/renderer.c | 1 - 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 4676c9d82b..297d04d261 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -57,10 +57,13 @@ static HRESULT enum_media_types_create(struct strmbase_pin *pin, IEnumMediaTypes object->pin = pin; IPin_AddRef(&pin->IPin_iface); - while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + if (pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++object->count; + while (pin->ops->pin_get_media_type(pin, object->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++object->count; + } } TRACE("Created enumerator %p.\n", object); @@ -121,6 +124,13 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, TRACE("enummt %p, count %u, mts %p, ret_count %p.\n", enummt, count, mts, ret_count); + if (!enummt->pin->ops->pin_get_media_type) + { + if (ret_count) + *ret_count = 0; + return count ? S_FALSE : S_OK; + } + for (i = 0; i < count; ++i) { if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) @@ -169,10 +179,13 @@ static HRESULT WINAPI enum_media_types_Reset(IEnumMediaTypes *iface) TRACE("enummt %p.\n", enummt); enummt->count = 0; - while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + if (enummt->pin->ops->pin_get_media_type) { - FreeMediaType(&mt); - ++enummt->count; + while (enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->count, &mt) == S_OK) + { + FreeMediaType(&mt); + ++enummt->count; + } } enummt->index = 0; @@ -397,7 +410,7 @@ static HRESULT WINAPI pin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_med TRACE("pin %p %s:%s, enum_media_types %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), enum_media_types); - if (FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) + if (pin->ops->pin_get_media_type && FAILED(hr = pin->ops->pin_get_media_type(pin, 0, &mt))) return hr; if (hr == S_OK) FreeMediaType(&mt); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd999d3ae9..f1e74f6476 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -257,7 +257,6 @@ static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_query_interface = sink_query_interface, - .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = BaseRenderer_Receive, .sink_connect = sink_connect, .sink_disconnect = sink_disconnect, -- 2.26.0

2 7

wine-4.0.4-rc2 Available
by Michael Stefaniuc 16 Apr '20

16 Apr '20

Hello guys, I have pushed wine-4.0.4-rc2 (with tag) to https://github.com/mstefani/wine-stable/tree/oldstable https://people.redhat.com/mstefani/wine/stable/ Only change is to add a fix for a dinput regression (Thanks Alistair): commit 50440e28bb1611377df841ee267c0fa7bef515cc Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 14 11:01:39 2020 +0100 dinput: Increase device buffer size to 1024. bye michael

1 0

[PATCH] winex11: Set res_class to the program name for Crostini.
by Francois Gouget 16 Apr '20

16 Apr '20

GNOME implements the startup notification protocol correctly which means it checks StartupWMClass against both WM name (res_name) and WM class (res_class). Thus it does not need this patch. The situation is different for desktop environments that thunk to Wayland such as Crostini. Wayland does not have separate concepts that WM name and WM class can be mapped to. So Crostini decided to only use res_class resulting in it trying to match 'Wine' to the program name stored in StartupWMClass. While Crostini's choice is unfortunate for Wine, most other applications (e.g. all GTK applications) already store the same value in both WM name and class. So in the interest of compatiblity it makes sense for Wine to do the same. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Actually GTK applications capitalize the binary name in res_class. But, at least in Crostini, the match is case-insensitive so I don't think it's worth adding a capitalized version of program_name. dlls/winex11.drv/window.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4676b099358..52e345ceb61 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -822,10 +822,8 @@ static void set_initial_wm_hints( Display *display, Window window ) /* class hints */ if ((class_hints = XAllocClassHint())) { - static char wine[] = "Wine"; - class_hints->res_name = process_name; - class_hints->res_class = wine; + class_hints->res_class = process_name; XSetClassHint( display, window, class_hints ); XFree( class_hints ); } -- 2.20.1

1 0

[PATCH v2 1/3] devenum: Ignore the "left" parameter to IMoniker::BindToObject().
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Actually test passing a "left" moniker, and fix a crash on winxp. dlls/devenum/mediacatenum.c | 88 ++++++++++++++++-------------------- dlls/devenum/tests/devenum.c | 18 +++++++- 2 files changed, 56 insertions(+), 50 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 15e5c9642cb..b03b17f945a 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -377,73 +377,63 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz return S_OK; } -static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, - IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) +static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, + IMoniker *left, REFIID iid, void **out) { - struct moniker *This = impl_from_IMoniker(iface); - IUnknown * pObj = NULL; - IPropertyBag * pProp = NULL; - CLSID clsID; + struct moniker *moniker = impl_from_IMoniker(iface); + IPersistPropertyBag *persist_bag; + IPropertyBag *prop_bag; + IUnknown *unk; + CLSID clsid; VARIANT var; - HRESULT res = E_FAIL; + HRESULT hr; - TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + TRACE("moniker %p, bind_ctx %p, left %p, iid %s, out %p.\n", + moniker, bind_ctx, left, debugstr_guid(iid), out); - if (!ppvResult) + if (!out) return E_POINTER; VariantInit(&var); - *ppvResult = NULL; + *out = NULL; - if(pmkToLeft==NULL) + if (FAILED(hr = IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + return hr; + + V_VT(&var) = VT_BSTR; + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL))) { - /* first activation of this class */ - LPVOID pvptr; - res=IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, &pvptr); - pProp = pvptr; - if (SUCCEEDED(res)) - { - V_VT(&var) = VT_BSTR; - res = IPropertyBag_Read(pProp, clsidW, &var, NULL); - } - if (SUCCEEDED(res)) - { - res = CLSIDFromString(V_BSTR(&var), &clsID); - VariantClear(&var); - } - if (SUCCEEDED(res)) - { - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IUnknown,&pvptr); - pObj = pvptr; - } + IPropertyBag_Release(prop_bag); + return hr; } - if (pObj!=NULL) + hr = CLSIDFromString(V_BSTR(&var), &clsid); + VariantClear(&var); + if (FAILED(hr)) { - /* get the requested interface from the loaded class */ - res = S_OK; - if (pProp) { - HRESULT res2; - LPVOID ppv = NULL; - res2 = IUnknown_QueryInterface(pObj, &IID_IPersistPropertyBag, &ppv); - if (SUCCEEDED(res2)) { - res = IPersistPropertyBag_Load((IPersistPropertyBag *) ppv, pProp, NULL); - IPersistPropertyBag_Release((IPersistPropertyBag *) ppv); - } - } - if (SUCCEEDED(res)) - res= IUnknown_QueryInterface(pObj,riidResult,ppvResult); - IUnknown_Release(pObj); + IPropertyBag_Release(prop_bag); + return hr; } - if (pProp) + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk))) { - IPropertyBag_Release(pProp); + IPropertyBag_Release(prop_bag); + return hr; + } + + if (SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void **)&persist_bag))) + { + hr = IPersistPropertyBag_Load(persist_bag, prop_bag, NULL); + IPersistPropertyBag_Release(persist_bag); } - TRACE("<- 0x%x\n", res); + if (SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(unk, iid, out); - return res; + IUnknown_Release(unk); + IPropertyBag_Release(prop_bag); + + return hr; } static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 01e6be98da7..decc53ff814 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -46,8 +46,9 @@ static void test_devenum(void) GUID cat_guid, clsid; WCHAR *displayname; IBindCtx *bindctx; + HRESULT hr, hr2; + IUnknown *unk; VARIANT var; - HRESULT hr; int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -114,6 +115,21 @@ static void test_devenum(void) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); + /* Instantiating the WMT Screen Capture Filter crashes on Windows XP. */ + if (hr != S_OK || wcscmp(V_BSTR(&var), L"{31087270-D348-432C-899E-2D2F38FF29A0}")) + { + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) + IUnknown_Release(unk); + hr2 = IMoniker_BindToObject(moniker, NULL, (IMoniker *)0xdeadbeef, + &IID_IUnknown, (void **)&unk); + if (hr2 == S_OK) + IUnknown_Release(unk); + ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + } + hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); -- 2.26.0

1 2

[PATCH v3] wined3d: Use GL_APPLE_rgb_422 for UYVY and YUY2 surfaces.
by Chip Davis 16 Apr '20

16 Apr '20

Theoretically, we could use it to support UYVY and YUY2 *textures* as well, but it would still require converting from YUV to RGB after sampling. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v3: Fix missing switch case warnings. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 11 +++++++++++ dlls/wined3d/utils.c | 20 +++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 36c920dc6e0..1037321b365 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7649,6 +7649,10 @@ static HRESULT arbfp_blit_set(struct wined3d_arbfp_blitter *blitter, struct wine case COMPLEX_FIXUP_NV12: shader = gen_yuv_shader(gl_info, &type); break; + + case COMPLEX_FIXUP_YUV: + ERR("We should've used GL_APPLE_ycbcr_422 for UYVY and YUY2 here\n"); + break; } if (!shader) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7feff85efb..91b3e141fe2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12713,6 +12713,15 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe gen_nv12_read(buffer, gl_info, tex_type); break; + case COMPLEX_FIXUP_YUV: + /* With APPLE_rgb_422, things are much simpler. The only thing we have to do here + * is YUV-RGB conversion. */ + shader_addline(buffer, " vec3 yuv = vec3(texture%s(sampler, out_texcoord.xy));\n", + needs_legacy_glsl_syntax(gl_info) ? tex_type : ""); + shader_addline(buffer, " luminance = yuv.y;\n"); + shader_addline(buffer, " chroma = yuv.xz;\n"); + break; + default: FIXME("Unsupported fixup %#x.\n", complex_fixup); string_buffer_free(buffer); @@ -12836,6 +12845,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); break; case COMPLEX_FIXUP_NONE: @@ -13183,6 +13193,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: src_level = src_sub_resource_idx % src_texture->level_count; location = GL_EXTCALL(glGetUniformLocation(program->id, "size")); GL_EXTCALL(glUniform2f(location, wined3d_texture_get_level_pow2_width(src_texture, src_level), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dec7eecd7ee..eb7e7a1b65a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1320,6 +1320,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_UYVY, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_UYVY, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -1332,6 +1336,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_YUY2, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_YUY2, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -3575,7 +3583,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->f.color_fixup = create_color_fixup_desc_from_string(fixups[i].fixup); } - if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] + if (!gl_info->supported[APPLE_YCBCR_422] && !gl_info->supported[APPLE_RGB_422] + && (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); @@ -3584,6 +3593,14 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } + else if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[APPLE_RGB_422]) + { + format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + + format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { @@ -5393,6 +5410,7 @@ static const char *debug_complex_fixup(enum complex_fixup fixup) WINED3D_TO_STR(COMPLEX_FIXUP_YV12); WINED3D_TO_STR(COMPLEX_FIXUP_NV12); WINED3D_TO_STR(COMPLEX_FIXUP_P8); + WINED3D_TO_STR(COMPLEX_FIXUP_YUV); #undef WINED3D_TO_STR default: FIXME("Unrecognized complex fixup %#x\n", fixup); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8c7e8ac276..0253aaef3a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -153,6 +153,7 @@ enum complex_fixup COMPLEX_FIXUP_YV12 = 3, COMPLEX_FIXUP_P8 = 4, COMPLEX_FIXUP_NV12 = 5, + COMPLEX_FIXUP_YUV = 6, }; #include <pshpack2.h> -- 2.24.0

1 0

[PATCH 1/3] ole32: Fix IMalloc::DidAlloc() return value to reflect block validity.
by Nikolay Sivov 16 Apr '20

16 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/ifs.c | 59 ++++++++++++++++++++++++-------------- dlls/ole32/tests/compobj.c | 21 ++++++++++++++ 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 9c7cb0977f..e747cfc0fe 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -114,6 +114,20 @@ static BOOL AddMemoryLocation(LPVOID * pMem) return TRUE; } +static void** mallocspy_is_allocation_spyed(const void *mem) +{ + void **current = Malloc32.SpyedBlocks; + + while (*current != mem) + { + current++; + if (current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) + return NULL; + } + + return current; +} + static BOOL RemoveMemoryLocation(LPCVOID pMem) { LPVOID * Current; @@ -122,14 +136,8 @@ static BOOL RemoveMemoryLocation(LPCVOID pMem) if (!Malloc32.SpyedBlockTableLength && !SetSpyedBlockTableLength(0x1000)) return FALSE; - Current = Malloc32.SpyedBlocks; - - /* find the location */ - while (*Current != pMem) { - Current++; - if (Current >= Malloc32.SpyedBlocks + Malloc32.SpyedBlockTableLength) - return FALSE; /* not found */ - } + if (!(Current = mallocspy_is_allocation_spyed(pMem))) + return FALSE; /* location found */ Malloc32.SpyedAllocationsLeft--; @@ -313,25 +321,32 @@ static SIZE_T WINAPI IMalloc_fnGetSize(IMalloc *iface, void *pv) /****************************************************************************** * IMalloc32_DidAlloc [VTABLE] */ -static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *pv) +static INT WINAPI IMalloc_fnDidAlloc(IMalloc *iface, void *mem) { - BOOL fSpyed = FALSE; - int didAlloc; + BOOL spyed_block = FALSE; + int did_alloc; - TRACE("(%p)\n",pv); + TRACE("(%p)\n", mem); - if(Malloc32.pSpy) { - EnterCriticalSection(&IMalloc32_SpyCS); - pv = IMallocSpy_PreDidAlloc(Malloc32.pSpy, pv, fSpyed); - } + if (!mem) + return -1; + + if (Malloc32.pSpy) + { + EnterCriticalSection(&IMalloc32_SpyCS); + spyed_block = !!mallocspy_is_allocation_spyed(mem); + mem = IMallocSpy_PreDidAlloc(Malloc32.pSpy, mem, spyed_block); + } - didAlloc = -1; + did_alloc = HeapValidate(GetProcessHeap(), 0, mem); - if(Malloc32.pSpy) { - didAlloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, pv, fSpyed, didAlloc); - LeaveCriticalSection(&IMalloc32_SpyCS); - } - return didAlloc; + if (Malloc32.pSpy) + { + did_alloc = IMallocSpy_PostDidAlloc(Malloc32.pSpy, mem, spyed_block, did_alloc); + LeaveCriticalSection(&IMalloc32_SpyCS); + } + + return did_alloc; } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index cc2737bdd1..b0a6ba1ea7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3069,6 +3069,8 @@ static void test_CoGetMalloc(void) { IMalloc *imalloc; HRESULT hr; + char *ptr; + int ret; if (0) /* crashes on native */ hr = CoGetMalloc(0, NULL); @@ -3102,6 +3104,25 @@ static void test_CoGetMalloc(void) hr = CoGetMalloc(MEMCTX_TASK, &imalloc); ok(hr == S_OK, "got 0x%08x\n", hr); ok(imalloc != NULL, "got %p\n", imalloc); + + /* DidAlloc() */ + ptr = IMalloc_Alloc(imalloc, 16); + ok(!!ptr, "Failed to allocate block.\n"); + + ret = IMalloc_DidAlloc(imalloc, ptr); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, NULL); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, (void *)0x1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + ret = IMalloc_DidAlloc(imalloc, ptr + 4); + ok(ret == 0, "Unexpected return value %d.\n", ret); + + IMalloc_Free(imalloc, ptr); + IMalloc_Release(imalloc); } -- 2.25.1

2 4

[PATCH v2] winedbg: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix.
by Brendan Shanks 16 Apr '20

16 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/tgt_active.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 2b38ce95de..91dea2f9d8 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -728,11 +728,11 @@ version_table[] = static const char *get_windows_version(void) { - OSVERSIONINFOEXW info = { sizeof(OSVERSIONINFOEXW) }; + RTL_OSVERSIONINFOEXW info = { sizeof(RTL_OSVERSIONINFOEXW) }; static char str[64]; int i; - GetVersionExW( (OSVERSIONINFOW *)&info ); + RtlGetVersion( &info ); for (i = 0; i < ARRAY_SIZE(version_table); i++) { -- 2.25.3

1 0

[PATCH v2] cmd: Use RtlGetVersion to fix displayed Windows version on Win8.1 or 10 prefix.
by Brendan Shanks 16 Apr '20

16 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index b0769bd839..112fc1a1ea 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -22,6 +22,7 @@ #define IDI_ICON1 1 #include <windows.h> #include <windef.h> +#include <winternl.h> #ifndef RC_INVOKED #include <string.h> #include <stdlib.h> diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5cad22b7ee..2834986bf9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2437,7 +2437,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; WCHAR comspec[MAX_PATH]; CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - OSVERSIONINFOW osv; + RTL_OSVERSIONINFOEXW osv; char osver[50]; STARTUPINFOW startupInfo; @@ -2452,7 +2452,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Get the windows version being emulated */ osv.dwOSVersionInfoSize = sizeof(osv); - GetVersionExW(&osv); + RtlGetVersion(&osv); /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); -- 2.25.3

1 0

[PATCH v2] winapi: Update 'perl -w' to 'use warnings 'all''.
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/c_function.pm | 1 + tools/winapi/c_parser.pm | 1 + tools/winapi/c_type.pm | 1 + tools/winapi/config.pm | 1 + tools/winapi/function.pm | 1 + tools/winapi/make_filter | 3 ++- tools/winapi/make_filter_options.pm | 4 +++- tools/winapi/make_parser.pm | 1 + tools/winapi/modules.pm | 1 + tools/winapi/msvcmaker | 3 ++- tools/winapi/msvcmaker_options.pm | 4 +++- tools/winapi/nativeapi.pm | 1 + tools/winapi/options.pm | 2 ++ tools/winapi/output.pm | 2 ++ tools/winapi/preprocessor.pm | 1 + tools/winapi/setup.pm | 1 + tools/winapi/tests.pm | 1 + tools/winapi/type.pm | 1 + tools/winapi/util.pm | 1 + tools/winapi/winapi.pm | 1 + tools/winapi/winapi_check | 3 ++- tools/winapi/winapi_check_options.pm | 8 ++++++-- tools/winapi/winapi_documentation.pm | 1 + tools/winapi/winapi_extract | 3 ++- tools/winapi/winapi_extract_options.pm | 4 +++- tools/winapi/winapi_function.pm | 4 +++- tools/winapi/winapi_global.pm | 1 + tools/winapi/winapi_local.pm | 1 + tools/winapi/winapi_module_user.pm | 1 + tools/winapi/winapi_parser.pm | 1 + tools/winapi/winapi_test | 3 ++- tools/winapi/winapi_test_options.pm | 4 +++- 32 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 773c6b2..4bef581 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -19,6 +19,7 @@ package c_function; use strict; +use warnings 'all'; sub new($) { diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d42e04a..77e524f 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -19,6 +19,7 @@ package c_parser; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index c6aeb6a..ba1aec2 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -19,6 +19,7 @@ package c_type; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index fd45dc7..ceba90a 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -19,6 +19,7 @@ package config; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm index c53daa6..2bc2c4c 100644 --- a/tools/winapi/function.pm +++ b/tools/winapi/function.pm @@ -19,6 +19,7 @@ package function; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index 45665de..f080706 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # # Copyright 1999, 2000, 2001 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/make_filter$%; diff --git a/tools/winapi/make_filter_options.pm b/tools/winapi/make_filter_options.pm index 0cb81cd..7008487 100644 --- a/tools/winapi/make_filter_options.pm +++ b/tools/winapi/make_filter_options.pm @@ -17,9 +17,11 @@ # package make_filter_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 773c5f3..2f5788d 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -19,6 +19,7 @@ package make_parser; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index cbf1a2a..0651a7f 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -19,6 +19,7 @@ package modules; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index a18eb97..864b2b7 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1,8 +1,9 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/msvcmaker$%; diff --git a/tools/winapi/msvcmaker_options.pm b/tools/winapi/msvcmaker_options.pm index 32bdffd..242dcb9 100644 --- a/tools/winapi/msvcmaker_options.pm +++ b/tools/winapi/msvcmaker_options.pm @@ -17,9 +17,11 @@ # package msvcmaker_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 4804486..bc58d96 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -19,6 +19,7 @@ package nativeapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 3daeb11..2254852 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -19,6 +19,7 @@ package options; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -58,6 +59,7 @@ sub parse_value($$) { package _options; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm index f2c8d79..381570a 100644 --- a/tools/winapi/output.pm +++ b/tools/winapi/output.pm @@ -19,6 +19,7 @@ package output; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -34,6 +35,7 @@ $output = '_output'->new; package _output; use strict; +use warnings 'all'; my $stdout_isatty = -t STDOUT; my $stderr_isatty = -t STDERR; diff --git a/tools/winapi/preprocessor.pm b/tools/winapi/preprocessor.pm index 3d49773..796f7df 100644 --- a/tools/winapi/preprocessor.pm +++ b/tools/winapi/preprocessor.pm @@ -19,6 +19,7 @@ package preprocessor; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index 60a35c5..ed08460 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -19,6 +19,7 @@ package setup; use strict; +use warnings 'all'; BEGIN { use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); diff --git a/tools/winapi/tests.pm b/tools/winapi/tests.pm index 142538c..6553da3 100644 --- a/tools/winapi/tests.pm +++ b/tools/winapi/tests.pm @@ -19,6 +19,7 @@ package tests; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/type.pm b/tools/winapi/type.pm index 8f66780..b18383a 100644 --- a/tools/winapi/type.pm +++ b/tools/winapi/type.pm @@ -19,6 +19,7 @@ package type; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm index 6697d56..8f400da 100644 --- a/tools/winapi/util.pm +++ b/tools/winapi/util.pm @@ -19,6 +19,7 @@ package util; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); require Exporter; diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index c770465..62b4311 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -19,6 +19,7 @@ package winapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 61a0635..bfc9fc7 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 1999-2002 Patrik Stridvall # @@ -28,6 +28,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_check$%; diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index 23abb1f..8e17744 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -17,9 +17,11 @@ # package winapi_check_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -161,9 +163,11 @@ my $options_usage = "usage: winapi_check [--help] [<files>]\n"; $options = '_winapi_check_options'->new(\%options_long, \%options_short, $options_usage); package _winapi_check_options; -use base qw(_options); use strict; +use warnings 'all'; + +use base qw(_options); sub report_module($$) { my $self = shift; diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index d959e11..2be7c8c 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -19,6 +19,7 @@ package winapi_documentation; use strict; +use warnings 'all'; use config qw($current_dir $wine_dir); use modules qw($modules); diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 1d165b9..b53fbcf 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_extract$%; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index 0e5754e..5126ba4 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -17,9 +17,11 @@ # package winapi_extract_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 633e9ea..d4cfb72 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -17,9 +17,11 @@ # package winapi_function; -use base qw(function); use strict; +use warnings 'all'; + +use base qw(function); use config qw($current_dir $wine_dir); use util qw(normalize_set); diff --git a/tools/winapi/winapi_global.pm b/tools/winapi/winapi_global.pm index 38c0dfe..bb1403c 100644 --- a/tools/winapi/winapi_global.pm +++ b/tools/winapi/winapi_global.pm @@ -19,6 +19,7 @@ package winapi_global; use strict; +use warnings 'all'; use modules qw($modules); use nativeapi qw($nativeapi); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 42dd146..a9aef17 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -19,6 +19,7 @@ package winapi_local; use strict; +use warnings 'all'; use nativeapi qw($nativeapi); use options qw($options); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index ef14453..53bce8e 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -19,6 +19,7 @@ package winapi_module_user; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3703837..87e286f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -19,6 +19,7 @@ package winapi_parser; use strict; +use warnings 'all'; use output qw($output); use options qw($options); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f..8051591 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_test$%; diff --git a/tools/winapi/winapi_test_options.pm b/tools/winapi/winapi_test_options.pm index 240e840..c422b65 100644 --- a/tools/winapi/winapi_test_options.pm +++ b/tools/winapi/winapi_test_options.pm @@ -17,9 +17,11 @@ # package winapi_test_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; -- 2.10.0.windows.1

1 0

[PATCH] winapi: Update to "use warnings 'all'".
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/c_function.pm | 1 + tools/winapi/c_parser.pm | 1 + tools/winapi/c_type.pm | 1 + tools/winapi/config.pm | 1 + tools/winapi/function.pm | 1 + tools/winapi/make_filter | 3 ++- tools/winapi/make_filter_options.pm | 4 +++- tools/winapi/make_parser.pm | 1 + tools/winapi/modules.pm | 1 + tools/winapi/msvcmaker | 3 ++- tools/winapi/msvcmaker_options.pm | 4 +++- tools/winapi/nativeapi.pm | 1 + tools/winapi/options.pm | 2 ++ tools/winapi/output.pm | 2 ++ tools/winapi/preprocessor.pm | 1 + tools/winapi/setup.pm | 1 + tools/winapi/tests.pm | 1 + tools/winapi/type.pm | 1 + tools/winapi/util.pm | 1 + tools/winapi/winapi.pm | 1 + tools/winapi/winapi_check | 3 ++- tools/winapi/winapi_check_options.pm | 8 ++++++-- tools/winapi/winapi_documentation.pm | 1 + tools/winapi/winapi_extract | 3 ++- tools/winapi/winapi_extract_options.pm | 4 +++- tools/winapi/winapi_function.pm | 4 +++- tools/winapi/winapi_global.pm | 1 + tools/winapi/winapi_local.pm | 1 + tools/winapi/winapi_module_user.pm | 1 + tools/winapi/winapi_parser.pm | 1 + tools/winapi/winapi_test | 3 ++- tools/winapi/winapi_test_options.pm | 4 +++- 32 files changed, 54 insertions(+), 12 deletions(-) diff --git a/tools/winapi/c_function.pm b/tools/winapi/c_function.pm index 773c6b2..4bef581 100644 --- a/tools/winapi/c_function.pm +++ b/tools/winapi/c_function.pm @@ -19,6 +19,7 @@ package c_function; use strict; +use warnings 'all'; sub new($) { diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d42e04a..77e524f 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -19,6 +19,7 @@ package c_parser; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index c6aeb6a..ba1aec2 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -19,6 +19,7 @@ package c_type; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/config.pm b/tools/winapi/config.pm index fd45dc7..ceba90a 100644 --- a/tools/winapi/config.pm +++ b/tools/winapi/config.pm @@ -19,6 +19,7 @@ package config; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/function.pm b/tools/winapi/function.pm index c53daa6..2bc2c4c 100644 --- a/tools/winapi/function.pm +++ b/tools/winapi/function.pm @@ -19,6 +19,7 @@ package function; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/make_filter b/tools/winapi/make_filter index 45665de..f080706 100755 --- a/tools/winapi/make_filter +++ b/tools/winapi/make_filter @@ -1,4 +1,4 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # # Copyright 1999, 2000, 2001 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/make_filter$%; diff --git a/tools/winapi/make_filter_options.pm b/tools/winapi/make_filter_options.pm index 0cb81cd..7008487 100644 --- a/tools/winapi/make_filter_options.pm +++ b/tools/winapi/make_filter_options.pm @@ -17,9 +17,11 @@ # package make_filter_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/make_parser.pm b/tools/winapi/make_parser.pm index 773c5f3..2f5788d 100644 --- a/tools/winapi/make_parser.pm +++ b/tools/winapi/make_parser.pm @@ -19,6 +19,7 @@ package make_parser; use strict; +use warnings 'all'; use setup qw($current_dir $wine_dir $winapi_dir); diff --git a/tools/winapi/modules.pm b/tools/winapi/modules.pm index cbf1a2a..0651a7f 100644 --- a/tools/winapi/modules.pm +++ b/tools/winapi/modules.pm @@ -19,6 +19,7 @@ package modules; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/msvcmaker b/tools/winapi/msvcmaker index a18eb97..864b2b7 100755 --- a/tools/winapi/msvcmaker +++ b/tools/winapi/msvcmaker @@ -1,8 +1,9 @@ -#! /usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/msvcmaker$%; diff --git a/tools/winapi/msvcmaker_options.pm b/tools/winapi/msvcmaker_options.pm index 32bdffd..242dcb9 100644 --- a/tools/winapi/msvcmaker_options.pm +++ b/tools/winapi/msvcmaker_options.pm @@ -17,9 +17,11 @@ # package msvcmaker_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/nativeapi.pm b/tools/winapi/nativeapi.pm index 4804486..bc58d96 100644 --- a/tools/winapi/nativeapi.pm +++ b/tools/winapi/nativeapi.pm @@ -19,6 +19,7 @@ package nativeapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/options.pm b/tools/winapi/options.pm index 3daeb11..2254852 100644 --- a/tools/winapi/options.pm +++ b/tools/winapi/options.pm @@ -19,6 +19,7 @@ package options; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -58,6 +59,7 @@ sub parse_value($$) { package _options; use strict; +use warnings 'all'; use output qw($output); diff --git a/tools/winapi/output.pm b/tools/winapi/output.pm index f2c8d79..381570a 100644 --- a/tools/winapi/output.pm +++ b/tools/winapi/output.pm @@ -19,6 +19,7 @@ package output; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -34,6 +35,7 @@ $output = '_output'->new; package _output; use strict; +use warnings 'all'; my $stdout_isatty = -t STDOUT; my $stderr_isatty = -t STDERR; diff --git a/tools/winapi/preprocessor.pm b/tools/winapi/preprocessor.pm index 3d49773..796f7df 100644 --- a/tools/winapi/preprocessor.pm +++ b/tools/winapi/preprocessor.pm @@ -19,6 +19,7 @@ package preprocessor; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/setup.pm b/tools/winapi/setup.pm index 60a35c5..ed08460 100644 --- a/tools/winapi/setup.pm +++ b/tools/winapi/setup.pm @@ -19,6 +19,7 @@ package setup; use strict; +use warnings 'all'; BEGIN { use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); diff --git a/tools/winapi/tests.pm b/tools/winapi/tests.pm index 142538c..6553da3 100644 --- a/tools/winapi/tests.pm +++ b/tools/winapi/tests.pm @@ -19,6 +19,7 @@ package tests; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/type.pm b/tools/winapi/type.pm index 8f66780..b18383a 100644 --- a/tools/winapi/type.pm +++ b/tools/winapi/type.pm @@ -19,6 +19,7 @@ package type; use strict; +use warnings 'all'; sub new($) { my $proto = shift; diff --git a/tools/winapi/util.pm b/tools/winapi/util.pm index 6697d56..8f400da 100644 --- a/tools/winapi/util.pm +++ b/tools/winapi/util.pm @@ -19,6 +19,7 @@ package util; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); require Exporter; diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index c770465..62b4311 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -19,6 +19,7 @@ package winapi; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_check b/tools/winapi/winapi_check index 61a0635..bfc9fc7 100755 --- a/tools/winapi/winapi_check +++ b/tools/winapi/winapi_check @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 1999-2002 Patrik Stridvall # @@ -28,6 +28,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_check$%; diff --git a/tools/winapi/winapi_check_options.pm b/tools/winapi/winapi_check_options.pm index 23abb1f..8e17744 100644 --- a/tools/winapi/winapi_check_options.pm +++ b/tools/winapi/winapi_check_options.pm @@ -17,9 +17,11 @@ # package winapi_check_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; @@ -161,9 +163,11 @@ my $options_usage = "usage: winapi_check [--help] [<files>]\n"; $options = '_winapi_check_options'->new(\%options_long, \%options_short, $options_usage); package _winapi_check_options; -use base qw(_options); use strict; +use warnings 'all'; + +use base qw(_options); sub report_module($$) { my $self = shift; diff --git a/tools/winapi/winapi_documentation.pm b/tools/winapi/winapi_documentation.pm index d959e11..2be7c8c 100644 --- a/tools/winapi/winapi_documentation.pm +++ b/tools/winapi/winapi_documentation.pm @@ -19,6 +19,7 @@ package winapi_documentation; use strict; +use warnings 'all'; use config qw($current_dir $wine_dir); use modules qw($modules); diff --git a/tools/winapi/winapi_extract b/tools/winapi/winapi_extract index 1d165b9..b53fbcf 100755 --- a/tools/winapi/winapi_extract +++ b/tools/winapi/winapi_extract @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_extract$%; diff --git a/tools/winapi/winapi_extract_options.pm b/tools/winapi/winapi_extract_options.pm index 0e5754e..5126ba4 100644 --- a/tools/winapi/winapi_extract_options.pm +++ b/tools/winapi/winapi_extract_options.pm @@ -17,9 +17,11 @@ # package winapi_extract_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_function.pm b/tools/winapi/winapi_function.pm index 633e9ea..d4cfb72 100644 --- a/tools/winapi/winapi_function.pm +++ b/tools/winapi/winapi_function.pm @@ -17,9 +17,11 @@ # package winapi_function; -use base qw(function); use strict; +use warnings 'all'; + +use base qw(function); use config qw($current_dir $wine_dir); use util qw(normalize_set); diff --git a/tools/winapi/winapi_global.pm b/tools/winapi/winapi_global.pm index 38c0dfe..bb1403c 100644 --- a/tools/winapi/winapi_global.pm +++ b/tools/winapi/winapi_global.pm @@ -19,6 +19,7 @@ package winapi_global; use strict; +use warnings 'all'; use modules qw($modules); use nativeapi qw($nativeapi); diff --git a/tools/winapi/winapi_local.pm b/tools/winapi/winapi_local.pm index 42dd146..a9aef17 100644 --- a/tools/winapi/winapi_local.pm +++ b/tools/winapi/winapi_local.pm @@ -19,6 +19,7 @@ package winapi_local; use strict; +use warnings 'all'; use nativeapi qw($nativeapi); use options qw($options); diff --git a/tools/winapi/winapi_module_user.pm b/tools/winapi/winapi_module_user.pm index ef14453..53bce8e 100644 --- a/tools/winapi/winapi_module_user.pm +++ b/tools/winapi/winapi_module_user.pm @@ -19,6 +19,7 @@ package winapi_module_user; use strict; +use warnings 'all'; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 3703837..87e286f 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -19,6 +19,7 @@ package winapi_parser; use strict; +use warnings 'all'; use output qw($output); use options qw($options); diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 8b7596f..8051591 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl # Copyright 2002 Patrik Stridvall # @@ -18,6 +18,7 @@ # use strict; +use warnings 'all'; BEGIN { $0 =~ m%^(.*?/?tools)/winapi/winapi_test$%; diff --git a/tools/winapi/winapi_test_options.pm b/tools/winapi/winapi_test_options.pm index 240e840..c422b65 100644 --- a/tools/winapi/winapi_test_options.pm +++ b/tools/winapi/winapi_test_options.pm @@ -17,9 +17,11 @@ # package winapi_test_options; -use base qw(options); use strict; +use warnings 'all'; + +use base qw(options); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); require Exporter; -- 2.10.0.windows.1

1 0

[PATCH] winedbg: Add compatibility manifest to fix displayed Windows version.
by Brendan Shanks 16 Apr '20

16 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/winedbg/winedbg.manifest | 17 +++++++++++++++++ programs/winedbg/winedbg.rc | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 programs/winedbg/winedbg.manifest diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest new file mode 100644 index 0000000000..f7188313aa --- /dev/null +++ b/programs/winedbg/winedbg.manifest @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> +  + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> +  + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> +  + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> +  + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> +  + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> +</compatibility> +</assembly> diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 7ad7686d28..af0018c3cf 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -75,3 +75,6 @@ BEGIN DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END + +/* @makedep: winedbg.manifest */ +1 RT_MANIFEST winedbg.manifest -- 2.24.1

2 1

[PATCH v3 1/6] dxgi: Create frame latency event for D3D12 swap chain if requested.
by Philip Rebohle 16 Apr '20

16 Apr '20

Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- v2: Don't set manual-reset flag for the event. v3: Fix frame_latency_event type. dlls/dxgi/swapchain.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f19b58da2e..58353ec1b7 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1094,6 +1094,9 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + + ID3D12Fence *frame_latency_fence; + HANDLE frame_latency_event; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1887,6 +1890,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_buffers(swapchain, TRUE); + if (swapchain->frame_latency_event) + CloseHandle(swapchain->frame_latency_event); + + if (swapchain->frame_latency_fence) + ID3D12Fence_Release(swapchain->frame_latency_fence); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -2906,7 +2915,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (swapchain_desc->Flags) + if (swapchain_desc->Flags & ~(DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); if (fullscreen_desc->RefreshRate.Numerator || fullscreen_desc->RefreshRate.Denominator) @@ -2983,6 +2992,25 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT) + { + if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, + 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) + { + WARN("Failed to create D3D12 fence, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + + if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create frame latency event, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; -- 2.26.0

2 6

[PATCH] winapi_test: Fix 'MIXERLINECONTROL[AW]' typos, in tests.dat.
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to e9e6845d66645daff6ffcfe599e03849e6ba9d32. --- dlls/winmm/tests/generated.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ tools/winapi/tests.dat | 4 ++-- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index 4c0fe7a..78051c6 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -814,6 +814,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -3219,6 +3241,28 @@ static void test_pack_MIXERCONTROLW(void) TEST_FIELD_OFFSET(MIXERCONTROLW, cMultipleItems, 16) } +static void test_pack_MIXERLINECONTROLSA(void) +{ + /* MIXERLINECONTROLSA (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSA, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSA, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSA, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSA, dwLineID, 4) +} + +static void test_pack_MIXERLINECONTROLSW(void) +{ + /* MIXERLINECONTROLSW (pack 1) */ + TEST_FIELD_SIZE (MIXERLINECONTROLSW, cbStruct, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, cbStruct, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, cbStruct, 0) + TEST_FIELD_SIZE (MIXERLINECONTROLSW, dwLineID, 4) + TEST_FIELD_ALIGN (MIXERLINECONTROLSW, dwLineID, 1) + TEST_FIELD_OFFSET(MIXERLINECONTROLSW, dwLineID, 4) +} + static void test_pack_MIXERCONTROLDETAILS(void) { /* MIXERCONTROLDETAILS (pack 1) */ @@ -5001,6 +5045,8 @@ static void test_pack(void) test_pack_MIXERCONTROLDETAILS_UNSIGNED(); test_pack_MIXERCONTROLW(); test_pack_MIXERLINEA(); + test_pack_MIXERLINECONTROLSA(); + test_pack_MIXERLINECONTROLSW(); test_pack_MIXERLINEW(); test_pack_MMCKINFO(); test_pack_MMIOINFO(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..64467c4 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1790,8 +1790,8 @@ MIXERLINEA MIXERLINEW MIXERCONTROLA MIXERCONTROLW -MIXERLINECONTROLA -MIXERLINECONTROLW +MIXERLINECONTROLSA +MIXERLINECONTROLSW MIXERCONTROLDETAILS MIXERCONTROLDETAILS_LISTTEXTA MIXERCONTROLDETAILS_LISTTEXTW -- 2.10.0.windows.1

1 0

[PATCH 5/5] wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object().
by Henri Verbeet 16 Apr '20

16 Apr '20

We may get coherent memory anyway, but we don't require it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 47aca9218d7..2e2ae239210 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1589,9 +1589,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT - | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT + | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); -- 2.20.1

1 0

[PATCH 4/5] wined3d: Flush non-coherent memory ranges in adapter_vk_unmap_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a015963ee67..1773f26ae7f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -556,13 +556,30 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s { const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; + unsigned int i; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) return; vk_info = wined3d_context_vk(context)->vk_info; device_vk = wined3d_device_vk(context->device); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + + for (i = 0; i < range_count; ++i) + { + range.offset = ranges[i].offset; + range.size = ranges[i].size; + VK_CALL(vkFlushMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } + } + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); } -- 2.20.1

1 0

[PATCH 3/5] wined3d: Invalidate non-coherent memory before reading from it in adapter_vk_map_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 11 +++++++++++ dlls/wined3d/context_vk.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a5900b29e59..a015963ee67 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -496,6 +496,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; void *map_ptr; VkResult vr; @@ -525,6 +526,16 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + range.offset = (uintptr_t)data->addr; + range.size = size; + VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } } wined3d_context_vk_submit_command_buffer(context_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 84e701543f1..b0e65231f25 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -38,6 +38,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic struct wined3d_adapter_vk *adapter_vk; VkMemoryAllocateInfo allocate_info; VkBufferCreateInfo create_info; + unsigned int memory_type_idx; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -62,14 +63,15 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; allocate_info.pNext = NULL; allocate_info.allocationSize = memory_requirements.size; - allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(adapter_vk, memory_requirements.memoryTypeBits, memory_type); - if (allocate_info.memoryTypeIndex == ~0u) + if (memory_type_idx == ~0u) { ERR("Failed to find suitable memory type.\n"); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } + allocate_info.memoryTypeIndex = memory_type_idx; if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) { ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -85,6 +87,8 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2fde81e641..55243050b03 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1521,6 +1521,8 @@ struct wined3d_bo_vk { VkBuffer vk_buffer; VkDeviceMemory vk_memory; + + VkMemoryPropertyFlags memory_type; }; struct wined3d_bo_address -- 2.20.1

1 0

[PATCH 2/5] wined3d: Only insert read barriers for WINED3D_MAP_READ maps in adapter_vk_map_bo_address().
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 85dfa6c987c..a5900b29e59 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -506,23 +506,26 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); - if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + if (map_flags & WINED3D_MAP_READ) { - ERR("Failed to get command buffer.\n"); - return NULL; - } + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } - vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); - vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; - vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = (uintptr_t)data->addr; - vk_barrier.size = size; - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + } wined3d_context_vk_submit_command_buffer(context_vk); wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1); -- 2.20.1

1 0

[PATCH 1/5] wined3d: Move Vulkan specific context functions to context_vk.c.
by Henri Verbeet 16 Apr '20

16 Apr '20

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 279 +----------------------------- dlls/wined3d/context_vk.c | 307 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 310 insertions(+), 278 deletions(-) create mode 100644 dlls/wined3d/context_vk.c diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 7ebd0106502..0f8be5bd18b 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ ati_fragment_shader.c \ buffer.c \ context.c \ + context_vk.c \ cs.c \ device.c \ directx.c \ diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 41dbca24dbc..d20e9e6835e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,123 +1493,6 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } -BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, - VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkMemoryRequirements memory_requirements; - struct wined3d_adapter_vk *adapter_vk; - VkMemoryAllocateInfo allocate_info; - VkBufferCreateInfo create_info; - VkResult vr; - - adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); - - create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; - create_info.pNext = NULL; - create_info.flags = 0; - create_info.size = size; - create_info.usage = usage; - create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - create_info.queueFamilyIndexCount = 0; - create_info.pQueueFamilyIndices = NULL; - - if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) - { - ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - return FALSE; - } - - VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); - - allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.allocationSize = memory_requirements.size; - allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, - memory_requirements.memoryTypeBits, memory_type); - if (allocate_info.memoryTypeIndex == ~0u) - { - ERR("Failed to find suitable memory type.\n"); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) - { - ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - - if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) - { - ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - return FALSE; - } - - return TRUE; -} - -void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - - VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); - VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); -} - -static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct wined3d_command_buffer_vk *buffer; - SIZE_T i = 0; - - while (i < context_vk->submitted.buffer_count) - { - buffer = &context_vk->submitted.buffers[i]; - if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) - { - ++i; - continue; - } - - TRACE("Command buffer %p with id 0x%s has finished.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, - context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); - - if (buffer->id > context_vk->completed_command_buffer_id) - context_vk->completed_command_buffer_id = buffer->id; - *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; - } -} - -void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) -{ - struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - - if (buffer->vk_command_buffer) - { - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, - context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); - buffer->vk_command_buffer = VK_NULL_HANDLE; - } - VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); - - wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); - context_vk->completed_command_buffer_id = buffer->id; - wined3d_context_vk_cleanup_resources(context_vk); - heap_free(context_vk->submitted.buffers); - wined3d_context_cleanup(&context_vk->c); -} - DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -2009,136 +1892,7 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - VkCommandBufferAllocateInfo command_buffer_info; - struct wined3d_command_buffer_vk *buffer; - VkCommandBufferBeginInfo begin_info; - VkResult vr; - - TRACE("context_vk %p.\n", context_vk); - - buffer = &context_vk->current_command_buffer; - if (buffer->vk_command_buffer) - { - TRACE("Returning existing command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - return buffer->vk_command_buffer; - } - - command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - command_buffer_info.pNext = NULL; - command_buffer_info.commandPool = context_vk->vk_command_pool; - command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - command_buffer_info.commandBufferCount = 1; - if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, - &command_buffer_info, &buffer->vk_command_buffer))) < 0) - { - WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - return VK_NULL_HANDLE; - } - - begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - begin_info.pNext = NULL; - begin_info.flags = 0; - begin_info.pInheritanceInfo = NULL; - if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) - { - WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); - VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, - 1, &buffer->vk_command_buffer)); - return buffer->vk_command_buffer = VK_NULL_HANDLE; - } - - TRACE("Created new command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - - return buffer->vk_command_buffer; -} - -void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - struct wined3d_command_buffer_vk *buffer; - VkFenceCreateInfo fence_desc; - VkSubmitInfo submit_info; - VkResult vr; - - TRACE("context_vk %p.\n", context_vk); - - buffer = &context_vk->current_command_buffer; - if (!buffer->vk_command_buffer) - return; - - TRACE("Submitting command buffer %p with id 0x%s.\n", - buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); - - VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); - - fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; - fence_desc.pNext = NULL; - fence_desc.flags = 0; - if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) - ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); - - submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submit_info.pNext = NULL; - submit_info.waitSemaphoreCount = 0; - submit_info.pWaitSemaphores = NULL; - submit_info.pWaitDstStageMask = NULL; - submit_info.commandBufferCount = 1; - submit_info.pCommandBuffers = &buffer->vk_command_buffer; - submit_info.signalSemaphoreCount = 0; - submit_info.pSignalSemaphores = NULL; - - if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) - ERR("Failed to submit command buffer %p, vr %s.\n", - buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); - - if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, - context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) - ERR("Failed to grow submitted command buffer array.\n"); - - context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; - - buffer->vk_command_buffer = VK_NULL_HANDLE; - /* We don't expect this to ever happen, but handle it anyway. */ - if (!++buffer->id) - { - wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); - context_vk->completed_command_buffer_id = 0; - buffer->id = 1; - } - wined3d_context_vk_cleanup_resources(context_vk); -} - -void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) -{ - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); - const struct wined3d_vk_info *vk_info = context_vk->vk_info; - SIZE_T i; - - if (id <= context_vk->completed_command_buffer_id) - return; - - for (i = 0; i < context_vk->submitted.buffer_count; ++i) - { - if (context_vk->submitted.buffers[i].id != id) - continue; - - VK_CALL(vkWaitForFences(device_vk->vk_device, 1, - &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); - wined3d_context_vk_cleanup_resources(context_vk); - return; - } - - ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); -} - -static void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) +void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) { struct wined3d_device *device = swapchain->device; DWORD state; @@ -2583,37 +2337,6 @@ fail: return E_FAIL; } -HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) -{ - VkCommandPoolCreateInfo command_pool_info; - const struct wined3d_vk_info *vk_info; - struct wined3d_adapter_vk *adapter_vk; - struct wined3d_device_vk *device_vk; - VkResult vr; - - TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); - - wined3d_context_init(&context_vk->c, swapchain); - device_vk = wined3d_device_vk(swapchain->device); - adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); - context_vk->vk_info = vk_info = &adapter_vk->vk_info; - - command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - command_pool_info.pNext = NULL; - command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; - command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; - if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, - &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) - { - ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); - wined3d_context_cleanup(&context_vk->c); - return E_FAIL; - } - context_vk->current_command_buffer.id = 1; - - return WINED3D_OK; -} - void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) { struct wined3d_device *device = context_gl->c.device; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c new file mode 100644 index 00000000000..84e701543f1 --- /dev/null +++ b/dlls/wined3d/context_vk.c @@ -0,0 +1,307 @@ +/* + * Copyright 2002-2004 Jason Edmeades + * Copyright 2002-2004 Raphael Junqueira + * Copyright 2004 Christian Costa + * Copyright 2005 Oliver Stieber + * Copyright 2006, 2008 Henri Verbeet + * Copyright 2007-2011, 2013 Stefan Dösinger for CodeWeavers + * Copyright 2009-2020 Henri Verbeet for CodeWeavers + * + * 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 "config.h" +#include "wine/port.h" + +#include "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + struct wined3d_adapter_vk *adapter_vk; + VkMemoryAllocateInfo allocate_info; + VkBufferCreateInfo create_info; + VkResult vr; + + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.size = size; + create_info.usage = usage; + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + + if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) + { + ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements.size; + allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, memory_type); + if (allocate_info.memoryTypeIndex == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + { + ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + { + ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + return TRUE; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); +} + +static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + SIZE_T i = 0; + + while (i < context_vk->submitted.buffer_count) + { + buffer = &context_vk->submitted.buffers[i]; + if (VK_CALL(vkGetFenceStatus(device_vk->vk_device, buffer->vk_fence)) == VK_NOT_READY) + { + ++i; + continue; + } + + TRACE("Command buffer %p with id 0x%s has finished.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + VK_CALL(vkDestroyFence(device_vk->vk_device, buffer->vk_fence, NULL)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + + if (buffer->id > context_vk->completed_command_buffer_id) + context_vk->completed_command_buffer_id = buffer->id; + *buffer = context_vk->submitted.buffers[--context_vk->submitted.buffer_count]; + } +} + +void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) +{ + struct wined3d_command_buffer_vk *buffer = &context_vk->current_command_buffer; + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + if (buffer->vk_command_buffer) + { + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, + context_vk->vk_command_pool, 1, &buffer->vk_command_buffer)); + buffer->vk_command_buffer = VK_NULL_HANDLE; + } + VK_CALL(vkDestroyCommandPool(device_vk->vk_device, context_vk->vk_command_pool, NULL)); + + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = buffer->id; + wined3d_context_vk_cleanup_resources(context_vk); + heap_free(context_vk->submitted.buffers); + wined3d_context_cleanup(&context_vk->c); +} + +VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkCommandBufferAllocateInfo command_buffer_info; + struct wined3d_command_buffer_vk *buffer; + VkCommandBufferBeginInfo begin_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (buffer->vk_command_buffer) + { + TRACE("Returning existing command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + return buffer->vk_command_buffer; + } + + command_buffer_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + command_buffer_info.pNext = NULL; + command_buffer_info.commandPool = context_vk->vk_command_pool; + command_buffer_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + command_buffer_info.commandBufferCount = 1; + if ((vr = VK_CALL(vkAllocateCommandBuffers(device_vk->vk_device, + &command_buffer_info, &buffer->vk_command_buffer))) < 0) + { + WARN("Failed to allocate Vulkan command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_NULL_HANDLE; + } + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + if ((vr = VK_CALL(vkBeginCommandBuffer(buffer->vk_command_buffer, &begin_info))) < 0) + { + WARN("Failed to begin command buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeCommandBuffers(device_vk->vk_device, context_vk->vk_command_pool, + 1, &buffer->vk_command_buffer)); + return buffer->vk_command_buffer = VK_NULL_HANDLE; + } + + TRACE("Created new command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + return buffer->vk_command_buffer; +} + +void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context_vk) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_command_buffer_vk *buffer; + VkFenceCreateInfo fence_desc; + VkSubmitInfo submit_info; + VkResult vr; + + TRACE("context_vk %p.\n", context_vk); + + buffer = &context_vk->current_command_buffer; + if (!buffer->vk_command_buffer) + return; + + TRACE("Submitting command buffer %p with id 0x%s.\n", + buffer->vk_command_buffer, wine_dbgstr_longlong(buffer->id)); + + VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); + + fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_desc.pNext = NULL; + fence_desc.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device_vk->vk_device, &fence_desc, NULL, &buffer->vk_fence))) < 0) + ERR("Failed to create fence, vr %s.\n", wined3d_debug_vkresult(vr)); + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &buffer->vk_command_buffer; + submit_info.signalSemaphoreCount = 0; + submit_info.pSignalSemaphores = NULL; + + if ((vr = VK_CALL(vkQueueSubmit(device_vk->vk_queue, 1, &submit_info, buffer->vk_fence))) < 0) + ERR("Failed to submit command buffer %p, vr %s.\n", + buffer->vk_command_buffer, wined3d_debug_vkresult(vr)); + + if (!wined3d_array_reserve((void **)&context_vk->submitted.buffers, &context_vk->submitted.buffers_size, + context_vk->submitted.buffer_count + 1, sizeof(*context_vk->submitted.buffers))) + ERR("Failed to grow submitted command buffer array.\n"); + + context_vk->submitted.buffers[context_vk->submitted.buffer_count++] = *buffer; + + buffer->vk_command_buffer = VK_NULL_HANDLE; + /* We don't expect this to ever happen, but handle it anyway. */ + if (!++buffer->id) + { + wined3d_context_vk_wait_command_buffer(context_vk, buffer->id - 1); + context_vk->completed_command_buffer_id = 0; + buffer->id = 1; + } + wined3d_context_vk_cleanup_resources(context_vk); +} + +void wined3d_context_vk_wait_command_buffer(struct wined3d_context_vk *context_vk, uint64_t id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + SIZE_T i; + + if (id <= context_vk->completed_command_buffer_id) + return; + + for (i = 0; i < context_vk->submitted.buffer_count; ++i) + { + if (context_vk->submitted.buffers[i].id != id) + continue; + + VK_CALL(vkWaitForFences(device_vk->vk_device, 1, + &context_vk->submitted.buffers[i].vk_fence, VK_TRUE, UINT64_MAX)); + wined3d_context_vk_cleanup_resources(context_vk); + return; + } + + ERR("Failed to find fence for command buffer with id 0x%s.\n", wine_dbgstr_longlong(id)); +} + +HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) +{ + VkCommandPoolCreateInfo command_pool_info; + const struct wined3d_vk_info *vk_info; + struct wined3d_adapter_vk *adapter_vk; + struct wined3d_device_vk *device_vk; + VkResult vr; + + TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); + + wined3d_context_init(&context_vk->c, swapchain); + device_vk = wined3d_device_vk(swapchain->device); + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + context_vk->vk_info = vk_info = &adapter_vk->vk_info; + + command_pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + command_pool_info.pNext = NULL; + command_pool_info.flags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; + command_pool_info.queueFamilyIndex = device_vk->vk_queue_family_index; + if ((vr = VK_CALL(vkCreateCommandPool(device_vk->vk_device, + &command_pool_info, NULL, &context_vk->vk_command_pool))) < 0) + { + ERR("Failed to create Vulkan command pool, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_context_cleanup(&context_vk->c); + return E_FAIL; + } + context_vk->current_command_buffer.id = 1; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5935a90cacb..c2fde81e641 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1994,6 +1994,7 @@ struct wined3d_context }; void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH 2/2] windowscodecs: Implement DdsDecoder_Initialize().
by Ziqing Hui 16 Apr '20

16 Apr '20

DDS file layout can been found here: https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-… Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 81 +++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 4 +- 2 files changed, 81 insertions(+), 4 deletions(-)

3 2

[PATCH 1/2] windowscodecs/tests: Add tests for DdsDecoder_Initialize().
by Ziqing Hui 16 Apr '20

16 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 75 +++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 7 deletions(-)

2 1

[PATCH 1/5] gdiplus: Reuse point when calling GdipAddPathBezier on open figure.
by Jeff Smith 16 Apr '20

16 Apr '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/graphicspath.c | 41 ++++++++++++++++++++++++------- dlls/gdiplus/tests/graphicspath.c | 34 +++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4d5a73588f..6d2760bef4 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -166,6 +166,33 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R return TRUE; } +GpStatus extend_current_figure(GpPath *path, INT count, REAL x1, REAL y1, INT *old_count) +{ + *old_count = path->pathdata.Count; + + if(path->newfigure || + path->pathdata.Points[*old_count - 1].X != x1 || + path->pathdata.Points[*old_count - 1].Y != y1) + { + if(!lengthen_path(path, count)) + return OutOfMemory; + + path->pathdata.Points[*old_count].X = x1; + path->pathdata.Points[*old_count].Y = y1; + path->pathdata.Types[*old_count] = + (path->newfigure ? PathPointTypeStart : PathPointTypeLine); + } + else + { + if(!lengthen_path(path, count - 1)) + return OutOfMemory; + + (*old_count)--; + } + + return Ok; +} + /******************************************************************************* * GdipAddPathArc [GDIPLUS.1] * @@ -244,6 +271,7 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { INT old_count; + GpStatus status; TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2, x3, y3, x4, y4); @@ -251,13 +279,10 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, if(!path) return InvalidParameter; - if(!lengthen_path(path, 4)) - return OutOfMemory; - - old_count = path->pathdata.Count; + status = extend_current_figure(path, 4, x1, y1, &old_count); + if(status != Ok) + return status; - path->pathdata.Points[old_count].X = x1; - path->pathdata.Points[old_count].Y = y1; path->pathdata.Points[old_count + 1].X = x2; path->pathdata.Points[old_count + 1].Y = y2; path->pathdata.Points[old_count + 2].X = x3; @@ -265,14 +290,12 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, path->pathdata.Points[old_count + 3].X = x4; path->pathdata.Points[old_count + 3].Y = y4; - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); path->pathdata.Types[old_count + 1] = PathPointTypeBezier; path->pathdata.Types[old_count + 2] = PathPointTypeBezier; path->pathdata.Types[old_count + 3] = PathPointTypeBezier; path->newfigure = FALSE; - path->pathdata.Count += 4; + path->pathdata.Count = old_count + 4; return Ok; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7670a6c41f..d85cf68dfc 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -332,6 +332,39 @@ static void test_line2(void) GdipDeletePath(path); } +static path_test_t bezier_path[] = { + {10.0, 10.0, PathPointTypeStart, 0, 0}, /*0*/ + {20.0, 10.0, PathPointTypeBezier, 0, 0}, /*1*/ + {20.0, 20.0, PathPointTypeBezier, 0, 0}, /*2*/ + {30.0, 20.0, PathPointTypeBezier, 0, 0}, /*3*/ + {40.0, 20.0, PathPointTypeBezier, 0, 0}, /*4*/ + {40.0, 30.0, PathPointTypeBezier, 0, 0}, /*5*/ + {50.0, 30.0, PathPointTypeBezier, 0, 0}, /*6*/ + {50.0, 10.0, PathPointTypeLine, 0, 0}, /*7*/ + {60.0, 10.0, PathPointTypeBezier, 0, 0}, /*8*/ + {60.0, 20.0, PathPointTypeBezier, 0, 0}, /*9*/ + {70.0, 20.0, PathPointTypeBezier, 0, 0} /*10*/ + }; + +static void test_bezier(void) +{ + GpStatus status; + GpPath* path; + + GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathBezier(path, 10.0, 10.0, 20.0, 10.0, 20.0, 20.0, 30.0, 20.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 30.0, 20.0, 40.0, 20.0, 40.0, 30.0, 50.0, 30.0); + expect(Ok, status); + status = GdipAddPathBezier(path, 50.0, 10.0, 60.0, 10.0, 60.0, 20.0, 70.0, 20.0); + expect(Ok, status); + + ok_path(path, bezier_path, ARRAY_SIZE(bezier_path), FALSE); + + GdipDeletePath(path); +} + static path_test_t arc_path[] = { {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ @@ -1784,6 +1817,7 @@ START_TEST(graphicspath) test_getpathdata(); test_createpath2(); test_line2(); + test_bezier(); test_arc(); test_worldbounds(); test_pathpath(); -- 2.23.0

4 23

[PATCH v2 1/6] dxgi: Create frame latency event for D3D12 swap chain.
by Philip Rebohle 16 Apr '20

16 Apr '20

Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- v2: Don't set manual-reset flag for the event. As mentioned in the original series, Monster Hunter World needs this functionality in order to run in Dx12 mode. dlls/dxgi/swapchain.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f19b58da2e..b04e8b4e87 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1094,6 +1094,9 @@ struct d3d12_swapchain IDXGIOutput *target; DXGI_SWAP_CHAIN_DESC1 desc; DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + + ID3D12Fence *frame_latency_fence; + HANDLE *frame_latency_event; }; static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) @@ -1887,6 +1890,12 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) d3d12_swapchain_destroy_buffers(swapchain, TRUE); + if (swapchain->frame_latency_event) + CloseHandle(swapchain->frame_latency_event); + + if (swapchain->frame_latency_fence) + ID3D12Fence_Release(swapchain->frame_latency_fence); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); @@ -2906,7 +2915,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); - if (swapchain_desc->Flags) + if (swapchain_desc->Flags & ~(DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT)) FIXME("Ignoring swapchain flags %#x.\n", swapchain_desc->Flags); if (fullscreen_desc->RefreshRate.Numerator || fullscreen_desc->RefreshRate.Denominator) @@ -2983,6 +2992,25 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hresult_from_vk_result(vr); } + if (swapchain_desc->Flags & DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT) + { + if (FAILED(hr = ID3D12Device_CreateFence(device, DXGI_MAX_SWAP_CHAIN_BUFFERS, + 0, &IID_ID3D12Fence, (void **)&swapchain->frame_latency_fence))) + { + WARN("Failed to create D3D12 fence, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + + if (!(swapchain->frame_latency_event = CreateEventW(NULL, FALSE, TRUE, NULL))) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + WARN("Failed to create frame latency event, hr %d.\n", hr); + d3d12_swapchain_destroy(swapchain); + return hr; + } + } + IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; -- 2.26.0

3 10

[PATCH 1/4] wined3d: Remove WINED3D_RS_EDGEANTIALIAS.
by Chip Davis 16 Apr '20

16 Apr '20

Handle this render state similarly to D3DRS_ZFUNC, by mapping it in the client DLLs. As far as I can tell, save for the fact that it's only supposed to apply to lines forming a convex outline, it's roughly equivalent to D3DRS_ANTIALIASEDLINEENABLE. We definitely handled it the same way. Curiously, even though we supported the render state, we didn't set the corresponding capability bit. Do that now. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d8/device.c | 13 +++++++++++-- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/device.c | 10 ++++++++-- dlls/wined3d/state.c | 13 +++++-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 -- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a67f817785..07f6dccbcbf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -422,6 +422,9 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + if (caps->LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->RasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; + caps->LineCaps &= ~WINED3DLINECAPS_ANTIALIAS; caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER @@ -446,9 +449,15 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) { - if (state == D3DRS_ZBIAS) + switch (state) + { + case D3DRS_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRS_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba9011..4ebf51d040c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1340,6 +1340,8 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) if (caps->dpcLineCaps.dwRasterCaps & WINED3DPRASTERCAPS_DEPTHBIAS) caps->dpcLineCaps.dwRasterCaps = (caps->dpcLineCaps.dwRasterCaps | D3DPRASTERCAPS_ZBIAS) & ~WINED3DPRASTERCAPS_DEPTHBIAS; + if (wined3d_caps.LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->dpcLineCaps.dwRasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; caps->dpcLineCaps.dwZCmpCaps &= ( D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e09100dfdc7..47856a05fb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -74,9 +74,15 @@ static inline WORD d3d_fpu_setup(void) static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) { - if (state == D3DRENDERSTATE_ZBIAS) + switch (state) + { + case D3DRENDERSTATE_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRENDERSTATE_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d375122781b..1cb9f222eab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,12 +1798,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta } } -static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void line_antialias(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_rasterizer_state *r = state->rasterizer_state; - - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) + if (r && r->desc.line_antialias) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4427,7 +4424,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4445,7 +4442,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4602,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, @@ -5504,6 +5500,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 8, 8}, { 17, 22}, { 27, 27}, + { 40, 40}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48d133485b8..7e97c84c19e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1665,7 +1665,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_FOGEND] = tmpfloat.d; tmpfloat.f = 1.0f; rs[WINED3D_RS_FOGDENSITY] = tmpfloat.d; - rs[WINED3D_RS_EDGEANTIALIAS] = FALSE; rs[WINED3D_RS_RANGEFOGENABLE] = FALSE; rs[WINED3D_RS_STENCILENABLE] = FALSE; rs[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 335d502ab0b..004c33f8ea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4919,7 +4919,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_FOGEND); D3DSTATE_TO_STR(WINED3D_RS_FOGDENSITY); D3DSTATE_TO_STR(WINED3D_RS_STIPPLEENABLE); - D3DSTATE_TO_STR(WINED3D_RS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3D_RS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3D_RS_MIPMAPLODBIAS); D3DSTATE_TO_STR(WINED3D_RS_RANGEFOGENABLE); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3b41896e4..d3eb8100cd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -310,7 +310,6 @@ enum wined3d_render_state WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, WINED3D_RS_STIPPLEENABLE = 39, - WINED3D_RS_EDGEANTIALIAS = 40, WINED3D_RS_COLORKEYENABLE = 41, WINED3D_RS_MIPMAPLODBIAS = 46, WINED3D_RS_RANGEFOGENABLE = 48, @@ -1209,7 +1208,6 @@ enum wined3d_shader_type #define WINED3DPRASTERCAPS_STIPPLE 0x00000200 #define WINED3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 #define WINED3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 -#define WINED3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 #define WINED3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 #define WINED3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 #define WINED3DPRASTERCAPS_FOGRANGE 0x00010000 -- 2.24.0

2 5

[PATCH v2] wined3d: Use GL_APPLE_rgb_422 for UYVY and YUY2 surfaces.
by Chip Davis 16 Apr '20

16 Apr '20

Theoretically, we could use it to support UYVY and YUY2 *textures* as well, but it would still require converting from YUV to RGB after sampling. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v2: Use a new complex fixup type for this. Get rid of ARBfp support; ARBfp and APPLE_rgb_422 are only seen together on legacy contexts, which will support APPLE_ycbcr_422 anyway. --- dlls/wined3d/glsl_shader.c | 11 +++++++++++ dlls/wined3d/utils.c | 19 ++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7feff85efb..91b3e141fe2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12713,6 +12713,15 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe gen_nv12_read(buffer, gl_info, tex_type); break; + case COMPLEX_FIXUP_YUV: + /* With APPLE_rgb_422, things are much simpler. The only thing we have to do here + * is YUV-RGB conversion. */ + shader_addline(buffer, " vec3 yuv = vec3(texture%s(sampler, out_texcoord.xy));\n", + needs_legacy_glsl_syntax(gl_info) ? tex_type : ""); + shader_addline(buffer, " luminance = yuv.y;\n"); + shader_addline(buffer, " chroma = yuv.xz;\n"); + break; + default: FIXME("Unsupported fixup %#x.\n", complex_fixup); string_buffer_free(buffer); @@ -12836,6 +12845,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: glsl_blitter_generate_yuv_shader(buffer, gl_info, args, output->buffer, tex_type, swizzle); break; case COMPLEX_FIXUP_NONE: @@ -13183,6 +13193,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YV12: case COMPLEX_FIXUP_NV12: + case COMPLEX_FIXUP_YUV: src_level = src_sub_resource_idx % src_texture->level_count; location = GL_EXTCALL(glGetUniformLocation(program->id, "size")); GL_EXTCALL(glUniform2f(location, wined3d_texture_get_level_pow2_width(src_texture, src_level), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dec7eecd7ee..a906188a605 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1320,6 +1320,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_UYVY, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_UYVY, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -1332,6 +1336,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, + {WINED3DFMT_YUY2, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_YUY2, GL_RGB, GL_RGB, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, @@ -3575,7 +3583,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->f.color_fixup = create_color_fixup_desc_from_string(fixups[i].fixup); } - if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] + if (!gl_info->supported[APPLE_YCBCR_422] && !gl_info->supported[APPLE_RGB_422] + && (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); @@ -3584,6 +3593,14 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } + else if (!gl_info->supported[APPLE_YCBCR_422] && gl_info->supported[APPLE_RGB_422]) + { + format = get_format_gl_internal(adapter, WINED3DFMT_YUY2); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + + format = get_format_gl_internal(adapter, WINED3DFMT_UYVY); + format->f.color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUV); + } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8c7e8ac276..0253aaef3a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -153,6 +153,7 @@ enum complex_fixup COMPLEX_FIXUP_YV12 = 3, COMPLEX_FIXUP_P8 = 4, COMPLEX_FIXUP_NV12 = 5, + COMPLEX_FIXUP_YUV = 6, }; #include <pshpack2.h> -- 2.24.0

2 1

[PATCH 2/2] winecfg: Add /? parameter to print help and valid versions.
by Owen Rudge 16 Apr '20

16 Apr '20

Implements a '/?' parameter to winecfg displaying help and valid Windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41559 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- programs/winecfg/appdefaults.c | 10 ++++++++++ programs/winecfg/main.c | 15 +++++++++++++++ programs/winecfg/winecfg.h | 1 + 3 files changed, 26 insertions(+)

1 0

[PATCH 1/2] winecfg: Add support for '/v' parameter allowing Windows version to be changed.
by Owen Rudge 16 Apr '20

16 Apr '20

Implements support for a '/v' parameter to winecfg allowing the Windows version to be changed using the same logic as the winecfg UI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41559 Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- programs/winecfg/appdefaults.c | 101 +++++++++++++++++++++------------ programs/winecfg/main.c | 38 ++++++++----- programs/winecfg/winecfg.h | 3 + 3 files changed, 91 insertions(+), 51 deletions(-)

1 0

[PATCH 01/13] qedit: Implement MediaDet_get_StreamType.
by Gabriel Ivăncescu 16 Apr '20

16 Apr '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/qedit/mediadet.c | 17 +++++++++++++++-- dlls/qedit/tests/mediadet.c | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index ecfafc4..a6b52c0 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -283,8 +283,21 @@ static HRESULT WINAPI MediaDet_put_CurrentStream(IMediaDet* iface, LONG newVal) static HRESULT WINAPI MediaDet_get_StreamType(IMediaDet* iface, GUID *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%s): not implemented!\n", This, debugstr_guid(pVal)); - return E_NOTIMPL; + AM_MEDIA_TYPE mt; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, pVal); + + if (!pVal) + return E_POINTER; + + hr = IMediaDet_get_StreamMediaType(&This->IMediaDet_iface, &mt); + if (FAILED(hr)) + return hr; + CoTaskMemFree(mt.pbFormat); + + *pVal = mt.majortype; + return hr; } static HRESULT WINAPI MediaDet_get_StreamTypeB(IMediaDet* iface, BSTR *pVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 65f5af7..c92c187 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -192,6 +192,7 @@ static void test_mediadet(void) BSTR filename = NULL; LONG nstrms = 0; LONG strm; + GUID guid; AM_MEDIA_TYPE mt; double fps; int flags; @@ -242,6 +243,12 @@ static void test_mediadet(void) hr = IMediaDet_get_StreamMediaType(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == E_INVALIDARG, "IMediaDet_get_StreamType failed: %08x\n", hr); + + hr = IMediaDet_get_StreamType(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_StreamType failed: %08x\n", hr); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename failed: %08x\n", hr); @@ -258,6 +265,10 @@ static void test_mediadet(void) ok(hr == S_OK, "IMediaDet_get_StreamMediaType failed: %08x\n", hr); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + /* Even before get_OutputStreams. */ hr = IMediaDet_put_CurrentStream(pM, 1); ok(hr == E_INVALIDARG, "IMediaDet_put_CurrentStream failed: %08x\n", hr); @@ -311,6 +322,10 @@ static void test_mediadet(void) "IMediaDet_get_StreamMediaType\n"); CoTaskMemFree(mt.pbFormat); + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Video), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, NULL); ok(hr == E_POINTER, "IMediaDet_get_FrameRate failed: %08x\n", hr); @@ -370,6 +385,10 @@ static void test_mediadet(void) if (IsEqualGUID(&mt.majortype, &MEDIATYPE_Audio)) { + hr = IMediaDet_get_StreamType(pM, &guid); + ok(hr == S_OK, "IMediaDet_get_StreamType failed: %08x\n", hr); + ok(IsEqualGUID(&guid, &MEDIATYPE_Audio), "Wrong GUID %s\n", wine_dbgstr_guid(&guid)); + hr = IMediaDet_get_FrameRate(pM, &fps); ok(hr == VFW_E_INVALIDMEDIATYPE, "IMediaDet_get_FrameRate failed: %08x\n", hr); } -- 2.21.0

1 12

[PATCH 1/3] dxgi: Improve d3d12_swapchain_CheckColorSpaceSupport stub.
by Philip Rebohle 16 Apr '20

16 Apr '20

Monster Hunter World needs this function to succeed. This behaves correctly under the assumption that the system has no HDR support, and only reports standard sRGB as supported. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- dlls/dxgi/swapchain.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7d15b4d48d..7a680a28e9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2684,10 +2684,19 @@ static UINT STDMETHODCALLTYPE d3d12_swapchain_GetCurrentBackBufferIndex(IDXGISwa static HRESULT STDMETHODCALLTYPE d3d12_swapchain_CheckColorSpaceSupport(IDXGISwapChain3 *iface, DXGI_COLOR_SPACE_TYPE colour_space, UINT *colour_space_support) { - FIXME("iface %p, colour_space %#x, colour_space_support %p stub!\n", + UINT support_flags = 0; + + FIXME("iface %p, colour_space %#x, colour_space_support %p semi-stub!\n", iface, colour_space, colour_space_support); - return E_NOTIMPL; + if (!colour_space_support) + return E_INVALIDARG; + + if (colour_space == DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709) + support_flags |= DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT; + + *colour_space_support = support_flags; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_SetColorSpace1(IDXGISwapChain3 *iface, -- 2.26.0

2 3

[PATCH] mf: Validate new current type set for sample grabber.
by Nikolay Sivov 16 Apr '20

16 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 24 ++++++++++++++---------- dlls/mf/tests/mf.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 205298501d..062e8ea173 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -599,15 +599,11 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, - IMFMediaType *in_type, IMFMediaType **out_type) +static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber_stream *stream, IMFMediaType *in_type) { - struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; DWORD flags; - TRACE("%p, %p, %p.\n", iface, in_type, out_type); - if (!stream->sink) return MF_E_STREAMSINK_REMOVED; @@ -620,6 +616,16 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IM return (flags & supported_flags) == supported_flags ? S_OK : MF_E_INVALIDMEDIATYPE; } +static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + return sample_grabber_stream_is_media_type_supported(stream, in_type); +} + static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { TRACE("%p, %p.\n", iface, count); @@ -647,14 +653,12 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF IMFMediaType *media_type) { struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, media_type); - if (!media_type) - return E_POINTER; - - if (!stream->sink) - return MF_E_STREAMSINK_REMOVED; + if (FAILED(hr = sample_grabber_stream_is_media_type_supported(stream, media_type))) + return hr; IMFMediaType_Release(stream->sink->media_type); stream->sink->media_type = media_type; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dd6c935b8c..8933ea717c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2000,14 +2000,20 @@ static void test_sample_grabber(void) hr = MFCreateSampleGrabberSinkActivate(NULL, &grabber_callback, &activate); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); - ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); - hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + EXPECT_REF(media_type, 1); + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + EXPECT_REF(media_type, 2); + + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); @@ -2136,11 +2142,27 @@ static void test_sample_grabber(void) hr = MFCreateMediaType(&media_type2); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_Float); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); IMFMediaType_Release(media_type); @@ -2242,6 +2264,9 @@ static void test_sample_grabber(void) hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); -- 2.25.1

1 0

[PATCH v2 1/5] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

v2: Fix compilation without LDAP. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 64 ++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 13 +++++++ 2 files changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..f9b3de77b3 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -277,11 +277,69 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop return NULL; } -PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope, +PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); +#ifdef HAVE_LDAP + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (base) + { + search->base = strWtoU( base ); + if (!search->base) goto fail; + } + if (filter) + { + search->filter = strWtoU( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarrayWtoU( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controlWtoU( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarrayWtoU( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); +#endif return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..442b4a884a 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,20 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; +#ifdef HAVE_LDAP +typedef struct ldapsearch +{ + char *base, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControl **serverctrls; + LDAPControl **clientctrls; + struct timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; +#else typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +#endif typedef struct ldapsortkeyA { -- 2.25.2

1 1

[PATCH v2 5/5] adsldp: Add support for paged search.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 56 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c2f7ca8023..b532b95fe5 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -409,6 +409,7 @@ typedef struct struct ldap_search_context { + LDAPSearch *page; LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; @@ -1329,12 +1330,26 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte ctrls = ctrls_a; } - err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + if (ldap->search.pagesize) + { + ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, + filter, props, ldap->search.attribtypes_only, + ctrls, NULL, 0, 0, NULL); + if (ldap_ctx->page) + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, + ldap->search.pagesize, &count, &ldap_ctx->res); + else + err = LDAP_NO_MEMORY; + } + else + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { TRACE("ldap_search_sW error %#x\n", err); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); heap_free(ldap_ctx); return HRESULT_FROM_WIN32(map_ldap_error(err)); } @@ -1384,11 +1399,42 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND else { if (ldap_ctx->pos >= ldap_ctx->count) + { + if (ldap_ctx->page) + { + ULONG err, count; + + ldap_msgfree(ldap_ctx->res); + ldap_ctx->res = NULL; + + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); + if (err == LDAP_SUCCESS) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + goto exit; + } + + if (err != LDAP_NO_RESULTS_RETURNED) + { + TRACE("ldap_get_next_page_s error %#x\n", err); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + /* fall through */ + } + return S_ADS_NOMORE_ROWS; + } ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } +exit: if (!ldap_ctx->entry) return S_ADS_NOMORE_ROWS; @@ -1782,13 +1828,17 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); struct ldap_search_context *ldap_ctx = res; TRACE("%p,%p\n", iface, res); if (!res) return E_ADS_BAD_PARAMETER; - ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); + if (ldap_ctx->res) + ldap_msgfree(ldap_ctx->res); return S_OK; } -- 2.25.2

1 0

[PATCH v2 4/5] wldap32: Implement ldap_get_next_page_s.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f2501e0498..40cb03537e 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -175,10 +175,37 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, struct l_timeval *timeout, ULONG pagesize, ULONG *count, WLDAP32_LDAPMessage **results ) { - FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, +#ifdef HAVE_LDAP + ULONG ret; + + TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + if (!ld || !search || !count || !results) return ~0u; - if (!ld) return ~0u; + if (search->cookie && search->cookie->bv_len == 0) + { + /* end of paged results */ + return WLDAP32_LDAP_NO_RESULTS_RETURNED; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_control( ld->ld, pagesize, search->cookie, 1, &search->serverctrls[0] ); + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + if (ret != LDAP_SUCCESS) return map_error( ret ); + + ret = ldap_search_ext_s( ld->ld, search->base, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; } -- 2.25.2

1 0

[PATCH v2 3/5] wldap32: Implement ldap_get_paged_count.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 46 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 2709e126ab..f2501e0498 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +#ifdef HAVE_LDAP +static struct berval null_cookie = { 0, NULL }; +#endif + /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) * @@ -77,7 +81,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, LDAPControlW *ctrl; BerElement *ber; ber_tag_t tag; - struct berval *berval, null_cookie = { 0, NULL }; + struct berval *berval; INT ret, len; char *val; @@ -181,15 +185,43 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG *count, WLDAP32_LDAPMessage *results ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results ); + ULONG ret; + LDAPControl **server_ctrls, *page_ctrl = NULL; + struct berval cookie; + + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; + + server_ctrls = NULL; + ret = ldap_parse_result( ld->ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (server_ctrls) + page_ctrl = ldap_control_find( LDAP_CONTROL_PAGEDRESULTS, server_ctrls, NULL ); + + if (!page_ctrl) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + ret = ldap_parse_pageresponse_control( ld->ld, page_ctrl, (int *)count, &cookie ); + if (ret == LDAP_SUCCESS) + { + TRACE("new search->cookie: %s, count %u\n", debugstr_an(cookie.bv_val, cookie.bv_len), *count); + search->cookie = ber_bvdup( &cookie ); + } + + ldap_controls_free( server_ctrls ); + + return map_error( ret ); #endif - return ret; + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -272,7 +304,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) strarrayfreeU( search->attrs ); controlarrayfreeU( search->serverctrls ); controlarrayfreeU( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search ); -- 2.25.2

1 0

[PATCH v2 2/5] wldap32: Implement ldap_search_abandon_page.
by Dmitry Timoshkov 16 Apr '20

16 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f9b3de77b3..2709e126ab 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,10 +262,25 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) { - FIXME( "(%p, %p)\n", ld, search ); +#ifdef HAVE_LDAP + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeU( search->base ); + strfreeU( search->filter ); + strarrayfreeU( search->attrs ); + controlarrayfreeU( search->serverctrls ); + controlarrayfreeU( search->clientctrls ); + if (search->cookie) + ber_bvfree( search->cookie ); + heap_free( search ); - if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; + +#else + return WLDAP32_LDAP_NOT_SUPPORTED; +#endif } PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scope, -- 2.25.2

1 0

[PATCH 1/3] devenum: Ignore the "left" parameter to IMoniker::BindToObject().
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 88 ++++++++++++++++-------------------- dlls/devenum/tests/devenum.c | 11 ++++- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 15e5c9642cb..b03b17f945a 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -377,73 +377,63 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz return S_OK; } -static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, - IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) +static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *bind_ctx, + IMoniker *left, REFIID iid, void **out) { - struct moniker *This = impl_from_IMoniker(iface); - IUnknown * pObj = NULL; - IPropertyBag * pProp = NULL; - CLSID clsID; + struct moniker *moniker = impl_from_IMoniker(iface); + IPersistPropertyBag *persist_bag; + IPropertyBag *prop_bag; + IUnknown *unk; + CLSID clsid; VARIANT var; - HRESULT res = E_FAIL; + HRESULT hr; - TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); + TRACE("moniker %p, bind_ctx %p, left %p, iid %s, out %p.\n", + moniker, bind_ctx, left, debugstr_guid(iid), out); - if (!ppvResult) + if (!out) return E_POINTER; VariantInit(&var); - *ppvResult = NULL; + *out = NULL; - if(pmkToLeft==NULL) + if (FAILED(hr = IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + return hr; + + V_VT(&var) = VT_BSTR; + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL))) { - /* first activation of this class */ - LPVOID pvptr; - res=IMoniker_BindToStorage(iface, NULL, NULL, &IID_IPropertyBag, &pvptr); - pProp = pvptr; - if (SUCCEEDED(res)) - { - V_VT(&var) = VT_BSTR; - res = IPropertyBag_Read(pProp, clsidW, &var, NULL); - } - if (SUCCEEDED(res)) - { - res = CLSIDFromString(V_BSTR(&var), &clsID); - VariantClear(&var); - } - if (SUCCEEDED(res)) - { - res=CoCreateInstance(&clsID,NULL,CLSCTX_ALL,&IID_IUnknown,&pvptr); - pObj = pvptr; - } + IPropertyBag_Release(prop_bag); + return hr; } - if (pObj!=NULL) + hr = CLSIDFromString(V_BSTR(&var), &clsid); + VariantClear(&var); + if (FAILED(hr)) { - /* get the requested interface from the loaded class */ - res = S_OK; - if (pProp) { - HRESULT res2; - LPVOID ppv = NULL; - res2 = IUnknown_QueryInterface(pObj, &IID_IPersistPropertyBag, &ppv); - if (SUCCEEDED(res2)) { - res = IPersistPropertyBag_Load((IPersistPropertyBag *) ppv, pProp, NULL); - IPersistPropertyBag_Release((IPersistPropertyBag *) ppv); - } - } - if (SUCCEEDED(res)) - res= IUnknown_QueryInterface(pObj,riidResult,ppvResult); - IUnknown_Release(pObj); + IPropertyBag_Release(prop_bag); + return hr; } - if (pProp) + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&unk))) { - IPropertyBag_Release(pProp); + IPropertyBag_Release(prop_bag); + return hr; + } + + if (SUCCEEDED(IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void **)&persist_bag))) + { + hr = IPersistPropertyBag_Load(persist_bag, prop_bag, NULL); + IPersistPropertyBag_Release(persist_bag); } - TRACE("<- 0x%x\n", res); + if (SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(unk, iid, out); - return res; + IUnknown_Release(unk); + IPropertyBag_Release(prop_bag); + + return hr; } static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 01e6be98da7..4bdd2b46e82 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -46,8 +46,9 @@ static void test_devenum(void) GUID cat_guid, clsid; WCHAR *displayname; IBindCtx *bindctx; + HRESULT hr, hr2; + IUnknown *unk; VARIANT var; - HRESULT hr; int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -114,6 +115,14 @@ static void test_devenum(void) hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) + IUnknown_Release(unk); + hr2 = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, (void **)&unk); + if (hr2 == S_OK) + IUnknown_Release(unk); + ok(hr2 == hr, "Expected hr %#x, got %#x.\n", hr, hr2); + hr = CreateBindCtx(0, &bindctx); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); -- 2.26.0

2 4

[PATCH 1/2] winegstreamer: Remove some unused imports.
by Zebediah Figura 16 Apr '20

16 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 2364ac84dc5..097edf273f5 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,5 +1,5 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid ole32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) PARENTSRC = ../strmbase -- 2.26.0

1 1

[PATCH] winapi_test: Remove useless winbase.h for wininet test, in tests.dat.
by Serge Gautherie 16 Apr '20

16 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..ba2850b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1594,7 +1594,6 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h wininet.h %include -- 2.10.0.windows.1

1 0

[PATCH] oledb32: Remove redundant NULL check before CoTaskMemFree()
by Michael Stefaniuc 15 Apr '20

15 Apr '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/dslocator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 8a7f2d134c..86a334bea0 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -72,8 +72,7 @@ static void destroy_datasource(struct datasource *data) CoTaskMemFree(data->propinfoset->rgPropertyInfos); CoTaskMemFree(data->propinfoset); } - if (data->description) - CoTaskMemFree(data->description); + CoTaskMemFree(data->description); if (data->provider) IDBProperties_Release(data->provider); -- 2.25.2

1 0

[PATCH 2/2] winegcc: Reorder DECLSPEC_NORETURN on error().
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winegcc/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 3d6b8f3..8ec6b8e 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -52,7 +52,7 @@ enum target_platform PLATFORM_CYGWIN }; -void error(const char* s, ...) DECLSPEC_NORETURN; +DECLSPEC_NORETURN void error(const char* s, ...); void* xmalloc(size_t size); void* xrealloc(void* p, size_t size); -- 2.10.0.windows.1

1 0

[PATCH 1/2] ntdll: Reorder DECLSPEC_NORETURN on raise_status().
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ntdll/ntdll_misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f18ab1f..0744e5a 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -60,7 +60,7 @@ extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void wait_suspend( CONTEXT *context ) DECLSPEC_HIDDEN; extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) DECLSPEC_HIDDEN; extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_NORETURN DECLSPEC_HIDDEN; +DECLSPEC_NORETURN extern void raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; extern NTSTATUS context_to_server( context_t *to, const CONTEXT *from ) DECLSPEC_HIDDEN; extern NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) DECLSPEC_HIDDEN; extern NTSTATUS set_thread_context( HANDLE handle, const context_t *context, BOOL *self ) DECLSPEC_HIDDEN; -- 2.10.0.windows.1

1 0

[PATCH 1/5] wldap32: Implement ldap_search_init_pageW.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 62 ++++++++++++++++++++++++++++++++-- dlls/wldap32/winldap_private.h | 11 +++++- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 7cf7d93245..27a8156e51 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -277,11 +277,67 @@ PLDAPSearch CDECL ldap_search_init_pageA( WLDAP32_LDAP *ld, PCHAR dn, ULONG scop return NULL; } -PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR dn, ULONG scope, +PLDAPSearch CDECL ldap_search_init_pageW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, PWCHAR filter, PWCHAR attrs[], ULONG attrsonly, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG timelimit, ULONG sizelimit, PLDAPSortKeyW *sortkeys ) { - FIXME( "(%p, %s, 0x%08x, %s, %p, 0x%08x)\n", ld, debugstr_w(dn), - scope, debugstr_w(filter), attrs, attrsonly ); + LDAPSearch *search; + DWORD i, len; + + TRACE( "(%p, %s, 0x%08x, %s, %p, 0x%08x, %p, %p, 0x%08x, 0x%08x, %p)\n", + ld, debugstr_w(base), scope, debugstr_w(filter), attrs, attrsonly, + serverctrls, clientctrls, timelimit, sizelimit, sortkeys ); + + search = heap_alloc_zero( sizeof(*search) ); + if (!search) + { + ld->ld_errno = WLDAP32_LDAP_NO_MEMORY; + return NULL; + } + + if (base) + { + search->base = strWtoU( base ); + if (!search->base) goto fail; + } + if (filter) + { + search->filter = strWtoU( filter ); + if (!search->filter) goto fail; + } + if (attrs) + { + search->attrs = strarrayWtoU( attrs ); + if (!search->attrs) goto fail; + } + + len = serverctrls ? controlarraylenW( serverctrls ) : 0; + search->serverctrls = heap_alloc( sizeof(LDAPControl *) * (len + 2) ); + if (!search->serverctrls) goto fail; + search->serverctrls[0] = NULL; /* reserve 0 for page control */ + for (i = 0; i < len; i++) + { + search->serverctrls[i + 1] = controlWtoU( serverctrls[i] ); + if (!search->serverctrls[i + 1]) goto fail; + } + search->serverctrls[len + 1] = NULL; + + if (clientctrls) + { + search->clientctrls = controlarrayWtoU( clientctrls ); + if (!search->clientctrls) goto fail; + } + + search->scope = scope; + search->attrsonly = attrsonly; + search->timeout.tv_sec = timelimit; + search->timeout.tv_usec = 0; + search->sizelimit = sizelimit; + search->cookie = NULL; + + return search; + +fail: + ldap_search_abandon_page( ld, search ); return NULL; } diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 30c12a909c..7145260aca 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -234,7 +234,16 @@ typedef struct WLDAP32_ldapvlvinfo VOID *ldvlv_extradata; } WLDAP32_LDAPVLVInfo, *WLDAP32_PLDAPVLVInfo; -typedef struct ldapsearch LDAPSearch, *PLDAPSearch; +typedef struct ldapsearch +{ + char *base, *filter, **attrs; + ULONG scope, attrsonly; + LDAPControl **serverctrls; + LDAPControl **clientctrls; + struct timeval timeout; + ULONG sizelimit; + struct berval *cookie; +} LDAPSearch, *PLDAPSearch; typedef struct ldapsortkeyA { -- 2.25.2

2 1

[PATCH 0/6] dxgi: Implement waitable swap chain for D3D12.
by Philip Rebohle 15 Apr '20

15 Apr '20

This series implements DXGI 1.3 frame latency events for D3D12 swap chains, which is used by Resident Evil 2/3, and is required for Monster Hunter World. The implementation just signals a D3D12 fence after presenting, and uses its SetEventOnCompletion function to signal the event, which doesn't necessarily happen after the Vulkan present operation has finished on the GPU, but will always happen after the command buffer that blits the back buffer to the Vulkan swap chain image has finished execution, so it should be good enough, since the D3D12 app does not have direct access to the Vulkan swap chain. - Philip

2 8

[PATCH] winnt.h: Add __readgsqword declaration.
by Jacek Caban 15 Apr '20

15 Apr '20

pragma intrinsic is meant only as an addition to C declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 3/3] winapi_test: Remove 1 MIDL_STUB_MESSAGE field exclusion, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Revert 5c033dad7991375a3d5c9abe92d454e7c9d56f77. NB: Wine never renamed this field... PSDK S03R2 and SDK 10.0.16299.0 have it. --- dlls/rpcrt4/tests/generated.c | 6 ++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index a111bb0..7dd5968 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -623,6 +623,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 97) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 98) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 104) @@ -1481,6 +1484,9 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags, 1) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, UniquePtrCount, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, UniquePtrCount, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, MaxCount, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, MaxCount, 60) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 9396536..215249b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount +MIDL_STUB_MESSAGE MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

1 0

[PATCH 2/3] winapi_test: Remove 3 MIDL_STUB_MESSAGE field exclusions, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 52911fc66c53816d7df1b417ca50ec25e24f9e88. --- dlls/rpcrt4/tests/generated.c | 18 ++++++++++++++++++ tools/winapi/tests.dat | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 72672cd..a111bb0 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -593,6 +593,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 8) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 48) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 56) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 57) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 58) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 60) @@ -1442,6 +1451,15 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Memory, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Memory, 28) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, IsClient, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, IsClient, 32) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, Pad, 1) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, Pad, 33) + TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, uFlags2, 2) + TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, uFlags2, 34) TEST_FIELD_SIZE (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_ALIGN (MIDL_STUB_MESSAGE, ReuseBuffer, 4) TEST_FIELD_OFFSET(MIDL_STUB_MESSAGE, ReuseBuffer, 36) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 5b2be4b..9396536 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -967,7 +967,7 @@ MALLOC_FREE_STRUCT MIDL_FORMAT_STRING MIDL_SERVER_INFO MIDL_STUB_DESC -MIDL_STUB_MESSAGE: !UniquePtrCount !IsClient !Pad !uFlags2 +MIDL_STUB_MESSAGE: !UniquePtrCount MIDL_STUBLESS_PROXY_INFO MIDL_SYNTAX_INFO NDR_CCONTEXT -- 2.10.0.windows.1

1 0

[PATCH 1/3] winapi_test: Add common headers for rpcrt4 test, in tests.dat.
by Serge Gautherie 15 Apr '20

15 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 02236f06a813a42a08fda5e40a97ba07fae9a712. --- tools/winapi/tests.dat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..5b2be4b 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -928,6 +930,10 @@ Unit tests for data structure packing %header +basetsd.h +winnt.h +windef.h + rpc.h rpcdce.h rpcdcep.h @@ -1050,6 +1056,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1230,6 +1237,7 @@ basetsd.h winnt.h windef.h wtypes.h + shlwapi.h %include @@ -1264,6 +1272,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + urlmon.h %include @@ -1321,6 +1330,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1595,6 +1605,7 @@ basetsd.h winnt.h windef.h winbase.h + wininet.h %include @@ -1736,6 +1747,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h -- 2.10.0.windows.1

1 0

[PATCH] include: Fix DECLSPEC_NORETURN usage.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/eh.h | 4 ++-- include/msvcrt/process.h | 10 +++++----- include/msvcrt/stdlib.h | 8 ++++---- include/wine/exception.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-)

1 0

[PATCH 2/2] windowscodecs: Implement stub for DdsDecoder.
by Ziqing Hui 15 Apr '20

15 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/ddsformat.c | 227 ++++++++++++++++++ dlls/windowscodecs/regsvr.c | 23 ++ dlls/windowscodecs/tests/ddsformat.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 7 files changed, 262 insertions(+), 2 deletions(-) create mode 100644 dlls/windowscodecs/ddsformat.c

3 2

[PATCH 1/2] windowscodecs/tests: Add tests for DDS format.
by Ziqing Hui 15 Apr '20

15 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/ddsformat.c | 121 +++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 dlls/windowscodecs/tests/ddsformat.c

2 1

[PATCH v2 1/6] wineusb.sys: New stub driver.
by Zebediah Figura 15 Apr '20

15 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Actually disable wineusb.sys when libusb is missing. configure.ac | 14 +++++++ dlls/wineusb.sys/Makefile.in | 8 ++++ dlls/wineusb.sys/wineusb.c | 61 +++++++++++++++++++++++++++++++ dlls/wineusb.sys/wineusb.sys.spec | 1 + loader/wine.inf.in | 2 + 5 files changed, 86 insertions(+) create mode 100644 dlls/wineusb.sys/Makefile.in create mode 100644 dlls/wineusb.sys/wineusb.c create mode 100644 dlls/wineusb.sys/wineusb.sys.spec diff --git a/configure.ac b/configure.ac index 862745ef62..b8d70b6fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)])) AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwind library (exception handling)])) +AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb library])) AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)])) AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)])) AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan])) @@ -1474,6 +1475,18 @@ fi WINE_NOTICE_WITH(sane,[test "x$ac_cv_lib_soname_sane" = "x"], [libsane ${notice_platform}development files not found, scanners won't be supported.]) +dnl **** Check for libusb **** +if test "x$with_usb" != "xno" +then + WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,, + [AC_CHECK_HEADER([libusb.h], + [AC_CHECK_LIB(usb-1.0,libusb_init,[:],[USB_LIBS=""],[$USB_LIBS])], + [USB_LIBS=""])]) +fi +WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_init" != "yes"], + [libusb-1.0 ${notice_platform}development files not found, USB devices won't be supported.], + [enable_wineusb_sys]) + dnl **** Check for libv4l2 **** if test "x$with_v4l2" != "xno" then @@ -3781,6 +3794,7 @@ WINE_CONFIG_MAKEFILE(dlls/wineps.drv) WINE_CONFIG_MAKEFILE(dlls/wineps16.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winepulse.drv) WINE_CONFIG_MAKEFILE(dlls/wineqtdecoder) +WINE_CONFIG_MAKEFILE(dlls/wineusb.sys) WINE_CONFIG_MAKEFILE(dlls/winevulkan) WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) diff --git a/dlls/wineusb.sys/Makefile.in b/dlls/wineusb.sys/Makefile.in new file mode 100644 index 0000000000..bac79f668e --- /dev/null +++ b/dlls/wineusb.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = wineusb.sys +IMPORTS = ntoskrnl +EXTRALIBS = $(USB_LIBS) +EXTRAINCL = $(USB_CFLAGS) +EXTRADLLFLAGS = -Wl,--subsystem,native + +C_SRCS = \ + wineusb.c diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c new file mode 100644 index 0000000000..b26f1036d8 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.c @@ -0,0 +1,61 @@ +/* + * USB root device enumerator using libusb + * + * Copyright 2020 Zebediah Figura + * + * 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 <assert.h> +#include <stdarg.h> +#include <stdlib.h> +#include <libusb.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winioctl.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "ddk/usb.h" +#include "ddk/usbioctl.h" +#include "wine/asm.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wineusb); + +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + libusb_exit(NULL); +} + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + int err; + + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + if ((err = libusb_init(NULL))) + { + ERR("Failed to initialize libusb: %s\n", libusb_strerror(err)); + return STATUS_UNSUCCESSFUL; + } + + driver->DriverUnload = driver_unload; + + return STATUS_SUCCESS; +} diff --git a/dlls/wineusb.sys/wineusb.sys.spec b/dlls/wineusb.sys/wineusb.sys.spec new file mode 100644 index 0000000000..76421d7e35 --- /dev/null +++ b/dlls/wineusb.sys/wineusb.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d321c4c826..e1546713db 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2614,6 +2614,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,tdi.sys,- 12,,winebus.sys,- 12,,winehid.sys,- +12,,wineusb.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2665,6 +2666,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,tdi.sys 12,,winebus.sys 12,,winehid.sys +12,,wineusb.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- -- 2.26.0

1 5

[PATCH] mfplat: Fix subtype test condition for MFInitMediaTypeFromWaveFormatEx().
by Nikolay Sivov 15 Apr '20

15 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index ddbffd5441..620e144d34 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2128,7 +2128,7 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (format->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &wfex->SubFormat, &hr); + memcpy(&subtype, &wfex->SubFormat, sizeof(subtype)); if (wfex->dwChannelMask) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, wfex->dwChannelMask, &hr); @@ -2140,10 +2140,10 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA { memcpy(&subtype, &MFAudioFormat_Base, sizeof(subtype)); subtype.Data1 = format->wFormatTag; - mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); mediatype_set_uint32(mediatype, &MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1, &hr); } + mediatype_set_guid(mediatype, &MF_MT_SUBTYPE, &subtype, &hr); if (format->nChannels) mediatype_set_uint32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, format->nChannels, &hr); -- 2.25.1

1 0

[PATCH] schedsvc/tests: Fix compilation with recent gcc/clang versions.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/tests/atsvcapi.c | 6 +++--- dlls/schedsvc/tests/rpcapi.c | 6 +++--- dlls/taskschd/task.c | 4 ++-- include/wine/atsvc.idl | 2 +- include/wine/schrpc.idl | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index d7d48a122c..f10c9d0723 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -31,7 +31,7 @@ #define JOB_ADD_CURRENT_DATE 0x08 #define JOB_NONINTERACTIVE 0x10 -extern handle_t rpc_handle; +extern handle_t atsvc_handle; static int test_failures, test_skipped; @@ -69,7 +69,7 @@ START_TEST(atsvcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -173,7 +173,7 @@ skip_tests_delete: skip_tests: SetUnhandledExceptionFilter(old_exception_filter); - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&atsvc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 9d9557fe1c..b791a047dc 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -25,7 +25,7 @@ #include "wine/test.h" -extern handle_t rpc_handle; +extern handle_t schrpc_handle; static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) { @@ -103,7 +103,7 @@ START_TEST(rpcapi) hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); - hr = RpcBindingFromStringBindingA(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingA(binding_str, &schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFromStringBinding error %#x\n", hr); hr = RpcStringFreeA(&binding_str); ok(hr == RPC_S_OK, "RpcStringFree error %#x\n", hr); @@ -537,7 +537,7 @@ todo_wine MIDL_user_free(path); } - hr = RpcBindingFree(&rpc_handle); + hr = RpcBindingFree(&schrpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); } diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index b75cfff8af..8d81a18b3f 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3843,7 +3843,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V DWORD len; HRESULT hr; RPC_WSTR binding_str; - extern handle_t rpc_handle; + extern handle_t schrpc_handle; TRACE("%p,%s,%s,%s,%s\n", iface, debugstr_variant(&server), debugstr_variant(&user), debugstr_variant(&domain), debugstr_variant(&password)); @@ -3882,7 +3882,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V hr = RpcStringBindingComposeW(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); if (hr != RPC_S_OK) return hr; - hr = RpcBindingFromStringBindingW(binding_str, &rpc_handle); + hr = RpcBindingFromStringBindingW(binding_str, &schrpc_handle); RpcStringFreeW(&binding_str); if (hr != RPC_S_OK) return hr; diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index e95e6cf110..5e7121d016 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -23,7 +23,7 @@ import "ocidl.idl"; [ uuid(1ff70682-0a51-30e8-076d-740be8cee98b), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t atsvc_handle), version(1.0), pointer_default(unique) ] diff --git a/include/wine/schrpc.idl b/include/wine/schrpc.idl index 4af709d8dd..944f283081 100644 --- a/include/wine/schrpc.idl +++ b/include/wine/schrpc.idl @@ -26,7 +26,7 @@ import "ocidl.idl"; [ uuid(86d35949-83c9-4044-b424-db363231fd0c), - implicit_handle(handle_t rpc_handle), + implicit_handle(handle_t schrpc_handle), version(1.0), pointer_default(unique) ] -- 2.25.2

1 0

[PATCH v3 1/2] dinput: Block Acquire() until hooks are installed to prevent input being lost.
by Brendan Shanks 15 Apr '20

15 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v3: Resending, looked like a testbot hiccup caused test failures last time. dlls/dinput/dinput_main.c | 15 ++++++++++++--- dlls/dinput8/tests/device.c | 3 --- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0855cb41cd..d70e9c86f2 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1717,10 +1717,11 @@ static DWORD WINAPI hook_thread_proc(void *param) if (msg.message == WM_USER+0x10) { IDirectInputImpl *dinput; + HANDLE finished_event = (HANDLE)msg.lParam; - TRACE( "Processing hook change notification lp:%ld\n", msg.lParam ); + TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); - if (!msg.wParam && !msg.lParam) + if (!msg.wParam) { if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); @@ -1765,6 +1766,9 @@ static DWORD WINAPI hook_thread_proc(void *param) UnhookWindowsHookEx( mouse_hook ); mouse_hook = NULL; } + + if (finished_event) + SetEvent(finished_event); } TranslateMessage(&msg); DispatchMessageW(&msg); @@ -1824,6 +1828,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) static HHOOK callwndproc_hook; static ULONG foreground_cnt; IDirectInputDeviceImpl *dev = impl_from_IDirectInputDevice8W(iface); + HANDLE hook_change_finished_event; EnterCriticalSection(&dinput_hook_crit); @@ -1851,9 +1856,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) hook_thread_event = NULL; } - PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); + + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index ea5ab75109..bb82855d40 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -798,12 +798,10 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); hr = IDirectInputDevice8_GetDeviceState(di_keyboard, sizeof(kbdata), kbdata); ok(SUCCEEDED(hr), "IDirectInputDevice8_GetDeviceState failed: %08x\n", hr); - todo_wine ok(kbdata[DIK_SPACE], "Expected DIK_SPACE key state down\n"); keybd_event(VK_SPACE, DIK_SPACE, KEYEVENTF_KEYUP, 0); @@ -812,7 +810,6 @@ static void test_keyboard_events(void) data_size = ARRAY_SIZE(obj_data); hr = IDirectInputDevice8_GetDeviceData(di_keyboard, sizeof(DIDEVICEOBJECTDATA), obj_data, &data_size, 0); ok(SUCCEEDED(hr), "Failed to get data hr=%08x\n", hr); - todo_wine ok(data_size == 1, "Expected 1 element, received %d\n", data_size); /* Test injecting keyboard events with scancode=0. -- 2.24.1

3 4

[PATCH v2 7/7] server: Get rid of separated thread suspend_context.
by Jacek Caban 15 Apr '20

15 Apr '20

It's always the same as context now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 31 +++++++++++++------------------ server/thread.h | 3 +-- 2 files changed, 14 insertions(+), 20 deletions(-)

1 0

[PATCH v2 6/7] ntdll: Use server_select to pass context to server in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 10 +++------- server/debugger.c | 26 +------------------------- server/protocol.def | 3 --- server/thread.c | 6 ------ server/thread.h | 1 - 5 files changed, 4 insertions(+), 42 deletions(-)

1 0

[PATCH v2 5/7] ntdll: Block signals in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)

1 0

[PATCH v2 4/7] server: Get rid of no longer needed get_suspend_context and set_suspend_context requests.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/protocol.def | 13 ------------ server/thread.c | 49 --------------------------------------------- 2 files changed, 62 deletions(-)

1 0

[PATCH v2 3/7] ntdll: Use select request instead of get_suspend_context to transfer context back to client.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 15 --------------- dlls/ntdll/server.c | 7 +++++++ server/thread.c | 24 ++++++++++++++++++++++++ server/thread.h | 1 + 4 files changed, 32 insertions(+), 15 deletions(-)

1 0

[PATCH v2 2/7] ntdll: Use select request to pass suspend context to server.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 14 ++------------ dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 16 ++++++++++++++-- dlls/ntdll/sync.c | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-)

1 0

[PATCH v2 1/7] server: Allow passing suspend context in select request.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/server.c | 1 + server/protocol.def | 5 ++++- server/thread.c | 20 ++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[PATCH 6/7] ntdll: Use server_select to pass context to server in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 8 +------- server/debugger.c | 26 +------------------------- server/protocol.def | 3 --- server/thread.c | 6 ------ server/thread.h | 1 - 5 files changed, 2 insertions(+), 42 deletions(-)

2 2

[PATCH 5/5] adsldp: Add support for paged search.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 56 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c2f7ca8023..7b2306da21 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -409,6 +409,7 @@ typedef struct struct ldap_search_context { + PLDAPSearch page; LDAPMessage *res, *entry; BerElement *ber; ULONG count, pos; @@ -1329,12 +1330,26 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte ctrls = ctrls_a; } - err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + if (ldap->search.pagesize) + { + ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, + filter, props, ldap->search.attribtypes_only, + ctrls, NULL, 0, 0, NULL); + if (ldap_ctx->page) + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, + ldap->search.pagesize, &count, &ldap_ctx->res); + else + err = LDAP_NO_MEMORY; + } + else + err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, + ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { TRACE("ldap_search_sW error %#x\n", err); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); heap_free(ldap_ctx); return HRESULT_FROM_WIN32(map_ldap_error(err)); } @@ -1384,11 +1399,42 @@ static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HAND else { if (ldap_ctx->pos >= ldap_ctx->count) + { + if (ldap_ctx->page) + { + ULONG err, count; + + ldap_msgfree(ldap_ctx->res); + ldap_ctx->res = NULL; + + err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); + if (err == LDAP_SUCCESS) + { + ldap_ctx->count = ldap_count_entries(ldap->ld, ldap_ctx->res); + ldap_ctx->pos = 0; + + if (ldap_ctx->pos >= ldap_ctx->count) + return S_ADS_NOMORE_ROWS; + + ldap_ctx->entry = ldap_first_entry(ldap->ld, ldap_ctx->res); + goto exit; + } + + if (err != LDAP_NO_RESULTS_RETURNED) + { + TRACE("ldap_get_next_page_s error %#x\n", err); + return HRESULT_FROM_WIN32(map_ldap_error(err)); + } + /* fall through */ + } + return S_ADS_NOMORE_ROWS; + } ldap_ctx->entry = ldap_next_entry(ldap->ld, ldap_ctx->entry); } +exit: if (!ldap_ctx->entry) return S_ADS_NOMORE_ROWS; @@ -1782,13 +1828,17 @@ static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COL static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) { + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); struct ldap_search_context *ldap_ctx = res; TRACE("%p,%p\n", iface, res); if (!res) return E_ADS_BAD_PARAMETER; - ldap_msgfree(ldap_ctx->res); + if (ldap_ctx->page) + ldap_search_abandon_page(ldap->ld, ldap_ctx->page); + if (ldap_ctx->res) + ldap_msgfree(ldap_ctx->res); return S_OK; } -- 2.25.2

1 0

[PATCH 4/5] wldap32: Implement ldap_get_next_page_s.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index f1244dca0d..7424eb6251 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -173,10 +173,37 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, struct l_timeval *timeout, ULONG pagesize, ULONG *count, WLDAP32_LDAPMessage **results ) { - FIXME( "(%p, %p, %p, 0x%08x, %p, %p)\n", ld, search, timeout, +#ifdef HAVE_LDAP + ULONG ret; + + TRACE( "(%p, %p, %p, %u, %p, %p)\n", ld, search, timeout, pagesize, count, results ); + if (!ld || !search || !count || !results) return ~0u; - if (!ld) return ~0u; + if (search->cookie && search->cookie->bv_len == 0) + { + /* end of paged results */ + return WLDAP32_LDAP_NO_RESULTS_RETURNED; + } + + TRACE("search->cookie: %s\n", search->cookie ? debugstr_an(search->cookie->bv_val, search->cookie->bv_len) : "NULL"); + ret = ldap_create_page_control( ld->ld, pagesize, search->cookie, 1, &search->serverctrls[0] ); + if (search->cookie) + { + ber_bvfree( search->cookie ); + search->cookie = NULL; + } + if (ret != LDAP_SUCCESS) return map_error( ret ); + + ret = ldap_search_ext_s( ld->ld, search->base, search->scope, + search->filter, search->attrs, search->attrsonly, + search->serverctrls, search->clientctrls, + search->timeout.tv_sec ? &search->timeout : NULL, search->sizelimit, results ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + return ldap_get_paged_count( ld, search, count, *results ); + +#endif return WLDAP32_LDAP_NOT_SUPPORTED; } -- 2.25.2

1 0

[PATCH 3/5] wldap32: Implement ldap_get_paged_count.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 79fdd7af16..f1244dca0d 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); +static struct berval null_cookie = { 0, NULL }; + /*********************************************************************** * ldap_create_page_controlA (WLDAP32.@) * @@ -77,7 +79,7 @@ static ULONG create_page_control( ULONG pagesize, struct WLDAP32_berval *cookie, LDAPControlW *ctrl; BerElement *ber; ber_tag_t tag; - struct berval *berval, null_cookie = { 0, NULL }; + struct berval *berval; INT ret, len; char *val; @@ -181,15 +183,43 @@ ULONG CDECL ldap_get_next_page_s( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, ULONG *count, WLDAP32_LDAPMessage *results ) { - ULONG ret = WLDAP32_LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP - FIXME( "(%p, %p, %p, %p)\n", ld, search, count, results ); + ULONG ret; + LDAPControl **server_ctrls, *page_ctrl = NULL; + struct berval cookie; + + TRACE( "(%p, %p, %p, %p)\n", ld, search, count, results ); + + if (!ld || !count || !results) return WLDAP32_LDAP_PARAM_ERROR; + + *count = 0; - if (!ld) return WLDAP32_LDAP_PARAM_ERROR; - /* FIXME: save the cookie from the server here */ + server_ctrls = NULL; + ret = ldap_parse_result( ld->ld, results, NULL, NULL, NULL, NULL, &server_ctrls, 0 ); + if (ret != LDAP_SUCCESS) return map_error( ret ); + + if (server_ctrls) + page_ctrl = ldap_control_find( LDAP_CONTROL_PAGEDRESULTS, server_ctrls, NULL ); + + if (!page_ctrl) /* assume end of paged results */ + { + search->cookie = &null_cookie; + return WLDAP32_LDAP_SUCCESS; + } + + ret = ldap_parse_pageresponse_control( ld->ld, page_ctrl, (int *)count, &cookie ); + if (ret == LDAP_SUCCESS) + { + TRACE("new search->cookie: %s, count %u\n", debugstr_an(cookie.bv_val, cookie.bv_len), *count); + search->cookie = ber_bvdup( &cookie ); + } + + ldap_controls_free( server_ctrls ); + + return map_error( ret ); #endif - return ret; + return WLDAP32_LDAP_NOT_SUPPORTED; } /*********************************************************************** @@ -271,7 +301,7 @@ ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) strarrayfreeU( search->attrs ); controlarrayfreeU( search->serverctrls ); controlarrayfreeU( search->clientctrls ); - if (search->cookie) + if (search->cookie && search->cookie != &null_cookie) ber_bvfree( search->cookie ); heap_free( search ); -- 2.25.2

1 0

[PATCH 2/5] wldap32: Implement ldap_search_abandon_page.
by Dmitry Timoshkov 15 Apr '20

15 Apr '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wldap32/page.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 27a8156e51..79fdd7af16 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -262,9 +262,19 @@ ULONG CDECL ldap_parse_page_controlW( WLDAP32_LDAP *ld, PLDAPControlW *ctrls, ULONG CDECL ldap_search_abandon_page( WLDAP32_LDAP *ld, PLDAPSearch search ) { - FIXME( "(%p, %p)\n", ld, search ); + TRACE( "(%p, %p)\n", ld, search ); + + if (!ld || !search) return ~0u; + + strfreeU( search->base ); + strfreeU( search->filter ); + strarrayfreeU( search->attrs ); + controlarrayfreeU( search->serverctrls ); + controlarrayfreeU( search->clientctrls ); + if (search->cookie) + ber_bvfree( search->cookie ); + heap_free( search ); - if (!ld) return ~0u; return WLDAP32_LDAP_SUCCESS; } -- 2.25.2

1 0

[PATCH 1/4] wined3d: Remove WINED3D_RS_EDGEANTIALIAS.
by Chip Davis 15 Apr '20

15 Apr '20

Handle this render state similarly to D3DRS_ZFUNC, by mapping it in the client DLLs. As far as I can tell, save for the fact that it's only supposed to apply to lines forming a convex outline, it's roughly equivalent to D3DRS_ANTIALIASEDLINEENABLE. We definitely handled it the same way. Curiously, even though we supported the render state, we didn't set the corresponding capability bit. Do that now. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/d3d8/device.c | 13 +++++++++++-- dlls/ddraw/ddraw.c | 2 ++ dlls/ddraw/device.c | 10 ++++++++-- dlls/wined3d/state.c | 13 +++++-------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 -- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6a67f817785..07f6dccbcbf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -422,6 +422,9 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFAFLATCUBIC | D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC; + if (caps->LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->RasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; + caps->LineCaps &= ~WINED3DLINECAPS_ANTIALIAS; caps->StencilCaps &= ~WINED3DSTENCILCAPS_TWOSIDED; caps->VertexProcessingCaps &= D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER @@ -446,9 +449,15 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) { - if (state == D3DRS_ZBIAS) + switch (state) + { + case D3DRS_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRS_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba9011..4ebf51d040c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1340,6 +1340,8 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) if (caps->dpcLineCaps.dwRasterCaps & WINED3DPRASTERCAPS_DEPTHBIAS) caps->dpcLineCaps.dwRasterCaps = (caps->dpcLineCaps.dwRasterCaps | D3DPRASTERCAPS_ZBIAS) & ~WINED3DPRASTERCAPS_DEPTHBIAS; + if (wined3d_caps.LineCaps & WINED3DLINECAPS_ANTIALIAS) + caps->dpcLineCaps.dwRasterCaps |= D3DPRASTERCAPS_ANTIALIASEDGES; caps->dpcLineCaps.dwZCmpCaps &= ( D3DPCMPCAPS_NEVER | D3DPCMPCAPS_LESS | D3DPCMPCAPS_EQUAL | diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e09100dfdc7..47856a05fb2 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -74,9 +74,15 @@ static inline WORD d3d_fpu_setup(void) static enum wined3d_render_state wined3d_render_state_from_ddraw(D3DRENDERSTATETYPE state) { - if (state == D3DRENDERSTATE_ZBIAS) + switch (state) + { + case D3DRENDERSTATE_ZBIAS: return WINED3D_RS_DEPTHBIAS; - return (enum wined3d_render_state)state; + case D3DRENDERSTATE_EDGEANTIALIAS: + return WINED3D_RS_ANTIALIASEDLINEENABLE; + default: + return (enum wined3d_render_state)state; + } } static enum wined3d_transform_state wined3d_transform_state_from_ddraw(D3DTRANSFORMSTATETYPE state) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d375122781b..1cb9f222eab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1798,12 +1798,9 @@ static void state_msaa(struct wined3d_context *context, const struct wined3d_sta } } -static void state_line_antialias(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void line_antialias(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; - const struct wined3d_rasterizer_state *r = state->rasterizer_state; - - if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || (r && r->desc.line_antialias)) + if (r && r->desc.line_antialias) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); @@ -4427,7 +4424,7 @@ static void rasterizer(struct wined3d_context *context, const struct wined3d_sta cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4445,7 +4442,7 @@ static void rasterizer_cc(struct wined3d_context *context, const struct wined3d_ cullmode(r, gl_info); depth_clip(r, gl_info); scissor(r, gl_info); - state_line_antialias(context, state, STATE_RENDER(WINED3D_RS_ANTIALIASEDLINEENABLE)); + line_antialias(r, gl_info); } static void psorigin_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4602,7 +4599,6 @@ const struct wined3d_state_entry_template misc_state_template[] = { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, { STATE_COMPUTE_UNORDERED_ACCESS_VIEW_BINDING, state_uav_warn }, WINED3D_GL_EXT_NONE }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so, }, WINED3D_GL_VERSION_3_2 }, { STATE_STREAM_OUTPUT, { STATE_STREAM_OUTPUT, state_so_warn, }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), { STATE_RENDER(WINED3D_RS_EDGEANTIALIAS), state_line_antialias}, WINED3D_GL_EXT_NONE }, { STATE_BLEND, { STATE_BLEND, blend_dbb }, ARB_DRAW_BUFFERS_BLEND }, { STATE_BLEND, { STATE_BLEND, blend_db2 }, EXT_DRAW_BUFFERS2 }, { STATE_BLEND, { STATE_BLEND, blend }, WINED3D_GL_EXT_NONE }, @@ -5504,6 +5500,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 8, 8}, { 17, 22}, { 27, 27}, + { 40, 40}, { 42, 45}, { 47, 47}, { 61, 127}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 48d133485b8..7e97c84c19e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1665,7 +1665,6 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_FOGEND] = tmpfloat.d; tmpfloat.f = 1.0f; rs[WINED3D_RS_FOGDENSITY] = tmpfloat.d; - rs[WINED3D_RS_EDGEANTIALIAS] = FALSE; rs[WINED3D_RS_RANGEFOGENABLE] = FALSE; rs[WINED3D_RS_STENCILENABLE] = FALSE; rs[WINED3D_RS_STENCILFAIL] = WINED3D_STENCIL_OP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 335d502ab0b..004c33f8ea9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4919,7 +4919,6 @@ const char *debug_d3drenderstate(enum wined3d_render_state state) D3DSTATE_TO_STR(WINED3D_RS_FOGEND); D3DSTATE_TO_STR(WINED3D_RS_FOGDENSITY); D3DSTATE_TO_STR(WINED3D_RS_STIPPLEENABLE); - D3DSTATE_TO_STR(WINED3D_RS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3D_RS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3D_RS_MIPMAPLODBIAS); D3DSTATE_TO_STR(WINED3D_RS_RANGEFOGENABLE); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0b3b41896e4..d3eb8100cd8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -310,7 +310,6 @@ enum wined3d_render_state WINED3D_RS_FOGEND = 37, WINED3D_RS_FOGDENSITY = 38, WINED3D_RS_STIPPLEENABLE = 39, - WINED3D_RS_EDGEANTIALIAS = 40, WINED3D_RS_COLORKEYENABLE = 41, WINED3D_RS_MIPMAPLODBIAS = 46, WINED3D_RS_RANGEFOGENABLE = 48, @@ -1209,7 +1208,6 @@ enum wined3d_shader_type #define WINED3DPRASTERCAPS_STIPPLE 0x00000200 #define WINED3DPRASTERCAPS_ANTIALIASSORTDEPENDENT 0x00000400 #define WINED3DPRASTERCAPS_ANTIALIASSORTINDEPENDENT 0x00000800 -#define WINED3DPRASTERCAPS_ANTIALIASEDGES 0x00001000 #define WINED3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 #define WINED3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 #define WINED3DPRASTERCAPS_FOGRANGE 0x00010000 -- 2.24.0

2 4

[PATCH 7/7] server: Get rid of separated thread suspend_context.
by Jacek Caban 15 Apr '20

15 Apr '20

It's always the same as context now. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/thread.c | 31 +++++++++++++------------------ server/thread.h | 3 +-- 2 files changed, 14 insertions(+), 20 deletions(-)

2 1

[PATCH v2 1/5] devenum/tests: Avoid running test_devenum() twice.
by Zebediah Figura 15 Apr '20

15 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Mostly since running with -v is a handy way to enumerate all devices. dlls/devenum/tests/devenum.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 6164efb7774..06efa3d773c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static void test_devenum(IBindCtx *bind_ctx) +static void test_devenum(void) { IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; @@ -45,6 +45,7 @@ static void test_devenum(IBindCtx *bind_ctx) IMoniker *moniker; GUID cat_guid, clsid; WCHAR *displayname; + IBindCtx *bindctx; VARIANT var; HRESULT hr; int count; @@ -58,7 +59,7 @@ static void test_devenum(IBindCtx *bind_ctx) while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); @@ -100,7 +101,7 @@ static void test_devenum(IBindCtx *bind_ctx) "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -110,9 +111,16 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); - hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + IPropertyBag_Release(prop_bag); + IBindCtx_Release(bindctx); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); @@ -1087,21 +1095,11 @@ static void test_vfw(void) START_TEST(devenum) { - IBindCtx *bind_ctx = NULL; HRESULT hr; CoInitialize(NULL); - test_devenum(NULL); - - /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ - hr = CreateBindCtx(0, &bind_ctx); - ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); - if (bind_ctx) { - test_devenum(bind_ctx); - IBindCtx_Release(bind_ctx); - } - + test_devenum(); test_moniker_isequal(); test_register_filter(); test_directshow_filter(); -- 2.26.0

1 4

[PATCH 1/5] devenum/tests: Avoid running test_devenum() twice.
by Zebediah Figura 15 Apr '20

15 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Mostly since running with -v is a handy way to enumerate all devices. dlls/devenum/tests/devenum.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 6164efb7774..06efa3d773c 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -37,7 +37,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static void test_devenum(IBindCtx *bind_ctx) +static void test_devenum(void) { IEnumMoniker *enum_cat, *enum_moniker; ICreateDevEnum* create_devenum; @@ -45,6 +45,7 @@ static void test_devenum(IBindCtx *bind_ctx) IMoniker *moniker; GUID cat_guid, clsid; WCHAR *displayname; + IBindCtx *bindctx; VARIANT var; HRESULT hr; int count; @@ -58,7 +59,7 @@ static void test_devenum(IBindCtx *bind_ctx) while (IEnumMoniker_Next(enum_cat, 1, &moniker, NULL) == S_OK) { - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (void **)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); @@ -100,7 +101,7 @@ static void test_devenum(IBindCtx *bind_ctx) "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); - hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); @@ -110,9 +111,16 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace(" %s %s\n", wine_dbgstr_w(displayname), wine_dbgstr_w(V_BSTR(&var))); - hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); + hr = IMoniker_BindToObject(moniker, NULL, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + hr = CreateBindCtx(0, &bindctx); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + IPropertyBag_Release(prop_bag); + IBindCtx_Release(bindctx); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); @@ -1087,21 +1095,11 @@ static void test_vfw(void) START_TEST(devenum) { - IBindCtx *bind_ctx = NULL; HRESULT hr; CoInitialize(NULL); - test_devenum(NULL); - - /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ - hr = CreateBindCtx(0, &bind_ctx); - ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); - if (bind_ctx) { - test_devenum(bind_ctx); - IBindCtx_Release(bind_ctx); - } - + test_devenum(); test_moniker_isequal(); test_register_filter(); test_directshow_filter(); -- 2.26.0

1 4

[PATCH 5/7] ntdll: Block signals in send_debug_event.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-)

1 0

[PATCH 4/7] server: Get rid of no longer needed get_suspend_context and set_suspend_context requests.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/protocol.def | 13 ------------ server/thread.c | 49 --------------------------------------------- 2 files changed, 62 deletions(-)

1 0

[PATCH 3/7] ntdll: Use select request instead of get_suspend_context to transfer context back to client.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 15 --------------- dlls/ntdll/server.c | 7 +++++++ server/thread.c | 24 ++++++++++++++++++++++++ server/thread.h | 1 + 4 files changed, 32 insertions(+), 15 deletions(-)

1 0

[PATCH 2/7] ntdll: Use select request to pass suspend context to server.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/exception.c | 14 ++------------ dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 16 ++++++++++++++-- dlls/ntdll/sync.c | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-)

1 0

[PATCH 1/7] server: Allow passing suspend context in select request.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/server.c | 1 + server/protocol.def | 5 ++++- server/thread.c | 20 ++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] kernelbase: Forward threadpool I/O functions to ntdll.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 6 +++--- .../api-ms-win-core-threadpool-l1-2-0.spec | 6 +++--- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernelbase/kernelbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)

2 2

[PATCH v2 2/2] kernelbase: Implement CreateThreadpoolIo.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/thread.c | 15 ++++++++++++--- dlls/ntdll/tests/threadpool.c | 4 +--- dlls/ntdll/threadpool.c | 1 + 3 files changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH v2 1/2] kernelbase: Forward threadpool I/O functions to ntdll.
by Jacek Caban 15 Apr '20

15 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- .../api-ms-win-core-threadpool-l1-1-0.spec | 6 +++--- .../api-ms-win-core-threadpool-l1-2-0.spec | 6 +++--- dlls/kernel32/kernel32.spec | 6 +++--- dlls/kernelbase/kernelbase.spec | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)

1 0

[PATCH] wdm.h: Fix MmMapLockedPagesSpecifyCache declaration.
by Jacek Caban 14 Apr '20

14 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/ddk/wdm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] cmd: Add compatibility manifest to fix displayed Windows version.
by Brendan Shanks 14 Apr '20

14 Apr '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- programs/cmd/cmd.manifest | 17 +++++++++++++++++ programs/cmd/cmd.rc | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 programs/cmd/cmd.manifest diff --git a/programs/cmd/cmd.manifest b/programs/cmd/cmd.manifest new file mode 100644 index 0000000000..f7188313aa --- /dev/null +++ b/programs/cmd/cmd.manifest @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> + <application> +  + <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> +  + <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> +  + <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> +  + <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> +  + <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> + </application> +</compatibility> +</assembly> diff --git a/programs/cmd/cmd.rc b/programs/cmd/cmd.rc index fa604a6db5..6a173daff3 100644 --- a/programs/cmd/cmd.rc +++ b/programs/cmd/cmd.rc @@ -407,3 +407,6 @@ Enter HELP <command> for further information on any of the above commands.\n" WCMD_BADPAREN, "Mismatch in parentheses.\n" WCMD_BADHEXOCT, "Badly formed number - must be one of decimal (12),\n hexadecimal (0x34) or octal (056).\n" } + +/* @makedep: cmd.manifest */ +1 RT_MANIFEST cmd.manifest -- 2.24.1

1 0

[PATCH] devpropdef.h: Fix DECLSPEC_SELECTANY usage.
by Jacek Caban 14 Apr '20

14 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/devpropdef.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH] winapi_test: Add support for more base types.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- That's not scalable though. To improve winapi will need to exploit the typedef so it knows that INT is int, PINT is int*, etc. Then only the base types will be needed. For the types that have multiple definitions, like DWORD, hardcoding the definition will probably still make sense. tools/winapi/winapi_test | 98 ++++++++++++++++++++++------------------ 1 file changed, 55 insertions(+), 43 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4ad..9d32f4eb78a 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -177,42 +177,74 @@ sub _find_align_kind_size($) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; + } elsif (/^(?:void|VOID)$/) { + $align = 4; + $kind = "signed"; + $size = 4; } elsif(/^char$/) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; + } elsif(/^CHAR$/) { + $align = 1; + $kind = "signed"; + $size = 1; + } elsif(/^(?:byte|BOOLEAN|BYTE|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int16|short(?:\s+int)?)$/) { $align = 2; $kind = defined($1) ? $1 : "signed"; $size = 2; - } elsif (/^(?:wchar_t)$/) { + } elsif (/^SHORT$/) { $align = 2; $kind = "signed"; $size = 2; + } elsif (/^(?:char16_t|wchar_t|USHORT|WCHAR|WORD)$/) { + $align = 2; + $kind = "unsigned"; + $size = 2; } elsif (/^(signed|unsigned)$/) { $align = 4; - $kind = defined($1) ? $1 : "signed"; + $kind = $1; $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:__int32|int)$/) { $align = 4; $kind = defined($1) ? $1 : "signed"; $size = 4; + } elsif (/^(?:BOOL|INT|LONG)$/) { + $align = 4; + $kind = "signed"; + $size = 4; + } elsif (/^(?:DWORD|FOURCC|LCID|UINT|ULONG)$/) { + $align = 4; + $kind = "unsigned"; + $size = 4; + } elsif (/^(?:float|FLOAT)$/) { + $align = 4; + $kind = "float"; + $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?(?:long(?:\s+int)?)$/) { $align = $pointer_size; $kind = defined($1) ? $1 : "signed"; $size = $pointer_size; - } elsif (/^(?:float)$/) { - $align = 4; - $kind = "float"; - $size = 4; } elsif (/^(?:(signed|unsigned)\s+)?__int64$/) { $align = 8; $kind = defined($1) ? $1 : "signed"; $size = 8; + } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { + $align = 8; + $kind = "signed"; + $size = 8; + } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { + $align = 8; + $kind = "unsigned"; + $size = 8; } elsif (/^(?:double|DOUBLE|DATE)$/) { $align = 8; $kind = "float"; @@ -221,58 +253,38 @@ sub _find_align_kind_size($) { $align = 4; $kind = "float"; $size = 12; - } elsif (/^H(?:DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|WND)$/) { + } elsif (/^(?:INT|LONG)_PTR$/) { + $align = $pointer_size; + $kind = "signed"; + $size = $pointer_size; + } elsif (/^(?:UINT|MMVERSION|ULONG|DWORD)_PTR$/) { + $align = $pointer_size; + $kind = "unsigned"; + $size = $pointer_size; + } elsif (/^H(?:ANDLE|DC|BITMAP|BRUSH|ICON|INSTANCE|KEY|MENU|METAFILE|MMIO|TASK|WND)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^LP(?:BYTE|CSTR|CWSTR|DWORD|STR|VOID|WSTR)$/) { + } elsif (/^(?:HPSTR|LP[A-Z0-9_]+|PVOID)$/) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; - } elsif (/^(?:FILETIME)$/) { + } elsif (/^POINTS$/) { + $align = 2; + $kind = "struct"; + $size = 4; + } elsif (/^(?:FILETIME|LUID|POINT|POINTL)$/) { $align = 4; $kind = "struct"; $size = 8; - } elsif (/^GUID$/) { + } elsif (/^(?:CLSID|GUID|RECT|RECTL)$/) { $align = 4; $kind = "struct"; $size = 16; - } elsif (/^(?:VOID)$/) { - $align = 4; - $kind = "signed"; - $size = 4; - } elsif (/^(?:SHORT)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:BYTE)$/) { - $align = 1; - $kind = "unsigned"; - $size = 1; - } elsif (/^(?:DWORD)$/) { - $align = 4; - $kind = "unsigned"; - $size = 4; - } elsif (/^(?:WORD)$/) { - $align = 2; - $kind = "unsigned"; - $size = 2; - } elsif (/^(?:INT64|LONG64|LONGLONG)$/) { - $align = 8; - $kind = "signed"; - $size = 8; - } elsif (/^(?:UINT64|ULONG64|DWORD64|ULONGLONG|DWORDLONG)$/) { - $align = 8; - $kind = "unsigned"; - $size = 8; } elsif (/^(?:LARGE_INTEGER)$/) { $align = 8; $kind = "union"; $size = 8; - } elsif (/^(?:POINTS)$/) { - $align = 2; - $kind = "struct"; - $size = 4; } elsif (/^(struct|union)$/) { $kind = $1; if (!$size_parse_reported{$_}) { -- 2.20.1

1 0

[PATCH v2] d3dcompiler: Implement D3DCompileFromFile().
by Jactry Zeng 14 Apr '20

14 Apr '20

Superseded patch 182804. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/compiler.c | 36 +++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 85 ++++++++++++++++++++++++++- 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 9fc7c1d773..8f00dfb16c 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -949,10 +949,42 @@ HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T size, UINT flags, const c HRESULT WINAPI D3DCompileFromFile(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors) { - FIXME("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p\n", + HANDLE file, mapping = NULL; + char *source = NULL; + SIZE_T source_size; + HRESULT hr; + + TRACE("filename %s, defines %p, includes %p, entrypoint %s, target %s, flags1 %x, flags2 %x, code %p, errors %p.\n", debugstr_w(filename), defines, includes, debugstr_a(entrypoint), debugstr_a(target), flags1, flags2, code, errors); - return E_NOTIMPL; + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + source_size = GetFileSize(file, NULL); + if (source_size == INVALID_FILE_SIZE) + goto error; + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + goto error; + + source = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (!source) + goto error; + + hr = D3DCompile(source, source_size, NULL, defines, includes, entrypoint, target, flags1, flags2, code, errors); + CloseHandle(mapping); + CloseHandle(file); + return hr; + +error: + hr = HRESULT_FROM_WIN32(GetLastError()); + if (!mapping) + CloseHandle(mapping); + CloseHandle(file); + + return hr; } HRESULT WINAPI D3DLoadModule(const void *data, SIZE_T size, ID3D11Module **module) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b96ab16679..cd93aa497d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -26,6 +26,8 @@ static pD3DCompile ppD3DCompile; static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static HRESULT (WINAPI *pD3DCompileFromFile)(const WCHAR *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *includes, + const char *entrypoint, const char *target, UINT flags1, UINT flags2, ID3DBlob **code, ID3DBlob **errors); struct vec2 { @@ -37,10 +39,40 @@ struct vec4 float x, y, z, w; }; +static BOOL create_file(WCHAR *filename, const char *code, DWORD code_size) +{ + static WCHAR temp_dir[MAX_PATH]; + DWORD written; + HANDLE file; + + if (!temp_dir[0]) + GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); + GetTempFileNameW(temp_dir, NULL, 0, filename); + file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + if (code) + { + WriteFile(file, code, code_size, &written, NULL); + if (written != code_size) + { + CloseHandle(file); + DeleteFileW(filename); + return FALSE; + } + } + CloseHandle(file); + return TRUE; +} + #define compile_shader(a, b) compile_shader_(__LINE__, a, b) static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const char *target) { - ID3D10Blob *blob = NULL, *errors = NULL; + ID3D10Blob *blob = NULL, *errors = NULL, *file_blob = NULL, *file_errors = NULL; + WCHAR filename[MAX_PATH] = {0}; + DWORD *data, *file_data; + SIZE_T size, file_size; HRESULT hr; hr = ppD3DCompile(source, strlen(source), NULL, NULL, NULL, "main", target, 0, 0, &blob, &errors); @@ -49,8 +81,38 @@ static ID3D10Blob *compile_shader_(unsigned int line, const char *source, const { if (winetest_debug > 1) trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); - ID3D10Blob_Release(errors); } + + if (SUCCEEDED(hr)) + { + if (!pD3DCompileFromFile || !create_file(filename, source, strlen(source))) + skip("D3DCompileFromFile() isn't supported or file creation failed.\n"); + else + { + hr = pD3DCompileFromFile(filename, NULL, NULL, "main", target, 0, 0, &file_blob, &file_errors); + ok_(__FILE__, line)(hr == D3D_OK, "Failed to compile shader from file, hr %#x.\n", hr); + size = ID3D10Blob_GetBufferSize(blob); + file_size = ID3D10Blob_GetBufferSize(blob); + ok_(__FILE__, line)(hr == D3D_OK, "Got unexpected buffer size: %lu vs %lu.\n", size, file_size); + data = ID3D10Blob_GetBufferPointer(blob); + file_data = ID3D10Blob_GetBufferPointer(file_blob); + ok_(__FILE__, line)(!memcmp(data, file_data, size), "Got unexpected data.\n"); + ok_(__FILE__, line)(!!file_errors == !!errors, "Got unexpected errors.\n"); + if (file_errors) + { + if (winetest_debug > 1) + trace_(__FILE__, line)("%s\n", (char *)ID3D10Blob_GetBufferPointer(file_errors)); + ID3D10Blob_Release(file_errors); + } + + ID3D10Blob_Release(file_blob); + DeleteFileW(filename); + } + } + + if (errors) + ID3D10Blob_Release(errors); + return blob; } @@ -1003,6 +1065,7 @@ static BOOL load_d3dcompiler(void) #if D3D_COMPILER_VERSION == 47 if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + pD3DCompileFromFile = (void*)GetProcAddress(module, "D3DCompileFromFile"); #else if (!(module = LoadLibraryA("d3dcompiler_43.dll"))) return FALSE; #endif @@ -1011,6 +1074,23 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static void test_compile(void) +{ + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + if (!pD3DCompileFromFile) + { + skip("D3DCompileFromFile() isn't supported.\n"); + return; + } + + hr = pD3DCompileFromFile(L"nonexistent", NULL, NULL, "main", "vs_2_0", 0, 0, &blob, &errors); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Got hr %#x.\n", hr); + ok(!blob, "Got unexpected blob.\n"); + ok(!errors, "Got unexpected errors.\n"); +} + START_TEST(hlsl_d3d9) { HMODULE mod; @@ -1038,4 +1118,5 @@ START_TEST(hlsl_d3d9) test_array_dimensions(); test_constant_table(); test_fail(); + test_compile(); } -- 2.26.0

2 1

[PATCH 1/7] d3dcompiler: Parse array types.
by Zebediah Figura 14 Apr '20

14 Apr '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 + dlls/d3dcompiler_43/hlsl.y | 61 ++++++++++++++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 59 ++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 4 +- 4 files changed, 122 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 2d8eba0b554..1a155736fd0 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1154,8 +1154,10 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu struct bwriter_shader *parse_hlsl_shader(const char *text, enum shader_type type, DWORD major, DWORD minor, const char *entrypoint, char **messages) DECLSPEC_HIDDEN; +const char *debug_base_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; const char *debug_modifiers(DWORD modifiers) DECLSPEC_HIDDEN; +const char *debug_node_type(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; void debug_dump_ir_function_decl(const struct hlsl_ir_function_decl *func) DECLSPEC_HIDDEN; void free_hlsl_type(struct hlsl_type *type) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e46bdbade3f..46d815d0144 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -926,6 +926,47 @@ static struct list *make_list(struct hlsl_ir_node *node) return list; } +static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) +{ + if (node->data_type->type != HLSL_CLASS_SCALAR) + return 0; + + switch (node->type) + { + case HLSL_IR_CONSTANT: + { + struct hlsl_ir_constant *constant = constant_from_node(node); + + switch (constant->node.data_type->base_type) + { + case HLSL_TYPE_UINT: + return constant->v.value.u[0]; + case HLSL_TYPE_INT: + return constant->v.value.i[0]; + case HLSL_TYPE_FLOAT: + return constant->v.value.f[0]; + case HLSL_TYPE_DOUBLE: + return constant->v.value.d[0]; + case HLSL_TYPE_BOOL: + return constant->v.value.b[0]; + default: + WARN("Invalid type %s.\n", debug_base_type(constant->node.data_type)); + return 0; + } + } + case HLSL_IR_CONSTRUCTOR: + case HLSL_IR_DEREF: + case HLSL_IR_EXPR: + case HLSL_IR_SWIZZLE: + FIXME("Unhandled type %s.\n", debug_node_type(node->type)); + return 0; + case HLSL_IR_ASSIGNMENT: + default: + WARN("Invalid node type %s.\n", debug_node_type(node->type)); + return 0; + } +} + %} %locations @@ -1651,9 +1692,25 @@ array: /* Empty */ } | '[' expr ']' { - FIXME("Array.\n"); - $$ = 0; + unsigned int size = evaluate_array_dimension(node_from_list($2)); + free_instr_list($2); + + if (!size) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size is not a positive integer constant\n"); + YYABORT; + } + TRACE("Array size %u.\n", size); + + if (size > 65536) + { + hlsl_report_message(get_location(&@2), HLSL_LEVEL_ERROR, + "array size must be between 1 and 65536"); + YYABORT; + } + $$ = size; } var_modifiers: /* Empty */ diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index c673e2be327..525de9910be 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -654,10 +654,47 @@ static void test_return(void) release_test_context(&test_context); } +static void test_array_dimensions(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char shader[] = + "float4 main(float x : TEXCOORD0) : COLOR\n" + "{\n" + " const int dim = 4;\n" + " float a[2 * 2] = {0.1, 0.2, 0.3, 0.4};\n" + " float b[4.1] = a;\n" + " float c[dim] = b;\n" + " float d[true] = {c[0]};\n" + " float e[65536];\n" + " return float4(d[0], c[0], c[1], c[3]);\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(shader, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.1f, 0.1f, 0.2f, 0.4f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = { + /* 0 */ "float4 test() : SV_TARGET\n" "{\n" " return y;\n" @@ -689,6 +726,7 @@ static void test_fail(void) " return float4(x.x, x.y, 0, 0);\n" "}", + /* 5 */ "float4 test() : SV_TARGET\n" "{\n" " struct { int b,c; } x = {0};\n" @@ -715,6 +753,26 @@ static void test_fail(void) "{\n" " return pos;\n" "}", + + /* 10 */ + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " float a[0];\n" + " return float4(0, 0, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " float a[65537];\n" + " return float4(0, 0, 0, 0);\n" + "}", + + "float4 test(float2 pos: TEXCOORD0) : SV_TARGET\n" + "{\n" + " int x;\n" + " float a[(x = 2)];\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"}; @@ -776,5 +834,6 @@ START_TEST(hlsl_d3d9) test_trig(); test_comma(); test_return(); + test_array_dimensions(); test_fail(); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 5eaff1730b3..fe2d23b623e 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1652,7 +1652,7 @@ void init_functions_tree(struct wine_rb_tree *funcs) wine_rb_init(&hlsl_ctx.functions, compare_function_rb); } -static const char *debug_base_type(const struct hlsl_type *type) +const char *debug_base_type(const struct hlsl_type *type) { const char *name = "(unknown)"; @@ -1744,7 +1744,7 @@ const char *debug_modifiers(DWORD modifiers) return wine_dbg_sprintf("%s", string[0] ? string + 1 : ""); } -static const char *debug_node_type(enum hlsl_ir_node_type type) +const char *debug_node_type(enum hlsl_ir_node_type type) { static const char * const names[] = { -- 2.25.1

4 24

[PATCH 2/2] kernelbase: Implement CreateThreadpoolIo.
by Jacek Caban 14 Apr '20

14 Apr '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/thread.c | 15 ++++++++++++--- dlls/ntdll/tests/threadpool.c | 4 +--- dlls/ntdll/threadpool.c | 1 + 3 files changed, 14 insertions(+), 6 deletions(-)

2 1

[PATCH] winapi_test: Fix handling of byte and UCHAR types.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/winapi_test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8f4ad..adee5e24a65 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -181,7 +181,11 @@ sub _find_align_kind_size($) { $align = 1; $kind = "char"; $size = 1; - } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { + } elsif(/^(?:byte|UCHAR)$/) { + $align = 1; + $kind = "unsigned"; + $size = 1; + } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char)$/) { $align = 1; $kind = defined($1) ? $1 : "signed"; $size = 1; -- 2.20.1

1 1

[PATCH 1/3] mf: Add support for end of presentation state change.
by Nikolay Sivov 14 Apr '20

14 Apr '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 67 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 3474b242a4..992b9a5cfb 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -826,9 +826,18 @@ static void session_pause(struct media_session *session) LeaveCriticalSection(&session->cs); } +static void session_set_stopped(struct media_session *session, HRESULT status) +{ + MediaEventType event_type; + + session->state = SESSION_STATE_STOPPED; + event_type = session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION ? MESessionEnded : MESessionStopped; + IMFMediaEventQueue_QueueEventParamVar(session->event_queue, event_type, &GUID_NULL, status, NULL); +} + static void session_stop(struct media_session *session) { - HRESULT hr = S_OK; + HRESULT hr; EnterCriticalSection(&session->cs); @@ -840,18 +849,14 @@ static void session_stop(struct media_session *session) /* Transition in two steps - pause clock, wait for sinks and pause sources. */ if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS; + else + session_set_stopped(session, hr); break; default: ; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } - LeaveCriticalSection(&session->cs); } @@ -2215,14 +2220,9 @@ static void session_set_source_object_state(struct media_session *session, IUnkn session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); if (session->presentation.flags & SESSION_FLAG_FINALIZE_SINKS) - { session_finalize_sinks(session); - } else - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, S_OK, NULL); - } + session_set_stopped(session, S_OK); break; default: @@ -2237,8 +2237,8 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre enum object_state state; IMFMediaEvent *event; DWORD caps, flags; + HRESULT hr = S_OK; BOOL changed; - HRESULT hr; if ((state = session_get_object_state_for_event(event_type)) == OBJ_STATE_INVALID) return; @@ -2311,15 +2311,14 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) { - if (FAILED(hr = IMFMediaSource_Stop(source->source))) + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION) + IMFMediaSource_Stop(source->source); + else if (FAILED(hr = IMFMediaSource_Stop(source->source))) break; } - if (FAILED(hr)) - { - session->state = SESSION_STATE_STOPPED; - IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStopped, &GUID_NULL, hr, NULL); - } + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION || FAILED(hr)) + session_set_stopped(session, hr); break; default: @@ -2771,6 +2770,27 @@ static void session_handle_end_of_presentation(struct media_session *session, IM } } +static void session_sink_stream_marker(struct media_session *session, IMFStreamSink *stream_sink) +{ + struct topo_node *node; + + if (!(node = session_get_node_object(session, (IUnknown *)stream_sink, MF_TOPOLOGY_OUTPUT_NODE)) + || node->flags & TOPO_NODE_END_OF_STREAM) + { + return; + } + + node->flags |= TOPO_NODE_END_OF_STREAM; + + if (session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION && + session_nodes_is_mask_set(session, MF_TOPOLOGY_OUTPUT_NODE, TOPO_NODE_END_OF_STREAM)) + { + session_set_topo_status(session, S_OK, MF_TOPOSTATUS_ENDED); + session_set_caps(session, session->caps & ~MFSESSIONCAP_PAUSE); + session_stop(session); + } +} + static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); @@ -2847,6 +2867,13 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM session_set_sink_stream_state(session, (IMFStreamSink *)event_source, event_type); LeaveCriticalSection(&session->cs); + break; + case MEStreamSinkMarker: + + EnterCriticalSection(&session->cs); + session_sink_stream_marker(session, (IMFStreamSink *)event_source); + LeaveCriticalSection(&session->cs); + break; case MEStreamSinkRequestSample: -- 2.25.1

1 2

[PATCH] adsldp: Fix the spelling of some FIXME() messages.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/adsldp/adsldp.c | 4 ++-- dlls/adsldp/schema.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index dce462d685a..c2f7ca80239 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1147,7 +1147,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S case ADS_SEARCHPREF_SEARCH_SCOPE: if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SEACH_SCOPE: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } @@ -1178,7 +1178,7 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) { - FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supportd dwType %d\n", prefs[i].vValue.dwType); + FIXME("ADS_SEARCHPREF_SECURITY_MASK: not supported dwType %d\n", prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; break; } diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index 63c95bdae6f..c8bcf3de663 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -227,7 +227,7 @@ static WCHAR *parse_name(WCHAR **str, ULONG *name_count) if (*p != '\'') { - FIXME("not suported NAME start at %s\n", debugstr_w(p)); + FIXME("not supported NAME start at %s\n", debugstr_w(p)); return NULL; } -- 2.20.1

1 0

[PATCH] dbghelp: Fix the spelling of a comment.
by Francois Gouget 14 Apr '20

14 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/elf_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index ab2a693ecaf..00e5c12c2e6 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -105,7 +105,7 @@ struct elf_module_info #define ELF_SHT_FINI_ARRAY 15 /* Array of destructors */ #define ELF_SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */ #define ELF_SHT_GROUP 17 /* Section group */ -#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indeces */ +#define ELF_SHT_SYMTAB_SHNDX 18 /* Extended section indices */ #define ELF_SHT_NUM 19 /* Number of defined types. */ /* Legal values for ST_TYPE subfield of st_info (symbol type). */ -- 2.20.1

1 0

[PATCH] winapi: Skip #if 0 sections.
by Francois Gouget 14 Apr '20

14 Apr '20

They are typically used as 'super comments' and may not contain C code. They are also typically not nested so this ignores nesting. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/winapi_parser.pm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index 0ad7057a0e3..941fdfe5a0b 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -244,7 +244,21 @@ sub parse_c_file($$) { # remove preprocessor directives if(s/^\s*\#/\#/s) { - if(/^(\#.*?)\\$/s) { + if (/^#\s*if\s+0\s*$/ms) { + # Skip #if 0 ... #endif sections entirely. + # They are typically used as 'super comments' and may not + # contain C code. This totally ignores nesting. + if(s/^(\s*#\s*if\s+0\s*\n.*?\n\s*#\s*endif\s*)\n//s) { + my @lines = split(/\n/, $1); + $_ = "\n" x $#lines; + &$preprocessor_found_callback("if", "0"); + $again = 1; + } else { + $lookahead = 1; + } + next readmore; + } + elsif(/^(\#.*?)\\$/s) { $_ = "$1\n"; $lookahead = 1; next; -- 2.20.1

1 0

[PATCH] winapi: Ignore function declarations that are too complex.
by Francois Gouget 14 Apr '20

14 Apr '20

A few function declarations are simply too complex for the winapi parser. Some are because they are in fact macro calls, and other because they mix parentheses with array declarations or strange function pointer types. When that happens print an error message and ignore the function declaration. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/winapi/winapi_parser.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/winapi/winapi_parser.pm b/tools/winapi/winapi_parser.pm index b24ce5f5f33..463b40ad33b 100644 --- a/tools/winapi/winapi_parser.pm +++ b/tools/winapi/winapi_parser.pm @@ -492,7 +492,11 @@ sub parse_c_file($$) { # die "$file: $.: syntax error: '$argument_type':'$argument_name'\n"; } else { - die "$file: $.: syntax error: '$argument'\n"; + # This is either a complex argument type, typically + # involving parentheses, or a macro argument. This is rare + # so just ignore the 'function' declaration. + print STDERR "$file: $.: cannot parse declaration argument (ignoring): '$argument'\n"; + next readmore; } $argument_type =~ s/\s*(?:const|volatile)\s*/ /g; # Remove const/volatile -- 2.20.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel