Changeset 24774

Timestamp:

11/25/08 02:27:04 (5 years ago)

Author:

saturday06

Message:

miriioo

Location:

lang/cplusplus/i3/trunk

Files:

• src/Common.h (modified) (4 diffs)
• src/Config.cpp (modified) (4 diffs)
• src/Config.h (modified) (1 diff)
• src/Mediator.cpp (modified) (2 diffs)
• src/gui-windows/InputWindowCore.cpp (modified) (1 diff)
• src/mol/include/mol/Thread.h (modified) (1 diff)
• src/mol/src/DebugLogger.cpp (modified) (2 diffs)
• src/mol/src/Test2.cpp (modified) (1 diff)
• src/mol/src/windows/WindowProcedureTest.cpp (modified) (1 diff)
• src/os-windows/CygwinPty.cpp (modified) (1 diff)
• src/os-windows/Os.cpp (modified) (1 diff)
• src/os-windows/OsTest1.cpp (modified) (1 diff)
• src/os-windows/OsTest2.cpp (modified) (2 diffs)
• src/os-windows/msvc/win_iconv.c (modified) (4 diffs)
• windows/i3_test.vcproj (modified) (2 diffs)
• windows/mol_test.vcproj (modified) (3 diffs)

lang/cplusplus/i3/trunk/src/Common.h

@@ -20 +20 @@
 #include <iconv.h>
 #include <libintl.h>
+
+// disable POSIX/XSI format strings
+#undef fprintf
+#undef vfprintf
+#undef printf
+#undef vprintf
+#undef sprintf
+#undef vsprintf
+#undef snprintf
+#undef vsnprintf
+
 //#include <argtable2.h>
 #ifdef HAVE_POPT_H
@@ -94 +105 @@
 #define UTF8_TO_UTF16LE_ALLOCA(data8, data16) \
     wchar_t* data16 = NULL; \
-    do { \
+    for (;;) { \
         const char* check = data8; check; \
         unsigned int num_elements = MultiByteToWideChar(CP_UTF8, 0, data8, -1, NULL, 0); \
@@ -116 +127 @@
             break; \
         } \
-    } while (0)
+        break; \
+    }
 
 #define UTF16LE_TO_UTF8_ALLOCA(data16, data8) \
     char* data8 = NULL; \
-    do { \
+    for (;;) { \
         const wchar_t* check = data16; check; \
         unsigned int num_elements = WideCharToMultiByte( CP_UTF8, 0, data16, -1, NULL, 0, 0, 0); \
@@ -137 +149 @@
             break; \
         } \
-    } while (0)
+        break; \
+    }
 
 

lang/cplusplus/i3/trunk/src/Config.cpp

@@ -3 +3 @@
 #include "Mediator.h"
 #include "Config.h"
+
+#include <vector>
+#include <list>
 
 namespace i3
@@ -113 +116 @@
 };
 */
-struct MyIniLoader : public grammar<MyIniLoader>
+struct MyIniLoader : public grammar<MyIniLoader>, public boost::noncopyable
 {
     struct integer_value
@@ -299 +302 @@
 }
 
-void load_config(Config& destination, const TCHAR* str)
+i3::Config parse_config(const TCHAR* str)
 {
     using namespace i3::config;
     using namespace boost::spirit;
-    i3::config::ConfigTemp c;
+
+    i3::config::ConfigTemp c = {};
+    i3::Config destination;
 
     MyIniLoader i(c);
@@ -358 +363 @@
         abort();
     }
+    return destination;
 }
 

lang/cplusplus/i3/trunk/src/Config.h

@@ -42 +42 @@
 
 
-void copy_config(Config& destination, const Config& source);
-void load_config(Config& destination, const TCHAR* str);
+Config parse_config(const TCHAR* str);
 
 }

lang/cplusplus/i3/trunk/src/Mediator.cpp

@@ -21 +21 @@
 exit_status Mediator::start()
 {
-    if (true)
-    {
+#if 1
         // threaded
+        inputWindow.createUI();
         completionWindow.start();
         outputWindow.start();
         shellManager.start();
         inputWindow.run();
-    }
-    else
-    {
+#else
         // no threaded gui
         completionWindow.createUI();
@@ -38 +36 @@
 
         global_loop();
-    }
-
+#endif
     return 0;
 }

lang/cplusplus/i3/trunk/src/gui-windows/InputWindowCore.cpp

@@ -29 +29 @@
 void InputWindowCore<InputWindow>::createUI()
 {
+    if (getWindow()) {
+        return;
+    }
+
     LoadLibrary(_T("RICHED32.DLL"));
     //LoadLibrary(_T("Riched20.dll")); // required?

lang/cplusplus/i3/trunk/src/mol/include/mol/Thread.h

@@ -59 +59 @@
     void start()
     {
+#if MOL_OS_WINDOWS
+        Sleep(100);
+#else
+#endif
         core.start();
     }

lang/cplusplus/i3/trunk/src/mol/src/DebugLogger.cpp

@@ -1 +1 @@
 #include <mol/PrecompiledHeaders.h>
 #include <mol/Mol.h>
+#include <mol/Debug.h>
 
 using namespace std;
@@ -9 +10 @@
 void clear_mapped_file(HANDLE mapped_file)
 {
-
     int8_t (*const view)[sizeof(DebugMappedFile)] = (int8_t(*const)[sizeof(DebugMappedFile)])MapViewOfFile(
                 mapped_file, FILE_MAP_WRITE, 0, 0, sizeof(DebugMappedFile));

lang/cplusplus/i3/trunk/src/mol/src/Test2.cpp

@@ -3 +3 @@
 #include <mol/MscCrt.h>
 #include <boost/test/unit_test.hpp>
+
+#if defined(_MSC_VER) && !defined(NDEBUG)
+#pragma warning (disable: 4189)
+#endif
 
 template <typename T>

lang/cplusplus/i3/trunk/src/mol/src/windows/WindowProcedureTest.cpp

@@ -79 +79 @@
         MSG msg = {};
         unsigned int loop = 100;
-        while (true)
+        for (;;)
         {
             Sleep(1);

lang/cplusplus/i3/trunk/src/os-windows/CygwinPty.cpp

@@ -91 +91 @@
 
     if (!DuplicateHandle(GetCurrentProcess(),hMyStdInput ,GetCurrentProcess(),NULL, 0, FALSE, DUPLICATE_SAME_ACCESS) ||
-            !DuplicateHandle(GetCurrentProcess(),hMyStdOutput,GetCurrentProcess(),NULL, 0, FALSE, DUPLICATE_SAME_ACCESS) ||
-            !DuplicateHandle(GetCurrentProcess(),hMyStdError ,GetCurrentProcess(),NULL, 0, FALSE, DUPLICATE_SAME_ACCESS))
+        !DuplicateHandle(GetCurrentProcess(),hMyStdOutput,GetCurrentProcess(),NULL, 0, FALSE, DUPLICATE_SAME_ACCESS) ||
+        !DuplicateHandle(GetCurrentProcess(),hMyStdError ,GetCurrentProcess(),NULL, 0, FALSE, DUPLICATE_SAME_ACCESS))
     {
 

lang/cplusplus/i3/trunk/src/os-windows/Os.cpp

@@ -67 +67 @@
     }
 
-    TCHAR locale_dir[1000] = {};
+    TCHAR locale_dir[3000] = {};
     DWORD result = GetModuleFileName(
                        GetModuleHandle(NULL),
                        locale_dir,
                        _countof(locale_dir));
-    if (result == 0 || result == _countof(locale_dir))   // error
-    {
-        memset(locale_dir, 0, sizeof(locale_dir));
-        return;
-    }
+    if (result == 0 || result == _countof(locale_dir))
+    {
+        //memset(locale_dir, 0, sizeof(locale_dir));
+        return;
+    }
+
     if (PathRemoveFileSpec(locale_dir) == FALSE)
     {
-        memset(locale_dir, 0, sizeof(locale_dir));
-        return;
-    }
-    if (0 != _tcscat_s(locale_dir, _T("\\locale")))
-    {
-        memset(locale_dir, 0, sizeof(locale_dir));
+        //memset(locale_dir, 0, sizeof(locale_dir));
+        return;
+    }
+
+    TCHAR more[] = _T("locale");
+    if (_countof(locale_dir) <= _countof(more) + _tcslen(locale_dir) + 1)
+    {
+        //memset(locale_dir, 0, sizeof(locale_dir));
+        return;
+    }
+
+    if (PathAppend(locale_dir, more) == FALSE)
+    {
+        //memset(locale_dir, 0, sizeof(locale_dir));
         return;
     }

lang/cplusplus/i3/trunk/src/os-windows/OsTest1.cpp

@@ -80 +80 @@
     BOOST_CHECK(true);
 }
+
+
+#if defined(_MSC_VER) && !defined(NDEBUG)
+#pragma warning (disable: 4309)
+#endif
 
 char testdata_utf8[] =

lang/cplusplus/i3/trunk/src/os-windows/OsTest2.cpp

@@ -3 +3 @@
 
 #include "Common.h"
+#include "Config.h"
 #include "Utf8ToUtf16Stream.h"
+
+#include <iostream>
+#include <fstream>
 
 #define WINDOWS_PATH_MAX_ELEMENTS 4000
 
 using namespace std;
+
+BOOST_AUTO_TEST_CASE(bcooooiodefgffffh)
+{
+    i3::Config config = i3::parse_config(_T("foo"));
+    const TCHAR* foo = config.string_key;
+}
 
 BOOST_AUTO_TEST_CASE(bcooooiodefgh)
@@ -15 +25 @@
     cygwin1_cygwin_dll_init();
 
-    FARPROC cygwin1_mkdir = GetProcAddress(cygwin1, "rmdir");
-    int result = ((int (*)(const char *pathname))cygwin1_mkdir)("/test");
+    int (*cygwin1_rmdir)(const char*)  = (decltype(cygwin1_rmdir))GetProcAddress(cygwin1, "rmdir");
+    int result = cygwin1_rmdir("/test");
     FreeLibrary(cygwin1);
 }

lang/cplusplus/i3/trunk/src/os-windows/msvc/win_iconv.c

@@ -26 +26 @@
 
 #include <windows.h>
-#include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+
+#ifndef _WIN32_WCE
+#include <errno.h>
+#else
+
+#ifdef _MSC_VER
+__declspec (thread) int errno = 0;
+#else
+//_thread int errno = 0;
+int errno = 0;
+#endif
+
+static int* _errno(void)
+{
+    return &errno;
+}
+
+#define E2BIG           7       /* Arg list too long */
+#define ENOMEM          12      /* Not enough space */
+#define EINVAL          22      /* Invalid argument */
+#define EILSEQ          42      /* Illegal byte sequence */
+#undef GetProcAddress
+#define GetProcAddress(hModule, lpProcName) GetProcAddressW(hModule, L##lpProcName)
+#endif
 
 #if 0
@@ -1423 +1446 @@
     hr = ConvertINetUnicodeToMultiByte(&cv->mode, cv->codepage,
             (const wchar_t *)wbuf, &wbufsize, tmpbuf, &tmpsize);
-    if (hr != S_OK || insize != wbufsize) {
+    if (hr != S_OK || insize != wbufsize)
         return_error(EILSEQ);
-    } else if (bufsize < tmpsize) {
+    else if (bufsize < tmpsize)
         return_error(E2BIG);
-    } else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize) {
+    else if (cv->mblen(cv, (uchar *)tmpbuf, tmpsize) != tmpsize)
         return_error(EILSEQ);
-    }
-
-    if (tmpsize >= sizeof(tmpbuf)) {
-        return_error(E2BIG);
-    }
     memcpy(buf, tmpbuf, tmpsize);
     return tmpsize;
@@ -1503 +1521 @@
 utf32_mbtowc(csconv_t *cv, const uchar *buf, int bufsize, ushort *wbuf, int *wbufsize)
 {
-    uint wc = 0;
+    uint wc;
 
     if (bufsize < 4)
@@ -1700 +1718 @@
 {
     iso2022_esc_t *iesc = iso2022jp_esc;
-    char tmp[MB_CHAR_MAX] = {0};
+    char tmp[MB_CHAR_MAX];
     int tmpsize = MB_CHAR_MAX;
     int insize = wbufsize;
     HRESULT hr;
     DWORD dummy = 0;
-    int len = 0;
-    int esc_len = 0;
-    int cs = 0;
-    int shift = 0;
-    int i = 0;
+    int len;
+    int esc_len;
+    int cs;
+    int shift;
+    int i;
 
     /*

lang/cplusplus/i3/trunk/windows/i3_test.vcproj

@@ -136 +136 @@
                                 EnableFiberSafeOptimizations="true"
                                 AdditionalIncludeDirectories="..\src\;"..\src\gui-windows";"..\src\os-windows";"..\src\os-windows\msvc";..\src\mol\include;..\src\intl"
-                                PreprocessorDefinitions="WIN32;NDEBUG"
+                                PreprocessorDefinitions="WIN32;NDEBUG;BOOST_NO_TYPEID"
                                 StringPooling="true"
                                 RuntimeLibrary="2"
@@ -399 +399 @@
                         </File>
                         <File
-                                RelativePath="..\src\os-windows\win_iconv.c"
+                                RelativePath="..\src\os-windows\msvc\win_iconv.c"
                                 >
                                 <FileConfiguration

lang/cplusplus/i3/trunk/windows/mol_test.vcproj

@@ -138 +138 @@
                                 EnableFiberSafeOptimizations="false"
                                 AdditionalIncludeDirectories="..\src\mol\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;BOOST_NO_TYPEID;_CONSOLE"
                                 ExceptionHandling="2"
                                 RuntimeLibrary="2"
@@ -295 +295 @@
                         </File>
                         <File
-                                RelativePath="..\src\mol\src\DebugLogger.cpp"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\mol\include\mol\StaticData.cpp"
                                 >
@@ -349 +345 @@
                         </File>
                         <File
+                                RelativePath="..\src\mol\include\mol\Debug.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\mol\include\mol\os-windows\Debug.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\src\mol\include\mol\Debug.h"
                                 >
                         </File>