- wine-devel - winehq.org

[PATCH] winedbg/gdbproxy: Silence some noisy debug messages.
by Zebediah Figura 18 Aug '18

18 Aug '18

--- programs/winedbg/gdbproxy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 75654d3..512e011 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -434,7 +434,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) case EXCEPTION_DEBUG_EVENT: assert(dbg_curr_thread); - fprintf(stderr, "%08x:%08x: exception code=0x%08x\n", de->dwProcessId, + TRACE("%08x:%08x: exception code=0x%08x\n", de->dwProcessId, de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); if (fetch_context(gdbctx, dbg_curr_thread->handle, &gdbctx->context)) @@ -1286,7 +1286,7 @@ static enum packet_return packet_read_register(struct gdb_context* gdbctx) reg = hex_to_int(gdbctx->in_packet, gdbctx->in_packet_len); if (reg >= gdbctx->process->be_cpu->gdb_num_regs) { - FIXME("Unhandled register %u\n", reg); + WARN("Unhandled register %u\n", reg); return packet_error; } if (dbg_curr_thread != gdbctx->other_thread && gdbctx->other_thread) @@ -1315,7 +1315,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) reg = strtoul(gdbctx->in_packet, &ptr, 16); if (ptr == NULL || reg >= gdbctx->process->be_cpu->gdb_num_regs || *ptr++ != '=') { - FIXME("Unhandled register %s\n", + WARN("Unhandled register %s\n", debugstr_an(gdbctx->in_packet, gdbctx->in_packet_len)); /* FIXME: if just the reg is above cpu_num_regs, don't tell gdb * it wouldn't matter too much, and it fakes our support for all regs -- 2.7.4

1 0

[PATCH v2 1/7] ntoskrnl.exe: Implement IoSetDeviceInterfaceState().
by Zebediah Figura 17 Aug '18

17 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 69 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80e9b9e..f92dd58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -43,7 +43,7 @@ #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" - +#include "wine/heap.h" #include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -1193,6 +1193,73 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + const WCHAR slashW[] = {'\\',0}; + const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + NTSTATUS ret; + size_t len; + + TRACE("(%s, %d)\n", debugstr_us(name), enable); + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + if (!ret) + { + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + if (!ret) + { + DWORD data = enable; + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + NtClose( control_key ); + } + NtClose( iface_key ); + } + + heap_free( path ); + return ret; +} + + +/*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 662445a..71ac860 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -449,7 +449,7 @@ @ stub IoRequestDeviceEject @ stub IoReuseIrp @ stub IoSetCompletionRoutineEx -@ stub IoSetDeviceInterfaceState +@ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5abe18b..39734de 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); void WINAPI IoReleaseCancelSpinLock(KIRQL); +NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING *name, BOOLEAN enable); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); -- 2.7.4

2 9

[PATCH 1/7] ntoskrnl.exe: Implement IoSetDeviceInterfaceState().
by Zebediah Figura 17 Aug '18

17 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 69 ++++++++++++++++++++++++++++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 80e9b9e..f92dd58 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -43,7 +43,7 @@ #include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" - +#include "wine/heap.h" #include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); @@ -1193,6 +1193,73 @@ NTSTATUS WINAPI IoDeleteSymbolicLink( UNICODE_STRING *name ) /*********************************************************************** + * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable ) +{ + const WCHAR DeviceClassesW[] = {'\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'D','e','v','i','c','e','C','l','a','s','s','e','s','\\',0}; + const WCHAR controlW[] = {'C','o','n','t','r','o','l',0}; + const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + const WCHAR slashW[] = {'\\',0}; + const WCHAR hashW[] = {'#',0}; + + size_t namelen = name->Length / sizeof(WCHAR); + HANDLE iface_key, control_key; + OBJECT_ATTRIBUTES attr = {0}; + WCHAR *path, *refstr, *p; + UNICODE_STRING string; + NTSTATUS ret; + size_t len; + + TRACE("(%s, %d)\n", debugstr_us(name), enable); + + refstr = memrchrW(name->Buffer + 4, '\\', namelen - 4); + + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + + if (!(path = heap_alloc( len * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + + strcpyW( path, DeviceClassesW ); + lstrcpynW( path + strlenW( path ), (refstr ? refstr : name->Buffer + namelen) - 38, 39 ); + strcatW( path, slashW ); + p = path + strlenW( path ); + lstrcpynW( path + strlenW( path ), name->Buffer, (refstr ? (refstr - name->Buffer) : namelen) + 1 ); + p[0] = p[1] = p[3] = '#'; + strcatW( path, slashW ); + strcatW( path, hashW ); + if (refstr) + lstrcpynW( path + strlenW( path ), refstr, name->Buffer + namelen - refstr + 1 ); + + attr.Length = sizeof(attr); + attr.ObjectName = &string; + RtlInitUnicodeString( &string, path ); + ret = NtOpenKey( &iface_key, KEY_CREATE_SUB_KEY, &attr ); + if (!ret) + { + attr.RootDirectory = iface_key; + RtlInitUnicodeString( &string, controlW ); + ret = NtCreateKey( &control_key, KEY_SET_VALUE, &attr, 0, NULL, 0, NULL ); + if (!ret) + { + DWORD data = enable; + RtlInitUnicodeString( &string, linkedW ); + ret = NtSetValueKey( control_key, &string, 0, REG_DWORD, &data, sizeof(data) ); + NtClose( control_key ); + } + NtClose( iface_key ); + } + + heap_free( path ); + return ret; +} + + +/*********************************************************************** * IoGetDeviceInterfaces (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 662445a..71ac860 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -449,7 +449,7 @@ @ stub IoRequestDeviceEject @ stub IoReuseIrp @ stub IoSetCompletionRoutineEx -@ stub IoSetDeviceInterfaceState +@ stdcall IoSetDeviceInterfaceState(ptr long) @ stub IoSetDeviceToVerify @ stub IoSetFileOrigin @ stub IoSetHardErrorOrVerifyDevice diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5abe18b..39734de 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1405,6 +1405,7 @@ void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); void WINAPI IoReleaseCancelSpinLock(KIRQL); +NTSTATUS WINAPI IoSetDeviceInterfaceState(UNICODE_STRING *name, BOOLEAN enable); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void); -- 2.7.4

3 10

[PATCH] winedbg: Restart as 64-bit before launching the child process.
by Zebediah Figura 17 Aug '18

17 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/winedbg/winedbg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 0e45186..504138b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -749,7 +749,10 @@ int main(int argc, char** argv) if (!argc) ds = start_ok; else if ((ds = dbg_active_attach(argc, argv)) == start_error_parse && (ds = minidump_reload(argc, argv)) == start_error_parse) + { + restart_if_wow64(); ds = dbg_active_launch(argc, argv); + } switch (ds) { case start_ok: break; @@ -757,8 +760,6 @@ int main(int argc, char** argv) case start_error_init: return -1; } - restart_if_wow64(); - dbg_start_interactive(hFile); return 0; -- 2.7.4

1 0

[PATCH 08/10] dinput/tests: Add DIK code tests for symbols and punctuations.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 50 ++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-)

2 1

[PATCH 03/10] dinput/tests: Use GET_DIDEVICE_SUBTYPE macro in keyboard type tests.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH 4/4 v3] msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Piotr Caban 17 Aug '18

17 Aug '18

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+)

1 0

[PATCH 3/4 v3] msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
by Piotr Caban 17 Aug '18

17 Aug '18

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 3 ++- dlls/msvcrt/wcs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH 2/4 v3] msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Piotr Caban 17 Aug '18

17 Aug '18

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+)

1 0

[PATCH 1/4 v3] msvcrt: Don't read past end of string in _strncoll/_wcsncoll.
by Piotr Caban 17 Aug '18

17 Aug '18

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - reorder patches to avoid invalid memory reads on wine - change tests skipping on setlocale failure - use MSVCRT_strnlen instead of strnlen - use MSVCRT_wcsnlen instead of adding strnlenW implementation dlls/msvcrt/string.c | 4 +++- dlls/msvcrt/wcs.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 17 Aug '18

17 Aug '18

1 0

[PATCH v2 2/4] msvcrt: Don't read past end of string in _strncoll/_wcsncoll.
by Daniel Lehman 17 Aug '18

17 Aug '18

v2: use strnlen

1 0

[PATCH v2 3/4] msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Daniel Lehman 17 Aug '18

17 Aug '18

1 0

[PATCH v2 4/4] msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
by Daniel Lehman 17 Aug '18

17 Aug '18

v2: use strnlen

1 0

[PATCH v2 1/4] msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Daniel Lehman 17 Aug '18

17 Aug '18

1 0

[PATCH 6/6] server: Share more code between pipe lient and server destructors.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)

1 0

[PATCH 5/6] server: Remove no longer needed pipe_state enum.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-)

1 0

[PATCH 4/6] server: Use pipe_end state in find_available_server.
by Jacek Caban 17 Aug '18

17 Aug '18

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

1 0

[PATCH 3/6] server: Use separated async queue for listeners.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 2/6] server: Use pipe_end state in FSCTL_PIPE_DISCONNECT implementation.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)

1 0

[PATCH 1/6] server: Use pipe_end state in FSCTL_PIPE_LISTEN implementation.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 8 ++++++++ server/named_pipe.c | 34 ++++++++++++++++------------------ 2 files changed, 24 insertions(+), 18 deletions(-)

1 0

[PATCH] wmp: Improve media items handling.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/player.c | 98 +++++++++++++++++++++--------------------- dlls/wmp/tests/media.c | 77 +++++++++++++++++++++++++++++++++ dlls/wmp/wmp_private.h | 20 ++++++++- 3 files changed, 144 insertions(+), 51 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 56b408f5b1..fd8c17d60f 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -129,14 +129,17 @@ static HRESULT WINAPI WMPPlayer4_close(IWMPPlayer4 *iface) return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *pbstrURL) +static HRESULT WINAPI WMPPlayer4_get_URL(IWMPPlayer4 *iface, BSTR *url) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - TRACE("(%p)->(%p)\n", This, pbstrURL); - if(This->wmpmedia == NULL) { + + TRACE("(%p)->(%p)\n", This, url); + + if(This->media == NULL) { return S_FALSE; } - return IWMPMedia_get_sourceURL(This->wmpmedia, pbstrURL); + + return return_bstr(This->media->url, url); } static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) @@ -149,7 +152,7 @@ static HRESULT WINAPI WMPPlayer4_put_URL(IWMPPlayer4 *iface, BSTR url) return E_POINTER; } - hres = create_media_from_url(url, &media); + hres = create_media_from_url(url, 0.0, &media); if (SUCCEEDED(hres)) { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsTransitioning); @@ -202,16 +205,18 @@ static HRESULT WINAPI WMPPlayer4_get_settings(IWMPPlayer4 *iface, IWMPSettings * return S_OK; } -static HRESULT WINAPI WMPPlayer4_get_currentMedia(IWMPPlayer4 *iface, IWMPMedia **ppMedia) +static HRESULT WINAPI WMPPlayer4_get_currentMedia(IWMPPlayer4 *iface, IWMPMedia **media) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - TRACE("(%p)->(%p)\n", This, ppMedia); - if(This->wmpmedia == NULL) { + + TRACE("(%p)->(%p)\n", This, media); + + *media = NULL; + + if (This->media == NULL) return S_FALSE; - } - IWMPMedia_AddRef(This->wmpmedia); - *ppMedia = This->wmpmedia; - return S_OK; + + return create_media_from_url(This->media->url, This->media->duration, media); } static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia *pMedia) @@ -223,15 +228,15 @@ static HRESULT WINAPI WMPPlayer4_put_currentMedia(IWMPPlayer4 *iface, IWMPMedia return E_POINTER; } update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistChanging); - if(This->wmpmedia != NULL) { + if(This->media != NULL) { IWMPControls_stop(&This->IWMPControls_iface); - IWMPMedia_Release(This->wmpmedia); + IWMPMedia_Release(&This->media->IWMPMedia_iface); } update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistChanged); update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia); IWMPMedia_AddRef(pMedia); - This->wmpmedia = pMedia; + This->media = unsafe_impl_from_IWMPMedia(pMedia); return S_OK; } @@ -259,8 +264,7 @@ static HRESULT WINAPI WMPPlayer4_get_versionInfo(IWMPPlayer4 *iface, BSTR *versi if (!version) return E_POINTER; - *version = SysAllocString(versionW); - return *version ? S_OK : E_OUTOFMEMORY; + return return_bstr(versionW, version); } static HRESULT WINAPI WMPPlayer4_launchURL(IWMPPlayer4 *iface, BSTR url) @@ -343,11 +347,13 @@ static HRESULT WINAPI WMPPlayer4_newPlaylist(IWMPPlayer4 *iface, BSTR name, BSTR return E_NOTIMPL; } -static HRESULT WINAPI WMPPlayer4_newMedia(IWMPPlayer4 *iface, BSTR url, IWMPMedia **ppMedia) +static HRESULT WINAPI WMPPlayer4_newMedia(IWMPPlayer4 *iface, BSTR url, IWMPMedia **media) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%p)\n", This, ppMedia); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_w(url), media); + + return create_media_from_url(url, 0.0, media); } static HRESULT WINAPI WMPPlayer4_get_enabled(IWMPPlayer4 *iface, VARIANT_BOOL *pbEnabled) @@ -1450,20 +1456,13 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) { HRESULT hres = S_OK; WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - WMPMedia *media; TRACE("(%p)\n", This); - if (!This->wmpmedia) { + if (!This->media) { return NS_S_WMPCORE_COMMAND_NOT_AVAILABLE; } - media = unsafe_impl_from_IWMPMedia(This->wmpmedia); - if (!media) { - FIXME("No support for non-builtin IWMPMedia implementations\n"); - return E_INVALIDARG; - } - if (!This->filter_graph) { hres = CoCreateInstance(&CLSID_FilterGraph, NULL, @@ -1473,7 +1472,7 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposOpeningUnknownURL); if (SUCCEEDED(hres)) - hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL); + hres = IGraphBuilder_RenderFile(This->filter_graph, This->media->url, NULL); if (SUCCEEDED(hres)) update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen); if (SUCCEEDED(hres)) @@ -1517,7 +1516,7 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface) LONGLONG duration; update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying); if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration))) - media->duration = (DOUBLE)duration / 10000000.0f; + This->media->duration = (DOUBLE)duration / 10000000.0f; } else { update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined); } @@ -1781,24 +1780,23 @@ static HRESULT WINAPI WMPMedia_get_isIdentical(IWMPMedia *iface, IWMPMedia *othe return E_NOTIMPL; } -static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *pbstrSourceUrl) +static HRESULT WINAPI WMPMedia_get_sourceURL(IWMPMedia *iface, BSTR *url) { WMPMedia *This = impl_from_IWMPMedia(iface); - BSTR url; - TRACE("(%p)->(%p)\n", This, pbstrSourceUrl); - url = SysAllocString(This->url); - if (url) { - *pbstrSourceUrl = url; - return S_OK; - } - return E_OUTOFMEMORY; + + TRACE("(%p)->(%p)\n", This, url); + + return return_bstr(This->url, url); } -static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *pbstrName) +static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *name) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, pbstrName); - return E_NOTIMPL; + + FIXME("(%p)->(%p)\n", This, name); + + /* FIXME: this should be a display name */ + return return_bstr(This->url, name); } static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR pbstrName) @@ -2012,8 +2010,8 @@ BOOL init_player(WindowsMediaPlayer *wmp) void destroy_player(WindowsMediaPlayer *wmp) { IWMPControls_stop(&wmp->IWMPControls_iface); - if(wmp->wmpmedia) - IWMPMedia_Release(wmp->wmpmedia); + if (wmp->media) + IWMPMedia_Release(&wmp->media->IWMPMedia_iface); DestroyWindow(wmp->msg_window); } @@ -2025,16 +2023,18 @@ WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) return NULL; } -HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) +HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) { - WMPMedia *media = heap_alloc_zero(sizeof(WMPMedia)); + static const WCHAR emptyW[] = {0}; + WMPMedia *media; - if (!media) { + media = heap_alloc_zero(sizeof(*media)); + if (!media) return E_OUTOFMEMORY; - } media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; - media->url = heap_strdupW(url); + media->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); + media->duration = duration; media->ref = 1; if (media->url) { diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index aeca6180b0..bd9aefc975 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -487,6 +487,81 @@ playback_skip: return test_ran; } +static void test_media_item(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + IWMPMedia *media, *media2; + IWMPPlayer4 *player; + HRESULT hr; + BSTR str; + + hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("CLSID_WindowsMediaPlayer is not registered.\n"); + return; + } + ok(hr == S_OK, "Failed to create media player instance, hr %#x.\n", hr); + + hr = IWMPPlayer4_newMedia(player, NULL, &media); + ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + media2 = (void *)0xdeadbeef; + hr = IWMPPlayer4_get_currentMedia(player, &media2); + ok(hr == S_FALSE, "Failed to get current media, hr %#x.\n", hr); + ok(media2 == NULL, "Unexpected media instance.\n"); + + hr = IWMPPlayer4_put_currentMedia(player, media); + ok(hr == S_OK, "Failed to set current media, hr %#x.\n", hr); + + hr = IWMPPlayer4_get_currentMedia(player, &media2); + ok(hr == S_OK, "Failed to get current media, hr %#x.\n", hr); + ok(media2 != NULL && media != media2, "Unexpected media instance.\n"); + IWMPMedia_Release(media2); + + IWMPMedia_Release(media); + + str = SysAllocStringLen(NULL, 0); + hr = IWMPPlayer4_newMedia(player, str, &media); + ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + SysFreeString(str); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + IWMPMedia_Release(media); + + str = SysAllocString(mp3file); + hr = IWMPPlayer4_newMedia(player, str, &media); + ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + SysFreeString(str); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + + hr = IWMPPlayer4_put_currentMedia(player, media); + ok(hr == S_OK, "Failed to set current media, hr %#x.\n", hr); + IWMPMedia_Release(media); + + hr = IWMPPlayer4_get_currentMedia(player, &media2); + ok(hr == S_OK, "Failed to get current media, hr %#x.\n", hr); + ok(media2 != NULL, "Unexpected media instance.\n"); + hr = IWMPMedia_get_name(media2, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + SysFreeString(str); + IWMPMedia_Release(media2); + + IWMPPlayer4_Release(player); +} + START_TEST(media) { CoInitialize(NULL); @@ -494,6 +569,8 @@ START_TEST(media) main_thread_id = GetCurrentThreadId(); playing_event = CreateEventW(NULL, FALSE, FALSE, NULL); completed_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + test_media_item(); if (test_wmp()) { test_completion_event(); } else { diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index b0861dd302..9617be0c7f 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -73,7 +73,7 @@ struct WindowsMediaPlayer { ConnectionPoint *wmpocx; - IWMPMedia *wmpmedia; + WMPMedia *media; /* DirectShow stuff */ IGraphBuilder* filter_graph; @@ -89,7 +89,7 @@ struct WindowsMediaPlayer { BOOL init_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; void destroy_player(WindowsMediaPlayer*) DECLSPEC_HIDDEN; WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) DECLSPEC_HIDDEN; -HRESULT create_media_from_url(BSTR url, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; +HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) DECLSPEC_HIDDEN; void ConnectionPointContainer_Init(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(WindowsMediaPlayer *wmp) DECLSPEC_HIDDEN; void call_sink(ConnectionPoint *This, DISPID dispid, DISPPARAMS *dispparams) DECLSPEC_HIDDEN; @@ -116,3 +116,19 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) return ret; } + +static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) +{ + if(!p) + return E_INVALIDARG; + + if(value) { + *p = SysAllocString(value); + if(!*p) + return E_OUTOFMEMORY; + }else { + *p = NULL; + } + + return S_OK; +} -- 2.18.0

1 0

[PATCH] winegcc: Improve heuristics for -m32/-m64 options in get_lib_dir.
by Jacek Caban 17 Aug '18

17 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 47 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 12 deletions(-)

1 0

[PATCH 3/3] d2d1: Add ID2D1DeviceContext stub.
by Henri Verbeet 17 Aug '18

17 Aug '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 8 +- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 4 +- dlls/d2d1/d2d1_private.h | 10 +- dlls/d2d1/device.c | 786 +++++++++++++++++++++++++++------------ 5 files changed, 563 insertions(+), 247 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 2d27d7b799f..8282dca0435 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -337,7 +337,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return *bitmap ? S_OK : E_OUTOFMEMORY; } -HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *target_device, +HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *target_device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) { D2D1_BITMAP_PROPERTIES d; @@ -349,7 +349,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device ID3D10Device *device; HRESULT hr = S_OK; - ID2D1RenderTarget_GetFactory(render_target, &factory); + ID2D1DeviceContext_GetFactory(context, &factory); if (src_impl->factory != factory) { hr = D2DERR_WRONG_FACTORY; @@ -437,7 +437,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device { float dpi_x, dpi_y; - ID2D1RenderTarget_GetDpi(render_target, &dpi_x, &dpi_y); + ID2D1DeviceContext_GetDpi(context, &dpi_x, &dpi_y); if (d.dpiX == 0.0f) d.dpiX = dpi_x; if (d.dpiY == 0.0f) @@ -454,7 +454,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - ID2D1RenderTarget_GetFactory(render_target, &factory); + ID2D1DeviceContext_GetFactory(context, &factory); d2d_bitmap_init(*bitmap, factory, view, pixel_size, &d); ID3D10ShaderResourceView_Release(view); ID2D1Factory_Release(factory); diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index de588723b7a..c106e211d61 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -728,7 +728,7 @@ static const struct ID2D1BitmapRenderTargetVtbl d2d_bitmap_render_target_vtbl = }; HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_target, - const struct d2d_d3d_render_target *parent_target, const D2D1_SIZE_F *size, + const struct d2d_device_context *parent_target, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *pixel_format, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options) { diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 00a37e6f12b..450507cef62 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1087,7 +1087,7 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_address_mode_from_extend_mode(D2D1_EXT } static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, - const struct d2d_d3d_render_target *render_target, struct d2d_brush_cb *cb) + const struct d2d_device_context *render_target, struct d2d_brush_cb *cb) { float theta, sin_theta, cos_theta; float dpi_scale, d, s1, s2, t, u; @@ -1204,7 +1204,7 @@ static BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, } HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, - BOOL outline, struct d2d_d3d_render_target *render_target, ID3D10Buffer **ps_cb) + BOOL outline, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) { D3D10_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb cb_data = {0}; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 925fcf48ce1..e00b9427977 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -117,9 +117,9 @@ struct d2d_ps_cb struct d2d_brush_cb opacity_brush; }; -struct d2d_d3d_render_target +struct d2d_device_context { - ID2D1RenderTarget ID2D1RenderTarget_iface; + ID2D1DeviceContext ID2D1DeviceContext_iface; ID2D1GdiInteropRenderTarget ID2D1GdiInteropRenderTarget_iface; IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; @@ -210,7 +210,7 @@ struct d2d_bitmap_render_target }; HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_target, - const struct d2d_d3d_render_target *parent_target, const D2D1_SIZE_F *size, + const struct d2d_device_context *parent_target, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options) DECLSPEC_HIDDEN; @@ -282,7 +282,7 @@ HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, struct d2d_brush **brush) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, - struct d2d_d3d_render_target *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; + struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style @@ -335,7 +335,7 @@ struct d2d_bitmap HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device *device, REFIID iid, void *data, +HRESULT d2d_bitmap_create_shared(ID2D1DeviceContext *context, ID3D10Device *device, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *device, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, struct d2d_bitmap **bitmap) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index cb7e8a540a5..bba4870dd4e 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -118,7 +118,7 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) --stack->count; } -static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_shape_type shape_type, +static void d2d_device_context_draw(struct d2d_device_context *render_target, enum d2d_shape_type shape_type, ID3D10Buffer *ib, unsigned int index_count, ID3D10Buffer *vb, unsigned int vb_stride, ID3D10Buffer *vs_cb, ID3D10Buffer *ps_cb, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { @@ -193,22 +193,28 @@ static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_sh WARN("Failed to apply stateblock, hr %#x.\n", hr); } -static inline struct d2d_d3d_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) +static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1DeviceContext *iface) { - return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, ID2D1RenderTarget_iface); + return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_QueryInterface(ID2D1RenderTarget *iface, REFIID iid, void **out) +static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) +{ + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1RenderTarget) + if (IsEqualGUID(iid, &IID_ID2D1DeviceContext) + || IsEqualGUID(iid, &IID_ID2D1RenderTarget) || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1RenderTarget_AddRef(iface); + ID2D1DeviceContext_AddRef(iface); *out = iface; return S_OK; } @@ -225,9 +231,9 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_QueryInterface(ID2D1Rende return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_AddRef(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_device_context_AddRef(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ULONG refcount = InterlockedIncrement(&render_target->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -235,9 +241,9 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_AddRef(ID2D1RenderTarget *i return refcount; } -static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_device_context_Release(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ULONG refcount = InterlockedDecrement(&render_target->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -270,9 +276,9 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * return refcount; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget *iface, ID2D1Factory **factory) +static void STDMETHODCALLTYPE d2d_device_context_GetFactory(ID2D1DeviceContext *iface, ID2D1Factory **factory) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, factory %p.\n", iface, factory); @@ -280,10 +286,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget ID2D1Factory_AddRef(*factory); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; @@ -296,10 +302,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; @@ -313,10 +319,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSharedBitmap(ID2D1DeviceContext *iface, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; @@ -329,11 +335,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1R return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapBrush(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -346,10 +352,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateSolidColorBrush(ID2D1DeviceContext *iface, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -361,11 +367,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollection(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateGradientStopCollection(ID2D1DeviceContext *iface, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, ID2D1GradientStopCollection **gradient) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_gradient *object; HRESULT hr; @@ -379,11 +385,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateLinearGradientBrush(ID2D1DeviceContext *iface, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -397,11 +403,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateRadialGradientBrush(ID2D1DeviceContext *iface, const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1RadialGradientBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -415,11 +421,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTarget(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCompatibleRenderTarget(ID2D1DeviceContext *iface, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, ID2D1BitmapRenderTarget **rt) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap_render_target *object; HRESULT hr; @@ -443,10 +449,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateLayer(ID2D1DeviceContext *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_layer *object; HRESULT hr; @@ -458,9 +464,9 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateMesh(ID2D1DeviceContext *iface, ID2D1Mesh **mesh) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_mesh *object; HRESULT hr; @@ -472,10 +478,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar return hr; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawLine(ID2D1DeviceContext *iface, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1PathGeometry *geometry; ID2D1GeometrySink *sink; HRESULT hr; @@ -503,14 +509,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget * WARN("Close() failed, %#x.\n", hr); ID2D1GeometrySink_Release(sink); - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1PathGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawRectangle(ID2D1DeviceContext *iface, const D2D1_RECT_F *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RectangleGeometry *geometry; HRESULT hr; @@ -523,14 +529,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTar return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1RectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillRectangle(ID2D1DeviceContext *iface, const D2D1_RECT_F *rect, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RectangleGeometry *geometry; HRESULT hr; @@ -542,14 +548,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1RectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawRoundedRectangle(ID2D1DeviceContext *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RoundedRectangleGeometry *geometry; HRESULT hr; @@ -562,14 +568,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1Re return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1RoundedRectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillRoundedRectangle(ID2D1DeviceContext *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RoundedRectangleGeometry *geometry; HRESULT hr; @@ -581,14 +587,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1Re return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1RoundedRectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawEllipse(ID2D1DeviceContext *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1EllipseGeometry *geometry; HRESULT hr; @@ -601,14 +607,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarge return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1EllipseGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillEllipse(ID2D1DeviceContext *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1EllipseGeometry *geometry; HRESULT hr; @@ -620,11 +626,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarge return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1EllipseGeometry_Release(geometry); } -static void d2d_rt_draw_geometry(struct d2d_d3d_render_target *render_target, +static void d2d_device_context_draw_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, float stroke_width) { ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb; @@ -713,7 +719,7 @@ static void d2d_rt_draw_geometry(struct d2d_d3d_render_target *render_target, goto done; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_OUTLINE, ib, 3 * geometry->outline.face_count, vb, + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_OUTLINE, ib, 3 * geometry->outline.face_count, vb, sizeof(*geometry->outline.vertices), vs_cb, ps_cb, brush, NULL); ID3D10Buffer_Release(vb); @@ -743,7 +749,8 @@ static void d2d_rt_draw_geometry(struct d2d_d3d_render_target *render_target, goto done; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_BEZIER_OUTLINE, ib, 3 * geometry->outline.bezier_face_count, vb, + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_BEZIER_OUTLINE, ib, + 3 * geometry->outline.bezier_face_count, vb, sizeof(*geometry->outline.beziers), vs_cb, ps_cb, brush, NULL); ID3D10Buffer_Release(vb); @@ -755,11 +762,11 @@ done: ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext *iface, ID2D1Geometry *geometry, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); TRACE("iface %p, geometry %p, brush %p, stroke_width %.8e, stroke_style %p.\n", @@ -768,10 +775,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarg if (stroke_style) FIXME("Ignoring stroke style %p.\n", stroke_style); - d2d_rt_draw_geometry(render_target, geometry_impl, brush_impl, stroke_width); + d2d_device_context_draw_geometry(render_target, geometry_impl, brush_impl, stroke_width); } -static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, +static void d2d_device_context_fill_geometry(struct d2d_device_context *render_target, const struct d2d_geometry *geometry, struct d2d_brush *brush, struct d2d_brush *opacity_brush) { ID3D10Buffer *ib, *vb, *vs_cb, *ps_cb; @@ -860,7 +867,7 @@ static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, goto done; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry->fill.face_count, vb, sizeof(*geometry->fill.vertices), vs_cb, ps_cb, brush, opacity_brush); ID3D10Buffer_Release(vb); @@ -878,7 +885,7 @@ static void d2d_rt_fill_geometry(struct d2d_d3d_render_target *render_target, goto done; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_BEZIER, NULL, geometry->fill.bezier_vertex_count, vb, + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_BEZIER, NULL, geometry->fill.bezier_vertex_count, vb, sizeof(*geometry->fill.bezier_vertices), vs_cb, ps_cb, brush, opacity_brush); ID3D10Buffer_Release(vb); @@ -889,12 +896,12 @@ done: ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillGeometry(ID2D1DeviceContext *iface, ID2D1Geometry *geometry, ID2D1Brush *brush, ID2D1Brush *opacity_brush) { const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); struct d2d_brush *opacity_brush_impl = unsafe_impl_from_ID2D1Brush(opacity_brush); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush); @@ -910,16 +917,16 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg return; } - d2d_rt_fill_geometry(render_target, geometry_impl, brush_impl, opacity_brush_impl); + d2d_device_context_fill_geometry(render_target, geometry_impl, brush_impl, opacity_brush_impl); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillMesh(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillMesh(ID2D1DeviceContext *iface, ID2D1Mesh *mesh, ID2D1Brush *brush) { FIXME("iface %p, mesh %p, brush %p stub!\n", iface, mesh, brush); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillOpacityMask(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceContext *iface, ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { @@ -927,7 +934,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillOpacityMask(ID2D1RenderT iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { @@ -979,21 +986,21 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; - if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + if (FAILED(hr = d2d_device_context_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) { ERR("Failed to create bitmap brush, hr %#x.\n", hr); return; } - ID2D1RenderTarget_FillRectangle(iface, &d, (ID2D1Brush *)brush); + d2d_device_context_FillRectangle(iface, &d, (ID2D1Brush *)brush); ID2D1BitmapBrush_Release(brush); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *iface, const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); IDWriteTextLayout *text_layout; IDWriteFactory *dwrite_factory; D2D1_POINT_2F origin; @@ -1026,14 +1033,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * } d2d_point_set(&origin, layout_rect->left, layout_rect->top); - ID2D1RenderTarget_DrawTextLayout(iface, origin, text_layout, brush, options); + ID2D1DeviceContext_DrawTextLayout(iface, origin, text_layout, brush, options); IDWriteTextLayout_Release(text_layout); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawTextLayout(ID2D1DeviceContext *iface, D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_draw_text_layout_ctx ctx; HRESULT hr; @@ -1048,7 +1055,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTa FIXME("Failed to draw text layout, hr %#x.\n", hr); } -static D2D1_ANTIALIAS_MODE d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(struct d2d_d3d_render_target *rt) +static D2D1_ANTIALIAS_MODE d2d_device_context_set_aa_mode_from_text_aa_mode(struct d2d_device_context *rt) { D2D1_ANTIALIAS_MODE prev_antialias_mode = rt->drawing_state.antialiasMode; rt->drawing_state.antialiasMode = rt->drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED ? @@ -1056,7 +1063,7 @@ static D2D1_ANTIALIAS_MODE d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(s return prev_antialias_mode; } -static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_target, +static void d2d_device_context_draw_glyph_run_outline(struct d2d_device_context *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush) { D2D1_MATRIX_3X2_F *transform, prev_transform; @@ -1096,8 +1103,8 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t prev_transform = *transform; transform->_31 += baseline_origin.x * transform->_11 + baseline_origin.y * transform->_21; transform->_32 += baseline_origin.x * transform->_12 + baseline_origin.y * transform->_22; - prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); - d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), + prev_antialias_mode = d2d_device_context_set_aa_mode_from_text_aa_mode(render_target); + d2d_device_context_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), NULL); render_target->drawing_state.antialiasMode = prev_antialias_mode; *transform = prev_transform; @@ -1105,7 +1112,7 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t ID2D1PathGeometry_Release(geometry); } -static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, +static void d2d_device_context_draw_glyph_run_bitmap(struct d2d_device_context *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) @@ -1196,7 +1203,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_desc.dpiX *= 3.0f; bitmap_desc.dpiY = render_target->desc.dpiY; - if (FAILED(hr = d2d_d3d_render_target_CreateBitmap(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = d2d_device_context_CreateBitmap(&render_target->ID2D1DeviceContext_iface, bitmap_size, opacity_values, bitmap_size.width, &bitmap_desc, &opacity_bitmap))) { ERR("Failed to create opacity bitmap, hr %#x.\n", hr); @@ -1213,7 +1220,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta brush_desc.transform._22 = 1.0f; brush_desc.transform._31 = run_rect.left; brush_desc.transform._32 = run_rect.top; - if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = d2d_device_context_CreateBitmapBrush(&render_target->ID2D1DeviceContext_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { ERR("Failed to create opacity bitmap brush, hr %#x.\n", hr); @@ -1228,7 +1235,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta m = *transform; *transform = identity; - d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), + d2d_device_context_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), unsafe_impl_from_ID2D1Brush((ID2D1Brush *)opacity_brush)); *transform = m; @@ -1243,11 +1250,11 @@ done: IDWriteGlyphRunAnalysis_Release(analysis); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext *iface, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; @@ -1319,74 +1326,74 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg } if (rendering_mode == DWRITE_RENDERING_MODE_OUTLINE) - d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); + d2d_device_context_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else - d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, + d2d_device_context_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, rendering_mode, measuring_mode, antialias_mode); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_SetTransform(ID2D1DeviceContext *iface, const D2D1_MATRIX_3X2_F *transform) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, transform %p.\n", iface, transform); render_target->drawing_state.transform = *transform; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_GetTransform(ID2D1DeviceContext *iface, D2D1_MATRIX_3X2_F *transform) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, transform %p.\n", iface, transform); *transform = render_target->drawing_state.transform; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_SetAntialiasMode(ID2D1DeviceContext *iface, D2D1_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); render_target->drawing_state.antialiasMode = antialias_mode; } -static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1RenderTarget *iface) +static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_device_context_GetAntialiasMode(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); return render_target->drawing_state.antialiasMode; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_SetTextAntialiasMode(ID2D1DeviceContext *iface, D2D1_TEXT_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); render_target->drawing_state.textAntialiasMode = antialias_mode; } -static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) +static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_device_context_GetTextAntialiasMode(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); return render_target->drawing_state.textAntialiasMode; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_SetTextRenderingParams(ID2D1DeviceContext *iface, IDWriteRenderingParams *text_rendering_params) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); @@ -1397,10 +1404,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1 render_target->text_rendering_params = text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_GetTextRenderingParams(ID2D1DeviceContext *iface, IDWriteRenderingParams **text_rendering_params) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); @@ -1408,9 +1415,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1 IDWriteRenderingParams_AddRef(*text_rendering_params); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2) +static void STDMETHODCALLTYPE d2d_device_context_SetTags(ID2D1DeviceContext *iface, D2D1_TAG tag1, D2D1_TAG tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); @@ -1418,9 +1425,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *i render_target->drawing_state.tag2 = tag2; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) +static void STDMETHODCALLTYPE d2d_device_context_GetTags(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); @@ -1428,29 +1435,29 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *i *tag2 = render_target->drawing_state.tag2; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_PushLayer(ID2D1DeviceContext *iface, const D2D1_LAYER_PARAMETERS *layer_parameters, ID2D1Layer *layer) { FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PopLayer(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_device_context_PopLayer(ID2D1DeviceContext *iface) { FIXME("iface %p stub!\n", iface); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) +static HRESULT STDMETHODCALLTYPE d2d_device_context_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_SaveDrawingState(ID2D1DeviceContext *iface, ID2D1DrawingStateBlock *state_block) { struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, state_block %p.\n", iface, state_block); @@ -1462,11 +1469,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1Render state_block_impl->text_rendering_params = render_target->text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_RestoreDrawingState(ID2D1DeviceContext *iface, ID2D1DrawingStateBlock *state_block) { struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, state_block %p.\n", iface, state_block); @@ -1478,10 +1485,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1Ren render_target->text_rendering_params = state_block_impl->text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_device_context_PushAxisAlignedClip(ID2D1DeviceContext *iface, const D2D1_RECT_F *clip_rect, D2D1_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); D2D1_RECT_F transformed_rect; float x_scale, y_scale; D2D1_POINT_2F point; @@ -1510,18 +1517,18 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1Ren WARN("Failed to push clip rect.\n"); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_device_context_PopAxisAlignedClip(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); d2d_clip_stack_pop(&render_target->clip_stack); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *colour) +static void STDMETHODCALLTYPE d2d_device_context_Clear(ID2D1DeviceContext *iface, const D2D1_COLOR_F *colour) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); D3D10_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb ps_cb_data = {0}; D3D10_BUFFER_DESC buffer_desc; @@ -1589,26 +1596,26 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - d2d_rt_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, render_target->ib, 6, + d2d_device_context_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, render_target->ib, 6, render_target->vb, render_target->vb_stride, vs_cb, ps_cb, NULL, NULL); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_device_context_BeginDraw(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); memset(&render_target->error, 0, sizeof(render_target->error)); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_device_context_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); @@ -1620,10 +1627,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget return render_target->error.code; } -static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface, +static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_device_context_GetPixelFormat(ID2D1DeviceContext *iface, D2D1_PIXEL_FORMAT *format) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, format %p.\n", iface, format); @@ -1631,9 +1638,9 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelForma return format; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *iface, float dpi_x, float dpi_y) +static void STDMETHODCALLTYPE d2d_device_context_SetDpi(ID2D1DeviceContext *iface, float dpi_x, float dpi_y) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, dpi_x %.8e, dpi_y %.8e.\n", iface, dpi_x, dpi_y); @@ -1649,9 +1656,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if render_target->desc.dpiY = dpi_y; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_device_context_GetDpi(ID2D1DeviceContext *iface, float *dpi_x, float *dpi_y) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -1659,9 +1666,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *if *dpi_y = render_target->desc.dpiY; } -static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface, D2D1_SIZE_F *size) +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_device_context_GetSize(ID2D1DeviceContext *iface, D2D1_SIZE_F *size) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, size %p.\n", iface, size); @@ -1670,10 +1677,10 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1Render return size; } -static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface, +static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_device_context_GetPixelSize(ID2D1DeviceContext *iface, D2D1_SIZE_U *pixel_size) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); @@ -1681,14 +1688,14 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1R return pixel_size; } -static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) +static UINT32 STDMETHODCALLTYPE d2d_device_context_GetMaximumBitmapSize(ID2D1DeviceContext *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static BOOL STDMETHODCALLTYPE d2d_d3d_render_target_IsSupported(ID2D1RenderTarget *iface, +static BOOL STDMETHODCALLTYPE d2d_device_context_IsSupported(ID2D1DeviceContext *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { FIXME("iface %p, desc %p stub!\n", iface, desc); @@ -1696,70 +1703,379 @@ static BOOL STDMETHODCALLTYPE d2d_d3d_render_target_IsSupported(ID2D1RenderTarge return FALSE; } -static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = -{ - d2d_d3d_render_target_QueryInterface, - d2d_d3d_render_target_AddRef, - d2d_d3d_render_target_Release, - d2d_d3d_render_target_GetFactory, - d2d_d3d_render_target_CreateBitmap, - d2d_d3d_render_target_CreateBitmapFromWicBitmap, - d2d_d3d_render_target_CreateSharedBitmap, - d2d_d3d_render_target_CreateBitmapBrush, - d2d_d3d_render_target_CreateSolidColorBrush, - d2d_d3d_render_target_CreateGradientStopCollection, - d2d_d3d_render_target_CreateLinearGradientBrush, - d2d_d3d_render_target_CreateRadialGradientBrush, - d2d_d3d_render_target_CreateCompatibleRenderTarget, - d2d_d3d_render_target_CreateLayer, - d2d_d3d_render_target_CreateMesh, - d2d_d3d_render_target_DrawLine, - d2d_d3d_render_target_DrawRectangle, - d2d_d3d_render_target_FillRectangle, - d2d_d3d_render_target_DrawRoundedRectangle, - d2d_d3d_render_target_FillRoundedRectangle, - d2d_d3d_render_target_DrawEllipse, - d2d_d3d_render_target_FillEllipse, - d2d_d3d_render_target_DrawGeometry, - d2d_d3d_render_target_FillGeometry, - d2d_d3d_render_target_FillMesh, - d2d_d3d_render_target_FillOpacityMask, - d2d_d3d_render_target_DrawBitmap, - d2d_d3d_render_target_DrawText, - d2d_d3d_render_target_DrawTextLayout, - d2d_d3d_render_target_DrawGlyphRun, - d2d_d3d_render_target_SetTransform, - d2d_d3d_render_target_GetTransform, - d2d_d3d_render_target_SetAntialiasMode, - d2d_d3d_render_target_GetAntialiasMode, - d2d_d3d_render_target_SetTextAntialiasMode, - d2d_d3d_render_target_GetTextAntialiasMode, - d2d_d3d_render_target_SetTextRenderingParams, - d2d_d3d_render_target_GetTextRenderingParams, - d2d_d3d_render_target_SetTags, - d2d_d3d_render_target_GetTags, - d2d_d3d_render_target_PushLayer, - d2d_d3d_render_target_PopLayer, - d2d_d3d_render_target_Flush, - d2d_d3d_render_target_SaveDrawingState, - d2d_d3d_render_target_RestoreDrawingState, - d2d_d3d_render_target_PushAxisAlignedClip, - d2d_d3d_render_target_PopAxisAlignedClip, - d2d_d3d_render_target_Clear, - d2d_d3d_render_target_BeginDraw, - d2d_d3d_render_target_EndDraw, - d2d_d3d_render_target_GetPixelFormat, - d2d_d3d_render_target_SetDpi, - d2d_d3d_render_target_GetDpi, - d2d_d3d_render_target_GetSize, - d2d_d3d_render_target_GetPixelSize, - d2d_d3d_render_target_GetMaximumBitmapSize, - d2d_d3d_render_target_IsSupported, +static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmap(ID2D1DeviceContext *iface, + D2D1_SIZE_U size, const void *src_data, UINT32 pitch, + const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p stub!\n", + iface, size.width, size.height, src_data, pitch, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapFromWicBitmap( + ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, + const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, bitmap_source %p, desc %p, bitmap %p stub!\n", iface, bitmap_source, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContext(ID2D1DeviceContext *iface, + D2D1_COLOR_SPACE space, const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %#x, profile %p, profile_size %u, color_context %p stub!\n", + iface, space, profile, profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromFilename(ID2D1DeviceContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicColorContext(ID2D1DeviceContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, + IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, surface %p, desc %p, bitmap %p stub!\n", iface, surface, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, + REFCLSID effect_id, ID2D1Effect **effect) +{ + FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection( + ID2D1DeviceContext *iface, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, + D2D1_COLOR_SPACE preinterpolation_space, D2D1_COLOR_SPACE postinterpolation_space, + D2D1_BUFFER_PRECISION buffer_precision, D2D1_EXTEND_MODE extend_mode, + D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, ID2D1GradientStopCollection1 **gradient) +{ + FIXME("iface %p, stops %p, stop_count %u, preinterpolation_space %#x, postinterpolation_space %#x, " + "buffer_precision %#x, extend_mode %#x, color_interpolation_mode %#x, gradient %p stub!\n", + iface, stops, stop_count, preinterpolation_space, postinterpolation_space, + buffer_precision, extend_mode, color_interpolation_mode, gradient); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1DeviceContext *iface, + ID2D1Image *image, const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, + const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1ImageBrush **brush) +{ + FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n", + iface, image, image_brush_desc, brush_desc, brush); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush(ID2D1DeviceContext *iface, + ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, + const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush1 **bitmap_brush) +{ + FIXME("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, bitmap_brush %p stub!\n", iface, bitmap, + bitmap_brush_desc, brush_desc, bitmap_brush); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCommandList(ID2D1DeviceContext *iface, + ID2D1CommandList **command_list) +{ + FIXME("iface %p, command_list %p stub!\n", iface, command_list); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_device_context_IsDxgiFormatSupported(ID2D1DeviceContext *iface, DXGI_FORMAT format) +{ + FIXME("iface %p, format %#x stub!\n", iface, format); + + return FALSE; +} + +static BOOL STDMETHODCALLTYPE d2d_device_context_IsBufferPrecisionSupported(ID2D1DeviceContext *iface, + D2D1_BUFFER_PRECISION buffer_precision) +{ + FIXME("iface %p, buffer_precision %#x stub!\n", iface, buffer_precision); + + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext *iface, + ID2D1Image *image, D2D1_RECT_F *local_bounds) +{ + FIXME("iface %p, image %p, local_bounds %p stub!\n", iface, image, local_bounds); +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetImageWorldBounds(ID2D1DeviceContext *iface, + ID2D1Image *image, D2D1_RECT_F *world_bounds) +{ + FIXME("iface %p, image %p, world_bounds %p stub!\n", iface, image, world_bounds); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetGlyphRunWorldBounds(ID2D1DeviceContext *iface, + D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, + DWRITE_MEASURING_MODE measuring_mode, D2D1_RECT_F *bounds) +{ + FIXME("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, measuring_mode %#x, bounds %p stub!\n", iface, + baseline_origin.x, baseline_origin.y, glyph_run, measuring_mode, bounds); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_device_context_GetDevice(ID2D1DeviceContext *iface, ID2D1Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *iface, ID2D1Image *target) +{ + FIXME("iface %p, target %p stub!\n", iface, target); +} + +static void STDMETHODCALLTYPE d2d_device_context_GetTarget(ID2D1DeviceContext *iface, ID2D1Image **target) +{ + FIXME("iface %p, target %p stub!\n", iface, target); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetRenderingControls(ID2D1DeviceContext *iface, + const D2D1_RENDERING_CONTROLS *rendering_controls) +{ + FIXME("iface %p, rendering_controls %p stub!\n", iface, rendering_controls); +} + +static void STDMETHODCALLTYPE d2d_device_context_GetRenderingControls(ID2D1DeviceContext *iface, + D2D1_RENDERING_CONTROLS *rendering_controls) +{ + FIXME("iface %p, rendering_controls %p stub!\n", iface, rendering_controls); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetPrimitiveBlend(ID2D1DeviceContext *iface, + D2D1_PRIMITIVE_BLEND primitive_blend) +{ + FIXME("iface %p, primitive_blend %#x stub!\n", iface, primitive_blend); +} + +static D2D1_PRIMITIVE_BLEND STDMETHODCALLTYPE d2d_device_context_GetPrimitiveBlend(ID2D1DeviceContext *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_PRIMITIVE_BLEND_SOURCE_OVER; +} + +static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext *iface, D2D1_UNIT_MODE unit_mode) +{ + FIXME("iface %p, unit_mode %#x stub!\n", iface, unit_mode); +} + +static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_UNIT_MODE_DIPS; +} + +static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun(ID2D1DeviceContext *iface, + D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, + const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) +{ + FIXME("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, " + "glyph_run_desc %p, brush %p, measuring_mode %#x stub!\n", + iface, baseline_origin.x, baseline_origin.y, glyph_run, glyph_run_desc, brush, measuring_mode); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *iface, ID2D1Image *image, + const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, + D2D1_COMPOSITE_MODE composite_mode) +{ + FIXME("iface %p, image %p, target_offset %p, image_rect %s, interpolation_mode %#x, composite_mode %#x stub!\n", + iface, image, target_offset, debug_d2d_rect_f(image_rect), interpolation_mode, composite_mode); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawGdiMetafile(ID2D1DeviceContext *iface, + ID2D1GdiMetafile *metafile, const D2D1_POINT_2F *target_offset) +{ + FIXME("iface %p, metafile %p, target_offset %p stub!\n", iface, metafile, target_offset); +} + +static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawBitmap(ID2D1DeviceContext *iface, + ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) +{ + FIXME("iface %p, bitmap %p, dst_rect %s, opacity %.8e, interpolation_mode %#x, " + "src_rect %s, perspective_transform %p stub!\n", + iface, bitmap, debug_d2d_rect_f(dst_rect), opacity, interpolation_mode, + debug_d2d_rect_f(src_rect), perspective_transform); +} + +static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_PushLayer(ID2D1DeviceContext *iface, + const D2D1_LAYER_PARAMETERS1 *layer_parameters, ID2D1Layer *layer) +{ + FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_InvalidateEffectInputRectangle(ID2D1DeviceContext *iface, + ID2D1Effect *effect, UINT32 input, const D2D1_RECT_F *input_rect) +{ + FIXME("iface %p, effect %p, input %u, input_rect %s stub!\n", + iface, effect, input, debug_d2d_rect_f(input_rect)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectInvalidRectangleCount(ID2D1DeviceContext *iface, + ID2D1Effect *effect, UINT32 *rect_count) +{ + FIXME("iface %p, effect %p, rect_count %p stub!\n", iface, effect, rect_count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectInvalidRectangles(ID2D1DeviceContext *iface, + ID2D1Effect *effect, D2D1_RECT_F *rectangles, UINT32 rect_count) +{ + FIXME("iface %p, effect %p, rectangles %p, rect_count %u stub!\n", iface, effect, rectangles, rect_count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectRequiredInputRectangles(ID2D1DeviceContext *iface, + ID2D1Effect *effect, const D2D1_RECT_F *image_rect, const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + D2D1_RECT_F *input_rect, UINT32 input_count) +{ + FIXME("iface %p, effect %p, image_rect %s, desc %p, input_rect %p, input_count %u stub!\n", + iface, effect, debug_d2d_rect_f(image_rect), desc, input_rect, input_count); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityMask(ID2D1DeviceContext *iface, + ID2D1Bitmap *mask, ID2D1Brush *brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) +{ + FIXME("iface %p, mask %p, brush %p, dst_rect %s, src_rect %s stub!\n", + iface, mask, brush, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); +} + +static const struct ID2D1DeviceContextVtbl d2d_device_context_vtbl = +{ + d2d_device_context_QueryInterface, + d2d_device_context_AddRef, + d2d_device_context_Release, + d2d_device_context_GetFactory, + d2d_device_context_CreateBitmap, + d2d_device_context_CreateBitmapFromWicBitmap, + d2d_device_context_CreateSharedBitmap, + d2d_device_context_CreateBitmapBrush, + d2d_device_context_CreateSolidColorBrush, + d2d_device_context_CreateGradientStopCollection, + d2d_device_context_CreateLinearGradientBrush, + d2d_device_context_CreateRadialGradientBrush, + d2d_device_context_CreateCompatibleRenderTarget, + d2d_device_context_CreateLayer, + d2d_device_context_CreateMesh, + d2d_device_context_DrawLine, + d2d_device_context_DrawRectangle, + d2d_device_context_FillRectangle, + d2d_device_context_DrawRoundedRectangle, + d2d_device_context_FillRoundedRectangle, + d2d_device_context_DrawEllipse, + d2d_device_context_FillEllipse, + d2d_device_context_DrawGeometry, + d2d_device_context_FillGeometry, + d2d_device_context_FillMesh, + d2d_device_context_FillOpacityMask, + d2d_device_context_DrawBitmap, + d2d_device_context_DrawText, + d2d_device_context_DrawTextLayout, + d2d_device_context_DrawGlyphRun, + d2d_device_context_SetTransform, + d2d_device_context_GetTransform, + d2d_device_context_SetAntialiasMode, + d2d_device_context_GetAntialiasMode, + d2d_device_context_SetTextAntialiasMode, + d2d_device_context_GetTextAntialiasMode, + d2d_device_context_SetTextRenderingParams, + d2d_device_context_GetTextRenderingParams, + d2d_device_context_SetTags, + d2d_device_context_GetTags, + d2d_device_context_PushLayer, + d2d_device_context_PopLayer, + d2d_device_context_Flush, + d2d_device_context_SaveDrawingState, + d2d_device_context_RestoreDrawingState, + d2d_device_context_PushAxisAlignedClip, + d2d_device_context_PopAxisAlignedClip, + d2d_device_context_Clear, + d2d_device_context_BeginDraw, + d2d_device_context_EndDraw, + d2d_device_context_GetPixelFormat, + d2d_device_context_SetDpi, + d2d_device_context_GetDpi, + d2d_device_context_GetSize, + d2d_device_context_GetPixelSize, + d2d_device_context_GetMaximumBitmapSize, + d2d_device_context_IsSupported, + d2d_device_context_ID2D1DeviceContext_CreateBitmap, + d2d_device_context_ID2D1DeviceContext_CreateBitmapFromWicBitmap, + d2d_device_context_CreateColorContext, + d2d_device_context_CreateColorContextFromFilename, + d2d_device_context_CreateColorContextFromWicColorContext, + d2d_device_context_CreateBitmapFromDxgiSurface, + d2d_device_context_CreateEffect, + d2d_device_context_ID2D1DeviceContext_CreateGradientStopCollection, + d2d_device_context_CreateImageBrush, + d2d_device_context_ID2D1DeviceContext_CreateBitmapBrush, + d2d_device_context_CreateCommandList, + d2d_device_context_IsDxgiFormatSupported, + d2d_device_context_IsBufferPrecisionSupported, + d2d_device_context_GetImageLocalBounds, + d2d_device_context_GetImageWorldBounds, + d2d_device_context_GetGlyphRunWorldBounds, + d2d_device_context_GetDevice, + d2d_device_context_SetTarget, + d2d_device_context_GetTarget, + d2d_device_context_SetRenderingControls, + d2d_device_context_GetRenderingControls, + d2d_device_context_SetPrimitiveBlend, + d2d_device_context_GetPrimitiveBlend, + d2d_device_context_SetUnitMode, + d2d_device_context_GetUnitMode, + d2d_device_context_ID2D1DeviceContext_DrawGlyphRun, + d2d_device_context_DrawImage, + d2d_device_context_DrawGdiMetafile, + d2d_device_context_ID2D1DeviceContext_DrawBitmap, + d2d_device_context_ID2D1DeviceContext_PushLayer, + d2d_device_context_InvalidateEffectInputRectangle, + d2d_device_context_GetEffectInvalidRectangleCount, + d2d_device_context_GetEffectInvalidRectangles, + d2d_device_context_GetEffectRequiredInputRectangles, + d2d_device_context_ID2D1DeviceContext_FillOpacityMask, }; -static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) +static inline struct d2d_device_context *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) { - return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); + return CONTAINING_RECORD(iface, struct d2d_device_context, IDWriteTextRenderer_iface); } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) @@ -1783,20 +2099,20 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRen static ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); TRACE("iface %p.\n", iface); - return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); + return d2d_device_context_AddRef(&render_target->ID2D1DeviceContext_iface); } static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); TRACE("iface %p.\n", iface); - return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); + return d2d_device_context_Release(&render_target->ID2D1DeviceContext_iface); } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, @@ -1814,18 +2130,18 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWri static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, void *ctx, DWRITE_MATRIX *transform) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); TRACE("iface %p, ctx %p, transform %p.\n", iface, ctx, transform); - ID2D1RenderTarget_GetTransform(&render_target->ID2D1RenderTarget_iface, (D2D1_MATRIX_3X2_F *)transform); + d2d_device_context_GetTransform(&render_target->ID2D1DeviceContext_iface, (D2D1_MATRIX_3X2_F *)transform); return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); TRACE("iface %p, ctx %p, ppd %p.\n", iface, ctx, ppd); @@ -1838,7 +2154,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; struct d2d_draw_text_layout_ctx *context = ctx; BOOL color_font = FALSE; @@ -1920,7 +2236,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende color_brush = brush; else { - if (FAILED(hr = ID2D1RenderTarget_CreateSolidColorBrush(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = d2d_device_context_CreateSolidColorBrush(&render_target->ID2D1DeviceContext_iface, &color_run->runColor, NULL, (ID2D1SolidColorBrush **)&color_brush))) { ERR("Failed to create solid color brush, hr %#x.\n", hr); @@ -1930,7 +2246,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende origin.x = color_run->baselineOriginX; origin.y = color_run->baselineOriginY; - ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + d2d_device_context_DrawGlyphRun(&render_target->ID2D1DeviceContext_iface, origin, &color_run->glyphRun, color_brush, measuring_mode); if (color_brush != brush) @@ -1940,7 +2256,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende IDWriteColorGlyphRunEnumerator_Release(layers); } else - ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + d2d_device_context_DrawGlyphRun(&render_target->ID2D1DeviceContext_iface, baseline_origin, glyph_run, brush, measuring_mode); ID2D1Brush_Release(brush); @@ -1951,7 +2267,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; D2D1_ANTIALIAS_MODE prev_antialias_mode; @@ -1972,8 +2288,8 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend start.y = baseline_origin_y + underline->offset + thickness / 2.0f; end.x = start.x + underline->width; end.y = start.y; - prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); - d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + prev_antialias_mode = d2d_device_context_set_aa_mode_from_text_aa_mode(render_target); + d2d_device_context_DrawLine(&render_target->ID2D1DeviceContext_iface, start, end, brush, thickness, NULL); render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush); @@ -1984,7 +2300,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { - struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + struct d2d_device_context *render_target = impl_from_IDWriteTextRenderer(iface); const D2D1_MATRIX_3X2_F *m = &render_target->drawing_state.transform; struct d2d_draw_text_layout_ctx *context = ctx; D2D1_ANTIALIAS_MODE prev_antialias_mode; @@ -2005,8 +2321,8 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText start.y = baseline_origin_y + strikethrough->offset + thickness / 2.0f; end.x = start.x + strikethrough->width; end.y = start.y; - prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); - d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + prev_antialias_mode = d2d_device_context_set_aa_mode_from_text_aa_mode(render_target); + d2d_device_context_DrawLine(&render_target->ID2D1DeviceContext_iface, start, end, brush, thickness, NULL); render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush); @@ -2053,15 +2369,15 @@ static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl = d2d_text_renderer_DrawInlineObject, }; -static inline struct d2d_d3d_render_target *impl_from_ID2D1GdiInteropRenderTarget(ID2D1GdiInteropRenderTarget *iface) +static inline struct d2d_device_context *impl_from_ID2D1GdiInteropRenderTarget(ID2D1GdiInteropRenderTarget *iface) { - return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, ID2D1GdiInteropRenderTarget_iface); + return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1GdiInteropRenderTarget_iface); } static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_QueryInterface(ID2D1GdiInteropRenderTarget *iface, REFIID iid, void **out) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -2070,7 +2386,7 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_QueryInterface(ID static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_AddRef(ID2D1GdiInteropRenderTarget *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); TRACE("iface %p.\n", iface); @@ -2079,14 +2395,14 @@ static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_AddRef(ID2D1GdiInte static ULONG STDMETHODCALLTYPE d2d_gdi_interop_render_target_Release(ID2D1GdiInteropRenderTarget *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); TRACE("iface %p.\n", iface); return IUnknown_Release(render_target->outer_unknown); } -static HRESULT d2d_d3d_render_target_get_surface(struct d2d_d3d_render_target *render_target, IDXGISurface1 **surface) +static HRESULT d2d_device_context_get_surface(struct d2d_device_context *render_target, IDXGISurface1 **surface) { ID3D10Resource *resource; HRESULT hr; @@ -2107,13 +2423,13 @@ static HRESULT d2d_d3d_render_target_get_surface(struct d2d_d3d_render_target *r static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_GetDC(ID2D1GdiInteropRenderTarget *iface, D2D1_DC_INITIALIZE_MODE mode, HDC *dc) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); IDXGISurface1 *surface; HRESULT hr; TRACE("iface %p, mode %d, dc %p.\n", iface, mode, dc); - if (FAILED(hr = d2d_d3d_render_target_get_surface(render_target, &surface))) + if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) return hr; hr = IDXGISurface1_GetDC(surface, mode != D2D1_DC_INITIALIZE_MODE_COPY, dc); @@ -2125,14 +2441,14 @@ static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_GetDC(ID2D1GdiInt static HRESULT STDMETHODCALLTYPE d2d_gdi_interop_render_target_ReleaseDC(ID2D1GdiInteropRenderTarget *iface, const RECT *update) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1GdiInteropRenderTarget(iface); IDXGISurface1 *surface; RECT update_rect; HRESULT hr; TRACE("iface %p, update rect %s.\n", iface, wine_dbgstr_rect(update)); - if (FAILED(hr = d2d_d3d_render_target_get_surface(render_target, &surface))) + if (FAILED(hr = d2d_device_context_get_surface(render_target, &surface))) return hr; if (update) @@ -2152,7 +2468,7 @@ static const struct ID2D1GdiInteropRenderTargetVtbl d2d_gdi_interop_render_targe d2d_gdi_interop_render_target_ReleaseDC, }; -static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, +static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc) { D3D10_SUBRESOURCE_DATA buffer_data; @@ -3032,7 +3348,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t if (desc->minLevel != D2D1_FEATURE_LEVEL_DEFAULT) WARN("Ignoring feature level %#x.\n", desc->minLevel); - render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; + render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; @@ -3040,7 +3356,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t ID2D1Factory_AddRef(render_target->factory); render_target->outer_unknown = outer_unknown ? outer_unknown : - (IUnknown *)&render_target->ID2D1RenderTarget_iface; + (IUnknown *)&render_target->ID2D1DeviceContext_iface; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3241,13 +3557,13 @@ err: HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surface, IUnknown *outer_unknown, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_d3d_render_target *object; + struct d2d_device_context *object; HRESULT hr; if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_d3d_render_target_init(object, factory, surface, outer_unknown, desc))) + if (FAILED(hr = d2d_device_context_init(object, factory, surface, outer_unknown, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); heap_free(object); @@ -3255,14 +3571,14 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac } TRACE("Created render target %p.\n", object); - *render_target = &object->ID2D1RenderTarget_iface; + *render_target = (ID2D1RenderTarget *)&object->ID2D1DeviceContext_iface; return S_OK; } HRESULT d2d_d3d_render_target_create_rtv(ID2D1RenderTarget *iface, IDXGISurface1 *surface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_device_context *render_target = impl_from_ID2D1RenderTarget(iface); DXGI_SURFACE_DESC surface_desc; ID3D10RenderTargetView *view; ID3D10Resource *resource; -- 2.11.0

1 0

[PATCH 2/3] d2d1/tests: Run the tests in parallel.
by Henri Verbeet 17 Aug '18

17 Aug '18

Like d3d11. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 132 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 105 insertions(+), 27 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 26c81e660ea..a8b67f144b3 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -25,6 +25,15 @@ #include "initguid.h" #include "dwrite.h" #include "wincodec.h" +#include "wine/heap.h" + +static BOOL use_mt = TRUE; + +static struct test_entry +{ + void (*test)(void); +} *mt_tests; +size_t mt_tests_size, mt_test_count; struct resource_readback { @@ -83,6 +92,63 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +static void queue_test(void (*test)(void)) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*mt_tests)); + } + mt_tests[mt_test_count++].test = test; +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + mt_tests[j].test(); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + mt_tests[i].test(); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_point(D2D1_POINT_2F *point, float x, float y) { point->x = x; @@ -6465,31 +6531,43 @@ static void test_create_device(void) START_TEST(d2d1) { - test_clip(); - test_state_block(); - test_color_brush(); - test_bitmap_brush(); - test_linear_brush(); - test_radial_brush(); - test_path_geometry(); - test_rectangle_geometry(); - test_rounded_rectangle_geometry(); - test_bitmap_formats(); - test_alpha_mode(); - test_shared_bitmap(); - test_bitmap_updates(); - test_opacity_brush(); - test_create_target(); - test_draw_text_layout(); - test_dc_target(); - test_hwnd_target(); - test_bitmap_target(); - test_desktop_dpi(); - test_stroke_style(); - test_gradient(); - test_draw_geometry(); - test_gdi_interop(); - test_layer(); - test_bezier_intersect(); - test_create_device(); + unsigned int argc, i; + char **argv; + + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--single")) + use_mt = FALSE; + } + + queue_test(test_clip); + queue_test(test_state_block); + queue_test(test_color_brush); + queue_test(test_bitmap_brush); + queue_test(test_linear_brush); + queue_test(test_radial_brush); + queue_test(test_path_geometry); + queue_test(test_rectangle_geometry); + queue_test(test_rounded_rectangle_geometry); + queue_test(test_bitmap_formats); + queue_test(test_alpha_mode); + queue_test(test_shared_bitmap); + queue_test(test_bitmap_updates); + queue_test(test_opacity_brush); + queue_test(test_create_target); + queue_test(test_draw_text_layout); + queue_test(test_dc_target); + queue_test(test_hwnd_target); + queue_test(test_bitmap_target); + queue_test(test_desktop_dpi); + queue_test(test_stroke_style); + queue_test(test_gradient); + queue_test(test_draw_geometry); + queue_test(test_gdi_interop); + queue_test(test_layer); + queue_test(test_bezier_intersect); + queue_test(test_create_device); + + run_queued_tests(); } -- 2.11.0

1 0

[PATCH 1/3] wined3d: Move OpenGL initialisation code to adapter_gl.c.
by Henri Verbeet 17 Aug '18

17 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/{directx.c => adapter_gl.c} | 2970 ++------------------ dlls/wined3d/directx.c | 4372 +----------------------------- dlls/wined3d/wined3d_private.h | 43 + 4 files changed, 341 insertions(+), 7045 deletions(-) copy dlls/wined3d/{directx.c => adapter_gl.c} (59%) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 58fc2d5f42d..39fed381d97 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = wined3d IMPORTS = opengl32 user32 gdi32 advapi32 C_SRCS = \ + adapter_gl.c \ arb_program_shader.c \ ati_fragment_shader.c \ buffer.c \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/adapter_gl.c similarity index 59% copy from dlls/wined3d/directx.c copy to dlls/wined3d/adapter_gl.c index 65a1bb1fabe..686c79ac73f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/adapter_gl.c @@ -4,7 +4,7 @@ * Copyright 2004 Christian Costa * Copyright 2005 Oliver Stieber * Copyright 2007-2008 Stefan Dösinger for CodeWeavers - * Copyright 2009-2011 Henri Verbeet for CodeWeavers + * Copyright 2009-2011, 2018 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 @@ -27,47 +27,11 @@ #include <stdio.h> #include "wined3d_private.h" -#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); -#define DEFAULT_REFRESH_RATE 0 - -/* The driver names reflect the lowest GPU supported - * by a certain driver, so DRIVER_AMD_R300 supports - * R3xx, R4xx and R5xx GPUs. */ -enum wined3d_display_driver -{ - DRIVER_AMD_RAGE_128PRO, - DRIVER_AMD_R100, - DRIVER_AMD_R300, - DRIVER_AMD_R600, - DRIVER_AMD_RX, - DRIVER_INTEL_GMA800, - DRIVER_INTEL_GMA900, - DRIVER_INTEL_GMA950, - DRIVER_INTEL_GMA3000, - DRIVER_INTEL_HD4000, - DRIVER_NVIDIA_TNT, - DRIVER_NVIDIA_GEFORCE2MX, - DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6, - DRIVER_NVIDIA_GEFORCE8, - DRIVER_VMWARE, - DRIVER_UNKNOWN -}; - -enum wined3d_driver_model -{ - DRIVER_MODEL_GENERIC, - DRIVER_MODEL_WIN9X, - DRIVER_MODEL_NT40, - DRIVER_MODEL_NT5X, - DRIVER_MODEL_NT6X -}; - enum wined3d_gl_vendor { GL_VENDOR_UNKNOWN, @@ -77,10 +41,6 @@ enum wined3d_gl_vendor GL_VENDOR_NVIDIA, }; -/* The d3d device ID */ -static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; - -/* Extension detection */ struct wined3d_extension_map { const char *extension_string; @@ -270,24 +230,6 @@ static const struct wined3d_extension_map wgl_extension_map[] = {"WGL_WINE_query_renderer", WGL_WINE_QUERY_RENDERER }, }; -/********************************************************** - * Utility functions follow - **********************************************************/ - -const struct min_lookup minMipLookup[] = -{ - /* NONE POINT LINEAR */ - {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* NONE */ - {{GL_NEAREST, GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST_MIPMAP_LINEAR}}, /* POINT*/ - {{GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_LINEAR}}, /* LINEAR */ -}; - -const GLenum magLookup[] = -{ - /* NONE POINT LINEAR */ - GL_NEAREST, GL_NEAREST, GL_LINEAR, -}; - static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) { const struct wined3d_gl_info *gl_info = ctx->gl_info; @@ -423,51 +365,6 @@ fail: return FALSE; } -/* Adjust the amount of used texture memory */ -UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) -{ - adapter->vram_bytes_used += amount; - TRACE("Adjusted used adapter memory by 0x%s to 0x%s.\n", - wine_dbgstr_longlong(amount), - wine_dbgstr_longlong(adapter->vram_bytes_used)); - return adapter->vram_bytes_used; -} - -static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) -{ - heap_free(adapter->gl_info.formats); - heap_free(adapter->cfgs); -} - -ULONG CDECL wined3d_incref(struct wined3d *wined3d) -{ - ULONG refcount = InterlockedIncrement(&wined3d->ref); - - TRACE("%p increasing refcount to %u.\n", wined3d, refcount); - - return refcount; -} - -ULONG CDECL wined3d_decref(struct wined3d *wined3d) -{ - ULONG refcount = InterlockedDecrement(&wined3d->ref); - - TRACE("%p decreasing refcount to %u.\n", wined3d, refcount); - - if (!refcount) - { - unsigned int i; - - for (i = 0; i < wined3d->adapter_count; ++i) - { - wined3d_adapter_cleanup(&wined3d->adapters[i]); - } - heap_free(wined3d); - } - - return refcount; -} - /* Context activation is done by the caller. */ static BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_info) { @@ -508,47 +405,42 @@ static BOOL match_amd_r300_to_500(const struct wined3d_gl_info *gl_info, struct const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (card_vendor != HW_VENDOR_AMD) return FALSE; - if (device == CARD_AMD_RADEON_9500) return TRUE; - if (device == CARD_AMD_RADEON_X700) return TRUE; - if (device == CARD_AMD_RADEON_X1600) return TRUE; - return FALSE; + return card_vendor == HW_VENDOR_AMD + && (device == CARD_AMD_RADEON_9500 + || device == CARD_AMD_RADEON_X700 + || device == CARD_AMD_RADEON_X1600); } static BOOL match_geforce5(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - if (card_vendor == HW_VENDOR_NVIDIA) - { - if (device == CARD_NVIDIA_GEFORCEFX_5200 || - device == CARD_NVIDIA_GEFORCEFX_5600 || - device == CARD_NVIDIA_GEFORCEFX_5800) - { - return TRUE; - } - } - return FALSE; + return card_vendor == HW_VENDOR_NVIDIA + && (device == CARD_NVIDIA_GEFORCEFX_5200 + || device == CARD_NVIDIA_GEFORCEFX_5600 + || device == CARD_NVIDIA_GEFORCEFX_5800); } static BOOL match_apple(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from - * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to - * detect the Apple OpenGL implementation to apply some extension fixups afterwards. + /* MacOS has various specialities in the extensions it advertises. Some + * have to be loaded from the OpenGL 1.2+ core, while other extensions are + * advertised, but software emulated. So try to detect the Apple OpenGL + * implementation to apply some extension fixups afterwards. * - * Detecting this isn't really easy. The vendor string doesn't mention Apple. Compile-time checks - * aren't sufficient either because a Linux binary may display on a macos X server via remote X11. - * So try to detect the GL implementation by looking at certain Apple extensions. Some extensions - * like client storage might be supported on other implementations too, but GL_APPLE_flush_render - * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So - * the chance that other implementations support them is rather small since Win32 QuickTime uses - * DirectDraw, not OpenGL. + * Detecting this isn't really easy. The vendor string doesn't mention + * Apple. Compile-time checks aren't sufficient either because a Linux + * binary may display on a MacOS X server via remote X11. So try to detect + * the OpenGL implementation by looking at certain Apple extensions. Some + * extensions like client storage might be supported on other + * implementations too, but GL_APPLE_flush_render is specific to the + * MacOS X window management, and GL_APPLE_ycbcr_422 is QuickTime + * specific. So the chance that other implementations support them is + * rather small since Win32 QuickTime uses DirectDraw, not OpenGL. * - * This test has been moved into wined3d_guess_gl_vendor() - */ + * This test has been moved into wined3d_guess_gl_vendor(). */ return gl_vendor == GL_VENDOR_APPLE; } @@ -639,13 +531,15 @@ static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, struct win const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) { - /* DX9 cards support 40 single float varyings in hardware, most drivers report 32. ATI misreports - * 44 varyings. So assume that if we have more than 44 varyings we have a dx10 card. - * This detection is for the gl_ClipPos varying quirk. If a d3d9 card really supports more than 44 - * varyings and we subtract one in dx9 shaders it's not going to hurt us because the dx9 limit is - * hardcoded + /* Direct3D 9 cards support 40 single float varyings in hardware, most + * drivers report 32. ATI misreports 44 varyings. So assume that if we + * have more than 44 varyings we have a Direct3D 10+ card. This detection + * is for the gl_ClipPos varying quirk. If a Direct3D 9 card really + * supports more than 44 varyings and we subtract one in Direct3D 9 + * shaders it's not going to hurt us because the Direct3D 9 limit is + * hardcoded. * - * dx10 cards usually have 64 varyings */ + * Direct3D 10 cards usually have 64 varyings. */ return gl_info->limits.glsl_varyings > 44; } @@ -935,27 +829,33 @@ static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) { - /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. - * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should - * allow 48 different offsets or other helper immediate values. */ + /* MacOS needs uniforms for relative addressing offsets. This can + * accumulate to quite a few uniforms. Beyond that the general uniform + * isn't optimal, so reserve a number of uniforms. 12 vec4's should allow + * 48 different offsets or other helper immediate values. */ TRACE("Reserving 12 GLSL constants for compiler private use.\n"); gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); } static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { - /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although - * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). - * If real NP2 textures are used, the driver falls back to software. We could just remove the - * extension and use GL_ARB_texture_rectangle instead, but texture_rectangle is inconvenient - * due to the non-normalized texture coordinates. Thus set an internal extension flag, - * GL_WINE_normalized_texrect, which signals the code that it can use non power of two textures - * as per GL_ARB_texture_non_power_of_two, but has to stick to the texture_rectangle limits. + /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and + * earlier cards, although these cards only support + * GL_ARB_texture_rectangle (D3DPTEXTURECAPS_NONPOW2CONDITIONAL). * - * fglrx doesn't advertise GL_ARB_texture_non_power_of_two, but it advertises opengl 2.0 which - * has this extension promoted to core. The extension loading code sets this extension supported - * due to that, so this code works on fglrx as well. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) + * If real NP2 textures are used, the driver falls back to software. We + * could just disable the extension and use GL_ARB_texture_rectangle + * instead, but texture_rectangle is inconvenient due to the + * non-normalised texture coordinates. Thus set an internal extension + * flag, GL_WINE_normalized_texrect, which signals the code that it can + * use non-power-of-two textures as per GL_ARB_texture_non_power_of_two, + * but has to stick to the texture_rectangle limits. + * + * Fglrx doesn't advertise GL_ARB_texture_non_power_of_two, but it + * advertises OpenGL 2.0, which has this extension promoted to core. The + * extension loading code sets this extension supported due to that, so + * this code works on fglrx as well. */ + if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) { TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; @@ -965,20 +865,26 @@ static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) static void quirk_no_np2(struct wined3d_gl_info *gl_info) { - /* The nVidia GeForceFX series reports OpenGL 2.0 capabilities with the latest drivers versions, but - * doesn't explicitly advertise the ARB_tex_npot extension in the GL extension string. - * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying - * within the limits enforced by the ARB_texture_rectangle extension. This however is not true for the - * FX series, which instantly falls back to a slower software path as soon as ARB_tex_npot is used. - * We therefore completely remove ARB_tex_npot from the list of supported extensions. + /* The NVIDIA GeForce FX series reports OpenGL 2.0 capabilities with the + * latest drivers versions, but doesn't explicitly advertise the + * ARB_tex_npot extension in the OpenGL extension string. This usually + * means that ARB_tex_npot is supported in hardware as long as the + * application is staying within the limits enforced by the + * ARB_texture_rectangle extension. This however is not true for the + * FX series, which instantly falls back to a slower software path as + * soon as ARB_tex_npot is used. We therefore completely remove + * ARB_tex_npot from the list of supported extensions. + * + * Note that WINE_normalized_texrect can't be used in this case because + * internally it uses ARB_tex_npot, triggering the software fallback. + * There is not much we can do here apart from disabling the + * software-emulated extension and re-enable ARB_tex_rect (which was + * previously disabled in wined3d_adapter_init_gl_caps). * - * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, - * triggering the software fallback. There is not much we can do here apart from disabling the - * software-emulated extension and re-enable ARB_tex_rect (which was previously disabled - * in wined3d_adapter_init_gl_caps). - * This fixup removes performance problems on both the FX 5900 and FX 5700 (e.g. for framebuffer - * post-processing effects in the game "Max Payne 2"). - * The behaviour can be verified through a simple test app attached in bugreport #14724. */ + * This fixup removes performance problems on both the FX 5900 and + * FX 5700 (e.g. for framebuffer post-processing effects in the game + * "Max Payne 2"). The behaviour can be verified through a simple test + * app attached in bugreport #14724. */ TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing.\n"); gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; @@ -986,19 +892,24 @@ static void quirk_no_np2(struct wined3d_gl_info *gl_info) static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) { - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems - * with fixed function fragment processing. Ideally this flag should be detected with a test shader - * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) - * do not like vertex shaders in feedback mode and return an error, even though it should be valid - * according to the spec. + /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by + * default, which causes problems with fixed-function fragment processing. + * Ideally this flag should be detected with a test shader and OpenGL + * feedback mode, but some OpenGL implementations (MacOS ATI at least, + * probably all MacOS ones) do not like vertex shaders in feedback mode + * and return an error, even though it should be valid according to the + * spec. * - * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This - * makes the shader slower and eats instruction slots which should be available to the d3d app. + * We don't want to enable this on all cards, as it adds an extra + * instruction per texcoord used. This makes the shader slower and eats + * instruction slots which should be available to the Direct3D + * application. * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist - * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If - * this workaround is activated on cards that do not need it, it won't break things, just affect - * performance negatively. */ + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking + * for the buggy cards, blacklist all Radeon cards on MacOS and whitelist + * the good ones. That way we're prepared for the future. If this + * workaround is activated on cards that do not need it, it won't break + * things, just affect performance negatively. */ TRACE("Enabling vertex texture coord fixes in vertex shaders.\n"); gl_info->quirks |= WINED3D_QUIRK_SET_TEXCOORD_W; } @@ -1035,23 +946,23 @@ static void quirk_infolog_spam(struct wined3d_gl_info *gl_info) static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) { - /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few - selected texture formats. They are apparently the only DX9 class GPUs - supporting VTF. - Also, DX9-era GPUs are somewhat limited with float textures - filtering and blending. */ + /* NVIDIA GeForce 6xxx and 7xxx support accelerated VTF only on a few + * selected texture formats. They are apparently the only Direct3D 9 class + * GPUs supporting VTF. Also, Direct3D 9-era GPUs are somewhat limited + * with float texture filtering and blending. */ gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; } static void quirk_r200_constants(struct wined3d_gl_info *gl_info) { - /* The Mesa r200 driver (and there is no other driver for this GPU Wine would run on) - * loads some fog parameters (start, end, exponent, but not the color) into the - * program. + /* The Mesa r200 driver (and there is no other driver for this GPU Wine + * would run on) loads some fog parameters (start, end, exponent, but not + * the colour) into the program. * - * Apparently the fog hardware is only able to handle linear fog with a range of 0.0;1.0, - * and it is the responsibility of the vertex pipeline to handle non-linear fog and - * linear fog with start and end other than 0.0 and 1.0. */ + * Apparently the fog hardware is only able to handle linear fog with a + * range of 0.0;1.0, and it is the responsibility of the vertex pipeline + * to handle non-linear fog and linear fog with start and end other than + * 0.0 and 1.0. */ TRACE("Reserving 1 ARB constant for compiler private use.\n"); gl_info->reserved_arb_constants = max(gl_info->reserved_arb_constants, 1); } @@ -1070,496 +981,12 @@ static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) } } -struct driver_quirk -{ - BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device); - void (*apply)(struct wined3d_gl_info *gl_info); - const char *description; -}; - -static const struct driver_quirk quirk_table[] = -{ - { - match_amd_r300_to_500, - quirk_amd_dx9, - "AMD normalized texrect quirk" - }, - { - match_apple, - quirk_apple_glsl_constants, - "Apple GLSL uniform override" - }, - { - match_geforce5, - quirk_no_np2, - "Geforce 5 NP2 disable" - }, - { - match_apple_intel, - quirk_texcoord_w, - "Init texcoord .w for Apple Intel GPU driver" - }, - { - match_apple_nonr500ati, - quirk_texcoord_w, - "Init texcoord .w for Apple ATI >= r600 GPU driver" - }, - { - match_dx10_capable, - quirk_clip_varying, - "Reserved varying for gl_ClipPos" - }, - { - /* GL_EXT_secondary_color does not allow 4 component secondary colors, but most - * GL implementations accept it. The Mac GL is the only implementation known to - * reject it. - * - * If we can pass 4 component specular colors, do it, because (a) we don't have - * to screw around with the data, and (b) the D3D fixed function vertex pipeline - * passes specular alpha to the pixel shader if any is used. Otherwise the - * specular alpha is used to pass the fog coordinate, which we pass to opengl - * via GL_EXT_fog_coord. - */ - match_allows_spec_alpha, - quirk_allows_specular_alpha, - "Allow specular alpha quirk" - }, - { - match_broken_nv_clip, - quirk_disable_nvvp_clip, - "Apple NV_vertex_program clip bug quirk" - }, - { - match_fbo_tex_update, - quirk_fbo_tex_update, - "FBO rebind for attachment updates" - }, - { - match_broken_rgba16, - quirk_broken_rgba16, - "True RGBA16 is not available" - }, - { - match_fglrx, - quirk_infolog_spam, - "Not printing GLSL infolog" - }, - { - match_not_dx10_capable, - quirk_limited_tex_filtering, - "Texture filtering, blending and VTF support is limited" - }, - { - match_r200, - quirk_r200_constants, - "r200 vertex shader constants" - }, - { - match_broken_arb_fog, - quirk_broken_arb_fog, - "ARBfp fogstart == fogend workaround" - }, - { - match_broken_viewport_subpixel_bits, - quirk_broken_viewport_subpixel_bits, - "Nvidia viewport subpixel bits bug" - }, -}; - -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. - * - * The driver version has the form "x.y.z.w". - * - * "x" is the Windows version the driver is meant for: - * 4 -> 95/98/NT4 - * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Win 7 - * - * "y" is the maximum Direct3D version the driver supports. - * y -> d3d version mapping: - * 11 -> d3d6 - * 12 -> d3d7 - * 13 -> d3d8 - * 14 -> d3d9 - * 15 -> d3d10 - * 16 -> d3d10.1 - * 17 -> d3d11 - * - * "z" is the subversion number. - * - * "w" is the vendor specific driver build number. - */ - -struct driver_version_information -{ - enum wined3d_display_driver driver; - enum wined3d_driver_model driver_model; - const char *driver_name; /* name of Windows driver */ - WORD version; /* version word ('y'), contained in low word of DriverVersion.HighPart */ - WORD subversion; /* subversion word ('z'), contained in high word of DriverVersion.LowPart */ - WORD build; /* build number ('w'), contained in low word of DriverVersion.LowPart */ -}; - -/* The driver version table contains driver information for different devices on several OS versions. */ -static const struct driver_version_information driver_version_table[] = -{ - /* AMD - * - Radeon HD2x00 (R600) and up supported by current drivers. - * - Radeon 9500 (R300) - X1*00 (R5xx) supported up to Catalyst 9.3 (Linux) and 10.2 (XP/Vista/Win7) - * - Radeon 7xxx (R100) - 9250 (RV250) supported up to Catalyst 6.11 (XP) - * - Rage 128 supported up to XP, latest official build 6.13.3279 dated October 2001 */ - {DRIVER_AMD_RAGE_128PRO, DRIVER_MODEL_NT5X, "ati2dvaa.dll", 13, 3279, 0}, - {DRIVER_AMD_R100, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6614}, - {DRIVER_AMD_R300, DRIVER_MODEL_NT5X, "ati2dvag.dll", 14, 10, 6764}, - {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 17, 10, 1280}, - {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 14, 10, 741 }, - {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 17, 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 17, 10, 1474}, - - /* Intel - * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp - * drivers used ialmrnt5.dll for GMA800/GMA900 but at some point the file was renamed to - * igxprd32.dll but the GMA800 driver was never updated. */ - {DRIVER_INTEL_GMA800, DRIVER_MODEL_NT5X, "ialmrnt5.dll", 14, 10, 3889}, - {DRIVER_INTEL_GMA900, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4764}, - {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 4926}, - {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, - {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, - {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, - {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 19, 15, 4352}, - - /* Nvidia - * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 - * - Geforce6 and 7 support is up to 307.83 on XP-Win8 - * - GeforceFX support is up to 173.x on <= XP - * - Geforce2MX/3/4 up to 96.x on <= XP - * - TNT/Geforce1/2 up to 71.x on <= XP - * All version numbers used below are from the Linux nvidia drivers. */ - {DRIVER_NVIDIA_TNT, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 7186}, - {DRIVER_NVIDIA_GEFORCE2MX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 10, 9371}, - {DRIVER_NVIDIA_GEFORCEFX, DRIVER_MODEL_NT5X, "nv4_disp.dll", 14, 11, 7516}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT5X, "nv4_disp.dll", 18, 13, 783}, - {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT5X, "nv4_disp.dll", 18, 13, 4052}, - {DRIVER_NVIDIA_GEFORCE6, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 783}, - {DRIVER_NVIDIA_GEFORCE8, DRIVER_MODEL_NT6X, "nvd3dum.dll", 18, 13, 4052}, - - /* VMware */ - {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, -}; - -struct gpu_description -{ - WORD vendor; /* reported PCI card vendor ID */ - WORD card; /* reported PCI card device ID */ - const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ - enum wined3d_display_driver driver; - unsigned int vidmem; -}; - -/* The amount of video memory stored in the gpu description table is the minimum amount of video memory - * found on a board containing a specific GPU. */ -static const struct gpu_description gpu_description_table[] = -{ - /* Nvidia cards */ - {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "NVIDIA RIVA 128", DRIVER_NVIDIA_TNT, 4 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, "NVIDIA RIVA TNT", DRIVER_NVIDIA_TNT, 16 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, "NVIDIA RIVA TNT2/TNT2 Pro", DRIVER_NVIDIA_TNT, 32 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", DRIVER_NVIDIA_TNT, 32 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", DRIVER_NVIDIA_TNT, 32 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", DRIVER_NVIDIA_GEFORCE2MX,32 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", DRIVER_NVIDIA_GEFORCE2MX,64 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", DRIVER_NVIDIA_GEFORCE2MX,64 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", DRIVER_NVIDIA_GEFORCE2MX,64, }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", DRIVER_NVIDIA_GEFORCEFX, 64 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", DRIVER_NVIDIA_GEFORCEFX, 128 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", DRIVER_NVIDIA_GEFORCEFX, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", DRIVER_NVIDIA_GEFORCE6, 64 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", DRIVER_NVIDIA_GEFORCE6, 128 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", DRIVER_NVIDIA_GEFORCE6, 128 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", DRIVER_NVIDIA_GEFORCE6, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", DRIVER_NVIDIA_GEFORCE6, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8200, "NVIDIA GeForce 8200", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8500GT, "NVIDIA GeForce 8500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", DRIVER_NVIDIA_GEFORCE8, 320 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTX, "NVIDIA GeForce 8800 GTX", DRIVER_NVIDIA_GEFORCE8, 768 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9300, "NVIDIA GeForce 9300", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT220, "NVIDIA GeForce GT 220", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT240, "NVIDIA GeForce GT 240", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS250, "NVIDIA GeForce GTS 250", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE8, 896 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE8, 512 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE8, 256}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT425M, "NVIDIA GeForce GT 425M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS450, "NVIDIA GeForce GTS 450", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE8, 768 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460M, "NVIDIA GeForce GTX 460M", DRIVER_NVIDIA_GEFORCE8, 1536}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX470, "NVIDIA GeForce GTX 470", DRIVER_NVIDIA_GEFORCE8, 1280}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX480, "NVIDIA GeForce GTX 480", DRIVER_NVIDIA_GEFORCE8, 1536}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT520, "NVIDIA GeForce GT 520", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT525M, "NVIDIA GeForce GT 525M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT540M, "NVIDIA GeForce GT 540M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX550, "NVIDIA GeForce GTX 550 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT555M, "NVIDIA GeForce GT 555M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560TI, "NVIDIA GeForce GTX 560 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560M, "NVIDIA GeForce GTX 560M", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX560, "NVIDIA GeForce GTX 560", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE8, 1280}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE8, 1536}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT610, "NVIDIA GeForce GT 610", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630, "NVIDIA GeForce GT 630", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650, "NVIDIA GeForce GTX 650", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX650TI, "NVIDIA GeForce GTX 650 Ti", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660M, "NVIDIA GeForce GTX 660M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA GeForce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760TI, "NVIDIA GeForce GTX 760 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN", DRIVER_NVIDIA_GEFORCE8, 6144}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANB, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANX, "NVIDIA GeForce GTX TITAN X", DRIVER_NVIDIA_GEFORCE8, 12288}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITANZ, "NVIDIA GeForce GTX TITAN Z", DRIVER_NVIDIA_GEFORCE8, 12288}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX870M, "NVIDIA GeForce GTX 870M", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX880M, "NVIDIA GeForce GTX 880M", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_940M, "NVIDIA GeForce 940M", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960, "NVIDIA GeForce GTX 960", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050TI, "NVIDIA GeForce GTX 1050 Ti", DRIVER_NVIDIA_GEFORCE8, 4096}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, - - /* AMD cards */ - {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_7200, "ATI RADEON 7200 SERIES", DRIVER_AMD_R100, 32 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_8500, "ATI RADEON 8500 SERIES", DRIVER_AMD_R100, 64 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_9500, "ATI Radeon 9500", DRIVER_AMD_R300, 64 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_XPRESS_200M, "ATI RADEON XPRESS 200M Series", DRIVER_AMD_R300, 64 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_X700, "ATI Radeon X700 SE", DRIVER_AMD_R300, 128 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_X1600, "ATI Radeon X1600 Series", DRIVER_AMD_R300, 128 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2350, "ATI Mobility Radeon HD 2350", DRIVER_AMD_R600, 256 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_AMD_R600, 256 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_AMD_R600, 128 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3850, "ATI Radeon HD 3850 AGP", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_AMD_R600, 256 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4700, "ATI Radeon HD 4700 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4800, "ATI Radeon HD 4800 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5400, "ATI Radeon HD 5400 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5600, "ATI Radeon HD 5600 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6480G, "AMD Radeon HD 6480G", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6700, "AMD Radeon HD 6700 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7660D, "AMD Radeon HD 7660D", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7700, "AMD Radeon HD 7700 Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7800, "AMD Radeon HD 7800 Series", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD7900, "AMD Radeon HD 7900 Series", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8600M, "AMD Radeon HD 8600M Series", DRIVER_AMD_R600, 1024}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8670, "AMD Radeon HD 8670", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, - - /* VMware */ - {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, - - /* Intel cards */ - {HW_VENDOR_INTEL, CARD_INTEL_830M, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, - {HW_VENDOR_INTEL, CARD_INTEL_855GM, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, - {HW_VENDOR_INTEL, CARD_INTEL_845G, "Intel(R) 845G", DRIVER_INTEL_GMA800, 32 }, - {HW_VENDOR_INTEL, CARD_INTEL_865G, "Intel(R) 82865G Graphics Controller", DRIVER_INTEL_GMA800, 32 }, - {HW_VENDOR_INTEL, CARD_INTEL_915G, "Intel(R) 82915G/GV/910GL Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_E7221G, "Intel(R) E7221G", DRIVER_INTEL_GMA900, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_915GM, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family", DRIVER_INTEL_GMA900, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_945G, "Intel(R) 945G", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_945GM, "Mobile Intel(R) 945GM Express Chipset Family", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_945GME, "Intel(R) 945GME", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_Q35, "Intel(R) Q35", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_G33, "Intel(R) G33", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_Q33, "Intel(R) Q33", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_PNVG, "Intel(R) IGD", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_PNVM, "Intel(R) IGD", DRIVER_INTEL_GMA950, 64 }, - {HW_VENDOR_INTEL, CARD_INTEL_965Q, "Intel(R) 965Q", DRIVER_INTEL_GMA3000, 128}, - {HW_VENDOR_INTEL, CARD_INTEL_965G, "Intel(R) 965G", DRIVER_INTEL_GMA3000, 128}, - {HW_VENDOR_INTEL, CARD_INTEL_946GZ, "Intel(R) 946GZ", DRIVER_INTEL_GMA3000, 128}, - {HW_VENDOR_INTEL, CARD_INTEL_965GM, "Mobile Intel(R) 965 Express Chipset Family", DRIVER_INTEL_GMA3000, 128}, - {HW_VENDOR_INTEL, CARD_INTEL_965GME, "Intel(R) 965GME", DRIVER_INTEL_GMA3000, 128}, - {HW_VENDOR_INTEL, CARD_INTEL_GM45, "Mobile Intel(R) GM45 Express Chipset Family", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_IGD, "Intel(R) Integrated Graphics Device", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_G45, "Intel(R) G45/G43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_Q45, "Intel(R) Q45/Q43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_G41, "Intel(R) G41", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_B43, "Intel(R) B43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_GMA3000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_I5100_4, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IP5200_1, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IP5200_2, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IP5200_3, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IP5200_4, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_IP5200_5, "Intel(R) Iris(TM) Pro Graphics 5200", DRIVER_INTEL_HD4000, 1536}, - {HW_VENDOR_INTEL, CARD_INTEL_HD5300, "Intel(R) HD Graphics 5300", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD5500, "Intel(R) HD Graphics 5500", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD5600, "Intel(R) HD Graphics 5600", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD6000, "Intel(R) HD Graphics 6000", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_I6100, "Intel(R) Iris(TM) Graphics 6100", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IP6200, "Intel(R) Iris(TM) Pro Graphics 6200", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP6300, "Intel(R) Iris(TM) Pro Graphics P6300", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD510_1, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD510_2, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD510_3, "Intel(R) HD Graphics 510", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD515, "Intel(R) HD Graphics 515", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD520_1, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD520_2, "Intel(R) HD Graphics 520", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD530_1, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD530_2, "Intel(R) HD Graphics 530", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HDP530, "Intel(R) HD Graphics P530", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_I540, "Intel(R) Iris(TM) Graphics 540", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_I550, "Intel(R) Iris(TM) Graphics 550", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_I555, "Intel(R) Iris(TM) Graphics 555", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IP555, "Intel(R) Iris(TM) Graphics P555", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IP580_1, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, - {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, -}; - -static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, - enum wined3d_driver_model driver_model) -{ - unsigned int i; - - TRACE("Looking up version info for driver=%d driver_model=%d\n", driver, driver_model); - for (i = 0; i < ARRAY_SIZE(driver_version_table); ++i) - { - const struct driver_version_information *entry = &driver_version_table[i]; - - if (entry->driver == driver && (driver_model == DRIVER_MODEL_GENERIC - || entry->driver_model == driver_model)) - { - TRACE("Found driver \"%s\", version %u, subversion %u, build %u.\n", - entry->driver_name, entry->version, entry->subversion, entry->build); - return entry; - } - } - return NULL; -} - -static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor vendor, - enum wined3d_pci_device device) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(gpu_description_table); ++i) - { - if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].card) - return &gpu_description_table[i]; - } - - return NULL; -} - -static const struct gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, UINT64 *vram_bytes) +static const struct wined3d_gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, + UINT64 *vram_bytes) { + const struct wined3d_gpu_description *gpu_description; enum wined3d_pci_vendor vendor = PCI_VENDOR_NONE; enum wined3d_pci_device device = PCI_DEVICE_NONE; - const struct gpu_description *gpu_description; static unsigned int once; if (gl_info->supported[WGL_WINE_QUERY_RENDERER]) @@ -1595,7 +1022,7 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_ wine_dbgstr_longlong(*vram_bytes)); } - if (!(gpu_description = get_gpu_description(vendor, device)) + if (!(gpu_description = wined3d_get_gpu_description(vendor, device)) && (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE || wined3d_settings.pci_device_id != PCI_DEVICE_NONE) && !once++) ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); @@ -1603,128 +1030,6 @@ static const struct gpu_description *query_gpu_description(const struct wined3d_ return gpu_description; } -static void init_driver_info(struct wined3d_driver_info *driver_info, - const struct gpu_description *gpu_desc, UINT64 vram_bytes) -{ - OSVERSIONINFOW os_version; - WORD driver_os_version; - enum wined3d_display_driver driver; - enum wined3d_driver_model driver_model; - const struct driver_version_information *version_info; - - memset(&os_version, 0, sizeof(os_version)); - os_version.dwOSVersionInfoSize = sizeof(os_version); - if (!GetVersionExW(&os_version)) - { - ERR("Failed to get OS version, reporting 2000/XP.\n"); - driver_os_version = 6; - driver_model = DRIVER_MODEL_NT5X; - } - else - { - TRACE("OS version %u.%u.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); - switch (os_version.dwMajorVersion) - { - case 4: - /* If needed we could distinguish between 9x and NT4, but this code won't make - * sense for NT4 since it had no way to obtain this info through DirectDraw 3.0. - */ - driver_os_version = 4; - driver_model = DRIVER_MODEL_WIN9X; - break; - - case 5: - driver_os_version = 6; - driver_model = DRIVER_MODEL_NT5X; - break; - - case 6: - if (os_version.dwMinorVersion == 0) - { - driver_os_version = 7; - driver_model = DRIVER_MODEL_NT6X; - } - else if (os_version.dwMinorVersion == 1) - { - driver_os_version = 8; - driver_model = DRIVER_MODEL_NT6X; - } - else - { - if (os_version.dwMinorVersion > 2) - { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", - os_version.dwMajorVersion, os_version.dwMinorVersion); - } - driver_os_version = 9; - driver_model = DRIVER_MODEL_NT6X; - } - break; - - case 10: - driver_os_version = 10; - driver_model = DRIVER_MODEL_NT6X; - break; - - default: - FIXME("Unhandled OS version %u.%u, reporting 2000/XP.\n", - os_version.dwMajorVersion, os_version.dwMinorVersion); - driver_os_version = 6; - driver_model = DRIVER_MODEL_NT5X; - break; - } - } - - driver_info->vendor = gpu_desc->vendor; - driver_info->device = gpu_desc->card; - driver_info->description = gpu_desc->description; - driver_info->vram_bytes = vram_bytes ? vram_bytes : (UINT64)gpu_desc->vidmem * 1024 * 1024; - driver = gpu_desc->driver; - - /** - * Diablo 2 crashes when the amount of video memory is greater than 0x7fffffff. - * In order to avoid this application bug we limit the amount of video memory - * to LONG_MAX for older Windows versions. - */ - if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) - { - TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); - driver_info->vram_bytes = LONG_MAX; - } - - /* Try to obtain driver version information for the current Windows version. This fails in - * some cases: - * - the gpu is not available on the currently selected OS version: - * - Geforce GTX480 on Win98. When running applications in compatibility mode on Windows, - * version information for the current Windows version is returned instead of faked info. - * We do the same and assume the default Windows version to emulate is WinXP. - * - * - Videocard is a Riva TNT but winver is set to win7 (there are no drivers for this beast) - * For now return the XP driver info. Perhaps later on we should return VESA. - * - * - the gpu is not in our database (can happen when the user overrides the vendor_id / device_id) - * This could be an indication that our database is not up to date, so this should be fixed. - */ - if ((version_info = get_driver_version_info(driver, driver_model)) - || (version_info = get_driver_version_info(driver, DRIVER_MODEL_GENERIC))) - { - driver_info->name = version_info->driver_name; - driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version); - driver_info->version_low = MAKEDWORD_VERSION(version_info->subversion, version_info->build); - } - else - { - ERR("No driver version info found for device %04x:%04x, driver model %#x.\n", - driver_info->vendor, driver_info->device, driver_model); - driver_info->name = "Display"; - driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); - driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ - } - - TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", - driver_info->version_high, driver_info->version_low); -} - /* Context activation is done by the caller. */ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, @@ -1732,6 +1037,103 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_cap { unsigned int i; + static const struct driver_quirk + { + BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, + const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, + enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device); + void (*apply)(struct wined3d_gl_info *gl_info); + const char *description; + } + quirk_table[] = + { + { + match_amd_r300_to_500, + quirk_amd_dx9, + "AMD normalised texrect quirk" + }, + { + match_apple, + quirk_apple_glsl_constants, + "Apple GLSL uniform override" + }, + { + match_geforce5, + quirk_no_np2, + "Geforce 5 NP2 disable" + }, + { + match_apple_intel, + quirk_texcoord_w, + "Init texcoord .w for Apple Intel GPU driver" + }, + { + match_apple_nonr500ati, + quirk_texcoord_w, + "Init texcoord .w for Apple ATI >= r600 GPU driver" + }, + { + match_dx10_capable, + quirk_clip_varying, + "Reserved varying for gl_ClipPos" + }, + { + /* GL_EXT_secondary_color does not allow 4 component secondary + * colours, but most OpenGL implementations accept it. Apple's + * is the only OpenGL implementation known to reject it. + * + * If we can pass 4-component specular colours, do it, because + * (a) we don't have to screw around with the data, and (b) the + * Direct3D fixed-function vertex pipeline passes specular alpha + * to the pixel shader if any is used. Otherwise the specular + * alpha is used to pass the fog coordinate, which we pass to + * OpenGL via GL_EXT_fog_coord. */ + match_allows_spec_alpha, + quirk_allows_specular_alpha, + "Allow specular alpha quirk" + }, + { + match_broken_nv_clip, + quirk_disable_nvvp_clip, + "Apple NV_vertex_program clip bug quirk" + }, + { + match_fbo_tex_update, + quirk_fbo_tex_update, + "FBO rebind for attachment updates" + }, + { + match_broken_rgba16, + quirk_broken_rgba16, + "True RGBA16 is not available" + }, + { + match_fglrx, + quirk_infolog_spam, + "Not printing GLSL infolog" + }, + { + match_not_dx10_capable, + quirk_limited_tex_filtering, + "Texture filtering, blending and VTF support is limited" + }, + { + match_r200, + quirk_r200_constants, + "r200 vertex shader constants" + }, + { + match_broken_arb_fog, + quirk_broken_arb_fog, + "ARBfp fogstart == fogend workaround" + }, + { + match_broken_viewport_subpixel_bits, + quirk_broken_viewport_subpixel_bits, + "NVIDIA viewport subpixel bits bug" + }, + }; + for (i = 0; i < ARRAY_SIZE(quirk_table); ++i) { if (!quirk_table[i].match(gl_info, ctx, gl_renderer, gl_vendor, card_vendor, device)) continue; @@ -2057,7 +1459,7 @@ cards_nvidia_binary[] = /* See http://developer.amd.com/resources/hardware-drivers/ati-catalyst-pc-vendor-… * * Beware: renderer string do not match exact card model, - * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ + * e.g. HD 4800 is returned for multiple cards, even for RV790 based ones. */ cards_amd_binary[] = { {"RX 480", CARD_AMD_RADEON_RX_480}, @@ -2405,7 +1807,7 @@ nvidia_gl_vendor_table[] = { {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, {GL_VENDOR_MESA, "Mesa Nouveau driver", cards_nvidia_mesa, ARRAY_SIZE(cards_nvidia_mesa)}, - {GL_VENDOR_NVIDIA, "Nvidia binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, + {GL_VENDOR_NVIDIA, "NVIDIA binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, }, vmware_gl_vendor_table[] = { @@ -2417,44 +1819,6 @@ intel_gl_vendor_table[] = {GL_VENDOR_MESA, "Mesa Intel driver", cards_intel, ARRAY_SIZE(cards_intel)}, }; -static const enum wined3d_pci_device -card_fallback_nvidia[] = -{ - CARD_NVIDIA_RIVA_128, /* D3D5 */ - CARD_NVIDIA_RIVA_TNT, /* D3D6 */ - CARD_NVIDIA_GEFORCE, /* D3D7 */ - CARD_NVIDIA_GEFORCE3, /* D3D8 */ - CARD_NVIDIA_GEFORCEFX_5800, /* D3D9_SM2 */ - CARD_NVIDIA_GEFORCE_6800, /* D3D9_SM3 */ - CARD_NVIDIA_GEFORCE_8800GTX, /* D3D10 */ - CARD_NVIDIA_GEFORCE_GTX470, /* D3D11 */ -}, -card_fallback_amd[] = -{ - CARD_AMD_RAGE_128PRO, /* D3D5 */ - CARD_AMD_RAGE_128PRO, /* D3D6 */ - CARD_AMD_RADEON_7200, /* D3D7 */ - CARD_AMD_RADEON_8500, /* D3D8 */ - CARD_AMD_RADEON_9500, /* D3D9_SM2 */ - CARD_AMD_RADEON_X1600, /* D3D9_SM3 */ - CARD_AMD_RADEON_HD2900, /* D3D10 */ - CARD_AMD_RADEON_HD5600, /* D3D11 */ -}, -card_fallback_intel[] = -{ - CARD_INTEL_845G, /* D3D5 */ - CARD_INTEL_845G, /* D3D6 */ - CARD_INTEL_845G, /* D3D7 */ - CARD_INTEL_915G, /* D3D8 */ - CARD_INTEL_915G, /* D3D9_SM2 */ - CARD_INTEL_945G, /* D3D9_SM3 */ - CARD_INTEL_G45, /* D3D10 */ - CARD_INTEL_IVBD, /* D3D11 */ -}; -C_ASSERT(ARRAY_SIZE(card_fallback_nvidia) == WINED3D_FEATURE_LEVEL_COUNT); -C_ASSERT(ARRAY_SIZE(card_fallback_amd) == WINED3D_FEATURE_LEVEL_COUNT); -C_ASSERT(ARRAY_SIZE(card_fallback_intel) == WINED3D_FEATURE_LEVEL_COUNT); - static enum wined3d_pci_device select_card_handler(const struct gl_vendor_selection *table, unsigned int table_size, enum wined3d_gl_vendor gl_vendor, const char *gl_renderer) { @@ -2486,22 +1850,13 @@ static const struct const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ const struct gl_vendor_selection *gl_vendor_selection; unsigned int gl_vendor_count; - const enum wined3d_pci_device *card_fallback; /* An array with FEATURE_LEVEL_COUNT elements */ } card_vendor_table[] = { - {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, - ARRAY_SIZE(amd_gl_vendor_table), - card_fallback_amd}, - {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, - ARRAY_SIZE(nvidia_gl_vendor_table), - card_fallback_nvidia}, - {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, - ARRAY_SIZE(vmware_gl_vendor_table), - card_fallback_amd}, - {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, - ARRAY_SIZE(intel_gl_vendor_table), - card_fallback_intel}, + {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, ARRAY_SIZE(amd_gl_vendor_table)}, + {HW_VENDOR_NVIDIA, "NVIDIA", nvidia_gl_vendor_table, ARRAY_SIZE(nvidia_gl_vendor_table)}, + {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, ARRAY_SIZE(vmware_gl_vendor_table)}, + {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, ARRAY_SIZE(intel_gl_vendor_table)}, }; static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level feature_level, @@ -2520,7 +1875,7 @@ static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level fea * Various games depend on the PCI id, so somehow we need to provide one. * A simple option is to parse the renderer string and translate this to * the right PCI id. This is a lot of work because there are more than 200 - * GPUs just for Nvidia. Various cards share the same renderer string, so + * GPUs just for NVIDIA. Various cards share the same renderer string, so * the amount of code might be 'small' but there are quite a number of * exceptions which would make this a pain to maintain. Another way would * be to query the PCI id from the operating system (assuming this is the @@ -2535,7 +1890,7 @@ static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level fea * * The code below checks the OpenGL capabilities of a videocard and matches * that to a certain level of Direct3D functionality. Once a card passes - * the Direct3D9 check, we know that the card (in case of Nvidia) is at + * the Direct3D9 check, we know that the card (in case of NVIDIA) is at * least a GeforceFX. To give a better estimate we do a basic check on the * renderer string but if that won't pass we return a default card. This * way is better than maintaining a full card database as even without a @@ -2573,15 +1928,14 @@ static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level fea return device; TRACE("Unrecognized renderer %s, falling back to default.\n", debugstr_a(gl_renderer)); - return card_vendor_table[i].card_fallback[feature_level]; + + return wined3d_gpu_from_feature_level(card_vendor, feature_level); } FIXME("No card selector available for card vendor %04x (using GL_RENDERER %s).\n", *card_vendor, debugstr_a(gl_renderer)); - /* Default to generic Nvidia hardware based on the supported OpenGL extensions. */ - *card_vendor = HW_VENDOR_NVIDIA; - return card_fallback_nvidia[feature_level]; + return wined3d_gpu_from_feature_level(card_vendor, feature_level); } static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info, @@ -3573,20 +2927,26 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_max); gl_info->limits.vertex_attribs = gl_max; - /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup - * is known at shader link time. In a vertex shader + pixel shader combination this isn't - * an issue because then the sampler setup only depends on the two shaders. If a pixel - * shader is used with fixed function vertex processing we're fine too because fixed function - * vertex processing doesn't use any samplers. If fixed function fragment processing is - * used we have to make sure that all vertex sampler setups are valid together with all - * possible fixed function fragment processing setups. This is true if vsamplers + MAX_TEXTURES - * <= max_samplers. This is true on all d3d9 cards that support vtf(gf 6 and gf7 cards). - * dx9 radeon cards do not support vertex texture fetch. DX10 cards have 128 samplers, and - * dx9 is limited to 8 fixed function texture stages and 4 vertex samplers. DX10 does not have - * a fixed function pipeline anymore. + /* Loading GLSL sampler uniforms is much simpler if we can assume + * that the sampler setup is known at shader link time. In a + * vertex shader + pixel shader combination this isn't an issue + * because then the sampler setup only depends on the two shaders. + * If a pixel shader is used with fixed-function vertex processing + * we're fine too because fixed-function vertex processing doesn't + * use any samplers. If fixed-function fragment processing is used + * we have to make sure that all vertex sampler setups are valid + * together with all possible fixed-function fragment processing + * setups. This is true if vsamplers + MAX_TEXTURES <= max_samplers. + * This is true on all Direct3D 9 cards that support vertex + * texture fetch (GeForce 6 and GeForce 7 cards). Direct3D 9 + * Radeon cards do not support vertex texture fetch. Direct3D 10 + * cards have 128 samplers, and Direct3D 9 is limited to 8 + * fixed-function texture stages and 4 vertex samplers. + * Direct3D 10 does not have a fixed-function pipeline anymore. * - * So this is just a check to check that our assumption holds true. If not, write a warning - * and reduce the number of vertex samplers or probably disable vertex texture fetch. */ + * So this is just a check to check that our assumption holds + * true. If not, write a warning and reduce the number of vertex + * samplers or probably disable vertex texture fetch. */ if (vertex_sampler_count && gl_info->limits.combined_samplers < 12 && MAX_TEXTURES + vertex_sampler_count > gl_info->limits.combined_samplers) { @@ -3957,8 +3317,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; + const struct wined3d_gpu_description *gpu_description; struct wined3d_gl_info *gl_info = &adapter->gl_info; - const struct gpu_description *gpu_description; struct wined3d_vertex_caps vertex_caps; struct fragment_caps fragment_caps; struct shader_caps shader_caps; @@ -4332,8 +3692,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, if (!d3d_info->shader_color_key) { - /* We do not want to deal with re-creating immutable texture storage for color keying emulation. */ - WARN("Disabling ARB_texture_storage because fragment pipe doesn't support color keying.\n"); + /* We do not want to deal with re-creating immutable texture storage + * for colour-keying emulation. */ + WARN("Disabling ARB_texture_storage because fragment pipe doesn't support colour-keying.\n"); gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; } @@ -4440,15 +3801,17 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_renderer_str, &gl_vendor, &vendor); TRACE("Guessed device PCI ID 0x%04x.\n", device); - if (!(gpu_description = get_gpu_description(vendor, device))) + if (!(gpu_description = wined3d_get_gpu_description(vendor, device))) { ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); return FALSE; } } fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor, - gpu_description->vendor, gpu_description->card); - init_driver_info(driver_info, gpu_description, vram_bytes); + gpu_description->vendor, gpu_description->device); + wined3d_driver_info_init(driver_info, gpu_description, vram_bytes); + TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", + driver_info->version_high, driver_info->version_low); gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); @@ -4460,1792 +3823,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, return TRUE; } -UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) -{ - TRACE("wined3d %p, reporting %u adapters.\n", - wined3d, wined3d->adapter_count); - - return wined3d->adapter_count; -} - -HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) -{ - FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_get_output_desc(const struct wined3d *wined3d, unsigned int adapter_idx, - struct wined3d_output_desc *desc) -{ - enum wined3d_display_rotation rotation; - const struct wined3d_adapter *adapter; - struct wined3d_display_mode mode; - HMONITOR monitor; - HRESULT hr; - - TRACE("wined3d %p, adapter_idx %u, desc %p.\n", wined3d, adapter_idx, desc); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = &wined3d->adapters[adapter_idx]; - if (!(monitor = MonitorFromPoint(adapter->monitor_position, MONITOR_DEFAULTTOPRIMARY))) - return WINED3DERR_INVALIDCALL; - - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, &rotation))) - return hr; - - memcpy(desc->device_name, adapter->DeviceName, sizeof(desc->device_name)); - SetRect(&desc->desktop_rect, 0, 0, mode.width, mode.height); - OffsetRect(&desc->desktop_rect, adapter->monitor_position.x, adapter->monitor_position.y); - /* FIXME: We should get this from EnumDisplayDevices() when the adapters - * are created. */ - desc->attached_to_desktop = TRUE; - desc->rotation = rotation; - desc->monitor = monitor; - - return WINED3D_OK; -} - -/* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes - of the same bpp but different resolutions */ - -/* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) -{ - const struct wined3d_adapter *adapter; - const struct wined3d_format *format; - unsigned int i = 0; - unsigned int j = 0; - UINT format_bits; - DEVMODEW mode; - - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); - - if (adapter_idx >= wined3d->adapter_count) - return 0; - - adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(&adapter->gl_info, format_id, WINED3DUSAGE_RENDERTARGET); - format_bits = format->byte_count * CHAR_BIT; - - memset(&mode, 0, sizeof(mode)); - mode.dmSize = sizeof(mode); - - while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) - { - if (mode.dmFields & DM_DISPLAYFLAGS) - { - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE - && (mode.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED - && !(mode.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for d3d8, do not enumerate P8 here. */ - if (mode.dmBitsPerPel == 32 || mode.dmBitsPerPel == 16) ++i; - } - else if (mode.dmBitsPerPel == format_bits) - { - ++i; - } - } - - TRACE("Returning %u matching modes (out of %u total) for adapter %u.\n", i, j, adapter_idx); - - return i; -} - -/* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ -HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, - UINT mode_idx, struct wined3d_display_mode *mode) -{ - const struct wined3d_adapter *adapter; - const struct wined3d_format *format; - UINT format_bits; - DEVMODEW m; - UINT i = 0; - int j = 0; - - TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x, mode_idx %u, mode %p.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering, mode_idx, mode); - - if (!mode || adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = &wined3d->adapters[adapter_idx]; - format = wined3d_get_format(&adapter->gl_info, format_id, WINED3DUSAGE_RENDERTARGET); - format_bits = format->byte_count * CHAR_BIT; - - memset(&m, 0, sizeof(m)); - m.dmSize = sizeof(m); - - while (i <= mode_idx) - { - if (!EnumDisplaySettingsExW(adapter->DeviceName, j++, &m, 0)) - { - WARN("Invalid mode_idx %u.\n", mode_idx); - return WINED3DERR_INVALIDCALL; - } - - if (m.dmFields & DM_DISPLAYFLAGS) - { - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE - && (m.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - - if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED - && !(m.u2.dmDisplayFlags & DM_INTERLACED)) - continue; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for d3d8, do not enumerate P8 here. */ - if (m.dmBitsPerPel == 32 || m.dmBitsPerPel == 16) ++i; - } - else if (m.dmBitsPerPel == format_bits) - { - ++i; - } - } - - mode->width = m.dmPelsWidth; - mode->height = m.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (m.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = m.dmDisplayFrequency; - - if (format_id == WINED3DFMT_UNKNOWN) - mode->format_id = pixelformat_for_depth(m.dmBitsPerPel); - else - mode->format_id = format_id; - - if (!(m.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (m.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; - - TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, - m.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_find_closest_matching_adapter_mode(const struct wined3d *wined3d, - unsigned int adapter_idx, struct wined3d_display_mode *mode) -{ - unsigned int i, j, mode_count, matching_mode_count, closest; - struct wined3d_display_mode **matching_modes; - struct wined3d_display_mode *modes; - HRESULT hr; - - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - - if (!(mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN))) - { - WARN("Adapter has 0 matching modes.\n"); - return E_FAIL; - } - - if (!(modes = heap_calloc(mode_count, sizeof(*modes)))) - return E_OUTOFMEMORY; - if (!(matching_modes = heap_calloc(mode_count, sizeof(*matching_modes)))) - { - heap_free(modes); - return E_OUTOFMEMORY; - } - - for (i = 0; i < mode_count; ++i) - { - if (FAILED(hr = wined3d_enum_adapter_modes(wined3d, adapter_idx, - mode->format_id, WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &modes[i]))) - { - heap_free(matching_modes); - heap_free(modes); - return hr; - } - matching_modes[i] = &modes[i]; - } - - matching_mode_count = mode_count; - - if (mode->scanline_ordering != WINED3D_SCANLINE_ORDERING_UNKNOWN) - { - for (i = 0, j = 0; i < matching_mode_count; ++i) - { - if (matching_modes[i]->scanline_ordering == mode->scanline_ordering) - matching_modes[j++] = matching_modes[i]; - } - if (j > 0) - matching_mode_count = j; - } - - if (mode->refresh_rate) - { - for (i = 0, j = 0; i < matching_mode_count; ++i) - { - if (matching_modes[i]->refresh_rate == mode->refresh_rate) - matching_modes[j++] = matching_modes[i]; - } - if (j > 0) - matching_mode_count = j; - } - - if (!mode->width || !mode->height) - { - struct wined3d_display_mode current_mode; - if (FAILED(hr = wined3d_get_adapter_display_mode(wined3d, adapter_idx, - &current_mode, NULL))) - { - heap_free(matching_modes); - heap_free(modes); - return hr; - } - mode->width = current_mode.width; - mode->height = current_mode.height; - } - - closest = ~0u; - for (i = 0, j = 0; i < matching_mode_count; ++i) - { - unsigned int d = abs(mode->width - matching_modes[i]->width) - + abs(mode->height - matching_modes[i]->height); - - if (closest > d) - { - closest = d; - j = i; - } - } - - *mode = *matching_modes[j]; - - heap_free(matching_modes); - heap_free(modes); - - TRACE("Returning %ux%u@%u %s %#x.\n", mode->width, mode->height, - mode->refresh_rate, debug_d3dformat(mode->format_id), - mode->scanline_ordering); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) -{ - const struct wined3d_adapter *adapter; - DEVMODEW m; - - TRACE("wined3d %p, adapter_idx %u, display_mode %p, rotation %p.\n", - wined3d, adapter_idx, mode, rotation); - - if (!mode || adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = &wined3d->adapters[adapter_idx]; - - memset(&m, 0, sizeof(m)); - m.dmSize = sizeof(m); - - EnumDisplaySettingsExW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &m, 0); - mode->width = m.dmPelsWidth; - mode->height = m.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (m.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = m.dmDisplayFrequency; - mode->format_id = pixelformat_for_depth(m.dmBitsPerPel); - - /* Lie about the format. X11 can't change the color depth, and some apps - * are pretty angry if they SetDisplayMode from 24 to 16 bpp and find out - * that GetDisplayMode still returns 24 bpp. This should probably be - * handled in winex11 instead. */ - if (adapter->screen_format && adapter->screen_format != mode->format_id) - { - WARN("Overriding format %s with stored format %s.\n", - debug_d3dformat(mode->format_id), - debug_d3dformat(adapter->screen_format)); - mode->format_id = adapter->screen_format; - } - - if (!(m.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (m.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; - - if (rotation) - { - switch (m.u1.s2.dmDisplayOrientation) - { - case DMDO_DEFAULT: - *rotation = WINED3D_DISPLAY_ROTATION_0; - break; - case DMDO_90: - *rotation = WINED3D_DISPLAY_ROTATION_90; - break; - case DMDO_180: - *rotation = WINED3D_DISPLAY_ROTATION_180; - break; - case DMDO_270: - *rotation = WINED3D_DISPLAY_ROTATION_270; - break; - default: - FIXME("Unhandled display rotation %#x.\n", m.u1.s2.dmDisplayOrientation); - *rotation = WINED3D_DISPLAY_ROTATION_UNSPECIFIED; - break; - } - } - - TRACE("Returning %ux%u@%u %s %#x.\n", mode->width, mode->height, - mode->refresh_rate, debug_d3dformat(mode->format_id), - mode->scanline_ordering); - return WINED3D_OK; -} - -HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, - UINT adapter_idx, const struct wined3d_display_mode *mode) -{ - struct wined3d_adapter *adapter; - DEVMODEW new_mode, current_mode; - RECT clip_rc; - LONG ret; - enum wined3d_format_id new_format_id; - - TRACE("wined3d %p, adapter_idx %u, mode %p.\n", wined3d, adapter_idx, mode); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - adapter = &wined3d->adapters[adapter_idx]; - - memset(&new_mode, 0, sizeof(new_mode)); - new_mode.dmSize = sizeof(new_mode); - memset(&current_mode, 0, sizeof(current_mode)); - current_mode.dmSize = sizeof(current_mode); - if (mode) - { - const struct wined3d_format *format; - - TRACE("mode %ux%u@%u %s %#x.\n", mode->width, mode->height, mode->refresh_rate, - debug_d3dformat(mode->format_id), mode->scanline_ordering); - - format = wined3d_get_format(&adapter->gl_info, mode->format_id, WINED3DUSAGE_RENDERTARGET); - - new_mode.dmFields = DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - new_mode.dmBitsPerPel = format->byte_count * CHAR_BIT; - new_mode.dmPelsWidth = mode->width; - new_mode.dmPelsHeight = mode->height; - - new_mode.dmDisplayFrequency = mode->refresh_rate; - if (mode->refresh_rate) - new_mode.dmFields |= DM_DISPLAYFREQUENCY; - - if (mode->scanline_ordering != WINED3D_SCANLINE_ORDERING_UNKNOWN) - { - new_mode.dmFields |= DM_DISPLAYFLAGS; - if (mode->scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED) - new_mode.u2.dmDisplayFlags |= DM_INTERLACED; - } - new_format_id = mode->format_id; - } - else - { - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_REGISTRY_SETTINGS, &new_mode)) - { - ERR("Failed to read mode from registry.\n"); - return WINED3DERR_NOTAVAILABLE; - } - new_format_id = pixelformat_for_depth(new_mode.dmBitsPerPel); - } - - /* Only change the mode if necessary. */ - if (!EnumDisplaySettingsW(adapter->DeviceName, ENUM_CURRENT_SETTINGS, &current_mode)) - { - ERR("Failed to get current display mode.\n"); - } - else if (current_mode.dmPelsWidth == new_mode.dmPelsWidth - && current_mode.dmPelsHeight == new_mode.dmPelsHeight - && current_mode.dmBitsPerPel == new_mode.dmBitsPerPel - && (current_mode.dmDisplayFrequency == new_mode.dmDisplayFrequency - || !(new_mode.dmFields & DM_DISPLAYFREQUENCY)) - && (current_mode.u2.dmDisplayFlags == new_mode.u2.dmDisplayFlags - || !(new_mode.dmFields & DM_DISPLAYFLAGS))) - { - TRACE("Skipping redundant mode setting call.\n"); - adapter->screen_format = new_format_id; - return WINED3D_OK; - } - - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); - if (ret != DISP_CHANGE_SUCCESSFUL) - { - if (new_mode.dmFields & DM_DISPLAYFREQUENCY) - { - WARN("ChangeDisplaySettingsExW failed, trying without the refresh rate.\n"); - new_mode.dmFields &= ~DM_DISPLAYFREQUENCY; - new_mode.dmDisplayFrequency = 0; - ret = ChangeDisplaySettingsExW(adapter->DeviceName, &new_mode, NULL, CDS_FULLSCREEN, NULL); - } - if (ret != DISP_CHANGE_SUCCESSFUL) - return WINED3DERR_NOTAVAILABLE; - } - - /* Store the new values. */ - adapter->screen_format = new_format_id; - - /* And finally clip mouse to our screen. */ - SetRect(&clip_rc, 0, 0, new_mode.dmPelsWidth, new_mode.dmPelsHeight); - ClipCursor(&clip_rc); - - return WINED3D_OK; -} - -/* NOTE: due to structure differences between dx8 and dx9 D3DADAPTER_IDENTIFIER, - and fields being inserted in the middle, a new structure is used in place */ -HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, - UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) -{ - const struct wined3d_adapter *adapter; - size_t len; - - TRACE("wined3d %p, adapter_idx %u, flags %#x, identifier %p.\n", - wined3d, adapter_idx, flags, identifier); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = &wined3d->adapters[adapter_idx]; - - if (identifier->driver_size) - { - const char *name = adapter->driver_info.name; - len = min(strlen(name), identifier->driver_size - 1); - memcpy(identifier->driver, name, len); - memset(&identifier->driver[len], 0, identifier->driver_size - len); - } - - if (identifier->description_size) - { - const char *description = adapter->driver_info.description; - len = min(strlen(description), identifier->description_size - 1); - memcpy(identifier->description, description, len); - memset(&identifier->description[len], 0, identifier->description_size - len); - } - - /* Note that d3d8 doesn't supply a device name. */ - if (identifier->device_name_size) - { - if (!WideCharToMultiByte(CP_ACP, 0, adapter->DeviceName, -1, identifier->device_name, - identifier->device_name_size, NULL, NULL)) - { - ERR("Failed to convert device name, last error %#x.\n", GetLastError()); - return WINED3DERR_INVALIDCALL; - } - } - - identifier->driver_version.u.HighPart = adapter->driver_info.version_high; - identifier->driver_version.u.LowPart = adapter->driver_info.version_low; - identifier->vendor_id = adapter->driver_info.vendor; - identifier->device_id = adapter->driver_info.device; - identifier->subsystem_id = 0; - identifier->revision = 0; - memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; - memcpy(&identifier->adapter_luid, &adapter->luid, sizeof(identifier->adapter_luid)); - identifier->video_memory = min(~(SIZE_T)0, adapter->vram_bytes); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, UINT adapter_idx, - struct wined3d_raster_status *raster_status) -{ - LONGLONG freq_per_frame, freq_per_line; - LARGE_INTEGER counter, freq_per_sec; - struct wined3d_display_mode mode; - static UINT once; - - if (!once++) - FIXME("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); - else - WARN("wined3d %p, adapter_idx %u, raster_status %p semi-stub!\n", - wined3d, adapter_idx, raster_status); - - /* Obtaining the raster status is a widely implemented but optional - * feature. When this method returns OK StarCraft 2 expects the - * raster_status->InVBlank value to actually change over time. - * And Endless Alice Crysis doesn't care even if this method fails. - * Thus this method returns OK and fakes raster_status by - * QueryPerformanceCounter. */ - - if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) - return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_get_adapter_display_mode(wined3d, adapter_idx, &mode, NULL))) - return WINED3DERR_INVALIDCALL; - if (mode.refresh_rate == DEFAULT_REFRESH_RATE) - mode.refresh_rate = 60; - - freq_per_frame = freq_per_sec.QuadPart / mode.refresh_rate; - /* Assume 20 scan lines in the vertical blank. */ - freq_per_line = freq_per_frame / (mode.height + 20); - raster_status->scan_line = (counter.QuadPart % freq_per_frame) / freq_per_line; - if (raster_status->scan_line < mode.height) - raster_status->in_vblank = FALSE; - else - { - raster_status->scan_line = 0; - raster_status->in_vblank = TRUE; - } - - TRACE("Returning fake value, in_vblank %u, scan_line %u.\n", - raster_status->in_vblank, raster_status->scan_line); - - return WINED3D_OK; -} - -static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) -{ - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - /* Probably a RGBA_float or color index mode. */ - if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) - return FALSE; - - if (cfg->redSize < format->red_size - || cfg->greenSize < format->green_size - || cfg->blueSize < format->blue_size - || cfg->alphaSize < format->alpha_size) - return FALSE; - - return TRUE; -} - -static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, - const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) -{ - BOOL lockable = FALSE; - - /* Float formats need FBOs. If FBOs are used this function isn't called */ - if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) - return FALSE; - - if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) - lockable = TRUE; - - /* On some modern cards like the Geforce8/9, GLX doesn't offer some - * depth/stencil formats which D3D9 reports. We can safely report - * "compatible" formats (e.g. D24 can be used for D16) as long as we - * aren't dealing with a lockable format. This also helps D3D <= 7 as they - * expect D16 which isn't offered without this on Geforce8 cards. */ - if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) - return FALSE; - - /* Some cards like Intel i915 ones only offer D24S8 but lots of games also - * need a format without stencil. We can allow a mismatch if the format - * doesn't have any stencil bits. If it does have stencil bits the size - * must match, or stencil wrapping would break. */ - if (format->stencil_size && cfg->stencilSize != format->stencil_size) - return FALSE; - - return TRUE; -} - -HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, - enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) -{ - const struct wined3d_format *rt_format; - const struct wined3d_format *ds_format; - const struct wined3d_adapter *adapter; - - TRACE("wined3d %p, adapter_idx %u, device_type %s,\n" - "adapter_format %s, render_target_format %s, depth_stencil_format %s.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dformat(render_target_format_id), debug_d3dformat(depth_stencil_format_id)); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter = &wined3d->adapters[adapter_idx]; - rt_format = wined3d_get_format(&adapter->gl_info, render_target_format_id, WINED3DUSAGE_RENDERTARGET); - ds_format = wined3d_get_format(&adapter->gl_info, depth_stencil_format_id, WINED3DUSAGE_DEPTHSTENCIL); - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - if ((rt_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_RENDERTARGET) - && (ds_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } - } - else - { - const struct wined3d_pixel_format *cfgs; - unsigned int cfg_count; - unsigned int i; - - cfgs = adapter->cfgs; - cfg_count = adapter->cfg_count; - for (i = 0; i < cfg_count; ++i) - { - if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) - { - TRACE("Formats match.\n"); - return WINED3D_OK; - } - } - } - - TRACE("Unsupported format pair: %s and %s.\n", - debug_d3dformat(render_target_format_id), - debug_d3dformat(depth_stencil_format_id)); - - return WINED3DERR_NOTAVAILABLE; -} - -HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id surface_format_id, BOOL windowed, - enum wined3d_multisample_type multisample_type, DWORD *quality_levels) -{ - const struct wined3d_gl_info *gl_info = &wined3d->adapters[adapter_idx].gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, surface_format_id, 0); - HRESULT hr = WINED3D_OK; - - TRACE("wined3d %p, adapter_idx %u, device_type %s, surface_format %s, " - "windowed %#x, multisample_type %#x, quality_levels %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(surface_format_id), - windowed, multisample_type, quality_levels); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - if (surface_format_id == WINED3DFMT_UNKNOWN) - return WINED3DERR_INVALIDCALL; - if (multisample_type < WINED3D_MULTISAMPLE_NONE) - return WINED3DERR_INVALIDCALL; - if (multisample_type > WINED3D_MULTISAMPLE_16_SAMPLES) - { - FIXME("multisample_type %u not handled yet.\n", multisample_type); - return WINED3DERR_NOTAVAILABLE; - } - - if (multisample_type && !(format->multisample_types & 1u << (multisample_type - 1))) - hr = WINED3DERR_NOTAVAILABLE; - - if (SUCCEEDED(hr) || (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE && format->multisample_types)) - { - if (quality_levels) - { - if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - *quality_levels = wined3d_popcount(format->multisample_types); - else - *quality_levels = 1; - } - return WINED3D_OK; - } - - TRACE("Returning not supported.\n"); - return hr; -} - -/* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ -static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *display_format, const struct wined3d_format *ds_format, - enum wined3d_gl_resource_type gl_type) -{ - /* Only allow depth/stencil formats */ - if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; - - /* Blacklist formats not supported on Windows */ - switch (ds_format->id) - { - case WINED3DFMT_S1_UINT_D15_UNORM: /* Breaks the shadowvol2 dx7 sdk sample */ - case WINED3DFMT_S4X4_UINT_D24_UNORM: - TRACE("[FAILED] - not supported on windows.\n"); - return FALSE; - - default: - break; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - /* With FBOs WGL limitations do not apply, but the format needs to be FBO attachable */ - if (ds_format->flags[gl_type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - return TRUE; - } - else - { - unsigned int i; - - /* Walk through all WGL pixel formats to find a match */ - for (i = 0; i < adapter->cfg_count; ++i) - { - const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) - && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) - return TRUE; - } - } - - return FALSE; -} - -/* Check the render target capabilities of a format */ -static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, - const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, - enum wined3d_gl_resource_type gl_type) -{ - /* Filter out non-RT formats */ - if (!(check_format->flags[gl_type] & WINED3DFMT_FLAG_RENDERTARGET)) - return FALSE; - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - return TRUE; - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - const struct wined3d_pixel_format *cfgs = adapter->cfgs; - unsigned int i; - - /* In backbuffer mode the front and backbuffer share the same WGL - * pixelformat. The format must match in RGB, alpha is allowed to be - * different. (Only the backbuffer can have alpha.) */ - if (adapter_format->red_size != check_format->red_size - || adapter_format->green_size != check_format->green_size - || adapter_format->blue_size != check_format->blue_size) - { - TRACE("[FAILED]\n"); - return FALSE; - } - - /* Check if there is a WGL pixel format matching the requirements, the format should also be window - * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (i = 0; i < adapter->cfg_count; ++i) - { - if (cfgs[i].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) - { - TRACE("Pixel format %d is compatible with format %s.\n", - cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); - return TRUE; - } - } - } - return FALSE; -} - -static BOOL wined3d_check_surface_capability(const struct wined3d_format *format, BOOL no3d) -{ - if (no3d) - { - switch (format->id) - { - case WINED3DFMT_B8G8R8_UNORM: - TRACE("[FAILED] - Not enumerated on Windows.\n"); - return FALSE; - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B5G6R5_UNORM: - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_B2G3R3_UNORM: - case WINED3DFMT_A8_UNORM: - case WINED3DFMT_B2G3R3A8_UNORM: - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_R10G10B10A2_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_R8G8B8X8_UNORM: - case WINED3DFMT_R16G16_UNORM: - case WINED3DFMT_B10G10R10A2_UNORM: - case WINED3DFMT_R16G16B16A16_UNORM: - case WINED3DFMT_P8_UINT: - TRACE("[OK]\n"); - return TRUE; - default: - TRACE("[FAILED] - Not available on GDI surfaces.\n"); - return FALSE; - } - } - - if (format->glInternal) - { - TRACE("[OK]\n"); - return TRUE; - } - - if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE)) - { - TRACE("[OK]\n"); - return TRUE; - } - - /* Reject other formats */ - TRACE("[FAILED]\n"); - return FALSE; -} - -/* OpenGL supports mipmapping on all formats. Wrapping is unsupported, but we - * have to report mipmapping so we cannot reject WRAPANDMIP. Tests show that - * Windows reports WRAPANDMIP on unfilterable surfaces as well, apparently to - * show that wrapping is supported. The lack of filtering will sort out the - * mipmapping capability anyway. - * - * For now lets report this on all formats, but in the future we may want to - * restrict it to some should applications need that. */ -HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, DWORD usage, - enum wined3d_resource_type resource_type, enum wined3d_format_id check_format_id) -{ - const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - const struct wined3d_format *adapter_format, *format; - enum wined3d_gl_resource_type gl_type, gl_type_end; - BOOL mipmap_gen_supported = TRUE; - DWORD format_flags = 0; - DWORD allowed_usage; - - TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s, " - "resource_type %s, check_format %s.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(adapter_format_id), - debug_d3dusage(usage), debug_d3dusagequery(usage), debug_d3dresourcetype(resource_type), - debug_d3dformat(check_format_id)); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - adapter_format = wined3d_get_format(gl_info, adapter_format_id, WINED3DUSAGE_RENDERTARGET); - format = wined3d_get_format(gl_info, check_format_id, usage); - - switch (resource_type) - { - case WINED3D_RTYPE_NONE: - allowed_usage = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_RENDERTARGET; - gl_type = WINED3D_GL_RES_TYPE_TEX_2D; - gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; - break; - - case WINED3D_RTYPE_TEXTURE_1D: - allowed_usage = WINED3DUSAGE_DYNAMIC - | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE - | WINED3DUSAGE_QUERY_FILTER - | WINED3DUSAGE_QUERY_GENMIPMAP - | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING - | WINED3DUSAGE_QUERY_SRGBREAD - | WINED3DUSAGE_QUERY_SRGBWRITE - | WINED3DUSAGE_QUERY_VERTEXTEXTURE - | WINED3DUSAGE_QUERY_WRAPANDMIP; - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; - break; - - case WINED3D_RTYPE_TEXTURE_2D: - allowed_usage = WINED3DUSAGE_DEPTHSTENCIL - | WINED3DUSAGE_RENDERTARGET - | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING; - if (usage & WINED3DUSAGE_RENDERTARGET) - allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; - if (!(usage & WINED3DUSAGE_TEXTURE)) - { - if (!wined3d_check_surface_capability(format, wined3d->flags & WINED3D_NO3D)) - { - TRACE("[FAILED] - Not supported for plain surfaces.\n"); - return WINED3DERR_NOTAVAILABLE; - } - - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_RB; - break; - } - allowed_usage |= WINED3DUSAGE_DYNAMIC - | WINED3DUSAGE_LEGACY_CUBEMAP - | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE - | WINED3DUSAGE_QUERY_FILTER - | WINED3DUSAGE_QUERY_GENMIPMAP - | WINED3DUSAGE_QUERY_LEGACYBUMPMAP - | WINED3DUSAGE_QUERY_SRGBREAD - | WINED3DUSAGE_QUERY_SRGBWRITE - | WINED3DUSAGE_QUERY_VERTEXTEXTURE - | WINED3DUSAGE_QUERY_WRAPANDMIP; - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; - if (usage & WINED3DUSAGE_LEGACY_CUBEMAP) - { - allowed_usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_QUERY_LEGACYBUMPMAP); - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_CUBE; - } - else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) - && !gl_info->supported[ARB_SHADOW]) - { - TRACE("[FAILED] - No shadow sampler support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; - - case WINED3D_RTYPE_TEXTURE_3D: - allowed_usage = WINED3DUSAGE_DYNAMIC - | WINED3DUSAGE_SOFTWAREPROCESSING - | WINED3DUSAGE_TEXTURE - | WINED3DUSAGE_QUERY_FILTER - | WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING - | WINED3DUSAGE_QUERY_SRGBREAD - | WINED3DUSAGE_QUERY_SRGBWRITE - | WINED3DUSAGE_QUERY_VERTEXTEXTURE - | WINED3DUSAGE_QUERY_WRAPANDMIP; - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; - break; - - default: - FIXME("Unhandled resource type %s.\n", debug_d3dresourcetype(resource_type)); - return WINED3DERR_NOTAVAILABLE; - } - - if ((usage & allowed_usage) != usage) - { - TRACE("Requested usage %#x, but resource type %s only allows %#x.\n", - usage, debug_d3dresourcetype(resource_type), allowed_usage); - return WINED3DERR_NOTAVAILABLE; - } - - if (usage & WINED3DUSAGE_TEXTURE) - format_flags |= WINED3DFMT_FLAG_TEXTURE; - if (usage & WINED3DUSAGE_QUERY_FILTER) - format_flags |= WINED3DFMT_FLAG_FILTERING; - if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) - format_flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; - if (usage & WINED3DUSAGE_QUERY_SRGBREAD) - format_flags |= WINED3DFMT_FLAG_SRGB_READ; - if (usage & WINED3DUSAGE_QUERY_SRGBWRITE) - format_flags |= WINED3DFMT_FLAG_SRGB_WRITE; - if (usage & WINED3DUSAGE_QUERY_VERTEXTEXTURE) - format_flags |= WINED3DFMT_FLAG_VTF; - if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) - format_flags |= WINED3DFMT_FLAG_BUMPMAP; - - if ((format_flags & WINED3DFMT_FLAG_TEXTURE) && (wined3d->flags & WINED3D_NO3D)) - { - TRACE("Requested texturing support, but wined3d was created with WINED3D_NO3D.\n"); - return WINED3DERR_NOTAVAILABLE; - } - - for (; gl_type <= gl_type_end; ++gl_type) - { - if ((format->flags[gl_type] & format_flags) != format_flags) - { - TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); - return WINED3DERR_NOTAVAILABLE; - } - - if ((usage & WINED3DUSAGE_RENDERTARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) - { - TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", - debug_d3dformat(check_format_id)); - return WINED3DERR_NOTAVAILABLE; - } - - /* 3D depth / stencil textures are never supported. */ - if (usage == WINED3DUSAGE_DEPTHSTENCIL && gl_type == WINED3D_GL_RES_TYPE_TEX_3D) - continue; - - if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) - { - TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", - debug_d3dformat(check_format_id)); - return WINED3DERR_NOTAVAILABLE; - } - - if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP)) - mipmap_gen_supported = FALSE; - } - - if ((usage & WINED3DUSAGE_QUERY_GENMIPMAP) && !mipmap_gen_supported) - { - TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); - return WINED3DOK_NOMIPGEN; - } - - return WINED3D_OK; -} - -UINT CDECL wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT width) -{ - const struct wined3d_gl_info *gl_info; - unsigned int row_pitch, slice_pitch; - - TRACE("wined3d %p, adapter_idx %u, format_id %s, width %u.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), width); - - if (adapter_idx >= wined3d->adapter_count) - return ~0u; - - gl_info = &wined3d->adapters[adapter_idx].gl_info; - wined3d_format_calculate_pitch(wined3d_get_format(gl_info, format_id, 0), - 1, width, 1, &row_pitch, &slice_pitch); - - return row_pitch; -} - -HRESULT CDECL wined3d_check_device_format_conversion(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id src_format, enum wined3d_format_id dst_format) -{ - FIXME("wined3d %p, adapter_idx %u, device_type %s, src_format %s, dst_format %s stub!\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(src_format), - debug_d3dformat(dst_format)); - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, enum wined3d_format_id display_format, - enum wined3d_format_id backbuffer_format, BOOL windowed) -{ - BOOL present_conversion = wined3d->flags & WINED3D_PRESENT_CONVERSION; - - TRACE("wined3d %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(display_format), - debug_d3dformat(backbuffer_format), windowed); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - /* The task of this function is to check whether a certain display / backbuffer format - * combination is available on the given adapter. In fullscreen mode microsoft specified - * that the display format shouldn't provide alpha and that ignoring alpha the backbuffer - * and display format should match exactly. - * In windowed mode format conversion can occur and this depends on the driver. */ - - /* There are only 4 display formats. */ - if (!(display_format == WINED3DFMT_B5G6R5_UNORM - || display_format == WINED3DFMT_B5G5R5X1_UNORM - || display_format == WINED3DFMT_B8G8R8X8_UNORM - || display_format == WINED3DFMT_B10G10R10A2_UNORM)) - { - TRACE("Format %s is not supported as display format.\n", debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (!windowed) - { - /* If the requested display format is not available, don't continue. */ - if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, - display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) - { - TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } - - present_conversion = FALSE; - } - else if (display_format == WINED3DFMT_B10G10R10A2_UNORM) - { - /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ - TRACE("Unsupported format combination %s / %s in windowed mode.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (present_conversion) - { - /* Use the display format as back buffer format if the latter is - * WINED3DFMT_UNKNOWN. */ - if (backbuffer_format == WINED3DFMT_UNKNOWN) - backbuffer_format = display_format; - - if (FAILED(wined3d_check_device_format_conversion(wined3d, adapter_idx, - device_type, backbuffer_format, display_format))) - { - TRACE("Format conversion from %s to %s not supported.\n", - debug_d3dformat(backbuffer_format), debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } - } - else - { - /* When format conversion from the back buffer format to the display - * format is not allowed, only a limited number of combinations are - * valid. */ - - if (display_format == WINED3DFMT_B5G6R5_UNORM && backbuffer_format != WINED3DFMT_B5G6R5_UNORM) - { - TRACE("Unsupported format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (display_format == WINED3DFMT_B5G5R5X1_UNORM - && !(backbuffer_format == WINED3DFMT_B5G5R5X1_UNORM || backbuffer_format == WINED3DFMT_B5G5R5A1_UNORM)) - { - TRACE("Unsupported format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (display_format == WINED3DFMT_B8G8R8X8_UNORM - && !(backbuffer_format == WINED3DFMT_B8G8R8X8_UNORM || backbuffer_format == WINED3DFMT_B8G8R8A8_UNORM)) - { - TRACE("Unsupported format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (display_format == WINED3DFMT_B10G10R10A2_UNORM - && backbuffer_format != WINED3DFMT_B10G10R10A2_UNORM) - { - TRACE("Unsupported format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - } - - /* Validate that the back buffer format is usable for render targets. */ - if (FAILED(wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, - WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_TEXTURE_2D, backbuffer_format))) - { - TRACE("Format %s not allowed for render targets.\n", debug_d3dformat(backbuffer_format)); - return WINED3DERR_NOTAVAILABLE; - } - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_device_type device_type, struct wined3d_caps *caps) -{ - const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; - const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_vertex_caps vertex_caps; - DWORD ckey_caps, blit_caps, fx_caps; - struct fragment_caps fragment_caps; - struct shader_caps shader_caps; - - TRACE("wined3d %p, adapter_idx %u, device_type %s, caps %p.\n", - wined3d, adapter_idx, debug_d3ddevicetype(device_type), caps); - - if (adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter_idx; - - caps->Caps = 0; - caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | - WINED3DCAPS2_FULLSCREENGAMMA | - WINED3DCAPS2_DYNAMICTEXTURES; - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) - caps->Caps2 |= WINED3DCAPS2_CANGENMIPMAP; - - caps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD | - WINED3DCAPS3_COPY_TO_VIDMEM | - WINED3DCAPS3_COPY_TO_SYSTEMMEM; - - caps->CursorCaps = WINED3DCURSORCAPS_COLOR | - WINED3DCURSORCAPS_LOWRES; - - caps->DevCaps = WINED3DDEVCAPS_FLOATTLVERTEX | - WINED3DDEVCAPS_EXECUTESYSTEMMEMORY | - WINED3DDEVCAPS_TLVERTEXSYSTEMMEMORY| - WINED3DDEVCAPS_TLVERTEXVIDEOMEMORY | - WINED3DDEVCAPS_DRAWPRIMTLVERTEX | - WINED3DDEVCAPS_HWTRANSFORMANDLIGHT | - WINED3DDEVCAPS_EXECUTEVIDEOMEMORY | - WINED3DDEVCAPS_PUREDEVICE | - WINED3DDEVCAPS_HWRASTERIZATION | - WINED3DDEVCAPS_TEXTUREVIDEOMEMORY | - WINED3DDEVCAPS_TEXTURESYSTEMMEMORY | - WINED3DDEVCAPS_CANRENDERAFTERFLIP | - WINED3DDEVCAPS_DRAWPRIMITIVES2 | - WINED3DDEVCAPS_DRAWPRIMITIVES2EX; - - caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_CULLNONE | - WINED3DPMISCCAPS_CULLCCW | - WINED3DPMISCCAPS_CULLCW | - WINED3DPMISCCAPS_COLORWRITEENABLE | - WINED3DPMISCCAPS_CLIPTLVERTS | - WINED3DPMISCCAPS_CLIPPLANESCALEDPOINTS | - WINED3DPMISCCAPS_MASKZ | - WINED3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING; - /* TODO: - WINED3DPMISCCAPS_NULLREFERENCE - WINED3DPMISCCAPS_FOGANDSPECULARALPHA - WINED3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - WINED3DPMISCCAPS_FOGVERTEXCLAMPED */ - - if (gl_info->supported[WINED3D_GL_BLEND_EQUATION]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_BLENDOP; - if (gl_info->supported[EXT_BLEND_EQUATION_SEPARATE] && gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_SEPARATEALPHABLEND; - if (gl_info->supported[EXT_DRAW_BUFFERS2]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_INDEPENDENTWRITEMASKS; - if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) - caps->PrimitiveMiscCaps |= WINED3DPMISCCAPS_POSTBLENDSRGBCONVERT; - - caps->RasterCaps = WINED3DPRASTERCAPS_DITHER | - WINED3DPRASTERCAPS_PAT | - WINED3DPRASTERCAPS_WFOG | - WINED3DPRASTERCAPS_ZFOG | - WINED3DPRASTERCAPS_FOGVERTEX | - WINED3DPRASTERCAPS_FOGTABLE | - WINED3DPRASTERCAPS_STIPPLE | - WINED3DPRASTERCAPS_SUBPIXEL | - WINED3DPRASTERCAPS_ZTEST | - WINED3DPRASTERCAPS_SCISSORTEST | - WINED3DPRASTERCAPS_SLOPESCALEDEPTHBIAS | - WINED3DPRASTERCAPS_DEPTHBIAS; - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->RasterCaps |= WINED3DPRASTERCAPS_ANISOTROPY | - WINED3DPRASTERCAPS_ZBIAS | - WINED3DPRASTERCAPS_MIPMAPLODBIAS; - } - - caps->ZCmpCaps = WINED3DPCMPCAPS_ALWAYS | - WINED3DPCMPCAPS_EQUAL | - WINED3DPCMPCAPS_GREATER | - WINED3DPCMPCAPS_GREATEREQUAL | - WINED3DPCMPCAPS_LESS | - WINED3DPCMPCAPS_LESSEQUAL | - WINED3DPCMPCAPS_NEVER | - WINED3DPCMPCAPS_NOTEQUAL; - - /* WINED3DPBLENDCAPS_BOTHINVSRCALPHA and WINED3DPBLENDCAPS_BOTHSRCALPHA - * are legacy settings for srcblend only. */ - caps->SrcBlendCaps = WINED3DPBLENDCAPS_BOTHINVSRCALPHA | - WINED3DPBLENDCAPS_BOTHSRCALPHA | - WINED3DPBLENDCAPS_DESTALPHA | - WINED3DPBLENDCAPS_DESTCOLOR | - WINED3DPBLENDCAPS_INVDESTALPHA | - WINED3DPBLENDCAPS_INVDESTCOLOR | - WINED3DPBLENDCAPS_INVSRCALPHA | - WINED3DPBLENDCAPS_INVSRCCOLOR | - WINED3DPBLENDCAPS_ONE | - WINED3DPBLENDCAPS_SRCALPHA | - WINED3DPBLENDCAPS_SRCALPHASAT | - WINED3DPBLENDCAPS_SRCCOLOR | - WINED3DPBLENDCAPS_ZERO; - - caps->DestBlendCaps = WINED3DPBLENDCAPS_DESTALPHA | - WINED3DPBLENDCAPS_DESTCOLOR | - WINED3DPBLENDCAPS_INVDESTALPHA | - WINED3DPBLENDCAPS_INVDESTCOLOR | - WINED3DPBLENDCAPS_INVSRCALPHA | - WINED3DPBLENDCAPS_INVSRCCOLOR | - WINED3DPBLENDCAPS_ONE | - WINED3DPBLENDCAPS_SRCALPHA | - WINED3DPBLENDCAPS_SRCCOLOR | - WINED3DPBLENDCAPS_ZERO; - - if (gl_info->supported[ARB_BLEND_FUNC_EXTENDED]) - caps->DestBlendCaps |= WINED3DPBLENDCAPS_SRCALPHASAT; - - if (gl_info->supported[EXT_BLEND_COLOR]) - { - caps->SrcBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; - caps->DestBlendCaps |= WINED3DPBLENDCAPS_BLENDFACTOR; - } - - - caps->AlphaCmpCaps = WINED3DPCMPCAPS_ALWAYS | - WINED3DPCMPCAPS_EQUAL | - WINED3DPCMPCAPS_GREATER | - WINED3DPCMPCAPS_GREATEREQUAL | - WINED3DPCMPCAPS_LESS | - WINED3DPCMPCAPS_LESSEQUAL | - WINED3DPCMPCAPS_NEVER | - WINED3DPCMPCAPS_NOTEQUAL; - - caps->ShadeCaps = WINED3DPSHADECAPS_SPECULARGOURAUDRGB | - WINED3DPSHADECAPS_COLORGOURAUDRGB | - WINED3DPSHADECAPS_ALPHAFLATBLEND | - WINED3DPSHADECAPS_ALPHAGOURAUDBLEND | - WINED3DPSHADECAPS_COLORFLATRGB | - WINED3DPSHADECAPS_FOGFLAT | - WINED3DPSHADECAPS_FOGGOURAUD | - WINED3DPSHADECAPS_SPECULARFLATRGB; - - caps->TextureCaps = WINED3DPTEXTURECAPS_ALPHA | - WINED3DPTEXTURECAPS_ALPHAPALETTE | - WINED3DPTEXTURECAPS_TRANSPARENCY | - WINED3DPTEXTURECAPS_BORDER | - WINED3DPTEXTURECAPS_MIPMAP | - WINED3DPTEXTURECAPS_PROJECTED | - WINED3DPTEXTURECAPS_PERSPECTIVE; - - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_POW2; - if (gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]) - caps->TextureCaps |= WINED3DPTEXTURECAPS_NONPOW2CONDITIONAL; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP | - WINED3DPTEXTURECAPS_MIPVOLUMEMAP; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_VOLUMEMAP_POW2; - } - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP | - WINED3DPTEXTURECAPS_MIPCUBEMAP; - if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - caps->TextureCaps |= WINED3DPTEXTURECAPS_CUBEMAP_POW2; - } - } - - caps->TextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT | - WINED3DPTFILTERCAPS_LINEAR | - WINED3DPTFILTERCAPS_LINEARMIPLINEAR | - WINED3DPTFILTERCAPS_LINEARMIPNEAREST | - WINED3DPTFILTERCAPS_MIPLINEAR | - WINED3DPTFILTERCAPS_MIPNEAREST | - WINED3DPTFILTERCAPS_NEAREST; - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->TextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | - WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - caps->CubeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT | - WINED3DPTFILTERCAPS_LINEAR | - WINED3DPTFILTERCAPS_LINEARMIPLINEAR | - WINED3DPTFILTERCAPS_LINEARMIPNEAREST | - WINED3DPTFILTERCAPS_MIPLINEAR | - WINED3DPTFILTERCAPS_MIPNEAREST | - WINED3DPTFILTERCAPS_NEAREST; - - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - caps->CubeTextureFilterCaps |= WINED3DPTFILTERCAPS_MAGFANISOTROPIC | - WINED3DPTFILTERCAPS_MINFANISOTROPIC; - } - } - else - { - caps->CubeTextureFilterCaps = 0; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureFilterCaps = WINED3DPTFILTERCAPS_MAGFLINEAR | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MIPFLINEAR | - WINED3DPTFILTERCAPS_MIPFPOINT | - WINED3DPTFILTERCAPS_LINEAR | - WINED3DPTFILTERCAPS_LINEARMIPLINEAR | - WINED3DPTFILTERCAPS_LINEARMIPNEAREST | - WINED3DPTFILTERCAPS_MIPLINEAR | - WINED3DPTFILTERCAPS_MIPNEAREST | - WINED3DPTFILTERCAPS_NEAREST; - } - else - { - caps->VolumeTextureFilterCaps = 0; - } - - caps->TextureAddressCaps = WINED3DPTADDRESSCAPS_INDEPENDENTUV | - WINED3DPTADDRESSCAPS_CLAMP | - WINED3DPTADDRESSCAPS_WRAP; - - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - caps->VolumeTextureAddressCaps = WINED3DPTADDRESSCAPS_INDEPENDENTUV | - WINED3DPTADDRESSCAPS_CLAMP | - WINED3DPTADDRESSCAPS_WRAP; - if (gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_BORDER; - } - if (gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; - } - if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) - { - caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; - } - } - else - { - caps->VolumeTextureAddressCaps = 0; - } - - caps->LineCaps = WINED3DLINECAPS_TEXTURE | - WINED3DLINECAPS_ZTEST | - WINED3DLINECAPS_BLEND | - WINED3DLINECAPS_ALPHACMP | - WINED3DLINECAPS_FOG; - /* WINED3DLINECAPS_ANTIALIAS is not supported on Windows, and dx and gl seem to have a different - * idea how generating the smoothing alpha values works; the result is different - */ - - caps->MaxTextureWidth = gl_info->limits.texture_size; - caps->MaxTextureHeight = gl_info->limits.texture_size; - - if (gl_info->supported[EXT_TEXTURE3D]) - caps->MaxVolumeExtent = gl_info->limits.texture3d_size; - else - caps->MaxVolumeExtent = 0; - - caps->MaxTextureRepeat = 32768; - caps->MaxTextureAspectRatio = gl_info->limits.texture_size; - caps->MaxVertexW = 1.0f; - - caps->GuardBandLeft = 0.0f; - caps->GuardBandTop = 0.0f; - caps->GuardBandRight = 0.0f; - caps->GuardBandBottom = 0.0f; - - caps->ExtentsAdjust = 0.0f; - - caps->StencilCaps = WINED3DSTENCILCAPS_DECRSAT | - WINED3DSTENCILCAPS_INCRSAT | - WINED3DSTENCILCAPS_INVERT | - WINED3DSTENCILCAPS_KEEP | - WINED3DSTENCILCAPS_REPLACE | - WINED3DSTENCILCAPS_ZERO; - if (gl_info->supported[EXT_STENCIL_WRAP]) - { - caps->StencilCaps |= WINED3DSTENCILCAPS_DECR | - WINED3DSTENCILCAPS_INCR; - } - if (gl_info->supported[WINED3D_GL_VERSION_2_0] || gl_info->supported[EXT_STENCIL_TWO_SIDE] - || gl_info->supported[ATI_SEPARATE_STENCIL]) - { - caps->StencilCaps |= WINED3DSTENCILCAPS_TWOSIDED; - } - - caps->MaxAnisotropy = gl_info->limits.anisotropy; - caps->MaxPointSize = gl_info->limits.pointsize_max; - - caps->MaxPrimitiveCount = 0x555555; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ - caps->MaxVertexIndex = 0xffffff; /* Taken from an AMD Radeon HD 5700 (Evergreen) GPU. */ - caps->MaxStreams = MAX_STREAMS; - caps->MaxStreamStride = 1024; - - /* d3d9.dll sets D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES here because StretchRects is implemented in d3d9 */ - caps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | - WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; - caps->MaxNpatchTessellationLevel = 0; - caps->MasterAdapterOrdinal = 0; - caps->AdapterOrdinalInGroup = 0; - caps->NumberOfAdaptersInGroup = 1; - - caps->NumSimultaneousRTs = gl_info->limits.buffers; - - caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | - WINED3DPTFILTERCAPS_MAGFPOINT | - WINED3DPTFILTERCAPS_MINFLINEAR | - WINED3DPTFILTERCAPS_MAGFLINEAR; - caps->VertexTextureFilterCaps = 0; - - adapter->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - adapter->fragment_pipe->get_caps(&adapter->gl_info, &fragment_caps); - adapter->vertex_pipe->vp_get_caps(&adapter->gl_info, &vertex_caps); - - /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ - caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; - - caps->VertexShaderVersion = shader_caps.vs_version; - caps->MaxVertexShaderConst = shader_caps.vs_uniform_count; - - caps->PixelShaderVersion = shader_caps.ps_version; - caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; - - caps->TextureOpCaps = fragment_caps.TextureOpCaps; - caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages; - caps->MaxSimultaneousTextures = fragment_caps.MaxSimultaneousTextures; - - caps->MaxUserClipPlanes = vertex_caps.max_user_clip_planes; - caps->MaxActiveLights = vertex_caps.max_active_lights; - caps->MaxVertexBlendMatrices = vertex_caps.max_vertex_blend_matrices; - caps->MaxVertexBlendMatrixIndex = vertex_caps.max_vertex_blend_matrix_index; - caps->VertexProcessingCaps = vertex_caps.vertex_processing_caps; - caps->FVFCaps = vertex_caps.fvf_caps; - caps->RasterCaps |= vertex_caps.raster_caps; - - /* The following caps are shader specific, but they are things we cannot detect, or which - * are the same among all shader models. So to avoid code duplication set the shader version - * specific, but otherwise constant caps here - */ - if (caps->VertexShaderVersion >= 3) - { - /* Where possible set the caps based on OpenGL extensions and if they - * aren't set (in case of software rendering) use the VS 3.0 from - * MSDN or else if there's OpenGL spec use a hardcoded value minimum - * VS3.0 value. */ - caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; - /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); - /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ - caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; - - caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ - caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); - caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; - } - else if (caps->VertexShaderVersion == 2) - { - caps->VS20Caps.caps = 0; - caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); - caps->VS20Caps.static_flow_control_depth = 1; - - caps->MaxVShaderInstructionsExecuted = 65535; - caps->MaxVertexShader30InstructionSlots = 0; - } - else - { /* VS 1.x */ - caps->VS20Caps.caps = 0; - caps->VS20Caps.dynamic_flow_control_depth = 0; - caps->VS20Caps.temp_count = 0; - caps->VS20Caps.static_flow_control_depth = 0; - - caps->MaxVShaderInstructionsExecuted = 0; - caps->MaxVertexShader30InstructionSlots = 0; - } - - if (caps->PixelShaderVersion >= 3) - { - /* Where possible set the caps based on OpenGL extensions and if they - * aren't set (in case of software rendering) use the PS 3.0 from - * MSDN or else if there's OpenGL spec use a hardcoded value minimum - * PS 3.0 value. */ - - /* Caps is more or less undocumented on MSDN but it appears to be - * used for PS20Caps based on results from R9600/FX5900/Geforce6800 - * cards from Windows */ - caps->PS20Caps.caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | - WINED3DPS20CAPS_GRADIENTINSTRUCTIONS | - WINED3DPS20CAPS_PREDICATION | - WINED3DPS20CAPS_NODEPENDENTREADLIMIT | - WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; - /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); - /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ - caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; - /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ - caps->PS20Caps.instruction_slot_count = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; - - caps->MaxPShaderInstructionsExecuted = 65535; - caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, - adapter->gl_info.limits.arb_ps_instructions); - } - else if(caps->PixelShaderVersion == 2) - { - /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ - caps->PS20Caps.caps = 0; - caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); - caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ - /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ - caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; - - caps->MaxPShaderInstructionsExecuted = 512; /* Minimum value, a GeforceFX uses 1024 */ - caps->MaxPixelShader30InstructionSlots = 0; - } - else /* PS 1.x */ - { - caps->PS20Caps.caps = 0; - caps->PS20Caps.dynamic_flow_control_depth = 0; - caps->PS20Caps.temp_count = 0; - caps->PS20Caps.static_flow_control_depth = 0; - caps->PS20Caps.instruction_slot_count = 0; - - caps->MaxPShaderInstructionsExecuted = 0; - caps->MaxPixelShader30InstructionSlots = 0; - } - - if (caps->VertexShaderVersion >= 2) - { - /* OpenGL supports all the formats below, perhaps not always - * without conversion, but it supports them. - * Further GLSL doesn't seem to have an official unsigned type so - * don't advertise it yet as I'm not sure how we handle it. - * We might need to add some clamping in the shader engine to - * support it. - * TODO: WINED3DDTCAPS_USHORT2N, WINED3DDTCAPS_USHORT4N, WINED3DDTCAPS_UDEC3, WINED3DDTCAPS_DEC3N */ - caps->DeclTypes = WINED3DDTCAPS_UBYTE4 | - WINED3DDTCAPS_UBYTE4N | - WINED3DDTCAPS_SHORT2N | - WINED3DDTCAPS_SHORT4N; - if (gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - caps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | - WINED3DDTCAPS_FLOAT16_4; - } - } - else - { - caps->DeclTypes = 0; - } - - /* Set DirectDraw helper Caps */ - ckey_caps = WINEDDCKEYCAPS_DESTBLT | - WINEDDCKEYCAPS_SRCBLT; - fx_caps = WINEDDFXCAPS_BLTALPHA | - WINEDDFXCAPS_BLTMIRRORLEFTRIGHT | - WINEDDFXCAPS_BLTMIRRORUPDOWN | - WINEDDFXCAPS_BLTROTATION90 | - WINEDDFXCAPS_BLTSHRINKX | - WINEDDFXCAPS_BLTSHRINKXN | - WINEDDFXCAPS_BLTSHRINKY | - WINEDDFXCAPS_BLTSHRINKYN | - WINEDDFXCAPS_BLTSTRETCHX | - WINEDDFXCAPS_BLTSTRETCHXN | - WINEDDFXCAPS_BLTSTRETCHY | - WINEDDFXCAPS_BLTSTRETCHYN; - blit_caps = WINEDDCAPS_BLT | - WINEDDCAPS_BLTCOLORFILL | - WINEDDCAPS_BLTDEPTHFILL | - WINEDDCAPS_BLTSTRETCH | - WINEDDCAPS_CANBLTSYSMEM | - WINEDDCAPS_CANCLIP | - WINEDDCAPS_CANCLIPSTRETCHED | - WINEDDCAPS_COLORKEY | - WINEDDCAPS_COLORKEYHWASSIST; - - /* Fill the ddraw caps structure */ - caps->ddraw_caps.caps = WINEDDCAPS_GDI | - WINEDDCAPS_PALETTE | - blit_caps; - caps->ddraw_caps.caps2 = WINEDDCAPS2_CERTIFIED | - WINEDDCAPS2_NOPAGELOCKREQUIRED | - WINEDDCAPS2_PRIMARYGAMMA | - WINEDDCAPS2_WIDESURFACES | - WINEDDCAPS2_CANRENDERWINDOWED; - caps->ddraw_caps.color_key_caps = ckey_caps; - caps->ddraw_caps.fx_caps = fx_caps; - caps->ddraw_caps.svb_caps = blit_caps; - caps->ddraw_caps.svb_color_key_caps = ckey_caps; - caps->ddraw_caps.svb_fx_caps = fx_caps; - caps->ddraw_caps.vsb_caps = blit_caps; - caps->ddraw_caps.vsb_color_key_caps = ckey_caps; - caps->ddraw_caps.vsb_fx_caps = fx_caps; - caps->ddraw_caps.ssb_caps = blit_caps; - caps->ddraw_caps.ssb_color_key_caps = ckey_caps; - caps->ddraw_caps.ssb_fx_caps = fx_caps; - - caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | - WINEDDSCAPS_BACKBUFFER | - WINEDDSCAPS_FLIP | - WINEDDSCAPS_FRONTBUFFER | - WINEDDSCAPS_OFFSCREENPLAIN | - WINEDDSCAPS_PALETTE | - WINEDDSCAPS_PRIMARYSURFACE | - WINEDDSCAPS_SYSTEMMEMORY | - WINEDDSCAPS_VIDEOMEMORY | - WINEDDSCAPS_VISIBLE; - - if (!(wined3d->flags & WINED3D_NO3D)) - { - caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | - WINEDDSCAPS_MIPMAP | - WINEDDSCAPS_TEXTURE | - WINEDDSCAPS_ZBUFFER; - caps->ddraw_caps.caps |= WINEDDCAPS_3D; - } - - caps->shader_double_precision = d3d_info->shader_double_precision; - - caps->max_feature_level = d3d_info->feature_level; - - return WINED3D_OK; -} - -HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, - HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent, - struct wined3d_device **device) -{ - struct wined3d_device *object; - HRESULT hr; - - TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, surface_alignment %u, device_parent %p, device %p.\n", - wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, device_parent, device); - - /* Validate the adapter number. If no adapters are available(no GL), ignore the adapter - * number and create a device without a 3D adapter for 2D only operation. */ - if (wined3d->adapter_count && adapter_idx >= wined3d->adapter_count) - return WINED3DERR_INVALIDCALL; - - if (!(object = heap_alloc_zero(sizeof(*object)))) - return E_OUTOFMEMORY; - - hr = device_init(object, wined3d, adapter_idx, device_type, - focus_window, flags, surface_alignment, device_parent); - if (FAILED(hr)) - { - WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); - return hr; - } - - TRACE("Created device %p.\n", object); - *device = object; - - device_parent->ops->wined3d_device_created(device_parent, *device); - - return WINED3D_OK; -} - static void WINE_GLAPI invalid_func(const void *data) { ERR("Invalid vertex attribute function called.\n"); @@ -6551,7 +4128,7 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc continue; /* We only want HW acceleration using an OpenGL ICD driver. - * PFD_GENERIC_FORMAT = slow opengl 1.1 gdi software rendering. + * PFD_GENERIC_FORMAT = slow OpenGL 1.1 GDI software rendering. * PFD_GENERIC_ACCELERATED = partial hw acceleration using a MCD * driver (e.g. 3dfx minigl). */ if (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) @@ -6601,7 +4178,7 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) +BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -6711,72 +4288,3 @@ static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD w return TRUE; } - -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) -{ - TRACE("adapter %p.\n", adapter); - - adapter->driver_info.name = "Display"; - adapter->driver_info.description = "WineD3D DirectDraw Emulation"; - if (wined3d_settings.emulated_textureram) - adapter->vram_bytes = wined3d_settings.emulated_textureram; - else - adapter->vram_bytes = 128 * 1024 * 1024; - - if (!wined3d_adapter_init_format_info(adapter, NULL)) - return FALSE; - - adapter->vertex_pipe = &none_vertex_pipe; - adapter->fragment_pipe = &none_fragment_pipe; - adapter->shader_backend = &none_shader_backend; - - return TRUE; -} - -static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, DWORD wined3d_creation_flags) -{ - DISPLAY_DEVICEW display_device; - - adapter->ordinal = ordinal; - - display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); - - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter %p.\n", - adapter->luid.HighPart, adapter->luid.LowPart, adapter); - - if (wined3d_creation_flags & WINED3D_NO3D) - return wined3d_adapter_no3d_init(adapter); - return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); -} - -static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} - -const struct wined3d_parent_ops wined3d_null_parent_ops = -{ - wined3d_null_wined3d_object_destroyed, -}; - -HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) -{ - wined3d->ref = 1; - wined3d->flags = flags; - - TRACE("Initialising adapters.\n"); - - if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) - { - WARN("Failed to initialise adapter.\n"); - return E_FAIL; - } - wined3d->adapter_count = 1; - - return WINED3D_OK; -} diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 65a1bb1fabe..a5c7b973161 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -24,41 +24,13 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> - #include "wined3d_private.h" #include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); -WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(winediag); #define DEFAULT_REFRESH_RATE 0 -/* The driver names reflect the lowest GPU supported - * by a certain driver, so DRIVER_AMD_R300 supports - * R3xx, R4xx and R5xx GPUs. */ -enum wined3d_display_driver -{ - DRIVER_AMD_RAGE_128PRO, - DRIVER_AMD_R100, - DRIVER_AMD_R300, - DRIVER_AMD_R600, - DRIVER_AMD_RX, - DRIVER_INTEL_GMA800, - DRIVER_INTEL_GMA900, - DRIVER_INTEL_GMA950, - DRIVER_INTEL_GMA3000, - DRIVER_INTEL_HD4000, - DRIVER_NVIDIA_TNT, - DRIVER_NVIDIA_GEFORCE2MX, - DRIVER_NVIDIA_GEFORCEFX, - DRIVER_NVIDIA_GEFORCE6, - DRIVER_NVIDIA_GEFORCE8, - DRIVER_VMWARE, - DRIVER_UNKNOWN -}; - enum wined3d_driver_model { DRIVER_MODEL_GENERIC, @@ -68,208 +40,9 @@ enum wined3d_driver_model DRIVER_MODEL_NT6X }; -enum wined3d_gl_vendor -{ - GL_VENDOR_UNKNOWN, - GL_VENDOR_APPLE, - GL_VENDOR_FGLRX, - GL_VENDOR_MESA, - GL_VENDOR_NVIDIA, -}; - /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; -/* Extension detection */ -struct wined3d_extension_map -{ - const char *extension_string; - enum wined3d_gl_extension extension; -}; - -static const struct wined3d_extension_map gl_extension_map[] = -{ - /* APPLE */ - {"GL_APPLE_fence", APPLE_FENCE }, - {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS }, - {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE }, - {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, - - /* ARB */ - {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, - {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, - {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, - {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, - {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, - {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, - {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, - {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, - {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, - {"GL_ARB_copy_image", ARB_COPY_IMAGE }, - {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, - {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, - {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, - {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP }, - {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, - {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, - {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, - {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, - {"GL_ARB_draw_indirect", ARB_DRAW_INDIRECT }, - {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, - {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, - {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, - {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, - {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, - {"GL_ARB_fragment_layer_viewport", ARB_FRAGMENT_LAYER_VIEWPORT }, - {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, - {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, - {"GL_ARB_framebuffer_no_attachments", ARB_FRAMEBUFFER_NO_ATTACHMENTS}, - {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, - {"GL_ARB_framebuffer_sRGB", ARB_FRAMEBUFFER_SRGB }, - {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, - {"GL_ARB_gpu_shader5", ARB_GPU_SHADER5 }, - {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, - {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, - {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS }, - {"GL_ARB_internalformat_query", ARB_INTERNALFORMAT_QUERY }, - {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2 }, - {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, - {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, - {"GL_ARB_multisample", ARB_MULTISAMPLE }, - {"GL_ARB_multitexture", ARB_MULTITEXTURE }, - {"GL_ARB_occlusion_query", ARB_OCCLUSION_QUERY }, - {"GL_ARB_pipeline_statistics_query", ARB_PIPELINE_STATISTICS_QUERY }, - {"GL_ARB_pixel_buffer_object", ARB_PIXEL_BUFFER_OBJECT }, - {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, - {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, - {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, - {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, - {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, - {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, - {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, - {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, - {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, - {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, - {"GL_ARB_shader_storage_buffer_object", ARB_SHADER_STORAGE_BUFFER_OBJECT}, - {"GL_ARB_shader_texture_image_samples", ARB_SHADER_TEXTURE_IMAGE_SAMPLES}, - {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, - {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, - {"GL_ARB_shading_language_420pack", ARB_SHADING_LANGUAGE_420PACK }, - {"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING }, - {"GL_ARB_shadow", ARB_SHADOW }, - {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, - {"GL_ARB_sync", ARB_SYNC }, - {"GL_ARB_tessellation_shader", ARB_TESSELLATION_SHADER }, - {"GL_ARB_texture_border_clamp", ARB_TEXTURE_BORDER_CLAMP }, - {"GL_ARB_texture_buffer_object", ARB_TEXTURE_BUFFER_OBJECT }, - {"GL_ARB_texture_buffer_range", ARB_TEXTURE_BUFFER_RANGE }, - {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, - {"GL_ARB_texture_compression_bptc", ARB_TEXTURE_COMPRESSION_BPTC }, - {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, - {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, - {"GL_ARB_texture_cube_map_array", ARB_TEXTURE_CUBE_MAP_ARRAY }, - {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, - {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, - {"GL_ARB_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, - {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, - {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, - {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, - {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, - {"GL_ARB_texture_multisample", ARB_TEXTURE_MULTISAMPLE }, - {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, - {"GL_ARB_texture_query_levels", ARB_TEXTURE_QUERY_LEVELS }, - {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, - {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, - {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, - {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, - {"GL_ARB_texture_storage_multisample", ARB_TEXTURE_STORAGE_MULTISAMPLE}, - {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, - {"GL_ARB_texture_view", ARB_TEXTURE_VIEW }, - {"GL_ARB_timer_query", ARB_TIMER_QUERY }, - {"GL_ARB_transform_feedback2", ARB_TRANSFORM_FEEDBACK2 }, - {"GL_ARB_transform_feedback3", ARB_TRANSFORM_FEEDBACK3 }, - {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, - {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, - {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, - {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, - {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, - {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, - {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, - - /* ATI */ - {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER }, - {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL }, - {"GL_ATI_texture_compression_3dc", ATI_TEXTURE_COMPRESSION_3DC }, - {"GL_ATI_texture_env_combine3", ATI_TEXTURE_ENV_COMBINE3 }, - {"GL_ATI_texture_mirror_once", ATI_TEXTURE_MIRROR_ONCE }, - - /* EXT */ - {"GL_EXT_blend_color", EXT_BLEND_COLOR }, - {"GL_EXT_blend_equation_separate", EXT_BLEND_EQUATION_SEPARATE }, - {"GL_EXT_blend_func_separate", EXT_BLEND_FUNC_SEPARATE }, - {"GL_EXT_blend_minmax", EXT_BLEND_MINMAX }, - {"GL_EXT_blend_subtract", EXT_BLEND_SUBTRACT }, - {"GL_EXT_depth_bounds_test", EXT_DEPTH_BOUNDS_TEST }, - {"GL_EXT_draw_buffers2", EXT_DRAW_BUFFERS2 }, - {"GL_EXT_fog_coord", EXT_FOG_COORD }, - {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, - {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, - {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, - {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, - {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, - {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, - {"GL_EXT_packed_float", EXT_PACKED_FLOAT }, - {"GL_EXT_point_parameters", EXT_POINT_PARAMETERS }, - {"GL_EXT_provoking_vertex", EXT_PROVOKING_VERTEX }, - {"GL_EXT_secondary_color", EXT_SECONDARY_COLOR }, - {"GL_EXT_stencil_two_side", EXT_STENCIL_TWO_SIDE }, - {"GL_EXT_stencil_wrap", EXT_STENCIL_WRAP }, - {"GL_EXT_texture3D", EXT_TEXTURE3D }, - {"GL_EXT_texture_array", EXT_TEXTURE_ARRAY }, - {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC }, - {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, - {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, - {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, - {"GL_EXT_texture_filter_anisotropic", ARB_TEXTURE_FILTER_ANISOTROPIC}, - {"GL_EXT_texture_integer", EXT_TEXTURE_INTEGER }, - {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, - {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, - {"GL_EXT_texture_shared_exponent", EXT_TEXTURE_SHARED_EXPONENT }, - {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, - {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, - {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, - {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, - - /* NV */ - {"GL_NV_fence", NV_FENCE }, - {"GL_NV_fog_distance", NV_FOG_DISTANCE }, - {"GL_NV_fragment_program", NV_FRAGMENT_PROGRAM }, - {"GL_NV_fragment_program2", NV_FRAGMENT_PROGRAM2 }, - {"GL_NV_fragment_program_option", NV_FRAGMENT_PROGRAM_OPTION }, - {"GL_NV_half_float", NV_HALF_FLOAT }, - {"GL_NV_light_max_exponent", NV_LIGHT_MAX_EXPONENT }, - {"GL_NV_point_sprite", NV_POINT_SPRITE }, - {"GL_NV_register_combiners", NV_REGISTER_COMBINERS }, - {"GL_NV_register_combiners2", NV_REGISTER_COMBINERS2 }, - {"GL_NV_texgen_reflection", NV_TEXGEN_REFLECTION }, - {"GL_NV_texture_env_combine4", NV_TEXTURE_ENV_COMBINE4 }, - {"GL_NV_texture_shader", NV_TEXTURE_SHADER }, - {"GL_NV_texture_shader2", NV_TEXTURE_SHADER2 }, - {"GL_NV_vertex_program", NV_VERTEX_PROGRAM }, - {"GL_NV_vertex_program1_1", NV_VERTEX_PROGRAM1_1 }, - {"GL_NV_vertex_program2", NV_VERTEX_PROGRAM2 }, - {"GL_NV_vertex_program2_option", NV_VERTEX_PROGRAM2_OPTION }, - {"GL_NV_vertex_program3", NV_VERTEX_PROGRAM3 }, -}; - -static const struct wined3d_extension_map wgl_extension_map[] = -{ - {"WGL_ARB_pixel_format", WGL_ARB_PIXEL_FORMAT }, - {"WGL_EXT_swap_control", WGL_EXT_SWAP_CONTROL }, - {"WGL_WINE_pixel_format_passthrough", WGL_WINE_PIXEL_FORMAT_PASSTHROUGH}, - {"WGL_WINE_query_renderer", WGL_WINE_QUERY_RENDERER }, -}; - /********************************************************** * Utility functions follow **********************************************************/ @@ -288,141 +61,6 @@ const GLenum magLookup[] = GL_NEAREST, GL_NEAREST, GL_LINEAR, }; -static void wined3d_caps_gl_ctx_destroy(const struct wined3d_caps_gl_ctx *ctx) -{ - const struct wined3d_gl_info *gl_info = ctx->gl_info; - - TRACE("Destroying caps GL context.\n"); - - /* Both glDeleteProgram and glDeleteBuffers silently ignore 0 IDs but - * this function might be called before the relevant function pointers - * in gl_info are initialized. */ - if (ctx->test_program_id || ctx->test_vbo) - { - GL_EXTCALL(glDeleteProgram(ctx->test_program_id)); - GL_EXTCALL(glDeleteBuffers(1, &ctx->test_vbo)); - } - - if (!wglMakeCurrent(NULL, NULL)) - ERR("Failed to disable caps GL context.\n"); - - if (!wglDeleteContext(ctx->gl_ctx)) - { - DWORD err = GetLastError(); - ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); - } - - wined3d_release_dc(ctx->wnd, ctx->dc); - DestroyWindow(ctx->wnd); - - if (ctx->restore_gl_ctx && !wglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) - ERR("Failed to restore previous GL context.\n"); -} - -static BOOL wined3d_caps_gl_ctx_create_attribs(struct wined3d_caps_gl_ctx *caps_gl_ctx, - struct wined3d_gl_info *gl_info) -{ - HGLRC new_ctx; - - if (!(gl_info->p_wglCreateContextAttribsARB = (void *)wglGetProcAddress("wglCreateContextAttribsARB"))) - return TRUE; - - if (!(new_ctx = context_create_wgl_attribs(gl_info, caps_gl_ctx->dc, NULL))) - { - gl_info->p_wglCreateContextAttribsARB = NULL; - return FALSE; - } - - if (!wglMakeCurrent(caps_gl_ctx->dc, new_ctx)) - { - ERR("Failed to make new context current, last error %#x.\n", GetLastError()); - if (!wglDeleteContext(new_ctx)) - ERR("Failed to delete new context, last error %#x.\n", GetLastError()); - gl_info->p_wglCreateContextAttribsARB = NULL; - return TRUE; - } - - if (!wglDeleteContext(caps_gl_ctx->gl_ctx)) - ERR("Failed to delete old context, last error %#x.\n", GetLastError()); - caps_gl_ctx->gl_ctx = new_ctx; - - return TRUE; -} - -static BOOL wined3d_caps_gl_ctx_create(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) -{ - PIXELFORMATDESCRIPTOR pfd; - int iPixelFormat; - - TRACE("getting context...\n"); - - ctx->restore_dc = wglGetCurrentDC(); - ctx->restore_gl_ctx = wglGetCurrentContext(); - - /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ - ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", - WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if (!ctx->wnd) - { - ERR("Failed to create a window.\n"); - goto fail; - } - - ctx->dc = GetDC(ctx->wnd); - if (!ctx->dc) - { - ERR("Failed to get a DC.\n"); - goto fail; - } - - /* PixelFormat selection */ - ZeroMemory(&pfd, 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.cColorBits = 32; - pfd.iLayerType = PFD_MAIN_PLANE; - - if (!(iPixelFormat = ChoosePixelFormat(ctx->dc, &pfd))) - { - /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ - ERR("Failed to find a suitable pixel format.\n"); - goto fail; - } - DescribePixelFormat(ctx->dc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(ctx->dc, iPixelFormat, &pfd); - - /* Create a GL context. */ - if (!(ctx->gl_ctx = wglCreateContext(ctx->dc))) - { - WARN("Failed to create default context for capabilities initialization.\n"); - goto fail; - } - - /* Make it the current GL context. */ - if (!wglMakeCurrent(ctx->dc, ctx->gl_ctx)) - { - ERR("Failed to make caps GL context current.\n"); - goto fail; - } - - ctx->gl_info = &adapter->gl_info; - return TRUE; - -fail: - if (ctx->gl_ctx) wglDeleteContext(ctx->gl_ctx); - ctx->gl_ctx = NULL; - if (ctx->dc) ReleaseDC(ctx->wnd, ctx->dc); - ctx->dc = NULL; - if (ctx->wnd) DestroyWindow(ctx->wnd); - ctx->wnd = NULL; - if (ctx->restore_gl_ctx && !wglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) - ERR("Failed to restore previous GL context.\n"); - - return FALSE; -} - /* Adjust the amount of used texture memory */ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) { @@ -468,706 +106,6 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Context activation is done by the caller. */ -static BOOL test_arb_vs_offset_limit(const struct wined3d_gl_info *gl_info) -{ - GLuint prog; - BOOL ret = FALSE; - static const char testcode[] = - "!!ARBvp1.0\n" - "PARAM C[66] = { program.env[0..65] };\n" - "ADDRESS A0;" - "PARAM zero = {0.0, 0.0, 0.0, 0.0};\n" - "ARL A0.x, zero.x;\n" - "MOV result.position, C[A0.x + 65];\n" - "END\n"; - - while (gl_info->gl_ops.gl.p_glGetError()); - GL_EXTCALL(glGenProgramsARB(1, &prog)); - if(!prog) { - ERR("Failed to create an ARB offset limit test program\n"); - } - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog)); - GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - strlen(testcode), testcode)); - if (gl_info->gl_ops.gl.p_glGetError()) - { - TRACE("OpenGL implementation does not allow indirect addressing offsets > 63\n"); - TRACE("error: %s\n", debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - ret = TRUE; - } else TRACE("OpenGL implementation allows offsets > 63\n"); - - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, 0)); - GL_EXTCALL(glDeleteProgramsARB(1, &prog)); - checkGLcall("ARB vp offset limit test cleanup"); - - return ret; -} - -static BOOL match_amd_r300_to_500(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (card_vendor != HW_VENDOR_AMD) return FALSE; - if (device == CARD_AMD_RADEON_9500) return TRUE; - if (device == CARD_AMD_RADEON_X700) return TRUE; - if (device == CARD_AMD_RADEON_X1600) return TRUE; - return FALSE; -} - -static BOOL match_geforce5(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (card_vendor == HW_VENDOR_NVIDIA) - { - if (device == CARD_NVIDIA_GEFORCEFX_5200 || - device == CARD_NVIDIA_GEFORCEFX_5600 || - device == CARD_NVIDIA_GEFORCEFX_5800) - { - return TRUE; - } - } - return FALSE; -} - -static BOOL match_apple(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from - * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to - * detect the Apple OpenGL implementation to apply some extension fixups afterwards. - * - * Detecting this isn't really easy. The vendor string doesn't mention Apple. Compile-time checks - * aren't sufficient either because a Linux binary may display on a macos X server via remote X11. - * So try to detect the GL implementation by looking at certain Apple extensions. Some extensions - * like client storage might be supported on other implementations too, but GL_APPLE_flush_render - * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So - * the chance that other implementations support them is rather small since Win32 QuickTime uses - * DirectDraw, not OpenGL. - * - * This test has been moved into wined3d_guess_gl_vendor() - */ - return gl_vendor == GL_VENDOR_APPLE; -} - -/* Context activation is done by the caller. */ -static void test_pbo_functionality(struct wined3d_gl_info *gl_info) -{ - /* Some OpenGL implementations, namely Apple's Geforce 8 driver, advertises PBOs, - * but glTexSubImage from a PBO fails miserably, with the first line repeated over - * all the texture. This function detects this bug by its symptom and disables PBOs - * if the test fails. - * - * The test uploads a 4x4 texture via the PBO in the "native" format GL_BGRA, - * GL_UNSIGNED_INT_8_8_8_8_REV. This format triggers the bug, and it is what we use - * for D3DFMT_A8R8G8B8. Then the texture is read back without any PBO and the data - * read back is compared to the original. If they are equal PBOs are assumed to work, - * otherwise the PBO extension is disabled. */ - GLuint texture, pbo; - static const unsigned int pattern[] = - { - 0x00000000, 0x000000ff, 0x0000ff00, 0x40ff0000, - 0x80ffffff, 0x40ffff00, 0x00ff00ff, 0x0000ffff, - 0x00ffff00, 0x00ff00ff, 0x0000ffff, 0x000000ff, - 0x80ff00ff, 0x0000ffff, 0x00ff00ff, 0x40ff00ff - }; - unsigned int check[ARRAY_SIZE(pattern)]; - - /* No PBO -> No point in testing them. */ - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) return; - - while (gl_info->gl_ops.gl.p_glGetError()); - gl_info->gl_ops.gl.p_glGenTextures(1, &texture); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, texture); - - gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0); - checkGLcall("Specifying the PBO test texture"); - - GL_EXTCALL(glGenBuffers(1, &pbo)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo)); - GL_EXTCALL(glBufferData(GL_PIXEL_UNPACK_BUFFER, sizeof(pattern), pattern, GL_STREAM_DRAW)); - checkGLcall("Specifying the PBO test pbo"); - - gl_info->gl_ops.gl.p_glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); - checkGLcall("Loading the PBO test texture"); - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - - gl_info->gl_ops.gl.p_glFinish(); /* just to be sure */ - - memset(check, 0, sizeof(check)); - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, check); - checkGLcall("Reading back the PBO test texture"); - - gl_info->gl_ops.gl.p_glDeleteTextures(1, &texture); - GL_EXTCALL(glDeleteBuffers(1, &pbo)); - checkGLcall("PBO test cleanup"); - - if (memcmp(check, pattern, sizeof(check))) - { - WARN_(d3d_perf)("PBO test failed, read back data doesn't match original.\n" - "Disabling PBOs. This may result in slower performance.\n"); - gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] = FALSE; - } - else - { - TRACE("PBO test successful.\n"); - } -} - -static BOOL match_apple_intel(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return (card_vendor == HW_VENDOR_INTEL) && (gl_vendor == GL_VENDOR_APPLE); -} - -static BOOL match_apple_nonr500ati(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (gl_vendor != GL_VENDOR_APPLE) return FALSE; - if (card_vendor != HW_VENDOR_AMD) return FALSE; - if (device == CARD_AMD_RADEON_X1600) return FALSE; - return TRUE; -} - -static BOOL match_dx10_capable(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - /* DX9 cards support 40 single float varyings in hardware, most drivers report 32. ATI misreports - * 44 varyings. So assume that if we have more than 44 varyings we have a dx10 card. - * This detection is for the gl_ClipPos varying quirk. If a d3d9 card really supports more than 44 - * varyings and we subtract one in dx9 shaders it's not going to hurt us because the dx9 limit is - * hardcoded - * - * dx10 cards usually have 64 varyings */ - return gl_info->limits.glsl_varyings > 44; -} - -static BOOL match_not_dx10_capable(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return !match_dx10_capable(gl_info, ctx, gl_renderer, gl_vendor, card_vendor, device); -} - -/* A GL context is provided by the caller */ -static BOOL match_allows_spec_alpha(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - GLenum error; - DWORD data[16]; - - if (!gl_info->supported[EXT_SECONDARY_COLOR] || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return FALSE; - - while (gl_info->gl_ops.gl.p_glGetError()); - GL_EXTCALL(glSecondaryColorPointerEXT)(4, GL_UNSIGNED_BYTE, 4, data); - error = gl_info->gl_ops.gl.p_glGetError(); - - if (error == GL_NO_ERROR) - { - TRACE("GL Implementation accepts 4 component specular color pointers\n"); - return TRUE; - } - else - { - TRACE("GL implementation does not accept 4 component specular colors, error %s\n", - debug_glerror(error)); - return FALSE; - } -} - -/* A GL context is provided by the caller */ -static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - GLuint prog; - BOOL ret = FALSE; - GLint pos; - static const char testcode[] = - "!!ARBvp1.0\n" - "OPTION NV_vertex_program2;\n" - "MOV result.clip[0], 0.0;\n" - "MOV result.position, 0.0;\n" - "END\n"; - - if (!gl_info->supported[NV_VERTEX_PROGRAM2_OPTION]) return FALSE; - - while (gl_info->gl_ops.gl.p_glGetError()); - - GL_EXTCALL(glGenProgramsARB(1, &prog)); - if(!prog) - { - ERR("Failed to create the NVvp clip test program\n"); - return FALSE; - } - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, prog)); - GL_EXTCALL(glProgramStringARB(GL_VERTEX_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - strlen(testcode), testcode)); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &pos); - if(pos != -1) - { - WARN("GL_NV_vertex_program2_option result.clip[] test failed\n"); - TRACE("error: %s\n", debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); - ret = TRUE; - while (gl_info->gl_ops.gl.p_glGetError()); - } - else TRACE("GL_NV_vertex_program2_option result.clip[] test passed\n"); - - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, 0)); - GL_EXTCALL(glDeleteProgramsARB(1, &prog)); - checkGLcall("GL_NV_vertex_program2_option result.clip[] test cleanup"); - - return ret; -} - -/* Context activation is done by the caller. */ -static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - char data[4 * 4 * 4]; - GLuint tex, fbo; - GLenum status; - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return FALSE; - - memset(data, 0xcc, sizeof(data)); - - gl_info->gl_ops.gl.p_glGenTextures(1, &tex); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); - gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 4, 4, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); - checkGLcall("glTexImage2D"); - - gl_info->fbo_ops.glGenFramebuffers(1, &fbo); - gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0); - checkGLcall("glFramebufferTexture2D"); - - status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); - if (status != GL_FRAMEBUFFER_COMPLETE) ERR("FBO status %#x\n", status); - checkGLcall("glCheckFramebufferStatus"); - - memset(data, 0x11, sizeof(data)); - gl_info->gl_ops.gl.p_glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 4, 4, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data); - checkGLcall("glTexSubImage2D"); - - gl_info->gl_ops.gl.p_glClearColor(0.996f, 0.729f, 0.745f, 0.792f); - gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); - checkGLcall("glClear"); - - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data); - checkGLcall("glGetTexImage"); - - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); - gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, 0); - checkGLcall("glBindTexture"); - - gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); - checkGLcall("glDeleteTextures"); - - return *(DWORD *)data == 0x11111111; -} - -/* Context activation is done by the caller. */ -static BOOL match_broken_rgba16(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - /* GL_RGBA16 uses GL_RGBA8 internally on Geforce 7 and older cards. - * This leads to graphical bugs in Half Life 2 and Unreal engine games. */ - GLuint tex; - GLint size; - - gl_info->gl_ops.gl.p_glGenTextures(1, &tex); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA16, 4, 4, 0, GL_RGBA, GL_UNSIGNED_SHORT, NULL); - checkGLcall("glTexImage2D"); - - gl_info->gl_ops.gl.p_glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_RED_SIZE, &size); - checkGLcall("glGetTexLevelParameteriv"); - TRACE("Real color depth is %d\n", size); - - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, 0); - checkGLcall("glBindTexture"); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); - checkGLcall("glDeleteTextures"); - - return size < 16; -} - -static BOOL match_fglrx(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - return gl_vendor == GL_VENDOR_FGLRX; -} - -static BOOL match_r200(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (card_vendor != HW_VENDOR_AMD) return FALSE; - if (device == CARD_AMD_RADEON_8500) return TRUE; - return FALSE; -} - -static BOOL match_broken_arb_fog(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - DWORD data[4]; - GLuint tex, fbo; - GLenum status; - float color[4] = {0.0f, 1.0f, 0.0f, 0.0f}; - GLuint prog; - GLint err_pos; - static const char program_code[] = - "!!ARBfp1.0\n" - "OPTION ARB_fog_linear;\n" - "MOV result.color, {1.0, 0.0, 0.0, 0.0};\n" - "END\n"; - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return FALSE; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return FALSE; - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return FALSE; - - gl_info->gl_ops.gl.p_glGenTextures(1, &tex); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); - gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, 4, 1, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); - checkGLcall("glTexImage2D"); - - gl_info->fbo_ops.glGenFramebuffers(1, &fbo); - gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, fbo); - gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, tex, 0); - checkGLcall("glFramebufferTexture2D"); - - status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); - if (status != GL_FRAMEBUFFER_COMPLETE) ERR("FBO status %#x\n", status); - checkGLcall("glCheckFramebufferStatus"); - - gl_info->gl_ops.gl.p_glClearColor(0.0f, 0.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glClear(GL_COLOR_BUFFER_BIT); - checkGLcall("glClear"); - gl_info->gl_ops.gl.p_glViewport(0, 0, 4, 1); - checkGLcall("glViewport"); - - gl_info->gl_ops.gl.p_glEnable(GL_FOG); - gl_info->gl_ops.gl.p_glFogf(GL_FOG_START, 0.5f); - gl_info->gl_ops.gl.p_glFogf(GL_FOG_END, 0.5f); - gl_info->gl_ops.gl.p_glFogi(GL_FOG_MODE, GL_LINEAR); - gl_info->gl_ops.gl.p_glHint(GL_FOG_HINT, GL_NICEST); - gl_info->gl_ops.gl.p_glFogfv(GL_FOG_COLOR, color); - checkGLcall("fog setup"); - - GL_EXTCALL(glGenProgramsARB(1, &prog)); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog)); - GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, - strlen(program_code), program_code)); - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("Test fragment program setup"); - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &err_pos); - if (err_pos != -1) - { - const char *error_str; - error_str = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB); - FIXME("Fog test program error at position %d: %s\n\n", err_pos, debugstr_a(error_str)); - } - - gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); - gl_info->gl_ops.gl.p_glVertex3f(-1.0f, -1.0f, 0.0f); - gl_info->gl_ops.gl.p_glVertex3f( 1.0f, -1.0f, 1.0f); - gl_info->gl_ops.gl.p_glVertex3f(-1.0f, 1.0f, 0.0f); - gl_info->gl_ops.gl.p_glVertex3f( 1.0f, 1.0f, 1.0f); - gl_info->gl_ops.gl.p_glEnd(); - checkGLcall("ARBfp fog test draw"); - - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data); - checkGLcall("glGetTexImage"); - data[0] &= 0x00ffffff; - data[1] &= 0x00ffffff; - data[2] &= 0x00ffffff; - data[3] &= 0x00ffffff; - - gl_info->fbo_ops.glBindFramebuffer(GL_FRAMEBUFFER, 0); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, 0); - - gl_info->fbo_ops.glDeleteFramebuffers(1, &fbo); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex); - gl_info->gl_ops.gl.p_glDisable(GL_FOG); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0)); - gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); - GL_EXTCALL(glDeleteProgramsARB(1, &prog)); - checkGLcall("ARBfp fog test teardown"); - - TRACE("Fog test data: %08x %08x %08x %08x\n", data[0], data[1], data[2], data[3]); - return data[0] != 0x00ff0000 || data[3] != 0x0000ff00; -} - -static BOOL match_broken_viewport_subpixel_bits(const struct wined3d_gl_info *gl_info, - struct wined3d_caps_gl_ctx *ctx, const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) -{ - if (!gl_info->supported[ARB_VIEWPORT_ARRAY]) - return FALSE; - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) - return FALSE; - return !wined3d_caps_gl_ctx_test_viewport_subpixel_bits(ctx); -} - -static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) -{ - /* MacOS needs uniforms for relative addressing offsets. This can accumulate to quite a few uniforms. - * Beyond that the general uniform isn't optimal, so reserve a number of uniforms. 12 vec4's should - * allow 48 different offsets or other helper immediate values. */ - TRACE("Reserving 12 GLSL constants for compiler private use.\n"); - gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 12); -} - -static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) -{ - /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although - * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). - * If real NP2 textures are used, the driver falls back to software. We could just remove the - * extension and use GL_ARB_texture_rectangle instead, but texture_rectangle is inconvenient - * due to the non-normalized texture coordinates. Thus set an internal extension flag, - * GL_WINE_normalized_texrect, which signals the code that it can use non power of two textures - * as per GL_ARB_texture_non_power_of_two, but has to stick to the texture_rectangle limits. - * - * fglrx doesn't advertise GL_ARB_texture_non_power_of_two, but it advertises opengl 2.0 which - * has this extension promoted to core. The extension loading code sets this extension supported - * due to that, so this code works on fglrx as well. */ - if(gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - TRACE("GL_ARB_texture_non_power_of_two advertised on R500 or earlier card, removing.\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] = TRUE; - } -} - -static void quirk_no_np2(struct wined3d_gl_info *gl_info) -{ - /* The nVidia GeForceFX series reports OpenGL 2.0 capabilities with the latest drivers versions, but - * doesn't explicitly advertise the ARB_tex_npot extension in the GL extension string. - * This usually means that ARB_tex_npot is supported in hardware as long as the application is staying - * within the limits enforced by the ARB_texture_rectangle extension. This however is not true for the - * FX series, which instantly falls back to a slower software path as soon as ARB_tex_npot is used. - * We therefore completely remove ARB_tex_npot from the list of supported extensions. - * - * Note that wine_normalized_texrect can't be used in this case because internally it uses ARB_tex_npot, - * triggering the software fallback. There is not much we can do here apart from disabling the - * software-emulated extension and re-enable ARB_tex_rect (which was previously disabled - * in wined3d_adapter_init_gl_caps). - * This fixup removes performance problems on both the FX 5900 and FX 5700 (e.g. for framebuffer - * post-processing effects in the game "Max Payne 2"). - * The behaviour can be verified through a simple test app attached in bugreport #14724. */ - TRACE("GL_ARB_texture_non_power_of_two advertised through OpenGL 2.0 on NV FX card, removing.\n"); - gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; - gl_info->supported[ARB_TEXTURE_RECTANGLE] = TRUE; -} - -static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) -{ - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by default, which causes problems - * with fixed function fragment processing. Ideally this flag should be detected with a test shader - * and OpenGL feedback mode, but some GL implementations (MacOS ATI at least, probably all MacOS ones) - * do not like vertex shaders in feedback mode and return an error, even though it should be valid - * according to the spec. - * - * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This - * makes the shader slower and eats instruction slots which should be available to the d3d app. - * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards, blacklist - * all radeon cards on Macs and whitelist the good ones. That way we're prepared for the future. If - * this workaround is activated on cards that do not need it, it won't break things, just affect - * performance negatively. */ - TRACE("Enabling vertex texture coord fixes in vertex shaders.\n"); - gl_info->quirks |= WINED3D_QUIRK_SET_TEXCOORD_W; -} - -static void quirk_clip_varying(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; -} - -static void quirk_allows_specular_alpha(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA; -} - -static void quirk_disable_nvvp_clip(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_NV_CLIP_BROKEN; -} - -static void quirk_fbo_tex_update(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_FBO_TEX_UPDATE; -} - -static void quirk_broken_rgba16(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_BROKEN_RGBA16; -} - -static void quirk_infolog_spam(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_INFO_LOG_SPAM; -} - -static void quirk_limited_tex_filtering(struct wined3d_gl_info *gl_info) -{ - /* Nvidia GeForce 6xxx and 7xxx support accelerated VTF only on a few - selected texture formats. They are apparently the only DX9 class GPUs - supporting VTF. - Also, DX9-era GPUs are somewhat limited with float textures - filtering and blending. */ - gl_info->quirks |= WINED3D_QUIRK_LIMITED_TEX_FILTERING; -} - -static void quirk_r200_constants(struct wined3d_gl_info *gl_info) -{ - /* The Mesa r200 driver (and there is no other driver for this GPU Wine would run on) - * loads some fog parameters (start, end, exponent, but not the color) into the - * program. - * - * Apparently the fog hardware is only able to handle linear fog with a range of 0.0;1.0, - * and it is the responsibility of the vertex pipeline to handle non-linear fog and - * linear fog with start and end other than 0.0 and 1.0. */ - TRACE("Reserving 1 ARB constant for compiler private use.\n"); - gl_info->reserved_arb_constants = max(gl_info->reserved_arb_constants, 1); -} - -static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) -{ - gl_info->quirks |= WINED3D_QUIRK_BROKEN_ARB_FOG; -} - -static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info) -{ - if (gl_info->supported[ARB_CLIP_CONTROL]) - { - TRACE("Disabling ARB_clip_control.\n"); - gl_info->supported[ARB_CLIP_CONTROL] = FALSE; - } -} - -struct driver_quirk -{ - BOOL (*match)(const struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device); - void (*apply)(struct wined3d_gl_info *gl_info); - const char *description; -}; - -static const struct driver_quirk quirk_table[] = -{ - { - match_amd_r300_to_500, - quirk_amd_dx9, - "AMD normalized texrect quirk" - }, - { - match_apple, - quirk_apple_glsl_constants, - "Apple GLSL uniform override" - }, - { - match_geforce5, - quirk_no_np2, - "Geforce 5 NP2 disable" - }, - { - match_apple_intel, - quirk_texcoord_w, - "Init texcoord .w for Apple Intel GPU driver" - }, - { - match_apple_nonr500ati, - quirk_texcoord_w, - "Init texcoord .w for Apple ATI >= r600 GPU driver" - }, - { - match_dx10_capable, - quirk_clip_varying, - "Reserved varying for gl_ClipPos" - }, - { - /* GL_EXT_secondary_color does not allow 4 component secondary colors, but most - * GL implementations accept it. The Mac GL is the only implementation known to - * reject it. - * - * If we can pass 4 component specular colors, do it, because (a) we don't have - * to screw around with the data, and (b) the D3D fixed function vertex pipeline - * passes specular alpha to the pixel shader if any is used. Otherwise the - * specular alpha is used to pass the fog coordinate, which we pass to opengl - * via GL_EXT_fog_coord. - */ - match_allows_spec_alpha, - quirk_allows_specular_alpha, - "Allow specular alpha quirk" - }, - { - match_broken_nv_clip, - quirk_disable_nvvp_clip, - "Apple NV_vertex_program clip bug quirk" - }, - { - match_fbo_tex_update, - quirk_fbo_tex_update, - "FBO rebind for attachment updates" - }, - { - match_broken_rgba16, - quirk_broken_rgba16, - "True RGBA16 is not available" - }, - { - match_fglrx, - quirk_infolog_spam, - "Not printing GLSL infolog" - }, - { - match_not_dx10_capable, - quirk_limited_tex_filtering, - "Texture filtering, blending and VTF support is limited" - }, - { - match_r200, - quirk_r200_constants, - "r200 vertex shader constants" - }, - { - match_broken_arb_fog, - quirk_broken_arb_fog, - "ARBfp fogstart == fogend workaround" - }, - { - match_broken_viewport_subpixel_bits, - quirk_broken_viewport_subpixel_bits, - "Nvidia viewport subpixel bits bug" - }, -}; - /* Certain applications (Steam) complain if we report an outdated driver version. In general, * reporting a driver version is moot because we are not the Windows driver, and we have different * bugs, features, etc. @@ -1253,18 +191,9 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_VMWARE, DRIVER_MODEL_NT5X, "vm3dum.dll", 14, 1, 1134}, }; -struct gpu_description -{ - WORD vendor; /* reported PCI card vendor ID */ - WORD card; /* reported PCI card device ID */ - const char *description; /* Description of the card e.g. NVIDIA RIVA TNT */ - enum wined3d_display_driver driver; - unsigned int vidmem; -}; - /* The amount of video memory stored in the gpu description table is the minimum amount of video memory * found on a board containing a specific GPU. */ -static const struct gpu_description gpu_description_table[] = +static const struct wined3d_gpu_description gpu_description_table[] = { /* Nvidia cards */ {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "NVIDIA RIVA 128", DRIVER_NVIDIA_TNT, 4 }, @@ -1525,7 +454,8 @@ static const struct driver_version_information *get_driver_version_info(enum win { unsigned int i; - TRACE("Looking up version info for driver=%d driver_model=%d\n", driver, driver_model); + TRACE("Looking up version info for driver %#x, driver_model %#x.\n", driver, driver_model); + for (i = 0; i < ARRAY_SIZE(driver_version_table); ++i) { const struct driver_version_information *entry = &driver_version_table[i]; @@ -1541,70 +471,22 @@ static const struct driver_version_information *get_driver_version_info(enum win return NULL; } -static const struct gpu_description *get_gpu_description(enum wined3d_pci_vendor vendor, +const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_pci_vendor vendor, enum wined3d_pci_device device) { unsigned int i; for (i = 0; i < ARRAY_SIZE(gpu_description_table); ++i) { - if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].card) + if (vendor == gpu_description_table[i].vendor && device == gpu_description_table[i].device) return &gpu_description_table[i]; } return NULL; } -static const struct gpu_description *query_gpu_description(const struct wined3d_gl_info *gl_info, UINT64 *vram_bytes) -{ - enum wined3d_pci_vendor vendor = PCI_VENDOR_NONE; - enum wined3d_pci_device device = PCI_DEVICE_NONE; - const struct gpu_description *gpu_description; - static unsigned int once; - - if (gl_info->supported[WGL_WINE_QUERY_RENDERER]) - { - GLuint value; - - if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VENDOR_ID_WINE, &value))) - vendor = value; - if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_DEVICE_ID_WINE, &value))) - device = value; - if (GL_EXTCALL(wglQueryCurrentRendererIntegerWINE(WGL_RENDERER_VIDEO_MEMORY_WINE, &value))) - *vram_bytes = (UINT64)value * 1024 * 1024; - TRACE("Card reports vendor PCI ID 0x%04x, device PCI ID 0x%04x, 0x%s bytes of video memory.\n", - vendor, device, wine_dbgstr_longlong(*vram_bytes)); - } - - if (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE) - { - vendor = wined3d_settings.pci_vendor_id; - TRACE("Overriding vendor PCI ID with 0x%04x.\n", vendor); - } - - if (wined3d_settings.pci_device_id != PCI_DEVICE_NONE) - { - device = wined3d_settings.pci_device_id; - TRACE("Overriding device PCI ID with 0x%04x.\n", device); - } - - if (wined3d_settings.emulated_textureram) - { - *vram_bytes = wined3d_settings.emulated_textureram; - TRACE("Overriding amount of video memory with 0x%s bytes.\n", - wine_dbgstr_longlong(*vram_bytes)); - } - - if (!(gpu_description = get_gpu_description(vendor, device)) - && (wined3d_settings.pci_vendor_id != PCI_VENDOR_NONE - || wined3d_settings.pci_device_id != PCI_DEVICE_NONE) && !once++) - ERR_(winediag)("Invalid GPU override %04x:%04x specified, ignoring.\n", vendor, device); - - return gpu_description; -} - -static void init_driver_info(struct wined3d_driver_info *driver_info, - const struct gpu_description *gpu_desc, UINT64 vram_bytes) +void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, + const struct wined3d_gpu_description *gpu_desc, UINT64 vram_bytes) { OSVERSIONINFOW os_version; WORD driver_os_version; @@ -1676,7 +558,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } driver_info->vendor = gpu_desc->vendor; - driver_info->device = gpu_desc->card; + driver_info->device = gpu_desc->device; driver_info->description = gpu_desc->description; driver_info->vram_bytes = vram_bytes ? vram_bytes : (UINT64)gpu_desc->vidmem * 1024 * 1024; driver = gpu_desc->driver; @@ -1718,2746 +600,74 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, driver_info->vendor, driver_info->device, driver_model); driver_info->name = "Display"; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); - driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ + driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* NVIDIA RIVA TNT, arbitrary */ } - - TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n", - driver_info->version_high, driver_info->version_low); } -/* Context activation is done by the caller. */ -static void fixup_extensions(struct wined3d_gl_info *gl_info, struct wined3d_caps_gl_ctx *ctx, - const char *gl_renderer, enum wined3d_gl_vendor gl_vendor, - enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) +enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, + enum wined3d_feature_level feature_level) { unsigned int i; - for (i = 0; i < ARRAY_SIZE(quirk_table); ++i) - { - if (!quirk_table[i].match(gl_info, ctx, gl_renderer, gl_vendor, card_vendor, device)) continue; - TRACE("Applying driver quirk \"%s\".\n", quirk_table[i].description); - quirk_table[i].apply(gl_info); - } - - /* Find out if PBOs work as they are supposed to. */ - test_pbo_functionality(gl_info); -} - -static DWORD wined3d_parse_gl_version(const char *gl_version) -{ - const char *ptr = gl_version; - int major, minor; - - major = atoi(ptr); - if (major <= 0) - ERR("Invalid OpenGL major version %d.\n", major); - - while (isdigit(*ptr)) ++ptr; - if (*ptr++ != '.') - ERR("Invalid OpenGL version string %s.\n", debugstr_a(gl_version)); - - minor = atoi(ptr); - - TRACE("Found OpenGL version %d.%d.\n", major, minor); - - return MAKEDWORD_VERSION(major, minor); -} - -static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, - const char *gl_vendor_string, const char *gl_renderer, const char *gl_version) -{ - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from - * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to - * detect the Apple OpenGL implementation to apply some extension fixups afterwards. - * - * Detecting this isn't really easy. The vendor string doesn't mention Apple. Compile-time checks - * aren't sufficient either because a Linux binary may display on a macos X server via remote X11. - * So try to detect the GL implementation by looking at certain Apple extensions. Some extensions - * like client storage might be supported on other implementations too, but GL_APPLE_flush_render - * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So - * the chance that other implementations support them is rather small since Win32 QuickTime uses - * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) - return GL_VENDOR_APPLE; - - if (strstr(gl_vendor_string, "NVIDIA")) - return GL_VENDOR_NVIDIA; - - if (strstr(gl_vendor_string, "ATI")) - return GL_VENDOR_FGLRX; - - if (strstr(gl_vendor_string, "Mesa") - || strstr(gl_vendor_string, "X.Org") - || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") - || strstr(gl_vendor_string, "DRI R300 Project") - || strstr(gl_vendor_string, "Tungsten Graphics, Inc") - || strstr(gl_vendor_string, "VMware, Inc.") - || strstr(gl_vendor_string, "Intel") - || strstr(gl_renderer, "Mesa") - || strstr(gl_renderer, "Gallium") - || strstr(gl_renderer, "Intel") - || strstr(gl_version, "Mesa")) - return GL_VENDOR_MESA; - - FIXME("Received unrecognized GL_VENDOR %s. Returning GL_VENDOR_UNKNOWN.\n", - debugstr_a(gl_vendor_string)); - - return GL_VENDOR_UNKNOWN; -} - -static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) -{ - if (strstr(gl_vendor_string, "NVIDIA") - || strstr(gl_vendor_string, "Nouveau") - || strstr(gl_vendor_string, "nouveau")) - return HW_VENDOR_NVIDIA; - - if (strstr(gl_vendor_string, "ATI") - || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") - || strstr(gl_vendor_string, "X.Org R300 Project") - || strstr(gl_renderer, "AMD") - || strstr(gl_renderer, "FirePro") - || strstr(gl_renderer, "Radeon") - || strstr(gl_renderer, "R100") - || strstr(gl_renderer, "R200") - || strstr(gl_renderer, "R300") - || strstr(gl_renderer, "R600") - || strstr(gl_renderer, "R700")) - return HW_VENDOR_AMD; - - if (strstr(gl_vendor_string, "Intel(R)") - /* Intel switched from Intel(R) to Intel® recently, so just match Intel. */ - || strstr(gl_renderer, "Intel") - || strstr(gl_renderer, "i915") - || strstr(gl_vendor_string, "Intel Inc.")) - return HW_VENDOR_INTEL; - - if (strstr(gl_renderer, "SVGA3D")) - return HW_VENDOR_VMWARE; - - if (strstr(gl_vendor_string, "Mesa") - || strstr(gl_vendor_string, "Brian Paul") - || strstr(gl_vendor_string, "Tungsten Graphics, Inc") - || strstr(gl_vendor_string, "VMware, Inc.")) - return HW_VENDOR_SOFTWARE; - - FIXME("Received unrecognized GL_VENDOR %s. Returning HW_VENDOR_NVIDIA.\n", debugstr_a(gl_vendor_string)); - - return HW_VENDOR_NVIDIA; -} - -static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_gl_info *gl_info, - const struct shader_caps *shader_caps, const struct fragment_caps *fragment_caps) -{ - unsigned int shader_model; - - shader_model = min(shader_caps->vs_version, shader_caps->ps_version); - shader_model = min(shader_model, max(shader_caps->gs_version, 3)); - shader_model = min(shader_model, max(shader_caps->hs_version, 4)); - shader_model = min(shader_model, max(shader_caps->ds_version, 4)); - - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SAMPLER_OBJECTS]) - { - if (shader_model >= 5 - && gl_info->supported[ARB_DRAW_INDIRECT] - && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) - return WINED3D_FEATURE_LEVEL_11; - - if (shader_model == 4) - return WINED3D_FEATURE_LEVEL_10; - } - - if (shader_model == 3) - return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_model == 2) - return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_model == 1) - return WINED3D_FEATURE_LEVEL_8; - - if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) - return WINED3D_FEATURE_LEVEL_7; - if (fragment_caps->MaxSimultaneousTextures > 1) - return WINED3D_FEATURE_LEVEL_6; - - return WINED3D_FEATURE_LEVEL_5; -} - -static const struct wined3d_renderer_table -{ - const char *renderer; - enum wined3d_pci_device id; -} -cards_nvidia_binary[] = -{ - /* Direct 3D 11 */ - {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ - {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ - {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ - {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ - {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ - {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ - {"GTX 1050 Ti", CARD_NVIDIA_GEFORCE_GTX1050TI}, /* GeForce 1000 - midend */ - {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ - {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ - {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ - {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ - {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ - {"GTX TITAN X", CARD_NVIDIA_GEFORCE_GTXTITANX}, /* Geforce 900 - highend */ - {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ - {"GTX 960", CARD_NVIDIA_GEFORCE_GTX960}, /* GeForce 900 - midend high */ - {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ - {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ - {"GeForce 940M", CARD_NVIDIA_GEFORCE_940M}, /* GeForce 900 - midend mobile */ - {"GTX 880M", CARD_NVIDIA_GEFORCE_GTX880M}, /* GeForce 800 - mobile */ - {"GTX 870M", CARD_NVIDIA_GEFORCE_GTX870M}, /* GeForce 800 - mobile */ - {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ - {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ - {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ - {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ - {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ - {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ - {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ - {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITANB}, /* Geforce 700 - highend */ - {"GTX TITAN Z", CARD_NVIDIA_GEFORCE_GTXTITANZ}, /* Geforce 700 - highend */ - {"GTX TITAN", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ - {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ - {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ - {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ - {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ - {"GTX 760 Ti", CARD_NVIDIA_GEFORCE_GTX760TI}, /* Geforce 700 - midend high */ - {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ - {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ - {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ - {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ - {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ - {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ - {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ - {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ - {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ - {"GTX 675MX", CARD_NVIDIA_GEFORCE_GTX675MX}, /* Geforce 600 - highend */ - {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ - {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ - {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ - {"GTX 660M", CARD_NVIDIA_GEFORCE_GTX660M}, /* Geforce 600 - midend high mobile */ - {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend high */ - {"GTX 650 Ti", CARD_NVIDIA_GEFORCE_GTX650TI}, /* Geforce 600 - lowend */ - {"GTX 650", CARD_NVIDIA_GEFORCE_GTX650}, /* Geforce 600 - lowend */ - {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ - {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ - {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ - {"GT 630", CARD_NVIDIA_GEFORCE_GT630}, /* Geforce 600 - lowend */ - {"GT 610", CARD_NVIDIA_GEFORCE_GT610}, /* Geforce 600 - lowend */ - {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ - {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ - {"GTX 560 Ti", CARD_NVIDIA_GEFORCE_GTX560TI}, /* Geforce 500 - midend */ - {"GTX 560M", CARD_NVIDIA_GEFORCE_GTX560M}, /* Geforce 500 - midend mobile */ - {"GTX 560", CARD_NVIDIA_GEFORCE_GTX560}, /* Geforce 500 - midend */ - {"GT 555M", CARD_NVIDIA_GEFORCE_GT555M}, /* Geforce 500 - midend mobile */ - {"GTX 550 Ti", CARD_NVIDIA_GEFORCE_GTX550}, /* Geforce 500 - midend */ - {"GT 540M", CARD_NVIDIA_GEFORCE_GT540M}, /* Geforce 500 - midend mobile */ - {"GT 525M", CARD_NVIDIA_GEFORCE_GT525M}, /* Geforce 500 - lowend mobile */ - {"GT 520", CARD_NVIDIA_GEFORCE_GT520}, /* Geforce 500 - lowend */ - {"GTX 480", CARD_NVIDIA_GEFORCE_GTX480}, /* Geforce 400 - highend */ - {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ - /* Direct 3D 10 */ - {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ - {"GTX 460M", CARD_NVIDIA_GEFORCE_GTX460M}, /* Geforce 400 - highend mobile */ - {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ - {"GTS 450", CARD_NVIDIA_GEFORCE_GTS450}, /* Geforce 400 - midend low */ - {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ - {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ - {"GT 425M", CARD_NVIDIA_GEFORCE_GT425M}, /* Geforce 400 - lowend mobile */ - {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ - {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ - {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ - {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ - {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ - {"GT 330M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ - {"GT 325M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ - {"GT 320M", CARD_NVIDIA_GEFORCE_GT320M}, /* Geforce 300 - midend mobile */ - {"320M", CARD_NVIDIA_GEFORCE_320M}, /* Geforce 300 - midend mobile */ - {"315M", CARD_NVIDIA_GEFORCE_315M}, /* Geforce 300 - midend mobile */ - {"GTX 295", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ - {"GTX 285", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ - {"GTX 280", CARD_NVIDIA_GEFORCE_GTX280}, /* Geforce 200 - highend */ - {"GTX 275", CARD_NVIDIA_GEFORCE_GTX275}, /* Geforce 200 - midend high */ - {"GTX 260", CARD_NVIDIA_GEFORCE_GTX260}, /* Geforce 200 - midend */ - {"GTS 250", CARD_NVIDIA_GEFORCE_GTS250}, /* Geforce 200 - midend */ - {"GT 240", CARD_NVIDIA_GEFORCE_GT240}, /* Geforce 200 - midend */ - {"GT 220", CARD_NVIDIA_GEFORCE_GT220}, /* Geforce 200 - lowend */ - {"GeForce 310", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GeForce 305", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GeForce 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"G 210", CARD_NVIDIA_GEFORCE_210}, /* Geforce 200 - lowend */ - {"GTS 150", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ - {"9800", CARD_NVIDIA_GEFORCE_9800GT}, /* Geforce 9 - highend / Geforce 200 - midend */ - {"9700M GT", CARD_NVIDIA_GEFORCE_9700MGT}, /* Geforce 9 - midend */ - {"GT 140", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ - {"9600", CARD_NVIDIA_GEFORCE_9600GT}, /* Geforce 9 - midend */ - {"GT 130", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ - {"GT 120", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ - {"9500", CARD_NVIDIA_GEFORCE_9500GT}, /* Geforce 9 - midend low / Geforce 200 - low */ - {"9400M", CARD_NVIDIA_GEFORCE_9400M}, /* Geforce 9 - lowend */ - {"9400", CARD_NVIDIA_GEFORCE_9400GT}, /* Geforce 9 - lowend */ - {"9300", CARD_NVIDIA_GEFORCE_9300}, /* Geforce 9 - lowend low */ - {"9200", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ - {"9100", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ - {"G 100", CARD_NVIDIA_GEFORCE_9200}, /* Geforce 9 - lowend low */ - {"8800 GTX", CARD_NVIDIA_GEFORCE_8800GTX}, /* Geforce 8 - highend high */ - {"8800", CARD_NVIDIA_GEFORCE_8800GTS}, /* Geforce 8 - highend */ - {"8600M", CARD_NVIDIA_GEFORCE_8600MGT}, /* Geforce 8 - midend mobile */ - {"8600 M", CARD_NVIDIA_GEFORCE_8600MGT}, /* Geforce 8 - midend mobile */ - {"8700", CARD_NVIDIA_GEFORCE_8600GT}, /* Geforce 8 - midend */ - {"8600", CARD_NVIDIA_GEFORCE_8600GT}, /* Geforce 8 - midend */ - {"8500", CARD_NVIDIA_GEFORCE_8500GT}, /* Geforce 8 - mid-lowend */ - {"8400", CARD_NVIDIA_GEFORCE_8400GS}, /* Geforce 8 - mid-lowend */ - {"8300", CARD_NVIDIA_GEFORCE_8300GS}, /* Geforce 8 - lowend */ - {"8200", CARD_NVIDIA_GEFORCE_8200}, /* Geforce 8 - lowend */ - {"8100", CARD_NVIDIA_GEFORCE_8200}, /* Geforce 8 - lowend */ - /* Direct 3D 9 SM3 */ - {"Quadro FX 5", CARD_NVIDIA_GEFORCE_7800GT}, /* Geforce 7 - highend */ - {"Quadro FX 4", CARD_NVIDIA_GEFORCE_7800GT}, /* Geforce 7 - highend */ - {"7950", CARD_NVIDIA_GEFORCE_7800GT}, /* Geforce 7 - highend */ - {"7900", CARD_NVIDIA_GEFORCE_7800GT}, /* Geforce 7 - highend */ - {"7800", CARD_NVIDIA_GEFORCE_7800GT}, /* Geforce 7 - highend */ - {"7700", CARD_NVIDIA_GEFORCE_7600}, /* Geforce 7 - midend */ - {"7600", CARD_NVIDIA_GEFORCE_7600}, /* Geforce 7 - midend */ - {"7400", CARD_NVIDIA_GEFORCE_7400}, /* Geforce 7 - lower medium */ - {"7300", CARD_NVIDIA_GEFORCE_7300}, /* Geforce 7 - lowend */ - {"6800", CARD_NVIDIA_GEFORCE_6800}, /* Geforce 6 - highend */ - {"6700", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ - {"6610", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ - {"6600", CARD_NVIDIA_GEFORCE_6600GT}, /* Geforce 6 - midend */ - /* Direct 3D 9 SM2 */ - {"Quadro FX", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ - {"5950", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ - {"5900", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ - {"5800", CARD_NVIDIA_GEFORCEFX_5800}, /* GeforceFX - highend */ - {"5750", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ - {"5700", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ - {"5650", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ - {"5600", CARD_NVIDIA_GEFORCEFX_5600}, /* GeforceFX - midend */ - {"5500", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ - {"5300", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ - {"5250", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ - {"5200", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ - {"5100", CARD_NVIDIA_GEFORCEFX_5200}, /* GeforceFX - lowend */ - /* Direct 3D 8 */ - {"Quadro4", CARD_NVIDIA_GEFORCE4_TI4200}, - {"GeForce4 Ti", CARD_NVIDIA_GEFORCE4_TI4200}, /* Geforce4 Ti4200/Ti4400/Ti4600/Ti4800 */ - /* Direct 3D 7 */ - {"GeForce4 MX", CARD_NVIDIA_GEFORCE4_MX}, /* MX420/MX440/MX460/MX4000 */ - {"Quadro2 MXR", CARD_NVIDIA_GEFORCE2_MX}, - {"GeForce2 MX", CARD_NVIDIA_GEFORCE2_MX}, /* Geforce2 standard/MX100/MX200/MX400 */ - {"Quadro2", CARD_NVIDIA_GEFORCE2}, - {"GeForce2", CARD_NVIDIA_GEFORCE2}, /* Geforce2 GTS/Pro/Ti/Ultra */ - /* Direct 3D 6 */ - {"TNT2", CARD_NVIDIA_RIVA_TNT2}, /* Riva TNT2 standard/M64/Pro/Ultra */ -}, -/* See http://developer.amd.com/resources/hardware-drivers/ati-catalyst-pc-vendor-… - * - * Beware: renderer string do not match exact card model, - * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ -cards_amd_binary[] = -{ - {"RX 480", CARD_AMD_RADEON_RX_480}, - {"RX 460", CARD_AMD_RADEON_RX_460}, - {"R9 Fury Series", CARD_AMD_RADEON_R9_FURY}, - /* Southern Islands */ - {"HD 7900", CARD_AMD_RADEON_HD7900}, - {"HD 7800", CARD_AMD_RADEON_HD7800}, - {"HD 7700", CARD_AMD_RADEON_HD7700}, - /* Northern Islands */ - {"HD 6970", CARD_AMD_RADEON_HD6900}, - {"HD 6900", CARD_AMD_RADEON_HD6900}, - {"HD 6800", CARD_AMD_RADEON_HD6800}, - {"HD 6770M", CARD_AMD_RADEON_HD6600M}, - {"HD 6750M", CARD_AMD_RADEON_HD6600M}, - {"HD 6700", CARD_AMD_RADEON_HD6700}, - {"HD 6670", CARD_AMD_RADEON_HD6600}, - {"HD 6630M", CARD_AMD_RADEON_HD6600M}, - {"HD 6600M", CARD_AMD_RADEON_HD6600M}, - {"HD 6600", CARD_AMD_RADEON_HD6600}, - {"HD 6570", CARD_AMD_RADEON_HD6600}, - {"HD 6500M", CARD_AMD_RADEON_HD6600M}, - {"HD 6500", CARD_AMD_RADEON_HD6600}, - {"HD 6480G", CARD_AMD_RADEON_HD6480G}, - {"HD 6400", CARD_AMD_RADEON_HD6400}, - {"HD 6300", CARD_AMD_RADEON_HD6300}, - {"HD 6200", CARD_AMD_RADEON_HD6300}, - /* Evergreen */ - {"HD 5870", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS PRO */ - {"HD 5850", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS XT */ - {"HD 5800", CARD_AMD_RADEON_HD5800}, /* Radeon EG CYPRESS HD58xx generic renderer string */ - {"HD 5770", CARD_AMD_RADEON_HD5700}, /* Radeon EG JUNIPER XT */ - {"HD 5750", CARD_AMD_RADEON_HD5700}, /* Radeon EG JUNIPER LE */ - {"HD 5700", CARD_AMD_RADEON_HD5700}, /* Radeon EG JUNIPER HD57xx generic renderer string */ - {"HD 5670", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD XT */ - {"HD 5570", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD PRO mapped to HD5600 series */ - {"HD 5550", CARD_AMD_RADEON_HD5600}, /* Radeon EG REDWOOD LE mapped to HD5600 series */ - {"HD 5450", CARD_AMD_RADEON_HD5400}, /* Radeon EG CEDAR PRO */ - {"HD 5000", CARD_AMD_RADEON_HD5600}, /* Defaulting to HD 5600 */ - /* R700 */ - {"HD 4890", CARD_AMD_RADEON_HD4800}, /* Radeon RV790 */ - {"HD 4870", CARD_AMD_RADEON_HD4800}, /* Radeon RV770 */ - {"HD 4850", CARD_AMD_RADEON_HD4800}, /* Radeon RV770 */ - {"HD 4830", CARD_AMD_RADEON_HD4800}, /* Radeon RV770 */ - {"HD 4800", CARD_AMD_RADEON_HD4800}, /* Radeon RV7xx HD48xx generic renderer string */ - {"HD 4770", CARD_AMD_RADEON_HD4700}, /* Radeon RV740 */ - {"HD 4700", CARD_AMD_RADEON_HD4700}, /* Radeon RV7xx HD47xx generic renderer string */ - {"HD 4670", CARD_AMD_RADEON_HD4600}, /* Radeon RV730 */ - {"HD 4650", CARD_AMD_RADEON_HD4600}, /* Radeon RV730 */ - {"HD 4600", CARD_AMD_RADEON_HD4600}, /* Radeon RV730 */ - {"HD 4550", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ - {"HD 4350", CARD_AMD_RADEON_HD4350}, /* Radeon RV710 */ - /* R600/R700 integrated */ - {"HD 4200M", CARD_AMD_RADEON_HD4200M}, - {"HD 3300", CARD_AMD_RADEON_HD3200}, - {"HD 3200", CARD_AMD_RADEON_HD3200}, - {"HD 3100", CARD_AMD_RADEON_HD3200}, - /* R600 */ - {"HD 3870", CARD_AMD_RADEON_HD2900}, /* HD2900/HD3800 - highend */ - {"HD 3850", CARD_AMD_RADEON_HD2900}, /* HD2900/HD3800 - highend */ - {"HD 2900", CARD_AMD_RADEON_HD2900}, /* HD2900/HD3800 - highend */ - {"HD 3830", CARD_AMD_RADEON_HD2600}, /* China-only midend */ - {"HD 3690", CARD_AMD_RADEON_HD2600}, /* HD2600/HD3600 - midend */ - {"HD 3650", CARD_AMD_RADEON_HD2600}, /* HD2600/HD3600 - midend */ - {"HD 2600", CARD_AMD_RADEON_HD2600}, /* HD2600/HD3600 - midend */ - {"HD 3470", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - {"HD 3450", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - {"HD 3430", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - {"HD 3400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - {"HD 2400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - {"HD 2350", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ - /* Radeon R5xx */ - {"X1950", CARD_AMD_RADEON_X1600}, - {"X1900", CARD_AMD_RADEON_X1600}, - {"X1800", CARD_AMD_RADEON_X1600}, - {"X1650", CARD_AMD_RADEON_X1600}, - {"X1600", CARD_AMD_RADEON_X1600}, - /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) - * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ - {"HD 2300", CARD_AMD_RADEON_X700}, - {"X2500", CARD_AMD_RADEON_X700}, - {"X2300", CARD_AMD_RADEON_X700}, - {"X1550", CARD_AMD_RADEON_X700}, - {"X1450", CARD_AMD_RADEON_X700}, - {"X1400", CARD_AMD_RADEON_X700}, - {"X1300", CARD_AMD_RADEON_X700}, - {"X850", CARD_AMD_RADEON_X700}, - {"X800", CARD_AMD_RADEON_X700}, - {"X700", CARD_AMD_RADEON_X700}, - /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ - {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, -}, -cards_intel[] = -{ - /* Skylake */ - {"Iris Pro Graphics P580", CARD_INTEL_IPP580_1}, - {"Skylake", CARD_INTEL_HD520_1}, - /* Broadwell */ - {"Iris Pro P6300", CARD_INTEL_IPP6300}, - {"Iris Pro 6200", CARD_INTEL_IP6200}, - {"Iris 6100", CARD_INTEL_I6100}, - {"Iris(TM) Graphics 6100", CARD_INTEL_I6100}, /* MacOS */ - /* Haswell */ - {"Iris Pro 5200", CARD_INTEL_IP5200_1}, - {"Iris 5100", CARD_INTEL_I5100_1}, - {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ - {"Haswell Mobile", CARD_INTEL_HWM}, - {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ - /* Ivybridge */ - {"Ivybridge Server", CARD_INTEL_IVBS}, - {"Ivybridge Mobile", CARD_INTEL_IVBM}, - {"Ivybridge Desktop", CARD_INTEL_IVBD}, - {"HD Graphics 4000", CARD_INTEL_IVBD}, /* MacOS */ - /* Sandybridge */ - {"Sandybridge Server", CARD_INTEL_SNBS}, - {"Sandybridge Mobile", CARD_INTEL_SNBM}, - {"Sandybridge Desktop", CARD_INTEL_SNBD}, - /* Ironlake */ - {"Ironlake Mobile", CARD_INTEL_ILKM}, - {"Ironlake Desktop", CARD_INTEL_ILKD}, - /* G4x */ - {"B43", CARD_INTEL_B43}, - {"G41", CARD_INTEL_G41}, - {"G45", CARD_INTEL_G45}, - {"Q45", CARD_INTEL_Q45}, - {"Integrated Graphics Device", CARD_INTEL_IGD}, - {"GM45", CARD_INTEL_GM45}, - /* i965 */ - {"965GME", CARD_INTEL_965GME}, - {"965GM", CARD_INTEL_965GM}, - {"X3100", CARD_INTEL_965GM}, /* MacOS */ - {"946GZ", CARD_INTEL_946GZ}, - {"965G", CARD_INTEL_965G}, - {"965Q", CARD_INTEL_965Q}, - /* i945 */ - {"Pineview M", CARD_INTEL_PNVM}, - {"Pineview G", CARD_INTEL_PNVG}, - {"IGD", CARD_INTEL_PNVG}, - {"Q33", CARD_INTEL_Q33}, - {"G33", CARD_INTEL_G33}, - {"Q35", CARD_INTEL_Q35}, - {"945GME", CARD_INTEL_945GME}, - {"945GM", CARD_INTEL_945GM}, - {"GMA 950", CARD_INTEL_945GM}, /* MacOS */ - {"945G", CARD_INTEL_945G}, - /* i915 */ - {"915GM", CARD_INTEL_915GM}, - {"E7221G", CARD_INTEL_E7221G}, - {"915G", CARD_INTEL_915G}, - /* i8xx */ - {"865G", CARD_INTEL_865G}, - {"845G", CARD_INTEL_845G}, - {"855GM", CARD_INTEL_855GM}, - {"830M", CARD_INTEL_830M}, -}, -/* 20101109 - These are never returned by current Gallium radeon - * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ -cards_amd_mesa[] = -{ - /* Polaris 10/11 */ - {"POLARIS10", CARD_AMD_RADEON_RX_480}, - {"POLARIS11", CARD_AMD_RADEON_RX_460}, - /* Volcanic Islands */ - {"FIJI", CARD_AMD_RADEON_R9_FURY}, - {"TONGA", CARD_AMD_RADEON_R9_285}, - /* Sea Islands */ - {"HAWAII", CARD_AMD_RADEON_R9_290}, - {"KAVERI", CARD_AMD_RADEON_R7 }, - {"KABINI", CARD_AMD_RADEON_R3 }, - {"BONAIRE", CARD_AMD_RADEON_HD8770}, - /* Southern Islands */ - {"OLAND", CARD_AMD_RADEON_HD8670}, - {"HAINAN", CARD_AMD_RADEON_HD8600M}, - {"TAHITI", CARD_AMD_RADEON_HD7900}, - {"PITCAIRN", CARD_AMD_RADEON_HD7800}, - {"CAPE VERDE", CARD_AMD_RADEON_HD7700}, - /* Northern Islands */ - {"ARUBA", CARD_AMD_RADEON_HD7660D}, - {"CAYMAN", CARD_AMD_RADEON_HD6900}, - {"BARTS", CARD_AMD_RADEON_HD6800}, - {"TURKS", CARD_AMD_RADEON_HD6600}, - {"SUMO2", CARD_AMD_RADEON_HD6410D}, /* SUMO2 first, because we do a strstr(). */ - {"SUMO", CARD_AMD_RADEON_HD6550D}, - {"CAICOS", CARD_AMD_RADEON_HD6400}, - {"PALM", CARD_AMD_RADEON_HD6300}, - /* Evergreen */ - {"HEMLOCK", CARD_AMD_RADEON_HD5900}, - {"CYPRESS", CARD_AMD_RADEON_HD5800}, - {"JUNIPER", CARD_AMD_RADEON_HD5700}, - {"REDWOOD", CARD_AMD_RADEON_HD5600}, - {"CEDAR", CARD_AMD_RADEON_HD5400}, - /* R700 */ - {"R700", CARD_AMD_RADEON_HD4800}, - {"RV790", CARD_AMD_RADEON_HD4800}, - {"RV770", CARD_AMD_RADEON_HD4800}, - {"RV740", CARD_AMD_RADEON_HD4700}, - {"RV730", CARD_AMD_RADEON_HD4600}, - {"RV710", CARD_AMD_RADEON_HD4350}, - /* R600/R700 integrated */ - {"RS880", CARD_AMD_RADEON_HD4200M}, - {"RS780", CARD_AMD_RADEON_HD3200}, - /* R600 */ - {"R680", CARD_AMD_RADEON_HD2900}, - {"R600", CARD_AMD_RADEON_HD2900}, - {"RV670", CARD_AMD_RADEON_HD3850}, - {"RV635", CARD_AMD_RADEON_HD2600}, - {"RV630", CARD_AMD_RADEON_HD2600}, - {"RV620", CARD_AMD_RADEON_HD2350}, - {"RV610", CARD_AMD_RADEON_HD2350}, - /* R500 */ - {"R580", CARD_AMD_RADEON_X1600}, - {"R520", CARD_AMD_RADEON_X1600}, - {"RV570", CARD_AMD_RADEON_X1600}, - {"RV560", CARD_AMD_RADEON_X1600}, - {"RV535", CARD_AMD_RADEON_X1600}, - {"RV530", CARD_AMD_RADEON_X1600}, - {"RV516", CARD_AMD_RADEON_X700}, - {"RV515", CARD_AMD_RADEON_X700}, - /* R400 */ - {"R481", CARD_AMD_RADEON_X700}, - {"R480", CARD_AMD_RADEON_X700}, - {"R430", CARD_AMD_RADEON_X700}, - {"R423", CARD_AMD_RADEON_X700}, - {"R420", CARD_AMD_RADEON_X700}, - {"R410", CARD_AMD_RADEON_X700}, - {"RV410", CARD_AMD_RADEON_X700}, - /* Radeon Xpress - onboard, DX9b, Shader 2.0, 300-400 MHz */ - {"RS740", CARD_AMD_RADEON_XPRESS_200M}, - {"RS690", CARD_AMD_RADEON_XPRESS_200M}, - {"RS600", CARD_AMD_RADEON_XPRESS_200M}, - {"RS485", CARD_AMD_RADEON_XPRESS_200M}, - {"RS482", CARD_AMD_RADEON_XPRESS_200M}, - {"RS480", CARD_AMD_RADEON_XPRESS_200M}, - {"RS400", CARD_AMD_RADEON_XPRESS_200M}, - {"RC410", CARD_AMD_RADEON_XPRESS_200M}, - /* R300 */ - {"R360", CARD_AMD_RADEON_9500}, - {"R350", CARD_AMD_RADEON_9500}, - {"R300", CARD_AMD_RADEON_9500}, - {"RV380", CARD_AMD_RADEON_9500}, - {"RV370", CARD_AMD_RADEON_9500}, - {"RV360", CARD_AMD_RADEON_9500}, - {"RV351", CARD_AMD_RADEON_9500}, - {"RV350", CARD_AMD_RADEON_9500}, -}, -cards_nvidia_mesa[] = -{ - /* Maxwell */ - {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, - {"NV120", CARD_NVIDIA_GEFORCE_GTX980TI}, - {"NV118", CARD_NVIDIA_GEFORCE_840M}, - {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, - /* Kepler */ - {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, - {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, - {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, - {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX / 760TI */ - /* Fermi */ - {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, - {"NVD7", CARD_NVIDIA_GEFORCE_820M}, - {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, - {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, - {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, - {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, - {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, - {"NVC1", CARD_NVIDIA_GEFORCE_GT420}, - {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, - /* Tesla */ - {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, - {"NVAC", CARD_NVIDIA_GEFORCE_8200}, - {"NVAA", CARD_NVIDIA_GEFORCE_8200}, /* 8100 */ - {"NVA8", CARD_NVIDIA_GEFORCE_210}, - {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, - {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, - {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, - {"NV98", CARD_NVIDIA_GEFORCE_9200}, - {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, - {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, - {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, - {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, - {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, - {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, - /* Curie */ - {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ - {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ - {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ - {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ - {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ - {"NV4B", CARD_NVIDIA_GEFORCE_7600}, - {"NV4A", CARD_NVIDIA_GEFORCE_6200}, - {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ - {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, - {"NV46", CARD_NVIDIA_GEFORCE_7400}, - {"NV45", CARD_NVIDIA_GEFORCE_6800}, - {"NV44", CARD_NVIDIA_GEFORCE_6200}, - {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, - {"NV42", CARD_NVIDIA_GEFORCE_6800}, - {"NV41", CARD_NVIDIA_GEFORCE_6800}, - {"NV40", CARD_NVIDIA_GEFORCE_6800}, - /* Rankine */ - {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ - {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ - {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ - {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, - {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, - {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, - /* Kelvin */ - {"nv28", CARD_NVIDIA_GEFORCE4_TI4200}, - {"nv25", CARD_NVIDIA_GEFORCE4_TI4200}, - {"nv20", CARD_NVIDIA_GEFORCE3}, - /* Celsius */ - {"nv1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ - {"nv1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ - {"nv18", CARD_NVIDIA_GEFORCE4_MX}, - {"nv17", CARD_NVIDIA_GEFORCE4_MX}, - {"nv16", CARD_NVIDIA_GEFORCE2}, - {"nv15", CARD_NVIDIA_GEFORCE2}, - {"nv11", CARD_NVIDIA_GEFORCE2_MX}, - {"nv10", CARD_NVIDIA_GEFORCE}, - /* Fahrenheit */ - {"nv05", CARD_NVIDIA_RIVA_TNT2}, - {"nv04", CARD_NVIDIA_RIVA_TNT}, - {"nv03", CARD_NVIDIA_RIVA_128}, -}, -cards_vmware[] = -{ - {"SVGA3D", CARD_VMWARE_SVGA3D}, -}; - -static const struct gl_vendor_selection -{ - enum wined3d_gl_vendor gl_vendor; - const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ - const struct wined3d_renderer_table *cards; /* To be used as cards[], pointer to the first member in an array */ - size_t cards_size; /* Number of entries in the array above */ -} -amd_gl_vendor_table[] = -{ - {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", cards_amd_binary, ARRAY_SIZE(cards_amd_binary)}, - {GL_VENDOR_FGLRX, "AMD/ATI binary driver", cards_amd_binary, ARRAY_SIZE(cards_amd_binary)}, - {GL_VENDOR_MESA, "Mesa AMD/ATI driver", cards_amd_mesa, ARRAY_SIZE(cards_amd_mesa)}, -}, -nvidia_gl_vendor_table[] = -{ - {GL_VENDOR_APPLE, "Apple OSX NVidia binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, - {GL_VENDOR_MESA, "Mesa Nouveau driver", cards_nvidia_mesa, ARRAY_SIZE(cards_nvidia_mesa)}, - {GL_VENDOR_NVIDIA, "Nvidia binary driver", cards_nvidia_binary, ARRAY_SIZE(cards_nvidia_binary)}, -}, -vmware_gl_vendor_table[] = -{ - {GL_VENDOR_MESA, "VMware driver", cards_vmware, ARRAY_SIZE(cards_vmware)}, -}, -intel_gl_vendor_table[] = -{ - {GL_VENDOR_APPLE, "Apple OSX Intel binary driver", cards_intel, ARRAY_SIZE(cards_intel)}, - {GL_VENDOR_MESA, "Mesa Intel driver", cards_intel, ARRAY_SIZE(cards_intel)}, -}; - -static const enum wined3d_pci_device -card_fallback_nvidia[] = -{ - CARD_NVIDIA_RIVA_128, /* D3D5 */ - CARD_NVIDIA_RIVA_TNT, /* D3D6 */ - CARD_NVIDIA_GEFORCE, /* D3D7 */ - CARD_NVIDIA_GEFORCE3, /* D3D8 */ - CARD_NVIDIA_GEFORCEFX_5800, /* D3D9_SM2 */ - CARD_NVIDIA_GEFORCE_6800, /* D3D9_SM3 */ - CARD_NVIDIA_GEFORCE_8800GTX, /* D3D10 */ - CARD_NVIDIA_GEFORCE_GTX470, /* D3D11 */ -}, -card_fallback_amd[] = -{ - CARD_AMD_RAGE_128PRO, /* D3D5 */ - CARD_AMD_RAGE_128PRO, /* D3D6 */ - CARD_AMD_RADEON_7200, /* D3D7 */ - CARD_AMD_RADEON_8500, /* D3D8 */ - CARD_AMD_RADEON_9500, /* D3D9_SM2 */ - CARD_AMD_RADEON_X1600, /* D3D9_SM3 */ - CARD_AMD_RADEON_HD2900, /* D3D10 */ - CARD_AMD_RADEON_HD5600, /* D3D11 */ -}, -card_fallback_intel[] = -{ - CARD_INTEL_845G, /* D3D5 */ - CARD_INTEL_845G, /* D3D6 */ - CARD_INTEL_845G, /* D3D7 */ - CARD_INTEL_915G, /* D3D8 */ - CARD_INTEL_915G, /* D3D9_SM2 */ - CARD_INTEL_945G, /* D3D9_SM3 */ - CARD_INTEL_G45, /* D3D10 */ - CARD_INTEL_IVBD, /* D3D11 */ -}; -C_ASSERT(ARRAY_SIZE(card_fallback_nvidia) == WINED3D_FEATURE_LEVEL_COUNT); -C_ASSERT(ARRAY_SIZE(card_fallback_amd) == WINED3D_FEATURE_LEVEL_COUNT); -C_ASSERT(ARRAY_SIZE(card_fallback_intel) == WINED3D_FEATURE_LEVEL_COUNT); - -static enum wined3d_pci_device select_card_handler(const struct gl_vendor_selection *table, - unsigned int table_size, enum wined3d_gl_vendor gl_vendor, const char *gl_renderer) -{ - unsigned int i, j; - - for (i = 0; i < table_size; ++i) - { - if (table[i].gl_vendor != gl_vendor) - continue; - - TRACE("Applying card selector \"%s\".\n", table[i].description); - - for (j = 0; j < table[i].cards_size; ++j) - { - if (strstr(gl_renderer, table[i].cards[j].renderer)) - return table[i].cards[j].id; - } - return PCI_DEVICE_NONE; - } - FIXME("Couldn't find a suitable card selector for GL vendor %04x (using GL_RENDERER %s)\n", - gl_vendor, debugstr_a(gl_renderer)); - - return PCI_DEVICE_NONE; -} - -static const struct -{ - enum wined3d_pci_vendor card_vendor; - const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ - const struct gl_vendor_selection *gl_vendor_selection; - unsigned int gl_vendor_count; - const enum wined3d_pci_device *card_fallback; /* An array with FEATURE_LEVEL_COUNT elements */ -} -card_vendor_table[] = -{ - {HW_VENDOR_AMD, "AMD", amd_gl_vendor_table, - ARRAY_SIZE(amd_gl_vendor_table), - card_fallback_amd}, - {HW_VENDOR_NVIDIA, "Nvidia", nvidia_gl_vendor_table, - ARRAY_SIZE(nvidia_gl_vendor_table), - card_fallback_nvidia}, - {HW_VENDOR_VMWARE, "VMware", vmware_gl_vendor_table, - ARRAY_SIZE(vmware_gl_vendor_table), - card_fallback_amd}, - {HW_VENDOR_INTEL, "Intel", intel_gl_vendor_table, - ARRAY_SIZE(intel_gl_vendor_table), - card_fallback_intel}, -}; - -static enum wined3d_pci_device wined3d_guess_card(enum wined3d_feature_level feature_level, - DWORD glsl_version, const char *gl_renderer, enum wined3d_gl_vendor *gl_vendor, - enum wined3d_pci_vendor *card_vendor) -{ - /* A Direct3D device object contains the PCI id (vendor + device) of the - * videocard which is used for rendering. Various applications use this - * information to get a rough estimation of the features of the card and - * some might use it for enabling 3d effects only on certain types of - * videocards. In some cases games might even use it to work around bugs - * which happen on certain videocards/driver combinations. The problem is - * that OpenGL only exposes a rendering string containing the name of the - * videocard and not the PCI id. - * - * Various games depend on the PCI id, so somehow we need to provide one. - * A simple option is to parse the renderer string and translate this to - * the right PCI id. This is a lot of work because there are more than 200 - * GPUs just for Nvidia. Various cards share the same renderer string, so - * the amount of code might be 'small' but there are quite a number of - * exceptions which would make this a pain to maintain. Another way would - * be to query the PCI id from the operating system (assuming this is the - * videocard which is used for rendering which is not always the case). - * This would work but it is not very portable. Second it would not work - * well in, let's say, a remote X situation in which the amount of 3d - * features which can be used is limited. - * - * As said most games only use the PCI id to get an indication of the - * capabilities of the card. It doesn't really matter if the given id is - * the correct one if we return the id of a card with similar 3d features. - * - * The code below checks the OpenGL capabilities of a videocard and matches - * that to a certain level of Direct3D functionality. Once a card passes - * the Direct3D9 check, we know that the card (in case of Nvidia) is at - * least a GeforceFX. To give a better estimate we do a basic check on the - * renderer string but if that won't pass we return a default card. This - * way is better than maintaining a full card database as even without a - * full database we can return a card with similar features. Second the - * size of the database can be made quite small because when you know what - * type of 3d functionality a card has, you know to which GPU family the - * GPU must belong. Because of this you only have to check a small part of - * the renderer string to distinguish between different models from that - * family. - * - * The code also selects a default amount of video memory which we will - * use for an estimation of the amount of free texture memory. In case of - * real D3D the amount of texture memory includes video memory and system - * memory (to be specific AGP memory or in case of PCIE TurboCache / - * HyperMemory). We don't know how much system memory can be addressed by - * the system but we can make a reasonable estimation about the amount of - * video memory. If the value is slightly wrong it doesn't matter as we - * didn't include AGP-like memory which makes the amount of addressable - * memory higher and second OpenGL isn't that critical it moves to system - * memory behind our backs if really needed. Note that the amount of video - * memory can be overruled using a registry setting. */ - - enum wined3d_pci_device device; - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(card_vendor_table); ++i) - { - if (card_vendor_table[i].card_vendor != *card_vendor) - continue; - - TRACE("Applying card selector \"%s\".\n", card_vendor_table[i].description); - device = select_card_handler(card_vendor_table[i].gl_vendor_selection, - card_vendor_table[i].gl_vendor_count, *gl_vendor, gl_renderer); - if (device != PCI_DEVICE_NONE) - return device; - - TRACE("Unrecognized renderer %s, falling back to default.\n", debugstr_a(gl_renderer)); - return card_vendor_table[i].card_fallback[feature_level]; - } - - FIXME("No card selector available for card vendor %04x (using GL_RENDERER %s).\n", - *card_vendor, debugstr_a(gl_renderer)); - - /* Default to generic Nvidia hardware based on the supported OpenGL extensions. */ - *card_vendor = HW_VENDOR_NVIDIA; - return card_fallback_nvidia[feature_level]; -} - -static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_backend_ops *shader_backend_ops) -{ - if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_VERTEX_SHADER]) - return &glsl_vertex_pipe; - return &ffp_vertex_pipe; -} - -static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, - const struct wined3d_shader_backend_ops *shader_backend_ops) -{ - if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_fragment_pipe; - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arbfp_fragment_pipeline; - if (gl_info->supported[ATI_FRAGMENT_SHADER]) - return &atifs_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS] && gl_info->supported[NV_TEXTURE_SHADER2]) - return &nvts_fragment_pipeline; - if (gl_info->supported[NV_REGISTER_COMBINERS]) - return &nvrc_fragment_pipeline; - return &ffp_fragment_pipeline; -} - -static const struct wined3d_shader_backend_ops *select_shader_backend(const struct wined3d_gl_info *gl_info) -{ - BOOL glsl = wined3d_settings.use_glsl && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && !wined3d_settings.use_glsl) - { - ERR_(winediag)("Ignoring the UseGLSL registry key. " - "GLSL is the only shader backend available on core profile contexts. " - "You need to explicitly set GL version to use legacy contexts.\n"); - glsl = TRUE; - } - - if (glsl && gl_info->supported[ARB_VERTEX_SHADER] && gl_info->supported[ARB_FRAGMENT_SHADER]) - return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] && gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arb_program_shader_backend; - if (glsl && (gl_info->supported[ARB_VERTEX_SHADER] || gl_info->supported[ARB_FRAGMENT_SHADER])) - return &glsl_shader_backend; - if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) - return &arb_program_shader_backend; - return &none_shader_backend; -} - -static void parse_extension_string(struct wined3d_gl_info *gl_info, const char *extensions, - const struct wined3d_extension_map *map, UINT entry_count) -{ - while (*extensions) - { - const char *start; - size_t len; - UINT i; - - while (isspace(*extensions)) - ++extensions; - start = extensions; - while (!isspace(*extensions) && *extensions) - ++extensions; - - len = extensions - start; - if (!len) - continue; - - TRACE("- %s.\n", debugstr_an(start, len)); - - for (i = 0; i < entry_count; ++i) - { - if (len == strlen(map[i].extension_string) - && !memcmp(start, map[i].extension_string, len)) - { - TRACE(" FOUND: %s support.\n", map[i].extension_string); - gl_info->supported[map[i].extension] = TRUE; - break; - } - } - } -} - -static void enumerate_gl_extensions(struct wined3d_gl_info *gl_info, - const struct wined3d_extension_map *map, unsigned int map_entries_count) -{ - const char *gl_extension_name; - unsigned int i, j; - GLint extensions_count; - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); - for (i = 0; i < extensions_count; ++i) - { - gl_extension_name = (const char *)GL_EXTCALL(glGetStringi(GL_EXTENSIONS, i)); - TRACE("- %s.\n", debugstr_a(gl_extension_name)); - for (j = 0; j < map_entries_count; ++j) - { - if (!strcmp(gl_extension_name, map[j].extension_string)) - { - TRACE("FOUND: %s support.\n", map[j].extension_string); - gl_info->supported[map[j].extension] = TRUE; - break; - } - } - } -} - -static void load_gl_funcs(struct wined3d_gl_info *gl_info) -{ -#define USE_GL_FUNC(pfn) gl_info->gl_ops.ext.p_##pfn = (void *)wglGetProcAddress(#pfn); - /* GL_APPLE_fence */ - USE_GL_FUNC(glDeleteFencesAPPLE) - USE_GL_FUNC(glFinishFenceAPPLE) - USE_GL_FUNC(glFinishObjectAPPLE) - USE_GL_FUNC(glGenFencesAPPLE) - USE_GL_FUNC(glIsFenceAPPLE) - USE_GL_FUNC(glSetFenceAPPLE) - USE_GL_FUNC(glTestFenceAPPLE) - USE_GL_FUNC(glTestObjectAPPLE) - /* GL_APPLE_flush_buffer_range */ - USE_GL_FUNC(glBufferParameteriAPPLE) - USE_GL_FUNC(glFlushMappedBufferRangeAPPLE) - /* GL_ARB_base_instance */ - USE_GL_FUNC(glDrawArraysInstancedBaseInstance) - USE_GL_FUNC(glDrawElementsInstancedBaseVertexBaseInstance) - /* GL_ARB_blend_func_extended */ - USE_GL_FUNC(glBindFragDataLocationIndexed) - USE_GL_FUNC(glGetFragDataIndex) - /* GL_ARB_clear_buffer_object */ - USE_GL_FUNC(glClearBufferData) - USE_GL_FUNC(glClearBufferSubData) - /* GL_ARB_clear_texture */ - USE_GL_FUNC(glClearTexImage) - USE_GL_FUNC(glClearTexSubImage) - /* GL_ARB_clip_control */ - USE_GL_FUNC(glClipControl) - /* GL_ARB_color_buffer_float */ - USE_GL_FUNC(glClampColorARB) - /* GL_ARB_compute_shader */ - USE_GL_FUNC(glDispatchCompute) - USE_GL_FUNC(glDispatchComputeIndirect) - /* GL_ARB_copy_buffer */ - USE_GL_FUNC(glCopyBufferSubData) - /* GL_ARB_copy_image */ - USE_GL_FUNC(glCopyImageSubData) - /* GL_ARB_debug_output */ - USE_GL_FUNC(glDebugMessageCallbackARB) - USE_GL_FUNC(glDebugMessageControlARB) - USE_GL_FUNC(glDebugMessageInsertARB) - USE_GL_FUNC(glGetDebugMessageLogARB) - /* GL_ARB_draw_buffers */ - USE_GL_FUNC(glDrawBuffersARB) - /* GL_ARB_draw_elements_base_vertex */ - USE_GL_FUNC(glDrawElementsBaseVertex) - USE_GL_FUNC(glDrawElementsInstancedBaseVertex) - USE_GL_FUNC(glDrawRangeElementsBaseVertex) - USE_GL_FUNC(glMultiDrawElementsBaseVertex) - /* GL_ARB_draw_indirect */ - USE_GL_FUNC(glDrawArraysIndirect) - USE_GL_FUNC(glDrawElementsIndirect) - /* GL_ARB_draw_instanced */ - USE_GL_FUNC(glDrawArraysInstancedARB) - USE_GL_FUNC(glDrawElementsInstancedARB) - /* GL_ARB_ES2_compatibility */ - USE_GL_FUNC(glReleaseShaderCompiler) - USE_GL_FUNC(glShaderBinary) - USE_GL_FUNC(glGetShaderPrecisionFormat) - USE_GL_FUNC(glDepthRangef) - USE_GL_FUNC(glClearDepthf) - /* GL_ARB_framebuffer_no_attachments */ - USE_GL_FUNC(glFramebufferParameteri) - /* GL_ARB_framebuffer_object */ - USE_GL_FUNC(glBindFramebuffer) - USE_GL_FUNC(glBindRenderbuffer) - USE_GL_FUNC(glBlitFramebuffer) - USE_GL_FUNC(glCheckFramebufferStatus) - USE_GL_FUNC(glDeleteFramebuffers) - USE_GL_FUNC(glDeleteRenderbuffers) - USE_GL_FUNC(glFramebufferRenderbuffer) - USE_GL_FUNC(glFramebufferTexture) - USE_GL_FUNC(glFramebufferTexture1D) - USE_GL_FUNC(glFramebufferTexture2D) - USE_GL_FUNC(glFramebufferTexture3D) - USE_GL_FUNC(glFramebufferTextureLayer) - USE_GL_FUNC(glGenFramebuffers) - USE_GL_FUNC(glGenRenderbuffers) - USE_GL_FUNC(glGenerateMipmap) - USE_GL_FUNC(glGetFramebufferAttachmentParameteriv) - USE_GL_FUNC(glGetRenderbufferParameteriv) - USE_GL_FUNC(glIsFramebuffer) - USE_GL_FUNC(glIsRenderbuffer) - USE_GL_FUNC(glRenderbufferStorage) - USE_GL_FUNC(glRenderbufferStorageMultisample) - /* GL_ARB_geometry_shader4 */ - USE_GL_FUNC(glFramebufferTextureARB) - USE_GL_FUNC(glFramebufferTextureFaceARB) - USE_GL_FUNC(glFramebufferTextureLayerARB) - USE_GL_FUNC(glProgramParameteriARB) - /* GL_ARB_instanced_arrays */ - USE_GL_FUNC(glVertexAttribDivisorARB) - /* GL_ARB_internalformat_query */ - USE_GL_FUNC(glGetInternalformativ) - /* GL_ARB_internalformat_query2 */ - USE_GL_FUNC(glGetInternalformati64v) - /* GL_ARB_map_buffer_range */ - USE_GL_FUNC(glFlushMappedBufferRange) - USE_GL_FUNC(glMapBufferRange) - /* GL_ARB_multisample */ - USE_GL_FUNC(glSampleCoverageARB) - /* GL_ARB_multitexture */ - USE_GL_FUNC(glActiveTextureARB) - USE_GL_FUNC(glClientActiveTextureARB) - USE_GL_FUNC(glMultiTexCoord1fARB) - USE_GL_FUNC(glMultiTexCoord1fvARB) - USE_GL_FUNC(glMultiTexCoord2fARB) - USE_GL_FUNC(glMultiTexCoord2fvARB) - USE_GL_FUNC(glMultiTexCoord2svARB) - USE_GL_FUNC(glMultiTexCoord3fARB) - USE_GL_FUNC(glMultiTexCoord3fvARB) - USE_GL_FUNC(glMultiTexCoord4fARB) - USE_GL_FUNC(glMultiTexCoord4fvARB) - USE_GL_FUNC(glMultiTexCoord4svARB) - /* GL_ARB_occlusion_query */ - USE_GL_FUNC(glBeginQueryARB) - USE_GL_FUNC(glDeleteQueriesARB) - USE_GL_FUNC(glEndQueryARB) - USE_GL_FUNC(glGenQueriesARB) - USE_GL_FUNC(glGetQueryivARB) - USE_GL_FUNC(glGetQueryObjectivARB) - USE_GL_FUNC(glGetQueryObjectuivARB) - USE_GL_FUNC(glIsQueryARB) - /* GL_ARB_point_parameters */ - USE_GL_FUNC(glPointParameterfARB) - USE_GL_FUNC(glPointParameterfvARB) - /* GL_ARB_provoking_vertex */ - USE_GL_FUNC(glProvokingVertex) - /* GL_ARB_sample_shading */ - USE_GL_FUNC(glMinSampleShadingARB) - /* GL_ARB_sampler_objects */ - USE_GL_FUNC(glGenSamplers) - USE_GL_FUNC(glDeleteSamplers) - USE_GL_FUNC(glIsSampler) - USE_GL_FUNC(glBindSampler) - USE_GL_FUNC(glSamplerParameteri) - USE_GL_FUNC(glSamplerParameterf) - USE_GL_FUNC(glSamplerParameteriv) - USE_GL_FUNC(glSamplerParameterfv) - USE_GL_FUNC(glSamplerParameterIiv) - USE_GL_FUNC(glSamplerParameterIuiv) - USE_GL_FUNC(glGetSamplerParameteriv) - USE_GL_FUNC(glGetSamplerParameterfv) - USE_GL_FUNC(glGetSamplerParameterIiv) - USE_GL_FUNC(glGetSamplerParameterIuiv) - /* GL_ARB_shader_atomic_counters */ - USE_GL_FUNC(glGetActiveAtomicCounterBufferiv) - /* GL_ARB_shader_image_load_store */ - USE_GL_FUNC(glBindImageTexture) - USE_GL_FUNC(glMemoryBarrier) - /* GL_ARB_shader_objects */ - USE_GL_FUNC(glAttachObjectARB) - USE_GL_FUNC(glBindAttribLocationARB) - USE_GL_FUNC(glCompileShaderARB) - USE_GL_FUNC(glCreateProgramObjectARB) - USE_GL_FUNC(glCreateShaderObjectARB) - USE_GL_FUNC(glDeleteObjectARB) - USE_GL_FUNC(glDetachObjectARB) - USE_GL_FUNC(glGetActiveUniformARB) - USE_GL_FUNC(glGetAttachedObjectsARB) - USE_GL_FUNC(glGetAttribLocationARB) - USE_GL_FUNC(glGetHandleARB) - USE_GL_FUNC(glGetInfoLogARB) - USE_GL_FUNC(glGetObjectParameterfvARB) - USE_GL_FUNC(glGetObjectParameterivARB) - USE_GL_FUNC(glGetShaderSourceARB) - USE_GL_FUNC(glGetUniformLocationARB) - USE_GL_FUNC(glGetUniformfvARB) - USE_GL_FUNC(glGetUniformivARB) - USE_GL_FUNC(glLinkProgramARB) - USE_GL_FUNC(glShaderSourceARB) - USE_GL_FUNC(glUniform1fARB) - USE_GL_FUNC(glUniform1fvARB) - USE_GL_FUNC(glUniform1iARB) - USE_GL_FUNC(glUniform1ivARB) - USE_GL_FUNC(glUniform2fARB) - USE_GL_FUNC(glUniform2fvARB) - USE_GL_FUNC(glUniform2iARB) - USE_GL_FUNC(glUniform2ivARB) - USE_GL_FUNC(glUniform3fARB) - USE_GL_FUNC(glUniform3fvARB) - USE_GL_FUNC(glUniform3iARB) - USE_GL_FUNC(glUniform3ivARB) - USE_GL_FUNC(glUniform4fARB) - USE_GL_FUNC(glUniform4fvARB) - USE_GL_FUNC(glUniform4iARB) - USE_GL_FUNC(glUniform4ivARB) - USE_GL_FUNC(glUniformMatrix2fvARB) - USE_GL_FUNC(glUniformMatrix3fvARB) - USE_GL_FUNC(glUniformMatrix4fvARB) - USE_GL_FUNC(glUseProgramObjectARB) - USE_GL_FUNC(glValidateProgramARB) - /* GL_ARB_shader_storage_buffer_object */ - USE_GL_FUNC(glShaderStorageBlockBinding) - /* GL_ARB_sync */ - USE_GL_FUNC(glClientWaitSync) - USE_GL_FUNC(glDeleteSync) - USE_GL_FUNC(glFenceSync) - USE_GL_FUNC(glGetInteger64v) - USE_GL_FUNC(glGetSynciv) - USE_GL_FUNC(glIsSync) - USE_GL_FUNC(glWaitSync) - /* GL_ARB_tessellation_shader */ - USE_GL_FUNC(glPatchParameteri) - USE_GL_FUNC(glPatchParameterfv) - /* GL_ARB_texture_buffer_object */ - USE_GL_FUNC(glTexBufferARB) - /* GL_ARB_texture_buffer_range */ - USE_GL_FUNC(glTexBufferRange) - /* GL_ARB_texture_compression */ - USE_GL_FUNC(glCompressedTexImage2DARB) - USE_GL_FUNC(glCompressedTexImage3DARB) - USE_GL_FUNC(glCompressedTexSubImage2DARB) - USE_GL_FUNC(glCompressedTexSubImage3DARB) - USE_GL_FUNC(glGetCompressedTexImageARB) - /* GL_ARB_texture_multisample */ - USE_GL_FUNC(glGetMultisamplefv); - USE_GL_FUNC(glSampleMaski); - USE_GL_FUNC(glTexImage2DMultisample); - USE_GL_FUNC(glTexImage3DMultisample); - /* GL_ARB_texture_storage */ - USE_GL_FUNC(glTexStorage1D) - USE_GL_FUNC(glTexStorage2D) - USE_GL_FUNC(glTexStorage3D) - /* GL_ARB_texture_storage_multisample */ - USE_GL_FUNC(glTexStorage2DMultisample); - USE_GL_FUNC(glTexStorage3DMultisample); - /* GL_ARB_texture_view */ - USE_GL_FUNC(glTextureView) - /* GL_ARB_timer_query */ - USE_GL_FUNC(glQueryCounter) - USE_GL_FUNC(glGetQueryObjectui64v) - /* GL_ARB_transform_feedback2 */ - USE_GL_FUNC(glBindTransformFeedback); - USE_GL_FUNC(glDeleteTransformFeedbacks); - USE_GL_FUNC(glDrawTransformFeedback); - USE_GL_FUNC(glGenTransformFeedbacks); - USE_GL_FUNC(glIsTransformFeedback); - USE_GL_FUNC(glPauseTransformFeedback); - USE_GL_FUNC(glResumeTransformFeedback); - /* GL_ARB_transform_feedback3 */ - USE_GL_FUNC(glBeginQueryIndexed); - USE_GL_FUNC(glDrawTransformFeedbackStream); - USE_GL_FUNC(glEndQueryIndexed); - USE_GL_FUNC(glGetQueryIndexediv); - /* GL_ARB_uniform_buffer_object */ - USE_GL_FUNC(glBindBufferBase) - USE_GL_FUNC(glBindBufferRange) - USE_GL_FUNC(glGetActiveUniformBlockName) - USE_GL_FUNC(glGetActiveUniformBlockiv) - USE_GL_FUNC(glGetActiveUniformName) - USE_GL_FUNC(glGetActiveUniformsiv) - USE_GL_FUNC(glGetIntegeri_v) - USE_GL_FUNC(glGetUniformBlockIndex) - USE_GL_FUNC(glGetUniformIndices) - USE_GL_FUNC(glUniformBlockBinding) - /* GL_ARB_vertex_buffer_object */ - USE_GL_FUNC(glBindBufferARB) - USE_GL_FUNC(glBufferDataARB) - USE_GL_FUNC(glBufferSubDataARB) - USE_GL_FUNC(glDeleteBuffersARB) - USE_GL_FUNC(glGenBuffersARB) - USE_GL_FUNC(glGetBufferParameterivARB) - USE_GL_FUNC(glGetBufferPointervARB) - USE_GL_FUNC(glGetBufferSubDataARB) - USE_GL_FUNC(glIsBufferARB) - USE_GL_FUNC(glMapBufferARB) - USE_GL_FUNC(glUnmapBufferARB) - /* GL_ARB_vertex_program */ - USE_GL_FUNC(glBindProgramARB) - USE_GL_FUNC(glDeleteProgramsARB) - USE_GL_FUNC(glDisableVertexAttribArrayARB) - USE_GL_FUNC(glEnableVertexAttribArrayARB) - USE_GL_FUNC(glGenProgramsARB) - USE_GL_FUNC(glGetProgramivARB) - USE_GL_FUNC(glProgramEnvParameter4fvARB) - USE_GL_FUNC(glProgramLocalParameter4fvARB) - USE_GL_FUNC(glProgramStringARB) - USE_GL_FUNC(glVertexAttrib1dARB) - USE_GL_FUNC(glVertexAttrib1dvARB) - USE_GL_FUNC(glVertexAttrib1fARB) - USE_GL_FUNC(glVertexAttrib1fvARB) - USE_GL_FUNC(glVertexAttrib1sARB) - USE_GL_FUNC(glVertexAttrib1svARB) - USE_GL_FUNC(glVertexAttrib2dARB) - USE_GL_FUNC(glVertexAttrib2dvARB) - USE_GL_FUNC(glVertexAttrib2fARB) - USE_GL_FUNC(glVertexAttrib2fvARB) - USE_GL_FUNC(glVertexAttrib2sARB) - USE_GL_FUNC(glVertexAttrib2svARB) - USE_GL_FUNC(glVertexAttrib3dARB) - USE_GL_FUNC(glVertexAttrib3dvARB) - USE_GL_FUNC(glVertexAttrib3fARB) - USE_GL_FUNC(glVertexAttrib3fvARB) - USE_GL_FUNC(glVertexAttrib3sARB) - USE_GL_FUNC(glVertexAttrib3svARB) - USE_GL_FUNC(glVertexAttrib4NbvARB) - USE_GL_FUNC(glVertexAttrib4NivARB) - USE_GL_FUNC(glVertexAttrib4NsvARB) - USE_GL_FUNC(glVertexAttrib4NubARB) - USE_GL_FUNC(glVertexAttrib4NubvARB) - USE_GL_FUNC(glVertexAttrib4NuivARB) - USE_GL_FUNC(glVertexAttrib4NusvARB) - USE_GL_FUNC(glVertexAttrib4bvARB) - USE_GL_FUNC(glVertexAttrib4dARB) - USE_GL_FUNC(glVertexAttrib4dvARB) - USE_GL_FUNC(glVertexAttrib4fARB) - USE_GL_FUNC(glVertexAttrib4fvARB) - USE_GL_FUNC(glVertexAttrib4ivARB) - USE_GL_FUNC(glVertexAttrib4sARB) - USE_GL_FUNC(glVertexAttrib4svARB) - USE_GL_FUNC(glVertexAttrib4ubvARB) - USE_GL_FUNC(glVertexAttrib4uivARB) - USE_GL_FUNC(glVertexAttrib4usvARB) - USE_GL_FUNC(glVertexAttribPointerARB) - /* GL_ARB_viewport_array */ - USE_GL_FUNC(glDepthRangeArrayv) - USE_GL_FUNC(glDepthRangeIndexed) - USE_GL_FUNC(glGetDoublei_v) - USE_GL_FUNC(glGetFloati_v) - USE_GL_FUNC(glScissorArrayv) - USE_GL_FUNC(glScissorIndexed) - USE_GL_FUNC(glScissorIndexedv) - USE_GL_FUNC(glViewportArrayv) - USE_GL_FUNC(glViewportIndexedf) - USE_GL_FUNC(glViewportIndexedfv) - /* GL_ATI_fragment_shader */ - USE_GL_FUNC(glAlphaFragmentOp1ATI) - USE_GL_FUNC(glAlphaFragmentOp2ATI) - USE_GL_FUNC(glAlphaFragmentOp3ATI) - USE_GL_FUNC(glBeginFragmentShaderATI) - USE_GL_FUNC(glBindFragmentShaderATI) - USE_GL_FUNC(glColorFragmentOp1ATI) - USE_GL_FUNC(glColorFragmentOp2ATI) - USE_GL_FUNC(glColorFragmentOp3ATI) - USE_GL_FUNC(glDeleteFragmentShaderATI) - USE_GL_FUNC(glEndFragmentShaderATI) - USE_GL_FUNC(glGenFragmentShadersATI) - USE_GL_FUNC(glPassTexCoordATI) - USE_GL_FUNC(glSampleMapATI) - USE_GL_FUNC(glSetFragmentShaderConstantATI) - /* GL_ATI_separate_stencil */ - USE_GL_FUNC(glStencilOpSeparateATI) - USE_GL_FUNC(glStencilFuncSeparateATI) - /* GL_EXT_blend_color */ - USE_GL_FUNC(glBlendColorEXT) - /* GL_EXT_blend_equation_separate */ - USE_GL_FUNC(glBlendFuncSeparateEXT) - /* GL_EXT_blend_func_separate */ - USE_GL_FUNC(glBlendEquationSeparateEXT) - /* GL_EXT_blend_minmax */ - USE_GL_FUNC(glBlendEquationEXT) - /* GL_EXT_depth_bounds_test */ - USE_GL_FUNC(glDepthBoundsEXT) - /* GL_EXT_draw_buffers2 */ - USE_GL_FUNC(glColorMaskIndexedEXT) - USE_GL_FUNC(glDisableIndexedEXT) - USE_GL_FUNC(glEnableIndexedEXT) - USE_GL_FUNC(glGetBooleanIndexedvEXT) - USE_GL_FUNC(glGetIntegerIndexedvEXT) - USE_GL_FUNC(glIsEnabledIndexedEXT) - /* GL_EXT_fog_coord */ - USE_GL_FUNC(glFogCoordPointerEXT) - USE_GL_FUNC(glFogCoorddEXT) - USE_GL_FUNC(glFogCoorddvEXT) - USE_GL_FUNC(glFogCoordfEXT) - USE_GL_FUNC(glFogCoordfvEXT) - /* GL_EXT_framebuffer_blit */ - USE_GL_FUNC(glBlitFramebufferEXT) - /* GL_EXT_framebuffer_multisample */ - USE_GL_FUNC(glRenderbufferStorageMultisampleEXT) - /* GL_EXT_framebuffer_object */ - USE_GL_FUNC(glBindFramebufferEXT) - USE_GL_FUNC(glBindRenderbufferEXT) - USE_GL_FUNC(glCheckFramebufferStatusEXT) - USE_GL_FUNC(glDeleteFramebuffersEXT) - USE_GL_FUNC(glDeleteRenderbuffersEXT) - USE_GL_FUNC(glFramebufferRenderbufferEXT) - USE_GL_FUNC(glFramebufferTexture1DEXT) - USE_GL_FUNC(glFramebufferTexture2DEXT) - USE_GL_FUNC(glFramebufferTexture3DEXT) - USE_GL_FUNC(glGenFramebuffersEXT) - USE_GL_FUNC(glGenRenderbuffersEXT) - USE_GL_FUNC(glGenerateMipmapEXT) - USE_GL_FUNC(glGetFramebufferAttachmentParameterivEXT) - USE_GL_FUNC(glGetRenderbufferParameterivEXT) - USE_GL_FUNC(glIsFramebufferEXT) - USE_GL_FUNC(glIsRenderbufferEXT) - USE_GL_FUNC(glRenderbufferStorageEXT) - /* GL_EXT_gpu_program_parameters */ - USE_GL_FUNC(glProgramEnvParameters4fvEXT) - USE_GL_FUNC(glProgramLocalParameters4fvEXT) - /* GL_EXT_gpu_shader4 */ - USE_GL_FUNC(glBindFragDataLocationEXT) - USE_GL_FUNC(glGetFragDataLocationEXT) - USE_GL_FUNC(glGetUniformuivEXT) - USE_GL_FUNC(glGetVertexAttribIivEXT) - USE_GL_FUNC(glGetVertexAttribIuivEXT) - USE_GL_FUNC(glUniform1uiEXT) - USE_GL_FUNC(glUniform1uivEXT) - USE_GL_FUNC(glUniform2uiEXT) - USE_GL_FUNC(glUniform2uivEXT) - USE_GL_FUNC(glUniform3uiEXT) - USE_GL_FUNC(glUniform3uivEXT) - USE_GL_FUNC(glUniform4uiEXT) - USE_GL_FUNC(glUniform4uivEXT) - USE_GL_FUNC(glVertexAttribI1iEXT) - USE_GL_FUNC(glVertexAttribI1ivEXT) - USE_GL_FUNC(glVertexAttribI1uiEXT) - USE_GL_FUNC(glVertexAttribI1uivEXT) - USE_GL_FUNC(glVertexAttribI2iEXT) - USE_GL_FUNC(glVertexAttribI2ivEXT) - USE_GL_FUNC(glVertexAttribI2uiEXT) - USE_GL_FUNC(glVertexAttribI2uivEXT) - USE_GL_FUNC(glVertexAttribI3iEXT) - USE_GL_FUNC(glVertexAttribI3ivEXT) - USE_GL_FUNC(glVertexAttribI3uiEXT) - USE_GL_FUNC(glVertexAttribI3uivEXT) - USE_GL_FUNC(glVertexAttribI4bvEXT) - USE_GL_FUNC(glVertexAttribI4iEXT) - USE_GL_FUNC(glVertexAttribI4ivEXT) - USE_GL_FUNC(glVertexAttribI4svEXT) - USE_GL_FUNC(glVertexAttribI4ubvEXT) - USE_GL_FUNC(glVertexAttribI4uiEXT) - USE_GL_FUNC(glVertexAttribI4uivEXT) - USE_GL_FUNC(glVertexAttribI4usvEXT) - USE_GL_FUNC(glVertexAttribIPointerEXT) - /* GL_EXT_point_parameters */ - USE_GL_FUNC(glPointParameterfEXT) - USE_GL_FUNC(glPointParameterfvEXT) - /* GL_EXT_provoking_vertex */ - USE_GL_FUNC(glProvokingVertexEXT) - /* GL_EXT_secondary_color */ - USE_GL_FUNC(glSecondaryColor3fEXT) - USE_GL_FUNC(glSecondaryColor3fvEXT) - USE_GL_FUNC(glSecondaryColor3ubEXT) - USE_GL_FUNC(glSecondaryColor3ubvEXT) - USE_GL_FUNC(glSecondaryColorPointerEXT) - /* GL_EXT_stencil_two_side */ - USE_GL_FUNC(glActiveStencilFaceEXT) - /* GL_EXT_texture3D */ - USE_GL_FUNC(glTexImage3D) - USE_GL_FUNC(glTexImage3DEXT) - USE_GL_FUNC(glTexSubImage3D) - USE_GL_FUNC(glTexSubImage3DEXT) - /* GL_NV_fence */ - USE_GL_FUNC(glDeleteFencesNV) - USE_GL_FUNC(glFinishFenceNV) - USE_GL_FUNC(glGenFencesNV) - USE_GL_FUNC(glGetFenceivNV) - USE_GL_FUNC(glIsFenceNV) - USE_GL_FUNC(glSetFenceNV) - USE_GL_FUNC(glTestFenceNV) - /* GL_NV_half_float */ - USE_GL_FUNC(glColor3hNV) - USE_GL_FUNC(glColor3hvNV) - USE_GL_FUNC(glColor4hNV) - USE_GL_FUNC(glColor4hvNV) - USE_GL_FUNC(glFogCoordhNV) - USE_GL_FUNC(glFogCoordhvNV) - USE_GL_FUNC(glMultiTexCoord1hNV) - USE_GL_FUNC(glMultiTexCoord1hvNV) - USE_GL_FUNC(glMultiTexCoord2hNV) - USE_GL_FUNC(glMultiTexCoord2hvNV) - USE_GL_FUNC(glMultiTexCoord3hNV) - USE_GL_FUNC(glMultiTexCoord3hvNV) - USE_GL_FUNC(glMultiTexCoord4hNV) - USE_GL_FUNC(glMultiTexCoord4hvNV) - USE_GL_FUNC(glNormal3hNV) - USE_GL_FUNC(glNormal3hvNV) - USE_GL_FUNC(glSecondaryColor3hNV) - USE_GL_FUNC(glSecondaryColor3hvNV) - USE_GL_FUNC(glTexCoord1hNV) - USE_GL_FUNC(glTexCoord1hvNV) - USE_GL_FUNC(glTexCoord2hNV) - USE_GL_FUNC(glTexCoord2hvNV) - USE_GL_FUNC(glTexCoord3hNV) - USE_GL_FUNC(glTexCoord3hvNV) - USE_GL_FUNC(glTexCoord4hNV) - USE_GL_FUNC(glTexCoord4hvNV) - USE_GL_FUNC(glVertex2hNV) - USE_GL_FUNC(glVertex2hvNV) - USE_GL_FUNC(glVertex3hNV) - USE_GL_FUNC(glVertex3hvNV) - USE_GL_FUNC(glVertex4hNV) - USE_GL_FUNC(glVertex4hvNV) - USE_GL_FUNC(glVertexAttrib1hNV) - USE_GL_FUNC(glVertexAttrib1hvNV) - USE_GL_FUNC(glVertexAttrib2hNV) - USE_GL_FUNC(glVertexAttrib2hvNV) - USE_GL_FUNC(glVertexAttrib3hNV) - USE_GL_FUNC(glVertexAttrib3hvNV) - USE_GL_FUNC(glVertexAttrib4hNV) - USE_GL_FUNC(glVertexAttrib4hvNV) - USE_GL_FUNC(glVertexAttribs1hvNV) - USE_GL_FUNC(glVertexAttribs2hvNV) - USE_GL_FUNC(glVertexAttribs3hvNV) - USE_GL_FUNC(glVertexAttribs4hvNV) - USE_GL_FUNC(glVertexWeighthNV) - USE_GL_FUNC(glVertexWeighthvNV) - /* GL_NV_point_sprite */ - USE_GL_FUNC(glPointParameteriNV) - USE_GL_FUNC(glPointParameterivNV) - /* GL_NV_register_combiners */ - USE_GL_FUNC(glCombinerInputNV) - USE_GL_FUNC(glCombinerOutputNV) - USE_GL_FUNC(glCombinerParameterfNV) - USE_GL_FUNC(glCombinerParameterfvNV) - USE_GL_FUNC(glCombinerParameteriNV) - USE_GL_FUNC(glCombinerParameterivNV) - USE_GL_FUNC(glFinalCombinerInputNV) - /* WGL extensions */ - USE_GL_FUNC(wglChoosePixelFormatARB) - USE_GL_FUNC(wglGetExtensionsStringARB) - USE_GL_FUNC(wglGetPixelFormatAttribfvARB) - USE_GL_FUNC(wglGetPixelFormatAttribivARB) - USE_GL_FUNC(wglQueryCurrentRendererIntegerWINE) - USE_GL_FUNC(wglQueryCurrentRendererStringWINE) - USE_GL_FUNC(wglQueryRendererIntegerWINE) - USE_GL_FUNC(wglQueryRendererStringWINE) - USE_GL_FUNC(wglSetPixelFormatWINE) - USE_GL_FUNC(wglSwapIntervalEXT) - - /* Newer core functions */ - USE_GL_FUNC(glActiveTexture) /* OpenGL 1.3 */ - USE_GL_FUNC(glAttachShader) /* OpenGL 2.0 */ - USE_GL_FUNC(glBeginQuery) /* OpenGL 1.5 */ - USE_GL_FUNC(glBeginTransformFeedback) /* OpenGL 3.0 */ - USE_GL_FUNC(glBindAttribLocation) /* OpenGL 2.0 */ - USE_GL_FUNC(glBindBuffer) /* OpenGL 1.5 */ - USE_GL_FUNC(glBindFragDataLocation) /* OpenGL 3.0 */ - USE_GL_FUNC(glBindVertexArray) /* OpenGL 3.0 */ - USE_GL_FUNC(glBlendColor) /* OpenGL 1.4 */ - USE_GL_FUNC(glBlendEquation) /* OpenGL 1.4 */ - USE_GL_FUNC(glBlendEquationSeparate) /* OpenGL 2.0 */ - USE_GL_FUNC(glBlendFuncSeparate) /* OpenGL 1.4 */ - USE_GL_FUNC(glBufferData) /* OpenGL 1.5 */ - USE_GL_FUNC(glBufferSubData) /* OpenGL 1.5 */ - USE_GL_FUNC(glColorMaski) /* OpenGL 3.0 */ - USE_GL_FUNC(glCompileShader) /* OpenGL 2.0 */ - USE_GL_FUNC(glCompressedTexImage2D) /* OpenGL 1.3 */ - USE_GL_FUNC(glCompressedTexImage3D) /* OpenGL 1.3 */ - USE_GL_FUNC(glCompressedTexSubImage2D) /* OpenGL 1.3 */ - USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */ - USE_GL_FUNC(glCreateProgram) /* OpenGL 2.0 */ - USE_GL_FUNC(glCreateShader) /* OpenGL 2.0 */ - USE_GL_FUNC(glDebugMessageCallback) /* OpenGL 4.3 */ - USE_GL_FUNC(glDebugMessageControl) /* OpenGL 4.3 */ - USE_GL_FUNC(glDebugMessageInsert) /* OpenGL 4.3 */ - USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */ - USE_GL_FUNC(glDeleteProgram) /* OpenGL 2.0 */ - USE_GL_FUNC(glDeleteQueries) /* OpenGL 1.5 */ - USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ - USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */ - USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */ - USE_GL_FUNC(glDisablei) /* OpenGL 3.0 */ - USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */ - USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */ - USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ - USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ - USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */ - USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ - USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ - USE_GL_FUNC(glEndTransformFeedback) /* OpenGL 3.0 */ - USE_GL_FUNC(glFramebufferTexture) /* OpenGL 3.2 */ - USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ - USE_GL_FUNC(glGenQueries) /* OpenGL 1.5 */ - USE_GL_FUNC(glGenVertexArrays) /* OpenGL 3.0 */ - USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetBooleani_v) /* OpenGL 3.0 */ - USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ - USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ - USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */ - USE_GL_FUNC(glGetIntegeri_v) /* OpenGL 3.0 */ - USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */ - USE_GL_FUNC(glGetQueryObjectuiv) /* OpenGL 1.5 */ - USE_GL_FUNC(glGetShaderInfoLog) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetShaderiv) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetShaderSource) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetStringi) /* OpenGL 3.0 */ - USE_GL_FUNC(glGetTextureLevelParameteriv) /* OpenGL 4.5 */ - USE_GL_FUNC(glGetTextureParameteriv) /* OpenGL 4.5 */ - USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */ - USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */ - USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ - USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ - USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ - USE_GL_FUNC(glMinSampleShading) /* OpenGL 4.0 */ - USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ - USE_GL_FUNC(glPointParameteriv) /* OpenGL 1.4 */ - USE_GL_FUNC(glShaderSource) /* OpenGL 2.0 */ - USE_GL_FUNC(glStencilFuncSeparate) /* OpenGL 2.0 */ - USE_GL_FUNC(glStencilOpSeparate) /* OpenGL 2.0 */ - USE_GL_FUNC(glTexBuffer) /* OpenGL 3.1 */ - USE_GL_FUNC(glTexImage3D) /* OpenGL 1.2 */ - USE_GL_FUNC(glTexSubImage3D) /* OpenGL 1.2 */ - USE_GL_FUNC(glTransformFeedbackVaryings) /* OpenGL 3.0 */ - USE_GL_FUNC(glUniform1f) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform1fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform1i) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform1iv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform2f) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform2fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform2i) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform2iv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform3f) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform3fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform3i) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform3iv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform4f) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform4fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform4i) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniform4iv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniformMatrix2fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniformMatrix3fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUniformMatrix4fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glUnmapBuffer) /* OpenGL 1.5 */ - USE_GL_FUNC(glUseProgram) /* OpenGL 2.0 */ - USE_GL_FUNC(glValidateProgram) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib1f) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib1fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib2f) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib2fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib3f) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib3fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4f) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4fv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4Nsv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4Nub) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4Nubv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4Nusv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4sv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttrib4ubv) /* OpenGL 2.0 */ - USE_GL_FUNC(glVertexAttribDivisor) /* OpenGL 3.3 */ - USE_GL_FUNC(glVertexAttribIPointer) /* OpenGL 3.0 */ - USE_GL_FUNC(glVertexAttribPointer) /* OpenGL 2.0 */ -#undef USE_GL_FUNC - -#ifndef USE_WIN32_OPENGL - /* hack: use the functions directly from the TEB table to bypass the thunks */ - /* note that we still need the above wglGetProcAddress calls to initialize the table */ - gl_info->gl_ops.ext = ((struct opengl_funcs *)NtCurrentTeb()->glTable)->ext; -#endif - -#define MAP_GL_FUNCTION(core_func, ext_func) \ - do \ - { \ - if (!gl_info->gl_ops.ext.p_##core_func) \ - gl_info->gl_ops.ext.p_##core_func = gl_info->gl_ops.ext.p_##ext_func; \ - } while (0) -#define MAP_GL_FUNCTION_CAST(core_func, ext_func) \ - do \ - { \ - if (!gl_info->gl_ops.ext.p_##core_func) \ - gl_info->gl_ops.ext.p_##core_func = (void *)gl_info->gl_ops.ext.p_##ext_func; \ - } while (0) - - MAP_GL_FUNCTION(glActiveTexture, glActiveTextureARB); - MAP_GL_FUNCTION(glAttachShader, glAttachObjectARB); - MAP_GL_FUNCTION(glBeginQuery, glBeginQueryARB); - MAP_GL_FUNCTION(glBindAttribLocation, glBindAttribLocationARB); - MAP_GL_FUNCTION(glBindBuffer, glBindBufferARB); - MAP_GL_FUNCTION(glBindFragDataLocation, glBindFragDataLocationEXT); - MAP_GL_FUNCTION(glBlendColor, glBlendColorEXT); - MAP_GL_FUNCTION(glBlendEquation, glBlendEquationEXT); - MAP_GL_FUNCTION(glBlendEquationSeparate, glBlendEquationSeparateEXT); - MAP_GL_FUNCTION(glBlendFuncSeparate, glBlendFuncSeparateEXT); - MAP_GL_FUNCTION(glBufferData, glBufferDataARB); - MAP_GL_FUNCTION(glBufferSubData, glBufferSubDataARB); - MAP_GL_FUNCTION(glColorMaski, glColorMaskIndexedEXT); - MAP_GL_FUNCTION(glCompileShader, glCompileShaderARB); - MAP_GL_FUNCTION(glCompressedTexImage2D, glCompressedTexImage2DARB); - MAP_GL_FUNCTION(glCompressedTexImage3D, glCompressedTexImage3DARB); - MAP_GL_FUNCTION(glCompressedTexSubImage2D, glCompressedTexSubImage2DARB); - MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB); - MAP_GL_FUNCTION(glCreateProgram, glCreateProgramObjectARB); - MAP_GL_FUNCTION(glCreateShader, glCreateShaderObjectARB); - MAP_GL_FUNCTION(glDebugMessageCallback, glDebugMessageCallbackARB); - MAP_GL_FUNCTION(glDebugMessageControl, glDebugMessageControlARB); - MAP_GL_FUNCTION(glDebugMessageInsert, glDebugMessageInsertARB); - MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB); - MAP_GL_FUNCTION(glDeleteProgram, glDeleteObjectARB); - MAP_GL_FUNCTION(glDeleteQueries, glDeleteQueriesARB); - MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); - MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); - MAP_GL_FUNCTION(glDisablei, glDisableIndexedEXT); - MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); - MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); - MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); - MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); - MAP_GL_FUNCTION(glEnablei, glEnableIndexedEXT); - MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB); - MAP_GL_FUNCTION(glEndQuery, glEndQueryARB); - MAP_GL_FUNCTION(glFramebufferTexture, glFramebufferTextureARB); - MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); - MAP_GL_FUNCTION(glGenQueries, glGenQueriesARB); - MAP_GL_FUNCTION(glGetActiveUniform, glGetActiveUniformARB); - MAP_GL_FUNCTION(glGetAttachedShaders, glGetAttachedObjectsARB); - MAP_GL_FUNCTION(glGetAttribLocation, glGetAttribLocationARB); - MAP_GL_FUNCTION(glGetBooleani_v, glGetBooleanIndexedvEXT); - MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); - MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); - MAP_GL_FUNCTION(glGetDebugMessageLog, glGetDebugMessageLogARB); - MAP_GL_FUNCTION(glGetIntegeri_v, glGetIntegerIndexedvEXT); - MAP_GL_FUNCTION(glGetProgramInfoLog, glGetInfoLogARB); - MAP_GL_FUNCTION(glGetProgramiv, glGetObjectParameterivARB); - MAP_GL_FUNCTION(glGetQueryiv, glGetQueryivARB); - MAP_GL_FUNCTION(glGetQueryObjectuiv, glGetQueryObjectuivARB); - MAP_GL_FUNCTION(glGetShaderInfoLog, glGetInfoLogARB); - MAP_GL_FUNCTION(glGetShaderiv, glGetObjectParameterivARB); - MAP_GL_FUNCTION(glGetShaderSource, glGetShaderSourceARB); - MAP_GL_FUNCTION(glGetUniformfv, glGetUniformfvARB); - MAP_GL_FUNCTION(glGetUniformiv, glGetUniformivARB); - MAP_GL_FUNCTION(glGetUniformLocation, glGetUniformLocationARB); - MAP_GL_FUNCTION(glIsEnabledi, glIsEnabledIndexedEXT); - MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); - MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); - MAP_GL_FUNCTION(glMinSampleShading, glMinSampleShadingARB); - MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB); - MAP_GL_FUNCTION(glTexBuffer, glTexBufferARB); - MAP_GL_FUNCTION_CAST(glTexImage3D, glTexImage3DEXT); - MAP_GL_FUNCTION(glTexSubImage3D, glTexSubImage3DEXT); - MAP_GL_FUNCTION(glUniform1f, glUniform1fARB); - MAP_GL_FUNCTION(glUniform1fv, glUniform1fvARB); - MAP_GL_FUNCTION(glUniform1i, glUniform1iARB); - MAP_GL_FUNCTION(glUniform1iv, glUniform1ivARB); - MAP_GL_FUNCTION(glUniform2f, glUniform2fARB); - MAP_GL_FUNCTION(glUniform2fv, glUniform2fvARB); - MAP_GL_FUNCTION(glUniform2i, glUniform2iARB); - MAP_GL_FUNCTION(glUniform2iv, glUniform2ivARB); - MAP_GL_FUNCTION(glUniform3f, glUniform3fARB); - MAP_GL_FUNCTION(glUniform3fv, glUniform3fvARB); - MAP_GL_FUNCTION(glUniform3i, glUniform3iARB); - MAP_GL_FUNCTION(glUniform3iv, glUniform3ivARB); - MAP_GL_FUNCTION(glUniform4f, glUniform4fARB); - MAP_GL_FUNCTION(glUniform4fv, glUniform4fvARB); - MAP_GL_FUNCTION(glUniform4i, glUniform4iARB); - MAP_GL_FUNCTION(glUniform4iv, glUniform4ivARB); - MAP_GL_FUNCTION(glUniformMatrix2fv, glUniformMatrix2fvARB); - MAP_GL_FUNCTION(glUniformMatrix3fv, glUniformMatrix3fvARB); - MAP_GL_FUNCTION(glUniformMatrix4fv, glUniformMatrix4fvARB); - MAP_GL_FUNCTION(glUnmapBuffer, glUnmapBufferARB); - MAP_GL_FUNCTION(glUseProgram, glUseProgramObjectARB); - MAP_GL_FUNCTION(glValidateProgram, glValidateProgramARB); - MAP_GL_FUNCTION(glVertexAttrib1f, glVertexAttrib1fARB); - MAP_GL_FUNCTION(glVertexAttrib1fv, glVertexAttrib1fvARB); - MAP_GL_FUNCTION(glVertexAttrib2f, glVertexAttrib2fARB); - MAP_GL_FUNCTION(glVertexAttrib2fv, glVertexAttrib2fvARB); - MAP_GL_FUNCTION(glVertexAttrib3f, glVertexAttrib3fARB); - MAP_GL_FUNCTION(glVertexAttrib3fv, glVertexAttrib3fvARB); - MAP_GL_FUNCTION(glVertexAttrib4f, glVertexAttrib4fARB); - MAP_GL_FUNCTION(glVertexAttrib4fv, glVertexAttrib4fvARB); - MAP_GL_FUNCTION(glVertexAttrib4Nsv, glVertexAttrib4NsvARB); - MAP_GL_FUNCTION(glVertexAttrib4Nub, glVertexAttrib4NubARB); - MAP_GL_FUNCTION(glVertexAttrib4Nubv, glVertexAttrib4NubvARB); - MAP_GL_FUNCTION(glVertexAttrib4Nusv, glVertexAttrib4NusvARB); - MAP_GL_FUNCTION(glVertexAttrib4sv, glVertexAttrib4svARB); - MAP_GL_FUNCTION(glVertexAttrib4ubv, glVertexAttrib4ubvARB); - MAP_GL_FUNCTION(glVertexAttribDivisor, glVertexAttribDivisorARB); - MAP_GL_FUNCTION(glVertexAttribIPointer, glVertexAttribIPointerEXT); - MAP_GL_FUNCTION(glVertexAttribPointer, glVertexAttribPointerARB); -#undef MAP_GL_FUNCTION -#undef MAP_GL_FUNCTION_CAST -} - -static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) -{ - unsigned int i, sampler_count; - GLfloat gl_floatv[2]; - GLint gl_max; - - gl_info->limits.buffers = 1; - gl_info->limits.textures = 0; - gl_info->limits.texture_coords = 0; - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - { - gl_info->limits.uniform_blocks[i] = 0; - gl_info->limits.samplers[i] = 0; - } - gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = 1; - gl_info->limits.combined_samplers = gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL]; - gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; - gl_info->limits.vertex_attribs = 16; - gl_info->limits.texture_buffer_offset_alignment = 1; - gl_info->limits.glsl_vs_float_constants = 0; - gl_info->limits.glsl_ps_float_constants = 0; - gl_info->limits.arb_vs_float_constants = 0; - gl_info->limits.arb_vs_native_constants = 0; - gl_info->limits.arb_vs_instructions = 0; - gl_info->limits.arb_vs_temps = 0; - gl_info->limits.arb_ps_float_constants = 0; - gl_info->limits.arb_ps_local_constants = 0; - gl_info->limits.arb_ps_instructions = 0; - gl_info->limits.arb_ps_temps = 0; - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_CLIP_DISTANCES, &gl_max); - gl_info->limits.user_clip_distances = min(MAX_CLIP_DISTANCES, gl_max); - TRACE("Clip plane support - max planes %d.\n", gl_max); - - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_LIGHTS, &gl_max); - gl_info->limits.lights = gl_max; - TRACE("Light support - max lights %d.\n", gl_max); - } - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); - gl_info->limits.texture_size = gl_max; - TRACE("Maximum texture size support - max texture size %d.\n", gl_max); - - gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] - ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, gl_floatv); - gl_info->limits.pointsize_min = gl_floatv[0]; - gl_info->limits.pointsize_max = gl_floatv[1]; - TRACE("Maximum point size support - max point size %f.\n", gl_floatv[1]); - - if (gl_info->supported[ARB_MAP_BUFFER_ALIGNMENT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MIN_MAP_BUFFER_ALIGNMENT, &gl_max); - TRACE("Minimum buffer map alignment: %d.\n", gl_max); - } - else - { - WARN_(d3d_perf)("Driver doesn't guarantee a minimum buffer map alignment.\n"); - } - if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GENERAL_COMBINERS_NV, &gl_max); - gl_info->limits.general_combiners = gl_max; - TRACE("Max general combiners: %d.\n", gl_max); - } - if (gl_info->supported[ARB_DRAW_BUFFERS] && wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, &gl_max); - gl_info->limits.buffers = min(MAX_RENDER_TARGET_VIEWS, gl_max); - TRACE("Max draw buffers: %u.\n", gl_max); - } - if (gl_info->supported[ARB_MULTITEXTURE]) - { - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); - gl_info->limits.textures = min(MAX_TEXTURES, gl_max); - TRACE("Max textures: %d.\n", gl_info->limits.textures); - - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - } - else - { - gl_info->limits.texture_coords = gl_info->limits.textures; - } - TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); - } - - if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &gl_max); - gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = gl_max; - } - else - { - gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = gl_info->limits.textures; - } - TRACE("Max fragment samplers: %d.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL]); - - if (gl_info->supported[ARB_VERTEX_SHADER]) - { - unsigned int vertex_sampler_count; - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); - vertex_sampler_count = gl_info->limits.samplers[WINED3D_SHADER_TYPE_VERTEX] = gl_max; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &gl_max); - gl_info->limits.combined_samplers = gl_max; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &gl_max); - gl_info->limits.vertex_attribs = gl_max; - - /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup - * is known at shader link time. In a vertex shader + pixel shader combination this isn't - * an issue because then the sampler setup only depends on the two shaders. If a pixel - * shader is used with fixed function vertex processing we're fine too because fixed function - * vertex processing doesn't use any samplers. If fixed function fragment processing is - * used we have to make sure that all vertex sampler setups are valid together with all - * possible fixed function fragment processing setups. This is true if vsamplers + MAX_TEXTURES - * <= max_samplers. This is true on all d3d9 cards that support vtf(gf 6 and gf7 cards). - * dx9 radeon cards do not support vertex texture fetch. DX10 cards have 128 samplers, and - * dx9 is limited to 8 fixed function texture stages and 4 vertex samplers. DX10 does not have - * a fixed function pipeline anymore. - * - * So this is just a check to check that our assumption holds true. If not, write a warning - * and reduce the number of vertex samplers or probably disable vertex texture fetch. */ - if (vertex_sampler_count && gl_info->limits.combined_samplers < 12 - && MAX_TEXTURES + vertex_sampler_count > gl_info->limits.combined_samplers) - { - FIXME("OpenGL implementation supports %u vertex samplers and %u total samplers.\n", - vertex_sampler_count, gl_info->limits.combined_samplers); - FIXME("Expected vertex samplers + MAX_TEXTURES(=8) > combined_samplers.\n"); - if (gl_info->limits.combined_samplers > MAX_TEXTURES) - vertex_sampler_count = gl_info->limits.combined_samplers - MAX_TEXTURES; - else - vertex_sampler_count = 0; - gl_info->limits.samplers[WINED3D_SHADER_TYPE_VERTEX] = vertex_sampler_count; - } - } - else - { - gl_info->limits.combined_samplers = gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL]; - } - TRACE("Max vertex samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_VERTEX]); - TRACE("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); - TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); - } - else + static const enum wined3d_pci_device card_fallback_nvidia[] = { - gl_info->limits.textures = 1; - gl_info->limits.texture_coords = 1; - } - - if (gl_info->supported[EXT_TEXTURE3D]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_3D_TEXTURE_SIZE_EXT, &gl_max); - gl_info->limits.texture3d_size = gl_max; - TRACE("Max texture3D size: %d.\n", gl_info->limits.texture3d_size); - } - if (gl_info->supported[ARB_TEXTURE_FILTER_ANISOTROPIC]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY, &gl_max); - gl_info->limits.anisotropy = gl_max; - TRACE("Max anisotropy: %d.\n", gl_info->limits.anisotropy); - } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) - { - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); - gl_info->limits.arb_ps_float_constants = gl_max; - TRACE("Max ARB_FRAGMENT_PROGRAM float constants: %d.\n", gl_info->limits.arb_ps_float_constants); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max)); - gl_info->limits.arb_ps_native_constants = gl_max; - TRACE("Max ARB_FRAGMENT_PROGRAM native float constants: %d.\n", - gl_info->limits.arb_ps_native_constants); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); - gl_info->limits.arb_ps_temps = gl_max; - TRACE("Max ARB_FRAGMENT_PROGRAM native temporaries: %d.\n", gl_info->limits.arb_ps_temps); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &gl_max)); - gl_info->limits.arb_ps_instructions = gl_max; - TRACE("Max ARB_FRAGMENT_PROGRAM native instructions: %d.\n", gl_info->limits.arb_ps_instructions); - GL_EXTCALL(glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &gl_max)); - gl_info->limits.arb_ps_local_constants = gl_max; - TRACE("Max ARB_FRAGMENT_PROGRAM local parameters: %d.\n", gl_info->limits.arb_ps_instructions); - } - if (gl_info->supported[ARB_VERTEX_PROGRAM]) - { - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &gl_max)); - gl_info->limits.arb_vs_float_constants = gl_max; - TRACE("Max ARB_VERTEX_PROGRAM float constants: %d.\n", gl_info->limits.arb_vs_float_constants); - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB, &gl_max)); - gl_info->limits.arb_vs_native_constants = gl_max; - TRACE("Max ARB_VERTEX_PROGRAM native float constants: %d.\n", - gl_info->limits.arb_vs_native_constants); - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB, &gl_max)); - gl_info->limits.arb_vs_temps = gl_max; - TRACE("Max ARB_VERTEX_PROGRAM native temporaries: %d.\n", gl_info->limits.arb_vs_temps); - GL_EXTCALL(glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &gl_max)); - gl_info->limits.arb_vs_instructions = gl_max; - TRACE("Max ARB_VERTEX_PROGRAM native instructions: %d.\n", gl_info->limits.arb_vs_instructions); - } - if (gl_info->supported[ARB_VERTEX_SHADER]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &gl_max); - gl_info->limits.glsl_vs_float_constants = gl_max / 4; - TRACE("Max ARB_VERTEX_SHADER float constants: %u.\n", gl_info->limits.glsl_vs_float_constants); - - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max vertex uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX], gl_max); - } - } - if (gl_info->supported[ARB_TESSELLATION_SHADER]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_HULL] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max hull uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_HULL], gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS, &gl_max); - gl_info->limits.samplers[WINED3D_SHADER_TYPE_HULL] = gl_max; - TRACE("Max hull samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_HULL]); - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_DOMAIN] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max domain uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_DOMAIN], gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS, &gl_max); - gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN] = gl_max; - TRACE("Max domain samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN]); - } - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max geometry uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY], gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, &gl_max); - gl_info->limits.samplers[WINED3D_SHADER_TYPE_GEOMETRY] = gl_max; - TRACE("Max geometry samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_GEOMETRY]); - } - if (gl_info->supported[ARB_FRAGMENT_SHADER]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &gl_max); - gl_info->limits.glsl_ps_float_constants = gl_max / 4; - TRACE("Max ARB_FRAGMENT_SHADER float constants: %u.\n", gl_info->limits.glsl_ps_float_constants); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VARYING_FLOATS_ARB, &gl_max); - gl_info->limits.glsl_varyings = gl_max; - TRACE("Max GLSL varyings: %u (%u 4 component varyings).\n", gl_max, gl_max / 4); - - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max fragment uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL], gl_max); - } - } - if (gl_info->supported[ARB_COMPUTE_SHADER]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_UNIFORM_BLOCKS, &gl_max); - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE] = min(gl_max, WINED3D_MAX_CBS); - TRACE("Max compute uniform blocks: %u (%d).\n", - gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE], gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, &gl_max); - gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE] = gl_max; - TRACE("Max compute samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE]); - } - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS, &gl_max); - TRACE("Max combined uniform blocks: %d.\n", gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS, &gl_max); - TRACE("Max uniform buffer bindings: %d.\n", gl_max); - } - if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT, &gl_max); - gl_info->limits.texture_buffer_offset_alignment = gl_max; - TRACE("Minimum required texture buffer offset alignment %d.\n", gl_max); - } - if (gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS]) - { - GLint max_fragment_buffers, max_combined_buffers, max_bindings; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS, &max_fragment_buffers); - TRACE("Max fragment atomic counter buffers: %d.\n", max_fragment_buffers); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS, &max_combined_buffers); - TRACE("Max combined atomic counter buffers: %d.\n", max_combined_buffers); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS, &max_bindings); - TRACE("Max atomic counter buffer bindings: %d.\n", max_bindings); - if (max_fragment_buffers < MAX_UNORDERED_ACCESS_VIEWS - || max_combined_buffers < MAX_UNORDERED_ACCESS_VIEWS - || max_bindings < MAX_UNORDERED_ACCESS_VIEWS) - { - WARN("Disabling ARB_shader_atomic_counters.\n"); - gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS] = FALSE; - } - } - if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_STREAMS, &gl_max); - TRACE("Max vertex streams: %d.\n", gl_max); - } - - if (gl_info->supported[NV_LIGHT_MAX_EXPONENT]) - gl_info->gl_ops.gl.p_glGetFloatv(GL_MAX_SHININESS_NV, &gl_info->limits.shininess); - else - gl_info->limits.shininess = 128.0f; - - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_SAMPLES, &gl_max); - gl_info->limits.samples = gl_max; - } - - if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_WIDTH, &gl_max); - gl_info->limits.framebuffer_width = gl_max; - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_FRAMEBUFFER_HEIGHT, &gl_max); - gl_info->limits.framebuffer_height = gl_max; - } - else - { - gl_info->limits.framebuffer_width = gl_info->limits.texture_size; - gl_info->limits.framebuffer_height = gl_info->limits.texture_size; - } - - gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = - min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], MAX_GL_FRAGMENT_SAMPLERS); - sampler_count = 0; - for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - sampler_count += gl_info->limits.samplers[i]; - if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->limits.combined_samplers < sampler_count) - { - /* The minimum value for GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS in OpenGL - * 3.2 is 48 (16 per stage). When tessellation shaders are supported - * the minimum value is increased to 80. */ - WARN("Graphics pipeline sampler count %u is greater than combined sampler count %u.\n", - sampler_count, gl_info->limits.combined_samplers); - for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - gl_info->limits.samplers[i] = min(gl_info->limits.samplers[i], 16); - } - - /* A majority of OpenGL implementations allow us to statically partition - * the set of texture bindings into six separate sets. */ - gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; - sampler_count = 0; - for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) - sampler_count += gl_info->limits.samplers[i]; - if (gl_info->limits.combined_samplers >= sampler_count) - gl_info->limits.graphics_samplers -= gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE]; -} + CARD_NVIDIA_RIVA_128, /* D3D5 */ + CARD_NVIDIA_RIVA_TNT, /* D3D6 */ + CARD_NVIDIA_GEFORCE, /* D3D7 */ + CARD_NVIDIA_GEFORCE3, /* D3D8 */ + CARD_NVIDIA_GEFORCEFX_5800, /* D3D9_SM2 */ + CARD_NVIDIA_GEFORCE_6800, /* D3D9_SM3 */ + CARD_NVIDIA_GEFORCE_8800GTX, /* D3D10 */ + CARD_NVIDIA_GEFORCE_GTX470, /* D3D11 */ + }, + card_fallback_amd[] = + { + CARD_AMD_RAGE_128PRO, /* D3D5 */ + CARD_AMD_RAGE_128PRO, /* D3D6 */ + CARD_AMD_RADEON_7200, /* D3D7 */ + CARD_AMD_RADEON_8500, /* D3D8 */ + CARD_AMD_RADEON_9500, /* D3D9_SM2 */ + CARD_AMD_RADEON_X1600, /* D3D9_SM3 */ + CARD_AMD_RADEON_HD2900, /* D3D10 */ + CARD_AMD_RADEON_HD5600, /* D3D11 */ + }, + card_fallback_intel[] = + { + CARD_INTEL_845G, /* D3D5 */ + CARD_INTEL_845G, /* D3D6 */ + CARD_INTEL_845G, /* D3D7 */ + CARD_INTEL_915G, /* D3D8 */ + CARD_INTEL_915G, /* D3D9_SM2 */ + CARD_INTEL_945G, /* D3D9_SM3 */ + CARD_INTEL_G45, /* D3D10 */ + CARD_INTEL_IVBD, /* D3D11 */ + }; + C_ASSERT(ARRAY_SIZE(card_fallback_nvidia) == WINED3D_FEATURE_LEVEL_COUNT); + C_ASSERT(ARRAY_SIZE(card_fallback_amd) == WINED3D_FEATURE_LEVEL_COUNT); + C_ASSERT(ARRAY_SIZE(card_fallback_intel) == WINED3D_FEATURE_LEVEL_COUNT); -/* Context activation is done by the caller. */ -static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, - struct wined3d_caps_gl_ctx *caps_gl_ctx, DWORD wined3d_creation_flags) -{ static const struct { - enum wined3d_gl_extension extension; - DWORD min_gl_version; + enum wined3d_pci_vendor vendor; + const enum wined3d_pci_device *device; } - core_extensions[] = + fallbacks[] = { - {EXT_TEXTURE3D, MAKEDWORD_VERSION(1, 2)}, - {ARB_MULTISAMPLE, MAKEDWORD_VERSION(1, 3)}, - {ARB_MULTITEXTURE, MAKEDWORD_VERSION(1, 3)}, - {ARB_TEXTURE_BORDER_CLAMP, MAKEDWORD_VERSION(1, 3)}, - {ARB_TEXTURE_COMPRESSION, MAKEDWORD_VERSION(1, 3)}, - {ARB_TEXTURE_CUBE_MAP, MAKEDWORD_VERSION(1, 3)}, - {ARB_DEPTH_TEXTURE, MAKEDWORD_VERSION(1, 4)}, - {ARB_POINT_PARAMETERS, MAKEDWORD_VERSION(1, 4)}, - {ARB_SHADOW, MAKEDWORD_VERSION(1, 4)}, - {ARB_TEXTURE_MIRRORED_REPEAT, MAKEDWORD_VERSION(1, 4)}, - {EXT_BLEND_COLOR, MAKEDWORD_VERSION(1, 4)}, - {EXT_BLEND_FUNC_SEPARATE, MAKEDWORD_VERSION(1, 4)}, - {EXT_BLEND_MINMAX, MAKEDWORD_VERSION(1, 4)}, - {EXT_BLEND_SUBTRACT, MAKEDWORD_VERSION(1, 4)}, - {EXT_STENCIL_WRAP, MAKEDWORD_VERSION(1, 4)}, - {NV_POINT_SPRITE, MAKEDWORD_VERSION(1, 4)}, - {ARB_OCCLUSION_QUERY, MAKEDWORD_VERSION(1, 5)}, - {ARB_VERTEX_BUFFER_OBJECT, MAKEDWORD_VERSION(1, 5)}, - {ARB_DRAW_BUFFERS, MAKEDWORD_VERSION(2, 0)}, - {ARB_FRAGMENT_SHADER, MAKEDWORD_VERSION(2, 0)}, - {ARB_SHADING_LANGUAGE_100, MAKEDWORD_VERSION(2, 0)}, - {ARB_TEXTURE_NON_POWER_OF_TWO, MAKEDWORD_VERSION(2, 0)}, - {ARB_VERTEX_SHADER, MAKEDWORD_VERSION(2, 0)}, - {EXT_BLEND_EQUATION_SEPARATE, MAKEDWORD_VERSION(2, 0)}, - {ARB_PIXEL_BUFFER_OBJECT, MAKEDWORD_VERSION(2, 1)}, - {EXT_TEXTURE_SRGB, MAKEDWORD_VERSION(2, 1)}, - {ARB_COLOR_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, - {ARB_DEPTH_BUFFER_FLOAT, MAKEDWORD_VERSION(3, 0)}, - {ARB_FRAMEBUFFER_OBJECT, MAKEDWORD_VERSION(3, 0)}, - {ARB_FRAMEBUFFER_SRGB, MAKEDWORD_VERSION(3, 0)}, - {ARB_HALF_FLOAT_PIXEL, MAKEDWORD_VERSION(3, 0)}, - {ARB_HALF_FLOAT_VERTEX, MAKEDWORD_VERSION(3, 0)}, - {ARB_MAP_BUFFER_RANGE, MAKEDWORD_VERSION(3, 0)}, - {ARB_TEXTURE_COMPRESSION_RGTC, MAKEDWORD_VERSION(3, 0)}, - {ARB_TEXTURE_FLOAT, MAKEDWORD_VERSION(3, 0)}, - {ARB_TEXTURE_RG, MAKEDWORD_VERSION(3, 0)}, - {EXT_DRAW_BUFFERS2, MAKEDWORD_VERSION(3, 0)}, - {EXT_PACKED_FLOAT, MAKEDWORD_VERSION(3, 0)}, - {EXT_TEXTURE_ARRAY, MAKEDWORD_VERSION(3, 0)}, - {EXT_TEXTURE_INTEGER, MAKEDWORD_VERSION(3, 0)}, - {EXT_TEXTURE_SHARED_EXPONENT, MAKEDWORD_VERSION(3, 0)}, - /* We don't want to enable EXT_GPU_SHADER4: even though similar - * functionality is available in core GL 3.0 / GLSL 1.30, it's different - * enough that reusing the same flag for the new features hurts more - * than it helps. */ - /* EXT_framebuffer_object, EXT_framebuffer_blit, - * EXT_framebuffer_multisample and EXT_packed_depth_stencil - * are integrated into ARB_framebuffer_object. */ - - {ARB_COPY_BUFFER, MAKEDWORD_VERSION(3, 1)}, - {ARB_DRAW_INSTANCED, MAKEDWORD_VERSION(3, 1)}, - {ARB_TEXTURE_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, - {ARB_UNIFORM_BUFFER_OBJECT, MAKEDWORD_VERSION(3, 1)}, - {EXT_TEXTURE_SNORM, MAKEDWORD_VERSION(3, 1)}, - /* We don't need or want GL_ARB_texture_rectangle (core in 3.1). */ - - {ARB_DEPTH_CLAMP, MAKEDWORD_VERSION(3, 2)}, - {ARB_DRAW_ELEMENTS_BASE_VERTEX, MAKEDWORD_VERSION(3, 2)}, - /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 - * core geometry shaders so it's not really correct to expose the - * extension for core-only support. */ - {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, - {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, - {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, - {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, - {ARB_TEXTURE_MULTISAMPLE, MAKEDWORD_VERSION(3, 2)}, - {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, - - {ARB_BLEND_FUNC_EXTENDED, MAKEDWORD_VERSION(3, 3)}, - {ARB_EXPLICIT_ATTRIB_LOCATION, MAKEDWORD_VERSION(3, 3)}, - {ARB_INSTANCED_ARRAYS, MAKEDWORD_VERSION(3, 3)}, - {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, - {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, - {ARB_TEXTURE_RGB10_A2UI, MAKEDWORD_VERSION(3, 3)}, - {ARB_TEXTURE_SWIZZLE, MAKEDWORD_VERSION(3, 3)}, - {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, - {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, - - {ARB_DRAW_INDIRECT, MAKEDWORD_VERSION(4, 0)}, - {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, - {ARB_SAMPLE_SHADING, MAKEDWORD_VERSION(4, 0)}, - {ARB_TESSELLATION_SHADER, MAKEDWORD_VERSION(4, 0)}, - {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, - {ARB_TEXTURE_GATHER, MAKEDWORD_VERSION(4, 0)}, - {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, - {ARB_TRANSFORM_FEEDBACK3, MAKEDWORD_VERSION(4, 0)}, - - {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, - {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, - - {ARB_BASE_INSTANCE, MAKEDWORD_VERSION(4, 2)}, - {ARB_CONSERVATIVE_DEPTH, MAKEDWORD_VERSION(4, 2)}, - {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, - {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, - {ARB_SHADER_ATOMIC_COUNTERS, MAKEDWORD_VERSION(4, 2)}, - {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, - {ARB_SHADING_LANGUAGE_420PACK, MAKEDWORD_VERSION(4, 2)}, - {ARB_SHADING_LANGUAGE_PACKING, MAKEDWORD_VERSION(4, 2)}, - {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, - {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, - - {ARB_CLEAR_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, - {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, - {ARB_COPY_IMAGE, MAKEDWORD_VERSION(4, 3)}, - {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, - {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, - {ARB_FRAGMENT_LAYER_VIEWPORT, MAKEDWORD_VERSION(4, 3)}, - {ARB_FRAMEBUFFER_NO_ATTACHMENTS, MAKEDWORD_VERSION(4, 3)}, - {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, - {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, - {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, - {ARB_STENCIL_TEXTURING, MAKEDWORD_VERSION(4, 3)}, - {ARB_TEXTURE_BUFFER_RANGE, MAKEDWORD_VERSION(4, 3)}, - {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, - {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, - {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, - - {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, - - {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, - {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, - {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, - {ARB_SHADER_TEXTURE_IMAGE_SAMPLES, MAKEDWORD_VERSION(4, 5)}, - - {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, - {ARB_TEXTURE_FILTER_ANISOTROPIC, MAKEDWORD_VERSION(4, 6)}, + {HW_VENDOR_AMD, card_fallback_amd}, + {HW_VENDOR_NVIDIA, card_fallback_nvidia}, + {HW_VENDOR_VMWARE, card_fallback_amd}, + {HW_VENDOR_INTEL, card_fallback_intel}, }; - struct wined3d_driver_info *driver_info = &adapter->driver_info; - const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; - struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; - struct wined3d_gl_info *gl_info = &adapter->gl_info; - const struct gpu_description *gpu_description; - struct wined3d_vertex_caps vertex_caps; - struct fragment_caps fragment_caps; - struct shader_caps shader_caps; - const char *WGL_Extensions = NULL; - enum wined3d_gl_vendor gl_vendor; - DWORD gl_version, gl_ext_emul_mask; - GLint context_profile = 0; - UINT64 vram_bytes = 0; - unsigned int i, j; - HDC hdc; - - TRACE("adapter %p.\n", adapter); - - gl_renderer_str = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); - TRACE("GL_RENDERER: %s.\n", debugstr_a(gl_renderer_str)); - if (!gl_renderer_str) - { - ERR("Received a NULL GL_RENDERER.\n"); - return FALSE; - } - - gl_vendor_str = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); - TRACE("GL_VENDOR: %s.\n", debugstr_a(gl_vendor_str)); - if (!gl_vendor_str) - { - ERR("Received a NULL GL_VENDOR.\n"); - return FALSE; - } - - /* Parse the GL_VERSION field into major and minor information */ - gl_version_str = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VERSION); - TRACE("GL_VERSION: %s.\n", debugstr_a(gl_version_str)); - if (!gl_version_str) - { - ERR("Received a NULL GL_VERSION.\n"); - return FALSE; - } - gl_version = wined3d_parse_gl_version(gl_version_str); - - load_gl_funcs(gl_info); - - memset(gl_info->supported, 0, sizeof(gl_info->supported)); - gl_info->supported[WINED3D_GL_EXT_NONE] = TRUE; - - if (gl_version >= MAKEDWORD_VERSION(3, 2)) - { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); - checkGLcall("Querying context profile"); - } - if (context_profile & GL_CONTEXT_CORE_PROFILE_BIT) - TRACE("Got a core profile context.\n"); - else - gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] = TRUE; - - TRACE("GL extensions reported:\n"); - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - const char *gl_extensions = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_EXTENSIONS); - - if (!gl_extensions) - { - ERR("Received a NULL GL_EXTENSIONS.\n"); - return FALSE; - } - parse_extension_string(gl_info, gl_extensions, gl_extension_map, ARRAY_SIZE(gl_extension_map)); - } - else - { - enumerate_gl_extensions(gl_info, gl_extension_map, ARRAY_SIZE(gl_extension_map)); - } - - hdc = wglGetCurrentDC(); - /* Not all GL drivers might offer WGL extensions e.g. VirtualBox. */ - if (GL_EXTCALL(wglGetExtensionsStringARB)) - WGL_Extensions = (const char *)GL_EXTCALL(wglGetExtensionsStringARB(hdc)); - if (!WGL_Extensions) - WARN("WGL extensions not supported.\n"); - else - parse_extension_string(gl_info, WGL_Extensions, wgl_extension_map, ARRAY_SIZE(wgl_extension_map)); - for (i = 0; i < ARRAY_SIZE(core_extensions); ++i) + for (i = 0; i < ARRAY_SIZE(fallbacks); ++i) { - if (!gl_info->supported[core_extensions[i].extension] - && gl_version >= core_extensions[i].min_gl_version) - { - for (j = 0; j < ARRAY_SIZE(gl_extension_map); ++j) - if (gl_extension_map[j].extension == core_extensions[i].extension) - break; - - if (j < ARRAY_SIZE(gl_extension_map)) - { - TRACE("GL CORE: %s support.\n", gl_extension_map[j].extension_string); - gl_info->supported[core_extensions[i].extension] = TRUE; - } - else - { - FIXME("GL extension %u not in the GL extensions map.\n", core_extensions[i].extension); - } - } + if (*vendor == fallbacks[i].vendor) + return fallbacks[i].device[feature_level]; } - if (gl_info->supported[EXT_BLEND_MINMAX] || gl_info->supported[EXT_BLEND_SUBTRACT]) - gl_info->supported[WINED3D_GL_BLEND_EQUATION] = TRUE; - - if (gl_version >= MAKEDWORD_VERSION(2, 0)) - { - gl_info->supported[WINED3D_GL_VERSION_2_0] = TRUE; - /* We want to use the core APIs for two-sided stencil in GL 2.0. */ - gl_info->supported[EXT_STENCIL_TWO_SIDE] = FALSE; - } - if (gl_version >= MAKEDWORD_VERSION(3, 2)) - gl_info->supported[WINED3D_GL_VERSION_3_2] = TRUE; + *vendor = HW_VENDOR_NVIDIA; - /* All the points are actually point sprites in core contexts, the APIs from - * ARB_point_sprite are not supported anymore. */ - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - gl_info->supported[ARB_POINT_SPRITE] = FALSE; - - if (gl_info->supported[APPLE_FENCE]) - { - /* GL_NV_fence and GL_APPLE_fence provide the same functionality basically. - * The apple extension interacts with some other apple exts. Disable the NV - * extension if the apple one is support to prevent confusion in other parts - * of the code. */ - gl_info->supported[NV_FENCE] = FALSE; - } - if (gl_info->supported[APPLE_FLOAT_PIXELS]) - { - /* GL_APPLE_float_pixels == GL_ARB_texture_float + GL_ARB_half_float_pixel - * - * The enums are the same: - * GL_RGBA16F_ARB = GL_RGBA_FLOAT16_APPLE = 0x881a - * GL_RGB16F_ARB = GL_RGB_FLOAT16_APPLE = 0x881b - * GL_RGBA32F_ARB = GL_RGBA_FLOAT32_APPLE = 0x8814 - * GL_RGB32F_ARB = GL_RGB_FLOAT32_APPLE = 0x8815 - * GL_HALF_FLOAT_ARB = GL_HALF_APPLE = 0x140b - */ - if (!gl_info->supported[ARB_TEXTURE_FLOAT]) - { - TRACE(" IMPLIED: GL_ARB_texture_float support (by GL_APPLE_float_pixels).\n"); - gl_info->supported[ARB_TEXTURE_FLOAT] = TRUE; - } - if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) - { - TRACE(" IMPLIED: GL_ARB_half_float_pixel support (by GL_APPLE_float_pixels).\n"); - gl_info->supported[ARB_HALF_FLOAT_PIXEL] = TRUE; - } - } - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - /* GL_ARB_map_buffer_range and GL_APPLE_flush_buffer_range provide the same - * functionality. Prefer the ARB extension */ - gl_info->supported[APPLE_FLUSH_BUFFER_RANGE] = FALSE; - } - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); - gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; - } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) - { - TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); - gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; - } - if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) - { - TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); - gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] = TRUE; - } - if (!gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) - { - TRACE(" IMPLIED: ARB_texture_compression_rgtc support (by EXT_texture_compression_rgtc).\n"); - gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = TRUE; - } - if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] && !gl_info->supported[ARB_TEXTURE_RG]) - { - TRACE("ARB_texture_rg not supported, disabling ARB_texture_compression_rgtc.\n"); - gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] = FALSE; - } - if (gl_info->supported[NV_TEXTURE_SHADER2]) - { - if (gl_info->supported[NV_REGISTER_COMBINERS]) - { - /* Also disable ATI_FRAGMENT_SHADER if register combiners and texture_shader2 - * are supported. The nv extensions provide the same functionality as the - * ATI one, and a bit more(signed pixelformats). */ - gl_info->supported[ATI_FRAGMENT_SHADER] = FALSE; - } - } - if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]) - { - /* If we have full NP2 texture support, disable - * GL_ARB_texture_rectangle because we will never use it. - * This saves a few redundant glDisable calls. */ - gl_info->supported[ARB_TEXTURE_RECTANGLE] = FALSE; - } - if (gl_info->supported[ATI_FRAGMENT_SHADER]) - { - /* Disable NV_register_combiners and fragment shader if this is supported. - * generally the NV extensions are preferred over the ATI ones, and this - * extension is disabled if register_combiners and texture_shader2 are both - * supported. So we reach this place only if we have incomplete NV dxlevel 8 - * fragment processing support. */ - gl_info->supported[NV_REGISTER_COMBINERS] = FALSE; - gl_info->supported[NV_REGISTER_COMBINERS2] = FALSE; - gl_info->supported[NV_TEXTURE_SHADER] = FALSE; - gl_info->supported[NV_TEXTURE_SHADER2] = FALSE; - } - if (gl_info->supported[NV_HALF_FLOAT]) - { - /* GL_ARB_half_float_vertex is a subset of GL_NV_half_float. */ - gl_info->supported[ARB_HALF_FLOAT_VERTEX] = TRUE; - } - if (gl_info->supported[ARB_FRAMEBUFFER_SRGB] && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode - * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode - * we never render to sRGB surfaces). */ - TRACE("EXT_texture_sRGB_decode is not supported, disabling ARB_framebuffer_sRGB.\n"); - gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; - } - if (gl_info->supported[ARB_OCCLUSION_QUERY]) - { - GLint counter_bits; - - GL_EXTCALL(glGetQueryiv(GL_SAMPLES_PASSED, GL_QUERY_COUNTER_BITS, &counter_bits)); - TRACE("Occlusion query counter has %d bits.\n", counter_bits); - if (!counter_bits) - gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; - } - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLint counter_bits; - - GL_EXTCALL(glGetQueryiv(GL_TIMESTAMP, GL_QUERY_COUNTER_BITS, &counter_bits)); - TRACE("Timestamp query counter has %d bits.\n", counter_bits); - if (!counter_bits) - gl_info->supported[ARB_TIMER_QUERY] = FALSE; - } - if (gl_version >= MAKEDWORD_VERSION(3, 0)) - { - GLint counter_bits; - - gl_info->supported[WINED3D_GL_PRIMITIVE_QUERY] = TRUE; - - GL_EXTCALL(glGetQueryiv(GL_PRIMITIVES_GENERATED, GL_QUERY_COUNTER_BITS, &counter_bits)); - TRACE("Primitives query counter has %d bits.\n", counter_bits); - if (!counter_bits) - gl_info->supported[WINED3D_GL_PRIMITIVE_QUERY] = FALSE; - - GL_EXTCALL(glGetQueryiv(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, GL_QUERY_COUNTER_BITS, &counter_bits)); - TRACE("Transform feedback primitives query counter has %d bits.\n", counter_bits); - if (!counter_bits) - gl_info->supported[WINED3D_GL_PRIMITIVE_QUERY] = FALSE; - } - if (gl_info->supported[ARB_VIEWPORT_ARRAY]) - { - GLint subpixel_bits; - - gl_info->gl_ops.gl.p_glGetIntegerv(GL_VIEWPORT_SUBPIXEL_BITS, &subpixel_bits); - TRACE("Viewport supports %d subpixel bits.\n", subpixel_bits); - if (subpixel_bits < 8 && gl_info->supported[ARB_CLIP_CONTROL]) - { - TRACE("Disabling ARB_clip_control because viewport subpixel bits < 8.\n"); - gl_info->supported[ARB_CLIP_CONTROL] = FALSE; - } - } - if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY]) - { - /* When using ARB_clip_control we need the float viewport parameters - * introduced by ARB_viewport_array to take care of the shifted pixel - * coordinates. */ - TRACE("Disabling ARB_clip_control because ARB_viewport_array is not supported.\n"); - gl_info->supported[ARB_CLIP_CONTROL] = FALSE; - } - if (gl_info->supported[ARB_STENCIL_TEXTURING] && !gl_info->supported[ARB_TEXTURE_SWIZZLE]) - { - /* The stencil value needs to be placed in the green channel. */ - TRACE("Disabling ARB_stencil_texturing because ARB_texture_swizzle is not supported.\n"); - gl_info->supported[ARB_STENCIL_TEXTURING] = FALSE; - } - if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) - { - TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] = TRUE; - } - if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) - { - TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); - gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; - } - if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) - { - /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ - ERR("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); - gl_info->supported[APPLE_YCBCR_422] = FALSE; - } - if (gl_info->supported[ARB_DRAW_INDIRECT] && !gl_info->supported[ARB_BASE_INSTANCE]) - { - /* If ARB_base_instance is not supported the baseInstance field - * in indirect draw parameters must be 0 or behavior is undefined. - */ - WARN("Disabling ARB_draw_indirect because ARB_base_instance is not supported.\n"); - gl_info->supported[ARB_DRAW_INDIRECT] = FALSE; - } - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !wined3d_settings.multisample_textures) - gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE] && !gl_info->supported[ARB_TEXTURE_STORAGE_MULTISAMPLE]) - { - WARN("Disabling ARB_texture_multisample because immutable storage is not supported.\n"); - gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; - } - - wined3d_adapter_init_limits(gl_info); - - if (gl_info->supported[ARB_VERTEX_PROGRAM] && test_arb_vs_offset_limit(gl_info)) - gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; - - if (gl_info->supported[ARB_SHADING_LANGUAGE_100]) - { - const char *str = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_SHADING_LANGUAGE_VERSION_ARB); - unsigned int major, minor; - - TRACE("GLSL version string: %s.\n", debugstr_a(str)); - - /* The format of the GLSL version string is "major.minor[.release] [vendor info]". */ - sscanf(str, "%u.%u", &major, &minor); - gl_info->glsl_version = MAKEDWORD_VERSION(major, minor); - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) - gl_info->supported[WINED3D_GLSL_130] = TRUE; - } - - checkGLcall("extension detection"); - - adapter->shader_backend = select_shader_backend(gl_info); - adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); - adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); - - adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); - d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; - d3d_info->limits.vs_version = shader_caps.vs_version; - d3d_info->limits.hs_version = shader_caps.hs_version; - d3d_info->limits.ds_version = shader_caps.ds_version; - d3d_info->limits.gs_version = shader_caps.gs_version; - d3d_info->limits.ps_version = shader_caps.ps_version; - d3d_info->limits.cs_version = shader_caps.cs_version; - d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; - d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; - d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->shader_double_precision = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION; - - adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); - d3d_info->xyzrhw = vertex_caps.xyzrhw; - d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; - d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; - d3d_info->limits.active_light_count = vertex_caps.max_active_lights; - d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; - - adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; - d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; - d3d_info->shader_color_key = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY; - d3d_info->wined3d_creation_flags = wined3d_creation_flags; - d3d_info->feature_level = feature_level_from_caps(gl_info, &shader_caps, &fragment_caps); - - TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); - - d3d_info->valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - d3d_info->valid_rt_mask |= (1u << i); - - if (!d3d_info->shader_color_key) - { - /* We do not want to deal with re-creating immutable texture storage for color keying emulation. */ - WARN("Disabling ARB_texture_storage because fragment pipe doesn't support color keying.\n"); - gl_info->supported[ARB_TEXTURE_STORAGE] = FALSE; - } - - if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) - { - gl_info->fbo_ops.glIsRenderbuffer = gl_info->gl_ops.ext.p_glIsRenderbuffer; - gl_info->fbo_ops.glBindRenderbuffer = gl_info->gl_ops.ext.p_glBindRenderbuffer; - gl_info->fbo_ops.glDeleteRenderbuffers = gl_info->gl_ops.ext.p_glDeleteRenderbuffers; - gl_info->fbo_ops.glGenRenderbuffers = gl_info->gl_ops.ext.p_glGenRenderbuffers; - gl_info->fbo_ops.glRenderbufferStorage = gl_info->gl_ops.ext.p_glRenderbufferStorage; - gl_info->fbo_ops.glRenderbufferStorageMultisample = gl_info->gl_ops.ext.p_glRenderbufferStorageMultisample; - gl_info->fbo_ops.glGetRenderbufferParameteriv = gl_info->gl_ops.ext.p_glGetRenderbufferParameteriv; - gl_info->fbo_ops.glIsFramebuffer = gl_info->gl_ops.ext.p_glIsFramebuffer; - gl_info->fbo_ops.glBindFramebuffer = gl_info->gl_ops.ext.p_glBindFramebuffer; - gl_info->fbo_ops.glDeleteFramebuffers = gl_info->gl_ops.ext.p_glDeleteFramebuffers; - gl_info->fbo_ops.glGenFramebuffers = gl_info->gl_ops.ext.p_glGenFramebuffers; - gl_info->fbo_ops.glCheckFramebufferStatus = gl_info->gl_ops.ext.p_glCheckFramebufferStatus; - gl_info->fbo_ops.glFramebufferTexture1D = gl_info->gl_ops.ext.p_glFramebufferTexture1D; - gl_info->fbo_ops.glFramebufferTexture2D = gl_info->gl_ops.ext.p_glFramebufferTexture2D; - gl_info->fbo_ops.glFramebufferTexture3D = gl_info->gl_ops.ext.p_glFramebufferTexture3D; - gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayer; - gl_info->fbo_ops.glFramebufferRenderbuffer = gl_info->gl_ops.ext.p_glFramebufferRenderbuffer; - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv - = gl_info->gl_ops.ext.p_glGetFramebufferAttachmentParameteriv; - gl_info->fbo_ops.glBlitFramebuffer = gl_info->gl_ops.ext.p_glBlitFramebuffer; - gl_info->fbo_ops.glGenerateMipmap = gl_info->gl_ops.ext.p_glGenerateMipmap; - gl_info->fbo_ops.glFramebufferTexture = gl_info->gl_ops.ext.p_glFramebufferTexture; - } - else - { - if (gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) - { - gl_info->fbo_ops.glIsRenderbuffer = gl_info->gl_ops.ext.p_glIsRenderbufferEXT; - gl_info->fbo_ops.glBindRenderbuffer = gl_info->gl_ops.ext.p_glBindRenderbufferEXT; - gl_info->fbo_ops.glDeleteRenderbuffers = gl_info->gl_ops.ext.p_glDeleteRenderbuffersEXT; - gl_info->fbo_ops.glGenRenderbuffers = gl_info->gl_ops.ext.p_glGenRenderbuffersEXT; - gl_info->fbo_ops.glRenderbufferStorage = gl_info->gl_ops.ext.p_glRenderbufferStorageEXT; - gl_info->fbo_ops.glGetRenderbufferParameteriv = gl_info->gl_ops.ext.p_glGetRenderbufferParameterivEXT; - gl_info->fbo_ops.glIsFramebuffer = gl_info->gl_ops.ext.p_glIsFramebufferEXT; - gl_info->fbo_ops.glBindFramebuffer = gl_info->gl_ops.ext.p_glBindFramebufferEXT; - gl_info->fbo_ops.glDeleteFramebuffers = gl_info->gl_ops.ext.p_glDeleteFramebuffersEXT; - gl_info->fbo_ops.glGenFramebuffers = gl_info->gl_ops.ext.p_glGenFramebuffersEXT; - gl_info->fbo_ops.glCheckFramebufferStatus = gl_info->gl_ops.ext.p_glCheckFramebufferStatusEXT; - gl_info->fbo_ops.glFramebufferTexture1D = gl_info->gl_ops.ext.p_glFramebufferTexture1DEXT; - gl_info->fbo_ops.glFramebufferTexture2D = gl_info->gl_ops.ext.p_glFramebufferTexture2DEXT; - gl_info->fbo_ops.glFramebufferTexture3D = gl_info->gl_ops.ext.p_glFramebufferTexture3DEXT; - gl_info->fbo_ops.glFramebufferRenderbuffer = gl_info->gl_ops.ext.p_glFramebufferRenderbufferEXT; - gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv - = gl_info->gl_ops.ext.p_glGetFramebufferAttachmentParameterivEXT; - gl_info->fbo_ops.glGenerateMipmap = gl_info->gl_ops.ext.p_glGenerateMipmapEXT; - } - else if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - WARN_(d3d_perf)("Framebuffer objects not supported, falling back to backbuffer offscreen rendering mode.\n"); - wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - } - - if (gl_info->supported[ARB_GEOMETRY_SHADER4]) - { - gl_info->fbo_ops.glFramebufferTexture = gl_info->gl_ops.ext.p_glFramebufferTextureARB; - gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayerARB; - } - if (gl_info->supported[EXT_FRAMEBUFFER_BLIT]) - { - gl_info->fbo_ops.glBlitFramebuffer = gl_info->gl_ops.ext.p_glBlitFramebufferEXT; - } - if (gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) - { - gl_info->fbo_ops.glRenderbufferStorageMultisample - = gl_info->gl_ops.ext.p_glRenderbufferStorageMultisampleEXT; - } - } - - gl_info->wrap_lookup[WINED3D_TADDRESS_WRAP - WINED3D_TADDRESS_WRAP] = GL_REPEAT; - gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - gl_info->wrap_lookup[WINED3D_TADDRESS_CLAMP - WINED3D_TADDRESS_WRAP] = GL_CLAMP_TO_EDGE; - gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; - - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - { - GLuint vao; - - GL_EXTCALL(glGenVertexArrays(1, &vao)); - GL_EXTCALL(glBindVertexArray(vao)); - checkGLcall("creating VAO"); - } - - gl_vendor = wined3d_guess_gl_vendor(gl_info, gl_vendor_str, gl_renderer_str, gl_version_str); - TRACE("Guessed GL vendor %#x.\n", gl_vendor); - - if (!(gpu_description = query_gpu_description(gl_info, &vram_bytes))) - { - enum wined3d_pci_vendor vendor; - enum wined3d_pci_device device; - - vendor = wined3d_guess_card_vendor(gl_vendor_str, gl_renderer_str); - TRACE("Guessed vendor PCI ID 0x%04x.\n", vendor); - - device = wined3d_guess_card(d3d_info->feature_level, gl_info->glsl_version, - gl_renderer_str, &gl_vendor, &vendor); - TRACE("Guessed device PCI ID 0x%04x.\n", device); - - if (!(gpu_description = get_gpu_description(vendor, device))) - { - ERR("Card %04x:%04x not found in driver DB.\n", vendor, device); - return FALSE; - } - } - fixup_extensions(gl_info, caps_gl_ctx, gl_renderer_str, gl_vendor, - gpu_description->vendor, gpu_description->card); - init_driver_info(driver_info, gpu_description, vram_bytes); - - gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) - | adapter->fragment_pipe->get_emul_mask(gl_info); - if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) - install_gl_compat_wrapper(gl_info, ARB_MULTITEXTURE); - if (gl_ext_emul_mask & GL_EXT_EMUL_EXT_FOG_COORD) - install_gl_compat_wrapper(gl_info, EXT_FOG_COORD); - - return TRUE; + return card_fallback_nvidia[feature_level]; } UINT CDECL wined3d_get_adapter_count(const struct wined3d *wined3d) @@ -6246,472 +2456,6 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e return WINED3D_OK; } -static void WINE_GLAPI invalid_func(const void *data) -{ - ERR("Invalid vertex attribute function called.\n"); - DebugBreak(); -} - -static void WINE_GLAPI invalid_texcoord_func(GLenum unit, const void *data) -{ - ERR("Invalid texcoord function called.\n"); - DebugBreak(); -} - -static void WINE_GLAPI invalid_generic_attrib_func(GLuint idx, const void *data) -{ - ERR("Invalid attribute function called.\n"); - DebugBreak(); -} - -/* Helper functions for providing vertex data to OpenGL. The arrays are - * initialised based on the extension detection and are used in - * draw_primitive_immediate_mode(). */ -static void WINE_GLAPI position_d3dcolor(const void *data) -{ - DWORD pos = *((const DWORD *)data); - - FIXME("Add a test for fixed function position from d3dcolor type.\n"); - context_get_current()->gl_info->gl_ops.gl.p_glVertex4s(D3DCOLOR_B_R(pos), - D3DCOLOR_B_G(pos), - D3DCOLOR_B_B(pos), - D3DCOLOR_B_A(pos)); -} - -static void WINE_GLAPI position_float4(const void *data) -{ - const GLfloat *pos = data; - - if (pos[3] != 0.0f && pos[3] != 1.0f) - { - float w = 1.0f / pos[3]; - - context_get_current()->gl_info->gl_ops.gl.p_glVertex4f(pos[0] * w, pos[1] * w, pos[2] * w, w); - } - else - { - context_get_current()->gl_info->gl_ops.gl.p_glVertex3fv(pos); - } -} - -static void WINE_GLAPI diffuse_d3dcolor(const void *data) -{ - DWORD diffuseColor = *((const DWORD *)data); - - context_get_current()->gl_info->gl_ops.gl.p_glColor4ub(D3DCOLOR_B_R(diffuseColor), - D3DCOLOR_B_G(diffuseColor), - D3DCOLOR_B_B(diffuseColor), - D3DCOLOR_B_A(diffuseColor)); -} - -static void WINE_GLAPI specular_d3dcolor(const void *data) -{ - DWORD specularColor = *((const DWORD *)data); - GLubyte d[] = - { - D3DCOLOR_B_R(specularColor), - D3DCOLOR_B_G(specularColor), - D3DCOLOR_B_B(specularColor) - }; - - context_get_current()->gl_info->gl_ops.ext.p_glSecondaryColor3ubvEXT(d); -} - -static void WINE_GLAPI warn_no_specular_func(const void *data) -{ - WARN("GL_EXT_secondary_color not supported.\n"); -} - -static void WINE_GLAPI generic_d3dcolor(GLuint idx, const void *data) -{ - DWORD color = *((const DWORD *)data); - - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nub(idx, - D3DCOLOR_B_R(color), D3DCOLOR_B_G(color), - D3DCOLOR_B_B(color), D3DCOLOR_B_A(color)); -} - -static void WINE_GLAPI generic_short2n(GLuint idx, const void *data) -{ - const GLshort s[] = {((const GLshort *)data)[0], ((const GLshort *)data)[1], 0, 1}; - - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nsv(idx, s); -} - -static void WINE_GLAPI generic_ushort2n(GLuint idx, const void *data) -{ - const GLushort s[] = {((const GLushort *)data)[0], ((const GLushort *)data)[1], 0, 1}; - - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4Nusv(idx, s); -} - -static void WINE_GLAPI generic_float16_2(GLuint idx, const void *data) -{ - float x = float_16_to_32(((const unsigned short *)data) + 0); - float y = float_16_to_32(((const unsigned short *)data) + 1); - - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib2f(idx, x, y); -} - -static void WINE_GLAPI generic_float16_4(GLuint idx, const void *data) -{ - float x = float_16_to_32(((const unsigned short *)data) + 0); - float y = float_16_to_32(((const unsigned short *)data) + 1); - float z = float_16_to_32(((const unsigned short *)data) + 2); - float w = float_16_to_32(((const unsigned short *)data) + 3); - - context_get_current()->gl_info->gl_ops.ext.p_glVertexAttrib4f(idx, x, y, z, w); -} - -static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; - struct wined3d_ffp_attrib_ops *ops = &d3d_info->ffp_attrib_ops; - unsigned int i; - - for (i = 0; i < WINED3D_FFP_EMIT_COUNT; ++i) - { - ops->position[i] = invalid_func; - ops->diffuse[i] = invalid_func; - ops->specular[i] = invalid_func; - ops->normal[i] = invalid_func; - ops->texcoord[i] = invalid_texcoord_func; - ops->generic[i] = invalid_generic_attrib_func; - } - - ops->position[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glVertex3fv; - if (!d3d_info->xyzrhw) - ops->position[WINED3D_FFP_EMIT_FLOAT4] = position_float4; - else - ops->position[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glVertex4fv; - ops->position[WINED3D_FFP_EMIT_D3DCOLOR] = position_d3dcolor; - ops->position[WINED3D_FFP_EMIT_SHORT4] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glVertex2sv; - - ops->diffuse[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glColor3fv; - ops->diffuse[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glColor4fv; - ops->diffuse[WINED3D_FFP_EMIT_D3DCOLOR] = diffuse_d3dcolor; - ops->diffuse[WINED3D_FFP_EMIT_UBYTE4N] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glColor4ubv; - ops->diffuse[WINED3D_FFP_EMIT_SHORT4N] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glColor4sv; - ops->diffuse[WINED3D_FFP_EMIT_USHORT4N] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glColor4usv; - - /* No 4 component entry points here. */ - if (gl_info->supported[EXT_SECONDARY_COLOR]) - ops->specular[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_ffp_attrib_func)GL_EXTCALL(glSecondaryColor3fvEXT); - else - ops->specular[WINED3D_FFP_EMIT_FLOAT3] = warn_no_specular_func; - if (gl_info->supported[EXT_SECONDARY_COLOR]) - ops->specular[WINED3D_FFP_EMIT_D3DCOLOR] = specular_d3dcolor; - else - ops->specular[WINED3D_FFP_EMIT_D3DCOLOR] = warn_no_specular_func; - - /* Only 3 component entry points here. Test how others behave. Float4 - * normals are used by one of our tests, trying to pass it to the pixel - * shader, which fails on Windows. */ - ops->normal[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glNormal3fv; - /* Just ignore the 4th value. */ - ops->normal[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_ffp_attrib_func)gl_info->gl_ops.gl.p_glNormal3fv; - - ops->texcoord[WINED3D_FFP_EMIT_FLOAT1] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord1fvARB; - ops->texcoord[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord2fvARB; - ops->texcoord[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord3fvARB; - ops->texcoord[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord4fvARB; - ops->texcoord[WINED3D_FFP_EMIT_SHORT2] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord2svARB; - ops->texcoord[WINED3D_FFP_EMIT_SHORT4] = (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord4svARB; - if (gl_info->supported[NV_HALF_FLOAT]) - { - /* Not supported by ARB_HALF_FLOAT_VERTEX, so check for NV_HALF_FLOAT. */ - ops->texcoord[WINED3D_FFP_EMIT_FLOAT16_2] = - (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord2hvNV; - ops->texcoord[WINED3D_FFP_EMIT_FLOAT16_4] = - (wined3d_ffp_texcoord_func)gl_info->gl_ops.ext.p_glMultiTexCoord4hvNV; - } - - ops->generic[WINED3D_FFP_EMIT_FLOAT1] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib1fv; - ops->generic[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2fv; - ops->generic[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib3fv; - ops->generic[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4fv; - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = generic_d3dcolor; - else - ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = - (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4Nubv; - ops->generic[WINED3D_FFP_EMIT_UBYTE4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4ubv; - ops->generic[WINED3D_FFP_EMIT_SHORT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2sv; - ops->generic[WINED3D_FFP_EMIT_SHORT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4sv; - ops->generic[WINED3D_FFP_EMIT_UBYTE4N] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4Nubv; - ops->generic[WINED3D_FFP_EMIT_SHORT2N] = generic_short2n; - ops->generic[WINED3D_FFP_EMIT_SHORT4N] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4Nsv; - ops->generic[WINED3D_FFP_EMIT_USHORT2N] = generic_ushort2n; - ops->generic[WINED3D_FFP_EMIT_USHORT4N] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4Nusv; - if (gl_info->supported[NV_HALF_FLOAT] && gl_info->supported[NV_VERTEX_PROGRAM]) - { - ops->generic[WINED3D_FFP_EMIT_FLOAT16_2] = - (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2hvNV; - ops->generic[WINED3D_FFP_EMIT_FLOAT16_4] = - (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4hvNV; - } - else - { - ops->generic[WINED3D_FFP_EMIT_FLOAT16_2] = generic_float16_2; - ops->generic[WINED3D_FFP_EMIT_FLOAT16_4] = generic_float16_4; - } -} - -static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc) -{ - const struct wined3d_gl_info *gl_info = &adapter->gl_info; - int i; - - if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) - { - UINT attrib_count = 0; - GLint cfg_count; - int attribs[11]; - int values[11]; - int attribute; - - attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; - GL_EXTCALL(wglGetPixelFormatAttribivARB(dc, 0, 0, 1, &attribute, &cfg_count)); - - adapter->cfgs = heap_calloc(cfg_count, sizeof(*adapter->cfgs)); - attribs[attrib_count++] = WGL_RED_BITS_ARB; - attribs[attrib_count++] = WGL_GREEN_BITS_ARB; - attribs[attrib_count++] = WGL_BLUE_BITS_ARB; - attribs[attrib_count++] = WGL_ALPHA_BITS_ARB; - attribs[attrib_count++] = WGL_COLOR_BITS_ARB; - attribs[attrib_count++] = WGL_DEPTH_BITS_ARB; - attribs[attrib_count++] = WGL_STENCIL_BITS_ARB; - attribs[attrib_count++] = WGL_DRAW_TO_WINDOW_ARB; - attribs[attrib_count++] = WGL_PIXEL_TYPE_ARB; - attribs[attrib_count++] = WGL_DOUBLE_BUFFER_ARB; - attribs[attrib_count++] = WGL_AUX_BUFFERS_ARB; - - for (i = 0, adapter->cfg_count = 0; i < cfg_count; ++i) - { - struct wined3d_pixel_format *cfg = &adapter->cfgs[adapter->cfg_count]; - int format_id = i + 1; - - if (!GL_EXTCALL(wglGetPixelFormatAttribivARB(dc, format_id, 0, attrib_count, attribs, values))) - continue; - - cfg->iPixelFormat = format_id; - cfg->redSize = values[0]; - cfg->greenSize = values[1]; - cfg->blueSize = values[2]; - cfg->alphaSize = values[3]; - cfg->colorSize = values[4]; - cfg->depthSize = values[5]; - cfg->stencilSize = values[6]; - cfg->windowDrawable = values[7]; - cfg->iPixelType = values[8]; - cfg->doubleBuffer = values[9]; - cfg->auxBuffers = values[10]; - - cfg->numSamples = 0; - /* Check multisample support. */ - if (gl_info->supported[ARB_MULTISAMPLE]) - { - int attribs[2] = {WGL_SAMPLE_BUFFERS_ARB, WGL_SAMPLES_ARB}; - int values[2]; - - if (GL_EXTCALL(wglGetPixelFormatAttribivARB(dc, format_id, 0, 2, attribs, values))) - { - /* values[0] = WGL_SAMPLE_BUFFERS_ARB which tells whether - * multisampling is supported. values[1] = number of - * multisample buffers. */ - if (values[0]) - cfg->numSamples = values[1]; - } - } - - TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, " - "depth=%d, stencil=%d, samples=%d, windowDrawable=%d\n", - cfg->iPixelFormat, cfg->iPixelType, cfg->doubleBuffer, - cfg->redSize, cfg->greenSize, cfg->blueSize, cfg->alphaSize, - cfg->depthSize, cfg->stencilSize, cfg->numSamples, cfg->windowDrawable); - - ++adapter->cfg_count; - } - } - else - { - int cfg_count; - - cfg_count = DescribePixelFormat(dc, 0, 0, 0); - adapter->cfgs = heap_calloc(cfg_count, sizeof(*adapter->cfgs)); - - for (i = 0, adapter->cfg_count = 0; i < cfg_count; ++i) - { - struct wined3d_pixel_format *cfg = &adapter->cfgs[adapter->cfg_count]; - PIXELFORMATDESCRIPTOR pfd; - int format_id = i + 1; - - if (!DescribePixelFormat(dc, format_id, sizeof(pfd), &pfd)) - continue; - - /* We only want HW acceleration using an OpenGL ICD driver. - * PFD_GENERIC_FORMAT = slow opengl 1.1 gdi software rendering. - * PFD_GENERIC_ACCELERATED = partial hw acceleration using a MCD - * driver (e.g. 3dfx minigl). */ - if (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) - { - TRACE("Skipping format %d because it isn't ICD accelerated.\n", format_id); - continue; - } - - cfg->iPixelFormat = format_id; - cfg->redSize = pfd.cRedBits; - cfg->greenSize = pfd.cGreenBits; - cfg->blueSize = pfd.cBlueBits; - cfg->alphaSize = pfd.cAlphaBits; - cfg->colorSize = pfd.cColorBits; - cfg->depthSize = pfd.cDepthBits; - cfg->stencilSize = pfd.cStencilBits; - cfg->windowDrawable = (pfd.dwFlags & PFD_DRAW_TO_WINDOW) ? 1 : 0; - cfg->iPixelType = (pfd.iPixelType == PFD_TYPE_RGBA) ? WGL_TYPE_RGBA_ARB : WGL_TYPE_COLORINDEX_ARB; - cfg->doubleBuffer = (pfd.dwFlags & PFD_DOUBLEBUFFER) ? 1 : 0; - cfg->auxBuffers = pfd.cAuxBuffers; - cfg->numSamples = 0; - - TRACE("iPixelFormat=%d, iPixelType=%#x, doubleBuffer=%d, RGBA=%d/%d/%d/%d, " - "depth=%d, stencil=%d, windowDrawable=%d\n", - cfg->iPixelFormat, cfg->iPixelType, cfg->doubleBuffer, - cfg->redSize, cfg->greenSize, cfg->blueSize, cfg->alphaSize, - cfg->depthSize, cfg->stencilSize, cfg->windowDrawable); - - ++adapter->cfg_count; - } - } -} - -static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) -{ - const char *gl_vendor, *gl_renderer; - - if (wined3d_settings.explicit_gl_version) - return wined3d_settings.max_gl_version; - - gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); - gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); - if (!gl_vendor || !gl_renderer - || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) - return MAKEDWORD_VERSION(1, 0); - - return wined3d_settings.max_gl_version; -} - -static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) -{ - static const DWORD supported_gl_versions[] = - { - MAKEDWORD_VERSION(4, 4), - MAKEDWORD_VERSION(3, 2), - MAKEDWORD_VERSION(1, 0), - }; - struct wined3d_gl_info *gl_info = &adapter->gl_info; - struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - DWORD max_gl_version; - unsigned int i; - - TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); - -/* Dynamically load all GL core functions */ -#ifdef USE_WIN32_OPENGL - { - HMODULE mod_gl = GetModuleHandleA("opengl32.dll"); -#define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f); - ALL_WGL_FUNCS -#undef USE_GL_FUNC - gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); - gl_info->gl_ops.wgl.p_wglGetPixelFormat = (void *)GetProcAddress(mod_gl, "wglGetPixelFormat"); - } -#else - /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */ - { - HDC hdc = GetDC( 0 ); - const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); - ReleaseDC( 0, hdc ); - if (!wgl_driver || wgl_driver == (void *)-1) return FALSE; - gl_info->gl_ops.wgl = wgl_driver->wgl; - gl_info->gl_ops.gl = wgl_driver->gl; - } -#endif - - glEnableWINE = gl_info->gl_ops.gl.p_glEnable; - glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) - { - ERR("Failed to get a GL context for adapter %p.\n", adapter); - return FALSE; - } - - max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); - for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) - { - if (supported_gl_versions[i] <= max_gl_version) - break; - } - if (i == ARRAY_SIZE(supported_gl_versions)) - { - ERR_(winediag)("Requested invalid GL version %u.%u.\n", - max_gl_version >> 16, max_gl_version & 0xffff); - i = ARRAY_SIZE(supported_gl_versions) - 1; - } - - for (; i < ARRAY_SIZE(supported_gl_versions); ++i) - { - gl_info->selected_gl_version = supported_gl_versions[i]; - - if (wined3d_caps_gl_ctx_create_attribs(&caps_gl_ctx, gl_info)) - break; - - WARN("Couldn't create an OpenGL %u.%u context, trying fallback to a lower version.\n", - supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); - } - - if (!wined3d_adapter_init_gl_caps(adapter, &caps_gl_ctx, wined3d_creation_flags)) - { - ERR("Failed to initialize GL caps for adapter %p.\n", adapter); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - return FALSE; - } - - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - ERR_(winediag)("You are using the backbuffer for offscreen rendering. " - "This is unsupported, and will be removed in a future version.\n"); - - wined3d_adapter_init_fb_cfgs(adapter, caps_gl_ctx.dc); - /* We haven't found any suitable formats. This should only happen in - * case of GDI software rendering, which is pretty useless anyway. */ - if (!adapter->cfg_count) - { - WARN("No suitable pixel formats found.\n"); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - heap_free(adapter->cfgs); - return FALSE; - } - - if (!wined3d_adapter_init_format_info(adapter, &caps_gl_ctx)) - { - ERR("Failed to initialize GL format info.\n"); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - heap_free(adapter->cfgs); - return FALSE; - } - - adapter->vram_bytes = adapter->driver_info.vram_bytes; - adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - - wined3d_adapter_init_ffp_attrib_ops(adapter); - - return TRUE; -} - static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { TRACE("adapter %p.\n", adapter); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5187bcf7291..60369ccb51b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2601,6 +2601,44 @@ struct wined3d_gl_info unsigned int format_count; }; +/* The driver names reflect the lowest GPU supported + * by a certain driver, so DRIVER_AMD_R300 supports + * R3xx, R4xx and R5xx GPUs. */ +enum wined3d_display_driver +{ + DRIVER_AMD_RAGE_128PRO, + DRIVER_AMD_R100, + DRIVER_AMD_R300, + DRIVER_AMD_R600, + DRIVER_AMD_RX, + DRIVER_INTEL_GMA800, + DRIVER_INTEL_GMA900, + DRIVER_INTEL_GMA950, + DRIVER_INTEL_GMA3000, + DRIVER_INTEL_HD4000, + DRIVER_NVIDIA_TNT, + DRIVER_NVIDIA_GEFORCE2MX, + DRIVER_NVIDIA_GEFORCEFX, + DRIVER_NVIDIA_GEFORCE6, + DRIVER_NVIDIA_GEFORCE8, + DRIVER_VMWARE, + DRIVER_UNKNOWN, +}; + +struct wined3d_gpu_description +{ + enum wined3d_pci_vendor vendor; + enum wined3d_pci_device device; + const char *description; + enum wined3d_display_driver driver; + unsigned int vidmem; +}; + +const struct wined3d_gpu_description *wined3d_get_gpu_description(enum wined3d_pci_vendor vendor, + enum wined3d_pci_device device) DECLSPEC_HIDDEN; +enum wined3d_pci_device wined3d_gpu_from_feature_level(enum wined3d_pci_vendor *vendor, + enum wined3d_feature_level feature_level) DECLSPEC_HIDDEN; + struct wined3d_driver_info { enum wined3d_pci_vendor vendor; @@ -2612,6 +2650,9 @@ struct wined3d_driver_info DWORD version_low; }; +void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, + const struct wined3d_gpu_description *gpu_description, UINT64 vram_bytes) DECLSPEC_HIDDEN; + /* The adapter structure */ struct wined3d_adapter { @@ -2634,6 +2675,8 @@ struct wined3d_adapter const struct wined3d_shader_backend_ops *shader_backend; }; +BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) DECLSPEC_HIDDEN; + struct wined3d_caps_gl_ctx { HDC dc; -- 2.11.0

1 0

[PATCH vkd3d 9/9] vkd3d-shader: Strip debug info after generating all code.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d62d553ed1dd..d40350f18f4d 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6364,14 +6364,14 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) - vkd3d_spirv_stream_clear(&builder->debug_stream); - vkd3d_spirv_build_op_function_end(builder); if (compiler->output_setup_function_id) vkd3d_dxbc_compiler_emit_output_setup_function(compiler); + if (compiler->options & VKD3D_SHADER_STRIP_DEBUG) + vkd3d_spirv_stream_clear(&builder->debug_stream); + if (!vkd3d_spirv_compile_module(builder, spirv)) return VKD3D_ERROR; -- 2.16.4

2 1

[PATCH vkd3d 8/9] tests: Fix mixed enums.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7b0040730aa0..7d286614a2a0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16064,9 +16064,9 @@ static void test_resolve_query_data_in_different_command_list(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_EndQuery(command_list, query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -16076,7 +16076,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (i = 0; i < readback_buffer_capacity / 2; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, heap_desc.Type, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); } hr = ID3D12GraphicsCommandList_Close(command_list); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -16087,7 +16087,7 @@ static void test_resolve_query_data_in_different_command_list(void) for (; i < readback_buffer_capacity; ++i) { ID3D12GraphicsCommandList_ResolveQueryData(command_list, - query_heap, heap_desc.Type, 0, 1, readback_buffer, i * sizeof(UINT64)); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, i * sizeof(UINT64)); } get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); @@ -16142,7 +16142,7 @@ static void test_resolve_query_data_in_reordered_command_list(void) /* Read query results in the second command list. */ ID3D12GraphicsCommandList_ResolveQueryData(command_lists[1], - query_heap, heap_desc.Type, 0, 1, readback_buffer, 0); + query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0, 1, readback_buffer, 0); hr = ID3D12GraphicsCommandList_Close(command_lists[1]); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); @@ -16153,9 +16153,9 @@ static void test_resolve_query_data_in_reordered_command_list(void) ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_lists[0], D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D12GraphicsCommandList_RSSetViewports(command_lists[0], 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_lists[0], 1, &context.scissor_rect); - ID3D12GraphicsCommandList_BeginQuery(command_lists[0], query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_BeginQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); ID3D12GraphicsCommandList_DrawInstanced(command_lists[0], 3, 1, 0, 0); - ID3D12GraphicsCommandList_EndQuery(command_lists[0], query_heap, heap_desc.Type, 0); + ID3D12GraphicsCommandList_EndQuery(command_lists[0], query_heap, D3D12_QUERY_TYPE_OCCLUSION, 0); hr = ID3D12GraphicsCommandList_Close(command_lists[0]); ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); -- 2.16.4

2 1

[PATCH vkd3d 6/9] vkd3d: Add support for optional instance extensions.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 11 +++++ libs/vkd3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 109 insertions(+), 18 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index d089ada56b72..fcff16681fec 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -40,6 +40,8 @@ enum vkd3d_structure_type VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO, VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO, + VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -69,6 +71,15 @@ struct vkd3d_instance_create_info uint32_t instance_extension_count; }; +struct vkd3d_optional_instance_extensions_info +{ + enum vkd3d_structure_type type; + const void *next; + + const char * const *extensions; + uint32_t extension_count; +}; + struct vkd3d_device_create_info { enum vkd3d_structure_type type; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 47b56e5975fd..c11f474a28d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -20,6 +20,27 @@ #include <dlfcn.h> +struct vkd3d_struct +{ + enum vkd3d_structure_type type; + const void *next; +}; + +#define vkd3d_find_struct(c, t) vkd3d_find_struct_(c, VKD3D_STRUCTURE_TYPE_##t) +static const void *vkd3d_find_struct_(const struct vkd3d_struct *chain, + enum vkd3d_structure_type type) +{ + while (chain) + { + if (chain->type == type) + return chain; + + chain = chain->next; + } + + return NULL; +} + struct vkd3d_optional_extension_info { const char *extension_name; @@ -88,7 +109,8 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, const char * const *user_extensions, unsigned int user_extension_count, - struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) + const char * const *optional_user_extensions, unsigned int optional_user_extension_count, + bool *user_extension_supported, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) { unsigned int extension_count = 0; unsigned int i; @@ -123,6 +145,38 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio ++extension_count; } + assert(!optional_user_extension_count || user_extension_supported); + for (i = 0; i < optional_user_extension_count; ++i) + { + if (has_extension(extensions, count, optional_user_extensions[i], false)) + { + user_extension_supported[i] = true; + ++extension_count; + } + else + { + user_extension_supported[i] = false; + WARN("Optional user %s extension %s is not supported.\n", + extension_type, debugstr_a(optional_user_extensions[i])); + } + } + + return extension_count; +} + +static unsigned int vkd3d_append_extension(const char *extensions[], + unsigned int extension_count, const char *extension_name) +{ + unsigned int i; + + /* avoid duplicates */ + for (i = 0; i < extension_count; ++i) + { + if (!strcmp(extensions[i], extension_name)) + return extension_count; + } + + extensions[extension_count++] = extension_name; return extension_count; } @@ -130,10 +184,11 @@ static unsigned int vkd3d_enable_extensions(const char *extensions[], const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, const char * const *user_extensions, unsigned int user_extension_count, - const struct vkd3d_vulkan_info *vulkan_info) + const char * const *optional_user_extensions, unsigned int optional_user_extension_count, + bool *user_extension_supported, const struct vkd3d_vulkan_info *vulkan_info) { unsigned int extension_count = 0; - unsigned int i, j; + unsigned int i; for (i = 0; i < required_extension_count; ++i) { @@ -147,18 +202,17 @@ static unsigned int vkd3d_enable_extensions(const char *extensions[], if (*supported) extensions[extension_count++] = optional_extensions[i].extension_name; } + for (i = 0; i < user_extension_count; ++i) { - /* avoid duplicates */ - for (j = 0; j < extension_count; ++j) - { - if (!strcmp(extensions[j], user_extensions[i])) - break; - } - if (j != extension_count) + extension_count = vkd3d_append_extension(extensions, extension_count, user_extensions[i]); + } + assert(!optional_user_extension_count || user_extension_supported); + for (i = 0; i < optional_user_extension_count; ++i) + { + if (!user_extension_supported[i]) continue; - - extensions[extension_count++] = user_extensions[i]; + extension_count = vkd3d_append_extension(extensions, extension_count, optional_user_extensions[i]); } return extension_count; @@ -166,9 +220,10 @@ static unsigned int vkd3d_enable_extensions(const char *extensions[], static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info, - uint32_t *instance_extension_count) + uint32_t *instance_extension_count, bool **user_extension_supported) { const struct vkd3d_vk_global_procs *vk_procs = &instance->vk_global_procs; + const struct vkd3d_optional_instance_extensions_info *optional_extensions; struct vkd3d_vulkan_info *vulkan_info = &instance->vk_info; VkExtensionProperties *vk_extensions; uint32_t count; @@ -196,10 +251,26 @@ static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, return hresult_from_vk_result(vr); } + optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_INSTANCE_EXTENSIONS_INFO); + if (optional_extensions && optional_extensions->extension_count) + { + if (!(*user_extension_supported = vkd3d_calloc(optional_extensions->extension_count, sizeof(bool)))) + { + vkd3d_free(vk_extensions); + return E_OUTOFMEMORY; + } + } + else + { + *user_extension_supported = NULL; + } + *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, NULL, 0, optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), create_info->instance_extensions, create_info->instance_extension_count, - vulkan_info, "instance"); + optional_extensions ? optional_extensions->extensions : NULL, + optional_extensions ? optional_extensions->extension_count : 0, + *user_extension_supported, vulkan_info, "instance"); vkd3d_free(vk_extensions); return S_OK; @@ -276,6 +347,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; + const struct vkd3d_optional_instance_extensions_info *optional_extensions; + bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; uint32_t extension_count; @@ -313,7 +386,8 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return hr; } - if (FAILED(hr = vkd3d_init_instance_caps(instance, create_info, &extension_count))) + if (FAILED(hr = vkd3d_init_instance_caps(instance, create_info, + &extension_count, &user_extension_supported))) { if (instance->libvulkan) dlclose(instance->libvulkan); @@ -332,9 +406,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, { if (instance->libvulkan) dlclose(instance->libvulkan); + vkd3d_free(user_extension_supported); return E_OUTOFMEMORY; } + optional_extensions = vkd3d_find_struct(create_info->next, OPTIONAL_INSTANCE_EXTENSIONS_INFO); + instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pNext = NULL; instance_info.flags = 0; @@ -344,8 +421,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, NULL, 0, optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), create_info->instance_extensions, create_info->instance_extension_count, - &instance->vk_info); + optional_extensions ? optional_extensions->extensions : NULL, + optional_extensions ? optional_extensions->extension_count : 0, + user_extension_supported, &instance->vk_info); instance_info.ppEnabledExtensionNames = extensions; + vkd3d_free(user_extension_supported); vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance); vkd3d_free(extensions); @@ -805,7 +885,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), create_info->device_extensions, create_info->device_extension_count, - vulkan_info, "device"); + NULL, 0, NULL, vulkan_info, "device"); vkd3d_free(vk_extensions); return S_OK; @@ -1039,7 +1119,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), create_info->device_extensions, create_info->device_extension_count, - &device->vk_info); + NULL, 0, NULL, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; device_info.pEnabledFeatures = &device_features; -- 2.16.4

2 1

[PATCH vkd3d 4/9] tests: Do not require libxcb and libx11 headers.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/vkd3d_api.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index e2d9d014125a..2c022ba1d575 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -19,8 +19,6 @@ #define COBJMACROS #define INITGUID #define WIDL_C_INLINE_WRAPPERS -#define VK_USE_PLATFORM_XCB_KHR -#define VK_USE_PLATFORM_XLIB_KHR #include "vkd3d_test.h" #include <vkd3d.h> @@ -215,8 +213,8 @@ static void test_additional_instance_extensions(void) struct vulkan_extension extensions[] = { {VK_KHR_SURFACE_EXTENSION_NAME}, - {VK_KHR_XCB_SURFACE_EXTENSION_NAME}, - {VK_KHR_XLIB_SURFACE_EXTENSION_NAME}, + {"VK_KHR_xcb_surface"}, + {"VK_KHR_xlib_surface"}, }; const char *enabled_extensions[ARRAY_SIZE(extensions)]; @@ -249,12 +247,12 @@ static void test_additional_instance_extensions(void) if (!extensions[i].is_supported) continue; - if (!strcmp(extensions[i].name, VK_KHR_XCB_SURFACE_EXTENSION_NAME)) + if (!strcmp(extensions[i].name, "VK_KHR_xcb_surface")) { pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXcbSurfaceKHR"); ok(pfn, "Failed to get proc addr for vkCreateXcbSurfaceKHR.\n"); } - else if (!strcmp(extensions[i].name, VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) + else if (!strcmp(extensions[i].name, "VK_KHR_xlib_surface")) { pfn = vkGetInstanceProcAddr(vk_instance, "vkCreateXlibSurfaceKHR"); ok(pfn, "Failed to get proc addr for vkCreateXlibSurfaceKHR.\n"); -- 2.16.4

2 1

[PATCH vkd3d 2/9] build: Add a line about demos to the configure summary.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index 83b0b0d8fcec..8e201f43b744 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -113,6 +114,8 @@ AS_ECHO([" Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Building demos: ${enable_demos} + Building crosstests: ${HAVE_CROSSTEST}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) -- 2.16.4

3 2

[PATCH] msvcp60: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 17 Aug '18

17 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 518c8dab35..079c4fa054 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -2906,10 +2906,10 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); - for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) + for(mode_idx=0; mode_idx<ARRAY_SIZE(str_mode); mode_idx++) if(str_mode[mode_idx].mode == real_mode) break; - if(mode_idx == sizeof(str_mode)/sizeof(str_mode[0])) + if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) -- 2.14.4

2 1

[PATCH] msvc90: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 17 Aug '18

17 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/ios.c | 8 ++++---- dlls/msvcp90/locale.c | 4 ++-- dlls/msvcp90/misc.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 61acf19fa3..bf7eea2e6f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3237,10 +3237,10 @@ FILE* __cdecl _Fiopen_wchar(const wchar_t *name, int mode, int prot) TRACE("(%s %d %d)\n", debugstr_w(name), mode, prot); - for(mode_idx=0; mode_idx<sizeof(str_mode)/sizeof(str_mode[0]); mode_idx++) + for(mode_idx=0; mode_idx<ARRAY_SIZE(str_mode); mode_idx++) if(str_mode[mode_idx].mode == real_mode) break; - if(mode_idx == sizeof(str_mode)/sizeof(str_mode[0])) + if(mode_idx == ARRAY_SIZE(str_mode)) return NULL; if((mode & OPENMODE__Nocreate) && !(f = _wfopen(name, rW))) @@ -3469,7 +3469,7 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) return c; buf_next = buf; - for(i=0; i < sizeof(buf)/sizeof(buf[0]); i++) { + for(i=0; i < ARRAY_SIZE(buf); i++) { buf[i] = c; switch(codecvt_char_in(this->cvt, &this->state, buf_next, @@ -4112,7 +4112,7 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this) return fgetwc(this->file); buf_next = buf; - for(i=0; i < sizeof(buf)/sizeof(buf[0]); i++) { + for(i=0; i < ARRAY_SIZE(buf); i++) { if((c = fgetc(this->file)) == EOF) return WEOF; buf[i] = c; diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5398fcf345..83fa3de706 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -786,11 +786,11 @@ int __cdecl _Getdateorder(void) #if _MSVCP_VER < 110 if(!GetLocaleInfoW(___lc_handle_func()[LC_TIME], LOCALE_ILDATE, - date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + date_fmt, ARRAY_SIZE(date_fmt))) return DATEORDER_no_order; #else if(!GetLocaleInfoEx(___lc_locale_name_func()[LC_TIME], LOCALE_ILDATE, - date_fmt, sizeof(date_fmt)/sizeof(*date_fmt))) + date_fmt, ARRAY_SIZE(date_fmt))) return DATEORDER_no_order; #endif diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 58e546cdf3..0d1a74e250 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1781,7 +1781,7 @@ typedef struct __Concurrent_vector_base_v4 void **segment; } _Concurrent_vector_base_v4; -#define STORAGE_SIZE (sizeof(this->storage) / sizeof(this->storage[0])) +#define STORAGE_SIZE ARRAY_SIZE(this->storage) #define SEGMENT_SIZE (sizeof(void*) * 8) typedef struct compact_block -- 2.14.4

2 1

[PATCH] d2d1: Add ID2D1DeviceContext stub.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 576 ++++++++++++++++++++++++++++++--------- 2 files changed, 443 insertions(+), 135 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 925fcf48ce..5898302a90 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -119,7 +119,7 @@ struct d2d_ps_cb struct d2d_d3d_render_target { - ID2D1RenderTarget ID2D1RenderTarget_iface; + ID2D1DeviceContext ID2D1DeviceContext_iface; ID2D1GdiInteropRenderTarget ID2D1GdiInteropRenderTarget_iface; IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index cb7e8a540a..030889aa2d 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -193,22 +193,28 @@ static void d2d_rt_draw(struct d2d_d3d_render_target *render_target, enum d2d_sh WARN("Failed to apply stateblock, hr %#x.\n", hr); } +static inline struct d2d_d3d_render_target *impl_from_ID2D1DeviceContext(ID2D1DeviceContext *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, ID2D1DeviceContext_iface); +} + static inline struct d2d_d3d_render_target *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) { - return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, ID2D1RenderTarget_iface); + return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, ID2D1DeviceContext_iface); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_QueryInterface(ID2D1RenderTarget *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_QueryInterface(ID2D1DeviceContext *iface, REFIID iid, void **out) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1RenderTarget) + if (IsEqualGUID(iid, &IID_ID2D1DeviceContext) + || IsEqualGUID(iid, &IID_ID2D1RenderTarget) || IsEqualGUID(iid, &IID_ID2D1Resource) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1RenderTarget_AddRef(iface); + ID2D1DeviceContext_AddRef(iface); *out = iface; return S_OK; } @@ -225,9 +231,9 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_QueryInterface(ID2D1Rende return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_AddRef(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_AddRef(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ULONG refcount = InterlockedIncrement(&render_target->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -235,9 +241,9 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_AddRef(ID2D1RenderTarget *i return refcount; } -static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget *iface) +static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ULONG refcount = InterlockedDecrement(&render_target->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -270,9 +276,9 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * return refcount; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget *iface, ID2D1Factory **factory) +static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1DeviceContext *iface, ID2D1Factory **factory) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, factory %p.\n", iface, factory); @@ -280,10 +286,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget ID2D1Factory_AddRef(*factory); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; @@ -296,10 +302,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; @@ -313,27 +319,27 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1DeviceContext *iface, REFIID iid, void *data, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *object; HRESULT hr; TRACE("iface %p, iid %s, data %p, desc %p, bitmap %p.\n", iface, debugstr_guid(iid), data, desc, bitmap); - if (SUCCEEDED(hr = d2d_bitmap_create_shared(iface, render_target->device, iid, data, desc, &object))) + if (SUCCEEDED(hr = d2d_bitmap_create_shared((ID2D1RenderTarget *)iface, render_target->device, iid, data, desc, &object))) *bitmap = (ID2D1Bitmap *)&object->ID2D1Bitmap1_iface; return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -346,10 +352,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1DeviceContext *iface, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, ID2D1SolidColorBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -361,11 +367,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollection(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollection(ID2D1DeviceContext *iface, const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_GAMMA gamma, D2D1_EXTEND_MODE extend_mode, ID2D1GradientStopCollection **gradient) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_gradient *object; HRESULT hr; @@ -379,11 +385,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateGradientStopCollect return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush(ID2D1DeviceContext *iface, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1LinearGradientBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -397,11 +403,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLinearGradientBrush return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush(ID2D1DeviceContext *iface, const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, ID2D1RadialGradientBrush **brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *object; HRESULT hr; @@ -415,11 +421,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateRadialGradientBrush return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTarget(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTarget(ID2D1DeviceContext *iface, const D2D1_SIZE_F *size, const D2D1_SIZE_U *pixel_size, const D2D1_PIXEL_FORMAT *format, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, ID2D1BitmapRenderTarget **rt) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap_render_target *object; HRESULT hr; @@ -443,10 +449,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1DeviceContext *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_layer *object; HRESULT hr; @@ -458,9 +464,9 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa return hr; } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1DeviceContext *iface, ID2D1Mesh **mesh) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_mesh *object; HRESULT hr; @@ -472,10 +478,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar return hr; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1DeviceContext *iface, D2D1_POINT_2F p0, D2D1_POINT_2F p1, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1PathGeometry *geometry; ID2D1GeometrySink *sink; HRESULT hr; @@ -503,14 +509,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget * WARN("Close() failed, %#x.\n", hr); ID2D1GeometrySink_Release(sink); - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1PathGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1DeviceContext *iface, const D2D1_RECT_F *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RectangleGeometry *geometry; HRESULT hr; @@ -523,14 +529,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRectangle(ID2D1RenderTar return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1RectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1DeviceContext *iface, const D2D1_RECT_F *rect, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RectangleGeometry *geometry; HRESULT hr; @@ -542,14 +548,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1RectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1DeviceContext *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RoundedRectangleGeometry *geometry; HRESULT hr; @@ -562,14 +568,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawRoundedRectangle(ID2D1Re return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1RoundedRectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1DeviceContext *iface, const D2D1_ROUNDED_RECT *rect, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1RoundedRectangleGeometry *geometry; HRESULT hr; @@ -581,14 +587,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRoundedRectangle(ID2D1Re return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1RoundedRectangleGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1DeviceContext *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1EllipseGeometry *geometry; HRESULT hr; @@ -601,14 +607,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawEllipse(ID2D1RenderTarge return; } - ID2D1RenderTarget_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); + ID2D1DeviceContext_DrawGeometry(iface, (ID2D1Geometry *)geometry, brush, stroke_width, stroke_style); ID2D1EllipseGeometry_Release(geometry); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1DeviceContext *iface, const D2D1_ELLIPSE *ellipse, ID2D1Brush *brush) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); ID2D1EllipseGeometry *geometry; HRESULT hr; @@ -620,7 +626,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillEllipse(ID2D1RenderTarge return; } - ID2D1RenderTarget_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); + ID2D1DeviceContext_FillGeometry(iface, (ID2D1Geometry *)geometry, brush, NULL); ID2D1EllipseGeometry_Release(geometry); } @@ -755,11 +761,11 @@ done: ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1DeviceContext *iface, ID2D1Geometry *geometry, ID2D1Brush *brush, float stroke_width, ID2D1StrokeStyle *stroke_style) { const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); TRACE("iface %p, geometry %p, brush %p, stroke_width %.8e, stroke_style %p.\n", @@ -889,12 +895,12 @@ done: ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1DeviceContext *iface, ID2D1Geometry *geometry, ID2D1Brush *brush, ID2D1Brush *opacity_brush) { const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); struct d2d_brush *opacity_brush_impl = unsafe_impl_from_ID2D1Brush(opacity_brush); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); TRACE("iface %p, geometry %p, brush %p, opacity_brush %p.\n", iface, geometry, brush, opacity_brush); @@ -913,13 +919,13 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg d2d_rt_fill_geometry(render_target, geometry_impl, brush_impl, opacity_brush_impl); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillMesh(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillMesh(ID2D1DeviceContext *iface, ID2D1Mesh *mesh, ID2D1Brush *brush) { FIXME("iface %p, mesh %p, brush %p stub!\n", iface, mesh, brush); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_FillOpacityMask(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_FillOpacityMask(ID2D1DeviceContext *iface, ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { @@ -927,7 +933,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillOpacityMask(ID2D1RenderT iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { @@ -979,21 +985,21 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top)); brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22; - if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush((ID2D1RenderTarget *)iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) { ERR("Failed to create bitmap brush, hr %#x.\n", hr); return; } - ID2D1RenderTarget_FillRectangle(iface, &d, (ID2D1Brush *)brush); + ID2D1DeviceContext_FillRectangle(iface, &d, (ID2D1Brush *)brush); ID2D1BitmapBrush_Release(brush); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1DeviceContext *iface, const WCHAR *string, UINT32 string_len, IDWriteTextFormat *text_format, const D2D1_RECT_F *layout_rect, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); IDWriteTextLayout *text_layout; IDWriteFactory *dwrite_factory; D2D1_POINT_2F origin; @@ -1026,14 +1032,14 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * } d2d_point_set(&origin, layout_rect->left, layout_rect->top); - ID2D1RenderTarget_DrawTextLayout(iface, origin, text_layout, brush, options); + ID2D1DeviceContext_DrawTextLayout(iface, origin, text_layout, brush, options); IDWriteTextLayout_Release(text_layout); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1DeviceContext *iface, D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); struct d2d_draw_text_layout_ctx ctx; HRESULT hr; @@ -1196,7 +1202,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_desc.dpiX *= 3.0f; bitmap_desc.dpiY = render_target->desc.dpiY; - if (FAILED(hr = d2d_d3d_render_target_CreateBitmap(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = d2d_d3d_render_target_CreateBitmap(&render_target->ID2D1DeviceContext_iface, bitmap_size, opacity_values, bitmap_size.width, &bitmap_desc, &opacity_bitmap))) { ERR("Failed to create opacity bitmap, hr %#x.\n", hr); @@ -1213,7 +1219,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta brush_desc.transform._22 = 1.0f; brush_desc.transform._31 = run_rect.left; brush_desc.transform._32 = run_rect.top; - if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1DeviceContext_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { ERR("Failed to create opacity bitmap brush, hr %#x.\n", hr); @@ -1243,11 +1249,11 @@ done: IDWriteGlyphRunAnalysis_Release(analysis); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1DeviceContext *iface, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, DWRITE_MEASURING_MODE measuring_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); DWRITE_TEXT_ANTIALIAS_MODE antialias_mode = DWRITE_TEXT_ANTIALIAS_MODE_GRAYSCALE; IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; @@ -1325,68 +1331,68 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg rendering_mode, measuring_mode, antialias_mode); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1DeviceContext *iface, const D2D1_MATRIX_3X2_F *transform) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, transform %p.\n", iface, transform); render_target->drawing_state.transform = *transform; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTransform(ID2D1DeviceContext *iface, D2D1_MATRIX_3X2_F *transform) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, transform %p.\n", iface, transform); *transform = render_target->drawing_state.transform; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetAntialiasMode(ID2D1DeviceContext *iface, D2D1_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, antialias_mode %#x stub!\n", iface, antialias_mode); render_target->drawing_state.antialiasMode = antialias_mode; } -static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1RenderTarget *iface) +static D2D1_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetAntialiasMode(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); return render_target->drawing_state.antialiasMode; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextAntialiasMode(ID2D1DeviceContext *iface, D2D1_TEXT_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, antialias_mode %#x.\n", iface, antialias_mode); render_target->drawing_state.textAntialiasMode = antialias_mode; } -static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1RenderTarget *iface) +static D2D1_TEXT_ANTIALIAS_MODE STDMETHODCALLTYPE d2d_d3d_render_target_GetTextAntialiasMode(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); return render_target->drawing_state.textAntialiasMode; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1DeviceContext *iface, IDWriteRenderingParams *text_rendering_params) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); @@ -1397,10 +1403,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTextRenderingParams(ID2D1 render_target->text_rendering_params = text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1DeviceContext *iface, IDWriteRenderingParams **text_rendering_params) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); @@ -1408,9 +1414,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTextRenderingParams(ID2D1 IDWriteRenderingParams_AddRef(*text_rendering_params); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *iface, D2D1_TAG tag1, D2D1_TAG tag2) +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1DeviceContext *iface, D2D1_TAG tag1, D2D1_TAG tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %s, tag2 %s.\n", iface, wine_dbgstr_longlong(tag1), wine_dbgstr_longlong(tag2)); @@ -1418,9 +1424,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTags(ID2D1RenderTarget *i render_target->drawing_state.tag2 = tag2; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) +static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); @@ -1428,29 +1434,29 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetTags(ID2D1RenderTarget *i *tag2 = render_target->drawing_state.tag2; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_PushLayer(ID2D1DeviceContext *iface, const D2D1_LAYER_PARAMETERS *layer_parameters, ID2D1Layer *layer) { FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PopLayer(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_d3d_render_target_PopLayer(ID2D1DeviceContext *iface) { FIXME("iface %p stub!\n", iface); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_Flush(ID2D1RenderTarget *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_Flush(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { FIXME("iface %p, tag1 %p, tag2 %p stub!\n", iface, tag1, tag2); return E_NOTIMPL; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1DeviceContext *iface, ID2D1DrawingStateBlock *state_block) { struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, state_block %p.\n", iface, state_block); @@ -1462,11 +1468,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SaveDrawingState(ID2D1Render state_block_impl->text_rendering_params = render_target->text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1DeviceContext *iface, ID2D1DrawingStateBlock *state_block) { struct d2d_state_block *state_block_impl = unsafe_impl_from_ID2D1DrawingStateBlock(state_block); - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, state_block %p.\n", iface, state_block); @@ -1478,10 +1484,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_RestoreDrawingState(ID2D1Ren render_target->text_rendering_params = state_block_impl->text_rendering_params; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1RenderTarget *iface, +static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1DeviceContext *iface, const D2D1_RECT_F *clip_rect, D2D1_ANTIALIAS_MODE antialias_mode) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); D2D1_RECT_F transformed_rect; float x_scale, y_scale; D2D1_POINT_2F point; @@ -1510,18 +1516,18 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_PushAxisAlignedClip(ID2D1Ren WARN("Failed to push clip rect.\n"); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_d3d_render_target_PopAxisAlignedClip(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); d2d_clip_stack_pop(&render_target->clip_stack); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *iface, const D2D1_COLOR_F *colour) +static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1DeviceContext *iface, const D2D1_COLOR_F *colour) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); D3D10_SUBRESOURCE_DATA buffer_data; struct d2d_ps_cb ps_cb_data = {0}; D3D10_BUFFER_DESC buffer_desc; @@ -1596,19 +1602,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa ID3D10Buffer_Release(vs_cb); } -static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1RenderTarget *iface) +static void STDMETHODCALLTYPE d2d_d3d_render_target_BeginDraw(ID2D1DeviceContext *iface) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p.\n", iface); memset(&render_target->error, 0, sizeof(render_target->error)); } -static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget *iface, +static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1DeviceContext *iface, D2D1_TAG *tag1, D2D1_TAG *tag2) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, tag1 %p, tag2 %p.\n", iface, tag1, tag2); @@ -1620,10 +1626,10 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget return render_target->error.code; } -static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface, +static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1DeviceContext *iface, D2D1_PIXEL_FORMAT *format) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, format %p.\n", iface, format); @@ -1631,9 +1637,9 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelForma return format; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *iface, float dpi_x, float dpi_y) +static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1DeviceContext *iface, float dpi_x, float dpi_y) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, dpi_x %.8e, dpi_y %.8e.\n", iface, dpi_x, dpi_y); @@ -1649,9 +1655,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if render_target->desc.dpiY = dpi_y; } -static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1DeviceContext *iface, float *dpi_x, float *dpi_y) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -1659,9 +1665,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *if *dpi_y = render_target->desc.dpiY; } -static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface, D2D1_SIZE_F *size) +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1DeviceContext *iface, D2D1_SIZE_F *size) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, size %p.\n", iface, size); @@ -1670,10 +1676,10 @@ static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1Render return size; } -static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface, +static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1DeviceContext *iface, D2D1_SIZE_U *pixel_size) { - struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1DeviceContext(iface); TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); @@ -1681,14 +1687,14 @@ static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1R return pixel_size; } -static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) +static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1DeviceContext *iface) { FIXME("iface %p stub!\n", iface); return 0; } -static BOOL STDMETHODCALLTYPE d2d_d3d_render_target_IsSupported(ID2D1RenderTarget *iface, +static BOOL STDMETHODCALLTYPE d2d_d3d_render_target_IsSupported(ID2D1DeviceContext *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { FIXME("iface %p, desc %p stub!\n", iface, desc); @@ -1696,7 +1702,274 @@ static BOOL STDMETHODCALLTYPE d2d_d3d_render_target_IsSupported(ID2D1RenderTarge return FALSE; } -static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmap(ID2D1DeviceContext *iface, D2D1_SIZE_U size, + const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p stub!\n", iface, size.width, size.height, + src_data, pitch, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromWicBitmap(ID2D1DeviceContext *iface, + IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, bitmap_source %p, desc %p, bitmap %p stub!\n", iface, bitmap_source, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContext(ID2D1DeviceContext *iface, D2D1_COLOR_SPACE space, + const BYTE *profile, UINT32 profile_size, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, space %d, profile %p, profile_size %u, color_context %p stub!\n", iface, space, profile, + profile_size, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromFilename(ID2D1DeviceContext *iface, + const WCHAR *filename, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, filename %s, color_context %p stub!\n", iface, debugstr_w(filename), color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateColorContextFromWicColorContext(ID2D1DeviceContext *iface, + IWICColorContext *wic_color_context, ID2D1ColorContext **color_context) +{ + FIXME("iface %p, wic_color_context %p, color_context %p stub!\n", iface, wic_color_context, color_context); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface(ID2D1DeviceContext *iface, + IDXGISurface *surface, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) +{ + FIXME("iface %p, surface %p, desc %p, bitmap %p stub!\n", iface, surface, desc, bitmap); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateEffect(ID2D1DeviceContext *iface, REFCLSID effect_id, + ID2D1Effect **effect) +{ + FIXME("iface %p, effect_id %s, effect %p stub!\n", iface, debugstr_guid(effect_id), effect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateGradientStopCollection(ID2D1DeviceContext *iface, + const D2D1_GRADIENT_STOP *stops, UINT32 stop_count, D2D1_COLOR_SPACE preinterpolation_space, + D2D1_COLOR_SPACE postinterpolation_space, D2D1_BUFFER_PRECISION buffer_precision, D2D1_EXTEND_MODE extend_mode, + D2D1_COLOR_INTERPOLATION_MODE color_interpolation_mode, ID2D1GradientStopCollection1 **gradient) +{ + FIXME("iface %p, stops %p, stop_count %u, preinterpolation_space %d, postinterpolation_space %d, " + "buffer_precision %d, extend_mode %d, color_interpolation_mode %d, gradient %p stub!\n", iface, stops, + stop_count, preinterpolation_space, postinterpolation_space, buffer_precision, extend_mode, + color_interpolation_mode, gradient); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateImageBrush(ID2D1DeviceContext *iface, ID2D1Image *image, + const D2D1_IMAGE_BRUSH_PROPERTIES *image_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1ImageBrush **brush) +{ + FIXME("iface %p, image %p, image_brush_desc %p, brush_desc %p, brush %p stub!\n", iface, image, image_brush_desc, + brush_desc, brush); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapBrush(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, + const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1BitmapBrush1 **bitmap_brush) +{ + FIXME("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, bitmap_brush %p stub!\n", iface, bitmap, + bitmap_brush_desc, brush_desc, bitmap_brush); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateCommandList(ID2D1DeviceContext *iface, + ID2D1CommandList **command_list) +{ + FIXME("iface %p, command_list %p stub!\n", iface, command_list); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE d2d_device_context_IsDxgiFormatSupported(ID2D1DeviceContext *iface, DXGI_FORMAT format) +{ + FIXME("iface %p, format %d stub!\n", iface, format); + + return FALSE; +} + +static BOOL STDMETHODCALLTYPE d2d_device_context_IsBufferPrecisionSupported(ID2D1DeviceContext *iface, + D2D1_BUFFER_PRECISION buffer_precision) +{ + FIXME("iface %p, buffer_precision %d stub!\n", iface, buffer_precision); + + return FALSE; +} + +static void STDMETHODCALLTYPE d2d_device_context_GetImageLocalBounds(ID2D1DeviceContext *iface, ID2D1Image *image, + D2D1_RECT_F *local_bounds) +{ + FIXME("iface %p, image %p, local_bounds %p stub!\n", iface, image, local_bounds); +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetImageWorldBounds(ID2D1DeviceContext *iface, ID2D1Image *image, + D2D1_RECT_F *world_bounds) +{ + FIXME("iface %p, image %p, world_bounds %p stub!\n", iface, image, world_bounds); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetGlyphRunWorldBounds(ID2D1DeviceContext *iface, + D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, DWRITE_MEASURING_MODE measuring_mode, + D2D1_RECT_F *bounds) +{ + FIXME("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, measuring_mode %d, bounds %p stub!\n", iface, + baseline_origin.x, baseline_origin.y, glyph_run, measuring_mode, bounds); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_device_context_GetDevice(ID2D1DeviceContext *iface, ID2D1Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *iface, ID2D1Image *target) +{ + FIXME("iface %p, target %p stub!\n", iface, target); +} + +static void STDMETHODCALLTYPE d2d_device_context_GetTarget(ID2D1DeviceContext *iface, ID2D1Image **target) +{ + FIXME("iface %p, target %p stub!\n", iface, target); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetRenderingControls(ID2D1DeviceContext *iface, + const D2D1_RENDERING_CONTROLS *rendering_controls) +{ + FIXME("iface %p, rendering_controls %p stub!\n", iface, rendering_controls); +} + +static void STDMETHODCALLTYPE d2d_device_context_GetRenderingControls(ID2D1DeviceContext *iface, + D2D1_RENDERING_CONTROLS *rendering_controls) +{ + FIXME("iface %p, rendering_controls %p stub!\n", iface, rendering_controls); +} + +static void STDMETHODCALLTYPE d2d_device_context_SetPrimitiveBlend(ID2D1DeviceContext *iface, + D2D1_PRIMITIVE_BLEND primitive_blend) +{ + FIXME("iface %p, primitive_blend %d stub!\n", iface, primitive_blend); +} + +static D2D1_PRIMITIVE_BLEND STDMETHODCALLTYPE d2d_device_context_GetPrimitiveBlend(ID2D1DeviceContext *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_PRIMITIVE_BLEND_SOURCE_OVER; +} + +static void STDMETHODCALLTYPE d2d_device_context_SetUnitMode(ID2D1DeviceContext *iface, D2D1_UNIT_MODE unit_mode) +{ + FIXME("iface %p, unit_mode %d stub!\n", iface, unit_mode); +} + +static D2D1_UNIT_MODE STDMETHODCALLTYPE d2d_device_context_GetUnitMode(ID2D1DeviceContext *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_UNIT_MODE_DIPS; +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext *iface, D2D1_POINT_2F baseline_origin, + const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *glyph_run_desc, ID2D1Brush *brush, + DWRITE_MEASURING_MODE measuring_mode) +{ + FIXME("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %d stub!\n", + iface, baseline_origin.x, baseline_origin.y, glyph_run, glyph_run_desc, brush, measuring_mode); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawImage(ID2D1DeviceContext *iface, ID2D1Image *image, + const D2D1_POINT_2F *target_offset, const D2D1_RECT_F *image_rect, D2D1_INTERPOLATION_MODE interpolation_mode, + D2D1_COMPOSITE_MODE composite_mode) +{ + FIXME("iface %p, image %p, target_offset %p, image_rect %p, interpolation_mode %d, composite_mode %d stub!\n", iface, + image, target_offset, image_rect, interpolation_mode, composite_mode); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawGdiMetafile(ID2D1DeviceContext *iface, ID2D1GdiMetafile *metafile, + const D2D1_POINT_2F *target_offset) +{ + FIXME("iface %p, metafile %p, target_offset %p stub!\n", iface, metafile, target_offset); +} + +static void STDMETHODCALLTYPE d2d_device_context_DrawBitmap(ID2D1DeviceContext *iface, ID2D1Bitmap *bitmap, + const D2D1_RECT_F *dst_rect, float opacity, D2D1_INTERPOLATION_MODE interpolation_mode, + const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) +{ + FIXME("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %d, src_rect %p, perspective_transform %p stub!\n", + iface, bitmap, dst_rect, opacity, interpolation_mode, src_rect, perspective_transform); +} + +static void STDMETHODCALLTYPE d2d_device_context_PushLayer(ID2D1DeviceContext *iface, + const D2D1_LAYER_PARAMETERS1 *layer_parameters, ID2D1Layer *layer) +{ + FIXME("iface %p, layer_parameters %p, layer %p stub!\n", iface, layer_parameters, layer); +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_InvalidateEffectInputRectangle(ID2D1DeviceContext *iface, + ID2D1Effect *effect, UINT32 input, const D2D1_RECT_F *input_rect) +{ + FIXME("iface %p, effect %p, input %u, input_rect %s stub!\n", iface, effect, input, debug_d2d_rect_f(input_rect)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectInvalidRectangleCount(ID2D1DeviceContext *iface, + ID2D1Effect *effect, UINT32 *rect_count) +{ + FIXME("iface %p, effect %p, rect_count %p stub!\n", iface, effect, rect_count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectInvalidRectangles(ID2D1DeviceContext *iface, + ID2D1Effect *effect, D2D1_RECT_F *rectangles, UINT32 rect_count) +{ + FIXME("iface %p, effect %p, rectangles %p, rect_count %u stub!\n", iface, effect, rectangles, rect_count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectRequiredInputRectangles(ID2D1DeviceContext *iface, + ID2D1Effect *effect, const D2D1_RECT_F *image_rect, const D2D1_EFFECT_INPUT_DESCRIPTION *desc, + D2D1_RECT_F *input_rect, UINT32 input_count) +{ + FIXME("iface %p, effect %p, image_rect %s, desc %p, input_rect %p, input_count %u stub!\n", iface, effect, + debug_d2d_rect_f(image_rect), desc, input_rect, input_count); + + return E_NOTIMPL; +} + +static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceContext *iface, ID2D1Bitmap *mask, + ID2D1Brush *brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) +{ + FIXME("iface %p, mask %p, brush %p, dst_rect %s, src_rect %s stub!\n", iface, mask, brush, + debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); +} + +static const struct ID2D1DeviceContextVtbl d2d_device_context_vtbl = { d2d_d3d_render_target_QueryInterface, d2d_d3d_render_target_AddRef, @@ -1755,6 +2028,41 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_GetPixelSize, d2d_d3d_render_target_GetMaximumBitmapSize, d2d_d3d_render_target_IsSupported, + d2d_device_context_CreateBitmap, + d2d_device_context_CreateBitmapFromWicBitmap, + d2d_device_context_CreateColorContext, + d2d_device_context_CreateColorContextFromFilename, + d2d_device_context_CreateColorContextFromWicColorContext, + d2d_device_context_CreateBitmapFromDxgiSurface, + d2d_device_context_CreateEffect, + d2d_device_context_CreateGradientStopCollection, + d2d_device_context_CreateImageBrush, + d2d_device_context_CreateBitmapBrush, + d2d_device_context_CreateCommandList, + d2d_device_context_IsDxgiFormatSupported, + d2d_device_context_IsBufferPrecisionSupported, + d2d_device_context_GetImageLocalBounds, + d2d_device_context_GetImageWorldBounds, + d2d_device_context_GetGlyphRunWorldBounds, + d2d_device_context_GetDevice, + d2d_device_context_SetTarget, + d2d_device_context_GetTarget, + d2d_device_context_SetRenderingControls, + d2d_device_context_GetRenderingControls, + d2d_device_context_SetPrimitiveBlend, + d2d_device_context_GetPrimitiveBlend, + d2d_device_context_SetUnitMode, + d2d_device_context_GetUnitMode, + d2d_device_context_DrawGlyphRun, + d2d_device_context_DrawImage, + d2d_device_context_DrawGdiMetafile, + d2d_device_context_DrawBitmap, + d2d_device_context_PushLayer, + d2d_device_context_InvalidateEffectInputRectangle, + d2d_device_context_GetEffectInvalidRectangleCount, + d2d_device_context_GetEffectInvalidRectangles, + d2d_device_context_GetEffectRequiredInputRectangles, + d2d_device_context_FillOpacityMask, }; static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) @@ -1787,7 +2095,7 @@ static ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *ifa TRACE("iface %p.\n", iface); - return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); + return d2d_d3d_render_target_AddRef(&render_target->ID2D1DeviceContext_iface); } static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) @@ -1796,7 +2104,7 @@ static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *if TRACE("iface %p.\n", iface); - return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); + return d2d_d3d_render_target_Release(&render_target->ID2D1DeviceContext_iface); } static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, @@ -1818,7 +2126,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTe TRACE("iface %p, ctx %p, transform %p.\n", iface, ctx, transform); - ID2D1RenderTarget_GetTransform(&render_target->ID2D1RenderTarget_iface, (D2D1_MATRIX_3X2_F *)transform); + ID2D1DeviceContext_GetTransform(&render_target->ID2D1DeviceContext_iface, (D2D1_MATRIX_3X2_F *)transform); return S_OK; } @@ -1920,7 +2228,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende color_brush = brush; else { - if (FAILED(hr = ID2D1RenderTarget_CreateSolidColorBrush(&render_target->ID2D1RenderTarget_iface, + if (FAILED(hr = ID2D1DeviceContext_CreateSolidColorBrush(&render_target->ID2D1DeviceContext_iface, &color_run->runColor, NULL, (ID2D1SolidColorBrush **)&color_brush))) { ERR("Failed to create solid color brush, hr %#x.\n", hr); @@ -1930,7 +2238,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende origin.x = color_run->baselineOriginX; origin.y = color_run->baselineOriginY; - ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + ID2D1RenderTarget_DrawGlyphRun((ID2D1RenderTarget *)&render_target->ID2D1DeviceContext_iface, origin, &color_run->glyphRun, color_brush, measuring_mode); if (color_brush != brush) @@ -1940,7 +2248,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende IDWriteColorGlyphRunEnumerator_Release(layers); } else - ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, + ID2D1RenderTarget_DrawGlyphRun((ID2D1RenderTarget *)&render_target->ID2D1DeviceContext_iface, baseline_origin, glyph_run, brush, measuring_mode); ID2D1Brush_Release(brush); @@ -1973,7 +2281,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRend end.x = start.x + underline->width; end.y = start.y; prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); - d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + d2d_d3d_render_target_DrawLine(&render_target->ID2D1DeviceContext_iface, start, end, brush, thickness, NULL); render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush); @@ -2006,7 +2314,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText end.x = start.x + strikethrough->width; end.y = start.y; prev_antialias_mode = d2d_d3d_render_target_set_aa_mode_from_text_aa_mode(render_target); - d2d_d3d_render_target_DrawLine(&render_target->ID2D1RenderTarget_iface, start, end, brush, thickness, NULL); + d2d_d3d_render_target_DrawLine(&render_target->ID2D1DeviceContext_iface, start, end, brush, thickness, NULL); render_target->drawing_state.antialiasMode = prev_antialias_mode; ID2D1Brush_Release(brush); @@ -3032,7 +3340,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t if (desc->minLevel != D2D1_FEATURE_LEVEL_DEFAULT) WARN("Ignoring feature level %#x.\n", desc->minLevel); - render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; + render_target->ID2D1DeviceContext_iface.lpVtbl = &d2d_device_context_vtbl; render_target->ID2D1GdiInteropRenderTarget_iface.lpVtbl = &d2d_gdi_interop_render_target_vtbl; render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; @@ -3040,7 +3348,7 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t ID2D1Factory_AddRef(render_target->factory); render_target->outer_unknown = outer_unknown ? outer_unknown : - (IUnknown *)&render_target->ID2D1RenderTarget_iface; + (IUnknown *)&render_target->ID2D1DeviceContext_iface; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device))) { @@ -3255,7 +3563,7 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac } TRACE("Created render target %p.\n", object); - *render_target = &object->ID2D1RenderTarget_iface; + *render_target = (ID2D1RenderTarget *)&object->ID2D1DeviceContext_iface; return S_OK; } -- 2.18.0

1 0

[PATCH 1/2] kernel32: Set %ALLUSERSPROFILE% variable to the same value as %ProgramData%.
by Dmitry Timoshkov 17 Aug '18

17 Aug '18

This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..b12c37f63f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -516,7 +516,6 @@ static void set_additional_environment(void) 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; - static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR public_valueW[] = {'P','u','b','l','i','c',0}; static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; @@ -524,7 +523,7 @@ static void set_additional_environment(void) static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; + WCHAR *profile_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; HANDLE hkey; DWORD len; @@ -546,28 +545,14 @@ static void set_additional_environment(void) if (!NtOpenKey( &hkey, KEY_READ, &attr )) { profile_dir = get_reg_value( hkey, profiles_valueW ); - all_users_dir = get_reg_value( hkey, all_users_valueW ); program_data_dir = get_reg_value( hkey, programdataW ); public_dir = get_reg_value( hkey, public_valueW ); NtClose( hkey ); } - if (profile_dir && all_users_dir) - { - WCHAR *value, *p; - - len = strlenW(profile_dir) + strlenW(all_users_dir) + 2; - value = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - strcpyW( value, profile_dir ); - p = value + strlenW(value); - if (p > value && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, all_users_dir ); - SetEnvironmentVariableW( allusersW, value ); - HeapFree( GetProcessHeap(), 0, value ); - } - if (program_data_dir) { + SetEnvironmentVariableW( allusersW, program_data_dir ); SetEnvironmentVariableW( programdataW, program_data_dir ); } @@ -576,7 +561,6 @@ static void set_additional_environment(void) SetEnvironmentVariableW( publicW, public_dir ); } - HeapFree( GetProcessHeap(), 0, all_users_dir ); HeapFree( GetProcessHeap(), 0, profile_dir ); HeapFree( GetProcessHeap(), 0, program_data_dir ); HeapFree( GetProcessHeap(), 0, public_dir ); -- 2.17.1

1 0

[PATCH] msi: Unlock msi_custom_action_c on the error paths
by Michael Stefaniuc 17 Aug '18

17 Aug '18

Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=45483 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- This lets the DX8 SDK finally install for me. dlls/msi/custom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 950681e76c..cd37a56d93 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -678,11 +678,13 @@ static DWORD WINAPI custom_client_thread(void *arg) size != sizeof(info->guid)) { ERR("Failed to write to custom action client pipe: %u\n", GetLastError()); + LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); } if (!ReadFile(pipe, &thread64, sizeof(thread64), &size, NULL) || size != sizeof(thread64)) { ERR("Failed to read from custom action client pipe: %u\n", GetLastError()); + LeaveCriticalSection(&msi_custom_action_cs); return GetLastError(); } -- 2.14.4

3 2

[PATCH 10/10] dinput: Correct key name mappings on Japanese 106 keyboard.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/keyboard.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-)

1 0

[PATCH 09/10] dinput: Fix DIK code mappings on Japanese 106 keyboard.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45475 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/keyboard.c | 37 +++++++++++++++++++++++++++++++++---- dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 34 insertions(+), 5 deletions(-)

1 0

[PATCH 07/10] dinput/tests: Skip DIK code tests if the keyboard type doesn't match.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)

1 0

[PATCH 06/10] dinput/tests: Peek messages for the target window only.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

This fixes "keyboard.c:365: Tests skipped: failed to queue keyboard event" message on my Win10 PC (real hardware). Since some thread messages and window messages, including IME related, are observed on the thread, they sometimes confuse the message handler. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)

1 0

[PATCH 05/10] dinput: Return DIDEVTYPEKEYBOARD_JAPAN106 subtype when it is used.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

For the further improvments, subtype is a member of SysKeyboardImpl structure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/keyboard.c | 43 +++++++++++++++++++++++++++++++------------ dlls/dinput/tests/keyboard.c | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-)

1 0

[PATCH 04/10] dinput/tests: Add more tests for keyboard subtypes.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dinput/tests/keyboard.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)

1 0

[PATCH 02/10] user32: Support Japanese keyboard type in GetKeyboardType.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/input.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-)

1 0

[PATCH 01/10] winex11: Fix Japanese 106 keyboard scan/vkey code tables.
by Akihiro Sagawa 17 Aug '18

17 Aug '18

Otherwise, some symbol keys (e.g. backslash) map differently. As a result, jp106's scan code and vkey tables equal to macjp. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winex11.drv/keyboard.c | 37 ++++++------------------------------- 1 file changed, 6 insertions(+), 31 deletions(-)

1 0

[PATCH vkd3d 5/9] build: Add support for MoltenVK.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 90557ee42e68..ada7e9a7f0f8 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,10 @@ AC_CHECK_LIB([pthread], [pthread_create], AC_SUBST([VULKAN_LIBS]) VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) + [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lMoltenVK" + AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$ac_cv_lib_soname_MoltenVK"])], + [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])]) AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], -- 2.16.4

2 1

[PATCH vkd3d 3/9] build: Make libxcb optional.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 19 ++++++++++++++----- libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d-utils/vkd3d_utils_private.h | 14 ++++++++------ 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 8e201f43b744..90557ee42e68 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(include/config.h) AC_ARG_VAR([WIDL], [widl IDL compiler]) AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) +AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)])) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) @@ -80,13 +81,17 @@ VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], [VULKAN_LIBS="-lvulkan"], [AC_MSG_ERROR([libvulkan not found.])]) -HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared], - [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.]) - HAVE_SPIRV_TOOLS=yes])]) + [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])], + [with_spirv_tools=no]) -PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms]) +HAVE_XCB=no +AS_IF([test "x$with_xcb" != "xno"], + [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) + HAVE_XCB=yes], + [HAVE_XCB=no])]) dnl Check for functions VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)]) @@ -96,7 +101,10 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_PTHREAD_SETNAME_NP +dnl Makefiles AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no]) +AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"], + [AC_MSG_ERROR([libxcb is required for demos.])]) AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) @@ -112,7 +120,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], AS_ECHO([" Configuration summary for $PACKAGE $VERSION - Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS} + Have XCB: ${HAVE_XCB} + Have SPIRV-Tools: ${with_spirv_tools} Building demos: ${enable_demos} diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 2c4d89a7e38e..8c2503784e37 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -34,7 +34,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, +#ifdef HAVE_XCB VK_KHR_XCB_SURFACE_EXTENSION_NAME, +#endif }; static const char * const device_extensions[] = { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 6aa0df6eeef5..b4828cc3ed5c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,17 +19,19 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H -#define VK_NO_PROTOTYPES -#define VK_USE_PLATFORM_XCB_KHR - -#include <pthread.h> -#include <vkd3d.h> - #define COBJMACROS #define NONAMELESSUNION #include "vkd3d_memory.h" #include "vkd3d_utils.h" +#define VK_NO_PROTOTYPES +#ifdef HAVE_XCB +# define VK_USE_PLATFORM_XCB_KHR +#endif + +#include <pthread.h> +#include <vkd3d.h> + struct vkd3d_event { pthread_mutex_t mutex; -- 2.16.4

2 1

[PATCH vkd3d 1/9] build: Detect soname of libvulkan at configure time.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 6 +++--- libs/vkd3d/device.c | 4 ++-- m4/check-soname.m4 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 m4/check-soname.m4 diff --git a/configure.ac b/configure.ac index d437e1b73262..83b0b0d8fcec 100644 --- a/configure.ac +++ b/configure.ac @@ -76,9 +76,9 @@ AC_CHECK_LIB([pthread], [pthread_create], [AC_MSG_ERROR([libpthread not found.])]) AC_SUBST([VULKAN_LIBS]) -AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], - [VULKAN_LIBS="-lvulkan"], - [AC_MSG_ERROR([libvulkan not found.])]) +VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr], + [VULKAN_LIBS="-lvulkan"], + [AC_MSG_ERROR([libvulkan not found.])]) HAVE_SPIRV_TOOLS=no AS_IF([test "x$with_spirv_tools" = "xyes"], diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 6fa001779180..47b56e5975fd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -212,9 +212,9 @@ static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, if (!vkGetInstanceProcAddr) { - if (!(instance->libvulkan = dlopen("libvulkan.so.1", RTLD_NOW))) + if (!(instance->libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) { - ERR("Failed to load libvulkan.\n"); + ERR("Failed to load libvulkan: %s.\n", dlerror()); return E_FAIL; } diff --git a/m4/check-soname.m4 b/m4/check-soname.m4 new file mode 100644 index 000000000000..82ad2287c8ce --- /dev/null +++ b/m4/check-soname.m4 @@ -0,0 +1,54 @@ +dnl +dnl Copyright 2002 Alexandre Julliard +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA +dnl +dnl As a special exception to the GNU Lesser General Public License, +dnl if you distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it +dnl under the same distribution terms that you use for the rest of +dnl that program. + +dnl VKD3D_PATH_SONAME_TOOLS +AC_DEFUN([VKD3D_PATH_SONAME_TOOLS], +[AC_PATH_PROG(LDD,ldd,true,/sbin:/usr/sbin:$PATH) +AC_CHECK_TOOL(OTOOL,otool,otool) +AC_CHECK_TOOL(READELF,[readelf],true)]) + +dnl VKD3D_CHECK_SONAME(library, function, [action-if-found, [action-if-not-found, [other_libraries, [pattern]]]]) +AC_DEFUN([VKD3D_CHECK_SONAME], +[AC_REQUIRE([VKD3D_PATH_SONAME_TOOLS])dnl +AS_VAR_PUSHDEF([ac_Lib],[ac_cv_lib_soname_$1])dnl +m4_pushdef([ac_lib_pattern],m4_default([$6],[lib$1]))dnl +AC_MSG_CHECKING([for -l$1]) +AC_CACHE_VAL(ac_Lib, +[ac_check_soname_save_LIBS=$LIBS + LIBS="-l$1 $5 $LIBS" + AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], + [AS_CASE(["$host_os"], + [darwin*|macosx*], [AS_VAR_SET(ac_Lib,[`$OTOOL -L conftest$ac_exeext | grep "]ac_lib_pattern[\\.[[0-9A-Za-z.]]*dylib" | sed -e "s/^.*\/$]ac_lib_pattern[\.[[0-9A-Za-z.]]*dylib$.*$/\1/"';2,$d'`])], + [AS_VAR_SET(ac_Lib,[`$READELF -d conftest$ac_exeext | grep "NEEDED.*]ac_lib_pattern[\\.$LIBEXT" | sed -e "s/^.*\\m4_dquote(\$]ac_lib_pattern[\\.$LIBEXT[[^ ]]*\$\\).*$/\1/"';2,$d'`]) + AS_VAR_IF([ac_Lib],[], + [AS_VAR_SET(ac_Lib,[`$LDD conftest$ac_exeext | grep "]ac_lib_pattern[\\.$LIBEXT" | sed -e "s/^.*$]ac_lib_pattern[\.$LIBEXT[[^ ]]*$.*$/\1/"';2,$d'`])])])]) + LIBS=$ac_check_soname_save_LIBS])dnl +AS_VAR_IF([ac_Lib],[], + [AC_MSG_RESULT([not found]) + $4], + [AC_MSG_RESULT(AS_VAR_GET(ac_Lib)) + AC_DEFINE_UNQUOTED(AS_TR_CPP(SONAME_LIB$1),["]AS_VAR_GET(ac_Lib)["], + [Define to the soname of the lib$1 library.]) + $3])dnl +m4_popdef([ac_lib_pattern])dnl +AS_VAR_POPDEF([ac_Lib])]) -- 2.16.4

2 1

[PATCH vkd3d 7/9] vkd3d-utils: Detect surface extensions at runtime.
by Józef Kucia 17 Aug '18

17 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-utils/vkd3d_utils_main.c | 16 ++++++++++++---- libs/vkd3d-utils/vkd3d_utils_private.h | 9 +++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79e31553cb7c..3ee2f130c50d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,7 +106,6 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils.map \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h -libvkd3d_utils_la_CFLAGS = @XCB_CFLAGS@ libvkd3d_utils_la_LDFLAGS = -version-info 1:0:0 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la if HAVE_LD_VERSION_SCRIPT diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 8c2503784e37..fa6e5f8f1616 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -28,15 +28,18 @@ HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; static const char * const instance_extensions[] = { VK_KHR_SURFACE_EXTENSION_NAME, -#ifdef HAVE_XCB - VK_KHR_XCB_SURFACE_EXTENSION_NAME, -#endif + }; + static const char * const optional_instance_extensions[] = + { + "VK_KHR_xcb_surface", + "VK_MVK_macos_surface", }; static const char * const device_extensions[] = { @@ -49,9 +52,14 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&optional_extensions_info, 0, sizeof(optional_extensions_info)); + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; - instance_create_info.next = NULL; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index b4828cc3ed5c..a31f9b737e3f 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -21,13 +21,10 @@ #define COBJMACROS #define NONAMELESSUNION -#include "vkd3d_memory.h" -#include "vkd3d_utils.h" - #define VK_NO_PROTOTYPES -#ifdef HAVE_XCB -# define VK_USE_PLATFORM_XCB_KHR -#endif + +#include "vkd3d_memory.h" +#include <vkd3d_utils.h> #include <pthread.h> #include <vkd3d.h> -- 2.16.4

1 0

[PATCH] winecfg: Update changed state on associations checkbox click.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winecfg/theme.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 1934538f44..5304f7240c 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1320,6 +1320,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDC_ENABLE_FILE_ASSOCIATIONS: update_mime_types(hDlg); + SendMessageW(GetParent(hDlg), PSM_CHANGED, 0, 0); break; } break; -- 2.18.0

3 5

[PATCH] po: Update Russian translation.
by Nikolay Sivov 17 Aug '18

17 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6a4c3c848f..aacc59532b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 09:26+0300\n" +"PO-Revision-Date: 2018-08-17 00:45+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.1.1\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -14205,11 +14205,11 @@ msgstr "Цвет:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типы MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Обновлять &ассоциации" #: winecfg.rc:308 msgid "Folders" -- 2.18.0

3 3

[PATCH v2 1/4] ntdll/actctx: Don't stop looking for manifest if dll without manifest is found
by Fabian Maurer 16 Aug '18

16 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/Makefile.in | 2 ++ dlls/kernel32/tests/actctx.c | 37 ++++++++++++++++++++++++++++++++- dlls/kernel32/tests/dummy.c | 0 dlls/kernel32/tests/dummy.spec | 0 dlls/ntdll/actctx.c | 3 ++- 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/dummy.c create mode 100644 dlls/kernel32/tests/dummy.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8c3..ee0bbd2c8b 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -11,6 +11,8 @@ C_SRCS = \ debugger.c \ directory.c \ drive.c \ + dummy.c \ + dummy.spec \ environ.c \ fiber.c \ file.c \ diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 96d9b8cbb6..1e142a35ea 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2598,9 +2598,28 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } +/* Copied from msi tests */ +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_CreateActCtx(void) { - CHAR path[MAX_PATH], dir[MAX_PATH]; + CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; @@ -2637,6 +2656,22 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + /* with specified directory, that does contain dependent assembly */ + GetTempPathA(ARRAY_SIZE(dir), dir); + actctx.lpAssemblyDirectory = dir; + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + /* Should still work if we add a dll with the same name, but without manifest */ + strcpy(dll, dir); + strcat(dll, "testdep1.dll"); + extract_resource("dummy.dll", "TESTDLL", dll); + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + DeleteFileA(dll); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); delete_manifest_file("testdep2.manifest"); diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 53a8b06882..08b6c509ae 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,7 +3294,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); - break; + if (status == STATUS_SUCCESS) + break; } RtlFreeUnicodeString( &nameW ); } -- 2.18.0

2 4

[PATCH v3 1/4] winbase.h: Correct spelling of PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY
by Fabian Maurer 16 Aug '18

16 Aug '18

--- include/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index 667df965d6..aa57dae818 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1683,7 +1683,7 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_GROUP_AFFINITY (ProcThreadAttributeGroupAffinity | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR (ProcThreadAttributeIdealProcessor | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_UMS_THREAD (ProcThreadAttributeUmsThread | PROC_THREAD_ATTRIBUTE_THREAD | PROC_THREAD_ATTRIBUTE_INPUT) -#define PROC_THREAD_ATTRIBUTE_MIGITATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) +#define PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY (ProcThreadAttributeMitigationPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_SECURITY_CAPABILITIES (ProcThreadAttributeSecurityCapabilities | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_PROTECTION_LEVEL (ProcThreadAttributeProtectionLevel | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_JOB_LIST (ProcThreadAttributeJobList | PROC_THREAD_ATTRIBUTE_INPUT) -- 2.18.0

2 5

[PATCH v4] ntdll: Add stub for NtCreateLowBoxToken
by Fabian Maurer 16 Aug '18

16 Aug '18

This is required by chromium x64 sandbox >=win8 chrome for some reason is not affected Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45646 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/ntdll/misc.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 7ccaa0ed7f..2431662a1e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -492,3 +492,15 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) { FIXME("stub\n"); } + +NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE *token_handle, HANDLE existing_token_handle, ACCESS_MASK desired_access, + OBJECT_ATTRIBUTES *object_attributes, SID *package_sid, ULONG capability_count, + SID_AND_ATTRIBUTES *capabilities, ULONG handle_count, HANDLE *handle) +{ + FIXME("(%p, %p, %x, %p, %p, %u, %p, %u, %p): stub\n", token_handle, existing_token_handle, desired_access, + object_attributes, package_sid, capability_count, capabilities, handle_count, handle); + + /* We need to return a NULL handle since later it will be passed to CloseHandle and that must not fail */ + *token_handle = NULL; + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d321c44d4f..003e4f9d00 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -142,6 +142,7 @@ @ stdcall NtCreateKey(ptr long ptr long ptr long ptr) @ stdcall NtCreateKeyTransacted(ptr long ptr long ptr long long ptr) @ stdcall NtCreateKeyedEvent(ptr long ptr long) +@ stdcall NtCreateLowBoxToken(ptr long long ptr ptr long ptr long ptr) @ stdcall NtCreateMailslotFile(ptr long ptr ptr long long long ptr) @ stdcall NtCreateMutant(ptr long ptr long) @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) -- 2.18.0

1 0

[PATCH v2] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- v2: Use sprintfW so user32 isn't required. - dlls/dpnet/address.c | 114 ++++++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0bfa2bc..a4c864e 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -47,6 +47,22 @@ static char *heap_strdupA( const char *str ) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) @@ -258,20 +274,98 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + const static WCHAR comma[] = {';',0}; + const static WCHAR format_stringW[] = {'%', 's','=','%','s',0}; + const static WCHAR format_dword[] = {'%', 's','=','%','d',0}; + static const WCHAR format_guid[] = { '%', 's','=','%', '%','7','B', + '%','0','8','X','-','%','0','4','X','-','%','0','4','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','%','%','7','D',0}; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + int position = strlenW(buffer); + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], comma); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + sprintfW( &buffer[position], format_guid, entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], entry->data.guid.Data4[3], + entry->data.guid.Data4[4], entry->data.guid.Data4[5], entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + break; + case DPNA_DATATYPE_STRING: + sprintfW(&buffer[position], format_stringW, entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + sprintfW(&buffer[position], format_dword, entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + { + WCHAR *str = heap_strdupAtoW(entry->data.ansi); + sprintfW(&buffer[position], format_stringW, entry->name, str); + heap_free(str); + break; + } + case DPNA_DATATYPE_BINARY: + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, size, NULL, NULL); + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a1dcdef..526f41f 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -305,6 +305,159 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const WCHAR urlW1[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D',0 }; + static const WCHAR urlW2[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',0 }; + static const WCHAR urlW3[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',';','h','o','s','t','n','a','m','e','=','l', + 'o','c','a','l','h','o','s','t', 0 }; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW1, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW2, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW3, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -382,6 +535,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 1.9.1

2 1

[PATCH] ieframe: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe_main.c | 2 +- dlls/ieframe/iexplore.c | 10 +++++----- dlls/ieframe/intshcut.c | 4 ++-- dlls/ieframe/navigate.c | 10 +++++----- dlls/ieframe/oleobject.c | 2 +- dlls/ieframe/shellbrowser.c | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 424868d62e..d22ad3d18c 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -428,7 +428,7 @@ static void update_travellog(DocHost *This) static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; - if(This->url && !strncmpiW(This->url, about_schemeW, sizeof(about_schemeW)/sizeof(*about_schemeW))) { + if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { TRACE("Skipping about URL\n"); return; } diff --git a/dlls/ieframe/ieframe_main.c b/dlls/ieframe/ieframe_main.c index a862f9afe5..e207ce0575 100644 --- a/dlls/ieframe/ieframe_main.c +++ b/dlls/ieframe/ieframe_main.c @@ -91,7 +91,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + for(i=0; i < ARRAY_SIZE(typeinfos); i++) { if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); } diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index aac1436239..1a83ee38bb 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -263,7 +263,7 @@ static void add_tbs_to_menu(HMENU menu) WCHAR classes_key[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\','C','L','S','I','D',0}; WCHAR guid[39]; - DWORD value_len = sizeof(guid)/sizeof(guid[0]); + DWORD value_len = ARRAY_SIZE(guid); int i; if(SHRegOpenUSKeyW(classes_key, KEY_READ, NULL, &classes_handle, TRUE) != ERROR_SUCCESS) @@ -276,11 +276,11 @@ static void add_tbs_to_menu(HMENU menu) for(i = 0; SHRegEnumUSValueW(toolbar_handle, i, guid, &value_len, NULL, NULL, NULL, SHREGENUM_HKLM) == ERROR_SUCCESS; i++) { WCHAR tb_name[100]; - DWORD tb_name_len = sizeof(tb_name)/sizeof(tb_name[0]); + DWORD tb_name_len = ARRAY_SIZE(tb_name); HUSKEY tb_class_handle; MENUITEMINFOW item; LSTATUS ret; - value_len = sizeof(guid)/sizeof(guid[0]); + value_len = ARRAY_SIZE(guid); if(lstrlenW(guid) != 38) { @@ -418,7 +418,7 @@ static void add_tb_button(InternetExplorer *ie, int bmp, int cmd, int strId) TBBUTTON btn; WCHAR buf[30]; - LoadStringW(ieframe_instance, strId, buf, sizeof(buf)/sizeof(buf[0])); + LoadStringW(ieframe_instance, strId, buf, ARRAY_SIZE(buf)); btn.iBitmap = bmp; btn.idCommand = cmd; @@ -445,7 +445,7 @@ static void create_rebar(InternetExplorer *ie) HIMAGELIST imagelist; SIZE toolbar_size; - LoadStringW(ieframe_instance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0])); + LoadStringW(ieframe_instance, IDS_ADDRESS, addr, ARRAY_SIZE(addr)); hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, 0, 0, 0, 0, diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 2376b1b424..4331bb9b0a 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -93,7 +93,7 @@ static BOOL run_winemenubuilder( const WCHAR *args ) WCHAR app[MAX_PATH]; void *redir; - GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder )); strcatW( app, menubuilder ); len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); @@ -278,7 +278,7 @@ static HRESULT WINAPI UniformResourceLocatorW_InvokeCommand(IUniformResourceLoca return E_NOTIMPL; } - hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, app, ARRAY_SIZE(app), NULL, 0); if(FAILED(hres)) return E_FAIL; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 658857fadd..96fb083005 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -111,7 +111,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR fmt[0] = 0; /* the format string must have one "%s" for the str */ LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN); - snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), fmt, str); + snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str); } V_VT(&arg) = VT_BSTR; @@ -576,7 +576,7 @@ static void on_before_navigate2(DocHost *This, LPCWSTR url, SAFEARRAY *post_data DISPPARAMS dispparams; VARIANTARG params[7]; WCHAR file_path[MAX_PATH]; - DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); + DWORD file_path_len = ARRAY_SIZE(file_path); dispparams.cArgs = 7; dispparams.cNamedArgs = 0; @@ -642,7 +642,7 @@ static BOOL try_application_url(LPCWSTR url) static const WCHAR wszURLProtocol[] = {'U','R','L',' ','P','r','o','t','o','c','o','l',0}; - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, app, ARRAY_SIZE(app), NULL, 0); if(FAILED(hres)) return FALSE; @@ -674,7 +674,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) if(PathIsURLW(url)) return CreateURLMoniker(NULL, url, mon); - size = sizeof(new_url)/sizeof(WCHAR); + size = ARRAY_SIZE(new_url); hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url)); if(FAILED(hres)) { @@ -978,7 +978,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, }else { DWORD size; - size = sizeof(new_url)/sizeof(WCHAR); + size = ARRAY_SIZE(new_url); hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT); if(FAILED(hres)) { diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 1ff9a92666..22fe4b1848 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -385,7 +385,7 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB if(pceltFetched) *pceltFetched = 0; - if(This->iter == sizeof(verbs)/sizeof(*verbs)) + if(This->iter == ARRAY_SIZE(verbs)) return S_FALSE; if(celt) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index f75689e49a..78e0e85a79 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -658,7 +658,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2( VARIANT_BOOL cancel = VARIANT_FALSE; SAFEARRAY *post_data; WCHAR file_path[MAX_PATH]; - DWORD file_path_len = sizeof(file_path) / sizeof(*file_path); + DWORD file_path_len = ARRAY_SIZE(file_path); TRACE("%p %p %s %x %s %p %d %s %d %p\n", This, pDispatch, debugstr_w(lpszUrl), dwFlags, debugstr_w(lpszFrameName), pPostData, cbPostData, -- 2.14.4

2 1

[PATCH] wineandroid.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Not compile tested. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineandroid.drv/device.c | 4 ++-- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/keyboard.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 0ccae1130c..20519e2625 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -1363,7 +1363,7 @@ static int perform( ANativeWindow *window, int operation, ... ) case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: default: FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, - operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + operation < ARRAY_SIZE( names ) ? names[operation] : "???" ); break; } va_end( args ); @@ -1419,7 +1419,7 @@ void release_ioctl_window( struct ANativeWindow *window ) if (InterlockedDecrement( &win->ref ) > 0) return; TRACE( "%p %p\n", win, win->hwnd ); - for (i = 0; i < sizeof(win->buffers)/sizeof(win->buffers[0]); i++) + for (i = 0; i < ARRAY_SIZE( win->buffers ); i++) if (win->buffers[i]) win->buffers[i]->buffer.common.decRef( &win->buffers[i]->buffer.common ); destroy_ioctl_window( win->hwnd, win->opengl ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 0dd3e5e686..da8fba30ca 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -677,7 +677,7 @@ static BOOL process_attach(void) load_android_libs(); (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); class = (*jni_env)->GetObjectClass( jni_env, object ); - (*jni_env)->RegisterNatives( jni_env, class, methods, sizeof(methods)/sizeof(methods[0]) ); + (*jni_env)->RegisterNatives( jni_env, class, methods, ARRAY_SIZE( methods )); (*jni_env)->DeleteLocalRef( jni_env, class ); #ifdef __i386__ wine_set_fs( old_fs ); /* the Java VM hijacks %fs for its own purposes, restore it */ diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3167d548e4..2c37c42e0d 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -638,7 +638,7 @@ static UINT scancode_to_vkey( UINT scan ) { UINT j; - for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_to_scancode ); j++) if (vkey_to_scancode[j] == scan) return j; return 0; @@ -648,7 +648,7 @@ static const char* vkey_to_name( UINT vkey ) { UINT j; - for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + for (j = 0; j < ARRAY_SIZE( vkey_names ); j++) if (vkey_names[j].vkey == vkey) return vkey_names[j].name; return NULL; @@ -724,7 +724,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k { union event_data data; - if ((unsigned int)keycode >= sizeof(keycode_to_vkey)/sizeof(keycode_to_vkey[0]) || + if ((unsigned int)keycode >= ARRAY_SIZE( keycode_to_vkey ) || !keycode_to_vkey[keycode]) { p__android_log_print( ANDROID_LOG_WARN, "wine", @@ -931,7 +931,7 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) code = VK_LMENU; break; } - if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + if (code < ARRAY_SIZE( vkey_to_scancode )) ret = vkey_to_scancode[code]; break; case MAPVK_VSC_TO_VK: case MAPVK_VSC_TO_VK_EX: @@ -993,7 +993,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) { SHORT ret = -1; - if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + if (ch < ARRAY_SIZE( char_vkey_map )) ret = char_vkey_map[ch]; TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); return ret; } -- 2.14.4

1 0

[PATCH] sane.ds: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sane.ds/capability.c | 14 +++++++------- dlls/sane.ds/ui.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 094bb93452..9157cae596 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -174,7 +174,7 @@ static TW_UINT16 TWAIN_GetSupportedCaps(pTW_CAPABILITY pCapability) TW_UINT32 i; a = GlobalLock (pCapability->hContainer); a->ItemType = TWTY_UINT16; - a->NumItems = sizeof(supported_caps) / sizeof(supported_caps[0]); + a->NumItems = ARRAY_SIZE(supported_caps); u = (UINT16 *) a->ItemList; for (i = 0; i < a->NumItems; i++) u[i] = supported_caps[i]; @@ -203,7 +203,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.capXferMech, TWSX_NATIVE); break; @@ -482,7 +482,7 @@ static TW_UINT16 SANE_ICAPBitDepth(pTW_CAPABILITY pCapability, TW_UINT16 action) break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, activeDS.sane_param.depth, activeDS.sane_param.depth); break; @@ -536,7 +536,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, TWCP_NONE, TWCP_NONE); FIXME("Partial stub: We don't attempt to support compression\n"); break; @@ -731,7 +731,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act break; case MSG_GET: - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, flavor, flavor); break; @@ -935,9 +935,9 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; case MSG_GET: - for (i = 0; i < sizeof(supported_sizes) / sizeof(supported_sizes[0]); i++) + for (i = 0; i < ARRAY_SIZE(supported_sizes); i++) possible_values[i] = supported_sizes[i].size; - twCC = msg_get_enum(pCapability, possible_values, sizeof(possible_values) / sizeof(possible_values[0]), + twCC = msg_get_enum(pCapability, possible_values, ARRAY_SIZE(possible_values), TWTY_UINT16, current_size, default_size); WARN("Partial Stub: our supported size selection is a bit thin.\n"); break; diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index fe1988a88a..23c38f31dc 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -639,7 +639,7 @@ static void UpdateRelevantEdit(HWND hwnd, const SANE_Option_Descriptor *opt, else return; buffer[len++] = ' '; - LoadStringW( SANE_instance, opt->unit, buffer + len, sizeof(buffer)/sizeof(WCHAR) - len ); + LoadStringW( SANE_instance, opt->unit, buffer + len, ARRAY_SIZE( buffer ) - len ); edit_w = GetDlgItem(hwnd,index+ID_BASE+ID_EDIT_BASE); if (edit_w) SetWindowTextW(edit_w,buffer); -- 2.14.4

1 0

[PATCH] sane.ds: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sane.ds/capability.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 45c54a1c73..094bb93452 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -844,7 +844,6 @@ static const supported_size_t supported_sizes[] = { TWSS_USEXECUTIVE, 184.15, 266.7 }, { TWSS_A3, 297, 420 }, }; -#define SUPPORTED_SIZE_COUNT (sizeof(supported_sizes) / sizeof(supported_sizes[0])) static TW_UINT16 get_default_paper_size(const supported_size_t *s, int n) { @@ -920,11 +919,11 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 TW_UINT16 twCC = TWCC_BADCAP; #ifdef SONAME_LIBSANE - static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; + static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)]; unsigned int i; TW_UINT32 val; - TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); - TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT); + TW_UINT16 default_size = get_default_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); + TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes)); TRACE("ICAP_SUPPORTEDSIZES\n"); @@ -946,7 +945,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -960,7 +959,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 case MSG_RESET: twCC = TWCC_BADCAP; - for (i = 1; i < SUPPORTED_SIZE_COUNT; i++) + for (i = 1; i < ARRAY_SIZE(supported_sizes); i++) if (supported_sizes[i].size == default_size) { twCC = set_width_height(supported_sizes[i].x, supported_sizes[i].y); @@ -976,7 +975,6 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 break; } -#undef SUPPORTED_SIZE_COUNT #endif return twCC; } -- 2.14.4

1 0

[PATCH] gdiplus/tests: Fix region leak (Coverity)
by Nikolay Sivov 16 Aug '18

16 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/tests/graphics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5eb0a8a4d0..b0e3d8232b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2194,6 +2194,7 @@ static void test_clip_xform(void) expect(0xff, color); GdipDeleteGraphics(graphics); + GdipDeleteRegion(clip); ReleaseDC(hwnd, hdc); } -- 2.18.0

2 1

[PATCH 1/6] mscoree: Add test for registration-less COM components
by Fabian Maurer 16 Aug '18

16 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Fix test not working when not in root folder Fix cleanup sometimes failing due to race condition v3: Build c# dll during test --- dlls/mscoree/tests/Makefile.in | 4 + dlls/mscoree/tests/comtest.c | 299 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 ++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 +++ 7 files changed, 416 insertions(+) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..9e53b7c577 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -2,6 +2,10 @@ TESTDLL = mscoree.dll IMPORTS = ole32 shlwapi uuid C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..687149cf57 --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,299 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" +#include "shlwapi.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + +static void run_test(int run) +{ + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (test) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + ok(hr == S_OK, "Got %x\n", hr); + + if (classFactory) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (test2) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + } + } +} + +static BOOL compile_cs_to_dll(char *source_path, char *dest_path) +{ + const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + if (!PathFileExistsA(path_csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + sprintf(cmdline, "%s /t:library /out:\"%s\" \"%s\"", path_csc, dest_path, source_path); + + si.cb = sizeof(si); + ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + WaitForSingleObject(pi.hProcess, 5000); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsA(dest_path); + ok(ret, "Compilation failed\n"); + return ret; +} + +static void prepare_and_run_test(int run, const char *dll_source) +{ + char path_tmp[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_dll_source[MAX_PATH] = {0}; + char path_current[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetCurrentDirectoryA(MAX_PATH, path_current); + GetTempPathA(MAX_PATH, path_tmp); + + if (!write_resource_file(path_tmp, dll_source, "comtest.cs", path_dll_source)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + strcpy(path_dll, path_current); + PathAppendA(path_dll, "comtest.dll"); + + if (!compile_cs_to_dll(path_dll_source, path_dll)) + goto cleanup; + + if (!write_resource_file(path_tmp, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + todo_wine + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run %d: CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + skip("Failed to create activation context\n"); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run %d: ActivateActCtx failed: %d\n", run, GetLastError()); + + run_test(run); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run %d: DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_dll_source) + { + success = DeleteFileA(path_dll_source); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(int run) +{ + char path_dll[MAX_PATH] = {0}; + BOOL success; + + GetCurrentDirectoryA(MAX_PATH, path_dll); + PathAppendA(path_dll, "comtest.dll"); + + if (!PathFileExistsA(path_dll)) + return; + + success = DeleteFileA(path_dll); + if (!success) + { + Sleep(500); + success = DeleteFileA(path_dll); + } + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); +} + +static void run_child_process(int run, const char *dll_source) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d %s", argv[0], argv[1], run, dll_source); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + int run = atoi(argv[2]); + const char *dll_source = argv[3]; + prepare_and_run_test(run, dll_source); + + goto cleanup; + } + + run_child_process(1, "comtest.cs"); + +cleanup: + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..4fe2a718b2 --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..9a1b89f656 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * 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 "windef.h" + +/* @makedep: comtest.cs */ +comtest.cs RCDATA comtest.cs + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

4 21

[PATCH v2 1/5] msi: Don't start the custom action server inside of custom_client_thread().
by Zebediah Figura 16 Aug '18

16 Aug '18

Asynchronous custom actions don't wait for custom_client_thread() to terminate, so it's possible for two consecutive actions to both try to start the server at once, causing failures when the second action e.g. receives ERROR_PIPE_BUSY from CreateNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- For bug 45483. dlls/msi/custom.c | 61 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b250b1b..a9bb81f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -388,6 +388,7 @@ typedef struct _msi_custom_action_info { LPWSTR action; INT type; GUID guid; + DWORD arch; } msi_custom_action_info; static void release_custom_action_data( msi_custom_action_info *info ) @@ -662,45 +663,16 @@ void custom_stop_server(HANDLE process, HANDLE pipe) static DWORD WINAPI custom_client_thread(void *arg) { msi_custom_action_info *info = arg; - RPC_STATUS status; DWORD64 thread64; HANDLE process; HANDLE thread; HANDLE pipe; - DWORD arch; DWORD size; - BOOL ret; UINT rc; CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - if (!info->package->rpc_server_started) - { - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } - - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; - } - - info->package->rpc_server_started = 1; - } - - ret = GetBinaryTypeW(info->source, &arch); - if (!ret) - arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); - - custom_start_server(info->package, arch); - if (arch == SCS_32BIT_BINARY) + if (info->arch == SCS_32BIT_BINARY) { process = info->package->custom_server_32_process; pipe = info->package->custom_server_32_pipe; @@ -741,6 +713,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { msi_custom_action_info *info; + RPC_STATUS status; + BOOL ret; info = msi_alloc( sizeof *info ); if (!info) @@ -759,6 +733,33 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); + if (!package->rpc_server_started) + { + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return NULL; + } + + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return NULL; + } + + info->package->rpc_server_started = 1; + } + + ret = GetBinaryTypeW(source, &info->arch); + if (!ret) + info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + + custom_start_server(package, info->arch); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { -- 2.7.4

3 10

[PATCH 1/4] msi: Don't start the custom action server inside of custom_client_thread().
by Zebediah Figura 16 Aug '18

16 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Asynchronous custom actions don't wait for custom_client_thread() to terminate, so it's possible for two consecutive actions to both try to start the server at once, causing failures when the second action e.g. receives ERROR_PIPE_BUSY from CreateNamedPipe(). For bug 45483. dlls/msi/custom.c | 61 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b250b1b..a9bb81f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -388,6 +388,7 @@ typedef struct _msi_custom_action_info { LPWSTR action; INT type; GUID guid; + DWORD arch; } msi_custom_action_info; static void release_custom_action_data( msi_custom_action_info *info ) @@ -662,45 +663,16 @@ void custom_stop_server(HANDLE process, HANDLE pipe) static DWORD WINAPI custom_client_thread(void *arg) { msi_custom_action_info *info = arg; - RPC_STATUS status; DWORD64 thread64; HANDLE process; HANDLE thread; HANDLE pipe; - DWORD arch; DWORD size; - BOOL ret; UINT rc; CoInitializeEx(NULL, COINIT_MULTITHREADED); /* needed to marshal streams */ - if (!info->package->rpc_server_started) - { - status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerUseProtseqEp failed: %#x\n", status); - return status; - } - - status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, - RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); - if (status != RPC_S_OK) - { - ERR("RpcServerRegisterIfEx failed: %#x\n", status); - return status; - } - - info->package->rpc_server_started = 1; - } - - ret = GetBinaryTypeW(info->source, &arch); - if (!ret) - arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); - - custom_start_server(info->package, arch); - if (arch == SCS_32BIT_BINARY) + if (info->arch == SCS_32BIT_BINARY) { process = info->package->custom_server_32_process; pipe = info->package->custom_server_32_pipe; @@ -741,6 +713,8 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( MSIPACKAGE *package, INT type, LPCWSTR source, LPCWSTR target, LPCWSTR action ) { msi_custom_action_info *info; + RPC_STATUS status; + BOOL ret; info = msi_alloc( sizeof *info ); if (!info) @@ -759,6 +733,33 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( list_add_tail( &msi_pending_custom_actions, &info->entry ); LeaveCriticalSection( &msi_custom_action_cs ); + if (!package->rpc_server_started) + { + status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, + endpoint_lrpcW, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEp failed: %#x\n", status); + return NULL; + } + + status = RpcServerRegisterIfEx(s_IWineMsiRemote_v0_0_s_ifspec, NULL, NULL, + RPC_IF_AUTOLISTEN, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); + if (status != RPC_S_OK) + { + ERR("RpcServerRegisterIfEx failed: %#x\n", status); + return NULL; + } + + info->package->rpc_server_started = 1; + } + + ret = GetBinaryTypeW(source, &info->arch); + if (!ret) + info->arch = (sizeof(void *) == 8 ? SCS_64BIT_BINARY : SCS_32BIT_BINARY); + + custom_start_server(package, info->arch); + info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL); if (!info->handle) { -- 2.7.4

3 6

[PATCH 8/8] server: Remove no longer needed client and server pointers.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)

1 0

[PATCH 7/8] server: Remove no longer needed pipe reference from pipe server object.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

1 0

[PATCH 6/8] server: Use pipe stored in pipe_end in set_named_pipe_info.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-)

1 0

[PATCH 5/8] server: Use pipe stored in pipe_end in get_named_pipe_info.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 11 ----------- server/named_pipe.c | 40 ++++++++++++++++++---------------------- 2 files changed, 18 insertions(+), 33 deletions(-)

1 0

[PATCH 4/8] server: Use common implementation for client and server get_file_info.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-)

1 0

[PATCH 3/8] server: Use common implementation for pipe client and server get_sd and set_sd.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 44 ++++++++++++++------------------------------ 2 files changed, 15 insertions(+), 31 deletions(-)

1 0

[PATCH 2/8] server: Store named_pipe reference in pipe_end struct.
by Jacek Caban 16 Aug '18

16 Aug '18

Allows pipe clients to access named_pipe object after server is closed without disconnecting. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)

1 0

[PATCH 1/8] ntdll/tests: Add more NtQueryInformationFile tests.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 1 deletion(-)

1 0

[PATCH] kernel32/tests: Add more pipe tests.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] d2d1: Fix scaling when rendering text in bitmap mode.
by Henri Verbeet 16 Aug '18

16 Aug '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 67b3fab9066..cb7e8a540a5 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1107,10 +1107,9 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { - D2D1_MATRIX_3X2_F prev_transform, *transform; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1119,10 +1118,11 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; IDWriteFactory2 *dwrite_factory; - DWRITE_GLYPH_RUN scaled_run; + D2D1_MATRIX_3X2_F *transform, m; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; + float scale_x, scale_y; D2D1_RECT_F run_rect; RECT bounds; HRESULT hr; @@ -1134,12 +1134,21 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - scaled_run = *glyph_run; - scaled_run.fontEmSize *= ppd; - hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, - (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, - baseline_origin.y, &analysis); + transform = &render_target->drawing_state.transform; + + scale_x = render_target->desc.dpiX / 96.0f; + m._11 = transform->_11 * scale_x; + m._21 = transform->_21 * scale_x; + m._31 = transform->_31 * scale_x; + + scale_y = render_target->desc.dpiY / 96.0f; + m._12 = transform->_12 * scale_y; + m._22 = transform->_22 * scale_y; + m._32 = transform->_32 * scale_y; + + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m, + rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, + baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) { @@ -1194,13 +1203,16 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + d2d_rect_set(&run_rect, bounds.left / scale_x, bounds.top / scale_y, + bounds.right / scale_x, bounds.bottom / scale_y); + brush_desc.opacity = 1.0f; brush_desc.transform._11 = 1.0f; brush_desc.transform._12 = 0.0f; brush_desc.transform._21 = 0.0f; brush_desc.transform._22 = 1.0f; - brush_desc.transform._31 = bounds.left; - brush_desc.transform._32 = bounds.top; + brush_desc.transform._31 = run_rect.left; + brush_desc.transform._32 = run_rect.top; if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { @@ -1208,19 +1220,17 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } - d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom); if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr); goto done; } - transform = &render_target->drawing_state.transform; - prev_transform = *transform; + m = *transform; *transform = identity; d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), unsafe_impl_from_ID2D1Brush((ID2D1Brush *)opacity_brush)); - *transform = prev_transform; + *transform = m; done: if (geometry) @@ -1242,7 +1252,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; HRESULT hr; - float ppd; TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode); @@ -1298,11 +1307,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg ; } - ppd = max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f; if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) { if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - ppd, measuring_mode, rendering_params, &rendering_mode))) + max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f, + measuring_mode, rendering_params, &rendering_mode))) { ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; @@ -1313,7 +1322,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode, antialias_mode); + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, -- 2.11.0

1 0

[PATCH] kernel32: Add AttachConsole implementation.
by Jacek Caban 16 Aug '18

16 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41573 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43910 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 19 +++++- dlls/kernel32/tests/console.c | 131 +++++++++++++++++++++++++++++++++++++++--- server/console.c | 43 ++++++++++++++ server/protocol.def | 10 ++++ 4 files changed, 193 insertions(+), 10 deletions(-)

4 4

[PATCH 3/5] msvcrt: Don't read past end of string in _strncoll/_wcsncoll.
by Daniel Lehman 16 Aug '18

16 Aug '18

2 1

[PATCH 2/5] msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Daniel Lehman 16 Aug '18

16 Aug '18

2 1

[PATCH 1/2] d2d1: Fix scaling when rendering text in bitmap mode.
by Nikolay Sivov 16 Aug '18

16 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 67b3fab906..58e39b30b2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1107,10 +1107,10 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { - D2D1_MATRIX_3X2_F prev_transform, *transform; + D2D1_MATRIX_3X2_F prev_transform, *transform, scale, m; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1119,10 +1119,10 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; IDWriteFactory2 *dwrite_factory; - DWRITE_GLYPH_RUN scaled_run; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; + float scale_x, scale_y; D2D1_RECT_F run_rect; RECT bounds; HRESULT hr; @@ -1134,11 +1134,13 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - scaled_run = *glyph_run; - scaled_run.fontEmSize *= ppd; - hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, - (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, + m = render_target->drawing_state.transform; + memset(&scale, 0, sizeof(scale)); + scale._11 = render_target->desc.dpiX / 96.0f; + scale._22 = render_target->desc.dpiY / 96.0f; + d2d_matrix_multiply(&m, &scale); + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m, + rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) @@ -1194,13 +1196,18 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + scale_x = 96.0f / render_target->desc.dpiX; + scale_y = 96.0f / render_target->desc.dpiY; + d2d_rect_set(&run_rect, bounds.left * scale_x, bounds.top * scale_y, bounds.right * scale_x, + bounds.bottom * scale_y); + brush_desc.opacity = 1.0f; brush_desc.transform._11 = 1.0f; brush_desc.transform._12 = 0.0f; brush_desc.transform._21 = 0.0f; brush_desc.transform._22 = 1.0f; - brush_desc.transform._31 = bounds.left; - brush_desc.transform._32 = bounds.top; + brush_desc.transform._31 = run_rect.left; + brush_desc.transform._32 = run_rect.top; if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { @@ -1208,7 +1215,6 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } - d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom); if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr); @@ -1313,7 +1319,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode, antialias_mode); + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, -- 2.18.0

1 1

[PATCH] d3d11/tests: Add a test for CopySubresourceRegion() with 3D textures.
by Henri Verbeet 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 149543. --- dlls/d3d11/tests/d3d11.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 209 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d62342fa98..60c88f4a24c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11566,7 +11566,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11582,7 +11582,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11605,8 +11605,8 @@ static void test_copy_subresource_region(void) ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; - ID3D11DeviceContext *context; ID3D11DeviceContext1 *context1; + ID3D11DeviceContext *context; struct vec4 float_colors[16]; struct resource_readback rb; ID3D11PixelShader *ps; @@ -11773,7 +11773,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11789,7 +11789,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11821,7 +11821,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11896,7 +11896,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11908,6 +11908,207 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_3d(void) +{ + ID3D11ShaderResourceView *dst_srv, *src_srv; + ID3D11Texture3D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + ID3D11SamplerState *sampler_state; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture2d; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD data[4][16]; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position.xyz / float3(640, 480, 1)); + } +#endif + 0x43425844, 0x27b15ae8, 0xbebf46f7, 0x6cd88d8d, 0x5118de51, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture3d_desc.Width = 4; + texture3d_desc.Height = 4; + texture3d_desc.Depth = 4; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_DEFAULT; + texture3d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &src_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &dst_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 4; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture2d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(*data); ++i) + { + data[0][i] = 0xff0000ff; + data[1][i] = bitmap_data[i]; + data[2][i] = 0xff00ff00; + data[3][i] = 0xffff00ff; + } + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = data[i]; + resource_data[i].SysMemPitch = texture2d_desc.Width * sizeof(data[0][0]); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, resource_data, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)src_texture, NULL, &src_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)dst_texture, NULL, &dst_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &src_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 0.25f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 1.0f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &dst_srv); + + set_box(&box, 0, 0, 0, 4, 4, 2); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 2, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 2, 4, 4, 4); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 0, (ID3D11Resource *)src_texture, 0, &box); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 0.25f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 1.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(dst_srv); + ID3D11ShaderResourceView_Release(src_srv); + ID3D11Texture2D_Release(texture2d); + ID3D11Texture3D_Release(dst_texture); + ID3D11Texture3D_Release(src_texture); + release_test_context(&test_context); +} + static void test_resource_map(void) { D3D11_MAPPED_SUBRESOURCE mapped_subresource; @@ -27874,6 +28075,7 @@ START_TEST(d3d11) queue_test(test_fragment_coords); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_3d); queue_test(test_resource_map); queue_for_each_feature_level(test_resource_access); queue_test(test_check_multisample_quality_levels); -- 2.11.0

1 0

[PATCH 2/6] wined3d: Use snprintf() in init_debug_buffer() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This doesn't fix anything --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888ad4c1..76f86334886b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4340,9 +4340,9 @@ struct debug_buffer static void init_debug_buffer(struct debug_buffer *buffer, const char *default_string) { - strcpy(buffer->str, default_string); + snprintf(buffer->str, sizeof(buffer->str), default_string); buffer->ptr = buffer->str; - buffer->size = ARRAY_SIZE(buffer->str); + buffer->size = sizeof(buffer->str); } static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) @@ -4355,7 +4355,7 @@ static void debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + strcpy(&buffer->str[sizeof(buffer->str) - 4], "..."); return; } -- 2.16.4

3 2

[PATCH 3/3] dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 241db3b10b10..83e0f256748f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -846,7 +846,6 @@ struct dxgi_vk_funcs PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; - PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; PFN_vkGetPhysicalDeviceMemoryProperties p_vkGetPhysicalDeviceMemoryProperties; @@ -1640,19 +1639,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return FALSE; } - dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; - dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; - dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; - dxgi->p_vkDestroySwapchainKHR = vk->p_vkDestroySwapchainKHR; - dxgi->p_vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vk->p_vkGetDeviceProcAddr; dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; - dxgi->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = vk->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceFormatsKHR = vk->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - dxgi->p_vkGetPhysicalDeviceSurfacePresentModesKHR = vk->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceSupportKHR = vk->p_vkGetPhysicalDeviceSurfaceSupportKHR; - dxgi->p_vkGetPhysicalDeviceWin32PresentationSupportKHR = vk->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; - dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; #define LOAD_INSTANCE_PFN(name) \ if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ @@ -1660,7 +1647,14 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk ERR("Failed to get instance proc "#name".\n"); \ return FALSE; \ } + LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) + LOAD_INSTANCE_PFN(vkDestroySurfaceKHR) LOAD_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfacePresentModesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceWin32PresentationSupportKHR) #undef LOAD_INSTANCE_PFN #define LOAD_DEVICE_PFN(name) \ @@ -1680,13 +1674,17 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkCreateImage) LOAD_DEVICE_PFN(vkCreateSemaphore) + LOAD_DEVICE_PFN(vkCreateSwapchainKHR) LOAD_DEVICE_PFN(vkDestroyCommandPool) LOAD_DEVICE_PFN(vkDestroyFence) LOAD_DEVICE_PFN(vkDestroyImage) LOAD_DEVICE_PFN(vkDestroySemaphore) + LOAD_DEVICE_PFN(vkDestroySwapchainKHR) LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) + LOAD_DEVICE_PFN(vkGetSwapchainImagesKHR) + LOAD_DEVICE_PFN(vkQueuePresentKHR) LOAD_DEVICE_PFN(vkQueueSubmit) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences) -- 2.16.4

2 1

[PATCH 2/3] d3d12: Return DXGI_ERROR_SDK_COMPONENT_MISSING from D3D12GetDebugInterface().
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 324ad3cc4ee5..f0c48ee7af43 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -39,9 +39,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { - FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + TRACE("iid %s, debug %p.\n", debugstr_guid(iid), debug); - return E_NOTIMPL; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; } static HRESULT d3d12_signal_event(HANDLE event) -- 2.16.4

2 1

[PATCH 1/3] dxgi: Return DXGI_ERROR_SDK_COMPONENT_MISSING from DXGIGetDebugInterface1().
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- I did more testing and DXGI_ERROR_SDK_COMPONENT_MISSING is the correct error code to return. --- dlls/dxgi/dxgi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index cd2c39f4e14d..83c3f3734a77 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -253,6 +253,6 @@ HRESULT WINAPI DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug) { TRACE("flags %#x, iid %s, debug %p.\n", flags, debugstr_guid(iid), debug); - WARN("Returning E_NOINTERFACE.\n"); - return E_NOINTERFACE; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; } -- 2.16.4

2 1

[PATCH 5/6] wined3d: Allow copying between different texture types.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7e8cecca323..5079113120eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4090,14 +4090,6 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->type != dst_resource->type) - { - WARN("Resource types (%s / %s) don't match.\n", - debug_d3dresourcetype(dst_resource->type), - debug_d3dresourcetype(src_resource->type)); - return WINED3DERR_INVALIDCALL; - } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { @@ -4109,6 +4101,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (dst_resource->type == WINED3D_RTYPE_BUFFER) { + if (src_resource->type != WINED3D_RTYPE_BUFFER) + { + WARN("Resource types (%s / %s) don't match.\n", + debug_d3dresourcetype(dst_resource->type), + debug_d3dresourcetype(src_resource->type)); + return WINED3DERR_INVALIDCALL; + } + if (dst_sub_resource_idx) { WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); -- 2.16.4

2 1

[PATCH 1/6] wined3d: Add fall through comment in texture2d_blt_fbo() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5502d055c263..2f74ad689fd5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,6 +175,7 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 default: FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); + /* fall through */ case WINED3D_TEXF_NONE: case WINED3D_TEXF_POINT: gl_filter = GL_NEAREST; -- 2.16.4

2 1

[PATCH 4/6] wined3d: Mark vOutputControlPointID register as scalar.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 39bb06ad2658..5187bcf7291e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4109,6 +4109,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: case WINED3DSPR_LOOP: /* aL */ + case WINED3DSPR_OUTPOINTID: case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ case WINED3DSPR_SAMPLEMASK: /* oMask */ -- 2.16.4

2 1

[PATCH 3/6] wined3d: Use snprintf() in shader_arb_request_a0() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c05dca0046a2..97584b6124b3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -987,9 +987,10 @@ static void shader_arb_request_a0(const struct wined3d_shader_instruction *ins, struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; - if (!strcmp(priv->addr_reg, src)) return; + if (!strcmp(priv->addr_reg, src)) + return; - strcpy(priv->addr_reg, src); + snprintf(priv->addr_reg, sizeof(priv->addr_reg), src); shader_addline(buffer, "ARL A0.x, %s;\n", src); } -- 2.16.4

2 1

[PATCH v2 1/5] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 16 Aug '18

16 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45643 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3060896daa..c53276c70a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1428,6 +1428,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 5aa245cf1a..320b7cfa55 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index cae825defd..5865ee7c48 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..e9e5989f24 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

2 11

[PATCH] kernel32: Set environment variable %PUBLIC% on the process start-up.
by Dmitry Timoshkov 16 Aug '18

16 Aug '18

This patch fixes an installer that has "[%PUBLIC]\Documents" entry for some of the targets being copied from a cabinet file. Under Windows %PUBLIC% environment variable is set to C:\Users\Public. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..280f406627 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -520,6 +520,7 @@ static void set_additional_environment(void) static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; @@ -560,6 +561,7 @@ static void set_additional_environment(void) if (p > value && p[-1] != '\\') *p++ = '\\'; strcpyW( p, all_users_dir ); SetEnvironmentVariableW( allusersW, value ); + SetEnvironmentVariableW( publicW, value ); HeapFree( GetProcessHeap(), 0, value ); } -- 2.17.1

3 6

[PATCH vkd3d 2/2] build: Check how many arguments pthread_setname_np() takes.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Based on a patch by Chip Davis. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 2 +- libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 9 +++++++++ m4/check-functions.m4 | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a6104498a2f9..d437e1b73262 100644 --- a/configure.ac +++ b/configure.ac @@ -94,7 +94,7 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)]) VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) -VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +VKD3D_CHECK_PTHREAD_SETNAME_NP AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967e08b5..ff7cc9de314e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb9304a554..c928cc719828 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -818,4 +818,13 @@ HRESULT vkd3d_load_vk_device_procs(struct vkd3d_vk_device_procs *procs, extern const char vkd3d_build[]; +static inline void vkd3d_set_thread_name(const char *name) +{ +#if defined(HAVE_PTHREAD_SETNAME_NP_2) + pthread_setname_np(pthread_self(), name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_1) + pthread_setname_np(name); +#endif +} + #endif /* __VKD3D_PRIVATE_H */ diff --git a/m4/check-functions.m4 b/m4/check-functions.m4 index 17082a179719..4d018d6924a1 100644 --- a/m4/check-functions.m4 +++ b/m4/check-functions.m4 @@ -14,3 +14,42 @@ AC_DEFUN([VKD3D_CHECK_LIB_FUNCS], LIBS="$LIBS $2" AC_CHECK_FUNCS([$1], [$3], [$4]) LIBS="$vkd3d_libs_saved"]) + +dnl VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP], + [AC_MSG_CHECKING([how many arguments pthread_set_np() takes]) + AC_CACHE_VAL([vkd3d_cv_which_pthread_set_np], [ + +vkd3d_cv_which_pthread_set_np=unknown + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np(pthread_self(), "conftest")])], + [vkd3d_cv_which_pthread_set_np=two]) + +AS_IF([test "$vkd3d_cv_which_pthread_set_np" = "unknown"], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [pthread_setname_np("conftest")])], + [vkd3d_cv_which_pthread_set_np=one])]) + +]) dnl AC_CACHE_VAL + +AS_CASE(["$vkd3d_cv_which_pthread_set_np"], + [one], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_1], [1], + [Define to 1 if you have the one-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([one])], + + [two], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_2], [1], + [Define to 1 if you have the two-argument variant of pthread_setname_np().]) + AC_MSG_RESULT([two])], + + [AC_MSG_RESULT([unknown])]) + +]) dnl AC_DEFUN + +dnl VKD3D_CHECK_PTHREAD_SETNAME_NP +AC_DEFUN([VKD3D_CHECK_PTHREAD_SETNAME_NP], + [VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) + AS_IF([test "x$ac_cv_func_pthread_setname_np" = "xyes"], + [VKD3D_CHECK_WHICH_PTHREAD_SETNAME_NP])]) -- 2.16.4

3 2

[PATCH vkd3d 1/2] build: Disable demos by default.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 5 ++++- configure.ac | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 14f2d5168134..76cedc76e965 100644 --- a/Makefile.am +++ b/Makefile.am @@ -131,16 +131,19 @@ TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@ noinst_PROGRAMS += $(vkd3d_demos) -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) demos_gears_CFLAGS = $(DEMOS_CFLAGS) demos_gears_LDADD = $(DEMOS_LDADD) -lm demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) +endif + +EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@) diff --git a/configure.ac b/configure.ac index 2773a155cd78..a6104498a2f9 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler]) AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)])) AC_USE_SYSTEM_EXTENSIONS @@ -95,6 +96,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_ VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) -- 2.16.4

4 3

[PATCH vkd3d 02/12] libs/vkd3d: Assert that queue is valid in vkd3d_queue_acquire().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967e08b5..4536264a6c3b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -66,6 +66,7 @@ static VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue) return VK_NULL_HANDLE; } + assert(queue->vk_queue); return queue->vk_queue; } -- 2.16.4

2 1

[PATCH vkd3d 05/12] libs/vkd3d-shader: Require shader signature elements for shader outputs.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d7c80163c677..d62d553ed1dd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3236,7 +3236,7 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } -static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { unsigned int component_idx, component_count, output_component_count; @@ -3252,8 +3252,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp bool use_private_variable; uint32_t id, var_id; - signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, - &signature_idx, reg->idx[0].offset, dst->write_mask); + if (!(signature_element = vkd3d_find_signature_element_for_reg(compiler->output_signature, + &signature_idx, reg->idx[0].offset, dst->write_mask))) + { + FIXME("No signature element for shader output, ignoring shader output.\n"); + return; + } + builtin = vkd3d_get_spirv_builtin(dst->reg.type, sysval); component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); @@ -3265,7 +3270,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp } else { - component_type = signature_element ? signature_element->component_type : VKD3D_TYPE_FLOAT; + component_type = signature_element->component_type; output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); @@ -3286,15 +3291,12 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } - if (signature_element) - { - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - } + + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE - || (signature_element - && get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE); + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE; if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -3325,8 +3327,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *comp if (!compiler->output_setup_function_id) compiler->output_setup_function_id = vkd3d_spirv_alloc_id(builder); } - - return id; } static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, -- 2.16.4

2 1

[PATCH vkd3d 12/12] vkd3d: Try to keep current render pass as long as possible.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> A lot of Vulkan commands must be recorded outside a render pass. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 64 +++++++++++++++++++++++++++++++++++++++------- libs/vkd3d/vkd3d_private.h | 1 + 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7989401600b2..ce5f60fb6824 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1143,6 +1143,21 @@ static void d3d12_command_list_invalidate_current_pipeline(struct d3d12_command_ list->current_pipeline = VK_NULL_HANDLE; } +static void d3d12_command_list_end_current_render_pass(struct d3d12_command_list *list, + const struct vkd3d_vk_device_procs *vk_procs) +{ + if (list->current_render_pass) + VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); + + list->current_render_pass = VK_NULL_HANDLE; +} + +static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_command_list *list) +{ + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); +} + static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, struct d3d12_pipeline_state *state) { @@ -1396,6 +1411,9 @@ static void d3d12_command_list_track_resource_usage(struct d3d12_command_list *l { if (resource->flags & VKD3D_RESOURCE_INITIAL_STATE_TRANSITION) { + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_transition_resource_to_initial_state(list, resource); resource->flags &= ~VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; } @@ -1523,6 +1541,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_Close(ID3D12GraphicsCommandL } vk_procs = &list->device->vk_procs; + + d3d12_command_list_end_current_render_pass(list, vk_procs); + if ((vr = VK_CALL(vkEndCommandBuffer(list->vk_command_buffer))) < 0) { WARN("Failed to end command buffer, vr %d.\n", vr); @@ -2202,6 +2223,7 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list const struct vkd3d_vk_device_procs *vk_procs) { struct VkRenderPassBeginInfo begin_desc; + VkRenderPass vk_render_pass; if (!list->state) { @@ -2216,9 +2238,14 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS); + if (list->current_render_pass != VK_NULL_HANDLE) + return true; + + vk_render_pass = list->state->u.graphics.render_pass; + begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; begin_desc.pNext = NULL; - begin_desc.renderPass = list->state->u.graphics.render_pass; + begin_desc.renderPass = vk_render_pass; begin_desc.framebuffer = list->current_framebuffer; begin_desc.renderArea.offset.x = 0; begin_desc.renderArea.offset.y = 0; @@ -2228,6 +2255,8 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list begin_desc.pClearValues = NULL; VK_CALL(vkCmdBeginRenderPass(list->vk_command_buffer, &begin_desc, VK_SUBPASS_CONTENTS_INLINE)); + list->current_render_pass = vk_render_pass; + return true; } @@ -2245,7 +2274,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom vk_procs = &list->device->vk_procs; - /* FIXME: We probably don't want to begin a render pass for each draw. */ if (!d3d12_command_list_begin_render_pass(list, vk_procs)) { WARN("Failed to begin render pass, ignoring draw call.\n"); @@ -2254,8 +2282,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawInstanced(ID3D12GraphicsCom VK_CALL(vkCmdDraw(list->vk_command_buffer, vertex_count_per_instance, instance_count, start_vertex_location, start_instance_location)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); } static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12GraphicsCommandList *iface, @@ -2272,7 +2298,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap vk_procs = &list->device->vk_procs; - /* FIXME: We probably don't want to begin a render pass for each draw. */ if (!d3d12_command_list_begin_render_pass(list, vk_procs)) { WARN("Failed to begin render pass, ignoring draw call.\n"); @@ -2281,8 +2306,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_DrawIndexedInstanced(ID3D12Grap VK_CALL(vkCmdDrawIndexed(list->vk_command_buffer, index_count_per_instance, instance_count, start_vertex_location, base_vertex_location, start_instance_location)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); } static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandList *iface, @@ -2301,6 +2324,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_Dispatch(ID3D12GraphicsCommandL vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); VK_CALL(vkCmdDispatch(list->vk_command_buffer, x, y, z)); @@ -2328,6 +2353,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyBufferRegion(ID3D12Graphics d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + buffer_copy.srcOffset = src_offset; buffer_copy.dstOffset = dst_offset; buffer_copy.size = byte_count; @@ -2548,6 +2575,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (src->Type == D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX && dst->Type == D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT) { @@ -2661,6 +2690,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm d3d12_command_list_track_resource_usage(list, dst_resource); d3d12_command_list_track_resource_usage(list, src_resource); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (d3d12_resource_is_buffer(dst_resource)) { assert(d3d12_resource_is_buffer(src_resource)); @@ -2850,6 +2881,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) { d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); } d3d12_command_list_invalidate_current_pipeline(list); } @@ -2869,6 +2901,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC vk_procs = &list->device->vk_procs; + d3d12_command_list_end_current_render_pass(list, vk_procs); + for (i = 0; i < barrier_count; ++i) { unsigned int sub_resource_idx = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES; @@ -3486,6 +3520,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_render_pass(list); } static void d3d12_command_list_clear(struct d3d12_command_list *list, @@ -3504,6 +3539,8 @@ static void d3d12_command_list_clear(struct d3d12_command_list *list, unsigned int i; VkResult vr; + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (!rect_count) { full_rect.top = 0; @@ -3695,6 +3732,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID return; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); if (!cpu_descriptor->view_size) { @@ -3737,6 +3776,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_BeginQuery(ID3D12GraphicsComman TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (type == D3D12_QUERY_TYPE_OCCLUSION) flags = VK_QUERY_CONTROL_PRECISE_BIT; @@ -3753,6 +3794,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_EndQuery(ID3D12GraphicsCommandL TRACE("iface %p, heap %p, type %#x, index %u.\n", iface, heap, type, index); + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_query_heap_mark_result_as_available(query_heap, index); if (type == D3D12_QUERY_TYPE_TIMESTAMP) @@ -3798,6 +3841,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveQueryData(ID3D12Graphics return; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + if (type == D3D12_QUERY_TYPE_PIPELINE_STATISTICS) stride = sizeof(struct D3D12_QUERY_DATA_PIPELINE_STATISTICS); @@ -3887,8 +3932,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC VK_CALL(vkCmdDrawIndirect(list->vk_command_buffer, arg_impl->u.vk_buffer, arg_buffer_offset, max_command_count, signature_desc->ByteStride)); - - VK_CALL(vkCmdEndRenderPass(list->vk_command_buffer)); break; case D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH: @@ -3902,6 +3945,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ExecuteIndirect(ID3D12GraphicsC break; } + d3d12_command_list_end_current_render_pass(list, vk_procs); + d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_COMPUTE); VK_CALL(vkCmdDispatchIndirect(list->vk_command_buffer, @@ -4022,6 +4067,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; + list->current_render_pass = VK_NULL_HANDLE; memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); list->state = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9fa29fb59774..f9a2f5a18f0c 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -617,6 +617,7 @@ struct d3d12_command_list VkFramebuffer current_framebuffer; VkPipeline current_pipeline; + VkRenderPass current_render_pass; struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; struct d3d12_pipeline_state *state; -- 2.16.4

2 1

[PATCH vkd3d 11/12] vkd3d: Avoid invalidating current framebuffer needlessly.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 10 +++++++--- libs/vkd3d/state.c | 34 ++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3d57545b20e1..7989401600b2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2835,22 +2835,26 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics { struct d3d12_pipeline_state *state = unsafe_impl_from_ID3D12PipelineState(pipeline_state); struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); - list->state = state; d3d12_command_list_invalidate_bindings(list, state); if (d3d12_pipeline_state_is_compute(state)) { - const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } else { - d3d12_command_list_invalidate_current_framebuffer(list); + if (!d3d12_pipeline_state_is_render_pass_compatible(list->state, state)) + { + d3d12_command_list_invalidate_current_framebuffer(list); + } d3d12_command_list_invalidate_current_pipeline(list); } + + list->state = state; } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8b10a6269a9c..43b1c1574fd0 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1798,6 +1798,40 @@ static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *forma return VKD3D_NO_SWIZZLE; } +/* + * This must return results in accordance with render passes created by + * d3d12_pipeline_state_init_graphics(). + */ +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) +{ + const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; + const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; + unsigned int i; + + if (!state_a != !state_b) + return false; + if (!state_a && !state_b) + return true; + + if (state_a->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS + || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) + return false; + + if (a->rt_idx != b->rt_idx) + return false; + if (a->attachment_count != b->attachment_count) + return false; + + for (i = 0; i < a->attachment_count; ++i) + { + if (a->attachments[i].format != b->attachments[i].format) + return false; + } + + return true; +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 59741684dc38..9fa29fb59774 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -525,6 +525,8 @@ HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; +bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, + const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; struct vkd3d_buffer -- 2.16.4

2 1

[PATCH vkd3d 10/12] vkd3d: Avoid invalidating graphics pipeline and framebuffer.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Do not invalidate the current graphics pipeline and the current framebuffer when a compute pipeline is bound. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 9 ++++++--- libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9455898c07b3..3d57545b20e1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2839,15 +2839,18 @@ static void STDMETHODCALLTYPE d3d12_command_list_SetPipelineState(ID3D12Graphics TRACE("iface %p, pipeline_state %p.\n", iface, pipeline_state); list->state = state; - d3d12_command_list_invalidate_current_framebuffer(list); - d3d12_command_list_invalidate_current_pipeline(list); d3d12_command_list_invalidate_bindings(list, state); - if (state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) + if (d3d12_pipeline_state_is_compute(state)) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, state->vk_bind_point, state->u.compute.vk_pipeline)); } + else + { + d3d12_command_list_invalidate_current_framebuffer(list); + d3d12_command_list_invalidate_current_pipeline(list); + } } static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb9304a554..59741684dc38 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -516,6 +516,11 @@ struct d3d12_pipeline_state struct d3d12_device *device; }; +static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) +{ + return state && state->vk_bind_point == VK_PIPELINE_BIND_POINT_COMPUTE; +} + HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, -- 2.16.4

2 1

[PATCH vkd3d 09/12] vkd3d: Initialize all fields before calling d3d12_command_allocator_allocate_command_buffer().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 501a06764e24..9455898c07b3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4001,12 +4001,6 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->allocator = allocator; list->pipeline_state = initial_pipeline_state; - if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) - { - ID3D12Device_Release(&device->ID3D12Device_iface); - return hr; - } - memset(list->strides, 0, sizeof(list->strides)); list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; list->ia_desc.pNext = NULL; @@ -4025,6 +4019,12 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->state = NULL; + if (FAILED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { + ID3D12Device_Release(&device->ID3D12Device_iface); + return hr; + } + return S_OK; } -- 2.16.4

2 1

[PATCH vkd3d 08/12] tests: Add test for draw with no descriptor bindings.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a0185951999d..7b0040730aa0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3512,6 +3512,74 @@ static void test_draw_indexed_instanced(void) destroy_test_context(&context); } +static void test_draw_no_descriptor_bindings(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_DESCRIPTOR_RANGE descriptor_range[2]; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + descriptor_range[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range[0].NumDescriptors = 2; + descriptor_range[0].BaseShaderRegister = 0; + descriptor_range[0].RegisterSpace = 0; + descriptor_range[0].OffsetInDescriptorsFromTableStart = 1; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range[0]; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + + descriptor_range[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; + descriptor_range[1].NumDescriptors = 1; + descriptor_range[1].BaseShaderRegister = 0; + descriptor_range[1].RegisterSpace = 0; + descriptor_range[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[1].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[1].DescriptorTable.pDescriptorRanges = &descriptor_range[1]; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, NULL, NULL); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + destroy_test_context(&context); +} + static void test_multiple_render_targets(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -18053,6 +18121,7 @@ START_TEST(d3d12) run_test(test_clear_unordered_access_view); run_test(test_draw_instanced); run_test(test_draw_indexed_instanced); + run_test(test_draw_no_descriptor_bindings); run_test(test_multiple_render_targets); run_test(test_append_aligned_element); run_test(test_gpu_virtual_address); -- 2.16.4

2 1

[PATCH vkd3d 07/12] vkd3d: Call vkCmdBindDescriptorSets() only with valid descriptor set.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> If the current pipeline state doesn't need any descriptors it is perfectly valid to not have a descriptor set. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4536264a6c3b..501a06764e24 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2188,9 +2188,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis } bindings->descriptor_table_dirty_mask = 0; - bindings->in_use = true; - VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, - rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + if (bindings->descriptor_set) + { + VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, + rs->vk_pipeline_layout, rs->main_set, 1, &bindings->descriptor_set, 0, NULL)); + bindings->in_use = true; + } d3d12_command_list_update_uav_counter_descriptors(list, bind_point); } -- 2.16.4

2 1

[PATCH vkd3d 06/12] vkd3d: Add few more formats.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 98b764a169d1..e6b949d068cf 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -35,6 +35,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, @@ -52,6 +53,7 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR}, -- 2.16.4

2 1

[PATCH vkd3d 04/12] programs/vkd3d-compiler: Do not overallocate memory for shader code.
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a5dae19ef7cb..d7c80163c677 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2509,7 +2509,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_constant(struct vkd3d_dxbc_compile const struct vkd3d_shader_register *reg, DWORD swizzle, DWORD write_mask) { unsigned int component_count = vkd3d_write_mask_component_count(write_mask); - uint32_t values[VKD3D_VEC4_SIZE]; + uint32_t values[VKD3D_VEC4_SIZE] = {0}; unsigned int i, j; assert(reg->type == VKD3DSPR_IMMCONST); diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 83ccd3d65a4a..5fe4540ca17c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -46,7 +46,7 @@ static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) return false; } - if (!(code = malloc(sizeof(uint32_t) * shader->size))) + if (!(code = malloc(shader->size))) { fprintf(stderr, "Out of memory.\n"); fclose(fd); -- 2.16.4

3 2

[PATCH vkd3d 03/12] libs/vkd3d: Add fall-through comment to vkd3d_select_memory_type().
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1456c4b925e7..44f323350056 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -417,6 +417,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); + /* fall-through */ case D3D12_HEAP_TYPE_UPLOAD: case D3D12_HEAP_TYPE_READBACK: required_flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; -- 2.16.4

2 1

[PATCH vkd3d 01/12] libs/vkd3d: Fix return type of d3d12_root_signature_info_count_descriptors() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 973caeef9567..8b10a6269a9c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -334,7 +334,7 @@ struct d3d12_root_signature_info size_t cost; }; -static bool d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, +static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_DESCRIPTOR_RANGE *range) { if (range->NumDescriptors == 0xffffffff) -- 2.16.4

2 1

[PATCH vkd3d v3 1/7] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis 16 Aug '18

16 Aug '18

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Pull the pthread_setname_np(3) call into a header. Try 3: Detect which variant of pthread_setname_np(3) we have at configure time. configure.ac | 28 ++++++++++++++++++++++++++++ libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 11 +++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2773a15..973105b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,34 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AS_IF([test "x$ac_cv_func_pthread_setname_np" = xyes], + [AC_MSG_CHECKING([which variant of pthread_setname_np is present]) + AC_CACHE_VAL([vkd3d_cv_pthread_setname_np_variant], + [vkd3d_cv_pthread_setname_np_variant=unknown + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np(pthread_self(), "conftest");])], + [vkd3d_cv_pthread_setname_np_variant=twoarg], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np("conftest");])], + [vkd3d_cv_pthread_setname_np_variant=onearg])])]) + AS_CASE(["$vkd3d_cv_pthread_setname_np_variant"], + [onearg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_ONEARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that only accepts a name.]) + AC_MSG_RESULT([name only])], + [twoarg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_TWOARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that accepts a pthread handle and name.]) + AC_MSG_RESULT([pthread handle and name])], + [AC_MSG_RESULT([unknown])])]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..042d2f1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..ca9fbaf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,17 @@ struct vkd3d_vulkan_info VkPhysicalDeviceSparseProperties sparse_properties; }; +static inline void vkd3d_set_thread_name(const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef HAVE_PTHREAD_SETNAME_NP_ONEARG + pthread_setname_np(name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_TWOARG) + pthread_setname_np(pthread_self(), name); +#endif +#endif +} + struct vkd3d_instance { VkInstance vk_instance; -- 2.18.0

4 16

[PATCH] kernel32: Set environment variable %PUBLIC% on the process start-up. (v2)
by Dmitry Timoshkov 16 Aug '18

16 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/process.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1a303c58e1..9ec11796da 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -517,12 +517,14 @@ static void set_additional_environment(void) 'P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR profiles_valueW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; static const WCHAR all_users_valueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; + static const WCHAR public_valueW[] = {'P','u','b','l','i','c',0}; static const WCHAR computernameW[] = {'C','O','M','P','U','T','E','R','N','A','M','E',0}; static const WCHAR allusersW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR programdataW[] = {'P','r','o','g','r','a','m','D','a','t','a',0}; + static const WCHAR publicW[] = {'P','U','B','L','I','C',0}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL; + WCHAR *profile_dir = NULL, *all_users_dir = NULL, *program_data_dir = NULL, *public_dir = NULL; WCHAR buf[MAX_COMPUTERNAME_LENGTH+1]; HANDLE hkey; DWORD len; @@ -546,6 +548,7 @@ static void set_additional_environment(void) profile_dir = get_reg_value( hkey, profiles_valueW ); all_users_dir = get_reg_value( hkey, all_users_valueW ); program_data_dir = get_reg_value( hkey, programdataW ); + public_dir = get_reg_value( hkey, public_valueW ); NtClose( hkey ); } @@ -568,9 +571,15 @@ static void set_additional_environment(void) SetEnvironmentVariableW( programdataW, program_data_dir ); } + if (public_dir) + { + SetEnvironmentVariableW( publicW, public_dir ); + } + HeapFree( GetProcessHeap(), 0, all_users_dir ); HeapFree( GetProcessHeap(), 0, profile_dir ); HeapFree( GetProcessHeap(), 0, program_data_dir ); + HeapFree( GetProcessHeap(), 0, public_dir ); } /*********************************************************************** -- 2.17.1

1 0

[PATCH 2/2] include: Fix a typo.
by Zhiyi Zhang 16 Aug '18

16 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index c01d7c2e5a..455f8a42ca 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2792,7 +2792,7 @@ typedef struct tagTVITEMCHANGE UINT uStateNew; UINT uStateOld; LPARAM lParam; -} NVTVITEMCHANGE; +} NMTVITEMCHANGE; typedef struct tagNMTVASYNCDRAW { -- 2.18.0

2 2

[PATCH 5/5] wined3d: Set a LUID for WINED3D_NO3D adapters as well.
by Henri Verbeet 16 Aug '18

16 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be03a1d01d1..65a1bb1fabe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6641,14 +6641,6 @@ static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD w glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - return FALSE; - } - TRACE("Allocated LUID %08x:%08x for adapter %p.\n", - adapter->luid.HighPart, adapter->luid.LowPart, adapter); - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) { ERR("Failed to get a GL context for adapter %p.\n", adapter); @@ -6752,6 +6744,14 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); + if (!AllocateLocallyUniqueId(&adapter->luid)) + { + ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); + return FALSE; + } + TRACE("Allocated LUID %08x:%08x for adapter %p.\n", + adapter->luid.HighPart, adapter->luid.LowPart, adapter); + if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Share common code between wined3d_adapter_init() and wined3d_adapter_no3d_init().
by Henri Verbeet 16 Aug '18

16 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 48 +++++++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f9449f4d17..be03a1d01d1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6601,7 +6601,7 @@ static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD fla return wined3d_settings.max_gl_version; } -static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) +static BOOL wined3d_adapter_opengl_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = { @@ -6611,13 +6611,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - unsigned int i; - DISPLAY_DEVICEW display_device; DWORD max_gl_version; + unsigned int i; - TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); - - adapter->ordinal = ordinal; + TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL @@ -6716,11 +6713,6 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->vram_bytes)); - display_device.cb = sizeof(display_device); - EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); - strcpyW(adapter->DeviceName, display_device.DeviceName); - wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(adapter); @@ -6728,12 +6720,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter) { - DISPLAY_DEVICEW display_device; - - memset(adapter, 0, sizeof(*adapter)); - adapter->ordinal = ordinal; + TRACE("adapter %p.\n", adapter); adapter->driver_info.name = "Display"; adapter->driver_info.description = "WineD3D DirectDraw Emulation"; @@ -6749,12 +6738,23 @@ static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordi adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; + return TRUE; +} + +static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, DWORD wined3d_creation_flags) +{ + DISPLAY_DEVICEW display_device; + + adapter->ordinal = ordinal; + display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); - TRACE("DeviceName: %s\n", debugstr_w(display_device.DeviceName)); + TRACE("Display device: %s\n", debugstr_w(display_device.DeviceName)); strcpyW(adapter->DeviceName, display_device.DeviceName); - return TRUE; + if (wined3d_creation_flags & WINED3D_NO3D) + return wined3d_adapter_no3d_init(adapter); + return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); } static void STDMETHODCALLTYPE wined3d_null_wined3d_object_destroyed(void *parent) {} @@ -6766,20 +6766,14 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) { - BOOL ret; - wined3d->ref = 1; wined3d->flags = flags; - TRACE("Initializing adapters.\n"); + TRACE("Initialising adapters.\n"); - if (flags & WINED3D_NO3D) - ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); - else - ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); - if (!ret) + if (!wined3d_adapter_init(&wined3d->adapters[0], 0, flags)) { - WARN("Failed to initialize adapter.\n"); + WARN("Failed to initialise adapter.\n"); return E_FAIL; } wined3d->adapter_count = 1; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Rename wined3d_adapter_init_nogl() to wined3d_adapter_no3d_init().
by Henri Verbeet 16 Aug '18

16 Aug '18

Matching WINED3D_NO3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7d9a5e99eef..8f9449f4d17 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6728,7 +6728,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return TRUE; } -static BOOL wined3d_adapter_init_nogl(struct wined3d_adapter *adapter, UINT ordinal) +static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, UINT ordinal) { DISPLAY_DEVICEW display_device; @@ -6774,7 +6774,7 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) TRACE("Initializing adapters.\n"); if (flags & WINED3D_NO3D) - ret = wined3d_adapter_init_nogl(&wined3d->adapters[0], 0); + ret = wined3d_adapter_no3d_init(&wined3d->adapters[0], 0); else ret = wined3d_adapter_init(&wined3d->adapters[0], 0, flags); if (!ret) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Trace command stream opcodes.
by Henri Verbeet 16 Aug '18

16 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3f1ca8ce658..d6bc7399ca5 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -443,6 +443,65 @@ struct wined3d_cs_stop enum wined3d_cs_op opcode; }; +static const char *debug_cs_op(enum wined3d_cs_op op) +{ + switch (op) + { +#define WINED3D_TO_STR(type) case type: return #type + WINED3D_TO_STR(WINED3D_CS_OP_NOP); + WINED3D_TO_STR(WINED3D_CS_OP_PRESENT); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR); + WINED3D_TO_STR(WINED3D_CS_OP_DISPATCH); + WINED3D_TO_STR(WINED3D_CS_OP_DRAW); + WINED3D_TO_STR(WINED3D_CS_OP_FLUSH); + WINED3D_TO_STR(WINED3D_CS_OP_SET_PREDICATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VIEWPORTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SCISSOR_RECTS); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDERTARGET_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ); + WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_OUTPUT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_INDEX_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CONSTANT_BUFFER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SHADER); + WINED3D_TO_STR(WINED3D_CS_OP_SET_BLEND_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RASTERIZER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TEXTURE_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_SAMPLER_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_TRANSFORM); + WINED3D_TO_STR(WINED3D_CS_OP_SET_CLIP_PLANE); + WINED3D_TO_STR(WINED3D_CS_OP_SET_COLOR_KEY); + WINED3D_TO_STR(WINED3D_CS_OP_SET_MATERIAL); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT); + WINED3D_TO_STR(WINED3D_CS_OP_SET_LIGHT_ENABLE); + WINED3D_TO_STR(WINED3D_CS_OP_PUSH_CONSTANTS); + WINED3D_TO_STR(WINED3D_CS_OP_RESET_STATE); + WINED3D_TO_STR(WINED3D_CS_OP_CALLBACK); + WINED3D_TO_STR(WINED3D_CS_OP_QUERY_ISSUE); + WINED3D_TO_STR(WINED3D_CS_OP_PRELOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UNLOAD_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_MAP); + WINED3D_TO_STR(WINED3D_CS_OP_UNMAP); + WINED3D_TO_STR(WINED3D_CS_OP_BLT_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_UPDATE_SUB_RESOURCE); + WINED3D_TO_STR(WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION); + WINED3D_TO_STR(WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_COPY_UAV_COUNTER); + WINED3D_TO_STR(WINED3D_CS_OP_GENERATE_MIPMAPS); + WINED3D_TO_STR(WINED3D_CS_OP_STOP); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); + } +} + static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) { } @@ -2711,6 +2770,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; + TRACE("Executing %s.\n", debug_cs_op(opcode)); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -2719,6 +2779,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) } wined3d_cs_op_handlers[opcode](cs, packet->data); + TRACE("%s executed.\n", debug_cs_op(opcode)); } tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Rename build_dxtn_alpha_table() to build_bc3_alpha_table().
by Henri Verbeet 16 Aug '18

16 Aug '18

Since it's specific to BC3, as pointed out by Matteo. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888ad4c..800cdc4d2a5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -391,7 +391,7 @@ static void build_dxtn_colour_table(WORD colour0, WORD colour1, } } -static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +static void build_bc3_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) { unsigned int i; @@ -449,7 +449,7 @@ static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width alpha_bits = s[0]; if (format_id == WINED3DFMT_BC3_UNORM) { - build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + build_bc3_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); alpha_bits >>= 16; } -- 2.11.0

1 0

[PATCH 1/2] include: Add missing notification codes.
by Zhiyi Zhang 16 Aug '18

16 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/commctrl.h | 4 ++++ include/richedit.h | 3 +++ 2 files changed, 7 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index b9e3ae6c8c..c01d7c2e5a 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1034,6 +1034,7 @@ static const WCHAR WC_BUTTONW[] = { 'B','u','t','t','o','n',0 }; #define BCN_HOTITEMCHANGE (BCN_FIRST + 1) #define BCN_DROPDOWN (BCN_FIRST + 2) +#define NM_GETCUSTOMSPLITRECT (BCN_FIRST + 3) #define BCM_FIRST 0x1600 #define BCM_GETIDEALSIZE (BCM_FIRST + 1) @@ -1796,6 +1797,7 @@ static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', #define TTN_GETDISPINFO WINELIB_NAME_AW(TTN_GETDISPINFO) #define TTN_SHOW (TTN_FIRST-1) #define TTN_POP (TTN_FIRST-2) +#define TTN_LINKCLICK (TTN_FIRST-3) #define TTN_NEEDTEXT TTN_GETDISPINFO #define TTN_NEEDTEXTA TTN_GETDISPINFOA @@ -2289,6 +2291,7 @@ static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; #define PGN_LAST (0U-950U) #define PGN_SCROLL (PGN_FIRST-1) #define PGN_CALCSIZE (PGN_FIRST-2) +#define PGN_HOTITEMCHANGE (PGN_FIRST-3) #include <pshpack1.h> @@ -4723,6 +4726,7 @@ static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', /* Notifications */ +#define MCN_VIEWCHANGE MCN_FIRST #define MCN_SELCHANGE (MCN_FIRST + 1) #define MCN_GETDAYSTATE (MCN_FIRST + 3) #define MCN_SELECT (MCN_FIRST + 4) diff --git a/include/richedit.h b/include/richedit.h index 63221e2d9e..c2248436ac 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -205,6 +205,9 @@ static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2',' #define EN_LOWFIRTF 0x070f #define EN_ALIGNLTR 0x0710 #define EN_ALIGNRTL 0x0711 +#define EN_CLIPFORMAT 0x0712 +#define EN_STARTCOMPOSITION 0x0713 +#define EN_ENDCOMPOSITION 0x0714 typedef DWORD (CALLBACK * EDITSTREAMCALLBACK)( DWORD_PTR, LPBYTE, LONG, LONG * ); -- 2.18.0

1 0

[PATCH] kernel32: Don't clear WINEDEBUG in the debugger process if +winedbg is set.
by Zebediah Figura 16 Aug '18

16 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This provides a way to debug winedbg.exe itself, which is otherwise practically impossible. Inspired by bug 45369. dlls/kernel32/except.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..98f0d9f 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -54,6 +54,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(seh); +WINE_DECLARE_DEBUG_CHANNEL(winedbg); static PTOP_LEVEL_EXCEPTION_FILTER top_filter; @@ -289,15 +290,18 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) /* make WINEDEBUG empty in the environment */ env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) + if (!TRACE_ON(winedbg)) { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + for (p = env; *p; p += strlen(p) + 1) { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; + if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) + { + char *next = p + strlen(p); + char *end = next + 1; + while (*end) end += strlen(end) + 1; + memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); + break; + } } } -- 2.7.4

1 0

[PATCH] odbccp32: Handle NULL parameter in SQLWritePrivateProfileStringW
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 6 +++++- dlls/odbccp32/tests/misc.c | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 4ad51df..be68e6a 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1600,6 +1600,7 @@ BOOL WINAPI SQLWriteFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, LPCWSTR lpszString, LPCWSTR lpszFilename) { + static const WCHAR empty[] = {0}; LONG ret; HKEY hkey; @@ -1623,7 +1624,10 @@ BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry if ((ret = RegCreateKeyW(hkeyfilename, lpszSection, &hkey_section)) == ERROR_SUCCESS) { - ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + if(lpszString) + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)lpszString, (lstrlenW(lpszString)+1)*sizeof(WCHAR)); + else + ret = RegSetValueExW(hkey_section, lpszEntry, 0, REG_SZ, (BYTE*)empty, sizeof(empty)); RegCloseKey(hkey_section); } diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8a16a9e..be3873ac 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -171,6 +171,9 @@ static void test_SQLWritePrivateProfileString(void) { HKEY hkey; + ret = SQLWritePrivateProfileString("wineodbc", "testing" , NULL, "odbc.ini"); + ok(ret, "SQLWritePrivateProfileString failed\n"); + reg_ret = RegOpenKeyExW(HKEY_CURRENT_USER, odbc_key, 0, KEY_READ, &hkey); ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); if(reg_ret == ERROR_SUCCESS) -- 1.9.1

1 0

[PATCH] odbccp32: Correcly lookup driver in load_config_driver
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

RegGetValueW doesn't return ERROR_MORE_DATA when the buffer parameter is NULL, unlike other Reg functions. This also passes the correct parameter(reg_driver) on the second call to RegGetValueW. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index be68e6a..64f366a 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -235,19 +235,25 @@ static HMODULE load_config_driver(const WCHAR *driver) if ((ret = RegOpenKeyW(hkey, driver, &hkeydriver)) == ERROR_SUCCESS) { ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, NULL, &size); - if(ret == ERROR_MORE_DATA) + if(ret != ERROR_SUCCESS || type != REG_SZ) { - filename = HeapAlloc(GetProcessHeap(), 0, size); - if(!filename) - { - RegCloseKey(hkeydriver); - RegCloseKey(hkey); - push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_INVALID_DSN, odbc_error_invalid_dsn); - return NULL; - } - ret = RegGetValueW(hkeydriver, NULL, driver, RRF_RT_REG_SZ, &type, filename, &size); + return NULL; + } + + filename = HeapAlloc(GetProcessHeap(), 0, size); + if(!filename) + { + RegCloseKey(hkeydriver); + RegCloseKey(hkey); + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + return NULL; } + ret = RegGetValueW(hkeydriver, NULL, reg_driver, RRF_RT_REG_SZ, &type, filename, &size); RegCloseKey(hkeydriver); } -- 1.9.1

1 0

[PATCH] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 16 Aug '18

16 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/address.c | 96 +++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 242 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 541e104..b2af545 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 ws2_32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 user32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 4d55caa..173ad87 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -258,20 +258,96 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + const static WCHAR comma[] = {';',0}; + const static WCHAR format_stringW[] = {'%', 's','=','%','s',0}; + const static WCHAR format_stringA[] = {'%', 's','=','%','S',0}; + const static WCHAR format_dword[] = {'%', 's','=','%','d',0}; + static const WCHAR format_guid[] = { '%', 's','=','%', '%','7','B', + '%','0','8','X','-','%','0','4','X','-','%','0','4','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','%','%','7','D',0}; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + int position = strlenW(buffer); + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], comma); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + sprintfW( &buffer[position], format_guid, entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], entry->data.guid.Data4[3], + entry->data.guid.Data4[4], entry->data.guid.Data4[5], entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + break; + case DPNA_DATATYPE_STRING: + wsprintfW(&buffer[position], format_stringW, entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + wsprintfW(&buffer[position], format_dword, entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + wsprintfW(&buffer[position], format_stringA, entry->name, entry->data.ansi); + break; + case DPNA_DATATYPE_BINARY: + break; + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, size, NULL, NULL); + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a1dcdef..526f41f 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -305,6 +305,159 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const WCHAR urlW1[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D',0 }; + static const WCHAR urlW2[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',0 }; + static const WCHAR urlW3[] = {'x','-','d','i','r','e','c','t','p','l','a','y',':','/','p','r','o','v','i','d','e','r', + '=','%','7','B','E','B','F','E','7','B','A','0','-','6','2','8','D','-','1','1','D','2', + '-','A','E','0','F','-','0','0','6','0','9','7','B','0','1','4','1','1','%','7','D', + ';','p','o','r','t','=','4','3','2','1',';','h','o','s','t','n','a','m','e','=','l', + 'o','c','a','l','h','o','s','t', 0 }; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW1, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW2, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(urlW3, buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -382,6 +535,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 1.9.1

1 0

[PATCH] winemac.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 16 Aug '18

16 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Not compile tested so if somebody with a Mac could check it that would be much appreciated. dlls/winemac.drv/clipboard.c | 12 ++++---- dlls/winemac.drv/display.c | 8 ++--- dlls/winemac.drv/gdi.c | 3 +- dlls/winemac.drv/keyboard.c | 70 ++++++++++++++++++++---------------------- dlls/winemac.drv/macdrv_main.c | 4 +-- dlls/winemac.drv/mouse.c | 10 +++--- dlls/winemac.drv/opengl.c | 30 +++++++++--------- dlls/winemac.drv/systray.c | 2 +- dlls/winemac.drv/window.c | 2 +- 9 files changed, 69 insertions(+), 72 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ac0dc3101a..cf5d56b1f1 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -280,7 +280,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - if (!GetClipboardFormatNameW(format->format_id, buffer, sizeof(buffer) / sizeof(buffer[0]))) + if (!GetClipboardFormatNameW(format->format_id, buffer, ARRAY_SIZE(buffer))) { WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); HeapFree(GetProcessHeap(), 0, format); @@ -347,7 +347,7 @@ static void register_builtin_formats(void) WINE_CLIPFORMAT *format; /* Register built-in formats */ - for (i = 0; i < sizeof(builtin_format_ids)/sizeof(builtin_format_ids[0]); i++) + for (i = 0; i < ARRAY_SIZE(builtin_format_ids); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = builtin_format_ids[i].id; @@ -360,7 +360,7 @@ static void register_builtin_formats(void) } /* Register known mappings between Windows formats and Mac types */ - for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(builtin_format_names); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); @@ -1841,12 +1841,12 @@ static LRESULT CALLBACK clipboard_wndproc(HWND hwnd, UINT msg, WPARAM wp, LPARAM static BOOL wait_clipboard_mutex(void) { static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + sizeof(prefix) / sizeof(WCHAR)]; + WCHAR buffer[MAX_PATH + ARRAY_SIZE(prefix)]; HANDLE mutex; memcpy(buffer, prefix, sizeof(prefix)); if (!GetUserObjectInformationW(GetProcessWindowStation(), UOI_NAME, - buffer + sizeof(prefix) / sizeof(WCHAR), + buffer + ARRAY_SIZE(prefix), sizeof(buffer) - sizeof(prefix), NULL)) { ERR("failed to get winstation name\n"); @@ -1873,7 +1873,7 @@ static BOOL CALLBACK init_pipe_name(INIT_ONCE* once, void* param, void** context memcpy(clipboard_pipe_name, prefix, sizeof(prefix)); if (!GetUserObjectInformationW(GetProcessWindowStation(), UOI_NAME, - clipboard_pipe_name + sizeof(prefix) / sizeof(WCHAR), + clipboard_pipe_name + ARRAY_SIZE(prefix), sizeof(clipboard_pipe_name) - sizeof(prefix), NULL)) { ERR("failed to get winstation name\n"); diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 49892ca3ef..00ad7738bb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -519,7 +519,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o CFSTR("pixel_encoding"), CFSTR("refresh_rate"), }; - const void* values[sizeof(keys) / sizeof(keys[0])] = { + const void* values[ARRAY_SIZE(keys)] = { cf_io_flags, cf_width, cf_height, @@ -527,7 +527,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o cf_refresh, }; - ret = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, sizeof(keys) / sizeof(keys[0]), + ret = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, ARRAY_SIZE(keys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); } @@ -1182,7 +1182,7 @@ BOOL macdrv_GetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) struct macdrv_display *displays; int num_displays; uint32_t mac_entries; - int win_entries = sizeof(r->red) / sizeof(r->red[0]); + int win_entries = ARRAY_SIZE(r->red); CGGammaValue *red, *green, *blue; CGError err; int win_entry; @@ -1316,7 +1316,7 @@ BOOL macdrv_SetDeviceGammaRamp(PHYSDEV dev, LPVOID ramp) DDGAMMARAMP *r = ramp; struct macdrv_display *displays; int num_displays; - int win_entries = sizeof(r->red) / sizeof(r->red[0]); + int win_entries = ARRAY_SIZE(r->red); CGGammaValue *red, *green, *blue; int i; CGError err = kCGErrorFailure; diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 77da2334ee..79dc3488cc 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -72,8 +72,7 @@ static void compute_desktop_rect(void) uint32_t count, i; desktop_rect = CGRectNull; - if (CGGetActiveDisplayList(sizeof(displayIDs)/sizeof(displayIDs[0]), - displayIDs, &count) != kCGErrorSuccess || + if (CGGetActiveDisplayList(ARRAY_SIZE(displayIDs), displayIDs, &count) != kCGErrorSuccess || !count) { displayIDs[0] = CGMainDisplayID(); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 3e0ebbf6ec..aa47b95ed0 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -456,7 +456,7 @@ static DWORD get_lcid(CFStringRef lang) WCHAR str[10]; range.location = 0; - range.length = min(CFStringGetLength(lang), sizeof(str) / sizeof(str[0]) - 1); + range.length = min(CFStringGetLength(lang), ARRAY_SIZE(str) - 1); CFStringGetCharacters(lang, range, str); str[range.length] = 0; return LocaleNameToLCID(str, 0); @@ -593,7 +593,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) optionKey >> 8, (shiftKey | optionKey) >> 8, }; - UniChar map[128][sizeof(modifier_combos) / sizeof(modifier_combos[0])][4 + 1]; + UniChar map[128][ARRAY_SIZE(modifier_combos)][4 + 1]; int combo; BYTE vkey_used[256]; int ignore_diacritics; @@ -673,7 +673,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) memset(thread_data->keyc2vkey, 0, sizeof(thread_data->keyc2vkey)); memset(vkey_used, 0, sizeof(vkey_used)); - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { thread_data->keyc2scan[keyc] = default_map[keyc].scan; if (default_map[keyc].fixed) @@ -708,14 +708,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Using the keyboard layout, build a map of key code + modifiers -> characters. */ memset(map, 0, sizeof(map)); - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* assigned a fixed vkey */ TRACE("keyc 0x%04x: ", keyc); - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { UInt32 deadKeyState; UniCharCount len; @@ -724,8 +724,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, modifier_combos[combo], thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, - &deadKeyState, sizeof(map[keyc][combo])/sizeof(map[keyc][combo][0]) - 1, - &len, map[keyc][combo]); + &deadKeyState, ARRAY_SIZE(map[keyc][combo]) - 1, &len, map[keyc][combo]); if (status != noErr) map[keyc][combo][0] = 0; @@ -741,14 +740,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) second pass, accept matches with diacritical marks. */ for (ignore_diacritics = 0; ignore_diacritics <= 1; ignore_diacritics++) { - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { for (vkey = 'A'; vkey <= 'Z'; vkey++) { if (vkey_used[vkey]) continue; - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; @@ -767,14 +766,14 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) } /* Next try to match key codes to the vkeys for the digits 0 through 9. */ - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { for (vkey = '0'; vkey <= '9'; vkey++) { if (vkey_used[vkey]) continue; - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) continue; @@ -793,16 +792,16 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Now try to match key codes for certain common punctuation characters to the most common OEM vkeys (e.g. '.' to VK_OEM_PERIOD). */ - for (i = 0; i < sizeof(symbol_vkeys) / sizeof(symbol_vkeys[0]); i++) + for (i = 0; i < ARRAY_SIZE(symbol_vkeys); i++) { vkey = symbol_vkeys[i].vkey; if (vkey_used[vkey]) continue; - for (combo = 0; combo < sizeof(modifier_combos) / sizeof(modifier_combos[0]); combo++) + for (combo = 0; combo < ARRAY_SIZE(modifier_combos); combo++) { - for (keyc = 0; keyc < sizeof(map) / sizeof(map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc] || !map[keyc][combo][0]) @@ -825,7 +824,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* For those key codes still without a vkey, try to use the default vkey from the default map, if it's still available. */ - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { DWORD vkey = default_map[keyc].vkey; @@ -844,7 +843,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) map, but whose normal letter vkey wasn't available, try to find a different letter. */ vkey = 'A'; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (default_map[keyc].vkey < 'A' || 'Z' < default_map[keyc].vkey) continue; /* not a letter in ANSI layout */ @@ -864,7 +863,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Same thing but with the digits. */ vkey = '0'; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (default_map[keyc].vkey < '0' || '9' < default_map[keyc].vkey) continue; /* not a digit in ANSI layout */ @@ -885,7 +884,7 @@ void macdrv_compute_keyboard_layout(struct macdrv_thread_data *thread_data) /* Last chance. Assign any available vkey. */ vkey_range = 0; vkey = vkey_ranges[vkey_range].first; - for (keyc = 0; keyc < sizeof(default_map) / sizeof(default_map[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(default_map); keyc++) { if (!thread_data->keyc2scan[keyc]) continue; /* not a known Mac key code */ if (thread_data->keyc2vkey[keyc]) continue; /* already assigned */ @@ -1012,7 +1011,7 @@ void macdrv_key_event(HWND hwnd, const macdrv_event *event) thread_data->last_modifiers = event->key.modifiers; - if (event->key.keycode < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (event->key.keycode < ARRAY_SIZE(thread_data->keyc2vkey)) { vkey = thread_data->keyc2vkey[event->key.keycode]; scan = thread_data->keyc2scan[event->key.keycode]; @@ -1072,7 +1071,7 @@ void macdrv_hotkey_press(const macdrv_event *event) event->hotkey_press.vkey, event->hotkey_press.mod_flags, event->hotkey_press.keycode, event->hotkey_press.time_ms); - if (event->hotkey_press.keycode < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0])) + if (event->hotkey_press.keycode < ARRAY_SIZE(thread_data->keyc2vkey)) { WORD scan = thread_data->keyc2scan[event->hotkey_press.keycode]; BYTE keystate[256]; @@ -1144,10 +1143,10 @@ void macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *ke flags &= ~(NX_COMMANDMASK | NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK); /* Find the Mac keycode corresponding to the scan code */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == vkey) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) return; TRACE("flags 0x%08x keyc 0x%04x\n", flags, keyc); @@ -1223,7 +1222,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) int scan, keyc; scan = (lparam >> 16) & 0x1FF; - for (keyc = 0; keyc < sizeof(thread_data->keyc2scan)/sizeof(thread_data->keyc2scan[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2scan); keyc++) { if (thread_data->keyc2scan[keyc] == scan) { @@ -1264,7 +1263,7 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) if (scan & 0x100) vkey |= 0x100; - for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(vkey_names); i++) { if (vkey_names[i].vkey == vkey) { @@ -1382,7 +1381,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) } /* vkey -> keycode -> scan */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) { if (thread_data->keyc2vkey[keyc] == wCode) { @@ -1395,7 +1394,7 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) case MAPVK_VSC_TO_VK: /* scan-code to vkey-code */ case MAPVK_VSC_TO_VK_EX: /* scan -> keycode -> vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if ((thread_data->keyc2scan[keyc] & 0xFF) == (wCode & 0xFF)) { ret = thread_data->keyc2vkey[keyc]; @@ -1445,10 +1444,10 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == wCode) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN("Unknown virtual key %X\n", wCode); break; @@ -1458,15 +1457,14 @@ UINT CDECL macdrv_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, - thread_data->keyboard_type, 0, &deadKeyState, - sizeof(s)/sizeof(s[0]), &len, s); + thread_data->keyboard_type, 0, &deadKeyState, ARRAY_SIZE(s), &len, s); if (status == noErr && !len && deadKeyState) { deadKey = TRUE; deadKeyState = 0; status = UCKeyTranslate(uchr, keyc, kUCKeyActionDown, 0, thread_data->keyboard_type, kUCKeyTranslateNoDeadKeysMask, - &deadKeyState, sizeof(s)/sizeof(s[0]), &len, s); + &deadKeyState, ARRAY_SIZE(s), &len, s); } if (status == noErr && len) @@ -1496,10 +1494,10 @@ BOOL CDECL macdrv_RegisterHotKey(HWND hwnd, UINT mod_flags, UINT vkey) TRACE_(key)("hwnd %p mod_flags 0x%04x vkey 0x%04x\n", hwnd, mod_flags, vkey); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == vkey) break; - if (keyc >= sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN_(key)("ignoring unknown virtual key 0x%04x\n", vkey); return TRUE; @@ -1641,10 +1639,10 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState modifierKeyState |= (optionKey >> 8); /* Find the Mac keycode corresponding to the vkey */ - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) if (thread_data->keyc2vkey[keyc] == virtKey) break; - if (keyc >= sizeof(thread_data->keyc2vkey)/sizeof(thread_data->keyc2vkey[0])) + if (keyc >= ARRAY_SIZE(thread_data->keyc2vkey)) { WARN_(key)("Unknown virtual key 0x%04x\n", virtKey); goto done; @@ -1780,7 +1778,7 @@ SHORT CDECL macdrv_VkKeyScanEx(WCHAR wChar, HKL hkl) modifierKeyState |= (cmdKey >> 8); } - for (keyc = 0; keyc < sizeof(thread_data->keyc2vkey) / sizeof(thread_data->keyc2vkey[0]); keyc++) + for (keyc = 0; keyc < ARRAY_SIZE(thread_data->keyc2vkey); keyc++) { UInt32 deadKeyState = 0; UniChar uchar; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 4bd74112b5..7abeea9db8 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -90,7 +90,7 @@ const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } @@ -242,7 +242,7 @@ static void load_strings(HINSTANCE instance) return; } - for (i = 0; i < sizeof(ids) / sizeof(ids[0]); i++) + for (i = 0; i < ARRAY_SIZE(ids); i++) { LPCWSTR str; int len = LoadStringW(instance, ids[i], (LPWSTR)&str, 0); diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 91c5b8895b..a6369c6168 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -225,7 +225,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) } /* Make sure it's one of the appropriate NSCursor class methods. */ - for (i = 0; i < sizeof(cocoa_cursor_names) / sizeof(cocoa_cursor_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(cocoa_cursor_names); i++) if (CFEqual(cursor_name, cocoa_cursor_names[i])) goto done; @@ -238,9 +238,9 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) if (info->szResName[0]) goto done; /* only integer resources are supported here */ if (!(module = GetModuleHandleW(info->szModName))) goto done; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE(module_cursors); i++) if (GetModuleHandleW(module_cursors[i].name) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + if (i == ARRAY_SIZE(module_cursors)) goto done; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++) @@ -276,7 +276,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, CGPoint hot_spot; CFDictionaryRef hot_spot_dict; const CFStringRef keys[] = { CFSTR("image"), CFSTR("hotSpot") }; - CFTypeRef values[sizeof(keys) / sizeof(keys[0])]; + CFTypeRef values[ARRAY_SIZE(keys)]; CFDictionaryRef frame; CFArrayRef frames; @@ -444,7 +444,7 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, values[0] = cgmasked; values[1] = hot_spot_dict; - frame = CFDictionaryCreate(NULL, (const void**)keys, values, sizeof(keys) / sizeof(keys[0]), + frame = CFDictionaryCreate(NULL, (const void**)keys, values, ARRAY_SIZE(keys), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); CFRelease(hot_spot_dict); diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index f11727fe8a..d83a4cea57 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -328,7 +328,7 @@ static const char* debugstr_attrib(int attrib, int value) const char *attrib_name = NULL; const char *value_name = NULL; - for (i = 0; i < sizeof(attrib_names) / sizeof(attrib_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(attrib_names); i++) { if (attrib_names[i].attrib == attrib) { @@ -386,7 +386,7 @@ static CGOpenGLDisplayMask active_displays_mask(void) uint32_t count, i; CGOpenGLDisplayMask mask; - err = CGGetActiveDisplayList(sizeof(displays) / sizeof(displays[0]), displays, &count); + err = CGGetActiveDisplayList(ARRAY_SIZE(displays), displays, &count); if (err != kCGErrorSuccess) { displays[0] = CGMainDisplayID(); @@ -473,7 +473,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE(" Double buffer: %s\n", (renderer->buffer_modes & kCGLDoubleBufferBit) ? "YES" : "NO"); TRACE("Color buffer modes:\n"); - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (renderer->color_modes & color_modes[i].mode) { @@ -485,7 +485,7 @@ static void dump_renderer(const renderer_properties* renderer) } TRACE("Accumulation buffer sizes: { "); - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (renderer->accum_modes & color_modes[i].mode) TRACE("%d, ", color_modes[i].color_bits); @@ -493,7 +493,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE("}\n"); TRACE("Depth buffer sizes: { "); - for (i = 0; i < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(depth_stencil_modes); i++) { if (renderer->depth_modes & depth_stencil_modes[i].mode) TRACE("%d, ", depth_stencil_modes[i].bits); @@ -501,7 +501,7 @@ static void dump_renderer(const renderer_properties* renderer) TRACE("}\n"); TRACE("Stencil buffer sizes: { "); - for (i = 0; i < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(depth_stencil_modes); i++) { if (renderer->stencil_modes & depth_stencil_modes[i].mode) TRACE("%d, ", depth_stencil_modes[i].bits); @@ -565,7 +565,7 @@ static unsigned int best_color_mode(GLint modes, GLint color_size, GLint alpha_s int best = -1; int i; - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if ((modes & color_modes[i].mode) && color_modes[i].color_bits >= color_size && @@ -593,7 +593,7 @@ static unsigned int best_color_mode(GLint modes, GLint color_size, GLint alpha_s if (best < 0) { /* Couldn't find a match. Return first one that renderer supports. */ - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if (modes & color_modes[i].mode) return i; @@ -609,7 +609,7 @@ static unsigned int best_accum_mode(GLint modes, GLint accum_size) int best = -1; int i; - for (i = 0; i < sizeof(color_modes)/sizeof(color_modes[0]); i++) + for (i = 0; i < ARRAY_SIZE(color_modes); i++) { if ((modes & color_modes[i].mode) && color_modes[i].color_bits >= accum_size) { @@ -633,7 +633,7 @@ static unsigned int best_accum_mode(GLint modes, GLint accum_size) if (best < 0) { /* Couldn't find a match. Return last one that renderer supports. */ - for (i = sizeof(color_modes)/sizeof(color_modes[0]) - 1; i >= 0; i--) + for (i = ARRAY_SIZE(color_modes) - 1; i >= 0; i--) { if (modes & color_modes[i].mode) return i; @@ -701,7 +701,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.aux_buffers = aux; n_stack[++n_stack_idx] = n; - for (color_mode = 0; color_mode < sizeof(color_modes)/sizeof(color_modes[0]); color_mode++) + for (color_mode = 0; color_mode < ARRAY_SIZE(color_modes); color_mode++) { unsigned int depth_mode; @@ -719,7 +719,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.color_mode = color_mode; n_stack[++n_stack_idx] = n; - for (depth_mode = 0; depth_mode < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); depth_mode++) + for (depth_mode = 0; depth_mode < ARRAY_SIZE(depth_stencil_modes); depth_mode++) { unsigned int stencil_mode; @@ -733,7 +733,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA request.depth_bits = depth_stencil_modes[depth_mode].bits; n_stack[++n_stack_idx] = n; - for (stencil_mode = 0; stencil_mode < sizeof(depth_stencil_modes)/sizeof(depth_stencil_modes[0]); stencil_mode++) + for (stencil_mode = 0; stencil_mode < ARRAY_SIZE(depth_stencil_modes); stencil_mode++) { unsigned int stereo; @@ -767,7 +767,7 @@ static void enum_renderer_pixel_formats(renderer_properties renderer, CFMutableA /* Starts at -1 for a 0 accum size */ n_stack[++n_stack_idx] = n; - for (accum_mode = -1; accum_mode < (int)(sizeof(color_modes)/sizeof(color_modes[0])); accum_mode++) + for (accum_mode = -1; accum_mode < (int) ARRAY_SIZE(color_modes); accum_mode++) { unsigned int target_pass; @@ -4265,7 +4265,7 @@ static BOOL init_opengl(void) return FALSE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + for (i = 0; i < ARRAY_SIZE(opengl_func_names); i++) { if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym(opengl_handle, opengl_func_names[i], NULL, 0))) { diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 9351d7796f..a2c32b238f 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -147,7 +147,7 @@ static BOOL modify_icon(struct tray_icon *icon, NOTIFYICONDATAW *nid) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptext, nid->szTip, ARRAY_SIZE(icon->tiptext)); if (icon->status_item) update_tooltip = TRUE; } diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6558824bd3..b7a09634ee 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -710,7 +710,7 @@ static void create_cocoa_window(struct macdrv_win_data *data) set_cocoa_window_properties(data); /* set the window text */ - if (!InternalGetWindowText(data->hwnd, text, sizeof(text)/sizeof(WCHAR))) text[0] = 0; + if (!InternalGetWindowText(data->hwnd, text, ARRAY_SIZE(text))) text[0] = 0; macdrv_set_cocoa_window_title(data->cocoa_window, text, strlenW(text)); /* set the window region */ -- 2.14.4

2 1

[PATCH 5/5] msvcrt: Don't read past end of string in _strnicoll/_wcsnicoll.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH 4/5] msvcrt/tests: Add tests for _strnicoll/_wcsnicoll.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH 1/5] kernel32/tests: Add some CompareStringA/W tests.
by Daniel Lehman 15 Aug '18

15 Aug '18

1 0

[PATCH] winebus.sys: Do not report HID report read errors unconditionally
by Kai Krakow 15 Aug '18

15 Aug '18

Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's report this situation only once at most. If we already know the multi-event situation, let's skip logging this completely: We won't loose any information anyway because the report contains a complete device state and only axis positions were updated. Thus, this commit adds a parameter to process_hid_report() to let it know if we are currently processing reports that are known to be sent multiple times in sequence (with updated reports). Also, if our consumers are slow to respond, then report the issue only once and not per each occurrence during the duration of one consumer read cycle. Finally, this is not really an error, it's a warning at most, thus degrade the error message to a warning to not pollute peoples consoles and logs with unimportant stuff. Especially during gaming I was seeing screens over screens full of only this single log message. This commit fixes it. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 CC: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus.h | 2 +- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 12 ++++++------ dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 18 +++++++++++++++--- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf93c04259..1e2989e5c5 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -45,7 +45,7 @@ DEVICE_OBJECT *bus_create_hid_device(DRIVER_OBJECT *driver, const WCHAR *busidW, DEVICE_OBJECT *bus_find_hid_device(const platform_vtbl *vtbl, void *platform_dev) DECLSPEC_HIDDEN; void bus_remove_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN; -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length, BOOL warn_multi_events) DECLSPEC_HIDDEN; DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) DECLSPEC_HIDDEN; /* General Bus Functions */ diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 501a40d26e..74e5d82c9f 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -135,7 +135,7 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, uint32_t reportID, uint8_t *report, CFIndex report_length) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; - process_hid_report(device, report, report_length); + process_hid_report(device, report, report_length, TRUE); } static int compare_platform_device(DEVICE_OBJECT *device, void *platform_dev) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 159727f6bc..99a206cb34 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -683,7 +683,7 @@ static BOOL set_report_from_event(SDL_Event *event) set_button_value(ie->button, ie->state, private->report_buffer); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); break; } case SDL_JOYAXISMOTION: @@ -693,7 +693,7 @@ static BOOL set_report_from_event(SDL_Event *event) if (ie->axis < 6) { set_axis_value(private, ie->axis, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); } break; } @@ -702,7 +702,7 @@ static BOOL set_report_from_event(SDL_Event *event) SDL_JoyBallEvent *ie = &event->jball; set_ball_value(private, ie->ball, ie->xrel, ie->yrel); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); break; } case SDL_JOYHATMOTION: @@ -710,7 +710,7 @@ static BOOL set_report_from_event(SDL_Event *event) SDL_JoyHatEvent *ie = &event->jhat; set_hat_value(private, ie->hat, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); break; } default: @@ -765,7 +765,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) if (usage >= 0) { set_button_value(usage, ie->state, private->report_buffer); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, TRUE); } break; } @@ -774,7 +774,7 @@ static BOOL set_mapped_report_from_event(SDL_Event *event) SDL_ControllerAxisEvent *ie = &event->caxis; set_axis_value(private, ie->axis, ie->value); - process_hid_report(device, private->report_buffer, private->buffer_length); + process_hid_report(device, private->report_buffer, private->buffer_length, FALSE); break; } default: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index d34e18c71c..47b9758ac2 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -768,7 +768,7 @@ static DWORD CALLBACK device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else - process_hid_report(device, report_buffer, size); + process_hid_report(device, report_buffer, size, TRUE); } return 0; } @@ -979,7 +979,7 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else if (set_report_from_event(private, &ie)) - process_hid_report(device, private->current_report_buffer, private->buffer_length); + process_hid_report(device, private->current_report_buffer, private->buffer_length, TRUE); } return 0; } diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2f3c05aa96..624ddd5f8d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -614,11 +614,12 @@ NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length, BOOL warn_multi_events) { struct device_extension *ext = (struct device_extension*)device->DeviceExtension; IRP *irp; LIST_ENTRY *entry; + static int overwrite_reported; if (!length || !report) return; @@ -641,8 +642,18 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); + /* + * Device reports may come in faster than our consumers could possibly + * read them, this is especially true for multi-axis events: When you move + * a stick across its range, it will always generate at least two events, + * one for the x axis, and one for the y axis. This is not really an error + * situation, so let's report this situation only once at most. If we + * already know the multi-event situation, let's skip logging this + * completely: We won't loose any information anyway because the report + * contains a complete device state and only axis positions were updated. + */ + if (warn_multi_events && !ext->last_report_read && !overwrite_reported++) + WARN_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); memcpy(ext->last_report, report, length); ext->last_report_size = length; @@ -659,6 +670,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) irp->UserBuffer, &irp->IoStatus.Information); ext->last_report_read = TRUE; IoCompleteRequest(irp, IO_NO_INCREMENT); + overwrite_reported = 0; } LeaveCriticalSection(&ext->report_cs); } -- 2.16.4

3 7

[PATCH v2] winebus.sys: Do not report HID report read errors unconditionally
by Kai Krakow 15 Aug '18

15 Aug '18

Device reports may come in faster than our consumers could possibly read them, this is especially true for multi-axis events: When you move a stick across its range, it will always generate at least two events, one for the x axis, and one for the y axis. This is not really an error situation, so let's just discard the error message. We cannot completely get rid of `last_report_read`, tho, as it is used to track delivery of the report in different places and if true, try to deliver the report to queued readers. v2: Do not add complexity and just discard the message as suggested by Alexandre Julliard and approved by Aric Stewart. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43125 CC: Aric Stewart <aric(a)codeweavers.com> CC: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index deb2c86d96..ce68e4af86 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -641,9 +641,6 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) ext->buffer_size = length; } - if (!ext->last_report_read) - ERR_(hid_report)("Device reports coming in too fast, last report not read yet!\n"); - memcpy(ext->last_report, report, length); ext->last_report_size = length; ext->last_report_read = FALSE; -- 2.16.4

2 1

[PATCH] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 15 Aug '18

15 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45643 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9844a744d7..2d5b6df8dd 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1427,6 +1427,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 42dd7cbbc0..a6a067b3cb 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4536,3 +4536,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c4a75bc169..885c8eca10 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 719cf8496f..efa41b698d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6288,6 +6288,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

2 6

[PATCH] netstat: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 15 Aug '18

15 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/netstat/netstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 8fe5900093..afa211d855 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -144,7 +144,7 @@ static WCHAR *NETSTAT_load_message(UINT id) { static WCHAR msg[2048]; static const WCHAR failedW[] = {'F','a','i','l','e','d','!','\0'}; - if (!LoadStringW(GetModuleHandleW(NULL), id, msg, sizeof(msg)/sizeof(WCHAR))) { + if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); strcpyW(msg, failedW); } -- 2.14.4

2 1

[PATCH] dinput: Fix mac build
by Andrew Eikum 15 Aug '18

15 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 282b6c2790..2b2aade813 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -988,16 +988,19 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS { char name[MAX_PATH]; char friendly[32]; + IOHIDDeviceRef device; TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { + if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) -- 2.18.0

1 0

[PATCH 1/5] kernel32: Don't clear WINEDEBUG in the debugger process.
by Zebediah Figura 15 Aug '18

15 Aug '18

While this does avoid usually undesired debug output, it also makes debugging winedbg.exe practically impossible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/except.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..03fb46d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -173,7 +173,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - char *cmdline, *env, *p; + char *cmdline; HANDLE hDbgConf; DWORD bAuto = TRUE; PROCESS_INFORMATION info; @@ -287,27 +287,12 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) } } - /* make WINEDEBUG empty in the environment */ - env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) - { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) - { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; - } - } - TRACE("Starting debugger %s\n", debugstr_a(cmdline)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); - FreeEnvironmentStringsA( env ); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info); if (ret) { -- 2.7.4

3 8

Re: [PATCH] msvcp120: Add tests for _Concurrent_vector_Internal_compact.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

1 0

[PATCH] msvcp120: Add tests for _Concurrent_vector_Internal_compact.
by Hua Meng 15 Aug '18

15 Aug '18

Signed-off-by: Hua meng <161220092(a)smail.nju.edu.cn> --- dlls/msvcp120/tests/msvcp120.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d7b82a3aae..77515cb27c 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -3095,6 +3095,29 @@ static void test_vector_base_v4(void) } for(; i<ARRAY_SIZE(b.blocks); i++) ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + SET_EXPECT(concurrent_vector_int_alloc); + call_func4(p_vector_base_v4__Internal_reserve, + &v2, 17, sizeof(int), 32); + CHECK_CALLED(concurrent_vector_int_alloc); + data = call_func5(p_vector_base_v4__Internal_compact, + &v2, sizeof(int), &b, concurrent_vector_int_destroy, + concurrent_vector_int_copy); + ok(v2.first_block == 4, "v2.first_block got %ld expected 4\n", (long)v2.first_block); + ok(v2.early_size == 9, "v2.early_size got %ld expected 9\n", (long)v2.early_size); + ok(b.first_block == 4, "b.first_block got %ld expected 2\n", (long)b.first_block); + ok(v2.segment != v2.storage, "v2.segment got %p expected %p\n", v2.segment, v2.storage); + for(i = 4; i < 32; i++) + ok(v2.segment[i] == 0, "v2.segment[%d] got %p\n", + i, v2.segment[i]); + for(i=0; i<4; i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); + for(; i < 5; i++) { + ok(b.blocks[i] != NULL, "b.blocks[%d] got NULL\n", i); + free(b.blocks[i]); + vector_alloc_count--; + } + for(; i<ARRAY_SIZE(b.blocks); i++) + ok(!b.blocks[i], "b.blocks[%d] != NULL\n", i); SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); -- 2.11.0

1 0

[PATCH 5/5 v2] msvcp90: Add time_get<char>::do_get_monthname implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed "return NULL;" line left from stub dlls/msvcp90/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 15 Aug '18

15 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/ctype.c | 2 +- dlls/msvcrt/errno.c | 2 +- dlls/msvcrt/except.c | 3 +-- dlls/msvcrt/exit.c | 3 +-- dlls/msvcrt/file.c | 20 ++++++++++---------- dlls/msvcrt/locale.c | 12 ++++++------ dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/process.c | 2 +- dlls/msvcrt/scheduler.c | 8 ++++---- dlls/msvcrt/wcs.c | 2 +- 11 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 75e95ebcfc..3a2301ef18 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -124,7 +124,7 @@ static BOOL handle_enhanced_keys(INPUT_RECORD *ir, unsigned char *ch1, unsigned { int i; - for (i = 0; i < sizeof(enh_map) / sizeof(enh_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(enh_map); i++) { if (ir->Event.KeyEvent.wVirtualScanCode == enh_map[i].vk) { diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 2c39a56686..758411a7a4 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -493,7 +493,7 @@ unsigned short __cdecl wctype(const char *property) }; unsigned int i; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + for(i=0; i<ARRAY_SIZE(properties); i++) if(!strcmp(property, properties[i].name)) return properties[i].mask; diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index c5fbae21a8..a80ac61f11 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -123,7 +123,7 @@ char *MSVCRT__sys_errlist[] = str_generic_error }; -unsigned int MSVCRT__sys_nerr = sizeof(MSVCRT__sys_errlist)/sizeof(MSVCRT__sys_errlist[0]) - 1; +unsigned int MSVCRT__sys_nerr = ARRAY_SIZE(MSVCRT__sys_errlist) - 1; static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 8fccd8ed5d..da0ac9219e 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -136,8 +136,7 @@ static LONG msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) int float_signal = MSVCRT__FPE_INVALID; sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; - for (i = 0; i < sizeof(float_exception_map) / - sizeof(float_exception_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(float_exception_map); i++) { if (float_exception_map[i].status == except->ExceptionRecord->ExceptionCode) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index b84c50adbc..51bc6f07e1 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -209,8 +209,7 @@ static void DoMessageBoxW(const MSVCRT_wchar_t *lead, const MSVCRT_wchar_t *mess MSVCRT_wchar_t text[2048]; INT ret; - MSVCRT__snwprintf(text, sizeof(text)/sizeof(text[0]), message_format, - lead, MSVCRT__wpgmptr, message); + MSVCRT__snwprintf(text, ARRAY_SIZE(text), message_format, lead, MSVCRT__wpgmptr, message); msgbox.cbSize = sizeof(msgbox); msgbox.hwndOwner = GetActiveWindow(); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2c05f25c6a..224e6eae0c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1223,7 +1223,7 @@ void msvcrt_free_io(void) MSVCRT__flushall(); MSVCRT__fcloseall(); - for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) + for(i=0; i<ARRAY_SIZE(MSVCRT___pioinfo); i++) { if(!MSVCRT___pioinfo[i]) continue; @@ -1246,7 +1246,7 @@ void msvcrt_free_io(void) } } - for(i=0; i<sizeof(MSVCRT_fstream)/sizeof(MSVCRT_fstream[0]); i++) + for(i=0; i<ARRAY_SIZE(MSVCRT_fstream); i++) MSVCRT_free(MSVCRT_fstream[i]); } @@ -1606,29 +1606,29 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st mode++; while(*mode == ' ') mode++; - if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, sizeof(ccs)/sizeof(ccs[0])))) + if(!MSVCRT_CHECK_PMT(!strncmpW(ccs, mode, ARRAY_SIZE(ccs)))) return -1; - mode += sizeof(ccs)/sizeof(ccs[0]); + mode += ARRAY_SIZE(ccs); while(*mode == ' ') mode++; if(!MSVCRT_CHECK_PMT(*mode == '=')) return -1; mode++; while(*mode == ' ') mode++; - if(!strncmpiW(utf8, mode, sizeof(utf8)/sizeof(utf8[0]))) + if(!strncmpiW(utf8, mode, ARRAY_SIZE(utf8))) { *open_flags |= MSVCRT__O_U8TEXT; - mode += sizeof(utf8)/sizeof(utf8[0]); + mode += ARRAY_SIZE(utf8); } - else if(!strncmpiW(utf16le, mode, sizeof(utf16le)/sizeof(utf16le[0]))) + else if(!strncmpiW(utf16le, mode, ARRAY_SIZE(utf16le))) { *open_flags |= MSVCRT__O_U16TEXT; - mode += sizeof(utf16le)/sizeof(utf16le[0]); + mode += ARRAY_SIZE(utf16le); } - else if(!strncmpiW(unicode, mode, sizeof(unicode)/sizeof(unicode[0]))) + else if(!strncmpiW(unicode, mode, ARRAY_SIZE(unicode))) { *open_flags |= MSVCRT__O_WTEXT; - mode += sizeof(unicode)/sizeof(unicode[0]); + mode += ARRAY_SIZE(unicode); } else { diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 8c9bece774..1e56395dbb 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -94,7 +94,7 @@ static const char * const _country_synonyms[] = static void remap_synonym(char *name) { unsigned int i; - for (i = 0; i < sizeof(_country_synonyms)/sizeof(char*); i += 2 ) + for (i = 0; i < ARRAY_SIZE(_country_synonyms); i += 2) { if (!strcasecmp(_country_synonyms[i],name)) { @@ -595,7 +595,7 @@ void* CDECL _Gettnames(void) TRACE("\n"); - for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) + for(i=0; i<ARRAY_SIZE(cur->str.str); i++) size += strlen(cur->str.str[i])+1; ret = MSVCRT_malloc(size); @@ -604,7 +604,7 @@ void* CDECL _Gettnames(void) memcpy(ret, cur, size); size = 0; - for(i=0; i<sizeof(cur->str.str)/sizeof(cur->str.str[0]); i++) { + for(i=0; i<ARRAY_SIZE(cur->str.str); i++) { ret->str.str[i] = &ret->data[size]; size += strlen(&ret->data[size])+1; } @@ -1605,7 +1605,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, size = sizeof(MSVCRT___lc_time_data); lcid_tmp = lcid[MSVCRT_LC_TIME] ? lcid[MSVCRT_LC_TIME] : MAKELCID(LANG_ENGLISH, SORT_DEFAULT); - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { size += sizeof(cloc_short_date) + sizeof(cloc_short_dateW); }else if(time_data[i]==LOCALE_SLONGDATE && !lcid[MSVCRT_LC_TIME]) { @@ -1637,7 +1637,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, } ret = 0; - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { locinfo->lc_time_curr->str.str[i] = &locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_date, sizeof(cloc_short_date)); @@ -1653,7 +1653,7 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, &locinfo->lc_time_curr->data[ret], size-ret); } } - for(i=0; i<sizeof(time_data)/sizeof(time_data[0]); i++) { + for(i=0; i<ARRAY_SIZE(time_data); i++) { locinfo->lc_time_curr->wstr.wstr[i] = (MSVCRT_wchar_t*)&locinfo->lc_time_curr->data[ret]; if(time_data[i]==LOCALE_SSHORTDATE && !lcid[MSVCRT_LC_TIME]) { memcpy(&locinfo->lc_time_curr->data[ret], cloc_short_dateW, sizeof(cloc_short_dateW)); diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index ee8120e149..077dafa550 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -518,7 +518,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.PadZero = '0'; i = flags.Precision; flags.Precision = 2*sizeof(void*); - FUNC_NAME(pf_integer_conv)(buf, sizeof(buf)/sizeof(APICHAR), &flags, + FUNC_NAME(pf_integer_conv)(buf, ARRAY_SIZE(buf), &flags, (ULONG_PTR)pf_args(args_ctx, pos, VT_PTR, valist).get_ptr); flags.PadZero = 0; flags.Precision = i; @@ -549,7 +549,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.Precision = flags.FieldLength - 2; max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; - if(max_len > sizeof(buf)/sizeof(APICHAR)) + if(max_len > ARRAY_SIZE(buf)) tmp = HeapAlloc(GetProcessHeap(), 0, max_len); if(!tmp) return -1; diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index fac3bd4d20..9a192e7e9b 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -345,7 +345,7 @@ static MSVCRT_wchar_t *msvcrt_get_comspec(void) MSVCRT_wchar_t *ret; unsigned int len; - if (!(len = GetEnvironmentVariableW(comspec, NULL, 0))) len = sizeof(cmd)/sizeof(MSVCRT_wchar_t); + if (!(len = GetEnvironmentVariableW(comspec, NULL, 0))) len = ARRAY_SIZE(cmd); if ((ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) { if (!GetEnvironmentVariableW(comspec, ret, len)) strcpyW(ret, cmd); diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index c6c0fa7e38..55ab1c549e 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -344,7 +344,7 @@ static void ExternalContextBase_dtor(ExternalContextBase *this) int i; /* TODO: move the allocator cache to scheduler so it can be reused */ - for(i=0; i<sizeof(this->allocator_cache)/sizeof(this->allocator_cache[0]); i++) { + for(i=0; i<ARRAY_SIZE(this->allocator_cache); i++) { for(cur = this->allocator_cache[i]; cur; cur=next) { next = cur->free.next; MSVCRT_operator_delete(cur); @@ -413,10 +413,10 @@ void * CDECL Concurrency_Alloc(MSVCRT_size_t size) int i; C_ASSERT(sizeof(union allocator_cache_entry) <= 1 << 4); - for(i=0; i<sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]); i++) + for(i=0; i<ARRAY_SIZE(context->allocator_cache); i++) if (1 << (i+4) >= size) break; - if(i==sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0])) { + if(i==ARRAY_SIZE(context->allocator_cache)) { p = MSVCRT_operator_new(size); p->alloc.bucket = -1; }else if (context->allocator_cache[i]) { @@ -446,7 +446,7 @@ void CDECL Concurrency_Free(void* mem) if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { MSVCRT_operator_delete(p); }else { - if(bucket >= 0 && bucket < sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]) && + if(bucket >= 0 && bucket < ARRAY_SIZE(context->allocator_cache) && (!context->allocator_cache[bucket] || context->allocator_cache[bucket]->free.depth < 20)) { p->free.next = context->allocator_cache[bucket]; p->free.depth = p->free.next ? p->free.next->free.depth+1 : 0; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 098e0d5ba8..ed73fc6163 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2109,7 +2109,7 @@ static int wctoint(WCHAR c, int base) 0xd66, 0xe50, 0xed0, 0xf20, 0x1040, 0x17e0, 0x1810, 0xff10 }; int i; - for (i = 0; i < sizeof(zeros)/sizeof(zeros[0]) && c >= zeros[i]; ++i) { + for (i = 0; i < ARRAY_SIZE(zeros) && c >= zeros[i]; ++i) { if (zeros[i] <= c && c <= zeros[i] + 9) { v = c - zeros[i]; break; -- 2.14.4

2 1

[PATCH 5/5] msvcp90: Add time_get<char>::do_get_monthname implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 4/5] msvcp90: Add time_get<char>::do_get_weekday implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-)

1 0

[PATCH 3/5] msvcp90: Add time_get<char>::do_get_year implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 2/5] msvcp90: Add time_get<char>::do_get_time implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] msvcp90: Add time_get<char>::_Getint implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/locale.c | 57 +++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++-- dlls/msvcp90/tests/ios.c | 123 ++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 16 deletions(-)

1 0

[PATCH 3/3] msvcp140/tests: Test _Last_write_time and _Set_last_write_time.
by Piotr Caban 15 Aug '18

15 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/tests/msvcp110.c | 35 ++++++++++++-- dlls/msvcp120/tests/msvcp120.c | 9 ++++ dlls/msvcp140/tests/msvcp140.c | 101 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 4 deletions(-)

1 0

[PATCH 2/3] msvcp140: Add _Last_write_time implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/ios.c | 38 +++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] msvcp110: Add _Last_write_time(wchar_t) implementation.
by Piotr Caban 15 Aug '18

15 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 8 ++-- dlls/msvcp120/msvcp120.spec | 8 ++-- dlls/msvcp120_app/msvcp120_app.spec | 8 ++-- dlls/msvcp90/ios.c | 78 ++++++++++++++++++++++++++++++------- 4 files changed, 75 insertions(+), 27 deletions(-)

1 0

[PATCH 5/5] d3d11/tests: Run the tests in parallel.
by Henri Verbeet 15 Aug '18

15 Aug '18

It's hard enough for a single CPU core to keep a modern GPU busy in the optimal case, but with typical batch sizes of 4 vertices and trivial shaders, our tests are extremely CPU bound. With 8+-core CPU's being generally available, there's a lot to be gained. Generally speaking, not all tests can be run in parallel; tests that touch global state, like e.g. the display mode, can't. Fortunately, none of the d3d11 tests currently do that. Unfortunately, this currently doesn't help quite as much on Wine as it does on Windows. The big wined3d lock prevents a lot of parallelism, even though the tests use separate Direct3D devices. In the specific case of these tests, simply disabling the lock is safe, and shows how much could be gained by simply pushing the lock down a layer to the device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 369 ++++++++++++++++++++++++++++++----------------- 1 file changed, 234 insertions(+), 135 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e324b18ba6..2d62342fa98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -37,6 +37,21 @@ #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 +static unsigned int use_adapter_idx; +static BOOL use_warp_adapter; +static BOOL use_mt = TRUE; + +static struct test_entry +{ + union + { + void (*test)(void); + void (*test_fl)(D3D_FEATURE_LEVEL fl); + } u; + D3D_FEATURE_LEVEL fl; +} *mt_tests; +size_t mt_tests_size, mt_test_count; + struct format_support { DXGI_FORMAT format; @@ -95,6 +110,89 @@ struct swapchain_desc DWORD flags; }; +static void queue_test_entry(const struct test_entry *t) +{ + if (mt_test_count >= mt_tests_size) + { + mt_tests_size = max(16, mt_tests_size * 2); + mt_tests = heap_realloc(mt_tests, mt_tests_size * sizeof(*t)); + } + mt_tests[mt_test_count++] = *t; +} + +static void queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), D3D_FEATURE_LEVEL fl) +{ + struct test_entry t; + + t.u.test_fl = test; + t.fl = fl; + queue_test_entry(&t); +} + +static void queue_test(void (*test)(void)) +{ + struct test_entry t; + + t.u.test = test; + t.fl = 0; + queue_test_entry(&t); +} + +static void run_mt_test(const struct test_entry *t) +{ + if (t->fl) + t->u.test_fl(t->fl); + else + t->u.test(); +} + +static DWORD WINAPI thread_func(void *ctx) +{ + LONG *i = ctx, j; + + while (*i < mt_test_count) + { + j = *i; + if (InterlockedCompareExchange(i, j + 1, j) == j) + run_mt_test(&mt_tests[j]); + } + + return 0; +} + +static void run_queued_tests(void) +{ + unsigned int thread_count, i; + HANDLE *threads; + SYSTEM_INFO si; + LONG test_idx; + + if (!use_mt) + { + for (i = 0; i < mt_test_count; ++i) + { + run_mt_test(&mt_tests[i]); + } + + return; + } + + GetSystemInfo(&si); + thread_count = si.dwNumberOfProcessors; + threads = heap_calloc(thread_count, sizeof(*threads)); + for (i = 0, test_idx = 0; i < thread_count; ++i) + { + threads[i] = CreateThread(NULL, 0, thread_func, &test_idx, 0, NULL); + ok(!!threads[i], "Failed to create thread %u.\n", i); + } + WaitForMultipleObjects(thread_count, threads, TRUE, INFINITE); + for (i = 0; i < thread_count; ++i) + { + CloseHandle(threads[i]); + } + heap_free(threads); +} + static void set_box(D3D11_BOX *box, UINT left, UINT top, UINT front, UINT right, UINT bottom, UINT back) { box->left = left; @@ -1139,9 +1237,6 @@ static void check_texture_uvec4_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_uvec4_(line, texture, sub_resource_idx, NULL, expected_value); } -static BOOL use_warp_adapter; -static unsigned int use_adapter_idx; - static IDXGIAdapter *create_adapter(void) { IDXGIFactory4 *factory4; @@ -17297,7 +17392,7 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, +static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) { static const D3D_FEATURE_LEVEL feature_levels[] = @@ -17316,19 +17411,19 @@ static void run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, for (i = 0; i < ARRAY_SIZE(feature_levels); ++i) { if (begin <= feature_levels[i] && feature_levels[i] <= end) - test_func(feature_levels[i]); + queue_test_fl(test_func, feature_levels[i]); } } -static void run_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, D3D_FEATURE_LEVEL_11_1, test_func); } -static void run_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +static void queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) { - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, D3D_FEATURE_LEVEL_9_3, test_func); } @@ -27730,135 +27825,139 @@ START_TEST(d3d11) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); + else if (!strcmp(argv[i], "--single")) + use_mt = FALSE; } print_adapter_info(); - test_create_device(); - run_for_each_feature_level(test_device_interfaces); - test_get_immediate_context(); - test_create_texture1d(); - test_texture1d_interfaces(); - test_create_texture2d(); - test_texture2d_interfaces(); - test_create_texture3d(); - test_texture3d_interfaces(); - test_create_buffer(); - test_create_depthstencil_view(); - test_depthstencil_view_interfaces(); - test_create_rendertarget_view(); - test_create_shader_resource_view(); - run_for_each_feature_level(test_create_shader); - test_create_sampler_state(); - test_create_blend_state(); - test_create_depthstencil_state(); - test_create_rasterizer_state(); - test_create_query(); - test_occlusion_query(); - test_pipeline_statistics_query(); - test_timestamp_query(); - test_device_removed_reason(); - test_private_data(); - run_for_each_feature_level(test_state_refcounting); - test_device_context_state(); - test_blend(); - test_texture1d(); - test_texture(); - test_cube_maps(); - test_depth_stencil_sampling(); - test_sample_c_lz(); - test_multiple_render_targets(); - test_render_target_views(); - test_layered_rendering(); - test_scissor(); - test_clear_state(); - test_il_append_aligned(); - test_instance_id(); - test_fragment_coords(); - test_update_subresource(); - test_copy_subresource_region(); - test_resource_map(); - run_for_each_feature_level(test_resource_access); - test_check_multisample_quality_levels(); - run_for_each_feature_level(test_swapchain_formats); - test_swapchain_views(); - test_swapchain_flip(); - test_clear_render_target_view_1d(); - test_clear_render_target_view_2d(); - test_clear_render_target_view_3d(); - test_clear_depth_stencil_view(); - test_clear_buffer_unordered_access_view(); - test_initial_depth_stencil_state(); - test_draw_depth_only(); - test_draw_uav_only(); - test_cb_relative_addressing(); - test_vs_input_relative_addressing(); - test_getdc(); - test_shader_stage_input_output_matching(); - test_shader_interstage_interface(); - test_sm4_if_instruction(); - test_sm4_breakc_instruction(); - test_sm4_continuec_instruction(); - test_sm4_discard_instruction(); - test_sm5_swapc_instruction(); - test_create_input_layout(); - test_input_assembler(); - test_null_sampler(); - test_check_feature_support(); - test_create_unordered_access_view(); - test_immediate_constant_buffer(); - test_fp_specials(); - test_uint_shader_instructions(); - test_index_buffer_offset(); - test_face_culling(); - test_line_antialiasing_blending(); - run_for_each_feature_level(test_required_format_support); - run_for_each_9_x_feature_level(test_fl9_draw); - test_ddy(); - test_shader_input_registers_limits(); - test_unbind_shader_resource_view(); - test_stencil_separate(); - test_uav_load(); - test_cs_uav_store(); - test_uav_store_immediate_constant(); - test_ps_cs_uav_binding(); - test_atomic_instructions(); - test_sm4_ret_instruction(); - test_primitive_restart(); - test_resinfo_instruction(); - test_sm5_bufinfo_instruction(); - test_sampleinfo_instruction(); - test_render_target_device_mismatch(); - test_buffer_srv(); - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + queue_test(test_create_device); + queue_for_each_feature_level(test_device_interfaces); + queue_test(test_get_immediate_context); + queue_test(test_create_texture1d); + queue_test(test_texture1d_interfaces); + queue_test(test_create_texture2d); + queue_test(test_texture2d_interfaces); + queue_test(test_create_texture3d); + queue_test(test_texture3d_interfaces); + queue_test(test_create_buffer); + queue_test(test_create_depthstencil_view); + queue_test(test_depthstencil_view_interfaces); + queue_test(test_create_rendertarget_view); + queue_test(test_create_shader_resource_view); + queue_for_each_feature_level(test_create_shader); + queue_test(test_create_sampler_state); + queue_test(test_create_blend_state); + queue_test(test_create_depthstencil_state); + queue_test(test_create_rasterizer_state); + queue_test(test_create_query); + queue_test(test_occlusion_query); + queue_test(test_pipeline_statistics_query); + queue_test(test_timestamp_query); + queue_test(test_device_removed_reason); + queue_test(test_private_data); + queue_for_each_feature_level(test_state_refcounting); + queue_test(test_device_context_state); + queue_test(test_blend); + queue_test(test_texture1d); + queue_test(test_texture); + queue_test(test_cube_maps); + queue_test(test_depth_stencil_sampling); + queue_test(test_sample_c_lz); + queue_test(test_multiple_render_targets); + queue_test(test_render_target_views); + queue_test(test_layered_rendering); + queue_test(test_scissor); + queue_test(test_clear_state); + queue_test(test_il_append_aligned); + queue_test(test_instance_id); + queue_test(test_fragment_coords); + queue_test(test_update_subresource); + queue_test(test_copy_subresource_region); + queue_test(test_resource_map); + queue_for_each_feature_level(test_resource_access); + queue_test(test_check_multisample_quality_levels); + queue_for_each_feature_level(test_swapchain_formats); + queue_test(test_swapchain_views); + queue_test(test_swapchain_flip); + queue_test(test_clear_render_target_view_1d); + queue_test(test_clear_render_target_view_2d); + queue_test(test_clear_render_target_view_3d); + queue_test(test_clear_depth_stencil_view); + queue_test(test_clear_buffer_unordered_access_view); + queue_test(test_initial_depth_stencil_state); + queue_test(test_draw_depth_only); + queue_test(test_draw_uav_only); + queue_test(test_cb_relative_addressing); + queue_test(test_vs_input_relative_addressing); + queue_test(test_getdc); + queue_test(test_shader_stage_input_output_matching); + queue_test(test_shader_interstage_interface); + queue_test(test_sm4_if_instruction); + queue_test(test_sm4_breakc_instruction); + queue_test(test_sm4_continuec_instruction); + queue_test(test_sm4_discard_instruction); + queue_test(test_sm5_swapc_instruction); + queue_test(test_create_input_layout); + queue_test(test_input_assembler); + queue_test(test_null_sampler); + queue_test(test_check_feature_support); + queue_test(test_create_unordered_access_view); + queue_test(test_immediate_constant_buffer); + queue_test(test_fp_specials); + queue_test(test_uint_shader_instructions); + queue_test(test_index_buffer_offset); + queue_test(test_face_culling); + queue_test(test_line_antialiasing_blending); + queue_for_each_feature_level(test_required_format_support); + queue_for_each_9_x_feature_level(test_fl9_draw); + queue_test(test_ddy); + queue_test(test_shader_input_registers_limits); + queue_test(test_unbind_shader_resource_view); + queue_test(test_stencil_separate); + queue_test(test_uav_load); + queue_test(test_cs_uav_store); + queue_test(test_uav_store_immediate_constant); + queue_test(test_ps_cs_uav_binding); + queue_test(test_atomic_instructions); + queue_test(test_sm4_ret_instruction); + queue_test(test_primitive_restart); + queue_test(test_resinfo_instruction); + queue_test(test_sm5_bufinfo_instruction); + queue_test(test_sampleinfo_instruction); + queue_test(test_render_target_device_mismatch); + queue_test(test_buffer_srv); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_unaligned_raw_buffer_access); - test_uav_counters(); - test_dispatch_indirect(); - test_compute_shader_registers(); - test_tgsm(); - test_geometry_shader(); - test_quad_tessellation(); - test_stream_output(); - test_fl10_stream_output_desc(); - test_stream_output_resume(); - test_stream_output_components(); - test_stream_output_vs(); - test_gather(); - test_gather_c(); - test_depth_bias(); - test_fractional_viewports(); - run_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports); - test_early_depth_stencil(); - test_conservative_depth_output(); - test_format_compatibility(); - test_clip_distance(); - test_combined_clip_and_cull_distances(); - test_generate_mips(); - test_alpha_to_coverage(); - test_unbound_multisample_texture(); - test_multiple_viewports(); - test_multisample_resolve(); - test_sample_shading(); - test_sample_mask(); - test_depth_clip(); + queue_test(test_uav_counters); + queue_test(test_dispatch_indirect); + queue_test(test_compute_shader_registers); + queue_test(test_tgsm); + queue_test(test_geometry_shader); + queue_test(test_quad_tessellation); + queue_test(test_stream_output); + queue_test(test_fl10_stream_output_desc); + queue_test(test_stream_output_resume); + queue_test(test_stream_output_components); + queue_test(test_stream_output_vs); + queue_test(test_gather); + queue_test(test_gather_c); + queue_test(test_depth_bias); + queue_test(test_fractional_viewports); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, test_negative_viewports); + queue_test(test_early_depth_stencil); + queue_test(test_conservative_depth_output); + queue_test(test_format_compatibility); + queue_test(test_clip_distance); + queue_test(test_combined_clip_and_cull_distances); + queue_test(test_generate_mips); + queue_test(test_alpha_to_coverage); + queue_test(test_unbound_multisample_texture); + queue_test(test_multiple_viewports); + queue_test(test_multisample_resolve); + queue_test(test_sample_shading); + queue_test(test_sample_mask); + queue_test(test_depth_clip); + + run_queued_tests(); } -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_string_buffer to shader_glsl_get_register_name().
by Henri Verbeet 15 Aug '18

15 Aug '18

Instead of hoping that 150 characters is plenty. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 219 ++++++++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7bc465bb951..1a1fe54bda6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2844,22 +2844,22 @@ static void shader_glsl_gen_modifier(enum wined3d_shader_src_modifier src_modifi } } -static void shader_glsl_fixup_scalar_register_variable(char *register_name, +static void shader_glsl_fixup_scalar_register_variable(struct wined3d_string_buffer *register_name, const char *glsl_variable, const struct wined3d_gl_info *gl_info) { /* The ARB_shading_language_420pack extension allows swizzle operations on * scalars. */ if (gl_info->supported[ARB_SHADING_LANGUAGE_420PACK]) - sprintf(register_name, "%s", glsl_variable); + string_buffer_sprintf(register_name, "%s", glsl_variable); else - sprintf(register_name, "ivec2(%s, 0)", glsl_variable); + string_buffer_sprintf(register_name, "ivec2(%s, 0)", glsl_variable); } /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - enum wined3d_data_type data_type, char *register_name, BOOL *is_swizzled, - const struct wined3d_shader_context *ctx) + enum wined3d_data_type data_type, struct wined3d_string_buffer *register_name, + BOOL *is_swizzled, const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; @@ -2884,7 +2884,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->type) { case WINED3DSPR_TEMP: - sprintf(register_name, "R%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "R%u", reg->idx[0].offset); break; case WINED3DSPR_INPUT: @@ -2899,12 +2899,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * *is_swizzled = TRUE; if (reg->idx[0].rel_addr) { - sprintf(register_name, "%s_in[%s + %u]", + string_buffer_sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); } else { - sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_in%u", prefix, reg->idx[0].offset); } break; } @@ -2916,19 +2916,19 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_in[%s + %u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_in[%s + %u].reg[%s + %u]", rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_in[%s + %u].reg[%u]", + string_buffer_sprintf(register_name, "shader_in[%s + %u].reg[%u]", rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_in[%u].reg[%s + %u]", reg->idx[0].offset, + string_buffer_sprintf(register_name, "shader_in[%u].reg[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_in[%u].reg[%u]", + string_buffer_sprintf(register_name, "shader_in[%u].reg[%u]", reg->idx[0].offset, reg->idx[1].offset); break; } @@ -2948,14 +2948,14 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (needs_legacy_glsl_syntax(gl_info) && shader->u.ps.declared_in_count > in_count) { - sprintf(register_name, + string_buffer_sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); + string_buffer_sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -2963,29 +2963,33 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (needs_legacy_glsl_syntax(gl_info) && shader->u.ps.declared_in_count > in_count) { - sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", + string_buffer_sprintf(register_name, + "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); + string_buffer_sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } else { - if (idx == in_count) sprintf(register_name, "gl_Color"); - else if (idx == in_count + 1) sprintf(register_name, "gl_SecondaryColor"); - else sprintf(register_name, "%s_in[%u]", prefix, idx); + if (idx == in_count) + string_buffer_sprintf(register_name, "gl_Color"); + else if (idx == in_count + 1) + string_buffer_sprintf(register_name, "gl_SecondaryColor"); + else + string_buffer_sprintf(register_name, "%s_in[%u]", prefix, idx); } } else { if (!reg->idx[0].offset) - strcpy(register_name, "ffp_varying_diffuse"); + string_buffer_sprintf(register_name, "ffp_varying_diffuse"); else - strcpy(register_name, "ffp_varying_specular"); + string_buffer_sprintf(register_name, "ffp_varying_specular"); break; } break; @@ -2996,46 +3000,48 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { if (wined3d_settings.check_float_constants) - sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + string_buffer_sprintf(register_name, + "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", rel_param0.param_str, reg->idx[0].offset, rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, prefix, rel_param0.param_str, reg->idx[0].offset); else if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_c[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); + string_buffer_sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { if (shader_constant_is_local(shader, reg->idx[0].offset)) - sprintf(register_name, "%s_lc%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_lc%u", prefix, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_c[%u]", prefix, reg->idx[0].offset); } } break; case WINED3DSPR_CONSTINT: - sprintf(register_name, "%s_i[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_i[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_CONSTBOOL: - sprintf(register_name, "%s_b[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_b[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_TEXTURE: /* case WINED3DSPR_ADDR: */ if (version->type == WINED3D_SHADER_TYPE_PIXEL) - sprintf(register_name, "T%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "T%u", reg->idx[0].offset); else - sprintf(register_name, "A%u", reg->idx[0].offset); + string_buffer_sprintf(register_name, "A%u", reg->idx[0].offset); break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); + string_buffer_sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: - sprintf(register_name, "%s_sampler%u", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_sampler%u", prefix, reg->idx[0].offset); break; case WINED3DSPR_COLOROUT: @@ -3043,51 +3049,51 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * WARN("Write to render target %u, only %d supported.\n", reg->idx[0].offset, gl_info->limits.buffers); - sprintf(register_name, "%s[%u]", get_fragment_output(gl_info), reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s[%u]", get_fragment_output(gl_info), reg->idx[0].offset); break; case WINED3DSPR_RASTOUT: - sprintf(register_name, "%s", hwrastout_reg_names[reg->idx[0].offset]); + string_buffer_sprintf(register_name, "%s", hwrastout_reg_names[reg->idx[0].offset]); break; case WINED3DSPR_DEPTHOUT: case WINED3DSPR_DEPTHOUTGE: case WINED3DSPR_DEPTHOUTLE: - sprintf(register_name, "gl_FragDepth"); + string_buffer_sprintf(register_name, "gl_FragDepth"); break; case WINED3DSPR_ATTROUT: if (!reg->idx[0].offset) - sprintf(register_name, "%s_out[8]", prefix); + string_buffer_sprintf(register_name, "%s_out[8]", prefix); else - sprintf(register_name, "%s_out[9]", prefix); + string_buffer_sprintf(register_name, "%s_out[9]", prefix); break; case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0: WINED3DSPR_OUTPUT */ if (reg->idx[0].rel_addr) - sprintf(register_name, "%s_out[%s + %u]", + string_buffer_sprintf(register_name, "%s_out[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_MISCTYPE: if (!reg->idx[0].offset) { /* vPos */ - sprintf(register_name, "vpos"); + string_buffer_sprintf(register_name, "vpos"); } else if (reg->idx[0].offset == 1) { /* Note that gl_FrontFacing is a bool, while vFace is * a float for which the sign determines front/back */ - sprintf(register_name, "(gl_FrontFacing ? 1.0 : -1.0)"); + string_buffer_sprintf(register_name, "(gl_FrontFacing ? 1.0 : -1.0)"); } else { FIXME("Unhandled misctype register %u.\n", reg->idx[0].offset); - sprintf(register_name, "unrecognized_register"); + string_buffer_sprintf(register_name, "unrecognized_register"); } break; @@ -3101,20 +3107,25 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + { + string_buffer_sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + } else - wined3d_ftoa(*(const float *)reg->u.immconst_data, register_name); + { + wined3d_ftoa(*(const float *)reg->u.immconst_data, imm_str[0]); + string_buffer_sprintf(register_name, "%s", imm_str[0]); + } break; case WINED3D_DATA_INT: - sprintf(register_name, "%#x", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "%#x", reg->u.immconst_data[0]); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(register_name, "%#xu", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "%#xu", reg->u.immconst_data[0]); break; default: - sprintf(register_name, "<unhandled data type %#x>", data_type); + string_buffer_sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; @@ -3127,7 +3138,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); } @@ -3137,61 +3148,63 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * wined3d_ftoa(*(const float *)&reg->u.immconst_data[1], imm_str[1]); wined3d_ftoa(*(const float *)&reg->u.immconst_data[2], imm_str[2]); wined3d_ftoa(*(const float *)&reg->u.immconst_data[3], imm_str[3]); - sprintf(register_name, "vec4(%s, %s, %s, %s)", + string_buffer_sprintf(register_name, "vec4(%s, %s, %s, %s)", imm_str[0], imm_str[1], imm_str[2], imm_str[3]); } break; case WINED3D_DATA_INT: - sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", + string_buffer_sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); break; case WINED3D_DATA_RESOURCE: case WINED3D_DATA_SAMPLER: case WINED3D_DATA_UINT: - sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", + string_buffer_sprintf(register_name, "uvec4(%#xu, %#xu, %#xu, %#xu)", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); break; default: - sprintf(register_name, "<unhandled data type %#x>", data_type); + string_buffer_sprintf(register_name, "<unhandled data type %#x>", data_type); break; } break; default: FIXME("Unhandled immconst type %#x\n", reg->immconst_type); - sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); + string_buffer_sprintf(register_name, "<unhandled_immconst_type %#x>", reg->immconst_type); } break; case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - sprintf(register_name, "%s_cb%u[%s + %u]", + string_buffer_sprintf(register_name, "%s_cb%u[%s + %u]", prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); + string_buffer_sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); break; case WINED3DSPR_IMMCONSTBUFFER: if (reg->idx[0].rel_addr) - sprintf(register_name, "%s_icb[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_icb[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset); + string_buffer_sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_PRIMID: if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) - sprintf(register_name, "gl_PrimitiveIDIn"); + string_buffer_sprintf(register_name, "gl_PrimitiveIDIn"); else - sprintf(register_name, "gl_PrimitiveID"); + string_buffer_sprintf(register_name, "gl_PrimitiveID"); break; case WINED3DSPR_IDXTEMP: if (reg->idx[1].rel_addr) - sprintf(register_name, "X%u[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); + string_buffer_sprintf(register_name, "X%u[%s + %u]", + reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); + string_buffer_sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); break; case WINED3DSPR_LOCALTHREADINDEX: @@ -3206,15 +3219,15 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_THREADID: - sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); + string_buffer_sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); break; case WINED3DSPR_THREADGROUPID: - sprintf(register_name, "ivec3(gl_WorkGroupID)"); + string_buffer_sprintf(register_name, "ivec3(gl_WorkGroupID)"); break; case WINED3DSPR_LOCALTHREADID: - sprintf(register_name, "ivec3(gl_LocalInvocationID)"); + string_buffer_sprintf(register_name, "ivec3(gl_LocalInvocationID)"); break; case WINED3DSPR_FORKINSTID: @@ -3224,48 +3237,48 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_TESSCOORD: - sprintf(register_name, "gl_TessCoord"); + string_buffer_sprintf(register_name, "gl_TessCoord"); break; case WINED3DSPR_OUTCONTROLPOINT: if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_out[%s + %u].reg[%s + %u]", rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "shader_out[%s + %u].reg[%u]", + string_buffer_sprintf(register_name, "shader_out[%s + %u].reg[%u]", rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); } else if (reg->idx[1].rel_addr) { - sprintf(register_name, "shader_out[%u].reg[%s + %u]", + string_buffer_sprintf(register_name, "shader_out[%u].reg[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); } else { - sprintf(register_name, "shader_out[%u].reg[%u]", + string_buffer_sprintf(register_name, "shader_out[%u].reg[%u]", reg->idx[0].offset, reg->idx[1].offset); } break; case WINED3DSPR_PATCHCONST: if (version->type == WINED3D_SHADER_TYPE_HULL) - sprintf(register_name, "hs_out[%u]", reg->idx[0].offset); + string_buffer_sprintf(register_name, "hs_out[%u]", reg->idx[0].offset); else - sprintf(register_name, "vpc[%u]", reg->idx[0].offset); + string_buffer_sprintf(register_name, "vpc[%u]", reg->idx[0].offset); break; case WINED3DSPR_SAMPLEMASK: - sprintf(register_name, "sample_mask"); + string_buffer_sprintf(register_name, "sample_mask"); break; default: FIXME("Unhandled register type %#x.\n", reg->type); - sprintf(register_name, "unrecognized_register"); + string_buffer_sprintf(register_name, "unrecognised_register"); break; } } @@ -3394,12 +3407,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c { struct shader_glsl_ctx_priv *priv = ctx->backend_data; struct wined3d_string_buffer *param_str = string_buffer_get(priv->string_buffers); + struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; - char reg_name[150]; - reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; @@ -3427,9 +3439,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c break; } - shader_glsl_sprintf_cast(param_str, reg_name, data_type, param_data_type); + shader_glsl_sprintf_cast(param_str, reg_name->buffer, data_type, param_data_type); shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); + string_buffer_release(priv->string_buffers, reg_name); string_buffer_release(priv->string_buffers, param_str); } @@ -3445,11 +3458,19 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name; + size_t len; + glsl_dst->mask_str[0] = '\0'; - glsl_dst->reg_name[0] = '\0'; - shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, NULL, ins->ctx); + reg_name = string_buffer_get(priv->string_buffers); + shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, reg_name, NULL, ins->ctx); + len = min(reg_name->content_size, ARRAY_SIZE(glsl_dst->reg_name) - 1); + memcpy(glsl_dst->reg_name, reg_name->buffer, len); + glsl_dst->reg_name[len] = '\0'; + string_buffer_release(priv->string_buffers, reg_name); + return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3738,10 +3759,13 @@ static void shader_glsl_color_correction_ext(struct wined3d_string_buffer *buffe static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { - char reg_name[256]; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, NULL, ins->ctx); - shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); + shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name->buffer, ins->dst[0].write_mask, fixup); + string_buffer_release(priv->string_buffers, reg_name); } static void PRINTF_ATTR(9, 10) shader_glsl_gen_sample_code(const struct wined3d_shader_instruction *ins, @@ -4995,16 +5019,15 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_parser_state *state = ins->ctx->state; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; + struct wined3d_string_buffer *reg_name; const DWORD *control_values = NULL; - char reg_name[150]; if (ins->ctx->reg_maps->shader_version.major < 4) { - shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); - /* Try to hardcode the loop control parameters if possible. Direct3D 9 * class hardware doesn't support real varying indexing, but Microsoft * designed this feature for Shader model 2.x+. If the loop control is @@ -5053,10 +5076,16 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) } else { + reg_name = string_buffer_get(priv->string_buffers); + shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); + shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - state->current_loop_depth, state->current_loop_reg, reg_name, - state->current_loop_depth, reg_name, - state->current_loop_depth, state->current_loop_reg, reg_name); + state->current_loop_depth, state->current_loop_reg, reg_name->buffer, + state->current_loop_depth, reg_name->buffer, + state->current_loop_depth, state->current_loop_reg, reg_name->buffer); + + string_buffer_release(priv->string_buffers, reg_name); + } ++state->current_loop_reg; @@ -6742,32 +6771,40 @@ static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) * Sample 2D texture at dst using the alpha & red (wx) components of src as texture coordinates */ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - char reg_name[150]; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.wx", reg_name); + "%s.wx", reg_name->buffer); shader_glsl_release_sample_function(ins->ctx, &sample_function); + + string_buffer_release(priv->string_buffers, reg_name); } /** Process the WINED3DSIO_TEXREG2GB instruction in GLSL * Sample 2D texture at dst using the green & blue (yz) components of src as texture coordinates */ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - char reg_name[150]; + struct wined3d_string_buffer *reg_name; + reg_name = string_buffer_get(priv->string_buffers); shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.yz", reg_name); + "%s.yz", reg_name->buffer); shader_glsl_release_sample_function(ins->ctx, &sample_function); + + string_buffer_release(priv->string_buffers, reg_name); } /** Process the WINED3DSIO_TEXREG2RGB instruction in GLSL -- 2.11.0

1 0

[PATCH 3/5] wined3d: Get rid of the "reg_name" field in struct glsl_src_param.
by Henri Verbeet 15 Aug '18

15 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bb82c89c95..7bc465bb951 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -93,7 +93,6 @@ struct glsl_dst_param struct glsl_src_param { - char reg_name[150]; char param_str[200]; }; @@ -3394,16 +3393,17 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type data_type) { struct shader_glsl_ctx_priv *priv = ctx->backend_data; - struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); + struct wined3d_string_buffer *param_str = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + char reg_name[150]; - glsl_src->reg_name[0] = '\0'; + reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ctx); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, reg_name, &is_color, ctx); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3427,10 +3427,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c break; } - shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + shader_glsl_sprintf_cast(param_str, reg_name, data_type, param_data_type); + shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); - string_buffer_release(priv->string_buffers, reg_name); + string_buffer_release(priv->string_buffers, param_str); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, @@ -4998,12 +4998,12 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; - struct glsl_src_param src1_param; const DWORD *control_values = NULL; + char reg_name[150]; if (ins->ctx->reg_maps->shader_version.major < 4) { - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); /* Try to hardcode the loop control parameters if possible. Direct3D 9 * class hardware doesn't support real varying indexing, but Microsoft @@ -5054,9 +5054,9 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) else { shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - state->current_loop_depth, state->current_loop_reg, - src1_param.reg_name, state->current_loop_depth, src1_param.reg_name, - state->current_loop_depth, state->current_loop_reg, src1_param.reg_name); + state->current_loop_depth, state->current_loop_reg, reg_name, + state->current_loop_depth, reg_name, + state->current_loop_depth, state->current_loop_reg, reg_name); } ++state->current_loop_reg; @@ -6744,13 +6744,13 @@ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.wx", src0_param.reg_name); + "%s.wx", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -6760,13 +6760,13 @@ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.yz", src0_param.reg_name); + "%s.yz", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Make the "is_color" parameter to shader_glsl_get_register_name() optional.
by Henri Verbeet 15 Aug '18

15 Aug '18

Not all callers care. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8aa3f2df250..8bb82c89c95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2859,7 +2859,7 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + enum wined3d_data_type data_type, char *register_name, BOOL *is_swizzled, const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ @@ -2879,7 +2879,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[1].offset != ~0u && reg->idx[1].rel_addr) shader_glsl_add_src_param_ext(ctx, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1, reg->idx[1].rel_addr->reg.data_type); - *is_color = FALSE; + if (is_swizzled) + *is_swizzled = FALSE; switch (reg->type) { @@ -2895,8 +2896,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); - if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) - *is_color = TRUE; + if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) + *is_swizzled = TRUE; if (reg->idx[0].rel_addr) { sprintf(register_name, "%s_in[%s + %u]", @@ -3444,13 +3445,11 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { - BOOL is_color = FALSE; - glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, &is_color, ins->ctx); + glsl_dst->reg_name, NULL, ins->ctx); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3740,9 +3739,8 @@ static void shader_glsl_color_correction_ext(struct wined3d_string_buffer *buffe static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { char reg_name[256]; - BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins->ctx); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); } -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_shader_context structure to shader_glsl_get_register_name().
by Henri Verbeet 15 Aug '18

15 Aug '18

Instead of a wined3d_shader_instruction structure. It only uses the instruction to get at the context, so just pass the context directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d38ba2bcf06..8aa3f2df250 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2771,8 +2771,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } /* Prototypes */ -static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, - const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src); +static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *ctx, + const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, + enum wined3d_data_type data_type); /** Used for opcode modifiers - They multiply the result by the specified amount */ static const char * const shift_glsl_tab[] = { @@ -2859,23 +2860,25 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, enum wined3d_data_type data_type, char *register_name, BOOL *is_color, - const struct wined3d_shader_instruction *ins) + const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"vs_out[10]", "vs_out[11].x", "vs_out[11].y"}; - const struct wined3d_shader *shader = ins->ctx->shader; - const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader *shader = ctx->shader; + const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; char imm_str[4][17]; - if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); - if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); + if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) + shader_glsl_add_src_param_ext(ctx, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, + &rel_param0, reg->idx[0].rel_addr->reg.data_type); + if (reg->idx[1].offset != ~0u && reg->idx[1].rel_addr) + shader_glsl_add_src_param_ext(ctx, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, + &rel_param1, reg->idx[1].rel_addr->reg.data_type); *is_color = FALSE; switch (reg->type) @@ -2888,7 +2891,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); @@ -3028,7 +3031,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * break; case WINED3DSPR_LOOP: - sprintf(register_name, "aL%u", ins->ctx->state->current_loop_reg - 1); + sprintf(register_name, "aL%u", ctx->state->current_loop_reg - 1); break; case WINED3DSPR_SAMPLER: @@ -3385,11 +3388,11 @@ static void shader_glsl_sprintf_cast(struct wined3d_string_buffer *dst_param, co /* From a given parameter token, generate the corresponding GLSL string. * Also, return the actual register name and swizzle in case the * caller needs this information as well. */ -static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instruction *ins, +static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *ctx, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src, enum wined3d_data_type data_type) { - struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; @@ -3399,7 +3402,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ins); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ctx); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3432,7 +3435,7 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src) { - shader_glsl_add_src_param_ext(ins, wined3d_src, mask, glsl_src, wined3d_src->reg.data_type); + shader_glsl_add_src_param_ext(ins->ctx, wined3d_src, mask, glsl_src, wined3d_src->reg.data_type); } /* From a given parameter token, generate the corresponding GLSL string. @@ -3447,7 +3450,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, &is_color, ins); + glsl_dst->reg_name, &is_color, ins->ctx); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3739,7 +3742,7 @@ static void shader_glsl_color_correction(const struct wined3d_shader_instruction char reg_name[256]; BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins->ctx); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); } @@ -5627,11 +5630,11 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s(%s_%s%u, %s, ", op, shader_glsl_get_prefix(version->type), resource, resource_idx, address->buffer); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_0, &data, data_type); shader_addline(buffer, "%s", data.param_str); if (ins->src_count >= 3) { - shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data2, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[2], WINED3DSP_WRITEMASK_0, &data2, data_type); shader_addline(buffer, ", %s", data2.param_str); } @@ -5803,7 +5806,7 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); + shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); shader_addline(ins->ctx->buffer, "imageStore(%s_image%u, %s, %s);\n", shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, image_data_param.param_str); -- 2.11.0

1 0

[PATCH 6/6] d3d11/tests: Add test for CopySubresourceRegion() with 3D textures.
by Józef Kucia 15 Aug '18

15 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 209 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e324b18ba66..22b4f25da277 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11471,7 +11471,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11487,7 +11487,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11510,8 +11510,8 @@ static void test_copy_subresource_region(void) ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; - ID3D11DeviceContext *context; ID3D11DeviceContext1 *context1; + ID3D11DeviceContext *context; struct vec4 float_colors[16]; struct resource_readback rb; ID3D11PixelShader *ps; @@ -11678,7 +11678,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11694,7 +11694,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11726,7 +11726,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11801,7 +11801,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11813,6 +11813,207 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_3d(void) +{ + ID3D11ShaderResourceView *dst_srv, *src_srv; + ID3D11Texture3D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + ID3D11SamplerState *sampler_state; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture2d; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD data[4][16]; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position / float3(640, 480, 1)); + } +#endif + 0x43425844, 0xfcc5a5be, 0x3061a059, 0xe848b9d9, 0x6ed0f8cc, 0x00000001, 0x00000140, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100086a, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, + 0x3acccccd, 0x3b088889, 0x3f800000, 0x00000000, 0x8b000045, 0x80000142, 0x00155543, 0x001020f2, + 0x00000000, 0x00100246, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture3d_desc.Width = 4; + texture3d_desc.Height = 4; + texture3d_desc.Depth = 4; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_DEFAULT; + texture3d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &src_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &dst_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 4; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture2d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(*data); ++i) + { + data[0][i] = 0xff0000ff; + data[1][i] = bitmap_data[i]; + data[2][i] = 0xff00ff00; + data[3][i] = 0xffff00ff; + } + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = data[i]; + resource_data[i].SysMemPitch = texture2d_desc.Width * sizeof(data[0][0]); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, resource_data, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)src_texture, NULL, &src_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)dst_texture, NULL, &dst_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &src_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 0.25f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 1.0f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &dst_srv); + + set_box(&box, 0, 0, 0, 4, 4, 2); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 2, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 2, 4, 4, 4); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 0, (ID3D11Resource *)src_texture, 0, &box); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 0.25f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 1.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(dst_srv); + ID3D11ShaderResourceView_Release(src_srv); + ID3D11Texture2D_Release(texture2d); + ID3D11Texture3D_Release(dst_texture); + ID3D11Texture3D_Release(src_texture); + release_test_context(&test_context); +} + static void test_resource_map(void) { D3D11_MAPPED_SUBRESOURCE mapped_subresource; @@ -27777,6 +27978,7 @@ START_TEST(d3d11) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); + test_copy_subresource_region_3d(); test_resource_map(); run_for_each_feature_level(test_resource_access); test_check_multisample_quality_levels(); -- 2.16.4

2 2

[PATCH 1/4] user32/tests: Add some ListBox tests for anchor index.
by Nikolay Sivov 15 Aug '18

15 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/listbox.c | 111 ++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index c6edc76ea2..ee5211c341 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -475,19 +475,129 @@ static void test_LB_SETCURSEL(void) SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 0, "expected vscroll 0, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); ret = GetScrollPos(hLB, SB_VERT); ok(ret == 1, "expected vscroll 1, got %d\n", ret); + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + hLB = create_listbox(0, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_SETCURSEL, 1, 0); + ok(ret == 1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_EXTENDEDSEL */ + hLB = create_listbox(LBS_EXTENDEDSEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(hLB); + + /* LBS_MULTIPLESEL */ + hLB = create_listbox(LBS_MULTIPLESEL, 0); + ok(hLB != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == -1, "Unexpected return value %d.\n", ret); + + ret = SendMessageA(hLB, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + DestroyWindow(hLB); } +static void test_LB_SETSEL(void) +{ + HWND list; + int ret; + + /* LBS_EXTENDEDSEL */ + list = create_listbox(LBS_EXTENDEDSEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 0, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, FALSE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(list); + + /* LBS_MULTIPLESEL */ + list = create_listbox(LBS_MULTIPLESEL, 0); + ok(list != NULL, "Failed to create ListBox window.\n"); + + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); + ok(ret == -1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 0); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 0, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, TRUE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + ret = SendMessageA(list, LB_SETSEL, FALSE, 1); + ok(ret == 0, "Unexpected return value %d.\n", ret); + ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); +todo_wine + ok(ret == 1, "Unexpected anchor index %d.\n", ret); + + DestroyWindow(list); +} + static void test_listbox_height(void) { HWND hList; @@ -1960,4 +2070,5 @@ START_TEST(listbox) test_missing_lbuttonup(); test_extents(); test_WM_MEASUREITEM(); + test_LB_SETSEL(); } -- 2.18.0

2 8

[PATCH] dinput/tests: Use GetModuleHandleA() instead of LoadLibraryA() (Coverity).
by Józef Kucia 15 Aug '18

15 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dinput/tests/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 59411cbfa577..554268099863 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -448,7 +448,7 @@ static void keyboard_tests(DWORD version) START_TEST(keyboard) { - pDirectInputCreateA = (void *)GetProcAddress(LoadLibraryA("dinput.dll"), "DirectInputCreateA"); + pDirectInputCreateA = (void *)GetProcAddress(GetModuleHandleA("dinput.dll"), "DirectInputCreateA"); CoInitialize(NULL); -- 2.16.4

1 0

[PATCH] winex11: Add simple fps counter for Vulkan.
by Józef Kucia 15 Aug '18

15 Aug '18

The fps counter is implemented in winex11 because winevulkan thunks can be bypassed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 5de855715f36..063281d3d542 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -41,6 +41,7 @@ #include "wine/vulkan_driver.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +WINE_DECLARE_DEBUG_CHANNEL(fps); #ifdef SONAME_LIBVULKAN @@ -513,8 +514,34 @@ static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device, static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { + VkResult res; + TRACE("%p, %p\n", queue, present_info); - return pvkQueuePresentKHR(queue, present_info); + + res = pvkQueuePresentKHR(queue, present_info); + + if (TRACE_ON(fps)) + { + static unsigned long frames, frames_total; + static long prev_time, start_time; + DWORD time; + + time = GetTickCount(); + frames++; + frames_total++; + if (time - prev_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps, total %.2ffps\n", + queue, 1000.0 * frames / (time - prev_time), + 1000.0 * frames_total / (time - start_time)); + prev_time = time; + frames = 0; + if (!start_time) + start_time = time; + } + } + + return res; } static const struct vulkan_funcs vulkan_funcs = -- 2.16.4

1 0

[PATCH] powrprof: Added PowerEnumerate stub
by Alistair Leslie-Hughes 15 Aug '18

15 Aug '18

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45603 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/powrprof/powrprof.c | 8 ++++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 685b66356f..1597d96f58 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -321,6 +321,14 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) return PlatformRoleDesktop; } +DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, + ULONG index, UCHAR *buffer, DWORD *buffer_size) +{ + FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + flags, index, buffer, buffer_size); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index c90fafc353..a9e337a0e4 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -11,6 +11,7 @@ @ stdcall IsPwrShutdownAllowed () @ stdcall IsPwrSuspendAllowed () @ stdcall PowerDeterminePlatformRole () +@ stdcall PowerEnumerate(long ptr ptr long long ptr ptr) @ stdcall PowerGetActiveScheme (ptr ptr) @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 239044ea10..318188e465 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -109,6 +109,36 @@ typedef struct _POWER_POLICY { } POWER_POLICY, *PPOWER_POLICY; +typedef enum _POWER_DATA_ACCESSOR { + ACCESS_AC_POWER_SETTING_INDEX, + ACCESS_DC_POWER_SETTING_INDEX, + ACCESS_FRIENDLY_NAME, + ACCESS_DESCRIPTION, + ACCESS_POSSIBLE_POWER_SETTING, + ACCESS_POSSIBLE_POWER_SETTING_FRIENDLY_NAME, + ACCESS_POSSIBLE_POWER_SETTING_DESCRIPTION, + ACCESS_DEFAULT_AC_POWER_SETTING, + ACCESS_DEFAULT_DC_POWER_SETTING, + ACCESS_POSSIBLE_VALUE_MIN, + ACCESS_POSSIBLE_VALUE_MAX, + ACCESS_POSSIBLE_VALUE_INCREMENT, + ACCESS_POSSIBLE_VALUE_UNITS, + ACCESS_ICON_RESOURCE, + ACCESS_DEFAULT_SECURITY_DESCRIPTOR, + ACCESS_ATTRIBUTES, + ACCESS_SCHEME, + ACCESS_SUBGROUP, + ACCESS_INDIVIDUAL_SETTING, + ACCESS_ACTIVE_SCHEME, + ACCESS_CREATE_SCHEME, + ACCESS_AC_POWER_SETTING_MAX, + ACCESS_DC_POWER_SETTING_MAX, + ACCESS_AC_POWER_SETTING_MIN, + ACCESS_DC_POWER_SETTING_MIN, + ACCESS_PROFILE, + ACCESS_OVERLAY_SCHEME, + ACCESS_ACTIVE_OVERLAY_SCHEME, +} POWER_DATA_ACCESSOR, *PPOWER_DATA_ACCESSOR; #ifdef __cplusplus extern "C" { @@ -128,6 +158,7 @@ BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY); BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); +DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY); -- 2.18.0

1 0

[PATCH 0/4] Shell32 icons
by Alex Henrie 15 Aug '18

15 Aug '18

If I understand correctly, the proper way to fix bug 30185 is to provide the first 138 shell32 icons. That's a big job, but I think I can get it done if I work on it a little at a time. Alex Henrie (4): shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE shell32: Add document icon shell32: Add window icon shell32: Add 512k and 314k floppy drive icons dlls/shell32/Makefile.in | 3 +- dlls/shell32/iconcache.c | 12 +- dlls/shell32/shell32.rc | 15 + dlls/shell32/shresdef.h | 4 +- dlls/shell32/window.ico | Bin 0 -> 30799 bytes dlls/shell32/window.svg | 598 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 624 insertions(+), 8 deletions(-) create mode 100644 dlls/shell32/window.ico create mode 100644 dlls/shell32/window.svg -- 2.18.0

1 4

[PATCH] winex11.drv: improve ChangeDisplaySettingsEx failed mode message
by Rob Walker 14 Aug '18

14 Aug '18

The failed mode error message dumps all the mode fields, that were being tested. Change this output so that only the mode fields explicitly being matched against are displayed. Make the failed message use formatting consist with the trace message, earlier in this function. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/winex11.drv/settings.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..953413390e 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -345,6 +345,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, DWORD i, dwBpp = 0; DEVMODEW dm; BOOL def_mode = TRUE; + char bbp_buffer[16] = "", freq_buffer[16] = ""; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -422,9 +423,13 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } - /* no valid modes found */ - ERR("No matching mode found %ux%ux%u @%u! (%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); + /* no valid modes found, only print the fields we were trying to matching against */ + if (devmode->dmFields & DM_BITSPERPEL) + snprintf(bbp_buffer, ARRAY_SIZE(bbp_buffer), "bbp=%d ", devmode->dmBitsPerPel); + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) + snprintf(freq_buffer, ARRAY_SIZE(freq_buffer), "freq=%d ", devmode->dmDisplayFrequency); + ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", + devmode->dmPelsWidth, devmode->dmPelsHeight, bbp_buffer, freq_buffer, handler_name); + return DISP_CHANGE_BADMODE; } -- 2.18.0

1 0

[PATCH] shdocvw: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Aug '18

14 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shdocvw/shdocvw_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 52c622c609..2657dfa5a5 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -386,7 +386,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { - len = sizeof(buffer_in) / sizeof(buffer_in[0]); + len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); @@ -400,7 +400,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L } } - len = sizeof(buffer_out) / sizeof(buffer_out[0]); + len = ARRAY_SIZE(buffer_out); buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; @@ -442,7 +442,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); -- 2.14.4

2 1

[PATCH] urlmon: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 14 Aug '18

14 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/urlmon_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 5968a6ce55..06f0698efa 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -409,7 +409,7 @@ static void init_session(void) { unsigned int i; - for(i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) { + for(i = 0; i < ARRAY_SIZE(object_creation); i++) { if(object_creation[i].protocol) register_namespace(object_creation[i].cf, object_creation[i].clsid, object_creation[i].protocol, TRUE); @@ -438,10 +438,10 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { unsigned int i; HRESULT hr; - + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) return IClassFactory_QueryInterface(object_creation[i].cf, riid, ppv); -- 2.14.4

2 1

RE: [PATCH] imm32: Use the ARRAY_SIZE() macro
by Aric Stewart 14 Aug '18

14 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com>

1 0

[PATCH 2/2] oleaut32: Extend value range before getting absolute value in VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH 1/2] oleaut32/tests: Add test for VarBstrFromI4.
by Daniel Lehman 14 Aug '18

14 Aug '18

1 0

[PATCH v3] quartz: Rewrite add_data with CoTaskMemRealloc and error handling
by Alex Henrie 14 Aug '18

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/filtermapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..0a41c7144a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -145,11 +145,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) int index = v->current; if (v->current + size > v->capacity) { - LPBYTE pOldData = v->pData; - v->capacity = (v->capacity + size) * 2; - v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + int new_capacity = (v->capacity + size) * 2; + BYTE *new_data = CoTaskMemRealloc(v->pData, new_capacity); + if (!new_data) return -1; + v->capacity = new_capacity; + v->pData = new_data; } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

1 0

[PATCH v2] quartz: Don't call memcpy with src=0 in FM2_WriteFilterData (Coverity)
by Alex Henrie 14 Aug '18

14 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Passing NULL to memcpy causes a segfault in newer versions of GCC, see https://www.imperialviolet.org/2016/06/26/nonnull.html v2: Fixed email address --- dlls/quartz/filtermapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..7a5b5aee72 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -148,8 +148,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) LPBYTE pOldData = v->pData; v->capacity = (v->capacity + size) * 2; v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + if (pOldData) + { + memcpy(v->pData, pOldData, v->current); + CoTaskMemFree(pOldData); + } } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

2 2

[PATCH] quartz: Don't call memcpy with src=0 in FM2_WriteFilterData (Coverity)
by Alex Henrie 13 Aug '18

13 Aug '18

Signed-off-by: Alex Henrie <alex.henrie(a)utah.edu> --- Passing NULL to memcpy causes a segfault in newer versions of GCC, see https://www.imperialviolet.org/2016/06/26/nonnull.html --- dlls/quartz/filtermapper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198637..7a5b5aee72 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -148,8 +148,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) LPBYTE pOldData = v->pData; v->capacity = (v->capacity + size) * 2; v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + if (pOldData) + { + memcpy(v->pData, pOldData, v->current); + CoTaskMemFree(pOldData); + } } memcpy(v->pData + v->current, pData, size); v->current += size; -- 2.18.0

1 0

[PATCH] odbc32: Add SQLGetDiagRecA implementation.
by Jacek Caban 13 Aug '18

13 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/odbc32/odbc32.spec | 2 +- dlls/odbc32/proxyodbc.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH] wineps.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Aug '18

13 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineps.drv/driver.c | 6 +++--- dlls/wineps.drv/pen.c | 10 +++++----- dlls/wineps.drv/type42.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 612bf69df4..64d813a44c 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -285,7 +285,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, res = di->pi->ppd->DefaultResolution; len = sprintfW(buf, resW, res); buf[len++] = ' '; - LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, sizeof(buf)/sizeof(buf[0]) - len); + LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, 0, MAKELONG(res, res)); Cursel = 0; @@ -317,7 +317,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, else len = sprintfW(buf, resxyW, res->resx, res->resy); buf[len++] = ' '; - LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, sizeof(buf)/sizeof(buf[0]) - len); + LoadStringW(PSDRV_hInstance, IDS_DPI, buf + len, ARRAY_SIZE(buf) - len); idx = SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_ADDSTRING, 0, (LPARAM)buf); SendDlgItemMessageW(hwnd, IDD_QUALITY, CB_SETITEMDATA, idx, MAKELONG(res->resx, res->resy)); @@ -557,7 +557,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, WCHAR SetupW[64]; static const WCHAR PAPERW[] = {'P','A','P','E','R','\0'}; - LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, sizeof(SetupW)/sizeof(SetupW[0])); + LoadStringW(PSDRV_hInstance, IDS_SETUP, SetupW, ARRAY_SIZE(SetupW)); hinstComctl32 = LoadLibraryA("comctl32.dll"); pCreatePropertySheetPage = (void*)GetProcAddress(hinstComctl32, "CreatePropertySheetPageW"); diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 2526fa931f..b3ad60606e 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -93,27 +93,27 @@ HPEN PSDRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patter switch(physDev->pen.style) { case PS_DASH: memcpy( physDev->pen.dash, PEN_dash, sizeof(PEN_dash) ); - physDev->pen.dash_len = sizeof(PEN_dash) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dash ); break; case PS_DOT: memcpy( physDev->pen.dash, PEN_dot, sizeof(PEN_dot) ); - physDev->pen.dash_len = sizeof(PEN_dot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dot ); break; case PS_DASHDOT: memcpy( physDev->pen.dash, PEN_dashdot, sizeof(PEN_dashdot) ); - physDev->pen.dash_len = sizeof(PEN_dashdot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdot ); break; case PS_DASHDOTDOT: memcpy( physDev->pen.dash, PEN_dashdotdot, sizeof(PEN_dashdotdot) ); - physDev->pen.dash_len = sizeof(PEN_dashdotdot) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdotdot ); break; case PS_ALTERNATE: memcpy( physDev->pen.dash, PEN_alternate, sizeof(PEN_alternate) ); - physDev->pen.dash_len = sizeof(PEN_alternate) / sizeof(DWORD); + physDev->pen.dash_len = ARRAY_SIZE( PEN_alternate ); break; case PS_USERSTYLE: diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index c0cda50a8d..8a56cc6b6c 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -70,7 +70,7 @@ static const OTTable tables_templ[] = { }; struct tagTYPE42 { - OTTable tables[sizeof(tables_templ)/sizeof(tables_templ[0])]; + OTTable tables[ARRAY_SIZE(tables_templ)]; int glyf_tab, loca_tab, head_tab; /* indices of glyf, loca and head tables */ int hmtx_tab, maxp_tab; int num_of_written_tables; @@ -138,7 +138,7 @@ TYPE42 *T42_download_header(PHYSDEV dev, char *ps_name, RECT *bbox, UINT emsize) { DWORD i, j, tablepos, nb_blocks, glyf_off = 0, loca_off = 0, cur_off; - WORD num_of_tables = sizeof(tables_templ) / sizeof(tables_templ[0]) - 1; + WORD num_of_tables = ARRAY_SIZE(tables_templ) - 1; char *buf; TYPE42 *t42; static const char start[] = /* name, fontbbox */ -- 2.14.4

2 1

[PATCH] localspl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Aug '18

13 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localspl/localmon.c | 10 +++++----- dlls/localspl/provider.c | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4be1ad6101..8553aa2297 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -279,10 +279,10 @@ static DWORD get_type_from_name(LPCWSTR name) { HANDLE hfile; - if (!strncmpW(name, portname_LPT, sizeof(portname_LPT) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPT, ARRAY_SIZE(portname_LPT) - 1)) return PORT_IS_LPT; - if (!strncmpW(name, portname_COM, sizeof(portname_COM) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_COM, ARRAY_SIZE(portname_COM) - 1)) return PORT_IS_COM; if (!strcmpW(name, portname_FILE)) @@ -294,10 +294,10 @@ static DWORD get_type_from_name(LPCWSTR name) if (name[0] == '|') return PORT_IS_PIPE; - if (!strncmpW(name, portname_CUPS, sizeof(portname_CUPS) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_CUPS, ARRAY_SIZE(portname_CUPS) - 1)) return PORT_IS_CUPS; - if (!strncmpW(name, portname_LPR, sizeof(portname_LPR) / sizeof(WCHAR) -1)) + if (!strncmpW(name, portname_LPR, ARRAY_SIZE(portname_LPR) - 1)) return PORT_IS_LPR; /* Must be a file or a directory. Does the file exist ? */ @@ -704,7 +704,7 @@ static DWORD WINAPI localmon_XcvDataPort(HANDLE hXcv, LPCWSTR pszDataName, PBYTE { ptr = ((xcv_t *)hXcv)->nameW; } - lstrcpynW(buffer, ptr, sizeof(buffer)/sizeof(WCHAR)); + lstrcpynW(buffer, ptr, ARRAY_SIZE(buffer)); if (buffer[0]) buffer[lstrlenW(buffer)-1] = '\0'; /* remove the ':' */ res = SetDefaultCommConfigW(buffer, (LPCOMMCONFIG) pInputData, cbInputData); TRACE("got %u with %u\n", res, GetLastError() ); diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 3538947281..c17d982fa7 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -275,7 +275,7 @@ static LONG copy_servername_from_name(LPCWSTR name, LPWSTR target) target[serverlen] = '\0'; } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); if (GetComputerNameW(buffer, &len)) { if ((serverlen == len) && (strncmpiW(server, buffer, len) == 0)) { /* The requested Servername is our computername */ @@ -693,7 +693,7 @@ static const printenv_t * validate_envW(LPCWSTR env) TRACE("(%s)\n", debugstr_w(env)); if (env && env[0]) { - for (i = 0; i < sizeof(all_printenv)/sizeof(all_printenv[0]); i++) + for (i = 0; i < ARRAY_SIZE(all_printenv); i++) { if (lstrcmpiW(env, all_printenv[i]->envname) == 0) { @@ -749,7 +749,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW ptr = (LPWSTR) &pMonitors[len]; numentries = 0; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; /* Windows creates the "Monitors"-Key on reboot / start "spooler" */ @@ -802,7 +802,7 @@ static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDW } } index++; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; } RegCloseKey(hroot); @@ -838,7 +838,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb ptr = (LPWSTR) &pPPInfo[len]; numentries = 0; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; if (RegCreateKeyW(HKEY_LOCAL_MACHINE, regpathW, &hroot) == ERROR_SUCCESS) { @@ -852,7 +852,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb TRACE("%p: writing PRINTPROCESSOR_INFO_1W #%d\n", ppi, numentries); ppi->pName = ptr; lstrcpyW(ptr, winprintW); /* Name of the Print Processor */ - ptr += sizeof(winprintW) / sizeof(WCHAR); + ptr += ARRAY_SIZE(winprintW); } /* Scan all Printprocessor Keys */ @@ -888,7 +888,7 @@ static DWORD get_local_printprocessors(LPWSTR regpathW, LPBYTE pPPInfo, DWORD cb } } index++; - len = sizeof(buffer)/sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); buffer[0] = '\0'; } RegCloseKey(hroot); @@ -1196,7 +1196,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) printer = NULL; } if (printername) { - len = sizeof(XcvMonitorW)/sizeof(WCHAR) - 1; + len = ARRAY_SIZE(XcvMonitorW) - 1; if (strncmpW(printername, XcvMonitorW, len) == 0) { /* OpenPrinter(",XcvMonitor ", ...) detected */ TRACE(",XcvMonitor: %s\n", debugstr_w(&printername[len])); @@ -1210,7 +1210,7 @@ static HANDLE printer_alloc_handle(LPCWSTR name, LPPRINTER_DEFAULTSW pDefault) } else { - len = sizeof(XcvPortW)/sizeof(WCHAR) - 1; + len = ARRAY_SIZE(XcvPortW) - 1; if (strncmpW( printername, XcvPortW, len) == 0) { /* OpenPrinter(",XcvPort ", ...) detected */ TRACE(",XcvPort: %s\n", debugstr_w(&printername[len])); @@ -1303,7 +1303,7 @@ static BOOL myAddPrinterDriverEx(DWORD level, LPBYTE pDriverInfo, DWORD dwFileCo DRIVER_INFO, that the caller supplied */ ZeroMemory(&di, sizeof(di)); - if (pDriverInfo && (level < (sizeof(di_sizeof) / sizeof(di_sizeof[0])))) { + if (pDriverInfo && (level < ARRAY_SIZE(di_sizeof))) { memcpy(&di, pDriverInfo, di_sizeof[level]); } -- 2.14.4

2 1

RFC: Chinese/Japanese/Korean speakers - testing needed for winetricks cjkfonts patch
by Austin English 13 Aug '18

13 Aug '18

A bug [1] was reported in winetricks a while back about Chinese input in QQ; the solution was a missing font substituion (QQ expected a substitution for the native name, not the English name). I just pushed a patch that adds the font substitutes that were in Chromium [2]. As I don't speak any of those languages, I'd appreciate if anyone that does could test the patches with `winetricks cjkfonts` (particularly if you've had issues with cjkfonts before) and let me know if helps / breaks anything. Thanks in advance, -Austin [1] https://github.com/Winetricks/winetricks/issues/781 [2] https://github.com/austin987/winetricks/commit/a591bf3d9a3efc153787768f5e2a… -- -Austin GPG: 267B CC1F 053F 0749 (expires 2021/02/18)

2 1

[PATCH v2 8/8] comctl32/taskdialog: Fix center positioning.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6875b9ce4f..f69fa6aaa3 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -2,6 +2,7 @@ * Task dialog control * * Copyright 2017 Fabian Maurer + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1101,8 +1102,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if (first_time) { - x = (ref_rect.left + ref_rect.right + dialog_width) / 2; - y = (ref_rect.top + ref_rect.bottom + dialog_height) / 2; + x = (ref_rect.left + ref_rect.right - dialog_width) / 2; + y = (ref_rect.top + ref_rect.bottom - dialog_height) / 2; SetWindowPos(dialog_info->hwnd, 0, x, y, dialog_width, dialog_height, SWP_NOZORDER); first_time = FALSE; } -- 2.18.0

2 1

[PATCH v2 7/8] comctl32/taskdialog: Add vertical spacing for radio buttons.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Add vertical spacing to make dialog look nicer. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1bc37861f8..6875b9ce4f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -939,7 +939,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) for (i = 0; i < dialog_info->radio_button_count; i++) { x = main_icon_right + h_spacing; - y = dialog_height; + y = dialog_height + v_spacing; taskdialog_get_radio_button_size(dialog_info, dialog_info->radio_buttons[i], dialog_width - x - h_spacing, &size); size.cx = dialog_width - x - h_spacing; SetWindowPos(dialog_info->radio_buttons[i], 0, x, y, size.cx, size.cy, SWP_NOZORDER); -- 2.18.0

2 1

[PATCH v2 6/8] comctl32/taskdialog: Add support for TDM_UPDATE_ICON.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6154e76be1..1bc37861f8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1306,6 +1306,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: taskdialog_button_set_shield(dialog_info, wParam, lParam); break; + case TDM_UPDATE_ICON: + taskdialog_set_icon(dialog_info, wParam, (HICON)lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

2 1

[PATCH v2 5/8] comctl32/taskdialog: Add support for TDF_SIZE_TO_CONTENT.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ffa8ee2fe8..6154e76be1 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -828,6 +828,36 @@ static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); } +static LONG taskdialog_get_dialog_width(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); + LONG max_width, main_icon_width, screen_width; + RECT rect; + SIZE size; + + screen_width = taskdialog_get_reference_rect(taskconfig, &rect); + if ((taskconfig->dwFlags & TDF_SIZE_TO_CONTENT) && !taskconfig->cxWidth) + { + max_width = DIALOG_MIN_WIDTH; + taskdialog_du_to_px(dialog_info, &max_width, NULL); + main_icon_width = dialog_info->m.h_spacing; + if (dialog_info->main_icon) main_icon_width += GetSystemMetrics(SM_CXICON); + if (dialog_info->content) + { + taskdialog_get_label_size(dialog_info, dialog_info->content, 0, &size, syslink); + max_width = max(max_width, size.cx + main_icon_width + dialog_info->m.h_spacing * 2); + } + } + else + { + max_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); + taskdialog_du_to_px(dialog_info, &max_width, NULL); + } + max_width = min(max_width, screen_width); + return max_width; +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -850,7 +880,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) BOOL syslink = taskdialog_hyperlink_enabled(dialog_info); static BOOL first_time = TRUE; RECT ref_rect; - LONG screen_width, dialog_width, dialog_height = 0; + LONG dialog_width, dialog_height = 0; LONG h_spacing, v_spacing; LONG main_icon_right, main_icon_bottom; LONG expando_right, expando_bottom; @@ -862,10 +892,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) SIZE size; INT i; - screen_width = taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); - dialog_width = max(taskconfig->cxWidth, DIALOG_MIN_WIDTH); - taskdialog_du_to_px(dialog_info, &dialog_width, 0); - dialog_width = min(dialog_width, screen_width); + taskdialog_get_reference_rect(dialog_info->taskconfig, &ref_rect); + dialog_width = taskdialog_get_dialog_width(dialog_info); h_spacing = dialog_info->m.h_spacing; v_spacing = dialog_info->m.v_spacing; -- 2.18.0

2 1

[PATCH v2 4/8] comctl32/taskdialog: Add support for TDM_{SET,UPDATE}_ELEMENT_TEXT.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index dd7369645f..ffa8ee2fe8 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -542,6 +542,28 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } +static void taskdialog_set_element_text(struct taskdialog_info *dialog_info, TASKDIALOG_ELEMENTS element, + const WCHAR *text) +{ + HWND hwnd = NULL; + WCHAR *textW; + + if (element == TDE_CONTENT) + hwnd = dialog_info->content; + else if (element == TDE_EXPANDED_INFORMATION) + hwnd = dialog_info->expanded_info; + else if (element == TDE_FOOTER) + hwnd = dialog_info->footer_text; + else if (element == TDE_MAIN_INSTRUCTION) + hwnd = dialog_info->main_instruction; + + if (!hwnd) return; + + textW = taskdialog_gettext(dialog_info, TRUE, text); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)textW); + Free(textW); +} + static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; @@ -1227,6 +1249,13 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case TDM_SET_PROGRESS_BAR_MARQUEE: SendMessageW(dialog_info->progress_bar, PBM_SETMARQUEE, wParam, lParam); break; + case TDM_SET_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + taskdialog_layout(dialog_info); + break; + case TDM_UPDATE_ELEMENT_TEXT: + taskdialog_set_element_text(dialog_info, wParam, (const WCHAR *)lParam); + break; case TDM_CLICK_RADIO_BUTTON: taskdialog_click_radio_button(dialog_info, wParam); break; -- 2.18.0

2 1

[PATCH v2 3/8] comctl32/taskdialog: Add support for TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index efe159f891..dd7369645f 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -212,6 +212,13 @@ static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); } +static void taskdialog_button_set_shield(const struct taskdialog_info *dialog_info, INT id, BOOL elevate) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) SendMessageW(hwnd, BCM_SETSHIELD, 0, elevate); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -1239,6 +1246,9 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } break; } + case TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE: + taskdialog_button_set_shield(dialog_info, wParam, lParam); + break; case WM_INITDIALOG: dialog_info = (struct taskdialog_info *)lParam; -- 2.18.0

2 1

[PATCH v2 2/8] comctl32/taskdialog: Add support for navigating page.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 17 ++++++++++ dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index c6a3aa7ae5..efe159f891 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -1142,8 +1142,16 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_layout(dialog_info); } +static BOOL CALLBACK takdialog_destroy_control(HWND hwnd, LPARAM lParam) +{ + DestroyWindow(hwnd); + return TRUE; +} + static void taskdialog_destroy(struct taskdialog_info *dialog_info) { + EnumChildWindows(dialog_info->hwnd, takdialog_destroy_control, 0); + if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); @@ -1167,6 +1175,15 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { + case TDM_NAVIGATE_PAGE: + dialog_info->taskconfig = (const TASKDIALOGCONFIG *)lParam; + taskdialog_destroy(dialog_info); + taskdialog_init(dialog_info, hwnd); + taskdialog_notify(dialog_info, TDN_DIALOG_CONSTRUCTED, 0, 0); + /* Default radio button click notification is sent before TDN_NAVIGATED */ + taskdialog_check_default_radio_buttons(dialog_info); + taskdialog_notify(dialog_info, TDN_NAVIGATED, 0, 0); + break; case TDM_CLICK_BUTTON: taskdialog_click_button(dialog_info, wParam); break; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8d60fb2eb8..093671c30f 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -271,6 +271,25 @@ static const struct message_info msg_return_verification_checked[] = { 0 } }; +static TASKDIALOGCONFIG navigated_info = {0}; + +static const struct message_info msg_send_navigate[] = +{ + { TDM_NAVIGATE_PAGE, 0, (LPARAM)&navigated_info, 0}, + { 0 } +}; + +static const struct message_info msg_return_navigated_page[] = +{ + { TDN_CREATED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, msg_send_navigate }, + { TDN_DIALOG_CONSTRUCTED, 0, 0, S_OK, NULL }, + { TDN_RADIO_BUTTON_CLICKED, ID_START_RADIO_BUTTON, 0, S_OK, NULL }, + { TDN_NAVIGATED, 0, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -682,6 +701,44 @@ static void test_verification_box(void) "default verification box: default unchecked and then checked"); } +static void test_navigate_page(void) +{ + TASKDIALOGCONFIG info = {0}; + static const WCHAR textW[] = {'t', 'e', 'x', 't', 0}; + static const WCHAR button_format[] = {'%', '0', '2', 'd', 0}; + TASKDIALOG_BUTTON radio_buttons[TEST_NUM_RADIO_BUTTONS]; + WCHAR radio_button_titles[TEST_NUM_BUTTONS * 3]; + int i; + + /* Init radio buttons */ + for (i = 0; i < TEST_NUM_RADIO_BUTTONS; i++) + { + WCHAR *text = &radio_button_titles[i * 3]; + wsprintfW(text, button_format, i); + + radio_buttons[i].pszButtonText = text; + radio_buttons[i].nButtonID = ID_START_RADIO_BUTTON + i; + } + + info.cbSize = sizeof(TASKDIALOGCONFIG); + info.pfCallback = taskdialog_callback_proc; + info.lpCallbackData = test_ref_data; + info.dwCommonButtons = TDCBF_OK_BUTTON; + info.cRadioButtons = TEST_NUM_RADIO_BUTTONS; + info.pRadioButtons = radio_buttons; + + navigated_info = info; + navigated_info.pszVerificationText = textW; + navigated_info.dwFlags = TDF_VERIFICATION_FLAG_CHECKED; + + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: default"); + + /* TDM_NAVIGATE_PAGE doesn't check cbSize. + * And null taskconfig pointer crash applicatioin, thus doesn't check pointer either */ + navigated_info.cbSize = 0; + run_test(&info, IDOK, ID_START_RADIO_BUTTON, TRUE, msg_return_navigated_page, "navigate page: invalid taskconfig cbSize"); +} + START_TEST(taskdialog) { ULONG_PTR ctx_cookie; @@ -722,6 +779,7 @@ START_TEST(taskdialog) test_timer(); test_progress_bar(); test_verification_box(); + test_navigate_page(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH v2 1/8] comctl32/taskdialog: Update vertical layout only when expando button clicked.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Update vertical layout only to improve efficiency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 57 +++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 457a5ff9d0..c6a3aa7ae5 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -232,11 +232,66 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_move_controls_vertically(HWND parent, HWND *controls, INT count, INT offset) +{ + RECT rect; + POINT pt; + INT i; + + for (i = 0; i < count; i++) + { + if (!controls[i]) continue; + + GetWindowRect(controls[i], &rect); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(HWND_DESKTOP, parent, &pt, 1); + SetWindowPos(controls[i], 0, pt.x, pt.y + offset, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } +} + static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *text; + RECT info_rect, rect; + INT height, offset; + dialog_info->expanded = !dialog_info->expanded; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + SendMessageW(dialog_info->expando_button, WM_SETTEXT, 0, (LPARAM)text); ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); - taskdialog_layout(dialog_info); + + GetWindowRect(dialog_info->expanded_info, &info_rect); + /* If expanded information starts up not expanded, call taskdialog_layout() + * to to set size for expanded information control at least once */ + if (IsRectEmpty(&info_rect)) + { + taskdialog_layout(dialog_info); + return; + } + height = info_rect.bottom - info_rect.top + dialog_info->m.v_spacing; + offset = dialog_info->expanded ? height : -height; + + /* Update vertical layout, move all controls after expanded information */ + /* Move dialog */ + GetWindowRect(dialog_info->hwnd, &rect); + SetWindowPos(dialog_info->hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top + offset, + SWP_NOMOVE | SWP_NOZORDER); + /* Move controls */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA)) + { + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->progress_bar, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->expando_button, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->verification_box, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_icon, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_text, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->buttons, dialog_info->button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->radio_buttons, + dialog_info->radio_button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->command_links, + dialog_info->command_link_count, offset); + } } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) -- 2.18.0

2 1

[PATCH] dwrite: Avoid possible out-of-bounds cluster metrics access.
by Nikolay Sivov 13 Aug '18

13 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45535 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 65e0a57678..10d591457c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2089,7 +2089,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) */ if (layout->len == 0) hr = layout_set_dummy_line_metrics(layout, 0); - else if (layout->clustermetrics[layout->cluster_count - 1].isNewline) + else if (layout->cluster_count && layout->clustermetrics[layout->cluster_count - 1].isNewline) hr = layout_set_dummy_line_metrics(layout, layout->len - 1); if (FAILED(hr)) return hr; -- 2.18.0

1 0

[resend PATCH] msxml3: Accept NormalizeAttributeValues property
by Nikolay Sivov 13 Aug '18

13 Aug '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/domdoc.c | 2 ++ dlls/msxml3/tests/domdoc.c | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ddd756582b..0b917c1302 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -73,6 +73,7 @@ static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r' static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0}; static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0}; +static const WCHAR PropertyNormalizeAttributeValuesW[] = {'N','o','r','m','a','l','i','z','e','A','t','t','r','i','b','u','t','e','V','a','l','u','e','s',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -3108,6 +3109,7 @@ static HRESULT WINAPI domdoc_setProperty( lstrcmpiW(p, PropertyNewParserW) == 0 || lstrcmpiW(p, PropertyResolveExternalsW) == 0 || lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 || + lstrcmpiW(p, PropertyNormalizeAttributeValuesW) == 0 || lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0) { /* Ignore */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d5f30fec62..35fa42a6d1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12792,6 +12792,44 @@ static void test_transformNodeToObject(void) free_bstrs(); } +static void test_normalize_attribute_values(void) +{ + IXMLDOMDocument2 *doc; + VARIANT var; + HRESULT hr; + + if (!is_clsid_supported(&CLSID_DOMDocument60, &IID_IXMLDOMDocument2)) + { + win_skip("NormalizeAttributeValues is not supported.\n"); + return; + } + + doc = create_document_version(60, &IID_IXMLDOMDocument2); + + V_VT(&var) = VT_I2; + V_I2(&var) = 10; + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("NormalizeAttributeValues"), &var); +todo_wine { + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + ok(V_VT(&var) == VT_BOOL, "Unexpected property value type, vt %d.\n", V_VT(&var)); + ok(V_BOOL(&var) == VARIANT_FALSE, "Unexpected property value.\n"); +} + V_VT(&var) = VT_BOOL; + V_BOOL(&var) = VARIANT_TRUE; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("NormalizeAttributeValues"), var); + ok(hr == S_OK, "Failed to set property, hr %#x.\n", hr); + + V_VT(&var) = VT_I2; + V_I2(&var) = 10; + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("NormalizeAttributeValues"), &var); +todo_wine { + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + ok(V_VT(&var) == VT_BOOL, "Unexpected property value type, vt %d.\n", V_VT(&var)); + ok(V_BOOL(&var) == VARIANT_TRUE, "Unexpected property value.\n"); +} + IXMLDOMDocument2_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -12875,6 +12913,7 @@ START_TEST(domdoc) test_url(); test_merging_text(); test_transformNodeToObject(); + test_normalize_attribute_values(); test_xsltemplate(); test_xsltext(); -- 2.18.0

1 0

[PATCH v2] wined3d: Decompress DXTn 3D textures on upload.
by Henri Verbeet 13 Aug '18

13 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 149253. v2: Fix the maths in the comments, as pointed out by Józef. --- dlls/wined3d/resource.c | 9 ++ dlls/wined3d/texture.c | 40 ++++-- dlls/wined3d/utils.c | 286 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 + 4 files changed, 304 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b5dcdf012db..bf54245276a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -477,3 +477,12 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } } + +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) +{ + if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) + && !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c316906a957..ebdacfa2ee0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1727,7 +1727,13 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - if (format->conv_byte_count) + if (texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS) + { + TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -1897,6 +1903,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s void *converted_mem = NULL; struct wined3d_format f; unsigned int level; + BOOL decompress; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1948,20 +1955,31 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s bo.addr += src_box->left * format->byte_count; } - if (format->upload) + decompress = texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS; + if (format->upload || decompress) { + const struct wined3d_format *compressed_format = format; unsigned int dst_row_pitch, dst_slice_pitch; void *src_mem; - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); + if (decompress) + { + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else + { + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); - f = *format; - f.byte_count = format->conv_byte_count; - format = &f; + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + } wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + /* Note that uploading 3D textures may require quite some address + * space; it may make sense to upload them per-slice instead. */ if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); @@ -1970,8 +1988,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + else + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..283e73015cb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -339,6 +339,230 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; +static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) +{ + BYTE c; + + /* (2⁸ - 1) / (2⁵ - 1) ≈ 2⁸ / 2⁵ + 2⁸ / 2¹⁰ + * (2⁸ - 1) / (2⁶ - 1) ≈ 2⁸ / 2⁶ + 2⁸ / 2¹² */ + c = rgb565 >> 11; + *r = (c << 3) + (c >> 2); + c = (rgb565 >> 5) & 0x3f; + *g = (c << 2) + (c >> 4); + c = rgb565 & 0x1f; + *b = (c << 3) + (c >> 2); +} + +static void build_dxtn_colour_table(WORD colour0, WORD colour1, + DWORD colour_table[4], enum wined3d_format_id format_id) +{ + unsigned int i; + struct + { + BYTE r, g, b; + } c[4]; + + rgb888_from_rgb565(colour0, &c[0].r, &c[0].g, &c[0].b); + rgb888_from_rgb565(colour1, &c[1].r, &c[1].g, &c[1].b); + + if (format_id == WINED3DFMT_BC1_UNORM && colour0 <= colour1) + { + c[2].r = (c[0].r + c[1].r) / 2; + c[2].g = (c[0].g + c[1].g) / 2; + c[2].b = (c[0].b + c[1].b) / 2; + + c[3].r = 0; + c[3].g = 0; + c[3].b = 0; + } + else + { + for (i = 0; i < 2; ++i) + { + c[i + 2].r = (2 * c[i].r + c[1 - i].r) / 3; + c[i + 2].g = (2 * c[i].g + c[1 - i].g) / 3; + c[i + 2].b = (2 * c[i].b + c[1 - i].b) / 3; + } + } + + for (i = 0; i < 4; ++i) + { + colour_table[i] = (c[i].r << 16) | (c[i].g << 8) | c[i].b; + } +} + +static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +{ + unsigned int i; + + alpha_table[0] = alpha0; + alpha_table[1] = alpha1; + + if (alpha0 > alpha1) + { + for (i = 0; i < 6; ++i) + { + alpha_table[2 + i] = ((6 - i) * alpha0 + (i + 1) * alpha1) / 7; + } + return; + } + else + { + for (i = 0; i < 4; ++i) + { + alpha_table[2 + i] = ((4 - i) * alpha0 + (i + 1) * alpha1) / 5; + } + alpha_table[6] = 0x00; + alpha_table[7] = 0xff; + } +} + +static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width, + unsigned int height, unsigned int dst_row_pitch, enum wined3d_format_id format_id) +{ + const UINT64 *s = (const UINT64 *)src; + BOOL bc1_alpha = FALSE; + DWORD colour_table[4]; + BYTE alpha_table[8]; + UINT64 alpha_bits; + DWORD colour_bits; + unsigned int x, y; + BYTE colour_idx; + DWORD *dst_row; + BYTE alpha; + + if (format_id == WINED3DFMT_BC1_UNORM) + { + WORD colour0, colour1; + + alpha_bits = 0; + + colour0 = s[0] & 0xffff; + colour1 = (s[0] >> 16) & 0xffff; + colour_bits = (s[0] >> 32) & 0xffffffff; + build_dxtn_colour_table(colour0, colour1, colour_table, format_id); + if (colour0 <= colour1) + bc1_alpha = TRUE; + } + else + { + alpha_bits = s[0]; + if (format_id == WINED3DFMT_BC3_UNORM) + { + build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + alpha_bits >>= 16; + } + + colour_bits = (s[1] >> 32) & 0xffffffff; + build_dxtn_colour_table(s[1] & 0xffff, (s[1] >> 16) & 0xffff, colour_table, format_id); + } + + for (y = 0; y < height; ++y) + { + dst_row = (DWORD *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + colour_idx = (colour_bits >> (y * 8 + x * 2)) & 0x3; + switch (format_id) + { + case WINED3DFMT_BC1_UNORM: + alpha = bc1_alpha && colour_idx == 3 ? 0x00 : 0xff; + break; + + case WINED3DFMT_BC2_UNORM: + alpha = (alpha_bits >> (y * 16 + x * 4)) & 0xf; + /* (2⁸ - 1) / (2⁴ - 1) ≈ 2⁸ / 2⁴ + 2⁸ / 2⁸ */ + alpha |= alpha << 4; + break; + + case WINED3DFMT_BC3_UNORM: + alpha = alpha_table[(alpha_bits >> (y * 12 + x * 3)) & 0x7]; + break; + + default: + alpha = 0xff; + break; + } + dst_row[x] = (alpha << 24) | colour_table[colour_idx]; + } + } +} + +static void decompress_dxtn(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth, enum wined3d_format_id format_id) +{ + unsigned int block_byte_count, block_w, block_h; + const BYTE *src_row, *src_slice = src; + BYTE *dst_row, *dst_slice = dst; + unsigned int x, y, z; + + block_byte_count = format_id == WINED3DFMT_BC1_UNORM ? 8 : 16; + + for (z = 0; z < depth; ++z) + { + src_row = src_slice; + dst_row = dst_slice; + for (y = 0; y < height; y += 4) + { + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_dxtn_block(&src_row[x * (block_byte_count / 4)], + &dst_row[x * 4], block_w, block_h, dst_row_pitch, format_id); + } + src_row += src_row_pitch; + dst_row += dst_row_pitch * 4; + } + src_slice += src_slice_pitch; + dst_slice += dst_slice_pitch; + } +} + +static void decompress_bc3(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC3_UNORM); +} + +static void decompress_bc2(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC2_UNORM); +} + +static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); +} + +static const struct wined3d_format_decompress_info +{ + enum wined3d_format_id id; + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); +} +format_decompress_info[] = +{ + {WINED3DFMT_DXT1, decompress_bc1}, + {WINED3DFMT_DXT2, decompress_bc2}, + {WINED3DFMT_DXT3, decompress_bc2}, + {WINED3DFMT_DXT4, decompress_bc3}, + {WINED3DFMT_DXT5, decompress_bc3}, + {WINED3DFMT_BC1_UNORM, decompress_bc1}, + {WINED3DFMT_BC2_UNORM, decompress_bc2}, + {WINED3DFMT_BC3_UNORM, decompress_bc3}, +}; + struct wined3d_format_block_info { enum wined3d_format_id id; @@ -437,6 +661,9 @@ struct wined3d_format_texture_info void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -1897,6 +2124,34 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) return TRUE; } +/* Most compressed formats are not supported for 3D textures by OpenGL. + * + * In the case of the S3TC/DXTn formats, NV_texture_compression_vtc provides + * these formats for 3D textures, but unfortunately the block layout is + * different from the one used by Direct3D. + * + * Since applications either don't check format availability at all before + * using these, or refuse to run without them, we decompress them on upload. + * + * Affected applications include "Heroes VI", "From Dust", "Halo Online" and + * "Eldorado". */ +static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +{ + struct wined3d_format *format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) + { + if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + return FALSE; + + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; + format->decompress = format_decompress_info[i].decompress; + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3390,34 +3645,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ } } - /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers - * for dx9 GPUs support it, some do not, so not supporting DXTn volumes is OK for d3d9. - * - * Note that GL_NV_texture_compression_vtc adds this functionality to OpenGL, but the - * block layout is not compatible with the one used by d3d. See volume_dxt5_test. */ - idx = get_format_idx(WINED3DFMT_DXT1); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT2); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT3); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT4); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT5); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + /* These formats are not supported for 3D textures. See also + * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); @@ -3742,6 +3971,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; + if (!init_format_decompress_info(gl_info)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece41ebd06c..25f7cb2416e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3081,6 +3081,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4231,6 +4233,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 +#define WINED3DFMT_FLAG_DECOMPRESS 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 @@ -4304,6 +4307,9 @@ struct wined3d_format void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

4 3

[PATCH 02/11] dxgi: Set transfer image usage for Vulkan swapchain images.
by Józef Kucia 12 Aug '18

12 Aug '18

For CopyTextureRegion() on swapchain buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 90f72d06e87a..3537f117d1b6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1624,6 +1624,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI unsigned int image_count, i, j; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; + VkImageUsageFlags usage; VkInstance vk_instance; VkBool32 supported; VkDevice vk_device; @@ -1738,6 +1739,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI goto fail; } + usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) + WARN("Transfer not supported for swapchain images.\n"); + vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; vk_swapchain_desc.flags = 0; @@ -1748,7 +1755,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI vk_swapchain_desc.imageExtent.width = swapchain_desc->Width; vk_swapchain_desc.imageExtent.height = swapchain_desc->Height; vk_swapchain_desc.imageArrayLayers = 1; - vk_swapchain_desc.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + vk_swapchain_desc.imageUsage = usage; vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; vk_swapchain_desc.queueFamilyIndexCount = 0; vk_swapchain_desc.pQueueFamilyIndices = NULL; -- 2.16.4

3 2

[PATCH 3/3] ddraw/tests: Fix IDirectDraw leaks.
by Józef Kucia 12 Aug '18

12 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- dlls/ddraw/tests/ddraw4.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 39e7d109438b..eafcd38f72ca 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11707,8 +11707,9 @@ static void test_viewport(void) IDirect3DDevice_DeleteMatrix(device, proj_handle); destroy_material(black_background); refcount = IDirect3DDevice_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9e2107cda43c..0a4750a8911d 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12989,8 +12989,9 @@ static void test_viewport(void) destroy_material(black_background); refcount = IDirect3DDevice2_Release(device); - IDirect3D2_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D2_Release(d3d); + IDirectDraw2_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cc77eea4a99f..b89d752606ef 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15083,8 +15083,9 @@ static void test_viewport(void) } refcount = IDirect3DDevice3_Release(device); - IDirect3D3_Release(d3d); ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D3_Release(d3d); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 501c9a184e28..0fddc82ed9a7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14399,6 +14399,7 @@ static void test_viewport(void) refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw7_Release(ddraw); DestroyWindow(window); } -- 2.16.4

4 3

[PATCH 01/11] dxgi: Stub DXGIGetDebugInterface1().
by Józef Kucia 12 Aug '18

12 Aug '18

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 801e6a4283c0..67a345dc3764 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -3,3 +3,4 @@ @ stdcall CreateDXGIFactory2(long ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) +@ stdcall DXGIGetDebugInterface1(long ptr ptr) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index df8761bdce09..cd2c39f4e14d 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -248,3 +248,11 @@ HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, U return S_OK; } + +HRESULT WINAPI DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug) +{ + TRACE("flags %#x, iid %s, debug %p.\n", flags, debugstr_guid(iid), debug); + + WARN("Returning E_NOINTERFACE.\n"); + return E_NOINTERFACE; +} -- 2.16.4

3 2

[PATCH 09/12] wined3d: Fix WINED3D_MCS_COLOR2 handling in wined3d_ffp_get_vs_settings().
by Henri Verbeet 12 Aug '18

12 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> WINED3D_MCS_COLOR2 requires specular colour, and does not require diffuse colour. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bac52022510..a4181d8572d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6077,6 +6077,16 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); } +static enum wined3d_material_color_source validate_material_colour_source(WORD use_map, + enum wined3d_material_color_source source) +{ + if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + return source; + if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + return source; + return WINED3D_MCS_MATERIAL; +} + void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { @@ -6141,12 +6151,16 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->point_size = state->gl_primitive_type == GL_POINTS; settings->per_vertex_point_size = !!(si->use_map & 1u << WINED3D_FFP_PSIZE); - if (state->render_states[WINED3D_RS_COLORVERTEX] && (si->use_map & (1u << WINED3D_FFP_DIFFUSE))) + if (state->render_states[WINED3D_RS_COLORVERTEX]) { - settings->diffuse_source = state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]; - settings->emissive_source = state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]; - settings->ambient_source = state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]; - settings->specular_source = state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]; + settings->diffuse_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_DIFFUSEMATERIALSOURCE]); + settings->emissive_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_EMISSIVEMATERIALSOURCE]); + settings->ambient_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_AMBIENTMATERIALSOURCE]); + settings->specular_source = validate_material_colour_source(si->use_map, + state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); } else { -- 2.11.0

2 1

[PATCH 07/12] wined3d: Invalidate the FFP vertex shader when diffuse/specular attribute presence changes.
by Henri Verbeet 12 Aug '18

12 Aug '18

Debugged by Andy Clayton. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 +++++++++++- dlls/wined3d/wined3d_private.h | 6 ++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c73aba8111..d38ba2bcf06 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11692,6 +11692,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL specular = !!(context->stream_info.use_map & (1u << WINED3D_FFP_SPECULAR)); + BOOL diffuse = !!(context->stream_info.use_map & (1u << WINED3D_FFP_DIFFUSE)); BOOL normal = !!(context->stream_info.use_map & (1u << WINED3D_FFP_NORMAL)); const BOOL legacy_clip_planes = needs_legacy_glsl_syntax(gl_info); BOOL transformed = context->stream_info.position_transformed; @@ -11724,8 +11726,14 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, /* Because of settings->texcoords, we have to regenerate the vertex * shader on a vdecl change if there aren't enough varyings to just - * always output all the texture coordinates. */ + * always output all the texture coordinates. + * + * Likewise, we have to invalidate the shader when using per-vertex + * colours and diffuse/specular attribute presence changes, or when + * normal presence changes. */ if (gl_info->limits.glsl_varyings < wined3d_max_compat_varyings(gl_info) + || (state->render_states[WINED3D_RS_COLORVERTEX] + && (diffuse != context->last_was_diffuse || specular != context->last_was_specular)) || normal != context->last_was_normal) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; @@ -11748,6 +11756,8 @@ static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, } context->last_was_vshader = use_vs(state); + context->last_was_diffuse = diffuse; + context->last_was_specular = specular; context->last_was_normal = normal; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25f7cb2416e..39bb06ad265 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1879,6 +1879,8 @@ struct wined3d_context DWORD last_swizzle_map : 16; /* MAX_ATTRIBS, 16 */ DWORD last_was_pshader : 1; DWORD last_was_vshader : 1; + DWORD last_was_diffuse : 1; + DWORD last_was_specular : 1; DWORD last_was_normal : 1; DWORD namedArraysLoaded : 1; DWORD last_was_ffp_blit : 1; @@ -1886,7 +1888,6 @@ struct wined3d_context DWORD last_was_ckey : 1; DWORD fog_coord : 1; DWORD fog_enabled : 1; - DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD current : 1; DWORD destroyed : 1; DWORD valid : 1; @@ -1911,7 +1912,8 @@ struct wined3d_context DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD padding : 9; + DWORD num_untracked_materials : 2; /* Max value 2 */ + DWORD padding : 7; DWORD constant_update_mask; DWORD numbered_array_mask; -- 2.11.0

2 1

[PATCH 03/12] wined3d: Clarify a TRACE in buffer_init().
by Henri Verbeet 12 Aug '18

12 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 181be6bbe48..7e5feb23262 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1371,7 +1371,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of * the buffer to provide the same behavior to the application. */ - TRACE("Using doublebuffer mode.\n"); + TRACE("Pinning system memory.\n"); buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } -- 2.11.0

2 1

[PATCH] shell32: Support BYREF index in FolderItems::Item().
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shelldispatch.c | 17 ++++++++++++----- dlls/shell32/tests/shelldispatch.c | 18 +++++++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 2835fad712..c6d1dab7f6 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1129,19 +1129,24 @@ static HRESULT WINAPI FolderItemsImpl_get_Parent(FolderItems3 *iface, IDispatch return E_NOTIMPL; } -static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, FolderItem **item) +static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT var, FolderItem **item) { FolderItemsImpl *This = impl_from_FolderItems(iface); BSTR display_name = NULL; + VARIANT index; HRESULT hr; - TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&index), item); + TRACE("(%p,%s,%p)\n", iface, debugstr_variant(&var), item); *item = NULL; if (!shellfolder_exists(This->folder->path)) return S_FALSE; + VariantInit(&index); + if (FAILED(hr = VariantCopyInd(&index, &var))) + return hr; + switch (V_VT(&index)) { case VT_I2: @@ -1163,8 +1168,9 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F if (!V_BSTR(&index)) return S_FALSE; - if (FAILED(hr = IShellFolder2_ParseDisplayName(This->folder->folder, NULL, NULL, V_BSTR(&index), - NULL, &pidl, NULL))) + hr = IShellFolder2_ParseDisplayName(This->folder->folder, NULL, NULL, V_BSTR(&index), NULL, &pidl, NULL); + VariantClear(&index); + if (FAILED(hr)) return S_FALSE; if (IShellFolder2_GetDisplayNameOf(This->folder->folder, pidl, SHGDN_FORPARSING, &strret) == S_OK) @@ -1176,7 +1182,8 @@ static HRESULT WINAPI FolderItemsImpl_Item(FolderItems3 *iface, VARIANT index, F break; default: - FIXME("Index type %d not handled.\n", V_VT(&index)); + FIXME("Index type %#x not handled.\n", V_VT(&index)); + VariantClear(&index); /* fall through */ case VT_EMPTY: return E_NOTIMPL; diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 30c8291f58..5191d5e970 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -382,7 +382,7 @@ static void test_items(void) FolderItems3 *items3 = NULL; FolderItem *item = (FolderItem*)0xdeadbeef, *item2; FolderItemVerbs *verbs = (FolderItemVerbs*)0xdeadbeef; - VARIANT var, int_index, str_index, str_index2; + VARIANT var, var2, int_index, str_index, str_index2; IDispatch *disp, *disp2; LONG count = -1; IUnknown *unk; @@ -543,12 +543,14 @@ static void test_items(void) ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); ok(count == ARRAY_SIZE(file_defs), "got %d files\n", count); + /* VT_EMPTY */ V_VT(&var) = VT_EMPTY; item = (FolderItem*)0xdeadbeef; r = FolderItems_Item(items, var, &item); ok(r == E_NOTIMPL, "expected E_NOTIMPL, got %08x\n", r); ok(!item, "item is not null\n"); + /* VT_I2 */ V_VT(&var) = VT_I2; V_I2(&var) = 0; @@ -571,6 +573,20 @@ static void test_items(void) FolderItem_Release(item); + /* VT_VARIANT | VT_BYREF */ + V_VT(&var2) = VT_I2; + V_I2(&var2) = 0; + + V_VT(&var) = VT_BYREF | VT_VARIANT; + V_VARIANTREF(&var) = &var2; + + item = NULL; + r = FolderItems_Item(items, var, &item); + ok(r == S_OK, "FolderItems::Item failed: %08x\n", r); + ok(!!item, "item is null\n"); + FolderItem_Release(item); + + /* VT_I4 */ V_VT(&var) = VT_I4; V_I4(&var) = 0; item = NULL; -- 2.18.0

1 0

[PATCH] comctl32: Fix background and text color for DrawStatusText().
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/commctrl.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 1117ec43e9..45b93bdc8b 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -487,20 +487,24 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) { RECT r = *lprc; UINT border = BDR_SUNKENOUTER; + COLORREF oldbkcolor; if (style & SBT_POPOUT) border = BDR_RAISEDOUTER; else if (style & SBT_NOBORDERS) border = 0; - DrawEdge (hdc, &r, border, BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); /* now draw text */ if (text) { int oldbkmode = SetBkMode (hdc, TRANSPARENT); + COLORREF oldtextcolor; UINT align = DT_LEFT; int strCnt = 0; + oldtextcolor = SetTextColor (hdc, comctl32_color.clrBtnText); if (style & SBT_RTLREADING) FIXME("Unsupported RTL style!\n"); r.left += 3; @@ -520,8 +524,11 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) } while(*text++); if (strCnt) DrawTextW (hdc, text - strCnt, -1, &r, align|DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX); - SetBkMode(hdc, oldbkmode); + SetBkMode (hdc, oldbkmode); + SetTextColor (hdc, oldtextcolor); } + + SetBkColor (hdc, oldbkcolor); } -- 2.18.0

1 0

[PATCH] comctl32/header: Fix item text color.
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index a48530d888..d6f8d3a4d7 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -389,7 +389,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ - SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); + SetTextColor(hdc, (bHotTrack && !theme) ? comctl32_color.clrHighlight : comctl32_color.clrBtnText); SetBkColor(hdc, comctl32_color.clr3dFace); if (lCDFlags & CDRF_NOTIFYITEMDRAW && !(phdi->fmt & HDF_OWNERDRAW)) -- 2.18.0

1 0

[PATCH] comctl32/tests: More tests for HTREEITEM layout.
by Nikolay Sivov 12 Aug '18

12 Aug '18

Based on research by Zhiyi Zhang. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 72 +++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 33edaaf4b4..14d814d8e0 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2175,20 +2175,64 @@ struct _ITEM_DATA HTREEITEM parent; /* for root value of parent field is unidetified */ HTREEITEM nextsibling; HTREEITEM firstchild; + void *unk[2]; + DWORD unk2; + WORD pad; + WORD width; }; -static void _check_item(HTREEITEM item, HTREEITEM parent, HTREEITEM nextsibling, HTREEITEM firstchild, int line) +struct _ITEM_DATA_V6 { - struct _ITEM_DATA *data = (struct _ITEM_DATA*)item; + HTREEITEM parent; /* for root value of parent field is unidetified */ + HTREEITEM nextsibling; + HTREEITEM firstchild; + void *unk[3]; + DWORD unk2[2]; + WORD pad; + WORD width; +}; - ok_(__FILE__, line)(data->parent == parent, "parent %p, got %p\n", parent, data->parent); - ok_(__FILE__, line)(data->nextsibling == nextsibling, "sibling %p, got %p\n", nextsibling, data->nextsibling); - ok_(__FILE__, line)(data->firstchild == firstchild, "firstchild %p, got %p\n", firstchild, data->firstchild); +static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) +{ + struct _ITEM_DATA *data = (struct _ITEM_DATA *)item; + HTREEITEM parent, nextsibling, firstchild, root; + RECT rect; + BOOL ret; + + root = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_ROOT, (LPARAM)item); + parent = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item); + nextsibling = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_NEXT, (LPARAM)item); + firstchild = (HTREEITEM)SendMessageA(hwnd, TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item); + + *(HTREEITEM*)&rect = item; + ret = SendMessageA(hwnd, TVM_GETITEMRECT, TRUE, (LPARAM)&rect); + + ok_(__FILE__, line)(item == root ? data->parent != NULL : data->parent == parent, + "Unexpected parent item %p, got %p, %p\n", parent, data->parent, hwnd); + ok_(__FILE__, line)(data->nextsibling == nextsibling, "Unexpected sibling %p, got %p\n", + nextsibling, data->nextsibling); + ok_(__FILE__, line)(data->firstchild == firstchild, "Unexpected first child %p, got %p\n", + firstchild, data->firstchild); + if (ret) + { + WORD width; + + if (is_version_6) + { + struct _ITEM_DATA_V6 *data_v6 = (struct _ITEM_DATA_V6 *)item; + width = data_v6->width; + } + else + width = data->width; + todo_wine + ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", + width, rect.right - rect.left); + } } -#define check_item(a, b, c, d) _check_item(a, b, c, d, __LINE__) +#define CHECK_ITEM(a, b) _check_item(a, b, is_version_6, __LINE__) -static void test_htreeitem_layout(void) +static void test_htreeitem_layout(BOOL is_version_6) { TVINSERTSTRUCTA ins; HTREEITEM item1, item2; @@ -2198,27 +2242,27 @@ static void test_htreeitem_layout(void) fill_tree(hTree); /* root has some special pointer in parent field */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, hChild); - check_item(hChild, hRoot, 0, 0); + CHECK_ITEM(hTree, hRoot); + CHECK_ITEM(hTree, hChild); ins.hParent = hChild; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item1 = TreeView_InsertItemA(hTree, &ins); - check_item(item1, hChild, 0, 0); + CHECK_ITEM(hTree, item1); ins.hParent = hRoot; ins.hInsertAfter = TVI_FIRST; U(ins).item.mask = 0; item2 = TreeView_InsertItemA(hTree, &ins); - check_item(item2, hRoot, hChild, 0); + CHECK_ITEM(hTree, item2); SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hChild); /* without children now */ - check_item(hRoot, ((struct _ITEM_DATA*)hRoot)->parent, 0, item2); + CHECK_ITEM(hTree, hRoot); DestroyWindow(hTree); } @@ -2870,7 +2914,7 @@ START_TEST(treeview) test_WM_PAINT(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(FALSE); test_TVS_CHECKBOXES(); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); @@ -2907,7 +2951,7 @@ START_TEST(treeview) test_treeview_classinfo(); test_delete_items(); test_cchildren(); - test_htreeitem_layout(); + test_htreeitem_layout(TRUE); test_TVM_GETNEXTITEM(); test_TVM_HITTEST(); test_WM_GETDLGCODE(); -- 2.18.0

2 1

[PATCH] wmp/tests: Fix a minor leak on error path (Coverity)
by Nikolay Sivov 12 Aug '18

12 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/tests/media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 218b80f1e6..aeca6180b0 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -309,7 +309,7 @@ static BOOL test_wmp(void) LONG progress; IWMPMedia *media; static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0}; - BSTR bstrcurrentPosition = SysAllocString(currentPosition); + BSTR bstrcurrentPosition; hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj); if(hres == REGDB_E_CLASSNOTREG) { @@ -344,6 +344,7 @@ static BOOL test_wmp(void) ok(hres == S_OK, "get_controls failed: %08x\n", hres); ok(controls != NULL, "controls = NULL\n"); + bstrcurrentPosition = SysAllocString(currentPosition); hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool); ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres); ok(vbool == VARIANT_FALSE, "unexpected value\n"); -- 2.18.0

1 0

[PATCH vkd3d v3 1/7] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis 10 Aug '18

10 Aug '18

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Pull the pthread_setname_np(3) call into a header. Try 3: Detect which variant of pthread_setname_np(3) we have at configure time. configure.ac | 28 ++++++++++++++++++++++++++++ libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 11 +++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2773a15..973105b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,34 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_ VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)]) VKD3D_CHECK_LIB_FUNCS([pthread_setname_np], [$PTHREAD_LIBS]) +AS_IF([test "x$ac_cv_func_pthread_setname_np" = xyes], + [AC_MSG_CHECKING([which variant of pthread_setname_np is present]) + AC_CACHE_VAL([vkd3d_cv_pthread_setname_np_variant], + [vkd3d_cv_pthread_setname_np_variant=unknown + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np(pthread_self(), "conftest");])], + [vkd3d_cv_pthread_setname_np_variant=twoarg], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#ifdef HAVE_PTHREAD_H + #include <pthread.h> + #endif + ], + [pthread_setname_np("conftest");])], + [vkd3d_cv_pthread_setname_np_variant=onearg])])]) + AS_CASE(["$vkd3d_cv_pthread_setname_np_variant"], + [onearg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_ONEARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that only accepts a name.]) + AC_MSG_RESULT([name only])], + [twoarg], + [AC_DEFINE([HAVE_PTHREAD_SETNAME_NP_TWOARG], [1], + [Define to 1 if you have the version of pthread_setname_np(3) that accepts a pthread handle and name.]) + AC_MSG_RESULT([pthread handle and name])], + [AC_MSG_RESULT([unknown])])]) AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..042d2f1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..ca9fbaf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,17 @@ struct vkd3d_vulkan_info VkPhysicalDeviceSparseProperties sparse_properties; }; +static inline void vkd3d_set_thread_name(const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef HAVE_PTHREAD_SETNAME_NP_ONEARG + pthread_setname_np(name); +#elif defined(HAVE_PTHREAD_SETNAME_NP_TWOARG) + pthread_setname_np(pthread_self(), name); +#endif +#endif +} + struct vkd3d_instance { VkInstance vk_instance; -- 2.18.0

3 15

[PATCH 1/3] kernel32: Implement stub for SetProcessMitigationPolicy
by Fabian Maurer 10 Aug '18

10 Aug '18

This is needed by x64 chromium sandbox for >= win8. Not doing anything but returning true is enough to make it work, though security won't be perfect. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- ...api-ms-win-core-processthreads-l1-1-1.spec | 2 +- ...api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 10 ++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnt.h | 19 +++++++++++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index ebbe55fe68..616fa63909 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -44,7 +44,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext @ stdcall SetThreadIdealProcessorEx(long ptr ptr) kernel32.SetThreadIdealProcessorEx diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index db94c2e5e7..8de6c5b66c 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -49,7 +49,7 @@ @ stdcall ResumeThread(long) kernel32.ResumeThread @ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass @ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode -@ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters @ stdcall SetThreadContext(long ptr) kernel32.SetThreadContext diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index de6f007999..812ffc6ad4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1427,6 +1427,7 @@ @ stdcall SetProcessAffinityMask(long long) @ stdcall SetProcessAffinityUpdateMode(long long) @ stdcall SetProcessDEPPolicy(long) +@ stdcall SetProcessMitigationPolicy(long ptr long) # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4e6ba1118e..a2801df874 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4389,3 +4389,13 @@ BOOL WINAPI BaseFlushAppcompatCache(void) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************** + * SetProcessMitigationPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessMitigationPolicy(PROCESS_MITIGATION_POLICY migitation_policy, void *buffer, SIZE_T length) +{ + FIXME("(%d, %p, %lu): stub\n", migitation_policy, buffer, length); + + return TRUE; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index fb7fafe47b..f07ab7bf9a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1456,7 +1456,7 @@ # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity # @ stub SetProcessInformation -# @ stub SetProcessMitigationPolicy +@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy # @ stub SetProcessPreferredUILanguages @ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost @ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters diff --git a/include/winnt.h b/include/winnt.h index 7f822c4aec..e9e5989f24 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6273,6 +6273,25 @@ typedef enum _RTL_UMS_SCHEDULER_REASON typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); +typedef enum _PROCESS_MITIGATION_POLICY { + ProcessDEPPolicy, + ProcessASLRPolicy, + ProcessDynamicCodePolicy, + ProcessStrictHandleCheckPolicy, + ProcessSystemCallDisablePolicy, + ProcessMitigationOptionsMask, + ProcessExtensionPointDisablePolicy, + ProcessControlFlowGuardPolicy, + ProcessSignaturePolicy, + ProcessFontDisablePolicy, + ProcessImageLoadPolicy, + ProcessSystemCallFilterPolicy, + ProcessPayloadRestrictionPolicy, + ProcessChildProcessPolicy, + ProcessSideChannelIsolationPolicy, + MaxProcessMitigationPolicy +} PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; + #ifdef __cplusplus } #endif -- 2.18.0

1 2

[PATCH] testbot: Only send an email when a job is really done.
by Francois Gouget 10 Aug '18

10 Aug '18

In particular don't send a report if it is requeued or was canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 464b6db45..4478d479b 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -307,7 +307,7 @@ sub HandleJobStatusChange($$$) LogMsg "Invalid JobKey $JobKey in jobstatuschange message\n"; } - if ($OldStatus eq "running" && $NewStatus ne "running") + if ($OldStatus eq "running" and $NewStatus !~ /^(?:canceled|queued|running)$/) { my $Pid = fork; if (!defined $Pid) -- 2.18.0

1 0

[PATCH] testbot/build: Log the wine commit id the patch is tested on.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 +++- testbot/bin/build/WineTest.pl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index da145837b..920fc8204 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -93,7 +93,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 5ef8e614e..1fa59c297 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,9 @@ sub ApplyPatch($) my ($PatchFile) = @_; InfoMsg "Applying patch\n"; - system("cd '$DataDir/wine' && set -x && ". + system("cd '$DataDir/wine' && ". + "echo wine:HEAD=`git rev-parse HEAD` && ". + "set -x && ". "git apply --verbose ". ShQuote($PatchFile) ." && ". "git add -A"); if ($? != 0) -- 2.18.0

1 0

[PATCH] testbot: Use List::Util::max() instead of reimplementing it.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index b3e576a19..a8885a4e1 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -28,7 +28,9 @@ WineTestBot::Activity - reconstruct the TestBot's activity from its history rec use Exporter 'import'; our @EXPORT = qw(GetActivity GetStatistics); +use List::Util qw(max); use Scalar::Util qw(weaken); + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::RecordGroups; @@ -40,12 +42,6 @@ sub _UpdateMin($$) $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); } -sub max($$) -{ - my ($a, $b) = @_; - return $a > $b ? $a : $b; -} - =pod =over 12 @@ -442,8 +438,7 @@ sub GetStatistics($;$) # Of course this only works for statistics about VM operations and running # tasks (so running.time, reverting.time, etc) not for those about idle or # off VMs (idle.time, etc.). - $ActivitySeconds = $Seconds + 60 + - ($SuiteTimeout > $ReconfigTimeout ? $SuiteTimeout : $ReconfigTimeout); + $ActivitySeconds = $Seconds + 60 + max($SuiteTimeout, $ReconfigTimeout); } my ($Activity, $Counters) = GetActivity($VMs, $ActivitySeconds); $GlobalStats->{"recordgroups.count"} = $Counters->{recordgroups}; -- 2.18.0

1 0

[PATCH] testbot/WineRun*: FatalError() does not return so remove the following else.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 4 ++-- testbot/bin/WineRunReconfig.pl | 4 ++-- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 10c098936..47e4b3bbd 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build") { FatalError("This is not a build VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 8a3d955a7..24a24d067 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -316,11 +316,11 @@ if ($VM->Type ne "build" and $VM->Type ne "wine") { FatalError("This is neither a build nor a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 974ff3b51..204f86305 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -372,11 +372,11 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64") { FatalError("This is not a Windows VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index e7aa72ec9..ee4c8537a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -373,11 +373,11 @@ if ($VM->Type ne "wine") { FatalError("This is not a Wine VM! (" . $VM->Type . ")\n"); } -elsif (!$Debug and $VM->Status ne "running") +if (!$Debug and $VM->Status ne "running") { FatalError("The VM is not ready for use (" . $VM->Status . ")\n"); } -elsif (!$VM->GetDomain()->IsPoweredOn()) +if (!$VM->GetDomain()->IsPoweredOn()) { FatalError("The VM is not powered on\n"); } -- 2.18.0

1 0

[PATCH] testbot: Remove an unneeded POSIX( qw(:errno_h) import.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Tasks.pm | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 54ebf5360..70b620544 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -67,7 +67,6 @@ Status is set to skipped. use WineTestBot::WineTestBotObjects; our @ISA = qw(WineTestBot::WineTestBotItem); -use POSIX qw(:errno_h); use File::Path; use ObjectModel::BackEnd; use WineTestBot::Config; -- 2.18.0

1 0

[PATCH] testbot: A couple of indentation fixes in WineTestBot::Log.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Log.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index b73f005c3..5dc933add 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -123,15 +123,15 @@ sub Time() sub Elapsed($) { - my ($Start) = @_; - return sprintf("%0.2f", Time()-$Start); + my ($Start) = @_; + return sprintf("%0.2f", Time() - $Start); } sub PrettyElapsed($) { - my ($Start) = @_; - require WineTestBot::Utils; - return WineTestBot::Utils::DurationToString(Time()-$Start); + my ($Start) = @_; + require WineTestBot::Utils; + return WineTestBot::Utils::DurationToString(Time() - $Start); } 1; -- 2.18.0

1 0

[PATCH] testbot: Add some section headers in PatchUtils.
by Francois Gouget 10 Aug '18

10 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 74 +++++++++++++++------------ 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index be5ce14d1..d399ced54 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -36,39 +36,9 @@ our @EXPORT = qw(GetPatchImpact UpdateWineData); use WineTestBot::Config; -# These paths are too generic to be proof that this is a Wine patch. -my $AmbiguousPathsRe = join('|', - 'Makefile\.in$', - # aclocal.m4 gets special treatment - # configure gets special treatment - # configure.ac gets special treatment - 'include/Makefile\.in$', - 'include/config\.h\.in$', - 'po/', - 'tools/Makefile.in', - 'tools/config.guess', - 'tools/config.sub', - 'tools/install-sh', - 'tools/makedep.c', -); - -# Patches to these paths don't impact the Wine build. So ignore them. -my $IgnoredPathsRe = join('|', - '\.mailmap$', - 'ANNOUNCE$', - 'AUTHORS$', - 'COPYING\.LIB$', - 'LICENSE\$', - 'LICENSE\.OLD$', - 'MAINTAINERS$', - 'README$', - 'VERSION$', - 'documentation/', - 'tools/c2man\.pl$', - 'tools/winapi/', - 'tools/winemaker/', -); - +# +# Source repository maintenance +# =pod =over 12 @@ -140,6 +110,44 @@ sub _LoadWineFiles() } } + +# +# Wine patch analysis +# + +# These paths are too generic to be proof that this is a Wine patch. +my $AmbiguousPathsRe = join('|', + 'Makefile\.in$', + # aclocal.m4 gets special treatment + # configure gets special treatment + # configure.ac gets special treatment + 'include/Makefile\.in$', + 'include/config\.h\.in$', + 'po/', + 'tools/Makefile.in', + 'tools/config.guess', + 'tools/config.sub', + 'tools/install-sh', + 'tools/makedep.c', +); + +# Patches to these paths don't impact the Wine build. So ignore them. +my $IgnoredPathsRe = join('|', + '\.mailmap$', + 'ANNOUNCE$', + 'AUTHORS$', + 'COPYING\.LIB$', + 'LICENSE\$', + 'LICENSE\.OLD$', + 'MAINTAINERS$', + 'README$', + 'VERSION$', + 'documentation/', + 'tools/c2man\.pl$', + 'tools/winapi/', + 'tools/winemaker/', +); + sub _HandleFile($$$) { my ($Impacts, $FilePath, $Change) = @_; -- 2.18.0

1 0

[PATCH] winebus.sys: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 501a40d26e..ac706f5265 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -295,7 +295,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); version = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVersionNumberKey))); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) CFStringToWSTR(str, serial_string, sizeof(serial_string) / sizeof(WCHAR)); + if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2f3c05aa96..deb2c86d96 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -696,7 +696,7 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) if (vid != VID_MICROSOFT) return FALSE; - for (i = 0; i < sizeof(PID_XBOX_CONTROLLERS)/sizeof(*PID_XBOX_CONTROLLERS); i++) + for (i = 0; i < ARRAY_SIZE(PID_XBOX_CONTROLLERS); i++) if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; return FALSE; -- 2.14.4

2 1

[PATCH] winejoystick.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Not compile tested. If somebody with a Mac could give this a try it would be much appreciated. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index bf82f67116..6f53477937 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -198,7 +198,7 @@ static const char* debugstr_cf(CFTypeRef t) if (!ret) { UniChar buf[200]; - int len = min(CFStringGetLength(s), sizeof(buf)/sizeof(buf[0])); + int len = min(CFStringGetLength(s), ARRAY_SIZE(buf)); CFStringGetCharacters(s, CFRangeMake(0, len), buf); ret = debugstr_wn(buf, len); } @@ -284,7 +284,7 @@ static CFDictionaryRef create_osx_device_match(int usage) if (values[0] && values[1]) { - result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, sizeof(values) / sizeof(values[0]), + result = CFDictionaryCreate(NULL, (const void**)keys, (const void**)values, ARRAY_SIZE(values), &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); if (!result) @@ -293,7 +293,7 @@ static CFDictionaryRef create_osx_device_match(int usage) else ERR("CFNumberCreate failed.\n"); - for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) + for (i = 0; i < ARRAY_SIZE(values); i++) if (values[i]) CFRelease(values[i]); return result; @@ -393,7 +393,7 @@ static int find_osx_devices(void) IOHIDManagerRef hid_manager; int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController }; int i; - CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])]; + CFDictionaryRef matching_dicts[ARRAY_SIZE(usages)]; CFArrayRef matching; CFSetRef devset; @@ -407,7 +407,7 @@ static int find_osx_devices(void) return 0; } - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) { matching_dicts[i] = create_osx_device_match(usages[i]); if (!matching_dicts[i]) @@ -418,10 +418,10 @@ static int find_osx_devices(void) } } - matching = CFArrayCreate(NULL, (const void**)matching_dicts, sizeof(matching_dicts) / sizeof(matching_dicts[0]), + matching = CFArrayCreate(NULL, (const void**)matching_dicts, ARRAY_SIZE(matching_dicts), &kCFTypeArrayCallBacks); - for (i = 0; i < sizeof(matching_dicts) / sizeof(matching_dicts[0]); i++) + for (i = 0; i < ARRAY_SIZE(matching_dicts); i++) CFRelease(matching_dicts[i]); IOHIDManagerSetDeviceMatchingMultiple(hid_manager, matching); -- 2.14.4

2 1

[PATCH] msacm32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/filter.c | 4 ++-- dlls/msacm32/format.c | 18 +++++++++--------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/pcmconverter.c | 15 +++++++-------- dlls/msacm32/tests/msacm.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 53db82777d..8d5abced9d 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -361,8 +361,8 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFilterTag, - sizeof(paftd->szFilterTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFilterTag, + ARRAY_SIZE(paftd->szFilterTag)); return mmr; } diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index b3d2900393..fcc0d9b1c6 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -503,9 +503,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, pafd->pwfx->wBitsPerSample); } - MultiByteToWideChar( CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, - pafd->szFormat + strlenW(pafd->szFormat), - sizeof(pafd->szFormat)/sizeof(WCHAR) - strlenW(pafd->szFormat) ); + MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, + pafd->szFormat + strlenW(pafd->szFormat), + ARRAY_SIZE(pafd->szFormat) - strlenW(pafd->szFormat)); } TRACE("=> %d\n", mmr); @@ -929,8 +929,8 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFormatTag == WAVE_FORMAT_PCM && paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); return mmr; } @@ -1036,8 +1036,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* (WS) I'm preserving this PCM hack since it seems to be * correct. Please notice this block was borrowed from * below. @@ -1062,8 +1062,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* FIXME (EPP): I'm not sure this is the correct * algorithm (should make more sense to apply the same * for all already loaded formats, but this will do diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 7bafcaad5e..aad071e8ad 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet); @@ -373,31 +373,31 @@ void MSACM_RegisterAllDrivers(void) if (lRet == ERROR_SUCCESS) { RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(buf, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } i = 0; - cnt = sizeof(valname) / sizeof(*valname); + cnt = ARRAY_SIZE(valname); bufLen = sizeof(buf); while(RegEnumValueW(hKey, i, valname, &cnt, 0, &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + if (!strncmpiW(valname, msacmW, ARRAY_SIZE(msacmW))) MSACM_RegisterDriver(valname, buf, 0); ++i; } RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys)) + if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) { for(s = buf; *s; s += strlenW(s) + 1) { - if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(s, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(s, '='))) continue; *name = 0; MSACM_RegisterDriver(s, name + 1, 0); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index f26f125fcd..dc10f11e7a 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -984,14 +984,13 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "MS-PCM", -1, add->szShortName, ARRAY_SIZE(add->szShortName)); + MultiByteToWideChar(CP_ACP, 0, "Wine PCM converter", -1, + add->szLongName, ARRAY_SIZE(add->szLongName)); + MultiByteToWideChar(CP_ACP, 0, "Brought to you by the Wine team...", -1, + add->szCopyright, ARRAY_SIZE(add->szCopyright)); + MultiByteToWideChar(CP_ACP, 0, "Refer to LICENSE file", -1, + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 959ec7f0c0..180639fa54 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1106,7 +1106,7 @@ static void test_convert(void) MMRESULT mmr; unsigned i; - for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + for (i = 0; i < ARRAY_SIZE(expected_output); i++) { mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); -- 2.14.4

2 1

[PATCH] midimap: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 1b35da7609..290300a55a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -172,7 +172,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, ARRAY_SIZE(buffer)); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; -- 2.14.4

2 1

[PATCH] mciwave: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index fd4d6f6728..0fa9b204f8 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -427,7 +427,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { + if (!GetTempPathW(ARRAY_SIZE(szTmpPath), szTmpPath)) { WARN("can't retrieve temp path!\n"); *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; -- 2.14.4

2 1

[PATCH 1/2] quartz: Remove redundant if clause from WAVEParser_InputPin_PreConnect
by Alex Henrie 10 Aug '18

10 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/quartz/waveparser.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 403c052db4..d8f349b35f 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -306,15 +306,12 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, return E_FAIL; } - if (hr == S_OK) - { - pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); - pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); - } - if (hr != S_OK) return E_FAIL; + pWAVEParser->StartOfFile = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFCHUNK)); + pWAVEParser->EndOfFile = MEDIATIME_FROM_BYTES(pos + chunk.cb + sizeof(RIFFCHUNK)); + props->cbAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; props->cbPrefix = 0; props->cbBuffer = 4096; -- 2.18.0

2 3

[PATCH] winepulse.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 32f7acb91d..8d57f1a45a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -469,7 +469,7 @@ static HRESULT pulse_connect(void) if (pulse_ctx) pa_context_unref(pulse_ctx); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -537,7 +537,7 @@ static HRESULT pulse_test_connect(void) pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL); - GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path)); + GetModuleFileNameW(NULL, path, ARRAY_SIZE(path)); name = strrchrW(path, '\\'); if (!name) name = path; @@ -1283,7 +1283,7 @@ static HRESULT pulse_spec_from_waveformat(ACImpl *This, const WAVEFORMATEX *fmt) This->map.channels = fmt->nChannels; if (!mask || (mask & (SPEAKER_ALL|SPEAKER_RESERVED))) mask = get_channel_mask(fmt->nChannels); - for (j = 0; j < sizeof(pulse_pos_from_wfx)/sizeof(*pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { + for (j = 0; j < ARRAY_SIZE(pulse_pos_from_wfx) && i < fmt->nChannels; ++j) { if (mask & (1 << j)) This->map.map[i++] = pulse_pos_from_wfx[j]; } -- 2.14.4

2 1

[PATCH] wineoss.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Not compile tested as I don't have a system with OSSv4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wineoss.drv/midi.c | 12 +++++------- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3a2ab2580d..24b3e7037b 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -230,9 +230,8 @@ static LRESULT OSS_MidiInit(void) MidiOutDev[i].caps.wTechnology = MOD_MIDIPORT; MidiOutDev[i].bEnabled = FALSE; } else { - MultiByteToWideChar( CP_UNIXCP, 0, sinfo.name, -1, - MidiOutDev[i].caps.szPname, - sizeof(MidiOutDev[i].caps.szPname)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_UNIXCP, 0, sinfo.name, -1, MidiOutDev[i].caps.szPname, + ARRAY_SIZE(MidiOutDev[i].caps.szPname)); MidiOutDev[i].caps.wTechnology = MIDI_UnixToWindowsDeviceType(sinfo.synth_type); if (MOD_MIDIPORT != MidiOutDev[i].caps.wTechnology) { @@ -313,7 +312,7 @@ static LRESULT OSS_MidiInit(void) } else { MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiOutDev[numsynthdevs + i].caps.szPname, - sizeof(MidiOutDev[numsynthdevs + i].caps.szPname) / sizeof(WCHAR)); + ARRAY_SIZE(MidiOutDev[numsynthdevs + i].caps.szPname)); MidiOutDev[numsynthdevs + i].bEnabled = TRUE; } MidiOutDev[numsynthdevs + i].caps.wTechnology = MOD_MIDIPORT; @@ -338,9 +337,8 @@ static LRESULT OSS_MidiInit(void) wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else { - MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, - MidiInDev[i].caps.szPname, - sizeof(MidiInDev[i].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, minfo.name, -1, MidiInDev[i].caps.szPname, + ARRAY_SIZE(MidiInDev[i].caps.szPname)); MidiInDev[i].state = 0; } MidiInDev[i].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1686c8c96c..fa3f885ea1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -349,8 +349,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -543,11 +542,11 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, len = MultiByteToWideChar(CP_UNIXCP, 0, ai.name, -1, NULL, 0); if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len += prefix_len; } (*ids)[*num] = HeapAlloc(GetProcessHeap(), 0, -- 2.14.4

2 1

[PATCH] winealsa.drv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winealsa.drv/midi.c | 10 ++++------ dlls/winealsa.drv/mmdevdrv.c | 11 +++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 6ef197681f..3d4d933ead 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1177,9 +1177,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiOutDev[MODM_NumDevs].caps.szPname, - sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiOutDev[MODM_NumDevs].caps.szPname)); MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type); @@ -1244,9 +1243,8 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* } else { lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, - MidiInDev[MIDM_NumDevs].caps.szPname, - sizeof(MidiInDev[MIDM_NumDevs].caps.szPname) / sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, + ARRAY_SIZE(MidiInDev[MIDM_NumDevs].caps.szPname)); MidiInDev[MIDM_NumDevs].state = 0; TRACE("MidiIn [%d]\tname='%s' support=%d\n" diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b285705509..de89fd05c5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -311,8 +311,7 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid) else key_name[0] = '0'; key_name[1] = ','; - MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, - (sizeof(key_name) / sizeof(*key_name)) - 2); + MultiByteToWideChar(CP_UNIXCP, 0, device, -1, key_name + 2, ARRAY_SIZE(key_name) - 2); if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ @@ -362,17 +361,17 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha DWORD len_wchars = 0, chunk1_len = 0, copied = 0, prefix_len; static const WCHAR dashW[] = {' ','-',' ',0}; - static const size_t dashW_len = (sizeof(dashW) / sizeof(*dashW)) - 1; + static const size_t dashW_len = ARRAY_SIZE(dashW) - 1; static const WCHAR outW[] = {'O','u','t',':',' ',0}; static const WCHAR inW[] = {'I','n',':',' ',0}; if(flow == eRender){ prefix = outW; - prefix_len = (sizeof(outW) / sizeof(*outW)) - 1; + prefix_len = ARRAY_SIZE(outW) - 1; len_wchars += prefix_len; }else{ prefix = inW; - prefix_len = (sizeof(inW) / sizeof(*inW)) - 1; + prefix_len = ARRAY_SIZE(inW) - 1; len_wchars += prefix_len; } if(chunk1){ @@ -724,7 +723,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name)/sizeof(WCHAR); + key_name_size = ARRAY_SIZE(key_name); if(RegEnumKeyExW(devices_key, i++, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; -- 2.14.4

2 1

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