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
f2e5b807
Commit
f2e5b807
authored
Dec 12, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32: Use the Get/SetComputerName functions from kernelbase.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7822b854
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
5 deletions
+16
-5
computername.c
dlls/kernel32/computername.c
+0
-0
kernel32.spec
dlls/kernel32/kernel32.spec
+5
-5
environ.c
dlls/kernel32/tests/environ.c
+11
-0
No files found.
dlls/kernel32/computername.c
View file @
f2e5b807
This diff is collapsed.
Click to expand it.
dlls/kernel32/kernel32.spec
View file @
f2e5b807
...
...
@@ -576,7 +576,7 @@
@ stdcall -import GetCompressedFileSizeW(long ptr)
@ stdcall GetComputerNameA(ptr ptr)
@ stdcall GetComputerNameExA(long ptr ptr)
@ stdcall GetComputerNameExW(long ptr ptr)
@ stdcall
-import
GetComputerNameExW(long ptr ptr)
@ stdcall GetComputerNameW(ptr ptr)
@ stub GetConsoleAliasA
@ stub GetConsoleAliasExesA
...
...
@@ -1338,10 +1338,10 @@
@ stdcall -import SetCommMask(long long)
@ stdcall -import SetCommState(long ptr)
@ stdcall -import SetCommTimeouts(long ptr)
@ stdcall SetComputerNameA(str)
@ stdcall SetComputerNameExA(long str)
@ stdcall SetComputerNameExW(long wstr)
@ stdcall SetComputerNameW(wstr)
@ stdcall
-import
SetComputerNameA(str)
@ stdcall
-import
SetComputerNameExA(long str)
@ stdcall
-import
SetComputerNameExW(long wstr)
@ stdcall
-import
SetComputerNameW(wstr)
@ stdcall -import SetConsoleActiveScreenBuffer(long)
@ stdcall -import SetConsoleCP(long)
# @ stub SetConsoleHistoryInfo
...
...
dlls/kernel32/tests/environ.c
View file @
f2e5b807
...
...
@@ -489,6 +489,12 @@ static void test_GetComputerNameExA(void)
ok
(
ret
==
0
,
"Expected 0, got %d
\n
"
,
ret
);
ok
(
error
==
ERROR_MORE_DATA
,
"Expected ERROR_MORE_DATA, got %d
\n
"
,
error
);
size
=
0
;
ret
=
pGetComputerNameExA
(
ComputerNameNetBIOS
,
NULL
,
&
size
);
error
=
GetLastError
();
ok
(
ret
==
0
,
"Expected 0, got %d
\n
"
,
ret
);
ok
(
error
==
ERROR_MORE_DATA
,
"Expected ERROR_MORE_DATA, got %d
\n
"
,
error
);
/* size is not set in win2k */
if
(
size
==
0
)
size
=
MAX_COMP_NAME
;
...
...
@@ -552,6 +558,11 @@ static void test_GetComputerNameExW(void)
ret
=
pGetComputerNameExW
(
ComputerNameNetBIOS
,
nameW
,
&
size
);
ok
(
ret
,
"GetComputerNameExW(ComputerNameNetBIOS) failed with error %d
\n
"
,
GetLastError
());
HeapFree
(
GetProcessHeap
(),
0
,
nameW
);
size
=
0
;
ret
=
pGetComputerNameExW
(
ComputerNameNetBIOS
,
NULL
,
&
size
);
error
=
GetLastError
();
ok
(
!
ret
&&
error
==
ERROR_MORE_DATA
,
"GetComputerNameExW should have failed with ERROR_MORE_DATA instead of %d
\n
"
,
error
);
}
static
void
test_GetEnvironmentStringsW
(
void
)
...
...
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