May 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Write flags when registering MFT.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: ea96db6557f755969474f9e19907ced9be6148e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea96db6557f755969474f9e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:43 2019 +0300 mfplat: Write flags when registering MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 +++++++++----- include/mfapi.h | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f634e0..d10e643 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -71,6 +71,7 @@ static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d', static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR mftflagsW[] = {'M','F','T','F','l','a','g','s',0}; static const WCHAR szGUIDFmt[] = { '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', @@ -167,7 +168,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, +static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { @@ -224,6 +225,12 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, } } + if (SUCCEEDED(hr) && flags) + { + if ((ret = RegSetValueExW(hclsid, mftflagsW, 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) + hr = HRESULT_FROM_WIN32(ret); + } + RegCloseKey(hclsid); return hr; } @@ -259,10 +266,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags TRACE("%s, %s, %s, %#x, %u, %p, %u, %p, %p.\n", debugstr_guid(&clsid), debugstr_guid(&category), debugstr_w(name), flags, cinput, input_types, coutput, output_types, attributes); - if (flags) - FIXME("flags not yet supported.\n"); - - hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types, attributes); + hr = register_transform(&clsid, name, flags, cinput, input_types, coutput, output_types, attributes); if(FAILED(hr)) ERR("Failed to write register transform\n"); diff --git a/include/mfapi.h b/include/mfapi.h index d172db1..f3ca3d9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -350,6 +350,22 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +enum _MFT_ENUM_FLAG +{ + MFT_ENUM_FLAG_SYNCMFT = 0x00000001, + MFT_ENUM_FLAG_ASYNCMFT = 0x00000002, + MFT_ENUM_FLAG_HARDWARE = 0x00000004, + MFT_ENUM_FLAG_FIELDOFUSE = 0x00000008, + MFT_ENUM_FLAG_LOCALMFT = 0x00000010, + MFT_ENUM_FLAG_TRANSCODE_ONLY = 0x00000020, + MFT_ENUM_FLAG_ALL = 0x0000003f, + MFT_ENUM_FLAG_SORTANDFILTER = 0x00000040, + MFT_ENUM_FLAG_SORTANDFILTER_APPROVED_ONLY = 0x000000c0, + MFT_ENUM_FLAG_SORTANDFILTER_WEB_ONLY = 0x00000140, + MFT_ENUM_FLAG_SORTANDFILTER_WEB_ONLY_EDGEMODE = 0x00000240, + MFT_ENUM_FLAG_UNTRUSTED_STOREMFT = 0x00000400, +}; + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue);

1 0

Nikolay Sivov : mf: Set preferred media types for nodes.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 45d084d7891231b9d82b0c3254587e60ca029c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d084d7891231b9d82b0c32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:44 2019 +0300 mf: Set preferred media types for nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 29 +++++++++ dlls/mf/tests/mf.c | 163 +++++++++++++++++++++++++++++++++++++++++------ dlls/mf/topology.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 330 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45d084d7891231b9d82b…

1 0

Nikolay Sivov : mf: Implement CloneFrom() for nodes.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 71397e6ebf0171b894663c7bc583b970601cdae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71397e6ebf0171b894663c7b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:45 2019 +0300 mf: Implement CloneFrom() for nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/topology.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index f40fe00..298200c 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1078,18 +1078,15 @@ static HRESULT WINAPI topology_node_CopyAllItems(IMFTopologyNode *iface, IMFAttr return IMFAttributes_CopyAllItems(node->attributes, dest); } -static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) +static HRESULT topology_node_set_object(struct topology_node *node, IUnknown *object) { static const GUID *iids[3] = { &IID_IPersist, &IID_IPersistStorage, &IID_IPersistPropertyBag }; - struct topology_node *node = impl_from_IMFTopologyNode(iface); IPersist *persist = NULL; BOOL has_object_id; GUID object_id; unsigned int i; HRESULT hr; - TRACE("%p, %p.\n", iface, object); - has_object_id = IMFAttributes_GetGUID(node->attributes, &MF_TOPONODE_TRANSFORM_OBJECTID, &object_id) == S_OK; if (object && !has_object_id) @@ -1130,6 +1127,15 @@ static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown * return S_OK; } +static HRESULT WINAPI topology_node_SetObject(IMFTopologyNode *iface, IUnknown *object) +{ + struct topology_node *node = impl_from_IMFTopologyNode(iface); + + TRACE("%p, %p.\n", iface, object); + + return topology_node_set_object(node, object); +} + static HRESULT WINAPI topology_node_GetObject(IMFTopologyNode *iface, IUnknown **object) { struct topology_node *node = impl_from_IMFTopologyNode(iface); @@ -1367,11 +1373,44 @@ static HRESULT WINAPI topology_node_GetInputPrefType(IMFTopologyNode *iface, DWO return hr; } -static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopologyNode *node) +static HRESULT WINAPI topology_node_CloneFrom(IMFTopologyNode *iface, IMFTopologyNode *src_node) { - FIXME("(%p)->(%p)\n", iface, node); + struct topology_node *node = impl_from_IMFTopologyNode(iface); + MF_TOPOLOGY_TYPE node_type; + IUnknown *object; + TOPOID topoid; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, src_node); + + if (FAILED(hr = IMFTopologyNode_GetNodeType(src_node, &node_type))) + return hr; + + if (node->node_type != node_type) + return MF_E_INVALIDREQUEST; + + if (FAILED(hr = IMFTopologyNode_GetTopoNodeID(src_node, &topoid))) + return hr; + + object = NULL; + IMFTopologyNode_GetObject(src_node, &object); + + EnterCriticalSection(&node->cs); + + hr = IMFTopologyNode_CopyAllItems(src_node, node->attributes); + + if (SUCCEEDED(hr)) + hr = topology_node_set_object(node, object); + + if (SUCCEEDED(hr)) + node->id = topoid; + + LeaveCriticalSection(&node->cs); + + if (object) + IUnknown_Release(object); + + return hr; } static const IMFTopologyNodeVtbl topologynodevtbl =

1 0

Louis Lenders : advapi32: Add InitiateShutdown{A,W} stub.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 8c61f824f97e11130defb23da458f5b2a76eaae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c61f824f97e11130defb23d… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 6 19:46:29 2019 +0200 advapi32: Add InitiateShutdown{A,W} stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47131 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi.c | 18 ++++++++++++++++++ dlls/advapi32/advapi32.spec | 4 ++-- include/winreg.h | 3 +++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index 1c528ef..433c258 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -268,6 +268,24 @@ BOOL WINAPI InitiateSystemShutdownW( LPWSTR lpMachineName, LPWSTR lpMessage, DWO SHTDN_REASON_MAJOR_LEGACY_API ); } +/*********************************************************************** + * InitiateShutdownA [ADVAPI32.@] + */ +DWORD WINAPI InitiateShutdownA(char *name, char *message, DWORD seconds, DWORD flags, DWORD reason) +{ + FIXME("%s, %s, %d, %d, %d stub\n", debugstr_a(name), debugstr_a(message), seconds, flags, reason); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * InitiateShutdownW [ADVAPI32.@] + */ +DWORD WINAPI InitiateShutdownW(WCHAR *name, WCHAR *message, DWORD seconds, DWORD flags, DWORD reason) +{ + FIXME("%s, %s, %d, %d, %d stub\n", debugstr_w(name), debugstr_w(message), seconds, flags, reason); + return ERROR_CALL_NOT_IMPLEMENTED; +} + BOOL WINAPI LogonUserA( LPCSTR lpszUsername, LPCSTR lpszDomain, LPCSTR lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken ) { diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index dd4102e..91d6750 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -405,8 +405,8 @@ @ stdcall InitializeAcl(ptr long long) @ stdcall InitializeSecurityDescriptor(ptr long) @ stdcall InitializeSid(ptr ptr long) -# @ stub InitiateShutdownA -# @ stub InitiateShutdownW +@ stdcall InitiateShutdownA(str str long long long) +@ stdcall InitiateShutdownW(wstr wstr long long long) @ stdcall InitiateSystemShutdownA(str str long long long) @ stdcall InitiateSystemShutdownExA(str str long long long long) @ stdcall InitiateSystemShutdownExW(wstr wstr long long long long) diff --git a/include/winreg.h b/include/winreg.h index 45057df..bc001c8 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -91,6 +91,9 @@ typedef LONG LSTATUS; WINADVAPI BOOL WINAPI AbortSystemShutdownA(LPSTR); WINADVAPI BOOL WINAPI AbortSystemShutdownW(LPWSTR); #define AbortSystemShutdown WINELIB_NAME_AW(AbortSystemShutdown) +WINADVAPI DWORD WINAPI InitiateShutdownA(char*,char*,DWORD,DWORD,DWORD); +WINADVAPI DWORD WINAPI InitiateShutdownW(WCHAR*,WCHAR*,DWORD,DWORD,DWORD); +#define InitiateShutdown WINELIB_NAME_AW(InitiateShutdown) WINADVAPI BOOL WINAPI InitiateSystemShutdownA(LPSTR,LPSTR,DWORD,BOOL,BOOL); WINADVAPI BOOL WINAPI InitiateSystemShutdownW(LPWSTR,LPWSTR,DWORD,BOOL,BOOL); #define InitiateSystemShutdown WINELIB_NAME_AW(InitiateSystemShutdown)

1 0

Louis Lenders : rpcrt4: Add NdrServerCallAll stub.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: e54224e88c9514b7a1293d2f5b9471effbb3358f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54224e88c9514b7a1293d2f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 6 20:09:47 2019 +0200 rpcrt4: Add NdrServerCallAll stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47131 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 8 ++++++++ dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcndr.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 813d7e8..530bd9e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1557,6 +1557,14 @@ void WINAPI NdrServerCall( PRPC_MESSAGE msg ) NdrStubCall( NULL, NULL, msg, &phase ); } +/*********************************************************************** + * NdrServerCallAll [RPCRT4.@] + */ +void WINAPI NdrServerCallAll( PRPC_MESSAGE msg ) +{ + FIXME("%p stub\n", msg); +} + struct async_call_data { MIDL_STUB_MESSAGE *pStubMsg; diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 79c9645..d8e873d 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -274,6 +274,7 @@ @ stdcall NdrSendReceive(ptr ptr) @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) +@ stdcall NdrServerCallAll(ptr) @ stdcall NdrServerContextMarshall(ptr ptr long) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp diff --git a/include/rpcndr.h b/include/rpcndr.h index 077e02a..ac9da11 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -677,6 +677,8 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI void RPC_ENTRY + NdrServerCallAll( PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY NdrAsyncServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI LONG RPC_ENTRY

1 0

Vijay Kiran Kamuju : include: Add missing navigation and gamepad key definitions in winuser.rh.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 9cbfd2c9c593706377ae22f191e5e18cba44a8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbfd2c9c593706377ae22f1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon May 6 15:04:24 2019 +0200 include: Add missing navigation and gamepad key definitions in winuser.rh. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.rh | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/include/winuser.rh b/include/winuser.rh index bcc7160..fd984a9 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -93,6 +93,7 @@ #define VK_KANA 0x15 #define VK_HANGEUL VK_KANA #define VK_HANGUL VK_KANA +/* 0x16 Undefined */ #define VK_JUNJA 0x17 #define VK_FINAL 0x18 #define VK_HANJA 0x19 @@ -170,7 +171,14 @@ #define VK_F22 0x85 #define VK_F23 0x86 #define VK_F24 0x87 -/* 0x88-0x8F Unassigned */ +#define VK_NAVIGATION_VIEW 0x88 +#define VK_NAVIGATION_MENU 0x89 +#define VK_NAVIGATION_UP 0x8A +#define VK_NAVIGATION_DOWN 0x8B +#define VK_NAVIGATION_LEFT 0x8C +#define VK_NAVIGATION_RIGHT 0x8D +#define VK_NAVIGATION_ACCEPT 0x8E +#define VK_NAVIGATION_CANCEL 0x8F #define VK_NUMLOCK 0x90 #define VK_SCROLL 0x91 #define VK_OEM_NEC_EQUAL 0x92 @@ -218,7 +226,31 @@ #define VK_OEM_PERIOD 0xBE #define VK_OEM_2 0xBF #define VK_OEM_3 0xC0 -/* 0xC1-0xDA Unassigned */ +/* 0xC1-0xC2 Unassigned */ +#define VK_GAMEPAD_A 0xC3 +#define VK_GAMEPAD_B 0xC4 +#define VK_GAMEPAD_X 0xC5 +#define VK_GAMEPAD_Y 0xC6 +#define VK_GAMEPAD_RIGHT_SHOULDER 0xC7 +#define VK_GAMEPAD_LEFT_SHOULDER 0xC8 +#define VK_GAMEPAD_LEFT_TRIGGER 0xC9 +#define VK_GAMEPAD_RIGHT_TRIGGER 0xCA +#define VK_GAMEPAD_DPAD_UP 0xCB +#define VK_GAMEPAD_DPAD_DOWN 0xCC +#define VK_GAMEPAD_DPAD_LEFT 0xCD +#define VK_GAMEPAD_DPAD_RIGHT 0xCE +#define VK_GAMEPAD_MENU 0xCF +#define VK_GAMEPAD_VIEW 0xD0 +#define VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON 0xD1 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON 0xD2 +#define VK_GAMEPAD_LEFT_THUMBSTICK_UP 0xD3 +#define VK_GAMEPAD_LEFT_THUMBSTICK_DOWN 0xD4 +#define VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT 0xD5 +#define VK_GAMEPAD_LEFT_THUMBSTICK_LEFT 0xD6 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_UP 0xD7 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN 0xD8 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT 0xD9 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT 0xDA #define VK_OEM_4 0xDB #define VK_OEM_5 0xDC #define VK_OEM_6 0xDD @@ -563,7 +595,7 @@ #define WM_TOUCHHITTESTING 0x024d #define WM_POINTERWHEEL 0x024e #define WM_POINTERHWHEEL 0x024f - +#define DM_POINTERHITTEST 0x0250 #define WM_POINTERROUTEDTO 0x0251 #define WM_POINTERROUTEDAWAY 0x0252 #define WM_POINTERROUTEDRELEASED 0x0253 @@ -812,6 +844,7 @@ #define WS_EX_APPWINDOW __MSABI_LONG(0x00040000) #define WS_EX_LAYERED __MSABI_LONG(0x00080000) #define WS_EX_NOINHERITLAYOUT __MSABI_LONG(0x00100000) +#define WS_EX_NOREDIRECTIONBITMAP __MSABI_LONG(0x00200000) #define WS_EX_LAYOUTRTL __MSABI_LONG(0x00400000) #define WS_EX_COMPOSITED __MSABI_LONG(0x02000000) #define WS_EX_NOACTIVATE __MSABI_LONG(0x08000000)

1 0

Andrew Eikum : dinput: Use heuristics to guess if a device is a gamepad or a joystick.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: ae849579161cb14aae0f71a64563ade1bc74c847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae849579161cb14aae0f71a6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 08:59:38 2019 -0500 dinput: Use heuristics to guess if a device is a gamepad or a joystick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47123 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick.c | 6 ++++- dlls/dinput/joystick_linux.c | 46 +++++++++++++++++++++++++++++++++++++-- dlls/dinput/joystick_linuxinput.c | 27 ++++++++++++++++++++--- dlls/dinput/joystick_osx.c | 20 ++++++++++++++--- 5 files changed, 91 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae849579161cb14aae0f…

1 0

Alexandre Julliard : advapi32: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 6e0a5b81a4f339e8691091c35bfb9df07b957aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e0a5b81a4f339e8691091c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:29 2019 -0500 advapi32: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9a4c961..43ea3b3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -108,7 +108,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; return (name->Length == sizeof(wow6432nodeW) && - !memicmpW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); + !strncmpiW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); } /* open the Wow6432Node subkey of the specified key */ @@ -149,7 +149,7 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES /* don't try to create registry root */ if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && - !memicmpW( buffer, registry_root, ARRAY_SIZE( registry_root ))) + !strncmpiW( buffer, registry_root, ARRAY_SIZE( registry_root ))) i += ARRAY_SIZE( registry_root ); while (i < len && buffer[i] != '\\') i++;

1 0

Alexandre Julliard : atl: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: d9db7faf6c4c11a494c9a25f1ba9509f9821535d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db7faf6c4c11a494c9a25f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:48 2019 -0500 atl: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index b717afe..c7d37a2 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -161,7 +161,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 - && !memicmpW(iter2, rep_iter->key, rep_iter->key_len)) + && !strncmpiW(iter2, rep_iter->key, rep_iter->key_len)) break; } if(!rep_iter) {

1 0

Alexandre Julliard : fusion: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard 07 May '19

07 May '19

Module: wine Branch: master Commit: 70441899256db1d622e9660587790302776d0826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70441899256db1d622e96605… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:58 2019 -0500 fusion: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index ba86818..915515e 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -350,7 +350,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, { unsigned int prefix_len = strlenW(prefix); if (strlenW(ffd.cFileName) >= prefix_len && - !memicmpW(ffd.cFileName, prefix, prefix_len)) + !strncmpiW(ffd.cFileName, prefix, prefix_len)) version += prefix_len; } sprintfW(disp, name_fmt, parent, version, token);

1 0