Adding an updated patch. It seems I missed a file.
Testing done: compiled with both /permissive- set and without.
Thanks,
-Andrew
From: awt-dev <[email protected]> On Behalf Of Andrew Luo
Sent: Monday, May 13, 2019 5:40 PM
To: [email protected]
Subject: <AWT Dev> [PATCH] Fix some C++ conformance issues in AWT Windows code
I've been trying to get the JDK to compile with the new /permissive- switch in
VS2017 (https://devblogs.microsoft.com/cppblog/permissive-switch/) however
there have been a few issues in various parts of the code.
While testing this, I found some issues in the AWT code. In one case we name a
function with the class:: prefix when the function is declared inline in the
class definition. Other cases include where we are assigning string literals
to non-const char* variables. I took some time to fix these and attached a
patch. Let me know if there are any comments.
c:\Users\Andrew\Documents\mercurial\openjdk\jdk\src\java.desktop\windows\native\libawt\windows\awt.h(343):
error C2440: 'return': cannot convert from 'const unsigned short *' to 'LPWSTR'
c:\Users\Andrew\Documents\mercurial\openjdk\jdk\src\java.desktop\windows\native\libawt\windows\awt.h(343):
note: Conversion from string literal loses const qualifier (see
/Zc:strictStrings)
c:\users\andrew\documents\mercurial\openjdk\jdk\src\java.desktop\windows\native\libawt\windows\awt_Component.h(455):
error C2061: syntax error: identifier 'javaKey'
c:\users\andrew\documents\mercurial\openjdk\jdk\src\java.desktop\windows\native\libawt\windows\awt_Component.h(455):
error C4430: missing type specifier - int assumed. Note: C++ does not support
default-int
Thanks,
-Andrew
ÿþd i f f - r 3 9 8 1 4 e 0 a 8 9 6 4
s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t . h
- - -
a / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t . h
S a t M a y 1 8 2 2 : 1 1 : 2 5 2 0 1 9 + 0 2 0 0
+ + +
b / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t . h
S a t M a y 1 8 2 2 : 2 7 : 0 8 2 0 1 9 - 0 7 0 0
@ @ - 3 3 7 , 7 + 3 3 7 , 7 @ @
p r o t e c t e d :
L P W S T R m _ p S t r ;
j s i z e m _ d w S i z e ;
- L P W S T R g e t N o n E m p t y S t r i n g ( ) {
+ L P C W S T R g e t N o n E m p t y S t r i n g ( ) {
r e t u r n ( N U L L = = m _ p S t r )
? L " "
: m _ p S t r ;
@ @ - 3 7 8 , 9 + 3 7 8 , 9 @ @
m _ p S t r =
( L P W S T R ) S A F E _ S I Z E _ A R R A Y _ R E A L L O C ( s a f e _ R e a l l o c ,
m _ p S t r , m _ d w S i z e + 1 , s i z e o f ( W C H A R ) ) ;
}
/ / w e a r e i n U N I C O D E n o w , s o
L P W S T R : = : L P T S T R
- o p e r a t o r L P W S T R ( ) { r e t u r n
g e t N o n E m p t y S t r i n g ( ) ; }
+ o p e r a t o r L P C W S T R ( ) { r e t u r n
g e t N o n E m p t y S t r i n g ( ) ; }
o p e r a t o r L P A R A M ( ) { r e t u r n
( L P A R A M ) g e t N o n E m p t y S t r i n g ( ) ; }
- v o i d * G e t D a t a ( ) { r e t u r n ( v o i d
* ) g e t N o n E m p t y S t r i n g ( ) ; }
+ c o n s t v o i d * G e t D a t a ( ) { r e t u r n
( c o n s t v o i d * ) g e t N o n E m p t y S t r i n g ( ) ; }
j s i z e G e t S i z e ( ) { r e t u r n
m _ d w S i z e ; }
} ;
d i f f - r 3 9 8 1 4 e 0 a 8 9 6 4
s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ C o m p o n e n t . h
- - -
a / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ C o m p o n e n t . h
S a t M a y 1 8 2 2 : 1 1 : 2 5 2 0 1 9 + 0 2 0 0
+ + +
b / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ C o m p o n e n t . h
S a t M a y 1 8 2 2 : 2 7 : 0 8 2 0 1 9 - 0 7 0 0
@ @ - 4 4 9 , 7 + 4 4 9 , 7 @ @
s t a t i c v o i d
J a v a K e y T o W i n d o w s K e y ( U I N T j a v a K e y , U I N T
* w i n d o w s K e y , U I N T * m o d i f i e r s , U I N T
o r i g i n a l W i n d o w s K e y ) ;
s t a t i c v o i d
U p d a t e D y n P r i m a r y K e y m a p ( U I N T w k e y , U I N T
j k e y L e g a c y , j i n t k e y L o c a t i o n , U I N T
m o d i f i e r s ) ;
- I N L I N E s t a t i c v o i d
A w t C o m p o n e n t : : J a v a K e y T o W i n d o w s K e y ( U I N T
j a v a K e y ,
+ I N L I N E s t a t i c v o i d
J a v a K e y T o W i n d o w s K e y ( U I N T j a v a K e y ,
U I N T * w i n d o w s K e y , U I N T * m o d i f i e r s )
{
J a v a K e y T o W i n d o w s K e y ( j a v a K e y ,
w i n d o w s K e y , m o d i f i e r s , I G N O R E _ K E Y ) ;
d i f f - r 3 9 8 1 4 e 0 a 8 9 6 4
s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ P r i n t C o n t r o l . c p p
- - -
a / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ P r i n t C o n t r o l . c p p
S a t M a y 1 8 2 2 : 1 1 : 2 5 2 0 1 9 + 0 2 0 0
+ + +
b / s r c / j a v a . d e s k t o p / w i n d o w s / n a t i v e / l i b a w t / w i n d o w s / a w t _ P r i n t C o n t r o l . c p p
S a t M a y 1 8 2 2 : 2 7 : 0 8 2 0 1 9 - 0 7 0 0
@ @ - 1 3 0 , 7 + 1 3 0 , 7 @ @
D W O R D c b B u f = * p c b B u f , d u m m y W o r d =
0 ;
J a v a S t r i n g B u f f e r
p r i n t e r N a m e B u f ( e n v , p r i n t e r N a m e ) ;
- L P T S T R l p c P r i n t e r N a m e =
( L P T S T R ) p r i n t e r N a m e B u f ;
+ L P C T S T R l p c P r i n t e r N a m e =
( L P C T S T R ) p r i n t e r N a m e B u f ;
D A S S E R T ( l p c P r i n t e r N a m e ! = N U L L ) ;
/ / F o r N T , f i r s t d o a q u i c k c h e c k
o f a l l r e m o t e a n d l o c a l p r i n t e r s .
