March 2021 - Wine-commits - list.winehq.org

Zebediah Figura : setupapi/tests: Expand tests for SetupIterateCabinet().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 978cc1d856c7f62191bf6b1b64ddecf737ea5eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=978cc1d856c7f62191bf6b1b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:47 2021 -0600 setupapi/tests: Expand tests for SetupIterateCabinet(). Partially based on a patch by Sebastian Lackner. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/setupcab.c | 231 ++++++++++++++++++++++++++++++----------- 1 file changed, 169 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=978cc1d856c7f62191bf…

1 0

Zebediah Figura : setupapi: Set the CabinetFile field to the name of the next cabinet.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 811da7bf1a37fc4e3851971a7e96e28b445efebc URL: https://source.winehq.org/git/wine.git/?a=commit;h=811da7bf1a37fc4e3851971a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:48 2021 -0600 setupapi: Set the CabinetFile field to the name of the next cabinet. Verified through manual testing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 6 +++--- dlls/setupapi/tests/setupcab.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 4824170d587..daf23ad31ad 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -166,9 +166,9 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p switch (fdint) { case fdintCABINET_INFO: - TRACE("New cabinet, path %s, set %u, number %u, next disk %s.\n", - debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2)); - ci.CabinetFile = phsc->most_recent_cabinet_name; + TRACE("New cabinet, path %s, set %u, number %u, next disk %s, next cabinet %s.\n", + debugstr_a(pfdin->psz3), pfdin->setID, pfdin->iCabinet, debugstr_a(pfdin->psz2), debugstr_a(pfdin->psz1)); + ci.CabinetFile = pfdin->psz1; ci.CabinetPath = pfdin->psz3; ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 6ead90206f8..c76ca465fca 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -324,7 +324,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para GetTempPathA(ARRAY_SIZE(temp), temp); ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); @@ -432,7 +432,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para GetTempPathW(ARRAY_SIZE(temp), temp); ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath)); - todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); + ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName)); ok(!info->SetId, "Got set ID %#x.\n", info->SetId); ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber);

1 0

Zebediah Figura : setupapi: Set the Source field to the full cabinet path for SPFILENOTIFY_FILEEXTRACTED.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: b67deb0d2f03f7963f3247e4a4477b668a7ace35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b67deb0d2f03f7963f3247e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:49 2021 -0600 setupapi: Set the Source field to the full cabinet path for SPFILENOTIFY_FILEEXTRACTED. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 115 +++++++++++++++++++++++------------------ dlls/setupapi/tests/setupcab.c | 4 +- 2 files changed, 67 insertions(+), 52 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index daf23ad31ad..b63f5fbaf28 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -39,11 +39,13 @@ OSVERSIONINFOW OsVersionInfo; HINSTANCE SETUPAPI_hInstance = 0; -typedef struct { - PSP_FILE_CALLBACK_A msghandler; - PVOID context; - CHAR most_recent_cabinet_name[MAX_PATH]; - CHAR most_recent_target[MAX_PATH]; +typedef struct +{ + PSP_FILE_CALLBACK_A msghandler; + void *context; + char cab_path[MAX_PATH]; + char last_cab[MAX_PATH]; + char most_recent_target[MAX_PATH]; } SC_HSC_A, *PSC_HSC_A; WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -204,7 +206,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p } case fdintCLOSE_FILE_INFO: TRACE("File extracted.\n"); - fp.Source = phsc->most_recent_cabinet_name; + fp.Source = phsc->last_cab; fp.Target = phsc->most_recent_target; fp.Win32Error = 0; fp.Flags = 0; @@ -225,7 +227,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p ci.DiskName = pfdin->psz2; ci.SetId = pfdin->setID; ci.CabinetNumber = pfdin->iCabinet; - strcpy(phsc->most_recent_cabinet_name, pfdin->psz1); + sprintf(phsc->last_cab, "%s%s", phsc->cab_path, ci.CabinetFile); err = phsc->msghandler(phsc->context, SPFILENOTIFY_NEEDNEWCABINET, (UINT_PTR)&ci, (UINT_PTR)mysterio); if (err) { SetLastError(err); @@ -246,62 +248,75 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p /*********************************************************************** * SetupIterateCabinetA (SETUPAPI.@) */ -BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, - PSP_FILE_CALLBACK_A MsgHandler, PVOID Context) +BOOL WINAPI SetupIterateCabinetA(const char *file, DWORD reserved, + PSP_FILE_CALLBACK_A callback, void *context) { - SC_HSC_A my_hsc; - ERF erf; - CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *p = NULL; - DWORD fpnsize; - HFDI hfdi; - BOOL ret; + SC_HSC_A my_hsc; + ERF erf; + CHAR pszCabinet[MAX_PATH], pszCabPath[MAX_PATH], *filepart = NULL; + size_t path_size = 0; + const char *p; + DWORD fpnsize; + HFDI hfdi; + BOOL ret; - TRACE("(CabinetFile == %s, Reserved == %u, MsgHandler == ^%p, Context == ^%p)\n", - debugstr_a(CabinetFile), Reserved, MsgHandler, Context); + TRACE("file %s, reserved %#x, callback %p, context %p.\n", + debugstr_a(file), reserved, callback, context); - if (!CabinetFile) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (!file) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } - fpnsize = strlen(CabinetFile); - if (fpnsize >= MAX_PATH) { - SetLastError(ERROR_BAD_PATHNAME); - return FALSE; - } + if (strlen(file) >= MAX_PATH) + { + SetLastError(ERROR_BAD_PATHNAME); + return FALSE; + } - fpnsize = GetFullPathNameA(CabinetFile, MAX_PATH, pszCabPath, &p); - if (fpnsize > MAX_PATH) { - SetLastError(ERROR_BAD_PATHNAME); - return FALSE; - } + fpnsize = GetFullPathNameA(file, MAX_PATH, pszCabPath, &filepart); + if (fpnsize > MAX_PATH) + { + SetLastError(ERROR_BAD_PATHNAME); + return FALSE; + } - if (p) { - strcpy(pszCabinet, p); - *p = '\0'; - } else { - strcpy(pszCabinet, CabinetFile); - pszCabPath[0] = '\0'; - } + if (filepart) + { + strcpy(pszCabinet, filepart); + *filepart = '\0'; + } + else + { + strcpy(pszCabinet, file); + pszCabPath[0] = '\0'; + } + + for (p = file; *p; ++p) + { + if (*p == '/' || *p == '\\') + path_size = p - file; + } + memcpy(my_hsc.cab_path, file, path_size); + my_hsc.cab_path[path_size] = 0; - TRACE("path: %s, cabfile: %s\n", debugstr_a(pszCabPath), debugstr_a(pszCabinet)); + TRACE("path: %s, cabfile: %s\n", debugstr_a(pszCabPath), debugstr_a(pszCabinet)); - /* remember the cabinet name */ - strcpy(my_hsc.most_recent_cabinet_name, pszCabinet); + strcpy(my_hsc.last_cab, file); - my_hsc.msghandler = MsgHandler; - my_hsc.context = Context; - hfdi = FDICreate(sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, - sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf); + my_hsc.msghandler = callback; + my_hsc.context = context; + hfdi = FDICreate(sc_cb_alloc, sc_cb_free, sc_cb_open, sc_cb_read, + sc_cb_write, sc_cb_close, sc_cb_lseek, cpuUNKNOWN, &erf); - if (!hfdi) return FALSE; + if (!hfdi) return FALSE; - ret = FDICopy(hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); + ret = FDICopy(hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); - FDIDestroy(hfdi); - return ret; + FDIDestroy(hfdi); + return ret; } struct iterate_wtoa_ctx diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index c76ca465fca..458708939da 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -367,7 +367,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para GetTempPathA(ARRAY_SIZE(temp), temp); ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp); - todo_wine ok(!strcmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_a(info->Source)); + ok(!strcmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_a(info->Source)); snprintf(path, ARRAY_SIZE(path), "%s\\%s", temp, expected_files[index].nameA); ok(!strcmp(info->Target, path), "%u: Got target %s.\n", index, debugstr_a(info->Target)); ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error); @@ -475,7 +475,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para GetTempPathW(ARRAY_SIZE(temp), temp); ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp); - todo_wine ok(!wcscmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_w(info->Source)); + ok(!wcscmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_w(info->Source)); swprintf(path, ARRAY_SIZE(path), L"%s\\%s", temp, expected_files[index].nameW); ok(!wcscmp(info->Target, path), "%u: Got target %s.\n", index, debugstr_w(info->Target)); ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error);

1 0

Zebediah Figura : setupapi: Pass the full cabinet path as the second parameter to SPFILENOTIFY_FILEINCABINET.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 8cb6e9585eefd4b0c0257f549d738f6a10f0d097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cb6e9585eefd4b0c0257f54… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:57:50 2021 -0600 setupapi: Pass the full cabinet path as the second parameter to SPFILENOTIFY_FILEINCABINET. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupcab.c | 2 +- dlls/setupapi/tests/setupcab.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index b63f5fbaf28..d4d475c98cb 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -190,7 +190,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p fici.DosAttribs = pfdin->attribs; memset(fici.FullTargetName, 0, MAX_PATH); err = phsc->msghandler(phsc->context, SPFILENOTIFY_FILEINCABINET, - (UINT_PTR)&fici, (UINT_PTR)pfdin->psz1); + (UINT_PTR)&fici, (UINT_PTR)phsc->last_cab); if (err == FILEOP_DOIT) { TRACE("Callback specified filename: %s\n", debugstr_a(fici.FullTargetName)); if (!fici.FullTargetName[0]) { diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index 458708939da..0bfab8142c2 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -350,7 +350,7 @@ static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR para GetTempPathA(ARRAY_SIZE(temp), temp); snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp); - todo_wine ok(!strcmp((const char *)param2, path), "%u: Got file name %s.\n", + ok(!strcmp((const char *)param2, path), "%u: Got file name %s.\n", index, debugstr_a((const char *)param2)); snprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName), @@ -458,7 +458,7 @@ static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR para GetTempPathW(ARRAY_SIZE(temp), temp); swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp); - todo_wine ok(!wcscmp((const WCHAR *)param2, path), "%u: Got file name %s.\n", + ok(!wcscmp((const WCHAR *)param2, path), "%u: Got file name %s.\n", index, debugstr_w((const WCHAR *)param2)); swprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName),

1 0

Zebediah Figura : ntdll: Export RtlQueryRegistryValuesEx().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: ba5465c71feec8dd95c1c912530af55ac5673ffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5465c71feec8dd95c1c912… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 14:59:39 2021 -0600 ntdll: Export RtlQueryRegistryValuesEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46969 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/reg.c | 17 +++-------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ac7365a84b6..c8622ba21f4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -901,6 +901,7 @@ @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 54f01049abf..294b724a5e5 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -460,20 +460,9 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) return status; } -/************************************************************************* - * RtlQueryRegistryValues [NTDLL.@] - * - * Query multiple registry values with a single call. - * - * PARAMS - * RelativeTo [I] Registry path that Path refers to - * Path [I] Path to key - * QueryTable [I] Table of key values to query - * Context [I] Parameter to pass to the application defined QueryRoutine function - * Environment [I] Optional parameter to use when performing expansion - * - * RETURNS - * STATUS_SUCCESS or an appropriate NTSTATUS error code. +/****************************************************************************** + * RtlQueryRegistryValues (NTDLL.@) + * RtlQueryRegistryValuesEx (NTDLL.@) */ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, IN PRTL_QUERY_REGISTRY_TABLE QueryTable, IN PVOID Context, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 145ea3099d7..9da62c44dd5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1213,6 +1213,7 @@ @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall -norelay RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long)

1 0

Zebediah Figura : wined3d: Introduce wined3d_device_get_immediate_context().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 3920277c22e1daa99ba292c1d6bf541165486baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3920277c22e1daa99ba292c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 16:19:19 2021 -0600 wined3d: Introduce wined3d_device_get_immediate_context(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06329293261..181f491546a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2054,6 +2054,13 @@ struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *dev return device->cs->c.state; } +struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return &device->cs->c; +} + void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f1d477af703..f5fa1d3d7e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,6 +84,7 @@ @ cdecl wined3d_device_get_hs_resource_view(ptr long) @ cdecl wined3d_device_get_hs_sampler(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) +@ cdecl wined3d_device_get_immediate_context(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 030e3fdcb67..ba9e8642ea2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2414,6 +2414,7 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_vie unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); +struct wined3d_device_context * __cdecl wined3d_device_get_immediate_context(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset); unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device);

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_constant_buffer().
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 8f1092a6ee7330284d2700b9ec0ffdbf44b848d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1092a6ee7330284d2700b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 7 16:19:22 2021 -0600 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5176c635cf5..43f1d04dd0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1414,18 +1414,18 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi device_invalidate_state(cs->c.device, STATE_CONSTANT_BUFFER(op->type)); } -void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT cb_idx, struct wined3d_buffer *buffer) +void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) { struct wined3d_cs_set_constant_buffer *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; op->type = type; op->cb_idx = cb_idx; op->buffer = buffer; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 181f491546a..1edbd23e7e4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1926,6 +1926,7 @@ void CDECL wined3d_device_get_scissor_rects(const struct wined3d_device *device, void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3d_state *state) { + struct wined3d_device_context *context = &device->cs->c; const struct wined3d_light_info *light; unsigned int i, j; @@ -1959,11 +1960,9 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { - wined3d_device_context_emit_set_shader(&device->cs->c, i, state->shader[i]); + wined3d_device_context_emit_set_shader(context, i, state->shader[i]); for (j = 0; j < MAX_CONSTANT_BUFFERS; ++j) - { - wined3d_cs_emit_set_constant_buffer(device->cs, i, j, state->cb[i][j]); - } + wined3d_device_context_emit_set_constant_buffer(context, i, j, state->cb[i][j]); for (j = 0; j < MAX_SAMPLER_OBJECTS; ++j) { wined3d_cs_emit_set_sampler(device->cs, i, j, state->sampler[i][j]); @@ -2143,7 +2142,7 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, if (buffer) wined3d_buffer_incref(buffer); state->cb[type][idx] = buffer; - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + wined3d_device_context_emit_set_constant_buffer(&device->cs->c, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ee00530981c..6fc743e74db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4747,8 +4747,6 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, - UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, @@ -4812,6 +4810,8 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_set_constant_buffer(struct wined3d_device_context *context, + enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_shader(struct wined3d_device_context *context, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN;

1 0

Chao Long : wmic: Add missing aliases.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 7dba53a0f28f1a30c538744f4d76cdddacc6c8af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dba53a0f28f1a30c538744f… Author: Chao Long <longchao(a)uniontech.com> Date: Mon Mar 8 09:25:42 2021 +0100 wmic: Add missing aliases. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias )

1 0

Nikolay Sivov : dwrite: Remove duplicated trace call.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: df9e20fadcd0aaeb7741740eb71d25063e504ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df9e20fadcd0aaeb7741740e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:46 2021 +0300 dwrite: Remove duplicated trace call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9232f29317f..8a5033ab64f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7226,9 +7226,6 @@ static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UI { static int once; - if (!once++) - FIXME("%p: stub\n", iface); - if (!once++) FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values);

1 0

Nikolay Sivov : dwrite: Limit to exactly one font file per fontface.
by Alexandre Julliard 09 Mar '21

09 Mar '21

Module: wine Branch: master Commit: 7b540f8bc8114c7cd51c03473307f2c3cf22975d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b540f8bc8114c7cd51c0347… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 8 11:30:47 2021 +0300 dwrite: Limit to exactly one font file per fontface. Multiple files only existed in initial API version, formats using multiple files were never supported, and newer API often operates on a single file instance. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 6 ++--- dlls/dwrite/font.c | 59 ++++++++++++++------------------------------ dlls/dwrite/main.c | 3 +-- 3 files changed, 22 insertions(+), 46 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d28c6cef870..4628a2a3704 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,9 +154,8 @@ struct fontface_desc { IDWriteFactory7 *factory; DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFile * const *files; + IDWriteFontFile *file; IDWriteFontFileStream *stream; - UINT32 files_number; UINT32 index; DWRITE_FONT_SIMULATIONS simulations; struct dwrite_font_data *font_data; /* could be NULL when face is created directly with IDWriteFactory::CreateFontFace() */ @@ -243,8 +242,7 @@ struct dwrite_fontface LONG refcount; IDWriteFontFileStream *stream; - IDWriteFontFile **files; - UINT32 file_count; + IDWriteFontFile *file; UINT32 index; IDWriteFactory7 *factory; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8a5033ab64f..9386e9bec3f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -639,14 +639,10 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFace5_ReleaseFontTable(iface, fontface->cpal.context); if (fontface->colr.context) IDWriteFontFace5_ReleaseFontTable(iface, fontface->colr.context); - for (i = 0; i < fontface->file_count; i++) - { - if (fontface->files[i]) - IDWriteFontFile_Release(fontface->files[i]); - } + if (fontface->file) + IDWriteFontFile_Release(fontface->file); if (fontface->stream) IDWriteFontFileStream_Release(fontface->stream); - heap_free(fontface->files); if (fontface->names) IDWriteLocalizedStrings_Release(fontface->names); if (fontface->family_names) @@ -683,24 +679,20 @@ static HRESULT WINAPI dwritefontface_GetFiles(IDWriteFontFace5 *iface, UINT32 *n IDWriteFontFile **fontfiles) { struct dwrite_fontface *fontface = impl_from_IDWriteFontFace5(iface); - int i; TRACE("%p, %p, %p.\n", iface, number_of_files, fontfiles); - if (fontfiles == NULL) + if (!fontfiles) { - *number_of_files = fontface->file_count; + *number_of_files = 1; return S_OK; } - if (*number_of_files < fontface->file_count) + if (!*number_of_files) return E_INVALIDARG; - for (i = 0; i < fontface->file_count; i++) - { - IDWriteFontFile_AddRef(fontface->files[i]); - fontfiles[i] = fontface->files[i]; - } + IDWriteFontFile_AddRef(fontface->file); + *fontfiles = fontface->file; return S_OK; } @@ -1603,7 +1595,7 @@ static HRESULT WINAPI dwritefontface5_GetFontResource(IDWriteFontFace5 *iface, I TRACE("%p, %p.\n", iface, resource); - return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->files[0], fontface->index, resource); + return IDWriteFactory7_CreateFontResource(fontface->factory, fontface->file, fontface->index, resource); } static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFace *other) @@ -1619,7 +1611,7 @@ static BOOL WINAPI dwritefontface5_Equals(IDWriteFontFace5 *iface, IDWriteFontFa return fontface->index == other_face->index && fontface->simulations == other_face->simulations && - is_same_fontfile(fontface->files[0], other_face->files[0]); + is_same_fontfile(fontface->file, other_face->file); } static const IDWriteFontFace5Vtbl dwritefontfacevtbl = @@ -1728,11 +1720,11 @@ static HRESULT WINAPI dwritefontface_reference_CreateFontFaceWithSimulations(IDW TRACE("%p, %#x, %p.\n", iface, simulations, ret); - hr = IDWriteFontFile_Analyze(fontface->files[0], &is_supported, &file_type, &face_type, &face_num); + hr = IDWriteFontFile_Analyze(fontface->file, &is_supported, &file_type, &face_type, &face_num); if (FAILED(hr)) return hr; - hr = IDWriteFactory7_CreateFontFace(fontface->factory, face_type, 1, fontface->files, fontface->index, + hr = IDWriteFactory7_CreateFontFace(fontface->factory, face_type, 1, &fontface->file, fontface->index, simulations, &face); if (SUCCEEDED(hr)) { @@ -1774,7 +1766,7 @@ static HRESULT WINAPI dwritefontface_reference_GetFontFile(IDWriteFontFaceRefere TRACE("%p, %p.\n", iface, file); - *file = fontface->files[0]; + *file = fontface->file; IDWriteFontFile_AddRef(*file); return S_OK; @@ -1879,8 +1871,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace5 desc.factory = font->family->collection->factory; desc.face_type = data->face_type; - desc.files = &data->file; - desc.files_number = 1; + desc.file = data->file; desc.index = data->face_index; desc.simulations = data->simulations; desc.font_data = data; @@ -3979,7 +3970,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return E_OUTOFMEMORY; data->ref = 1; - data->file = desc->files[0]; + data->file = desc->file; data->face_index = desc->index; data->face_type = desc->face_type; IDWriteFontFile_AddRef(data->file); @@ -4388,9 +4379,8 @@ HRESULT create_font_collection(IDWriteFactory7 *factory, IDWriteFontFileEnumerat desc.factory = factory; desc.face_type = face_type; - desc.files = &file; + desc.file = file; desc.stream = stream; - desc.files_number = 1; desc.index = i; desc.simulations = DWRITE_FONT_SIMULATIONS_NONE; desc.font_data = NULL; @@ -4729,13 +4719,12 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit struct dwrite_font_data *font_data; struct fontface_desc desc; - /* alloc and init new font data structure */ + /* Allocate new font data structure. */ desc.factory = factory; desc.face_type = face_type; desc.index = i; - desc.files = &file; + desc.file = file; desc.stream = stream; - desc.files_number = 1; desc.simulations = DWRITE_FONT_SIMULATIONS_NONE; desc.font_data = NULL; @@ -4983,17 +4972,10 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li if (!fontface) return E_OUTOFMEMORY; - fontface->files = heap_alloc_zero(sizeof(*fontface->files) * desc->files_number); - if (!fontface->files) { - heap_free(fontface); - return E_OUTOFMEMORY; - } - fontface->IDWriteFontFace5_iface.lpVtbl = &dwritefontfacevtbl; fontface->IDWriteFontFaceReference_iface.lpVtbl = &dwritefontface_reference_vtbl; fontface->refcount = 1; fontface->type = desc->face_type; - fontface->file_count = desc->files_number; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; fontface->cpal.exists = TRUE; @@ -5002,11 +4984,8 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->simulations = desc->simulations; fontface->factory = desc->factory; IDWriteFactory7_AddRef(fontface->factory); - - for (i = 0; i < fontface->file_count; i++) { - fontface->files[i] = desc->files[i]; - IDWriteFontFile_AddRef(fontface->files[i]); - } + fontface->file = desc->file; + IDWriteFontFile_AddRef(fontface->file); fontface->stream = desc->stream; IDWriteFontFileStream_AddRef(fontface->stream); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 864a44936c1..d66a27d7f68 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1033,9 +1033,8 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory7 *iface, DWRIT desc.factory = iface; desc.face_type = req_facetype; - desc.files = font_files; + desc.file = *font_files; desc.stream = stream; - desc.files_number = files_number; desc.index = index; desc.simulations = simulations; desc.font_data = NULL;

1 0