From 851e264fd9a286187b1bbd6c04fefac2f3a466c3 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 --- 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 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�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 delta 17604 zcmX_{WmufC(y(_IcXui7?%u^I?(W6i9d>bdcXxLy6e(UPuEpJov`8t?kDl|MZ}02c zA5W4=GMRmn%*;0C!u03DByoU(j*__~-@a2RI&hm~oiSlTK3S%|U{b?d9HB`4_c2c2 zr;j{0_vtP7)&PK81_l5ZfR~yuL4bq=fLW46l1kZbb;Kg%f~f58R&_pqe4$Fkb7l9W z3f(xHU9~+||8|F?4Y`N!8PWI}r+Z}UgA*53$tagh(#j)RawCxQJ<-@q=kM3=kLNeT zJ9&gk^%hncQ^4VC#WpHt96wHCJmS1UIX}x8nQCN>ZUF`ML57~0FvQtvN8gbpWygR% zx&xRuLbq=rz$2J1{|MC<8SsL-{DWaOdXQ)>N!&XdG1>PfWgpKu94jpBkHnDYPaqZO zjS?}e;wzg{Tr4u@cD<|M6u!2-wvHvbPLefwdgZG2p2ZwHmy&KC;;$CRbk>URq?9oQ zgGUw|OgIq{{$UaxT69hZ`=1X4R!S#?PEiWB@56GbTjdsB+AAKltkL_ja=*XncFmP` zn|f~a7nWBG&CIZsG|N)-AsP}JMKcE()w_LQU)Zv^0>r;JV}Vg8pU3W|6C zh~X`lz0M&F-)X<+3t2%lK1ZPN*(~4T^%5%&N^DOl{JBZzt{{Uc)Q`rXVa-E! z#P~zE%!kUJ1U@fmHzEj+1!XVAe;`gW`gQYTCY^ql2L-Rw4OQVM%Wwzk@%-1RYxYJ0 zMs(|}yhHbhrSs*p;nty+^rS zV1C1a{|TEc@_{fheisSkb4CfXSz-|m&&WyWIyjE3uBz$=MLNckfTjQ}a8<^hEA(}O z(FP+-hv`<6&UlVE2_X7NU2UEWBj(F&Jb*8Cf;Om;vj|}G4LKVB?m_?X2mQhayONFX zqt@?}7EK$w|EhBiZ00qL(dxKNuaVxFtP-46jwZh9K+58Y{9sgt@Z$8Z0v0mObM}M+Q=S~ zj~klGy0L}42<5n$car4bc{QONa%i|D4Uq?Nd@&EDZ5*$7tHkmUu7}+0yyz5^ey5tS z;1U1h04|3Xz6K;iFRY5&bCjb(Y1@Wakxl0559>;?c5A^4XJWUurK+f^=piQDPeLEA zV<*Z;U{MW%W|9Upjk8ZjRc3HMWDG8GN-`0}l}HZhjp+IKiMl40WU9T4X!%ZTm@+`M z+cN6h^Axh`V4@eM8a@i+&IF}Ma(#Op6vv|=G^#}xA_7!#+Ksj`DIdW(K3WOm@2jB> z)v_pyLDfj+WD)_kR@Hu!}6-NZJMACdm23od_uC4QRvt{5eh@Ch;@Ouk)IOS z1!bGkE<}TG+WT%=hp(Qiys!GB;qUs%)%N!`eC{yFUVc>eo^5n-x&$6xc#%uBnpFVJ z`?Ejx|2A(}GLN2#;U(RX!Z!^4l}{&{wPi9Hy8lulY*d5V;+=i5cGhy(xFx zx|nk0biC3jaFKOntGLhA!%YNP@K+3fTznat9=q5laKHPK#6p(NqR7i}vZdC8V&^OV zXJ%oGD-~qsSiHtV6cISYwfB{2-DPk85HC@f)y!{=Ui7P$faHvq<_y=}M3KMjDO)ug z{7tV)z;&NV*)fy9nf7p9gr4JkT?7J(HcTyVvoKh@WVqzCN_u!PIrImFtX$Xt4t>%) z?{>%M^NF&KY3PL!ov_a)dx^%nyz|%twHnGEP?ita;wNxij#x@W1zUCIUYhoX?PgXH2<9>lnIq3W~JU>8HrBLa- zP-W8uky*o--0yv8{*#7~k@u=_n(1J?O>V#)>DflraaC>iz)L0JCFivgiRb`6quKQh zd={*-l|MW*jV&2lag9tqgnF}rTB8($OGrxQy5wAn#_mL1ia%N~*~kA$oph0YIVw&V<___Tw`P7BG5`7lIeRMb9mj#Me-j@w-xmtPH9e=lsi zAuYuMtzN;yuEn#1UOlEK6QJ?cTK2h)Q8p#2IQTVWFA4lj2OM=y}tOKQ5$ce?o zK79qmn^VX{5&l#e4F1)Z&O8W_W3tPOqu#WYuGafVu!|w|=-qa5l-yp8(7Q zF-;Alpelfvl;HQBS-0vk<%M`&_jf>S*u)94jlo@V2ZFn%UE2Cm{usB zX}KJb@EQd9G#>j^pS!i`ve` z2dVZ`tA8RG0x~5oVOapEA_g0?=8Y~uZHGZ*$R_?Es0xg+7J=_Sg4|?|rCmjbp>FVTldvsFO09I3y)4_rAt>k z`3gh$Mdy6&)6L}v2nV7}`q0%op1FrsHRP@U8!?FPi|tGTI~iOn*U8AeF-Qb}frwF5 z>f=mnI&AHb)R%S^DigtFS=Ti>cL?DG=VXvVBZaSLy%g1lhQmq=O%8_;EpB_yJr?Rc zz8IN_ek4mYy?bP7KS7rri1@a;BTNi@HxSt$s^(~gA^$Tj%d721yN_*VX0mgJ$j300 z0@1cGoM#ggarK&rBm^D|Km>$LYY&tvhQ3?<+w|A$FaO8C!w3i%AqWQh;tdc{G`=W) zok11*=pS-0VE{@)9AX~>FoKAyX{l){Q5Aj_en}(h+n$42Z_#$mu*O?L<#;C_8t0T$ zjK@W{f#MI`)<*j{5PJ=GppWF3?*gvqPunkrz)w!81?N$~r$6HVDL(Gi2LSsi0N9Wsw5JtWy#_oG!-nHb zMJ^fiX|tlgC?80%g9b|h695ZXNC6ypueZVIc*oZn?()1<^Hm~{4t=X8rgM$@KY{eI z8R7vLQ5gLX$-ktUIpwZusAV&nLh2e)(wX95wKgl5y4vkMXi*-)+Sb!dIJ|Bo^l^S3+rG``C))M12c@R6C|o%jLM#dq9$NTdPIyocZ!4Iw%(JpxMvsY3GE_F8ZN6_C6bEgyLSa4DW5*5QeP;H$$ z#<2!HxsLbZ)JtER5VmddxYQxNP0ZUtIp40Z-ZcbluV2JzDN7+I>_uq4ysQqFXO5)Q zJ0U}p+ikO#^ ze%5^6XwTCb=5=bNK>w>^+A?|hagZA#aEG%+NF!GGdUN>;7_{l0#BEK%ms$Z%Uj`zI z0f8W(Kv4{0FzCH1SetDb6*S1$Cy@t0ka3xfVE`aINCbDNYea(t>RE;BFG;^_0U}9i z3BoD&BTq_VHUG65&>00G^-~UV`NR8OOe)!v)Qhb*#8wO*n3sLtb}JBud?fZ7yx)(B zpgey`y7MUKQr$s7hCQ5vhIp$&6|ad96)6Ss00KZ4kkAh7z!XAg=wR=}j-i_9ePti# z@rij5V335uMG1Ci`*%2u&u_6(s6!^8eun_vl*A_iR3aLN50{szLrCjq36`N8$Al$< zP=sQHjE8buP(%sJfzTliZQ_`Asu<$w0pU!)4cnl|crMtprqISPF9g}p(!n_|H=ZT! z;k@Eyrs0x$(3x zfE8SuF)Hg4wu3l`Ww(MQkp}vTbkvq8xE3MlrEfXo=>BAv%V`t`Wh<(kS(fwKLlG0_rU9$2e_U(AO2A8-X%4uu*2+VD&Xi8Cl!p?;+)kmFI{lDQ2`>6;kkNuyZtK z3?DFMQ(%)<5mP7v%E(JD6;dhLwO%0O#|a@?696Ir^)fm+# zpA_M%fOhgr&K?R~T!*lmIV`!GThph0;s!z(U64@syO0{q3>qE*9-kXhu_E{?#ym6l zSpW~MTQ7iQpu$Hxof|)IE%p1}ZYNobZCE4c#3jNEw& zFOUkZUUv%a3@La{2L^F86kCqpXtA~|%?*6EaRL#6u5m}dkTWw7(D~ACBg1*Jm7|t; zGHasRdD7vL$k51)G7}<<5Wn)0Iv1&PU|Di!?nbxsWP_32M^)XJ@aGlxm{&Jcjal*M zRoB@ZWLD$u9vQFWgS$sxaH9ml4X)$jGZ3H$T1bMTj!Z?uZO4rw8P3EqQqbF0N0w%_ zdoX0va%U}9s9&B~@xj-OQloq|Tp0@i6aWTDK_38szy2SBdZGY}574Kb02SLt_9eh& zuabYqGtB=SI_wPXK-hp_fCZQtP?gx`fQ2r%;kacb9|?YSN;OfxhDC+^&qain8T_ie z;k|P{GndYq0Kdf27?;>xW2NldKqsbAXv zbGGgS^3p+mS6y-Pni6lpmSzQwk9E?&3{nuzm8M*6vOvFjN`GLLdaB$v&1>kT5qhz3 zHjbMiNEPovlmFeoJV%8-uQPdPhGgYRSYEh!`+1JEs)tAlio6ZcphXv+b7O!=*FRs%lSShycKPPo>!tz0LEzv7 znVlQl#N4`(@IGY!_G)*d9Ufp9Yly09CMpFeN(t0#8;aK(Arp5iZ{^K{Mn^#X^0MCB z&lMrc;vL+@qr--g4wJqxdn&lv4nW*^03|PgX!OIR48>Oo6{|< zhUEEC84Yjt%(prX+XXM2A@BiQRCh2QQ4}Ze`n0Q$FT z4b74k9JH_Fx?-v_->7t=rtqk|;vm^=1%5M*uvq{)jo;b{rnVX`xl^A{?+;D`P&@gg z6)#%9vEzK;66r&v8)P9B`NW)qI{l*!GH>Zw{~jD$r9x5>TNXpD(>iyr9gs=?gLyEp zl&^JTd-ua18EYyNu%IPQPqTgrW&VdODuhy>cq?KL9124w34UwV39XZ-uOyI6|f^Q^mGROY_-dsR?MC4#JRSh~p_%5K6`~jYCi?1CO zwe6<9MK&8@{Mg)q7%gKLGKB8us*C#khe2bF^F&?t=Q9;8gYxD@l2n73 z^XC5Csr{Yv8-aeGBIOwspS+$=c*u8EIfo`CV7=lnSs0wbwkZm(iCQ8 z^9yeouj(e5ru&CMZK(dNRWsoacN_aO1;FJ|kz;2Yd=v13YoG%AIemZ+t87xW!v<4f z1TFW08!*24t(cOZ3IXlyI-Ga#BeCR_BjMM>xkF~&knxX(^yxH899lZgo0iyDp1N5` zA)|4##K<6Jup7629t2hsW@)BaUo!yS0%i@JdP6J`c8!pZw6#Il_&ZW;fRH@zO8kVS znW3f#&TR}&rT1AI-F3>|RO!*yVO zDxHD$xg!@auj(afP4^K*8%i93SY(8~?xkS=W(91P(P=(U*iA4Q}q`oTDrl56-&*iv)rfjqXWaSxP%tp z4`MTXeJ2zo8>G%ZC#8TGp^+#*IaVA=^Yg~BmMfZzQ&Zmy+R*tOZvPxUb>Sr6-h#}* zWM(;L{4LZ|c-+0rt*h3LTO63iScKH<{QZu2eEjiYvMS)E@)MWnO0yVLWet5+j2(SN zZuL()&*ZSys_E#!A)015kyVBp-5>B1Do00t(YILYGx8jxYZ=W< zVWkFITecIDL+keWa>v@J#n|InJREc=LYBcqb;$r&;9w5r_(4r? z+yHWHU$vK_73xPpB|2xnes4!AcBlMd-yUrH2ln2nbDmtB2YlBG{e4B^Lk-kbLmB5m z-L%~{aWEogO@uHBtry+)GWSj zy#p#sTu7#fgf-e9K(I@(6!y)O3{L<)3Zt6Ek$Ntk)>NMSBDW)!-q3#KEfRPak#=9;;Q&kskqK<+TtOAUU+sqnK-8zuI6X z9Rr5202Io22FLbk6pjWyNv&;>c;I>o%&TVEAc$!d2%EGf^wZljZ{prZYQ~f^wvzV%+=$X9-+7<4`9hx$<*i!qtmWkqWp_WT{E6WnBzlnDKWn7+P1>N35decuOLr@93*;S ziutCLcNXje=Fv9W9uGj^>7C9PWBTC|3&k|lsFXQXaRyC71Uy)AS}aw*XU3?&8b~Cn zM{G)bd`hqy9n)l()PxTM9%?yNv0_$gl&d;WnXBi+7+du~`FEeCao^%3{#7PSDun+q zRy1ywquSvRX27OaXHnom)PmH{G$F7yw1<8h-?xkBf-W$oJhPjVRWcU#D(0uS$jH6K zLbZ!6Sc*%qSh3za!;Uj%=>zGxB_Q8w4+-1dYA`u7H;oV{Ix3p`9Id)AE%jo636R=i zo2y(h{qxhelW-us=sZhBf$|jhaNiF=c55sU)F6j~D6SNVh|jZYFQ$Y$Y7>l(DpnuS zbg;cZ3zP|yo>pZeXC}}k1IT3Wy)U$2FtI*bu#=O|2{6PclGJS5-GrC}2tqVHvWSCn zh#iJFpu6-OU2V!cL)M01a{y8J!mW_G(^9%T9>T}rXw5dtA6LX2L6T{sfXySLDr zW^d7FR$Np#bIqV=oC=vR2NyBKqE68$vk$8y{hYDGad0Wm^)8R!-?YFd(N#~|im*&M z?lY?|Lvqz+)TAA=z0<4oX3F&cAb^&-Bx z+1de#6Y*_$-Urw?_2*Gb->L4^w{xC>u-XVu{$V5z) zIr60`nK6I{E*+v>LnAGVW>%|e!R3!9U!fMLVmTgytCTE}7LMY^qmppsiRPwUHzSyQ zy%@u%R=1n^{McGFu(SJ?4Ui>sJ4i4{lNEk@v&-@c3qu(|NiLjkf=`s2Y0jrB6(*I!Pgo`w08b(x$f#}=?5NK^L!Ie;f5OBCQP34hvc@D-kLvRW60E+3G~O|@Fpjv zT&eI6@TZ6^CT>;q`r67^o|I=6`wfVS`yIS6f$`xo7oRPTMqa0%3SDwlJViwHZJ%Y zntV3;5LDIksVwUD$&=$xL*DQspI&wKnX-r~8^knk)h5)}8MlD(%9!CZbArr^UezHYW!K-Aq^7uB| zPWxK%BIsJnAHVnYg(a7@(NfUHmlgducyF^$n)K`Z3Ys?U@FKJtr~y*}uZWgK%)x7F zrwQTU%@V_vW;D*d8lv2g55HXJvVg*(H@J+e+hmSL(_}2|Ct}(j(`Ghc zhv(!6rDa~t0ibA?1OxEvU9usL3K3@@B#0Yo8pgq#C8Ai$q`iyb;FArDZZ?xuo&Jsf z$2z^a7}FDplc5&roB{MEjbbPCp&nCP68t)sJEDv_(|AJsI$c_V~(|^vEZ-$M`H_CI;Z{f=3U&L&mLO8{^RivH-IQQSuSt)VQ0tc)y>!i zkaD9rho~tgelTu(igb!IkN<_Ch@t%I$yxGv=ju7X?ZJo4pRWCMG;$KaNo3LLtabHH zdgZj5_5AUh)3G=YiBpmKIyQwq?BEKt z!&G8cLaT8&!dc+t>fsnOv5nrzaC@+X?}~JjKz-2#SvkVTOdZAZKs8W1vnurwfP7U> z)ZhU@4+lSoS)SVByV18;jz({GiS;X=(Ry}8TUcT?;r!7hi_|R)gh4qZD=8W&^^UTs z(CmFD>+xC+>07deBS~3_5CZ@Y+>TH+ojW6!?es;o>Hr|MK(VXw5-3)j>rR;!;5<44 z#V||9psbP(TMk{eH#l#;D+Dlt*ZJfuc{{;ONp@K3lxo2m_O6pF8N(~#jVLAr{SDE^ zFiEukCBhG)La~NCp}nj-@34ede9iMx|H!q`l`q-TF zCno-%2>oiTQ=65>u&Ji_=sz-(M7u8LBV3UF99_)Fvj;vdp-9?KTaNgH z&{*VP7yPX#1bQfDV*U(!Y}~X$nNS=g=eY>In^s8XrT8MRaDE4OvoI`K$M( z6(L3?o4<;6)Nuv@Z)Ky%ON%qChPp=8QeHdd$ffA`w?skZ_sg`WJh#Z!B#V^Z9P{@Y z7Z&)p9N}VSR4v+a!k2IhF1SVqY>E4|;#WQIbHh?&y9n|Nk7X3CllLNT0v69z5V{}g z8dYS2Z)F0SdTV=JD*|RHh#|6P=M#neHNwN--$e&*S9YYePWkMw=*Kq_p63#xy;HU( zfz%=-%4G3 zlP!H^(F_8A%A#RV+v+BJNd3)B@3C1(zg_<+6+1SOUvoimr#44fCIyl|BU{<`y0*sB z6|+FV-DADKjtyCO&Ffmqm2o`^%9zerX(4UuqZq=u1! zk3%IS;@~p1NaN+I3KEfaK<)c&Dzlwh6K~TlZqt`{RAQGRrC*=aqPlJx@iYu|yH`)R z&@yczoKmoYHID$}IGF3jIaCojZy3u!x{LI|n+~ zs=9*Bs0Di?vSfUUgjtqfw*oTLUWQ$de$Zf40SA|BqQM*y69Dqy)=^BGk@UlQ(s&-f45^t{;)kbwi~cjepS;M<^=4OimzrgDKh`eyw{Dg(AzG`TW%f^~ zuMb`sJ8OhlT2IP*R99b5jy%TmOB#zHw-l!;J9tGxkh<} zd#0L>Md*YY46qIjA<}1!Y?XF+KEr3Y7Fv=nvzZcdC=R2RvZktY#Rbb%7A$bBPHd|H z8NG!QYXZo1kx4x}Q4ZB(;z35}QNWp(T!TbMv%?JNParUFCAqZ;6JaFbT;7fx^er zoDIbC8Ox<_nLBREEFY)Y9C6sr8O|_1n#Xwdw9WBk8OHs3_+8Ryr_8CrIVw19=r6in z9kIfqIX3D?Jx~*@1yd`tP73oK zh2iJDrUc-d{)qSRTmCfQdCD?c8S3o)k$LmSm z-bH?|E#|YUG9q@1m1%lU{XGxs;;UST<*F#rU__i>RL7-z&~OCqzof%g)n2Z}4Aj+*TmFL|ja-AfrtFBqhu@TLvQg9BH$ZytVH4kru&9Z?CU}` z0!bewaxjRrExMAe4$5?e!EkeHv`dd1Y$h zu6V?47ra^7hfnrFkaO{?Ha98%QCcen-1r4L)NSjA=e zAA7c9(tB&>4RLZJ&Uuj%*f+c}nRTiW$TAuw-gB`SpKfWYE~qYK)Y$4~K2JJy9PW_zgPoEFlsrX}>+i1t%a73`NQv71~zwxnE! zmS!6WbIp^j*Ij|maU<e=qTd2F#g~0$qFOPA7?%o@ zZu6n^o8I%@1Oh)K8jW^Z6rMeo^&kX3XJ?d8#Huv{@d5+o4P4)tDw}adT*}`vgz8j@ z9pE}Z21H^4&9R1BEjC>j*#`6G`w4rK^uA~oyrC>TtK{WG(%zNaxpy>~rv26yYwjBoTRYO;i z{i(Q~H{%q+RA`S;k<)MwIUGVs6(2G>DThPXq&K3RHyn-8I{IXff}Z%L(D(+@ZHRZT zjA6wSsWx++wr;%^)AXSD4h6(Tb)?44Az0ASVwQKGqG937A=A(4oKn&Q zrQ-v%K0&yi9(f(N&#({+&)mA5l^LvzEggoUscD3~ef!p%qsE?zf7zLCxs(W z8C2r-O$)0Tg2oKPZv_Sqk7`r2VZ7%sqjvsEe#XM85UZiH0u~WYmG=S#9jmTdS43ZC) zijy&eh66)kfrOLIJ$Gn%$C=TLd?H4A;Hkeq&_awMq;Y>1rfl%D>>6%Xav%Cix4BYF zw+-bh?1cq+9)OPQV1w2bd@26>+m54pmRpCoogAvqblclA7pJ%7R-cRV@rov4asnW^ zC(b5^CoK*nrQj)mP3mjUm;AR{RENA1h)VsR^VjS<^+^1E?KPe6mK<;ObKNSGrnGT{ zsvaS3>z;7Ek*^ICCCSNPZr?-XF$J zo&Fj*oSu%Ix`}n+TF>w;t2v1b_DZ%ceLe7ZZps>&a*;hns4-`U?|1U)^h*Ei{Cj-L zln;Gxfi{1u?~m0Fvu*T3qU?*?sH!tuxyLV%uNr>;vMFmM#ukV1hdFAx6l<+T#2kt6 zxqg2#bFq9%-ZyoCC7wbkh#%^vG|$_d3AM?PW0w5(7H?EbkFMaytL%IWlrJv)*#8s} z)r2no9+5%~I;y6~9aHD>PGxq^x(-wAU)E#LhQ%-DmqxA|g+=e-B@KOZQjeho4^0`N#fh zR2p&MGYAjy*JpF;_18ZfClH|$dWY-h*4L!}Dm6+)c#ZNcYtd=^T=VSWGuIvTBB8fh z6L?eSZnc?G*ncixhNchU$UFZ5Wh4WaqfV6Sx zNQdMr$*kGz?ip~r)wr%eo7v$S{u{_PhI zYtePW!u5O5kde6tH$^wKQzUrg?KS}4WC zCUKS0a}ajlJwdNCL^=sVQ!ME0&G>Z0hE%rkg`^ZdDwjoH-p&{=jx>C++2G?I zoSk<-z-25wj|3J6zmRqQ@Ow|?94pfx3i4zK-uR=?aRAK=+wMm@EIr4E)cBdpwp{ww z{W1a^y=Hu@5Ldn5E!fne3jj5l_lw>P z$xEHB8mWJ6KUoVK<9yFyT^e1aV`(Li>-rQ^j@DjmXOttlpb7h}&YN+3D;g8( zR8B8Tv-kczYugmC??A0iH9lYXy*6UW-_BUiyCM6bnwBMmh{dWVEh?G7VuY#rBP4Ko zJ;*jQWea}tu3oK%iZY7%CAv^`O=jylOfPz7nJa^-t#PMYoU&qNkjBagu83MADI3Po z{GfC~RLiZJ@wn*8&XG<^t^TqaBRY;;7DWRkk>cwwnuSXgD&29`mWxRfvAd~bi)X#x z{$<~Z8|$ziQf@omsh)csfHtD(IwAh2LwQl1y`MCg)iD4z`=?JZUo zoGMk`yRX?3xy^t+m||aR2L{nID4;k4fVMVeN~G>k?|%QmGy;|Ys?Cx zIbY}tScNOGNbt<-pu)oFmpUw?(U)JQLUfl;__iEwpa?)M=IZfMwwZ_mI*1Z|WvzXB z*^yNEyM^p~wPjU1|C0%Iy1-P$x)>p@_+`f2OZgrtgAa;yu~dbvxvrms_JVT3UzF`- zGQRhu&u0XJ=F00 z(-DS|BwY8e6@ul-8N^o0TC_gT$-o(@Yh7~M2pWBOXt0|H za~fd|kIa{z`~_M!q64mR%cLoaOmViKiQ|_2&K{Ns9K@+15HX0nJ-N{Lf_wGl880?S z-x(=U--$}fAH$&h4L*1N2=dR7ZB+IW+F^B7pXzKF-^DDH{jOuUO}zY~gzsK9MW0Gj zuN+sxJf2HT2`7OZhI>+&0W!jjl$$WaCs8l>%yB3vJ^9mRG8KKILp0LwK;Rckd!Of3 zuCd6mw=)vjw`+9BEYok6t#8qXzch~<%6Vk1eztSx9;bEZ?M2Msd@643^-`Too~BR} zFS*skPOnVOHa#N3#-X8uc$=pjkul?>W>`2;fB#r68`B*l$Tt>Od*VLYD@J)= zXI$WEta0?UqcR`HQ|l+jxALzg&V5!nL7c+!o}m|rYgjGR5DVGygd{RbVSQoYp#xqT zMY*ikL8OH-EO$9f?d>}JNG&sHqpoUGSu6oFiIq5uI?YWt>>?MYo6ak z_G40rK5#9atMssA(Rx)j;}8*XwS0Cp-yEuVByuB=lF>s7`-S9=a=s8bEgjq9k=@on z;`#}j3_Fui3?daW@_;tg^y3O`jk|SXUQL^n~K zrpcAeYvyJN$K|ML9a4BiJ$j4#NRvgLu+Q z(m|HGkh6UWy9mwZyerp)|U~*HzyN1Krr^ zh-leN+L-%Z7qt->S<;ARWzQPKLGtyjVR+VNZRmPY$ILB4ySO8or9s?!ZxLTree1Kh zqpE=a0?yU=x^sdtO;?YwD@L3X`jNoW@5b%7Kl<8S38 zR2#RFXK3a&^iu%-f%;Yiz;{4rM9cK%N{0j+;lEDu4>8^Z5Kr>0bUN(O+sa&LKyD7b zb`1RA1NwuV(JXUo7eo`U9(UDu_#Ywlt<=!%oi_oj!P|3uJ0y?GYZy@Howpe}MLA15 z3<<*b2HW>}Vi>}#yh;4~v6E8{(DoCO~YLlpDvJ?L4-xyp{LYEo%c=v zztF9J>i3Hs@JjK8NMd6;-=Oi60TPO!bT1S%MH_TSoVo_mPhHISI{uhzHXKsQbQ z>FfRVUJIrMgk0RQ?|=GwASE`r?;;EMjJUY0|N3v0iXDC?rvIfRGzqW{d@cC%j?#!H z0uzc^l+I2GO95-cu<<;5BsKeF_l-H)Ugy1i!a8I~qj!E(;%i z5(}=)i(U#S1w^y#rR-qM<$f4NH}b|F_NOXQD&jw>ZzX|l6}`=CGihruYAUgd2s_cm zP6;?8A`%Dpyu6Mz;C%hIrbom)-K7Q3QklMt12^bY6owFp31BGL<;^G_)?(a0GMM;` zQxT#^*dL;r3J^9FJMdd{4J#T*y#XI z0nv93iiZLI>-yGrfbD^Q<^M7@pzKg(;40IOM?3}pZQGaH;=(CJ@d%fybmrp-#6>&_T zdF|1L-9k&>%-X{6=$W?vH;ozb0venBy1d_WzTf#fAGjs+V$#F9ugq-K*Lx?;Qm!&6 zv|P5RJ!M+bsmU*sET_%zzp`Y_B$nr=f0c8!&dIs?kE8ob(sS>!!b?WF-4>}+d+&>W zTeEcfk?GU@J32KME|%EOv3YhaYkitxb$p#^^hNFSU#imHb7|>6NV^{wSoOnWeqG!a zKDl*wIjrK3Z&AqeY};MzZ}gkXwRiipkX!8Y_J!T}^kw&v%j!&1Tc>quY%CVC4}Fon z<3OyUZtCfXMO|snytHFJZj1eKuQF40_Kzh?`n~~seUYA>RgPcnEOZRREWIK(n*FNx z3wo(1cy_9Oy3I1{z1w3}?QOFB^lJCjrPp50eck1Lj4S-kjGYQit#_38@6K8%X1r#C zbnSKXob-%>Z2x~OZu6_yxYt(yu(Jp?i_IqVvqRW;a2NP>AcTUgVJoWq5 zY%QnDFWJ0mp3kXO3sczsUp~N_nMH(w0k}cTW%J4o3pVJ19-F`S?Gb^oPc9A>0curs = 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 ) {