Changeset 727 in dev

Timestamp:

Aug 19, 2008, 11:11:27 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

SlideStringの実装をText::SlideStringに、SlideBufferをmemmoveにした。

File:

• trunk/ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp (modified) (4 diffs)

trunk/ab5.0/abdev/BasicCompiler_Common/StrOperation.cpp

@@ -164 +164 @@
 }
 void SlideString(char *buffer, int slide){
-    char *temp;
-    temp=(char *)malloc(lstrlen(buffer)+1);
-    lstrcpy(temp,buffer);
-    lstrcpy(buffer+slide,temp);
-    free(temp);
+    Text::SlideString(buffer,slide);
 }
 void SlideBuffer(char *buffer,int length,int slide){
-    void *temp;
-    temp=malloc(length+1);
-    memcpy(temp,buffer,length);
-    memcpy(buffer+slide,temp,length);
-    free(temp);
+    memmove(buffer+slide,buffer,length);
 }
 
@@ -415 +407 @@
     }
 
-    static std::string resultStr = "";
-    resultStr = temporary;
+    static std::string resultStr = temporary;
 
     free( temporary );
@@ -438 +429 @@
     BROWSEINFO BrowseInfo;
     LPITEMIDLIST pidlBrowse;
-    LPMALLOC g_pMalloc;
     char temporary[MAX_PATH];
 
@@ -451 +441 @@
     pidlBrowse=SHBrowseForFolder(&BrowseInfo);
     if(pidlBrowse){
-        if(SHGetMalloc(&g_pMalloc)!=0) return 0;
-        SHGetPathFromIDList(pidlBrowse,folder);
-        g_pMalloc->Free(pidlBrowse);
-        g_pMalloc->Release();
-        return 1;
+        BOOL ret = SHGetPathFromIDList(pidlBrowse,folder);
+        CoTaskMemFree(pidlBrowse);
+        return ret;
     }
     return 0;