V*To^P0ym_dWf!T!x#wB|H3?3k(x_IBznII*ZY@*@X98eYN#Oe
z_h#ohlw6PO1Q%koMs_yjQ%Nk}O4-pIS*$kfnP^SBO%Z6Rz#yQhlP*i9~nd&6YACQ+GA?s@*e4ziTt(QSvm|RWOKW%F;7aA7Vb^
z&67Lu7kOfj-x#DZZlDbH-NG}pWf5h_)GYtd8`LJuJoo{Gk|jrZH1)UGEk#?gq}-i?
z`A`fsm{})zzFH0HjH()P$TGWO<<#EuFmd2pbab6{5N_$?Zp{b*V-!^R?agXfDGi;!
z7&E_GnW#B*GaI>Tg=Xo^taw%SWMu;R@0)nE){$yz%}7n@Bj`x@?a%#Hr0N%gZ;jr`8PD#BXNj)(q)egJN4NHLqEv%;Dvn
z-t4wM#UU*0LworqB_(Z;Mf}V6ML$9}CKsN_6bh-Uu7N
zeznlxFwrr@94tJx4%8chUPJ8^*6PE1ITjeCbB;9;YgW;xhookHz0>|~(9CB2!e-|@
zaTW^4c4t9=YZhL@6SjtFeUs@cgovj0ui0F^e)*1KRPm4!wrfMO
zxRSlOVcT>^Hqyf-JuTk$xzm|C+}_gSSk&1X4riYX`BsD?40>~+rgS(=oo2^91{9P0
z4BMPPZO&pIu3PIEf=?`|l|@m#eEx1EH3|>4UMOlS?a}}({4VFu7YmP!xg|gp&$02A
zi8IqPAr7`VBYf4#5;u(QyB~%+IVVdJcl$ov1itpRXkzw=Wv}=ai{Cg+TyQXdqZo0l
zD=mAQQT>q0T?I!pD2)lXt|qwu)`tp)~*ef#xX!u1E)SGNxy0xC#|
z&d?{}c|Qr+xWaeBr}pwKKkaP>Qd7_!v4fR}h$lQ%TZ*JYYvAKBUG_w7LMrp_7)FWR
za!2emc%#ds_al}_*2@m7oP}(Q@?SCbNxe`rkWsUiLZ%QOXL_3_axdbr@S3PT%|t}K
zQcEHG?2aeJRCdpnSaB$OVoTo8h#P5*hZ@|5jdZyecXdjp%K_)Gv)&?VlvFRGkyE;2Ety)(%d_QYbNt!t=dMm?$Piro?vNdD+Rqxh#g>MLYPkZ&v14Z21jmBW703rx{YO6?-xI3E!JV;NfxkeLf;m&0*^I9GIcaA_AH}C+}F!Vzv(oI<^tK%>``s_G2U8olkM8
z2M&`mJDuBy+yBwxSlHPbqjth?7a20-XW4)q!y`VTHJmBN8A4a{+nph^GvqVOykk(<
zPHcVATMcR*-LYevc!{;|h!tOAhP$SV&$A_WO%xwz#dxN&7w?Lj_UF00a^XBg?QcSF
zfkc?Pb#)x(?j1$FxMFxJ3%vW5K0pCqtJ9I9?!0?a#FJfZWVyX9Px+41>vzwkrL$Q4
zatggKgi94qe}fr=cegx6A6rK4N8q>Avz+OT@+3N?P!@7ej<}m`xM!A_#tz;yord?%?wKI=VPUq>5#d3;cE7VNS;M!T*b>|1N!7@F
z{oDl7LH%4hUJ<0ZTIXH5dd+(BDsRRTmiwk?>*pJ^^P#g^Th_of-V{UBFRBHA0!MhB
zNHhA0xKiGUE-#%zy~gg+9~KuR^V%epw}9D#naAkMVfxCx7{bw=C8K|k%A4SIjZL$E
z&FogJ?845C;ptsjQASO+a9129wQ(0u_`t6B#Zq>=z5fW}{L2@L^fS8i{GEMnFuD-E
zDeyd0_MQDh(%glzyYcCn#pTHnBa;;J5Sk?6eYXp1%^J@|Pn4e;X!kk77yc3Ac!VQw-xnc@;q0@D`!%~J^LTd08$rKM8=k__w?8nVo+mc(cb7z&j{|b-t=%Z;PSi{!wWUQsUpk?r_G4L)iV!VPRB1B&rn&
zO;ju1aL&?vGlBi&9JN4gP)XUcYl2ep^=tVjB$c+Q&Hxlp<^kKf(%jirjJ!~?1^15^
zSF!!~Po0NdDtYCHsP^>zLH^Z2bq}=1_Xf*7*50q(huZD_91r^3paHy;&kcq@5KomP
z^?^+Rc#(wFKCm-D2eBttjU1DNoH$H!{!_`Y@ckW}7PUEfb){pE?NnoCx70Vh<_gOH`*3)cQs9%UY5KwO>tXZqhwwu_xK7X5r
zT_a4{v*Zt0%HBxvb(XbvF4#V@_jd6h3w~&yxRgEh&`eEr1N-cuN$SPc=21$SWPU20
zS>x!pimLSm*~Z2{93$SumOT6}y4R?Ev7&=b-Pb6}ENK7uUdWAnbTON;e}$OG9@syM
z1g+bDpJ-z#kHm^=S>7WF`dw5ZO&uv_%tbrpBKG7Xqf$p3d0KvBu6KZxCxSc+!gtD}
zV8b3uHzK)m5&G|cEIbnQ=n^qZnRZAW%as=$*FF|SMS16AqX?=W8`cK|1-W>Wj=uT+Sjp3_2@wA+r1y-Er$21+*
z;q#G^Yn`cKcqx&zHG^$AFv%7)6ol#_JnHezwh*Obr7tXFZmjMUQsPvL;;tplWTc|@
zD{@_27d!QpzMH$g+`O|b*Pna)@+>y|aT^uHp~pvvcd>UKzlkQzPYi?I`~>5b{O?ap
zfGg_BRB<26c{0bSG~y(jve7I~d20pB>t;na*<2H>>B;G|oXl7*e=?XpBqZL=CRX={
zN*7nhrjoerJAZB$wWU^k{0ABbsnlNnopqtp)L~u@ZMrxOe5TME0X*TxWFQvo=`&%^
zSI5M13e**N2Vn?kAs*?S^fkf63#;S?cDee<0MIzMi`bTPnml;LFoWMGKRRqFovk-D
zkPbYNP$Rqi%&=H=!ugI~a_k$v6R72&L6ZRu73_#-w`jh2l|Az86furndUmzg#>PLF
zF$uZHz*B(zEY!JxlD5|EbPM*p{4jP_oTl@*J0pMc3I_ko7P>!&-sn7?B&xDTuuq;#
zi!O`g4THbuYQNmEvyEQlq7hGK2UDXE0u`?9kHXkuGmvwQ>g9jUlGUZVtBgNglX#G6Z4WQ_3V9|OJp`T0cg
zF&6&9AoQl=Ula^;0|k*1>a4ku~~o7wimn__#T
z;zPT5>$vO_X?2rzgp_$1U({4)oQN6l`=!Rmu}=a5B3q3c#<)FILUS(b6vqVIb-9nrsd`6lr>w&+N#
z_KRuQ%E1TI#wb#)z>Xm4rE9LJzI#q54@w8mE*u%S9Hq@qLlZxt&y%&HUS;#?KCl0%
zcRGCWxTI5YVPk7%hqb>`JIAan3FM#pQz{|uClIe>4!&8o{5#8jrHV-0
zucV0c*mbWOLkmaJ(&Li!5!N1kkF0uid;o>-K9L+=;?H6}730SzGDQO$|5^b^jy&?(
z7LiCpU!Ro<%}JL$A4whMo}#|^ey}J_q+O0S)qm}pGg+h?bnDqLPfe3Oy?>fgKzNy4%-##-l6e*v1eX1tF$bNi%ES-Rlej`ou&mY;g
zH%4i8TxCzbu|d;*BkT3%bz%vd_+~^1_*i0a!fP>rHsj6Meq?WlEb_ak9XH-sADB|Y
z>~Hc#(Hnrw;q2<0|3u`=uCaI;PEEpd-l-9JBx@Y1!;Kh6^p+fQhAYmZv6Ec*IOp3Q
zM`#*}9ct#!75qtrj?i5GBp&Ai7vm|`ifdM%DF~D=p$|HbdoG5Rtl`u%VF3m9S%{CukB@vcI36MoN!8vqWQF$!x4Os)C&-(g2GkSSz?ZkvXtpL|XyibUWLO*k>>3
zj}K783qx^Wf#${wV-8yGp}ef8XJj5d2j|jrN)A0|t-v$C68BJ2@n;PxLyNd`u$e<(
z8ix^!IEK=YtSH6
zjC#?GC#g#P=KP;fIW3!3GV5DI`D)bEk!ZSt37jV~0-Bjf7NcTun%ba3EgX`m-HEB7
zsV&jenRx2$Gn6!Y|E=jGkl^?4t#$B}*PKao;eX1RIw3_6&R8n2DdveBjrN{!ZgdbF
zXXG0OvbE=8jfkb+>pD|+l056`=n46hB3iDN5qtXFJJeTft{+0>OY<#Wz-)j05c039
zpB0?<+x4C)C`)gEdnL}3^7
z=Jk%nz5PsIgxD{Mj#<^P;EW5%K7M<~OmYQCtJ|NV2=)g2VTl9q!Z0fwB%kk3(cd}I
zmoa$Q8?;I&)dhsIw0GjK=Y`Js1)+CZM-m_o!f
zLvy{2f}0)~0bjh3a>g^F$$+vO(ZZi?{3)P+@r-Ea_AC6^!JqV16VC_(e@63X41ebF
zXD)w^4eBLqL@FE_|w9loA{Gv_MQ_
zKa2P?hd2*i4C%+-Q%g-WX7f1=%2kC{n)m0=YSDg
zcOhcnB_h~Q1oXvzr2=8*;U2w*#eW#ZVlL=yXDReWU#OSnq+70{!`W(g3&&=6Gsg;d
zBal=12~z=K7Pe!gT+#{KEZFMWiEoz57iWKN%Yz8VH%MAUeHmsTf_+2N&r-Vfyt}lD
zt+~*D`gizHrV_smwz~Nlh##oL$CVKGBA$G+JB4G7JBj0dx9fiP;)MaWL%!ILQta&%
z`v|(a^Axw^0m@3V+eHdauW{D_duCxj1Yhf8l1WTX5|hou#P3IZYB;|-cQsJq!@j#1
zX6x^Z9!k+WDEde>Iwfo2(Om94j?L~Ij#X|mu!lIi3(-YFqO9VGeuzq~0v30vLZc1p4i-_lZ21hY;yZ20r159ChRfU+DwV=`h}=%P@8mu~UQSZ4`z3DOMAk!`(B(eBvDv*B*i-yA
z)N{z8Yx9c#b1UQ+y#jLd_sUUa>*~HbK>R6@R1wLy9h{?IkJ5nflL(iV5ar86d6FpK
zRVbBA`O#CqQ|Y66MxmmFc(Od-48s&K5vYQ`sknDET4z1u9;$d@jdJF-hc(s
zlE-s~UO;Klc>BDzpGX+bZUo?4itg`V>7mLcRmjS1#402UtnU4u6}&exzw$X^<*Y-8
zXg{TM|M^WMs=6ZF4}go)c@kmnvR^XXO_9K}1K&bdD(#oB)h#0KLHN)EPaiu3?nS%V
zn#QO}Z~Ewt5nUzGUBm~>6`d+g+qwU|f6HDmzksbSAsZAw8zy^oyD#D$vUZmg)|L_dKQtCf;>Rc<8l!F*cCRj
zX+R(OK3=iTyFb5=cX(Mo(ljE?CDIL7xGXder~x_s^^HPaG>6>#;qEDBC900z$0m^2
zR1upY3L9Us5Wk!r@n?8vDwpW%@w_R&1zX*DV(=M`;e4@Sp?u4fS#-oL71Rc=yN^es
zwp~KeIw;!1YBVCRQOT<-*yazThAs4w&m!{4H-bFNN8aS#e=pTko1T+VzY<7f79tz+
z3t<}EIrsij8#GP0^o3XdZ^2f#m*Ri+beXReX6pBIH9D;8_^@eZ4_N)x8()T9|ua
z*2Bz&8HTV$FmbT=g4qlne}%gd<}Ts~zq2rfFnMs#hk4ot$7oopK}5e7fYET@58Oo&
zVGcmB6EOL(Hv@Bl_aa_2kbVyXzlOgVSg88_47X0TH$x*0s&;07m%`)R@O6stQ@<2}
zb^b9r=m7Rs7Ji+wXK2*m#i_y$+G#1lRUnu}aJNLH2#qkp61MbD12v1594YuyZ*5?x
zfUP3-m(Tl&{K-=OqGN@h#SDrQ(uLcF^}VQe;m^VX
zY(`v(drx!;6q_~P1v4GFG8vg^Q}eij~S8&90vo49*BsBR;ta5J|R@toiS
zA$&K&Zwu(j?^aHeETqBrCZ3Tk$hjFjion?`h<|8kx8Nhk|DxASpDUz7*z1wOrNVq+
zEuN{!stLRKB;PGOjjdd+4cxA%VlB$xt-n2BONMH!NN+x5*uv8k1XA*H$he7zD5_P$
z$EeCxRJ;Xw*aWjq*otSaa3^?d22y-8*F_PE3FU`;uK?8+NV5THjqw#ou8oUCrQxqi
zDi?oMlDoSqm2&N=PV%)tXm1gbJGooZOA&S(gdpYedNAQvgNu-#bv#ESgzd=pdgM}I
z8!vx9b{mA*E)*g^x8uA5qFL5$zGXvP;g${SH{@^JykTox{<@8uHmsi!CotO=gIV4e
z4~BJ*!y3Lw8r79RE|lU;EFKlV8+-QChtovi@NA{m@P>uJAE!8iE*(9_obF*bz!0?9O^QKSOpmZI
z{2}0dt`KonSYfKr4&kZQVn=*mpHML~U~gLLo}rNe>q}DEdzzucs*6*F2=pc1A0=ai
zdz|W5UA*tbP%&z}KMm35B3=tS!vz_E&JewRgjz0PFp)HSxkjYIMd^CwI19Jej`;j1;(17Ata=F@lo;Z5
z6z>Z&h*7=B9$msq-$wcL*8vGa=2|+)1#Q;%f^Y#^3Kc|jlOlQqQFsd`N)&|+Fu#ZS
z7RICzg)d?90z}~%n18{{(~3d~j2MWi1&ldRTp^Ugat!7tn5n%);YpbAAW=w%c?jkU
zn87+x*akB=SQKuCc?IStm|49=p&aHdn4e%~^+5uC#C<;+#K9AX?RvH7Z?BD8`1FCP
ze;x4Wl|N7|nKvUhbL)mJTXS!_ef$=Sw_RR|y$LuQz7vpVJ
zID3mP+OWOIcpHs9LN#)1K&w^!whOgLXc1JcxOc248u~lhZREF+{7ITJi-3ZNGYGZdlPB*%nA9ft@8`s^B(5*fE64T1h#
zJ1Vxf>~Y^n5R!65-pQ-=A(8yj;OAFICUd$qqHvM;DfI?=5mpI8p(q%s!l}777K=hL
zLbw|ms)l=imm9+?5-bsg3evz$Te+M5EQRWimwBQ1+oFik5JV`rx!3g^7^0j^H1>em;L=Owr!LT9x26mC+d$-vyFv
z9|1{we*sdq+JL0JD?o38M-`@p{Y9N_(a%b~$LuL)AAGd?a4SvMM~j^;l5KKk>b}n-
z#Hf%!rJB|N#eGAg#D4QACZ$A3iX}r5P_#veo&xm#_B^SiLS&jGVmw&7o{`6Y~q&WF19nHsGK02j(-BPU*
zzn~Hy1(Muv07+X7K$7!)AQi@^K&oDU2U6j-1F7Er0HnsL4Nj%yyATHSYJ7f`RjGp4O>-t=@xC>PALdeN;3cFK@4I)fIIQ8RToLe80db)0ISgzEo(JO8+|vTYk+Y`*h@&-6#3;^3
z*o62Z7#0JO51|T3U3v|W#@RX`##x)t01K643y@UQ0i<$@7_X>*G?2=1K9F|Ra)DvM
zA|Mts!hRsB^e`|S=mPcw%D^a~Ha=D83ycHOZe0Q}5|{>zrt&X@We_|nfib{Z;9y`Q
za0svs7z@-*P|C~*913>|a2Rksa5%66XapVtjs!LUslr|cjt1%yQibb)M&MZBBH%cr
zFXX{89#{&bHRl1~1YjL70oVkjWnUX`7En78uO5%T1^6?t3g`j4fK;8ERBQu^aBHWbb_1h<0l?8fEieU$5m(3s_5v0GgMgL5
zVBldD&)Q(2?aEJqp$O;%h5^SVp>_jvR4fG=;I0OS15X0`0-J#SfbGBtpmsWHH!ubm
z1)L1*4@?8b0ta{)Mnr!;3%L4I2u?990RNc
zP69Rp6M#u0O^gALSQ7Y3>XEh0Y(E)0%?NX0*nI+bD&~i3~(4Q2{;^>
z12h7QfFo?MRKhY6co;YecosMs*a92_)TW>x02+Z4fhoXA!1cgHU>R^Suo}1%cow(|
zC}XJ-`OwQ^3o>gFs;}njJ6(_%tvX_y=Gv
z&;_gj(wmeuKN|z5%Y@|dZE!*$2ALr}?4iYgmqeV)|O4O^NA!4GLnHQ6i
zX{ccw3RA{~BbjC;O(yi1d_+Z)mL>~@(IRya4f9>N$eQnFf6SV-?z(5Kd(PVX+u!f;
z?S0SL_xh=mXG{-Gn_f^be`d#4}Os%bhn3^r+0J)wi6hyBmB
z#g7-wnl`6!_WWyYRK2HRsR-Bo``2U7wPSsP362W}E9x`dU}jV}V%Psbr%@(ej^Dzk
z@o+MWyhvUqUy@6toVL*a&=_XeqihpvV?lloKhA&VSz?vw5dkO8nd+={K6E;q>tu|4
zNv@Y~$xJCs#aZ5KdFH_Q|IdzeL;8YKbq&wM$=}Z+|llMH^XgpzY4n--7(&M
z-ePaHx5k@e3++m~!+vC=eBYnqKj~NaHGaK+!iOlKhDYXygVAJ^k6KY5yayk^kCGMS
z7Ru;B2=pB`jrS5;MTIj)PLgwFk&IJ^)I|tmoj##QnL<-x6L;E
znE$Td?FUl85utI5O3^3i40g%4q?E3wwKR>bW2aaY@5?vC$nOyki+N&@^N7Uar^c*Y$4wxjv+OoAG9`dD^^Y2D#MDcK_mz^k#dDylOAnj^U(l;`DJx?yvRZaP3~`d3T4$fr
z>MW3}RFz(0J}?*EXs^>7XJ`7w{(e7@2Qr4X>XF28WG=ajZlqQ03>(I0@DKSZo*;<0
zTTB)+#5$+N>2$)Wa*;eHzmr#GZ`EIoS9vN`Pcao{pXuYKx<}ktZ#;nWs&}Vd1+aA4
z5&k27nZMQFs+ZieI|mqI*!hwXq=9p
z!WZzpWFh&945z#49c&0s;7L5Jc`jci%Eb#noPDCodDq$LG&x^60eM_@%JZ_1x=l^d
zxq6m8_B!CJi@o<=jzQ*&&jr0||gMLU4
z(c^S9_PU8TPh1IcUc9|ve+xP*oLjIs0Gt1qR
zZl;}XAGVL$BX+1i)-Uwo{=zSF&ygq<Kmtlf_k%PO@mO4m
zx8aZRVeFB+NEUg3r0|Jx3*Q!R7aa`6}KdQk_0BtTviaZkD&p?zJcE
z4L9_v>2740a!vl?jxmS1Wl#OXg#F(6z!q0YzSj4jrHd7
zT=E=V$QSZ$d^o@dCZ?xt1`^d8+;d9_>LD*4+wxHdp8J$8gcqqOZ
zKMf+fibLejq?T-f#C<`U$u}f{j%S5{_9v_bG<}g>VL!88JeCjOqq*VZc?N%whxlIJ
z%7bE{NE6G%r{auQ;4F5^ofn)M=M|uLlk>UL?6f)Upt>_o_>$8D?%h}RmvM50yj9*Q
zjZBkw%Rk5m^|Sg+f2%L+
z!64bGrorqsADdQl##}JH+?!qN&UK63C*36P4v%|9-coO+SMF^9S7{A<$GmU7E8cZB
z$&R%e%rVnWw3BVFoniB#8We-PO6)VX+^)83?0Q>kUj@DIuyW-JSbz~67-X+V`q
z{wW_IMu}|kmLTBpTbwJ7kyUbo+$!IO@qY>#I4VzqC-lf(>PCfCscKdUdaB;2kLv^&
z_d4^YdDnbtj+h(Wq3%d`j7z|}=DUxBeLd^0cB|blpynNSPrGMbhzb@WtZLtc;GN;f
zS|SBL$s-|>Pf}PAh07T|=uQYuJ=)
z<1B!hw?ys-qMQTnNHK$ItLuDSTE5Px<=RP*L0oUt{e3Gx=|m|UHV5IF#XLS6K{}VCd*7T*(TTI
znPO9F%1pVbHJi;Y(+GL!G7#KExDyK$mna7;Cm$7~N>qb(p}nXJb)$Hkh;cGTpy(8w
zg$r;oF2OZ;Gp@r8xDlVgUHB3XkVKM97|ABNkf8#yr0ScDU|hJH#M4BYOc9kd1yYs`
z30elJ*-Yzb18t-yXcxUi11ymtmd$cmh!wD6wv3gsa<+ywuugUkT&O=!<_H*&&GUFZ
zFX3f;4b=KNP;)bH=K&ET1_>rykkdp_B$kL0Q6?(IcCl-?XcwL05=;k%J4w#%j&yRI
zkW&g;t8{9r#%2bGhLdH6oG5c-NS4ZSxkfg~U9w3w%S$o<@FXi2fC;H0RiUcY`v6F%
ziqmxQ4=E-L5;M1&
diff --git a/sln/hgsetver/hgsetver.cpp b/sln/hgsetver/hgsetver.cpp
index 0c37583..5635c99 100644
--- a/sln/hgsetver/hgsetver.cpp
+++ b/sln/hgsetver/hgsetver.cpp
@@ -428,11 +428,11 @@ namespace rc
if (bgn)
str.erase(0, bgn);
}
- static bool get_version_from_file(const wchar_t* file, int* v1, int* v2, int* v3, int* v4, std::wstring* company_name, std::wstring* short_company_name, std::wstring* vendor_name)
+ static bool get_version_from_file(const wchar_t* file, oem o, int* v1, int* v2, int* v3, int* v4, std::wstring* company_name, std::wstring* short_company_name, std::wstring* vendor_name)
{
std::wstring cont(load_file(file, NULL)), line(L""), tag(L"#define VERSION_MAIN");
int end = -1, bgn = -1;
- oem o = OEM_NONE;
+ // oem o = OEM_NONE;
if (v1)
{
@@ -489,22 +489,22 @@ namespace rc
*v4 = _wtoi(cont.c_str() + bgn);
}
- tag = L"#define OEM_";
- {
- bgn = find_line(cont, tag.c_str(), &end);
- if (bgn < 0)
- return false;
-
- line = cont.substr(bgn, end - bgn);
- if (line.find(oem_str(OEM_HANWANG)) != std::wstring::npos)
- o = OEM_HANWANG;
- else if (line.find(oem_str(OEM_LISICHENG)) != std::wstring::npos)
- o = OEM_LISICHENG;
- else if (line.find(oem_str(OEM_CANGTIAN)) != std::wstring::npos)
- o = OEM_CANGTIAN;
- else if (line.find(oem_str(OEM_ZHONGJING)) != std::wstring::npos)
- o = OEM_ZHONGJING;
- }
+ //tag = L"#define OEM_";
+ //{
+ // bgn = find_line(cont, tag.c_str(), &end);
+ // if (bgn < 0)
+ // return false;
+ //
+ // line = cont.substr(bgn, end - bgn);
+ // if (line.find(oem_str(OEM_HANWANG)) != std::wstring::npos)
+ // o = OEM_HANWANG;
+ // else if (line.find(oem_str(OEM_LISICHENG)) != std::wstring::npos)
+ // o = OEM_LISICHENG;
+ // else if (line.find(oem_str(OEM_CANGTIAN)) != std::wstring::npos)
+ // o = OEM_CANGTIAN;
+ // else if (line.find(oem_str(OEM_ZHONGJING)) != std::wstring::npos)
+ // o = OEM_ZHONGJING;
+ //}
bool found = false, is_oem = false;
std::vector embed;
@@ -1023,7 +1023,11 @@ namespace rc
{
prev = L"_ctssane_";
if (cont.find(prev) == std::wstring::npos)
- return false;
+ {
+ prev = L"_zjsane_";
+ if (cont.find(prev) == std::wstring::npos)
+ return false;
+ }
}
}
@@ -1218,7 +1222,8 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
patch *= 1000;
patch += cur->tm_yday + 1;
- while (change_oem(unic, vendor))
+ //while (change_oem(unic, vendor))
+ do
{
if (!nov)
{
@@ -1235,8 +1240,8 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
break;
ret = true;
- break;
- }
+ // break;
+ } while (0);
if (ret)
{
@@ -1262,14 +1267,14 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
base += L"\\..\\..\\..\\code_twain\\twain";
STR_TO_ABSOLUTE_PATH(base);
wprintf_s(L"aaaa=%s\r\n", file);
- if (rc::get_version_from_file(file, &main, &sub, &build, &patch, &cn, &scn, &vs))
+ if (rc::get_version_from_file(file, vendor, &main, &sub, &build, &patch, &cn, &scn, &vs))
{
if (!twain_only)
{
- rcf = base + L"\\..\\sane\\sane.vcxproj";
- STR_SIMPLIFY_PATH(rcf);
- if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor))
- std::wcout << "change predefines failed: " << rcf.c_str() << std::endl;
+ //rcf = base + L"\\..\\sane\\sane.vcxproj";
+ //STR_SIMPLIFY_PATH(rcf);
+ //if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor))
+ // std::wcout << "change predefines failed: " << rcf.c_str() << std::endl;
rcf = base + L"\\..\\sane\\sane.rc";
STR_SIMPLIFY_PATH(rcf);
@@ -1281,10 +1286,10 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
if (!rc::change_file(rcf.c_str(), ¶m, rc::change_sane_def))
std::wcout << "change exporting-definition failed: " << rcf.c_str() << std::endl;
- rcf = base + L"\\..\\device\\scanner.vcxproj";
- STR_SIMPLIFY_PATH(rcf);
- if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor))
- std::wcout << "change predefines failed: " << rcf.c_str() << std::endl;
+ //rcf = base + L"\\..\\device\\scanner.vcxproj";
+ //STR_SIMPLIFY_PATH(rcf);
+ //if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor))
+ // std::wcout << "change predefines failed: " << rcf.c_str() << std::endl;
rcf = base + L"\\..\\device\\scanner.rc";
STR_SIMPLIFY_PATH(rcf);
@@ -1297,14 +1302,14 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
std::wcout << "change exporting-definition failed: " << rcf.c_str() << std::endl;*/
}
- rcf = base + L"\\..\\twain\\twain.vcxproj";
- STR_SIMPLIFY_PATH(rcf);
- param.change_out_dir = !twain_only;
- if (!rc::change_file(rcf.c_str(), ¶m, rc::change_output))
- {
- std::wcout << "change exporting-definition failed: " << rcf.c_str() << std::endl;
- ret = false;
- }
+ //rcf = base + L"\\..\\twain\\twain.vcxproj";
+ //STR_SIMPLIFY_PATH(rcf);
+ //param.change_out_dir = !twain_only;
+ //if (!rc::change_file(rcf.c_str(), ¶m, rc::change_output))
+ //{
+ // std::wcout << "change exporting-definition failed: " << rcf.c_str() << std::endl;
+ // ret = false;
+ //}
rcf = base + L"\\..\\..\\code_device\\build.sh";
STR_SIMPLIFY_PATH(rcf);
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index 9d16847..7883cd3 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -76,7 +76,7 @@
true
$(SolutionDir)..\..\sdk\include\;$(IncludePath)
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
- $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
$(LibraryPath)
huagaotwain400.ds
@@ -86,13 +86,13 @@
true
$(SolutionDir)..\..\sdk\include\;$(IncludePath)
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
- $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
false
$(SolutionDir)..\..\sdk\include\;$(IncludePath)
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
- $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
$(LibraryPath)
huagaotwain400.ds
@@ -102,7 +102,7 @@
false
$(SolutionDir)..\..\sdk\include\;$(IncludePath)
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
- $(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
+ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\
@@ -123,13 +123,8 @@
- set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
-mkdir "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
-move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
-copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoTwain\x86" /y
+
+
@@ -152,13 +147,8 @@ copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoTwain\x86" /y
- set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
-mkdir "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
-move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
-copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y
+
+
@@ -183,12 +173,8 @@ copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y
- set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
-mkdir "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
-move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
+
+
@@ -214,12 +200,8 @@ move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
- set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
-mkdir "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
-move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
+
+
|