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
e3213978
Commit
e3213978
authored
Feb 10, 2022
by
Eric Pouech
Committed by
Alexandre Julliard
Feb 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explorerframe: Enable compilation with long types.
Signed-off-by:
Eric Pouech
<
eric.pouech@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1cc1ecf5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
29 deletions
+28
-29
Makefile.in
dlls/explorerframe/Makefile.in
+0
-1
explorerframe_main.c
dlls/explorerframe/explorerframe_main.c
+2
-2
nstc.c
dlls/explorerframe/nstc.c
+23
-23
taskbarlist.c
dlls/explorerframe/taskbarlist.c
+3
-3
No files found.
dlls/explorerframe/Makefile.in
View file @
e3213978
EXTRADEFS
=
-DWINE_NO_LONG_TYPES
MODULE
=
explorerframe.dll
IMPORTS
=
uuid ole32 comctl32 shell32 user32
...
...
dlls/explorerframe/explorerframe_main.c
View file @
e3213978
...
...
@@ -45,7 +45,7 @@ LONG EFRAME_refCount = 0;
*/
BOOL
WINAPI
DllMain
(
HINSTANCE
hinst
,
DWORD
fdwReason
,
LPVOID
fImpLoad
)
{
TRACE
(
"%p, 0x%x, %p
\n
"
,
hinst
,
fdwReason
,
fImpLoad
);
TRACE
(
"%p, 0x%
l
x, %p
\n
"
,
hinst
,
fdwReason
,
fImpLoad
);
switch
(
fdwReason
)
{
case
DLL_PROCESS_ATTACH
:
...
...
@@ -61,7 +61,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
*/
HRESULT
WINAPI
DllCanUnloadNow
(
void
)
{
TRACE
(
"refCount is %d
\n
"
,
EFRAME_refCount
);
TRACE
(
"refCount is %
l
d
\n
"
,
EFRAME_refCount
);
return
EFRAME_refCount
?
S_FALSE
:
S_OK
;
}
...
...
dlls/explorerframe/nstc.c
View file @
e3213978
...
...
@@ -192,7 +192,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs,
NSTCSTYLE
nstcs_mask
,
DWORD
*
new_style
)
{
DWORD
old_style
,
tv_mask
=
0
;
TRACE
(
"%p, %
x, %
x, %p
\n
"
,
This
,
nstcs
,
nstcs_mask
,
new_style
);
TRACE
(
"%p, %
lx, %l
x, %p
\n
"
,
This
,
nstcs
,
nstcs_mask
,
new_style
);
if
(
This
->
hwnd_tv
)
old_style
=
GetWindowLongPtrW
(
This
->
hwnd_tv
,
GWL_STYLE
);
...
...
@@ -232,7 +232,7 @@ static DWORD treeview_style_from_nstcs(NSTC2Impl *This, NSTCSTYLE nstcs,
*
new_style
=
(
old_style
&
~
tv_mask
)
|
(
*
new_style
&
tv_mask
);
TRACE
(
"old: %08
x, new: %08
x
\n
"
,
old_style
,
*
new_style
);
TRACE
(
"old: %08
lx, new: %08l
x
\n
"
,
old_style
,
*
new_style
);
return
old_style
^*
new_style
;
}
...
...
@@ -397,22 +397,22 @@ static UINT fill_sublevel(NSTC2Impl *This, HTREEITEM hitem)
IShellItem_Release
(
psi
);
}
else
ERR
(
"SHCreateShellItem failed with 0x%08x
\n
"
,
hr
);
ERR
(
"SHCreateShellItem failed with 0x%08
l
x
\n
"
,
hr
);
}
IEnumIDList_Release
(
peidl
);
}
else
ERR
(
"EnumObjects failed with 0x%08x
\n
"
,
hr
);
ERR
(
"EnumObjects failed with 0x%08
l
x
\n
"
,
hr
);
IShellFolder_Release
(
psf
);
}
else
ERR
(
"BindToHandler failed with 0x%08x
\n
"
,
hr
);
ERR
(
"BindToHandler failed with 0x%08
l
x
\n
"
,
hr
);
ILFree
(
pidl_parent
);
}
else
ERR
(
"SHGetIDListFromObject failed with 0x%08x
\n
"
,
hr
);
ERR
(
"SHGetIDListFromObject failed with 0x%08
l
x
\n
"
,
hr
);
return
added
;
}
...
...
@@ -590,7 +590,7 @@ static LRESULT on_tvn_getdispinfow(NSTC2Impl *This, LPARAM lParam)
ILFree
(
pidl
);
}
else
ERR
(
"Failed to get IDList (%08x).
\n
"
,
hr
);
ERR
(
"Failed to get IDList (%08
l
x).
\n
"
,
hr
);
}
}
...
...
@@ -606,7 +606,7 @@ static LRESULT on_tvn_getdispinfow(NSTC2Impl *This, LPARAM lParam)
CoTaskMemFree
(
display_name
);
}
else
ERR
(
"Failed to get display name (%08x).
\n
"
,
hr
);
ERR
(
"Failed to get display name (%08
l
x).
\n
"
,
hr
);
}
return
TRUE
;
...
...
@@ -700,7 +700,7 @@ static LRESULT on_wm_mbuttonup(NSTC2Impl *This, WPARAM wParam, LPARAM lParam)
TVHITTESTINFO
tvhit
;
IShellItem
*
psi
;
HRESULT
hr
;
TRACE
(
"%p (%
lx, %l
x)
\n
"
,
This
,
wParam
,
lParam
);
TRACE
(
"%p (%
Ix, %I
x)
\n
"
,
This
,
wParam
,
lParam
);
tvhit
.
pt
.
x
=
(
int
)(
short
)
LOWORD
(
lParam
);
tvhit
.
pt
.
y
=
(
int
)(
short
)
HIWORD
(
lParam
);
...
...
@@ -724,7 +724,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP
{
IShellItem
*
psi
;
HTREEITEM
hitem
;
TRACE
(
"%p : %d, %
lx, %l
x
\n
"
,
This
,
uMsg
,
wParam
,
lParam
);
TRACE
(
"%p : %d, %
Ix, %I
x
\n
"
,
This
,
uMsg
,
wParam
,
lParam
);
/* Handled by the client? */
if
(
FAILED
(
events_OnKeyboardInput
(
This
,
uMsg
,
wParam
,
lParam
)))
...
...
@@ -837,7 +837,7 @@ static ULONG WINAPI NSTC2_fnAddRef(INameSpaceTreeControl2* iface)
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
LONG
ref
=
InterlockedIncrement
(
&
This
->
ref
);
TRACE
(
"%p - ref %d
\n
"
,
This
,
ref
);
TRACE
(
"%p - ref %
l
d
\n
"
,
This
,
ref
);
return
ref
;
}
...
...
@@ -847,7 +847,7 @@ static ULONG WINAPI NSTC2_fnRelease(INameSpaceTreeControl2* iface)
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
LONG
ref
=
InterlockedDecrement
(
&
This
->
ref
);
TRACE
(
"%p - ref: %d
\n
"
,
This
,
ref
);
TRACE
(
"%p - ref: %
l
d
\n
"
,
This
,
ref
);
if
(
!
ref
)
{
...
...
@@ -871,10 +871,10 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface,
RECT
rc
;
static
const
WCHAR
NSTC2_CLASS_NAME
[]
=
L"NamespaceTreeControl"
;
TRACE
(
"%p (%p, %p, %x)
\n
"
,
This
,
hwndParent
,
prc
,
nstcsFlags
);
TRACE
(
"%p (%p, %p, %
l
x)
\n
"
,
This
,
hwndParent
,
prc
,
nstcsFlags
);
if
(
nstcsFlags
&
unsupported_styles
)
FIXME
(
"0x%08
x contains the unsupported style(s) 0x%08
x
\n
"
,
FIXME
(
"0x%08
lx contains the unsupported style(s) 0x%08l
x
\n
"
,
nstcsFlags
,
nstcsFlags
&
unsupported_styles
);
This
->
style
=
nstcsFlags
;
...
...
@@ -949,7 +949,7 @@ static HRESULT WINAPI NSTC2_fnTreeUnadvise(INameSpaceTreeControl2* iface, DWORD
{
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
TRACE
(
"%p (%x)
\n
"
,
This
,
cookie
);
TRACE
(
"%p (%
l
x)
\n
"
,
This
,
cookie
);
/* The cookie is ignored. */
...
...
@@ -987,7 +987,7 @@ static HRESULT WINAPI NSTC2_fnInsertRoot(INameSpaceTreeControl2* iface,
HTREEITEM
add_after_hitem
;
int
i
;
TRACE
(
"%p, %d, %p, %
x, %
x, %p
\n
"
,
This
,
iIndex
,
psiRoot
,
grfEnumFlags
,
grfRootStyle
,
pif
);
TRACE
(
"%p, %d, %p, %
lx, %l
x, %p
\n
"
,
This
,
iIndex
,
psiRoot
,
grfEnumFlags
,
grfRootStyle
,
pif
);
new_root
=
heap_alloc
(
sizeof
(
*
new_root
));
if
(
!
new_root
)
...
...
@@ -1045,7 +1045,7 @@ static HRESULT WINAPI NSTC2_fnAppendRoot(INameSpaceTreeControl2* iface,
{
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
UINT
root_count
;
TRACE
(
"%p, %p, %
x, %
x, %p
\n
"
,
TRACE
(
"%p, %p, %
lx, %l
x, %p
\n
"
,
This
,
psiRoot
,
grfEnumFlags
,
grfRootStyle
,
pif
);
root_count
=
list_count
(
&
This
->
roots
);
...
...
@@ -1151,7 +1151,7 @@ static HRESULT WINAPI NSTC2_fnSetItemState(INameSpaceTreeControl2* iface,
TVITEMEXW
tvi
;
HTREEITEM
hitem
;
TRACE
(
"%p (%p, %
x, %
x)
\n
"
,
This
,
psi
,
nstcisMask
,
nstcisFlags
);
TRACE
(
"%p (%p, %
lx, %l
x)
\n
"
,
This
,
psi
,
nstcisMask
,
nstcisFlags
);
hitem
=
treeitem_from_shellitem
(
This
,
psi
);
if
(
!
hitem
)
return
E_INVALIDARG
;
...
...
@@ -1213,7 +1213,7 @@ static HRESULT WINAPI NSTC2_fnGetItemState(INameSpaceTreeControl2* iface,
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
HTREEITEM
hitem
;
TVITEMEXW
tvi
;
TRACE
(
"%p (%p, %x, %p)
\n
"
,
This
,
psi
,
nstcisMask
,
pnstcisFlags
);
TRACE
(
"%p (%p, %
l
x, %p)
\n
"
,
This
,
psi
,
nstcisMask
,
pnstcisFlags
);
hitem
=
treeitem_from_shellitem
(
This
,
psi
);
if
(
!
hitem
)
...
...
@@ -1425,7 +1425,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle(INameSpaceTreeControl2* iface,
NSTCS_SINGLECLICKEXPAND
|
NSTCS_NOREPLACEOPEN
|
NSTCS_NOORDERSTREAM
|
NSTCS_FAVORITESMODE
|
NSTCS_EMPTYTEXT
|
NSTCS_ALLOWJUNCTIONS
|
NSTCS_SHOWTABSBUTTON
|
NSTCS_SHOWDELETEBUTTON
|
NSTCS_SHOWREFRESHBUTTON
;
TRACE
(
"%p (%
x, %
x)
\n
"
,
This
,
nstcsMask
,
nstcsStyle
);
TRACE
(
"%p (%
lx, %l
x)
\n
"
,
This
,
nstcsMask
,
nstcsStyle
);
/* Fail if there is an attempt to set an unknown style. */
if
(
nstcsMask
&
~
(
tv_style_flags
|
host_style_flags
|
nstc_flags
))
...
...
@@ -1455,7 +1455,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle(INameSpaceTreeControl2* iface,
}
if
((
nstcsStyle
&
nstcsMask
)
&
unsupported_styles
)
FIXME
(
"mask & style (0x%08
x) contains unsupported style(s): 0x%08
x
\n
"
,
FIXME
(
"mask & style (0x%08
lx) contains unsupported style(s): 0x%08l
x
\n
"
,
(
nstcsStyle
&
nstcsMask
),
(
nstcsStyle
&
nstcsMask
)
&
unsupported_styles
);
...
...
@@ -1470,7 +1470,7 @@ static HRESULT WINAPI NSTC2_fnGetControlStyle(INameSpaceTreeControl2* iface,
NSTCSTYLE
*
pnstcsStyle
)
{
NSTC2Impl
*
This
=
impl_from_INameSpaceTreeControl2
(
iface
);
TRACE
(
"%p (%x, %p)
\n
"
,
This
,
nstcsMask
,
pnstcsStyle
);
TRACE
(
"%p (%
l
x, %p)
\n
"
,
This
,
nstcsMask
,
pnstcsStyle
);
*
pnstcsStyle
=
(
This
->
style
&
nstcsMask
);
...
...
@@ -1485,7 +1485,7 @@ static HRESULT WINAPI NSTC2_fnSetControlStyle2(INameSpaceTreeControl2* iface,
TRACE
(
"%p (%x, %x)
\n
"
,
This
,
nstcsMask
,
nstcsStyle
);
if
((
nstcsStyle
&
nstcsMask
)
&
unsupported_styles2
)
FIXME
(
"mask & style (0x%08x) contains unsupported style(s): 0x%08x
\n
"
,
FIXME
(
"mask & style (0x%08x) contains unsupported style(s): 0x%08
l
x
\n
"
,
(
nstcsStyle
&
nstcsMask
),
(
nstcsStyle
&
nstcsMask
)
&
unsupported_styles2
);
...
...
dlls/explorerframe/taskbarlist.c
View file @
e3213978
...
...
@@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_AddRef(ITaskbarList4 *iface)
struct
taskbar_list
*
This
=
impl_from_ITaskbarList4
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
This
->
refcount
);
TRACE
(
"%p increasing refcount to %u
\n
"
,
This
,
refcount
);
TRACE
(
"%p increasing refcount to %
l
u
\n
"
,
This
,
refcount
);
return
refcount
;
}
...
...
@@ -77,7 +77,7 @@ static ULONG STDMETHODCALLTYPE taskbar_list_Release(ITaskbarList4 *iface)
struct
taskbar_list
*
This
=
impl_from_ITaskbarList4
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
This
->
refcount
);
TRACE
(
"%p decreasing refcount to %u
\n
"
,
This
,
refcount
);
TRACE
(
"%p decreasing refcount to %
l
u
\n
"
,
This
,
refcount
);
if
(
!
refcount
)
{
...
...
@@ -190,7 +190,7 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetTabActive(ITaskbarList4 *iface,
HWND
hwndMDI
,
DWORD
dwReserved
)
{
FIXME
(
"iface %p, hwndTab %p, hwndMDI %p, dwReserved %x stub!
\n
"
,
iface
,
hwndTab
,
hwndMDI
,
dwReserved
);
FIXME
(
"iface %p, hwndTab %p, hwndMDI %p, dwReserved %
l
x stub!
\n
"
,
iface
,
hwndTab
,
hwndMDI
,
dwReserved
);
return
E_NOTIMPL
;
}
...
...
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