Skip to content

[WIP] Provide ANSI and UNICODE versions of all resource functions. #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fancycode wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Provide ANSI and UNICODE versions of all resource functions. #53

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c5bc3
Provide ANSI and UNICODE versions of all resource functions.
fancycode Sep 20, 2016
13e979e
MSVC needs the variables to be declared earlier.
fancycode Sep 20, 2016
d718478
Fix string termination for UNICODE.
fancycode Sep 20, 2016
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
Prev Previous commit
Next Next commit
MSVC needs the variables to be declared earlier.
  • Loading branch information
@fancycode
fancycode committed Sep 20, 2016
commit 13e979e0b71ac294cb9b7aee766cad198d0fa2a5
13 changes: 7 additions & 6 deletions MemoryModule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,12 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntryA(
LPCSTR key)
{
PIMAGE_RESOURCE_DIRECTORY_ENTRY result = NULL;
size_t searchKeyLen;
#define MAX_LOCAL_KEY_LENGTH 2048
// In most cases resource names are short, so optimize for that by
// using a pre-allocated array.
wchar_t _searchKeySpace[MAX_LOCAL_KEY_LENGTH+1];
LPWSTR _searchKey;

if (!IS_INTRESOURCE(key) && key[0] == '#') {
// special case: resource id given as string
Expand All @@ -886,12 +892,7 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntryA(

// Resource names are always stored using 16bit characters, need to
// convert string we search for.
#define MAX_LOCAL_KEY_LENGTH 2048
size_t searchKeyLen = strlen(key);
// In most cases resource names are short, so optimize for that by
// using a pre-allocated array.
wchar_t _searchKeySpace[MAX_LOCAL_KEY_LENGTH+1];
LPWSTR _searchKey;
searchKeyLen = strlen(key);
if (searchKeyLen > MAX_LOCAL_KEY_LENGTH) {
size_t _searchKeySize = (searchKeyLen + 1) * sizeof(wchar_t);
_searchKey = (LPWSTR) malloc(_searchKeySize);
Expand Down