From 302e86a4dc777b38925e2c428429d85fbefd3963 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 6 Mar 2006 08:11:10 +0000 Subject: [PATCH] Fixed more Win64 portability issues --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401476 --- VisualCE.zip | Bin 52670 -> 52655 bytes src/main/win32/SDL_win32_main.c | 2 +- src/stdlib/SDL_getenv.c | 4 ++-- src/video/gapi/SDL_gapivideo.c | 2 +- src/video/wincommon/SDL_lowvideo.h | 3 +++ src/video/wincommon/SDL_sysevents.c | 2 +- src/video/wincommon/SDL_sysmouse.c | 2 +- src/video/wincommon/SDL_wingl.c | 2 +- src/video/windib/SDL_dibevents.c | 10 +++++----- src/video/windib/SDL_dibvideo.c | 6 +++--- src/video/windx5/SDL_dx5events.c | 6 +++--- src/video/windx5/SDL_dx5video.c | 14 +++++++------- 12 files changed, 28 insertions(+), 25 deletions(-) diff --git a/VisualCE.zip b/VisualCE.zip index 75d5d22cb83932c9818b8d20a422d30dab0d91cf..9ab9a7dd5e5b05d30baca7f2707a9ae7ffefc03e 100644 GIT binary patch delta 17519 zcmYhiWmFu&*0wz}3^KR}*Wm6J+}+*XC3uj`;O-tExNC6NKyY`50Kp+haPqF4bDnQ~ zeXaggUA1@Z+N-PUuCAVJxVmh(M0OCyMG~hZ2;<_LPY5O)9?&M`6_c78a)Ba+ae*SG z?F$B+!2v;Pif~|D004jlKn2=xSATb7JWY|rdXMmMjw1DN-sp@)zzJQ>OMdzGIcYSy zEkiJ=-`UIVtjVk5*At{l)E{nhkHJQU`G&g-BJ+J7w|FE@{|niyFNyMnY+Zd7)W+rI z?!nwmCAL&YgJay>m)0a{)PkFln_o2Pb}T1O1FzKmW4cMOx@Rr~D_?W{I=U)%?ZHoZ z1o0oe2XGUJk%*B{#7M*%U)VWd_aAEcI3ZjOlpzRwVig#~Jix#Sj z9gX`cE8|;bmbyqP^3_o);Ifs&e0DZ-lYy?=#V#v@WeI*Uelh+BMw0h&X_S-{|G`XL zOynQ9jtU7oJRHdVj_1zcI;^fG46&;Y#eT=L0Etgx|ARodbP$>~6M9eZO$a}jAZ(rk z`H-Ga4)Tx760rY95|=xOm~`a`=45=;32%W;W@|2ljSXTNRs#oUP}X*rY=^BgX9hgjRFTVgXEEc z*`gFsIWjejSu*)dRaS~chBO_qLtJ(Uyb>=kOF`@q3sWAfg#b(w>Dx!Zi~?%u0J5;f zTplz#UvG6po2Okzl9u)8B<8=bnAgrA{2!m~;I1=w_Qn7MTc6GAPJ~&s5$@z#j2e&Q zqq~#ckYCc6B_>MxLPZ**`#kuRGzw#N$V8$l@SMu1RfL1s%_*)`CegN8<#24^)C3Z;-<; zSQv8$4nzU!LIgZ)D_+n4LJfH$QzOs0WH`U03km+SSt{%wN(I)|LVW%X}h*WoH}T1@yn>{tx+?n0+R@_ z_r!65IrI+^V?jkaX1Er(n9XE`i3Nc2GyqMEK#=OrJVJm3)DM)KUZ`n^iQ);$1_Fdz(+zZVY{V^DLzP@t3#QfJ~A^YnswApOFeGXHsIm(>B_3MLe`lBtCvPw-{B z{oAAE8v2~Mpejq~)rND7>*hH2uzJHSGe z;t8jZ8N#{RC;HmdJ(B7xkvMok5fQws$&rYQfD$3cdBja5X)iHH;23NZRvpH0l$c-Q zpAJ;*)8zQ@n`IcrU{=Xo%G`*gZhHcaHCM{+ndQzjioLxztd*>>5q`EL^Qali_sjPi zqeMRBxU!nslt70Q)5a*LC<8E9`qkyf2LFIhKq1SBAbYpRnTY+565GDbBaP{e2u;oNna{MM|~jO(Fa5<>uGc(+fs%!ebPaI|o^^qfpD-0S{vA;ao6WZTWi$}X;QuBuDSeHe%y-ibn6@Ga` z=P5bEZJ;CSgS$#S|BP@35IT6u0SbtzRK(i=&|#W|9|_IiR#J~t5mo@a*3Ujbp+1#% z6=N~h~QgzXwQlI9BTbNOS@_J`;T!ZG9QD1+Xhv?%qq9=ob&P= z>ys4m`}jFy4P(?jpS*`1|6aLi?LPz6;reKeYsLC#82Hr)I*t}TuxhCY>3Q{-@Cs_g zO(6xJ7Gx4=>Lvd{|L@PUxwU-=tDQ>TR~@EOWtDlFQa<4}u?ebz52-$?9e+T*CPxb> zAN-<(rk}1svLw_JhD*W z7cKh@cr{sI3_oISAIYcuc3i%8f8sx>?a|PD^An97k~8rK6~JIjMU&YelnR#ZP?jx~A-D33jNOr5j*?rL35j&UOk&eQ zq}eQd&p+oZsDL~wuDEOmsb!WOeX{?affFL*;zq1XhAP-0F003Stu{Ahy$9IkX-JrfrgHwkT^cQ0dDi?^*b2C0GEFHc9DOE{bqEN_rKEhAv8Un; zqh)t6;B!#Y@&N1hTandmoFoJ6fWa?8$0xFCM@sv%xA=1Nin!hmG0IXqa5Iq2aZ%a$TkjXBndLD^hNSYed;VPa&i`3l42|Up{q2QZHAkD zHgqdacN;Rweukr1r;fbpTB3XRb3NtF3^SH7Y+KZ>@Y1#j*X?m8;H~~?K8Ms)5ZT6h zCg!{w>KD|QW&#;IXhiW~h_c5+$+!DskA^?D5`0Ny%XBLM>Kx9RG z$HK5i_I;L*OAU`BI|uxR1khoeYf8 zG8|&$PvnH@S_=)%Tf*Ks&kI(Ua;FuTH$3ZxZC@X{}fOAGy^~Z;(+&J#J6<` z4NxN{uv*J{jxwJR;I30SP+SO3tdAH;4B-I@P)Y+FxoomWti2%8Zy&H%Ygxbk!Wxb6 z@3Gn)!vAYf6`v*Kfee#8;F9_{%EB^nOItRc*&JTqn1)H408-hZtnKEwe58PX6;wU- zMVr=PpI3#zG&jMeLF!_hwh79~Hcn#um4)T=!+FCG<-?t)`G~wS)`R#mQcZp<}EHfpNu?xIklLUra1kb|EJDR|X@qp<> zIv-KVs*P8YU3Y4CEv>kf_x2Z`b4fpFu#aq7Kl!_%eOP!EpqJs)9R@?+oQF1Mbn$~I zlyRig&fp50WO3KENU8K4SLV-~s@ak3(xzos8SMivR&oRvMGSv}gO-}aEXU%-61~sZ zzgO3kAoCAle{s9xWFIn%?#E@)P600gPhnnTOM(5kc7q?N6~2ij>NsL?L^k9og? zrHCZ4j2T2$GXu9_4&i~8D-h!>n7t6qRZt2O&E;Y}a7xI^>EvgeCMsT&jW!!2Uk8pc~LD-|^xPnE zZ-aG#$ZjAypAH+c!Vz zI|hrDNTfvKd=o<;2PYw#uZUxMB!Wp+>_R9O@}XqGjE~6L*X?#dJjR{(`TYP>$T@mE zf^109`MzCcO}Kz$jdr-SA$&tk@KAmAb^@3ksN``jrIuOJ8#7RC&~mQC&GRW>=tnEv zYd-}6;km=L4qXl6yfnW+0+OC;xOtwQUtF8%wC#tU0-c-Bm5Y00740QZLG)pJy;9e_ zIH*SA;ms z@IY;V+AnLkKm(W#OI*SZQa@HO^+GLmC_Q{8&V)U=M*~{KS<_g~`r+*&uVn`T&{#}2 zw~&K4|2j%>lw6c!g90X@ag5{*f^Ypd(u|*k?8R1AM=sZ z6J}=|2pvHIkRGsU%i^v4c)Id8(#xeRb0zI0H5>w-?ZC1)e4!eN);1NOFK}zAUy(0C zf~WX`x03RppU!bfeEsZuCW|`muPtMhQrlZFu{@M0HO2!GD(nizjx&%)Swj^HEe^B%$EF&--m28k2> z0S1aaXD()yJ*zgBqdg-UwjhyU2P-LBCuXK2|CU&Z8P%8#>mZJ!J!cT^VQj&^7ISgd zcisBdf-VE*;({jQmDqa1)8Cpq#Bd&Q&kUFzFr%M|AvthIL}1b^Xl<+#>4EdlEJ51j z8l0Edfkq+v$$`w!AQEs11ialRzj$H+%P)a< z{f}SgOiU|*Yd+b3oE{PXKZ!`q0S@T_1RR0s0My9sSE)!6Th_ZKQ_+K7Hfei{cOd^$ zh@ez3CRVuD+?LC}<=i4B!}suW-iB6OUdI2Fr0MiRAmB3q@N!A>c-$bWwhea@a?@Qb ztZf8Y>pYpBg^$gzs`8|X0gLOjjv{|PCow;^;G0?0Umv@&r-@npB>E_m0`F-WeM=xe z`G>b>idp8#5%J%*wI7^=(zW`wr9&U|pSa8Mnwa3K`V=D0UMNem-Kh`AI*m>?h`d$( z(a&$}Bk%b%y46LH%SIdGNt}9ZtXn8eQe2mMI*2{7$F3mSd5~fPliaCiAdw&eh3oWT zHegaXp@n*yTL%(MB$ndJG~%8i#|q0>{A|GF2csXrmno2V7apiZ8$7P32|}?MGTm-? zm+R@_U@tHbX)Ju#}>mE~vt#*gt{jLD6wff?9AyZ5wXw*&&pB zA^>woisJ0wVoZ`ue9=;R5q;**4({70!Z&J5sMU@t<{eJ>3;4H)e0@UP zEo30zgc5GEa3A~*53U#l)4EN7oU4Bn<}8b@6?Jel;N%AZ&?C*q%h4~# zI-bNd5x*8V7>^A*p)ZZB^VGt!QQkI7^G4(7d=(>2FgFj4;B-)}>ICPoq)6lU8itjt zwR*6n z^U?W70vG4#%oW=_Q`%%JUq39RV10gHUtMm(FPrv%i^oq4pfG&(JYJ=D@_4efHbv(( z53H&iy1~yf&Ni*RgDHRFrlfjc?qjr`md#RsvF!! z>Il=d)y;yG%v?wF2&XYSQ9{vZpn`@Qp3>pB-Qr?sN^p1S68SfihsC_g7DnO_vR)xR zh4la$KH65?Wy?Umj352WKR*Wi7R$}ayW;oy#8iBn5nFhwWVya?0cFRi3tlMcB2Ly% zIVg!SBU7r?$asr)`T2?e;cLf(aGP+VUckZ9p0C;_qo6o zKub{{G`tU?wlm66&N073sQfTFxCYRiKWV|S@oQ#@J_E2eDZcJvk7fq9VhvNKd0+~1 zrjko5aGIq^k0$25v;`z~=1EGrNTCx|VrBD>ZjwvCnv)z~F0Zl*gmrHiGi5VK(kduf z>{-8iwbv{7E27zD5f&XH2|BQ8;)j$YROU)To68?iM-UoFWm*EsAPpQ!{5HluU2Qn{ zkDjRxwZtjo18v?*4=#$PGRF&^Bja59{3y;C&X+kYwkSnG4*6>WTI0yuKxeUaYdc9B zxRp&H?{*u=95Iv>(|cx9W~D!ps)79sCdVvA^&blBcN6j660)tt810@fgjaQ-$SVjf zq(d$FpEB`|WcHEUc-KhK|Kl0Y^2;=`+8`#dNm1f|F(_e9;_N#d@KgqxlKrY&*Q1m? zwj#+zElk1k6n`)x5PAomqEYwYwPKCTsESAxbmxvBrA?j+ogF0*Bow17{H1l26P?W^ z{*j7GC2Vk1kDv6o6gsfsu4qzJ8Y(zu#$^yG@*jH8qeV&!+)uY+r57L2qFU#2a!xa6 z)p^-Qf2@|iBek;3{^@LzMZaTyP~s zp0YW8=Kf6qc^Gn^FRfw4^8IzEYH=-%EK!hm>!&c&D%js_1OTU@?OSa;*D6`U2qCl0NA98@ zxI!|&K9l+-jDK}JxZ-Dc#4?;P7uJr4>Uuj2=wB96dGFvnIK9im%!8FJUWJ~4`D@_l zbk|*hyz8R7>ZslnO|+qF%tAp>)#=~zUi4~v^Fbk*k0!8141;0uv9~DNlx||?#Mk<4 z;j||wOC%W1juT2wVJ!}T9Q2X0w5-j(={ zRi+y!_*^rewt#kBBgM%T|6lcGIGHVM%oBhFrFf9)>D6d!br23J9h5+YJ!j`B*Gy`U zBJ>|?8yB_)AN9>D*IWDK?i^MM-ggE93t{E(A~c(76QD$@{at|%&guDpva+3hg93e+ zvYijbg3T%SPA38k(B$P)5>A1hkVaz(jVUrbDA*&&-KG=_G|U#P{{-w%8-jtGifn zMp2|nv^&-&;UJ;?`}XsF`Kk2HU2eO>lv0Jw%?}>SlF$lWJ$iK&{B-%`>M-rS#C46#lFMT)0`1^_HL5V1A&^M)ICGl$P zJc&r2Jr5L3M=LWlg6vrC5jjUCvuMaUdk_}ww?4faMKk}3h}4rqy#f!aRS?Gz69UxZ z9q6hx_(& z{Uq_zVR` z(vtfPnFPF?VF|_ga|&t2N9B}Gc+pTLn>vY6?#jywRQ<$4293xDH}Uwx(b=wA@u{dq z0Xpoj2D7x$JTJ-QP<&j14zC%MAhRG|b}sIMYIzA&BtUZ2GCff`sYs^o zFF6JO-5|sKJk}-Utm@*S!dRJ{Q>(B>tKXaG$at?n(>bWN_)P9 zeil+K-kgemKR1c=yY}&)&PH>0iIvvF7!QAIv|H-#yKXUkIO`&a3Bl zVUeF*RJ!CaLPberuo4}xu4CLZn0D8w=NSR7(!_RF{dF6hA~%7M?&Y`G{( z8aXB#Ekq&J$K}VX)!P`v`2N?Z57TAw_r0HJi`+O5m8B_3R%JJ{_H|HiUXsWT_PaJRB6?CM21e&u;omLFUyxRt&m(6%)w0XYo3!aN#5DnAH7Z8e0br5)|N-hDhS|^DY zRj+118Kd3`-Vn#EUx6F5uMm&*rp|d(&6q+wKIl5=LkDWVEL7tYT0D~;c^o{G=1{CQ zlZj(250e2FsxgwWUW**g3ecNzVNzW09kcUbFkY?5U@~4c)?hGR)&77V9z)B3171ah zU&^@1Y!7Fi-}SKD1>`ymPqI8TM?s*UIFdW-54sdkU8a$^2BbB5+gAOsJo>pPDon4< zT_EsH50jSj2wFQ}j#Oz< zF^l?f36`b1%Iwj{9HTKhe`n&j{8S@S!Hm0MQT-^vZrKrOXn1}|GQju`crfA zT682R+-yzy_rKehXj%$}AgLIBInz-dNT#tYbe`XfW}cU#-5u{gt68C&tjRnOLJp|R zdk1$9m)#3gnpgs;Xr?&OC_Ejs3y&{h&!O{yW1prhgD<@zsAh@O6vI}O~2y6kzDJ_4U_u}7?Q`t;p8xH5P^dK zaGm{XIrw0h0+$FXb`H_fLWIu;mHz=Wf0`#`n2&2iOe2BW5xozn?473b^k4<2Tu!zT zTv1kEQ-Yf#XZ&XToE?Q*-f$@3<<=1@st@ty;5Aqz7~eCxIk2cauDL&STzT!D4lMJ` zIszKN|KYpZCFH#!g`N{B$i76JR6Lw|^e{ADjS!?Dq#z_{5E8?-fGU$X1tlj+ zAtSO2Oh59cr{Xo%5dG?j$@W8WY%P2lOfz5)x0a7~jnmGhh(+?ppy@C=$uwDzOM`Od zHUCqb?t#r)A77<)`}0DK8TQ0L|0{L_Vr$v3J@@>tg)Iy(<}U8|%orjYi%>K^5IhZ0 z30QA{NCHM~Km!L|t(`GoESI$=E1^ys3U!Mm6qHAB&K95{G`PH(Zo_8uV@^(`}RDi{T|LjJfx1{?R(=+ove42=x^5rh&S{AwP3yIl|b3cN;F}PzmnxF65+; z(o6iF9YjdfY>6e^8jHUZ{U=OQJRZh?qKRM1th8#Qtna&yss0b|X!=^V*k*(px9#DQ zT+xnS5c=7AAMx9p`gHtU&zmMvCb97F5wSm3_36l@xJpvJz{CReZ||ujbD0{Sj-Nzh zeE*33hBDkBG!L~+KIZTF5iis-hO2o=;Z-V)D$J3f-+nM1xk>HJ)yUJlaKlela@W;7 zvyIN3kRU6ap;MAtLbfmKHY18JjM+H&7{GI6d~ciL=8kn=cyqH6dCaWw!u~bE@Aa7C z{_EY{F}>PWB!;(-Hs4h0G@;Z_xj^B^8yPQK0w_Iss?mjUoaJK8&CvGl2a|Fa<8oUc zf%7WYP+QA`gV7HJ6)pjn5tZYL(e!nuh>e$H0Ya7V^TzFe2ZjfN92rT7Q1#gdT*}KHuzjruk@C{Qe#8@C6c}JwGbfF#mYev@9x= z4G-1*_+%k-?_^}S=em}M)9N=*KeaL4uzGEf9+JMi=SD`qwQ2ahpE+<-s}+rake$=a zs&53A1f+(OL5PiQkU>~XD2t3M;3JOm6ayZ!^P7#6z~hpj6m@a z5kF|?uwL#kpaXtLFd2nQbK!jYi{jGvj+BLI`r_yNq4l8b1m^lvEO*M~>*p)h)k&hxxqzH!}iuC@O)>SA4Y3z+RYX@u%NA z_--g|(s~5D;KmjIg_ij3KF*8A*ugb;RJd^aO!Fpd4TW$H%;N z({PI7)%Emd7EO$ATU~kL4i}%%TiUS%P^)B|Kpl1@0`PZ*=7+dA`xm7G5>z%-VfB2j zwvUXW6hl^TP~=aRcuLJPKxXI9J(e{v7VI_5P>r``n?|eci3So}6DEz*|UjbcA5KZ1~Mx zSNn^j#JpQKZU1lUXLO4L#=HE%YwaW1@FAwnY-9%_hcyizv~lc2FT@6;OYEca22$pF z_k(8wv-7c~Cd&f_=n|jhu7Y;E#j3)hU}<{IRRh6zW^tvu+Q(#a4Z-zB3DWQ^3lz-* z3jiz3k;$zhn)vzSxOG7WU4e*ewo=2ETHJ6n(SPQd!#HYXDN;*@99j#iY46;zPTZ}3 z|B5fMA!pz%(Q3MEAD!JMFK(=X_csWJCYor(iSroP>Y;MIX1K<-M42N2aPsqbOHh87 z(-mS)OM<3L-t+!HWGQ4HE(v#!J#U_lSj%-85#mS=lmMeBCwx;k`Q4;V%XDu{_O1gZ zRr_v>{z{5N?hAe=$~D$R9@c2}EFFyInU$!RJyoIaaMNH9n{=P&hvD6Eqe!#rA*-z@StT_h;0knhx!NH>A{G#xb>h|JcW>& zJ{>crK}0(5q$&k`vR3E*Ru@jX4x#22%^BTXieTIXz)#AL1UAJBfcI=eV zZ-9pOelSPV;|aIFWO7z+WTtn7w{AYTR~X~n+57lId-)jTy*l8IeJ8!P1ezupM{1oPt-gAT(NI2s436L0Q{0B&tu!tk9u(=|CA3*4@djvM9W$qFF%^NL^iB%AM(x+pF1vX>i)61; z^C^68>Z~Qb@k0Du%7=Npx6qAq664jbV!=@CBnHhGsX}+Y6F+mwnRK)dXMa3^eV2xof))VzT}uSmC8Wp7gJ|g@{3rs4v(N%kfpaj>IH%s&cH@3&8j>w)iL+*KlIK2uSi8_+q;(Q2H-?MwmbN zEP4xmsOnbpi_BtOuW~(3loWz6zXByvnNhVKVvyyK%_P#@FviK!g_)lZnf)JDcBI@2 z;e}{C)lphpUe`Mg7!zQSzwG@P5&b3Cvn5o>4*;ZTK!2*9g!4lg?}(rtU_ewXacImy zOzWbZk*dYqS}dG(qz#@B+Jq^^9J-4vUM+!LZdQaFj2Y$^*}~&!BBu5mh0(WPinhES zOqh~Sjjq*JP!S%b6eQq_)rDl@6#4GB6kwop##xmnizj%XNwU*oWhH20VHpVza5je8c(-ZeFXv_6TYT)N`C zo>!3=r#oBX+7SYr=S(x&=J%fsi@RtE3r6o-x%|(09WB{h<4$UNI+RTuHK&^FR~;k} z@k~`ZeCV$@se~5~{ZxXm?j*5sVwR76jq3b-Qn8KepD-t}?X8bKh3qm{a?akC?%nd{7-jmc1?DVc zVl4%aU@BqraHCG^Oe?=FgCnX%xnDPS7&9k+j^$PR-5S3vA(aI0_rFF}MAQ`Br_sJ# zsC#CX&mrr214+FHr#a+tr6EL zuupUZ|Bg8QyZ`Tq(|In`b-e{YJf-*3dno;Al+WesMFuX7VaxnV`U1KUtVd*{7P>(h8|&+FkU4;t0{ zad?vQs(@`?6yE3ONu35yf#0Lz+N2uxFAtX5XB{fay_>bm2jQCYc!*xvbc?G|&1JVsPkE5(g;4SaNdGI&2HAukx z7ebtabwB7u<}U0bU!r59c6;*YCdca;a*hP8KPPv(Y2@f^g3EQLawvw)Y+t>mstvJq zriin1Zq*k}O9r17DAV|a?#3omTA`2r7Nxo0ZhClq;4j$-J>rK(9cp-c*UYwH=+rLZ zh0!TYU)R$a6jN@CcA?~*4>gVSw?*~x?RMD1bclm1=HEDd89LNLi>9JZI080J(gx;zOo^l-ByIRgs6#`Qhjp|L%~KR<(36 z?4$Z)A-1J3nU??L((Gcye)&|5osN0|+Tl}S+H*WR-Zg#2OpVL_vr*$P; zkAgNX_&eU)chzz`YFFQZYAIVsLPfl_jH``&%=uF@P-884CW$aH3(nbMzi3og-@Sn0 zSN@ZOGwpZvn)6YNs5r78D4Hk<6ce}L`EwNP`ba~o)wJG#lZ@%nhsN7`y>=cGeVPlJ z1833vrSlc|793@$%l%xK0G2CC?@GL|mC&EW{S;y<5*Z`h&#i9`){~JIU)3(X&-G|9 zO!OfUbmtglqP?}f>vapk<>W}2nD@4yoHsqsrAw9soL<&MoL`y8O!PUI-i!QpniYs! zrN^=i+gSZ**K5I{;v~z0_`N}<)uC}nk}O=SwwNlRlb_fR`h`6=hqX>S@e2;&XC>P; zS$)Zh^8z}BtXpNyZ;Tfs+y-S%ElkJQ&NLiZ%+Uc;F2k=+QP0jGETI}gb@x*pIm26s zobGK9dgZh0R@d6}1zxa^eYy8osgmW_ch{o=MJ6k`ZGnd)ZI}F{DSl|;O4^j81=yH{ z($>ll%&p~9Xs6dBTMgB+?S~u-&-0i}-pdSWKYBx#np!Q*{N40wk0W)nN%D?xWcTAb zay=#?>IwWB-rFUHdjXVzA00&lvn0G9Qvy$n`n46kRU~Fv+2$X-#f^BEH}hP`qs64! zI#we5ggzoSt_($6i)hi0p81+)SEYM39e+yjh{$CnSX34=I~aVyK4wT!0Sl^AGPm+8BYkgB1B>9Xgrc zc>Bt6i6BaN3FKQ<#UR#5$t7{>-AO*BZ)|nkE2~aE zZW>Aqa&^HqDTu_}d!*)kJ=thZJsffB@wU0i;mpw7nE4dU=jpwSt{~7r_?}Tt>#IWH zwI`GlXX1mTMez6iOBJQLE=y~RxoahL^?^=)Jpbz35wlv0_(_hRoKHEwYgHqKt1@hJ zms15A&+UJS8Lz$!dQdh#7}jN#noh)PY*GkGc!!=LtztD$Tgi^ZFHOa>e?o)cV3$JO z25vuoCrSQ3{D^I(@&mQQmOsShm4qoy5#uwInjz%Fdvm#gXr)@Ap|g%&U++z>>9##9 znM9>OPbn9QN>Q8kXHqiZv1hJ1dad>H!jc!kk@QTkL=kfr^T4P2c3<^W)|4eL%Xr;A zNv*5}N)U68t6sPl)HU*JmNEhYU*n#Z6tb^fI^7=V@_=iECCC%AQ@F>gtyAJlo# zYwnO4geET?(R?&JNBVV(nU-P7HZ&LL=^0>$x2>kYDdyukt)(0B#?mUV&)LmTa@A$z z+}A~C;=D(4b{V0u8DBIL&Bl>_U1H*5QQTS0(DpH8Ex#qafko!rSdDmLN&hXMxBOo_ z>d%-92+dyUqUC4~|12$tz&DFK=N@1DSScoFB37 z5RlhKIs4GuPS1bC07qmJg0ve3L7E6AoO~9gRh8Rmeg8ku7tJ_0^qg1$bfLTm~8XVlWo$}GGT&IoQ< z@RY0#p_V7r`QmY1a^6c>jCf{A{}slY|Ib}a}#Ai#ZkUp3Ce<2|E{iq+xkdWW9 z^?$+gM~`Fk+d%Iz1v@yhK>rPqTFc{)vA;+JrUABrZ(pCuv5dJ>ZbGnF-seLty5Luq z4F2}<*8l5ELaR|ulhQcVLoGvFO*0&9eWxY7VKZ?Z?qldl3P&golr%IabO~t%p~Y)S zv>wgLk$(M!j}N}Jf{)qThYJUuN`##SHI*9K?p!4j6bbrI5*qT_Uc`~MUr6=)V}H;7 z7am(aK)1Lnnsp~-_aN3g@{e5a$#xgMfO0{jd;I?)q1WHrP)bPm&XYE+}Mr&<*i#pmN(}8py_!DSa*G_ zjjm&%`-g`iCSj8ghZKSo0-ANUD=d(evrS#@BFJ^e&{h=C6Xc3!Z3yat3m#>GwJwRn9wn4>gVd^JO!2dx7Qy*(;P*GhkfV)LQ8kJ=YHmU(<~u4ip!cTs=Hp zP;@9_!*DvSgPIYqEUC4$KV5S)lOGMht-)G!P7s@b|1#=1iTO8nKAPQW_2+*nq}D<# z;s3|wP{<=zf6uICX%Dfn-wDmya6nl88}D~TI+$zCE8qd4=U?J|OqSGwQ1bDQ1XyZVp4Qm2LQ_~d$jv52zm|FP^- zkk!ZSEc<8Nn{{?ZXn(kV)Pr`N)s@qhng|J&`L0)qo+Hl78*J>lDtDdFE6MMzTuXCO z&WPp)XJ#g}EemclX++DQLC6&k1V^3k^J?j#-iRq#l9XS`5_3zaS+3`|&>t?mn zm+tD${4(?8+e>R$Ctp&U>A{}ooz?l|&!U-xI!9{QbVzl~0R~9{T%=o#)#+X;oAAKM9YDe2(&;)Hymu{nF7Q9mDx2JR?;( z&xwD1FT!PcbJJfz(U(WhO@H%fNotf>;VCWY{n~FLz4bfw_2+Y_IdaOnepNb?_f2$0 z>zmr2SL<_J*V|lvJ#(-2iaiapYpY#fK2)y#Re8~>VniyGO>jD_Atcji`4x*4vq z>Q+=xrhLV(sKnEk-wXNA=LivtQgiH_EBrNN;rfS6<*i$$=q7h+&6=sbw&3XPvWL~r zmrl)jGi<@r@XwbaIgA)FtKyvnZQ$BTR)ah@+$AFs9#rO`PlI8%e_y7-in@? z7=C}P-d4Z&G3FI1YYL9`&IC6VpDc_vzLL}?TDbWAueP^5ym@as=U;dceEz}V0}_`S zKi-t@k{9}a>dvl{b*r>|1oZ0)BJP)5DazgUXV_+!mW@Hd&;AH>-Mg|6kC5=gwU!9a^=6uIJndg)~r@R;y zCbysRVq7`-(kXAox0B^ghcV5VJ6Zm;+~g^ztr#mOpFi!(xPS8b(_)kVFXo@@bjFk^ xW!>Zpr$s0KU(7ps_8BY2XOpj;@n+K6Ho5Ao++@eI=8UH%SDv+JyL=pEF91;Xjhz4h delta 17604 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 z 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 E0N|curs = CreateCursor( - (HINSTANCE)GetWindowLongPtr(SDL_Window, GWL_HINSTANCE), + (HINSTANCE)GetWindowLongPtr(SDL_Window, GWLP_HINSTANCE), hot_x, hot_y, allowed_x, allowed_y, cursor->ands, cursor->xors); if ( cursor->curs == NULL ) { diff --git a/src/video/wincommon/SDL_wingl.c b/src/video/wincommon/SDL_wingl.c index 2efb69821..28f7b91c1 100644 --- a/src/video/wincommon/SDL_wingl.c +++ b/src/video/wincommon/SDL_wingl.c @@ -45,7 +45,7 @@ static int WIN_GL_ResetWindow(_THIS) /* Save the existing window attributes */ LONG style; RECT rect = { 0, 0, 0, 0 }; - style = GetWindowLong(SDL_Window, GWL_STYLE); + style = GetWindowLongPtr(SDL_Window, GWL_STYLE); GetWindowRect(SDL_Window, &rect); DestroyWindow(SDL_Window); SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c index 177d4993c..5b51c3105 100644 --- a/src/video/windib/SDL_dibevents.c +++ b/src/video/windib/SDL_dibevents.c @@ -43,7 +43,7 @@ /* The translation table from a Microsoft VK keysym to a SDL keysym */ static SDLKey VK_keymap[SDLK_LAST]; -static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, int pressed); +static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed); /* Masks for processing the windows KEYDOWN and KEYUP messages */ #define REPEATED_KEYMASK (1<<30) @@ -376,7 +376,7 @@ void DIB_InitOSKeymap(_THIS) VK_keymap[VK_APPS] = SDLK_MENU; } -static SDL_keysym *TranslateKey(UINT vkey, UINT scancode, SDL_keysym *keysym, int pressed) +static SDL_keysym *TranslateKey(WPARAM vkey, UINT scancode, SDL_keysym *keysym, int pressed) { /* Set the keysym information */ keysym->scancode = (unsigned char) scancode; @@ -426,8 +426,8 @@ int DIB_CreateWindow(_THIS) /* DJM: we want all event's for the user specified window to be handled by SDL. */ - userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWL_WNDPROC); - SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)WinMessage); + userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWLP_WNDPROC); + SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)WinMessage); } else { SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), @@ -444,7 +444,7 @@ int DIB_CreateWindow(_THIS) void DIB_DestroyWindow(_THIS) { if ( SDL_windowid ) { - SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)userWindowProc); + SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)userWindowProc); } else { DestroyWindow(SDL_Window); } diff --git a/src/video/windib/SDL_dibvideo.c b/src/video/windib/SDL_dibvideo.c index 9e78f0111..1a58e0713 100644 --- a/src/video/windib/SDL_dibvideo.c +++ b/src/video/windib/SDL_dibvideo.c @@ -647,7 +647,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current, screen_pal = DIB_CreatePalette(bpp); } - style = GetWindowLong(SDL_Window, GWL_STYLE); + style = GetWindowLongPtr(SDL_Window, GWL_STYLE); style &= ~(resizestyle|WS_MAXIMIZE); if ( (video->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) { style &= ~windowstyle; @@ -677,7 +677,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current, /* DJM: Don't piss of anyone who has setup his own window */ if ( !SDL_windowid ) - SetWindowLong(SDL_Window, GWL_STYLE, style); + SetWindowLongPtr(SDL_Window, GWL_STYLE, style); /* Delete the old bitmap if necessary */ if ( screen_bmp != NULL ) { @@ -780,7 +780,7 @@ SDL_Surface *DIB_SetVideoMode(_THIS, SDL_Surface *current, bounds.top = SDL_windowY; bounds.right = SDL_windowX+video->w; bounds.bottom = SDL_windowY+video->h; - AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLongPtr(SDL_Window, GWL_STYLE), FALSE, 0); width = bounds.right-bounds.left; height = bounds.bottom-bounds.top; if ( (flags & SDL_FULLSCREEN) ) { diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index bebc45147..ab8fc1a12 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -874,8 +874,8 @@ int DX5_CreateWindow(_THIS) /* DJM: we want all event's for the user specified window to be handled by SDL. */ - userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWL_WNDPROC); - SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)WinMessage); + userWindowProc = (WNDPROCTYPE)GetWindowLongPtr(SDL_Window, GWLP_WNDPROC); + SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)WinMessage); } else { SDL_Window = CreateWindow(SDL_Appname, SDL_Appname, (WS_OVERLAPPED|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX), @@ -903,7 +903,7 @@ void DX5_DestroyWindow(_THIS) /* Destroy our window */ if ( SDL_windowid ) { - SetWindowLongPtr(SDL_Window, GWL_WNDPROC, (LONG_PTR)userWindowProc); + SetWindowLongPtr(SDL_Window, GWLP_WNDPROC, (LONG_PTR)userWindowProc); } else { DestroyWindow(SDL_Window); } diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c index 94b73a8a4..362ecf044 100644 --- a/src/video/windx5/SDL_dx5video.c +++ b/src/video/windx5/SDL_dx5video.c @@ -1123,7 +1123,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, } #endif /* !NO_CHANGEDISPLAYSETTINGS */ - style = GetWindowLong(SDL_Window, GWL_STYLE); + style = GetWindowLongPtr(SDL_Window, GWL_STYLE); style &= ~(resizestyle|WS_MAXIMIZE); if ( video->flags & SDL_FULLSCREEN ) { style &= ~windowstyle; @@ -1148,7 +1148,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, /* DJM: Don't piss of anyone who has setup his own window */ if ( !SDL_windowid ) - SetWindowLong(SDL_Window, GWL_STYLE, style); + SetWindowLongPtr(SDL_Window, GWL_STYLE, style); /* Resize the window (copied from SDL WinDIB driver) */ if ( !SDL_windowid && !IsZoomed(SDL_Window) ) { @@ -1178,7 +1178,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, bounds.top = SDL_windowY; bounds.right = SDL_windowX+video->w; bounds.bottom = SDL_windowY+video->h; - AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLongPtr(SDL_Window, GWL_STYLE), FALSE, 0); width = bounds.right-bounds.left; height = bounds.bottom-bounds.top; if ( (flags & SDL_FULLSCREEN) ) { @@ -1217,7 +1217,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, } /* Set the appropriate window style */ - style = GetWindowLong(SDL_Window, GWL_STYLE); + style = GetWindowLongPtr(SDL_Window, GWL_STYLE); style &= ~(resizestyle|WS_MAXIMIZE); if ( (flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) { style &= ~windowstyle; @@ -1239,7 +1239,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, } /* DJM: Don't piss of anyone who has setup his own window */ if ( !SDL_windowid ) - SetWindowLong(SDL_Window, GWL_STYLE, style); + SetWindowLongPtr(SDL_Window, GWL_STYLE, style); /* Set DirectDraw sharing mode.. exclusive when fullscreen */ if ( (flags & SDL_FULLSCREEN) == SDL_FULLSCREEN ) { @@ -1264,7 +1264,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, bounds.top = 0; bounds.right = GetSystemMetrics(SM_CXSCREEN); bounds.bottom = GetSystemMetrics(SM_CYSCREEN); - AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLongPtr(SDL_Window, GWL_STYLE), FALSE, 0); SetWindowPos(SDL_Window, HWND_TOPMOST, bounds.left, bounds.top, bounds.right - bounds.left, @@ -1581,7 +1581,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current, bounds.top = SDL_windowY; bounds.right = SDL_windowX+video->w; bounds.bottom = SDL_windowY+video->h; - AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLongPtr(SDL_Window, GWL_STYLE), FALSE, 0); width = bounds.right-bounds.left; height = bounds.bottom-bounds.top; if ( center ) {