August 2018 - Wine-commits - list.winehq.org

Jacek Caban : server: Allow pipe server fd caching throughout its whole lifetime.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 32169eafe23db1f8cbd65ec94d05c865bca0355e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32169eafe23db1f8cbd65ec9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 8 22:01:20 2018 +0200 server: Allow pipe server fd caching throughout its whole lifetime. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 10 ---------- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b39e931..932dc7e 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1693,16 +1693,6 @@ NTSTATUS WINAPI NtFsControlFile(HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc if (!status) status = DIR_unmount_device( handle ); return status; - case FSCTL_PIPE_DISCONNECT: - status = server_ioctl_file( handle, event, apc, apc_context, io, code, - in_buffer, in_size, out_buffer, out_size ); - if (!status) - { - int fd = server_remove_fd_from_cache( handle ); - if (fd != -1) close( fd ); - } - return status; - case FSCTL_PIPE_IMPERSONATE: FIXME("FSCTL_PIPE_IMPERSONATE: impersonating self\n"); status = RtlImpersonateSelf( SecurityImpersonation ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 66e3607..768567f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1126,6 +1126,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned release_object( server ); return NULL; } + allow_fd_caching( server->pipe_end.fd ); set_fd_signaled( server->pipe_end.fd, 1 ); set_server_state( server, ps_idle_server ); return server; @@ -1218,7 +1219,6 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize, options ))) { - allow_fd_caching( server->pipe_end.fd ); if (server->state == ps_wait_open) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); server->pipe_end.state = FILE_PIPE_CONNECTED_STATE;

1 0

Alex Henrie : quartz: Rewrite add_data with CoTaskMemRealloc and error handling.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 24703e4cd63401079bb6f3a734c25fadd4ae620d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24703e4cd63401079bb6f3a7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 14 09:25:10 2018 -0600 quartz: Rewrite add_data with CoTaskMemRealloc and error handling. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0d26198..0a41c71 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -145,11 +145,11 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) int index = v->current; if (v->current + size > v->capacity) { - LPBYTE pOldData = v->pData; - v->capacity = (v->capacity + size) * 2; - v->pData = CoTaskMemAlloc(v->capacity); - memcpy(v->pData, pOldData, v->current); - CoTaskMemFree(pOldData); + int new_capacity = (v->capacity + size) * 2; + BYTE *new_data = CoTaskMemRealloc(v->pData, new_capacity); + if (!new_data) return -1; + v->capacity = new_capacity; + v->pData = new_data; } memcpy(v->pData + v->current, pData, size); v->current += size;

1 0

Alexandre Julliard : quartz: Remove some unnecessary casts.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: fc79250ff7f89b8918d7cecfeb62123a5c4b5de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc79250ff7f89b8918d7cecf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 08:38:53 2018 +0200 quartz: Remove some unnecessary casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 0a41c71..1a5f76d 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -140,7 +140,7 @@ struct Vector }; /* returns the position it was added at */ -static int add_data(struct Vector * v, const BYTE * pData, int size) +static int add_data(struct Vector *v, const void *pData, int size) { int index = v->current; if (v->current + size > v->capacity) @@ -156,7 +156,7 @@ static int add_data(struct Vector * v, const BYTE * pData, int size) return index; } -static int find_data(const struct Vector * v, const BYTE * pData, int size) +static int find_data(const struct Vector *v, const void *pData, int size) { int index; for (index = 0; index < v->current; index++) @@ -404,7 +404,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrf.dwPins = prf2->u.s2.cPins2; rrf.dwUnused = 0; - add_data(&mainStore, (LPBYTE)&rrf, sizeof(rrf)); + add_data(&mainStore, &rrf, sizeof(rrf)); for (i = 0; i < prf2->u.s2.cPins2; i++) { @@ -432,15 +432,15 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rrfp.dwMediums = rgPin2.nMediums; rrfp.bCategory = rgPin2.clsPinCategory ? 1 : 0; - add_data(&mainStore, (LPBYTE)&rrfp, sizeof(rrfp)); + add_data(&mainStore, &rrfp, sizeof(rrfp)); if (rrfp.bCategory) { - DWORD index = find_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + DWORD index = find_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)rgPin2.clsPinCategory, sizeof(CLSID)); + index = add_data(&clsidStore, rgPin2.clsPinCategory, sizeof(CLSID)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } for (j = 0; j < rgPin2.nMediaTypes; j++) @@ -453,26 +453,26 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG rt.signature[3] = '3'; rt.signature[0] += j; rt.dwUnused = 0; - rt.dwOffsetMajor = find_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) - rt.dwOffsetMajor = add_data(&clsidStore, (const BYTE*)rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); + rt.dwOffsetMajor = add_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); rt.dwOffsetMajor += size; - rt.dwOffsetMinor = find_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = find_data(&clsidStore, clsMinorType, sizeof(CLSID)); if (rt.dwOffsetMinor == -1) - rt.dwOffsetMinor = add_data(&clsidStore, (const BYTE*)clsMinorType, sizeof(CLSID)); + rt.dwOffsetMinor = add_data(&clsidStore, clsMinorType, sizeof(CLSID)); rt.dwOffsetMinor += size; - add_data(&mainStore, (LPBYTE)&rt, sizeof(rt)); + add_data(&mainStore, &rt, sizeof(rt)); } for (j = 0; j < rgPin2.nMediums; j++) { - DWORD index = find_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + DWORD index = find_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); if (index == -1) - index = add_data(&clsidStore, (const BYTE*)(rgPin2.lpMedium + j), sizeof(REGPINMEDIUM)); + index = add_data(&clsidStore, rgPin2.lpMedium + j, sizeof(REGPINMEDIUM)); index += size; - add_data(&mainStore, (LPBYTE)&index, sizeof(index)); + add_data(&mainStore, &index, sizeof(index)); } } @@ -1036,7 +1036,7 @@ static HRESULT WINAPI FilterMapper3_EnumMatchingFilters( { struct MONIKER_MERIT mm = {pMoniker, rf2.dwMerit}; IMoniker_AddRef(pMoniker); - add_data(&monikers, (LPBYTE)&mm, sizeof(mm)); + add_data(&monikers, &mm, sizeof(mm)); } }

1 0

Austin English : setupapi: Set LastError on success in SetupInstallFromInfSectionW.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: d45e6814d67c1f1a2eb6023f0fb5574d560fd9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45e6814d67c1f1a2eb6023f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 3 22:13:22 2018 +0200 setupapi: Set LastError on success in SetupInstallFromInfSectionW. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45167 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0593df8..5a76e3a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1188,6 +1188,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, return FALSE; } + SetLastError(ERROR_SUCCESS); return TRUE; }

1 0

Gijs Vermeulen : setupapi/tests: Add SetupInstallFromInfSectionA test.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 87acb93586dd461c39b88cf6e4abdd30415341c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87acb93586dd461c39b88cf6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Aug 3 22:13:23 2018 +0200 setupapi/tests: Add SetupInstallFromInfSectionA test. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 72d16a1..a3b562e 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -174,6 +174,45 @@ static void test_registry(void) ok(ret, "Expected source inf to exist, last error was %d\n", GetLastError()); } +static void test_install_from(void) +{ + char path[MAX_PATH]; + HINF infhandle; + HKEY key; + LONG res; + BOOL ret; + + /* First create a registry structure we would like to be deleted */ + ok(!RegCreateKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), + "Expected RegCreateKeyA to succeed\n"); + + /* Doublecheck if the registry key is present */ + ok(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest", &key), + "Expected registry key to exist\n"); + + create_inf_file(inffile, cmdline_inf_reg); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + SetLastError(0xdeadbeef); + ret = SetupInstallFromInfSectionA(NULL, infhandle, "DefaultInstall", SPINST_REGISTRY, key, + "A:\\", 0, NULL, NULL, NULL, NULL); + ok(ret, "Unexpected failure\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + + /* Check if the registry key is recursively deleted */ + res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); + ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); + /* Just in case */ + if (res == ERROR_SUCCESS) + { + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest\\setupapitest"); + RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest"); + } + + SetupCloseInfFile(infhandle); + DeleteFileA(inffile); +} + static void test_install_svc_from(void) { char inf[2048]; @@ -742,6 +781,7 @@ START_TEST(install) test_cmdline(); test_registry(); + test_install_from(); test_install_svc_from(); test_driver_install(); test_dirid();

1 0

Aric Stewart : hidclass.sys: Unload all devices before unloading a minidriver.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: f97bbef0e5496a36321ce68135acbbdc9c8026b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f97bbef0e5496a36321ce681… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 6 09:21:12 2018 -0500 hidclass.sys: Unload all devices before unloading a minidriver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 1829319..4e8ba3c 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -70,6 +70,12 @@ void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *buffer, UINT size) DECLSPEC_HIDDEN; +typedef struct _hiddevice +{ + struct list entry; + DEVICE_OBJECT *device; +} hid_device; + typedef struct _minidriver { struct list entry; @@ -80,6 +86,7 @@ typedef struct _minidriver pAddDevice AddDevice; PDRIVER_DISPATCH PNPDispatch; + struct list device_list; } minidriver; NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; @@ -100,6 +107,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDE /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; +NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT* device, IRP* irp) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 1742cfe..8bb423b 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -49,6 +49,12 @@ static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) md = find_minidriver(driver); if (md) { + hid_device *device, *next; + TRACE("%i devices to unload\n", list_count(&md->device_list)); + LIST_FOR_EACH_ENTRY_SAFE(device, next, &md->device_list, hid_device, entry) + { + PNP_RemoveDevice(md, device->device, NULL); + } if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); list_remove(&md->entry); @@ -82,6 +88,8 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) driver->minidriver = *registration; list_add_tail(&minidriver_list, &driver->entry); + list_init(&driver->device_list); + return STATUS_SUCCESS; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 30d1045..6ee89c1 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -75,6 +75,7 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { + hid_device *hiddev; DEVICE_OBJECT *device = NULL; NTSTATUS status; minidriver *minidriver; @@ -96,13 +97,19 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) TRACE("PDO add device(%p:%s)\n", PDO, debugstr_w(PDO_id)); minidriver = find_minidriver(driver); - status = HID_CreateDevice(PDO, &minidriver->minidriver, &device); + hiddev = HeapAlloc(GetProcessHeap(), 0, sizeof(*hiddev)); + if (!hiddev) + return STATUS_NO_MEMORY; + + status = HID_CreateDevice(PDO, &minidriver->minidriver, &hiddev->device); if (status != STATUS_SUCCESS) { ERR("Failed to create HID object (%x)\n",status); HeapFree(GetProcessHeap(), 0, PDO_id); + HeapFree(GetProcessHeap(), 0, hiddev); return status; } + device = hiddev->device; ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); @@ -177,6 +184,8 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return STATUS_NOT_SUPPORTED; } + list_add_tail(&(minidriver->device_list), &hiddev->entry); + ext->information.DescriptorSize = ext->preparseData->dwSize; lstrcpyW(ext->instance_id, device_enumeratorW); @@ -200,6 +209,26 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return STATUS_SUCCESS; } +NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) +{ + hid_device *hiddev; + NTSTATUS rc = STATUS_NOT_SUPPORTED; + + if (irp) + rc = minidriver->PNPDispatch(device, irp); + HID_DeleteDevice(&minidriver->minidriver, device); + LIST_FOR_EACH_ENTRY(hiddev, &minidriver->device_list, hid_device, entry) + { + if (hiddev->device == device) + { + list_remove(&hiddev->entry); + HeapFree(GetProcessHeap(), 0, hiddev); + break; + } + } + return rc; +} + NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS rc = STATUS_NOT_SUPPORTED; @@ -255,9 +284,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_REMOVE_DEVICE: { - rc = minidriver->PNPDispatch(device, irp); - HID_DeleteDevice(&minidriver->minidriver, device); - return rc; + return PNP_RemoveDevice(minidriver, device, irp); } default: {

1 0

Alistair Leslie-Hughes : powrprof: Added PowerEnumerate stub.
by Alexandre Julliard 15 Aug '18

15 Aug '18

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

1 0

Henri Verbeet : wined3d: Pass a wined3d_shader_context structure to shader_glsl_get_register_name( ).
by Alexandre Julliard 15 Aug '18

15 Aug '18

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

1 0

Alexandre Julliard : winedump: Don't use strncat with source length.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 9b940964481694822ee1e3dc45c6a3298fe3302c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b940964481694822ee1e3dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 07:08:04 2018 +0200 winedump: Don't use strncat with source length. gcc is now warning about this. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index 3e54373..221c079 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -709,7 +709,7 @@ void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, stabbufflen += 65536; stabbuff = realloc(stabbuff, stabbufflen); } - strncat(stabbuff, ptr, len - 1); + strcat(stabbuff, ptr); continue; } else if (stabbuff[0] != '\0')

1 0

Alexandre Julliard : shell32/tests: Don' t use strncat with known large enough buffer.
by Alexandre Julliard 15 Aug '18

15 Aug '18

Module: wine Branch: master Commit: 3386c01349ee05e99e89861877ff71a2ddd4eb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3386c01349ee05e99e898618… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 07:08:50 2018 +0200 shell32/tests: Don't use strncat with known large enough buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/brsfolder.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index bf29d11..0888cfa 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -44,8 +44,8 @@ static int get_number_of_folders(LPCSTR path) WIN32_FIND_DATAA find_data; HANDLE find_handle; - lstrcpynA(path_search_string, path, MAX_PATH); - strncat(path_search_string, "*", 1); + lstrcpynA(path_search_string, path, MAX_PATH - 1); + strcat(path_search_string, "*"); find_handle = FindFirstFileA(path_search_string, &find_data); if (find_handle == INVALID_HANDLE_VALUE) @@ -186,9 +186,9 @@ static void test_click_make_new_folder_button(void) { skip("GetCurrentDirectoryA failed %u\n", GetLastError()); } - strncat(test_folder_path, "\\", 1); - strncat(test_folder_path, title, MAX_PATH-1); - strncat(test_folder_path, "\\", 1); + strcat(test_folder_path, "\\"); + strcat(test_folder_path, title); + strcat(test_folder_path, "\\"); /* Avoid conflicts by creating a test folder. */ if (!CreateDirectoryA(title, NULL))

1 0