Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Nemkin2019-01-31 06:54:35 -0500
committerNikita Nemkin2019-04-16 05:41:59 -0400
commitc64218f83b34c6936c38d867bf5bfa4cfa76fdef (patch)
treeba9b963163b5d4f5846aad636344768bf54b834a /bundles/org.eclipse.swt/Eclipse SWT PI
parent580b0e95b8c566f33cd479080d52608e07b040dd (diff)
downloadeclipse.platform.swt-c64218f83b34c6936c38d867bf5bfa4cfa76fdef.tar.gz
eclipse.platform.swt-c64218f83b34c6936c38d867bf5bfa4cfa76fdef.tar.xz
eclipse.platform.swt-c64218f83b34c6936c38d867bf5bfa4cfa76fdef.zip
Bug 545884 - [Win32] Remove TCHAR string wrapper (Part 1)
Replace TCHARs that are used as fixed-size buffers with plain char[] arrays of the same size. Change-Id: Ic54bafb4e865dff62de67a0efefc6020aa5349f3 Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java30
1 files changed, 0 insertions, 30 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 3e0eb8a503..2e77e7ecf9 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -2174,16 +2174,6 @@ public static final int ExtractIconEx (TCHAR lpszFile, int nIconIndex, long /*in
return ExtractIconEx (lpszFile1, nIconIndex, phiconLarge, phiconSmall, nIcons);
}
-public static final boolean ExtTextOut(long /*int*/ hdc, int X, int Y, int fuOptions, RECT lprc, TCHAR lpString, int cbCount, int[] lpDx) {
- char [] lpString1 = lpString == null ? null : lpString.chars;
- return ExtTextOut (hdc, X, Y, fuOptions, lprc, lpString1, cbCount, lpDx);
-}
-
-public static final int GetCharacterPlacement (long /*int*/ hdc, TCHAR lpString, int nCount, int nMaxExtent, GCP_RESULTS lpResults, int dwFlags) {
- char [] lpString1 = lpString == null ? null : lpString.chars;
- return GetCharacterPlacement (hdc, lpString1, nCount, nMaxExtent, lpResults, dwFlags);
-}
-
public static final boolean GetClassInfo (long /*int*/ hInstance, TCHAR lpClassName, WNDCLASS lpWndClass) {
boolean result;
@@ -2202,16 +2192,6 @@ public static final boolean GetClassInfo (long /*int*/ hInstance, TCHAR lpClassN
return result;
}
-public static final int GetClassName (long /*int*/ hWnd, TCHAR lpClassName, int nMaxCount) {
- char [] lpClassName1 = lpClassName == null ? null : lpClassName.chars;
- return GetClassName (hWnd, lpClassName1, nMaxCount);
-}
-
-public static final int GetClipboardFormatName (int format, TCHAR lpszFormatName, int cchMaxCount) {
- char [] lpszFormatName1 = lpszFormatName == null ? null : lpszFormatName.chars;
- return GetClipboardFormatName (format, lpszFormatName1, cchMaxCount);
-}
-
public static final int GetLocaleInfo (int Locale, int LCType, TCHAR lpLCData, int cchData) {
char [] lpLCData1 = lpLCData == null ? null : lpLCData.chars;
return GetLocaleInfo (Locale, LCType, lpLCData1, cchData);
@@ -2230,11 +2210,6 @@ public static final int GetProfileString (TCHAR lpAppName, TCHAR lpKeyName, TCHA
return GetProfileString (lpAppName1, lpKeyName1, lpDefault1, lpReturnedString1, nSize);
}
-public static final boolean GetTextExtentPoint32 (long /*int*/ hdc, TCHAR lpString, int cbString, SIZE lpSize) {
- char [] lpString1 = lpString == null ? null : lpString.chars;
- return GetTextExtentPoint32 (hdc, lpString1, cbString, lpSize);
-}
-
public static final int GetWindowText (long /*int*/ hWnd, TCHAR lpString, int nMaxCount) {
char [] lpString1 = lpString == null ? null : lpString.chars;
return GetWindowText (hWnd, lpString1, nMaxCount);
@@ -2250,11 +2225,6 @@ public static final long /*int*/ ImmEscape (long /*int*/ hKL,long /*int*/ hIMC,
return ImmEscape (hKL, hIMC, uEscape, lpData1);
}
-public static final int ImmGetCompositionString (long /*int*/ hIMC, int dwIndex, TCHAR lpBuf, int dwBufLen) {
- char [] lpBuf1 = lpBuf == null ? null : lpBuf.chars;
- return ImmGetCompositionString (hIMC, dwIndex, lpBuf1, dwBufLen);
-}
-
public static final boolean InternetGetCookie (TCHAR lpszUrl, TCHAR lpszCookieName, TCHAR lpszCookieData, int[] lpdwSize) {
char [] url = lpszUrl == null ? null : lpszUrl.chars;
char [] cookieName = lpszCookieName == null ? null : lpszCookieName.chars;

Back to the top