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
6d605e68
Commit
6d605e68
authored
Oct 11, 2010
by
Andrew Nguyen
Committed by
Alexandre Julliard
Oct 11, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel32: Make the return type of LoadModule match the Windows SDK.
parent
43e99d6e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
process.c
dlls/kernel32/process.c
+10
-10
winbase.h
include/winbase.h
+1
-1
No files found.
dlls/kernel32/process.c
View file @
6d605e68
...
...
@@ -2297,25 +2297,25 @@ UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
/**********************************************************************
* LoadModule (KERNEL32.@)
*/
HINSTANCE
WINAPI
LoadModule
(
LPCSTR
name
,
LPVOID
paramBlock
)
DWORD
WINAPI
LoadModule
(
LPCSTR
name
,
LPVOID
paramBlock
)
{
LOADPARMS32
*
params
=
paramBlock
;
PROCESS_INFORMATION
info
;
STARTUPINFOA
startup
;
HINSTANCE
hInstance
;
DWORD
ret
;
LPSTR
cmdline
,
p
;
char
filename
[
MAX_PATH
];
BYTE
len
;
if
(
!
name
)
return
(
HINSTANCE
)
ERROR_FILE_NOT_FOUND
;
if
(
!
name
)
return
ERROR_FILE_NOT_FOUND
;
if
(
!
SearchPathA
(
NULL
,
name
,
".exe"
,
sizeof
(
filename
),
filename
,
NULL
)
&&
!
SearchPathA
(
NULL
,
name
,
NULL
,
sizeof
(
filename
),
filename
,
NULL
))
return
ULongToHandle
(
GetLastError
()
);
return
GetLastError
(
);
len
=
(
BYTE
)
params
->
lpCmdLine
[
0
];
if
(
!
(
cmdline
=
HeapAlloc
(
GetProcessHeap
(),
0
,
strlen
(
filename
)
+
len
+
2
)))
return
(
HINSTANCE
)
ERROR_NOT_ENOUGH_MEMORY
;
return
ERROR_NOT_ENOUGH_MEMORY
;
strcpy
(
cmdline
,
filename
);
p
=
cmdline
+
strlen
(
cmdline
);
...
...
@@ -2337,19 +2337,19 @@ HINSTANCE WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
/* Give 30 seconds to the app to come up */
if
(
wait_input_idle
(
info
.
hProcess
,
30000
)
==
WAIT_FAILED
)
WARN
(
"WaitForInputIdle failed: Error %d
\n
"
,
GetLastError
()
);
hInstance
=
(
HINSTANCE
)
33
;
ret
=
33
;
/* Close off the handles */
CloseHandle
(
info
.
hThread
);
CloseHandle
(
info
.
hProcess
);
}
else
if
((
hInstance
=
ULongToHandle
(
GetLastError
()))
>=
(
HINSTANCE
)
32
)
else
if
((
ret
=
GetLastError
())
>=
32
)
{
FIXME
(
"Strange error set by CreateProcess: %
p
\n
"
,
hInstance
);
hInstance
=
(
HINSTANCE
)
11
;
FIXME
(
"Strange error set by CreateProcess: %
u
\n
"
,
ret
);
ret
=
11
;
}
HeapFree
(
GetProcessHeap
(),
0
,
cmdline
);
return
hInstance
;
return
ret
;
}
...
...
include/winbase.h
View file @
6d605e68
...
...
@@ -1887,7 +1887,7 @@ WINBASEAPI HMODULE WINAPI LoadLibraryW(LPCWSTR);
WINBASEAPI
HMODULE
WINAPI
LoadLibraryExA
(
LPCSTR
,
HANDLE
,
DWORD
);
WINBASEAPI
HMODULE
WINAPI
LoadLibraryExW
(
LPCWSTR
,
HANDLE
,
DWORD
);
#define LoadLibraryEx WINELIB_NAME_AW(LoadLibraryEx)
WINBASEAPI
HINSTANCE
WINAPI
LoadModule
(
LPCSTR
,
LPVOID
);
WINBASEAPI
DWORD
WINAPI
LoadModule
(
LPCSTR
,
LPVOID
);
WINBASEAPI
HGLOBAL
WINAPI
LoadResource
(
HMODULE
,
HRSRC
);
WINBASEAPI
HLOCAL
WINAPI
LocalAlloc
(
UINT
,
SIZE_T
)
__WINE_ALLOC_SIZE
(
2
);
WINBASEAPI
SIZE_T
WINAPI
LocalCompact
(
UINT
);
...
...
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