svn commit: r905615 - in /commons/sandbox/runtime/trunk/src/main/native/support/win32: suexec.c support.rc

[mturk]

Author: mturk
Date: Tue Feb  2 13:02:55 2010
New Revision: 905615

URL: http://svn.apache.org/viewvc?rev=905615&view=rev
Log:
Polish the about dialog

Modified:
    commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c
    commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc

Modified: commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c?rev=905615&r1=905614&r2=905615&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/support/win32/suexec.c Tue 
Feb  2 13:02:55 2010
@@ -1542,7 +1542,8 @@
     static WCHAR szBuf[4][4096];
     if (nBuf > 4)
         return L"";
-    if (LoadStringW(hCurrentInstance, wID , szBuf[nBuf], 4096) > 0)
+    if (LoadStringW(hCurrentInstance, wID , szBuf[nBuf],
+                    sizeof(szBuf[nBuf])) > 0)
         return szBuf[nBuf];
     else
         return L"";
@@ -1550,12 +1551,10 @@
 
 static void ShowShellAbout(HWND hWnd)
 {
-    TCHAR szApplication[512];
+    TCHAR szApplication[1024];
 
-    LoadLibraryW(L"RICHED32.DLL");
-
-    _snwprintf(szApplication , 512,
-               L"About - %s#Windows",
+    _snwprintf(szApplication , sizeof(szApplication),
+               L"About - %s#Microsoft",
                LoadResourceW(IDS_APPLICATION, 0));
     ShellAbout(hWnd, szApplication,
                LoadResourceW(IDS_APPFULLNAME, 1),
@@ -1671,6 +1670,7 @@
 static void AboutBox(HWND hWnd)
 {
     LoadLibraryW(L"RICHED32.DLL");
+
     DialogBox(hCurrentInstance,
               MAKEINTRESOURCE(IDD_ABOUTBOX),
               hWnd,

Modified: commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc
URL: 
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc?rev=905615&r1=905614&r2=905615&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc 
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/support/win32/support.rc Tue 
Feb  2 13:02:55 2010
@@ -90,16 +90,16 @@
 #define STR_ICONAME             "apache.ico"
 #endif
 IDI_MAINICON         ICON       STR_ICONAME
-IDR_LICENSE          RTF                    "license.rtf"
-BMP_JAKARTA          BITMAP                 "commons.bmp"
+IDR_LICENSE          RTF        "license.rtf"
+BMP_JAKARTA          BITMAP     "commons.bmp"
 
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST  "commonc.manifest"
 
 STRINGTABLE
 BEGIN
-    IDS_APPLICATION     STR_INTNAME
+    IDS_APPLICATION     STR_INTNAME    
     IDS_APPVERSION      "Version " ACR_VERSION_STRING
-    IDS_APPFULLNAME     STR_INTNAME " Version " ACR_VERSION_STRING
+    IDS_APPFULLNAME     STR_PRODUCT " Version " ACR_VERSION_STRING
     IDS_APPCOPYRIGHT    STR_COPYRIGHT
 END