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
3d6e19d4
Commit
3d6e19d4
authored
Nov 03, 2008
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Nov 04, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Do not cast zero.
parent
62e17fa8
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
18 deletions
+14
-18
cursoricon.c
dlls/user32/cursoricon.c
+1
-1
driver16.c
dlls/user32/driver16.c
+1
-1
resource.c
dlls/user32/resource.c
+2
-2
scroll.c
dlls/user32/scroll.c
+7
-11
listbox.c
dlls/user32/tests/listbox.c
+2
-2
win.c
dlls/user32/win.c
+1
-1
No files found.
dlls/user32/cursoricon.c
View file @
3d6e19d4
...
@@ -1667,7 +1667,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
...
@@ -1667,7 +1667,7 @@ HGLOBAL16 WINAPI LoadCursorIconHandler16( HGLOBAL16 hResource, HMODULE16 hModule
{
{
FIXME_
(
cursor
)(
"(%04x,%04x,%04x): old 2.x resources are not supported!
\n
"
,
FIXME_
(
cursor
)(
"(%04x,%04x,%04x): old 2.x resources are not supported!
\n
"
,
hResource
,
hModule
,
hRsrc
);
hResource
,
hModule
,
hRsrc
);
return
(
HGLOBAL16
)
0
;
return
0
;
}
}
/**********************************************************************
/**********************************************************************
...
...
dlls/user32/driver16.c
View file @
3d6e19d4
...
@@ -434,7 +434,7 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
...
@@ -434,7 +434,7 @@ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
}
}
}
}
hRetDrv
=
(
lpDrv
)
?
lpDrv
->
hDriver16
:
(
HDRVR16
)
0
;
hRetDrv
=
(
lpDrv
)
?
lpDrv
->
hDriver16
:
0
;
TRACE
(
"return %04x !
\n
"
,
hRetDrv
);
TRACE
(
"return %04x !
\n
"
,
hRetDrv
);
return
hRetDrv
;
return
hRetDrv
;
}
}
dlls/user32/resource.c
View file @
3d6e19d4
...
@@ -396,10 +396,10 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
...
@@ -396,10 +396,10 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
i
=
min
(
buflen
-
1
,
*
p
);
i
=
min
(
buflen
-
1
,
*
p
);
if
(
i
>
0
)
{
if
(
i
>
0
)
{
memcpy
(
buffer
,
p
+
1
,
i
*
sizeof
(
WCHAR
));
memcpy
(
buffer
,
p
+
1
,
i
*
sizeof
(
WCHAR
));
buffer
[
i
]
=
(
WCHAR
)
0
;
buffer
[
i
]
=
0
;
}
else
{
}
else
{
if
(
buflen
>
1
)
{
if
(
buflen
>
1
)
{
buffer
[
0
]
=
(
WCHAR
)
0
;
buffer
[
0
]
=
0
;
return
0
;
return
0
;
}
}
}
}
...
...
dlls/user32/scroll.c
View file @
3d6e19d4
...
@@ -918,8 +918,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
...
@@ -918,8 +918,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
}
}
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
NULL
);
(
TIMERPROC
)
0
);
}
}
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
break
;
break
;
...
@@ -936,8 +935,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
...
@@ -936,8 +935,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
SB_PAGEUP
,
(
LPARAM
)
hwndCtl
);
SB_PAGEUP
,
(
LPARAM
)
hwndCtl
);
}
}
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
NULL
);
(
TIMERPROC
)
0
);
}
}
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
break
;
break
;
...
@@ -1005,8 +1003,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
...
@@ -1005,8 +1003,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
SB_PAGEDOWN
,
(
LPARAM
)
hwndCtl
);
SB_PAGEDOWN
,
(
LPARAM
)
hwndCtl
);
}
}
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
NULL
);
(
TIMERPROC
)
0
);
}
}
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
break
;
break
;
...
@@ -1023,8 +1020,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
...
@@ -1023,8 +1020,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
}
}
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SetSystemTimer
(
hwnd
,
SCROLL_TIMER
,
(
msg
==
WM_LBUTTONDOWN
)
?
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
SCROLL_FIRST_DELAY
:
SCROLL_REPEAT_DELAY
,
NULL
);
(
TIMERPROC
)
0
);
}
}
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
else
KillSystemTimer
(
hwnd
,
SCROLL_TIMER
);
break
;
break
;
...
@@ -1791,7 +1787,7 @@ BOOL WINAPI GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info)
...
@@ -1791,7 +1787,7 @@ BOOL WINAPI GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info)
/* Refer SB_CTL requests to the window */
/* Refer SB_CTL requests to the window */
if
(
nBar
==
SB_CTL
)
if
(
nBar
==
SB_CTL
)
{
{
SendMessageW
(
hwnd
,
SBM_GETSCROLLINFO
,
(
WPARAM
)
0
,
(
LPARAM
)
info
);
SendMessageW
(
hwnd
,
SBM_GETSCROLLINFO
,
0
,
(
LPARAM
)
info
);
return
TRUE
;
return
TRUE
;
}
}
return
SCROLL_GetScrollInfo
(
hwnd
,
nBar
,
info
);
return
SCROLL_GetScrollInfo
(
hwnd
,
nBar
,
info
);
...
@@ -1818,7 +1814,7 @@ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info)
...
@@ -1818,7 +1814,7 @@ BOOL WINAPI GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO info)
/* Refer OBJID_CLIENT requests to the window */
/* Refer OBJID_CLIENT requests to the window */
if
(
idObject
==
OBJID_CLIENT
)
if
(
idObject
==
OBJID_CLIENT
)
return
SendMessageW
(
hwnd
,
SBM_GETSCROLLBARINFO
,
(
WPARAM
)
0
,
(
LPARAM
)
info
);
return
SendMessageW
(
hwnd
,
SBM_GETSCROLLBARINFO
,
0
,
(
LPARAM
)
info
);
else
else
return
SCROLL_GetScrollBarInfo
(
hwnd
,
idObject
,
info
);
return
SCROLL_GetScrollBarInfo
(
hwnd
,
idObject
,
info
);
}
}
...
@@ -1882,7 +1878,7 @@ INT WINAPI GetScrollPos(HWND hwnd, INT nBar)
...
@@ -1882,7 +1878,7 @@ INT WINAPI GetScrollPos(HWND hwnd, INT nBar)
/* Refer SB_CTL requests to the window */
/* Refer SB_CTL requests to the window */
if
(
nBar
==
SB_CTL
)
if
(
nBar
==
SB_CTL
)
return
SendMessageW
(
hwnd
,
SBM_GETPOS
,
(
WPARAM
)
0
,
(
LPARAM
)
0
);
return
SendMessageW
(
hwnd
,
SBM_GETPOS
,
0
,
0
);
else
else
return
SCROLL_GetScrollPos
(
hwnd
,
nBar
);
return
SCROLL_GetScrollPos
(
hwnd
,
nBar
);
}
}
...
...
dlls/user32/tests/listbox.c
View file @
3d6e19d4
...
@@ -103,8 +103,8 @@ buttonpress (HWND handle, WORD x, WORD y)
...
@@ -103,8 +103,8 @@ buttonpress (HWND handle, WORD x, WORD y)
LPARAM
lp
=
x
+
(
y
<<
16
);
LPARAM
lp
=
x
+
(
y
<<
16
);
WAIT
;
WAIT
;
SendMessage
(
handle
,
WM_LBUTTONDOWN
,
(
WPARAM
)
MK_LBUTTON
,
lp
);
SendMessage
(
handle
,
WM_LBUTTONDOWN
,
MK_LBUTTON
,
lp
);
SendMessage
(
handle
,
WM_LBUTTONUP
,
(
WPARAM
)
0
,
lp
);
SendMessage
(
handle
,
WM_LBUTTONUP
,
0
,
lp
);
REDRAW
;
REDRAW
;
}
}
...
...
dlls/user32/win.c
View file @
3d6e19d4
...
@@ -3144,7 +3144,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
...
@@ -3144,7 +3144,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
else
wparam
=
(
hWnd
==
GetForegroundWindow
());
else
wparam
=
(
hWnd
==
GetForegroundWindow
());
WIN_ReleasePtr
(
wndPtr
);
WIN_ReleasePtr
(
wndPtr
);
SendMessageW
(
hWnd
,
WM_NCACTIVATE
,
wparam
,
(
LPARAM
)
0
);
SendMessageW
(
hWnd
,
WM_NCACTIVATE
,
wparam
,
0
);
return
wparam
;
return
wparam
;
}
}
}
}
...
...
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