December 2018 - Wine-Commits

Roderick Colenbrander : ntdll: Fix parsing thread_siblings bitmaps on high core count systems.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: b9af36933fdf47cbbe139626e98750da72142dce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9af36933fdf47cbbe139626… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:16 2018 -0800 ntdll: Fix parsing thread_siblings bitmaps on high core count systems. Linux compiled for a high number of CPU cores, the bitmap is broken into sections of 32-bit by commas. Handle parsing this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45453 Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0e11e0e..db51a98 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1704,13 +1704,8 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** /* Mask of logical threads sharing same physical core in kernel core numbering. */ sprintf(name, core_info, i, "thread_siblings"); - f = fopen(name, "r"); - if(f) - { - fscanf(f, "%lx", &thread_mask); - fclose(f); - } - else thread_mask = 1<<i; + if(!sysfs_parse_bitmap(name, &thread_mask)) + thread_mask = 1<<i; if(!logical_proc_info_add_by_id(data, dataex, &len, max_len, RelationProcessorCore, phys_core, thread_mask)) { fclose(fcpu_list);

1 0

Roderick Colenbrander : ntdll: Parse sysfs cpu_shared_map using helper function.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: ed75a7b3443e79f9d63e97eeebcce2d2f40c507b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed75a7b3443e79f9d63e97ee… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Dec 2 22:53:15 2018 -0800 ntdll: Parse sysfs cpu_shared_map using helper function. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index aa6f846..0e11e0e 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1604,6 +1604,36 @@ static inline BOOL logical_proc_info_add_group(SYSTEM_LOGICAL_PROCESSOR_INFORMAT } #ifdef linux +/* Helper function for counting bitmap values as commonly used by the Linux kernel + * for storing CPU masks in sysfs. The format is comma separated lists of hex values + * each max 32-bit e.g. "00ff" or even "00,00000000,0000ffff". + * + * Example files include: + * - /sys/devices/system/cpu/cpu0/cache/index0/shared_cpu_map + * - /sys/devices/system/cpu/cpu0/topology/thread_siblings + */ +static BOOL sysfs_parse_bitmap(const char *filename, ULONG_PTR * const mask) +{ + FILE *f; + DWORD r; + + f = fopen(filename, "r"); + if (!f) + return FALSE; + + while (!feof(f)) + { + char op; + if (!fscanf(f, "%x%c ", &r, &op)) + break; + + *mask = (sizeof(ULONG_PTR)>sizeof(int) ? *mask<<(8*sizeof(DWORD)) : 0) + r; + } + + fclose(f); + return TRUE; +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION **data, SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX **dataex, DWORD *max_len) @@ -1693,15 +1723,7 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** ULONG_PTR mask = 0; sprintf(name, cache_info, i, j, "shared_cpu_map"); - f = fopen(name, "r"); - if(!f) continue; - while(!feof(f)) - { - if(!fscanf(f, "%x%c ", &r, &op)) - break; - mask = (sizeof(ULONG_PTR)>sizeof(int) ? mask<<(8*sizeof(DWORD)) : 0) + r; - } - fclose(f); + if(!sysfs_parse_bitmap(name, &mask)) continue; sprintf(name, cache_info, i, j, "level"); f = fopen(name, "r");

1 0

Pierre Schweitzer : mpr: Implement remembered connection enumeration.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 9988bb5e0729178b527052803d3ad670e5e0b46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9988bb5e0729178b52705280… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sat Dec 1 13:23:06 2018 +0100 mpr: Implement remembered connection enumeration. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 207 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9988bb5e0729178b5270…

1 0

Alex Henrie : cryptui: Have a single empty wide string at the top of main.c.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 9b69fe2332e76984929f9aea49bc779035049513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b69fe2332e76984929f9aea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:01 2018 -0700 cryptui: Have a single empty wide string at the top of main.c. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 1fbe63e..a100419 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -46,6 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptui); static HINSTANCE hInstance; +static const WCHAR empty[] = {0}; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -804,8 +806,6 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, static void cert_mgr_clear_cert_selection(HWND hwnd) { - WCHAR empty[] = { 0 }; - EnableWindow(GetDlgItem(hwnd, IDC_MGR_EXPORT), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_REMOVE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_MGR_VIEW), FALSE); @@ -1166,7 +1166,6 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, break; case LVN_ITEMCHANGED: { - WCHAR empty[] = { 0 }; NMITEMACTIVATE *nm = (NMITEMACTIVATE*)lp; HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); int numSelected = SendMessageW(lv, LVM_GETSELECTEDCOUNT, 0, 0);

1 0

Alex Henrie : uxtheme: Turn a variable and a constant into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 53c8abbf8aecf96ef5d239984c6054a56f5a64cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c8abbf8aecf96ef5d23998… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:59 2018 -0700 uxtheme: Turn a variable and a constant into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/metric.c | 6 +++--- dlls/uxtheme/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index 5f6c36f..073422f 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -165,9 +165,7 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTheme, int iIntID, int *piValue) */ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) { - PTHEME_PROPERTY tp; - int i, id = -1; - int metricMap[] = { + static const int metricMap[] = { SM_CXVSCROLL, TMT_SCROLLBARWIDTH, SM_CYHSCROLL, TMT_SCROLLBARHEIGHT, SM_CXSIZE, TMT_CAPTIONBARWIDTH, @@ -179,6 +177,8 @@ int WINAPI GetThemeSysSize(HTHEME hTheme, int iSizeID) SM_CXMENUSIZE, TMT_MENUBARWIDTH, SM_CYMENUSIZE, TMT_MENUBARHEIGHT }; + PTHEME_PROPERTY tp; + int i, id = -1; if(hTheme) { for(i=0; i<ARRAY_SIZE(metricMap); i+=2) { diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index db49754..c898ad3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -813,7 +813,7 @@ HRESULT WINAPI GetThemeDocumentationProperty(LPCWSTR pszThemeName, LPWSTR pszValueBuff, int cchMaxValChars) { - const WORD wDocToRes[] = { + static const WORD wDocToRes[] = { TMT_DISPLAYNAME,5000, TMT_TOOLTIP,5001, TMT_COMPANY,5002,

1 0

Alex Henrie : qcap: Make constants 'msg' and 'VFWIndex' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 6a1a2e8288be541f906a4b718cca8cf771cbc291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1a2e8288be541f906a4b71… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:58 2018 -0700 qcap: Make constants 'msg' and 'VFWIndex' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b4b7b96..80b0fe8 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -915,7 +915,7 @@ error: Capture * qcap_driver_init( IPin *pOut, USHORT card ) { - const char msg[] = + static const char msg[] = "The v4l headers were not available at compile time,\n" "so video capture support is not available.\n"; MESSAGE(msg); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ca804fe..6297a80 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -524,10 +524,10 @@ static HRESULT WINAPI PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, IErrorLog *pErrorLog ) { + static const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; VfwCapture *This = impl_from_IPersistPropertyBag(iface); HRESULT hr; VARIANT var; - const OLECHAR VFWIndex[] = {'V','F','W','I','n','d','e','x',0}; TRACE("%p/%p-> (%p, %p)\n", iface, This, pPropBag, pErrorLog);

1 0

Alex Henrie : inetcomm: Make several constants static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 11f8826c135a220c20900224b00ce3a45f5469f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f8826c135a220c20900224… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:54 2018 -0700 inetcomm: Make several constants static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/smtptransport.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/inetcomm/smtptransport.c b/dlls/inetcomm/smtptransport.c index af11308..d71061e 100644 --- a/dlls/inetcomm/smtptransport.c +++ b/dlls/inetcomm/smtptransport.c @@ -281,7 +281,7 @@ static void SMTPTransport_CallbackSendHello(IInternetTransport *iface, char *pBu HRESULT hr; const char *pszHello; char *pszCommand; - const char szHostName[] = "localhost"; /* FIXME */ + static const char szHostName[] = "localhost"; /* FIXME */ TRACE("\n"); @@ -483,7 +483,7 @@ static void SMTPTransport_CallbackMessageSendTo(IInternetTransport *iface, char if ((This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].addrtype & ADDR_TOFROM_MASK) == ADDR_TO) { - const char szCommandFormat[] = "RCPT TO: <%s>\n"; + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + strlen(This->pending_message.rAddressList.prgAddress[This->ulCurrentAddressIndex].szEmail); @@ -659,10 +659,10 @@ static HRESULT WINAPI SMTPTransport_InitNew(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, LPSMTPMESSAGE pMessage) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; ULONG i, size; LPSTR pszFromAddress = NULL; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -723,8 +723,8 @@ static HRESULT WINAPI SMTPTransport_SendMessage(ISMTPTransport2 *iface, static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR pszEmailFrom) { + static const char szCommandFormat[] = "MAIL FROM: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "MAIL FROM: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -750,8 +750,8 @@ static HRESULT WINAPI SMTPTransport_CommandMAIL(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR pszEmailTo) { + static const char szCommandFormat[] = "RCPT TO: <%s>\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "RCPT TO: <%s>\n"; char *szCommand; int len; HRESULT hr; @@ -777,9 +777,9 @@ static HRESULT WINAPI SMTPTransport_CommandRCPT(ISMTPTransport2 *iface, LPSTR ps static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "EHLO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "EHLO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -801,9 +801,9 @@ static HRESULT WINAPI SMTPTransport_CommandEHLO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) { + static const char szCommandFormat[] = "HELO %s\n"; + static const char szHostname[] = "localhost"; /* FIXME */ SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "HELO %s\n"; - const char szHostname[] = "localhost"; /* FIXME */ char *szCommand; int len = sizeof(szCommandFormat) - 2 /* "%s" */ + sizeof(szHostname); HRESULT hr; @@ -826,8 +826,8 @@ static HRESULT WINAPI SMTPTransport_CommandHELO(ISMTPTransport2 *iface) static HRESULT WINAPI SMTPTransport_CommandAUTH(ISMTPTransport2 *iface, LPSTR pszAuthType) { + static const char szCommandFormat[] = "AUTH %s\n"; SMTPTransport *This = (SMTPTransport *)iface; - const char szCommandFormat[] = "AUTH %s\n"; char *szCommand; int len; HRESULT hr;

1 0

Alex Henrie : comctl32: Make constant 'mdays' static.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: baf6adfef766cece78b4ddf593a55de767a6de16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf6adfef766cece78b4ddf5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:48 2018 -0700 comctl32: Make constant 'mdays' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 3fb7600..dd34c22 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -213,7 +213,7 @@ static inline int MONTHCAL_MonthDiff(const SYSTEMTIME *left, const SYSTEMTIME *r /* January is 1, December is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; + static const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */

1 0

Hans Leidekker : webservices: Implement WsFillBody.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: d00aa4db48b3b575f791fe41d30fd997a6b65e9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d00aa4db48b3b575f791fe41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 4 13:57:26 2018 +0100 webservices: Implement WsFillBody. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e28baa2..ada549c 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -999,6 +999,33 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } /************************************************************************** + * WsFillBody [webservices.@] + */ +HRESULT WINAPI WsFillBody( WS_MESSAGE *handle, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + HRESULT hr; + + TRACE( "%p %u %p %p\n", handle, size, ctx, error ); + + if (!msg) return E_INVALIDARG; + + EnterCriticalSection( &msg->cs ); + + if (msg->magic != MSG_MAGIC) + { + LeaveCriticalSection( &msg->cs ); + return E_INVALIDARG; + } + + hr = WsFillReader( msg->reader_body, size, ctx, error ); + + LeaveCriticalSection( &msg->cs ); + TRACE( "returning %08x\n", hr ); + return hr; +} + +/************************************************************************** * WsInitializeMessage [webservices.@] */ HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 30c97e3..adad68d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -43,7 +43,7 @@ @ stub WsEndReaderCanonicalization @ stub WsEndWriterCanonicalization @ stdcall WsFileTimeToDateTime(ptr ptr ptr) -@ stub WsFillBody +@ stdcall WsFillBody(ptr long ptr ptr) @ stdcall WsFillReader(ptr long ptr ptr) @ stdcall WsFindAttribute(ptr ptr ptr long ptr ptr) @ stub WsFlushBody diff --git a/include/webservices.h b/include/webservices.h index 6cafcc6..69e3c8a 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1622,6 +1622,7 @@ HRESULT WINAPI WsDateTimeToFileTime(const WS_DATETIME*, FILETIME*, WS_ERROR*); HRESULT WINAPI WsDecodeUrl(const WS_STRING*, ULONG, WS_HEAP*, WS_URL**, WS_ERROR*); HRESULT WINAPI WsEncodeUrl(const WS_URL*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); HRESULT WINAPI WsFileTimeToDateTime(const FILETIME*, WS_DATETIME*, WS_ERROR*); +HRESULT WINAPI WsFillBody(WS_MESSAGE*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*);

1 0

Alex Henrie : dinput: Turn two variables into static constants.
by Alexandre Julliard Dec. 4, 2018

Dec. 4, 2018

Module: wine Branch: master Commit: 2ad7ecc6cdce22c4b4bbeea82fb7ff1f022fbcfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ad7ecc6cdce22c4b4bbeea8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:52 2018 -0700 dinput: Turn two variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9f426f3..0ec1ceb 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -766,11 +766,11 @@ HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszUserName, DWORD dwFlags) { + static const DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; + static const DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); unsigned int i, j; BOOL has_actions = FALSE; - DWORD object_types[] = { DIDFT_AXIS, DIDFT_BUTTON }; - DWORD type_map[] = { DIDFT_RELAXIS, DIDFT_PSHBUTTON }; FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags);

1 0