Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
c4e71c2e
Commit
c4e71c2e
authored
14 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
14 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wiaservc: COM cleanup for the IWiaDevMgr iface.
parent
70a1ce99
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/wiaservc/wiadevmgr.c
+15
-15
15 additions, 15 deletions
dlls/wiaservc/wiadevmgr.c
dlls/wiaservc/wiaservc_private.h
+1
-1
1 addition, 1 deletion
dlls/wiaservc/wiaservc_private.h
with
16 additions
and
16 deletions
dlls/wiaservc/wiadevmgr.c
+
15
−
15
View file @
c4e71c2e
...
...
@@ -29,14 +29,14 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
wia
);
static
inline
wiadevmgr
*
impl_from_WiaDevMgr
(
IWiaDevMgr
*
iface
)
static
inline
wiadevmgr
*
impl_from_
I
WiaDevMgr
(
IWiaDevMgr
*
iface
)
{
return
(
wiadevmgr
*
)((
char
*
)
iface
-
FIELD_OFFSET
(
wiadevmgr
,
lpVtbl
)
);
return
CONTAINING_RECORD
(
iface
,
wiadevmgr
,
IWiaDevMgr_iface
);
}
static
HRESULT
WINAPI
wiadevmgr_QueryInterface
(
IWiaDevMgr
*
iface
,
REFIID
riid
,
void
**
ppvObject
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
TRACE
(
"(%p, %s, %p)
\n
"
,
This
,
debugstr_guid
(
riid
),
ppvObject
);
...
...
@@ -54,14 +54,14 @@ static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, v
static
ULONG
WINAPI
wiadevmgr_AddRef
(
IWiaDevMgr
*
iface
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
return
InterlockedIncrement
(
&
This
->
ref
);
}
static
ULONG
WINAPI
wiadevmgr_Release
(
IWiaDevMgr
*
iface
)
{
ULONG
ref
;
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
ref
=
InterlockedDecrement
(
&
This
->
ref
);
if
(
ref
==
0
)
...
...
@@ -71,14 +71,14 @@ static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface)
static
HRESULT
WINAPI
wiadevmgr_EnumDeviceInfo
(
IWiaDevMgr
*
iface
,
LONG
lFlag
,
IEnumWIA_DEV_INFO
**
ppIEnum
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %d, %p): stub
\n
"
,
This
,
lFlag
,
ppIEnum
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
wiadevmgr_CreateDevice
(
IWiaDevMgr
*
iface
,
BSTR
bstrDeviceID
,
IWiaItem
**
ppWiaItemRoot
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %s, %p): stub
\n
"
,
This
,
debugstr_w
(
bstrDeviceID
),
ppWiaItemRoot
);
return
E_NOTIMPL
;
}
...
...
@@ -86,7 +86,7 @@ static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceI
static
HRESULT
WINAPI
wiadevmgr_SelectDeviceDlg
(
IWiaDevMgr
*
iface
,
HWND
hwndParent
,
LONG
lDeviceType
,
LONG
lFlags
,
BSTR
*
pbstrDeviceID
,
IWiaItem
**
ppItemRoot
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %p, %d, 0x%x, %p, %p): stub
\n
"
,
This
,
hwndParent
,
lDeviceType
,
lFlags
,
pbstrDeviceID
,
ppItemRoot
);
return
E_NOTIMPL
;
}
...
...
@@ -94,7 +94,7 @@ static HRESULT WINAPI wiadevmgr_SelectDeviceDlg(IWiaDevMgr *iface, HWND hwndPare
static
HRESULT
WINAPI
wiadevmgr_SelectDeviceDlgID
(
IWiaDevMgr
*
iface
,
HWND
hwndParent
,
LONG
lDeviceType
,
LONG
lFlags
,
BSTR
*
pbstrDeviceID
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %p, %d, 0x%x, %p): stub
\n
"
,
This
,
hwndParent
,
lDeviceType
,
lFlags
,
pbstrDeviceID
);
return
E_NOTIMPL
;
}
...
...
@@ -103,7 +103,7 @@ static HRESULT WINAPI wiadevmgr_GetImageDlg(IWiaDevMgr *iface, HWND hwndParent,
LONG
lFlags
,
LONG
lIntent
,
IWiaItem
*
pItemRoot
,
BSTR
bstrFilename
,
GUID
*
pguidFormat
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %p, %d, 0x%x, %d, %p, %s, %s): stub
\n
"
,
This
,
hwndParent
,
lDeviceType
,
lFlags
,
lIntent
,
pItemRoot
,
debugstr_w
(
bstrFilename
),
debugstr_guid
(
pguidFormat
));
return
E_NOTIMPL
;
...
...
@@ -113,7 +113,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackProgram(IWiaDevMgr *iface,
const
GUID
*
pEventGUID
,
BSTR
bstrCommandline
,
BSTR
bstrName
,
BSTR
bstrDescription
,
BSTR
bstrIcon
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub
\n
"
,
This
,
lFlags
,
debugstr_w
(
bstrDeviceID
),
debugstr_guid
(
pEventGUID
),
debugstr_w
(
bstrCommandline
),
debugstr_w
(
bstrName
),
debugstr_w
(
bstrDescription
),
debugstr_w
(
bstrIcon
));
...
...
@@ -124,7 +124,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackInterface(IWiaDevMgr *iface
const
GUID
*
pEventGUID
,
IWiaEventCallback
*
pIWiaEventCallback
,
IUnknown
**
pEventObject
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, 0x%x, %s, %s, %p, %p): stub
\n
"
,
This
,
lFlags
,
debugstr_w
(
bstrDeviceID
),
debugstr_guid
(
pEventGUID
),
pIWiaEventCallback
,
pEventObject
);
return
E_NOTIMPL
;
...
...
@@ -134,7 +134,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO
const
GUID
*
pEventGUID
,
const
GUID
*
pClsID
,
BSTR
bstrName
,
BSTR
bstrDescription
,
BSTR
bstrIcon
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, 0x%x, %s, %s, %s, %s, %s, %s): stub
\n
"
,
This
,
lFlags
,
debugstr_w
(
bstrDeviceID
),
debugstr_guid
(
pEventGUID
),
debugstr_guid
(
pClsID
),
debugstr_w
(
bstrName
),
debugstr_w
(
bstrDescription
),
debugstr_w
(
bstrIcon
));
...
...
@@ -143,7 +143,7 @@ static HRESULT WINAPI wiadevmgr_RegisterEventCallbackCLSID(IWiaDevMgr *iface, LO
static
HRESULT
WINAPI
wiadevmgr_AddDeviceDlg
(
IWiaDevMgr
*
iface
,
HWND
hwndParent
,
LONG
lFlags
)
{
wiadevmgr
*
This
=
impl_from_WiaDevMgr
(
iface
);
wiadevmgr
*
This
=
impl_from_
I
WiaDevMgr
(
iface
);
FIXME
(
"(%p, %p, 0x%x): stub
\n
"
,
This
,
hwndParent
,
lFlags
);
return
E_NOTIMPL
;
}
...
...
@@ -171,7 +171,7 @@ HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj)
This
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
wiadevmgr
));
if
(
This
)
{
This
->
lpVtbl
=
&
WIASERVC_IWiaDevMgr_Vtbl
;
This
->
IWiaDevMgr_iface
.
lpVtbl
=
&
WIASERVC_IWiaDevMgr_Vtbl
;
This
->
ref
=
1
;
*
ppObj
=
This
;
return
S_OK
;
...
...
This diff is collapsed.
Click to expand it.
dlls/wiaservc/wiaservc_private.h
+
1
−
1
View file @
c4e71c2e
...
...
@@ -30,7 +30,7 @@ extern ClassFactoryImpl WIASERVC_ClassFactory;
typedef
struct
{
const
IWiaDevMgr
Vtbl
*
lpVtbl
;
IWiaDevMgr
IWiaDevMgr
_iface
;
LONG
ref
;
}
wiadevmgr
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment