Changeset 278

Show
Ignore:
Timestamp:
Sat Jul 8 13:51:46 2006
Author:
giovannibajo
Message:

Fix problem with icons provided by the user disappearing when compressing
the executables with UPX. The problem is actually a bug in UPX, but it's
still worth working-around it by using LANG_NEUTRAL for icons in bootloader.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/source/windows/run.rc

    r2 r278  
    18 18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)  
    19 19 #ifdef _WIN32  
    20   LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  
      20 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL  
    20 20 #pragma code_page(1252)  
    21 21 #endif //_WIN32  
    …… 
    37 37 //  
    38 38  
    39   1 TEXTINCLUDE DISCARDABLE   
      39 1 TEXTINCLUDE DISCARDABLE  
    39 39 BEGIN  
    40 40     "resource.h\0"  
    41 41 END  
    42 42  
    43   2 TEXTINCLUDE DISCARDABLE   
      43 2 TEXTINCLUDE DISCARDABLE  
    43 43 BEGIN  
    44 44     "#include ""afxres.h""\r\n"  
    …… 
    48 48 END  
    49 49  
    50   3 TEXTINCLUDE DISCARDABLE   
      50 3 TEXTINCLUDE DISCARDABLE  
    50 50 BEGIN  
    51 51     "\r\n"  

  • trunk/source/windows/runw.rc

    r2 r278  
    18 18 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)  
    19 19 #ifdef _WIN32  
    20   LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US  
      20 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL  
    20 20 #pragma code_page(1252)  
    21 21 #endif //_WIN32  
    …… 
    37 37 //  
    38 38  
    39   1 TEXTINCLUDE DISCARDABLE   
      39 1 TEXTINCLUDE DISCARDABLE  
    39 39 BEGIN  
    40 40     "resource.h\0"  
    41 41 END  
    42 42  
    43   2 TEXTINCLUDE DISCARDABLE   
      43 2 TEXTINCLUDE DISCARDABLE  
    43 43 BEGIN  
    44 44     "#include ""afxres.h""\r\n"  
    …… 
    48 48 END  
    49 49  
    50   3 TEXTINCLUDE DISCARDABLE   
      50 3 TEXTINCLUDE DISCARDABLE  
    50 50 BEGIN  
    51 51     "\r\n"