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
53ffeb67
Commit
53ffeb67
authored
Mar 29, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winedevice: Add the drivers directory to the dll search path.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
5f19e9c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
ntoskrnl.c
dlls/ntoskrnl.exe/ntoskrnl.c
+1
-1
device.c
programs/winedevice/device.c
+5
-0
No files found.
dlls/ntoskrnl.exe/ntoskrnl.c
View file @
53ffeb67
...
...
@@ -3691,7 +3691,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn
TRACE
(
"loading driver %s
\n
"
,
wine_dbgstr_w
(
str
)
);
module
=
LoadLibraryExW
(
str
,
0
,
LOAD_
WITH_ALTERED_SEARCH_PATH
);
module
=
LoadLibraryExW
(
str
,
0
,
LOAD_
LIBRARY_SEARCH_DLL_LOAD_DIR
|
LOAD_LIBRARY_SEARCH_DEFAULT_DIRS
);
if
(
module
&&
load_image_notify_routine_count
)
{
...
...
programs/winedevice/device.c
View file @
53ffeb67
...
...
@@ -115,6 +115,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
static
void
WINAPI
ServiceMain
(
DWORD
argc
,
LPWSTR
*
argv
)
{
WCHAR
driver_dir
[
MAX_PATH
];
const
WCHAR
*
service_group
=
(
argc
>=
2
)
?
argv
[
1
]
:
argv
[
0
];
if
(
!
(
stop_event
=
CreateEventW
(
NULL
,
TRUE
,
FALSE
,
NULL
)))
...
...
@@ -124,6 +125,10 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
if
(
!
(
service_handle
=
RegisterServiceCtrlHandlerExW
(
winedeviceW
,
service_handler
,
(
void
*
)
service_group
)))
return
;
GetSystemDirectoryW
(
driver_dir
,
MAX_PATH
);
wcscat
(
driver_dir
,
L"
\\
drivers"
);
AddDllDirectory
(
driver_dir
);
TRACE
(
"starting service group %s
\n
"
,
wine_dbgstr_w
(
service_group
)
);
set_service_status
(
service_handle
,
SERVICE_RUNNING
,
SERVICE_ACCEPT_STOP
|
SERVICE_ACCEPT_SHUTDOWN
);
...
...
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