Skip to content

Commit 3c8247b

Browse files
MolandaMolanda
committed
Added 64-bit build configuration
1 parent 845cb84 commit 3c8247b

File tree

7 files changed

+428
-71
lines changed

7 files changed

+428
-71
lines changed

‎BrowserProxy/BrowserProxy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@ HRESULT BrowserProxyModule::ForwardCookie(ICoreWebView2CookieManager *cookieMana
14601460

14611461
const WCHAR *value = nullptr;
14621462
{
1463-
DWORD skip = wcslen(name) + 1; // name=
1463+
DWORD skip = (DWORD)wcslen(name) + 1; // name=
14641464
if (size < skip)
14651465
return E_FAIL;
14661466

‎BrowserProxy/BrowserProxy.vcxproj

Lines changed: 167 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Develop|Win32">
913
<Configuration>Develop</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Develop|x64">
17+
<Configuration>Develop</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
<ProjectConfiguration Include="Release|Win32">
1321
<Configuration>Release</Configuration>
1422
<Platform>Win32</Platform>
1523
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Release|x64">
25+
<Configuration>Release</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
1628
</ItemGroup>
1729
<PropertyGroup Label="Globals">
1830
<VCProjectVersion>16.0</VCProjectVersion>
@@ -27,18 +39,36 @@
2739
<PlatformToolset>v143</PlatformToolset>
2840
<CharacterSet>Unicode</CharacterSet>
2941
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43+
<ConfigurationType>DynamicLibrary</ConfigurationType>
44+
<UseDebugLibraries>true</UseDebugLibraries>
45+
<PlatformToolset>v143</PlatformToolset>
46+
<CharacterSet>Unicode</CharacterSet>
47+
</PropertyGroup>
3048
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3149
<ConfigurationType>DynamicLibrary</ConfigurationType>
3250
<UseDebugLibraries>false</UseDebugLibraries>
3351
<PlatformToolset>v143</PlatformToolset>
3452
<CharacterSet>Unicode</CharacterSet>
3553
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
55+
<ConfigurationType>DynamicLibrary</ConfigurationType>
56+
<UseDebugLibraries>false</UseDebugLibraries>
57+
<PlatformToolset>v143</PlatformToolset>
58+
<CharacterSet>Unicode</CharacterSet>
59+
</PropertyGroup>
3660
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'" Label="Configuration">
3761
<ConfigurationType>DynamicLibrary</ConfigurationType>
3862
<UseDebugLibraries>false</UseDebugLibraries>
3963
<PlatformToolset>v143</PlatformToolset>
4064
<CharacterSet>Unicode</CharacterSet>
4165
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'" Label="Configuration">
67+
<ConfigurationType>DynamicLibrary</ConfigurationType>
68+
<UseDebugLibraries>false</UseDebugLibraries>
69+
<PlatformToolset>v143</PlatformToolset>
70+
<CharacterSet>Unicode</CharacterSet>
71+
</PropertyGroup>
4272
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
4373
<ImportGroup Label="ExtensionSettings">
4474
</ImportGroup>
@@ -47,31 +77,58 @@
4777
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4878
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4979
</ImportGroup>
80+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
81+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
82+
</ImportGroup>
5083
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5184
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5285
</ImportGroup>
86+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
87+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
88+
</ImportGroup>
5389
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'" Label="PropertySheets">
5490
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5591
</ImportGroup>
92+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'" Label="PropertySheets">
93+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
94+
</ImportGroup>
5695
<PropertyGroup Label="UserMacros" />
5796
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5897
<IgnoreImportLibrary>true</IgnoreImportLibrary>
5998
<LinkIncremental>true</LinkIncremental>
6099
<TargetName>BrowserProxy</TargetName>
61100
<OutDir>$(SolutionDir)BrowserProxy\$(Configuration)\</OutDir>
62101
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
104+
<LinkIncremental>true</LinkIncremental>
105+
<TargetName>BrowserProxy</TargetName>
106+
</PropertyGroup>
63107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64108
<IgnoreImportLibrary>true</IgnoreImportLibrary>
65109
<LinkIncremental>false</LinkIncremental>
66110
<TargetName>BrowserProxy</TargetName>
67-
<OutDir>$(SolutionDir)BrowserProxy\$(Configuration)\</OutDir>
111+
<OutDir>$(SolutionDir)BrowserProxy\$(Configuration)\$(Platform)\</OutDir>
112+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
113+
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
115+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
116+
<LinkIncremental>false</LinkIncremental>
117+
<TargetName>BrowserProxy</TargetName>
118+
<OutDir>$(SolutionDir)BrowserProxy\$(Configuration)\$(Platform)\</OutDir>
119+
<IntDir>$(Configuration)\$(Platform)\</IntDir>
68120
</PropertyGroup>
69121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">
70122
<IgnoreImportLibrary>true</IgnoreImportLibrary>
71123
<LinkIncremental>false</LinkIncremental>
72124
<TargetName>BrowserProxy</TargetName>
73125
<OutDir>$(SolutionDir)BrowserProxy\$(Configuration)\</OutDir>
74126
</PropertyGroup>
127+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
128+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
129+
<LinkIncremental>false</LinkIncremental>
130+
<TargetName>BrowserProxy</TargetName>
131+
</PropertyGroup>
75132
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
76133
<ClCompile>
77134
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -106,6 +163,38 @@
106163
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
107164
</Link>
108165
</ItemDefinitionGroup>
166+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
167+
<ClCompile>
168+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
169+
<WarningLevel>Level3</WarningLevel>
170+
<Optimization>Disabled</Optimization>
171+
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;THERE_LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172+
<PrecompiledHeaderFile>
173+
</PrecompiledHeaderFile>
174+
<SDLCheck>true</SDLCheck>
175+
</ClCompile>
176+
<Midl>
177+
<MkTypLibCompatible>false</MkTypLibCompatible>
178+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179+
<HeaderFileName>BrowserProxy_i.h</HeaderFileName>
180+
<InterfaceIdentifierFileName>BrowserProxy_i.c</InterfaceIdentifierFileName>
181+
<ProxyFileName>BrowserProxy_p.c</ProxyFileName>
182+
<GenerateStublessProxies>true</GenerateStublessProxies>
183+
<TypeLibraryName>$(IntDir)BrowserProxy.tlb</TypeLibraryName>
184+
<DllDataFileName>
185+
</DllDataFileName>
186+
</Midl>
187+
<ResourceCompile>
188+
<Culture>0x0409</Culture>
189+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
190+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
191+
</ResourceCompile>
192+
<Link>
193+
<SubSystem>Windows</SubSystem>
194+
<ModuleDefinitionFile>.\BrowserProxy.def</ModuleDefinitionFile>
195+
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
196+
</Link>
197+
</ItemDefinitionGroup>
109198
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
110199
<ClCompile>
111200
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -142,6 +231,40 @@
142231
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
143232
</Link>
144233
</ItemDefinitionGroup>
234+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
235+
<ClCompile>
236+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
237+
<WarningLevel>Level3</WarningLevel>
238+
<Optimization>MaxSpeed</Optimization>
239+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
240+
<PrecompiledHeaderFile>
241+
</PrecompiledHeaderFile>
242+
<SDLCheck>true</SDLCheck>
243+
</ClCompile>
244+
<Midl>
245+
<MkTypLibCompatible>false</MkTypLibCompatible>
246+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
247+
<HeaderFileName>BrowserProxy_i.h</HeaderFileName>
248+
<InterfaceIdentifierFileName>BrowserProxy_i.c</InterfaceIdentifierFileName>
249+
<ProxyFileName>BrowserProxy_p.c</ProxyFileName>
250+
<GenerateStublessProxies>true</GenerateStublessProxies>
251+
<TypeLibraryName>$(IntDir)BrowserProxy.tlb</TypeLibraryName>
252+
<DllDataFileName>
253+
</DllDataFileName>
254+
</Midl>
255+
<ResourceCompile>
256+
<Culture>0x0409</Culture>
257+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
258+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259+
</ResourceCompile>
260+
<Link>
261+
<SubSystem>Windows</SubSystem>
262+
<ModuleDefinitionFile>.\BrowserProxy.def</ModuleDefinitionFile>
263+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
264+
<OptimizeReferences>true</OptimizeReferences>
265+
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
266+
</Link>
267+
</ItemDefinitionGroup>
145268
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">
146269
<ClCompile>
147270
<PrecompiledHeader>NotUsing</PrecompiledHeader>
@@ -179,6 +302,40 @@
179302
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
180303
</Link>
181304
</ItemDefinitionGroup>
305+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
306+
<ClCompile>
307+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
308+
<WarningLevel>Level3</WarningLevel>
309+
<Optimization>MaxSpeed</Optimization>
310+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;THERE_LOGGING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
311+
<PrecompiledHeaderFile>
312+
</PrecompiledHeaderFile>
313+
<SDLCheck>true</SDLCheck>
314+
</ClCompile>
315+
<Midl>
316+
<MkTypLibCompatible>false</MkTypLibCompatible>
317+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
318+
<HeaderFileName>BrowserProxy_i.h</HeaderFileName>
319+
<InterfaceIdentifierFileName>BrowserProxy_i.c</InterfaceIdentifierFileName>
320+
<ProxyFileName>BrowserProxy_p.c</ProxyFileName>
321+
<GenerateStublessProxies>true</GenerateStublessProxies>
322+
<TypeLibraryName>$(IntDir)BrowserProxy.tlb</TypeLibraryName>
323+
<DllDataFileName>
324+
</DllDataFileName>
325+
</Midl>
326+
<ResourceCompile>
327+
<Culture>0x0409</Culture>
328+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
329+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
330+
</ResourceCompile>
331+
<Link>
332+
<SubSystem>Windows</SubSystem>
333+
<ModuleDefinitionFile>.\BrowserProxy.def</ModuleDefinitionFile>
334+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
335+
<OptimizeReferences>true</OptimizeReferences>
336+
<AdditionalDependencies>version.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
337+
</Link>
338+
</ItemDefinitionGroup>
182339
<ItemGroup>
183340
<ClInclude Include="platform.h" />
184341
<ClInclude Include="resource.h" />
@@ -191,14 +348,23 @@
191348
<ClCompile Include="BrowserProxy.cpp" />
192349
<ClCompile Include="BrowserProxy_i.c">
193350
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
351+
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
194352
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
353+
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
195354
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">false</CompileAsManaged>
355+
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">false</CompileAsManaged>
196356
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
197357
</PrecompiledHeader>
358+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
359+
</PrecompiledHeader>
198360
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
199361
</PrecompiledHeader>
362+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
363+
</PrecompiledHeader>
200364
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|Win32'">
201365
</PrecompiledHeader>
366+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Develop|x64'">
367+
</PrecompiledHeader>
202368
</ClCompile>
203369
<ClCompile Include="SettingsRequestHandler.cpp" />
204370
<ClCompile Include="VoiceTrainerProxy.cpp" />

‎BrowserProxy/SettingsRequestHandler.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ HRESULT SettingsRequestHandler::HandleSettings(HWND wnd)
179179
break;
180180
}
181181

182-
DWORD size = token1 - data;
182+
DWORD size = (DWORD)(token1 - data);
183183
if (size > 0)
184184
m_content->Write(data, size, nullptr);
185185

@@ -192,7 +192,7 @@ HRESULT SettingsRequestHandler::HandleSettings(HWND wnd)
192192
break;
193193

194194
data = token2 + 1;
195-
size = token2 - token1 + 1;
195+
size = (DWORD)(token2 - token1 + 1);
196196
dsize -= size;
197197

198198
if (strncmp(token1, "@home@", size) == 0)
@@ -372,7 +372,7 @@ HRESULT SettingsRequestHandler::SettingsRequestHandler::SetStartPage(const WCHAR
372372
HKEY key;
373373
if (RegOpenKeyEx(HKEY_CURRENT_USER, L"Software\\There.com\\There", 0, KEY_WRITE, &key) == ERROR_SUCCESS)
374374
{
375-
DWORD length = (wcslen(url) + 1) * sizeof(WCHAR);
375+
DWORD length = (DWORD)((wcslen(url) + 1) * sizeof(WCHAR));
376376
result = RegSetKeyValue(key, L"Edge\\", L"Start Page", REG_SZ, (BYTE*)url, length);
377377
RegCloseKey(key);
378378
}

‎FlashProxy/FlashProxy.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ HRESULT STDMETHODCALLTYPE FlashProxyModule::Close(DWORD dwSaveOption)
404404
BroadcastMessage(WM_FLASHPROXY_SET_TELEPORTING, 0, 0);
405405

406406
if (m_proxyWnd != nullptr)
407-
SetWindowLongPtr(m_proxyWnd, GWL_USERDATA, 0);
407+
SetWindowLongPtr(m_proxyWnd, GWLP_USERDATA, 0);
408408

409409
if (m_controller != nullptr)
410410
m_controller->Close();
@@ -489,7 +489,7 @@ HRESULT STDMETHODCALLTYPE FlashProxyModule::DoVerb(LONG iVerb, LPMSG lpmsg, IOle
489489
if (m_proxyWnd == nullptr)
490490
return E_FAIL;
491491

492-
SetWindowLongPtr(m_proxyWnd, GWL_USERDATA, (LPARAM)this);
492+
SetWindowLongPtr(m_proxyWnd, GWLP_USERDATA, (LPARAM)this);
493493
}
494494

495495
{
@@ -1467,7 +1467,7 @@ LRESULT FlashProxyModule::BroadcastMessage(UINT Msg, WPARAM wParam, LPARAM lPara
14671467

14681468
LRESULT APIENTRY FlashProxyModule::ChildWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
14691469
{
1470-
FlashProxyModule *flashProxy = reinterpret_cast<FlashProxyModule*>(GetWindowLongPtr(hWnd, GWL_USERDATA));
1470+
FlashProxyModule *flashProxy = reinterpret_cast<FlashProxyModule*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
14711471

14721472
switch (Msg)
14731473
{
@@ -1513,10 +1513,10 @@ LRESULT APIENTRY FlashProxyModule::ChildWndProc(HWND hWnd, UINT Msg, WPARAM wPar
15131513
{
15141514
WCHAR *buff = (WCHAR*)lParam;
15151515
if (wcscpy_s(buff, wParam / sizeof(WCHAR), flashProxy->m_aboutQuery) == 0)
1516-
length = wcslen(buff);
1516+
length = (LONG)wcslen(buff);
15171517
}
15181518
else
1519-
length = flashProxy->m_aboutQuery.Length();
1519+
length = (LONG)flashProxy->m_aboutQuery.Length();
15201520
}
15211521

15221522
return length;

0 commit comments

Comments
 (0)