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/win32wbaseprop.cpp

    r10031 r21916  
    1212 */
    1313#include <string.h>
    14 #include <user32.h>
     14#include "user32.h"
    1515#include <heapstring.h>
    1616#include <misc.h>
    … …  
    7070
    7171    if(HIWORD(str)) {
    72          dprintf2(("GetProp %x %s %x", getWindowHandle, str, prop ? prop->handle : 0));
    73     }
    74     else dprintf2(("GetProp %x %x %x", getWindowHandle, str, prop ? prop->handle : 0));
     72         dprintf2(("GetProp %x %s %x", getWindowHandle(), str, prop ? prop->handle : 0));
     73    }
     74    else dprintf2(("GetProp %x %x %x", getWindowHandle(), str, prop ? prop->handle : 0));
    7575
    7676    return prop ? prop->handle : 0;
    … …  
    8585
    8686    if (HIWORD(str)) {
    87          dprintf2(("SetProp %x %s %x", getWindowHandle, str, handle));
    88     }
    89     else dprintf2(("SetProp %x %x %x", getWindowHandle, str, handle));
     87         dprintf2(("SetProp %x %s %x", getWindowHandle(), str, handle));
     88    }
     89    else dprintf2(("SetProp %x %x %x", getWindowHandle(), str, handle));
    9090
    9191    if (!(prop = findWindowProperty(str)))
    … …  
    192192    INT ret = -1;
    193193
    194     dprintf(("EnumPropsExA %x %x %x", getWindowHandle, func, lParam));
     194    dprintf(("EnumPropsExA %x %x %x", getWindowHandle(), func, lParam));
    195195
    196196    for (prop = propertyList; (prop); prop = next)
    … …  
    220220    INT ret = -1;
    221221
    222     dprintf(("EnumPropsExW %x %x %x", getWindowHandle, func, lParam));
     222    dprintf(("EnumPropsExW %x %x %x", getWindowHandle(), func, lParam));
    223223
    224224    for (prop = propertyList; (prop); prop = next)
Note: See TracChangeset for help on using the changeset viewer.