Subversion Repositories filter_foundry

Rev

Rev 433 | Rev 444 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 433 Rev 440
Line 239... Line 239...
239 
        case filterSelectorAbout:
 239 
        case filterSelectorAbout:
240 
                if (!gdata) {
 240 
                if (!gdata) {
241 
                        gdata = (globals_t*)malloc(sizeof(globals_t));
 241 
                        gdata = (globals_t*)malloc(sizeof(globals_t));
242 
                        if (!gdata) break;
 242 
                        if (!gdata) break;
243 
                        gdata->hWndMainDlg = (HWND)((PlatformData*)((AboutRecordPtr)pb)->platformData)->hwnd; // so that simplealert() works
 243 
                        gdata->hWndMainDlg = (HWND)((PlatformData*)((AboutRecordPtr)pb)->platformData)->hwnd; // so that simplealert() works
244 
                        gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason,READ_OBFUSC);
 244 
                        gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason);
245 
                        if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
 245 
                        if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
246 
                                if (gdata->obfusc) {
 246 
                                if (gdata->obfusc) {
247 
                                        simplealert(_strdup("Incompatible obfuscation."));
 247 
                                        simplealert(_strdup("Incompatible obfuscation."));
248 
                                }
 248 
                                }
249 
                                else {
 249 
                                else {
Line 385... Line 385...
385 
                sfr.sfType = PS_FILTER_FILETYPE;
 385 
                sfr.sfType = PS_FILTER_FILETYPE;
386 
 
 386 
 
387 
                // We need to set gdata->standalone after loadfile(), but we must call readPARMresource() before loadfile()
 387 
                // We need to set gdata->standalone after loadfile(), but we must call readPARMresource() before loadfile()
388 
                // Reason: readPARMresource() reads parameters from the DLL while loadfile() reads parameters from the AFS file
 388 
                // Reason: readPARMresource() reads parameters from the DLL while loadfile() reads parameters from the AFS file
389 
                // But loadfile() will reset gdata->standalone ...
 389 
                // But loadfile() will reset gdata->standalone ...
390 
                isStandalone = readPARMresource((HMODULE)hDllInstance, &reason, READ_OBFUSC);
 390 
                isStandalone = readPARMresource((HMODULE)hDllInstance, &reason);
391 
                if (isStandalone && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
 391 
                if (isStandalone && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
392 
                        if (gdata->obfusc) {
 392 
                        if (gdata->obfusc) {
393 
                                simplealert(_strdup("Incompatible obfuscation."));
 393 
                                simplealert(_strdup("Incompatible obfuscation."));
394 
                        }
 394 
                        }
395 
                        else {
 395 
                        else {
Line 431... Line 431...
431 
        if( (bUninitializedParams = !(params && readparams_afs_pff(params,&reasonstr))) ){
 431 
        if( (bUninitializedParams = !(params && readparams_afs_pff(params,&reasonstr))) ){
432 
                /* either the parameter handle was uninitialised,
 432 
                /* either the parameter handle was uninitialised,
433 
                   or the parameter data couldn't be read; set default values */
 433 
                   or the parameter data couldn't be read; set default values */
434 
 
 434 
 
435 
                // see if saved parameters exist
 435 
                // see if saved parameters exist
436 
                gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason,READ_OBFUSC);
 436 
                gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason);
437 
                if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
 437 
                if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
438 
                        if (gdata->obfusc) {
 438 
                        if (gdata->obfusc) {
439 
                                simplealert(_strdup("Incompatible obfuscation."));
 439 
                                simplealert(_strdup("Incompatible obfuscation."));
440 
                        }
 440 
                        }
441 
                        else {
 441 
                        else {