February 2019 - Wine-Commits

Zebediah Figura : setupapi: Handle error translation in SetupDiOpenDevRegKey().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: f703c7f22d5da5596c9abc91400191d3e12c3cbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f703c7f22d5da5596c9abc91… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 24 22:08:18 2019 -0600 setupapi: Handle error translation in SetupDiOpenDevRegKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 36 ++++++++++++++++-------------------- dlls/setupapi/tests/devinst.c | 2 -- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cf6bc5d..d8ae778 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -514,9 +514,9 @@ static HKEY SETUPDI_CreateDevKey(struct device *device) return key; } -static HKEY open_driver_key(struct device *device, REGSAM access) +static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) { - HKEY class_key, key; + HKEY class_key; WCHAR path[50]; DWORD size = sizeof(path); LONG l; @@ -525,23 +525,21 @@ static HKEY open_driver_key(struct device *device, REGSAM access) KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { ERR("Failed to open driver class root key, error %u.\n", l); - SetLastError(l); - return INVALID_HANDLE_VALUE; + return l; } if (!(l = RegGetValueW(device->key, NULL, Driver, RRF_RT_REG_SZ, NULL, path, &size))) { - if (!(l = RegOpenKeyExW(class_key, path, 0, access, &key))) + if (!(l = RegOpenKeyExW(class_key, path, 0, access, key))) { RegCloseKey(class_key); - return key; + return l; } ERR("Failed to open driver key, error %u.\n", l); } RegCloseKey(class_key); - SetLastError(ERROR_KEY_DOES_NOT_EXIST); - return INVALID_HANDLE_VALUE; + return l; } static HKEY create_driver_key(struct device *device) @@ -554,7 +552,7 @@ static HKEY create_driver_key(struct device *device) DWORD dispos; LONG l; - if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) + if (!open_driver_key(device, KEY_READ | KEY_WRITE, &key)) return key; if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, @@ -593,16 +591,14 @@ static BOOL delete_driver_key(struct device *device) HKEY key; LONG l; - if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE) + if (!(l = open_driver_key(device, KEY_READ | KEY_WRITE, &key))) { l = RegDeleteKeyW(key, emptyW); RegCloseKey(key); - - SetLastError(l); - return !l; } - return FALSE; + SetLastError(l); + return !l; } struct PropertyMapEntry @@ -3555,17 +3551,17 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, switch (KeyType) { case DIREG_DEV: - if ((l = RegOpenKeyExW(device->key, DeviceParameters, 0, samDesired, &key))) - key = INVALID_HANDLE_VALUE; - SetLastError(l); + l = RegOpenKeyExW(device->key, DeviceParameters, 0, samDesired, &key); break; case DIREG_DRV: - key = open_driver_key(device, samDesired); + l = open_driver_key(device, samDesired, &key); break; default: - WARN("unknown KeyType %d\n", KeyType); + FIXME("Unhandled type %#x.\n", KeyType); + l = ERROR_CALL_NOT_IMPLEMENTED; } - return key; + SetLastError(l == ERROR_FILE_NOT_FOUND ? ERROR_KEY_DOES_NOT_EXIST : l); + return l ? INVALID_HANDLE_VALUE : key; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9f36b2a..0f27783 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1163,7 +1163,6 @@ todo_wine { key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); -todo_wine ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key); @@ -1192,7 +1191,6 @@ todo_wine key = SetupDiOpenDevRegKey(set, &device, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ); ok(key == INVALID_HANDLE_VALUE, "Expected failure.\n"); -todo_wine ok(GetLastError() == ERROR_KEY_DOES_NOT_EXIST, "Got unexpected error %#x.\n", GetLastError()); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, params_key_path, &key);

1 0

Zebediah Figura : quartz/tests/filesource: Add tests for IAsyncReader_SyncReadAligned().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 653bc4fa1a1f0bd15d772f90ad74e009c36f2d0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=653bc4fa1a1f0bd15d772f90… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 22 19:27:03 2019 -0600 quartz/tests/filesource: Add tests for IAsyncReader_SyncReadAligned(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index e13cb05..32b007f 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -666,11 +666,71 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_sync_read_aligned(IAsyncReader *reader, IMemAllocator *allocator) +{ + REFERENCE_TIME start_time, end_time; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG len; + int i; + + IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + IMediaSample_GetPointer(sample, &data); + + start_time = 0; + end_time = 512 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_SyncReadAligned(reader, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + len = IMediaSample_GetActualDataLength(sample); +todo_wine + ok(len == 512, "Got length %d.\n", len); + + for (i = 0; i < 512; i++) + ok(data[i] == i % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + start_time = 512 * (LONGLONG)10000000; + end_time = 1024 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_SyncReadAligned(reader, sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + len = IMediaSample_GetActualDataLength(sample); +todo_wine + ok(len == 88, "Got length %d.\n", len); + + for (i = 0; i < 88; i++) + ok(data[i] == (512 + i) % 111, "Got wrong byte %02x at %u.\n", data[i], i); + + start_time = 1024 * (LONGLONG)10000000; + end_time = 1536 * (LONGLONG)10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAsyncReader_SyncReadAligned(reader, sample); +todo_wine + ok(hr == S_OK, "Got hr %#x.\n", hr); + + len = IMediaSample_GetActualDataLength(sample); +todo_wine + ok(len == 0, "Got length %d.\n", len); + + IMediaSample_Release(sample); +} + static void test_async_reader(void) { + ALLOCATOR_PROPERTIES req_props = {2, 1024, 512, 0}, ret_props; IBaseFilter *filter = create_file_source(); IFileSourceFilter *filesource; LONGLONG length, available; + IMemAllocator *allocator; WCHAR filename[MAX_PATH]; IAsyncReader *reader; BYTE buffer[20]; @@ -733,6 +793,19 @@ static void test_async_reader(void) ok(hr == S_FALSE, "Got hr %#x.\n", hr); ok(buffer[0] == 0xcc, "Got wrong byte %02x.\n", buffer[0]); + ret_props = req_props; + hr = IAsyncReader_RequestAllocator(reader, NULL, &ret_props, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_props.cBuffers == 2, "Got %d buffers.\n", ret_props.cBuffers); + ok(ret_props.cbBuffer == 1024, "Got size %d.\n", ret_props.cbBuffer); + ok(ret_props.cbAlign == 512, "Got alignment %d.\n", ret_props.cbAlign); + ok(ret_props.cbPrefix == 0, "Got prefix %d.\n", ret_props.cbPrefix); + + IMemAllocator_Commit(allocator); + + test_sync_read_aligned(reader, allocator); + + IMemAllocator_Release(allocator); IAsyncReader_Release(reader); IPin_Release(pin); IFileSourceFilter_Release(filesource);

1 0

Zebediah Figura : setupapi: Handle error translation in SetupDiCreateDevRegKey().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 8c12672b06dc36bd656a512f5ba454f7ff3ae581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c12672b06dc36bd656a512f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 24 22:08:20 2019 -0600 setupapi: Handle error translation in SetupDiCreateDevRegKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 93a623a..537b335 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -542,25 +542,24 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) return l; } -static HKEY create_driver_key(struct device *device) +static LONG create_driver_key(struct device *device, HKEY *key) { static const WCHAR formatW[] = {'%','0','4','u',0}; static const WCHAR slash[] = { '\\',0 }; - HKEY class_key, key; unsigned int i = 0; WCHAR path[50]; + HKEY class_key; DWORD dispos; LONG l; - if (!open_driver_key(device, KEY_READ | KEY_WRITE, &key)) - return key; + if (!open_driver_key(device, KEY_READ | KEY_WRITE, key)) + return ERROR_SUCCESS; if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { ERR("Failed to open driver class root key, error %u.\n", l); - SetLastError(l); - return INVALID_HANDLE_VALUE; + return l; } SETUPDI_GuidToString(&device->class, path); @@ -570,20 +569,19 @@ static HKEY create_driver_key(struct device *device) for (;;) { sprintfW(path + 39, formatW, i++); - if ((l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, &dispos))) + if ((l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, key, &dispos))) break; else if (dispos == REG_CREATED_NEW_KEY) { RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR)); RegCloseKey(class_key); - return key; + return ERROR_SUCCESS; } - RegCloseKey(key); + RegCloseKey(*key); } ERR("Failed to create driver key, error %u.\n", l); RegCloseKey(class_key); - SetLastError(l); - return INVALID_HANDLE_VALUE; + return l; } static LONG delete_driver_key(struct device *device) @@ -1449,23 +1447,21 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da switch (KeyType) { case DIREG_DEV: - if ((l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &key, NULL))) - { - key = INVALID_HANDLE_VALUE; - } - SetLastError(l); + l = RegCreateKeyExW(device->key, DeviceParameters, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); break; case DIREG_DRV: - key = create_driver_key(device); + l = create_driver_key(device, &key); break; default: - WARN("unknown KeyType %d\n", KeyType); + FIXME("Unhandled type %#x.\n", KeyType); + l = ERROR_CALL_NOT_IMPLEMENTED; } if (InfHandle) SetupInstallFromInfSectionW(NULL, InfHandle, InfSectionName, SPINST_ALL, NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, devinfo, device_data); - return key; + SetLastError(l); + return l ? INVALID_HANDLE_VALUE : key; } /***********************************************************************

1 0

Sven Baars : devenum: Don't pass a name argument to IEnumDMO_Next.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: e6b9a83bb428b712494a44713cbb3b0bc0bf3e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6b9a83bb428b712494a4471… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 24 20:46:35 2019 +0100 devenum: Don't pass a name argument to IEnumDMO_Next. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 5fa2f00..3e97f6d 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -865,7 +865,6 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, LONG res; ULONG fetched = 0; MediaCatMoniker * pMoniker; - WCHAR *name; CLSID clsid; HRESULT hr; HKEY hkey; @@ -877,7 +876,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, /* FIXME: try PNP devices first */ /* try DMOs */ - if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, &name, NULL)) == S_OK) + if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, NULL, NULL)) == S_OK) { if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) return E_OUTOFMEMORY;

1 0

Sven Baars : msdmo: Allow for names to be NULL in IEnumDMO_Next.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 61e0ffcd73bda1c5f54de406415729780cf38f9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=61e0ffcd73bda1c5f54de406… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Feb 24 20:46:34 2019 +0100 msdmo: Allow for names to be NULL in IEnumDMO_Next. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 15 +++++++++------ dlls/msdmo/tests/msdmo.c | 7 +++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 864cb85..1c06bbf 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -530,7 +530,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); - if (!pCLSID || !Names) + if (!pCLSID) return E_POINTER; if (!pcItemsFetched && cItemsToFetch > 1) @@ -656,14 +656,17 @@ static HRESULT WINAPI IEnumDMO_fnNext( } /* Media object wasn't filtered so add it to return list */ - Names[count] = NULL; len = MAX_PATH * sizeof(WCHAR); ret = RegQueryValueExW(hkey, NULL, NULL, NULL, (LPBYTE)szValue, &len); - if (ERROR_SUCCESS == ret) + if (Names) { - Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); - if (Names[count]) - strcpyW(Names[count], szValue); + Names[count] = NULL; + if (ret == ERROR_SUCCESS) + { + Names[count] = CoTaskMemAlloc((strlenW(szValue) + 1) * sizeof(WCHAR)); + if (Names[count]) + strcpyW(Names[count], szValue); + } } wsprintfW(szGuidKey,szToGuidFmt,szNextKey); CLSIDFromString(szGuidKey, &pCLSID[count]); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index 7617123..68de11f 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -107,6 +107,13 @@ static void test_DMOEnum(void) ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 0, "expected 0, got %d\n", count); + hr = IEnumDMO_Next(enum_dmo, 2, NULL, &name, &count); + ok(hr == E_POINTER, "expected S_FALSE, got %#x\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 2, &clsid, NULL, &count); + ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); + ok(count == 0, "expected 0, got %d\n", count); + IEnumDMO_Release(enum_dmo); }

1 0

Zebediah Figura : setupapi: Handle error translation in SetupDiDeleteDevRegKey().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: 922bc932c8f4a98c29f5ace7804e52dbbd65147a URL: https://source.winehq.org/git/wine.git/?a=commit;h=922bc932c8f4a98c29f5ace7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Feb 24 22:08:19 2019 -0600 setupapi: Handle error translation in SetupDiDeleteDevRegKey(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index d8ae778..93a623a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -586,7 +586,7 @@ static HKEY create_driver_key(struct device *device) return INVALID_HANDLE_VALUE; } -static BOOL delete_driver_key(struct device *device) +static LONG delete_driver_key(struct device *device) { HKEY key; LONG l; @@ -597,8 +597,7 @@ static BOOL delete_driver_key(struct device *device) RegCloseKey(key); } - SetLastError(l); - return !l; + return l; } struct PropertyMapEntry @@ -3571,7 +3570,6 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat DWORD Scope, DWORD HwProfile, DWORD KeyType) { struct device *device; - BOOL ret = FALSE; LONG l; TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", @@ -3601,21 +3599,21 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat switch (KeyType) { case DIREG_DRV: - ret = delete_driver_key(device); + l = delete_driver_key(device); break; case DIREG_BOTH: - if (!(ret = delete_driver_key(device))) + if ((l = delete_driver_key(device))) break; /* fall through */ case DIREG_DEV: l = RegDeleteKeyW(device->key, DeviceParameters); - SetLastError(l); - ret = !l; break; default: - WARN("unknown KeyType %d\n", KeyType); + FIXME("Unhandled type %#x.\n", KeyType); + l = ERROR_CALL_NOT_IMPLEMENTED; } - return ret; + SetLastError(l); + return !l; } /***********************************************************************

1 0

Hans Leidekker : mscms: Add a partial implementation of WcsOpenColorProfileA/W.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: wine Branch: master Commit: aeec35ab5a2a9f3239bf46699264ed9e1ef5a8b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeec35ab5a2a9f3239bf4669… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 25 09:12:36 2019 +0100 mscms: Add a partial implementation of WcsOpenColorProfileA/W. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46708 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/mscms.spec | 4 +-- dlls/mscms/profile.c | 71 +++++++++++++++++++++++++++++++++++++-------------- include/icm.h | 2 ++ 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index f521ac6..fec0af5 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -96,8 +96,8 @@ @ stub WcsGetDefaultRenderingIntent @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) @ stub WcsGpCanInstallOrUninstallProfiles -@ stub WcsOpenColorProfileA -@ stub WcsOpenColorProfileW +@ stdcall WcsOpenColorProfileA(ptr ptr ptr long long long long) +@ stdcall WcsOpenColorProfileW(ptr ptr ptr long long long long) @ stub WcsSetCalibrationManagementState @ stub WcsSetDefaultColorProfile @ stub WcsSetDefaultRenderingIntent diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index a0b9d41..6bc55e7 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1327,6 +1327,18 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete return TRUE; } +static BOOL profile_AtoW( const PROFILE *in, PROFILE *out ) +{ + int len; + if (!in->pProfileData) return FALSE; + len = MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, NULL, 0 ); + if (!(out->pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + out->cbDataSize = len * sizeof(WCHAR); + MultiByteToWideChar( CP_ACP, 0, in->pProfileData, -1, out->pProfileData, len ); + out->dwType = in->dwType; + return TRUE; +} + /****************************************************************************** * OpenColorProfileA [MSCMS.@] * @@ -1335,6 +1347,7 @@ BOOL WINAPI UninstallColorProfileW( PCWSTR machine, PCWSTR profile, BOOL delete HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing, DWORD creation ) { HPROFILE handle = NULL; + PROFILE profileW; TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); @@ -1344,25 +1357,9 @@ HPROFILE WINAPI OpenColorProfileA( PPROFILE profile, DWORD access, DWORD sharing if (profile->dwType & PROFILE_MEMBUFFER) return OpenColorProfileW( profile, access, sharing, creation ); - if (profile->dwType & PROFILE_FILENAME) - { - UINT len; - PROFILE profileW; - - profileW.dwType = profile->dwType; - - len = MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, NULL, 0 ); - profileW.pProfileData = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - - if (profileW.pProfileData) - { - profileW.cbDataSize = len * sizeof(WCHAR); - MultiByteToWideChar( CP_ACP, 0, profile->pProfileData, -1, profileW.pProfileData, len ); - - handle = OpenColorProfileW( &profileW, access, sharing, creation ); - HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); - } - } + if (!profile_AtoW( profile, &profileW )) return FALSE; + handle = OpenColorProfileW( &profileW, access, sharing, creation ); + HeapFree( GetProcessHeap(), 0, profileW.pProfileData ); return handle; } @@ -1546,3 +1543,39 @@ BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTY SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +/****************************************************************************** + * WcsOpenColorProfileA [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileA( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + PROFILE cdmW, campW = {0}, gmmpW = {0}; + HPROFILE ret = NULL; + + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + + if (!cdm || !profile_AtoW( cdm, &cdmW )) return NULL; + if (camp && !profile_AtoW( camp, &campW )) goto done; + if (gmmp && !profile_AtoW( gmmp, &gmmpW )) goto done; + + ret = WcsOpenColorProfileW( &cdmW, &campW, &gmmpW, access, sharing, creation, flags ); + +done: + HeapFree( GetProcessHeap(), 0, cdmW.pProfileData ); + HeapFree( GetProcessHeap(), 0, campW.pProfileData ); + HeapFree( GetProcessHeap(), 0, gmmpW.pProfileData ); + return ret; +} + +/****************************************************************************** + * WcsOpenColorProfileW [MSCMS.@] + */ +HPROFILE WINAPI WcsOpenColorProfileW( PROFILE *cdm, PROFILE *camp, PROFILE *gmmp, DWORD access, DWORD sharing, + DWORD creation, DWORD flags ) +{ + TRACE( "%p, %p, %p, %08x, %08x, %08x, %08x\n", cdm, camp, gmmp, access, sharing, creation, flags ); + FIXME("no support for WCS profiles\n" ); + + return OpenColorProfileW( cdm, access, sharing, creation ); +} diff --git a/include/icm.h b/include/icm.h index fbbdede..de5bf26 100644 --- a/include/icm.h +++ b/include/icm.h @@ -411,6 +411,8 @@ BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetUsePerUserProfiles(const WCHAR*,DWORD,BOOL*); +HPROFILE WINAPI WcsOpenColorProfileA(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); +HPROFILE WINAPI WcsOpenColorProfileW(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DWORD,DWORD); #define PROFILE_FILENAME 1 #define PROFILE_MEMBUFFER 2

1 0

Józef Kucia : tests: Add test for vkd3d shader function pointers.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: vkd3d Branch: master Commit: b277b12f5ffa55e1188781c0950a9f669339f87c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b277b12f5ffa55e1188781c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:17 2019 +0100 tests: Add test for vkd3d shader function pointers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_shader_api.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index ec439e1..65099f2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -52,7 +52,79 @@ static void test_invalid_shaders(void) ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); } +static void test_vkd3d_shader_pfns(void) +{ + PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; + PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; + PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; + PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; + PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; + PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; + PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; + PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; + PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; + + struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_shader_signature_element *element; + struct vkd3d_shader_scan_info scan_info; + struct vkd3d_shader_signature signature; + struct vkd3d_shader_code dxbc, spirv; + int rc; + + static const struct vkd3d_root_signature_desc empty_rs_desc; + static const DWORD vs_code[] = + { +#if 0 + float4 main(int4 p : POSITION) : SV_Position + { + return p; + } +#endif + 0x43425844, 0x3fd50ab1, 0x580a1d14, 0x28f5f602, 0xd1083e3a, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x0500002b, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + + pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; + pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; + pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; + pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; + pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; + pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; + pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; + pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; + pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; + + rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_shader_code(&dxbc); + + rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + element = pfn_vkd3d_shader_find_signature_element(&signature, "POSITION", 0, 0); + ok(element, "Could not find shader signature element.\n"); + pfn_vkd3d_shader_free_shader_signature(&signature); + + rc = pfn_vkd3d_shader_compile_dxbc(&vs, &spirv, 0, NULL, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + pfn_vkd3d_shader_free_shader_code(&spirv); + + memset(&scan_info, 0, sizeof(scan_info)); + scan_info.type = VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO; + rc = pfn_vkd3d_shader_scan_dxbc(&vs, &scan_info); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); +} + START_TEST(vkd3d_shader_api) { run_test(test_invalid_shaders); + run_test(test_vkd3d_shader_pfns); }

1 0

Józef Kucia : vkd3d-shader: Call vkd3d_dxbc_compiler_leave_shader_phase() also for last phase.
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: vkd3d Branch: master Commit: 95b6d5222dbb059aa14b4641872c6b103185eb74 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=95b6d5222dbb059aa14b464… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:12 2019 +0100 vkd3d-shader: Call vkd3d_dxbc_compiler_leave_shader_phase() also for last phase. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4225f8f..08065f9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7870,8 +7870,12 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; - vkd3d_spirv_build_op_function_end(builder); + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_leave_shader_phase(compiler, phase); + else + vkd3d_spirv_build_op_function_end(builder); if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) vkd3d_dxbc_compiler_emit_hull_shader_main(compiler);

1 0

Józef Kucia : vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_store().
by Alexandre Julliard Feb. 25, 2019

Feb. 25, 2019

Module: vkd3d Branch: master Commit: 61aeaae0c2bee3b05b0f7866b37173c6164fb5d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=61aeaae0c2bee3b05b0f786… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:10 2019 +0100 vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 75 ++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b447a13..01f9080 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2908,65 +2908,80 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, - const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, id, index[1]; + uint32_t type_id, ptr_type_id, index[1]; unsigned int component_idx; - assert(reg->type != VKD3DSPR_IMMCONST); - - id = reg_info->id; - if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + if (vkd3d_write_mask_component_count(dst_write_mask) > 1) { - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); + } + + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); +} + +static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, dst_val_id; + unsigned int component_count; + + assert(write_mask); + + component_count = vkd3d_write_mask_component_count(write_mask); + + if (component_count == 1) + { + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, + dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); + } + + if (component_count != VKD3D_VEC4_SIZE) + { + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); + + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; - uint32_t type_id, reg_val_id; - unsigned int component_count; + uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); - assert(write_mask); - component_count = vkd3d_write_mask_component_count(write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) return; vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { + unsigned int component_count = vkd3d_write_mask_component_count(write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + component_type = reg_info.component_type; } - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); - - if (component_count != VKD3D_VEC4_SIZE) - { - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); - - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); - } - - vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler,

1 0