Changeset 8016 for trunk/src


Ignore:
Timestamp:
Feb 26, 2002, 12:12:26 PM (24 years ago)
Author:
sandervl
Message:

GetWindowThreadProcessId changes

Location:
trunk/src/user32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/oslibmsg.cpp

    r7620 r8016  
    1 /* $Id: oslibmsg.cpp,v 1.52 2001-12-12 16:40:43 sandervl Exp $ */
     1/* $Id: oslibmsg.cpp,v 1.53 2002-02-26 11:12:25 sandervl Exp $ */
    22/*
    33 * Window message translation functions for OS/2
    … …  
    607607}
    608608//******************************************************************************
    609 BOOL    _System _O32_PostThreadMessage( DWORD, UINT, WPARAM, LPARAM );
    610 
    611 inline BOOL O32_PostThreadMessage(DWORD a, UINT b, WPARAM c, LPARAM d)
    612 {
    613  BOOL yyrc;
    614  USHORT sel = RestoreOS2FS();
    615 
    616     yyrc = _O32_PostThreadMessage(a, b, c, d);
    617     SetFS(sel);
    618 
    619     return yyrc;
    620 }
    621609//******************************************************************************
    622610BOOL OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode)

  • trunk/src/user32/win32wbase.h

    r7801 r8016  
    1 /* $Id: win32wbase.h,v 1.139 2002-02-05 17:59:01 sandervl Exp $ */
     1/* $Id: win32wbase.h,v 1.140 2002-02-26 11:12:25 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    319319        void    setOwner(Win32BaseWindow *newOwner) { owner = newOwner; };
    320320
     321
     322         DWORD  getThreadId()        { return dwThreadId; };
     323         DWORD  getProcessId()       { return dwProcessId; };
     324
    321325 SCROLLBAR_INFO *getScrollInfo(int nBar);
    322326

  • trunk/src/user32/windlg.cpp

    r7890 r8016  
    1 /* $Id: windlg.cpp,v 1.30 2002-02-12 18:07:21 sandervl Exp $ */
     1/* $Id: windlg.cpp,v 1.31 2002-02-26 11:12:25 sandervl Exp $ */
    22/*
    33 * Win32 dialog apis for OS/2
    … …  
    6969//that gets called before or after dialog creation
    7070//******************************************************************************
    71 static HOOKPROC pfnDialogHook = NULL;
    72 //******************************************************************************
    73 BOOL WIN32API SetDialogHook(HOOKPROC pfnDialogProc)
    74 {
    75     dprintf(("SetDialogHook %x", pfnDialogProc));
    76     pfnDialogHook = pfnDialogProc;
     71static HOOKPROC pfnCustomDialogHook = NULL;
     72//******************************************************************************
     73BOOL WIN32API SetCustomDialogHook(HOOKPROC pfnDialogProc)
     74{
     75    dprintf(("SetCustomDialogHook %x", pfnDialogProc));
     76    pfnCustomDialogHook = pfnDialogProc;
    7777    return TRUE;
    7878}
    7979//******************************************************************************
    8080//******************************************************************************
    81 BOOL WIN32API ClearDialogHook()
    82 {
    83     pfnDialogHook = NULL;
     81BOOL WIN32API ClearCustomDialogHook()
     82{
     83    pfnCustomDialogHook = NULL;
    8484    return TRUE;
    8585}
    … …  
    113113    HWND hwnd = dialog->getWindowHandle();
    114114
    115     if(pfnDialogHook) {
     115    if(pfnCustomDialogHook) {
    116116        dprintf(("Calling Dialog hook for dialog %x", hwnd));
    117         pfnDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
     117        pfnCustomDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
    118118    }
    119119
    … …  
    150150    HWND hwnd = dialog->getWindowHandle();
    151151
    152     if(pfnDialogHook) {
     152    if(pfnCustomDialogHook) {
    153153        dprintf(("Calling Dialog hook for dialog %x", hwnd));
    154         pfnDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
     154        pfnCustomDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
    155155    }
    156156

  • trunk/src/user32/window.cpp

    r7890 r8016  
    1 /* $Id: window.cpp,v 1.120 2002-02-12 18:07:21 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.121 2002-02-26 11:12:26 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    16341634                    return hwnd;
    16351635                }
     1636                hwnd = GetWindow(hwnd, GW_HWNDNEXT);
     1637#if 0
    16361638                //try siblings
    16371639                HWND hwndSibling;
    … …  
    16511653                }
    16521654                hwnd = hwndParent;
     1655#endif
    16531656        }
    16541657    }
    … …  
    18711874//******************************************************************************
    18721875//******************************************************************************
    1873 DWORD WIN32API GetWindowThreadProcessId(HWND hwnd,  PDWORD lpdwProcessId)
    1874 {
    1875     DWORD dwThreadId;
    1876 
    1877     dwThreadId = O32_GetWindowThreadProcessId(Win32ToOS2Handle(hwnd), lpdwProcessId);
    1878     if(dwThreadId == 0) {
    1879         dprintf(("!WARNING! GetWindowThreadProcessId %x failed!!", hwnd));
    1880     }
     1876DWORD WIN32API GetWindowThreadProcessId(HWND hwnd, PDWORD lpdwProcessId)
     1877{
     1878  Win32BaseWindow *window;
     1879  DWORD dwThreadId;
     1880
     1881    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
     1882    if(!window) {
     1883        dprintf(("GetWindowThreadProcessId, window %x not found", hwnd));
     1884        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
     1885        return 0;
     1886    }
     1887    dwThreadId = window->getThreadId();
     1888    if(lpdwProcessId) {
     1889        *lpdwProcessId = window->getProcessId();
     1890    }
     1891    RELEASE_WNDOBJ(window);
     1892   
    18811893    return dwThreadId;
    18821894}
Note: See TracChangeset for help on using the changeset viewer.