Skip to content

Commit 22e86ed

Browse files
committed
WindowTextExtractor64.exe will be located in the application folder.
1 parent 7ef5b44 commit 22e86ed

File tree

4 files changed

+7
-33
lines changed

4 files changed

+7
-33
lines changed

Build/Build.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
<WindowTextExtractorSourceFileWin32 Include="$(WindowTextExtractorProjectPath)\bin\x86\Release\WindowTextExtractor.exe" />
1717
<WindowTextExtractorSourceFileWin64 Include="$(WindowTextExtractorProjectPath)\bin\x64\Release\WindowTextExtractor.exe" />
1818
<WindowTextExtractorDestFileWin32 Include="$(ApplicationPath)\WindowTextExtractor.exe" />
19-
<WindowTextExtractorDestFileWin64 Include="$(WindowTextExtractorProjectPath)\WindowTextExtractor64.exe" />
20-
<EmptyTextForFile Include="Empty File" />
19+
<WindowTextExtractorDestFileWin64 Include="$(ApplicationPath)\WindowTextExtractor64.exe" />
2120
</ItemGroup>
2221

2322
<Target Name="BuildSolution">
2423
<CallTarget Targets="Build_Release_x32_WindowTextExtractorHook" />
2524
<CallTarget Targets="Copy_Release_x32_WindowTextExtractorHook" />
2625
<CallTarget Targets="Build_Release_x64_WindowTextExtractorHook" />
2726
<CallTarget Targets="Copy_Release_x64_WindowTextExtractorHook" />
28-
<CallTarget Targets="WriteEmptyTextToEmbeddedResourceInWindowTextExtractor" />
2927
<CallTarget Targets="Build_Release_x64_WindowTextExtractor" />
3028
<CallTarget Targets="Copy_Release_x64_WindowTextExtractor" />
3129
<CallTarget Targets="Build_Release_x32_WindowTextExtractor" />
@@ -83,10 +81,4 @@
8381
<Copy SourceFiles="@(WindowTextExtractorSourceFileWin64)" DestinationFiles="@(WindowTextExtractorDestFileWin64)" />
8482
<Message Text="Copy Completed $(WindowTextExtractorProjectName) Realese x64" />
8583
</Target>
86-
87-
<Target Name="WriteEmptyTextToEmbeddedResourceInWindowTextExtractor">
88-
<Message Text="Write Empty Embedded Resource $(WindowTextExtractorProjectName)" />
89-
<WriteLinesToFile File="@(WindowTextExtractorDestFileWin64)" Lines="@(EmptyTextForFile)" Overwrite="true" />
90-
<Message Text="Write Empty Embedded Resource Completed $(WindowTextExtractorProjectName)" />
91-
</Target>
9284
</Project>

WindowTextExtractor/Forms/MainForm.cs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,12 @@ protected override void OnLoad(EventArgs e)
6161
#if WIN32
6262
if (Environment.Is64BitOperatingSystem)
6363
{
64-
var resourceName = "WindowTextExtractor.WindowTextExtractor64.exe";
6564
var fileName = "WindowTextExtractor64.exe";
6665
var directoryName = Path.GetDirectoryName(AssemblyUtils.AssemblyLocation);
6766
_64BitFilePath = Path.Combine(directoryName, fileName);
68-
try
67+
if (!File.Exists(_64BitFilePath))
6968
{
70-
if (!File.Exists(_64BitFilePath))
71-
{
72-
AssemblyUtils.ExtractFileFromAssembly(resourceName, _64BitFilePath);
73-
}
74-
}
75-
catch
76-
{
77-
var message = string.Format("Failed to load {0} process!", fileName);
69+
var message = string.Format("{0} is not found.", fileName);
7870
MessageBox.Show(message, AssemblyUtils.AssemblyTitle, MessageBoxButtons.OK, MessageBoxIcon.Error);
7971
Close();
8072
}
@@ -86,19 +78,6 @@ protected override void OnClosed(EventArgs e)
8678
{
8779
base.OnClosed(e);
8880
Application.RemoveMessageFilter(this);
89-
90-
#if WIN32
91-
if (Environment.Is64BitOperatingSystem && File.Exists(_64BitFilePath))
92-
{
93-
try
94-
{
95-
File.Delete(_64BitFilePath);
96-
}
97-
catch
98-
{
99-
}
100-
}
101-
#endif
10281
}
10382

10483
private void btnTarget_MouseDown(object sender, MouseEventArgs e)

WindowTextExtractor/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ static void Main(string[] args)
2929
NativeMethods.QueryPasswordEdit64();
3030
NativeMethods.UnsetHook64(hwndCallerPtr, hwndTargetPtr);
3131
}
32+
else
33+
{
34+
MessageBox.Show("WindowTextExtractor64.exe is not for a manual run.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
35+
}
3236
#endif
3337
}
3438
}

WindowTextExtractor/WindowTextExtractor.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
<Content Include="WindowTextExtractor.ico" />
147147
<Content Include="WindowTextExtractor.png" />
148148
<Content Include="WindowTextExtractor32.ico" />
149-
<EmbeddedResource Include="WindowTextExtractor64.exe" />
150149
</ItemGroup>
151150
<ItemGroup>
152151
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

0 commit comments

Comments
 (0)