Skip to content

Commit 3dbc850

Browse files
authored
Delete some unused files and functions from clr pal (#77112)
* Delete unused coreclr\tools\util * Delete palrt/path.cpp * Cleanup strsafe.h * Delete nls.h * Delete shlwapi.h * Cleanup shlwapi leftovers * Delete winnls.h * Delete wincrypt.h * Delete weakreference.h * Delete tchar.h * Add back wincrypt used in assembly.cpp * Delete psapi.h * Remove use of shlwapip.h * Revert "Delete weakreference.h" This reverts commit 4990d03. * Revert changes in wincrypt.h
1 parent 5c61ad4 commit 3dbc850

File tree

26 files changed

+24
-5090
lines changed

26 files changed

+24
-5090
lines changed

src/coreclr/classlibnative/inc/nls.h

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/coreclr/dlls/mscoree/mscoree.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ BOOL STDMETHODCALLTYPE EEDllMain( // TRUE on success, FALSE on error.
2828
// Handle lifetime of loaded library.
2929
//*****************************************************************************
3030

31-
#include <shlwapi.h>
32-
3331
#ifdef TARGET_WINDOWS
3432
extern "C" BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved);
3533
#endif // TARGET_WINDOWS

src/coreclr/dlls/mscorpe/ceefilegenwriter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include "corerror.h"
1515
#include <posterror.h>
16-
#include <shlwapi.h>
1716

1817
// The following block contains a template for the default entry point stubs of a COM+
1918
// IL only program. One can emit these stubs (with some fix-ups) and make

src/coreclr/inc/crtwrap.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <stdint.h>
1414
#include <windows.h>
1515
#include <objbase.h>
16-
#include <tchar.h>
1716
#include "debugmacros.h"
1817
#include <stdlib.h>
1918
#include <malloc.h>

src/coreclr/inc/utilcode.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "clrhost.h"
2626
#include "debugmacros.h"
2727
#include "corhlprpriv.h"
28-
#include "winnls.h"
2928
#include "check.h"
3029
#include "safemath.h"
3130
#include "new.hpp"

src/coreclr/inc/winwrap.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@
131131

132132
// winbase.h
133133
#define WszFormatMessage FormatMessageW
134-
#define Wszlstrcmp lstrcmpW
135-
#define Wszlstrcmpi lstrcmpiW
136134
#define WszCreateMutex CreateMutexW
137135
#define WszOpenMutex OpenMutexW
138136
#define WszCreateEvent CreateEventW

src/coreclr/pal/inc/rt/palrt.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -634,25 +634,6 @@ typedef unsigned int ALG_ID;
634634
#define CSTR_EQUAL 2
635635
#define CSTR_GREATER_THAN 3
636636

637-
/******************* shlwapi ************************************/
638-
639-
// note: diff in NULL handing and calling convetion
640-
#define StrChrW (WCHAR*)PAL_wcschr
641-
642-
STDAPI_(LPWSTR) StrRChrW(LPCWSTR lpStart, LPCWSTR lpEnd, WCHAR wMatch);
643-
644-
#define lstrcmpW PAL_wcscmp
645-
#define lstrcmpiW _wcsicmp
646-
647-
#ifdef UNICODE
648-
#define StrChr StrChrW
649-
650-
#define StrRChr StrRChrW
651-
652-
#define lstrcmp lstrcmpW
653-
#define lstrcmpi lstrcmpiW
654-
#endif
655-
656637

657638
#ifdef __cplusplus
658639
/*
@@ -729,15 +710,6 @@ inline errno_t __cdecl _fopen_unsafe(PAL_FILE * *ff, const char *fileName, const
729710
}
730711
#endif /* __cplusplus */
731712

732-
STDAPI_(BOOL) PathIsUNCW(LPCWSTR pszPath);
733-
STDAPI_(BOOL) PathCanonicalizeW(LPWSTR lpszDst, LPCWSTR lpszSrc);
734-
735-
#ifdef UNICODE
736-
#define PathIsUNC PathIsUNCW
737-
#define PathCanonicalize PathCanonicalizeW
738-
739-
#endif // UNICODE
740-
741713
/******************* misc ***************************************/
742714

743715
#ifdef __cplusplus

src/coreclr/pal/inc/rt/psapi.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/coreclr/pal/inc/rt/shlwapi.h

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/coreclr/pal/inc/rt/tchar.h

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)