Changeset 1522
- Timestamp:
- Oct 30, 1999, 5:16:58 PM (26 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
changelog (modified) (8 diffs)
-
src/user32/oslibwin.cpp (modified) (3 diffs)
-
src/user32/pmwindow.cpp (modified) (7 diffs)
-
src/user32/pmwindow.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/changelog
r1517 r1522 1 /* $Id: changelog,v 1.386 1999-10-30 10:56:51 sandervl Exp $ */ 1 /* $Id: changelog,v 1.387 1999-10-30 15:16:55 dengert Exp $ */ 2 3 99-10-30: Daniela Engert <dani@ngrt.de> 4 - USER32: Fixed missing repaints for transparent windows (VPBuddy!) 2 5 3 6 99-10-30: Sander van Leeuwen <sandervl@xs4all.nl> … … 6 9 99-10-30: Edgar Buerkle <Edgar.Buerkle@gmx.net> 7 10 - USER32: Port Wine ascii <-> unicode message conversion for user32 controls 8 11 (Wine controls only support ascii msgs) 9 12 10 13 99-10-30: Jens Wiessner <wiessnej@rfi.de> … … 16 19 99-10-29: Sander van Leeuwen <sandervl@xs4all.nl> 17 20 - USER32: Changed font size multiply factor, negated it and fixed 18 19 20 21 default dialog unit bug. 22 Fixed MDI destroy bug 23 WM_SETICON bugfix. 21 24 22 25 99-10-29: Sander van Leeuwen <sandervl@xs4all.nl> 23 26 Rene Pronk<R.Pronk@twi.tudelft.nl> 24 27 - USER32: Focus fixes. Activate a window when it receives a button click message. 25 28 26 29 99-10-29 Markus Montkowski <mmontkowski@gmx.de> 27 28 30 - DDRAW: Changed logging, loginfo now in odin32_x.log for the first time... 31 29 32 99-10-28: Edgar Buerkle <Edgar.Buerkle@gmx.net> 30 33 - USER32: LoadBitmapW fix 31 32 33 34 35 36 34 ModifyMenuW/InsertMenuW fixes. 35 Call CallWindowProcA/W in Send(Internal)MessageA/W 36 (in preparation of Wine unicode msg translation port) 37 Always call default window handler for WM_PAINT. Apparently 38 there are apps that return 0, but don't call BeginPaint. 39 Added extra messages for msg translation. 37 40 38 41 99-10-28: Sander van Leeuwen <sandervl@xs4all.nl> … … 40 43 41 44 - makefiles: Added nodebuginfo build option to build debug binaries 42 43 45 without debug information. (for upcoming alpha release) 46 44 47 - KERNEL32: GetVersion fix. Low byte = major version, high byte = minor version 45 46 47 48 a backslash. 49 50 48 Destroyed shared heap on dll unload (refcount == 0) 49 Shared heap fixes. 50 GetWindowsDirectory & GetSystemDirectory return string that don't end with 51 a backslash. 52 Fixed loading of dlls without .dll extension. 53 Fixed OSLibStripPath. 51 54 52 55 - USER32: Fixed style conversion (use dwStyle, not cs->style, same for dwExStyle) 53 54 55 56 56 -> title bar in prof. minesweeper 57 Fixed bug in pmframe WM_WINDOWPOSCHANGED handler (didn't restore OS/2 58 selector before returning) 59 Don't delete global window classes. 57 60 Removed shared heap, use the one in kernel32 instead. 58 61 Fixed OSLibSetStyle & SetWindowLong for GWL_STYLE (wrong style used) 59 62 Fixed win32 to OS/2 style conversion (DLG frame) 60 61 62 63 Fix for timer messages in apps that use PeekMessage/DispatchMessage 64 instead of GetMessage/DispatchMessage. 65 Translation of extra messages. 63 66 64 67 99-10-28: Jens Wiessner <wiessnej@rfi.de> … … 70 73 71 74 99-10-27: knut st. osmundsen <knut.stange.osmundsen@pmsc.no> 72 73 75 - WIN32K: It's working! At least on my testmachine running 76 the WSeB astrict UNI kernel and the Warp 4 astrict kernel. 74 77 75 78 99-10-27: Sander van Leeuwen <sandervl@xs4all.nl> 76 79 - KERNEL32: If dll can't be found, look in directory of kernel32 (PE loader) 77 78 79 80 81 82 80 Fixed iLoadLibrary (added .dll if it couldn't find this string in 81 the module name; now only does that if it can't find a '.') 82 Implemented WinExec using CreateProcessA. 83 Fixed file mapping view lookup bug. Views are now again stored 84 in per-process data segment. 85 Delete process memory maps in exitlist too. 83 86 - KERNEL32: Fixed bug in icon conversion (rgb only for <= 8bpp) 84 85 86 87 Added support for color cursors (needs more testing but seems to work) 88 - USER32: Added support for color cursors 89 Fix for class lookup in CreateWindowExA/W 87 90 88 91 99-10-26: Sander van Leeuwen <sandervl@xs4all.nl> 89 92 - USER32: Fixed bugs in menu apis (Append/InsertMenuA/W) 90 91 92 93 93 Fixed InsertMenuItemA/W. 94 Finished up Patrick's work -> regedit menus now correct 95 In winmenu call only ODIN_* menu apis; decreases amount of 96 logging and increases speed. 94 97 95 98 - KERNEL32: Removed menu resource + non-used resource methods 96 97 98 99 Fixed FS selector corruption in GetLocaleInfoA/W (use 100 ODINFUNCTION wrapper as it calls a OS/2 unicode api that has no 101 FS wrapper) 99 102 100 103 - PELDR: Increased stack from 192k to 640k (Quake 2 ran out of stack) 101 104 - DSOUND/DDRAW: Fixed FS selector corruption in logging procedures 102 103 104 105 105 ---> Quake 2 works again (Yeah! :) ) 106 NOTE: Quake 2 3.20 only starts the first time. Seems to change something 107 in the config.cfg file that crashes it the next time you run it. 108 (workaround: save original config.sys and restore it afterwards) 106 109 107 110 99-10-26: Patrick Haller <phaller@gmx.net> … … 111 114 99-10-25: Sander van Leeuwen <sandervl@xs4all.nl> 112 115 - USER32: Removed SetFocus call in Edit control (WM_LBUTTONDOWN) 113 114 115 116 117 118 116 Virtual key translation table change (VK_RETURN (PM) -> 0x0A 117 VK_ENTER (PM_ -> 0x0A (VK_RETURN)) 118 (fixes problems in edit control, but might not be a good fix) 119 Never call default window handler (PM) after WM_CHAR -> 120 PM sends the WM_CHAR to the owner window -> focus changes 121 in notepad. 119 122 - USER32: (menus) 120 121 123 Rewrote LoadMenuIndirectA/W to use OS/2 apis 124 Implemented GetMenuInfo & SetMenuInfo (just store new info; nothing else done) 122 125 Implemented GetMenuContextHelpId/SetMenuContextHelpId 123 126 (based on Wine build 990815) 124 125 127 Partially implemented GetMenuItemInfo. 128 NOTE: Needs a complete rewrite. 126 129 127 130 - INCLUDE\win\commctrl.h: 128 131 Changed back calling convention of callback handlers to CALLBACK. 129 132 -> fixes crashes in SHELL32 (DPASearch calls) 130 133 131 134 99-10-25: Achim Hasenmueller <achimha@innotek.de> 132 133 135 - KERNEL32: Added ReinitializeCriticalSection, ported WINE code 136 for this function and UninitializeCriticalSection 134 137 135 138 99-10-25: Patrick Haller <phaller@gmx.net> … … 140 143 141 144 99-10-25: Markus Montkowski <mmontkowski@gmx.de> 142 143 144 145 145 - DDRAW: Fixed bug in Color conversion of surfaces DDEX1.EXE now works, 146 Get/ReleaseDC functions are working, but problem 147 with Bitmap orientation DDRAW surfaces are TopDown DCs Bmps are BottomUp 148 this neeeds to be solved (any way to create a TopDown DC Bmp?) 146 149 147 150 99-10-24: Sander van Leeuwen <sandervl@xs4all.nl> 148 151 - USER32: MDI window fixes (mdi children correctly activated; menus inserted) 149 152 Bugfix in WM_GETTEXT of Edit control (wrong string length) 150 153 Only create global classes when CS_GLOBALCLASS flag specified 151 152 153 154 154 Create system classes only every first time user32 is loaded 155 and only unregister them when the last win32 app quits. 156 Converted all OS/2 bitmaps to windows format and put them in user32.rc 157 (deleted all bmp files) 155 158 - USER32, 156 157 158 159 160 159 COMCTL32, 160 SHELL32: Don't check if control atom already exists, always register 161 control. 162 NOTE: Global classes have a global atom, but the class objects 163 are NOT shared! (so you must recreate them for every app) 161 164 162 165 - KERNEL32: Implemented shared memory mapped files (SDK memory sample 163 164 165 166 works for shared memory; haven't tested files and it requires 167 more testing!) 168 Added shared heap code for memory mapped objects 166 169 167 170 99-10-24: Daniela Engert <dani@ngrt.de> … … 175 178 99-10-23: Sander van Leeuwen <sandervl@xs4all.nl> 176 179 - USER32: Put back WM_ADJUSTWINDOWPOS/WINDOWPOSCHANGED into pmwindow.cpp 177 178 179 180 181 182 180 Put message logging procedure in wndmsg.cpp. 181 Don't log WM_KICKIDLE & WM_NCHITTEST messages. (sent too often) 182 Don't set capture to listbox window in comboboxes (after lbuttonup) 183 Use wrc to compile USER32 resources + added version resource 184 Fixed PMFRAME window position handlers and put them back. 185 (comboboxes now displayed properly) 183 186 184 187 - KERNEL32: Write logfiles to directory of kernel32 if executable is on 185 186 187 188 188 readonly device. 189 Fixed CreateProcess. 190 Added support for GetVersionSize/GetVersionStruct for images 191 that aren't loaded. (LX or PE; PE not tested!) 189 192 - DSOUND: Made it compile again. (always pretends there's no soundcard in the system) 190 193 - SHELL32/COMCTL32: Changed file description in version resource -
trunk/src/user32/oslibwin.cpp
r1511 r1522 1 /* $Id: oslibwin.cpp,v 1.3 8 1999-10-29 16:06:55 cbratschiExp $ */1 /* $Id: oslibwin.cpp,v 1.39 1999-10-30 15:16:58 dengert Exp $ */ 2 2 /* 3 3 * Window API wrappers for OS/2 … … 69 69 ULONG dwClientStyle; 70 70 71 #if 0 71 72 // if(dwFrameStyle || hwndParent == HWND_DESKTOP) { 72 73 dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS); … … 89 90 dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB()))); 90 91 return 0; 92 #else 93 BOOL TopLevel = hwndParent == HWND_DESKTOP; 94 FRAMECDATA FCData = {sizeof (FRAMECDATA), 0, 0, 0}; 95 96 dwClientStyle = dwWinStyle & ~(WS_TABSTOP | WS_GROUP | WS_CLIPSIBLINGS); 97 98 dwFrameStyle |= FCF_NOBYTEALIGN; 99 if (hwndParent == HWND_DESKTOP && dwFrameStyle & FCF_TITLEBAR) { 100 dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER; 101 } 102 103 dwWinStyle &= ~(WS_CLIPCHILDREN | WS_CLIPSIBLINGS); 104 FCData.flCreateFlags = dwFrameStyle; 105 106 *hwndFrame = WinCreateWindow (hwndParent, 107 TopLevel ? WC_FRAME : WIN32_INNERFRAME, 108 pszName, dwWinStyle, 0, 0, 50, 30, 109 hwndParent, HWND_TOP, id, &FCData, NULL); 110 if (*hwndFrame) { 111 hwndClient = WinCreateWindow (*hwndFrame, WIN32_STDCLASS, 112 NULL, dwClientStyle, 0, 0, 0, 0, 113 *hwndFrame, HWND_TOP, FID_CLIENT, NULL, NULL); 114 if (hwndClient != NULLHANDLE) 115 WinSendMsg (*hwndFrame, WM_UPDATEFRAME, 0, 0); 116 return hwndClient; 117 } 118 dprintf(("OSLibWinCreateWindow: (FRAME) WinCreateStdWindow failed (%x)", WinGetLastError(GetThreadHAB()))); 119 return 0; 120 #endif 121 91 122 #if 0 92 123 } -
trunk/src/user32/pmwindow.cpp
r1504 r1522 1 /* $Id: pmwindow.cpp,v 1.4 7 1999-10-28 22:41:01 sandervlExp $ */1 /* $Id: pmwindow.cpp,v 1.48 1999-10-30 15:16:57 dengert Exp $ */ 2 2 /* 3 3 * Win32 Window Managment Code for OS/2 … … 117 117 BOOL InitPM() 118 118 { 119 CLASSINFO FrameClassInfo; 120 119 121 hab = WinInitialize(0); 120 122 dprintf(("Winitialize returned %x", hab)); … … 152 154 (PFNWP)Win32WindowProc, /* Address of window procedure */ 153 155 // CS_SIZEREDRAW | CS_HITTEST | CS_MOVENOTIFY, 154 CS_SIZEREDRAW | CS_HITTEST ,156 CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT, 155 157 NROF_WIN32WNDBYTES)) { 156 158 dprintf(("WinRegisterClass Win32BaseWindow failed")); 157 159 return(FALSE); 160 } 161 if (!WinQueryClassInfo (hab, WC_FRAME, &FrameClassInfo)) { 162 dprintf (("WinQueryClassInfo WC_FRAME failed")); 163 return (FALSE); 164 } 165 FrameClassInfo.flClassStyle &= ~(CS_PUBLIC | CS_CLIPSIBLINGS); 166 if (!WinRegisterClass (hab, 167 WIN32_INNERFRAME, 168 FrameClassInfo.pfnWindowProc, 169 FrameClassInfo.flClassStyle, 170 FrameClassInfo.cbWindowData)) { 171 dprintf (("WinRegisterClass Win32InnerFrame failed")); 172 return (FALSE); 158 173 } 159 174 … … 664 679 keyWasPressed = ((SHORT1FROMMP (mp1) & KC_PREVDOWN) == KC_PREVDOWN); 665 680 666 681 dprintf(("PM: WM_CHAR: %x %x %d %x", SHORT1FROMMP(mp2), SHORT2FROMMP(mp2), repeatCount, scanCode)); 667 682 // both WM_KEYUP & WM_KEYDOWN want a virtual key, find the right Win32 virtual key 668 683 // given the OS/2 virtual key and OS/2 character … … 738 753 ULONG keyflags = 0, vkey = 0; 739 754 ULONG fl = SHORT1FROMMP(mp1); 740 755 ULONG chCode = SHORT1FROMMP(mp2); 741 756 742 757 if(!(fl & KC_CHAR)) { 743 758 //SvL: Test 744 759 break; 745 760 // goto RunDefWndProc; 746 761 } 747 762 if(fl & KC_VIRTUALKEY) { 748 749 750 751 763 if(virtualKey) 764 vkey = virtualKey; 765 else vkey = SHORT2FROMMP(mp2); 766 chCode = vkey; 752 767 } 753 768 if(fl & KC_KEYUP) { … … 786 801 ULONG id; 787 802 788 803 dprintf(("OS2: WM_TIMER %x %d", hwnd, mp1)); 789 804 if (TIMER_GetTimerInfo(hwnd,(ULONG)mp1,&sys,&id)) 790 805 { … … 856 871 goto RunDefWndProc; 857 872 } 858 873 //Apparently there are apps that return 0, but don't do anything during WM_PAINT 859 874 goto RunDefWndProc; 860 875 -
trunk/src/user32/pmwindow.h
r1333 r1522 1 /* $Id: pmwindow.h,v 1. 2 1999-10-17 12:17:44 cbratschiExp $ */1 /* $Id: pmwindow.h,v 1.3 1999-10-30 15:16:57 dengert Exp $ */ 2 2 /* 3 3 * Win32 Window Managment Code for OS/2 … … 9 9 #define __PMWINDOW_H__ 10 10 11 #define WIN32_STDCLASS "Win32WindowClass" 11 #define WIN32_STDCLASS "Win32WindowClass" 12 #define WIN32_INNERFRAME "Win32InnerFrameClass" 12 13 13 14 BOOL InitPM();
Note:
See TracChangeset
for help on using the changeset viewer.
