Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[greatlrd] 33086: did the mistake commit the reactos.diff again :(

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Apr 21 00:43:51 2008 New Revision: 33086 URL: http://svn.reactos.org/svn/reactos?rev=33086&view=rev Log: did the mistake commit the reactos.diff again :( Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 21 00:43:51 2008 @@ -125,8 +125,7 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -windows\ddraw.dll 1 -windows\dciman32.dll 1 +dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 @@ -308,9 +307,9 @@ drivers\bus\isapnp\isapnp.sys 2 -windows\dxapi.sys 2 -windows\dxg.sys 2 -windows\dxgthk.sys 2 +drivers\directx\dxapi\dxapi.sys 2 +drivers\directx\dxg\dxg.sys 2 +drivers\directx\dxgthk\dxgthk.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 drivers\filesystems\msfs\msfs.sys 2 @@ -606,17 +605,6 @@ modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional - -modules\rostests\dxtest\ddraw_test\ddraw_test.exe 7 optional -modules\rostests\dxtest\win32kdxtest\win32kdxtest.exe 7 optional - -modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional - -modules\rostests\apitests\user32api\user32api.exe 7 optional -modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional -modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 7 optional - - modules\wallpaper\lake.bmp 4 optional ; Native libraries

16 years, 6 months

[dchapyshev] 33085: - Add Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Mon Apr 21 00:43:23 2008 New Revision: 33085 URL: http://svn.reactos.org/svn/reactos?rev=33085&view=rev Log: - Add Russian translation Added: trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc Added: trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc [iso-8859-1] Mon Apr 21 00:43:23 2008 @@ -1,0 +1,6 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_EXIT, "Âûõîä" +END Propchange: trunk/reactos/base/applications/kbswitch/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Mon Apr 21 00:43:23 2008 @@ -1,2 +1,3 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/ru-RU.rc"

16 years, 6 months

[greatlrd] 33084: DxDdStartupDxGraphics Bugfix : the load order, it try loading vista dxkrnl.sys frist then it try loading dxg.System rember I have not tested vista dxkrnl.sys in reactos at all yet. Bugfix : thx piggworth for notice the hDev was never resive to DxEngLockHdev, it still does not do in some case. we need more invigaste why

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Apr 21 00:42:08 2008 New Revision: 33084 URL: http://svn.reactos.org/svn/reactos?rev=33084&view=rev Log: DxDdStartupDxGraphics Bugfix : the load order, it try loading vista dxkrnl.sys frist then it try loading dxg.System rember I have not tested vista dxkrnl.sys in reactos at all yet. Bugfix : thx piggworth for notice the hDev was never resive to DxEngLockHdev, it still does not do in some case. we need more invigaste why Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 21 00:42:08 2008 @@ -125,7 +125,8 @@ dll\directx\dplayx\dplayx.dll 1 dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 -dll\directx\ddraw\ddraw.dll 1 +windows\ddraw.dll 1 +windows\dciman32.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 @@ -307,9 +308,9 @@ drivers\bus\isapnp\isapnp.sys 2 -drivers\directx\dxapi\dxapi.sys 2 -drivers\directx\dxg\dxg.sys 2 -drivers\directx\dxgthk\dxgthk.sys 2 +windows\dxapi.sys 2 +windows\dxg.sys 2 +windows\dxgthk.sys 2 drivers\filesystems\fs_rec\fs_rec.sys 2 drivers\filesystems\msfs\msfs.sys 2 @@ -605,6 +606,17 @@ modules\rostests\winetests\uxtheme\uxtheme_winetest.exe 7 optional modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional + +modules\rostests\dxtest\ddraw_test\ddraw_test.exe 7 optional +modules\rostests\dxtest\win32kdxtest\win32kdxtest.exe 7 optional + +modules\rostests\apitests\gdi32api\gdi32api.exe 7 optional + +modules\rostests\apitests\user32api\user32api.exe 7 optional +modules\rostests\apitests\w32knapi\w32knapi.exe 7 optional +modules\rostests\apitests\w32kdll\w32kdll_ros\w32kdll.dll 7 optional + + modules\wallpaper\lake.bmp 4 optional ; Native libraries Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Mon Apr 21 00:42:08 2008 @@ -23,7 +23,7 @@ HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext; void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl); -EDD_DIRECTDRAW_GLOBAL eDdirectDraw_Global; +EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; /************************************************************************/ @@ -54,17 +54,14 @@ /* Loading the kernel interface of directx for win32k */ - - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); - + DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); if ( ghDxGraphics == NULL) { - DPRINT1("Warning: dxg.sys not found\n"); - + DPRINT1("Warning: dxkrnl.sys not found\n"); /* try loading vista dx kernel */ - DPRINT1("Warning: trying loading vista dxkrnl.sys\n"); - - ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxkrnl.sys"); + DPRINT1("Warning: trying loading xp/2003/reactos dxg.sys\n"); + ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); } if ( ghDxGraphics == NULL) @@ -117,7 +114,7 @@ for (t=0;t<=DXG_INDEX_DxDdIoctl;t++) { gpDxFuncs[lstDrvFN[t].iFunc].iFunc =lstDrvFN[t].iFunc; - gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; + gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } /* dump sort list for debuging */ @@ -129,7 +126,7 @@ for (t=0;t<=DXG_INDEX_DxDdIoctl;t++) { DPRINT1("gpDxFuncs[0x%08lx].iFunc = 0x%08lx\n",t,gpDxFuncs[t].iFunc); - DPRINT1("gpDxFuncs[0x%08lx].pfn = 0x%08lx\n",t,gpDxFuncs[t].pfn); + DPRINT1("gpDxFuncs[0x%08lx].pfn = 0x%08lx\n",t,gpDxFuncs[t].pfn); } #endif DPRINT1("DirectX interface is activated\n"); @@ -183,10 +180,13 @@ return 0; } /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ - ((PGDIDEVICE)pDC->pPDev)->pEDDgpl = &eDdirectDraw_Global; - RtlZeroMemory(&eDdirectDraw_Global,sizeof(EDD_DIRECTDRAW_GLOBAL)); + ((PGDIDEVICE)pDC->pPDev)->pEDDgpl = &edd_DdirectDraw_Global; + RtlZeroMemory(&edd_DdirectDraw_Global,sizeof(EDD_DIRECTDRAW_GLOBAL)); + + /* setup hdev for edd_DdirectDraw_Global xp */ + edd_DdirectDraw_Global.hDev = (PVOID)pDC->pPDev; + edd_DdirectDraw_Global.hPDev = (PVOID)pDC->pPDev; DC_UnlockDc(pDC); - /* get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; @@ -201,7 +201,7 @@ DxHandle = pfnDdCreateDirectDrawObject(hdc); #if DXDDRAWDEBUG - dump_edd_directdraw_global(&eDdirectDraw_Global); + dump_edd_directdraw_global(&edd_DdirectDraw_Global); #endif return DxHandle; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Mon Apr 21 00:42:08 2008 @@ -530,7 +530,11 @@ DxEngLockHdev(HDEV hDev) { PGDIDEVICE pPDev = (PGDIDEVICE)hDev; - PERESOURCE Resource = pPDev->hsemDevLock; + PERESOURCE Resource; + + DPRINT1("hDev : 0x%08lx\n",hDev); + + Resource = pPDev->hsemDevLock; DPRINT1("ReactX Calling : DxEngLockHdev \n");

16 years, 6 months

[zguo] 33083: Forgot this file.

by zguo＠svn.reactos.org

Author: zguo Date: Sun Apr 20 22:50:48 2008 New Revision: 33083 URL: http://svn.reactos.org/svn/reactos?rev=33083&view=rev Log: Forgot this file. Modified: trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=33083&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/xml.cpp [iso-8859-1] Sun Apr 20 22:50:48 2008 @@ -833,8 +833,10 @@ Path::RelativeFromWorkingDirectory ( includeFile ) ); XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile ); - return XMLLoadInclude ( - *fallbackInclude, includes ); + + XMLElement* value = XMLLoadInclude (*fallbackInclude, includes ); + delete fallbackInclude; + return value; } } throw XMLInvalidBuildFileException (

16 years, 6 months

[zguo] 33081: Header updates from Samuel

by zguo＠svn.reactos.org

Author: zguo Date: Sun Apr 20 21:13:57 2008 New Revision: 33081 URL: http://svn.reactos.org/svn/reactos?rev=33081&view=rev Log: Header updates from Samuel Modified: trunk/reactos/include/psdk/imm.h trunk/reactos/include/psdk/winreg.h trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=330… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Sun Apr 20 21:13:57 2008 @@ -344,7 +344,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD); BOOL WINAPI ImmGetOpenStatus(HIMC); BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA); BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW); BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA); Modified: trunk/reactos/include/psdk/winreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winreg.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winreg.h [iso-8859-1] Sun Apr 20 21:13:57 2008 @@ -37,7 +37,6 @@ #define REG_NOTIFY_CHANGE_LAST_SET 4 #define REG_NOTIFY_CHANGE_SECURITY 8 -#if (_WIN32_WINNT >= 0x0600) #define RRF_RT_REG_NONE (1 << 0) #define RRF_RT_REG_SZ (1 << 1) #define RRF_RT_REG_EXPAND_SZ (1 << 2) @@ -50,7 +49,6 @@ #define RRF_RT_ANY (0x0000FFFF) #define RRF_NOEXPAND (1 << 28) #define RRF_ZEROONFAILURE (1 << 29) -#endif #ifndef RC_INVOKED typedef ACCESS_MASK REGSAM; 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] Sun Apr 20 21:13:57 2008 @@ -3027,7 +3027,7 @@ DWORD dwFlags; LPWSTR lpszDefaultScheme; } HIGHCONTRASTW,*LPHIGHCONTRASTW; -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) typedef struct tagICONMETRICSA { UINT cbSize; int iHorzSpacing; @@ -3059,7 +3059,7 @@ DWORD dwReserved1; DWORD dwReserved2; } MOUSEKEYS,*LPMOUSEKEYS; -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) typedef struct tagNONCLIENTMETRICSA { UINT cbSize; int iBorderWidth; @@ -3552,7 +3552,7 @@ LRESULT WINAPI CallWindowProcW(WNDPROC,HWND,UINT,WPARAM,LPARAM); WORD WINAPI CascadeWindows(HWND,UINT,LPCRECT,UINT,const HWND*); BOOL WINAPI ChangeClipboardChain(HWND,HWND); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) LONG WINAPI ChangeDisplaySettingsA(PDEVMODEA,DWORD); LONG WINAPI ChangeDisplaySettingsW(PDEVMODEW,DWORD); LONG WINAPI ChangeDisplaySettingsExA(LPCSTR,LPDEVMODEA,HWND,DWORD,LPVOID); @@ -3603,7 +3603,7 @@ HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int); BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int); HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); #endif @@ -3704,7 +3704,7 @@ BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM); BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) @@ -4215,7 +4215,7 @@ #endif #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI SetLayeredWindowAttributes(HWND,COLORREF,BYTE,DWORD); -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI UpdateLayeredWindow(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); #endif #endif @@ -4548,7 +4548,7 @@ #define WinHelp WinHelpA #define wsprintf wsprintfA #define wvsprintf wvsprintfA -#ifndef NOGDI +#if defined(_WINGDI_) && !defined(NOGDI) typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS; typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS; #define ChangeDisplaySettings ChangeDisplaySettingsA

16 years, 6 months

[fireball] 33080: - directory.rbuild in rosapps should be alphabetically sorted, so move drivers to its respected place. - Move service skeleton into templates directory, it's there for that kind of stuff.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 20 15:54:06 2008 New Revision: 33080 URL: http://svn.reactos.org/svn/reactos?rev=33080&view=rev Log: - directory.rbuild in rosapps should be alphabetically sorted, so move drivers to its respected place. - Move service skeleton into templates directory, it's there for that kind of stuff. Added: trunk/rosapps/templates/skel_service/ - copied from r33079, trunk/rosapps/skel_service/ Removed: trunk/rosapps/skel_service/ Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=33080… ============================================================================== --- trunk/rosapps/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/directory.rbuild [iso-8859-1] Sun Apr 20 15:54:06 2008 @@ -1,10 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="drivers"> - <xi:include href="drivers/directory.rbuild" /> - </directory> - <directory name="applications"> <xi:include href="applications/applications.rbuild" /> </directory> @@ -27,6 +23,10 @@ <directory name="downloader"> <xi:include href="downloader/downloader.rbuild" /> + </directory> + + <directory name="drivers"> + <xi:include href="drivers/directory.rbuild" /> </directory> <directory name="fontview">

16 years, 6 months

[cfinck] 33079: - Make the "Exit" string translateable - Use the last possible ID for this command, so we can add as many keyboard layouts as possible to the popup menu - Send a WM_CLOSE message when clicking "Exit", don't duplicate the WM_DESTROY code here

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 20 14:49:10 2008 New Revision: 33079 URL: http://svn.reactos.org/svn/reactos?rev=33079&view=rev Log: - Make the "Exit" string translateable - Use the last possible ID for this command, so we can add as many keyboard layouts as possible to the popup menu - Send a WM_CLOSE message when clicking "Exit", don't duplicate the WM_DESTROY code here Added: trunk/reactos/base/applications/kbswitch/lang/ trunk/reactos/base/applications/kbswitch/lang/de-DE.rc (with props) trunk/reactos/base/applications/kbswitch/lang/en-US.rc (with props) trunk/reactos/base/applications/kbswitch/rsrc.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h trunk/reactos/base/applications/kbswitch/kbswitch.rc trunk/reactos/base/applications/kbswitch/resource.h Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -137,6 +137,7 @@ HMENU hMenu; HKEY hKey; DWORD dwIndex, dwSize; + LPTSTR szExit; TCHAR szLayoutNum[CCH_ULONG_DEC + 1]; TCHAR szName[MAX_PATH]; @@ -159,8 +160,9 @@ RegCloseKey(hKey); } - AppendMenu(hMenu, MF_SEPARATOR, 0, _T("")); - AppendMenu(hMenu, MF_STRING, 1000, _T("Exit")); + LoadString(hInst, IDS_EXIT, (LPTSTR)&szExit, 0); + AppendMenu(hMenu, MF_SEPARATOR, 0, NULL); + AppendMenu(hMenu, MF_STRING, MENU_ID_EXIT, szExit); return hMenu; } @@ -194,16 +196,11 @@ break; case WM_COMMAND: - if (LOWORD(wParam) == 1000) - { - DestroyMenu(hPopupMenu); - DelTrayIcon(hwnd); - PostQuitMessage(0); - } + if (LOWORD(wParam) == MENU_ID_EXIT) + SendMessage(hwnd, WM_CLOSE, 0, 0); else - { ActivateLayout(LOWORD(wParam)); - } + break; case WM_DESTROY: Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -9,3 +9,5 @@ // Maximum Character Count of a ULONG in decimal #define CCH_ULONG_DEC 10 + +#define MENU_ID_EXIT 65535 Modified: trunk/reactos/base/applications/kbswitch/kbswitch.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.rc [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -3,4 +3,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Keyboard Layout Switcher\0" +#define REACTOS_STR_INTERNAL_NAME "kbswitch\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbswitch.exe\0" +#include <reactos/version.rc> + IDI_MAIN ICON "res/kbswitch.ico" + +#include "rsrc.rc" Added: trunk/reactos/base/applications/kbswitch/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/de-DE.rc [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -1,0 +1,6 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_EXIT, "Beenden" +END Propchange: trunk/reactos/base/applications/kbswitch/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/en-US.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/en-US.rc [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -1,0 +1,6 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_EXIT, "Exit" +END Propchange: trunk/reactos/base/applications/kbswitch/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/resource.h [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -1,2 +1,5 @@ /* Icons */ #define IDI_MAIN 100 + +/* Strings */ +#define IDS_EXIT 1001 Added: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc (added) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Sun Apr 20 14:49:10 2008 @@ -1,0 +1,2 @@ +#include "lang/de-DE.rc" +#include "lang/en-US.rc" Propchange: trunk/reactos/base/applications/kbswitch/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 6 months

[hpoussin] 33078: Prevent mshtml registration (doesn't work yet) See issue #3189 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Apr 20 14:10:41 2008 New Revision: 33078 URL: http://svn.reactos.org/svn/reactos?rev=33078&view=rev Log: Prevent mshtml registration (doesn't work yet) See issue #3189 for more details. Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild Modified: trunk/reactos/dll/win32/mshtml/mshtml.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml.rb… ============================================================================== --- trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/mshtml.rbuild [iso-8859-1] Sun Apr 20 14:10:41 2008 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="mshtml" type="win32dll" baseaddress="${BASEADDRESS_MSHTML}" installbase="system32" installname="mshtml.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="Both" /> +  <importlibrary definition="mshtml.spec.def" /> <include base="mshtml">.</include> <include base="ReactOS">include/reactos/wine</include>

16 years, 6 months

[dchapyshev] 33077: - Add "Exit" item to menu

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Apr 20 13:59:58 2008 New Revision: 33077 URL: http://svn.reactos.org/svn/reactos?rev=33077&view=rev Log: - Add "Exit" item to menu Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Sun Apr 20 13:59:58 2008 @@ -158,6 +158,9 @@ RegCloseKey(hKey); } + + AppendMenu(hMenu, MF_SEPARATOR, 0, _T("")); + AppendMenu(hMenu, MF_STRING, 1000, _T("Exit")); return hMenu; } @@ -191,7 +194,16 @@ break; case WM_COMMAND: - ActivateLayout(LOWORD(wParam)); + if (LOWORD(wParam) == 1000) + { + DestroyMenu(hPopupMenu); + DelTrayIcon(hwnd); + PostQuitMessage(0); + } + else + { + ActivateLayout(LOWORD(wParam)); + } break; case WM_DESTROY:

16 years, 6 months

[cfinck] 33076: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Apr 20 13:15:06 2008 New Revision: 33076 URL: http://svn.reactos.org/svn/reactos?rev=33076&view=rev Log: Set svn:ignore to "GNUmakefile *.vcproj *.user *.cbp *.ncb *.suo *.sln" where needed Modified: trunk/reactos/base/applications/dxdiag/ (props changed) trunk/reactos/base/applications/dxdiag/lang/ (props changed) trunk/reactos/base/applications/dxdiag/res/ (props changed) trunk/reactos/base/applications/kbswitch/ (props changed) trunk/reactos/base/applications/kbswitch/res/ (props changed) trunk/reactos/dll/directx/ksproxy/ (props changed) trunk/reactos/dll/directx/ksuser/ (props changed) trunk/reactos/dll/directx/msdmo/ (props changed) trunk/reactos/dll/directx/qedit/ (props changed) trunk/reactos/dll/directx/quartz/ (props changed) trunk/reactos/dll/keyboard/kbdal/ (props changed) trunk/reactos/dll/keyboard/kbdru1/ (props changed) trunk/reactos/dll/win32/compstui/ (props changed) trunk/reactos/dll/win32/mshtml/ (props changed) trunk/reactos/dll/win32/ntdsapi/ (props changed) trunk/reactos/dll/win32/pdh/ (props changed) trunk/reactos/dll/win32/printui/ (props changed) Propchange: trunk/reactos/base/applications/dxdiag/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/applications/dxdiag/lang/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/applications/dxdiag/res/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/applications/kbswitch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/base/applications/kbswitch/res/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/ksproxy/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/ksuser/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/msdmo/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/qedit/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/directx/quartz/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdal/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/keyboard/kbdru1/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/compstui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/mshtml/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/ntdsapi/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/pdh/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/win32/printui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 20 13:15:06 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln

16 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
40
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 April 2008