View | Details | Raw Unified | Return to issue 88652
Collapse All | Expand All

(-)a/main/RepositoryFixes.mk (-2 lines)
Lines 94-100 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib Link Here
94
94
95
gb_Library_ILIBFILENAMES:=\
95
gb_Library_ILIBFILENAMES:=\
96
	gdiplus \
96
	gdiplus \
97
	unicows \
98
	uuid \
97
	uuid \
99
98
100
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
99
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
Lines 151-157 gb_Library_NOILIBFILENAMES:=\ Link Here
151
	oleaut32 \
150
	oleaut32 \
152
	shell32 \
151
	shell32 \
153
	sot \
152
	sot \
154
	unicows \
155
	user32 \
153
	user32 \
156
	uuid \
154
	uuid \
157
	uwinapi \
155
	uwinapi \
(-)a/main/configure.in (-16 lines)
Lines 5653-5674 fi Link Here
5653
AC_SUBST(ZIP_HOME)
5653
AC_SUBST(ZIP_HOME)
5654
5654
5655
dnl ===================================================================
5655
dnl ===================================================================
5656
dnl Windows builds need unicows.dll in external/unicows/
5657
dnl ===================================================================
5658
if test "$_os" = "WINNT"; then
5659
   AC_MSG_CHECKING([for unicows.dll])
5660
   if test -x ./external/unicows/unicows.dll ; then
5661
      AC_MSG_RESULT([found and executable])
5662
   else
5663
      AC_MSG_ERROR([The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
5664
Get it from the Microsoft site and put it into external/unicows.
5665
(Note: Microsoft seems to enjoy changing the exact location of this file. You
5666
may have to search Microsoft's website.) Last time it was seen at:
5667
<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>.])
5668
   fi
5669
fi
5670
5671
dnl ===================================================================
5672
dnl Windows builds need dbghelp.dll in external/dbghelp/
5656
dnl Windows builds need dbghelp.dll in external/dbghelp/
5673
dnl ===================================================================
5657
dnl ===================================================================
5674
if test "$_os" = "WINNT"; then
5658
if test "$_os" = "WINNT"; then
(-)a/main/cpputools/source/unoexe/makefile.mk (-3 lines)
Lines 83-91 APP1STDLIBS= \ Link Here
83
	$(CPPULIB)		\
83
	$(CPPULIB)		\
84
	$(CPPUHELPERLIB)\
84
	$(CPPUHELPERLIB)\
85
    $(LIBXML2LIB)
85
    $(LIBXML2LIB)
86
.IF "$(OS)" == "WNT"
87
APP1STDLIBS += $(UNICOWSLIB)
88
.ENDIF
89
86
90
.INCLUDE :  target.mk
87
.INCLUDE :  target.mk
91
88
(-)a/main/external/prj/d.lst (-2 lines)
Lines 46-53 mkdir: %_DEST%\inc%_EXT%\external\mingw\include\sys Link Here
46
..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
46
..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC90.DebugCRT.manifest
47
..\msm90\*.msm %_DEST%\bin%_EXT%
47
..\msm90\*.msm %_DEST%\bin%_EXT%
48
48
49
..\unicows\unicows.dll %_DEST%\bin%_EXT%\unicows.dll
50
51
..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
49
..\unowinreg\unowinreg.dll %_DEST%\bin%_EXT%\unowinreg.dll
52
50
53
..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
51
..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
(-)a/main/external/unicows/README_unicows.dll (-1 lines)
Line 1 Link Here
1
Put the unicows.dll in this directory for Windows builds.
(-)a/main/postprocess/rebase/no_rebase.txt (-1 lines)
Lines 8-14 policy.1.0.cli_oootypes.dll Link Here
8
policy.1.0.cli_ure.dll
8
policy.1.0.cli_ure.dll
9
policy.1.0.cli_cppuhelper.dll
9
policy.1.0.cli_cppuhelper.dll
10
policy.1.0.cli_basetypes.dll
10
policy.1.0.cli_basetypes.dll
11
unicows.dll
12
gdiplus.dll
11
gdiplus.dll
13
mingwm10.dll
12
mingwm10.dll
14
msvcm80d.dll
13
msvcm80d.dll
(-)a/main/postprocess/signing/no_signing.txt (-1 lines)
Lines 8-13 policy.1.0.cli_oootypes.dll Link Here
8
policy.1.0.cli_ure.dll
8
policy.1.0.cli_ure.dll
9
policy.1.0.cli_cppuhelper.dll
9
policy.1.0.cli_cppuhelper.dll
10
policy.1.0.cli_basetypes.dll
10
policy.1.0.cli_basetypes.dll
11
unicows.dll
12
gdiplus.dll
11
gdiplus.dll
13
mingwm10.dll
12
mingwm10.dll
(-)a/main/sal/osl/w32/process.cxx (-7 lines)
Lines 392-404 void SAL_CALL osl_setCommandArgs (int argc, char ** argv) Link Here
392
/***************************************************************************
392
/***************************************************************************
393
 * Environment
393
 * Environment
394
 ***************************************************************************/
394
 ***************************************************************************/
395
/*
396
   #109941# because of a bug in the M$ unicows library we have to
397
   allocate a buffer large enough to hold the requested environment
398
   variable instead of testing for the required size. This wastes
399
   some stack space, maybe we should revoke this work around if 
400
   unicows library is fixed.
401
*/
402
#define ENV_BUFFER_SIZE (32*1024-1)
395
#define ENV_BUFFER_SIZE (32*1024-1)
403
396
404
oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *ustrVar, rtl_uString **ustrValue)
397
oslProcessError SAL_CALL osl_getEnvironment(rtl_uString *ustrVar, rtl_uString **ustrValue)
(-)a/main/sal/systools/win32/onlineupdate/makefile.mk (-1 lines)
Lines 70-76 SHL1OBJS=$(SLOFILES) Link Here
70
#STDSHL=
70
#STDSHL=
71
71
72
SHL1STDLIBS=\
72
SHL1STDLIBS=\
73
		$(UNICOWSLIB)\
74
		$(KERNEL32LIB)\
73
		$(KERNEL32LIB)\
75
		$(LIBCMT)\
74
		$(LIBCMT)\
76
		$(WININETLIB)
75
		$(WININETLIB)
(-)a/main/sal/systools/win32/uwinapi/DllGetVersion.cpp (-73 lines)
Lines 1-73 Link Here
1
/*************************************************************************
2
 *
3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4
 * 
5
 * Copyright 2000, 2010 Oracle and/or its affiliates.
6
 *
7
 * OpenOffice.org - a multi-platform office productivity suite
8
 *
9
 * This file is part of OpenOffice.org.
10
 *
11
 * OpenOffice.org is free software: you can redistribute it and/or modify
12
 * it under the terms of the GNU Lesser General Public License version 3
13
 * only, as published by the Free Software Foundation.
14
 *
15
 * OpenOffice.org is distributed in the hope that it will be useful,
16
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 * GNU Lesser General Public License version 3 for more details
19
 * (a copy is included in the LICENSE file that accompanied this code).
20
 *
21
 * You should have received a copy of the GNU Lesser General Public License
22
 * version 3 along with OpenOffice.org.  If not, see
23
 * <http://www.openoffice.org/license.html>
24
 * for a copy of the LGPLv3 License.
25
 *
26
 ************************************************************************/
27
28
#define WIN32_LEAN_AND_MEAN
29
#ifdef _MSC_VER
30
#pragma warning(push,1)
31
#endif
32
#include <windows.h>
33
#include <shlwapi.h>
34
#ifdef _MSC_VER
35
#pragma warning(pop)
36
#endif
37
#include <malloc.h>
38
39
extern HMODULE		UWINAPI_BaseAddress;
40
41
// This function should be exported by every DLL that wants to provide it's version number.
42
// This code automaticly generates the information from the version resource
43
44
extern "C" HRESULT CALLBACK DllGetVersion( DLLVERSIONINFO *pdvi )
45
{
46
	TCHAR	szModulePath[MAX_PATH];
47
	BOOL	fSuccess = FALSE;
48
49
	if ( UWINAPI_BaseAddress && GetModuleFileName( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
50
	{
51
		DWORD	dwHandle = 0;
52
		DWORD	dwSize = GetFileVersionInfoSize( szModulePath, &dwHandle );
53
		LPVOID	lpData = _alloca( dwSize );
54
55
		if ( GetFileVersionInfo( szModulePath, dwHandle, dwSize, lpData ) )
56
		{
57
			VS_FIXEDFILEINFO	*lpBuffer = NULL;
58
			UINT	uLen = 0;
59
60
			if ( VerQueryValue( lpData, TEXT("\\"), (LPVOID *)&lpBuffer, &uLen ) )
61
			{
62
				pdvi->dwMajorVersion = HIWORD( lpBuffer->dwFileVersionMS );
63
				pdvi->dwMinorVersion = LOWORD( lpBuffer->dwFileVersionMS );
64
				pdvi->dwBuildNumber = HIWORD( lpBuffer->dwFileVersionLS );
65
				pdvi->dwPlatformID = (DWORD) ((lpBuffer->dwFileOS & VOS_NT) ? DLLVER_PLATFORM_NT : DLLVER_PLATFORM_WINDOWS);
66
67
				fSuccess = TRUE;
68
			}
69
		}
70
	}
71
72
	return fSuccess ? HRESULT_FROM_WIN32( GetLastError() ) : HRESULT_FROM_WIN32( NO_ERROR );
73
}
(-)a/main/sal/systools/win32/uwinapi/DllMain.cpp (-235 lines)
Lines 1-235 Link Here
1
/*************************************************************************
2
 *
3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4
 * 
5
 * Copyright 2000, 2010 Oracle and/or its affiliates.
6
 *
7
 * OpenOffice.org - a multi-platform office productivity suite
8
 *
9
 * This file is part of OpenOffice.org.
10
 *
11
 * OpenOffice.org is free software: you can redistribute it and/or modify
12
 * it under the terms of the GNU Lesser General Public License version 3
13
 * only, as published by the Free Software Foundation.
14
 *
15
 * OpenOffice.org is distributed in the hope that it will be useful,
16
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
 * GNU Lesser General Public License version 3 for more details
19
 * (a copy is included in the LICENSE file that accompanied this code).
20
 *
21
 * You should have received a copy of the GNU Lesser General Public License
22
 * version 3 along with OpenOffice.org.  If not, see
23
 * <http://www.openoffice.org/license.html>
24
 * for a copy of the LGPLv3 License.
25
 *
26
 ************************************************************************/
27
28
#define WIN32_LEAN_AND_MEAN
29
#ifdef _MSC_VER
30
#pragma warning(push,1) // disable warnings within system headers
31
#endif
32
#include <windows.h>
33
#ifdef _MSC_VER
34
#pragma warning(pop)
35
#endif
36
#include <malloc.h>
37
#define _MBCS
38
#include <tchar.h>
39
40
41
HMODULE		UWINAPI_BaseAddress = NULL;
42
const CHAR	szUnicowsModuleName[] = "UNICOWS.DLL";
43
44
static HMODULE WINAPI _LoadUnicowsLibrary(VOID)
45
{
46
	CHAR		szModulePath[MAX_PATH];
47
	HMODULE		hModuleUnicows = NULL;
48
49
	// First search in the same directory as UWINAPI.DLL was loaded from. This is because
50
	// UWINAPI.DLL not always resides in the same directory as the actual application.
51
52
	if ( UWINAPI_BaseAddress && GetModuleFileNameA( UWINAPI_BaseAddress, szModulePath, MAX_PATH ) )
53
	{
54
		char	*lpLastBkSlash = _tcsrchr( szModulePath, '\\' );
55
56
		if ( lpLastBkSlash )
57
		{
58
			size_t	nParentDirSize = (size_t) (_tcsinc( lpLastBkSlash ) - szModulePath);
59
			LPSTR	lpUnicowsModulePath = (LPTSTR)_alloca( nParentDirSize + sizeof(szUnicowsModuleName) );
60
61
			if ( lpUnicowsModulePath )
62
			{
63
				_tcsncpy( lpUnicowsModulePath, szModulePath, nParentDirSize );
64
				_tcscpy( lpUnicowsModulePath + nParentDirSize, szUnicowsModuleName );
65
66
				hModuleUnicows = LoadLibraryA( lpUnicowsModulePath );
67
			}
68
		}
69
	}
70
71
	// Search at the common places
72
73
	if ( !hModuleUnicows )
74
		hModuleUnicows = LoadLibraryA(szUnicowsModuleName);
75
76
	return hModuleUnicows;
77
}
78
79
static HMODULE WINAPI LoadUnicowsLibrary(VOID)
80
{
81
	HMODULE	hModuleUnicows;
82
	int		idMsg = IDOK;
83
84
	do
85
	{
86
		hModuleUnicows = _LoadUnicowsLibrary();
87
88
		if ( !hModuleUnicows )
89
		{
90
			LPVOID lpMsgBuf;
91
92
			FormatMessageA(
93
				FORMAT_MESSAGE_ALLOCATE_BUFFER |
94
				FORMAT_MESSAGE_FROM_SYSTEM |
95
				FORMAT_MESSAGE_IGNORE_INSERTS,
96
				NULL,
97
				ERROR_DLL_NOT_FOUND /* GetLastError() */,
98
				MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
99
				(LPSTR)&lpMsgBuf,
100
				0,
101
				NULL
102
			);
103
			// Process any inserts in lpMsgBuf.
104
			CHAR szModuleFileName[MAX_PATH];
105
106
			GetModuleFileNameA( NULL, szModuleFileName, sizeof(szModuleFileName) );
107
			LPSTR	lpMessage = (LPSTR)_alloca( strlen( (LPCSTR)lpMsgBuf ) + sizeof(szUnicowsModuleName) + 1 );
108
			strcpy( lpMessage, (LPCSTR)lpMsgBuf );
109
			strcat( lpMessage, "\n" );
110
			strcat( lpMessage, szUnicowsModuleName );
111
			// Free the buffer.
112
			LocalFree( lpMsgBuf );
113
			// Display the string.
114
			idMsg = MessageBoxA( NULL, lpMessage,
115
				szModuleFileName, MB_ABORTRETRYIGNORE | MB_ICONERROR | MB_TASKMODAL );
116
117
			if ( IDABORT == idMsg )
118
				TerminateProcess( GetCurrentProcess(), 255 );
119
		}
120
	} while ( !hModuleUnicows && IDRETRY == idMsg );
121
122
	return hModuleUnicows;
123
}
124
125
extern "C" {
126
FARPROC _PfnLoadUnicows = (FARPROC)LoadUnicowsLibrary;
127
}
128
129
#ifdef __MINGW32__
130
131
extern "C" {
132
133
typedef void (*func_ptr) (void);
134
extern func_ptr __CTOR_LIST__[];
135
extern func_ptr __DTOR_LIST__[];
136
137
static void do_startup(void);
138
static void do_cleanup(void);
139
140
HMODULE hModuleUnicowsDLL;
141
142
void
143
__do_global_dtors (void)
144
{
145
  static func_ptr *p = __DTOR_LIST__ + 1;
146
147
  /*
148
   * Call each destructor in the destructor list until a null pointer
149
   * is encountered.
150
   */
151
  while (*p)
152
    {
153
      (*(p)) ();
154
      p++;
155
    }
156
}
157
158
void
159
__do_global_ctors (void)
160
{
161
  unsigned long nptrs = (unsigned long) __CTOR_LIST__[0];
162
  unsigned i;
163
164
  /*
165
   * If the first entry in the constructor list is -1 then the list
166
   * is terminated with a null entry. Otherwise the first entry was
167
   * the number of pointers in the list.
168
   */
169
  if (nptrs == static_cast<unsigned long>(-1))
170
    {
171
      for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
172
	;
173
    }
174
175
  /* 
176
   * Go through the list backwards calling constructors.
177
   */
178
  for (i = nptrs; i >= 1; i--)
179
    {
180
      __CTOR_LIST__[i] ();
181
    }
182
183
  /*
184
   * Register the destructors for processing on exit.
185
   */
186
  atexit (__do_global_dtors);
187
}
188
189
static int initialized = 0;
190
191
void
192
__main (void)
193
{
194
  if (!initialized)
195
    {
196
      initialized = 1;
197
      do_startup();
198
      __do_global_ctors ();
199
    }
200
}
201
202
static void do_startup( void )
203
{
204
	if (((LONG)GetVersion()&0x800000ff) == 0x80000004)
205
        {
206
		hModuleUnicowsDLL = LoadUnicowsLibrary();
207
		if (hModuleUnicowsDLL)
208
			atexit(do_cleanup);
209
	}
210
}
211
212
void do_cleanup( void )
213
{
214
	FreeLibrary(hModuleUnicowsDLL);
215
}
216
}
217
218
#endif
219
220
extern "C" BOOL WINAPI DllMain( HMODULE hModule, DWORD dwReason, LPVOID )
221
{
222
	switch ( dwReason )
223
	{
224
	case DLL_PROCESS_ATTACH:
225
		UWINAPI_BaseAddress = hModule;
226
#ifdef __MINGW32__
227
		return TRUE;
228
#else
229
		return DisableThreadLibraryCalls( hModule );
230
#endif
231
	default:
232
		return TRUE;
233
	}
234
235
}
(-)a/main/sal/systools/win32/uwinapi/Uwinapi.def (-1 lines)
Lines 14-20 EXPORTS Link Here
14
	MoveFileExW
14
	MoveFileExW
15
	MoveFileW
15
	MoveFileW
16
	GetVersion
16
	GetVersion
17
	DllGetVersion
18
	lstrrchrA
17
	lstrrchrA
19
	lstrrchrW
18
	lstrrchrW
20
	lstrchrA
19
	lstrchrA
(-)a/main/sal/systools/win32/uwinapi/makefile.mk (-2 lines)
Lines 75-82 SLOFILES=\ Link Here
75
		$(SLO)$/MoveFileExA.obj\
75
		$(SLO)$/MoveFileExA.obj\
76
		$(SLO)$/MoveFileExW.obj\
76
		$(SLO)$/MoveFileExW.obj\
77
		$(SLO)$/toolhelp.obj\
77
		$(SLO)$/toolhelp.obj\
78
		$(SLO)$/DllGetVersion.obj\
79
		$(SLO)$/DllMain.obj\
80
		$(SLO)$/ResolveThunk.obj\
78
		$(SLO)$/ResolveThunk.obj\
81
		$(SLO)$/ResolveUnicows.obj\
79
		$(SLO)$/ResolveUnicows.obj\
82
		$(SLO)$/snprintf.obj\
80
		$(SLO)$/snprintf.obj\
(-)a/main/sal/systools/win32/uwinapi/uwinapi.dxp (-1 / +1 lines)
Lines 25-31 Link Here
25
;
25
;
26
;*************************************************************************
26
;*************************************************************************
27
27
28
DllGetVersion
28
;DllGetVersion
29
;CheckTokenMembership
29
;CheckTokenMembership
30
CommandLineToArgvW
30
CommandLineToArgvW
31
CopyFileExA
31
CopyFileExA
(-)a/main/sal/systools/win32/uwinapi/uwinapi_mingw.dxp (-1 / +1 lines)
Lines 25-31 Link Here
25
;
25
;
26
;*************************************************************************
26
;*************************************************************************
27
27
28
DllGetVersion@4
28
;DllGetVersion@4
29
CommandLineToArgvW@8
29
CommandLineToArgvW@8
30
CopyFileExA@24
30
CopyFileExA@24
31
CopyFileExW@24
31
CopyFileExW@24
(-)a/main/scp2/source/ooo/ure.scp (-11 lines)
Lines 946-961 End Link Here
946
#endif
946
#endif
947
947
948
#if defined WNT
948
#if defined WNT
949
File gid_File_Dl_Unicows
950
    TXT_FILE_BODY;
951
    Dir = SCP2_URE_DL_DIR;
952
    Name = SCP2_URE_DL_NORMAL("unicows");
953
    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
954
    // CompID = "F05005FA-5B2C-43B1-83EF-988EFFF1D7BD";
955
End
956
#endif
957
958
#if defined WNT
959
File gid_File_Dl_Uwinapi
949
File gid_File_Dl_Uwinapi
960
    TXT_FILE_BODY;
950
    TXT_FILE_BODY;
961
    Dir = SCP2_URE_DL_DIR;
951
    Dir = SCP2_URE_DL_DIR;
Lines 1148-1154 Module gid_Module_Root_Ure_Hidden Link Here
1148
            gid_File_Lib_Mingwm10_Ure,
1138
            gid_File_Lib_Mingwm10_Ure,
1149
            gid_File_Dl_Msvcr71,
1139
            gid_File_Dl_Msvcr71,
1150
            gid_File_Dl_Msvcp71,
1140
            gid_File_Dl_Msvcp71,
1151
            gid_File_Dl_Unicows,
1152
            gid_File_Dl_Uwinapi,
1141
            gid_File_Dl_Uwinapi,
1153
            gid_File_Lib_Msvcr80_Ure,
1142
            gid_File_Lib_Msvcr80_Ure,
1154
            gid_File_Lib_Msvcp80_Ure,
1143
            gid_File_Lib_Msvcp80_Ure,
(-)a/main/solenv/gbuild/platform/windows.mk (-1 lines)
Lines 461-467 gb_Library_PLAINLIBS_NONE += \ Link Here
461
	ole32 \
461
	ole32 \
462
	oleaut32 \
462
	oleaut32 \
463
	shell32 \
463
	shell32 \
464
	unicows \
465
	user32 \
464
	user32 \
466
	uuid \
465
	uuid \
467
	uwinapi \
466
	uwinapi \
(-)a/main/solenv/gbuild/platform/winmingw.mk (-1 lines)
Lines 485-491 gb_Library_PLAINLIBS_NONE += \ Link Here
485
	ole32 \
485
	ole32 \
486
	oleaut32 \
486
	oleaut32 \
487
	shell32 \
487
	shell32 \
488
	unicows \
489
	user32 \
488
	user32 \
490
	uuid \
489
	uuid \
491
	uwinapi \
490
	uwinapi \
(-)a/main/solenv/inc/set_wntx64.mk (-1 lines)
Lines 142-148 MSILIB_X64=$(LIBPATH_X64)/msi.lib Link Here
142
DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
142
DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
143
SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
143
SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
144
URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
144
URLMONLIB_X64=$(LIBPATH_X64)/urlmon.lib
145
UNICOWSLIB_X64=$(LIBPATH_X64)/unicows.lib
146
WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
145
WININETLIB_X64=$(LIBPATH_X64)/wininet.lib
147
OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
146
OLDNAMESLIB_X64=$(LIBPATH_VC_X64)/oldnames.lib
148
MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
147
MSIMG32LIB_X64=$(LIBPATH_X64)/msimg32.lib
(-)a/main/solenv/inc/wntgcci.mk (-1 lines)
Lines 210-216 MSILIB=$(PSDK_HOME)$/lib$/msi.lib Link Here
210
DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
210
DDRAWLIB=$(DIRECTXSDK_LIB)/ddraw.lib
211
SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
211
SHLWAPILIB=$(PSDK_HOME)$/lib$/shlwapi.lib
212
URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
212
URLMONLIB=$(PSDK_HOME)$/lib$/urlmon.lib
213
UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
214
WININETLIB=-lwininet
213
WININETLIB=-lwininet
215
OLDNAMESLIB=-lmoldname
214
OLDNAMESLIB=-lmoldname
216
MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
215
MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
(-)a/main/solenv/inc/wntmsci10.mk (-1 lines)
Lines 336-342 MSILIB=msi.lib Link Here
336
DDRAWLIB=ddraw.lib
336
DDRAWLIB=ddraw.lib
337
SHLWAPILIB=shlwapi.lib
337
SHLWAPILIB=shlwapi.lib
338
URLMONLIB=urlmon.lib
338
URLMONLIB=urlmon.lib
339
UNICOWSLIB=unicows.lib
340
WININETLIB=wininet.lib
339
WININETLIB=wininet.lib
341
OLDNAMESLIB=oldnames.lib
340
OLDNAMESLIB=oldnames.lib
342
MSIMG32LIB=msimg32.lib
341
MSIMG32LIB=msimg32.lib
(-)a/main/solenv/inc/wntmsci11.mk (-1 lines)
Lines 382-388 MSILIB=msi.lib Link Here
382
DDRAWLIB=ddraw.lib
382
DDRAWLIB=ddraw.lib
383
SHLWAPILIB=shlwapi.lib
383
SHLWAPILIB=shlwapi.lib
384
URLMONLIB=urlmon.lib
384
URLMONLIB=urlmon.lib
385
UNICOWSLIB=unicows.lib
386
WININETLIB=wininet.lib
385
WININETLIB=wininet.lib
387
OLDNAMESLIB=oldnames.lib
386
OLDNAMESLIB=oldnames.lib
388
MSIMG32LIB=msimg32.lib
387
MSIMG32LIB=msimg32.lib
(-)a/main/ure/source/README (-1 lines)
Lines 158-164 Program Files\URE\bin\textinstream.uno.dll [private] Link Here
158
Program Files\URE\bin\textoutstream.uno.dll  [private]
158
Program Files\URE\bin\textoutstream.uno.dll  [private]
159
Program Files\URE\bin\stocservices.uno.dll  [private]
159
Program Files\URE\bin\stocservices.uno.dll  [private]
160
Program Files\URE\bin\uuresolver.uno.dll  [private]
160
Program Files\URE\bin\uuresolver.uno.dll  [private]
161
Program Files\URE\bin\unicows.dll  [private]
162
Program Files\URE\bin\uwinapi.dll  [private]
161
Program Files\URE\bin\uwinapi.dll  [private]
163
Program Files\URE\java\java_uno.jar  [private]
162
Program Files\URE\java\java_uno.jar  [private]
164
Program Files\URE\misc\javavendors.xml  [private]
163
Program Files\URE\misc\javavendors.xml  [private]
(-)a/main/vcl/win/source/app/salinfo.cxx (-6 lines)
Lines 28-39 Link Here
28
// MARKER(update_precomp.py): autogen include statement, do not remove
28
// MARKER(update_precomp.py): autogen include statement, do not remove
29
#include "precompiled_vcl.hxx"
29
#include "precompiled_vcl.hxx"
30
30
31
// rely on unicows on for multimon functions for older versions
32
#if WINVER < 0x0500
33
#undef WINVER
34
#define WINVER 0x0500
35
#endif
36
37
#include "svsys.h"
31
#include "svsys.h"
38
#include "rtl/ustrbuf.hxx"
32
#include "rtl/ustrbuf.hxx"
39
33
(-)a/main/vcl/win/source/window/salframe.cxx (-2 lines)
Lines 2531-2538 static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf, Link Here
2531
        if ( true/*aSalShlData.mbWNT*/ )
2531
        if ( true/*aSalShlData.mbWNT*/ )
2532
        {
2532
        {
2533
            nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen );
2533
            nKeyLen = GetKeyNameTextW( lParam, aKeyBuf, nMaxKeyLen );
2534
            // #i12401# the current unicows.dll has a bug in CharUpperBuffW, which corrupts the stack
2535
            // fall back to the ANSI version instead
2536
            DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" );
2534
            DBG_ASSERT( nKeyLen <= nMaxKeyLen, "Invalid key name length!" );
2537
            if( nKeyLen > nMaxKeyLen )
2535
            if( nKeyLen > nMaxKeyLen )
2538
                nKeyLen = 0;
2536
                nKeyLen = 0;

Return to issue 88652