Changeset 21916 for trunk/testapp


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
12 deleted
6 edited
11 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/testapp/encodings/test.c

    r21466 r21916  
    22#include <stdio.h>
    33#include <stdlib.h>
     4#include <memory.h>
    45
    56#ifndef _MSC_VER

  • trunk/testapp/gui/fontlist/XFont.cpp

    r21539 r21916  
    2222#include "XFont.h"
    2323
    24 //#define TRACE(a,...)  do {} while(0)
     24#ifdef __GNUC__
     25#define TRACE(a,...)  do {} while(0)
     26#else
    2527#define TRACE ((void)0)
     28#endif
    2629#define _ASSERTE(a) do {} while(0)
    2730
    … …  
    591594    *pnVersion = WUNKNOWN;
    592595
    593     TCHAR *cp = NULL;
     596    const TCHAR *cp = NULL;
    594597
    595598    OSVERSIONINFO osinfo;

  • trunk/testapp/gui/input/input.c

    r21557 r21916  
    4646            case WM_KEYDOWN:
    4747            {
    48                 printf("WM_KEYDOWN = %08x\n", (int)wParam);
     48                printf("WM_KEYDOWN = %08x (%04x)\n", (int)wParam,
     49                       (!!GetKeyState(VK_SHIFT) << 2) |
     50                       (!!GetKeyState(VK_CONTROL) << 1) |
     51                       (!!GetKeyState(VK_MENU) << 0));
    4952                break;
    5053            }
    … …  
    5255            case WM_CHAR:
    5356            {
    54                 printf("WM_CHAR = %08x\n", (int)wParam);
     57                printf("WM_CHAR = %08x\n", (int)wParam,
     58                       (!!GetKeyState(VK_SHIFT) << 2) |
     59                       (!!GetKeyState(VK_CONTROL) << 1) |
     60                       (!!GetKeyState(VK_MENU) << 0));
    5561                break;
    5662            }

  • trunk/testapp/network/iphlpapi/GetIpAddrTable.c

    r21415 r21916  
    4242                          (LPTSTR) & lpMsgBuf, 0, NULL)) {
    4343            printf("\tError: %s", lpMsgBuf);
    44             LocalFree(lpMsgBuf);
     44            LocalFree((HLOCAL)lpMsgBuf);
    4545        }
    4646        exit(1);

  • trunk/testapp/threads/threads.c

    r21614 r21916  
    2121#include <strsafe.h>
    2222#else
     23#include <stdio.h>
    2324#include <stdarg.h>
    2425void StringCchPrintf(LPTSTR pszDest, size_t cchDest,
    … …  
    241242        (lstrlen((LPCTSTR) lpMsgBuf) + lstrlen((LPCTSTR) lpszFunction) + 40) * sizeof(TCHAR));
    242243    StringCchPrintf((LPTSTR)lpDisplayBuf,
    243         LocalSize(lpDisplayBuf) / sizeof(TCHAR),
     244        LocalSize((HLOCAL)lpDisplayBuf) / sizeof(TCHAR),
    244245        TEXT("%s failed with error %d: %s"),
    245246        lpszFunction, dw, lpMsgBuf);
    … …  
    248249        // Free error-handling buffer allocations.
    249250
    250     LocalFree(lpMsgBuf);
    251     LocalFree(lpDisplayBuf);
    252 }
    253 
     251    LocalFree((HLOCAL)lpMsgBuf);
     252    LocalFree((HLOCAL)lpDisplayBuf);
     253}
     254
Note: See TracChangeset for help on using the changeset viewer.