From 888c3abfc346eea9ec2601c01acd8cb91d7ba1ca Mon Sep 17 00:00:00 2001 From: winesync Date: Sat, 16 Sep 2023 16:53:47 +0200 Subject: [PATCH] [WINESYNC] setupapi: Use _S_I(READ|WRITE) from sys/stat.h instead of redefining them. wine commit id a1ae33a3efb7231adf683484e9de66f84abb04d1 by Alex Henrie --- dll/win32/setupapi/setupapi_private.h | 4 ---- dll/win32/setupapi/setupcab.c | 2 ++ sdk/tools/winesync/setupapi.cfg | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dll/win32/setupapi/setupapi_private.h b/dll/win32/setupapi/setupapi_private.h index 925a718e44c..b3084e8a1b9 100644 --- a/dll/win32/setupapi/setupapi_private.h +++ b/dll/win32/setupapi/setupapi_private.h @@ -320,10 +320,6 @@ struct callback_WtoA_context UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, UINT_PTR, UINT_PTR ); -/* from msvcrt/sys/stat.h */ -#define _S_IWRITE 0x0080 -#define _S_IREAD 0x0100 - /* devinst.c */ DWORD diff --git a/dll/win32/setupapi/setupcab.c b/dll/win32/setupapi/setupcab.c index a39ea464921..7ab8700120c 100644 --- a/dll/win32/setupapi/setupcab.c +++ b/dll/win32/setupapi/setupcab.c @@ -22,6 +22,8 @@ #include #include +#include + #include HINSTANCE SETUPAPI_hInstance = NULL; diff --git a/sdk/tools/winesync/setupapi.cfg b/sdk/tools/winesync/setupapi.cfg index 67921a01790..a154d7a6559 100644 --- a/sdk/tools/winesync/setupapi.cfg +++ b/sdk/tools/winesync/setupapi.cfg @@ -10,4 +10,4 @@ files: dlls/setupapi/setupcab.c: dll/win32/setupapi/setupcab.c dlls/setupapi/stringtable.c: dll/win32/setupapi/stringtable_wine.c tags: - wine: d15262e464ba3536567ad73f68d95e6b7f88f3aa + wine: a1ae33a3efb7231adf683484e9de66f84abb04d1