Ignore:
Timestamp:
Oct 19, 2011, 11:26:02 AM (14 years ago)
Author:
dmik
Message:

Replace "\" with "/" in include statements.

Location:
branches/gcc-kmk/src/user32
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/gcc-kmk/src/user32/controls/controls.h

    r8543 r21720  
    1010#define __CONTROLS_H
    1111
    12 #include <win\win.h>
     12#include <win/win.h>
    1313#include <heapstring.h>
    1414

  • branches/gcc-kmk/src/user32/loadres.cpp

    r21303 r21720  
    2222#include <heapstring.h>
    2323#include <oslibres.h>
    24 #include <win\virtual.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

  • branches/gcc-kmk/src/user32/msgbox.c

    r10190 r21720  
    88 *
    99 */
    10 #include <win\winbase.h>
    11 #include <win\winuser.h>
     10#include <win/winbase.h>
     11#include <win/winuser.h>
    1212#include <string.h>
    1313#include <dlgs.h>

  • branches/gcc-kmk/src/user32/oslibmsg.cpp

    r21555 r21720  
    4949#include "pmwindow.h"
    5050#include "oslibwin.h"
    51 #include <win\hook.h>
     51#include <win/hook.h>
    5252#include <winscan.h>
    5353#include <winkeyboard.h>

  • branches/gcc-kmk/src/user32/oslibres.h

    r6168 r21720  
    1717#endif
    1818
    19 #include <win\cursoricon.h>
     19#include <win/cursoricon.h>
    2020
    2121#ifdef OS2_INCLUDED

  • branches/gcc-kmk/src/user32/pmwindow.cpp

    r21717 r21720  
    5757#include <oslibdnd.h>
    5858#include <custombuild.h>
    59 #include <win\dbt.h>
     59#include <win/dbt.h>
    6060#include "dragdrop.h"
    6161#include "menu.h"

  • branches/gcc-kmk/src/user32/win32class.cpp

    r10587 r21720  
    3434#include <win32class.h>
    3535#include <win32wnd.h>
    36 #include <win\winproc.h>
     36#include <win/winproc.h>
    3737#include <unicode.h>
    3838

  • branches/gcc-kmk/src/user32/win32dlg.cpp

    r10545 r21720  
    1818#include <misc.h>
    1919#include <win32dlg.h>
    20 #include <win\winproc.h>
     20#include <win/winproc.h>
    2121#include "oslibmsg.h"
    2222#include "oslibwin.h"
    … …  
    202202
    203203    //Mask away WS_CAPTION style for dialogs with DS_CONTROL style
    204     //(necessary for OFN_ENABLETEMPLATE file open dialogs) 
     204    //(necessary for OFN_ENABLETEMPLATE file open dialogs)
    205205    //(verified this behaviour in NT4, SP6)
    206206    if (dlgInfo.style & DS_CONTROL)     cs.style &= ~(WS_CAPTION);
    … …  
    265265
    266266        HWND hwndPreInitFocus = GetFocus();
    267         if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
     267        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param))
    268268        {
    269269            //SvL: Experiments in NT4 show that dialogs that are children don't
    270270            //     receive focus. Not sure if this is always true. (couldn't
    271271            //     find any remarks about this in the SDK docs)
    272             if(!(getStyle() & WS_CHILD)) 
     272            if(!(getStyle() & WS_CHILD))
    273273            {
    274274                /* check where the focus is again,
    … …  
    285285            //     receive focus. Not sure if this is always true. (couldn't
    286286            //     find any remarks about this in the SDK docs)
    287             if(!(getStyle() & WS_CHILD)) 
     287            if(!(getStyle() & WS_CHILD))
    288288            {
    289289                /* If the dlgproc has returned FALSE (indicating handling of keyboard focus)
    … …  
    379379                       HOOK_CallHooksA( WH_MSGFILTER, MSGF_DIALOGBOX, 0,
    380380                                          (LPARAM) pmsg ));
    381                        
     381
    382382                HeapFree( GetProcessHeap(), 0, pmsg );
    383383                if (ret)
    … …  
    11631163
    11641164    /* unblock dialog loop */
    1165     PostMessageA(hwnd, WM_NULL, 0, 0); 
     1165    PostMessageA(hwnd, WM_NULL, 0, 0);
    11661166    return TRUE;
    11671167}

  • branches/gcc-kmk/src/user32/win32wbase.cpp

    r21641 r21720  
    6363#include "controls.h"
    6464#include <wprocess.h>
    65 #include <win\hook.h>
     65#include <win/hook.h>
    6666#include <menu.h>
    6767#define INCL_TIMERWIN32

  • branches/gcc-kmk/src/user32/win32wbasepos.cpp

    r10091 r21720  
    3636#include "dc.h"
    3737#include "win32wdesktop.h"
    38 #include <win\hook.h>
     38#include <win/hook.h>
    3939
    4040#define DBG_LOCALLOG    DBG_win32wbasepos

  • branches/gcc-kmk/src/user32/win32wfake.cpp

    r10038 r21720  
    1414#include <string.h>
    1515#include <dbglog.h>
    16 #include <win\winproc.h>
     16#include <win/winproc.h>
    1717#include <win32wbase.h>
    1818#include <win32wfake.h>

  • branches/gcc-kmk/src/user32/winaccel.cpp

    r10190 r21720  
    1818#include <misc.h>
    1919#include <heapstring.h>
    20 #include <win\winnls.h>
     20#include <win/winnls.h>
    2121
    2222#define DBG_LOCALLOG    DBG_winaccel
    … …  
    2929 * 01:  BYTE    pad             (to WORD boundary)
    3030 * 02:  WORD    event
    31  * 04:  WORD    IDval           
     31 * 04:  WORD    IDval
    3232 * 06:  WORD    pad             (to DWORD boundary)
    3333 */
    … …  
    5454                hRetval = GlobalAlloc(0,sizeof(ACCEL)*nrofaccells);
    5555                accel   = (LPACCEL)GlobalLock(hRetval);
    56        
     56
    5757                for (i=0;i<nrofaccells;i++) {
    5858                        accel[i].fVirt = accel_table[i].fVirt;

  • branches/gcc-kmk/src/user32/windlg.cpp

    r21356 r21720  
    2424#include "win32dlg.h"
    2525#include <heapstring.h>
    26 #include <win\drive.h>
     26#include <win/drive.h>
    2727#include <custombuild.h>
    2828
    … …  
    330330                }
    331331            }
    332         }       
     332        }
    333333    }
    334334#endif

  • branches/gcc-kmk/src/user32/windlgmsg.cpp

    r8968 r21720  
    2222#include "win32dlg.h"
    2323#include <winnls.h>
    24 #include <wine\unicode.h>
     24#include <wine/unicode.h>
    2525
    2626#define DBG_LOCALLOG    DBG_windlgmsg
    … …  
    276276                if (HIWORD(dw) == DC_HASDEFID)
    277277                {
    278                   if (IsWindowEnabled(GetDlgItem(hwndDlg, LOWORD(dw)))) 
     278                  if (IsWindowEnabled(GetDlgItem(hwndDlg, LOWORD(dw))))
    279279                  {
    280280                       SendMessageA( hwndDlg, WM_COMMAND,

  • branches/gcc-kmk/src/user32/window.cpp

    r21347 r21720  
    3939#include "pmwindow.h"
    4040#include "oslibmsg.h"
    41 #include <win\winpos.h>
    42 #include <win\win.h>
     41#include <win/winpos.h>
     42#include <win/win.h>
    4343#include <heapstring.h>
    4444#include <winuser32.h>
    … …  
    155155    }
    156156    HWND hwnd = window->getWindowHandle();
    157  
     157
    158158    // set myself as last active popup / window
    159159    window->setLastActive( hwnd );
    160  
     160
    161161    RELEASE_WNDOBJ(window);
    162162    return hwnd;
    … …  
    262262    }
    263263    HWND hwnd = window->getWindowHandle();
    264  
     264
    265265    // set myself as last active popup / window
    266266    window->setLastActive( hwnd );
    267  
     267
    268268    RELEASE_WNDOBJ(window);
    269269    return hwnd;
    … …  
    300300    }
    301301    hwndActive = window->SetActiveWindow();
    302  
     302
    303303    // check last active popup window
    304304    if (hwndActive)
    … …  
    308308      dprintf(("support for last active popup incorrectly implemented"));
    309309    }
    310  
     310
    311311    RELEASE_WNDOBJ(window);
    312312    return hwndActive;
    … …  
    561561    if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look )
    562562    {
    563         dprintf(("ShowWindow: Initiating OS/2 PM restore"));         
     563        dprintf(("ShowWindow: Initiating OS/2 PM restore"));
    564564        ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle());
    565565    }
    566     else   
     566    else
    567567        ret = window->ShowWindow(nCmdShow);
    568568    RELEASE_WNDOBJ(window);
    … …  
    720720    ret = TRUE;
    721721
    722     if(dwStyle & WS_CHILD) 
     722    if(dwStyle & WS_CHILD)
    723723    {
    724724        //check visibility of parents
    … …  
    762762        //else no child -> no parent (GetParent returns owner otherwise!)
    763763    }
    764     else 
    765     if (type == GA_ROOT) 
     764    else
     765    if (type == GA_ROOT)
    766766    {
    767767         hwndAncestor = window->GetTopParent();
    768768    }
    769769    else
    770     if (type == GA_ROOTOWNER) 
    771     {
    772          if(hwnd != GetDesktopWindow()) 
     770    if (type == GA_ROOTOWNER)
     771    {
     772         if(hwnd != GetDesktopWindow())
    773773         {
    774774             hwndAncestor = hwnd;
    … …  
    804804 TEB *teb;
    805805
    806     dprintf(("SetFocus %x", hwnd));   
     806    dprintf(("SetFocus %x", hwnd));
    807807    teb = GetThreadTEB();
    808808    if(teb == NULL) {
    … …  
    929929    lpThreadInfo->hwndActive  = GetActiveWindow();
    930930    if(lpThreadInfo->hwndActive) {
    931         if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 
     931        if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL))
    932932        {//this thread doesn't own the active window (TODO: correct??)
    933933            lpThreadInfo->hwndActive = 0;
    … …  
    980980         windowDesktop->addRef();
    981981         window = windowDesktop;
    982     }     
     982    }
    983983    else window = Win32BaseWindow::GetWindowFromHandle(hwnd);
    984      
     984
    985985    if(!window) {
    986986        dprintf(("GetWindowRect, window %x not found", hwnd));
    … …  
    11041104 *      InternalGetWindowText    (USER32.326)
    11051105 */
    1106 int WIN32API InternalGetWindowText(HWND hwnd, 
     1106int WIN32API InternalGetWindowText(HWND hwnd,
    11071107                                   LPWSTR lpString,
    11081108                                   INT    nMaxCount )
    … …  
    12741274        windowDesktop->addRef();
    12751275        wndfrom = windowDesktop;
    1276     } 
     1276    }
    12771277    else {
    12781278        wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom);
    … …  
    12881288        windowDesktop->addRef();
    12891289        wndto = windowDesktop;
    1290     } 
     1290    }
    12911291    else {
    12921292        wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo);
    … …  
    18871887        {
    18881888//            WND *wndPtr = WIN_FindWndPtr(hwndChild);
    1889            
     1889
    18901890//            WINPOS_ShowIconTitle( wndPtr, FALSE );
    1891                
     1891
    18921892            SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
    18931893                            y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
    … …  
    20032003
    20042004  owner = Win32BaseWindow::GetWindowFromHandle(hWnd);
    2005   if(!owner) 
     2005  if(!owner)
    20062006  {
    20072007    dprintf(("GetLastActivePopup, window %x not found", hWnd));
    … …  
    20132013  if (!IsWindow( hwndRetVal ))
    20142014    hwndRetVal = owner->getWindowHandle();
    2015  
     2015
    20162016  RELEASE_WNDOBJ(owner);
    2017  
     2017
    20182018  return hwndRetVal;
    20192019}
    … …  
    20362036    }
    20372037    RELEASE_WNDOBJ(window);
    2038    
     2038
    20392039    return dwThreadId;
    20402040}
    … …  
    22202220}
    22212221//******************************************************************************
    2222 //The GetWindowModuleFileName function retrieves the full path and file name of 
     2222//The GetWindowModuleFileName function retrieves the full path and file name of
    22232223//the module associated with the specified window handle.
    22242224//******************************************************************************

  • branches/gcc-kmk/src/user32/winicon.cpp

    r21356 r21720  
    4747#include <string.h>
    4848#include <winicon.h>
    49 #include <win\cursoricon.h>
     49#include <win/cursoricon.h>
    5050#include <objhandle.h>
    5151#include "dib.h"
    5252#include <heapstring.h>
    53 #include <win\virtual.h>
     53#include <win/virtual.h>
    5454#include "initterm.h"
    5555#include "oslibres.h"
    … …  
    200200
    201201        /* Transfer the bitmap bits to the CURSORICONINFO structure */
    202         if(bmpAnd.bmBitsPixel > 1) 
     202        if(bmpAnd.bmBitsPixel > 1)
    203203        {//Our code expects b&w masks, so convert it first
    204204         //We could also use GetDIBits to do the conversion for us, but it returns
    … …  
    216216
    217217            //blit to the destination HDC & convert to 1bpp
    218             BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight, 
     218            BitBlt(hdcDest, 0, 0, bmpAnd.bmWidth, bmpAnd.bmHeight,
    219219                   hdcSrc, 0, 0, SRCCOPY);
    220220
    … …  
    442442    if(hActiveCursorPM && hActiveCursorPM != OSLibWinQueryPointer()) {
    443443       dprintf(("Another app changed mouse cursor"));
    444        hActiveCursorPM = hActiveCursor = 0; 
     444       hActiveCursorPM = hActiveCursor = 0;
    445445    }
    446446    return hActiveCursor;
    … …  
    593593    bmpXor.bmBitsPixel  = info->bBitsPerPixel;
    594594    bmpXor.bmBits       = NULL;
    595     ((CURSORICONINFO *)ptr)->hColorBmp = 
     595    ((CURSORICONINFO *)ptr)->hColorBmp =
    596596          OSLibWinCreatePointer(info, (char *)lpANDbits, (LPBITMAP_W)&bmpAnd, (char *)lpXORbits, (LPBITMAP_W)&bmpXor, fIcon == FALSE);
    597597#endif
    … …  
    10851085//SvL: Must use CreateBitmap here as CreateDIBitmap converts data to 8bpp (GetObjectA info -> 8 bpp)
    10861086#if 1
    1087                     int linewidth; 
     1087                    int linewidth;
    10881088                    int orglinewidth;
    10891089

  • branches/gcc-kmk/src/user32/winmouse.cpp

    r21502 r21720  
    3232#include <commctrl.h>
    3333#include <debugtools.h>
    34 #include <win\mouse.h>
     34#include <win/mouse.h>
    3535#include "winmouse.h"
    3636#include "oslibmsg.h"

  • branches/gcc-kmk/src/user32/winproc.cpp

    r10602 r21720  
    1818#include <string.h>
    1919#include "callwrap.h"
    20 #include <win\winproc.h>
    21 #include <win\debugtools.h>
     20#include <win/winproc.h>
     21#include <win/debugtools.h>
    2222#include <heapcode.h>
    2323#include "win32wbase.h"
    … …  
    307307    }
    308308    else  dprintf2(("CallWindowProcA %x %x %x %x %x (unknown proc)", func, hwnd, msg, wParam, lParam));
    309    
     309
    310310    if(!IsWindow(hwnd)) {
    311311        dprintf2(("CallWindowProcA, window %x not found", hwnd));

  • branches/gcc-kmk/src/user32/wndmsg.cpp

    r10511 r21720  
    1313#include <stdio.h>
    1414#include <string.h>
    15 #include <win\winmfcmsg.h>
     15#include <win/winmfcmsg.h>
    1616#include <spy.h>
    1717#include "wndmsg.h"
Note: See TracChangeset for help on using the changeset viewer.