ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed CLSIDFromString endianness assumptions (reported by Gregg Mattinson).

This commit is contained in:
Alexandre Julliard 2002-06-21 21:55:37 +00:00
parent 7f1e74a97a
commit bf50153479
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/ole32/compobj.c
View File

@ -450,7 +450,6 @@ HRESULT WINAPI CLSIDFromString16(
CLSID *id /* [out] GUID converted from string */ CLSID *id /* [out] GUID converted from string */
) { ) {
BYTE *s = (BYTE *) idstr; BYTE *s = (BYTE *) idstr;
BYTE *p;
int i; int i;
BYTE table[256]; BYTE table[256];
@ -490,41 +489,20 @@ HRESULT WINAPI CLSIDFromString16(
/* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
p = (BYTE *) id; id->Data1 = (table[s[1]] << 28 | table[s[2]] << 24 | table[s[3]] << 20 | table[s[4]] << 16 |
table[s[5]] << 12 | table[s[6]] << 8 | table[s[7]] << 4 | table[s[8]]);
s++; /* skip leading brace */ id->Data2 = table[s[10]] << 12 | table[s[11]] << 8 | table[s[12]] << 4 | table[s[13]];
for (i = 0; i < 4; i++) { id->Data3 = table[s[15]] << 12 | table[s[16]] << 8 | table[s[17]] << 4 | table[s[18]];
p[3 - i] = table[*s]<<4 | table[*(s+1)];
s += 2;
}
p += 4;
s++; /* skip - */
for (i = 0; i < 2; i++) {
p[1-i] = table[*s]<<4 | table[*(s+1)];
s += 2;
}
p += 2;
s++; /* skip - */
for (i = 0; i < 2; i++) {
p[1-i] = table[*s]<<4 | table[*(s+1)];
s += 2;
}
p += 2;
s++; /* skip - */
/* these are just sequential bytes */ /* these are just sequential bytes */
for (i = 0; i < 2; i++) { id->Data4[0] = table[s[20]] << 4 | table[s[21]];
*p++ = table[*s]<<4 | table[*(s+1)]; id->Data4[1] = table[s[22]] << 4 | table[s[23]];
s += 2; id->Data4[2] = table[s[25]] << 4 | table[s[26]];
} id->Data4[3] = table[s[27]] << 4 | table[s[28]];
s++; /* skip - */ id->Data4[4] = table[s[29]] << 4 | table[s[30]];
id->Data4[5] = table[s[31]] << 4 | table[s[32]];
for (i = 0; i < 6; i++) { id->Data4[6] = table[s[33]] << 4 | table[s[34]];
*p++ = table[*s]<<4 | table[*(s+1)]; id->Data4[7] = table[s[35]] << 4 | table[s[36]];
s += 2;
}
return S_OK; return S_OK;
} }