Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Debugger.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;dbghelp.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Bscmake>
Expand Down Expand Up @@ -140,7 +140,7 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;comctl32.lib;dbghelp.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<Bscmake>
Expand All @@ -150,6 +150,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="CRC32.cpp" />
<ClCompile Include="FileNamePattern.cpp" />
<ClCompile Include="Log.cpp" />
<ClCompile Include="Main.cpp" />
<ClCompile Include="PortableExecutable.cpp" />
Expand All @@ -158,6 +159,7 @@
<ItemGroup>
<ClInclude Include="CRC32.h" />
<ClInclude Include="FindFile.h" />
<ClInclude Include="FileNamePattern.h" />
<ClInclude Include="Handle.h" />
<ClInclude Include="Log.h" />
<ClInclude Include="PortableExecutable.h" />
Expand Down
113 changes: 113 additions & 0 deletions FileNamePattern.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
#include "FileNamePattern.h"

#include "Handle.h"
#include "Support.h"

#include <limits>
#include <string_view>

#include <winternl.h>

// The Windows SDK omits these ntdll declarations.
extern "C" NTSYSAPI BOOLEAN NTAPI RtlIsNameInExpression(
PUNICODE_STRING Expression, PUNICODE_STRING Name, BOOLEAN IgnoreCase,
PWCH UpcaseTable);
extern "C" NTSYSAPI NTSTATUS NTAPI RtlUpcaseUnicodeString(
PUNICODE_STRING DestinationString, PCUNICODE_STRING SourceString,
BOOLEAN AllocateDestinationString);

namespace
{
std::wstring ToWide(char const* text)
{
// Match FindFirstFileA's code page.
auto const count = MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS,
text, -1, nullptr, 0);
if (!count)
{
throw_lasterror_or(ERROR_NO_UNICODE_TRANSLATION, text);
}

std::wstring result(count, L'\0');
if (!MultiByteToWideChar(CP_ACP, MB_ERR_INVALID_CHARS, text, -1,
result.data(), count))
{
throw_lasterror_or(ERROR_NO_UNICODE_TRANSLATION, text);
}
result.pop_back();
return result;
}

UNICODE_STRING AsUnicodeString(std::wstring const& text)
{
constexpr auto MaxLength = std::numeric_limits<USHORT>::max();
if (text.size() > MaxLength / sizeof(wchar_t))
{
throw_lasterror(ERROR_FILENAME_EXCED_RANGE, {});
}
auto const length = static_cast<USHORT>(text.size() * sizeof(wchar_t));
return { length, length, const_cast<PWSTR>(text.data()) };
}
}

FileNamePattern::FileNamePattern(char const* pathPattern)
{
auto const path = ToWide(pathPattern);
std::wstring_view pattern = path;
auto const separator = pattern.find_last_of(L"\\/:");
if (separator != std::wstring_view::npos)
{
pattern.remove_prefix(separator + 1);
}

// Normalize trailing dots/spaces except in extended paths.
// A trailing '*.' selects extensionless names.
bool extensionless = false;
if (!path.starts_with(L"\\\\?\\"))
{
auto const endedInDot = pattern.ends_with(L'.');
auto const last = pattern.find_last_not_of(L" .");
pattern = pattern.substr(0, last == std::wstring_view::npos ? 0 : last + 1);
extensionless = endedInDot && pattern.ends_with(L'*');
}

// Use FindFirstFile's DOS_STAR (<), DOS_QM (>), and DOS_DOT (") translation.
expression.reserve(pattern.size());
for (size_t i = 0; i < pattern.size(); ++i)
{
auto const ch = pattern[i];
auto const next = i + 1 < pattern.size() ? pattern[i + 1] : L'\0';
if (ch == L'*' && (next == L'.' || (extensionless && i + 1 == pattern.size())))
{
expression.push_back(L'<');
}
else if (ch == L'?')
{
expression.push_back(L'>');
}
else if (ch == L'.' && (next == L'*' || next == L'?'))
{
expression.push_back(L'"');
}
else
{
expression.push_back(ch);
}
}

// IgnoreCase requires an uppercase expression.
auto source = AsUnicodeString(expression);
auto destination = source;
if (RtlUpcaseUnicodeString(&destination, &source, FALSE) < 0)
{
throw_lasterror(ERROR_INVALID_NAME, pathPattern);
}
}

bool FileNamePattern::Matches(char const* fileName) const
{
auto const name = ToWide(fileName);
auto patternString = AsUnicodeString(expression);
auto nameString = AsUnicodeString(name);
return RtlIsNameInExpression(&patternString, &nameString, TRUE, nullptr) != FALSE;
}
15 changes: 15 additions & 0 deletions FileNamePattern.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#pragma once

#include <string>

// Matches Win32 search patterns against long filenames.
class FileNamePattern
{
public:
explicit FileNamePattern(char const* pathPattern);

bool Matches(char const* fileName) const;

private:
std::wstring expression;
};
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ syringe.exe game.exe --args="-CD. -SPAWN"

### DLL Injection Behavior

By default, Syringe injects **all compatible DLLs** found in the directory.
By default, Syringe injects **all compatible DLLs** found in the directory whose long filenames end in `.dll` (case insensitive). Renaming a DLL to `.dlli`, `.dllbak`, or another extension excludes it from automatic discovery, even when its Windows 8.3 short name still ends in `.DLL`.

To load only specific DLLs, use one or more instances of:

Expand All @@ -52,7 +52,7 @@ Example:
syringe.exe game.exe -i=ExtensionA.dll -i=ExtensionB.dll
```

When at least one `-i=` option is present, **only the specified DLLs** are injected.
When at least one `-i=` option is present, **only the specified DLLs** are injected. Selections can use exact filenames or Win32 wildcard patterns, including other filename extensions. Every selection is checked against the long filename, so `-i=*.dll` also excludes `.dlli` and `.dll+` files that only match through an 8.3 alias. Use their long names or a matching pattern to select them explicitly.

### Debugger Detach and Process Lifetime

Expand Down
8 changes: 8 additions & 0 deletions SyringeDebugger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "CRC32.h"
#include "FindFile.h"
#include "FileNamePattern.h"
#include "Handle.h"
#include "Log.h"
#include "Support.h"
Expand Down Expand Up @@ -1410,10 +1411,17 @@ void SyringeDebugger::FindDLLs()
{
Log::WriteLine(__FUNCTION__ ": Searching for DLLs matching \"%s\"...", dll.c_str());

FileNamePattern const pattern(dll.c_str());
for (auto file = FindFile(dll.c_str()); file; ++file)
{
std::string_view const fn(file->cFileName);

// Reject matches that only come from an 8.3 alias.
if (!pattern.Matches(file->cFileName))
{
continue;
}

// Log::WriteLine(
// __FUNCTION__ ": Potential DLL: \"%.*s\"", printable(fn));

Expand Down
5 changes: 3 additions & 2 deletions Tests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>false</OptimizeReferences>
<EnableCOMDATFolding>false</EnableCOMDATFolding>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;dbghelp.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -102,7 +102,7 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;dbghelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;shell32.lib;dbghelp.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
Expand All @@ -111,6 +111,7 @@
<ClCompile Include="SyringeDebugger.cpp" />
<ClCompile Include="Log.cpp" />
<ClCompile Include="CRC32.cpp" />
<ClCompile Include="FileNamePattern.cpp" />
<ClCompile Include="PortableExecutable.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading