summaryrefslogtreecommitdiff
path: root/support/dktools/dk3wreg.c
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/dk3wreg.c
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dk3wreg.c')
-rw-r--r--support/dktools/dk3wreg.c60
1 files changed, 21 insertions, 39 deletions
diff --git a/support/dktools/dk3wreg.c b/support/dktools/dk3wreg.c
index 7dd8ee7d28..216c2eb817 100644
--- a/support/dktools/dk3wreg.c
+++ b/support/dktools/dk3wreg.c
@@ -1,36 +1,14 @@
/*
- WARNING: This file was generated by dkct.
- Changes you make here will be lost if dkct is run again!
- You should modify the original source and run dkct on it.
- Original source: dk3wreg.ctr
+Copyright (C) 2013-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
*/
/*
-Copyright (C) 2013-2017, Dirk Krause
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above opyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ WARNING: This file was generated by the dkct program (see
+ http://dktools.sourceforge.net/ for details).
+ Changes you make here will be lost if dkct is run again!
+ You should modify the original source and run dkct on it.
+ Original source: dk3wreg.ctr
*/
/** @file dk3wreg.c The dk3wreg module.
@@ -373,7 +351,7 @@ int
dk3wreg_key_delete(HKEY b, dkChar const *n, dk3_app_t *app)
{
int back = 0;
-#if _MSC_VER >= 1700 && (!(DK4_WINDOWS_LEGACY))
+#if (_WIN32) && defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0601)
long res;
@@ -658,7 +636,11 @@ dk3wreg_get_expanded_sz(
fe = REG_SZ;
if(dk3wreg_get_expand_sz(k, n, tp, ts, &fe, app)) {
if(REG_EXPAND_SZ == fe) {
- res = ExpandEnvironmentStrings(tp, dp, (DWORD)ds);
+#if DK3_CHAR_SIZE > 1
+ res = ExpandEnvironmentStringsW(tp, dp, (DWORD)ds);
+#else
+ res = ExpandEnvironmentStringsA(tp, dp, (DWORD)ds);
+#endif
if(0 < res) {
if((size_t)res < ds) {
back = 1;
@@ -683,16 +665,16 @@ dk3wreg_get_expanded_sz(
}
-#line 754 "dk3wreg.ctr"
+#line 758 "dk3wreg.ctr"
-#line 755 "dk3wreg.ctr"
+#line 759 "dk3wreg.ctr"
-#line 756 "dk3wreg.ctr"
+#line 760 "dk3wreg.ctr"
-#line 757 "dk3wreg.ctr"
+#line 761 "dk3wreg.ctr"
return back;
}
@@ -708,7 +690,7 @@ dk3wreg_get_dword(HKEY k, dkChar const *n, DWORD *b, dk3_app_t *app)
long res;
-#line 771 "dk3wreg.ctr"
+#line 775 "dk3wreg.ctr"
if((n) && (b)) {
dws = (DWORD)sizeof(DWORD);
dwres = (DWORD)0UL;
@@ -743,7 +725,7 @@ dk3wreg_get_dword(HKEY k, dkChar const *n, DWORD *b, dk3_app_t *app)
}
}
-#line 804 "dk3wreg.ctr"
+#line 808 "dk3wreg.ctr"
return back;
}
@@ -756,7 +738,7 @@ dk3wreg_entry_delete(HKEY k, dkChar const *n, dk3_app_t *app)
long res;
-#line 815 "dk3wreg.ctr"
+#line 819 "dk3wreg.ctr"
if(n) {
#if 2 == DK3_CHAR_SIZE
res = RegDeleteValueW(k, n);
@@ -770,7 +752,7 @@ dk3wreg_entry_delete(HKEY k, dkChar const *n, dk3_app_t *app)
}
}
-#line 827 "dk3wreg.ctr"
+#line 831 "dk3wreg.ctr"
return back;
}