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
61d92562
Commit
61d92562
authored
22 years ago
by
Michael Stefaniuc
Committed by
Alexandre Julliard
22 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence some warnings due to casts between pointer and integers of
different size.
parent
bd6590a8
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
14 deletions
+15
-14
menu.c
controls/menu.c
+1
-1
client.c
dlls/user/dde/client.c
+1
-1
text.c
dlls/user/text.c
+2
-1
win.c
windows/win.c
+1
-1
winproc.c
windows/winproc.c
+10
-10
No files found.
controls/menu.c
View file @
61d92562
...
@@ -4433,7 +4433,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
...
@@ -4433,7 +4433,7 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
if
(
lpmii
->
fMask
&
MIIM_SUBMENU
)
{
if
(
lpmii
->
fMask
&
MIIM_SUBMENU
)
{
menu
->
hSubMenu
=
lpmii
->
hSubMenu
;
menu
->
hSubMenu
=
lpmii
->
hSubMenu
;
if
(
menu
->
hSubMenu
)
{
if
(
menu
->
hSubMenu
)
{
POPUPMENU
*
subMenu
=
MENU_GetMenu
(
(
UINT16
)
menu
->
hSubMenu
);
POPUPMENU
*
subMenu
=
MENU_GetMenu
(
menu
->
hSubMenu
);
if
(
subMenu
)
{
if
(
subMenu
)
{
subMenu
->
wFlags
|=
MF_POPUP
;
subMenu
->
wFlags
|=
MF_POPUP
;
menu
->
fType
|=
MF_POPUP
;
menu
->
fType
|=
MF_POPUP
;
...
...
This diff is collapsed.
Click to expand it.
dlls/user/dde/client.c
View file @
61d92562
...
@@ -688,7 +688,7 @@ static WDML_QUEUE_STATE WDML_HandleExecuteReply(WDML_CONV* pConv, MSG* msg, WDML
...
@@ -688,7 +688,7 @@ static WDML_QUEUE_STATE WDML_HandleExecuteReply(WDML_CONV* pConv, MSG* msg, WDML
}
}
WDML_ExtractAck
(
uiLo
,
&
ddeAck
);
WDML_ExtractAck
(
uiLo
,
&
ddeAck
);
pXAct
->
hDdeData
=
(
HDDEDATA
)
ddeAck
.
fAck
;
pXAct
->
hDdeData
=
(
HDDEDATA
)
(
UINT_PTR
)
ddeAck
.
fAck
;
return
WDML_QS_HANDLED
;
return
WDML_QS_HANDLED
;
}
}
...
...
This diff is collapsed.
Click to expand it.
dlls/user/text.c
View file @
61d92562
...
@@ -37,6 +37,7 @@
...
@@ -37,6 +37,7 @@
#include "winbase.h"
#include "winbase.h"
#include "winerror.h"
#include "winerror.h"
#include "winnls.h"
#include "winnls.h"
#include "wownt32.h"
#include "user.h"
#include "user.h"
#include "wine/debug.h"
#include "wine/debug.h"
...
@@ -1176,7 +1177,7 @@ static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, IN
...
@@ -1176,7 +1177,7 @@ static BOOL TEXT_GrayString(HDC hdc, HBRUSH hb, GRAYSTRINGPROC fn, LPARAM lp, IN
if
(
_32bit
)
if
(
_32bit
)
retval
=
fn
(
memdc
,
lp
,
slen
);
retval
=
fn
(
memdc
,
lp
,
slen
);
else
else
retval
=
(
BOOL
)((
BOOL16
)((
GRAYSTRINGPROC16
)
fn
)(
(
HDC16
)
memdc
,
lp
,
(
INT16
)
slen
));
retval
=
(
BOOL
)((
BOOL16
)((
GRAYSTRINGPROC16
)
fn
)(
HDC_16
(
memdc
)
,
lp
,
(
INT16
)
slen
));
}
}
else
else
{
{
...
...
This diff is collapsed.
Click to expand it.
windows/win.c
View file @
61d92562
...
@@ -3084,7 +3084,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
...
@@ -3084,7 +3084,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert )
{
{
HDC
hDC
=
GetDC
(
hWnd
);
HDC
hDC
=
GetDC
(
hWnd
);
if
(
!
SendMessageW
(
hWnd
,
WM_ERASEBKGND
,
(
WPARAM
16
)
hDC
,
0
))
if
(
!
SendMessageW
(
hWnd
,
WM_ERASEBKGND
,
(
WPARAM
)
hDC
,
0
))
wndPtr
->
flags
|=
WIN_NEEDS_ERASEBKGND
;
wndPtr
->
flags
|=
WIN_NEEDS_ERASEBKGND
;
ReleaseDC
(
hWnd
,
hDC
);
ReleaseDC
(
hWnd
,
hDC
);
...
...
This diff is collapsed.
Click to expand it.
windows/winproc.c
View file @
61d92562
...
@@ -1124,7 +1124,7 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
...
@@ -1124,7 +1124,7 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
case
WM_CTLCOLOR
:
case
WM_CTLCOLOR
:
if
(
HIWORD
(
*
plparam
)
>
CTLCOLOR_STATIC
)
return
-
1
;
if
(
HIWORD
(
*
plparam
)
>
CTLCOLOR_STATIC
)
return
-
1
;
*
pmsg32
=
WM_CTLCOLORMSGBOX
+
HIWORD
(
*
plparam
);
*
pmsg32
=
WM_CTLCOLORMSGBOX
+
HIWORD
(
*
plparam
);
*
pwparam32
=
(
WPARAM
)
(
HDC
)
wParam16
;
*
pwparam32
=
(
WPARAM
)
HDC_32
(
wParam16
)
;
*
plparam
=
(
LPARAM
)
WIN_Handle32
(
LOWORD
(
*
plparam
)
);
*
plparam
=
(
LPARAM
)
WIN_Handle32
(
LOWORD
(
*
plparam
)
);
return
0
;
return
0
;
case
WM_COMPAREITEM
:
case
WM_COMPAREITEM
:
...
@@ -1185,7 +1185,7 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
...
@@ -1185,7 +1185,7 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
dis
->
itemID
=
dis16
->
itemID
;
dis
->
itemID
=
dis16
->
itemID
;
dis
->
itemAction
=
dis16
->
itemAction
;
dis
->
itemAction
=
dis16
->
itemAction
;
dis
->
itemState
=
dis16
->
itemState
;
dis
->
itemState
=
dis16
->
itemState
;
dis
->
hwndItem
=
(
dis
->
CtlType
==
ODT_MENU
)
?
(
HWND
)
(
HMENU
)
dis16
->
hwndItem
dis
->
hwndItem
=
(
dis
->
CtlType
==
ODT_MENU
)
?
(
HWND
)
HMENU_32
(
dis16
->
hwndItem
)
:
WIN_Handle32
(
dis16
->
hwndItem
);
:
WIN_Handle32
(
dis16
->
hwndItem
);
dis
->
hDC
=
dis16
->
hDC
;
dis
->
hDC
=
dis16
->
hDC
;
dis
->
itemData
=
dis16
->
itemData
;
dis
->
itemData
=
dis16
->
itemData
;
...
@@ -1229,23 +1229,23 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
...
@@ -1229,23 +1229,23 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
case
WM_MDISETMENU
:
case
WM_MDISETMENU
:
if
(
wParam16
==
TRUE
)
if
(
wParam16
==
TRUE
)
*
pmsg32
=
WM_MDIREFRESHMENU
;
*
pmsg32
=
WM_MDIREFRESHMENU
;
*
pwparam32
=
(
WPARAM
)
(
HMENU
)
LOWORD
(
*
plparam
);
*
pwparam32
=
(
WPARAM
)
HMENU_32
(
LOWORD
(
*
plparam
)
);
*
plparam
=
(
LPARAM
)
(
HMENU
)
HIWORD
(
*
plparam
);
*
plparam
=
(
LPARAM
)
HMENU_32
(
HIWORD
(
*
plparam
)
);
return
0
;
return
0
;
case
WM_MENUCHAR
:
case
WM_MENUCHAR
:
*
pwparam32
=
MAKEWPARAM
(
wParam16
,
LOWORD
(
*
plparam
)
);
*
pwparam32
=
MAKEWPARAM
(
wParam16
,
LOWORD
(
*
plparam
)
);
*
plparam
=
(
LPARAM
)
(
HMENU
)
HIWORD
(
*
plparam
);
*
plparam
=
(
LPARAM
)
HMENU_32
(
HIWORD
(
*
plparam
)
);
return
0
;
return
0
;
case
WM_MENUSELECT
:
case
WM_MENUSELECT
:
if
((
LOWORD
(
*
plparam
)
&
MF_POPUP
)
&&
(
LOWORD
(
*
plparam
)
!=
0xFFFF
))
if
((
LOWORD
(
*
plparam
)
&
MF_POPUP
)
&&
(
LOWORD
(
*
plparam
)
!=
0xFFFF
))
{
{
HMENU
hmenu
=
(
HMENU
)
HIWORD
(
*
plparam
);
HMENU
hmenu
=
HMENU_32
(
HIWORD
(
*
plparam
)
);
UINT
Pos
=
MENU_FindSubMenu
(
&
hmenu
,
wParam16
);
UINT
Pos
=
MENU_FindSubMenu
(
&
hmenu
,
wParam16
);
if
(
Pos
==
0xFFFF
)
Pos
=
0
;
/* NO_SELECTED_ITEM */
if
(
Pos
==
0xFFFF
)
Pos
=
0
;
/* NO_SELECTED_ITEM */
*
pwparam32
=
MAKEWPARAM
(
Pos
,
LOWORD
(
*
plparam
)
);
*
pwparam32
=
MAKEWPARAM
(
Pos
,
LOWORD
(
*
plparam
)
);
}
}
else
*
pwparam32
=
MAKEWPARAM
(
wParam16
,
LOWORD
(
*
plparam
)
);
else
*
pwparam32
=
MAKEWPARAM
(
wParam16
,
LOWORD
(
*
plparam
)
);
*
plparam
=
(
LPARAM
)
(
HMENU
)
HIWORD
(
*
plparam
);
*
plparam
=
(
LPARAM
)
HMENU_32
(
HIWORD
(
*
plparam
)
);
return
0
;
return
0
;
case
WM_MDIACTIVATE
:
case
WM_MDIACTIVATE
:
if
(
*
plparam
)
if
(
*
plparam
)
...
@@ -1517,7 +1517,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
...
@@ -1517,7 +1517,7 @@ LRESULT WINPROC_UnmapMsg16To32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
case
WM_NEXTMENU
:
case
WM_NEXTMENU
:
{
{
MDINEXTMENU
*
next
=
(
MDINEXTMENU
*
)
lParam
;
MDINEXTMENU
*
next
=
(
MDINEXTMENU
*
)
lParam
;
result
=
MAKELONG
(
next
->
hmenuNext
,
HWND_16
(
next
->
hwndNext
)
);
result
=
MAKELONG
(
HMENU_16
(
next
->
hmenuNext
)
,
HWND_16
(
next
->
hwndNext
)
);
HeapFree
(
GetProcessHeap
(),
0
,
next
);
HeapFree
(
GetProcessHeap
(),
0
,
next
);
}
}
break
;
break
;
...
@@ -1614,7 +1614,7 @@ INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
...
@@ -1614,7 +1614,7 @@ INT WINPROC_MapMsg16To32W( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
ch
=
wParam16
;
ch
=
wParam16
;
MultiByteToWideChar
(
CP_ACP
,
0
,
&
ch
,
1
,
&
wch
,
1
);
MultiByteToWideChar
(
CP_ACP
,
0
,
&
ch
,
1
,
&
wch
,
1
);
*
pwparam32
=
MAKEWPARAM
(
wch
,
LOWORD
(
*
plparam
)
);
*
pwparam32
=
MAKEWPARAM
(
wch
,
LOWORD
(
*
plparam
)
);
*
plparam
=
(
LPARAM
)
(
HMENU
)
HIWORD
(
*
plparam
);
*
plparam
=
(
LPARAM
)
HMENU_32
(
HIWORD
(
*
plparam
)
);
return
0
;
return
0
;
case
WM_CHAR
:
case
WM_CHAR
:
case
WM_DEADCHAR
:
case
WM_DEADCHAR
:
...
@@ -1951,7 +1951,7 @@ INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32,
...
@@ -1951,7 +1951,7 @@ INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32,
dis
->
itemAction
=
(
UINT16
)
dis32
->
itemAction
;
dis
->
itemAction
=
(
UINT16
)
dis32
->
itemAction
;
dis
->
itemState
=
(
UINT16
)
dis32
->
itemState
;
dis
->
itemState
=
(
UINT16
)
dis32
->
itemState
;
dis
->
hwndItem
=
HWND_16
(
dis32
->
hwndItem
);
dis
->
hwndItem
=
HWND_16
(
dis32
->
hwndItem
);
dis
->
hDC
=
(
HDC16
)
dis32
->
hDC
;
dis
->
hDC
=
HDC_16
(
dis32
->
hDC
)
;
dis
->
itemData
=
dis32
->
itemData
;
dis
->
itemData
=
dis32
->
itemData
;
CONV_RECT32TO16
(
&
dis32
->
rcItem
,
&
dis
->
rcItem
);
CONV_RECT32TO16
(
&
dis32
->
rcItem
,
&
dis
->
rcItem
);
*
plparam
=
MapLS
(
dis
);
*
plparam
=
MapLS
(
dis
);
...
...
This diff is collapsed.
Click to expand it.
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