Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
7e8c096a
Commit
7e8c096a
authored
Jan 17, 2005
by
Paul Vriens
Committed by
Alexandre Julliard
Jan 17, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the order of Src and Dst in CopyKey calls/functions.
parent
149b6e38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
reg.c
dlls/shlwapi/reg.c
+8
-8
shreg.c
dlls/shlwapi/tests/shreg.c
+1
-1
No files found.
dlls/shlwapi/reg.c
View file @
7e8c096a
...
...
@@ -2038,9 +2038,9 @@ HKEY WINAPI SHRegDuplicateHKey(HKEY hKey)
* Copy a key and its values/sub keys to another location.
*
* PARAMS
* hKeyDst [I] Destination key
* lpszSubKey [I] Sub key under hKeyDst, or NULL to use hKeyDst directly
* hKeySrc [I] Source key to copy from
* lpszSubKey [I] Sub key under hKeyDst, or NULL to use hKeyDst directly
* hKeyDst [I] Destination key
* dwReserved [I] Reserved, must be 0
*
* RETURNS
...
...
@@ -2052,16 +2052,16 @@ HKEY WINAPI SHRegDuplicateHKey(HKEY hKey)
* (It will loop until out of stack, or the registry is full). This
* bug is present in Win32 also.
*/
DWORD
WINAPI
SHCopyKeyA
(
HKEY
hKey
Dst
,
LPCSTR
lpszSubKey
,
HKEY
hKeySrc
,
DWORD
dwReserved
)
DWORD
WINAPI
SHCopyKeyA
(
HKEY
hKey
Src
,
LPCSTR
lpszSubKey
,
HKEY
hKeyDst
,
DWORD
dwReserved
)
{
WCHAR
szSubKeyW
[
MAX_PATH
];
TRACE
(
"(hkey=%p,%s,%p08x,%ld)
\n
"
,
hKey
Dst
,
debugstr_a
(
lpszSubKey
),
hKeySrc
,
dwReserved
);
TRACE
(
"(hkey=%p,%s,%p08x,%ld)
\n
"
,
hKey
Src
,
debugstr_a
(
lpszSubKey
),
hKeyDst
,
dwReserved
);
if
(
lpszSubKey
)
MultiByteToWideChar
(
0
,
0
,
lpszSubKey
,
-
1
,
szSubKeyW
,
MAX_PATH
);
return
SHCopyKeyW
(
hKey
Dst
,
lpszSubKey
?
szSubKeyW
:
NULL
,
hKeySrc
,
dwReserved
);
return
SHCopyKeyW
(
hKey
Src
,
lpszSubKey
?
szSubKeyW
:
NULL
,
hKeyDst
,
dwReserved
);
}
/*************************************************************************
...
...
@@ -2069,7 +2069,7 @@ DWORD WINAPI SHCopyKeyA(HKEY hKeyDst, LPCSTR lpszSubKey, HKEY hKeySrc, DWORD dwR
*
* See SHCopyKeyA.
*/
DWORD
WINAPI
SHCopyKeyW
(
HKEY
hKey
Dst
,
LPCWSTR
lpszSubKey
,
HKEY
hKeySrc
,
DWORD
dwReserved
)
DWORD
WINAPI
SHCopyKeyW
(
HKEY
hKey
Src
,
LPCWSTR
lpszSubKey
,
HKEY
hKeyDst
,
DWORD
dwReserved
)
{
DWORD
dwKeyCount
=
0
,
dwValueCount
=
0
,
dwMaxKeyLen
=
0
;
DWORD
dwMaxValueLen
=
0
,
dwMaxDataLen
=
0
,
i
;
...
...
@@ -2078,7 +2078,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeyDst, LPCWSTR lpszSubKey, HKEY hKeySrc, DWORD dw
WCHAR
szName
[
MAX_PATH
],
*
lpszName
=
szName
;
DWORD
dwRet
=
S_OK
;
TRACE
(
"hkey=%p,%s,%p08x,%ld)
\n
"
,
hKey
Dst
,
debugstr_w
(
lpszSubKey
),
hKeySrc
,
dwReserved
);
TRACE
(
"hkey=%p,%s,%p08x,%ld)
\n
"
,
hKey
Src
,
debugstr_w
(
lpszSubKey
),
hKeyDst
,
dwReserved
);
if
(
!
hKeyDst
||
!
hKeySrc
)
dwRet
=
ERROR_INVALID_PARAMETER
;
...
...
@@ -2134,7 +2134,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeyDst, LPCWSTR lpszSubKey, HKEY hKeySrc, DWORD dw
if
(
!
dwRet
)
{
/* Recursively copy keys and values from the sub key */
dwRet
=
SHCopyKeyW
(
hSubKey
Dst
,
NULL
,
hSubKeySrc
,
0
);
dwRet
=
SHCopyKeyW
(
hSubKey
Src
,
NULL
,
hSubKeyDst
,
0
);
RegCloseKey
(
hSubKeyDst
);
}
}
...
...
dlls/shlwapi/tests/shreg.c
View file @
7e8c096a
...
...
@@ -250,7 +250,7 @@ static void test_SHCopyKey(void)
if
(
pSHCopyKeyA
)
ok
(
!
(
*
pSHCopyKeyA
)(
hKey
Dst
,
NULL
,
hKeySrc
,
0
),
"failed copy
\n
"
);
ok
(
!
(
*
pSHCopyKeyA
)(
hKey
Src
,
NULL
,
hKeyDst
,
0
),
"failed copy
\n
"
);
RegCloseKey
(
hKeySrc
);
RegCloseKey
(
hKeyDst
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment