Alex Henrie : shell32/tests: Drop progman DDE test workarounds for Windows <= 2000.
Alexandre Julliard
julliard at winehq.org
Tue Jan 9 15:49:38 CST 2018
Module: wine
Branch: master
Commit: 946b4ad2703569f14a255051449b2f6c09a40f17
URL: https://source.winehq.org/git/wine.git/?a=commit;h=946b4ad2703569f14a255051449b2f6c09a40f17
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Mon Jan 8 21:48:52 2018 -0700
shell32/tests: Drop progman DDE test workarounds for Windows <= 2000.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/shell32/tests/progman_dde.c | 46 +++-------------------------------------
1 file changed, 3 insertions(+), 43 deletions(-)
diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c
index 0bb4960..62ed413 100644
--- a/dlls/shell32/tests/progman_dde.c
+++ b/dlls/shell32/tests/progman_dde.c
@@ -35,8 +35,6 @@
#include "shlobj.h"
static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *);
-static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL);
-static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int);
static void init_function_pointers(void)
{
@@ -44,10 +42,6 @@ static void init_function_pointers(void)
hmod = GetModuleHandleA("shell32.dll");
pSHGetLocalizedName = (void*)GetProcAddress(hmod, "SHGetLocalizedName");
- pSHGetSpecialFolderPathA = (void*)GetProcAddress(hmod, "SHGetSpecialFolderPathA");
- pReadCabinetState = (void*)GetProcAddress(hmod, "ReadCabinetState");
- if (!pReadCabinetState)
- pReadCabinetState = (void*)GetProcAddress(hmod, (LPSTR)651);
}
static BOOL use_common(void)
@@ -88,21 +82,7 @@ static BOOL full_title(void)
CABINETSTATE cs;
memset(&cs, 0, sizeof(cs));
- if (pReadCabinetState)
- {
- pReadCabinetState(&cs, sizeof(cs));
- }
- else
- {
- HKEY key;
- DWORD size;
-
- win_skip("ReadCabinetState is not available, reading registry directly\n");
- RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\CabinetState", &key);
- size = sizeof(cs);
- RegQueryValueExA(key, "Settings", NULL, NULL, (LPBYTE)&cs, &size);
- RegCloseKey(key);
- }
+ ReadCabinetState(&cs, sizeof(cs));
return (cs.fFullPathTitle == -1);
}
@@ -114,28 +94,8 @@ static void init_strings(void)
char commonprograms[MAX_PATH];
char programs[MAX_PATH];
- if (pSHGetSpecialFolderPathA)
- {
- pSHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE);
- pSHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE);
- }
- else
- {
- HKEY key;
- DWORD size;
-
- /* Older Win9x and NT4 */
-
- RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key);
- size = sizeof(programs);
- RegQueryValueExA(key, "Programs", NULL, NULL, (LPBYTE)&programs, &size);
- RegCloseKey(key);
-
- RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", &key);
- size = sizeof(commonprograms);
- RegQueryValueExA(key, "Common Programs", NULL, NULL, (LPBYTE)&commonprograms, &size);
- RegCloseKey(key);
- }
+ SHGetSpecialFolderPathA(NULL, programs, CSIDL_PROGRAMS, FALSE);
+ SHGetSpecialFolderPathA(NULL, commonprograms, CSIDL_COMMON_PROGRAMS, FALSE);
/* ProgramsDir on Vista+ is always the users one (CSIDL_PROGRAMS). Before Vista
* it depends on whether the user is an administrator (CSIDL_COMMON_PROGRAMS) or
More information about the wine-cvs
mailing list