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
3f6c6dbb
Commit
3f6c6dbb
authored
May 16, 2014
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sane.ds: Remove unnecessary DllMain implementation when SANE is missing.
parent
78cf6059
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
sane_main.c
dlls/sane.ds/sane_main.c
+4
-10
No files found.
dlls/sane.ds/sane_main.c
View file @
3f6c6dbb
...
...
@@ -30,10 +30,10 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
twain
);
HINSTANCE
SANE_instance
;
#ifdef SONAME_LIBSANE
HINSTANCE
SANE_instance
;
static
void
*
libsane_handle
;
static
void
close_libsane
(
void
*
h
)
...
...
@@ -79,8 +79,6 @@ static void *open_libsane(void)
return
h
;
}
#endif
/* SONAME_LIBSANE */
BOOL
WINAPI
DllMain
(
HINSTANCE
hinstDLL
,
DWORD
fdwReason
,
LPVOID
lpvReserved
)
{
TRACE
(
"%p,%x,%p
\n
"
,
hinstDLL
,
fdwReason
,
lpvReserved
);
...
...
@@ -88,7 +86,6 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
switch
(
fdwReason
)
{
case
DLL_PROCESS_ATTACH
:
{
#ifdef SONAME_LIBSANE
SANE_Int
version_code
;
libsane_handle
=
open_libsane
();
...
...
@@ -96,28 +93,25 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
return
FALSE
;
psane_init
(
&
version_code
,
NULL
);
#endif
SANE_instance
=
hinstDLL
;
DisableThreadLibraryCalls
(
hinstDLL
);
break
;
}
case
DLL_PROCESS_DETACH
:
if
(
lpvReserved
)
break
;
#ifdef SONAME_LIBSANE
TRACE
(
"calling sane_exit()
\n
"
);
psane_exit
();
close_libsane
(
libsane_handle
);
#endif
break
;
}
return
TRUE
;
}
#ifdef SONAME_LIBSANE
static
TW_UINT16
SANE_GetIdentity
(
pTW_IDENTITY
,
pTW_IDENTITY
);
static
TW_UINT16
SANE_OpenDS
(
pTW_IDENTITY
,
pTW_IDENTITY
);
#endif
#endif
/* SONAME_LIBSANE */
static
TW_UINT16
SANE_SourceControlHandler
(
pTW_IDENTITY
pOrigin
,
...
...
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