stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6999766: Changes to correct c/c++ language issues for use of parfait

Browse Source 
Reviewed-by: uta, amenkov
This commit is contained in:
Andrei Dmitriev 2010-12-28 17:13:13 +03:00
parent 00c8b5c7a0
commit 67712c8370
7 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/windows/native/sun/windows/Devices.h
View File

@ -54,7 +54,7 @@ static BOOL UpdateInstance(JNIEnv *env);
InstanceAccess& operator=(const InstanceAccess&);
InstanceAccess* operator&();
};
friend InstanceAccess;
friend class InstanceAccess;
private:
Devices(int numElements);

2
jdk/src/windows/native/sun/windows/awt.h
View File

@ -173,7 +173,7 @@ extern JavaVM *jvm;
// Platform encoding is Unicode (UTF-16), re-define JNU_ functions
// to proper JNI functions.
#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast<jchar*>(x), static_cast<jsize>(_tcslen(x)))
#define JNU_NewStringPlatform(env, x) env->NewString(reinterpret_cast<const jchar*>(x), static_cast<jsize>(_tcslen(x)))
#define JNU_GetStringPlatformChars(env, x, y) reinterpret_cast<LPCWSTR>(env->GetStringChars(x, y))
#define JNU_ReleaseStringPlatformChars(env, x, y) env->ReleaseStringChars(x, reinterpret_cast<const jchar*>(y))

11
jdk/src/windows/native/sun/windows/awt_Debug.cpp
View File

@ -47,12 +47,21 @@ void * operator new(size_t size, const char * filename, int linenumber) {
return ptr;
}
void * operator new[](size_t size, const char * filename, int linenumber) {
void * ptr = DMem_AllocateBlock(size, filename, linenumber);
if (ptr == NULL) {
throw std::bad_alloc();
}
return ptr;
}
#if _MSC_VER >= 1200
void operator delete(void *ptr, const char*, int) {
DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!");
}
#endif
void operator delete(void *ptr) {
void operator delete(void *ptr) throw() {
DMem_FreeBlock(ptr);
}

5
jdk/src/windows/native/sun/windows/awt_Debug.h
View File

@ -48,11 +48,14 @@
};
extern void * operator new(size_t size, const char * filename, int linenumber);
extern void * operator new[](size_t size, const char * filename, int linenumber);
#if _MSC_VER >= 1200
/* VC 6.0 is more strict about enforcing matching placement new & delete */
extern void operator delete(void *ptr, const char*, int);
#endif
extern void operator delete(void *ptr);
extern void operator delete(void *ptr) throw();
extern void DumpClipRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);
extern void DumpUpdateRectangle(const char * file, int line, int argc, const char * fmt, va_list arglist);

18
jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
View File

@ -650,7 +650,7 @@ UINT AwtDesktopProperties::GetIntegerParameter(UINT spi) {
}
void AwtDesktopProperties::SetStringProperty(LPCTSTR propName, LPTSTR value) {
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setStringPropertyID,
key, JNU_NewStringPlatform(GetEnv(), value));
@ -658,7 +658,7 @@ void AwtDesktopProperties::SetStringProperty(LPCTSTR propName, LPTSTR value) {
}
void AwtDesktopProperties::SetIntegerProperty(LPCTSTR propName, int value) {
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setIntegerPropertyID,
key, (jint)value);
@ -666,7 +666,7 @@ void AwtDesktopProperties::SetIntegerProperty(LPCTSTR propName, int value) {
}
void AwtDesktopProperties::SetBooleanProperty(LPCTSTR propName, BOOL value) {
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setBooleanPropertyID,
key, value ? JNI_TRUE : JNI_FALSE);
@ -674,7 +674,7 @@ void AwtDesktopProperties::SetBooleanProperty(LPCTSTR propName, BOOL value) {
}
void AwtDesktopProperties::SetColorProperty(LPCTSTR propName, DWORD value) {
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setColorPropertyID,
key, GetRValue(value), GetGValue(value),
@ -726,7 +726,7 @@ void AwtDesktopProperties::SetFontProperty(HDC dc, int fontID,
style |= java_awt_Font_ITALIC;
}
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setFontPropertyID,
key, fontName, style, pointSize);
@ -744,7 +744,7 @@ void AwtDesktopProperties::SetFontProperty(LPCTSTR propName, const LOGFONT & fon
jint pointSize;
jint style;
fontName = JNU_NewStringPlatform(GetEnv(), const_cast<LPWSTR>(font.lfFaceName));
fontName = JNU_NewStringPlatform(GetEnv(), font.lfFaceName);
#if 0
HDC hdc;
@ -767,7 +767,7 @@ void AwtDesktopProperties::SetFontProperty(LPCTSTR propName, const LOGFONT & fon
style |= java_awt_Font_ITALIC;
}
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
GetEnv()->CallVoidMethod(self, AwtDesktopProperties::setFontPropertyID,
key, fontName, style, pointSize);
@ -776,8 +776,8 @@ void AwtDesktopProperties::SetFontProperty(LPCTSTR propName, const LOGFONT & fon
}
void AwtDesktopProperties::SetSoundProperty(LPCTSTR propName, LPCTSTR winEventName) {
jstring key = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(propName));
jstring event = JNU_NewStringPlatform(GetEnv(), const_cast<LPTSTR>(winEventName));
jstring key = JNU_NewStringPlatform(GetEnv(), propName);
jstring event = JNU_NewStringPlatform(GetEnv(), winEventName);
GetEnv()->CallVoidMethod(self,
AwtDesktopProperties::setSoundPropertyID,
key, event);

65
jdk/src/windows/native/sun/windows/awt_TextArea.h
View File

@ -41,9 +41,6 @@
class AwtTextArea : public AwtTextComponent {
// inner classes
class OleCallback;
public:
/* java.awt.TextArea fields ids */
@ -89,6 +86,37 @@ public:
static void _ReplaceText(void *param);
protected:
/*****************************************************************
* Inner class OleCallback declaration.
*/
class OleCallback : public IRichEditOleCallback {
public:
OleCallback();
STDMETHODIMP QueryInterface(REFIID riid, LPVOID * ppvObj);
STDMETHODIMP_(ULONG) AddRef();
STDMETHODIMP_(ULONG) Release();
STDMETHODIMP GetNewStorage(LPSTORAGE FAR * ppstg);
STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME FAR * ppipframe,
LPOLEINPLACEUIWINDOW FAR* ppipuiDoc,
LPOLEINPLACEFRAMEINFO pipfinfo);
STDMETHODIMP ShowContainerUI(BOOL fShow);
STDMETHODIMP QueryInsertObject(LPCLSID pclsid, LPSTORAGE pstg, LONG cp);
STDMETHODIMP DeleteObject(LPOLEOBJECT poleobj);
STDMETHODIMP QueryAcceptData(LPDATAOBJECT pdataobj, CLIPFORMAT *pcfFormat,
DWORD reco, BOOL fReally, HGLOBAL hMetaPict);
STDMETHODIMP ContextSensitiveHelp(BOOL fEnterMode);
STDMETHODIMP GetClipboardData(CHARRANGE *pchrg, DWORD reco,
LPDATAOBJECT *ppdataobj);
STDMETHODIMP GetDragDropEffect(BOOL fDrag, DWORD grfKeyState,
LPDWORD pdwEffect);
STDMETHODIMP GetContextMenu(WORD seltype, LPOLEOBJECT poleobj,
CHARRANGE FAR * pchrg, HMENU FAR * phmenu);
private:
ULONG m_refs; // Reference count
};//OleCallback class
INLINE static OleCallback& GetOleCallback() { return sm_oleCallback; }
void EditSetSel(CHARRANGE &cr);
void EditGetSel(CHARRANGE &cr);
@ -114,37 +142,6 @@ protected:
static OleCallback sm_oleCallback;
/*****************************************************************
* Inner class OleCallback declaration.
*/
class AwtTextArea::OleCallback : public IRichEditOleCallback {
public:
OleCallback();
STDMETHODIMP QueryInterface(REFIID riid, LPVOID * ppvObj);
STDMETHODIMP_(ULONG) AddRef();
STDMETHODIMP_(ULONG) Release();
STDMETHODIMP GetNewStorage(LPSTORAGE FAR * ppstg);
STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME FAR * ppipframe,
LPOLEINPLACEUIWINDOW FAR* ppipuiDoc,
LPOLEINPLACEFRAMEINFO pipfinfo);
STDMETHODIMP ShowContainerUI(BOOL fShow);
STDMETHODIMP QueryInsertObject(LPCLSID pclsid, LPSTORAGE pstg, LONG cp);
STDMETHODIMP DeleteObject(LPOLEOBJECT poleobj);
STDMETHODIMP QueryAcceptData(LPDATAOBJECT pdataobj, CLIPFORMAT *pcfFormat,
DWORD reco, BOOL fReally, HGLOBAL hMetaPict);
STDMETHODIMP ContextSensitiveHelp(BOOL fEnterMode);
STDMETHODIMP GetClipboardData(CHARRANGE *pchrg, DWORD reco,
LPDATAOBJECT *ppdataobj);
STDMETHODIMP GetDragDropEffect(BOOL fDrag, DWORD grfKeyState,
LPDWORD pdwEffect);
STDMETHODIMP GetContextMenu(WORD seltype, LPOLEOBJECT poleobj,
CHARRANGE FAR * pchrg, HMENU FAR * phmenu);
private:
ULONG m_refs; // Reference count
};
};
#endif /* AWT_TEXTAREA_H */

2
jdk/src/windows/native/sun/windows/awt_Toolkit.h
View File

@ -110,7 +110,7 @@ class CriticalSection {
private:
const CriticalSection& critSec;
};
friend Lock;
friend class Lock;
private:
CRITICAL_SECTION rep;