Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

steam_helper: Fix building against Wine 4.11

Browse Source
This commit is contained in:
Andrew Eikum 2019-06-19 13:36:50 -05:00
parent f9dd5bb0fc
commit ab453aaf11
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/makefile_base.mak
View File

@ -729,10 +729,11 @@ STEAMEXE_CONFIGURE_FILES := $(STEAMEXE_OBJ)/Makefile
$(STEAMEXE_CONFIGURE_FILES): SHELL = $(CONTAINER_SHELL32) $(STEAMEXE_CONFIGURE_FILES): SHELL = $(CONTAINER_SHELL32)
$(STEAMEXE_CONFIGURE_FILES): $(STEAMEXE_SYN) $(MAKEFILE_DEP) | $(STEAMEXE_OBJ) $(WINEMAKER) $(STEAMEXE_CONFIGURE_FILES): $(STEAMEXE_SYN) $(MAKEFILE_DEP) | $(STEAMEXE_OBJ) $(WINEMAKER)
cd $(dir $@) && \ cd $(dir $@) && \
$(WINEMAKER) --nosource-fix --nolower-include --nodlls --nomsvcrt --wine32 \ $(WINEMAKER) --nosource-fix --nolower-include --nodlls --wine32 \
-I"../$(TOOLS_DIR32)"/include/ \ -I"../$(TOOLS_DIR32)"/include/ \
-I"../$(TOOLS_DIR32)"/include/wine/ \ -I"../$(TOOLS_DIR32)"/include/wine/ \
-I"../$(TOOLS_DIR32)"/include/wine/windows/ \ -I"../$(TOOLS_DIR32)"/include/wine/windows/ \
-I"../$(TOOLS_DIR32)"/include/wine/msvcrt/ \
-I"../$(SRCDIR)"/lsteamclient/steamworks_sdk_142/ \ -I"../$(SRCDIR)"/lsteamclient/steamworks_sdk_142/ \
-L"../$(TOOLS_DIR32)"/lib/ \ -L"../$(TOOLS_DIR32)"/lib/ \
-L"../$(TOOLS_DIR32)"/lib/wine/ \ -L"../$(TOOLS_DIR32)"/lib/wine/ \

23
steam_helper/steam.cpp
View File

@ -33,6 +33,8 @@
* Windows version of Steam running. */ * Windows version of Steam running. */
#include <windows.h> #include <windows.h>
#include <string.h>
#include <stdio.h>
#pragma push_macro("_WIN32") #pragma push_macro("_WIN32")
#pragma push_macro("__cdecl") #pragma push_macro("__cdecl")
@ -42,7 +44,6 @@
#pragma pop_macro("_WIN32") #pragma pop_macro("_WIN32")
#pragma pop_macro("__cdecl") #pragma pop_macro("__cdecl")
#include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(steam); WINE_DEFAULT_DEBUG_CHANNEL(steam);
@ -118,7 +119,7 @@ static void setup_steam_registry(void)
static WCHAR *find_quote(WCHAR *str) static WCHAR *find_quote(WCHAR *str)
{ {
WCHAR *end = strchrW(str, '"'), *ch; WCHAR *end = wcschr(str, '"'), *ch;
int odd; int odd;
while (end) while (end)
{ {
@ -131,7 +132,7 @@ static WCHAR *find_quote(WCHAR *str)
} }
if (!odd) if (!odd)
return end; return end;
end = strchrW(end + 1, '"'); end = wcschr(end + 1, '"');
} }
return NULL; return NULL;
} }
@ -150,7 +151,7 @@ static HANDLE run_process(void)
} }
else else
{ {
cmdline = strchrW(cmdline, ' '); cmdline = wcschr(cmdline, ' ');
} }
if (!cmdline) if (!cmdline)
{ {
@ -187,9 +188,9 @@ static HANDLE run_process(void)
else else
{ {
start = cmdline; start = cmdline;
end = strchrW(start, ' '); end = wcschr(start, ' ');
if (!end) if (!end)
end = strchrW(start, '\0'); end = wcschr(start, '\0');
remainder = end; remainder = end;
} }
@ -220,11 +221,11 @@ static HANDLE run_process(void)
dos = wine_get_dos_file_name(scratchA); dos = wine_get_dos_file_name(scratchA);
new_cmdline = (WCHAR *)HeapAlloc(GetProcessHeap(), 0, new_cmdline = (WCHAR *)HeapAlloc(GetProcessHeap(), 0,
(strlenW(dos) + 3 + strlenW(remainder) + 1) * sizeof(WCHAR)); (lstrlenW(dos) + 3 + lstrlenW(remainder) + 1) * sizeof(WCHAR));
strcpyW(new_cmdline, dquoteW); lstrcpyW(new_cmdline, dquoteW);
strcatW(new_cmdline, dos); lstrcatW(new_cmdline, dos);
strcatW(new_cmdline, dquoteW); lstrcatW(new_cmdline, dquoteW);
strcatW(new_cmdline, remainder); lstrcatW(new_cmdline, remainder);
cmdline = new_cmdline; cmdline = new_cmdline;
} }