Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 50966: [RTL] - Fix compilation when NDEBUG is not defined
by jgardou＠svn.reactos.org 04 Mar '11

04 Mar '11

Author: jgardou Date: Fri Mar 4 03:42:38 2011 New Revision: 50966 URL: http://svn.reactos.org/svn/reactos?rev=50966&view=rev Log: [RTL] - Fix compilation when NDEBUG is not defined Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=509… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Fri Mar 4 03:42:38 2011 @@ -604,7 +604,7 @@ RtlLeaveCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { #ifndef NDEBUG - HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; + HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* In win this case isn't checked. However it's a valid check so it should only be performed in debug builds! */

1 0

[tkreuzer] 50965: [USER32_APITEST] Add a cursor and an icon and use those instead of system cursor. Fixes tests on Windows.
by tkreuzer＠svn.reactos.org 03 Mar '11

03 Mar '11

Author: tkreuzer Date: Thu Mar 3 21:49:44 2011 New Revision: 50965 URL: http://svn.reactos.org/svn/reactos?rev=50965&view=rev Log: [USER32_APITEST] Add a cursor and an icon and use those instead of system cursor. Fixes tests on Windows. Added: trunk/rostests/apitests/user32/resource.h (with props) trunk/rostests/apitests/user32/test.cur (with props) trunk/rostests/apitests/user32/test.ico (with props) trunk/rostests/apitests/user32/user32_apitest.rc (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/GetIconInfo.c trunk/rostests/apitests/user32/user32_apitest.rbuild Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Mar 3 21:49:44 2011 @@ -9,7 +9,8 @@ GetSystemMetrics.c GetIconInfo.c GetPeekMessage.c - testlist.c) + testlist.c + user32_apitest.rc) add_executable(user32_apitest ${SOURCE}) target_link_libraries(user32_apitest wine) Modified: trunk/rostests/apitests/user32/GetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn… ============================================================================== --- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Thu Mar 3 21:49:44 2011 @@ -2,7 +2,7 @@ #include <stdio.h> #include <wine/test.h> #include <windows.h> - +#include "resource.h" // FIXME user32 @@ -144,12 +144,21 @@ Test_GetIconInfo(0); Test_GetIconInfo(1); - hcursor = LoadCursor(NULL, IDC_APPSTARTING); + hcursor = LoadCursor(GetModuleHandle(NULL), "TESTCURSOR"); + ok(hcursor != 0, "should not fail, error %ld\n", GetLastError()); + ok(GetIconInfo(hcursor, &iconinfo2), "\n"); + ok(iconinfo2.fIcon == 0, "\n"); + ok(iconinfo2.xHotspot == 8, "%ld\n", iconinfo2.xHotspot); + ok(iconinfo2.yHotspot == 29, "%ld\n", iconinfo2.yHotspot); + ok(iconinfo2.hbmMask != NULL, "\n"); + ok(iconinfo2.hbmColor != NULL, "\n"); + + hcursor = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TEST)); ok(hcursor != 0, "should not fail\n"); ok(GetIconInfo(hcursor, &iconinfo2), "\n"); - ok(iconinfo2.fIcon == 0, "\n"); - ok(iconinfo2.xHotspot == 0, "%ld\n", iconinfo2.xHotspot); - ok(iconinfo2.yHotspot == 8, "%ld\n", iconinfo2.yHotspot); + ok(iconinfo2.fIcon == 1, "\n"); + ok(iconinfo2.xHotspot == 16, "%ld\n", iconinfo2.xHotspot); + ok(iconinfo2.yHotspot == 16, "%ld\n", iconinfo2.yHotspot); ok(iconinfo2.hbmMask != NULL, "\n"); ok(iconinfo2.hbmColor != NULL, "\n"); Added: trunk/rostests/apitests/user32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/resource.… ============================================================================== --- trunk/rostests/apitests/user32/resource.h (added) +++ trunk/rostests/apitests/user32/resource.h [iso-8859-1] Thu Mar 3 21:49:44 2011 @@ -1,0 +1,3 @@ + + +#define IDI_TEST 1000 Propchange: trunk/rostests/apitests/user32/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/user32/test.cur URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/test.cur?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/user32/test.cur ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/user32/test.ico URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/test.ico?… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/user32/test.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rostests/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/user32_apitest.rbuild [iso-8859-1] Thu Mar 3 21:49:44 2011 @@ -8,6 +8,7 @@ <library>user32</library> <library>pseh</library> <file>testlist.c</file> + <file>user32_apitest.rc</file> <file>InitializeLpkHooks.c</file> <file>RealGetWindowClass.c</file> Added: trunk/rostests/apitests/user32/user32_apitest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/user32_ap… ============================================================================== --- trunk/rostests/apitests/user32/user32_apitest.rc (added) +++ trunk/rostests/apitests/user32/user32_apitest.rc [iso-8859-1] Thu Mar 3 21:49:44 2011 @@ -1,0 +1,7 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_TEST ICON "test.ico" +TESTCURSOR CURSOR "test.cur" Propchange: trunk/rostests/apitests/user32/user32_apitest.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 50964: [SHELL32] - Return the icon index, not the icon id - Fixes bug 5742
by janderwald＠svn.reactos.org 03 Mar '11

03 Mar '11

Author: janderwald Date: Thu Mar 3 21:22:47 2011 New Revision: 50964 URL: http://svn.reactos.org/svn/reactos?rev=50964&view=rev Log: [SHELL32] - Return the icon index, not the icon id - Fixes bug 5742 Modified: trunk/reactos/dll/win32/shell32/dialogs.c Modified: trunk/reactos/dll/win32/shell32/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs.… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs.c [iso-8859-1] Thu Mar 3 21:22:47 2011 @@ -63,7 +63,7 @@ PPICK_ICON_CONTEXT pIconContext = (PPICK_ICON_CONTEXT)lParam; if (IS_INTRESOURCE(lpszName)) - swprintf(szName, L"%u\n", lpszName); + swprintf(szName, L"%u", lpszName); else wcscpy(szName, (WCHAR*)lpszName); @@ -105,7 +105,7 @@ LPMEASUREITEMSTRUCT lpmis; LPDRAWITEMSTRUCT lpdis; HICON hIcon; - INT index; + INT index, count; WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; OPENFILENAMEW ofn = {0}; @@ -123,18 +123,21 @@ else SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_SETTEXT, 0, (LPARAM)pIconContext->szName); - swprintf(szText, L"%u", pIconContext->Index); - index = SendMessageW(pIconContext->hDlgCtrl, LB_FINDSTRING, -1, (LPARAM)szText); - if (index != LB_ERR) - SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, index, 0); + count = SendMessage(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); + if (count != LB_ERR) + { + if (count > pIconContext->Index) + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, pIconContext->Index, 0); + else + SendMessageW(pIconContext->hDlgCtrl, LB_SETCURSEL, 0, 0); + } return TRUE; case WM_COMMAND: switch(LOWORD(wParam)) { case IDOK: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - SendMessageW(pIconContext->hDlgCtrl, LB_GETTEXT, index, (LPARAM)szText); - pIconContext->Index = _wtoi(szText); + pIconContext->Index = index; SendDlgItemMessageW(hwndDlg, IDC_EDIT_PATH, WM_GETTEXT, MAX_PATH, (LPARAM)pIconContext->szName); DestroyIconList(pIconContext->hDlgCtrl); EndDialog(hwndDlg, 1);

1 0

[ekohl] 50963: [SETUPAPI] Implement CM_Register_Device_Interface[_Ex]A/W and CM_Unregister_Device_Interface[_Ex]A/W.
by ekohl＠svn.reactos.org 03 Mar '11

03 Mar '11

Author: ekohl Date: Thu Mar 3 19:53:26 2011 New Revision: 50963 URL: http://svn.reactos.org/svn/reactos?rev=50963&view=rev Log: [SETUPAPI] Implement CM_Register_Device_Interface[_Ex]A/W and CM_Unregister_Device_Interface[_Ex]A/W. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Thu Mar 3 19:53:26 2011 @@ -3963,6 +3963,174 @@ ulFlags, lpDevInst, NULL); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** + * CM_Register_Device_InterfaceA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Register_Device_InterfaceA( + DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference, + LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + pszReference, pszDeviceInterface, pulLength, ulFlags); + + return CM_Register_Device_Interface_ExA(dnDevInst, InterfaceClassGuid, + pszReference, pszDeviceInterface, + pulLength, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Register_Device_InterfaceW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Register_Device_InterfaceW( + DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference, + LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags) +{ + TRACE("%lx %s %s %p %p %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags); + + return CM_Register_Device_Interface_ExW(dnDevInst, InterfaceClassGuid, + pszReference, pszDeviceInterface, + pulLength, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Register_Device_Interface_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Register_Device_Interface_ExA( + DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCSTR pszReference, + LPSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + LPWSTR pszReferenceW = NULL; + LPWSTR pszDeviceInterfaceW = NULL; + ULONG ulLength; + CONFIGRET ret; + + TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + pszReference, pszDeviceInterface, pulLength, ulFlags, hMachine); + + if (pulLength == NULL || pszDeviceInterface == NULL) + return CR_INVALID_POINTER; + + if (pszReference != NULL) + { + if (pSetupCaptureAndConvertAnsiArg(pszReference, &pszReferenceW)) + return CR_INVALID_DATA; + } + + ulLength = *pulLength; + + pszDeviceInterfaceW = HeapAlloc(GetProcessHeap(), 0, ulLength * sizeof(WCHAR)); + if (pszDeviceInterfaceW == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto Done; + } + + ret = CM_Register_Device_Interface_ExW(dnDevInst, + InterfaceClassGuid, + pszReferenceW, + pszDeviceInterfaceW, + &ulLength, + ulFlags, + hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + pszDeviceInterfaceW, + ulLength, + pszDeviceInterface, + *pulLength, + NULL, + NULL) == 0) + ret = CR_FAILURE; + } + + *pulLength = ulLength; + +Done: + if (pszDeviceInterfaceW != NULL) + HeapFree(GetProcessHeap(), 0, pszDeviceInterfaceW); + + if (pszReferenceW != NULL) + MyFree(pszReferenceW); + + return ret; +} + + +/*********************************************************************** + * CM_Register_Device_Interface_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Register_Device_Interface_ExW( + DEVINST dnDevInst, LPGUID InterfaceClassGuid, LPCWSTR pszReference, + LPWSTR pszDeviceInterface, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + ULONG ulTransferLength; + CONFIGRET ret; + + TRACE("%lx %s %s %p %p %lx %lx\n", dnDevInst, debugstr_guid(InterfaceClassGuid), + debugstr_w(pszReference), pszDeviceInterface, pulLength, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (InterfaceClassGuid == NULL || + pszDeviceInterface == NULL || + pulLength == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + ulTransferLength = *pulLength; + + RpcTryExcept + { + ret = PNP_RegisterDeviceClassAssociation(BindingHandle, + lpDevInst, + InterfaceClassGuid, + (LPWSTR)pszReference, + pszDeviceInterface, + pulLength, + &ulTransferLength, + 0); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { @@ -4884,3 +5052,101 @@ return ret; } + + +/*********************************************************************** + * CM_Unregister_Device_InterfaceA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Unregister_Device_InterfaceA( + LPCSTR pszDeviceInterface, ULONG ulFlags) +{ + TRACE("%s %lx\n", pszDeviceInterface, ulFlags); + + return CM_Unregister_Device_Interface_ExA(pszDeviceInterface, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Unregister_Device_InterfaceW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Unregister_Device_InterfaceW( + LPCWSTR pszDeviceInterface, ULONG ulFlags) +{ + TRACE("%s %lx\n", debugstr_w(pszDeviceInterface), ulFlags); + + return CM_Unregister_Device_Interface_ExW(pszDeviceInterface, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Unregister_Device_Interface_ExA [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA( + LPCSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine) +{ + LPWSTR pszDeviceInterfaceW = NULL; + CONFIGRET ret; + + TRACE("%s %lx %lx\n", pszDeviceInterface, ulFlags, hMachine); + + if (pszDeviceInterface == NULL) + return CR_INVALID_POINTER; + + if (pSetupCaptureAndConvertAnsiArg(pszDeviceInterface, &pszDeviceInterfaceW)) + return CR_INVALID_DATA; + + ret = CM_Unregister_Device_Interface_ExW(pszDeviceInterfaceW, + ulFlags, hMachine); + + if (pszDeviceInterfaceW != NULL) + MyFree(pszDeviceInterfaceW); + + return ret; +} + + +/*********************************************************************** + * CM_Unregister_Device_Interface_ExW [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Unregister_Device_Interface_ExW( + LPCWSTR pszDeviceInterface, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + CONFIGRET ret; + + TRACE("%s %lx %lx\n", debugstr_w(pszDeviceInterface), ulFlags, hMachine); + + if (pszDeviceInterface == NULL) + return CR_INVALID_POINTER; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + RpcTryExcept + { + ret = PNP_UnregisterDeviceClassAssociation(BindingHandle, + (LPWSTR)pszDeviceInterface, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Thu Mar 3 19:53:26 2011 @@ -170,10 +170,10 @@ @ stdcall CM_Reenumerate_DevNode_Ex(long long long) @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex -@ stub CM_Register_Device_InterfaceA -@ stub CM_Register_Device_InterfaceW -@ stub CM_Register_Device_Interface_ExA -@ stub CM_Register_Device_Interface_ExW +@ stdcall CM_Register_Device_InterfaceA(long ptr str str ptr long) +@ stdcall CM_Register_Device_InterfaceW(long ptr wstr wstr ptr long) +@ stdcall CM_Register_Device_Interface_ExA(long ptr str str ptr long long) +@ stdcall CM_Register_Device_Interface_ExW(long ptr wstr wstr ptr long long) @ stdcall CM_Remove_SubTree(long long) @ stdcall CM_Remove_SubTree_Ex(long long long) @ stdcall CM_Request_Device_EjectA(long ptr str long long) @@ -203,10 +203,10 @@ @ stub CM_Test_Range_Available @ stdcall CM_Uninstall_DevNode(long long) @ stdcall CM_Uninstall_DevNode_Ex(long long long) -@ stub CM_Unregister_Device_InterfaceA -@ stub CM_Unregister_Device_InterfaceW -@ stub CM_Unregister_Device_Interface_ExA -@ stub CM_Unregister_Device_Interface_ExW +@ stdcall CM_Unregister_Device_InterfaceA(str long) +@ stdcall CM_Unregister_Device_InterfaceW(wstr long) +@ stdcall CM_Unregister_Device_Interface_ExA(str long long) +@ stdcall CM_Unregister_Device_Interface_ExW(wstr long long) @ stdcall DoesUserHavePrivilege(wstr) @ stub ExtensionPropSheetPageProc @ stdcall InstallCatalog(str str ptr)

1 0

[jimtabor] 50962: [Win32k] - Missed the clearing of the clip region for the window at the end of of its life. The mouse is looking for the window, doing so, scanning through all of them, even the o...
by jimtabor＠svn.reactos.org 03 Mar '11

03 Mar '11

Author: jimtabor Date: Thu Mar 3 17:32:20 2011 New Revision: 50962 URL: http://svn.reactos.org/svn/reactos?rev=50962&view=rev Log: [Win32k] - Missed the clearing of the clip region for the window at the end of of its life. The mouse is looking for the window, doing so, scanning through all of them, even the ones that are at deaths door. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Mar 3 17:32:20 2011 @@ -472,6 +472,7 @@ if(Window->hrgnClip) { GreDeleteObject(Window->hrgnClip); + Window->hrgnClip = NULL; } // ASSERT(Window != NULL);

1 0

[jimtabor] 50961: [Win32k] - Fix the select of the clip region for a window. Apologies to Rafal Harabien select works like select, also don't assume the original author is always right.
by jimtabor＠svn.reactos.org 03 Mar '11

03 Mar '11

Author: jimtabor Date: Thu Mar 3 13:59:17 2011 New Revision: 50961 URL: http://svn.reactos.org/svn/reactos?rev=50961&view=rev Log: [Win32k] - Fix the select of the clip region for a window. Apologies to Rafal Harabien select works like select, also don't assume the original author is always right. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Mar 3 13:59:17 2011 @@ -4052,7 +4052,7 @@ } else { - hrgnCopy = IntSysCreateRectRgnIndirect(&Window->rcWindow); //HRGN_WINDOW; + hrgnCopy = NULL; } if (Window->hrgnClip) @@ -4061,12 +4061,14 @@ GreDeleteObject(Window->hrgnClip); } - if (Window->fnid != FNID_DESKTOP) - NtGdiOffsetRgn(hrgnCopy, Window->rcWindow.left, Window->rcWindow.top); - - /* Set public ownership */ - IntGdiSetRegionOwner(hrgnCopy, GDI_OBJ_HMGR_PUBLIC); - + if (hrgnCopy) + { + if (Window->fnid != FNID_DESKTOP) + NtGdiOffsetRgn(hrgnCopy, Window->rcWindow.left, Window->rcWindow.top); + + /* Set public ownership */ + IntGdiSetRegionOwner(hrgnCopy, GDI_OBJ_HMGR_PUBLIC); + } Window->hrgnClip = hrgnCopy; Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) );

1 0

[tkreuzer] 50960: [WIN32K] Acquire ownership of monitor region before deleting it.
by tkreuzer＠svn.reactos.org 02 Mar '11

02 Mar '11

Author: tkreuzer Date: Wed Mar 2 23:02:12 2011 New Revision: 50960 URL: http://svn.reactos.org/svn/reactos?rev=50960&view=rev Log: [WIN32K] Acquire ownership of monitor region before deleting it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed Mar 2 23:02:12 2011 @@ -282,7 +282,10 @@ Monitor->rcWork = Monitor->rcMonitor; if (Monitor->hrgnMonitor) + { + GDIOBJ_SetOwnership(Monitor->hrgnMonitor, PsGetCurrentProcess()); REGION_FreeRgnByHandle(Monitor->hrgnMonitor); + } Monitor->hrgnMonitor = IntSysCreateRectRgnIndirect( &Monitor->rcMonitor );

1 0

[tkreuzer] 50959: [WIN32K] Revert part of r50941. First its architecturally unclean to lock a DC in a USER function, 2nd its a bug to keep the lock while sending a message.
by tkreuzer＠svn.reactos.org 02 Mar '11

02 Mar '11

Author: tkreuzer Date: Wed Mar 2 22:33:14 2011 New Revision: 50959 URL: http://svn.reactos.org/svn/reactos?rev=50959&view=rev Log: [WIN32K] Revert part of r50941. First its architecturally unclean to lock a DC in a USER function, 2nd its a bug to keep the lock while sending a message. Modified: trunk/reactos/subsystems/win32/win32k/include/color.h trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/palette.c Modified: trunk/reactos/subsystems/win32/win32k/include/color.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/color.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/color.h [iso-8859-1] Wed Mar 2 22:33:14 2011 @@ -36,6 +36,6 @@ COLORREF APIENTRY COLOR_LookupNearestColor (PALETTEENTRY* palPalEntry, INT size, COLORREF color); INT APIENTRY COLOR_PaletteLookupExactIndex (PALETTEENTRY* palPalEntry, INT size, COLORREF col); INT APIENTRY COLOR_PaletteLookupPixel(PALETTEENTRY *palPalEntry, INT size, XLATEOBJ *XlateObj, COLORREF col, BOOL skipReserved); -UINT FASTCALL IntGdiRealizePalette (PDC); +UINT FASTCALL IntGdiRealizePalette (HDC); HCOLORSPACE FASTCALL IntGdiCreateColorSpace(PLOGCOLORSPACEEXW); BOOL FASTCALL IntGdiDeleteColorSpace(HCOLORSPACE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed Mar 2 22:33:14 2011 @@ -1951,11 +1951,7 @@ HWND hWnd; DWORD Ret; - PDC pdc = DC_LockDc(hdc); - if(!pdc) - return 0; - - Ret = IntGdiRealizePalette(pdc); + Ret = IntGdiRealizePalette(hdc); if (Ret) // There was a change. { hWnd = IntWindowFromDC(hdc); @@ -1964,7 +1960,6 @@ UserSendNotifyMessage((HWND)HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0); } } - DC_UnlockDc(pdc); return Ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Wed Mar 2 22:33:14 2011 @@ -723,10 +723,18 @@ UINT FASTCALL -IntGdiRealizePalette(PDC pdc) +IntGdiRealizePalette(HDC hDC) { UINT i, realize = 0; + PDC pdc; PALETTE *ppalSurf, *ppalDC; + + pdc = DC_LockDc(hDC); + if(!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } ppalSurf = pdc->dclevel.pSurface->ppal; ppalDC = pdc->dclevel.ppal; @@ -734,7 +742,7 @@ if(!(ppalSurf->flFlags & PAL_INDEXED)) { // FIXME : set error? - return 0; + goto cleanup; } ASSERT(ppalDC->flFlags & PAL_INDEXED); @@ -747,6 +755,8 @@ InterlockedExchange((LONG*)&ppalSurf->IndexedColors[i], *(LONG*)&ppalDC->IndexedColors[i]); } +cleanup: + DC_UnlockDc(pdc); return realize; } @@ -800,9 +810,11 @@ { if (dc->dclevel.hpal == hPal) { - IntGdiRealizePalette(dc); + DC_UnlockDc(dc); + IntGdiRealizePalette(hDC); } - DC_UnlockDc(dc); + else + DC_UnlockDc(dc); } UserReleaseDC(Wnd,hDC, FALSE); }

1 0

[pschweitzer] 50958: [FASTFAT] - Prevent code duplication by using vfatAttachFCBToFileObject() for volume opening, instead of rewritting the whole function. - Properly check requested disposition w...
by pschweitzer＠svn.reactos.org 02 Mar '11

02 Mar '11

Author: pschweitzer Date: Wed Mar 2 21:51:33 2011 New Revision: 50958 URL: http://svn.reactos.org/svn/reactos?rev=50958&view=rev Log: [FASTFAT] - Prevent code duplication by using vfatAttachFCBToFileObject() for volume opening, instead of rewritting the whole function. - Properly check requested disposition when opening a volume. This fixes bug #5839. Trying to exec \\.\C: in explorer run dialog now ends with an error, as it does on Windows. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Wed Mar 2 21:51:33 2011 @@ -433,7 +433,6 @@ NTSTATUS Status = STATUS_SUCCESS; PDEVICE_EXTENSION DeviceExt; ULONG RequestedDisposition, RequestedOptions; - PVFATCCB pCcb; PVFATFCB pFcb = NULL; PVFATFCB ParentFcb = NULL; PWCHAR c, last; @@ -468,9 +467,8 @@ if (FileObject->FileName.Length == 0 && (FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) { - if (RequestedDisposition == FILE_CREATE || - RequestedDisposition == FILE_OVERWRITE_IF || - RequestedDisposition == FILE_SUPERSEDE) + if (RequestedDisposition != FILE_OPEN || + RequestedDisposition != FILE_OPEN_IF) { return(STATUS_ACCESS_DENIED); } @@ -481,16 +479,9 @@ return(STATUS_NOT_A_DIRECTORY); } #endif + pFcb = DeviceExt->VolumeFcb; - pCcb = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); - if (pCcb == NULL) - { - return (STATUS_INSUFFICIENT_RESOURCES); - } - RtlZeroMemory(pCcb, sizeof(VFATCCB)); - FileObject->SectionObjectPointer = &pFcb->SectionObjectPointers; - FileObject->FsContext = pFcb; - FileObject->FsContext2 = pCcb; + vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); pFcb->RefCount++; Irp->IoStatus.Information = FILE_OPENED;

1 0

[tkreuzer] 50957: [SHELL32] patch by Thomas Faber: fix a TRACE
by tkreuzer＠svn.reactos.org 02 Mar '11

02 Mar '11

Author: tkreuzer Date: Wed Mar 2 13:33:19 2011 New Revision: 50957 URL: http://svn.reactos.org/svn/reactos?rev=50957&view=rev Log: [SHELL32] patch by Thomas Faber: fix a TRACE Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Wed Mar 2 13:33:19 2011 @@ -1475,7 +1475,7 @@ case LVN_ENDLABELEDITW: { - TRACE("-- LVN_ENDLABELEDITA %p\n",This); + TRACE("-- LVN_ENDLABELEDITW %p\n",This); if (lpdi->item.pszText) { HRESULT hr;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs