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

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

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/src/user32/loadres.cpp

    r21303 r21916  
    1919 */
    2020#include <os2win.h>
    21 #include <user32.h>
     21#include "user32.h"
    2222#include <heapstring.h>
    23 #include <oslibres.h>
    24 #include <win\virtual.h>
     23#include "oslibres.h"
     24#include <win/virtual.h>
    2525#include "dib.h"
    2626#include "initterm.h"
    … …  
    7070    hRes = FindResourceW(hinst, (LPWSTR)(((wID>>4)&0xffff)+1), RT_STRINGW);
    7171    if(hRes == NULL) {
    72         dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer)); 
     72        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
    7373        *lpBuffer = 0;  //NT4, SP6 clears first character
    7474        return 0;
    … …  
    342342    headersize = sizeof(BITMAPINFO)+colortablesize+3*sizeof(DWORD); //+ extra space for > 8bpp images
    343343
    344     pInfo = (BITMAPINFO *)malloc(headersize+bmpsize); 
     344    pInfo = (BITMAPINFO *)malloc(headersize+bmpsize);
    345345    if(pInfo == NULL) {
    346346        DebugInt3();
    … …  
    360360    GetDIBits(hdc, hBitmap, 0, bm.bmHeight, pBitmapData, pInfo, DIB_RGB_COLORS);
    361361
    362     res = CreateDIBitmap(hdc, &pInfo->bmiHeader, CBM_INIT, pBitmapData, 
     362    res = CreateDIBitmap(hdc, &pInfo->bmiHeader, CBM_INIT, pBitmapData,
    363363                         pInfo, DIB_RGB_COLORS );
    364364
Note: See TracChangeset for help on using the changeset viewer.