6 files changed, 15 insertions, 15 deletions
diff --git a/plugins/HistoryPlusPlus/EventDetailForm.pas b/plugins/HistoryPlusPlus/EventDetailForm.pas
index eedae3bc66..06bffc478d 100644
--- a/plugins/HistoryPlusPlus/EventDetailForm.pas
+++ b/plugins/HistoryPlusPlus/EventDetailForm.pas
@@ -676,10 +676,10 @@ end;
 
 procedure TEventDetailsFrm.BrowseReceivedFilesClick(Sender: TObject);
 var
-  Path: Array [0 .. MAX_PATH] of AnsiChar;
+  Path: Array [0 .. MAX_PATH] of WideChar;
 begin
   CallService(MS_FILE_GETRECEIVEDFILESFOLDER, FParentForm.hContact, LPARAM(@Path));
-  ShellExecuteA(0, 'open', Path, nil, nil, SW_SHOW);
+  ShellExecuteW(0, 'open', Path, nil, nil, SW_SHOW);
 end;
 
 procedure TEventDetailsFrm.ETextURLClick(Sender: TObject; const URLText: String; Button: TMouseButton);
diff --git a/plugins/HistoryPlusPlus/GlobalSearch.pas b/plugins/HistoryPlusPlus/GlobalSearch.pas
index 2ae098591a..b7cafc091e 100644
--- a/plugins/HistoryPlusPlus/GlobalSearch.pas
+++ b/plugins/HistoryPlusPlus/GlobalSearch.pas
@@ -2450,12 +2450,12 @@ end;
 
 procedure TfmGlobalSearch.BrowseReceivedFilesClick(Sender: TObject);
 var
-  Path: Array [0 .. MAX_PATH] of AnsiChar;
+  Path: Array [0 .. MAX_PATH] of WideChar;
   hContact: THandle;
 begin
   hContact := GetSearchItem(hg.Selected).Contact.Handle;
   CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, LParam(@Path));
-  ShellExecuteA(0, 'open', Path, nil, nil, SW_SHOW);
+  ShellExecuteW(0, 'open', Path, nil, nil, SW_SHOW);
 end;
 
 procedure TfmGlobalSearch.tbEventsClick(Sender: TObject);
diff --git a/plugins/HistoryPlusPlus/HistoryForm.pas b/plugins/HistoryPlusPlus/HistoryForm.pas
index 3b50cfe5a5..ad1bc32035 100644
--- a/plugins/HistoryPlusPlus/HistoryForm.pas
+++ b/plugins/HistoryPlusPlus/HistoryForm.pas
@@ -3796,10 +3796,10 @@ end;
 
 procedure THistoryFrm.BrowseReceivedFilesClick(Sender: TObject);
 var
-  Path: Array [0 .. MAX_PATH] of AnsiChar;
+  Path: Array [0 .. MAX_PATH] of WideChar;
 begin
   CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, lParam(@Path));
-  ShellExecuteA(0, 'open', Path, nil, nil, SW_SHOW);
+  ShellExecuteW(0, 'open', Path, nil, nil, SW_SHOW);
 end;
 
 procedure THistoryFrm.hgOptionsChange(Sender: TObject);
diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
index b67e82c1f6..197b91db89 100644
--- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas
+++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
@@ -1329,12 +1329,12 @@ end;
 
 procedure TExternalGrid.OnBrowseReceivedFilesClick(Sender: TObject);
 var
-  Path: Array [0 .. MAX_PATH] of AnsiChar;
+  Path: Array [0 .. MAX_PATH] of WideChar;
 begin
   if Grid.Selected = -1 then
     exit;
   CallService(MS_FILE_GETRECEIVEDFILESFOLDER, Items[Grid.Selected].hContact,LParam(@Path));
-  ShellExecuteA(0, 'open', Path, nil, nil, SW_SHOW);
+  ShellExecuteW(0, 'open', Path, nil, nil, SW_SHOW);
 end;
 
 end.
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 3684defb91..0a76189564 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -206,10 +206,10 @@ static void ShowPopup(const wchar_t *pwszText, MCONTACT hContact)
 
 BOOL DirectoryExists(MCONTACT hContact)
 {
-	char path[MAX_PATH];
+	wchar_t path[MAX_PATH];
 	CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, (LPARAM)&path);
-	uint32_t attr = GetFileAttributesA(path);
-	return (attr != -1) && (attr&FILE_ATTRIBUTE_DIRECTORY);
+	uint32_t attr = GetFileAttributesW(path);
+	return (attr != -1) && (attr & FILE_ATTRIBUTE_DIRECTORY);
 }
 
 BOOL isMetaContact(MCONTACT hContact)
@@ -543,9 +543,9 @@ static INT_PTR OpenIgnoreOptions(WPARAM, LPARAM)
 
 static INT_PTR onRecvFiles(WPARAM hContact, LPARAM)
 {
-	char path[MAX_PATH];
+	wchar_t path[MAX_PATH];
 	CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, (LPARAM)&path);
-	ShellExecuteA(nullptr, "open", path, nullptr, nullptr, SW_SHOW);
+	ShellExecuteW(nullptr, L"open", path, nullptr, nullptr, SW_SHOW);
 	return 0;
 }
 
diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index eedcbb0b9b..edb47276b6 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -244,7 +244,7 @@ void ItemData::fill(int tmpl)
 		dbe.eventType = EVENTTYPE_JABBER_PRESENCE;
 		break;
 	default:
-		dbe.eventType = 309247;
+		dbe.eventType = 9247;
 		break;
 	}
 }
@@ -373,7 +373,7 @@ void ItemData::load(bool bFullLoad)
 			}
 
 			wchar_t buf[MAX_PATH];
-			CallService(MS_FILE_GETRECEIVEDFILESFOLDERW, hContact, (LPARAM)buf);
+			CallService(MS_FILE_GETRECEIVEDFILESFOLDER, hContact, (LPARAM)buf);
 
 			CMStringW wszFileName = buf;
 			wszFileName.Append(blob.getName());