CommandLineToArgvW hook - fixes #92

Author: kevoreilly

hook_misc.c

@@ -1856,6 +1856,15 @@ HOOKDEF(LPWSTR, WINAPI, GetCommandLineW,
 	return ret;
 }
 
+HOOKDEF(LPWSTR, WINAPI, CommandLineToArgvW,
+	__in LPWSTR lpCmdLine,
+	__out int *pNumArgs
+) {
+	LPWSTR ret = Old_CommandLineToArgvW(lpCmdLine, pNumArgs);
+	LOQ_nonnull("misc", "ui", "CommandLine", lpCmdLine, "NumArgs", *pNumArgs);
+	return ret;
+}
+
 HOOKDEF(BOOL, WINAPI, EnumDisplayDevicesA,
 	_In_	LPCSTR  lpDevice,
 	_In_	DWORD  iDevNum,

hooks.c

@@ -329,6 +329,7 @@ hook_t full_hooks[] = {
 	//HOOK(ntdll, RtlMoveMemory),
 	HOOK(kernel32, GetCommandLineA),
 	HOOK(kernel32, GetCommandLineW),
+	HOOK(shcore, CommandLineToArgvW),
 	HOOK(kernel32, OutputDebugStringA),
 	HOOK(kernel32, OutputDebugStringW),
 	HOOK(kernel32, HeapCreate),

hooks.h

@@ -3592,6 +3592,11 @@ HOOKDEF(LPWSTR, WINAPI, GetCommandLineW,
 	void
 );
 
+HOOKDEF(LPWSTR, WINAPI, CommandLineToArgvW,
+	__in LPWSTR lpCmdLine,
+	__out int *pNumArgs
+);
+
 HOOKDEF(BOOL, WINAPI, DisableThreadLibraryCalls,
 	__in HMODULE hLibModule
 );