Changeset 21512 for trunk/src/shell32

Timestamp:

Dec 6, 2010, 5:24:51 PM (15 years ago)

Author:

dmik

Message:

Aligned the STRRET definition and made it available through shlwapi.h and shlobj.h for compatibility with Win32.

Location:

trunk/src/shell32

Files:

• shellstring.c (modified) (2 diffs)
• shlfolder.c (modified) (9 diffs)

trunk/src/shell32/shellstring.c

@@ -39 +39 @@
             break;
 
-          case STRRET_CSTRA:
+          case STRRET_CSTR:
             lstrcpynA((LPSTR)dest, src->u.cStr, len);
             break;
 
-          case STRRET_OFFSETA:
+          case STRRET_OFFSET:
             lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
             break;
@@ -72 +72 @@
             break;
 
-          case STRRET_CSTRA:
+          case STRRET_CSTR:
               if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len)
                   dest[len-1] = 0;
             break;
 
-          case STRRET_OFFSETA:
+          case STRRET_OFFSET:
             if (pidl)
             {

trunk/src/shell32/shlfolder.c

@@ -1213 +1213 @@
             return E_OUTOFMEMORY;
         }
-        strRet->uType = STRRET_CSTRA;
+        strRet->uType = STRRET_CSTR;
         lstrcpynA(strRet->u.cStr, szPath, MAX_PATH);
 
@@ -1356 +1356 @@
           psd->fmt = GenericSFHeader[iColumn].fmt;
           psd->cxChar = GenericSFHeader[iColumn].cxChar;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
           LoadStringA(shell32_hInstance, GenericSFHeader[iColumn].colnameid, psd->str.u.cStr, MAX_PATH);
           return S_OK;
@@ -1382 +1382 @@
           }
           hr = S_OK;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
         }
 
@@ -2020 +2020 @@
             return E_OUTOFMEMORY;
         }
-        strRet->uType = STRRET_CSTRA;
+        strRet->uType = STRRET_CSTR;
         lstrcpynA(strRet->u.cStr, szPath, MAX_PATH);
 
@@ -2102 +2102 @@
           psd->fmt = DesktopSFHeader[iColumn].fmt;
           psd->cxChar = DesktopSFHeader[iColumn].cxChar;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
           LoadStringA(shell32_hInstance, DesktopSFHeader[iColumn].colnameid, psd->str.u.cStr, MAX_PATH);
           return S_OK;
@@ -2128 +2128 @@
           }
           hr = S_OK;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
         }
 
@@ -2501 +2501 @@
             return E_OUTOFMEMORY;
         }
-        strRet->uType = STRRET_CSTRA;
+        strRet->uType = STRRET_CSTR;
         lstrcpynA(strRet->u.cStr, szPath, MAX_PATH);
 
@@ -2585 +2585 @@
           psd->fmt = MyComputerSFHeader[iColumn].fmt;
           psd->cxChar = MyComputerSFHeader[iColumn].cxChar;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
           LoadStringA(shell32_hInstance, MyComputerSFHeader[iColumn].colnameid, psd->str.u.cStr, MAX_PATH);
           return S_OK;
@@ -2595 +2595 @@
 
           psd->str.u.cStr[0] = 0x00;
-          psd->str.uType = STRRET_CSTRA;
+          psd->str.uType = STRRET_CSTR;
           switch(iColumn)
           {