Changeset 8132 for trunk/src


Ignore:
Timestamp:
Mar 28, 2002, 5:20:07 PM (23 years ago)
Author:
sandervl
Message:

customization updates

Location:
trunk/src/user32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/HOOK.CPP

    r7875 r8132  
    1 /* $Id: HOOK.CPP,v 1.35 2002-02-11 16:05:58 sandervl Exp $ */
     1/* $Id: HOOK.CPP,v 1.36 2002-03-28 16:20:06 sandervl Exp $ */
    22
    33/*
    … …  
    861861                          ? TRUE : FALSE);
    862862}
     863
     864#ifdef __WIN32OS2__
     865//******************************************************************************
     866//Custom Odin hooks
     867static HOOKPROC pfnOdinHook = NULL;
     868//******************************************************************************
     869HHOOK WIN32API SetOdinHookA(HOOKPROC proc )
     870{
     871    if(pfnOdinHook) DebugInt3();
     872
     873    pfnOdinHook = proc;
     874    return (HHOOK)proc;
     875}
     876//******************************************************************************
     877//******************************************************************************
     878BOOL WIN32API UnhookOdinHook(HHOOK hhook)
     879{
     880    pfnOdinHook = NULL;
     881    return TRUE;
     882}
     883//******************************************************************************
     884//******************************************************************************
     885LRESULT HOOK_CallOdinHookA(INT code, WPARAM wParam, LPARAM lParam)
     886{
     887    if(pfnOdinHook) {
     888        return pfnOdinHook(code, wParam, lParam);
     889    }
     890    return 0;
     891}
     892//******************************************************************************
     893//******************************************************************************
     894#endif //__WIN32OS2__

  • trunk/src/user32/win32wbase.cpp

    r8126 r8132  
    1 /* $Id: win32wbase.cpp,v 1.320 2002-03-27 10:56:25 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.321 2002-03-28 16:20:06 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    4646#include <heapstring.h>
    4747#include <winuser32.h>
     48#include <custombuild.h>
    4849#include "win32wbase.h"
    4950#include "wndmsg.h"
    … …  
    638639        if(ret)
    639640        {
    640             dprintf(("CBT-hook returned 0!!"));
     641            dprintf(("CBT-hook returned non-0 !!"));
    641642            SetLastError(ERROR_CAN_NOT_COMPLETE); //todo: wrong error
    642643            return FALSE;
    … …  
    904905            if (!(getStyle() & WS_CHILD) && !owner)
    905906                HOOK_CallHooksA(WH_SHELL, HSHELL_WINDOWCREATED, getWindowHandle(), 0);
     907
     908            //Call custom Odin hook for window creation (for all windows)
     909            HOOK_CallOdinHookA(HODIN_WINDOWCREATED, hwnd, 0);
    906910
    907911            SetLastError(0);

  • trunk/src/user32/windlg.cpp

    r8016 r8132  
    1 /* $Id: windlg.cpp,v 1.31 2002-02-26 11:12:25 sandervl Exp $ */
     1/* $Id: windlg.cpp,v 1.32 2002-03-28 16:20:07 sandervl Exp $ */
    22/*
    33 * Win32 dialog apis for OS/2
    … …  
    6666}
    6767//******************************************************************************
    68 //This function can be used by a custom Odin build to register a hook procedure
    69 //that gets called before or after dialog creation
    70 //******************************************************************************
    71 static HOOKPROC pfnCustomDialogHook = NULL;
    72 //******************************************************************************
    73 BOOL WIN32API SetCustomDialogHook(HOOKPROC pfnDialogProc)
    74 {
    75     dprintf(("SetCustomDialogHook %x", pfnDialogProc));
    76     pfnCustomDialogHook = pfnDialogProc;
    77     return TRUE;
    78 }
    79 //******************************************************************************
    80 //******************************************************************************
    81 BOOL WIN32API ClearCustomDialogHook()
    82 {
    83     pfnCustomDialogHook = NULL;
    84     return TRUE;
    85 }
    86 //******************************************************************************
    8768//******************************************************************************
    8869HWND WIN32API CreateDialogIndirectParamA(HINSTANCE hInst,
    … …  
    11293    }
    11394    HWND hwnd = dialog->getWindowHandle();
    114 
    115     if(pfnCustomDialogHook) {
    116         dprintf(("Calling Dialog hook for dialog %x", hwnd));
    117         pfnCustomDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
    118     }
     95    HOOK_CallOdinHookA(HODIN_POSTDIALOGCREATION, hwnd, 0);
    11996
    12097    RELEASE_WNDOBJ(dialog);
    … …  
    150127    HWND hwnd = dialog->getWindowHandle();
    151128
    152     if(pfnCustomDialogHook) {
    153         dprintf(("Calling Dialog hook for dialog %x", hwnd));
    154         pfnCustomDialogHook(HCUSTOM_POSTDIALOGCREATION, hwnd, 0);
    155     }
     129    HOOK_CallOdinHookA(HODIN_POSTDIALOGCREATION, hwnd, 0);
    156130
    157131    RELEASE_WNDOBJ(dialog);
Note: See TracChangeset for help on using the changeset viewer.