November 2018 - Wine-Devel - list.winehq.org

[PATCH v3] msvcr120: Add nexttoward implementation.
by Zebediah Figura Nov. 26, 2018

Nov. 26, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 30 +++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 133 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1db7af9177..907fac2f71 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9547bcbdf..e2764dc46e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..eee3d5c876 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section(a)Concurrency@@QEAA(a)XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {1.17549421e-38f, 0.0, 1.17549407e-38f, 1.1754942106924409e-38}, + {1.17549421e-38f, 1.17549421e-38f, 1.17549421e-38f, 1.1754942106924411e-38}, + {1.17549421e-38f, 1.0, 1.17549435e-38f, 1.1754942106924412e-38}, + {1.17549435e-38f, 0.0, 1.17549421e-38f, 1.1754943508222874e-38}, + {1.17549435e-38f, 1.17549435e-38f, 1.17549435e-38f, 1.1754943508222875e-38}, + {1.17549435e-38f, 1.0, 1.17549449e-38f, 1.1754943508222878e-38}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (isnormal(d) || isinf(tests[i].source)) + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + else + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno -1, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..706799ce37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..07cf19dfee 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1542,6 +1542,36 @@ double CDECL MSVCRT__nextafter(double num, double next) return retval; } +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#if 1 + double ret = nexttoward(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttoward (MSVCRT.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#if 1 + float ret = nexttowardf(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + /********************************************************************* * _ecvt (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6e6cc439d8..3592a569e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

1 0

[PATCH] setupapi: Store the class and reference string keys in the device_iface structure.
by Zebediah Figura Nov. 26, 2018

Nov. 26, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 62 ++++++++++++------------------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 1f020b9b8e..64c04131b0 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -93,6 +93,7 @@ static const WCHAR Phantom[] = {'P','h','a','n','t','o','m',0}; static const WCHAR SymbolicLink[] = {'S','y','m','b','o','l','i','c','L','i','n','k',0}; static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; +static const WCHAR emptyW[] = {0}; /* is used to identify if a DeviceInfoSet pointer is valid or not */ @@ -126,6 +127,8 @@ struct device_iface struct device *device; GUID class; DWORD flags; + HKEY class_key; + HKEY refstr_key; struct list entry; }; @@ -377,7 +380,7 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, { struct device_iface *iface = NULL; WCHAR *refstr2 = NULL, *symlink = NULL, *path = NULL; - HKEY key = NULL; + HKEY key; LONG ret; TRACE("%p %s %s\n", device, debugstr_guid(class), debugstr_w(refstr)); @@ -422,9 +425,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, } RegSetValueExW(key, DeviceInstance, 0, REG_SZ, (BYTE *)device->instanceId, lstrlenW(device->instanceId) * sizeof(WCHAR)); - RegCloseKey(key); heap_free(path); + iface->class_key = key; + if (!(path = get_refstr_key_path(iface))) { SetLastError(ERROR_OUTOFMEMORY); @@ -442,9 +446,10 @@ static struct device_iface *SETUPDI_CreateDeviceInterface(struct device *device, if (is_linked(key)) iface->flags |= SPINT_ACTIVE; - RegCloseKey(key); heap_free(path); + iface->refstr_key = key; + list_add_tail(&device->interfaces, &iface->entry); return iface; @@ -554,7 +559,6 @@ static BOOL SETUPDI_SetDeviceRegistryPropertyW(struct device *device, static void SETUPDI_RemoveDevice(struct device *device) { struct device_iface *iface, *next; - WCHAR *path; if (device->key != INVALID_HANDLE_VALUE) RegCloseKey(device->key); @@ -576,11 +580,10 @@ static void SETUPDI_RemoveDevice(struct device *device) struct device_iface, entry) { list_remove(&iface->entry); - if (device->phantom && (path = get_refstr_key_path(iface))) - { - RegDeleteKeyW(HKEY_LOCAL_MACHINE, path); - heap_free(path); - } + if (device->phantom) + RegDeleteKeyW(iface->refstr_key, emptyW); + RegCloseKey(iface->refstr_key); + RegCloseKey(iface->class_key); heap_free(iface->refstr); heap_free(iface->symlink); heap_free(iface); @@ -2486,8 +2489,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, HINF hinf, const WCHAR *section) { struct device_iface *iface; - HKEY refstr_key, params_key; - WCHAR *path; + HKEY params_key; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n", @@ -2501,24 +2503,8 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, return INVALID_HANDLE_VALUE; } - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return INVALID_HANDLE_VALUE; - } - - ret = RegCreateKeyExW(refstr_key, DeviceParameters, 0, NULL, 0, access, + ret = RegCreateKeyExW(iface->refstr_key, DeviceParameters, 0, NULL, 0, access, NULL, &params_key, NULL); - RegCloseKey(refstr_key); if (ret) { SetLastError(ret); @@ -2535,8 +2521,6 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DWORD reserved) { struct device_iface *iface; - HKEY refstr_key; - WCHAR *path; LONG ret; TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved); @@ -2544,23 +2528,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; - if (!(path = get_refstr_key_path(iface))) - { - SetLastError(ERROR_OUTOFMEMORY); - return FALSE; - } - - ret = RegCreateKeyExW(HKEY_LOCAL_MACHINE, path, 0, NULL, 0, 0, NULL, - &refstr_key, NULL); - heap_free(path); - if (ret) - { - SetLastError(ret); - return FALSE; - } - - ret = RegDeleteKeyW(refstr_key, DeviceParameters); - RegCloseKey(refstr_key); + ret = RegDeleteKeyW(iface->refstr_key, DeviceParameters); if (ret) { SetLastError(ret); -- 2.14.1

1 0

[PATCH v2] odbccp32: Implement SQLConfigDataSource/W
by Alistair Leslie-Hughes Nov. 26, 2018

Nov. 26, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/odbccp32/odbccp32.c | 142 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 118 insertions(+), 24 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 694a90c..c146122 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -69,6 +69,9 @@ static const WCHAR odbc_error_load_lib_failed[] = {'L','o','a','d',' ','L','i',' static const WCHAR odbc_error_request_failed[] = {'R','e','q','u','e','s','t',' ','F','a','i','l','e','d',0}; static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' ','k','e','y','w','o','r','d',' ','v','a','l','u','e',0}; +static BOOL (WINAPI *pConfigDSN)(HWND hwnd, WORD request, const char *driver, const char *attr); +static BOOL (WINAPI *pConfigDSNW)(HWND hwnd, WORD request, const WCHAR *driver, const WCHAR *attr); + /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { @@ -102,6 +105,27 @@ static inline WCHAR *heap_strdupAtoW(const char *str) return ret; } +static inline WCHAR *heap_attrdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + + if (str) + { + DWORD size = 0, len; + const char *p; + + for (p = str; *p; p += lstrlenA(p) + 1) + { + len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + size += len; + } + + ret = heap_alloc_zero( (size+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, p, size, ret, size); + } + return ret; +} + BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { @@ -220,30 +244,6 @@ static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_leng return success; } -BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, - LPCWSTR lpszDriver, LPCWSTR lpszAttributes) -{ - LPCWSTR p; - - clear_errors(); - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), - debugstr_w(lpszAttributes)); - - for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) - FIXME("%s\n", debugstr_w(p)); - - return TRUE; -} - -BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, - LPCSTR lpszDriver, LPCSTR lpszAttributes) -{ - FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), - debugstr_a(lpszAttributes)); - clear_errors(); - return TRUE; -} - static HMODULE load_config_driver(const WCHAR *driver) { static WCHAR reg_driver[] = {'d','r','i','v','e','r',0}; @@ -360,6 +360,100 @@ fail: return FALSE; } +BOOL WINAPI SQLConfigDataSourceW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_w(driver), debugstr_w(attributes)); + if (TRACE_ON(odbc)) + { + const WCHAR *p; + for (p = attributes; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + } + + clear_errors(); + + mod = load_config_driver(driver); + if (!mod) + return FALSE; + + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if(pConfigDSNW) + ret = pConfigDSNW(hwnd, request, driver, attributes); + else + ERR("Failed to find ConfigDSNW\n"); + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + FreeLibrary(mod); + + return ret; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwnd, WORD request, LPCSTR driver, LPCSTR attributes) +{ + HMODULE mod; + BOOL ret = FALSE; + WCHAR *driverW; + + TRACE("%p, %d, %s, %s\n", hwnd, request, debugstr_a(driver), debugstr_a(attributes)); + + if (TRACE_ON(odbc)) + { + const char *p; + for (p = attributes; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + } + + clear_errors(); + + driverW = heap_strdupAtoW(driver); + if (!driverW) + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + return FALSE; + } + + mod = load_config_driver(driverW); + if (!mod) + { + heap_free(driverW); + return FALSE; + } + + pConfigDSN = (void*)GetProcAddress(mod, "ConfigDSN"); + if (pConfigDSN) + { + TRACE("Calling ConfigDSN\n"); + ret = pConfigDSN(hwnd, request, driver, attributes); + } + else + { + pConfigDSNW = (void*)GetProcAddress(mod, "ConfigDSNW"); + if (pConfigDSNW) + { + WCHAR *attr = NULL; + TRACE("Calling ConfigDSNW\n"); + + attr = heap_attrdupAtoW(attributes); + if(attr) + ret = pConfigDSNW(hwnd, request, driverW, attr); + heap_free(attr); + } + } + + if (!ret) + push_error(ODBC_ERROR_REQUEST_FAILED, odbc_error_request_failed); + + heap_free(driverW); + FreeLibrary(mod); + + return ret; +} + BOOL WINAPI SQLConfigDriverW(HWND hwnd, WORD request, LPCWSTR driver, LPCWSTR args, LPWSTR msg, WORD msgmax, WORD *msgout) { -- 1.9.1

1 0

[PATCH] user32: LoadImage should search image in PE directory, not the working directory
by Fabian Maurer Nov. 26, 2018

Nov. 26, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46186 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/cursoricon.c | 15 ++++++++- dlls/user32/tests/cursoricon.c | 56 ++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f11f5e45ed..4d803e7818 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3039,11 +3039,24 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { int depth; + WCHAR path[MAX_PATH]; TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); - if (loadflags & LR_LOADFROMFILE) loadflags &= ~LR_SHARED; + if (loadflags & LR_LOADFROMFILE) { + loadflags &= ~LR_SHARED; + + /* Relative paths are relative to the PE directory - not the current working directory */ + if (name != NULL && lstrlenW(name) > 2 && name[0] != '\\' && name[1] != ':') { + WCHAR *part_filename; + GetModuleFileNameW(hinst, path, ARRAY_SIZE(path)); + part_filename = strrchrW(path, '\\') + 1; + *part_filename = '\0'; + strcatW(path, name); + name = path; + } + } switch (type) { case IMAGE_BITMAP: return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 8404ee71ab..a4af988720 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,6 +1203,59 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } +static void test_LoadImageWorkingDirectory(void) +{ + char working_dir[MAX_PATH]; + char temp_dir[MAX_PATH]; + DWORD bytes_written; + HANDLE handle; + BOOL ret; + static const test_icon_entries_t icon_desc = {32, 32}; + + GetCurrentDirectoryA(ARRAY_SIZE(working_dir), working_dir); + GetTempPathA(ARRAY_SIZE(temp_dir), temp_dir); + + strcat(temp_dir, "wine-test-dir"); + + CreateDirectoryA(temp_dir, NULL); + + /* Create Files */ + create_ico_file("icon.ico", &icon_desc, 1); + + handle = CreateFileA("test.bmp", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, bmpimage, sizeof(bmpimage), &bytes_written, NULL); + ok(ret && bytes_written == sizeof(bmpimage), "Test file created improperly.\n"); + CloseHandle(handle); + + SetCurrentDirectoryA(temp_dir); + + /* Test cursor */ + handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "LoadImage() failed.\n"); + + ret = DestroyCursor(handle); + ok(ret, "DestroyCusor failed: %d\n", GetLastError()); + + /* Test image */ + handle = LoadImageA(NULL, "test.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + ok(handle != NULL, "LoadImageA failed.\n"); + + ret = DeleteObject(handle); + ok(ret, "DeleteObject failed: %d\n", GetLastError()); + + /* Cleanup */ + SetCurrentDirectoryA(working_dir); + + ret = DeleteFileA("test.bmp"); + ok(ret, "DeleteFileA failed: %d\n", GetLastError()); + ret = DeleteFileA("icon.ico"); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); + + ret = RemoveDirectoryA(temp_dir); + ok(ret, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_LoadImage(void) { HANDLE handle; @@ -1326,6 +1379,9 @@ static void test_LoadImage(void) bitmap_header->biSize = sizeof(BITMAPINFOHEADER); test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); + + /* Test if images are properly loaded - from executable directory instead of current working directory */ + test_LoadImageWorkingDirectory(); } static void test_CreateIconFromResource(void) -- 2.19.2

5 5

[PATCH 2/2] wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the cursor texture.
by Henri Verbeet Nov. 26, 2018

Nov. 26, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 +-- dlls/wined3d/texture.c | 6 ------ include/wine/wined3d.h | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7cb32a6abb3..6d6f53060ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4563,8 +4563,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.depth = 1; desc.size = 0; - hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_MAPPABLE, - &data, NULL, &wined3d_null_parent_ops, &texture); + hr = wined3d_texture_create(device, &desc, 1, 1, 0, &data, NULL, &wined3d_null_parent_ops, &texture); wined3d_resource_unmap(&cursor_image->resource, sub_resource_idx); if (FAILED(hr)) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index dbc256f1102..5b41d4a9cdc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) - || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) - WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1)) || (desc->depth & (desc->depth - 1))) @@ -3010,8 +3006,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); - if (flags & WINED3D_TEXTURE_CREATE_MAPPABLE) - texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40553f7e514..b0b1abc508e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1562,7 +1562,6 @@ enum wined3d_shader_type #define WINED3D_PALETTE_ALLOW_256 0x00000002 #define WINED3D_PALETTE_ALPHA 0x00000004 -#define WINED3D_TEXTURE_CREATE_MAPPABLE 0x00000001 #define WINED3D_TEXTURE_CREATE_DISCARD 0x00000002 #define WINED3D_TEXTURE_CREATE_GET_DC_LENIENT 0x00000004 #define WINED3D_TEXTURE_CREATE_GET_DC 0x00000008 -- 2.11.0

1 0

[PATCH 1/2] wined3d: Do not set WINED3D_TEXTURE_CREATE_MAPPABLE on the logo texture.
by Henri Verbeet Nov. 26, 2018

Nov. 26, 2018

We never map it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a89a33d676e..7cb32a6abb3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -582,8 +582,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.height = bm.bmHeight; desc.depth = 1; desc.size = 0; - if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, - WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_GET_DC, + if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, WINED3D_TEXTURE_CREATE_GET_DC, NULL, NULL, &wined3d_null_parent_ops, &device->logo_texture))) { ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); -- 2.11.0

1 0

[PATCH vkd3d 5/5] tests: Add test for multisample array textures.
by Józef Kucia Nov. 26, 2018

Nov. 26, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c82778594129..aa35315f3e7a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11739,6 +11739,228 @@ static void test_cube_maps(void) destroy_test_context(&context); } +static void test_multisample_array_texture(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_ROOT_PARAMETER root_parameters[3]; + D3D12_DESCRIPTOR_RANGE descriptor_range; + ID3D12GraphicsCommandList *command_list; + D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + D3D12_GPU_DESCRIPTOR_HANDLE gpu_handle; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12Resource *uav_buffer; + ID3D12CommandQueue *queue; + ID3D12Resource *texture; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2DMSArray<float4> t; + + RWByteAddressBuffer u; + + uint layer; + uint sample_index; + + uint offset; + + float4 main() : SV_Target + { + uint width, height, elements, samples; + t.GetDimensions(width, height, elements, samples); + u.Store4(offset, uint4(width, height, elements, samples)); + return t.Load(int3(0, 0, layer), sample_index); + } +#endif + 0x43425844, 0xb1457478, 0xd475e3dd, 0xda1eb41d, 0x66075d2b, 0x00000001, 0x0000017c, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000104, 0x00000050, 0x00000041, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04004858, 0x00107000, 0x00000000, + 0x00005555, 0x0300009d, 0x0011e000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x8900103d, 0x80000242, 0x00155543, 0x00100072, 0x00000000, 0x00004001, 0x00000000, + 0x00107e46, 0x00000000, 0x0500086f, 0x00100082, 0x00000000, 0x0010700a, 0x00000000, 0x080000a6, + 0x0011e0f2, 0x00000001, 0x0020802a, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x05000036, + 0x00100012, 0x00000000, 0x00004001, 0x00000000, 0x06000036, 0x00100042, 0x00000000, 0x0020800a, + 0x00000000, 0x00000000, 0x8c00002e, 0x80000242, 0x00155543, 0x001020f2, 0x00000000, 0x00100206, + 0x00000000, 0x00107e46, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + + {0.0f, 1.0f, 1.0f, 1.0f}, + {1.0f, 0.0f, 1.0f, 1.0f}, + {1.0f, 1.0f, 0.0f, 1.0f}, + + {0.5f, 0.5f, 0.5f, 1.0f}, + {0.5f, 0.5f, 0.5f, 0.5f}, + }; + static const struct + { + struct + { + unsigned int layer; + unsigned int sample_index; + unsigned int offset; + } constants; + unsigned int expected_color; + } + tests[] = + { + {{0, 0, 0}, 0xff0000ff}, + {{0, 1, 0}, 0xff0000ff}, + {{0, 2, 0}, 0xff0000ff}, + {{0, 3, 0}, 0xff0000ff}, + + {{1, 0, 16}, 0xff00ff00}, + {{2, 1, 32}, 0xffff0000}, + {{3, 2, 32}, 0xffffff00}, + {{4, 3, 32}, 0xffff00ff}, + {{5, 0, 32}, 0xff00ffff}, + {{6, 0, 32}, 0xff7f7f7f}, + {{7, 0, 32}, 0x7f7f7f7f}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.rt_descriptor_count = 2; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + descriptor_range.RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_range.NumDescriptors = 1; + descriptor_range.BaseShaderRegister = 0; + descriptor_range.RegisterSpace = 0; + descriptor_range.OffsetInDescriptorsFromTableStart = 0; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + root_parameters[0].DescriptorTable.pDescriptorRanges = &descriptor_range; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[1].Constants.ShaderRegister = 0; + root_parameters[1].Constants.RegisterSpace = 0; + root_parameters[1].Constants.Num32BitValues = 3; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_PIXEL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_UAV; + root_parameters[2].Descriptor.ShaderRegister = 1; + root_parameters[2].Descriptor.RegisterSpace = 0; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(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, &ps, NULL); + + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + memset(&resource_desc, 0, sizeof(resource_desc)); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Width = 32; + resource_desc.Height = 32; + resource_desc.DepthOrArraySize = ARRAY_SIZE(colors); + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + cpu_handle = get_cpu_rtv_handle(&context, context.rtv_heap, 1); + + for (i = 0; i < ARRAY_SIZE(colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Format = resource_desc.Format; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + ID3D12Device_CreateRenderTargetView(device, texture, &rtv_desc, cpu_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, cpu_handle, &colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, texture, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); + gpu_handle = ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(heap); + + ID3D12Device_CreateShaderResourceView(device, texture, NULL, cpu_handle); + + uav_buffer = create_default_buffer(device, 4096, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + 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_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, gpu_handle); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 3, &tests[i].constants.layer, 0); + ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(command_list, + 2, ID3D12Resource_GetGPUVirtualAddress(uav_buffer)); + 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, tests[i].expected_color, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + transition_resource_state(command_list, uav_buffer, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(uav_buffer, DXGI_FORMAT_R32G32B32A32_UINT, &rb, queue, command_list); + for (i = 0; i < 2; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(v->x == resource_desc.Width, "Got unexpected width %u.\n", v->x); + ok(v->y == resource_desc.Height, "Got unexpected height %u.\n", v->y); + ok(v->z == resource_desc.DepthOrArraySize, "Got unexpected array size %u.\n", v->z); + ok(v->w == resource_desc.SampleDesc.Count, "Got unexpected sample count %u.\n", v->w); + } + release_resource_readback(&rb); + + ID3D12Resource_Release(texture); + ID3D12Resource_Release(uav_buffer); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + static void test_descriptor_tables(void) { ID3D12DescriptorHeap *heap, *sampler_heap, *heaps[2]; @@ -21659,6 +21881,7 @@ START_TEST(d3d12) run_test(test_gather); run_test(test_gather_c); run_test(test_cube_maps); + run_test(test_multisample_array_texture); run_test(test_descriptor_tables); run_test(test_descriptor_tables_overlapping_bindings); run_test(test_update_root_descriptors); -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d-shader: Translate sample_info instructions.
by Józef Kucia Nov. 26, 2018

Nov. 26, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8c8906439c71..ec7cab693c84 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1418,6 +1418,13 @@ static uint32_t vkd3d_spirv_build_op_image_query_levels(struct vkd3d_spirv_build SpvOpImageQueryLevels, result_type, image_id); } +static uint32_t vkd3d_spirv_build_op_image_query_samples(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t image_id) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, + SpvOpImageQuerySamples, result_type, image_id); +} + static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder) { return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); @@ -6414,6 +6421,53 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t constituents[VKD3D_VEC4_SIZE]; + struct vkd3d_shader_image image; + uint32_t type_id, val_id; + unsigned int i; + + if (src->reg.type == VKD3DSPR_RASTERIZER) + { + FIXME("Rasterizer not supported.\n"); + return; + } + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); + + constituents[0] = val_id; + for (i = 1; i < VKD3D_VEC4_SIZE; ++i) + constituents[i] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, VKD3D_VEC4_SIZE); + val_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, VKD3D_VEC4_SIZE); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); + if (instruction->flags == VKD3DSI_SAMPLE_INFO_UINT) + { + val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + } + else + { + if (instruction->flags) + FIXME("Unhandled flags %#x.\n", instruction->flags); + val_id = vkd3d_spirv_build_op_convert_utof(builder, type_id, val_id); + } + + val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + val_id, VKD3D_TYPE_FLOAT, src->swizzle, dst->write_mask); + + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); +} + /* From the Vulkan spec: * * "Scope for execution must be limited to: * Workgroup * Subgroup" @@ -6808,6 +6862,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_RESINFO: vkd3d_dxbc_compiler_emit_resinfo(compiler, instruction); break; + case VKD3DSIH_SAMPLE_INFO: + vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); + break; case VKD3DSIH_SYNC: vkd3d_dxbc_compiler_emit_sync(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 3/5] vkd3d: Add support for multisample texture views.
by Józef Kucia Nov. 26, 2018

Nov. 26, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 31883f6e91aa..36c5cb232f67 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1785,6 +1785,14 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -2176,6 +2184,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -2261,6 +2277,14 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; break; + case D3D12_DSV_DIMENSION_TEXTURE2DMS: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + break; + case D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.18.1

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Add support for 2D MS arrays.
by Józef Kucia Nov. 26, 2018

Nov. 26, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 12fa300021dc..8c8906439c71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1643,6 +1643,7 @@ vkd3d_spirv_resource_type_table[] = {VKD3D_SHADER_RESOURCE_TEXTURE_1DARRAY, SpvDim1D, 1, 0, 2, 1, SpvCapabilitySampled1D, SpvCapabilityImage1D}, {VKD3D_SHADER_RESOURCE_TEXTURE_2DARRAY, SpvDim2D, 1, 0, 3, 2}, + {VKD3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY, SpvDim2D, 1, 1, 3, 2}, {VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY, SpvDimCube, 1, 0, 3, 0, SpvCapabilitySampledCubeArray, SpvCapabilityImageCubeArray}, }; -- 2.18.1

2 1