Rev 373 | Rev 376 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 373 | Rev 375 | ||
|---|---|---|---|
| Line 40... | Line 40... | ||
| 40 | HRSRC resinfo; |
40 | HRSRC resinfo; |
| 41 | HANDLE h; |
41 | HANDLE h; |
| 42 | Ptr pparm; |
42 | Ptr pparm; |
| 43 | int res = false; |
43 | int res = false; |
| 44 | 44 | ||
| 45 | parm_id = PARM_ID; // default value |
45 | parm_id = 0; |
| 46 | EnumResourceNames(hm,"PARM",enumnames,0); // callback function enumnames() will find the actual found parm_id |
46 | EnumResourceNames(hm,PARM_TYPE,enumnames,0); // callback function enumnames() will find the actual found parm_id |
| 47 | 47 | ||
| 48 | // load first PARM resource |
48 | // load first PARM resource |
| 49 | if( (resinfo = FindResource(hm,MAKEINTRESOURCE(parm_id),"PARM")) ){ |
49 | if( (resinfo = FindResource(hm,MAKEINTRESOURCE(parm_id),PARM_TYPE)) ){ |
| 50 | if ((h = LoadResource(hm, resinfo)) && (pparm = (Ptr)LockResource(h))) { |
50 | if ((h = LoadResource(hm, resinfo)) && (pparm = (Ptr)LockResource(h))) { |
| 51 | res = readPARM(pparm, &gdata->parm, reason, 1 /*Windows format resource*/); |
51 | res = readPARM(pparm, &gdata->parm, reason, 1 /*Windows format resource*/); |
| 52 | gdata->obfusc = false; |
52 | gdata->obfusc = false; |
| 53 | } |
53 | } |
| - | 54 | }else if( readobfusc && |
|
| - | 55 | ((resinfo = FindResource(hm,OBFUSCDATA_ID_NEW,OBFUSCDATA_TYPE_NEW)) || |
|
| 54 | }else if( readobfusc && (resinfo = FindResource(hm,MAKEINTRESOURCE(OBFUSCDATA_ID),RT_RCDATA)) ){ |
56 | (resinfo = FindResource(hm,OBFUSCDATA_ID_OLD,OBFUSCDATA_TYPE_OLD))) ){ |
| 55 | if( (h = LoadResource(hm,resinfo)) && (pparm = (Ptr)LockResource(h)) ){ |
57 | if( (h = LoadResource(hm,resinfo)) && (pparm = (Ptr)LockResource(h)) ){ |
| 56 | // Fix by DM, 18 Dec 2018: |
58 | // Fix by DM, 18 Dec 2018: |
| 57 | // We need to copy the information, because the resource data is read-only |
59 | // We need to copy the information, because the resource data is read-only |
| 58 | DWORD resSize = SizeofResource(hm,resinfo); |
60 | DWORD resSize = SizeofResource(hm,resinfo); |
| 59 | if (resSize == sizeof(PARM_T)) { |
61 | if (resSize == sizeof(PARM_T)) { |