Author: fireball Date: Fri Jul 17 21:42:17 2009 New Revision: 42018
URL: http://svn.reactos.org/svn/reactos?rev=42018&view=rev Log: - Make user32 compile, part 1.
Added: branches/arwinss/reactos/dll/win32/user32/resources/user32.rc (with props) Modified: branches/arwinss/reactos/dll/win32/user32/button.c branches/arwinss/reactos/dll/win32/user32/combo.c branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/defdlg.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/listbox.c branches/arwinss/reactos/dll/win32/user32/lstr.c branches/arwinss/reactos/dll/win32/user32/mdi.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/scroll.c branches/arwinss/reactos/dll/win32/user32/static.c branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/dll/win32/user32/uitools.c branches/arwinss/reactos/dll/win32/user32/user32.rbuild branches/arwinss/reactos/dll/win32/user32/user_private.h branches/arwinss/reactos/dll/win32/user32/win.c
Modified: branches/arwinss/reactos/dll/win32/user32/button.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/button.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/button.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -461,7 +461,9 @@ InvalidateRect( hWnd, NULL, FALSE ); break;
+#ifndef __REACTOS__ case BM_SETSTYLE16: +#endif case BM_SETSTYLE: if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; @@ -499,11 +501,15 @@ case BM_GETIMAGE: return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET );
+#ifndef __REACTOS__ case BM_GETCHECK16: +#endif case BM_GETCHECK: return get_button_state( hWnd ) & 3;
+#ifndef __REACTOS__ case BM_SETCHECK16: +#endif case BM_SETCHECK: if (wParam > maxCheckState[btn_type]) wParam = maxCheckState[btn_type]; state = get_button_state( hWnd ); @@ -522,11 +528,15 @@ BUTTON_CheckAutoRadioButton( hWnd ); break;
+#ifndef __REACTOS__ case BM_GETSTATE16: +#endif case BM_GETSTATE: return get_button_state( hWnd );
+#ifndef __REACTOS__ case BM_SETSTATE16: +#endif case BM_SETSTATE: state = get_button_state( hWnd ); if (wParam)
Modified: branches/arwinss/reactos/dll/win32/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/combo.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/combo.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -2044,9 +2044,11 @@
/* Combo messages */
+#ifndef __REACTOS__ case CB_ADDSTRING16: if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_ADDSTRING: if( unicode ) { @@ -2077,10 +2079,12 @@ HeapFree(GetProcessHeap(), 0, string); return ret; } +#ifndef __REACTOS__ case CB_INSERTSTRING16: wParam = (INT)(INT16)wParam; if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_INSERTSTRING: if( unicode ) { @@ -2099,43 +2103,51 @@
return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); } - case CB_DELETESTRING16: case CB_DELETESTRING: return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); +#ifndef __REACTOS__ case CB_SELECTSTRING16: wParam = (INT)(INT16)wParam; if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_SELECTSTRING: return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); +#ifndef __REACTOS__ case CB_FINDSTRING16: wParam = (INT)(INT16)wParam; if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_FINDSTRING: return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); +#ifndef __REACTOS__ case CB_FINDSTRINGEXACT16: wParam = (INT)(INT16)wParam; if( CB_HASSTRINGS(lphc) ) lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_FINDSTRINGEXACT: return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); +#ifndef __REACTOS__ case CB_SETITEMHEIGHT16: wParam = (INT)(INT16)wParam; /* signed integer */ /* fall through */ +#endif case CB_SETITEMHEIGHT: return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); +#ifndef __REACTOS__ case CB_GETITEMHEIGHT16: wParam = (INT)(INT16)wParam; /* fall through */ +#endif case CB_GETITEMHEIGHT: if( (INT)wParam >= 0 ) /* listbox item */ return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); return CBGetTextAreaHeight(hwnd, lphc); - case CB_RESETCONTENT16: case CB_RESETCONTENT: SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) ) @@ -2166,6 +2178,7 @@ if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && (INT)wParam < 32768 ) lphc->droppedWidth = (INT)wParam; return CB_ERR; +#ifndef __REACTOS__ case CB_GETDROPPEDCONTROLRECT16: lParam = (LPARAM)MapSL(lParam); if( lParam ) @@ -2179,19 +2192,20 @@ r16->bottom = r.bottom; } return CB_OKAY; +#endif case CB_GETDROPPEDCONTROLRECT: if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); return CB_OKAY; - case CB_GETDROPPEDSTATE16: case CB_GETDROPPEDSTATE: return (lphc->wState & CBF_DROPPED) ? TRUE : FALSE; +#ifndef __REACTOS__ case CB_DIR16: return SendMessageA(lphc->hWndLBox, LB_DIR16, wParam, lParam); +#endif case CB_DIR: return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam);
- case CB_SHOWDROPDOWN16: case CB_SHOWDROPDOWN: if( CB_GETTYPE(lphc) != CBS_SIMPLE ) { @@ -2205,15 +2219,15 @@ CBRollUp( lphc, FALSE, TRUE ); } return TRUE; - case CB_GETCOUNT16: case CB_GETCOUNT: return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); - case CB_GETCURSEL16: case CB_GETCURSEL: return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); +#ifndef __REACTOS__ case CB_SETCURSEL16: wParam = (INT)(INT16)wParam; /* fall through */ +#endif case CB_SETCURSEL: lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); if( lParam >= 0 ) @@ -2226,44 +2240,52 @@ InvalidateRect(lphc->self, &lphc->textRect, TRUE); lphc->wState &= ~CBF_SELCHANGE; return lParam; +#ifndef __REACTOS__ case CB_GETLBTEXT16: wParam = (INT)(INT16)wParam; lParam = (LPARAM)MapSL(lParam); /* fall through */ +#endif case CB_GETLBTEXT: return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); +#ifndef __REACTOS__ case CB_GETLBTEXTLEN16: wParam = (INT)(INT16)wParam; /* fall through */ +#endif case CB_GETLBTEXTLEN: return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); +#ifndef __REACTOS__ case CB_GETITEMDATA16: wParam = (INT)(INT16)wParam; /* fall through */ +#endif case CB_GETITEMDATA: return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); +#ifndef __REACTOS__ case CB_SETITEMDATA16: wParam = (INT)(INT16)wParam; /* fall through */ +#endif case CB_SETITEMDATA: return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); +#ifndef __REACTOS__ case CB_GETEDITSEL16: wParam = lParam = 0; /* just in case */ /* fall through */ +#endif case CB_GETEDITSEL: /* Edit checks passed parameters itself */ if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); return CB_ERR; - case CB_SETEDITSEL16: case CB_SETEDITSEL: if( lphc->wState & CBF_EDIT ) return SendMessageW(lphc->hWndEdit, EM_SETSEL, (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) ); return CB_ERR; - case CB_SETEXTENDEDUI16: case CB_SETEXTENDEDUI: if( CB_GETTYPE(lphc) == CBS_SIMPLE ) return CB_ERR; @@ -2271,7 +2293,6 @@ lphc->wState |= CBF_EUI; else lphc->wState &= ~CBF_EUI; return CB_OKAY; - case CB_GETEXTENDEDUI16: case CB_GETEXTENDEDUI: return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO:
Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1412,6 +1412,7 @@ /*********************************************************************** * CreateIcon (USER.407) */ +#ifndef __REACTOS__ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth, INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel, LPCVOID lpANDbits, LPCVOID lpXORbits ) @@ -1431,6 +1432,7 @@
return CreateCursorIconIndirect16( hInstance, &info, lpANDbits, lpXORbits ); } +#endif
/*********************************************************************** @@ -1926,6 +1928,7 @@ /********************************************************************** * GetIconID (USER.455) */ +#ifndef __REACTOS__ WORD WINAPI GetIconID16( HGLOBAL16 hResource, DWORD resType ) { LPBYTE lpDir = GlobalLock16(hResource); @@ -1971,7 +1974,7 @@ return HICON_16(CreateIconFromResourceEx( bits, 0, TRUE, bNew ? 0x00030000 : 0x00020000, 0, 0, LR_DEFAULTCOLOR)); } - +#endif /*********************************************************************** * LoadCursorW (USER32.@) */
Modified: branches/arwinss/reactos/dll/win32/user32/defdlg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -373,6 +373,7 @@ /*********************************************************************** * DefDlgProc (USER.308) */ +#ifndef __REACTOS__ LRESULT WINAPI DefDlgProc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ) { @@ -421,6 +422,7 @@ } return DEFDLG_Epilog( hwnd32, msg, result); } +#endif
/***********************************************************************
Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -334,6 +334,7 @@ { INT ret;
+#ifndef __REACTOS__ if (es->word_break_proc16) { HGLOBAL16 hglob16; SEGPTR segptr; @@ -355,7 +356,9 @@ GlobalUnlock16(hglob16); GlobalFree16(hglob16); } - else if (es->word_break_proc) + else +#endif + if (es->word_break_proc) { if(es->is_unicode) { @@ -4229,7 +4232,6 @@ * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ - case EM_GETTHUMB16: { LRESULT ret; if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_HSCROLL) @@ -4243,11 +4245,12 @@ TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } +#ifndef __REACTOS__ case EM_LINESCROLL16: TRACE("EM_LINESCROLL16\n"); dx = pos; break; - +#endif default: ERR("undocumented WM_HSCROLL action %d (0x%04x), please report\n", action, action); @@ -4353,7 +4356,6 @@ * although it's also a regular control message. */ case EM_GETTHUMB: /* this one is used by NT notepad */ - case EM_GETTHUMB16: { LRESULT ret; if(GetWindowLongW( es->hwndSelf, GWL_STYLE ) & WS_VSCROLL) @@ -4367,10 +4369,6 @@ TRACE("EM_GETTHUMB: returning %ld\n", ret); return ret; } - case EM_LINESCROLL16: - TRACE("EM_LINESCROLL16 %d\n", pos); - dy = pos; - break;
default: ERR("undocumented WM_VSCROLL action %d (0x%04x), please report\n", @@ -4767,56 +4765,21 @@ if (es && (msg != WM_DESTROY)) EDIT_LockBuffer(es);
switch (msg) { - case EM_GETSEL16: - wParam = 0; - lParam = 0; - /* fall through */ case EM_GETSEL: result = EDIT_EM_GetSel(es, (PUINT)wParam, (PUINT)lParam); break;
- case EM_SETSEL16: - if ((short)LOWORD(lParam) == -1) - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); - else - EDIT_EM_SetSel(es, LOWORD(lParam), HIWORD(lParam), FALSE); - if (!wParam) - EDIT_EM_ScrollCaret(es); - result = 1; - break; case EM_SETSEL: EDIT_EM_SetSel(es, wParam, lParam, FALSE); EDIT_EM_ScrollCaret(es); result = 1; break;
- case EM_GETRECT16: - if (lParam) - { - RECT16 *r16 = MapSL(lParam); - r16->left = es->format_rect.left; - r16->top = es->format_rect.top; - r16->right = es->format_rect.right; - r16->bottom = es->format_rect.bottom; - } - break; case EM_GETRECT: if (lParam) CopyRect((LPRECT)lParam, &es->format_rect); break;
- case EM_SETRECT16: - if ((es->style & ES_MULTILINE) && lParam) { - RECT rc; - RECT16 *r16 = MapSL(lParam); - rc.left = r16->left; - rc.top = r16->top; - rc.right = r16->right; - rc.bottom = r16->bottom; - EDIT_SetRectNP(es, &rc); - EDIT_UpdateText(es, NULL, TRUE); - } - break; case EM_SETRECT: if ((es->style & ES_MULTILINE) && lParam) { EDIT_SetRectNP(es, (LPRECT)lParam); @@ -4824,47 +4787,28 @@ } break;
- case EM_SETRECTNP16: - if ((es->style & ES_MULTILINE) && lParam) { - RECT rc; - RECT16 *r16 = MapSL(lParam); - rc.left = r16->left; - rc.top = r16->top; - rc.right = r16->right; - rc.bottom = r16->bottom; - EDIT_SetRectNP(es, &rc); - } - break; case EM_SETRECTNP: if ((es->style & ES_MULTILINE) && lParam) EDIT_SetRectNP(es, (LPRECT)lParam); break;
- case EM_SCROLL16: case EM_SCROLL: result = EDIT_EM_Scroll(es, (INT)wParam); break;
- case EM_LINESCROLL16: - wParam = (WPARAM)(INT)(SHORT)HIWORD(lParam); - lParam = (LPARAM)(INT)(SHORT)LOWORD(lParam); - /* fall through */ case EM_LINESCROLL: result = (LRESULT)EDIT_EM_LineScroll(es, (INT)wParam, (INT)lParam); break;
- case EM_SCROLLCARET16: case EM_SCROLLCARET: EDIT_EM_ScrollCaret(es); result = 1; break;
- case EM_GETMODIFY16: case EM_GETMODIFY: result = ((es->flags & EF_MODIFIED) != 0); break;
- case EM_SETMODIFY16: case EM_SETMODIFY: if (wParam) es->flags |= EF_MODIFIED; @@ -4872,34 +4816,22 @@ es->flags &= ~(EF_MODIFIED | EF_UPDATE); /* reset pending updates */ break;
- case EM_GETLINECOUNT16: case EM_GETLINECOUNT: result = (es->style & ES_MULTILINE) ? es->line_count : 1; break;
- case EM_LINEINDEX16: - if ((INT16)wParam == -1) - wParam = (WPARAM)-1; - /* fall through */ case EM_LINEINDEX: result = (LRESULT)EDIT_EM_LineIndex(es, (INT)wParam); break;
- case EM_SETHANDLE16: - EDIT_EM_SetHandle16(es, (HLOCAL16)wParam); - break; case EM_SETHANDLE: EDIT_EM_SetHandle(es, (HLOCAL)wParam); break;
- case EM_GETHANDLE16: - result = (LRESULT)EDIT_EM_GetHandle16(es); - break; case EM_GETHANDLE: result = (LRESULT)EDIT_EM_GetHandle(es); break;
- case EM_GETTHUMB16: case EM_GETTHUMB: result = EDIT_EM_GetThumb(es); break; @@ -4917,15 +4849,10 @@ result = DefWindowProcW(hwnd, msg, wParam, lParam); break;
- case EM_LINELENGTH16: case EM_LINELENGTH: result = (LRESULT)EDIT_EM_LineLength(es, (INT)wParam); break;
- case EM_REPLACESEL16: - lParam = (LPARAM)MapSL(lParam); - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ case EM_REPLACESEL: { LPWSTR textW; @@ -4948,50 +4875,35 @@ break; }
- case EM_GETLINE16: - lParam = (LPARAM)MapSL(lParam); - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ case EM_GETLINE: result = (LRESULT)EDIT_EM_GetLine(es, (INT)wParam, (LPWSTR)lParam, unicode); break;
- case EM_LIMITTEXT16: case EM_SETLIMITTEXT: EDIT_EM_SetLimitText(es, wParam); break;
- case EM_CANUNDO16: case EM_CANUNDO: result = (LRESULT)EDIT_EM_CanUndo(es); break;
- case EM_UNDO16: case EM_UNDO: case WM_UNDO: result = (LRESULT)EDIT_EM_Undo(es); break;
- case EM_FMTLINES16: case EM_FMTLINES: result = (LRESULT)EDIT_EM_FmtLines(es, (BOOL)wParam); break;
- case EM_LINEFROMCHAR16: case EM_LINEFROMCHAR: result = (LRESULT)EDIT_EM_LineFromChar(es, (INT)wParam); break;
- case EM_SETTABSTOPS16: - result = (LRESULT)EDIT_EM_SetTabStops16(es, (INT)wParam, MapSL(lParam)); - break; case EM_SETTABSTOPS: result = (LRESULT)EDIT_EM_SetTabStops(es, (INT)wParam, (LPINT)lParam); break;
- case EM_SETPASSWORDCHAR16: - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ case EM_SETPASSWORDCHAR: { WCHAR charW = 0; @@ -5008,19 +4920,14 @@ break; }
- case EM_EMPTYUNDOBUFFER16: case EM_EMPTYUNDOBUFFER: EDIT_EM_EmptyUndoBuffer(es); break;
- case EM_GETFIRSTVISIBLELINE16: - result = es->y_offset; - break; case EM_GETFIRSTVISIBLELINE: result = (es->style & ES_MULTILINE) ? es->y_offset : es->x_offset; break;
- case EM_SETREADONLY16: case EM_SETREADONLY: if (wParam) { SetWindowLongW( hwnd, GWL_STYLE, @@ -5034,23 +4941,14 @@ result = 1; break;
- case EM_SETWORDBREAKPROC16: - EDIT_EM_SetWordBreakProc16(es, (EDITWORDBREAKPROC16)lParam); - break; case EM_SETWORDBREAKPROC: EDIT_EM_SetWordBreakProc(es, (void *)lParam); break;
- case EM_GETWORDBREAKPROC16: - result = (LRESULT)es->word_break_proc16; - break; case EM_GETWORDBREAKPROC: result = (LRESULT)es->word_break_proc; break;
- case EM_GETPASSWORDCHAR16: - unicode = FALSE; /* 16-bit message is always ascii */ - /* fall through */ case EM_GETPASSWORDCHAR: { if(unicode)
Modified: branches/arwinss/reactos/dll/win32/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/listbox.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -2645,16 +2645,12 @@
switch(msg) { - case LB_RESETCONTENT16: case LB_RESETCONTENT: LISTBOX_ResetContent( descr ); LISTBOX_UpdateScroll( descr ); InvalidateRect( descr->self, NULL, TRUE ); return 0;
- case LB_ADDSTRING16: - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_ADDSTRING: { INT ret; @@ -2677,10 +2673,6 @@ return ret; }
- case LB_INSERTSTRING16: - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - wParam = (INT)(INT16)wParam; - /* fall through */ case LB_INSERTSTRING: { INT ret; @@ -2702,9 +2694,6 @@ return ret; }
- case LB_ADDFILE16: - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_ADDFILE: { INT ret; @@ -2727,7 +2716,6 @@ return ret; }
- case LB_DELETESTRING16: case LB_DELETESTRING: if (LISTBOX_RemoveItem( descr, wParam) != LB_ERR) return descr->nb_items; @@ -2737,7 +2725,6 @@ return LB_ERR; }
- case LB_GETITEMDATA16: case LB_GETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) { @@ -2746,7 +2733,6 @@ } return descr->items[wParam].data;
- case LB_SETITEMDATA16: case LB_SETITEMDATA: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) { @@ -2757,18 +2743,12 @@ /* undocumented: returns TRUE, not LB_OKAY (0) */ return TRUE;
- case LB_GETCOUNT16: case LB_GETCOUNT: return descr->nb_items;
- case LB_GETTEXT16: - lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_GETTEXT: return LISTBOX_GetText( descr, wParam, (LPWSTR)lParam, unicode );
- case LB_GETTEXTLEN16: - /* fall through */ case LB_GETTEXTLEN: if ((INT)wParam >= descr->nb_items || (INT)wParam < 0) { @@ -2780,7 +2760,6 @@ return WideCharToMultiByte( CP_ACP, 0, descr->items[wParam].str, strlenW(descr->items[wParam].str), NULL, 0, NULL, NULL );
- case LB_GETCURSEL16: case LB_GETCURSEL: if (descr->nb_items == 0) return LB_ERR; @@ -2791,17 +2770,12 @@ return descr->focus_item; /* otherwise, if the user tries to move the selection with the */ /* arrow keys, we will give the application something to choke on */ - case LB_GETTOPINDEX16: case LB_GETTOPINDEX: return descr->top_item;
- case LB_GETITEMHEIGHT16: case LB_GETITEMHEIGHT: return LISTBOX_GetItemHeight( descr, wParam );
- case LB_SETITEMHEIGHT16: - lParam = LOWORD(lParam); - /* fall through */ case LB_SETITEMHEIGHT: return LISTBOX_SetItemHeight( descr, wParam, lParam, TRUE );
@@ -2843,7 +2817,6 @@ return MAKELONG(index, hit ? 0 : 1); }
- case LB_SETCARETINDEX16: case LB_SETCARETINDEX: if ((!IS_MULTISELECT(descr)) && (descr->selected_item != -1)) return LB_ERR; if (LISTBOX_SetCaretIndex( descr, wParam, !lParam ) == LB_ERR) @@ -2853,37 +2826,18 @@ else return LB_OKAY;
- case LB_GETCARETINDEX16: case LB_GETCARETINDEX: return descr->focus_item;
- case LB_SETTOPINDEX16: case LB_SETTOPINDEX: return LISTBOX_SetTopItem( descr, wParam, TRUE );
- case LB_SETCOLUMNWIDTH16: case LB_SETCOLUMNWIDTH: return LISTBOX_SetColumnWidth( descr, wParam );
- case LB_GETITEMRECT16: - { - RECT rect; - RECT16 *r16 = MapSL(lParam); - ret = LISTBOX_GetItemRect( descr, (INT16)wParam, &rect ); - r16->left = rect.left; - r16->top = rect.top; - r16->right = rect.right; - r16->bottom = rect.bottom; - } - return ret; - case LB_GETITEMRECT: return LISTBOX_GetItemRect( descr, wParam, (RECT *)lParam );
- case LB_FINDSTRING16: - wParam = (INT)(INT16)wParam; - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_FINDSTRING: { INT ret; @@ -2903,10 +2857,6 @@ return ret; }
- case LB_FINDSTRINGEXACT16: - wParam = (INT)(INT16)wParam; - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_FINDSTRINGEXACT: { INT ret; @@ -2926,10 +2876,6 @@ return ret; }
- case LB_SELECTSTRING16: - wParam = (INT)(INT16)wParam; - if (HAS_STRINGS(descr)) lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_SELECTSTRING: { INT index; @@ -2958,23 +2904,14 @@ return index; }
- case LB_GETSEL16: - wParam = (INT)(INT16)wParam; - /* fall through */ case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; return descr->items[wParam].selected;
- case LB_SETSEL16: - lParam = (INT)(INT16)lParam; - /* fall through */ case LB_SETSEL: return LISTBOX_SetSelection( descr, lParam, wParam, FALSE );
- case LB_SETCURSEL16: - wParam = (INT)(INT16)wParam; - /* fall through */ case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; LISTBOX_SetCaretIndex( descr, wParam, FALSE ); @@ -2982,17 +2919,12 @@ if (ret != LB_ERR) ret = descr->selected_item; return ret;
- case LB_GETSELCOUNT16: case LB_GETSELCOUNT: return LISTBOX_GetSelCount( descr );
- case LB_GETSELITEMS16: - return LISTBOX_GetSelItems16( descr, wParam, (LPINT16)MapSL(lParam) ); - case LB_GETSELITEMS: return LISTBOX_GetSelItems( descr, wParam, (LPINT)lParam );
- case LB_SELITEMRANGE16: case LB_SELITEMRANGE: if (LOWORD(lParam) <= HIWORD(lParam)) return LISTBOX_SelectItemRange( descr, LOWORD(lParam), @@ -3001,28 +2933,21 @@ return LISTBOX_SelectItemRange( descr, HIWORD(lParam), LOWORD(lParam), wParam );
- case LB_SELITEMRANGEEX16: case LB_SELITEMRANGEEX: if ((INT)lParam >= (INT)wParam) return LISTBOX_SelectItemRange( descr, wParam, lParam, TRUE ); else return LISTBOX_SelectItemRange( descr, lParam, wParam, FALSE);
- case LB_GETHORIZONTALEXTENT16: case LB_GETHORIZONTALEXTENT: return descr->horz_extent;
- case LB_SETHORIZONTALEXTENT16: case LB_SETHORIZONTALEXTENT: return LISTBOX_SetHorizontalExtent( descr, wParam );
- case LB_GETANCHORINDEX16: case LB_GETANCHORINDEX: return descr->anchor_item;
- case LB_SETANCHORINDEX16: - wParam = (INT)(INT16)wParam; - /* fall through */ case LB_SETANCHORINDEX: if (((INT)wParam < -1) || ((INT)wParam >= descr->nb_items)) { @@ -3032,12 +2957,6 @@ descr->anchor_item = (INT)wParam; return LB_OKAY;
- case LB_DIR16: - /* according to Win16 docs, DDL_DRIVES should make DDL_EXCLUSIVE - * be set automatically (this is different in Win32) */ - if (wParam & DDL_DRIVES) wParam |= DDL_EXCLUSIVE; - lParam = (LPARAM)MapSL(lParam); - /* fall through */ case LB_DIR: { INT ret; @@ -3076,13 +2995,9 @@ case LB_SETCOUNT: return LISTBOX_SetCount( descr, (INT)wParam );
- case LB_SETTABSTOPS16: - return LISTBOX_SetTabStops( descr, (INT)(INT16)wParam, MapSL(lParam), TRUE ); - case LB_SETTABSTOPS: return LISTBOX_SetTabStops( descr, wParam, (LPINT)lParam, FALSE );
- case LB_CARETON16: case LB_CARETON: if (descr->caret_on) return LB_OKAY; @@ -3091,7 +3006,6 @@ LISTBOX_RepaintItem( descr, descr->focus_item, ODA_FOCUS ); return LB_OKAY;
- case LB_CARETOFF16: case LB_CARETOFF: if (!descr->caret_on) return LB_OKAY;
Modified: branches/arwinss/reactos/dll/win32/user32/lstr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/lstr.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -114,7 +114,7 @@ /*********************************************************************** * CharPrevExW (USER32.@) */ -LPSTR WINAPI CharPrevExW( WORD codepage, LPCWSTR start, LPCWSTR ptr, DWORD flags ) +LPWSTR WINAPI CharPrevExW( WORD codepage, LPCWSTR start, LPCWSTR ptr, DWORD flags ) { /* doesn't make sense, there are no codepages for Unicode */ return NULL;
Modified: branches/arwinss/reactos/dll/win32/user32/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/mdi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/mdi.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -953,9 +953,9 @@
if ( (menuInfo.fType & MFT_BITMAP) && (LOWORD(menuInfo.dwTypeData)!=0) && - (LOWORD(menuInfo.dwTypeData)!=HBITMAP_16(hBmpClose)) ) - { - DeleteObject(HBITMAP_32(LOWORD(menuInfo.dwTypeData))); + (LOWORD(menuInfo.dwTypeData)!=LOWORD(hBmpClose)) ) + { + DeleteObject((HBITMAP)(ULONG_PTR)(LOWORD(menuInfo.dwTypeData))); }
/* close */ @@ -1082,12 +1082,14 @@ ci->hWindowMenu = ccs->hWindowMenu; ci->idFirstChild = ccs->idFirstChild; } +#ifndef __REACTOS__ else { LPCLIENTCREATESTRUCT16 ccs = MapSL(PtrToUlong(cs->lpCreateParams)); ci->hWindowMenu = HMENU_32(ccs->hWindowMenu); ci->idFirstChild = ccs->idFirstChild; } +#endif WIN_ReleasePtr( wndPtr );
ci->hwndChildMaximized = 0;
Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -2085,7 +2085,7 @@ HeapFree( GetProcessHeap(), 0, prevText ); } else if(( flags & MFT_BITMAP)) { - item->hbmpItem = HBITMAP_32(LOWORD(str)); + item->hbmpItem = (HBITMAP)(LOWORD(str)); /* setting bitmap clears text */ HeapFree( GetProcessHeap(), 0, item->text ); item->text = NULL; @@ -4011,7 +4011,7 @@ * GetMenuCheckMarkDimensions (USER.417) * GetMenuCheckMarkDimensions (USER32.@) */ -DWORD WINAPI GetMenuCheckMarkDimensions(void) +LONG WINAPI GetMenuCheckMarkDimensions(void) { return MAKELONG( GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK) ); } @@ -4348,6 +4348,7 @@ /*********************************************************************** * LookupMenuHandle (USER.217) */ +#ifndef __REACTOS__ HMENU16 WINAPI LookupMenuHandle16( HMENU16 hmenu, INT16 id ) { HMENU hmenu32 = HMENU_32(hmenu); @@ -4376,6 +4377,7 @@ FreeResource16( handle ); return hMenu; } +#endif
/***************************************************************** @@ -4403,6 +4405,7 @@ /********************************************************************** * LoadMenuIndirect (USER.220) */ +#ifndef __REACTOS__ HMENU16 WINAPI LoadMenuIndirect16( LPCVOID template ) { HMENU hMenu; @@ -4427,6 +4430,7 @@ } return HMENU_16(hMenu); } +#endif
/********************************************************************** @@ -4693,7 +4697,7 @@ HeapFree(GetProcessHeap(), 0, menu->text); set_menu_item_text( menu, lpmii->dwTypeData, unicode ); } else if( (menu->fType) & MFT_BITMAP) - menu->hbmpItem = HBITMAP_32(LOWORD(lpmii->dwTypeData)); + menu->hbmpItem = (HBITMAP)(ULONG_PTR)(LOWORD(lpmii->dwTypeData)); }
if (lpmii->fMask & MIIM_FTYPE ) {
Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -259,7 +259,7 @@ /*********************************************************************** * RegisterLogonProcess (USER32.@) */ -DWORD WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) +BOOL WINAPI RegisterLogonProcess(HANDLE hprocess,BOOL x) { FIXME("(%p,%d),stub!\n",hprocess,x); return 1; @@ -514,7 +514,7 @@ /*********************************************************************** * DeregisterShellHookWindow [USER32.@] */ -HRESULT WINAPI DeregisterShellHookWindow ( DWORD u ) +HRESULT WINAPI DeregisterShellHookWindow ( HWND u ) { FIXME("0x%08x stub\n",u); return 0;
Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -257,6 +257,7 @@ /*********************************************************************** * EnumProps (USER.27) */ +#ifndef __REACTOS__ INT16 WINAPI EnumProps16( HWND16 hwnd, PROPENUMPROC16 func ) { int ret = -1, i, count; @@ -294,3 +295,4 @@ } return ret; } +#endif
Added: branches/arwinss/reactos/dll/win32/user32/resources/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/resources/user32.rc (added) +++ branches/arwinss/reactos/dll/win32/user32/resources/user32.rc [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1,0 +1,79 @@ +/* + * Top level resource file for USER + * + * Copyright 1999 Bertho Stultiens + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <windows.h> +//#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User API Client Dll\0" +#define REACTOS_STR_INTERNAL_NAME "user32\0" +#define REACTOS_STR_ORIGINAL_FILENAME "user32.dll\0" +#include <reactos/version.rc> + +#define MDI_IDC_LISTBOX 100 +#define IDS_MDI_MOREWINDOWS 13 +#define IDS_ERROR 2 + +/* + * Everything that does not depend on language, + * like textless bitmaps etc, go into the + * neutral language. This will prevent them from + * being duplicated for each language. + */ +#include "resources/user32_bin.rc" + +/* + * Everything specific to any language goes + * in one of the specific files. + * Note that you can and may override resources + * which also have a neutral version. This is to + * get localized bitmaps for example. + */ +#include "resources/user32_Bg.rc" +#include "resources/user32_Ca.rc" +#include "resources/user32_Cs.rc" +#include "resources/user32_Da.rc" +#include "resources/user32_De.rc" +#include "resources/user32_En.rc" +#include "resources/user32_Eo.rc" +#include "resources/user32_Es.rc" +#include "resources/user32_Fi.rc" +#include "resources/user32_Fr.rc" +#include "resources/user32_Hu.rc" +#include "resources/user32_It.rc" +#include "resources/user32_Ko.rc" +#include "resources/user32_Lt.rc" +#include "resources/user32_Nl.rc" +#include "resources/user32_No.rc" +#include "resources/user32_Pl.rc" +#include "resources/user32_Pt.rc" +#include "resources/user32_Ro.rc" +#include "resources/user32_Ru.rc" +#include "resources/user32_Si.rc" +#include "resources/user32_Sk.rc" +#include "resources/user32_Sv.rc" +#include "resources/user32_Tr.rc" +#include "resources/user32_Uk.rc" +#include "resources/user32_Wa.rc" +#include "resources/user32_Ja.rc" +#include "resources/user32_Zh.rc" + +//#include "resources/version.rc"
Propchange: branches/arwinss/reactos/dll/win32/user32/resources/user32.rc ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/arwinss/reactos/dll/win32/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1519,19 +1519,12 @@ } break;
- case SBM_SETPOS16: case SBM_SETPOS: return SetScrollPos( hwnd, SB_CTL, wParam, (BOOL)lParam );
- case SBM_GETPOS16: case SBM_GETPOS: return SCROLL_GetScrollPos(hwnd, SB_CTL);
- case SBM_SETRANGE16: - if (wParam) message = SBM_SETRANGEREDRAW; - wParam = LOWORD(lParam); - lParam = HIWORD(lParam); - /* fall through */ case SBM_SETRANGEREDRAW: case SBM_SETRANGE: { @@ -1543,18 +1536,9 @@ } return 0;
- case SBM_GETRANGE16: - { - INT min, max; - - SCROLL_GetScrollRange(hwnd, SB_CTL, &min, &max); - return MAKELRESULT(min, max); - } - case SBM_GETRANGE: return SCROLL_GetScrollRange(hwnd, SB_CTL, (LPINT)wParam, (LPINT)lParam);
- case SBM_ENABLE_ARROWS16: case SBM_ENABLE_ARROWS: return EnableScrollBar( hwnd, SB_CTL, wParam );
Modified: branches/arwinss/reactos/dll/win32/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -574,7 +574,6 @@ case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style );
- case STM_GETICON16: case STM_GETICON: return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style );
@@ -597,7 +596,6 @@ STATIC_TryPaintFcn( hwnd, full_style ); break;
- case STM_SETICON16: case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style );
Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -3275,10 +3275,10 @@ lpDevMode->dmDisplayFrequency = devmodeW.dmDisplayFrequency; lpDevMode->dmFields = devmodeW.dmFields;
- lpDevMode->u1.s2.dmPosition.x = devmodeW.u1.s2.dmPosition.x; - lpDevMode->u1.s2.dmPosition.y = devmodeW.u1.s2.dmPosition.y; - lpDevMode->u1.s2.dmDisplayOrientation = devmodeW.u1.s2.dmDisplayOrientation; - lpDevMode->u1.s2.dmDisplayFixedOutput = devmodeW.u1.s2.dmDisplayFixedOutput; + lpDevMode->u1.dmPosition.x = devmodeW.u1.dmPosition.x; + lpDevMode->u1.dmPosition.y = devmodeW.u1.dmPosition.y; + lpDevMode->u1.dmDisplayOrientation = devmodeW.u1.dmDisplayOrientation; + lpDevMode->u1.dmDisplayFixedOutput = devmodeW.u1.dmDisplayFixedOutput; } if (lpszDeviceName) RtlFreeUnicodeString(&nameW); return ret;
Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1427,7 +1427,7 @@ { HBRUSH prevBrush;
- if (hbrush <= (HBRUSH) (COLOR_MAX + 1)) hbrush = GetSysColorBrush( HandleToULong(hbrush) - 1 ); + if (hbrush <= (HBRUSH) (COLOR_MAX + 1)) hbrush = GetSysColorBrush( (ULONG_PTR)(hbrush) - 1 );
if (!(prevBrush = SelectObject( hdc, hbrush ))) return 0; PatBlt( hdc, rect->left, rect->top,
Modified: branches/arwinss/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1,11 +1,13 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" allowwarnings="true"> <importlibrary definition="user32.spec" /> <include base="user32">.</include> <include base="user32">include</include> <include base="ReactOS">include/reactos/subsys</include> + <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> <define name="WINVER">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> + <define name="__WINESRC__" /> <library>wine</library> <library>ntdll</library> <library>gdi32</library> @@ -15,6 +17,52 @@ <library>win32ksys</library> <library>pseh</library>
+ <file>button.c</file> + <file>caret.c</file> + <file>class.c</file> + <file>clipboard.c</file> + <file>combo.c</file> + <file>cursoricon.c</file> + <file>dde_client.c</file> + <file>dde_misc.c</file> + <file>dde_server.c</file> + <file>defdlg.c</file> + <file>defwnd.c</file> + <file>desktop.c</file> + <file>dialog.c</file> + <file>driver.c</file> + <file>edit.c</file> + <file>exticon.c</file> + <file>focus.c</file> + <file>hook.c</file> + <file>icontitle.c</file> + <file>input.c</file> + <file>listbox.c</file> + <file>lstr.c</file> + <file>mdi.c</file> + <file>menu.c</file> + <file>message.c</file> + <file>misc.c</file> + <file>msgbox.c</file> + <file>nonclient.c</file> + <file>painting.c</file> + <file>property.c</file> + <file>resource.c</file> + <file>scroll.c</file> + <file>spy.c</file> + <file>static.c</file> + <file>sysparams.c</file> + <file>text.c</file> + <file>uitools.c</file> + <file>user_main.c</file> + <file>win.c</file> + <file>winhelp.c</file> <file>winpos.c</file> - <file>user32.rc</file> + <file>winproc.c</file> + <file>winstation.c</file> + <file>wsprintf.c</file> + + <directory name="resources"> + <file>user32.rc</file> + </directory> </module>
Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -81,7 +81,9 @@ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr))
+#ifndef __REACTOS__ #define WM_SYSTIMER 0x0118 +#endif #define WM_POPUPSYSTEMMENU 0x0313
/* internal messages codes */
Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Fri Jul 17 21:42:17 2009 @@ -1374,7 +1374,7 @@ return 0; }
- +#ifndef __REACTOS__ /*********************************************************************** * CreateWindow (USER.41) */ @@ -1437,6 +1437,7 @@ return HWND_16( WIN_CreateWindowEx( &cs, (LPCWSTR)className, 0 )); } } +#endif
/***********************************************************************