Changeset 131 for trunk/src/helpers
- Timestamp:
- Jan 9, 2002, 10:17:41 PM (24 years ago)
- Location:
- trunk/src/helpers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/helpers/apps.c
r129 r131 62 62 * 63 63 ********************************************************************/ 64 65 /* 66 *@@ appQueryEnvironmentLen: 67 * returns the total length of the passed in environment 68 * string buffer, including the terminating two null bytes. 69 * 70 *@@added V0.9.16 (2002-01-09) [umoeller] 71 */ 72 73 ULONG appQueryEnvironmentLen(PCSZ pcszEnvironment) 74 { 75 ULONG cbEnvironment = 0; 76 if (pcszEnvironment) 77 { 78 PCSZ pVarThis = pcszEnvironment; 79 // go thru the environment strings; last one has two null bytes 80 while (*pVarThis) 81 { 82 ULONG ulLenThis = strlen(pVarThis) + 1; 83 cbEnvironment += ulLenThis; 84 pVarThis += ulLenThis; 85 } 86 87 cbEnvironment++; // last null byte 88 } 89 90 return (cbEnvironment); 91 } 64 92 65 93 /* -
trunk/src/helpers/dosh.c
r129 r131 1806 1806 // file ptr is at beginning 1807 1807 1808 #ifdef DEBUG_DOSOPEN 1808 1809 if (arc) 1809 1810 _Pmpf((__FUNCTION__ ": DosSetFilePtr/queryfilesize returned %d for %s", 1810 1811 arc, pcszFilename)); 1812 #endif 1811 1813 1812 1814 // store file size … … 1817 1819 pFile->pszFilename = strdup(pcszFilename); 1818 1820 } 1821 #ifdef DEBUG_DOSOPEN 1819 1822 else 1820 1823 _Pmpf((__FUNCTION__ ": DosOpen returned %d for %s", 1821 1824 arc, pcszFilename)); 1825 #endif 1822 1826 1823 1827 if (arc) … … 1891 1895 * cache. 1892 1896 * 1897 * fl may be any combination of the following: 1898 * 1899 * -- DRFL_NOCACHE: do not fill the cache with 1900 * new data if the data is not in the cache 1901 * currently. 1902 * 1903 * -- DRFL_FAILIFLESS: return ERROR_NO_DATA 1904 * if the data returned by DosRead is less 1905 * than what was specified. This might 1906 * simplify error handling. 1907 * 1893 1908 *@@added V0.9.13 (2001-06-14) [umoeller] 1894 1909 *@@changed V0.9.16 (2001-12-18) [umoeller]: now with XFILE, and always using FILE_BEGIN … … 1896 1911 1897 1912 APIRET doshReadAt(PXFILE pFile, 1898 ULONG ulOffset, // in: offset to read from (from beginning of file) 1899 PULONG pcb, // in: bytes to read, out: bytes read 1900 PBYTE pbData) // out: read buffer (must be cb bytes) 1913 ULONG ulOffset, // in: offset to read from (from beginning of file) 1914 PULONG pcb, // in: bytes to read, out: bytes read 1915 PBYTE pbData, // out: read buffer (must be cb bytes) 1916 ULONG fl) // in: DRFL_* flags 1901 1917 { 1902 1918 APIRET arc; … … 1927 1943 *pcb = cb; 1928 1944 1945 #ifdef DEBUG_DOSOPEN 1929 1946 _Pmpf((__FUNCTION__ " %s: data is fully in cache", 1930 1947 pFile->pszFilename)); … … 1935 1952 _Pmpf((" so copied %d bytes from cache ofs %d", 1936 1953 cb, ulOfsInCache)); 1937 1938 // still, advance the file pointer because 1939 // caller might run plain DosRead next 1940 /* DosSetFilePtr(pFile->hf, 1941 (LONG)ulOffset + cb, 1942 FILE_BEGIN, 1943 &ulDummy); */ 1954 #endif 1944 1955 } 1945 1956 else … … 1948 1959 // check how much it is... for small amounts, 1949 1960 // we load the cache first 1950 if (cb <= 4096 - 512) 1961 if ( (cb <= 4096 - 512) 1962 && (!(fl & DRFL_NOCACHE)) 1963 ) 1951 1964 { 1965 #ifdef DEBUG_DOSOPEN 1952 1966 _Pmpf((__FUNCTION__ " %s: filling cache anew", 1953 1967 pFile->pszFilename)); 1954 1968 _Pmpf((" caller wants %d bytes from %d", 1955 1969 cb, ulOffset)); 1970 #endif 1956 1971 1957 1972 // OK, then fix the offset to read from … … 1962 1977 pFile->cbCache = 4096; 1963 1978 1979 #ifdef DEBUG_DOSOPEN 1964 1980 _Pmpf((" getting %d bytes from %d", 1965 1981 pFile->cbCache, pFile->ulReadFrom)); 1982 #endif 1966 1983 1967 1984 // free old cache … … 1974 1991 else 1975 1992 { 1993 ULONG ulOfsInCache = 0; 1994 1976 1995 if (!(arc = DosSetFilePtr(pFile->hf, 1977 1996 (LONG)pFile->ulReadFrom, … … 1985 2004 { 1986 2005 // got data: 1987 ULONG ulOfsInCache; 1988 2006 #ifdef DEBUG_DOSOPEN 1989 2007 _Pmpf((" %d bytes read", ulDummy)); 2008 #endif 2009 1990 2010 pFile->cbCache = ulDummy; 1991 2011 1992 // c opy to caller2012 // check bounds 1993 2013 ulOfsInCache = ulOffset - pFile->ulReadFrom; 1994 memcpy(pbData, 1995 pFile->pbCache + ulOfsInCache, 1996 cb); 1997 *pcb = cb; 1998 1999 _Pmpf((" so copied %d bytes from cache ofs %d", 2000 cb, ulOfsInCache)); 2001 2002 // still, advance the file pointer because 2003 // caller might run plain DosRead next 2004 /* DosSetFilePtr(pFile->hf, 2005 (LONG)ulOffset + cb, 2006 FILE_BEGIN, 2007 &ulDummy); */ 2014 2015 /* 2016 if (ulOfsInCache + cb > pFile->cbCache) 2017 { 2018 cb = pFile->cbCache - ulOfsInCache; 2019 if (fl & DRFL_FAILIFLESS) 2020 arc = ERROR_NO_DATA; 2021 } 2022 */ 2008 2023 } 2009 2024 } 2010 2025 2011 if (arc) 2012 FREE(pFile->pbCache); 2013 } 2026 if (!arc) 2027 { 2028 // copy to caller 2029 memcpy(pbData, 2030 pFile->pbCache + ulOfsInCache, 2031 cb); 2032 *pcb = cb; 2033 2034 #ifdef DEBUG_DOSOPEN 2035 _Pmpf((" so copied %d bytes from cache ofs %d", 2036 cb, ulOfsInCache)); 2037 #endif 2038 } 2039 else 2040 { 2041 free(pFile->pbCache); 2042 pFile->pbCache = NULL; 2043 } 2044 } // end else if (!(pFile->pbCache = (PBYTE)malloc(pFile->cbCache))) 2014 2045 } 2015 2046 else 2016 2047 { 2017 2048 // read uncached: 2049 #ifdef DEBUG_DOSOPEN 2018 2050 _Pmpf((" " __FUNCTION__ " %s: reading uncached", 2019 2051 pFile->pszFilename)); 2020 2052 _Pmpf((" caller wants %d bytes from %d", 2021 2053 cb, ulOffset)); 2054 #endif 2055 2022 2056 if (!(arc = DosSetFilePtr(pFile->hf, 2023 2057 (LONG)ulOffset, … … 2029 2063 cb, 2030 2064 &ulDummy))) 2031 *pcb = ulDummy; // bytes read 2065 { 2066 if ( (fl & DRFL_FAILIFLESS) 2067 && (ulDummy != cb) 2068 ) 2069 arc = ERROR_NO_DATA; 2070 else 2071 *pcb = ulDummy; // bytes read 2072 } 2032 2073 } 2033 2074 } -
trunk/src/helpers/exeh.c
r130 r131 171 171 *@@changed V0.9.12 (2001-05-03) [umoeller]: added support for NOSTUB newstyle executables 172 172 *@@changed V0.9.16 (2001-12-08) [umoeller]: now using OPEN_SHARE_DENYWRITE 173 *@@changed V0.9.16 (2001-12-08) [umoeller]: fLibrary was never set, works for LX and NE now173 *@@changed V0.9.16 (2001-12-08) [umoeller]: fLibrary was never set, works for LX, NE, and PE now 174 174 *@@changed V0.9.16 (2001-12-08) [umoeller]: speed optimizations, changed some return codes 175 175 *@@changed V0.9.16 (2002-01-04) [umoeller]: added fixes for COM, BAT, CMD extensions … … 187 187 PCSZ pExt; 188 188 BOOL fOpenFile = FALSE; 189 BOOL fLoadNewHeader = FALSE; 190 ULONG ulNewHeaderOfs = 0; // V0.9.12 (2001-05-03) [umoeller] 189 191 190 192 if (!ppExec) … … 240 242 } 241 243 242 if ( (fOpenFile) // no t one of the above244 if ( (fOpenFile) // none of the above 243 245 && (!(arc = doshOpen((PSZ)pcszExecutable, 244 246 XOPEN_READ_EXISTING, 245 247 &cbFile, 246 248 &pFile))) 249 // file opened successfully: 247 250 ) 248 251 { 249 // file opened successfully:250 252 pExec->pFile = pFile; 253 pExec->cbDosExeHeader = sizeof(DOSEXEHEADER); 251 254 252 255 // read old DOS EXE header 253 256 if (!(pExec->pDosExeHeader = (PDOSEXEHEADER)malloc(sizeof(DOSEXEHEADER)))) 254 257 arc = ERROR_NOT_ENOUGH_MEMORY; 255 else 258 else if (!(arc = doshReadAt(pFile, 259 0, 260 &pExec->cbDosExeHeader, // in/out 261 (PBYTE)pExec->pDosExeHeader, 262 DRFL_FAILIFLESS))) 256 263 { 257 pExec->cbDosExeHeader = sizeof(DOSEXEHEADER); 258 if (!(arc = doshReadAt(pFile, 259 0, 260 &pExec->cbDosExeHeader, // in/out 261 (PBYTE)pExec->pDosExeHeader))) 264 // now check if we really have a DOS header 265 if (pExec->pDosExeHeader->usDosExeID != 0x5a4d) 262 266 { 263 ULONG ulNewHeaderOfs = 0; // V0.9.12 (2001-05-03) [umoeller] 264 BOOL fLoadNewHeader = FALSE; 265 266 // now check if we really have a DOS header 267 if (pExec->pDosExeHeader->usDosExeID != 0x5a4d) 268 { 269 // arc = ERROR_INVALID_EXE_SIGNATURE; 270 271 // V0.9.12 (2001-05-03) [umoeller] 272 // try loading new header directly; there are 273 // drivers which were built with NOSTUB, and 274 // the exe image starts out with the NE or LX 275 // image directly (try JFS.IFS) 276 fLoadNewHeader = TRUE; 277 // ulNewHeaderOfs is 0 now 278 279 // remove the DOS header info, since we have none 280 // V0.9.12 (2001-05-03) [umoeller] 281 FREE(pExec->pDosExeHeader); 267 // arc = ERROR_INVALID_EXE_SIGNATURE; 268 269 // V0.9.12 (2001-05-03) [umoeller] 270 // try loading new header directly; there are 271 // drivers which were built with NOSTUB, and 272 // the exe image starts out with the NE or LX 273 // image directly (try JFS.IFS) 274 fLoadNewHeader = TRUE; 275 // ulNewHeaderOfs is 0 now 276 277 // remove the DOS header info, since we have none 278 // V0.9.12 (2001-05-03) [umoeller] 279 FREE(pExec->pDosExeHeader); 280 pExec->cbDosExeHeader = 0; 281 } 282 else 283 { 284 // we have a DOS header: 285 if (pExec->pDosExeHeader->usRelocTableOfs < 0x40) 286 { 287 // neither LX nor PE nor NE: 288 pExec->ulOS = EXEOS_DOS3; 289 pExec->ulExeFormat = EXEFORMAT_OLDDOS; 282 290 } 283 291 else 284 292 { 285 // we have a DOS header: 286 if (pExec->pDosExeHeader->usRelocTableOfs < 0x40) 287 { 288 // neither LX nor PE nor NE: 289 pExec->ulOS = EXEOS_DOS3; 290 pExec->ulExeFormat = EXEFORMAT_OLDDOS; 291 } 293 // we have a new header offset: 294 fLoadNewHeader = TRUE; 295 ulNewHeaderOfs = pExec->pDosExeHeader->ulNewHeaderOfs; 296 } 297 } 298 } 299 } 300 301 if (fLoadNewHeader) 302 { 303 // either LX or PE or NE: 304 // read in new header... 305 // ulNewHeaderOfs is now either 0 (if no DOS header 306 // was found) or pDosExeHeader->ulNewHeaderOfs 307 // V0.9.12 (2001-05-03) [umoeller] 308 309 // read in the first two bytes to find out 310 // what extended header type we have; note, 311 // PE uses four bytes here 312 CHAR achNewHeaderType[4] = "???"; 313 ULONG cbRead = 4; 314 315 if (!(arc = doshReadAt(pFile, 316 ulNewHeaderOfs, 317 &cbRead, 318 achNewHeaderType, 319 DRFL_FAILIFLESS))) 320 { 321 PBYTE pbCheckOS = NULL; 322 323 if (!memcmp(achNewHeaderType, "NE", 2)) 324 { 325 // New Executable: 326 pExec->ulExeFormat = EXEFORMAT_NE; 327 cbRead = sizeof(NEHEADER); 328 329 // go read in the complete header then 330 // (doshReadAt has this in the cache) 331 if (!(pExec->pNEHeader = malloc(cbRead))) 332 arc = ERROR_NOT_ENOUGH_MEMORY; 333 else if (!(arc = doshReadAt(pFile, 334 ulNewHeaderOfs, 335 &cbRead, 336 (PBYTE)pExec->pNEHeader, 337 0))) 338 { 339 if (cbRead < sizeof(NEHEADER)) 340 arc = ERROR_BAD_EXE_FORMAT; 292 341 else 293 342 { 294 // we have a new header offset: 295 fLoadNewHeader = TRUE; 296 ulNewHeaderOfs = pExec->pDosExeHeader->ulNewHeaderOfs; 343 pExec->cbNEHeader = cbRead; 344 pbCheckOS = &pExec->pNEHeader->bTargetOS; 345 // set library flag V0.9.16 (2001-12-08) [umoeller] 346 if (pExec->pNEHeader->usFlags & 0x8000) 347 // library: 348 pExec->fLibrary = TRUE; 297 349 } 298 350 } 299 300 if (fLoadNewHeader) 301 { 302 // either LX or PE or NE: 303 // read in new header... 304 // ulNewHeaderOfs is now either 0 (if no DOS header 305 // was found) or pDosExeHeader->ulNewHeaderOfs 306 // V0.9.12 (2001-05-03) [umoeller] 307 308 // read in the first two bytes to find out 309 // what extended header type we have 310 CHAR achNewHeaderType[2] = "?"; 311 ULONG cbRead = 2; 312 313 // take the largest of LXHEADER and NEHEADER and PEHEADER 351 } 352 else if ( (!memcmp(achNewHeaderType, "LX", 2)) 353 || (!memcmp(achNewHeaderType, "LE", 2)) 354 // this is used by SMARTDRV.EXE 355 ) 356 { 357 // OS/2 Linear Executable: 358 pExec->ulExeFormat = EXEFORMAT_LX; 359 cbRead = sizeof(LXHEADER); 360 361 // go read in the complete header then 362 // (doshReadAt has this in the cache) 363 if (!(pExec->pLXHeader = malloc(cbRead))) 364 arc = ERROR_NOT_ENOUGH_MEMORY; 365 else if (!(arc = doshReadAt(pFile, 366 ulNewHeaderOfs, 367 &cbRead, 368 (PBYTE)pExec->pLXHeader, 369 0))) 370 { 371 if (cbRead < sizeof(LXHEADER)) 372 arc = ERROR_BAD_EXE_FORMAT; 373 else 374 { 375 pExec->cbLXHeader = cbRead; 376 pbCheckOS = (PBYTE)(&pExec->pLXHeader->usTargetOS); 377 // set library flag V0.9.16 (2001-12-08) [umoeller] 378 if (pExec->pLXHeader->ulFlags & 0x8000) 379 // library: 380 pExec->fLibrary = TRUE; 381 } 382 } 383 } 384 else if (!memcmp(achNewHeaderType, "PE\0\0", 4)) 385 { 386 pExec->ulExeFormat = EXEFORMAT_PE; 387 388 // PE has a standard header of 24 bytes 389 // plus an extended header, so check 390 // what we've got 391 if (!(pExec->pPEHeader = malloc(sizeof(PEHEADER)))) 392 arc = ERROR_NOT_ENOUGH_MEMORY; 393 else 394 { 395 ULONG ulOfs = ulNewHeaderOfs + 4; 396 PPEHEADER pPEHeader = pExec->pPEHeader; 397 398 // null the entire header 399 memset(pExec->pPEHeader, 400 0, 401 sizeof(PEHEADER)); 402 403 // copy sig 404 pPEHeader->ulSignature = *((PULONG)&achNewHeaderType); 405 406 // read standard header 407 cbRead = sizeof(IMAGE_FILE_HEADER); 314 408 if (!(arc = doshReadAt(pFile, 315 ul NewHeaderOfs,409 ulOfs, 316 410 &cbRead, 317 achNewHeaderType))) 411 (PBYTE)&pPEHeader->FileHeader, 412 0))) 318 413 { 319 PBYTE pbCheckOS = NULL; 320 321 if (!memcmp(achNewHeaderType, "NE", 2)) 414 if (cbRead < sizeof(IMAGE_FILE_HEADER)) 415 // only if we don't even have the 416 // standard header, return an error 417 arc = ERROR_BAD_EXE_FORMAT; 418 else 322 419 { 323 // New Executable: 324 pExec->ulExeFormat = EXEFORMAT_NE; 325 cbRead = sizeof(NEHEADER); 326 327 // go read in the complete header then 328 // (doshReadAt has this in the cache) 329 if (!(pExec->pNEHeader = malloc(cbRead))) 330 arc = ERROR_NOT_ENOUGH_MEMORY; 331 else if (!(arc = doshReadAt(pFile, 332 ulNewHeaderOfs, 333 &cbRead, 334 (PBYTE)pExec->pNEHeader))) 420 pExec->f32Bits = TRUE; 421 pExec->cbPEHeader = 4 + sizeof(PEHEADER); // for now 422 423 if (pPEHeader->FileHeader.fsCharacteristics & IMAGE_FILE_DLL) 424 pExec->fLibrary = TRUE; 425 426 // try extended header 427 ulOfs += sizeof(IMAGE_FILE_HEADER); 428 if ( (cbRead = pPEHeader->FileHeader.usSizeOfOptionalHeader) 429 && (cbRead <= sizeof(IMAGE_OPTIONAL_HEADER)) 430 ) 335 431 { 336 if (cbRead < sizeof(NEHEADER)) 337 arc = ERROR_BAD_EXE_FORMAT; 338 else 432 if (!(arc = doshReadAt(pFile, 433 ulOfs, 434 &cbRead, 435 (PBYTE)&pPEHeader->OptionalHeader, 436 0))) 339 437 { 340 pExec->cbNEHeader = cbRead; 341 pbCheckOS = &pExec->pNEHeader->bTargetOS; 342 // set library flag V0.9.16 (2001-12-08) [umoeller] 343 if (pExec->pNEHeader->usFlags & 0x8000) 344 // library: 345 pExec->fLibrary = TRUE; 438 if (cbRead != sizeof(IMAGE_OPTIONAL_HEADER)) 439 arc = ERROR_BAD_EXE_FORMAT; 440 else switch (pPEHeader->OptionalHeader.usSubsystem) 441 { 442 // case IMAGE_SUBSYSTEM_UNKNOWN: // 0 443 // case IMAGE_SUBSYSTEM_NATIVE: // 1 444 // case IMAGE_SUBSYSTEM_OS2_CUI: // 5 445 // case IMAGE_SUBSYSTEM_POSIX_CUI: // 7 446 // for these we shouldn't set win32 447 448 case IMAGE_SUBSYSTEM_WINDOWS_GUI: // 2 // Windows GUI subsystem 449 pExec->ulOS = EXEOS_WIN32_GUI; 450 break; 451 452 case IMAGE_SUBSYSTEM_WINDOWS_CUI: // 3 // Windows character subsystem 453 pExec->ulOS = EXEOS_WIN32_CLI; 454 break; 455 } 456 457 pExec->cbPEHeader = sizeof(PEHEADER); 346 458 } 347 459 } 348 460 } 349 else if ( (!memcmp(achNewHeaderType, "LX", 2)) 350 || (!memcmp(achNewHeaderType, "LE", 2)) 351 // this is used by SMARTDRV.EXE 352 ) 353 { 354 // OS/2 Linear Executable: 355 pExec->ulExeFormat = EXEFORMAT_LX; 356 cbRead = sizeof(LXHEADER); 357 358 // go read in the complete header then 359 // (doshReadAt has this in the cache) 360 if (!(pExec->pLXHeader = malloc(cbRead))) 361 arc = ERROR_NOT_ENOUGH_MEMORY; 362 else if (!(arc = doshReadAt(pFile, 363 ulNewHeaderOfs, 364 &cbRead, 365 (PBYTE)pExec->pLXHeader))) 366 { 367 if (cbRead < sizeof(LXHEADER)) 368 arc = ERROR_BAD_EXE_FORMAT; 369 else 370 { 371 pExec->cbLXHeader = cbRead; 372 pbCheckOS = (PBYTE)(&pExec->pLXHeader->usTargetOS); 373 // set library flag V0.9.16 (2001-12-08) [umoeller] 374 if (pExec->pLXHeader->ulFlags & 0x8000) 375 // library: 376 pExec->fLibrary = TRUE; 377 } 378 } 379 } 380 else if (!memcmp(achNewHeaderType, "PE", 2)) 381 { 382 pExec->ulExeFormat = EXEFORMAT_PE; 383 // PE has a standard header of 24 bytes 384 // plus an extended header, so try to 385 // read both of them in one chunk first 386 cbRead = sizeof(PEHEADER); 387 388 // go read in the complete header 389 // (doshReadAt has this in the cache) 390 if (!(pExec->pPEHeader = malloc(cbRead))) 391 arc = ERROR_NOT_ENOUGH_MEMORY; 392 else if (!(arc = doshReadAt(pFile, 393 ulNewHeaderOfs, 394 &cbRead, 395 (PBYTE)pExec->pPEHeader))) 396 { 397 if (cbRead < 24) 398 // only if don't even have the 399 // standard header, return an error 400 arc = ERROR_BAD_EXE_FORMAT; 401 else 402 { 403 // set size of header to what we've got 404 pExec->cbPEHeader = pExec->pPEHeader->usHeaderSize; 405 pExec->ulOS = EXEOS_WIN32; 406 pExec->f32Bits = TRUE; 407 408 /* 409 // we have the first 24 bytes already, so 410 // go for the next chunk, if this is more 411 // than we have in PEHEADER 412 if ( (cbRead < cbPE) 413 && (cbRead = pExec->pPEHeader->usHeaderSize) 414 ) 415 { 416 _Pmpf((" usHdrSize %d, sizeof(PEHEADER) %d, cbRead %d, cbPE %d --> reading extended header", 417 pExec->pPEHeader->usHeaderSize, 418 sizeof(PEHEADER), 419 cbRead, 420 cbPE)); 421 if (!(arc = doshReadAt(hFile, 422 ulNewHeaderOfs + 24, 423 FILE_BEGIN, 424 &cbRead, 425 (PBYTE)pExec->pPEHeader + 24))) 426 { 427 } 428 else 429 { 430 arc = ERROR_BAD_EXE_FORMAT; 431 FREE(pExec->pPEHeader); 432 } 433 } 434 else 435 _Pmpf((" already got extended header")); 436 */ 437 } 438 } 439 } 440 else 441 // strange type: 442 arc = ERROR_INVALID_EXE_SIGNATURE; 443 444 if ((!arc) && (pbCheckOS)) 445 { 446 // BYTE to check for operating system 447 // (NE and LX): 448 switch (*pbCheckOS) 449 { 450 case NEOS_OS2: 451 pExec->ulOS = EXEOS_OS2; 452 if (pExec->ulExeFormat == EXEFORMAT_LX) 453 pExec->f32Bits = TRUE; 454 break; 455 456 case NEOS_WIN16: 457 pExec->ulOS = EXEOS_WIN16; 458 break; 459 460 case NEOS_DOS4: 461 pExec->ulOS = EXEOS_DOS4; 462 break; 463 464 case NEOS_WIN386: 465 pExec->ulOS = EXEOS_WIN386; 466 pExec->f32Bits = TRUE; 467 break; 468 } 469 } 470 } // end if (!(arc = doshReadAt(hFile, 471 } // end if (fLoadNewHeader) 472 } // end if (!(arc = doshReadAt(hFile, 473 } // end else if (!(pExec->pDosExeHeader = (PDOSEXEHEADER)malloc(sizeof(DOSEXEHEADER)))) 474 475 } // end if (!(arc = DosOpen((PSZ)pcszExecutable, 461 } 462 } 463 } 464 else 465 // strange type: 466 arc = ERROR_INVALID_EXE_SIGNATURE; 467 468 if ((!arc) && (pbCheckOS)) 469 { 470 // BYTE to check for operating system 471 // (NE and LX): 472 switch (*pbCheckOS) 473 { 474 case NEOS_OS2: 475 pExec->ulOS = EXEOS_OS2; 476 if (pExec->ulExeFormat == EXEFORMAT_LX) 477 pExec->f32Bits = TRUE; 478 break; 479 480 case NEOS_WIN16: 481 pExec->ulOS = EXEOS_WIN16; 482 break; 483 484 case NEOS_DOS4: 485 pExec->ulOS = EXEOS_DOS4; 486 break; 487 488 case NEOS_WIN386: 489 pExec->ulOS = EXEOS_WIN386; 490 pExec->f32Bits = TRUE; 491 break; 492 } 493 } 494 } // end if (!(arc = doshReadAt(hFile, 495 } // end if (fLoadNewHeader) 476 496 477 497 if (arc != NO_ERROR) … … 769 789 ulNRNTOfs, // ofs determined above 770 790 &cb, // 2000 771 pszNameTable))) 791 pszNameTable, 792 0))) 772 793 { 773 794 // the string is in Pascal format, so the … … 2035 2056 + ulNewHeaderOfs, 2036 2057 &cb, 2037 (PBYTE)pExec->pRsTbl))) 2058 (PBYTE)pExec->pRsTbl, 2059 DRFL_FAILIFLESS))) 2038 2060 ) 2039 2061 { … … 2047 2069 + ulNewHeaderOfs, 2048 2070 &cb, 2049 (PBYTE)pExec->pObjTbl))) 2071 (PBYTE)pExec->pObjTbl, 2072 DRFL_FAILIFLESS))) 2050 2073 ) 2051 2074 { … … 2059 2082 + ulNewHeaderOfs, 2060 2083 &cb, 2061 (PBYTE)pExec->pObjPageTbl))) 2084 (PBYTE)pExec->pObjPageTbl, 2085 DRFL_FAILIFLESS))) 2062 2086 ) 2063 2087 { … … 2524 2548 ulOffset, 2525 2549 &ulSize, 2526 pabCompressed))) 2550 pabCompressed, 2551 0))) 2527 2552 { 2528 2553 _Pmpf((" %d bytes read", ulSize)); … … 2883 2908 + ulNewHeaderOfs, 2884 2909 &cb, 2885 (PBYTE)pExec->paOS2NEResTblEntry))) 2910 (PBYTE)pExec->paOS2NEResTblEntry, 2911 DRFL_FAILIFLESS))) 2886 2912 ) 2887 2913 { … … 2896 2922 - cb, // pNEHeader->usResSegmCount * sizeof(struct new_seg) 2897 2923 &cb, 2898 (PBYTE)pExec->paOS2NESegments))) 2924 (PBYTE)pExec->paOS2NESegments, 2925 DRFL_FAILIFLESS))) 2899 2926 ) 2900 2927 { … … 3032 3059 ulOffset, 3033 3060 &cb, 3034 *ppbResData))) 3061 *ppbResData, 3062 DRFL_FAILIFLESS))) 3035 3063 { 3036 3064 if (pcbResData) -
trunk/src/helpers/gpih.c
r129 r131 1549 1549 &bih2, 1550 1550 0, // do not initialize 1551 NULL, 1551 NULL, // init data 1552 1552 NULL); 1553 1553 }
Note:
See TracChangeset
for help on using the changeset viewer.
