Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 28351: Dmitry Chapyshev <lentind@yandex.ru>: - Fix so that letters like "p" or "y" are correctly displayed in messageboxes.
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Wed Aug 15 18:49:44 2007 New Revision: 28351 URL: http://svn.reactos.org/svn/reactos?rev=28351&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Fix so that letters like "p" or "y" are correctly displayed in messageboxes. Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c Wed Aug 15 18:49:44 2007 @@ -491,7 +491,7 @@ txtrect.right = GetSystemMetrics(SM_CXSCREEN) / 5 * 4; if(Icon) txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; - txtrect.top = txtrect.left = txtrect.bottom = 0; + txtrect.top = txtrect.left = txtrect.bottom = 5; SelectObject(hDC, hFont); if (textlen != 0) {

1 0

[fireball] 28350: Dmitry Chapyshev <lentind@yandex.ru>: - Russian translation fixes - Separation of hardcoded strings into resource files
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Wed Aug 15 18:46:36 2007 New Revision: 28350 URL: http://svn.reactos.org/svn/reactos?rev=28350&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Russian translation fixes - Separation of hardcoded strings into resource files Added: trunk/reactos/base/applications/cmdutils/find/lang/ (with props) trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/find/find.c trunk/reactos/base/applications/cmdutils/find/find.rbuild trunk/reactos/base/applications/cmdutils/find/find.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/wordpad/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru…

1 0

[cfinck] 28349: Reapply the taskbar icon hackfix from r27734
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 18:45:59 2007 New Revision: 28349 URL: http://svn.reactos.org/svn/reactos?rev=28349&view=rev Log: Reapply the taskbar icon hackfix from r27734 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c Wed Aug 15 18:45:59 2007 @@ -2669,7 +2669,33 @@ TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + { + BITMAP bmp; + HBITMAP hOldBitmapBitmap, hOldBitmapLoad; + HDC hdcImage, hdcBitmap; + + /* copy the bitmap before adding it so that the user's bitmap + * doesn't get modified. + */ + GetObjectW ((HBITMAP)bitmap->nID, sizeof(BITMAP), (LPVOID)&bmp); + + hdcImage = CreateCompatibleDC(0); + hdcBitmap = CreateCompatibleDC(0); + + /* create new bitmap */ + hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); + hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)bitmap->nID); + hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + + /* Copy the user's image */ + BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, + hdcBitmap, 0, 0, SRCCOPY); + + SelectObject (hdcImage, hOldBitmapLoad); + SelectObject (hdcBitmap, hOldBitmapBitmap); + DeleteDC (hdcImage); + DeleteDC (hdcBitmap); + } else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

[cfinck] 28348: Set version 0.3.3-SVN
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 18:19:51 2007 New Revision: 28348 URL: http://svn.reactos.org/svn/reactos?rev=28348&view=rev Log: Set version 0.3.3-SVN Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/in… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h (original) +++ branches/ros-branch-0_3_3-new/reactos/include/reactos/version.h Wed Aug 15 18:19:51 2007 @@ -18,8 +18,8 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 3 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"RELEASE" */ #define KERNEL_VERSION_BUILD_TYPE L"SVN"

1 0

[cfinck] 28347: Rebranch 0.3.3 from current trunk (better than this merging mess :-)
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 18:02:33 2007 New Revision: 28347 URL: http://svn.reactos.org/svn/reactos?rev=28347&view=rev Log: Rebranch 0.3.3 from current trunk (better than this merging mess :-) Added: branches/ros-branch-0_3_3-new/ - copied from r28346, trunk/

1 0

[gedmurphy] 28346: move mmsys icons into the resources folder
by gedmurphy＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: gedmurphy Date: Wed Aug 15 16:50:21 2007 New Revision: 28346 URL: http://svn.reactos.org/svn/reactos?rev=28346&view=rev Log: move mmsys icons into the resources folder Added: trunk/reactos/dll/cpl/mmsys/resources/microphone.ico - copied unchanged from r28345, trunk/reactos/dll/cpl/mmsys/microphone.ico trunk/reactos/dll/cpl/mmsys/resources/muted.ico - copied unchanged from r28345, trunk/reactos/dll/cpl/mmsys/muted.ico trunk/reactos/dll/cpl/mmsys/resources/speaker.bmp - copied unchanged from r28345, trunk/reactos/dll/cpl/mmsys/speaker.bmp Removed: trunk/reactos/dll/cpl/mmsys/microphone.ico trunk/reactos/dll/cpl/mmsys/muted.ico trunk/reactos/dll/cpl/mmsys/speaker.bmp Removed: trunk/reactos/dll/cpl/mmsys/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/microphone.i… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/cpl/mmsys/muted.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/muted.ico?re… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/cpl/mmsys/speaker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/speaker.bmp?… ============================================================================== Binary file - no diff available.

1 0

[fireball] 28345: Dmitry Chapyshev <lentind@yandex.ru>: - Add some icons to mmsys. - Change ugly powercfg icons to better one.
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Wed Aug 15 16:41:24 2007 New Revision: 28345 URL: http://svn.reactos.org/svn/reactos?rev=28345&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Add some icons to mmsys. - Change ugly powercfg icons to better one. Added: trunk/reactos/dll/cpl/mmsys/microphone.ico (with props) trunk/reactos/dll/cpl/mmsys/muted.ico (with props) trunk/reactos/dll/cpl/mmsys/speaker.bmp (with props) Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharging.ico trunk/reactos/dll/cpl/powercfg/resources/batterychargingcritical.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginghalf.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginghigh.ico trunk/reactos/dll/cpl/powercfg/resources/batterycharginglow.ico trunk/reactos/dll/cpl/powercfg/resources/batterycritical.ico trunk/reactos/dll/cpl/powercfg/resources/batteryfull.ico trunk/reactos/dll/cpl/powercfg/resources/batteryhalf.ico trunk/reactos/dll/cpl/powercfg/resources/batteryhigh.ico trunk/reactos/dll/cpl/powercfg/resources/batterylow.ico trunk/reactos/dll/cpl/powercfg/resources/batteryunknown.ico trunk/reactos/dll/cpl/powercfg/resources/nobattery.ico Added: trunk/reactos/dll/cpl/mmsys/microphone.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/microphone.i… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/mmsys/microphone.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/mmsys/muted.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/muted.ico?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/mmsys/muted.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/mmsys/speaker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/speaker.bmp?… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/mmsys/speaker.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharging.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterychargingcritical.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginghalf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginghigh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycharginglow.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterycritical.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryfull.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryhalf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryhigh.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batterylow.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/batteryunknown.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/resources/nobattery.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resources… ============================================================================== Binary files - no diff available.

1 0

[amunger] 28344: Fixup the R_MAGIC code.
by amunger＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: amunger Date: Wed Aug 15 11:45:55 2007 New Revision: 28344 URL: http://svn.reactos.org/svn/reactos?rev=28344&view=rev Log: Fixup the R_MAGIC code. Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rpoolmgr.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h (original) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h Wed Aug 15 11:45:55 2007 @@ -427,12 +427,12 @@ ASSERT ( Addr >= (char*)pool->UserBase && Addr < ((char*)pool->UserBase + pool->UserSize - 16) ); #ifdef R_MAGIC - if ( pUsed->UsedMagic == MM_PPOOL_FREEMAGIC ) + if ( pUsed->UsedMagic == R_FREE_MAGIC ) { pUsed->UserSize = 0; // just to keep from confusion, MmpBadBlock() doesn't return... RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 ); } - if ( pUsed->UsedMagic != MM_PPOOL_USEDMAGIC ) + if ( pUsed->UsedMagic != R_USED_MAGIC ) { RiBadBlock ( pUsed, Addr, "bad magic", file, line, 0 ); } @@ -650,7 +650,7 @@ { Block->Status = 1; RUsedFillStack ( Block ); -#if R_MAGIC +#ifdef R_MAGIC Block->UsedMagic = R_USED_MAGIC; #endif//R_MAGIC //ASSERT_SIZE ( Block->Size ); @@ -978,7 +978,7 @@ { PR_USED Block = RBodyToHdr(Addr); // TODO FIXME - should we validate params? -#if R_MAGIC +#ifdef R_MAGIC if ( Block->UsedMagic != R_USED_MAGIC ) return 0xDEADBEEF; #endif//R_MAGIC

1 0

[arty] 28343: Fix size of handle count database. We really didn't want to change the size we remembered for the old one, and the newly computed size was wacky too. We just want to add 4 to i and 4 * entry size to the size. This was found by Wax.
by arty＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: arty Date: Wed Aug 15 09:30:32 2007 New Revision: 28343 URL: http://svn.reactos.org/svn/reactos?rev=28343&view=rev Log: Fix size of handle count database. We really didn't want to change the size we remembered for the old one, and the newly computed size was wacky too. We just want to add 4 to i and 4 * entry size to the size. This was found by Wax. Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Wed Aug 15 09:30:32 2007 @@ -261,7 +261,7 @@ /* Add 4 more entries */ i += 4; - Size = OldSize += ((i - 1) * sizeof(OBJECT_HANDLE_COUNT_ENTRY)); + Size = OldSize + (4 * sizeof(OBJECT_HANDLE_COUNT_ENTRY)); } /* Allocate the DB */

1 0

[jimtabor] 28342: GdiComment, example port from Wine.
by jimtabor＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: jimtabor Date: Wed Aug 15 05:41:30 2007 New Revision: 28342 URL: http://svn.reactos.org/svn/reactos?rev=28342&view=rev Log: GdiComment, example port from Wine. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Wed Aug 15 05:41:30 2007 @@ -551,14 +551,27 @@ BOOL STDCALL GdiComment( - HDC a0, - UINT a1, - CONST BYTE *a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HDC hDC, + UINT bytes, + CONST BYTE *buffer + ) +{ +#if 0 + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_EMF) + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { // Wine port + return EMFDRV_GdiComment( hDC, bytes, buffer ); + } + } +#endif + return FALSE; }

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