fixed cocos2d#176 test_win32 OK.

Author: yangws

cocos2dx/platform/win32/CCXBitmapDC.cpp

@@ -43,7 +43,7 @@ namespace cocos2d {
 		HFONT hFont = NULL;
 		HFONT hNewFont = NULL;
 		LOGFONT lFont = {0};
-		lFont.lfHeight = -MulDiv((int)fontSize, GetDeviceCaps(m_hMemDC, LOGPIXELSY), 72);
+		lFont.lfHeight = -(LONG)fontSize;
 		MultiByteToWideChar(CP_ACP, 0, fontName, -1, lFont.lfFaceName, LF_FACESIZE);
 		hFont = CreateFontIndirect(&lFont);
 		if (hFont)
@@ -57,9 +57,9 @@ namespace cocos2d {
 		HGDIOBJ hOldFont = SelectObject(m_hMemDC, hNewFont);
 
 		// text
-		int len = strlen(text) + 1;
-		WCHAR *pText = new WCHAR[len];
-        MultiByteToWideChar(CP_ACP, 0, text, len, pText, len);
+		int len = strlen(text);
+		WCHAR *pText = new WCHAR[len + 1];
+        MultiByteToWideChar(CP_ACP, 0, text, len + 1, pText, len);
 
 		// calculate text size
 		SIZE extent;
@@ -99,6 +99,7 @@ namespace cocos2d {
 		// draw text
 		RECT rc = {0, 0, extent.cx, extent.cy};
 		SetBkMode(m_hMemDC, TRANSPARENT);
+		SetTextColor(m_hMemDC, RGB(255, 255, 255)); // white color
 		DrawText(m_hMemDC, pText, len, &rc, dwStyle);
 
 		// free resource

cocos2dx/platform/win32/CCXEGLView_win32.cpp

@@ -227,16 +227,14 @@ bool CCXEGLView::Create(LPCTSTR pTitle, int w, int h)
 		RECT rect = {(rcDesktop.right + rcDesktop.left - w) / 2, (rcDesktop.bottom + rcDesktop.top - h) / 2, 0, 0};
 		rect.right = rect.left + w;
 		rect.bottom = rect.top + h;
-		AdjustWindowRectEx(&rect, WS_POPUPWINDOW, false, WS_EX_TOPMOST | WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
+		AdjustWindowRectEx(&rect, WS_CAPTION | WS_POPUPWINDOW, false, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE);
 
 		// create window
 		m_hWnd = CreateWindowEx(
-			WS_EX_TOPMOST | WS_EX_APPWINDOW | WS_EX_WINDOWEDGE,	// Extended Style For The Window
+			WS_EX_APPWINDOW | WS_EX_WINDOWEDGE,	// Extended Style For The Window
 			kWindowClassName,									// Class Name
 			pTitle,												// Window Title
-			WS_POPUPWINDOW/*WS_OVERLAPPEDWINDOW*/               // Defined Window Style
-			| WS_CLIPSIBLINGS									// Required Window Style
-			| WS_CLIPCHILDREN,									// Required Window Style
+			WS_CAPTION | WS_POPUPWINDOW,	// Defined Window Style
 			rect.left, rect.top,								// Window Position
 			rect.right - rect.left,                             // Window Width
 			rect.bottom - rect.top,                             // Window Height
@@ -290,7 +288,7 @@ LRESULT CCXEGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 
 	case WM_LBUTTONUP:
-		if (MK_LBUTTON == wParam && m_bCaptured)
+		if (m_bCaptured)
 		{
 			m_pTouch->SetTouchInfo(0, (float)LOWORD(lParam), (float)HIWORD(lParam));
 			m_pDelegate->touchesEnded(m_pSet, NULL);
@@ -304,6 +302,10 @@ LRESULT CCXEGLView::WindowProc(UINT message, WPARAM wParam, LPARAM lParam)
 		EndPaint(m_hWnd, &ps);
 		break;
 
+	case WM_CLOSE:
+		CCDirector::getSharedDirector()->end();
+		break;
+
 	case WM_DESTROY:
 		PostQuitMessage(0);
 		break;

cocos2dx/platform/win32/CCXUIImage_win32.cpp

@@ -71,8 +71,6 @@ static void pngReadCallback(png_structp png_ptr, png_bytep data, png_size_t leng
 
 UIImage::UIImage(void)
 {
-	m_pBitmap = NULL;
-
 	m_imageInfo.hasAlpha = false;
 	m_imageInfo.isPremultipliedAlpha = false;
 	m_imageInfo.height = 0;
@@ -98,14 +96,32 @@ UIImage::UIImage(CCXBitmapDC * pBmpDC)
 	GetDIBits(pBmpDC->getDC(), pBmpDC->getBitmap(), 0, 0, NULL, (LPBITMAPINFO)&bi, DIB_RGB_COLORS);
 
 	// init imageinfo
- 	m_imageInfo.height	= bi.bmiHeader.biHeight;
+	m_imageInfo.height	= (bi.bmiHeader.biHeight < 0) ? - bi.bmiHeader.biHeight : bi.bmiHeader.biHeight;
  	m_imageInfo.width	= bi.bmiHeader.biWidth;
  	m_imageInfo.bitsPerComponent = bi.bmiHeader.biBitCount / 4;
  	m_imageInfo.hasAlpha = true;
  	m_imageInfo.isPremultipliedAlpha = false;
- 	m_imageInfo.data = new BYTE[m_imageInfo.height * m_imageInfo.width * m_imageInfo.bitsPerComponent];
+ 	m_imageInfo.data = new BYTE[m_imageInfo.height * m_imageInfo.width * 4];
+
+	bi.bmiHeader.biHeight = (bi.bmiHeader.biHeight > 0) ? - bi.bmiHeader.biHeight : bi.bmiHeader.biHeight;
 	GetDIBits(pBmpDC->getDC(), pBmpDC->getBitmap(), 0, m_imageInfo.height, m_imageInfo.data, 
 		(LPBITMAPINFO)&bi, DIB_RGB_COLORS);
+
+	// change pixel's alpha value to 255, when it's RGB != 0
+	COLORREF * pPixel = NULL;
+	for (int y = 0; y < m_imageInfo.height; ++y)
+	{
+		pPixel = (COLORREF *)m_imageInfo.data + y * m_imageInfo.width;
+		for (int x = 0; x < m_imageInfo.width; ++x)
+		{
+			COLORREF& clr = *pPixel;
+			if (GetRValue(clr) || GetGValue(clr) || GetBValue(clr))
+			{
+				clr |= 0xff000000;
+			}
+			++pPixel;
+		}
+	}
 }
 
 UIImage::~UIImage(void)

cocos2dx/platform/win32/CCXUIImage_win32.h

@@ -104,7 +104,6 @@ class CCX_DLL UIImage
 	bool loadJpg(const char *strFileName);
 
 private:
-	HBITMAP *m_pBitmap;
 	tImageInfo m_imageInfo;
 };
 }//namespace   cocos2d 

test_win32/TestApplication.cpp

@@ -22,11 +22,11 @@ bool TestApplication::initCocos2d()
 	pDirector->setDisplayFPS(true);
 
 	CCScene * pScene = CCScene::node();
-	CCLayer * pLayer = new TestController();
+	CCLayer * pLayer = new TestController(kCCDeviceOrientationPortrait);
 	pLayer->autorelease();
 
 	pScene->addChild(pLayer);
-	pDirector->replaceScene(pScene);
+	pDirector->runWithScene(pScene);
 
 	return true;
 }
@@ -39,4 +39,4 @@ void TestApplication::applicationDidEnterBackground()
 void TestApplication::applicationWillEnterForeground()
 {
 	CCDirector::getSharedDirector()->startAnimation();
-}
+}