Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 37368: - Remove more duplicate definitions - Make definitions compatible when they are present in multiple headers
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 17:23:30 2008 New Revision: 37368 URL: http://svn.reactos.org/svn/reactos?rev=37368&view=rev Log: - Remove more duplicate definitions - Make definitions compatible when they are present in multiple headers Modified: trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/winnls.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/include/reactos/win32k/callback.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -126,9 +126,6 @@ #define SHGFI_SHELLICONSIZE 4 #define SHGFI_PIDL 8 #define SHGFI_USEFILEATTRIBUTES 16 -#define SHERB_NOCONFIRMATION 1 -#define SHERB_NOPROGRESSUI 2 -#define SHERB_NOSOUND 4 typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -850,7 +850,7 @@ typedef enum _STREAM_INFO_LEVELS { FindStreamInfoStandard } STREAM_INFO_LEVELS; -typedef struct _WIN32_FIND_STREAM_DATAW { +typedef struct _WIN32_FIND_STREAM_DATA { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; @@ -1085,9 +1085,6 @@ typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; typedef void(APIENTRY *PAPCFUNC)(ULONG_PTR); typedef void(CALLBACK *PTIMERAPCROUTINE)(PVOID,DWORD,DWORD); -#if (_WIN32_WINNT >= 0x0500) -typedef void(CALLBACK *WAITORTIMERCALLBACK)(PVOID,BOOLEAN); -#endif #if (_WIN32_WINNT >= 0x0600) typedef DWORD (WINAPI *APPLICATION_RECOVERY_CALLBACK)(PVOID); #endif @@ -2196,9 +2193,6 @@ #ifdef UNICODE typedef STARTUPINFOW STARTUPINFO,*LPSTARTUPINFO; typedef WIN32_FIND_DATAW WIN32_FIND_DATA,*LPWIN32_FIND_DATA; -#if (_WIN32_WINNT >= 0x0501) -typedef WIN32_FIND_STREAM_DATA WIN32_FIND_STREAM_DATA,*LPWIN32_FIND_STREAM_DATA; -#endif typedef HW_PROFILE_INFOW HW_PROFILE_INFO,*LPHW_PROFILE_INFO; typedef ENUMRESLANGPROCW ENUMRESLANGPROC; typedef ENUMRESNAMEPROCW ENUMRESNAMEPROC; Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winnls.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnls.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -167,7 +167,9 @@ #define WC_DEFAULTCHAR 0x0040 #define WC_ERR_INVALID_CHARS 0x0080 #define WC_COMPOSITECHECK 0x0200 +#if (WINVER >= 0x0500) #define WC_NO_BEST_FIT_CHARS 0x0400 +#endif #define CP_ACP 0 #define CP_OEMCP 1 @@ -426,7 +428,6 @@ #define DATE_LTRREADING 16 #define DATE_RTLREADING 32 #define MAP_EXPAND_LIGATURES 0x2000 -#define WC_NO_BEST_FIT_CHARS 1024 #define CAL_SYEARMONTH 47 #define CAL_ITWODIGITYEARMAX 48 #define CAL_NOUSEROVERRIDE LOCALE_NOUSEROVERRIDE Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -2837,7 +2837,7 @@ PVOID ExceptionAddress; DWORD NumberParameters; ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; - } EXCEPTION_RECORD, *PEXCEPTION_RECORD, *LPEXCEPTION_RECORD; + } EXCEPTION_RECORD; typedef EXCEPTION_RECORD *PEXCEPTION_RECORD; @@ -3864,7 +3864,6 @@ WORD OffsetModuleName; WORD Reserved; } IMAGE_BOUND_FORWARDER_REF,*PIMAGE_BOUND_FORWARDER_REF; -typedef void(NTAPI *PIMAGE_TLS_CALLBACK)(PVOID,DWORD,PVOID); typedef struct _IMAGE_RESOURCE_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; @@ -4381,9 +4380,6 @@ ProcessorPowerPolicyCurrent } POWER_INFORMATION_LEVEL; -#if (_WIN32_WINNT >= 0x0500) -typedef LONG (WINAPI *PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS); -#endif #if 1 /* (WIN32_WINNT >= 0x0500) */ typedef struct _SYSTEM_POWER_INFORMATION { ULONG MaxIdlenessAllowed; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -1779,14 +1779,6 @@ #define WM_CHANGEUISTATE 295 #define WM_UPDATEUISTATE 296 #define WM_QUERYUISTATE 297 -#define UIS_SET 1 -#define UIS_CLEAR 2 -#define UIS_INITIALIZE 3 -#define UISF_HIDEFOCUS 1 -#define UISF_HIDEACCEL 2 -#if(_WIN32_WINNT >= 0x0501) -#define UISF_ACTIVE 4 -#endif /* _WIN32_WINNT >= 0x0501 */ #endif /* _WIN32_WINNT >= 0x0500 */ #endif /* _WIN32_WCE */ #define BM_CLICK 245 @@ -2470,14 +2462,10 @@ #define HBMMENU_POPUP_RESTORE ((HBITMAP)9) #define HBMMENU_POPUP_MAXIMIZE ((HBITMAP)10) #define HBMMENU_POPUP_MINIMIZE ((HBITMAP)11) -#define MOD_ALT 1 -#define MOD_CONTROL 2 -#define MOD_SHIFT 4 -#define MOD_WIN 8 -#define MOD_IGNORE_ALL_MODIFIER 1024 -#define MOD_ON_KEYUP 2048 -#define MOD_RIGHT 16384 -#define MOD_LEFT 32768 +#define MOD_ALT 0x0001 +#define MOD_CONTROL 0x0002 +#define MOD_SHIFT 0x0004 +#define MOD_WIN 0x0008 #define LLKHF_EXTENDED 0x00000001 #define LLKHF_INJECTED 0x00000010 #define LLKHF_ALTDOWN 0x00000020 @@ -2643,10 +2631,10 @@ #define RIM_TYPEMOUSE 0x00000000 #define RIM_TYPEKEYBOARD 0x00000001 #define RIM_TYPEHID 0x00000002 -#define MOUSE_MOVE_RELATIVE 0x00000000 -#define MOUSE_MOVE_ABSOLUTE 0x00000001 -#define MOUSE_VIRTUAL_DESKTOP 0x00000002 -#define MOUSE_ATTRIBUTES_CHANGED 0x00000004 +#define MOUSE_MOVE_RELATIVE 0 +#define MOUSE_MOVE_ABSOLUTE 1 +#define MOUSE_VIRTUAL_DESKTOP 0x02 +#define MOUSE_ATTRIBUTES_CHANGED 0x04 #define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 #define RI_MOUSE_LEFT_BUTTON_UP 0x0002 #define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 @@ -2869,7 +2857,6 @@ short cx; short cy; } DLGTEMPLATE,*LPDLGTEMPLATE,*LPDLGTEMPLATEA,*LPDLGTEMPLATEW; -typedef const DLGTEMPLATE *LPCDLGTEMPLATE; typedef const DLGTEMPLATE *LPCDLGTEMPLATEA; typedef const DLGTEMPLATE *LPCDLGTEMPLATEW; #ifdef UNICODE Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Fri Nov 14 17:23:30 2008 @@ -51,8 +51,6 @@ /* WCHAR szClass[] */ } HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS, *PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS; -typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); - typedef struct _EVENTPROC_CALLBACK_ARGUMENTS { HWINEVENTHOOK hook;

1 0

[sginsberg] 37367: - Remove duplicate definition
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 17:05:40 2008 New Revision: 37367 URL: http://svn.reactos.org/svn/reactos?rev=37367&view=rev Log: - Remove duplicate definition Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=3… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Fri Nov 14 17:05:40 2008 @@ -18,8 +18,6 @@ #include <wine/list.h> /* FUNCTIONS ***************************************************************/ - -typedef VOID (CALLBACK *WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); HANDLE TimerThreadHandle = NULL;

1 0

[janderwald] 37366: - Improve function stubs - bug 3829
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 15:03:48 2008 New Revision: 37366 URL: http://svn.reactos.org/svn/reactos?rev=37366&view=rev Log: - Improve function stubs - bug 3829 Modified: trunk/reactos/dll/win32/winspool/stubs.c Modified: trunk/reactos/dll/win32/winspool/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winspool/stubs.c [iso-8859-1] Fri Nov 14 15:03:48 2008 @@ -620,6 +620,8 @@ EnumFormsA(HANDLE Printer, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumFormsA stub called\n"); + *Needed = 0; + *Returned = 0; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -634,6 +636,8 @@ EnumFormsW(HANDLE Printer, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumFormsW stub called\n"); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -647,6 +651,9 @@ EnumJobsA(HANDLE Printer, DWORD First, DWORD NoJobs, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumJobsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -661,6 +668,9 @@ EnumJobsW(HANDLE Printer, DWORD First, DWORD NoJobs, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumJobsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -675,6 +685,9 @@ EnumMonitorsA(LPSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumMonitorsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -689,6 +702,9 @@ EnumMonitorsW(LPWSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumMonitorsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -703,6 +719,9 @@ EnumPortsA(LPSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumPortsA stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -717,6 +736,9 @@ EnumPortsW(LPWSTR Name, DWORD Level, PBYTE Buffer, DWORD BufSize, PDWORD Needed, PDWORD Returned) { OutputDebugStringW(L"winspool EnumPortsW stub called\n"); + *Needed = 0; + *Returned = 0; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -758,6 +780,8 @@ { OutputDebugStringW(L"winspool EnumPrinterDriversA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -772,6 +796,8 @@ { OutputDebugStringW(L"winspool EnumPrinterDriversW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -786,6 +812,8 @@ { OutputDebugStringW(L"winspool EnumPrintersA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -800,6 +828,8 @@ { OutputDebugStringW(L"winspool EnumPrintersW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -814,6 +844,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorDatatypesA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -828,6 +860,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorDatatypesW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -842,6 +876,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorsA stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; } @@ -856,6 +892,8 @@ { OutputDebugStringW(L"winspool EnumPrintProcessorsW stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + *Needed = 0; + *Returned = 0; return FALSE; }

1 0

[janderwald] 37365: - Make trash properties settings be unvolatile ; ) See issue #3786 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 14:58:27 2008 New Revision: 37365 URL: http://svn.reactos.org/svn/reactos?rev=37365&view=rev Log: - Make trash properties settings be unvolatile ;) See issue #3786 for more details. Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c Modified: trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_r… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_recyclebin.c [iso-8859-1] Fri Nov 14 14:58:27 2008 @@ -1287,7 +1287,7 @@ DWORD dwSize; - if (RegOpenKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, KEY_WRITE, &hKey) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Bitbucket\\Volume", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return FALSE; iCount = ListView_GetItemCount(hDlgCtrl);

1 0

[janderwald] 37364: - Display Provider and Version in driver details dialog
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:57:22 2008 New Revision: 37364 URL: http://svn.reactos.org/svn/reactos?rev=37364&view=rev Log: - Display Provider and Version in driver details dialog Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Fri Nov 14 13:57:22 2008 @@ -162,6 +162,26 @@ &DriverInfoData)) { HSPFILEQ queueHandle; + DWORD HiVal, LoVal; + WCHAR szTime[25]; + + HiVal = (DriverInfoData.DriverVersion >> 32); + if (HiVal) + { + swprintf (szTime, L"%d.%d", HIWORD(HiVal), LOWORD(HiVal)); + LoVal = (DriverInfoData.DriverVersion & 0xFFFFFFFF); + if (HIWORD(LoVal)) + { + swprintf(&szTime[wcslen(szTime)], L".%d", HIWORD(LoVal)); + if (LOWORD(LoVal)) + { + swprintf(&szTime[wcslen(szTime)], L".%d", LOWORD(LoVal)); + } + } + SetDlgItemTextW(hwndDlg, IDC_FILEVERSION, szTime); + } + SetDlgItemText(hwndDlg, IDC_FILEPROVIDER, DriverInfoData.ProviderName); + queueHandle = SetupOpenFileQueue(); if (queueHandle != (HSPFILEQ)INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Fri Nov 14 13:57:22 2008 @@ -6,6 +6,7 @@ #include <setupapi.h> #include <cfgmgr32.h> #include <commctrl.h> +#include <stdio.h> #include <dll/devmgr/devmgr.h> #include "resource.h"

1 0

[janderwald] 37363: - Create IDataObject from the selected pidl - Check if drop target is the desktop - fixes bug 3763
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:48:46 2008 New Revision: 37363 URL: http://svn.reactos.org/svn/reactos?rev=37363&view=rev Log: - Create IDataObject from the selected pidl - Check if drop target is the desktop - fixes bug 3763 Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_def_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_def_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shv_def_cmenu.c [iso-8859-1] Fri Nov 14 13:48:46 2008 @@ -1054,9 +1054,19 @@ return E_FAIL; } - IShellFolder_Release(psfDesktop); - - if (FAILED(IShellFolder_BindToObject(This->dcm.psf, This->dcm.apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&psfTarget))) + if (This->dcm.cidl) + { + IShellFolder_Release(psfDesktop); + hr = IShellFolder_BindToObject(This->dcm.psf, This->dcm.apidl[0], NULL, &IID_IShellFolder, (LPVOID*)&psfTarget); + } + else + { + /* target folder is desktop because cidl is zero */ + psfTarget = psfDesktop; + hr = S_OK; + } + + if (FAILED(hr)) { ERR("no IShellFolder\n"); @@ -1309,8 +1319,15 @@ { LPSHELLBROWSER lpSB; LPSHELLVIEW lpSV; - LPDATAOBJECT lpDo; + LPDATAOBJECT pDataObj; HRESULT hr; + + if (SUCCEEDED(SHCreateDataObject(iface->dcm.pidlFolder, iface->dcm.cidl, iface->dcm.apidl, NULL, &IID_IDataObject, (void**)&pDataObj))) + { + hr = OleSetClipboard(pDataObj); + IDataObject_Release(pDataObj); + return hr; + } lpSB = (LPSHELLBROWSER)SendMessageA(lpcmi->hwnd, CWM_GETISHELLBROWSER,0,0); if (!lpSB) @@ -1326,19 +1343,19 @@ return hr; } - hr = IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&lpDo); + hr = IShellView_GetItemObject(lpSV, SVGIO_SELECTION, &IID_IDataObject, (LPVOID*)&pDataObj); if (FAILED(hr)) { TRACE("failed to get item object\n"); return hr; } - hr = OleSetClipboard(lpDo); + hr = OleSetClipboard(pDataObj); if (FAILED(hr)) { WARN("OleSetClipboard failed"); } - IDataObject_Release(lpDo); + IDataObject_Release(pDataObj); IShellView_Release(lpSV); return S_OK; }

1 0

[sginsberg] 37362: - Optimize DebugService -- patch from Alex
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 13:14:00 2008 New Revision: 37362 URL: http://svn.reactos.org/svn/reactos?rev=37362&view=rev Log: - Optimize DebugService -- patch from Alex Modified: trunk/reactos/lib/rtl/i386/debug_asm.S Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] Fri Nov 14 13:14:00 2008 @@ -67,13 +67,11 @@ /* Setup the stack */ push ebp mov ebp, esp - + /* Save the registers */ - push ecx push ebx push edi - push edx - + /* Call the Interrupt */ mov eax, [ebp+8] mov ecx, [ebp+12] @@ -82,14 +80,12 @@ mov edi, [ebp+24] int 0x2D int 3 - + /* Restore registers */ - pop edx pop edi pop ebx - pop ecx - + /* Return */ - leave + pop ebp ret 20 .endfunc

1 0

[janderwald] 37361: - Pass the parent to PropertySheetW See issue #3597 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 13:08:29 2008 New Revision: 37361 URL: http://svn.reactos.org/svn/reactos?rev=37361&view=rev Log: - Pass the parent to PropertySheetW See issue #3597 for more details. Modified: trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/misc.c Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -391,7 +391,7 @@ if (NewLcid == (LCID)CB_ERR) break; - SetupApplet(NewLcid); + SetupApplet(GetParent(hwndDlg), NewLcid); } break; } Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=37… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -75,7 +75,7 @@ LONG APIENTRY -SetupApplet(LCID lcid); +SetupApplet(HWND hwndDlg, LCID lcid); #endif /* __CPL_INTL_H */ Modified: trunk/reactos/dll/cpl/intl/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/misc.c?rev=37… ============================================================================== --- trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/misc.c [iso-8859-1] Fri Nov 14 13:08:29 2008 @@ -190,7 +190,7 @@ /* Create applets */ LONG APIENTRY -SetupApplet(LCID lcid) +SetupApplet(HWND hwndDlg, LCID lcid) { PROPSHEETPAGE PsPage[NUM_SHEETS + 1]; PROPSHEETHEADER psh; @@ -207,7 +207,7 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; - psh.hwndParent = NULL; + psh.hwndParent = hwndDlg; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption;

1 0

[janderwald] 37360: - Implement IShellExecuteHookW - Free NETCON_PROPERTIES on cleanup - Show status dialog when clicking on startmenu->settings->network connections item - Fixes bug 3782 See issue #3782 for more details.
by janderwald＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: janderwald Date: Fri Nov 14 12:47:00 2008 New Revision: 37360 URL: http://svn.reactos.org/svn/reactos?rev=37360&view=rev Log: - Implement IShellExecuteHookW - Free NETCON_PROPERTIES on cleanup - Show status dialog when clicking on startmenu->settings->network connections item - Fixes bug 3782 See issue #3782 for more details. Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Fri Nov 14 12:47:00 2008 @@ -33,6 +33,7 @@ LONG ref; const IPersistFolder2Vtbl *lpVtblPersistFolder2; + const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; //const IPersistIDListVtbl *lpVtblPersistIDList; /* both paths are parsible from the desktop */ @@ -71,6 +72,8 @@ #define COLUMN_PHONE 4 #define COLUMN_OWNER 5 +HRESULT ShowNetConnectionStatus(IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd); + static const IContextMenu3Vtbl vt_ContextMenu3; static const IObjectWithSiteVtbl vt_ObjectWithSite; static const IQueryInfoVtbl vt_QueryInfo; @@ -92,6 +95,11 @@ return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblPersistFolder2)); } +static LPIGenericSFImpl __inline impl_from_IShellExecuteHookW(IShellExecuteHookW *iface) +{ + return (LPIGenericSFImpl)((char *)iface - FIELD_OFFSET(IGenericSFImpl, lpVtblShellExecuteHookW)); +} + static LPIContextMenuImpl __inline impl_from_IQueryInfo(IQueryInfo *iface) { return (LPIContextMenuImpl)((char *)iface - FIELD_OFFSET(IContextMenuImpl, lpVtblQueryInfo)); @@ -120,6 +128,10 @@ IsEqualIID (riid, &IID_IPersistFolder2)) { *ppvObj = (LPVOID *)&This->lpVtblPersistFolder2; + } + else if (IsEqualIID(riid, &IID_IShellExecuteHookW)) + { + *ppvObj = (LPVOID *)&This->lpVtblShellExecuteHookW; } #if 0 else if (IsEqualIID(riid, &IID_IPersistIDList)) @@ -382,12 +394,14 @@ pMenu->lpOleCmd = lpOleCmd; pMenu->ref = 1; - if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2))// || IsEqualIID(riid, &IID_IContextMenu3)) + if (IsEqualIID(riid, &IID_IContextMenu) || IsEqualIID(riid, &IID_IContextMenu2)|| IsEqualIID(riid, &IID_IContextMenu3)) pObj = (IUnknown*)(&pMenu->lpVtblContextMenu); else if(IsEqualIID(riid, &IID_IQueryInfo)) pObj = (IUnknown*)(&pMenu->lpVtblQueryInfo); else if(IsEqualIID(riid, &IID_IExtractIconW)) pObj = (IUnknown*)(&pMenu->lpVtblExtractIconW); + else + return E_NOINTERFACE; IUnknown_AddRef(pObj); @@ -462,7 +476,7 @@ wcscpy(pszName, pProperties->pszwName); hr = S_OK; } - //NcFreeNetconProperties(pProperties); + NcFreeNetconProperties(pProperties); } } @@ -842,7 +856,7 @@ _InsertMenuItemW(hMenu, indexMenu++, TRUE, -1, MFT_SEPARATOR, NULL, MFS_ENABLED); _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_NET_PROPERTIES, MFT_STRING, MAKEINTRESOURCEW(IDS_NET_PROPERTIES), MFS_ENABLED); - + NcFreeNetconProperties(pProperties); return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 9); } @@ -862,23 +876,23 @@ HRESULT ShowNetConnectionStatus( - IContextMenuImpl * This, + IOleCommandTarget * lpOleCmd, INetConnection * pNetConnect, HWND hwnd) { NETCON_PROPERTIES * pProperties; HRESULT hr; - if (!This->lpOleCmd) + if (!lpOleCmd) return E_FAIL; if (INetConnection_GetProperties(pNetConnect, &pProperties) != NOERROR) return E_FAIL; - hr = IOleCommandTarget_Exec(This->lpOleCmd, &pProperties->guidId, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); + hr = IOleCommandTarget_Exec(lpOleCmd, &pProperties->guidId, 2, OLECMDEXECOPT_DODEFAULT, NULL, NULL); NcFreeNetconProperties(pProperties); - return E_FAIL; + return hr; } HRESULT @@ -951,7 +965,7 @@ if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS) || lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_STATUS-1)) //HACK for Windows XP { - return ShowNetConnectionStatus(This, val->pItem, lpcmi->hwnd); + return ShowNetConnectionStatus(This->lpOleCmd, val->pItem, lpcmi->hwnd); } else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_NET_PROPERTIES) || lpcmi->lpVerb == MAKEINTRESOURCEA(10099)) //HACK for Windows XP @@ -1310,6 +1324,75 @@ ISF_NetConnect_PersistFolder2_GetCurFolder }; +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_QueryInterface + */ +static HRESULT WINAPI ISF_NetConnect_ShellExecuteHookW_QueryInterface (IShellExecuteHookW * iface, + REFIID iid, LPVOID * ppvObj) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_QueryInterface ((IShellFolder2*)This, iid, ppvObj); +} + +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_AddRef + */ +static ULONG WINAPI ISF_NetConnect_ShellExecuteHookW_AddRef (IShellExecuteHookW * iface) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_AddRef((IShellFolder2*)This); +} + +/************************************************************************ + * ISF_NetConnect_PersistFolder2_Release + */ +static ULONG WINAPI ISF_NetConnect_ShellExecuteHookW_Release (IShellExecuteHookW * iface) +{ + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + return IShellFolder2_Release((IShellFolder2*)This); +} + + +/************************************************************************ + * ISF_NetConnect_ShellExecuteHookW_Execute + */ +static HRESULT WINAPI ISF_NetConnect_ShellExecuteHookW_Execute (IShellExecuteHookW * iface, + LPSHELLEXECUTEINFOW pei) +{ + VALUEStruct * val; + NETCON_PROPERTIES * pProperties; + IGenericSFImpl * This = impl_from_IShellExecuteHookW(iface); + + val = _ILGetValueStruct(ILFindLastID(pei->lpIDList)); + if (!val) + return E_FAIL; + + if (INetConnection_GetProperties((INetConnection*)val->pItem, &pProperties) != NOERROR) + return E_FAIL; + + if (pProperties->Status == NCS_CONNECTED) + { + NcFreeNetconProperties(pProperties); + return ShowNetConnectionStatus(This->lpOleCmd, val->pItem, pei->hwnd); + } + + NcFreeNetconProperties(pProperties); + + return S_OK; +} + + +static const IShellExecuteHookWVtbl vt_ShellExecuteHookW = +{ + ISF_NetConnect_ShellExecuteHookW_QueryInterface, + ISF_NetConnect_ShellExecuteHookW_AddRef, + ISF_NetConnect_ShellExecuteHookW_Release, + ISF_NetConnect_ShellExecuteHookW_Execute +}; + #if 0 static const IPersistIDListVtbl vt_PersistIDList = { @@ -1413,6 +1496,7 @@ sf->ref = 1; sf->lpVtbl = &vt_ShellFolder2; sf->lpVtblPersistFolder2 = &vt_PersistFolder2; + sf->lpVtblShellExecuteHookW = &vt_ShellExecuteHookW; hr = CoCreateInstance(&CLSID_LanConnectStatusUI, NULL, CLSCTX_INPROC_SERVER, &IID_IOleCommandTarget, (LPVOID*)&sf->lpOleCmd); if (FAILED(hr))

1 0

[sginsberg] 37359: - PAGE_SIZE fix 2.0
by sginsberg＠svn.reactos.org 14 Nov '08

14 Nov '08

Author: sginsberg Date: Fri Nov 14 09:24:08 2008 New Revision: 37359 URL: http://svn.reactos.org/svn/reactos?rev=37359&view=rev Log: - PAGE_SIZE fix 2.0 Modified: trunk/reactos/lib/cmlib/cmlib.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3735… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Nov 14 09:24:08 2008 @@ -107,14 +107,10 @@ // PAGE_SIZE definition // #ifndef PAGE_SIZE -#if defined(_M_IX86) -#define PAGE_SIZE 0x1000 -#elif defined(_M_AMD64) -#define PAGE_SIZE 0x1000 -#elif defined(_M_ARM) +#if defined(TARGET_i386) || defined(TARGET_amd64) || defined(TARGET_arm) #define PAGE_SIZE 0x1000 #else -#error Local PAGE_SIZE definition required +#error Local PAGE_SIZE definition required when built as host #endif #endif

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