Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[fireball] 45206: [vendor/wine] - Import Wine-1.1.37 gdi32, user32, winex11.drv, wineserver.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 22 23:30:22 2010 New Revision: 45206 URL: http://svn.reactos.org/svn/reactos?rev=45206&view=rev Log: [vendor/wine] - Import Wine-1.1.37 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/freetype.c vendor/wine/dlls/gdi32/current/tests/font.c vendor/wine/dlls/user32/current/defwnd.c vendor/wine/dlls/user32/current/input.c vendor/wine/dlls/user32/current/menu.c vendor/wine/dlls/user32/current/misc.c vendor/wine/dlls/user32/current/scroll.c vendor/wine/dlls/user32/current/tests/menu.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/winex11.drv/current/keyboard.c vendor/wine/dlls/winex11.drv/current/systray.c vendor/wine/server/current/change.c vendor/wine/server/current/main.c vendor/wine/server/current/queue.c vendor/wine/server/current/sock.c Modified: vendor/wine/dlls/gdi32/current/freetype.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/freetype.… ============================================================================== --- vendor/wine/dlls/gdi32/current/freetype.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/freetype.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -2171,7 +2171,7 @@ BOOL WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { GDI_CheckNotLock(); - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return TRUE; } @@ -6679,25 +6679,25 @@ INT WineEngAddFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return 1; } INT WineEngRemoveFontResourceEx(LPCWSTR file, DWORD flags, PVOID pdv) { - FIXME(":stub\n"); + FIXME("(%s, %x, %p): stub\n", debugstr_w(file), flags, pdv); return TRUE; } HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD *pcFonts) { - FIXME(":stub\n"); + FIXME("(%p, %u, %p, %p): stub\n", pbFont, cbFont, pdv, pcFonts); return NULL; } UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) { - FIXME(":stub\n"); + FIXME("(%p, %p, %u): stub\n", font, fs, flags); return DEFAULT_CHARSET; } Modified: vendor/wine/dlls/gdi32/current/tests/font.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/fon… ============================================================================== --- vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/tests/font.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -2848,7 +2848,7 @@ static void test_oemcharset(void) { HDC hdc; - LOGFONTA lf; + LOGFONTA lf, clf; HFONT hfont, old_hfont; int charset; @@ -2863,7 +2863,12 @@ charset = GetTextCharset(hdc); todo_wine ok(charset == OEM_CHARSET, "expected %d charset, got %d\n", OEM_CHARSET, charset); - SelectObject(hdc, old_hfont); + hfont = SelectObject(hdc, old_hfont); + GetObjectA(hfont, sizeof(clf), &clf); + ok(!lstrcmpA(clf.lfFaceName, lf.lfFaceName), "expected %s face name, got %s\n", lf.lfFaceName, clf.lfFaceName); + ok(clf.lfPitchAndFamily == lf.lfPitchAndFamily, "expected %x family, got %x\n", lf.lfPitchAndFamily, clf.lfPitchAndFamily); + ok(clf.lfCharSet == lf.lfCharSet, "expected %d charset, got %d\n", lf.lfCharSet, clf.lfCharSet); + ok(clf.lfHeight == lf.lfHeight, "expected %d height, got %d\n", lf.lfHeight, clf.lfHeight); DeleteObject(hfont); DeleteDC(hdc); } Modified: vendor/wine/dlls/user32/current/defwnd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/defwnd.c… ============================================================================== --- vendor/wine/dlls/user32/current/defwnd.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/defwnd.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -561,7 +561,11 @@ } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break; Modified: vendor/wine/dlls/user32/current/input.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/input.c?… ============================================================================== --- vendor/wine/dlls/user32/current/input.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/input.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -101,12 +101,15 @@ } SERVER_END_REQ; - USER_Driver->pSetCapture( hwnd, gui_flags ); - - if (previous && previous != hwnd) - SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); - - if (prev_ret) *prev_ret = previous; + if (ret) + { + USER_Driver->pSetCapture( hwnd, gui_flags ); + + if (previous && previous != hwnd) + SendMessageW( previous, WM_CAPTURECHANGED, 0, (LPARAM)hwnd ); + + if (prev_ret) *prev_ret = previous; + } return ret; } @@ -226,7 +229,7 @@ */ HWND WINAPI DECLSPEC_HOTPATCH SetCapture( HWND hwnd ) { - HWND previous; + HWND previous = 0; set_capture_window( hwnd, 0, &previous ); return previous; @@ -241,7 +244,7 @@ BOOL ret = set_capture_window( 0, 0, NULL ); /* Somebody may have missed some mouse movements */ - mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); + if (ret) mouse_event( MOUSEEVENTF_MOVE, 0, 0, 0, 0 ); return ret; } Modified: vendor/wine/dlls/user32/current/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/menu.c?r… ============================================================================== --- vendor/wine/dlls/user32/current/menu.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/menu.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -3119,6 +3119,7 @@ switch(msg.wParam) { case VK_MENU: + case VK_F10: fEndMenu = TRUE; break; Modified: vendor/wine/dlls/user32/current/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/misc.c?r… ============================================================================== --- vendor/wine/dlls/user32/current/misc.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/misc.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -539,8 +539,8 @@ */ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hnd,notifyfilter,flags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hnd,notifyfilter,flags ); return (HDEVNOTIFY) 0xcafecafe; } @@ -569,8 +569,8 @@ */ HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecepient, LPVOID pNotificationFilter, DWORD dwFlags) { - FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n" - "\treturns a fake device notification handle!\n", hRecepient,pNotificationFilter,dwFlags ); + FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", + hRecepient,pNotificationFilter,dwFlags ); return (HDEVNOTIFY) 0xcafeaffe; } Modified: vendor/wine/dlls/user32/current/scroll.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/scroll.c… ============================================================================== --- vendor/wine/dlls/user32/current/scroll.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/scroll.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -317,6 +317,7 @@ { INT thumbSize; INT pixels = vertical ? rect->bottom-rect->top : rect->right-rect->left; + INT range; if ((pixels -= 2*(GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP)) <= 0) return infoPtr->minVal; @@ -333,9 +334,12 @@ pos = max( 0, pos - (GetSystemMetrics(SM_CXVSCROLL) - SCROLL_ARROW_THUMB_OVERLAP) ); if (pos > pixels) pos = pixels; - if (!infoPtr->page) pos *= infoPtr->maxVal - infoPtr->minVal; - else pos *= infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; - return infoPtr->minVal + ((pos + pixels / 2) / pixels); + if (!infoPtr->page) + range = infoPtr->maxVal - infoPtr->minVal; + else + range = infoPtr->maxVal - infoPtr->minVal - infoPtr->page + 1; + + return infoPtr->minVal + MulDiv(pos, range, pixels); } /*********************************************************************** Modified: vendor/wine/dlls/user32/current/tests/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/me… ============================================================================== --- vendor/wine/dlls/user32/current/tests/menu.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/menu.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -1890,8 +1890,10 @@ { INPUT_KEYBOARD, {{0}}, {'D', 0}, FALSE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_MENU, 'M', 'P', 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {'E', 0}, FALSE, FALSE }, - - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 18 */ + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, + { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, + + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… ============================================================================== --- vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -6903,6 +6903,32 @@ { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, { 0 } }; +static const struct message WmShiftF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ + { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7122,6 +7148,16 @@ keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + + trace("testing SHIFT+F10 press/release\n"); + keybd_event(VK_SHIFT, 0, 0, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmShiftF10Seq, "SHIFT+F10 press/release", TRUE); trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… ============================================================================== --- vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -52,6 +52,7 @@ static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); +static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -2695,6 +2696,114 @@ ok (ret, "releasecapture did not return TRUE.\n"); ret = ReleaseCapture(); ok (ret, "releasecapture did not return TRUE after second try.\n"); +} + +static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + GUITHREADINFO gti; + HWND cap_wnd, cap_wnd2, set_cap_wnd; + BOOL status; + switch (msg) + { + case WM_CAPTURECHANGED: + + /* now try to release capture from menu. this should fail */ + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } + cap_wnd = GetCapture(); + + /* check that re-setting the capture for the menu fails */ + set_cap_wnd = SetCapture(cap_wnd); + ok(!set_cap_wnd, "SetCapture should have failed!\n"); + + /* check that SetCapture fails for another window and that it does not touch the error code */ + set_cap_wnd = SetCapture(hWnd); + ok(!set_cap_wnd, "ReleaseCapture should have failed!\n"); + + /* check that ReleaseCapture fails and does not touch the error code */ + status = ReleaseCapture(); + ok(!status, "ReleaseCapture should have failed!\n"); + + /* check that thread info did not change */ + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } + + /* verify that no capture change took place */ + cap_wnd2 = GetCapture(); + ok(cap_wnd2 == cap_wnd, "Capture changed!\n"); + + /* we are done. kill the window */ + DestroyWindow(hWnd); + break; + + default: + return( DefWindowProcA( hWnd, msg, wParam, lParam ) ); + } + return 0; +} + +/* Test that no-one can mess around with the current capture while a menu is open */ +static void test_capture_4(void) +{ + BOOL ret; + HMENU hmenu; + HWND hwnd; + WNDCLASSA wclass; + HINSTANCE hInstance = GetModuleHandleA( NULL ); + + if (!pGetGUIThreadInfo) + win_skip("GetGUIThreadInfo is not available\n"); + + wclass.lpszClassName = "TestCapture4Class"; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = test_capture_4_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIconA( 0, IDI_APPLICATION ); + wclass.hCursor = LoadCursorA( NULL, IDC_ARROW ); + wclass.hbrBackground = (HBRUSH)( COLOR_WINDOW + 1 ); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + assert (RegisterClassA( &wclass )); + assert (hwnd = CreateWindowA( wclass.lpszClassName, "MenuTest", + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, + 400, 200, NULL, NULL, hInstance, NULL) ); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + if (!hwnd) return; + hmenu = CreatePopupMenu(); + + ret = AppendMenuA( hmenu, MF_STRING, 1, "winetest2"); + ok( ret, "AppendMenuA has failed!\n"); + + /* set main window to have initial capture */ + SetCapture(hwnd); + + if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + { + win_skip("TrackPopupMenu test crashes on Win9x/WinMe\n"); + } + else + { + /* create popup (it will self-destruct) */ + ret = TrackPopupMenu(hmenu, TPM_RETURNCMD, 100, 100, 0, hwnd, NULL); + ok( ret == 0, "TrackPopupMenu returned %d expected zero\n", ret); + } + + /* clean up */ + DestroyMenu(hmenu); + DestroyWindow(hwnd); } /* PeekMessage wrapper that ignores the messages we don't care about */ @@ -5790,6 +5899,7 @@ pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); + pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); if (!RegisterWindowClasses()) assert(0); @@ -5821,6 +5931,7 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); + test_capture_4(); test_CreateWindow(); test_parent_owner(); Modified: vendor/wine/dlls/winex11.drv/current/keyboard.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/key… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/keyboard.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/keyboard.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -1140,6 +1140,11 @@ * depending on the NumLock state */ return nonchar_key_vkey[keysym & 0xFF]; + /* Pressing the Pause/Break key alone produces VK_PAUSE vkey, while + * pressing Ctrl+Pause/Break produces VK_CANCEL. */ + if ((e->state & ControlMask) && (keysym == XK_Break)) + return VK_CANCEL; + TRACE_(key)("e->keycode = %x\n", e->keycode); return keyc2vkey[e->keycode]; Modified: vendor/wine/dlls/winex11.drv/current/systray.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/sys… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/systray.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/systray.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -344,7 +344,7 @@ if (icon->window) { struct x11drv_win_data *data = X11DRV_get_win_data( icon->window ); - if (data) XClearArea( gdi_display, data->client_window, 0, 0, 0, 0, True ); + if (data) XClearArea( thread_display(), data->client_window, 0, 0, 0, 0, True ); } } Modified: vendor/wine/server/current/change.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/change.c?rev=… ============================================================================== --- vendor/wine/server/current/change.c [iso-8859-1] (original) +++ vendor/wine/server/current/change.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -451,8 +451,8 @@ char *name; /* basename name of the inode */ }; -struct list inode_hash[ HASH_SIZE ]; -struct list wd_hash[ HASH_SIZE ]; +static struct list inode_hash[ HASH_SIZE ]; +static struct list wd_hash[ HASH_SIZE ]; static int inotify_add_dir( char *path, unsigned int filter ); Modified: vendor/wine/server/current/main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/main.c?rev=45… ============================================================================== --- vendor/wine/server/current/main.c [iso-8859-1] (original) +++ vendor/wine/server/current/main.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -65,14 +65,14 @@ static struct option long_options[] = { - {"debug", 2, 0, 'd'}, - {"foreground", 0, 0, 'f'}, - {"help", 0, 0, 'h'}, - {"kill", 2, 0, 'k'}, - {"persistent", 2, 0, 'p'}, - {"version", 0, 0, 'v'}, - {"wait", 0, 0, 'w'}, - { NULL, 0, 0, 0} + {"debug", 2, NULL, 'd'}, + {"foreground", 0, NULL, 'f'}, + {"help", 0, NULL, 'h'}, + {"kill", 2, NULL, 'k'}, + {"persistent", 2, NULL, 'p'}, + {"version", 0, NULL, 'v'}, + {"wait", 0, NULL, 'w'}, + { NULL, 0, NULL, 0} }; server_argv0 = argv[0]; Modified: vendor/wine/server/current/queue.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/queue.c?rev=4… ============================================================================== --- vendor/wine/server/current/queue.c [iso-8859-1] (original) +++ vendor/wine/server/current/queue.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -2145,6 +2145,12 @@ { struct thread_input *input = queue->input; + /* if in menu mode, reject all requests to change focus, except if the menu bit is set */ + if (input->menu_owner && !(req->flags & CAPTURE_MENU)) + { + set_error(STATUS_ACCESS_DENIED); + return; + } reply->previous = input->capture; input->capture = get_user_full_handle( req->handle ); input->menu_owner = (req->flags & CAPTURE_MENU) ? input->capture : 0; Modified: vendor/wine/server/current/sock.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/sock.c?rev=45… ============================================================================== --- vendor/wine/server/current/sock.c [iso-8859-1] (original) +++ vendor/wine/server/current/sock.c [iso-8859-1] Fri Jan 22 23:30:22 2010 @@ -248,13 +248,13 @@ int i; int async_active = 0; - if ( pollev & (POLLIN|POLLPRI) && async_waiting( sock->read_q )) + if ( pollev & (POLLIN|POLLPRI|POLLERR|POLLHUP) && async_waiting( sock->read_q )) { if (debug_level) fprintf( stderr, "activating read queue for socket %p\n", sock ); async_wake_up( sock->read_q, STATUS_ALERTED ); async_active = 1; } - if ( pollev & POLLOUT && async_waiting( sock->write_q )) + if ( pollev & (POLLOUT|POLLERR|POLLHUP) && async_waiting( sock->write_q )) { if (debug_level) fprintf( stderr, "activating write queue for socket %p\n", sock ); async_wake_up( sock->write_q, STATUS_ALERTED );

14 years, 11 months

[dchapyshev] 45205: - Add/update Ukrainian translation by Sakara Yevhen (eresid[at]gmail[dot]com) and Igor Paliychuk (igor-hkr[at]mail[dot]ru) - Update Russian translation for sysdm

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Jan 22 18:03:08 2010 New Revision: 45205 URL: http://svn.reactos.org/svn/reactos?rev=45205&view=rev Log: - Add/update Ukrainian translation by Sakara Yevhen (eresid[at]gmail[dot]com) and Igor Paliychuk (igor-hkr[at]mail[dot]ru) - Update Russian translation for sysdm Added: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc (with props) Modified: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc Modified: trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/u… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -30,7 +30,7 @@ END POPUP "&Äîâ³äêà" BEGIN - MENUITEM "&Ïðî ïðîãðàìó ...", IDM_ABOUT + MENUITEM "Ïð&î ïðîãðàìó ...", IDM_ABOUT END END @@ -124,7 +124,7 @@ CONTROL "Íàëàãîäæóâà÷ FreeLoader v1.0\nCopyright (C) 2003\nby Brian Palmer (brianp(a)reactos.org)", IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, 122,26 - DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + DEFPUSHBUTTON "Òàê",IDOK,183,189,44,14,WS_GROUP ICON IDI_FDEBUG,IDC_STATIC,19,30,20,20 EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | ES_READONLY | WS_VSCROLL @@ -171,7 +171,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Öå â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ; Âè ìîæåòå ðîçïîâñþäæóâàòè ¿¿ òà çì³íþâàòè, äîòðèìóþ÷èñü óìîâè Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU, îïóáë³êîâàíî¿ Ôîíäîì â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; àáî ðåäàêö³¿ 2 Óãîäè, àáî áóäü-ÿêî¿ ðåäàêö³¿, âèïóùåíî¿ ï³çí³øå.\r\n\r\nÖÿ ïðîãðàìà ðîçïîâñþäæóºòüñÿ â íàä³¿ íà òå, ùî âîíà âèÿâèòüñÿ êîðèñíîþ, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É, âêëþ÷àþ÷è ÓßÂÍÎÞ ÃÀÐÀÍÒ²ªÞ ßÊÎÑÒ² àáî ÏÐÈÄÀÒÍÎÑÒ² äëÿ ïåâíèõ ö³ëåé. Ïîäðîáèö³ ì³ñòÿòüñÿ ó Â³äêðèò³é ë³öåíç³éí³é óãîä³ GNU.\r\n\r\nÐàçîì ç ö³ºþ ïðîãðàìîþ ïîâèíåí ïîøèðþâàòèñÿ ïðèì³ðíèê Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU. ßêùî â³í â³äñóòí³é, ïîâ³äîìòå ïðî öå â Ôîíä â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END #endif // Ukrainian resources Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/desk/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Display Control Panel Applet - * TRANSLATOR: Artem Reznikov + * TRANSLATOR: Artem Reznikov, Sakara Yevhen */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -61,7 +61,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Êîë³ðíà ñõåìà", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Åôåêòè...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Äîäàòêîâî", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -106,24 +106,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Åôåêòè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Çàñòîñîâóâàòè íàñòóïíèé ïåðåõ³äíèé åôåêò äëÿ ìåíþ òà ï³äêàçîê:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "Ç&àñòîñîâóâàòè íàñòóïíèé ìåòîä çãëàäæóâàííÿ äëÿ åêðàííèõ øðèôò³â:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Çàñòîñîâóâàòè &âåëèê³ çíà÷êè",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Â³äîáðàæàòè ò³í³ â³ä ìåíþ",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Ïîêàçàòè &âì³ñò â³êíà ï³ä ÷àñ ïåðåòÿãóâàííÿ",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Ïðèõîâóâàòè ïîêàæ÷èêè âèêëèêó ç êëàâ³àòóðè äî íàòèñíåííÿ <Alt>",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -155,7 +155,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Åêðàí", -1, 7, 6, 237, 56, WS_GROUP - LTEXT "Font Size:", -1, 14, 20, 222, 8 + LTEXT "Ðîçì³ð øðèôòó:", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 GROUPBOX "Ñóì³ñí³ñòü", -1, 7, 67, 237, 97 @@ -186,14 +186,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_SLIDEEFFECT "Ðîçãîðòàííÿ" + IDS_FADEEFFECT "Çàòåìíåííÿ" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Çâè÷àéíèé" + IDS_CLEARTYPEEFFECT "Â³äêðèòèé òèï" END STRINGTABLE @@ -267,7 +267,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Ïàðàìåòðè äèñïëåÿ" + IDS_APPLY_FAILED "Íå âäàëîñÿ çàñòîñóâàòè íîâ³ ïàðàìåòðè..." + IDS_APPLY_NEEDS_RESTART "Âè ïîâèíí³ ïåðåçàâàíòàæèòè êîìï'þòåð äëÿ çàñòîñóâàííÿ çì³í." +END Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -13,7 +13,7 @@ CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select the services that you want for each input language shown in the list.\nUse the Add and Remove buttons to modify this list.", -1, 9, 6, 238, 25 + LTEXT "Âèáåð³òü ïîòð³áí³ ðîçêëàäêè äëÿ êîæíî¿ ìîâè ââåäåííÿ ç³ ñïèñêó. Äëÿ çì³íè ñïèñêó âèêîðèñòîâóéòå êíîïêè ""Äîäàòè"" ³ ""Âèäàëèòè"".", -1, 9, 6, 238, 25 CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 36, 237, 101 PUSHBUTTON "Çàìîâ&÷óâàííÿ", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 27, 142, 70, 14 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -192,7 +192,7 @@ LTEXT "Äîñòóïíîå ïðîñòðàíñòâî:", IDC_STATIC, 20, 92, 183, 9 LTEXT "", IDC_SPACEAVAIL, 154, 92, 104, 9 LTEXT "Èñõîäíûé ðàçìåð (MB):", -1, 22, 118, 80, 9 - LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1, 22, 131, 105, 9 + LTEXT "Ìàêñèìàëüíûé ðàçìåð (MB):", -1, 22, 131, 98, 9 AUTORADIOBUTTON "&Äðóãîé ðàçìåð", IDC_CUSTOM, 20, 105, 65, 9, WS_GROUP AUTORADIOBUTTON "Ðàçìåð ïî âûáîðó ñèñòåìû", IDC_SYSMANSIZE, 20, 145, 105, 9 AUTORADIOBUTTON "Áåç ôàéëà ïîäêà÷êè", IDC_NOPAGEFILE, 20, 158, 85, 9 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -53,12 +53,13 @@ IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "System Settings" +CAPTION "Íàëàøòóâàííÿ ñèñòåìè" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Version Info",IDC_STATIC,6,3,210,73 - CONTROL "Report as Workstation",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 - LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.",IDC_STATIC,15,15,183,41 + GROUPBOX "²íôîðìàö³ÿ ïðî âåðñ³þ",IDC_STATIC,6,3,210,73 + CONTROL "Ïîçíà÷èòè ÿê ðîáî÷ó ñòàíö³þ",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + CONTROL "Ïîçíà÷èòè ÿê ðîáî÷ó ñòàíö³þ",IDC_REPORTASWORKSTATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,57,88,10 + LTEXT "ReactOS áóäóºòüñÿ ÿê ñåðâåðíà ÎÑ. Îáðàòè ïðàïîðåöü, ùîá çì³íèòè ëèøå öåé äîäàòîê.",IDC_STATIC,15,15,183,41 PUSHBUTTON "OK",IDOK,166,83,50,14 END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -18,7 +18,7 @@ IDD_NOTICE_DLG DIALOGEX 0, 0, 186, 32 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Welcome to ReactOS" +CAPTION "Ëàñêàâî ïðîñèìî äî ReactOS" FONT 8,"MS Shell Dlg",400,0,1 BEGIN ICON IDI_LOCKICON, -1, 7, 5, 32, 32 @@ -27,7 +27,7 @@ IDD_LOGGEDOUT_DLG DIALOGEX 0,0,275,147 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Logon" +CAPTION "Âõ³ä" FONT 8,"MS Shell Dlg",400,0,1 BEGIN PUSHBUTTON "OK",IDOK,37, 122, 50, 14,BS_DEFPUSHBUTTON Added: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc (added) +++ trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -1,0 +1,25 @@ +/* + * PROJECT: ReactOS Logon GINA DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shimgvw/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for msgina + * TRANSLATOR: Igor Paliychuk + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_APPTITLE "Ïðîãðàìà ïåðåãëÿäó çîáðàæåíü ³ ôàêñ³â ReactOS" + IDS_SETASDESKBG "Âñòàíîâèòè ÿê ôîí ðîáî÷îãî ñòîëó" + + /* Tooltips */ + IDS_TOOLTIP_NEXT_PIC "Íàñòóïíå çîáðàæåííÿ" + IDS_TOOLTIP_PREV_PIC "Ïîïåðåäíº çîáðàæåííÿ" + IDS_TOOLTIP_ZOOM_IN "Çá³ëüøèòè (+)" + IDS_TOOLTIP_ZOOM_OUT "Çìåíøèòè (-)" + IDS_TOOLTIP_ROT_CLOCKW "Ïîâåðíóòè çà ãîäèííèêîâîþ ñòð³ëêîþ (Ctrl+K)" + IDS_TOOLTIP_ROT_COUNCW "Ïîâåðíóòè ïðîòè ãîäèííèêîâî¿ ñòð³ëêè (Ctrl+L)" + IDS_TOOLTIP_PRINT "Äðóê (Ctrl+P)" + IDS_TOOLTIP_SAVEAS "Çáåðåãòè ÿê... (Ctrl+S)" +END Propchange: trunk/reactos/dll/win32/shimgvw/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/rsrc.rc [iso-8859-1] Fri Jan 22 18:03:08 2010 @@ -10,3 +10,4 @@ #include "lang/lt-LT.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc"

14 years, 11 months

[dchapyshev] 45204: - Add/update Ukrainian translation by Sakara Yevhen (eresid[at]gmail[dot]com) and Igor Paliychuk (igor-hkr[at]mail[dot]ru) - Update Russian translation for spider

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Jan 22 17:53:12 2010 New Revision: 45204 URL: http://svn.reactos.org/svn/reactos?rev=45204&view=rev Log: - Add/update Ukrainian translation by Sakara Yevhen (eresid[at]gmail[dot]com) and Igor Paliychuk (igor-hkr[at]mail[dot]ru) - Update Russian translation for spider Added: trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc (with props) trunk/reactos/base/applications/games/spider/lang/uk-UA.rc (with props) trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc (with props) trunk/reactos/base/system/runonce/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/rsrc.rc trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc trunk/reactos/base/applications/games/spider/lang/ru-RU.rc trunk/reactos/base/applications/games/spider/rsrc.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/sndrec32/rsrc.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/system/runonce/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Added: trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/games/spider/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Added: trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Added: trunk/reactos/base/system/runonce/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/u… Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r…

14 years, 11 months

[gedmurphy] 45203: Fix more makefile paths, rbuild now builds

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jan 22 17:32:15 2010 New Revision: 45203 URL: http://svn.reactos.org/svn/reactos?rev=45203&view=rev Log: Fix more makefile paths, rbuild now builds Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak branches/Tree-restructure-test/sdk/libs/lib.mak branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak Modified: branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/inflib/inflib.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -32,7 +32,7 @@ INFLIB_HOST_CFLAGS = -O3 -Wall -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -DINFLIB_HOST \ - -Iinclude/reactos -Iinclude $(HOST_CFLAGS) + -Isdk/include/reactos -Isdk/include $(HOST_CFLAGS) $(INFLIB_HOST_TARGET): $(INFLIB_HOST_OBJECTS) | $(INFLIB_OUT) $(ECHO_HOSTAR) Modified: branches/Tree-restructure-test/sdk/libs/lib.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -1,4 +1,4 @@ -LIB_BASE = lib +LIB_BASE = sdk\libs LIB_BASE_ = $(LIB_BASE)$(SEP) include sdk/libs/inflib/inflib.mak Modified: branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/rbuild/rbuild.mak [iso-8859-1] Fri Jan 22 17:32:15 2010 @@ -321,7 +321,7 @@ $(RBUILD_COMMON_OBJECTS) \ $(RBUILD_TEST_SPECIAL_OBJECTS) -RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Iinclude/reactos +RBUILD_HOST_CXXFLAGS = -I$(RBUILD_BASE) -I$(TOOLS_BASE) -I$(INFLIB_BASE) $(TOOLS_CPPFLAGS) -Iinclude -Isdk/include/reactos RBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)

14 years, 11 months

[gedmurphy] 45202: Add base include files

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jan 22 17:28:08 2010 New Revision: 45202 URL: http://svn.reactos.org/svn/reactos?rev=45202&view=rev Log: Add base include files Added: branches/Tree-restructure-test/sdk/include/host/ - copied from r44923, trunk/reactos/include/host/ branches/Tree-restructure-test/sdk/include/reactos/ - copied from r44923, trunk/reactos/include/reactos/

14 years, 11 months

[gedmurphy] 45201: Fix mak file paths, rbuild now starts to build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jan 22 16:55:53 2010 New Revision: 45201 URL: http://svn.reactos.org/svn/reactos?rev=45201&view=rev Log: Fix mak file paths, rbuild now starts to build Modified: branches/Tree-restructure-test/Makefile branches/Tree-restructure-test/sdk/tools/tools.mak Modified: branches/Tree-restructure-test/Makefile URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/Makefile?… ============================================================================== --- branches/Tree-restructure-test/Makefile [iso-8859-1] (original) +++ branches/Tree-restructure-test/Makefile [iso-8859-1] Fri Jan 22 16:55:53 2010 @@ -425,8 +425,8 @@ BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h -include lib/lib.mak -include tools/tools.mak +include sdk/libs/lib.mak +include sdk/tools/tools.mak -include $(ROS_AUTOMAKE) PREAUTO := \ Modified: branches/Tree-restructure-test/sdk/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/tools… ============================================================================== --- branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/tools/tools.mak [iso-8859-1] Fri Jan 22 16:55:53 2010 @@ -1,4 +1,4 @@ -TOOLS_BASE = tools +TOOLS_BASE = sdk\tools TOOLS_BASE_ = $(TOOLS_BASE)$(SEP) TOOLS_INT = $(INTERMEDIATE_)$(TOOLS_BASE) TOOLS_INT_ = $(TOOLS_INT)$(SEP) @@ -40,15 +40,15 @@ $(ECHO_HOSTCC) ${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@ -include tools/bin2c.mak -include tools/buildno/buildno.mak -include tools/gendib/gendib.mak -include tools/rsym/log2lines.mak -include tools/nci/nci.mak +include sdk/tools/bin2c.mak +include sdk/tools/buildno/buildno.mak +include sdk/tools/gendib/gendib.mak +include sdk/tools/rsym/log2lines.mak +include sdk/tools/nci/nci.mak ifeq ($(ARCH),powerpc) -include tools/ofw_interface/ofw_interface.mak +include sdk/tools/ofw_interface/ofw_interface.mak endif -include tools/pefixup.mak -include tools/rsym/raddr2line.mak -include tools/rbuild/rbuild.mak -include tools/rsym/rsym.mak +include sdk/tools/pefixup.mak +include sdk/tools/rsym/raddr2line.mak +include sdk/tools/rbuild/rbuild.mak +include sdk/tools/rsym/rsym.mak

14 years, 11 months

[gedmurphy] 45200: Add base libs

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jan 22 16:52:35 2010 New Revision: 45200 URL: http://svn.reactos.org/svn/reactos?rev=45200&view=rev Log: Add base libs Added: branches/Tree-restructure-test/sdk/libs/atl/ - copied from r44923, trunk/reactos/lib/atl/ branches/Tree-restructure-test/sdk/libs/cmlib/ - copied from r44923, trunk/reactos/lib/cmlib/ branches/Tree-restructure-test/sdk/libs/inflib/ - copied from r44923, trunk/reactos/lib/inflib/ branches/Tree-restructure-test/sdk/libs/lib.mak - copied, changed from r44923, trunk/reactos/lib/lib.mak branches/Tree-restructure-test/sdk/libs/libxml2/ - copied from r44923, trunk/reactos/lib/3rdparty/libxml2/ branches/Tree-restructure-test/sdk/libs/pseh/ - copied from r44923, trunk/reactos/lib/pseh/ branches/Tree-restructure-test/sdk/libs/rossym/ - copied from r44923, trunk/reactos/lib/rossym/ Copied: branches/Tree-restructure-test/sdk/libs/lib.mak (from r44923, trunk/reactos/lib/lib.mak) URL: http://svn.reactos.org/svn/reactos/branches/Tree-restructure-test/sdk/libs/… ============================================================================== --- trunk/reactos/lib/lib.mak [iso-8859-1] (original) +++ branches/Tree-restructure-test/sdk/libs/lib.mak [iso-8859-1] Fri Jan 22 16:52:35 2010 @@ -1,7 +1,7 @@ LIB_BASE = lib LIB_BASE_ = $(LIB_BASE)$(SEP) -include lib/inflib/inflib.mak -ifeq ($(ARCH),powerpc) -include lib/ppcmmu/ppcmmu.mak -endif +include sdk/libs/inflib/inflib.mak +#ifeq ($(ARCH),powerpc) +#include lib/ppcmmu/ppcmmu.mak +#endif

14 years, 11 months

[fireball] 45199: - Best way to fix CRT problem: Add more underscores! (and hacks) - winex11.drv builds again. - Mark usleep as unimplemented.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jan 22 11:49:40 2010 New Revision: 45199 URL: http://svn.reactos.org/svn/reactos?rev=45199&view=rev Log: - Best way to fix CRT problem: Add more underscores! (and hacks) - winex11.drv builds again. - Mark usleep as unimplemented. Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c branches/arwinss/reactos/dll/win32/winex11.drv/window.c branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c Modified: branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/rosglue.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -4,6 +4,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <fcntl.h> +#include <share.h> +#include <io.h> #include "windef.h" #include "winbase.h" @@ -17,12 +20,9 @@ int usleep (unsigned int useconds) { //return _usleep(useconds); + UNIMPLEMENTED; return 0; } - -//void xinerama_init( unsigned int width, unsigned int height ) -//{ -//} WCHAR *wine_get_dos_file_name(char *path) { @@ -74,9 +74,55 @@ { } + +/* CRT compatibility HACKS */ + struct _stat; int CDECL fstat(int fd, struct _stat* buf) { int CDECL _fstat(int fd, struct _stat* buf); return _fstat(fd, buf); } + +char *__cdecl strdup(const char *_Src) +{ + return _strdup(_Src); +} + +int __cdecl open(const char *path,int flags,...) +{ + va_list ap; + + if (flags & O_CREAT) + { + int pmode; + va_start(ap, flags); + pmode = va_arg(ap, int); + va_end(ap); + return _sopen( path, flags, _SH_DENYNO, pmode ); + } + else + return _sopen( path, flags, _SH_DENYNO); +} + +int __cdecl close(int _FileHandle) +{ + return _close(_FileHandle); +} + +int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount) +{ + return _read(_FileHandle, _DstBuf, _MaxCharCount); +} + +int __cdecl unlink(const char *_Filename) +{ + return _unlink(_Filename); +} + +int __cdecl access(const char *_Filename,int _AccessMode) +{ + return _access(_Filename, _AccessMode); +} + + Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -946,7 +946,7 @@ /* set the WM_CLIENT_MACHINE and WM_LOCALE_NAME properties */ XSetWMProperties(display, data->whole_window, NULL, NULL, NULL, 0, NULL, NULL, NULL); /* set the pid. together, these properties are needed so the window manager can kill us if we freeze */ - i = getpid(); + i = _getpid(); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&i, 1); Modified: branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/xfont.c [iso-8859-1] Fri Jan 22 11:49:40 2010 @@ -47,6 +47,16 @@ #include "wine/library.h" #include "wine/unicode.h" #include "wine/debug.h" + +#ifdef __REACTOS__ +// CRT compat HACKS +#define open _open +#define close _close +#define read _read +#define write _write +#define lseek _lseek +#define hypot _hypot +#endif WINE_DEFAULT_DEBUG_CHANNEL(font);

14 years, 11 months

[jimtabor] 45198: [Win32k] - Remove CriticalRegion calls.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jan 22 02:29:21 2010 New Revision: 45198 URL: http://svn.reactos.org/svn/reactos?rev=45198&view=rev Log: [Win32k] - Remove CriticalRegion calls. Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Jan 22 02:29:21 2010 @@ -182,34 +182,28 @@ */ if (pDC->rosdc.hClipRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hClipRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hClipRgn, Owner)) return FALSE; } if (pDC->rosdc.hVisRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hVisRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hVisRgn, Owner)) return FALSE; } if (pDC->rosdc.hGCClipRgn) { // FIXME! HAX!!! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pDC->rosdc.hGCClipRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if (!GDIOBJ_SetOwnership(pDC->rosdc.hGCClipRgn, Owner)) return FALSE; }

14 years, 11 months

[jimtabor] 45197: [Win32k] - Remove CriticalRegion calls.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jan 22 02:12:06 2010 New Revision: 45197 URL: http://svn.reactos.org/svn/reactos?rev=45197&view=rev Log: [Win32k] - Remove CriticalRegion calls. Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -159,7 +159,6 @@ PVOID NewMem = NULL; PDC pDC; - KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; @@ -179,7 +178,6 @@ DPRINT1("DC_ATTR not allocated!\n"); } } - KeLeaveCriticalRegion(); pDC = DC_LockDc(hDC); ASSERT(pDC->pdcattr == &pDC->dcattr); if (NewMem) @@ -198,7 +196,6 @@ pDC->pdcattr = &pDC->dcattr; DC_UnlockDc(pDC); - KeEnterCriticalRegion(); { INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; @@ -208,7 +205,6 @@ Entry->UserData = NULL; } } - KeLeaveCriticalRegion(); } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -755,10 +755,8 @@ } if (pAttr) { - KeEnterCriticalRegion(); FreeObjectAttr(pAttr); Entry->UserData = NULL; - KeLeaveCriticalRegion(); } break; @@ -1575,12 +1573,10 @@ level functions. */ // FIXME! HAX!!! Remove this once we get everything right! - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hRgn); Entry = &GdiHandleTable->Entries[Index]; if (Entry->UserData) FreeObjectAttr(Entry->UserData); Entry->UserData = NULL; - KeLeaveCriticalRegion(); // if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) { Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Jan 22 02:12:06 2010 @@ -2063,11 +2063,9 @@ } } - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hReg); Entry = &GdiHandleTable->Entries[Index]; Entry->UserData = AllocateObjectAttr(); - KeLeaveCriticalRegion(); EMPTY_REGION(pReg); pReg->rdh.dwSize = sizeof(RGNDATAHEADER); @@ -2091,12 +2089,10 @@ if (pRgn) { - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(hRgn); Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - KeLeaveCriticalRegion(); if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && pRgn_Attr ) @@ -2151,12 +2147,10 @@ if (pRgn) { - KeEnterCriticalRegion(); Index = GDI_HANDLE_GET_INDEX(pRgn->BaseObject.hHmgr); Entry = &GdiHandleTable->Entries[Index]; pRgn_Attr = Entry->UserData; pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); - KeLeaveCriticalRegion(); if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && pRgn_Attr )

14 years, 11 months

← Newer
1
...
14
15
16
17
18
19
20
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010