Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
9f029b7d
Commit
9f029b7d
authored
Nov 15, 2002
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Warning fixes.
parent
56ab2b3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
computername.c
dlls/kernel/computername.c
+10
-8
rundll32.c
programs/rundll32/rundll32.c
+3
-3
No files found.
dlls/kernel/computername.c
View file @
9f029b7d
...
...
@@ -426,12 +426,13 @@ BOOL WINAPI GetComputerNameExA(COMPUTER_NAME_FORMAT type, LPSTR name, LPDWORD si
memcpy
(
name
,
buf
,
len
);
name
[
len
]
=
0
;
*
size
=
len
;
ret
=
TRUE
;
}
}
__EXCEPT
(
page_fault
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
ret
=
FALSE
;
ret
urn
FALSE
;
}
__ENDTRY
}
...
...
@@ -476,26 +477,27 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, LPWSTR name, LPDWORD
TRACE
(
"-> %s (%d)
\n
"
,
debugstr_a
(
buf
),
len
);
__TRY
{
int
len
=
MultiByteToWideChar
(
CP_ACP
,
0
,
buf
,
len
,
NULL
,
0
);
if
(
*
size
<
len
)
int
len
W
=
MultiByteToWideChar
(
CP_ACP
,
0
,
buf
,
len
,
NULL
,
0
);
if
(
*
size
<
len
W
)
{
MultiByteToWideChar
(
CP_ACP
,
0
,
buf
,
len
,
name
,
*
size
);
name
[
*
size
]
=
0
;
*
size
=
len
;
*
size
=
len
W
;
SetLastError
(
ERROR_MORE_DATA
);
ret
=
FALSE
;
}
else
{
MultiByteToWideChar
(
CP_ACP
,
0
,
buf
,
len
,
name
,
len
);
name
[
len
]
=
0
;
*
size
=
len
;
MultiByteToWideChar
(
CP_ACP
,
0
,
buf
,
len
,
name
,
lenW
);
name
[
lenW
]
=
0
;
*
size
=
lenW
;
ret
=
TRUE
;
}
}
__EXCEPT
(
page_fault
)
{
SetLastError
(
ERROR_INVALID_PARAMETER
);
ret
=
FALSE
;
ret
urn
FALSE
;
}
__ENDTRY
}
...
...
programs/rundll32/rundll32.c
View file @
9f029b7d
...
...
@@ -101,7 +101,7 @@ int main(int argc, char* argv[])
/* try loading the UNICODE version first */
strcpy
(
szEntryPoint
,
comma
+
1
);
strcat
(
szEntryPoint
,
"W"
);
pfEntryPointW
=
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
pfEntryPointW
=
(
EntryPointW
)
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
if
(
pfEntryPointW
!=
NULL
)
{
WCHAR
wszCmdLine
[
2048
];
...
...
@@ -112,11 +112,11 @@ int main(int argc, char* argv[])
{
strcpy
(
szEntryPoint
,
comma
+
1
);
strcat
(
szEntryPoint
,
"A"
);
pfEntryPointA
=
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
pfEntryPointA
=
(
EntryPointA
)
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
if
(
pfEntryPointA
==
NULL
)
{
strcpy
(
szEntryPoint
,
comma
+
1
);
pfEntryPointA
=
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
pfEntryPointA
=
(
EntryPointA
)
LoadProc
(
szDllName
,
szEntryPoint
,
&
DllHandle
);
if
(
pfEntryPointA
==
NULL
)
return
0
;
}
...
...
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