Skip to content

Commit 80b5d73

Browse files
committed
GUI: Don't use MB_PRECOMPOSED due to failing on 15063
1 parent 1edb989 commit 80b5d73

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

ExplorerPatcher/updates.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ BOOL IsUpdateAvailableHelper(
271271
{
272272
MultiByteToWideChar(
273273
CP_UTF8,
274-
MB_PRECOMPOSED,
274+
0,
275275
jsonStr.c_str(),
276276
-1,
277277
pszJsonStr,

ep_gui/GUI.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
12391239
ZeroMemory(section, MAX_LINE_LENGTH * sizeof(wchar_t));
12401240
MultiByteToWideChar(
12411241
CP_UTF8,
1242-
MB_PRECOMPOSED,
1242+
0,
12431243
line[1] == '-' ? line + 2 : line + 1,
12441244
numChRd - (line[1] == '-' ? 5 : 4),
12451245
section,
@@ -1279,7 +1279,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
12791279
ZeroMemory(text, (MAX_LINE_LENGTH + 3) * sizeof(wchar_t));
12801280
MultiByteToWideChar(
12811281
CP_UTF8,
1282-
MB_PRECOMPOSED,
1282+
0,
12831283
line + 3,
12841284
numChRd - 3,
12851285
text,
@@ -1362,7 +1362,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
13621362
ZeroMemory(text, (MAX_LINE_LENGTH + 3) * sizeof(wchar_t));
13631363
MultiByteToWideChar(
13641364
CP_UTF8,
1365-
MB_PRECOMPOSED,
1365+
0,
13661366
line + 3,
13671367
numChRd - 3,
13681368
text,
@@ -1912,7 +1912,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
19121912
ZeroMemory(wszName, MAX_PATH * sizeof(wchar_t));
19131913
MultiByteToWideChar(
19141914
CP_UTF8,
1915-
MB_PRECOMPOSED,
1915+
0,
19161916
line2 + 2,
19171917
numChRd2 - 2,
19181918
wszName,
@@ -2190,7 +2190,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
21902190
ZeroMemory(wszName, MAX_PATH * sizeof(wchar_t));
21912191
MultiByteToWideChar(
21922192
CP_UTF8,
2193-
MB_PRECOMPOSED,
2193+
0,
21942194
line2 + 2,
21952195
numChRd2 - 2,
21962196
wszName,
@@ -2339,7 +2339,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
23392339
text[2] = L' ';
23402340
MultiByteToWideChar(
23412341
CP_UTF8,
2342-
MB_PRECOMPOSED,
2342+
0,
23432343
!strncmp(line, ";c ", 3) || !strncmp(line, ";z ", 3) ? strchr(line + 3, ' ') + 1 : line + 3,
23442344
numChRd - 3,
23452345
text + 3,
@@ -2399,7 +2399,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
23992399
wchar_t* miText = malloc(MAX_PATH * sizeof(wchar_t));
24002400
MultiByteToWideChar(
24012401
CP_UTF8,
2402-
MB_PRECOMPOSED,
2402+
0,
24032403
ln,
24042404
MAX_PATH,
24052405
miText,
@@ -2442,7 +2442,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
24422442
if (p) *p = 0;
24432443
MultiByteToWideChar(
24442444
CP_UTF8,
2445-
MB_PRECOMPOSED,
2445+
0,
24462446
l + 1,
24472447
numChRd - 1,
24482448
wszPrompt,
@@ -2457,7 +2457,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
24572457
if (p) *p = 0;
24582458
MultiByteToWideChar(
24592459
CP_UTF8,
2460-
MB_PRECOMPOSED,
2460+
0,
24612461
l + 1,
24622462
numChRd - 1,
24632463
wszFallbackDefault,
@@ -2486,7 +2486,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
24862486
ZeroMemory(name, MAX_LINE_LENGTH * sizeof(wchar_t));
24872487
MultiByteToWideChar(
24882488
CP_UTF8,
2489-
MB_PRECOMPOSED,
2489+
0,
24902490
line[0] == '"' ? line + 1 : line,
24912491
numChRd,
24922492
name,

0 commit comments

Comments
 (0)