Kaydet (Commit) ddc28b8a authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

clean-up ghost traces of unicow

üst 677da6ca
...@@ -72,8 +72,7 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES)) ...@@ -72,8 +72,7 @@ gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
# cross-compile that module then using MinGW. That needs to be fixed # cross-compile that module then using MinGW. That needs to be fixed
# then, and we need to use these libraries through run-time lookup of # then, and we need to use these libraries through run-time lookup of
# APIs. Or something. # APIs. Or something.
gb_Library_SDKLIBFILENAMES:=\ gb_Library_SDKLIBFILENAMES:=
unicows \
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib) gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_SDKLIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib).lib)
......
...@@ -8,7 +8,6 @@ policy.1.0.cli_oootypes.dll ...@@ -8,7 +8,6 @@ policy.1.0.cli_oootypes.dll
policy.1.0.cli_ure.dll policy.1.0.cli_ure.dll
policy.1.0.cli_cppuhelper.dll policy.1.0.cli_cppuhelper.dll
policy.1.0.cli_basetypes.dll policy.1.0.cli_basetypes.dll
unicows.dll
gdiplus.dll gdiplus.dll
mingwm10.dll mingwm10.dll
msvcm80d.dll msvcm80d.dll
......
...@@ -8,6 +8,5 @@ policy.1.0.cli_oootypes.dll ...@@ -8,6 +8,5 @@ policy.1.0.cli_oootypes.dll
policy.1.0.cli_ure.dll policy.1.0.cli_ure.dll
policy.1.0.cli_cppuhelper.dll policy.1.0.cli_cppuhelper.dll
policy.1.0.cli_basetypes.dll policy.1.0.cli_basetypes.dll
unicows.dll
gdiplus.dll gdiplus.dll
mingwm10.dll mingwm10.dll
...@@ -447,7 +447,6 @@ gb_Library_PLAINLIBS_NONE += \ ...@@ -447,7 +447,6 @@ gb_Library_PLAINLIBS_NONE += \
oleaut32 \ oleaut32 \
shell32 \ shell32 \
shlwapi \ shlwapi \
unicows \
user32 \ user32 \
uuid \ uuid \
uwinapi \ uwinapi \
......
...@@ -457,7 +457,6 @@ gb_Library_PLAINLIBS_NONE += \ ...@@ -457,7 +457,6 @@ gb_Library_PLAINLIBS_NONE += \
oleaut32 \ oleaut32 \
shell32 \ shell32 \
shlwapi \ shlwapi \
unicows \
user32 \ user32 \
uuid \ uuid \
uwinapi \ uwinapi \
......
...@@ -160,7 +160,6 @@ Program Files\URE\bin\textinstream.uno.dll [private] ...@@ -160,7 +160,6 @@ Program Files\URE\bin\textinstream.uno.dll [private]
Program Files\URE\bin\textoutstream.uno.dll [private] Program Files\URE\bin\textoutstream.uno.dll [private]
Program Files\URE\bin\stocservices.uno.dll [private] Program Files\URE\bin\stocservices.uno.dll [private]
Program Files\URE\bin\uuresolver.uno.dll [private] Program Files\URE\bin\uuresolver.uno.dll [private]
Program Files\URE\bin\unicows.dll [private]
Program Files\URE\bin\uwinapi.dll [private] Program Files\URE\bin\uwinapi.dll [private]
Program Files\URE\java\java_uno.jar [private] Program Files\URE\java\java_uno.jar [private]
Program Files\URE\misc\javavendors.xml [private] Program Files\URE\misc\javavendors.xml [private]
......
...@@ -29,12 +29,6 @@ ...@@ -29,12 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx" #include "precompiled_vcl.hxx"
// rely on unicows on for multimon functions for older versions
#if WINVER < 0x0500
#undef WINVER
#define WINVER 0x0500
#endif
#include "svsys.h" #include "svsys.h"
#include "rtl/ustrbuf.hxx" #include "rtl/ustrbuf.hxx"
......
...@@ -2401,8 +2401,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, ...@@ -2401,8 +2401,6 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
if ( lParam ) if ( lParam )
{ {
nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen ); nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen );
// #i12401# the current unicows.dll has a bug in CharUpperBuffW, which corrupts the stack
// fall back to the ANSI version instead
DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" ); DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" );
if( nKeyLen > nMaxKeyLen ) if( nKeyLen > nMaxKeyLen )
nKeyLen = 0; nKeyLen = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment