Changeset 45921 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 15, 2009, 10:20:11 AM (16 years ago)

Author:

[email protected]

Message:

2009-07-15 Yong Li <​[email protected]>

Reviewed by George Staikos.

​https://bugs.webkit.org/show_bug.cgi?id=27301
Use OutputDebugStringW on WinCE since OutputDebugStringA is not supported
Originally written by Yong Li <​[email protected]> and refactored by
Joe Mason <​[email protected]>

• wtf/Assertions.cpp: vprintf_stderr_common

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Assertions.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-07-15  Yong Li  <[email protected]>
+
+         Reviewed by George Staikos.
+
+         https://bugs.webkit.org/show_bug.cgi?id=27301
+         Use OutputDebugStringW on WinCE since OutputDebugStringA is not supported
+         Originally written by Yong Li <[email protected]> and refactored by
+         Joe Mason <[email protected]>
+
+         * wtf/Assertions.cpp: vprintf_stderr_common
+
 2009-07-15  Yong Li  <[email protected]>
 

trunk/JavaScriptCore/wtf/Assertions.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2003, 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46 +47 @@
 #endif
 
+#if PLATFORM(WINCE)
+#include <winbase.h>
+#endif
+
 extern "C" {
 
@@ -67 +72 @@
         CFRelease(cfFormat);
     } else
-#elif COMPILER(MSVC) && !PLATFORM(WINCE)
+#elif COMPILER(MSVC) && !defined(WINCEBASIC)
     if (IsDebuggerPresent()) {
         size_t size = 1024;
@@ -78 +83 @@
 
             if (_vsnprintf(buffer, size, format, args) != -1) {
+#if PLATFORM(WINCE)
+                // WinCE only supports wide chars
+                wchar_t* wideBuffer = (wchar_t*)malloc(size * sizeof(wchar_t));
+                if (wideBuffer == NULL)
+                    break;
+                for (unsigned int i = 0; i < size; ++i) {
+                    if (!(wideBuffer[i] = buffer[i]))
+                        break;
+                }
+                OutputDebugStringW(wideBuffer);
+                free(wideBuffer);
+#else
                 OutputDebugStringA(buffer);
+#endif
                 free(buffer);
                 break;
@@ -102 +120 @@
 static void printCallSite(const char* file, int line, const char* function)
 {
-#if PLATFORM(WIN) && defined _DEBUG
+#if PLATFORM(WIN) && !PLATFORM(WINCE) && defined _DEBUG
     _CrtDbgReport(_CRT_WARN, file, line, NULL, "%s\n", function);
 #else