shell32/tests: Fix compilation with -D__WINESRC__.

dlls/shell32/tests/Makefile.in

 TESTDLL   = shell32.dll
 IMPORTS   = shell32 ole32 oleaut32 user32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	appbar.c \

dlls/shell32/tests/appbar.c

@@ -20,6 +20,7 @@
 #include <stdarg.h>
 
 #include <windows.h>
+#include "shellapi.h"
 
 #include "wine/test.h"
 
@@ -47,7 +48,7 @@ static int expected_bottom;
 
 static void testwindow_setpos(HWND hwnd)
 {
-    struct testwindow_info* info = (struct testwindow_info*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    struct testwindow_info* info = (struct testwindow_info*)GetWindowLongPtrA(hwnd, GWLP_USERDATA);
     APPBARDATA abd;
     BOOL ret;
 
@@ -113,7 +114,7 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L
         }
     }
 
-    return DefWindowProc(hwnd, msg, wparam, lparam);
+    return DefWindowProcA(hwnd, msg, wparam, lparam);
 }
 
 /* process pending messages until a condition is true or 3 seconds pass */
@@ -185,7 +186,7 @@ static void register_testwindow_class(void)
     cls.style = 0;
     cls.lpfnWndProc = testwindow_wndproc;
     cls.hInstance = NULL;
-    cls.hCursor = LoadCursor(0, IDC_ARROW);
+    cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
     cls.hbrBackground = (HBRUSH) COLOR_WINDOW;
     cls.lpszClassName = testwindow_class;
 
@@ -234,7 +235,7 @@ static void test_setpos(void)
     windows[0].desired_rect.right = screen_width;
     windows[0].desired_rect.top = screen_height - 15;
     windows[0].desired_rect.bottom = screen_height;
-    SetWindowLongPtr(windows[0].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[0]);
+    SetWindowLongPtrA(windows[0].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[0]);
     testwindow_setpos(windows[0].hwnd);
     do_events();
 
@@ -255,7 +256,7 @@ static void test_setpos(void)
     windows[1].desired_rect.right = screen_width;
     windows[1].desired_rect.top = screen_height - 10;
     windows[1].desired_rect.bottom = screen_height;
-    SetWindowLongPtr(windows[1].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[1]);
+    SetWindowLongPtrA(windows[1].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[1]);
     testwindow_setpos(windows[1].hwnd);
 
     /* the windows are adjusted to they don't overlap */
@@ -287,7 +288,7 @@ static void test_setpos(void)
     windows[2].desired_rect.right = screen_width;
     windows[2].desired_rect.top = screen_height - 10;
     windows[2].desired_rect.bottom = screen_height;
-    SetWindowLongPtr(windows[2].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[2]);
+    SetWindowLongPtrA(windows[2].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[2]);
     testwindow_setpos(windows[2].hwnd);
 
     do_events_until(no_appbars_intersect);

dlls/shell32/tests/autocomplete.c

@@ -194,7 +194,7 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
     switch(msg) {
     case WM_CREATE:
         /* create edit control */
-        hEdit = CreateWindowEx(0, "EDIT", "Some text", 0, 10, 10, 300, 300,
+        hEdit = CreateWindowExA(0, "EDIT", "Some text", 0, 10, 10, 300, 300,
                     hWnd, NULL, hinst, NULL);
         ok(hEdit != NULL, "Can't create edit control\n");
         break;
@@ -214,7 +214,7 @@ static void createMainWnd(void)
     wc.cbWndExtra = 0;
     wc.hInstance = GetModuleHandleA(NULL);
     wc.hIcon = NULL;
-    wc.hCursor = LoadCursorA(NULL, IDC_IBEAM);
+    wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_IBEAM);
     wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
     wc.lpszMenuName = NULL;
     wc.lpszClassName = "MyTestWnd";

dlls/shell32/tests/brsfolder.c

@@ -18,10 +18,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
+#define COBJMACROS
+
 #include <windows.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 #include <string.h>
+#include "shellapi.h"
 
 #include "wine/test.h"
 #define IDD_MAKENEWFOLDER 0x3746 /* From "../shresdef.h" */
@@ -37,13 +41,13 @@ static int get_number_of_folders(LPCSTR path)
 {
     int number_of_folders = 0;
     char path_search_string[MAX_PATH];
-    WIN32_FIND_DATA find_data;
+    WIN32_FIND_DATAA find_data;
     HANDLE find_handle;
 
-    strncpy(path_search_string, path, MAX_PATH);
+    lstrcpynA(path_search_string, path, MAX_PATH);
     strncat(path_search_string, "*", 1);
 
-    find_handle = FindFirstFile(path_search_string, &find_data);
+    find_handle = FindFirstFileA(path_search_string, &find_data);
     if (find_handle == INVALID_HANDLE_VALUE)
         return -1;
 
@@ -56,7 +60,7 @@ static int get_number_of_folders(LPCSTR path)
             number_of_folders++;
         }
     }
-    while (FindNextFile(find_handle, &find_data) != 0);
+    while (FindNextFileA(find_handle, &find_data) != 0);
 
     FindClose(find_handle);
     return number_of_folders;
@@ -81,11 +85,11 @@ static void CALLBACK make_new_folder_timer_callback(HWND hwnd, UINT uMsg,
     {
     case 0:
         /* Click "Make New Folder" button */
-        PostMessage(hwnd, WM_COMMAND, IDD_MAKENEWFOLDER, 0);
+        PostMessageA(hwnd, WM_COMMAND, IDD_MAKENEWFOLDER, 0);
         break;
     case 1:
         /* Set the new folder name to foo by replacing text in edit control */
-        SendMessage(GetFocus(), EM_REPLACESEL, 0, (LPARAM) new_folder_name);
+        SendMessageA(GetFocus(), EM_REPLACESEL, 0, (LPARAM) new_folder_name);
         SetFocus(hwnd);
         break;
     case 2:
@@ -104,7 +108,7 @@ static void CALLBACK make_new_folder_timer_callback(HWND hwnd, UINT uMsg,
     case 4:
         KillTimer(hwnd, idEvent);
         /* Close dialog box */
-        SendMessage(hwnd, WM_COMMAND, IDOK, 0);
+        SendMessageA(hwnd, WM_COMMAND, IDOK, 0);
         break;
     default:
         break;
@@ -150,7 +154,7 @@ static int CALLBACK create_new_folder_callback(HWND hwnd, UINT uMsg,
 static void test_click_make_new_folder_button(void)
 {
     HRESULT resCoInit, hr;
-    BROWSEINFO bi;
+    BROWSEINFOA bi;
     LPITEMIDLIST pidl = NULL;
     LPITEMIDLIST test_folder_pidl;
     IShellFolder *test_folder_object;
@@ -161,7 +165,7 @@ static void test_click_make_new_folder_button(void)
     char selected_folder[MAX_PATH];
     const CHAR title[] = "test_click_make_new_folder_button";
     int number_of_folders = -1;
-    SHFILEOPSTRUCT shfileop;
+    SHFILEOPSTRUCTA shfileop;
 
     if (does_folder_or_file_exist(title))
     {
@@ -195,8 +199,8 @@ static void test_click_make_new_folder_button(void)
 
     /* Initialize browse info struct for SHBrowseForFolder */
     bi.hwndOwner = NULL;
-    bi.pszDisplayName = (LPTSTR) &selected_folder;
-    bi.lpszTitle = (LPTSTR) title;
+    bi.pszDisplayName = selected_folder;
+    bi.lpszTitle = title;
     bi.ulFlags = BIF_NEWDIALOGSTYLE;
     bi.lpfn = create_new_folder_callback;
     /* Use test folder as the root folder for dialog box */
@@ -213,7 +217,7 @@ static void test_click_make_new_folder_button(void)
     bi.pidlRoot = test_folder_pidl;
 
     /* Display dialog box and let callback click the buttons */
-    pidl = SHBrowseForFolder(&bi);
+    pidl = SHBrowseForFolderA(&bi);
 
     number_of_folders = get_number_of_folders(test_folder_path);
     ok(number_of_folders == 1 || broken(number_of_folders == 0) /* W95, W98 */,
@@ -242,7 +246,7 @@ static void test_click_make_new_folder_button(void)
     shfileop.pFrom = test_folder_path;
     shfileop.pTo = NULL;
     shfileop.fFlags = FOF_NOCONFIRMATION|FOF_NOERRORUI|FOF_SILENT;
-    SHFileOperation(&shfileop);
+    SHFileOperationA(&shfileop);
 
     if (pidl)
         CoTaskMemFree(pidl);
@@ -265,37 +269,37 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR
     {
     case BFFM_INITIALIZED:
         /* test with zero values */
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 0, 0);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONA, 0, 0);
         ok(!ret, "SendMessage returned: %u\n", ret);
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 0, 0);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONW, 0, 0);
         ok(!ret, "SendMessage returned: %u\n", ret);
 
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, 0);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONA, 1, 0);
         ok(!ret, "SendMessage returned: %u\n", ret);
 
         if(0)
         {
             /* Crashes on NT4 */
-            ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, 0);
+            ret = SendMessageA(hwnd, BFFM_SETSELECTIONW, 1, 0);
             ok(!ret, "SendMessage returned: %u\n", ret);
         }
 
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 0, (LPARAM)selected_folder_pidl);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONA, 0, (LPARAM)selected_folder_pidl);
         ok(!ret, "SendMessage returned: %u\n", ret);
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 0, (LPARAM)selected_folder_pidl);
+        ret = SendMessageW(hwnd, BFFM_SETSELECTIONW, 0, (LPARAM)selected_folder_pidl);
         ok(!ret, "SendMessage returned: %u\n", ret);
 
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)selected_folder_pidl);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)selected_folder_pidl);
         ok(!ret, "SendMessage returned: %u\n", ret);
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)selected_folder_pidl);
+        ret = SendMessageW(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)selected_folder_pidl);
         ok(!ret, "SendMessage returned: %u\n", ret);
 
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)new_folder_name);
+        ret = SendMessageA(hwnd, BFFM_SETSELECTIONA, 1, (LPARAM)new_folder_name);
         ok(!ret, "SendMessage returned: %u\n", ret);
-        ret = SendMessage(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)new_folder_name);
+        ret = SendMessageW(hwnd, BFFM_SETSELECTIONW, 1, (LPARAM)new_folder_name);
         ok(!ret, "SendMessage returned: %u\n", ret);
 
-        SendMessage(hwnd, WM_COMMAND, IDOK, 0);
+        SendMessageA(hwnd, WM_COMMAND, IDOK, 0);
         return 1;
     default:
         return 0;
@@ -305,7 +309,7 @@ static int CALLBACK selection_callback(HWND hwnd, UINT uMsg, LPARAM lParam, LPAR
 static void test_selection(void)
 {
     HRESULT resCoInit, hr;
-    BROWSEINFO bi;
+    BROWSEINFOA bi;
     LPITEMIDLIST pidl = NULL;
     IShellFolder *desktop_object;
     WCHAR selected_folderW[MAX_PATH];
@@ -326,7 +330,7 @@ static void test_selection(void)
     /* Initialize browse info struct for SHBrowseForFolder */
     bi.hwndOwner = NULL;
     bi.pszDisplayName = NULL;
-    bi.lpszTitle = (LPTSTR) title;
+    bi.lpszTitle = title;
     bi.lpfn = selection_callback;
 
     hr = SHGetDesktopFolder(&desktop_object);
@@ -341,19 +345,19 @@ static void test_selection(void)
 
     /* test without flags */
     bi.ulFlags = 0;
-    pidl = SHBrowseForFolder(&bi);
+    pidl = SHBrowseForFolderA(&bi);
 
     if (pidl)
         CoTaskMemFree(pidl);
 
     /* test with flag */
     bi.ulFlags = BIF_NEWDIALOGSTYLE;
-    pidl = SHBrowseForFolder(&bi);
+    pidl = SHBrowseForFolderA(&bi);
 
     if (pidl)
         CoTaskMemFree(pidl);
 
-    desktop_object->lpVtbl->Release(desktop_object);
+    IShellFolder_Release(desktop_object);
 
     CoUninitialize();
 }

dlls/shell32/tests/ebrowser.c

@@ -114,10 +114,10 @@ static HRESULT ebrowser_browse_to_desktop(IExplorerBrowser *peb)
 static void process_msgs(void)
 {
     MSG msg;
-    while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE))
+    while(PeekMessageA( &msg, NULL, 0, 0, PM_REMOVE))
     {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageA(&msg);
     }
 }
 

dlls/shell32/tests/progman_dde.c

@@ -411,7 +411,7 @@ static void CheckFileExistsInProgramGroups(const char *nameToCheck, int shouldEx
         }
         strcat(path, "\\");
         strcat(path, nameToCheck);
-        attributes = GetFileAttributes(path);
+        attributes = GetFileAttributesA(path);
         if (!shouldExist)
         {
             ok (attributes == INVALID_FILE_ATTRIBUTES , "File exists and shouldn't %s.%s\n",
@@ -705,11 +705,11 @@ START_TEST(progman_dde)
     init_strings();
 
     /* Initialize DDE Instance */
-    err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0);
+    err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0);
     ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));
 
     /* Create Connection */
-    hszProgman = DdeCreateStringHandle(instance, "PROGMAN", CP_WINANSI);
+    hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI);
     ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance));
     hConv = DdeConnect(instance, hszProgman, hszProgman, NULL);
     ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n");
@@ -730,11 +730,11 @@ START_TEST(progman_dde)
     /* 2nd Instance (Followup Tests) */
     /* Initialize DDE Instance */
     instance = 0;
-    err = DdeInitialize(&instance, DdeCallback, APPCMD_CLIENTONLY, 0);
+    err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0);
     ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err));
 
     /* Create Connection */
-    hszProgman = DdeCreateStringHandle(instance, "PROGMAN", CP_WINANSI);
+    hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI);
     ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance));
     hConv = DdeConnect(instance, hszProgman, hszProgman, NULL);
     ok (hConv != NULL, "DdeConnect Error %s\n", GetDdeLastErrorStr(instance));

dlls/shell32/tests/shelldispatch.c

@@ -25,6 +25,7 @@
 #include "shldisp.h"
 #include "shlobj.h"
 #include "shlwapi.h"
+#include "winsvc.h"
 #include "wine/test.h"
 
 #define EXPECT_HR(hr,hr_exp) \

dlls/shell32/tests/shelllink.c

@@ -26,6 +26,7 @@
 #include "shlguid.h"
 #include "shobjidl.h"
 #include "shlobj.h"
+#include "shellapi.h"
 #include "wine/test.h"
 
 #include "shell32_test.h"
@@ -126,7 +127,7 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer));
     ok(r == S_OK, "GetDescription failed (0x%08x)\n", r);
-    ok(lstrcmp(buffer,str)==0, "GetDescription returned '%s'\n", buffer);
+    ok(strcmp(buffer,str)==0, "GetDescription returned '%s'\n", buffer);
 
     r = IShellLinkA_SetDescription(sl, NULL);
     ok(r == S_OK, "SetDescription failed (0x%08x)\n", r);
@@ -134,8 +135,7 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer));
     ok(r == S_OK, "GetDescription failed (0x%08x)\n", r);
-    ok(*buffer=='\0' || broken(lstrcmp(buffer,str)==0), "GetDescription returned '%s'\n", buffer); /* NT4 */
-
+    ok(*buffer=='\0' || broken(strcmp(buffer,str)==0), "GetDescription returned '%s'\n", buffer); /* NT4 */
 
     /* Test Getting / Setting the work directory */
     strcpy(buffer,"garbage");
@@ -150,7 +150,7 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer));
     ok(r == S_OK, "GetWorkingDirectory failed (0x%08x)\n", r);
-    ok(lstrcmpi(buffer,str)==0, "GetWorkingDirectory returned '%s'\n", buffer);
+    ok(lstrcmpiA(buffer,str)==0, "GetWorkingDirectory returned '%s'\n", buffer);
 
     /* Test Getting / Setting the path */
     strcpy(buffer,"garbage");
@@ -187,7 +187,7 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH);
     ok(r == S_OK, "GetPath failed (0x%08x)\n", r);
-    ok(lstrcmpi(buffer,str)==0, "GetPath returned '%s'\n", buffer);
+    ok(lstrcmpiA(buffer,str)==0, "GetPath returned '%s'\n", buffer);
 
     /* Get some real path to play with */
     GetWindowsDirectoryA( mypath, sizeof(mypath)-12 );
@@ -205,7 +205,7 @@ static void test_get_set(void)
         ret = SHGetPathFromIDListA(tmp_pidl, buffer);
         ok(ret, "SHGetPathFromIDListA failed\n");
         if (ret)
-            ok(lstrcmpi(buffer,str)==0, "GetIDList returned '%s'\n", buffer);
+            ok(lstrcmpiA(buffer,str)==0, "GetIDList returned '%s'\n", buffer);
         pILFree(tmp_pidl);
     }
 
@@ -239,8 +239,7 @@ static void test_get_set(void)
         r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH);
         ok(r == S_OK, "GetPath failed (0x%08x)\n", r);
         todo_wine
-        ok(lstrcmpi(buffer, mypath)==0, "GetPath returned '%s'\n", buffer);
-
+        ok(lstrcmpiA(buffer, mypath)==0, "GetPath returned '%s'\n", buffer);
     }
 
     /* test path with quotes (IShellLinkA_SetPath returns S_FALSE on W2K and below and S_OK on XP and above */
@@ -250,8 +249,8 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH);
     ok(r==S_OK, "GetPath failed (0x%08x)\n", r);
-    ok(!lstrcmp(buffer, "C:\\nonexistent\\file") ||
-       broken(!lstrcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */
+    ok(!strcmp(buffer, "C:\\nonexistent\\file") ||
+       broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */
        "case doesn't match\n");
 
     r = IShellLinkA_SetPath(sl, "\"c:\\foo");
@@ -282,14 +281,14 @@ static void test_get_set(void)
     strcpy(buffer,"garbage");
     r = IShellLinkA_GetArguments(sl, buffer, sizeof(buffer));
     ok(r == S_OK, "GetArguments failed (0x%08x)\n", r);
-    ok(lstrcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer);
+    ok(strcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer);
 
     strcpy(buffer,"garbage");
     r = IShellLinkA_SetArguments(sl, NULL);
     ok(r == S_OK, "SetArguments failed (0x%08x)\n", r);
     r = IShellLinkA_GetArguments(sl, buffer, sizeof(buffer));
     ok(r == S_OK, "GetArguments failed (0x%08x)\n", r);
-    ok(!buffer[0] || lstrcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer);
+    ok(!buffer[0] || strcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer);
 
     strcpy(buffer,"garbage");
     r = IShellLinkA_SetArguments(sl, "");
@@ -327,7 +326,7 @@ static void test_get_set(void)
     i=0xdeadbeef;
     r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i);
     ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r);
-    ok(lstrcmpi(buffer,str)==0, "GetIconLocation returned '%s'\n", buffer);
+    ok(lstrcmpiA(buffer,str)==0, "GetIconLocation returned '%s'\n", buffer);
     ok(i==0xbabecafe, "GetIconLocation returned %d'\n", i);
 
     /* Test Getting / Setting the hot key */
@@ -535,7 +534,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
         strcpy(buffer,"garbage");
         r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer));
         lok(r == S_OK, "GetDescription failed (0x%08x)\n", r);
-        lok_todo_4(0x1, lstrcmp(buffer, desc->description)==0,
+        lok_todo_4(0x1, strcmp(buffer, desc->description)==0,
            "GetDescription returned '%s' instead of '%s'\n",
            buffer, desc->description);
     }
@@ -544,7 +543,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
         strcpy(buffer,"garbage");
         r = IShellLinkA_GetWorkingDirectory(sl, buffer, sizeof(buffer));
         lok(r == S_OK, "GetWorkingDirectory failed (0x%08x)\n", r);
-        lok_todo_4(0x2, lstrcmpi(buffer, desc->workdir)==0,
+        lok_todo_4(0x2, lstrcmpiA(buffer, desc->workdir)==0,
            "GetWorkingDirectory returned '%s' instead of '%s'\n",
            buffer, desc->workdir);
     }
@@ -553,7 +552,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
         strcpy(buffer,"garbage");
         r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH);
         lok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r);
-        lok_todo_4(0x4, lstrcmpi(buffer, desc->path)==0,
+        lok_todo_4(0x4, lstrcmpiA(buffer, desc->path)==0,
            "GetPath returned '%s' instead of '%s'\n",
            buffer, desc->path);
     }
@@ -580,7 +579,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
         strcpy(buffer,"garbage");
         r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i);
         lok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r);
-        lok_todo_4(0x20, lstrcmpi(buffer, desc->icon)==0,
+        lok_todo_4(0x20, lstrcmpiA(buffer, desc->icon)==0,
            "GetIconLocation returned '%s' instead of '%s'\n",
            buffer, desc->icon);
         lok_todo_4(0x20, i==desc->icon_id,
@@ -650,7 +649,7 @@ static void test_load_save(void)
     create_lnk(lnkfile, &desc, 0);
     check_lnk(lnkfile, &desc, 0x0);
 
-    r=GetModuleFileName(NULL, mypath, sizeof(mypath));
+    r=GetModuleFileNameA(NULL, mypath, sizeof(mypath));
     ok(r<sizeof(mypath), "GetModuleFileName failed (%d)\n", r);
     strcpy(mydir, mypath);
     p=strrchr(mydir, '\\');
@@ -724,7 +723,7 @@ static void test_load_save(void)
     check_lnk(lnkfile, &desc, 0x4);
 
     /* Create a temporary non-executable file */
-    r=GetTempPath(sizeof(mypath), mypath);
+    r=GetTempPathA(sizeof(mypath), mypath);
     ok(r<sizeof(mypath), "GetTempPath failed (%d), err %d\n", r, GetLastError());
     r=pGetLongPathNameA(mypath, mydir, sizeof(mydir));
     ok(r<sizeof(mydir), "GetLongPathName failed (%d), err %d\n", r, GetLastError());
@@ -734,8 +733,8 @@ static void test_load_save(void)
 
     strcpy(mypath, mydir);
     strcat(mypath, "\\test.txt");
-    hf = CreateFile(mypath, GENERIC_WRITE, 0, NULL,
-                    CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    hf = CreateFileA(mypath, GENERIC_WRITE, 0, NULL,
+                     CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     CloseHandle(hf);
 
     /* Overwrite the existing lnk file and test link to an existing non-executable file */
@@ -778,8 +777,8 @@ static void test_load_save(void)
     /* Create a temporary .bat file */
     strcpy(mypath, mydir);
     strcat(mypath, "\\test.bat");
-    hf = CreateFile(mypath, GENERIC_WRITE, 0, NULL,
-                    CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    hf = CreateFileA(mypath, GENERIC_WRITE, 0, NULL,
+                     CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     CloseHandle(hf);
 
     strcpy(realpath, mypath);
@@ -985,7 +984,7 @@ static void test_GetIconLocation(void)
     i = 0xdeadbeef;
     r = IShellLinkA_GetIconLocation(sl, buffer, sizeof(buffer), &i);
     ok(r == S_OK, "GetIconLocation failed (0x%08x)\n", r);
-    ok(lstrcmpi(buffer,str) == 0, "GetIconLocation returned '%s'\n", buffer);
+    ok(lstrcmpiA(buffer,str) == 0, "GetIconLocation returned '%s'\n", buffer);
     ok(i == 0xbabecafe, "GetIconLocation returned %d'\n", i);
 
     IShellLinkA_Release(sl);

dlls/shell32/tests/shellpath.c

@@ -31,6 +31,7 @@
 #include "shlobj.h"
 #include "shlwapi.h"
 #include "knownfolders.h"
+#include "shellapi.h"
 #include "wine/test.h"
 
 #include "initguid.h"

dlls/shell32/tests/shlfolder.c

@@ -2063,7 +2063,7 @@ static void test_SHGetFolderPathAndSubDirA(void)
         "expected %s to start with %s\n", testpath, appdata);
     ok(!lstrcmpA(&testpath[1 + strlen(appdata)], winetemp),
         "expected %s to end with %s\n", testpath, winetemp);
-    dwret = GetFileAttributes(testpath);
+    dwret = GetFileAttributesA(testpath);
     ok(FILE_ATTRIBUTE_DIRECTORY | dwret, "expected %x to contain FILE_ATTRIBUTE_DIRECTORY\n", dwret);
 
     /* cleanup */
@@ -4417,7 +4417,7 @@ static LRESULT CALLBACK testwindow_wndproc(HWND hwnd, UINT msg, WPARAM wparam, L
             ok(0, "Didn't expect a WM_USER_NOTIFY message (event: %x)\n", signal);
         return 0;
     }
-    return DefWindowProc(hwnd, msg, wparam, lparam);
+    return DefWindowProcA(hwnd, msg, wparam, lparam);
 }
 
 static void register_testwindow_class(void)

dlls/shell32/tests/systray.c

@@ -20,6 +20,7 @@
 #include <stdarg.h>
 
 #include <windows.h>
+#include "shellapi.h"
 
 #include "wine/test.h"
 
@@ -41,7 +42,7 @@ static void test_cbsize(void)
         nidW.hWnd = hMainWnd;
         nidW.uID = 1;
         nidW.uFlags = NIF_ICON|NIF_MESSAGE;
-        nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+        nidW.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION);
         nidW.uCallbackMessage = WM_USER+17;
         ret = pShell_NotifyIconW(NIM_ADD, &nidW);
         /* using an invalid cbSize does work */
@@ -61,7 +62,7 @@ static void test_cbsize(void)
     nidA.hWnd = hMainWnd;
     nidA.uID = 1;
     nidA.uFlags = NIF_ICON|NIF_MESSAGE;
-    nidA.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    nidA.hIcon = LoadIconA(NULL, (LPSTR)IDI_APPLICATION);
     nidA.uCallbackMessage = WM_USER+17;
     ok(Shell_NotifyIconA(NIM_ADD, &nidA), "NIM_ADD failed!\n");
 
@@ -91,11 +92,11 @@ START_TEST(systray)
     wc.cbWndExtra = 0;
     wc.hInstance = GetModuleHandleA(NULL);
     wc.hIcon = NULL;
-    wc.hCursor = LoadCursorA(NULL, IDC_IBEAM);
+    wc.hCursor = LoadCursorA(NULL, (LPSTR)IDC_IBEAM);
     wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW);
     wc.lpszMenuName = NULL;
     wc.lpszClassName = "MyTestWnd";
-    wc.lpfnWndProc = DefWindowProc;
+    wc.lpfnWndProc = DefWindowProcA;
     RegisterClassA(&wc);
 
     hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW,

include/ddeml.h

@@ -50,14 +50,45 @@ extern "C" {
 
 #define EXPENTRY CALLBACK
 
-#define SZDDESYS_TOPIC		TEXT("System")
-#define SZDDESYS_ITEM_TOPICS	TEXT("Topics")
-#define SZDDESYS_ITEM_SYSITEMS	TEXT("SysItems")
-#define SZDDESYS_ITEM_RTNMSG	TEXT("ReturnMessage")
-#define SZDDESYS_ITEM_STATUS	TEXT("Status")
-#define SZDDESYS_ITEM_FORMATS	TEXT("Formats")
-#define SZDDESYS_ITEM_HELP	TEXT("Help")
-#define SZDDE_ITEM_ITEMLIST	TEXT("TopicItemList")
+#ifdef UNICODE
+#if defined(_MSC_VER)
+#define SZDDESYS_TOPIC          L"System"
+#define SZDDESYS_ITEM_TOPICS    L"Topics"
+#define SZDDESYS_ITEM_SYSITEMS  L"SysItems"
+#define SZDDESYS_ITEM_RTNMSG    L"ReturnMessage"
+#define SZDDESYS_ITEM_STATUS    L"Status"
+#define SZDDESYS_ITEM_FORMATS   L"Formats"
+#define SZDDESYS_ITEM_HELP      L"Help"
+#define SZDDE_ITEM_ITEMLIST     L"TopicItemList"
+#elif defined(__GNUC__)
+#define SZDDESYS_TOPIC          (const WCHAR []){'S','y','s','t','e','m',0}
+#define SZDDESYS_ITEM_TOPICS    (const WCHAR []){'T','o','p','i','c','s',0}
+#define SZDDESYS_ITEM_SYSITEMS  (const WCHAR []){'S','y','s','I','t','e','m','s',0}
+#define SZDDESYS_ITEM_RTNMSG    (const WCHAR []){'R','e','t','u','r','n','M','e','s','s','a','g','e',0}
+#define SZDDESYS_ITEM_STATUS    (const WCHAR []){'S','t','a','t','u','s',0}
+#define SZDDESYS_ITEM_FORMATS   (const WCHAR []){'F','o','r','m','a','t','s',0}
+#define SZDDESYS_ITEM_HELP      (const WCHAR []){'H','e','l','p',0}
+#define SZDDE_ITEM_ITEMLIST     (const WCHAR []){'T','o','p','i','c','I','t','e','m','L','i','s','t',0}
+#else /* _MSC_VER/__GNUC__ */
+static const WCHAR SZDDESYS_TOPIC[] = {'S','y','s','t','e','m',0};
+static const WCHAR SZDDESYS_ITEM_TOPICS[] = {'T','o','p','i','c','s',0};
+static const WCHAR SZDDESYS_ITEM_SYSITEMS[] = {'S','y','s','I','t','e','m','s',0};
+static const WCHAR SZDDESYS_ITEM_RTNMSG[] = {'R','e','t','u','r','n','M','e','s','s','a','g','e',0};
+static const WCHAR SZDDESYS_ITEM_STATUS[] = {'S','t','a','t','u','s',0};
+static const WCHAR SZDDESYS_ITEM_FORMATS[] = {'F','o','r','m','a','t','s',0};
+static const WCHAR SZDDESYS_ITEM_HELP[] = {'H','e','l','p',0};
+static const WCHAR SZDDE_ITEM_ITEMLIST[] = {'T','o','p','i','c','I','t','e','m','L','i','s','t',0};
+#endif
+#else /* UNICODE */
+#define SZDDESYS_TOPIC          "System"
+#define SZDDESYS_ITEM_TOPICS    "Topics"
+#define SZDDESYS_ITEM_SYSITEMS  "SysItems"
+#define SZDDESYS_ITEM_RTNMSG    "ReturnMessage"
+#define SZDDESYS_ITEM_STATUS    "Status"
+#define SZDDESYS_ITEM_FORMATS   "Formats"
+#define SZDDESYS_ITEM_HELP      "Help"
+#define SZDDE_ITEM_ITEMLIST     "TopicItemList"
+#endif
 
 /***************************************************