Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 42711: - Implement system palette based on palette.c from r41760 (pre-Timo rewrite, to be compatible with other existing stuff).
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 20:10:34 2009 New Revision: 42711 URL: http://svn.reactos.org/svn/reactos?rev=42711&view=rev Log: - Implement system palette based on palette.c from r41760 (pre-Timo rewrite, to be compatible with other existing stuff). Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -143,6 +143,9 @@ /* Create an empty combined clipping region */ pNewDC->CombinedClip = EngCreateClip(); + + /* Set default palette */ + pNewDC->hPalette = hSystemPal; /* Give handle to the caller */ *pdev = hNewDC; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/palobj.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -14,6 +14,84 @@ #define NDEBUG #include <debug.h> +/* GLOBALS *******************************************************************/ +HGDIOBJ hSystemPal; + +#define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ + +const PALETTEENTRY COLOR_sysPalTemplate[NB_RESERVED_COLORS] = +{ + // first 10 entries in the system palette + // red green blue flags + { 0x00, 0x00, 0x00, PC_SYS_USED }, + { 0x80, 0x00, 0x00, PC_SYS_USED }, + { 0x00, 0x80, 0x00, PC_SYS_USED }, + { 0x80, 0x80, 0x00, PC_SYS_USED }, + { 0x00, 0x00, 0x80, PC_SYS_USED }, + { 0x80, 0x00, 0x80, PC_SYS_USED }, + { 0x00, 0x80, 0x80, PC_SYS_USED }, + { 0xc0, 0xc0, 0xc0, PC_SYS_USED }, + { 0xc0, 0xdc, 0xc0, PC_SYS_USED }, + { 0xa6, 0xca, 0xf0, PC_SYS_USED }, + + // ... c_min/2 dynamic colorcells + // ... gap (for sparse palettes) + // ... c_min/2 dynamic colorcells + + { 0xff, 0xfb, 0xf0, PC_SYS_USED }, + { 0xa0, 0xa0, 0xa4, PC_SYS_USED }, + { 0x80, 0x80, 0x80, PC_SYS_USED }, + { 0xff, 0x00, 0x00, PC_SYS_USED }, + { 0x00, 0xff, 0x00, PC_SYS_USED }, + { 0xff, 0xff, 0x00, PC_SYS_USED }, + { 0x00, 0x00, 0xff, PC_SYS_USED }, + { 0xff, 0x00, 0xff, PC_SYS_USED }, + { 0x00, 0xff, 0xff, PC_SYS_USED }, + { 0xff, 0xff, 0xff, PC_SYS_USED } // last 10 +}; + +const PALETTEENTRY* FASTCALL COLOR_GetSystemPaletteTemplate(void) +{ + return (const PALETTEENTRY*)&COLOR_sysPalTemplate; +} + +/* PRIVATE FUNCTIONS *********************************************************/ +/* + * @implemented + */ +HPALETTE APIENTRY +GrepCreatePalette( IN LPLOGPALETTE pLogPal, IN UINT cEntries ) +{ + PPALETTE PalGDI; + HPALETTE NewPalette; + + pLogPal->palNumEntries = cEntries; + NewPalette = PALETTE_AllocPalette( PAL_INDEXED, + cEntries, + (PULONG)pLogPal->palPalEntry, + 0, 0, 0); + + if (NewPalette == NULL) + { + return NULL; + } + + PalGDI = (PPALETTE) PALETTE_LockPalette(NewPalette); + if (PalGDI != NULL) + { + PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); + //PalGDI->logicalToSystem = NULL; + PALETTE_UnlockPalette(PalGDI); + } + else + { + /* FIXME - Handle PalGDI == NULL!!!! */ + DPRINT1("Warning: PalGDI is NULL!\n"); + } + return NewPalette; +} + /* PUBLIC FUNCTIONS **********************************************************/ HPALETTE @@ -105,6 +183,108 @@ return NewPalette; } +// Create the system palette +VOID APIENTRY +PALETTE_Init(VOID) +{ + int i; + PLOGPALETTE palPtr; + + const PALETTEENTRY* __sysPalTemplate = (const PALETTEENTRY*)COLOR_GetSystemPaletteTemplate(); + + // create default palette (20 system colors) + palPtr = ExAllocatePoolWithTag(PagedPool, + sizeof(LOGPALETTE) + + (NB_RESERVED_COLORS * sizeof(PALETTEENTRY)), + TAG_PALETTE); + if (!palPtr) + { + hSystemPal = 0; + return; + } + + palPtr->palVersion = 0x300; + palPtr->palNumEntries = NB_RESERVED_COLORS; + for (i=0; i<NB_RESERVED_COLORS; i++) + { + palPtr->palPalEntry[i].peRed = __sysPalTemplate[i].peRed; + palPtr->palPalEntry[i].peGreen = __sysPalTemplate[i].peGreen; + palPtr->palPalEntry[i].peBlue = __sysPalTemplate[i].peBlue; + palPtr->palPalEntry[i].peFlags = 0; + } + + hSystemPal = GrepCreatePalette(palPtr,NB_RESERVED_COLORS); + ExFreePoolWithTag(palPtr, TAG_PALETTE); + + /* Convert it to a stock object */ + GDIOBJ_ConvertToStockObj(&hSystemPal); +} + +UINT APIENTRY +GreGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe) +{ + PPALETTE palGDI = NULL; + PDC dc = NULL; + UINT EntriesSize = 0; + UINT Ret = 0; + + if (Entries == 0) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + + if (pe != NULL) + { + EntriesSize = Entries * sizeof(pe[0]); + if (Entries != EntriesSize / sizeof(pe[0])) + { + /* Integer overflow! */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + } + + if (!(dc = DC_Lock(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + palGDI = PALETTE_LockPalette(dc->hPalette); + if (palGDI != NULL) + { + if (pe != NULL) + { + if (StartIndex >= palGDI->NumColors) + Entries = 0; + else if (Entries > palGDI->NumColors - StartIndex) + Entries = palGDI->NumColors - StartIndex; + + memcpy(pe, + palGDI->IndexedColors + StartIndex, + Entries * sizeof(pe[0])); + + Ret = Entries; + } + else + { + Ret = dc->pPDevice->GDIInfo.ulNumPalReg; + } + } + + if (palGDI != NULL) + PALETTE_UnlockPalette(palGDI); + + if (dc != NULL) + DC_Unlock(dc); + + return Ret; +} + RGBQUAD * NTAPI DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi) @@ -114,7 +294,7 @@ USHORT *lpIndex; PPALETTE palGDI; - palGDI = NULL;//PALETTE_LockPalette(dc->hPalette); + palGDI = PALETTE_LockPalette(dc->hPalette); UNIMPLEMENTED; if (NULL == palGDI) { @@ -219,5 +399,11 @@ return hPal; } +VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size) +{ + int i = 0; + for (; i<size ; i++) + lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07); +} /* EOF */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -12,6 +12,7 @@ PBRUSHGDI pLineBrush; COLORREF crForegroundClr; COLORREF crBackgroundClr; + HPALETTE hPalette; /* Origins and extents */ RECT rcDcRect; /* Relative to Vport */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/palobj.h [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -17,6 +17,8 @@ //HDEV hPDev; } PALETTE, *PPALETTE; +HGDIOBJ hSystemPal; + HPALETTE FASTCALL PALETTE_AllocPalette(ULONG Mode, ULONG NumColors, ULONG *Colors, @@ -27,6 +29,12 @@ HPALETTE FASTCALL PALETTE_AllocPaletteIndexedRGB(ULONG NumColors, CONST RGBQUAD *Colors); + +UINT APIENTRY +GreGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe); RGBQUAD * NTAPI DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi); @@ -41,6 +49,9 @@ GDIOBJ_FreeObjByHandle(hPalette, GDI_OBJECT_TYPE_PALETTE); } +VOID FASTCALL PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, INT size); +VOID APIENTRY PALETTE_Init(VOID); + #define PALETTE_LockPalette(hPalette) ((PPALETTE)GDIOBJ_LockObj((HGDIOBJ)hPalette, GDI_OBJECT_TYPE_PALETTE)) #define PALETTE_UnlockPalette(pPalette) GDIOBJ_UnlockObjByPtr((PBASEOBJECT)pPalette) Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sat Aug 15 20:10:34 2009 @@ -355,6 +355,7 @@ /* Create stock objects */ CreateStockBitmap(); + PALETTE_Init(); /* Init video driver implementation */ InitDcImpl();

1 0

[fireball] 42710: - Totally get rid of 16 bit global heap functions.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 18:58:58 2009 New Revision: 42710 URL: http://svn.reactos.org/svn/reactos?rev=42710&view=rev Log: - Totally get rid of 16 bit global heap functions. Modified: branches/arwinss/reactos/dll/win32/user32/controls.h branches/arwinss/reactos/dll/win32/user32/defdlg.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/menu.c branches/arwinss/reactos/dll/win32/user32/static.c branches/arwinss/reactos/dll/win32/user32/uitools.c branches/arwinss/reactos/dll/win32/user32/winproc.c Modified: branches/arwinss/reactos/dll/win32/user32/controls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -160,7 +160,7 @@ UINT yBaseUnit; INT idResult; /* EndDialog() result / default pushbutton ID */ UINT flags; /* EndDialog() called for this dialog */ - HGLOBAL16 hDialogHeap; + HGLOBAL hDialogHeap; } DIALOGINFO; #define DF_END 0x0001 Modified: branches/arwinss/reactos/dll/win32/user32/defdlg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defdlg.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -237,8 +237,8 @@ /* Free dialog heap (if created) */ if (dlgInfo->hDialogHeap) { - GlobalUnlock16(dlgInfo->hDialogHeap); - GlobalFree16(dlgInfo->hDialogHeap); + GlobalUnlock(dlgInfo->hDialogHeap); + GlobalFree(dlgInfo->hDialogHeap); } if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -14,81 +14,6 @@ RosUserConnectCsrss(); WINE_DEFAULT_DEBUG_CHANNEL(userlegacy); - -void WINAPI DbgBreakPoint(void); - -LPVOID -WINAPI -GlobalLock16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return NULL; -} - -BOOL16 -WINAPI -GlobalUnlock16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} - -HGLOBAL16 -WINAPI -GlobalAlloc16(UINT16 u, DWORD d) -{ - UNIMPLEMENTED; - DbgBreakPoint(); - return 0; -} - -HGLOBAL16 -WINAPI -GlobalFree16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -WINAPI -GlobalSize16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -SEGPTR -WINAPI -LocalLock16(HLOCAL16 h) -{ - UNIMPLEMENTED; - return 0; -} - -BOOL16 -WINAPI -LocalUnlock16(HLOCAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} - -LPVOID -WINAPI -LockResource16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return NULL; -} - -BOOL16 -WINAPI -FreeResource16(HGLOBAL16 h) -{ - UNIMPLEMENTED; - return FALSE; -} VOID WINAPI Modified: branches/arwinss/reactos/dll/win32/user32/menu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/menu.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -5351,13 +5351,13 @@ INT WINAPI TranslateAcceleratorA( HWND hWnd, HACCEL hAccel, LPMSG msg ) { /* YES, Accel16! */ - LPACCEL16 lpAccelTbl; + LPACCEL lpAccelTbl; int i; WPARAM wParam; if (!hWnd || !msg) return 0; - if (!hAccel || !(lpAccelTbl = (LPACCEL16) LockResource16(LOWORD(hAccel)))) + if (!hAccel || !(lpAccelTbl = (LPACCEL) LockResource(hAccel))) { WARN_(accel)("invalid accel handle=%p\n", hAccel); return 0; Modified: branches/arwinss/reactos/dll/win32/user32/static.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/static.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -151,7 +151,7 @@ CURSORICONINFO * info; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL; + info = hicon ? GlobalLock(hicon) : NULL; if (hicon && !info) { WARN("hicon != 0, but info == 0\n"); return 0; @@ -174,7 +174,7 @@ SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } - if (info) GlobalUnlock16(HICON_16(hicon)); + if (info) GlobalUnlock(hicon); return prevIcon; } @@ -803,7 +803,7 @@ GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL; + info = hIcon ? GlobalLock(hIcon) : NULL; if (!hIcon || !info) { FillRect(hdc, &rc, hbrush); @@ -823,7 +823,7 @@ DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); } - if (info) GlobalUnlock16(HICON_16(hIcon)); + if (info) GlobalUnlock(hIcon); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) Modified: branches/arwinss/reactos/dll/win32/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/uitools.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -1612,11 +1612,11 @@ break; case DST_ICON: - ici = GlobalLock16((HGLOBAL16)lp); + ici = GlobalLock((HGLOBAL)lp); if(!ici) return FALSE; s.cx = ici->nWidth; s.cy = ici->nHeight; - GlobalUnlock16((HGLOBAL16)lp); + GlobalUnlock((HGLOBAL)lp); break; case DST_BITMAP: Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Aug 15 18:58:58 2009 @@ -739,7 +739,7 @@ } - +#if 0 static UINT_PTR convert_handle_16_to_32(HANDLE16 src, unsigned int flags) { HANDLE dst; @@ -773,6 +773,7 @@ return dst; } +#endif /**********************************************************************

1 0

[sginsberg] 42709: - Convert tditest to PSEH instead of a broken MSVC SEH attempt - Teach man how to use "subroutines"
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 18:40:51 2009 New Revision: 42709 URL: http://svn.reactos.org/svn/reactos?rev=42709&view=rev Log: - Convert tditest to PSEH instead of a broken MSVC SEH attempt - Teach man how to use "subroutines" Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c trunk/rosapps/applications/sysutils/man/man.c Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… ============================================================================== --- trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] Sat Aug 15 18:40:51 2009 @@ -10,6 +10,7 @@ * 26-Nov-2003 Vizzini Updated to run properly on Win2ksp4 */ #include <tditest.h> +#include <pseh/pseh2.h> #if DBG @@ -544,22 +545,18 @@ return STATUS_INSUFFICIENT_RESOURCES; } -#ifdef _MSC_VER - try - { -#endif - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); -#ifdef _MSC_VER - } - except(EXCEPTION_EXECUTE_HANDLER) - { - TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); - IoFreeIrp(Irp); - ExFreePool(ConnectInfo); - return STATUS_UNSUCCESSFUL; - } -#endif + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); + IoFreeIrp(Irp); + ExFreePool(ConnectInfo); + return STATUS_UNSUCCESSFUL; + } _SEH2_END; TdiBuildSendDatagram( Irp, /* I/O Request Packet */ @@ -675,23 +672,19 @@ return STATUS_INSUFFICIENT_RESOURCES; } -#ifdef _MSC_VER - try - { -#endif - MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); -#ifdef _MSC_VER - } - except (EXCEPTION_EXECUTE_HANDLER) - { - TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); - IoFreeMdl(Mdl); - IoFreeIrp(Irp); - ExFreePool(MdlBuffer); - ExFreePool(ReceiveInfo); - return STATUS_INSUFFICIENT_RESOURCES; - } -#endif + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + TDI_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); + IoFreeIrp(Irp); + ExFreePool(MdlBuffer); + ExFreePool(ReceiveInfo); + return STATUS_INSUFFICIENT_RESOURCES; + } _SEH2_END; TdiBuildReceiveDatagram( Irp, /* I/O Request Packet */ Modified: trunk/rosapps/applications/sysutils/man/man.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/… ============================================================================== --- trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/man/man.c [iso-8859-1] Sat Aug 15 18:40:51 2009 @@ -119,48 +119,51 @@ return element; } -int -AnalyzeFile() -{ - char *cur_string=(char*)malloc(sizeof(char)*MAXLINE); +void sh_outp(char *cur_string) +{ + int symbol; + putchar('\n'); + putchar('\n'); + for(symbol=3;putchar(cur_string[symbol]); symbol++); +} + +void th_outp(char *cur_string, char *THtag) +{ + int symbol; + putchar('\n'); + putchar('\n'); + putchar('\t'); + putchar('\t'); + SetCl(ITALIC); + for(symbol=3;putchar(THtag[symbol]); symbol++); + putchar('\n'); + SetCl(NORMAL); +} + +void text_outp(char *cur_string) +{ + char TagFlag=0; int symbol=0; - char *THtag=(char*)malloc(sizeof(char)*MAXLINE); - - - void sh_outp(void) - { - putchar('\n'); - putchar('\n'); - for(symbol=3;putchar(cur_string[symbol]); symbol++); - } - - void th_outp(void) - { - putchar('\n'); - putchar('\n'); - putchar('\t'); - putchar('\t'); - SetCl(ITALIC); - for(symbol=3;putchar(THtag[symbol]); symbol++); - putchar('\n'); - SetCl(NORMAL); - } - - void text_outp(void) - { - char TagFlag=0; - symbol=0; - - if(cur_string[0]=='.') - while(cur_string[symbol]!=' ') - symbol++; - - if(symbol) TagFlag=1; - - for(;cur_string[symbol]!='\n'; symbol++) + + if(cur_string[0]=='.') + while(cur_string[symbol]!=' ') + symbol++; + + if(symbol) TagFlag=1; + + for(;cur_string[symbol]!='\n'; symbol++) putchar(cur_string[symbol]); putchar(' '); - } +} + +int +AnalyzeFile() +{ + char *cur_string=(char*)malloc(sizeof(char)*MAXLINE); + char *THtag=(char*)malloc(sizeof(char)*MAXLINE); + + + while(fgets(cur_string,MAXLINE,manfile)) @@ -169,7 +172,7 @@ (cur_string[2]=='H')) // .SH tag { SetCl(BOLD); - sh_outp(); + sh_outp(cur_string); SetCl(NORMAL); } else @@ -177,7 +180,7 @@ (cur_string[2]==' ')) // .I tag { SetCl(ITALIC); - text_outp(); + text_outp(cur_string); SetCl(NORMAL); } else @@ -195,7 +198,7 @@ (cur_string[2]==' ')) // .B tag { SetCl(BOLD); - text_outp(); + text_outp(cur_string); SetCl(NORMAL); } else @@ -206,8 +209,8 @@ putchar(' '); } - else text_outp(); // print plane text - th_outp(); + else text_outp(cur_string); // print plane text + th_outp(cur_string, THtag); /* END of TAGs processing */ return 0; }

1 0

[fireball] 42708: - Fix a typo.
by fireball＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: fireball Date: Sat Aug 15 18:32:20 2009 New Revision: 42708 URL: http://svn.reactos.org/svn/reactos?rev=42708&view=rev Log: - Fix a typo. Modified: trunk/rostests/dibtests/icontest/icontest.c Modified: trunk/rostests/dibtests/icontest/icontest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] (original) +++ trunk/rostests/dibtests/icontest/icontest.c [iso-8859-1] Sat Aug 15 18:32:20 2009 @@ -9,7 +9,7 @@ const char titleMask[] = "Mask(AND image)"; const char titleXor[] = "XOR(color image)"; const char file[] = "Icon from file:"; -const char res[] = "Icon from Resorce:"; +const char res[] = "Icon from Resource:"; const char cursor[] = "Current Cursor:"; const char cursormask[] = "Cursor Mask Bitmap"; const char cursorcolor[] = "Cursor Color Bitmap";

1 0

[sginsberg] 42707: - gdi32: Don't use typeof -- MSVC does not implement it. Also fix an unitialized variable warning spotted by MSVC. - user32: Properly stub out 16-bit code -- fixes several warnings (more remain) - winent/winex11: Fix some const warnings in MSVC, and use redefine for WINVER and _WIN32_WINNT
by sginsberg＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: sginsberg Date: Sat Aug 15 18:23:21 2009 New Revision: 42707 URL: http://svn.reactos.org/svn/reactos?rev=42707&view=rev Log: - gdi32: Don't use typeof -- MSVC does not implement it. Also fix an unitialized variable warning spotted by MSVC. - user32: Properly stub out 16-bit code -- fixes several warnings (more remain) - winent/winex11: Fix some const warnings in MSVC, and use redefine for WINVER and _WIN32_WINNT Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild branches/arwinss/reactos/dll/win32/gdi32/regglue.c branches/arwinss/reactos/dll/win32/user32/driver.c branches/arwinss/reactos/dll/win32/user32/edit.c branches/arwinss/reactos/dll/win32/user32/spy.c branches/arwinss/reactos/dll/win32/user32/user_main.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild Modified: branches/arwinss/reactos/dll/win32/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/freetype.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -160,32 +160,31 @@ static void *ft_handle = NULL; -#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL // FIXME: MSVC does not implement typeof -MAKE_FUNCPTR(FT_Vector_Unit); -MAKE_FUNCPTR(FT_Done_Face); -MAKE_FUNCPTR(FT_Get_Char_Index); -MAKE_FUNCPTR(FT_Get_Module); -MAKE_FUNCPTR(FT_Get_Sfnt_Name); -MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); -MAKE_FUNCPTR(FT_Get_Sfnt_Table); -MAKE_FUNCPTR(FT_Init_FreeType); -MAKE_FUNCPTR(FT_Load_Glyph); -MAKE_FUNCPTR(FT_Matrix_Multiply); +static void (*pFT_Vector_Unit)(FT_Vector*, FT_Angle) = NULL; +static FT_Error (*pFT_Done_Face)(FT_Face) = NULL; +static FT_UInt (*pFT_Get_Char_Index)(FT_Face, FT_ULong) = NULL; +static FT_Module (*pFT_Get_Module)(FT_Library, const char*) = NULL; +static FT_Error (*pFT_Get_Sfnt_Name)(FT_Face, FT_UInt, FT_SfntName*) = NULL; +static FT_UInt (*pFT_Get_Sfnt_Name_Count)(FT_Face) = NULL; +static void* (*pFT_Get_Sfnt_Table)(FT_Face, FT_Sfnt_Tag) = NULL; +static FT_Error (*pFT_Init_FreeType)(FT_Library*) = NULL; +static FT_Error (*pFT_Load_Glyph)(FT_Face, FT_UInt, FT_Int32) = NULL; +static void (*pFT_Matrix_Multiply)(const FT_Matrix*, FT_Matrix*) = NULL; #ifdef FT_MULFIX_INLINED #define pFT_MulFix FT_MULFIX_INLINED #else -MAKE_FUNCPTR(FT_MulFix); +static FT_Long (*pFT_MulFix)(FT_Long, FT_Long) = NULL; #endif -MAKE_FUNCPTR(FT_New_Face); -MAKE_FUNCPTR(FT_New_Memory_Face); -MAKE_FUNCPTR(FT_Outline_Get_Bitmap); -MAKE_FUNCPTR(FT_Outline_Transform); -MAKE_FUNCPTR(FT_Outline_Translate); -MAKE_FUNCPTR(FT_Select_Charmap); -MAKE_FUNCPTR(FT_Set_Charmap); -MAKE_FUNCPTR(FT_Set_Pixel_Sizes); -MAKE_FUNCPTR(FT_Vector_Transform); -MAKE_FUNCPTR(FT_Render_Glyph); +static FT_Error (*pFT_New_Face)(FT_Library, const char*, FT_Long, FT_Face*) = NULL; +static FT_Error (*pFT_New_Memory_Face)(FT_Library, const FT_Byte*, FT_Long, FT_Long, FT_Face*) = NULL; +static FT_Error (*pFT_Outline_Get_Bitmap)(FT_Library, FT_Outline*, const FT_Bitmap*) = NULL; +static void (*pFT_Outline_Transform)(const FT_Outline*, const FT_Matrix*) = NULL; +static void (*pFT_Outline_Translate)(const FT_Outline*, FT_Pos, FT_Pos) = NULL; +static FT_Error (*pFT_Select_Charmap)(FT_Face, FT_Encoding) = NULL; +static FT_Error (*pFT_Set_Charmap)(FT_Face, FT_CharMap) = NULL; +static FT_Error (*pFT_Set_Pixel_Sizes)(FT_Face, FT_UInt, FT_UInt) = NULL; +static void (*pFT_Vector_Transform)(FT_Vector*, const FT_Matrix*) = NULL; +static FT_Error (*pFT_Render_Glyph)(FT_GlyphSlot, FT_Render_Mode) = NULL; static void (*pFT_Library_Version)(FT_Library,FT_Int*,FT_Int*,FT_Int*); static FT_Error (*pFT_Load_Sfnt_Table)(FT_Face,FT_ULong,FT_Long,FT_Byte*,FT_ULong*); static FT_ULong (*pFT_Get_First_Char)(FT_Face,FT_UInt*); @@ -195,11 +194,21 @@ static FT_Error (*pFT_Library_SetLcdFilter)(FT_Library, FT_LcdFilter); #endif #ifdef HAVE_FREETYPE_FTWINFNT_H -MAKE_FUNCPTR(FT_Get_WinFNT_Header); +static FT_Error (*pFT_Get_WinFNT_Header)(FT_Face, FT_WinFNT_HeaderRec*) = NULL; #endif #ifdef SONAME_LIBFONTCONFIG #include <fontconfig/fontconfig.h> +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; +static = NULL; MAKE_FUNCPTR(FcConfigGetCurrent); MAKE_FUNCPTR(FcFontList); MAKE_FUNCPTR(FcFontSetDestroy); @@ -212,8 +221,6 @@ MAKE_FUNCPTR(FcPatternGetBool); MAKE_FUNCPTR(FcPatternGetString); #endif - -#undef MAKE_FUNCPTR #ifndef FT_MAKE_TAG #define FT_MAKE_TAG( ch0, ch1, ch2, ch3 ) \ Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/arwinss/reactos/dll/win32/gdi32/regglue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/regglue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/regglue.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1338,7 +1338,7 @@ static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); TRACE("(%p,%s,%p,%p,%p,%p=%d)\n", - hkey, debugstr_w(name), reserved, type, data, count, + hkeyorg, debugstr_w(name), reserved, type, data, count, (count && data) ? *count : 0 ); if ((data && !count) || reserved) return ERROR_INVALID_PARAMETER; Modified: branches/arwinss/reactos/dll/win32/user32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/driver.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -36,7 +36,9 @@ static const USER_DRIVER *load_driver(void) { char buffer[MAX_PATH], libname[32], *name, *next; +#if 0 HKEY hkey; +#endif void *ptr; HMODULE graphics_driver; USER_DRIVER *driver, *prev; Modified: branches/arwinss/reactos/dll/win32/user32/edit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/edit.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1133,8 +1133,6 @@ */ static void EDIT_LockBuffer(EDITSTATE *es) { - HINSTANCE16 hInstance = GetWindowLongPtrW( es->hwndSelf, GWLP_HINSTANCE ); - if (!es->text) { CHAR *textA = NULL; UINT countA = 0; @@ -1217,7 +1215,9 @@ CHAR *textA = NULL; UINT countA = 0; UINT countW = get_text_length(es) + 1; - HANDLE16 oldDS = 0; +#ifndef __REACTOS__ + HANDLE16 oldDS = 0; +#endif if(es->hloc32A) { @@ -3037,29 +3037,6 @@ /********************************************************************* * - * EM_SETTABSTOPS16 - * - */ -static BOOL EDIT_EM_SetTabStops16(EDITSTATE *es, INT count, const INT16 *tabs) -{ - if (!(es->style & ES_MULTILINE)) - return FALSE; - HeapFree(GetProcessHeap(), 0, es->tabs); - es->tabs_count = count; - if (!count) - es->tabs = NULL; - else { - INT i; - es->tabs = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT)); - for (i = 0 ; i < count ; i++) - es->tabs[i] = *tabs++; - } - return TRUE; -} - - -/********************************************************************* - * * EM_SETWORDBREAKPROC * */ @@ -3071,25 +3048,6 @@ es->word_break_proc = wbp; es->word_break_proc16 = NULL; - if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { - EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); - EDIT_UpdateText(es, NULL, TRUE); - } -} - - -/********************************************************************* - * - * EM_SETWORDBREAKPROC16 - * - */ -static void EDIT_EM_SetWordBreakProc16(EDITSTATE *es, EDITWORDBREAKPROC16 wbp) -{ - if (es->word_break_proc16 == wbp) - return; - - es->word_break_proc = NULL; - es->word_break_proc16 = wbp; if ((es->style & ES_MULTILINE) && !(es->style & ES_AUTOHSCROLL)) { EDIT_BuildLineDefs_ML(es, 0, get_text_length(es), 0, NULL); EDIT_UpdateText(es, NULL, TRUE); @@ -4378,7 +4336,7 @@ * * The Following code is to handle inline editing from IMEs */ - +#if 0 static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) { LONG buflen; @@ -4484,6 +4442,7 @@ HeapFree(GetProcessHeap(),0,lpResultStr); } +#endif static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { Modified: branches/arwinss/reactos/dll/win32/user32/spy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/spy.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -2658,10 +2658,14 @@ { int i; UINT j; +#if 0 char buffer[1024]; +#endif const SPY_NOTIFY *p; const USER_MSG *q; +#if 0 HKEY hkey; +#endif if (!TRACE_ON(message)) return TRUE; Modified: branches/arwinss/reactos/dll/win32/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_main.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -155,7 +155,9 @@ static const WCHAR *get_default_desktop(void) { static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; +#if 0 static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; +#endif static const WCHAR explorerW[] = {'\\','E','x','p','l','o','r','e','r',0}; static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', @@ -164,7 +166,9 @@ WCHAR *p, *appname = buffer; const WCHAR *ret = defaultW; DWORD len; +#if 0 HKEY tmpkey, appkey; +#endif len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); if (!len || len >= MAX_PATH) return ret; @@ -264,10 +268,10 @@ */ static BOOL process_attach(void) { +#ifndef __REACTOS__ HINSTANCE16 instance; /* Create USER heap */ -#ifndef __REACTOS__ if ((instance = LoadLibrary16( "USER.EXE" )) >= 32) USER_HeapSel = instance | 7; else { Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -633,7 +633,7 @@ pen = CreatePen(PS_NULL, 0, 0); oldPen = SelectObject(physDev->hUserDC, pen); - RosGdiRectangle(physDev->hKernelDC, lprect); + RosGdiRectangle(physDev->hKernelDC, (RECT*)lprect); DeleteObject(SelectObject(physDev->hUserDC, oldBrush)); DeleteObject(SelectObject(physDev->hUserDC, oldPen)); Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -247,7 +247,7 @@ if (in_count >= sizeof(struct ntdrv_escape_set_drawable)) { const struct ntdrv_escape_set_drawable *data = in_data; - RosGdiSetDcRects(physDev->hKernelDC, &data->dc_rect, &data->drawable_rect); + RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", physDev->hUserDC, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); return TRUE; Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -158,7 +158,7 @@ INT CDECL RosDrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { - return RosUserToUnicodeEx(virt, scan, state, str, size, flags, layout); + return RosUserToUnicodeEx(virt, scan, (BYTE*)state, str, size, flags, layout); } BOOL CDECL RosDrv_UnloadKeyboardLayout( HKL layout ) @@ -876,7 +876,7 @@ } } - RosDrv_UpdateZOrder(hwnd, visible_rect); + RosDrv_UpdateZOrder(hwnd, (RECT*)visible_rect); } /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -1,9 +1,9 @@ -<module name="winent" type="win32dll" baseaddress="${BASEADDRESS_WINENT}" installbase="system32" installname="winent.drv" allowwarnings="true"> +<module name="winent" type="win32dll" baseaddress="${BASEADDRESS_WINENT}" installbase="system32" installname="winent.drv"> <importlibrary definition="winent.drv.spec" /> <include base="winent">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="__WINESRC__" /> <define name="_WINE" /> <file>font.c</file> Modified: branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/winex11.rbuild [iso-8859-1] Sat Aug 15 18:23:21 2009 @@ -2,8 +2,8 @@ <importlibrary definition="winex11.drv.spec" /> <include base="winex11">.</include> <include base="ReactOS">include/reactos/wine</include> - <define name="WINVER">0x0600</define> - <define name="_WIN32_WINNT">0x0501</define> + <redefine name="WINVER">0x0600</redefine> + <redefine name="_WIN32_WINNT">0x0501</redefine> <define name="__WINESRC__" /> <define name="_WINE" /> <file>bitblt.c</file>

1 0

[dchapyshev] 42706: - Sync comctl32 with Wine 1.1.27 (without imagelist.c) - Sync comdlg32 with Wine 1.1.27
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 18:15:43 2009 New Revision: 42706 URL: http://svn.reactos.org/svn/reactos?rev=42706&view=rev Log: - Sync comctl32 with Wine 1.1.27 (without imagelist.c) - Sync comdlg32 with Wine 1.1.27 Modified: trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/hotkey.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/printdlg.c trunk/reactos/include/psdk/commctrl.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex… Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… Modified: trunk/reactos/dll/win32/comctl32/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/hotkey.… Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… Modified: trunk/reactos/dll/win32/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres… Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… Modified: trunk/reactos/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.… Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink… Modified: trunk/reactos/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r… Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl… Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re…

1 0

[dchapyshev] 42705: - Fix Russian translation
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 17:50:29 2009 New Revision: 42705 URL: http://svn.reactos.org/svn/reactos?rev=42705&view=rev Log: - Fix Russian translation Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/netshell/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/ru-RU.rc [iso-8859-1] Sat Aug 15 17:50:29 2009 @@ -114,10 +114,10 @@ IDS_NET_DELETE "Óäàëèòü" IDS_NET_PROPERTIES "Ñâîéñòâà" - IDS_FORMAT_BIT "%u Áàéò/s" - IDS_FORMAT_KBIT "%u ÊÁàéò/s" - IDS_FORMAT_MBIT "%u ÌÁàéò/s" - IDS_FORMAT_GBIT "%u ÃÁàéò/s" + IDS_FORMAT_BIT "%u áèò/ñ" + IDS_FORMAT_KBIT "%u Êáèò/ñ" + IDS_FORMAT_MBIT "%u Ìáèò/ñ" + IDS_FORMAT_GBIT "%u Ãáèò/ñ" IDS_DURATION_DAY "%d äåíü %s" IDS_DURATION_DAYS "%d äíåé %s" IDS_ASSIGNED_DHCP "Ïðèñâîåí DHCP"

1 0

[dchapyshev] 42704: - Set mute icon if sound unavailable - Set "No devices" if device unavailable - Disable controls after dialog initialization
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 17:38:40 2009 New Revision: 42704 URL: http://svn.reactos.org/svn/reactos?rev=42704&view=rev Log: - Set mute icon if sound unavailable - Set "No devices" if device unavailable - Disable controls after dialog initialization Modified: trunk/reactos/dll/cpl/mmsys/audio.c trunk/reactos/dll/cpl/mmsys/lang/bg-BG.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/no-NO.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/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -23,29 +23,38 @@ WAVEOUTCAPS waveOutputPaps; WAVEINCAPS waveInputPaps; MIDIOUTCAPS midiOutCaps; + TCHAR szNoDevices[256]; UINT DevsNum; UINT uIndex; HWND hCB; LRESULT Res; + LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, sizeof(szNoDevices) / sizeof(TCHAR)); + // Init sound playback devices list hCB = GetDlgItem(hwnd, IDC_DEVICE_PLAY_LIST); DevsNum = waveOutGetNumDevs(); - if (DevsNum < 1) return; - - for (uIndex = 0; uIndex < DevsNum; uIndex++) - { - if (waveOutGetDevCaps(uIndex, &waveOutputPaps, sizeof(waveOutputPaps))) - continue; - - Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveOutputPaps.szPname); - - if (CB_ERR != Res) - { - SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); - // TODO: Getting default device - SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + if (DevsNum < 1) + { + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM)szNoDevices); + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + else + { + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (waveOutGetDevCaps(uIndex, &waveOutputPaps, sizeof(waveOutputPaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveOutputPaps.szPname); + + if (CB_ERR != Res) + { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } } } @@ -53,20 +62,26 @@ hCB = GetDlgItem(hwnd, IDC_DEVICE_REC_LIST); DevsNum = waveInGetNumDevs(); - if (DevsNum < 1) return; - - for (uIndex = 0; uIndex < DevsNum; uIndex++) - { - if (waveInGetDevCaps(uIndex, &waveInputPaps, sizeof(waveInputPaps))) - continue; - - Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveInputPaps.szPname); - - if (CB_ERR != Res) - { - SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); - // TODO: Getting default device - SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + if (DevsNum < 1) + { + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM)szNoDevices); + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + else + { + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (waveInGetDevCaps(uIndex, &waveInputPaps, sizeof(waveInputPaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveInputPaps.szPname); + + if (CB_ERR != Res) + { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } } } @@ -74,20 +89,26 @@ hCB = GetDlgItem(hwnd, IDC_DEVICE_MIDI_LIST); DevsNum = midiOutGetNumDevs(); - if (DevsNum < 1) return; - - for (uIndex = 0; uIndex < DevsNum; uIndex++) - { - if (midiOutGetDevCaps(uIndex, &midiOutCaps, sizeof(midiOutCaps))) - continue; - - Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) midiOutCaps.szPname); - - if (CB_ERR != Res) - { - SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); - // TODO: Getting default device - SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + if (DevsNum < 1) + { + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM)szNoDevices); + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } + else + { + for (uIndex = 0; uIndex < DevsNum; uIndex++) + { + if (midiOutGetDevCaps(uIndex, &midiOutCaps, sizeof(midiOutCaps))) + continue; + + Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) midiOutCaps.szPname); + + if (CB_ERR != Res) + { + SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); + // TODO: Getting default device + SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); + } } } } @@ -128,9 +149,10 @@ { case WM_INITDIALOG: { - UINT NumWavOut; - - NumWavOut = waveOutGetNumDevs(); + UINT NumWavOut = waveOutGetNumDevs(); + + InitAudioDlg(hwndDlg); + if (!NumWavOut) { EnableWindow(GetDlgItem(hwndDlg, IDC_DEVICE_PLAY_LIST), FALSE); @@ -144,10 +166,6 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME3_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADV3_BTN), FALSE); } - else - { - InitAudioDlg(hwndDlg); - } } break; Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -236,6 +236,7 @@ IDS_CPLNAME "Çâóêîâè óñòðîéñòâà" IDS_CPLDESCRIPTION "Ïðîìåíÿ çâóêîâàòà íàðåäáà çà êîìïþòúðà âè èëè íàñòðîéêèòå çà ãîâîðèòåëèòå è çàïèñâàùèòå óñòðîéñòâà." IDS_NO_SOUND "(Íÿìà)" + IDS_NO_DEVICES "No Devices" 5825 "Ïðîãðàìíà ãðåøêà" 5826 "Çàòâàðÿíå íà ïðîçîðåä" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -239,6 +239,7 @@ IDS_CPLNAME "Zvuky a zvuková zaøízení" IDS_CPLDESCRIPTION "Upraví zvukové schéma Vaeho poèítaèe, nebo nastaví reproduktory a nahrávací zaøízení." IDS_NO_SOUND "(Není)" + IDS_NO_DEVICES "No Devices" 5825 "Chyba programu" 5826 "Ukonèení programu" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Sounds und Audio Geräte" IDS_CPLDESCRIPTION "Ändert das Sound-Schema Ihres Computers, oder konfiguriert die Einstellungen für Ihre Lautsprecher und Aufnahmegeräte." IDS_NO_SOUND "(Kein)" + IDS_NO_DEVICES "No Devices" 5825 "Programmfehler" 5826 "Programm schließen" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "ÓõóêåõÝò Þ÷ïõ" IDS_CPLDESCRIPTION "ÁëëÜæåé ôï ó÷Þìá Þ÷ïõ ôïõ õðïëïãéóôÞ Þ ôñïðïðïéåß ôéò ñõèìßóåéò ãéá ôá ç÷åßá êáé ôéò óõóêåõÝò åããñáöÞò Þ÷ïõ." IDS_NO_SOUND "(None)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Close program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -6,12 +6,12 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",IDC_DEVICE_NAME,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,20 GROUPBOX "Device volume", -1, 7,30,230,100 CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 - LTEXT "Low",-1,62,66,30,17 - LTEXT "High",-1,195,66,30,17 + LTEXT "Low",-1,62,66,30,9 + LTEXT "High",-1,195,66,30,9 CHECKBOX "&Mute", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 CHECKBOX "Place volume &icon in the taskbar", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "Ad&vanced...", IDC_ADVANCED_BTN, 150,105,75,15 @@ -27,15 +27,15 @@ CAPTION "Sounds" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,40 - LTEXT "Sound s&cheme:",-1,8,42,150,17 + LTEXT "A sound scheme is a set of sounds applied to events to in ReactOS and programs. You can select an existing scheme or save one you have modified.",-1,8,7,230,30 + LTEXT "Sound s&cheme:",-1,8,42,150,9 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Sav&e As...", IDC_SAVEAS_BTN, 134,70,50,15 PUSHBUTTON "&Delete", IDC_DELETE_BTN, 188,70,50,15 - LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,40 - LTEXT "&Program events:",-1,8,118,150,17 + LTEXT "To change sounds, click a program event in the following list and then select a sound to apply. You can save the changes as a new sound scheme.",-1,8,90,230,27 + LTEXT "&Program events:",-1,8,118,150,9 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + LTEXT "&Sounds:",IDC_TEXT_SOUND,8,194,80,9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED | BS_ICON PUSHBUTTON "&Browse...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED @@ -48,19 +48,19 @@ BEGIN GROUPBOX "Sound playback", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Default device:",-1,50,20,80,17 + LTEXT "&Default device:",-1,50,20,80,9 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME1_BTN, 85,47,70,15 PUSHBUTTON "Adva&nced...", IDC_ADV2_BTN, 160,47,70,15 GROUPBOX "Sound recording", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "D&efault device:",-1,50,88,80,17 + LTEXT "D&efault device:",-1,50,88,80,9 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME2_BTN, 85,115,70,15 PUSHBUTTON "Advan&ced...", IDC_ADV1_BTN, 160,115,70,15 GROUPBOX "MIDI music playback", -1, 7,145,230,60 ICON IDI_MIDICON, IDI_MIDICON, 15,158,32,32 - LTEXT "De&fault device:",-1,50,158,80,17 + LTEXT "De&fault device:",-1,50,158,80,9 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Volu&me...", IDC_VOLUME3_BTN, 85,185,70,15 PUSHBUTTON "A&bout...", IDC_ADV3_BTN, 160,185,70,15 @@ -75,13 +75,13 @@ LTEXT "These settings control volume and advanced options for the voice playback or recording device you selected.",-1,8,7,230,40 GROUPBOX "Voice playback", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "&Default device:",-1,50,50,80,17 + LTEXT "&Default device:",-1,50,50,80,9 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Volume...", IDC_VOLUME4_BTN, 85,77,70,15 PUSHBUTTON "Adva&nced...", IDC_ADV4_BTN, 160,77,70,15 GROUPBOX "Voice recording", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "D&efault device:",-1,50,118,80,17 + LTEXT "D&efault device:",-1,50,118,80,9 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "V&olume...", IDC_VOLUME5_BTN, 85,145,70,15 PUSHBUTTON "Advan&ced...", IDC_ADV5_BTN, 160,145,70,15 @@ -148,9 +148,9 @@ LTEXT "These settings control how ReactOS records audio. They can help you troubleshoot audio-related problems.", 8492, 34, 7, 217, 20 GROUPBOX "Audio recording", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 17 + LTEXT "&Hardware acceleration:", 8495, 13, 46, 103, 9 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 17 + LTEXT "&Sample rate conversion quality:", 8496, 13, 103, 103, 9 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 PUSHBUTTON "&Restore Defaults", 5400, 9, 158, 110, 14 LTEXT "None", 8497, 125, 46, 24, 10 @@ -234,6 +234,7 @@ IDS_CPLNAME "Sound and Audio Devices" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(None)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Close program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Dispositivos de sonido y audio" IDS_CPLDESCRIPTION "Cambie la combinación de sonidos para el equipo, o configure los parámetros para sus altavoces y dispositivos de grabación." IDS_NO_SOUND "(Ninguno)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Cerrar programa" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Son et périphériques audio" IDS_CPLDESCRIPTION "Change le modèle de sons de votre ordinateur, ou configure les paramètres de vos hauts-parleurs et de vos périphériques d'enregistrement." IDS_NO_SOUND "(Aucun)" + IDS_NO_DEVICES "No Devices" 5825 "Erreur programme" 5826 "Fermeture programme" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Suara dan Audio Devices" IDS_CPLDESCRIPTION "Mengubah skema suara untuk komputer anda, atau mengkonfigurasi setelan untuk speaker dan device perekaman anda." IDS_NO_SOUND "(None)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Close program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Suoni e Dispositivi audio" IDS_CPLDESCRIPTION "Cambia lo schema dei suoni per il tuo computer o configura le impostazioni per gli altoparlanti e i dispositivi di registrazione." IDS_NO_SOUND "(nessuno)" + IDS_NO_DEVICES "No Devices" 5825 "Errore del programma" 5826 "Chiudere il programma" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -235,6 +235,7 @@ IDS_CPLNAME "Geluid en Audio apparaten" IDS_CPLDESCRIPTION "Verander het geluidsschema van uw computer of configureer de aanwezige geluidsapparatuur." IDS_NO_SOUND "(Geen)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Close program" Modified: trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Lyder og lydenheter" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(Ingen)" + IDS_NO_DEVICES "No Devices" 5825 "Program feil" 5826 "Avslutt program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -244,6 +244,7 @@ IDS_CPLNAME "Dwiêk i urz¹dzenia audio" IDS_CPLDESCRIPTION "Zmieñ schemat dwiêkowy dla tego komputera lub skonfiguruj ustawienia g³oników i urz¹dzeñ nagrywaj¹cych." IDS_NO_SOUND "(Brak)" + IDS_NO_DEVICES "No Devices" 5825 "B³¹d programu" 5826 "Zamknij program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ IDS_CPLNAME "Sons e dispositivos de audio" IDS_CPLDESCRIPTION "Altera o esquema de som para o seu computador ou define as configurações para os auto-falantes e dispositivos de gravação." IDS_NO_SOUND "(None)" + IDS_NO_DEVICES "No Devices" 5825 "Program error" 5826 "Close program" Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -236,6 +236,7 @@ IDS_CPLNAME "Sunet Èi dispozitive audio" IDS_CPLDESCRIPTION "SchimbÄ schema de sunete a computerului Èi modificÄ setÄrile pentru dispozitivele de redare Èi de Ã®nregistrare sunet instalate." IDS_NO_SOUND "(Niciunul)" + IDS_NO_DEVICES "No Devices" 5825 "Eroare program" 5826 "Ãnchidere program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -6,12 +6,12 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLICON, IDI_CPLICON, 8,5,32,32 - LTEXT "",IDC_DEVICE_NAME,40,10,194,36 + LTEXT "",IDC_DEVICE_NAME,40,10,194,19 GROUPBOX "Ãðîìêîñòü ìèêøåðà", -1, 7,30,230,100 CONTROL "", IDC_MUTE_ICON, "Static", SS_ICON | WS_VISIBLE,17,45,32,32 CONTROL "",IDC_VOLUME_TRACKBAR, "msctls_trackbar32", TBS_AUTOTICKS | TBS_ENABLESELRANGE | TBS_BOTTOM | TBS_HORZ | WS_TABSTOP, 65, 45, 140, 14 - LTEXT "íèæå",-1,62,66,30,17 - LTEXT "âûøå",-1,195,66,30,17 + LTEXT "íèæå",-1,62,66,30,9 + LTEXT "âûøå",-1,195,66,30,9 CHECKBOX "Â&ûêëþ÷èòü çâóê", IDC_MUTE_CHECKBOX, 50, 78, 140, 10 CHECKBOX "Îòîáðàæàòü &çíà÷îê íà ïàíåëè çàäà÷", IDC_ICON_IN_TASKBAR, 50, 92, 140, 10 PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_ADVANCED_BTN, 155,110,75,15 @@ -27,15 +27,15 @@ CAPTION "Çâóêè" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Çâóêîâàÿ ñõåìà çàäàåò çâóêè, ñîïðîâîæäàþùèå ñîáûòèÿ â îïåðàöèîííîé ñèñòåìå ReactOS è ïðîãðàììàõ. Ìîæíî âûáðàòü îäíó èç ñóùåñòâóþùèõ ñõåì èëè ñîçäàòü íîâóþ.",-1,8,7,230,40 - LTEXT "Çâóêîâàÿ ñ&õåìà:",-1,8,42,150,17 + LTEXT "Çâóêîâàÿ ñõåìà çàäàåò çâóêè, ñîïðîâîæäàþùèå ñîáûòèÿ â îïåðàöèîííîé ñèñòåìå ReactOS è ïðîãðàììàõ. Ìîæíî âûáðàòü îäíó èç ñóùåñòâóþùèõ ñõåì èëè ñîçäàòü íîâóþ.",-1,8,7,230,30 + LTEXT "Çâóêîâàÿ ñ&õåìà:",-1,8,42,150,9 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Ñîõðàíèòü &êàê...", IDC_SAVEAS_BTN, 119,70,65,15 PUSHBUTTON "&Óäàëèòü", IDC_DELETE_BTN, 188,70,50,15 - LTEXT "×òîáû èçìåíèòü çâóêîâîå ñîïðîâîæäåíèå, ùåëêíèòå íà ñîáûòèè â ñïèñêå è âûáåðèòå íóæíûé çâóê. Èçìåíåíèÿ ìîæíî ñîõðàíèòü êàê íîâóþ çâóêîâóþ ñõåìó.",-1,8,90,230,40 - LTEXT "Ïðîãðàììíûå &ñîáûòèÿ:",-1,8,118,150,17 + LTEXT "×òîáû èçìåíèòü çâóêîâîå ñîïðîâîæäåíèå, ùåëêíèòå íà ñîáûòèè â ñïèñêå è âûáåðèòå íóæíûé çâóê. Èçìåíåíèÿ ìîæíî ñîõðàíèòü êàê íîâóþ çâóêîâóþ ñõåìó.",-1,8,90,230,28 + LTEXT "Ïðîãðàììíûå &ñîáûòèÿ:",-1,8,118,150,9 CONTROL "", IDC_SCHEME_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 8, 130, 230, 60, WS_EX_CLIENTEDGE - LTEXT "&Çâóêè:",IDC_TEXT_SOUND,8,194,80,17, WS_DISABLED + LTEXT "&Çâóêè:",IDC_TEXT_SOUND,8,194,80,9, WS_DISABLED COMBOBOX IDC_SOUND_LIST, 8, 205, 155, 146, CBS_DROPDOWNLIST | CBS_DISABLENOSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED PUSHBUTTON "", IDC_PLAY_SOUND, 168,205,15,15, WS_DISABLED | BS_ICON PUSHBUTTON "&Îáçîð...", IDC_BROWSE_SOUND, 188,205,50,15, WS_DISABLED @@ -48,19 +48,19 @@ BEGIN GROUPBOX "Âîñïðîèçâåäåíèå çâóêà", -1, 7,7,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,20,32,32 - LTEXT "&Èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,20,180,17 + LTEXT "&Èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,20,180,9 COMBOBOX IDC_DEVICE_PLAY_LIST, 50, 30, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Ãðîìêîñòü...", IDC_VOLUME1_BTN, 85,47,70,15 PUSHBUTTON "&Íàñòðîéêà...", IDC_ADV2_BTN, 160,47,70,15 GROUPBOX "Çàïèñü çâóêà", -1, 7,75,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,88,32,32 - LTEXT "È&èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,88,180,17 + LTEXT "È&èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,88,180,9 COMBOBOX IDC_DEVICE_REC_LIST, 50, 98, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Ãðî&ìêîñòü...", IDC_VOLUME2_BTN, 85,115,70,15 PUSHBUTTON "Í&àñòðîéêà...", IDC_ADV1_BTN, 160,115,70,15 GROUPBOX "Âîñïðîèçâåäåíèå MIDI", -1, 7,145,230,60 ICON IDI_MIDICON, IDI_MIDICON, 15,158,32,32 - LTEXT "Èñ&ïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,158,180,17 + LTEXT "Èñ&ïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,158,180,9 COMBOBOX IDC_DEVICE_MIDI_LIST, 50, 168, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Ãðîì&êîñòü...", IDC_VOLUME3_BTN, 85,185,70,15 PUSHBUTTON "Ñâ&åäåíèÿ...", IDC_ADV3_BTN, 160,185,70,15 @@ -72,16 +72,16 @@ CAPTION "Ðå÷ü" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Ìîæíî èçìåíèòü ãðîìêîñòü è äðóãèå ïàðàìåòðû äëÿ âûáðàííûõ âàìè óñòðîéñòâ âîñïðîèçâåäåíèÿ è çàïèñè ðå÷è.",-1,8,7,230,40 + LTEXT "Ìîæíî èçìåíèòü ãðîìêîñòü è äðóãèå ïàðàìåòðû äëÿ âûáðàííûõ âàìè óñòðîéñòâ âîñïðîèçâåäåíèÿ è çàïèñè ðå÷è.",-1,8,7,230,30 GROUPBOX "Âîñïðîèçâåäåíèå ðå÷è", -1, 7,37,230,60 ICON IDI_CPLICON, IDI_CPLICON, 15,50,32,32 - LTEXT "&Èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,50,180,17 + LTEXT "&Èñïîëüçóåìîå ïî óìîë÷àíèþ óñòðîéñòâî:",-1,50,50,180,9 COMBOBOX IDC_DEVICE_VOICE_LIST, 50, 60, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "&Ãðîìêîñòü...", IDC_VOLUME4_BTN, 85,77,70,15 PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_ADV4_BTN, 160,77,70,15 GROUPBOX "Çàïèñü ðå÷è", -1, 7,105,230,60 ICON IDI_MICROPHONE_ICON, IDI_MICROPHONE_ICON, 15,118,32,32 - LTEXT "È&ñïîëüçóåìîå ïî óìîë÷àíèþ óòðîéñòâî:",-1,50,118,180,17 + LTEXT "È&ñïîëüçóåìîå ïî óìîë÷àíèþ óòðîéñòâî:",-1,50,118,180,9 COMBOBOX IDC_DEVICE_VOICE_REC_LIST, 50, 128, 180, 46, CBS_DROPDOWNLIST PUSHBUTTON "Ãðî&ìêîñòü...", IDC_VOLUME5_BTN, 85,145,70,15 PUSHBUTTON "Äîïî&ëíèòåëüíî...", IDC_ADV5_BTN, 160,145,70,15 @@ -114,13 +114,13 @@ ICON 4379, -1, 7, 8, 20, 20 LTEXT "Óêàæèòå ðàñïîëîæåíèå äèíàìèêîâ, íàèáîëåå ñîîòâåòñòâóþùåå ðåàëüíîìó äëÿ äàííîãî êîìïüþòåðà.", -1, 36, 8, 215, 27 CONTROL 110, 5376, "STATIC", SS_BITMAP | SS_CENTERIMAGE, 37, 40, 209, 112, WS_EX_TRANSPARENT - LTEXT "&Ðàñïîëîæåíèå äèíàìèêîâ:", 8502, 53, 169, 55, 10 + LTEXT "&Ðàñïîëîæåíèå äèíàìèêîâ:", 8502, 53, 169, 100, 10 COMBOBOX 5401, 52, 182, 170, 200, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP END IDD_PERFORMANCE1 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" +CAPTION "Ïðîèçâîäèòåëüíîñòü" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ýòè ïàðàìåòðû óïðàâëÿþò âîñïðîèçâåäåíèåì çâóêà è ìîãóò ïîìî÷ü ïðè äèàãíîñòèêå íåïîëàäîê ñî çâóêîì.", 8492, 34, 7, 218, 23 @@ -132,7 +132,7 @@ CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 121, 62, 18 PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 5400, 7, 191, 110, 14 LTEXT "Íåò", 8497, 128, 56, 21, 10 - LTEXT "Ïîëíîå", 8498, 214, 56, 21, 9 + LTEXT "Ïîëíîå", 8498, 214, 56, 30, 9 LTEXT "Íèæå", 8499, 128, 123, 21, 10 LTEXT "Âûøå", 8500, 214, 123, 23, 9 LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà çàõâàòà çâóêà", 5399, 13, 145, 227, 21 @@ -141,23 +141,23 @@ IDD_PERFORMANCE2 DIALOG 0, 0, 257, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Performance" +CAPTION "Ïðîèçâîäèòåëüíîñòü" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ýòè ïàðàìåòðû óïðàâëÿþò çàïèñüþ çâóêà è ìîãóò ïîìî÷ü ïðè äèàãíîñòèêå íåïîëàäîê ñî çâóêîì.", 8492, 34, 7, 217, 20 GROUPBOX "Çàïèñü çâóêà", 8494, 7, 29, 242, 122 ICON 4380, 8512, 8, 7, 20, 20 - LTEXT "&Àïïàðàòíîå óñêîðåíèå:", 8495, 13, 46, 103, 17 + LTEXT "&Àïïàðàòíîå óñêîðåíèå:", 8495, 13, 46, 103, 9 CONTROL "Slider1", 5395, "MSCTLS_TRACKBAR32", WS_GROUP | WS_TABSTOP | 0x00000401, 150, 43, 62, 18 - LTEXT "&×àñòîòà äèñêðåòèçàöèè:", 8496, 13, 103, 103, 17 + LTEXT "&×àñòîòà äèñêðåòèçàöèè:", 8496, 13, 103, 103, 9 CONTROL "Slider1", 5396, "MSCTLS_TRACKBAR32", WS_TABSTOP | 0x00000401, 150, 101, 62, 18 PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 5400, 9, 158, 110, 14 LTEXT "Íåò", 8497, 125, 46, 24, 10 - LTEXT "Ïîëíîå", 8498, 217, 46, 19, 9 + LTEXT "Ïîëíîå", 8498, 217, 46, 30, 9 LTEXT "Íèæå", 8499, 125, 103, 24, 10 LTEXT "Âûøå", 8500, 217, 103, 19, 9 LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà çàõâàòà çâóêà", 5399, 13, 125, 222, 21 - LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà îáðàáîòêè çâóêà", 5398, 13, 68, 218, 24 + LTEXT "Ýòîò ïàðàìåòð îïèñûâàåò íàñòðîéêó óñòðîéñòâà îáðàáîòêè çâóêà", 5398, 13, 68, 218, 17 END IDD_SETUP1 DIALOG 0, 0, 227, 206 @@ -169,7 +169,7 @@ ICON 4393, 10241, 26, 26, 20, 20 LTEXT "Ýòîò êîìïüþòåð íå ìîæåò âîñïðîèçâîäèòü çâóê ïîêà ñëóæáà çâóêà ReactOS íå âêëþ÷åíà.", 10245, 60, 25, 150, 40 AUTOCHECKBOX "&Âêëþ÷èòü Çâóê ReactOS", 10253, 60, 68, 150, 9 - LTEXT "Ïðèìå÷àíèÿ", 10246, 58, 87, 150, 11 + LTEXT "Ïðèìå÷àíèÿ", 10246, 58, 87, 150, 9 LTEXT "1. You must be an administrator to enable this service. If you are not logged on as administrator, you will be prompted for an administrator name and password.", 10247, 60, 100, 150, 40 LTEXT "2. Ïîñëå òîãî, êàê âû âêëþ÷èòå Çâóê ReactOS, âû äîëæíû ïåðåçàãðóçèòü êîìïüþòåð.", 10248, 60, 140, 150, 40 END @@ -233,6 +233,7 @@ IDS_CPLNAME "Çâóê è àóäèîóñòðîéñòâà" IDS_CPLDESCRIPTION "Èçìåíåíèå çâóêîâûõ ñõåì âàøåãî êîìïüþòåðà, íàñòðîéêà êîëîíîê è çàïèñûâàþùèõ óñòðîéñòâ." IDS_NO_SOUND "(Íåò)" + IDS_NO_DEVICES "No Devices" 5825 "Îøèáêà ïðîãðàììû" 5826 "Çàêðûòü ïðîãðàììó" Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -239,6 +239,7 @@ IDS_CPLNAME "Zvuk a zvukové zariadenia" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(iadne)" + IDS_NO_DEVICES "No Devices" 5825 "Chyba programu" 5826 "Zavrie program" 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -242,6 +242,7 @@ IDS_CPLNAME "Çâóêîâ³ ³ àóä³î ïðèñòðî¿" IDS_CPLDESCRIPTION "Çì³íà çâóêîâèõ ñõåì âàøîãî êîìï'þòåðà, íàñòðîþâàííÿ êîëîíîê ³ çàïèñóþ÷èõ ïðèñòðî¿â." IDS_NO_SOUND "(íåìàº)" + IDS_NO_DEVICES "No Devices" 5825 "Ïîìèëêà ïðîãðàìè" 5826 "Çàêðèòè ïðîãðàìó" Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -242,6 +242,7 @@ IDS_CPLNAME "ÉùÒôºÍÒôÆµÉè±¸" IDS_CPLDESCRIPTION "¸ü¸Ä¼ÆËã»úµÄÉùÒô·½°¸£¬»òÕßÅäÖÃÑïÉùÆ÷ºÍÂ¼ÒôÉè±¸µÄÉèÖÃ" IDS_NO_SOUND "(ÎÞ)" + IDS_NO_DEVICES "No Devices" 5825 "³ÌÐò³ö´í" 5826 "¹Ø±Õ³ÌÐò" Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -75,6 +75,7 @@ #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 #define IDS_NO_SOUND 1002 +#define IDS_NO_DEVICES 1003 #endif /* __CPL_RESOURCE_H */ Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Sat Aug 15 17:38:40 2009 @@ -234,6 +234,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_SET_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); + SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); return; }

1 0

[dchapyshev] 42703: - Add some resources - Disable controls after dialog initialization
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 16:49:44 2009 New Revision: 42703 URL: http://svn.reactos.org/svn/reactos?rev=42703&view=rev Log: - Add some resources - Disable controls after dialog initialization Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.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/no-NO.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/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/bg-BG.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -266,4 +266,5 @@ 5851 "Ïóñêîâ èçáîðíèê" 5852 "Èçëèçàíå îò ÐåàêòÎÑ" 5853 "Âëèçàíå â ÐåàêòÎÑ" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -269,4 +269,5 @@ 5851 "Otevøení nabídky Start" 5852 "Odhláení od systému ReactOS" 5853 "Pøihláení k systému ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Startmenü" 5852 "ReactOS-Abmeldung" 5853 "ReactOS-Anmeldung" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Start Menu" 5852 "ReactOS Logoff" 5853 "ReactOS Logon" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/en-US.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Start Menu" 5852 "ReactOS Logoff" 5853 "ReactOS Logon" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Menu de Inicio" 5852 "Cierre de sesión de ReactOS" 5853 "Inicio de sesión en ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Menu démarrer" 5852 "Déconnexion ReactOS" 5853 "Connexion ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Start Menu" 5852 "ReactOS Logoff" 5853 "ReactOS Logon" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Menu avvio" 5852 "Fine sessione di ReactOS" 5853 "Inizio sessione di ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -265,4 +265,5 @@ 5851 "Start Menu" 5852 "ReactOS Logoff" 5853 "ReactOS Logon" -END + 5854 "ReactOS Explorer" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/no-NO.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Start Meny" 5852 "ReactOS Logg av" 5853 "ReactOS Logg på" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -274,4 +274,5 @@ 5851 "Menu Start" 5852 "Wylogowanie z ReactOS" 5853 "Logowanie do ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -264,4 +264,5 @@ 5851 "Start Menu" 5852 "ReactOS Logoff" 5853 "ReactOS Logon" -END + 5854 "ReactOS Explorer" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -266,6 +266,7 @@ 5851 "Meniu Start" 5852 "IeÈire din ReactOS" 5853 "Intrare Ã®n ReactOS" + 5854 "ReactOS Explorer" END #pragma code_page(default) 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -263,4 +263,5 @@ 5851 "Ãëàâíîå ìåíþ" 5852 "Âûõîä èç ReactOS" 5853 "Âõîä â ReactOS" -END + 5854 "Ïðîâîäíèê ReactOS" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/sk-SK.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -269,4 +269,5 @@ 5851 "Ponuka tart" 5852 "Odhlásenie zo systému ReactOS" 5853 "Prihlásenie do systému ReactOS" -END + 5854 "ReactOS Explorer" +END 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… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -272,4 +272,5 @@ 5851 "Ãîëîâíå ìåíþ" 5852 "Âèõ³ä ³ç ReactOS" 5853 "Âõ³ä äî ReactOS" -END + 5854 "ReactOS Explorer" +END Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -272,4 +272,5 @@ 5851 "¡¸¿ªÊ¼¡¹²Ëµ¥" 5852 "ReactOS ×¢Ïú" 5853 "ReactOS µÇÂ¼" -END + 5854 "ReactOS Explorer" +END Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/resource.h [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -66,8 +66,8 @@ #define IDC_SPEAKIMG 4625 #define IDC_MUTE_ICON 4626 +#define IDS_REACTOS_LOGOFF 5852 #define IDS_REACTOS_LOGON 5853 -#define IDS_REACTOS_LOGOFF 5852 #define IDS_REACTOS_DEFAULT_SCHEME 5856 Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sat Aug 15 16:49:44 2009 @@ -795,9 +795,17 @@ { case WM_INITDIALOG: { - UINT NumWavOut; - - NumWavOut = waveOutGetNumDevs(); + UINT NumWavOut = waveOutGetNumDevs(); + + SendMessage(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), + BM_SETIMAGE,(WPARAM)IMAGE_ICON, + (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_PLAY_ICON))); + + LoadEventLabels(); + LoadSoundProfiles(hwndDlg); + LoadSoundFiles(hwndDlg); + ShowSoundScheme(hwndDlg); + if (!NumWavOut) { EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME), FALSE); @@ -806,14 +814,6 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), FALSE); } - SendMessage(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), - BM_SETIMAGE,(WPARAM)IMAGE_ICON, - (LPARAM)(HANDLE)LoadIcon(hApplet, MAKEINTRESOURCE(IDI_PLAY_ICON))); - - LoadEventLabels(); - LoadSoundProfiles(hwndDlg); - LoadSoundFiles(hwndDlg); - ShowSoundScheme(hwndDlg); if (wParam == (WPARAM)GetDlgItem(hwndDlg, IDC_SOUND_SCHEME)) return TRUE; SetFocus(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME));

1 0

[dchapyshev] 42702: - Add EventLabels keys
by dchapyshev＠svn.reactos.org 15 Aug '09

15 Aug '09

Author: dchapyshev Date: Sat Aug 15 16:46:24 2009 New Revision: 42702 URL: http://svn.reactos.org/svn/reactos?rev=42702&view=rev Log: - Add EventLabels keys Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_arm.inf [iso-8859-1] Sat Aug 15 16:46:24 2009 @@ -1505,6 +1505,7 @@ HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" ; Sound Schemes +HKCU,"AppEvents",,0x00000012 HKCU,"AppEvents\Schemes","",0x00000000,".Default" HKCU,"AppEvents\Schemes\Apps",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default","",0x00000000,"ReactOS" @@ -1599,4 +1600,62 @@ HKCU,"AppEvents\Schemes\Names\.Default","",0x00000002,"ReactOS Default" HKCU,"AppEvents\Schemes\Names\.None","",0x00000002,"No sounds" +HKCU,"AppEvents\EventLabels",,0x00000012 +HKCU,"AppEvents\EventLabels\.Default","",0x00000000,"Default Beep" +HKCU,"AppEvents\EventLabels\.Default","DispFileName",0x00000000,"@mmsys.cpl,-5824" +HKCU,"AppEvents\EventLabels\AppGPFault","",0x00000000,"Program error" +HKCU,"AppEvents\EventLabels\AppGPFault","DispFileName",0x00000000,"@mmsys.cpl,-5825" +HKCU,"AppEvents\EventLabels\Close","",0x00000000,"Close program" +HKCU,"AppEvents\EventLabels\Close","DispFileName",0x00000000,"@mmsys.cpl,-5826" +HKCU,"AppEvents\EventLabels\CriticalBatteryAlarm","",0x00000000,"Critical Battery Alarm" +HKCU,"AppEvents\EventLabels\CriticalBatteryAlarm","DispFileName",0x00000000,"@mmsys.cpl,-5827" +HKCU,"AppEvents\EventLabels\DeviceConnect","",0x00000000,"Device Connect" +HKCU,"AppEvents\EventLabels\DeviceConnect","DispFileName",0x00000000,"@mmsys.cpl,-5828" +HKCU,"AppEvents\EventLabels\DeviceDisconnect","",0x00000000,"Device Disconnect" +HKCU,"AppEvents\EventLabels\DeviceDisconnect","DispFileName",0x00000000,"@mmsys.cpl,-5829" +HKCU,"AppEvents\EventLabels\DeviceFail","",0x00000000,"Device Failed to Connect" +HKCU,"AppEvents\EventLabels\DeviceFail","DispFileName",0x00000000,"@mmsys.cpl,-5830" +HKCU,"AppEvents\EventLabels\EmptyRecycleBin","",0x00000000,"Empty Recycle Bin" +HKCU,"AppEvents\EventLabels\EmptyRecycleBin","DispFileName",0x00000000,"@mmsys.cpl,-5831" +HKCU,"AppEvents\EventLabels\LowBatteryAlarm","",0x00000000,"Low Battery Alarm" +HKCU,"AppEvents\EventLabels\LowBatteryAlarm","DispFileName",0x00000000,"@mmsys.cpl,-5832" +HKCU,"AppEvents\EventLabels\Maximize","",0x00000000,"Maximize" +HKCU,"AppEvents\EventLabels\Maximize","DispFileName",0x00000000,"@mmsys.cpl,-5833" +HKCU,"AppEvents\EventLabels\MenuCommand","",0x00000000,"Menu command" +HKCU,"AppEvents\EventLabels\MenuCommand","DispFileName",0x00000000,"@mmsys.cpl,-5834" +HKCU,"AppEvents\EventLabels\MenuPopup","",0x00000000,"Menu popup" +HKCU,"AppEvents\EventLabels\MenuPopup","DispFileName",0x00000000,"@mmsys.cpl,-5835" +HKCU,"AppEvents\EventLabels\Minimize","",0x00000000,"Minimize" +HKCU,"AppEvents\EventLabels\Minimize","DispFileName",0x00000000,"@mmsys.cpl,-5836" +HKCU,"AppEvents\EventLabels\MailBeep","",0x00000000,"New Mail Notification" +HKCU,"AppEvents\EventLabels\MailBeep","DispFileName",0x00000000,"@mmsys.cpl,-5837" +HKCU,"AppEvents\EventLabels\Navigating","",0x00000000,"Start Navigation" +HKCU,"AppEvents\EventLabels\Navigating","DispFileName",0x00000000,"@mmsys.cpl,-5838" +HKCU,"AppEvents\EventLabels\Open","",0x00000000,"Open program" +HKCU,"AppEvents\EventLabels\Open","DispFileName",0x00000000,"@mmsys.cpl,-5839" +HKCU,"AppEvents\EventLabels\PrintComplete","",0x00000000,"Print Complete" +HKCU,"AppEvents\EventLabels\PrintComplete","DispFileName",0x00000000,"@mmsys.cpl,-5840" +HKCU,"AppEvents\EventLabels\RestoreDown","",0x00000000,"Restore Down" +HKCU,"AppEvents\EventLabels\RestoreDown","DispFileName",0x00000000,"@mmsys.cpl,-5841" +HKCU,"AppEvents\EventLabels\RestoreUp","",0x00000000,"Restore Up" +HKCU,"AppEvents\EventLabels\RestoreUp","DispFileName",0x00000000,"@mmsys.cpl,-5842" +HKCU,"AppEvents\EventLabels\SystemAsterisk","",0x00000000,"Asterisk" +HKCU,"AppEvents\EventLabels\SystemAsterisk","DispFileName",0x00000000,"@mmsys.cpl,-5843" +HKCU,"AppEvents\EventLabels\SystemExclamation","",0x00000000,"Exclamation" +HKCU,"AppEvents\EventLabels\SystemExclamation","DispFileName",0x00000000,"@mmsys.cpl,-5845" +HKCU,"AppEvents\EventLabels\SystemExit","",0x00000000,"Exit ReactOS" +HKCU,"AppEvents\EventLabels\SystemExit","DispFileName",0x00000000,"@mmsys.cpl,-5846" +HKCU,"AppEvents\EventLabels\SystemHand","",0x00000000,"Critical Stop" +HKCU,"AppEvents\EventLabels\SystemHand","DispFileName",0x00000000,"@mmsys.cpl,-5847" +HKCU,"AppEvents\EventLabels\SystemNotification","",0x00000000,"System Notification" +HKCU,"AppEvents\EventLabels\SystemNotification","DispFileName",0x00000000,"@mmsys.cpl,-5848" +HKCU,"AppEvents\EventLabels\SystemQuestion","",0x00000000,"Question" +HKCU,"AppEvents\EventLabels\SystemQuestion","DispFileName",0x00000000,"@mmsys.cpl,-5849" +HKCU,"AppEvents\EventLabels\SystemStart","",0x00000000,"Start ReactOS" +HKCU,"AppEvents\EventLabels\SystemStart","DispFileName",0x00000000,"@mmsys.cpl,-5850" +HKCU,"AppEvents\EventLabels\WindowsLogoff","",0x00000000,"ReactOS Logoff" +HKCU,"AppEvents\EventLabels\WindowsLogoff","DispFileName",0x00000000,"@mmsys.cpl,-5852" +HKCU,"AppEvents\EventLabels\WindowsLogon","",0x00000000,"ReactOS Logon" +HKCU,"AppEvents\EventLabels\WindowsLogon","DispFileName",0x00000000,"@mmsys.cpl,-5853" + ; EOF Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sat Aug 15 16:46:24 2009 @@ -1523,6 +1523,7 @@ HKCU,Software\Wine\MSHTML,"GeckoCabDir",0x00020000,"%SystemRoot%\" ; Sound Schemes +HKCU,"AppEvents",,0x00000012 HKCU,"AppEvents\Schemes","",0x00000000,".Default" HKCU,"AppEvents\Schemes\Apps",,0x00000012 HKCU,"AppEvents\Schemes\Apps\.Default","",0x00000000,"ReactOS" @@ -1617,4 +1618,62 @@ HKCU,"AppEvents\Schemes\Names\.Default","",0x00000002,"ReactOS Default" HKCU,"AppEvents\Schemes\Names\.None","",0x00000002,"No sounds" +HKCU,"AppEvents\EventLabels",,0x00000012 +HKCU,"AppEvents\EventLabels\.Default","",0x00000000,"Default Beep" +HKCU,"AppEvents\EventLabels\.Default","DispFileName",0x00000000,"@mmsys.cpl,-5824" +HKCU,"AppEvents\EventLabels\AppGPFault","",0x00000000,"Program error" +HKCU,"AppEvents\EventLabels\AppGPFault","DispFileName",0x00000000,"@mmsys.cpl,-5825" +HKCU,"AppEvents\EventLabels\Close","",0x00000000,"Close program" +HKCU,"AppEvents\EventLabels\Close","DispFileName",0x00000000,"@mmsys.cpl,-5826" +HKCU,"AppEvents\EventLabels\CriticalBatteryAlarm","",0x00000000,"Critical Battery Alarm" +HKCU,"AppEvents\EventLabels\CriticalBatteryAlarm","DispFileName",0x00000000,"@mmsys.cpl,-5827" +HKCU,"AppEvents\EventLabels\DeviceConnect","",0x00000000,"Device Connect" +HKCU,"AppEvents\EventLabels\DeviceConnect","DispFileName",0x00000000,"@mmsys.cpl,-5828" +HKCU,"AppEvents\EventLabels\DeviceDisconnect","",0x00000000,"Device Disconnect" +HKCU,"AppEvents\EventLabels\DeviceDisconnect","DispFileName",0x00000000,"@mmsys.cpl,-5829" +HKCU,"AppEvents\EventLabels\DeviceFail","",0x00000000,"Device Failed to Connect" +HKCU,"AppEvents\EventLabels\DeviceFail","DispFileName",0x00000000,"@mmsys.cpl,-5830" +HKCU,"AppEvents\EventLabels\EmptyRecycleBin","",0x00000000,"Empty Recycle Bin" +HKCU,"AppEvents\EventLabels\EmptyRecycleBin","DispFileName",0x00000000,"@mmsys.cpl,-5831" +HKCU,"AppEvents\EventLabels\LowBatteryAlarm","",0x00000000,"Low Battery Alarm" +HKCU,"AppEvents\EventLabels\LowBatteryAlarm","DispFileName",0x00000000,"@mmsys.cpl,-5832" +HKCU,"AppEvents\EventLabels\Maximize","",0x00000000,"Maximize" +HKCU,"AppEvents\EventLabels\Maximize","DispFileName",0x00000000,"@mmsys.cpl,-5833" +HKCU,"AppEvents\EventLabels\MenuCommand","",0x00000000,"Menu command" +HKCU,"AppEvents\EventLabels\MenuCommand","DispFileName",0x00000000,"@mmsys.cpl,-5834" +HKCU,"AppEvents\EventLabels\MenuPopup","",0x00000000,"Menu popup" +HKCU,"AppEvents\EventLabels\MenuPopup","DispFileName",0x00000000,"@mmsys.cpl,-5835" +HKCU,"AppEvents\EventLabels\Minimize","",0x00000000,"Minimize" +HKCU,"AppEvents\EventLabels\Minimize","DispFileName",0x00000000,"@mmsys.cpl,-5836" +HKCU,"AppEvents\EventLabels\MailBeep","",0x00000000,"New Mail Notification" +HKCU,"AppEvents\EventLabels\MailBeep","DispFileName",0x00000000,"@mmsys.cpl,-5837" +HKCU,"AppEvents\EventLabels\Navigating","",0x00000000,"Start Navigation" +HKCU,"AppEvents\EventLabels\Navigating","DispFileName",0x00000000,"@mmsys.cpl,-5838" +HKCU,"AppEvents\EventLabels\Open","",0x00000000,"Open program" +HKCU,"AppEvents\EventLabels\Open","DispFileName",0x00000000,"@mmsys.cpl,-5839" +HKCU,"AppEvents\EventLabels\PrintComplete","",0x00000000,"Print Complete" +HKCU,"AppEvents\EventLabels\PrintComplete","DispFileName",0x00000000,"@mmsys.cpl,-5840" +HKCU,"AppEvents\EventLabels\RestoreDown","",0x00000000,"Restore Down" +HKCU,"AppEvents\EventLabels\RestoreDown","DispFileName",0x00000000,"@mmsys.cpl,-5841" +HKCU,"AppEvents\EventLabels\RestoreUp","",0x00000000,"Restore Up" +HKCU,"AppEvents\EventLabels\RestoreUp","DispFileName",0x00000000,"@mmsys.cpl,-5842" +HKCU,"AppEvents\EventLabels\SystemAsterisk","",0x00000000,"Asterisk" +HKCU,"AppEvents\EventLabels\SystemAsterisk","DispFileName",0x00000000,"@mmsys.cpl,-5843" +HKCU,"AppEvents\EventLabels\SystemExclamation","",0x00000000,"Exclamation" +HKCU,"AppEvents\EventLabels\SystemExclamation","DispFileName",0x00000000,"@mmsys.cpl,-5845" +HKCU,"AppEvents\EventLabels\SystemExit","",0x00000000,"Exit ReactOS" +HKCU,"AppEvents\EventLabels\SystemExit","DispFileName",0x00000000,"@mmsys.cpl,-5846" +HKCU,"AppEvents\EventLabels\SystemHand","",0x00000000,"Critical Stop" +HKCU,"AppEvents\EventLabels\SystemHand","DispFileName",0x00000000,"@mmsys.cpl,-5847" +HKCU,"AppEvents\EventLabels\SystemNotification","",0x00000000,"System Notification" +HKCU,"AppEvents\EventLabels\SystemNotification","DispFileName",0x00000000,"@mmsys.cpl,-5848" +HKCU,"AppEvents\EventLabels\SystemQuestion","",0x00000000,"Question" +HKCU,"AppEvents\EventLabels\SystemQuestion","DispFileName",0x00000000,"@mmsys.cpl,-5849" +HKCU,"AppEvents\EventLabels\SystemStart","",0x00000000,"Start ReactOS" +HKCU,"AppEvents\EventLabels\SystemStart","DispFileName",0x00000000,"@mmsys.cpl,-5850" +HKCU,"AppEvents\EventLabels\WindowsLogoff","",0x00000000,"ReactOS Logoff" +HKCU,"AppEvents\EventLabels\WindowsLogoff","DispFileName",0x00000000,"@mmsys.cpl,-5852" +HKCU,"AppEvents\EventLabels\WindowsLogon","",0x00000000,"ReactOS Logon" +HKCU,"AppEvents\EventLabels\WindowsLogon","DispFileName",0x00000000,"@mmsys.cpl,-5853" + ; EOF

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