Skip to content

Included all of my changes. #1

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
AraHaan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Included all of my changes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be39f6d
Ensure terminating null is included when setting values via RegSetVal…
dmoulding Mar 21, 2013
6070a80
Merge pull request #1 from dmoulding/master
AraHaan May 8, 2017
9427084
Hmm
AraHaan May 8, 2017
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Debug
Release
ReleaseStatic
*.aps
*.ncb
*.suo
*.sdf
*.vcproj.*.*.user
*.vcxproj.user
4 changes: 2 additions & 2 deletions EnvVar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void EnvVar::paste (std::string const &text)
0,
REG_EXPAND_SZ,
reinterpret_cast<BYTE const *>(value_.c_str()),
value_.length());
value_.length() + 1);
RegCloseKey(key);

// Notify everyone of the change.
Expand Down Expand Up @@ -225,7 +225,7 @@ void EnvVar::set (std::string const &text)
0,
REG_EXPAND_SZ,
reinterpret_cast<const BYTE *>(value_.c_str()),
value_.length());
value_.length() + 1);
RegCloseKey(key);

// Notify everyone of the change.
Expand Down
29 changes: 29 additions & 0 deletions VS2008/editenv.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editenv", "editenv.vcproj", "{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "envtest", "envtest\envtest.vcproj", "{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}"
ProjectSection(ProjectDependencies) = postProject
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1} = {59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.ActiveCfg = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.Build.0 = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.ActiveCfg = Release|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.Build.0 = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.ActiveCfg = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.Build.0 = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.ActiveCfg = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
14 changes: 7 additions & 7 deletions editenv.vcproj → VS2008/editenv.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\editenv.cpp"
RelativePath="../editenv.cpp"
>
</File>
<File
RelativePath=".\EnvVar.cpp"
RelativePath="../EnvVar.cpp"
>
</File>
</Filter>
Expand All @@ -180,19 +180,19 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\editenv.hpp"
RelativePath="../editenv.hpp"
>
</File>
<File
RelativePath=".\editenvTypes.hpp"
RelativePath="../editenvTypes.hpp"
>
</File>
<File
RelativePath=".\EnvVar.hpp"
RelativePath="../EnvVar.hpp"
>
</File>
<File
RelativePath=".\resource.h"
RelativePath="../resource.h"
>
</File>
</Filter>
Expand All @@ -202,7 +202,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\editenv.rc"
RelativePath="../editenv.rc"
>
</File>
</Filter>
Expand Down
6 changes: 3 additions & 3 deletions envtest/envtest.vcproj → VS2008/envtest/envtest.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\"
AdditionalIncludeDirectories="../../"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
Expand Down Expand Up @@ -111,7 +111,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\"
AdditionalIncludeDirectories="../../"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
WarningLevel="3"
Expand Down Expand Up @@ -166,7 +166,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\main.cpp"
RelativePath="../../envtest/main.cpp"
>
</File>
</Filter>
Expand Down
14 changes: 9 additions & 5 deletions editenv.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,15 @@
#ifndef EDITENV_EDITENV_HPP
#define EDITENV_EDITENV_HPP

#ifdef EDITENV_BUILD
#define EDITENV_API __declspec(dllexport)
#else
#define EDITENV_API __declspec(dllimport)
#endif // EDITENV_BUILD
#ifdef EDITENV_STATIC
#define EDITENV_API /* For static linkage to work. */
#else
#ifdef EDITENV_BUILD
#define EDITENV_API __declspec(dllexport)
#else
#define EDITENV_API __declspec(dllimport)
#endif // EDITENV_BUILD
#endif // EDITENV_STATIC

#include "editenvTypes.hpp"
#include "EnvVar.hpp"
Expand Down
74 changes: 45 additions & 29 deletions editenv.sln
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editenv", "editenv.vcproj", "{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "envtest", "envtest\envtest.vcproj", "{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}"
ProjectSection(ProjectDependencies) = postProject
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1} = {59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.ActiveCfg = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.Build.0 = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.ActiveCfg = Release|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.Build.0 = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.ActiveCfg = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.Build.0 = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.ActiveCfg = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C++ Express 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editenv", "editenv.vcxproj", "{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "envtest", "envtest\envtest.vcxproj", "{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
ReleaseStatic|Win32 = ReleaseStatic|Win32
ReleaseStatic|x64 = ReleaseStatic|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.ActiveCfg = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|Win32.Build.0 = Debug|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|x64.ActiveCfg = Debug|x64
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Debug|x64.Build.0 = Debug|x64
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.ActiveCfg = Release|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|Win32.Build.0 = Release|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|x64.ActiveCfg = Release|x64
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.Release|x64.Build.0 = Release|x64
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.ReleaseStatic|Win32.Build.0 = ReleaseStatic|Win32
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
{59489F1B-1D27-43DB-9EB2-3BCB6F3D67F1}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.ActiveCfg = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|Win32.Build.0 = Debug|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|x64.ActiveCfg = Debug|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Debug|x64.Build.0 = Debug|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.ActiveCfg = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|Win32.Build.0 = Release|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|x64.ActiveCfg = Release|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.Release|x64.Build.0 = Release|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.ReleaseStatic|Win32.ActiveCfg = ReleaseStatic|Win32
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.ReleaseStatic|x64.ActiveCfg = ReleaseStatic|x64
{0A47F2D0-47F9-4D42-AAB6-692A8C75C010}.ReleaseStatic|x64.Build.0 = ReleaseStatic|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading