June 2020 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : qwave: Add QOSAddSocketToFlow stub.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: eb510fa5aac4ba48232ad65a9fd4dbafb9f2f492 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb510fa5aac4ba48232ad65a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 00:09:38 2020 +0000 qwave: Add QOSAddSocketToFlow stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48580 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8641e59fe306c850f28d60edf4b25aaa2a864d7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qwave/main.c | 8 ++++++++ dlls/qwave/qwave.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index 685fcfb6c6..e256d1b8c6 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -50,3 +50,11 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) SetLastError(ERROR_SERVICE_ALREADY_RUNNING); return FALSE; } + +BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, + QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) +{ + FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} diff --git a/dlls/qwave/qwave.spec b/dlls/qwave/qwave.spec index 94b62eb1d8..83dfc6787c 100644 --- a/dlls/qwave/qwave.spec +++ b/dlls/qwave/qwave.spec @@ -1,6 +1,6 @@ @ stub QDLHPathDiagnostics @ stub QDLHStartDiagnosingPath -@ stub QOSAddSocketToFlow +@ stdcall QOSAddSocketToFlow(ptr long ptr long long ptr) @ stub QOSCancel @ stub QOSCloseHandle @ stdcall QOSCreateHandle(ptr ptr)

1 0

Akihiro Sagawa : dsound/tests: Add a test whether the buffer is a valid global memory.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: db754f0f18b594febee229c12e4d39810ba69b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db754f0f18b594febee229c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:44 2020 +0900 dsound/tests: Add a test whether the buffer is a valid global memory. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e28638afccdfda3ee44121405d9097d201b61445) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/tests/dsound.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 7fdac9144e..0e779618a2 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1157,6 +1157,13 @@ static HRESULT test_duplicate(LPGUID lpGuid) ok(rc==DS_OK && buf!=NULL, "IDirectSoundBuffer_Lock failed to lock the buffer %08x\n",rc); if (rc==DS_OK && buf!=NULL) { + if (sizeof(void*)==4) { /* crashes on 64-bit */ + /* broken apps like Asuka 120% Return BURNING Fest, + pass the pointer to GlobalHandle. */ + HGLOBAL hmem = GlobalHandle(buf); + todo_wine ok(!hmem,"GlobalHandle should return NULL " + "for buffer %p, got %p\n",buf,hmem); + } ZeroMemory(buf,bufsize); rc=IDirectSoundBuffer_Unlock(original,buf,bufsize, NULL,0);

1 0

Akihiro Sagawa : dsound: Make GlobalHandle() for the sound buffer failed.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 0a0bdbf1dc1d38fa7a5f42bcd563eb46f2291918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a0bdbf1dc1d38fa7a5f42bc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 6 21:52:46 2020 +0900 dsound: Make GlobalHandle() for the sound buffer failed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70aeb7e4b0eb8efefd24c26d1c1442ea6c25d082) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/buffer.c | 15 +++++---------- dlls/dsound/tests/dsound.c | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index f600652914..1a3e3b9526 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1014,6 +1014,7 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + size_t bufsize; TRACE("(%p,%p,%p)\n", device, dsbd, buffer); @@ -1069,19 +1070,15 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds TRACE("capf = 0x%08x, device->drvcaps.dwFlags = 0x%08x\n", capf, device->drvcaps.dwFlags); /* Allocate an empty buffer */ - dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); + bufsize = (sizeof(*(dsb->buffer)) + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + dsb->buffer = HeapAlloc(GetProcessHeap(),0,bufsize + dsb->buflen); if (!dsb->buffer) { IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ - dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (!dsb->buffer->memory) { - WARN("out of memory\n"); - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - return DSERR_OUTOFMEMORY; - } + dsb->buffer->memory = (BYTE *)dsb->buffer + bufsize; dsb->buffer->ref = 1; dsb->buffer->lockedbytes = 0; @@ -1152,10 +1149,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) This->buffer->ref--; list_remove(&This->entry); - if (This->buffer->ref == 0) { - HeapFree(GetProcessHeap(), 0, This->buffer->memory); + if (This->buffer->ref == 0) HeapFree(GetProcessHeap(), 0, This->buffer); - } HeapFree(GetProcessHeap(), 0, This->notifies); HeapFree(GetProcessHeap(), 0, This->pwfx); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0e779618a2..2bf87eb857 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1161,7 +1161,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) /* broken apps like Asuka 120% Return BURNING Fest, pass the pointer to GlobalHandle. */ HGLOBAL hmem = GlobalHandle(buf); - todo_wine ok(!hmem,"GlobalHandle should return NULL " + ok(!hmem,"GlobalHandle should return NULL " "for buffer %p, got %p\n",buf,hmem); } ZeroMemory(buf,bufsize);

1 0

Zebediah Figura : setupapi: Implement SetupDiGetSelectedDriver().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: d133d9c82092198ab11a537ec4e7134d7fb48c45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d133d9c82092198ab11a537e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 8 14:13:14 2020 -0500 setupapi: Implement SetupDiGetSelectedDriver(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48639 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6971dfcfc21e887e4b5724d4f32e29d012e1b5be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/devinst.c | 90 +++++++++++++++++++++++++++++++------------ dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/tests/devinst.c | 14 +++++++ 3 files changed, 82 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 25d4040da0..e561fcd996 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4570,16 +4570,42 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +static BOOL copy_driver_data(SP_DRVINFO_DATA_W *data, const struct driver *driver) +{ + INFCONTEXT ctx; + HINF hinf; + + if ((hinf = SetupOpenInfFileW(driver->inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return FALSE; + + data->ProviderName[0] = 0; + if (SetupFindFirstLineW(hinf, L"Version", L"Provider", &ctx)) + SetupGetStringFieldW(&ctx, 1, data->ProviderName, ARRAY_SIZE(data->ProviderName), NULL); + wcscpy(data->Description, driver->description); + wcscpy(data->MfgName, driver->manufacturer); + data->DriverType = SPDIT_COMPATDRIVER; + + SetupCloseInfFile(hinf); + + return TRUE; +} + +static void driver_data_wtoa(SP_DRVINFO_DATA_A *a, const SP_DRVINFO_DATA_W *w) +{ + a->DriverType = w->DriverType; + a->Reserved = w->Reserved; + WideCharToMultiByte(CP_ACP, 0, w->Description, -1, a->Description, sizeof(a->Description), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->MfgName, -1, a->MfgName, sizeof(a->MfgName), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, w->ProviderName, -1, a->ProviderName, sizeof(a->ProviderName), NULL, NULL); +} + /*********************************************************************** * SetupDiEnumDriverInfoW (SETUPAPI.@) */ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type, DWORD index, SP_DRVINFO_DATA_W *driver_data) { - static const WCHAR providerW[] = {'P','r','o','v','i','d','e','r',0}; struct device *device; - INFCONTEXT ctx; - HINF hinf; TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", devinfo, device_data, type, index, driver_data); @@ -4600,19 +4626,7 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return FALSE; } - if ((hinf = SetupOpenInfFileW(device->drivers[index].inf_path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) - return FALSE; - - driver_data->ProviderName[0] = 0; - if (SetupFindFirstLineW(hinf, Version, providerW, &ctx)) - SetupGetStringFieldW(&ctx, 1, driver_data->ProviderName, ARRAY_SIZE(driver_data->ProviderName), NULL); - lstrcpyW(driver_data->Description, device->drivers[index].description); - lstrcpyW(driver_data->MfgName, device->drivers[index].manufacturer); - driver_data->DriverType = SPDIT_COMPATDRIVER; - - SetupCloseInfFile(hinf); - - return TRUE; + return copy_driver_data(driver_data, &device->drivers[index]); } /*********************************************************************** @@ -4626,14 +4640,7 @@ BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat driver_dataW.cbSize = sizeof(driver_dataW); ret = SetupDiEnumDriverInfoW(devinfo, device_data, type, index, &driver_dataW); - driver_data->DriverType = driver_dataW.DriverType; - driver_data->Reserved = driver_dataW.Reserved; - WideCharToMultiByte(CP_ACP, 0, driver_dataW.Description, -1, driver_data->Description, - sizeof(driver_data->Description), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.MfgName, -1, driver_data->MfgName, - sizeof(driver_data->MfgName), NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, driver_dataW.ProviderName, -1, driver_data->ProviderName, - sizeof(driver_data->ProviderName), NULL, NULL); + driver_data_wtoa(driver_data, &driver_dataW); return ret; } @@ -4663,6 +4670,41 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device return TRUE; } +/*********************************************************************** + * SetupDiGetSelectedDriverW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_W *driver_data) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, driver_data %p.\n", devinfo, device_data, driver_data); + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (!device->selected_driver) + { + SetLastError(ERROR_NO_DRIVER_SELECTED); + return FALSE; + } + + return copy_driver_data(driver_data, device->selected_driver); +} + +/*********************************************************************** + * SetupDiGetSelectedDriverA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetSelectedDriverA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, SP_DRVINFO_DATA_A *driver_data) +{ + SP_DRVINFO_DATA_W driver_dataW; + BOOL ret; + + driver_dataW.cbSize = sizeof(driver_dataW); + if ((ret = SetupDiGetSelectedDriverW(devinfo, device_data, &driver_dataW))) + driver_data_wtoa(driver_data, &driver_dataW); + return ret; +} + /*********************************************************************** * SetupDiInstallDriverFiles (SETUPAPI.@) */ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8c4ebcc101..325985dac6 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -359,8 +359,8 @@ @ stdcall SetupDiGetINFClassA(str ptr ptr long ptr) @ stdcall SetupDiGetINFClassW(wstr ptr ptr long ptr) @ stub SetupDiGetSelectedDevice -@ stub SetupDiGetSelectedDriverA -@ stub SetupDiGetSelectedDriverW +@ stdcall SetupDiGetSelectedDriverA(ptr ptr ptr) +@ stdcall SetupDiGetSelectedDriverW(ptr ptr ptr) @ stub SetupDiGetWizardPage @ stdcall SetupDiInstallClassA(long str long ptr) @ stub SetupDiInstallClassExA diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index a02752d2de..1c3c191ba9 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2374,6 +2374,20 @@ static void test_driver_list(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_NO_MORE_ITEMS, "Got unexpected error %#x.\n", GetLastError()); + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret /* Win10 1809 */ || GetLastError() == ERROR_NO_DRIVER_SELECTED, + "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiSelectBestCompatDrv(set, &device); + ok(ret, "Failed to select driver, error %#x.\n", GetLastError()); + + ret = SetupDiGetSelectedDriverA(set, &device, &driver); + ok(ret, "Failed to get selected driver, error %#x.\n", GetLastError()); + ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); + ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); + ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName); + SetupDiDestroyDeviceInfoList(set); ret = DeleteFileA(inf_path); ok(ret, "Failed to delete %s, error %u.\n", inf_path, GetLastError());

1 0

Dirk Niggemann : krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: c7befdbcc764b61ebb469849c10d690d9cb24971 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7befdbcc764b61ebb469849… Author: Dirk Niggemann <dirk.niggemann(a)gmail.com> Date: Tue Feb 4 22:42:50 2020 +0000 krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480 Signed-off-by: Dirk Niggemann <dirk.niggemann(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c57483ba4d77d04a7af120a6e016b53c5596fe81) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index c8ad3824c0..91a24f19c4 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2475,11 +2475,12 @@ DWORD WINAPIV CallProc32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, VA_LIST16 valist ) { DWORD args[32]; - unsigned int i; + unsigned int i, count = min( 32, nrofargs & ~CPEX_DEST_CDECL ); - TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32); + TRACE("(%s,%d,%d,%p args[", nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall", + nrofargs & ~CPEX_DEST_CDECL, argconvmask, proc32); - for (i=0;i<nrofargs;i++) + for (i = 0; i < count; i++) { if (argconvmask & (1<<i)) {

1 0

Vijay Kiran Kamuju : include: Add missing defines to icm.h.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 4b7e8339b262c55e3b387b90c3881481e498c40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7e8339b262c55e3b387b90… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jan 31 01:43:13 2020 +0100 include: Add missing defines to icm.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b4db9884c396b22f78e357c01fa77ebac58d2422) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/icm.h | 168 +++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 137 insertions(+), 31 deletions(-) diff --git a/include/icm.h b/include/icm.h index de5bf2626e..67bfcc89fd 100644 --- a/include/icm.h +++ b/include/icm.h @@ -137,20 +137,20 @@ typedef enum typedef enum { - BM_x555RGB = 0x00, - BM_565RGB = 0x01, - BM_RGBTRIPLETS = 0x02, - BM_BGRTRIPLETS = 0x04, - BM_xRGBQUADS = 0x08, - BM_10b_RGB = 0x09, - BM_16b_RGB = 0x0a, - BM_xBGRQUADS = 0x10, - BM_CMYKQUADS = 0x20, - BM_x555XYZ = 0x101, + BM_x555RGB = 0x0000, + BM_565RGB = 0x0001, + BM_RGBTRIPLETS = 0x0002, + BM_BGRTRIPLETS = 0x0004, + BM_xRGBQUADS = 0x0008, + BM_10b_RGB = 0x0009, + BM_16b_RGB = 0x000a, + BM_xBGRQUADS = 0x0010, + BM_CMYKQUADS = 0x0020, + BM_x555XYZ = 0x0101, BM_x555Yxz, BM_x555Lab, BM_x555G3CH, - BM_XYZTRIPLETS = 0x201, + BM_XYZTRIPLETS = 0x0201, BM_YxyTRIPLETS, BM_LabTRIPLETS, BM_G3CHTRIPLETS, @@ -159,21 +159,28 @@ typedef enum BM_7CHANNEL, BM_8CHANNEL, BM_GRAY, - BM_xXYZQUADS = 0x301, + BM_xXYZQUADS = 0x0301, BM_xYxyQUADS, BM_xLabQUADS, BM_xG3CHQUADS, BM_KYMCQUADS, - BM_10b_XYZ = 0x401, + BM_10b_XYZ = 0x0401, BM_10b_Yxy, BM_10b_Lab, BM_10b_G3CH, BM_NAMED_INDEX, - BM_16b_XYZ = 0x501, + BM_16b_XYZ = 0x0501, BM_16b_Yxy, BM_16b_Lab, BM_16b_G3CH, BM_16b_GRAY, + BM_32b_scRGB = 0x0601, + BM_32b_scARGB, + BM_S2DOT13FIXED_scRGB, + BM_S2DOT13FIXED_scARGB, + BM_R10G10B10A2 = 0x0701, + BM_R10G10B10A2_XR, + BM_R16G16B16A16_FLOAT } BMFORMAT, *PBMFORMAT, *LPBMFORMAT; typedef enum @@ -182,6 +189,36 @@ typedef enum WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER } WCS_PROFILE_MANAGEMENT_SCOPE; +#define DONT_USE_EMBEDDED_WCS_PROFILES 0x00000001 + +#define PROOF_MODE 0x00000001 +#define NORMAL_MODE 0x00000002 +#define BEST_MODE 0x00000003 +#define ENABLE_GAMUT_CHECKING 0x00010000 +#define USE_RELATIVE_COLORIMETRIC 0x00020000 +#define FAST_TRANSLATE 0x00040000 +#define PRESERVEBLACK 0x00100000 +#define WCS_ALWAYS 0x00200000 +#define RESERVED 0x80000000 +#define SEQUENTIAL_TRANSFORM 0x80800000 + +#define CSA_A 1 +#define CSA_ABC 2 +#define CSA_DEF 3 +#define CSA_DEFG 4 +#define CSA_GRAY 5 +#define CSA_RGB 6 +#define CSA_CMYK 7 +#define CSA_Lab 8 + +#define CMM_WIN_VERSION 0 +#define CMM_IDENT 1 +#define CMM_DRIVER_VERSION 2 +#define CMM_DLL_VERSION 3 +#define CMM_VERSION 4 +#define CMM_DESCRIPTION 5 +#define CMM_LOGOICON 6 + typedef BOOL (CALLBACK *PBMCALLBACKFN)(ULONG,ULONG,LPARAM); typedef PBMCALLBACKFN LPPBMCALLBACKFN; @@ -190,6 +227,38 @@ typedef PBMCALLBACKFN LPPBMCALLBACKFN; #define INTENT_SATURATION 2 #define INTENT_ABSOLUTE_COLORIMETRIC 3 +typedef enum +{ + CPT_ICC, + CPT_DMP, + CPT_CAMP, + CPT_GMMP +} COLORPROFILETYPE, *PCOLORPROFILETYPE, *LPCOLORPROFILETYPE; + +typedef enum +{ + CPST_PERCEPTUAL = INTENT_PERCEPTUAL, + CPST_RELATIVE_COLORIMETRIC = INTENT_RELATIVE_COLORIMETRIC, + CPST_SATURATION = INTENT_SATURATION, + CPST_ABSOLUTE_COLORIMETRIC = INTENT_ABSOLUTE_COLORIMETRIC, + CPST_NONE, + CPST_RGB_WORKING_SPACE, + CPST_CUSTOM_WORKING_SPACE, + CPST_STANDARD_DISPLAY_COLOR_MODE, + CPST_EXTENDED_DISPLAY_COLOR_MODE +} COLORPROFILESUBTYPE, *PCOLORPROFILESUBTYPE, *LPCOLORPROFILESUBTYPE; + +typedef enum +{ + COLOR_BYTE = 1, + COLOR_WORD, + COLOR_FLOAT, + COLOR_S2DOT13FIXED, + COLOR_10b_R10G10B10A2, + COLOR_10b_R10G10B10A2_XR, + COLOR_FLOAT16 +} COLORDATATYPE, *PCOLORDATATYPE, *LPCOLORDATATYPE; + typedef struct tagPROFILEHEADER { DWORD phSize; @@ -268,23 +337,43 @@ typedef struct tagENUMTYPEW DWORD dwDeviceClass; } ENUMTYPEW, *PENUMTYPEW, *LPENUMTYPEW; -#define ET_DEVICENAME 0x00000001 -#define ET_MEDIATYPE 0x00000002 -#define ET_DITHERMODE 0x00000004 -#define ET_RESOLUTION 0x00000008 -#define ET_CMMTYPE 0x00000010 -#define ET_CLASS 0x00000020 -#define ET_DATACOLORSPACE 0x00000040 -#define ET_CONNECTIONSPACE 0x00000080 -#define ET_SIGNATURE 0x00000100 -#define ET_PLATFORM 0x00000200 -#define ET_PROFILEFLAGS 0x00000400 -#define ET_MANUFACTURER 0x00000800 -#define ET_MODEL 0x00001000 -#define ET_ATTRIBUTES 0x00002000 -#define ET_RENDERINGINTENT 0x00004000 -#define ET_CREATOR 0x00008000 -#define ET_DEVICECLASS 0x00010000 +#define ET_DEVICENAME 0x00000001 +#define ET_MEDIATYPE 0x00000002 +#define ET_DITHERMODE 0x00000004 +#define ET_RESOLUTION 0x00000008 +#define ET_CMMTYPE 0x00000010 +#define ET_CLASS 0x00000020 +#define ET_DATACOLORSPACE 0x00000040 +#define ET_CONNECTIONSPACE 0x00000080 +#define ET_SIGNATURE 0x00000100 +#define ET_PLATFORM 0x00000200 +#define ET_PROFILEFLAGS 0x00000400 +#define ET_MANUFACTURER 0x00000800 +#define ET_MODEL 0x00001000 +#define ET_ATTRIBUTES 0x00002000 +#define ET_RENDERINGINTENT 0x00004000 +#define ET_CREATOR 0x00008000 +#define ET_DEVICECLASS 0x00010000 +#define ET_STANDARDDISPLAYCOLOR 0x00020000 +#define ET_EXTENDEDDISPLAYCOLOR 0x00040000 + +#define COLOR_MATCH_VERSION 0x0200 + +#define CMS_DISABLEICM 0x00000001 +#define CMS_ENABLEPROOFING 0x00000002 +#define CMS_SETRENDERINTENT 0x00000004 +#define CMS_SETPROOFINTENT 0x00000008 +#define CMS_SETMONITORPROFILE 0x00000010 +#define CMS_SETPRINTERPROFILE 0x00000020 +#define CMS_SETTARGETPROFILE 0x00000040 +#define CMS_USEHOOK 0x00000080 +#define CMS_USEAPPLYCALLBACK 0x00000100 +#define CMS_USEDESCRIPTION 0x00000200 +#define CMS_DISABLEINTENT 0x00000400 +#define CMS_DISABLERENDERINTENT 0x00000800 +#define CMS_TARGETOVERFLOW 0x20000000 +#define CMS_PRINTERROVERFLOW 0x40000000 +#define CMS_MONITOROVERFLOW 0x80000000 struct _tagCOLORMATCHSETUPA; struct _tagCOLORMATCHSETUPW; @@ -420,6 +509,23 @@ HPROFILE WINAPI WcsOpenColorProfileW(PROFILE*,PROFILE*,PROFILE*,DWORD,DWORD,DW #define PROFILE_READ 1 #define PROFILE_READWRITE 2 +#define FLAG_EMBEDDEDPROFILE 0x00000001 +#define FLAG_DEPENDENTONDATA 0x00000002 +#define FLAG_ENABLE_CHROMATIC_ADAPTATION 0x02000000 + +#define ATTRIB_TRANSPARENCY 0x00000001 +#define ATTRIB_MATTE 0x00000002 + +#define CLASS_MONITOR 0x6D6E7472 /* 'mntr' */ +#define CLASS_PRINTER 0x70727472 /* 'prtr' */ +#define CLASS_SCANNER 0x73636E72 /* 'scnr' */ +#define CLASS_LINK 0x6C696E6B /* 'link' */ +#define CLASS_ABSTRACT 0x61627374 /* 'abst' */ +#define CLASS_COLORSPACE 0x73617063 /* 'spac' */ +#define CLASS_NAMED 0x6E6D636C /* 'nmcl' */ +#define CLASS_CAMP 0x63616D70 /* 'camp' */ +#define CLASS_GMMP 0x676D6D70 /* 'gmmp' */ + #define SPACE_XYZ 0x58595A20 /* 'XYZ ' */ #define SPACE_Lab 0x4C616220 /* 'Lab ' */ #define SPACE_Luv 0x4C757620 /* 'Luv ' */

1 0

Vijay Kiran Kamuju : mscms: Add stub for WcsGetDefaultColorProfileSize.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 4227dcb721981c73120b375c9f702c53fdf36421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4227dcb721981c73120b375c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jan 31 01:50:01 2020 +0100 mscms: Add stub for WcsGetDefaultColorProfileSize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48541 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 87e14f61027eef63cea7bcf68727454c482fa1f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 12 ++++++++++++ include/icm.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index fec0af571d..c535d4c88e 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -92,7 +92,7 @@ @ stdcall WcsEnumColorProfilesSize(long ptr ptr) @ stub WcsGetCalibrationManagementState @ stub WcsGetDefaultColorProfile -@ stub WcsGetDefaultColorProfileSize +@ stdcall WcsGetDefaultColorProfileSize(long wstr long long long ptr) @ stub WcsGetDefaultRenderingIntent @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) @ stub WcsGpCanInstallOrUninstallProfiles diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index d45ac4af12..efc0e4b416 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1552,6 +1552,18 @@ BOOL WINAPI WcsEnumColorProfilesSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, ENUMTY return FALSE; } +/****************************************************************************** + * WcsGetDefaultColorProfileSize [MSCMS.@] + */ +BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, PCWSTR device_name, + COLORPROFILETYPE type, COLORPROFILESUBTYPE subtype, + DWORD profile_id, PDWORD profile_size) +{ + FIXME( "%d %s %d %d %d %p\n", scope, debugstr_w(device_name), type, subtype, profile_id, profile_size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /****************************************************************************** * WcsOpenColorProfileA [MSCMS.@] */ diff --git a/include/icm.h b/include/icm.h index 67bfcc89fd..dab0b5f2e5 100644 --- a/include/icm.h +++ b/include/icm.h @@ -499,6 +499,7 @@ BOOL WINAPI UnregisterCMMA(PCSTR,DWORD); BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); +BOOL WINAPI WcsGetDefaultColorProfileSize(WCS_PROFILE_MANAGEMENT_SCOPE,const WCHAR*,COLORPROFILETYPE,COLORPROFILESUBTYPE,DWORD,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);

1 0

Vijay Kiran Kamuju : mscms: Add stub for WcsGetDefaultRenderingIntent.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 797c80adfffd6d654f0de590f7702a4a9d6a5b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=797c80adfffd6d654f0de590… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jan 31 02:00:28 2020 +0100 mscms: Add stub for WcsGetDefaultRenderingIntent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48541 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0e4dbcfd5d46e325a0811aac4d85ab1ec4ca30e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscms/mscms.spec | 2 +- dlls/mscms/profile.c | 10 ++++++++++ include/icm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/mscms/mscms.spec b/dlls/mscms/mscms.spec index c535d4c88e..cfe32a826e 100644 --- a/dlls/mscms/mscms.spec +++ b/dlls/mscms/mscms.spec @@ -93,7 +93,7 @@ @ stub WcsGetCalibrationManagementState @ stub WcsGetDefaultColorProfile @ stdcall WcsGetDefaultColorProfileSize(long wstr long long long ptr) -@ stub WcsGetDefaultRenderingIntent +@ stdcall WcsGetDefaultRenderingIntent(long ptr) @ stdcall WcsGetUsePerUserProfiles(wstr long ptr) @ stub WcsGpCanInstallOrUninstallProfiles @ stdcall WcsOpenColorProfileA(ptr ptr ptr long long long long) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index efc0e4b416..ed0ed53158 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1564,6 +1564,16 @@ BOOL WINAPI WcsGetDefaultColorProfileSize( WCS_PROFILE_MANAGEMENT_SCOPE scope, P return FALSE; } +/****************************************************************************** + * WcsGetDefaultRednderingIntent [MSCMS.@] + */ +BOOL WINAPI WcsGetDefaultRenderingIntent( WCS_PROFILE_MANAGEMENT_SCOPE scope, PDWORD intent) +{ + FIXME( "%d %p\n", scope, intent ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /****************************************************************************** * WcsOpenColorProfileA [MSCMS.@] */ diff --git a/include/icm.h b/include/icm.h index dab0b5f2e5..cd0e2c0c2a 100644 --- a/include/icm.h +++ b/include/icm.h @@ -500,6 +500,7 @@ BOOL WINAPI UnregisterCMMW(PCWSTR,DWORD); #define UnregisterCMM WINELIB_NAME_AW(UnregisterCMM) BOOL WINAPI WcsEnumColorProfilesSize(WCS_PROFILE_MANAGEMENT_SCOPE,ENUMTYPEW*,DWORD*); BOOL WINAPI WcsGetDefaultColorProfileSize(WCS_PROFILE_MANAGEMENT_SCOPE,const WCHAR*,COLORPROFILETYPE,COLORPROFILESUBTYPE,DWORD,DWORD*); +BOOL WINAPI WcsGetDefaultRenderingIntent(WCS_PROFILE_MANAGEMENT_SCOPE,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);

1 0

Piotr Caban : msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 81cca6bb783bcea870bb9069446994f3b4edc2fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81cca6bb783bcea870bb9069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 5 13:08:55 2020 +0100 msvcp90: Don't pass NULL as reference in runtime_error and logic_error constructors. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48561 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit daff3be7d2bfe890b3acce369cd21c92ea35a0ee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index bf75949dbe..74529e9019 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -314,7 +314,7 @@ logic_error* __thiscall MSVCP_logic_error_ctor( logic_error *this, exception_nam #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else @@ -560,7 +560,7 @@ static runtime_error* MSVCP_runtime_error_ctor( runtime_error *this, exception_n #if _MSVCP_VER == 60 MSVCP_exception_ctor(&this->e, ""); #else - MSVCP_exception_ctor(&this->e, NULL); + MSVCP_exception_default_ctor(&this->e); #endif MSVCP_basic_string_char_ctor_cstr(&this->str, EXCEPTION_STR(name)); #else

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace().
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: stable Commit: 5d489c26e4cc12534f7993218e6d01c025f9fd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d489c26e4cc12534f799321… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:24:59 2020 +0300 dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6ee109c5aab14ef7382b69a92862cd740ffd0ef2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/font.c | 16 ++++++++++++++-- dlls/dwrite/tests/font.c | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9280b5d32a..9989427625 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -6263,9 +6263,21 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) { - FIXME("%p, %p.\n", iface, fontface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + IDWriteFontFace3 *fontface3; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontface); + + /* FIXME: created instance should likely respect given axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, + &fontface3))) + { + hr = IDWriteFontFace3_QueryInterface(fontface3, &IID_IDWriteFontFace5, (void **)fontface); + IDWriteFontFace3_Release(fontface3); + } + + return hr; } static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d7bcfb1f0a..b2892b8e85 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9537,6 +9537,10 @@ static void test_font_resource(void) ok(hr == S_OK, "Failed to get axis values, hr %#x.\n", hr); ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected axis tag.\n"); + hr = IDWriteFontFaceReference1_CreateFontFace(reference, &fontface5); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + IDWriteFontFace5_Release(fontface5); + IDWriteFontFaceReference1_Release(reference); IDWriteFontFile_Release(fontfile);

1 0