Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[dreimer] 30998: Leave COMCTL's Resources alone!!
by dreimer＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: dreimer Date: Tue Dec 4 19:25:42 2007 New Revision: 30998 URL: http://svn.reactos.org/svn/reactos?rev=30998&view=rev Log: Leave COMCTL's Resources alone!! Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Tue Dec 4 19:25:42 2007 @@ -43,21 +43,6 @@ del /f "dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL del /f "dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL del /f "dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL - del /f "dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL del /f "dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL

1 0

[cwittich] 30997: check for a valid dc before accessing Dc_Attr
by cwittich＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: cwittich Date: Tue Dec 4 18:31:11 2007 New Revision: 30997 URL: http://svn.reactos.org/svn/reactos?rev=30997&view=rev Log: check for a valid dc before accessing Dc_Attr Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Dec 4 18:31:11 2007 @@ -88,6 +88,7 @@ case GdiBCSetBrushOrg: { PGDIBSSETBRHORG pgSBO; + if(!dc) break; pgSBO = (PGDIBSSETBRHORG) pHdr; Dc_Attr->ptlBrushOrigin = pgSBO->ptlBrushOrigin; break;

1 0

[hpoussin] 30996: CTRL+SCROLL LOCK+SCROLL LOCK should only work with right control key
by hpoussin＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: hpoussin Date: Tue Dec 4 17:55:49 2007 New Revision: 30996 URL: http://svn.reactos.org/svn/reactos?rev=30996&view=rev Log: CTRL+SCROLL LOCK+SCROLL LOCK should only work with right control key Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Tue Dec 4 17:55:49 2007 @@ -785,21 +785,18 @@ if (PortDeviceExtension->Settings.CrashOnCtrlScroll) { /* Test for CTRL + SCROLL LOCK twice */ - static const UCHAR ScanCodes[] = { 0x1d, 0x46, 0x46, 0 }; - - if (!(Output & 0x80)) - { - if ((Output & 0x7f) == ScanCodes[DeviceExtension->ComboPosition]) - { - DeviceExtension->ComboPosition++; - if (ScanCodes[DeviceExtension->ComboPosition] == 0) - KeBugCheck(MANUALLY_INITIATED_CRASH); - } - else if ((Output & 0x7f) == ScanCodes[0]) - DeviceExtension->ComboPosition = 1; - else - DeviceExtension->ComboPosition = 0; - } + static const UCHAR ScanCodes[] = { 0xe0, 0x1d, 0x46, 0xc6, 0x46, 0 }; + + if (Output == ScanCodes[DeviceExtension->ComboPosition]) + { + DeviceExtension->ComboPosition++; + if (ScanCodes[DeviceExtension->ComboPosition] == 0) + KeBugCheck(MANUALLY_INITIATED_CRASH); + } + else if (Output == ScanCodes[0]) + DeviceExtension->ComboPosition = 1; + else + DeviceExtension->ComboPosition = 0; } if (i8042KbdCallIsrHook(DeviceExtension, PortStatus, Output, &ToReturn))

1 0

[greatlrd] 30995: remove wrong fixme comment from win32k
by greatlrd＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: greatlrd Date: Tue Dec 4 12:42:05 2007 New Revision: 30995 URL: http://svn.reactos.org/svn/reactos?rev=30995&view=rev Log: remove wrong fixme comment from win32k Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 4 12:42:05 2007 @@ -805,7 +805,6 @@ } NewDC = DC_LockDc( hNewDC ); - /* FIXME - NewDC can be NULL!!! Don't assert here! */ if ( !NewDC ) { DC_FreeDC( hNewDC );

1 0

[jimtabor] 30994: Fix NtGdiFlush so it will not spam the debug list. Add changes and fixups.
by jimtabor＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: jimtabor Date: Tue Dec 4 10:51:03 2007 New Revision: 30994 URL: http://svn.reactos.org/svn/reactos?rev=30994&view=rev Log: Fix NtGdiFlush so it will not spam the debug list. Add changes and fixups. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Tue Dec 4 10:51:03 2007 @@ -51,7 +51,7 @@ typedef struct { - HANDLE Handle; + HANDLE Handle; // HSURF PVOID pvEntry; ULONG lucExcLock; ULONG Tid; @@ -60,7 +60,6 @@ PERESOURCE hsemDevLock; PVOID pvGammaRamp; - PVOID pfnSync; DHPDEV PDev; DEVMODEW DMW; @@ -94,6 +93,7 @@ NTSTATUS FASTCALL InitDcImpl(VOID); HDC FASTCALL RetrieveDisplayHDC(VOID); +PGDIDEVICE FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 4 10:51:03 2007 @@ -541,7 +541,7 @@ PrimarySurface.PreparedDriver = TRUE; PrimarySurface.DisplayNumber = DisplayNumber; - + PrimarySurface.flFlags = PDEV_DISPLAY; // Hard set,, add more flags. PrimarySurface.hsemDevLock = (PERESOURCE)EngCreateSemaphore(); ret = TRUE; @@ -826,6 +826,9 @@ NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", NewDC->w.bitsPerPixel); + + NewDC->flGraphics = PrimarySurface.DevInfo.flGraphicsCaps; + NewDC->flGraphics2 = PrimarySurface.DevInfo.flGraphicsCaps2; if (!CreateAsIC) { @@ -2678,6 +2681,17 @@ return SurfObj->hsurf == PrimarySurface.Handle; } +// +// Enumerate HDev +// +PGDIDEVICE FASTCALL +IntEnumHDev(VOID) +{ +// I guess we will soon have more than one primary surface. +// This will do for now. + return &PrimarySurface; +} + #define SIZEOF_DEVMODEW_300 188 #define SIZEOF_DEVMODEW_400 212 #define SIZEOF_DEVMODEW_500 220 Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Tue Dec 4 10:51:03 2007 @@ -10,6 +10,51 @@ // Gdi Batch Flush support functions. // +// +// DoDeviceSync +// +// based on IntEngEnter from eng/engmisc.c +// +VOID +FASTCALL +DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl) +{ + PGDIDEVICE Device = (GDIDEVICE*)Surface->hdev; +// No punting and "Handle to a surface, provided that the surface is device-managed. +// Otherwise, dhsurf is zero". + if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) && (Surface->dhsurf)) + { + if (Device->DriverFunctions.SynchronizeSurface) + return Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl); + else + { + if (Device->DriverFunctions.Synchronize) + return Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect); + } + } + return; +} + +VOID +FASTCALL +SynchonizeDriver(FLONG Flags) +{ + SURFOBJ *SurfObj; + PGDIDEVICE Device; + + if (Flags & GCAPS2_SYNCFLUSH) + Flags = DSS_FLUSH_EVENT; + if (Flags & GCAPS2_SYNCTIMER) + Flags = DSS_TIMER_EVENT; + + Device = IntEnumHDev(); + + SurfObj = EngLockSurface((HSURF)Device->Handle); + if(!SurfObj) return; + DoDeviceSync( SurfObj, NULL, Flags); + EngUnlockSurface(SurfObj); + return; +} // // Process the batch. @@ -80,7 +125,7 @@ APIENTRY NtGdiFlush(VOID) { - UNIMPLEMENTED; + SynchonizeDriver(GCAPS2_SYNCFLUSH); } /*

1 0

[jimtabor] 30993: Fix zero bug.
by jimtabor＠svn.reactos.org 04 Dec '07

04 Dec '07

Author: jimtabor Date: Tue Dec 4 05:52:46 2007 New Revision: 30993 URL: http://svn.reactos.org/svn/reactos?rev=30993&view=rev Log: Fix zero bug. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c Tue Dec 4 05:52:46 2007 @@ -141,6 +141,8 @@ } _SEH_END } + else + Result = FALSE; // Can not be zero. if (Result) *UserData = Entry->UserData; return Result; }

1 0

[janderwald] 30992: - show nice display name when full path for executable is available - enumerate default open verb too - look in HKCR progid for default verbs/file associations - fix a bug in SHEOW_LoadOpenWithItems
by janderwald＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: janderwald Date: Tue Dec 4 02:33:36 2007 New Revision: 30992 URL: http://svn.reactos.org/svn/reactos?rev=30992&view=rev Log: - show nice display name when full path for executable is available - enumerate default open verb too - look in HKCR progid for default verbs/file associations - fix a bug in SHEOW_LoadOpenWithItems Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Tue Dec 4 02:33:36 2007 @@ -164,6 +164,7 @@ MENUITEMINFOW mii; WCHAR szBuffer[MAX_PATH]; UINT index; + WCHAR * szPtr; static const WCHAR szChoose[] = { 'C','h','o','o','s','e',' ','P','r','o','g','r','a','m','.','.','.',0 }; ZeroMemory(&mii, sizeof(mii)); @@ -175,7 +176,26 @@ for (index = 0; index < This->count; index++) { mii.wID = idCmdFirst; - mii.dwTypeData = (LPWSTR)This->szArray[index]; + szPtr = wcsrchr(This->szArray[index], L'\\'); + if (!szPtr) + { + szPtr = This->szArray[index]; + } + else + { + /* remove backslash from path */ + szPtr++; + } + + wcscpy(szBuffer, szPtr); + szPtr = wcsrchr(szBuffer, L'.'); + if (szPtr) + { + /* remove .exe part from display list */ + szPtr[0] = 0; + } + + mii.dwTypeData = szBuffer; if (InsertMenuItemW(hMenu, -1, TRUE, &mii)) { idCmdFirst++; @@ -1013,6 +1033,31 @@ return NumKeys; result = RegOpenKeyExW(hKey, + L"shell\\open\\command", + 0, + KEY_READ | KEY_QUERY_VALUE, + &hSubKey); + + if (result == ERROR_SUCCESS) + { + WCHAR szBuffer[MAX_PATH+10]; + WCHAR * ptr; + DWORD dwBuffer = sizeof(szBuffer); + + if (RegGetValueW(hSubKey, NULL, NULL, RRF_RT_REG_SZ, NULL, (PVOID)szBuffer, &dwBuffer) == ERROR_SUCCESS) + { + ptr = wcsrchr(szBuffer, L' '); + if (ptr) + { + /* erase %1 or extra arguments */ + ptr[0] = 0; + } + SHEOW_AddOWItem(This, szBuffer); + } + RegCloseKey(hSubKey); + } + + result = RegOpenKeyExW(hKey, szCROW, 0, KEY_READ | KEY_QUERY_VALUE, @@ -1196,13 +1241,17 @@ } SHEOW_LoadItemFromHKCU(This, szPtr); + if (RegGetValueW(HKEY_CURRENT_USER, szPtr, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) + { + SHEOW_LoadItemFromHKCU(This, szPath); + } + SHEOW_LoadItemFromHKCR(This, szPtr); dwPath = sizeof(szPath); if (RegGetValueW(HKEY_CLASSES_ROOT, szPtr, NULL, RRF_RT_REG_SZ, NULL, szPath, &dwPath) == ERROR_SUCCESS) { - SHEOW_LoadItemFromHKCU(This, szPath); - } - + SHEOW_LoadItemFromHKCR(This, szPath); + } } TRACE("count %u\n", This->count); return S_OK;

1 0

[cfinck] 30991: Always add _CRT_SECURE_NO_WARNINGS to the preprocessor definition list to disable warnings about not using the safe functions introduced in MSVC8.
by cfinck＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: cfinck Date: Tue Dec 4 02:03:58 2007 New Revision: 30991 URL: http://svn.reactos.org/svn/reactos?rev=30991&view=rev Log: Always add _CRT_SECURE_NO_WARNINGS to the preprocessor definition list to disable warnings about not using the safe functions introduced in MSVC8. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Tue Dec 4 02:03:58 2007 @@ -350,6 +350,9 @@ fprintf ( OUT, "\"\r\n" ); StringSet defines = common_defines; + + // Always add _CRT_SECURE_NO_WARNINGS to disable warnings about not using the safe functions introduced in MSVC8. + defines.insert ( "_CRT_SECURE_NO_WARNINGS" ); if ( debug ) {

1 0

[janderwald] 30990: - display recently used programs - append %1 to allow executing in default command - store prog id as default key in new file ext - assign default file association when requested
by janderwald＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: janderwald Date: Tue Dec 4 01:52:27 2007 New Revision: 30990 URL: http://svn.reactos.org/svn/reactos?rev=30990&view=rev Log: - display recently used programs - append %1 to allow executing in default command - store prog id as default key in new file ext - assign default file association when requested Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c Modified: trunk/reactos/dll/win32/shell32/she_ocmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/she_ocme… ============================================================================== --- trunk/reactos/dll/win32/shell32/she_ocmenu.c (original) +++ trunk/reactos/dll/win32/shell32/she_ocmenu.c Tue Dec 4 01:52:27 2007 @@ -270,15 +270,30 @@ LV_ITEMW listItem; HWND hList; WCHAR * ptr; + WCHAR szApp[MAX_PATH]; hList = GetDlgItem(hwndDlg, 14002); - - ptr = wcsrchr(item, L'\\') + 1; + szApp[0] = 0; + ptr = wcsrchr(item, L'\\'); + if (ptr) + { + ptr++; + } + else + { + ptr = item; + } + + wcscpy(szApp, ptr); + ptr = wcsrchr(szApp, L'.'); + if (ptr) + ptr[0] = 0; + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.state = state; - listItem.pszText = ptr; + listItem.pszText = szApp; listItem.iImage = -1; listItem.iItem = index; listItem.lParam = (LPARAM)item; @@ -291,6 +306,7 @@ HWND hList; RECT clientRect; LV_COLUMN col; + int index; hList = GetDlgItem(hwndDlg, 14002); @@ -302,10 +318,22 @@ col.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); (void)ListView_InsertColumn(hList, 0, &col); - /* FIXME - * add default items + This->iSelItem = -1; + + if (!This->szArray) + return; + + for(index = 0; index < This->count; index++) + { + if (This->szArray[index] == NULL) + continue; + TRACE("val %s\n", debugstr_w(This->szArray[index])); + AddListViewItem(hwndDlg, This->szArray[index], 0, index); + } + + /* FIXME + * select default item */ - This->iSelItem = -1; } static void FreeListViewItems(HWND hwndDlg) { @@ -332,12 +360,17 @@ BOOL HideApplicationFromList(WCHAR * pFileName) { WCHAR szBuffer[100]; - DWORD dwSize; + DWORD dwSize = 0; + LONG result; wcscpy(szBuffer, L"Applications\\"); wcscat(szBuffer, pFileName); - if (RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, L"NoOpenWith", RRF_RT_REG_SZ, NULL, NULL, &dwSize) == ERROR_SUCCESS) + result = RegGetValueW(HKEY_CLASSES_ROOT, szBuffer, L"NoOpenWith", RRF_RT_REG_SZ, NULL, NULL, &dwSize); + + TRACE("result %d szBuffer %s\n", result, debugstr_w(szBuffer)); + + if (result == ERROR_SUCCESS) return TRUE; else return FALSE; @@ -349,6 +382,7 @@ HKEY hVerb; HKEY hCmd; LONG result; + WCHAR szPath[MAX_PATH+10]; if (RegCreateKeyExW(hRootKey, L"shell", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hShell, NULL) != ERROR_SUCCESS) { @@ -369,7 +403,10 @@ return FALSE; } - result = RegSetValueExW(hCmd, NULL, 0, REG_SZ, (const BYTE*)pFullPath, (strlenW(pFullPath)+1)* sizeof(WCHAR)); + wcscpy(szPath, pFullPath); + wcscat(szPath, L" %1"); + + result = RegSetValueExW(hCmd, NULL, 0, REG_SZ, (const BYTE*)szPath, (strlenW(szPath)+1)* sizeof(WCHAR)); RegCloseKey(hCmd); if (result == ERROR_SUCCESS) return TRUE; @@ -395,7 +432,6 @@ RegCloseKey(hRootKey); return FALSE; } - RegCloseKey(hKey); RegCloseKey(hRootKey); result = WriteStaticShellExtensionKey(hKey, L"open", pFullPath); @@ -451,50 +487,37 @@ RegCloseKey(hRootKey); - if (dwDisposition & REG_CREATED_NEW_KEY) - { - result = RegSetValueExW(hKey, L"a", 0, REG_SZ, (const BYTE*)pFileName, (strlenW(pFileName)+1) * sizeof(WCHAR)); - - if (result != ERROR_SUCCESS) - { - ERR("Error: failed to set value\n"); - RegCloseKey(hKey); - return FALSE; - } - - result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)L"a", 2 * sizeof(WCHAR)); - RegCloseKey(hKey); - if (result == ERROR_SUCCESS) - return TRUE; - else - return FALSE; - } - dwBuffer = sizeof(szBuffer); result = RegGetValueW(hKey, NULL, L"MRUList", RRF_RT_REG_SZ, NULL, szBuffer, &dwBuffer); if (result != ERROR_SUCCESS) { /* FIXME - * recreate info + * should rescan all values and rebuild the list */ - ERR("Failed to get value of MRUList\n"); - RegCloseKey(hKey); - return FALSE; - } + szBuffer[0] = 0; + } + dwMask = 0; CurChar[1] = 0; - dwBuffer = (dwBuffer / sizeof(WCHAR)); - for(dwIndex = 0; dwIndex < dwBuffer - 1; dwIndex++) + dwBuffer = strlenW(szBuffer); //FIXME + + TRACE("MRUList %s length %u\n", debugstr_w(szBuffer), dwBuffer); + + for(dwIndex = 0; dwIndex < dwBuffer; dwIndex++) { CurChar[0] = szBuffer[dwIndex]; - dwMask |= (1 << (CurChar[0] - L'a')); + dwMask |= (1 << (szBuffer[0] - L'a')); + + TRACE("dwMask %x CurChar %s\n", dwMask, debugstr_w(CurChar)); dwVal = sizeof(szVal); if (RegGetValueW(hKey, NULL, CurChar, RRF_RT_REG_SZ, NULL, szVal, &dwVal) == ERROR_SUCCESS) { if (!wcsicmp(szVal, pFileName)) { - memmove(&szBuffer[0], &szBuffer[1], dwIndex * sizeof(WCHAR)); + if (dwIndex) + memmove(&szBuffer[1], &szBuffer[0], dwIndex * sizeof(WCHAR)); + szBuffer[0] = CurChar[0]; result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)szBuffer, dwBuffer * sizeof(WCHAR)); RegCloseKey(hKey); @@ -505,6 +528,7 @@ } } } + TRACE("dwMask %x\n", dwMask); dwIndex = 0; while(dwMask & (1 << dwIndex)) @@ -519,18 +543,23 @@ } CurChar[0] = L'a' + dwIndex; + + TRACE("new index %u CurChar %s\n", dwIndex, debugstr_w(CurChar)); + result = RegSetValueExW(hKey, CurChar, 0, REG_SZ, (const BYTE*)pFileName, (strlenW(pFileName) + 1) * sizeof(WCHAR)); if (result == ERROR_SUCCESS) { - memmove(&szBuffer[0], &szBuffer[1], dwBuffer * sizeof(WCHAR)); + memmove(&szBuffer[1], &szBuffer[0], (dwBuffer + 1) * sizeof(WCHAR)); szBuffer[0] = CurChar[0]; - result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)szBuffer, dwBuffer * sizeof(WCHAR)); + dwBuffer = strlenW(szBuffer); + TRACE("New MRUList %s length %u\n", debugstr_w(szBuffer), dwBuffer); + result = RegSetValueExW(hKey, L"MRUList", 0, REG_SZ, (const BYTE*)szBuffer, (dwBuffer+1) * sizeof(WCHAR)); if (result == ERROR_SUCCESS) { StoreApplicationsPathForUser(pFileName, pFullPath); } } - + RegCloseKey(hKey); if (result == ERROR_SUCCESS) @@ -539,7 +568,7 @@ return FALSE; } BOOL -SetProgrammAsDefaultHandler(WCHAR *pFileExt, WCHAR* pFullPath) +SetProgramAsDefaultHandler(WCHAR *pFileExt, WCHAR* pFullPath) { HKEY hExtKey; HKEY hProgKey; @@ -558,11 +587,17 @@ { wcscpy(szBuffer, &pFileExt[1]); wcscat(szBuffer, L"_auto_file"); + if (RegSetValueExW(hExtKey, NULL, 0, REG_SZ, (const BYTE*)szBuffer, (strlenW(szBuffer)+1) * sizeof(WCHAR)) != ERROR_SUCCESS) + { + ERR("Error: failed to store default key\n"); + RegCloseKey(hExtKey); + return FALSE; + } } else { dwSize = sizeof(szBuffer); - if (!RegGetValueW(hExtKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szBuffer, &dwSize)) + if (RegGetValueW(hExtKey, NULL, NULL, RRF_RT_REG_SZ, NULL, szBuffer, &dwSize) != ERROR_SUCCESS) { ERR("Error: failed to retrieve subkey\n"); RegCloseKey(hExtKey); @@ -596,7 +631,7 @@ LPFNOFN ofnProc; WCHAR szBuffer[MAX_PATH + 30] = { 0 }; WCHAR szPath[MAX_PATH * 2 +1] = { 0 }; - WCHAR * pExt; + WCHAR * pExt, *pFileName; int res; LVITEMW lvItem; STARTUPINFOW si; @@ -657,38 +692,43 @@ case 14005: /* ok */ ZeroMemory(&lvItem, sizeof(LVITEMW)); - lvItem.mask = LVIF_PARAM | LVIF_TEXT; + lvItem.mask = LVIF_PARAM; lvItem.iItem = This->iSelItem; - lvItem.pszText = szBuffer; + if (!ListView_GetItemW(GetDlgItem(hwndDlg, 14002), &lvItem)) { - ERR("Failed to get item index %d\n", This->iSelItem); + ERR("Failed to get item lparam %d\n", This->iSelItem); DestroyWindow(hwndDlg); return FALSE; } - pExt = wcsrchr(szBuffer, L'.'); - - if (!HideApplicationFromList(szBuffer)) + + pFileName = wcsrchr((WCHAR*)lvItem.lParam, L'\\'); + pExt = wcsrchr(This->szPath, L'\\'); + if (pExt) { -#if 0 - if (!StoreNewSettings(pExt, szBuffer, (WCHAR*)lvItem.lParam)) + pExt = wcsrchr(pExt + 1, L'.'); + } + + if (pFileName && pExt) + { + pFileName++; + if (!HideApplicationFromList(pFileName)) { - /* failed to store setting */ - WARN("Error: failed to store settings for app %s\n", debugstr_w(szBuffer)); + if (!StoreNewSettings(pExt, pFileName, (WCHAR*)lvItem.lParam)) + { + WARN("Error: failed to store settings for app %s\n", debugstr_w(szBuffer)); + } } -#endif + if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + if (!SetProgramAsDefaultHandler(pExt, (WCHAR*)lvItem.lParam)) + { + /* failed to associate programm */ + WARN("Error: failed to associate programm\n"); + } + } } - if (SendDlgItemMessage(hwndDlg, 14003, BM_GETCHECK, 0, 0) == BST_CHECKED) - { -#if 0 - if (!SetProgrammAsDefaultHandler(pExt, (WCHAR*)lvItem.lParam)) - { - /* failed to associate programm */ - WARN("Error: failed to associate programm\n"); - } -#endif - } ZeroMemory(&si, sizeof(STARTUPINFOW)); si.cb = sizeof(STARTUPINFOW); wcscpy(szPath, (WCHAR*)lvItem.lParam); @@ -761,7 +801,12 @@ MSG msg; BOOL bRet; HWND hwnd = CreateDialogParam(shell32_hInstance, MAKEINTRESOURCE(OPEN_WITH_PROGRAMM_DLG), lpici->hwnd, OpenWithProgrammDlg, (LPARAM)This); - ShowWindow(hwnd, SW_SHOW); + if (hwnd == NULL) + { + ERR("Failed to create dialog\n"); + return E_FAIL; + } + ShowWindow(hwnd, SW_SHOWNORMAL); while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0) { @@ -858,27 +903,20 @@ void SHEOW_AddOWItem(SHEOWImpl *This, WCHAR * szAppName) { - UINT index; - WCHAR * szPtr; - - if (This->count + 1 >= This->size || !This->szArray) - { + UINT index; + if (This->count + 1 >= This->size || !This->szArray) + { if (!SHEOW_ResizeArray(This)) return; - } - - szPtr = wcsrchr(szAppName, '.'); - if (szPtr) - { - szPtr[0] = 0; - } - - for(index = 0; index < This->count; index++) - { + } + + for(index = 0; index < This->count; index++) + { if (!wcsicmp(This->szArray[index], szAppName)) return; - } - This->szArray[This->count] = wcsdup(szAppName); + } + + This->szArray[This->count] = wcsdup(szAppName); if (This->szArray[This->count]) This->count++; @@ -902,7 +940,7 @@ LONG result = ERROR_SUCCESS; WCHAR szName[10]; WCHAR szValue[MAX_PATH]; - WCHAR szMRUList[MAX_PATH] = {0}; + WCHAR szMRUList[32] = {0}; static const WCHAR szMRU[] = {'M','R','U','L','i','s','t', 0 }; @@ -925,14 +963,14 @@ if (result == ERROR_SUCCESS) { - if (wcsicmp(szValue, szMRU)) + if (!wcsicmp(szName, szMRU)) + { + wcsncpy(szMRUList, szValue, sizeof(szMRU) / sizeof(WCHAR)); + } + else { SHEOW_AddOWItem(This, szValue); NumItems++; - } - else - { - wcscpy(szMRUList, szValue); } } dwIndex++; @@ -1170,9 +1208,6 @@ return S_OK; } - - - static HRESULT WINAPI SHEOW_ExtInit_Initialize( IShellExtInit* iface, LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID )

1 0

[jimtabor] 30989: Fix dce test. User32 wine test 57 pass and only 2 fail.
by jimtabor＠svn.reactos.org 03 Dec '07

03 Dec '07

Author: jimtabor Date: Tue Dec 4 01:03:26 2007 New Revision: 30989 URL: http://svn.reactos.org/svn/reactos?rev=30989&view=rev Log: Fix dce test. User32 wine test 57 pass and only 2 fail. Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c Tue Dec 4 01:03:26 2007 @@ -258,7 +258,15 @@ UserDrawCaptionButton(&WindowRect, Style, ExStyle, hDC, bDown, Type); } +// Note from Wine: +/* MSDN docs are pretty idiotic here, they say app CAN use clipRgn in + the call to GetDCEx implying that it is allowed not to use it either. + However, the suggested GetDCEx( , DCX_WINDOW | DCX_INTERSECTRGN) + will cause clipRgn to be deleted after ReleaseDC(). + Now, how is the "system" supposed to tell what happened? + */ #define DCX_USESTYLE 0x00010000 +#define DCX_KEEPCLIPRGN 0x00040000 // <-- You do this! /* * FIXME: * - Drawing of WS_BORDER after scrollbars @@ -277,7 +285,7 @@ Style = GetWindowLongW(hWnd, GWL_STYLE); - hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE); + hDC = GetDCEx(hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_USESTYLE | DCX_KEEPCLIPRGN); if (hDC == 0) { return 0;

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007