summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog19
-rw-r--r--winsup/w32api/lib/kernel32.def48
-rw-r--r--winsup/w32api/lib/ntdll.def1
-rw-r--r--winsup/w32api/lib/th32.def14
-rw-r--r--winsup/w32api/lib/version.def2
5 files changed, 19 insertions, 65 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 8ad475f71..19b3c7b13 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,5 +1,24 @@
2010-08-21 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+ * lib/kernel32.def (CopyLZFile, GetExpandedNameA, GetExpandedNameW, LZClose,
+ LZCopy, LZInit, LZOpenFileA, LZOpenFileW, LZRead, LZSeek, OpenProcessToken,
+ OpenThreadToken, RegCloseKey, RegCreateKeyExA, RegCreateKeyExW,
+ RegDeleteKeyExA, RegDeleteKeyExW, RegDeleteValueA, RegDeleteValueW,
+ RegEnumKeyExA, RegEnumKeyExW, RegEnumValueA, RegEnumValueW, RegFlushKey,
+ RegGetKeySecurity, RegLoadKeyA, RegLoadKeyW, RegNotifyChangeKeyValue,
+ RegOpenCurrentUser, RegOpenKeyExA, RegOpenKeyExW, RegOpenUserClassesRoot,
+ RegQueryInfoKeyA, RegQueryInfoKeyW, RegQueryValueExA, RegQueryValueExW,
+ RegRestoreKeyA, RegRestoreKeyW, RegSetKeySecurity, RegSetValueExA,
+ RegSetValueW, RegUnLoadKeyA, RegUnLoadKeyW, RtlCaptureStackBackTrace,
+ RtlFillMemory, RtlMoveMemory, RtlZeroMemory, SetThreadToken): Remove
+ conflicting definition.
+ * lib/th32.def: Remove.
+ * lib/ntdll.def (RtlUnwind): Remove conflicting definition.
+ * lib/version.def (VerLanguageNameA, VerLanguageNameW): Remove conflicting
+ definition.
+
+2010-08-21 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
+
* lib/kernel32.def (CreateProcessAsUserW): Remove definition.
2010-08-20 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
diff --git a/winsup/w32api/lib/kernel32.def b/winsup/w32api/lib/kernel32.def
index 3d3fb1984..5b4c79aa3 100644
--- a/winsup/w32api/lib/kernel32.def
+++ b/winsup/w32api/lib/kernel32.def
@@ -124,7 +124,6 @@ CopyFileExW@24
CopyFileTransactedA@28
CopyFileTransactedW@28
CopyFileW@12
-CopyLZFile@8
CreateActCtxA@4
CreateActCtxW@4
CreateBoundaryDescriptorA@8
@@ -486,8 +485,6 @@ GetEraNameCountedString@16
GetErrorMode@0
GetExitCodeProcess@8
GetExitCodeThread@8
-GetExpandedNameA@8
-GetExpandedNameW@8
GetExtendedContextLength@8
GetExtendedFeaturesMask@4
GetFileAttributesA@4
@@ -818,16 +815,9 @@ LCIDToLocaleName@16
LCMapStringA@24
LCMapStringEx@36
LCMapStringW@24
-LZClose@4
LZCloseFile@4
-LZCopy@8
LZCreateFileW@20
LZDone@0
-LZInit@4
-LZOpenFileA@12
-LZOpenFileW@12
-LZRead@12
-LZSeek@12
LZStart@0
LeaveCriticalSection@4
LeaveCriticalSectionWhenCallbackReturns@8
@@ -901,12 +891,10 @@ OpenMutexW@12
OpenPrivateNamespaceA@8
OpenPrivateNamespaceW@8
OpenProcess@12
-OpenProcessToken@12
OpenProfileUserMapping@0
OpenSemaphoreA@12
OpenSemaphoreW@12
OpenThread@12
-OpenThreadToken@16
OpenWaitableTimerA@12
OpenWaitableTimerW@12
OutputDebugStringA@4
@@ -969,48 +957,17 @@ ReadFileEx@20
ReadFileScatter@20
ReadProcessMemory@20
ReadThreadProfilingData@12
-RegCloseKey@4
-RegCreateKeyExA@36
-RegCreateKeyExW@36
-RegDeleteKeyExA@16
-RegDeleteKeyExW@16
RegDeleteTreeA@8
RegDeleteTreeW@8
-RegDeleteValueA@8
-RegDeleteValueW@8
RegDisablePredefinedCacheEx@0
-RegEnumKeyExA@32
-RegEnumKeyExW@32
-RegEnumValueA@32
-RegEnumValueW@32
-RegFlushKey@4
-RegGetKeySecurity@16
RegGetValueA@28
RegGetValueW@28
RegKrnGetGlobalState@0
RegKrnInitialize@12
-RegLoadKeyA@12
-RegLoadKeyW@12
RegLoadMUIStringA@28
RegLoadMUIStringW@28
-RegNotifyChangeKeyValue@20
-RegOpenCurrentUser@8
-RegOpenKeyExA@20
-RegOpenKeyExW@20
-RegOpenUserClassesRoot@16
-RegQueryInfoKeyA@48
-RegQueryInfoKeyW@48
-RegQueryValueExA@24
-RegQueryValueExW@24
-RegRestoreKeyA@12
-RegRestoreKeyW@12
RegSaveKeyExA@16
RegSaveKeyExW@16
-RegSetKeySecurity@12
-RegSetValueExA@24
-RegSetValueExW@24
-RegUnLoadKeyA@8
-RegUnLoadKeyW@8
RegisterApplicationRecoveryCallback@16
RegisterApplicationRestart@8
RegisterConsoleIME@8
@@ -1049,11 +1006,7 @@ ResolveLocaleName@12
RestoreLastError@4
ResumeThread@4
RtlCaptureContext@4
-RtlCaptureStackBackTrace@16
-RtlFillMemory@12
-RtlMoveMemory@12
RtlUnwind@16
-RtlZeroMemory@8
ScrollConsoleScreenBufferA@20
ScrollConsoleScreenBufferW@20
SearchPathA@24
@@ -1184,7 +1137,6 @@ SetThreadPreferredUILanguages@12
SetThreadPriority@8
SetThreadPriorityBoost@8
SetThreadStackGuarantee@4
-SetThreadToken@8
SetThreadUILanguage@4
SetThreadpoolStackInformation@8
SetThreadpoolThreadMaximum@8
diff --git a/winsup/w32api/lib/ntdll.def b/winsup/w32api/lib/ntdll.def
index 29b94c3fd..cd0910e5a 100644
--- a/winsup/w32api/lib/ntdll.def
+++ b/winsup/w32api/lib/ntdll.def
@@ -642,7 +642,6 @@ RtlUnicodeToMultiByteSize@12
RtlUnicodeToOemN@20
RtlUniform@4
RtlUnlockHeap@4
-RtlUnwind@16
RtlUpcaseUnicodeChar@4
RtlUpcaseUnicodeString@12
RtlUpcaseUnicodeStringToAnsiString@12
diff --git a/winsup/w32api/lib/th32.def b/winsup/w32api/lib/th32.def
deleted file mode 100644
index 4137bf61f..000000000
--- a/winsup/w32api/lib/th32.def
+++ /dev/null
@@ -1,14 +0,0 @@
-LIBRARY Kernel32.dll
-EXPORTS
-CreateToolhelp32Snapshot@8
-Heap32First@12
-Heap32ListFirst@8
-Heap32ListNext@8
-Heap32Next@4
-Module32First@8
-Module32Next@8
-Process32First@8
-Process32Next@8
-Thread32First@8
-Thread32Next@8
-Toolhelp32ReadProcessMemory@20
diff --git a/winsup/w32api/lib/version.def b/winsup/w32api/lib/version.def
index 35a087e5d..01f132499 100644
--- a/winsup/w32api/lib/version.def
+++ b/winsup/w32api/lib/version.def
@@ -8,8 +8,6 @@ VerFindFileA@32
VerFindFileW@32
VerInstallFileA@32
VerInstallFileW@32
-VerLanguageNameA@12
-VerLanguageNameW@12
VerQueryValueA@16
VerQueryValueIndexA@24
VerQueryValueIndexW@24