From 442b19bc1fed89f044f2d132c8daccf9f14420ff Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 3 Apr 2003 12:26:33 +0000 Subject: [PATCH] Will always return Admin on 9x systems with advapi32.dll that contains functions it shouldn't (all of them?) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2414 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/UserInfo/UserInfo.c | 7 ++++++- Plugins/UserInfo.dll | Bin 4096 -> 4096 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Contrib/UserInfo/UserInfo.c b/Contrib/UserInfo/UserInfo.c index 1d0aaca7..372ce930 100644 --- a/Contrib/UserInfo/UserInfo.c +++ b/Contrib/UserInfo/UserInfo.c @@ -32,9 +32,14 @@ void __declspec(dllexport) GetAccountType(HWND hwndParent, int string_size, char *group = ""; + if (GetVersion() & 0x80000000) // Not NT + { + group = "Admin"; + } + // First we must open a handle to the access token for this thread. - if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &hThread) || + else if (OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &hThread) || OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hThread)) { // Then we must query the size of the group information associated with diff --git a/Plugins/UserInfo.dll b/Plugins/UserInfo.dll index e96e3b7bce15763c6cf778f21a6acfec4fcf2e4a..8fd67445f267a52a210c5dcf628b3f1f2fb725b7 100644 GIT binary patch delta 829 zcmb`F&ubGw6vy9`O-*a0tEL)g#7%!oX_<*_D4Lf3+Q!miSFKe+)YuLt60>A?iwc50 zR4=j8I9CsaiYHMqi0G*YOAzWo@ldhUARZL4^k9S@G`?L6_78C2v)}!G-+RpLGLy=r zG7~2AnU21}2cbyA>yzGpobooJzqjD>R->A$F>gKU()ZJj9*vL1>|WSdnhG#PBnX6V zb!L|RB$QbnF3Sf1&S68JI6`WOCQ>D>l7co9s48o*_!SFlVey7EkS?)KhRIZRpyU}5 zGeo{4HE$0qAg9-+RgX5^FKNX}ujrKMmi-^*8Y#%)n&huju;a%3RZmX+;lu1}4*{4~ zz1p#h?qX#v7IDfaW~E&_!Rf4+s&G2w(R7<6UP(iYlKX_Z70 z`uS+0JCV@Gpapspy2%eklj8{vg^gOj!8t&jM7T8+H7(UJbOYc($PRiZ41*^v&CtiV zX+p=QY$Rsz=s3WNosDwCjO$5&=VEW!BW7P5`|JGG00b5Pw}TtKjQEfd8AD_rzPD#x z<=@C2O~1@>YdCH?0+9)B+SjUk{8Bub4S4b-L#1Jy(J|0=ptRAKWRBT$OhO6#@S6a$8zjF`@{0|N-xVO;) delta 838 zcmbu7T}TvB6vxk%8CiA030zxQks00m$c#Jc>Iw?2HY&K_ViHAdwz*>}n;WyU5fLR+ zw6QEW&Pxx15Bb)E#D=~E6@g0l;KM!$mHHr+*oT3HL@}Kig?jJ8Z_fGu@44r4E;BBS z3lptmMQ=ORyw>!f>c!dYU(RJ~P&dxA*>a5Wso`uT#?|QycI+D&9JXq8(ZvO2fB<1& zpk%F0UoItrzSWzzA_80jfRl!wRFHrX&S_)>l)C87JE18zG~BB+UXdz7jV;nkZf9C@ z=E)>eci1NYpV~>wTrl0q1WhLxVs4Sq$CRFbTup&b%S8=ugQrIw$+(^ zaAuR~EHY-;3gR-B*!CmVV5V2V7O5Rm^Kkp)2^leWofzY!c*uuuHiJwcH<61-AJUCj zs|;g4@$VYe{b3(UD4R(aMT}-#s;Al zI-;?-(j6X)L>1UR*y~gk1t3DY6fF>rYqF}wQ~-or`203|)qy+Qoj5B}RdQ+bDN3M>H8NUnM z84vfK=#=TfngEs_qE70jb+nDP(;hlNuh1Bsq>tz{ouzYhiEhwcdQ@tV{8F!UO-f5o brPtE3v@U&=cBP+EetluRt3Kn;eMbHO+b`wz