Subversion Repositories filter_foundry

Compare Revisions

Regard whitespace Rev 498 → Rev 497

/trunk/main.c
203,6 → 203,7
void ENTRYPOINT(short selector, FilterRecordPtr pb, intptr_t *data, short *result){
static Boolean wantdialog = false;
static Boolean premiereWarnedOnce = false;
TCHAR*reason;
 
#ifdef SHOW_HOST_DEBUG
char* tmp;
311,7 → 312,7
gdata = (globals_t*)malloc(sizeof(globals_t));
if (!gdata) break;
gdata->hWndMainDlg = (HWND)((PlatformData*)((AboutRecordPtr)pb)->platformData)->hwnd; // so that simplealert() works
gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance, NULL);
gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason);
if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
if (gdata->obfusc) {
simplealert_id(MSG_INCOMPATIBLE_OBFUSCATION_ID);
448,6 → 449,7
}
 
int checkandinitparams(Handle params){
TCHAR*reasonstr,*reason;
int i;
Boolean bUninitializedParams;
Boolean showdialog;
466,7 → 468,7
// We need to set gdata->standalone after loadfile(), but we must call readPARMresource() before loadfile()
// Reason: readPARMresource() reads parameters from the DLL while loadfile() reads parameters from the AFS file
// But loadfile() will reset gdata->standalone ...
isStandalone = readPARMresource((HMODULE)hDllInstance, NULL);
isStandalone = readPARMresource((HMODULE)hDllInstance, &reason);
if (isStandalone && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
if (gdata->obfusc) {
simplealert_id(MSG_INCOMPATIBLE_OBFUSCATION_ID);
493,7 → 495,7
}
}
 
if (loadfile(&sfr, NULL)) {
if (loadfile(&sfr, &reason)) {
gdata->standalone = gdata->parmloaded = isStandalone;
 
if (isStandalone) {
507,12 → 509,12
}
}
 
if( (bUninitializedParams = !(params && readparams_afs_pff(params, NULL))) ){
if( (bUninitializedParams = !(params && readparams_afs_pff(params,&reasonstr))) ){
/* either the parameter handle was uninitialised,
or the parameter data couldn't be read; set default values */
 
// see if saved parameters exist
gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance, NULL);
gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason);
if (gdata->parmloaded && (gdata->parm.cbSize != PARM_SIZE) && (gdata->parm.cbSize != PARM_SIZE_PREMIERE) && (gdata->parm.cbSize != PARM_SIG_MAC)) {
if (gdata->obfusc) {
simplealert_id(MSG_INCOMPATIBLE_OBFUSCATION_ID);