Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
4588bb11
Commit
4588bb11
authored
10 years ago
by
Nikolay Sivov
Committed by
Alexandre Julliard
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wshom.ocx: Implement RegWrite().
parent
129862f3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/wshom.ocx/Makefile.in
+1
-1
1 addition, 1 deletion
dlls/wshom.ocx/Makefile.in
dlls/wshom.ocx/shell.c
+129
-27
129 additions, 27 deletions
dlls/wshom.ocx/shell.c
dlls/wshom.ocx/tests/wshom.c
+80
-1
80 additions, 1 deletion
dlls/wshom.ocx/tests/wshom.c
with
210 additions
and
29 deletions
dlls/wshom.ocx/Makefile.in
+
1
−
1
View file @
4588bb11
MODULE
=
wshom.ocx
IMPORTS
=
uuid oleaut32 ole32 shell32
IMPORTS
=
uuid oleaut32 ole32 shell32
advapi32
C_SRCS
=
\
shell.c
\
...
...
This diff is collapsed.
Click to expand it.
dlls/wshom.ocx/shell.c
+
129
−
27
View file @
4588bb11
...
...
@@ -1035,12 +1035,46 @@ static HKEY get_root_key(const WCHAR *path)
return
NULL
;
}
/* Caller is responsible to free 'subkey' if 'value' is not NULL */
static
HRESULT
split_reg_path
(
const
WCHAR
*
path
,
WCHAR
**
subkey
,
WCHAR
**
value
)
{
*
value
=
NULL
;
/* at least one separator should be present */
*
subkey
=
strchrW
(
path
,
'\\'
);
if
(
!*
subkey
)
return
HRESULT_FROM_WIN32
(
ERROR_PATH_NOT_FOUND
);
/* default value or not */
if
((
*
subkey
)[
strlenW
(
*
subkey
)
-
1
]
==
'\\'
)
{
(
*
subkey
)
++
;
*
value
=
NULL
;
}
else
{
*
value
=
strrchrW
(
*
subkey
,
'\\'
);
if
(
*
value
-
*
subkey
>
1
)
{
unsigned
int
len
=
*
value
-
*
subkey
-
1
;
WCHAR
*
ret
;
ret
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
len
+
1
)
*
sizeof
(
WCHAR
));
if
(
!
ret
)
return
E_OUTOFMEMORY
;
memcpy
(
ret
,
*
subkey
+
1
,
len
*
sizeof
(
WCHAR
));
ret
[
len
]
=
0
;
*
subkey
=
ret
;
}
(
*
value
)
++
;
}
return
S_OK
;
}
static
HRESULT
WINAPI
WshShell3_RegRead
(
IWshShell3
*
iface
,
BSTR
name
,
VARIANT
*
value
)
{
DWORD
type
,
datalen
,
ret
;
WCHAR
*
keyname
,
*
val
;
HRESULT
hr
=
S_OK
;
BSTR
subkey
=
NULL
;
WCHAR
*
subkey
,
*
val
;
HRESULT
hr
;
HKEY
root
;
TRACE
(
"(%s %p)
\n
"
,
debugstr_w
(
name
),
value
);
...
...
@@ -1052,28 +1086,13 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v
if
(
!
root
)
return
HRESULT_FROM_WIN32
(
ERROR_PATH_NOT_FOUND
);
/* at least one separator should be present */
keyname
=
strchrW
(
name
,
'\\'
);
if
(
!
keyname
)
return
HRESULT_FROM_WIN32
(
ERROR_PATH_NOT_FOUND
);
/* default value or not */
if
(
keyname
[
strlenW
(
keyname
)
-
1
]
==
'\\'
)
{
keyname
++
;
val
=
NULL
;
}
else
{
val
=
strrchrW
(
keyname
,
'\\'
);
if
(
val
-
keyname
>
1
)
{
subkey
=
SysAllocStringLen
(
keyname
+
1
,
val
-
keyname
-
1
);
keyname
=
subkey
;
}
val
++
;
}
hr
=
split_reg_path
(
name
,
&
subkey
,
&
val
);
if
(
FAILED
(
hr
))
return
hr
;
type
=
REG_NONE
;
datalen
=
0
;
ret
=
RegGetValueW
(
root
,
key
name
,
val
,
RRF_RT_ANY
,
&
type
,
NULL
,
&
datalen
);
ret
=
RegGetValueW
(
root
,
sub
key
,
val
,
RRF_RT_ANY
,
&
type
,
NULL
,
&
datalen
);
if
(
ret
==
ERROR_SUCCESS
)
{
void
*
data
;
...
...
@@ -1083,7 +1102,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v
goto
fail
;
}
ret
=
RegGetValueW
(
root
,
key
name
,
val
,
RRF_RT_ANY
,
&
type
,
data
,
&
datalen
);
ret
=
RegGetValueW
(
root
,
sub
key
,
val
,
RRF_RT_ANY
,
&
type
,
data
,
&
datalen
);
if
(
ret
)
{
HeapFree
(
GetProcessHeap
(),
0
,
data
);
hr
=
HRESULT_FROM_WIN32
(
ret
);
...
...
@@ -1183,14 +1202,97 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v
hr
=
HRESULT_FROM_WIN32
(
ret
);
fail:
SysFreeString
(
subkey
);
if
(
val
)
HeapFree
(
GetProcessHeap
(),
0
,
subkey
);
return
hr
;
}
static
HRESULT
WINAPI
WshShell3_RegWrite
(
IWshShell3
*
iface
,
BSTR
N
ame
,
VARIANT
*
V
alue
,
VARIANT
*
T
ype
)
static
HRESULT
WINAPI
WshShell3_RegWrite
(
IWshShell3
*
iface
,
BSTR
n
ame
,
VARIANT
*
v
alue
,
VARIANT
*
t
ype
)
{
FIXME
(
"(%s %s %s): stub
\n
"
,
debugstr_w
(
Name
),
debugstr_variant
(
Value
),
debugstr_variant
(
Type
));
return
E_NOTIMPL
;
static
const
WCHAR
regexpandszW
[]
=
{
'R'
,
'E'
,
'G'
,
'_'
,
'E'
,
'X'
,
'P'
,
'A'
,
'N'
,
'D'
,
'_'
,
'S'
,
'Z'
,
0
};
static
const
WCHAR
regszW
[]
=
{
'R'
,
'E'
,
'G'
,
'_'
,
'S'
,
'Z'
,
0
};
static
const
WCHAR
regdwordW
[]
=
{
'R'
,
'E'
,
'G'
,
'_'
,
'D'
,
'W'
,
'O'
,
'R'
,
'D'
,
0
};
static
const
WCHAR
regbinaryW
[]
=
{
'R'
,
'E'
,
'G'
,
'_'
,
'B'
,
'I'
,
'N'
,
'A'
,
'R'
,
'Y'
,
0
};
DWORD
regtype
,
data_len
;
WCHAR
*
subkey
,
*
val
;
const
BYTE
*
data
;
HRESULT
hr
;
HKEY
root
;
VARIANT
v
;
LONG
ret
;
TRACE
(
"(%s %s %s)
\n
"
,
debugstr_w
(
name
),
debugstr_variant
(
value
),
debugstr_variant
(
type
));
if
(
!
name
||
!
value
||
!
type
)
return
E_POINTER
;
root
=
get_root_key
(
name
);
if
(
!
root
)
return
HRESULT_FROM_WIN32
(
ERROR_PATH_NOT_FOUND
);
/* value type */
if
(
is_optional_argument
(
type
))
regtype
=
REG_SZ
;
else
{
if
(
V_VT
(
type
)
!=
VT_BSTR
)
return
E_INVALIDARG
;
if
(
!
strcmpW
(
V_BSTR
(
type
),
regszW
))
regtype
=
REG_SZ
;
else
if
(
!
strcmpW
(
V_BSTR
(
type
),
regdwordW
))
regtype
=
REG_DWORD
;
else
if
(
!
strcmpW
(
V_BSTR
(
type
),
regexpandszW
))
regtype
=
REG_EXPAND_SZ
;
else
if
(
!
strcmpW
(
V_BSTR
(
type
),
regbinaryW
))
regtype
=
REG_BINARY
;
else
{
FIXME
(
"unrecognized value type %s
\n
"
,
debugstr_w
(
V_BSTR
(
type
)));
return
E_FAIL
;
}
}
/* it's always a string or a DWORD */
VariantInit
(
&
v
);
switch
(
regtype
)
{
case
REG_SZ
:
case
REG_EXPAND_SZ
:
hr
=
VariantChangeType
(
&
v
,
value
,
0
,
VT_BSTR
);
if
(
hr
==
S_OK
)
{
data
=
(
BYTE
*
)
V_BSTR
(
&
v
);
data_len
=
SysStringByteLen
(
V_BSTR
(
&
v
))
+
sizeof
(
WCHAR
);
}
break
;
case
REG_DWORD
:
case
REG_BINARY
:
hr
=
VariantChangeType
(
&
v
,
value
,
0
,
VT_I4
);
data
=
(
BYTE
*
)
&
V_I4
(
&
v
);
data_len
=
sizeof
(
DWORD
);
break
;
default:
FIXME
(
"unexpected regtype %d
\n
"
,
regtype
);
return
E_FAIL
;
};
if
(
FAILED
(
hr
))
{
FIXME
(
"failed to convert value, regtype %d, 0x%08x
\n
"
,
regtype
,
hr
);
return
hr
;
}
hr
=
split_reg_path
(
name
,
&
subkey
,
&
val
);
if
(
FAILED
(
hr
))
goto
fail
;
ret
=
RegSetKeyValueW
(
root
,
subkey
,
val
,
regtype
,
data
,
data_len
);
if
(
ret
)
hr
=
HRESULT_FROM_WIN32
(
ret
);
fail:
VariantClear
(
&
v
);
if
(
val
)
HeapFree
(
GetProcessHeap
(),
0
,
subkey
);
return
hr
;
}
static
HRESULT
WINAPI
WshShell3_RegDelete
(
IWshShell3
*
iface
,
BSTR
Name
)
...
...
This diff is collapsed.
Click to expand it.
dlls/wshom.ocx/tests/wshom.c
+
80
−
1
View file @
4588bb11
...
...
@@ -240,10 +240,10 @@ static void test_registry(void)
static
const
WCHAR
brokenW
[]
=
{
'H'
,
'K'
,
'E'
,
'Y'
,
'_'
,
'b'
,
'r'
,
'o'
,
'k'
,
'e'
,
'n'
,
'_'
,
'k'
,
'e'
,
'y'
,
0
};
static
const
WCHAR
broken2W
[]
=
{
'H'
,
'K'
,
'E'
,
'Y'
,
'_'
,
'C'
,
'U'
,
'R'
,
'R'
,
'E'
,
'N'
,
'T'
,
'_'
,
'U'
,
'S'
,
'E'
,
'R'
,
'a'
,
0
};
WCHAR
pathW
[
MAX_PATH
];
DWORD
dwvalue
,
type
;
VARIANT
value
,
v
;
IWshShell3
*
sh3
;
VARTYPE
vartype
;
DWORD
dwvalue
;
LONG
bound
;
HRESULT
hr
;
BSTR
name
;
...
...
@@ -255,6 +255,7 @@ static void test_registry(void)
&
IID_IWshShell3
,
(
void
**
)
&
sh3
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
/* RegRead() */
V_VT
(
&
value
)
=
VT_I2
;
hr
=
IWshShell3_RegRead
(
sh3
,
NULL
,
&
value
);
ok
(
hr
==
E_POINTER
,
"got 0x%08x
\n
"
,
hr
);
...
...
@@ -388,6 +389,84 @@ static void test_registry(void)
VariantClear
(
&
value
);
SysFreeString
(
name
);
delete_key
(
root
);
/* RegWrite() */
ret
=
RegCreateKeyA
(
HKEY_CURRENT_USER
,
"Software
\\
Wine
\\
Test"
,
&
root
);
ok
(
ret
==
0
,
"got %d
\n
"
,
ret
);
hr
=
IWshShell3_RegWrite
(
sh3
,
NULL
,
NULL
,
NULL
);
ok
(
hr
==
E_POINTER
,
"got 0x%08x
\n
"
,
hr
);
lstrcpyW
(
pathW
,
keypathW
);
lstrcatW
(
pathW
,
regszW
);
name
=
SysAllocString
(
pathW
);
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
NULL
,
NULL
);
ok
(
hr
==
E_POINTER
,
"got 0x%08x
\n
"
,
hr
);
VariantInit
(
&
value
);
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
NULL
);
ok
(
hr
==
E_POINTER
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
value
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
/* type is optional */
V_VT
(
&
v
)
=
VT_ERROR
;
V_ERROR
(
&
v
)
=
DISP_E_PARAMNOTFOUND
;
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
v
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
/* default type is REG_SZ */
V_VT
(
&
value
)
=
VT_I4
;
V_I4
(
&
value
)
=
12
;
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
v
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
type
=
REG_NONE
;
ret
=
RegGetValueA
(
root
,
NULL
,
"regsz"
,
RRF_RT_ANY
,
&
type
,
NULL
,
NULL
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
ok
(
type
==
REG_SZ
,
"got %d
\n
"
,
type
);
ret
=
RegDeleteValueA
(
root
,
"regsz"
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
V_VT
(
&
value
)
=
VT_BSTR
;
V_BSTR
(
&
value
)
=
SysAllocString
(
regszW
);
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
v
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
VariantClear
(
&
value
);
type
=
REG_NONE
;
ret
=
RegGetValueA
(
root
,
NULL
,
"regsz"
,
RRF_RT_ANY
,
&
type
,
NULL
,
NULL
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
ok
(
type
==
REG_SZ
,
"got %d
\n
"
,
type
);
ret
=
RegDeleteValueA
(
root
,
"regsz"
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
V_VT
(
&
value
)
=
VT_R4
;
V_R4
(
&
value
)
=
1
.
2
;
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
v
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
VariantClear
(
&
value
);
type
=
REG_NONE
;
ret
=
RegGetValueA
(
root
,
NULL
,
"regsz"
,
RRF_RT_ANY
,
&
type
,
NULL
,
NULL
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
ok
(
type
==
REG_SZ
,
"got %d
\n
"
,
type
);
ret
=
RegDeleteValueA
(
root
,
"regsz"
);
ok
(
ret
==
ERROR_SUCCESS
,
"got %d
\n
"
,
ret
);
V_VT
(
&
value
)
=
VT_R4
;
V_R4
(
&
value
)
=
1
.
2
;
V_VT
(
&
v
)
=
VT_I2
;
V_I2
(
&
v
)
=
1
;
hr
=
IWshShell3_RegWrite
(
sh3
,
name
,
&
value
,
&
v
);
ok
(
hr
==
E_INVALIDARG
,
"got 0x%08x
\n
"
,
hr
);
VariantClear
(
&
value
);
SysFreeString
(
name
);
delete_key
(
root
);
IWshShell3_Release
(
sh3
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment