Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 30097: Gdi32: - Implement GdiGetCodePage and SetROP2. Still testing. - Implemented batch support for SetBrushOrgEx. Still testing. - Moved PatBlt and PolyPatBlt out of stubs.
by jimtabor＠svn.reactos.org 04 Nov '07

04 Nov '07

Author: jimtabor Date: Sun Nov 4 03:28:49 2007 New Revision: 30097 URL: http://svn.reactos.org/svn/reactos?rev=30097&view=rev Log: Gdi32: - Implement GdiGetCodePage and SetROP2. Still testing. - Implemented batch support for SetBrushOrgEx. Still testing. - Moved PatBlt and PolyPatBlt out of stubs. Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/brush.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Nov 4 03:28:49 2007 @@ -105,19 +105,6 @@ */ int STDCALL -SetROP2(HDC hdc, - int fnDrawMode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -int -STDCALL SetStretchBltMode(HDC hdc, int iStretchMode) { /* FIXME share memory */ @@ -205,20 +192,6 @@ { /* FIXME share memory */ return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); -} - -/* - * @unimplemented - */ -BOOL -STDCALL -SetBrushOrgEx(HDC hdc, - int nXOrg, - int nYOrg, - LPPOINT lppt) -{ - /* FIXME share memory */ - return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); } /* @@ -1513,18 +1486,6 @@ BOOL STDCALL GdiDrawStream(HDC dc, ULONG l, VOID *v) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -DWORD -STDCALL -GdiGetCodePage(HDC hdc) { UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -2681,36 +2642,10 @@ } -BOOL -STDCALL -PatBlt(HDC hdc, - int nXLeft, - int nYLeft, - int nWidth, - int nHeight, - DWORD dwRop) -{ - /* FIXME some part need be done in user mode */ - return NtGdiPatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); -} - -BOOL -STDCALL -PolyPatBlt(IN HDC hdc, - IN DWORD rop4, - IN PPOLYPATBLT pPoly, - IN DWORD Count, - IN DWORD Mode) -{ - /* FIXME some part need be done in user mode */ - return NtGdiPolyPatBlt(hdc, rop4, pPoly,Count,Mode); -} - - - - - - - - - + + + + + + + Modified: trunk/reactos/dll/win32/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/br… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/brush.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/brush.c Sun Nov 4 03:28:49 2007 @@ -179,3 +179,146 @@ return hBrush; } +BOOL +STDCALL +PatBlt(HDC hdc, + int nXLeft, + int nYLeft, + int nWidth, + int nHeight, + DWORD dwRop) +{ + /* FIXME some part need be done in user mode */ + return NtGdiPatBlt( hdc, nXLeft, nYLeft, nWidth, nHeight, dwRop); +} + +BOOL +STDCALL +PolyPatBlt(IN HDC hdc, + IN DWORD rop4, + IN PPOLYPATBLT pPoly, + IN DWORD Count, + IN DWORD Mode) +{ + /* FIXME some part need be done in user mode */ + return NtGdiPolyPatBlt(hdc, rop4, pPoly,Count,Mode); +} + + +/* + * @implemented + */ +int +STDCALL +SetROP2(HDC hdc, + int fnDrawMode) +{ + PDC_ATTR Dc_Attr; + INT Old_ROP2; + +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC) + return MFDRV_SetROP2( hdc, fnDrawMode); + else + { + PLDC pLDC = GdiGetLDC(hdc); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetROP2(( hdc, fnDrawMode); + } + return FALSE; + } + } +#endif + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return FALSE; + + if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG) hdc) + { + if (Dc_Attr->ulDirty_ & DC_MODE_DIRTY) + { + NtGdiFlush(); + Dc_Attr->ulDirty_ &= ~DC_MODE_DIRTY; + } + } + + Old_ROP2 = Dc_Attr->jROP2; + Dc_Attr->jROP2 = fnDrawMode; + + return Old_ROP2; +} + +/* + * @implemented + */ +BOOL +STDCALL +SetBrushOrgEx(HDC hdc, + int nXOrg, + int nYOrg, + LPPOINT lppt) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) + { + PLDC pLDC = GdiGetLDC(hdc); + if ( (pLDC == NULL) || (GDI_HANDLE_GET_TYPE(hdc) == GDI_OBJECT_TYPE_METADC)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return EMFDRV_SetBrushOrg(hdc, nXOrg, nYOrg); // ReactOS only. + } + return FALSE; + } +#endif +#if 0 + PDC_ATTR Dc_Attr; + + if (GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) + { + PTEB pTeb = NtCurrentTeb(); + if (lppt) + { + lppt->x = Dc_Attr->ptlBrushOrigin.x; + lppt->y = Dc_Attr->ptlBrushOrigin.y; + } + if ((nXOrg == Dc_Attr->ptlBrushOrigin.x) && (nYOrg == Dc_Attr->ptlBrushOrigin.y)) + return TRUE; + + if(((pTeb->GdiTebBatch.HDC == 0) || (pTeb->GdiTebBatch.HDC == (ULONG)hdc)) && + ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSSETBRHORG)) <= GDIBATCHBUFSIZE) && + (!(Dc_Attr->ulDirty_ & DC_DIBSECTION)) ) + { + PGDIBSSETBRHORG pgSBO = (PGDIBSSETBRHORG)(&pTeb->GdiTebBatch.Buffer[0] + + pTeb->GdiTebBatch.Offset); + + Dc_Attr->ptlBrushOrigin.x = nXOrg; + Dc_Attr->ptlBrushOrigin.y = nYOrg; + + pgSBO->gbHdr.Cmd = GdiBCSetBrushOrg; + pgSBO->gbHdr.Size = sizeof(GDIBSSETBRHORG); + pgSBO->ptlBrushOrigin = Dc_Attr->ptlBrushOrigin; + + pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); + pTeb->GdiTebBatch.HDC = (ULONG)hdc; + pTeb->GdiBatchCount++; + if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + + return TRUE; + } + } +#endif + return NtGdiSetBrushOrg(hdc,nXOrg,nYOrg,lppt); +} + Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Sun Nov 4 03:28:49 2007 @@ -44,6 +44,20 @@ int cbString) { return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL); +} + + +/* + * @implemented + */ +DWORD +STDCALL +GdiGetCodePage(HDC hdc) +{ + PDC_ATTR Dc_Attr; + if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr)) return 0; + if (Dc_Attr->ulDirty_ & DIRTY_CHARSET) return LOWORD(NtGdiGetCharSet(hdc)); + return LOWORD(Dc_Attr->iCS_CP); }

1 0

[jimtabor] 30096: Implement NtGdiGetCharSet, for testing.
by jimtabor＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: jimtabor Date: Sun Nov 4 02:42:07 2007 New Revision: 30096 URL: http://svn.reactos.org/svn/reactos?rev=30096&view=rev Log: Implement NtGdiGetCharSet, for testing. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sun Nov 4 02:42:07 2007 @@ -3172,12 +3172,75 @@ return FALSE; } + DWORD -NtGdiGetCharSet(HDC hDC) -{ - UNIMPLEMENTED; - return 0; -} +FASTCALL +IntGdiGetCharSet(HDC hDC) +{ + UINT cp = 0; + CHARSETINFO csi; + DWORD charset = NtGdiGetTextCharsetInfo(hDC,NULL,0); + if (IntTranslateCharsetInfo(&charset, &csi, TCI_SRCCHARSET)) + cp = csi.ciACP; + else + { + switch(charset) + { + case OEM_CHARSET: + cp = 1; + break; + case DEFAULT_CHARSET: + cp = 0; + break; + default: + DPRINT1("Can't find codepage for charset %d\n", charset); + break; + } + } + DPRINT("charset %d => cp %d\n", charset, LOWORD(cp)); + return (MAKELONG(cp, charset)); +} + + +DWORD +NtGdiGetCharSet(HDC hDC) +{ + PDC Dc; + DWORD cscp = IntGdiGetCharSet(hDC); + // If here, update everything! + Dc = DC_LockDc(hDC); + if (!Dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + Dc->Dc_Attr.iCS_CP = cscp; + Dc->Dc_Attr.ulDirty_ &= ~DIRTY_CHARSET; + + if (Dc->pDc_Attr) + { + PDC_ATTR Dc_Attr = Dc->pDc_Attr; + NTSTATUS Status = STATUS_SUCCESS; + _SEH_TRY + { + ProbeForWrite(Dc_Attr, + sizeof(DC_ATTR), + 1); + Dc_Attr->iCS_CP = cscp; + Dc_Attr->ulDirty_ &= ~DIRTY_CHARSET; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if(!NT_SUCCESS(Status)) SetLastNtError(Status); + } + DC_UnlockDc( Dc ); + return cscp; +} + INT APIENTRY

1 0

[ekohl] 30095: Select the first user and system environment variable upon initialization.
by ekohl＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: ekohl Date: Sun Nov 4 01:09:27 2007 New Revision: 30095 URL: http://svn.reactos.org/svn/reactos?rev=30095&view=rev Log: Select the first user and system environment variable upon initialization. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sun Nov 4 01:09:27 2007 @@ -311,12 +311,13 @@ HKEY_CURRENT_USER, _T("Environment")); - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - - ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); + (void)ListView_SetColumnWidth(hwndListView, 2, LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView, 0, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); (void)ListView_Update(hwndListView,0); - /* Set system environment variables */ hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); @@ -329,11 +330,13 @@ HKEY_LOCAL_MACHINE, _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - - ListView_SetItemState(hwndListView,0,LVIS_FOCUSED,LVIS_FOCUSED); - - (void)ListView_Update(hwndListView,0); + (void)ListView_SetColumnWidth(hwndListView, 2, LVSCW_AUTOSIZE_USEHEADER); + + ListView_SetItemState(hwndListView, 0, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); + + (void)ListView_Update(hwndListView, 0); }

1 0

[gedmurphy] 30094: Add an mstsc (remote desktop client) which is based on the GPL WinRDesktop. It's a VS project at the moment, not yet converted to be buildable via rbuild, and still pretty incomplete.
by gedmurphy＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: gedmurphy Date: Sun Nov 4 01:02:59 2007 New Revision: 30094 URL: http://svn.reactos.org/svn/reactos?rev=30094&view=rev Log: Add an mstsc (remote desktop client) which is based on the GPL WinRDesktop. It's a VS project at the moment, not yet converted to be buildable via rbuild, and still pretty incomplete. Added: trunk/reactos/base/applications/mstsc/ trunk/reactos/base/applications/mstsc/bitmap.c (with props) trunk/reactos/base/applications/mstsc/bsops.c (with props) trunk/reactos/base/applications/mstsc/bsops.h (with props) trunk/reactos/base/applications/mstsc/cache.c (with props) trunk/reactos/base/applications/mstsc/channels.c (with props) trunk/reactos/base/applications/mstsc/connectdialog.c (with props) trunk/reactos/base/applications/mstsc/constants.h (with props) trunk/reactos/base/applications/mstsc/iso.c (with props) trunk/reactos/base/applications/mstsc/lang/ trunk/reactos/base/applications/mstsc/lang/en-US.rc (with props) trunk/reactos/base/applications/mstsc/licence.c (with props) trunk/reactos/base/applications/mstsc/manifest.xml (with props) trunk/reactos/base/applications/mstsc/mcs.c (with props) trunk/reactos/base/applications/mstsc/mppc.c (with props) trunk/reactos/base/applications/mstsc/mstsc.rbuild (with props) trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln (with props) trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj (with props) trunk/reactos/base/applications/mstsc/orders.c (with props) trunk/reactos/base/applications/mstsc/orders.h (with props) trunk/reactos/base/applications/mstsc/parse.h (with props) trunk/reactos/base/applications/mstsc/proto.h (with props) trunk/reactos/base/applications/mstsc/pstcache.c (with props) trunk/reactos/base/applications/mstsc/rdc.rc (with props) trunk/reactos/base/applications/mstsc/rdesktop.h (with props) trunk/reactos/base/applications/mstsc/rdp.c (with props) trunk/reactos/base/applications/mstsc/rdp5.c (with props) trunk/reactos/base/applications/mstsc/res/ trunk/reactos/base/applications/mstsc/res/colors.ico (with props) trunk/reactos/base/applications/mstsc/res/connection.ico (with props) trunk/reactos/base/applications/mstsc/res/header.bmp (with props) trunk/reactos/base/applications/mstsc/res/header.pdn (with props) trunk/reactos/base/applications/mstsc/res/logon.ico (with props) trunk/reactos/base/applications/mstsc/res/mstsc.ico (with props) trunk/reactos/base/applications/mstsc/res/remote.ico (with props) trunk/reactos/base/applications/mstsc/res/spectrum.bmp (with props) trunk/reactos/base/applications/mstsc/res/video-display.png (with props) trunk/reactos/base/applications/mstsc/resource.h (with props) trunk/reactos/base/applications/mstsc/rsrc.rc (with props) trunk/reactos/base/applications/mstsc/secure.c (with props) trunk/reactos/base/applications/mstsc/ssl_calls.c (with props) trunk/reactos/base/applications/mstsc/tcp.c (with props) trunk/reactos/base/applications/mstsc/types.h (with props) trunk/reactos/base/applications/mstsc/uimain.c (with props) trunk/reactos/base/applications/mstsc/uimain.h (with props) trunk/reactos/base/applications/mstsc/win32.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… Added: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… Added: trunk/reactos/base/applications/mstsc/bsops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… Added: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… Added: trunk/reactos/base/applications/mstsc/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ch… Added: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Added: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Added: trunk/reactos/base/applications/mstsc/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/is… Added: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Added: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… Added: trunk/reactos/base/applications/mstsc/manifest.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ma… Added: trunk/reactos/base/applications/mstsc/mcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mc… Added: trunk/reactos/base/applications/mstsc/mppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mp… Added: trunk/reactos/base/applications/mstsc/mstsc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… Added: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.sln URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… Added: trunk/reactos/base/applications/mstsc/mstsc_vc8_auto.vcproj URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ms… Added: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Added: trunk/reactos/base/applications/mstsc/orders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Added: trunk/reactos/base/applications/mstsc/parse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pa… Added: trunk/reactos/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Added: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… Added: trunk/reactos/base/applications/mstsc/rdc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Added: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Added: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Added: trunk/reactos/base/applications/mstsc/rdp5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Added: trunk/reactos/base/applications/mstsc/res/colors.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/connection.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/header.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/header.pdn URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/logon.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/mstsc.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/remote.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/spectrum.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/res/video-display.png URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… Added: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… Added: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… Added: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… Added: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… Added: trunk/reactos/base/applications/mstsc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ty… Added: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… Added: trunk/reactos/base/applications/mstsc/uimain.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… Added: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi…

1 0

[spetreolle] 30093: Miscellanous fixes and updates for french translations by Pierre Schweitzer
by spetreolle＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: spetreolle Date: Sun Nov 4 00:16:56 2007 New Revision: 30093 URL: http://svn.reactos.org/svn/reactos?rev=30093&view=rev Log: Miscellanous fixes and updates for french translations by Pierre Schweitzer Added: trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc (with props) trunk/reactos/dll/cpl/joy/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Added: trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc Sun Nov 4 00:16:56 2007 @@ -1,0 +1,19 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_CONFIG DIALOGEX 0, 0, 273, 178 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètres de l'écran de veille Texte 3D" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,216,7,50,14 + PUSHBUTTON "Annuler",IDCANCEL,216,24,50,14 + EDITTEXT IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL + LTEXT "Texte personnalisé",IDC_STATIC_TEXT,18,17,65,8 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Écran de veille Texte 3D" + IDS_TITLE "À propos de" + IDS_TEXT "Il n'y a aucune option à définir." +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Sun Nov 4 00:16:56 2007 @@ -13,4 +13,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc Sun Nov 4 00:16:56 2007 @@ -218,9 +218,9 @@ STRING_DIR_HELP3, " Le lecteur %c n'a pas de nom de volume\n" STRING_DIR_HELP4, " Le numéro de série du volume est %04X-%04X\n" STRING_DIR_HELP5, "\n Total de fichiers listés :\n%16i Fichier(s)% 14s octets\n" -STRING_DIR_HELP6, "%16i fichier(s)% 15s octets\n" +STRING_DIR_HELP6, "%16i Rep(s)% 15s octets\n" STRING_DIR_HELP7, "\n Répertoire de %s\n\n" -STRING_DIR_HELP8, "%16i Rep(s)% 14s octets\n" +STRING_DIR_HELP8, "%16i Fichier(s)% 14s octets\n" STRING_DIRSTACK_HELP1, "Stocke le répertoire courant pour utilisation avec la commande POPD,\n\ ensuite change de répertoire vers le répertoire spécifié.\n\n\ Added: trunk/reactos/dll/cpl/joy/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/fr-FR.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/fr-FR.rc (added) +++ trunk/reactos/dll/cpl/joy/lang/fr-FR.rc Sun Nov 4 00:16:56 2007 @@ -1,0 +1,84 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Contrôleurs de jeu" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 + LTEXT "Ces paramètres vous aident à configurer les contrôleurs de jeu installés sur votre ordinateur.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "Co&ntrôleurs de jeu installés", -1, 7, 34, 238, 117 + CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 + PUSHBUTTON "&Ajouter...", IDC_ADD_BUTTON, 35, 129, 65, 14 + PUSHBUTTON "Supp&rimer", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED + PUSHBUTTON "&Propriétés", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED + PUSHBUTTON "Avancé...", IDC_ADVANCED_BUTTON, 111, 157, 65, 14 + PUSHBUTTON "Dépannage...", IDC_TROUBLESHOOT_BUTTON, 180, 157, 65, 14 + PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 +END + +IDD_ADD DIALOGEX 0, 0, 265, 200 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Ajouer un contrôleur de jeu" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 + LTEXT "Sélectionnez un contrôleur de jeu dans la liste suivante, puis cliquez sur OK. Si votre contrôleur de jeu n'apparaît pas dans la liste, cliquez sur Personnaliser.", -1, 35, 7, 210, 33 + LTEXT "Contrôleurs de jeu:", -1, 8, 45, 126, 8 + LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP + AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + LTEXT "Port de jeu:", -1, 7, 134, 38, 8, NOT WS_VISIBLE + COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL + PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 + DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 208, 179, 50, 14 +END + +IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 +STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Contrôleur de jeu personnalisé" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Caractéristiques spéciales", -1, 7, 7, 245, 52 + AUTORADIOBUTTON "&Joystick", IDC_JOYSTICK_RADIO, 17, 23, 55, 10 + AUTORADIOBUTTON "Manche à balai", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 + AUTORADIOBUTTON "Manette de jeu", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 + AUTORADIOBUTTON "Volant", IDC_RACE_CAR_RADIO, 147, 40, 93, 10 + GROUPBOX "&Axes", -1, 7, 67, 116, 44, WS_GROUP + COMBOBOX IDC_AXES_COMBO, 37, 79, 48, 50, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + AUTORADIOBUTTON "Palonnier/Pédales", IDC_RUDDER_PEDALS_RADIO, 14, 97, 63, 10, NOT WS_VISIBLE + AUTORADIOBUTTON "Axe Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE + GROUPBOX "&Boutons", -1, 137, 67, 116, 44 + COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE + AUTOCHECKBOX "Inclue un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + LTEXT "N&om du contrôleur:", -1, 7, 139, 200, 9 + EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE + DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 203, 150, 50, 14 +END + +IDD_ADVANCED DIALOGEX 0, 0, 220, 86 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Paramètres avancés" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 + DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 163, 65, 50, 14 + LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 10 + LTEXT "&Périphérique préféré:", -1, 34, 24, 70, 10 + COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Contrôleurs de jeu" + IDS_CPLSYSTEMDESCRIPTION "Ajouter, supprimer, et configurer le matériel de contrôle de jeu comme les joysticks et les manettes de jeu." + IDS_CONTROLLER "Contrôleur" + IDS_STATUS "Status" +END Propchange: trunk/reactos/dll/cpl/joy/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=30… ============================================================================== --- trunk/reactos/dll/cpl/joy/rsrc.rc (original) +++ trunk/reactos/dll/cpl/joy/rsrc.rc Sun Nov 4 00:16:56 2007 @@ -3,4 +3,5 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/fr-FR.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Sun Nov 4 00:16:56 2007 @@ -3,6 +3,7 @@ * French language support * * Copyright 1998 Juergen Schmied + * 2007 Pierre Schweitzer * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,8 +24,8 @@ MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Grands icônes", FCIDM_SHVIEW_BIGICON - MENUITEM "&Petits icônes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END @@ -36,8 +37,8 @@ BEGIN POPUP "&Affichage" BEGIN - MENUITEM "&Grands icônes", FCIDM_SHVIEW_BIGICON - MENUITEM "&Petits icônes", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grandes icônes", FCIDM_SHVIEW_BIGICON + MENUITEM "&Petites icônes", FCIDM_SHVIEW_SMALLICON MENUITEM "&Liste", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Détails", FCIDM_SHVIEW_REPORTVIEW END @@ -102,17 +103,17 @@ SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK -CAPTION "Browse for Folder" +CAPTION "Parcourir pour un dossier" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Folder:", IDD_FOLDER, 10, 156, 40, 12 + LTEXT "Dossier:", IDD_FOLDER, 10, 156, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Make New Folder", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 @@ -120,10 +121,10 @@ CAPTION "Message" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Oui", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Oui pour tous", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Non", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuler", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 END @@ -173,66 +174,66 @@ SHELL_GENERAL_SHORTCUT_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Shortcut" +CAPTION "Raccourci" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE - LTEXT "Target type:", 14004, 10, 30, 50, 10 + LTEXT "Type de la cible:", 14004, 10, 30, 50, 10 LTEXT "", 14005, 70, 30, 150, 10 - LTEXT "Target location:", 14006, 10, 40, 70, 10 + LTEXT "Localisation de la cible:", 14006, 10, 40, 70, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Target:", 14008, 10, 55, 45, 10 + LTEXT "Cible:", 14008, 10, 55, 45, 10 EDITTEXT 14009, 70, 55, 150, 10, ES_LEFT | ES_AUTOHSCROLL - LTEXT "&Start in:",14010, 10, 65, 57, 10 + LTEXT "Démarrer dans:",14010, 10, 65, 57, 10 EDITTEXT 14011, 70, 65, 150, 10, ES_LEFT | ES_AUTOHSCROLL - LTEXT "Shortcut &key:", 14014, 10, 80, 57, 10 + LTEXT "Touche de raccourci:", 14014, 10, 80, 57, 10 EDITTEXT 14015, 70, 80, 150, 10, ES_LEFT - LTEXT "Run:", 14016, 10, 90, 57, 10 + LTEXT "Exécuter:", 14016, 10, 90, 57, 10 EDITTEXT 14017, 70, 90, 150, 10, ES_AUTOHSCROLL - LTEXT "C&omment:", 14018, 10, 100, 57, 10 + LTEXT "C&ommentaire:", 14018, 10, 100, 57, 10 EDITTEXT 14019, 70, 100, 150, 10, ES_LEFT | ES_AUTOHSCROLL - PUSHBUTTON "&Find Target...", 14020, 10, 115, 63, 14, ES_LEFT - PUSHBUTTON "&Change Icon...", 14021, 83, 115, 63, 14, ES_LEFT - PUSHBUTTON "A&dvanced...", 14022, 156, 115, 63, 14, ES_LEFT + PUSHBUTTON "Trouver la cible...", 14020, 10, 115, 63, 14, ES_LEFT + PUSHBUTTON "&Changer d'icône...", 14021, 83, 115, 63, 14, ES_LEFT + PUSHBUTTON "A&vancé...", 14022, 156, 115, 63, 14, ES_LEFT END SHELL_EXTENDED_SHORTCUT_DLG DIALOGEX 0, 0, 230, 150 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION -CAPTION "Extended Properties" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 - CHECKBOX "Run with different credentials", 14000, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 - CHECKBOX "Run in seperate memory space", 14001, 25, 100, 90, 10, WS_DISABLED +CAPTION "Propriétés étendues" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Choisissez la propriété étendue que vous voulez pour ce raccourci.", -1, 5, 30, 210, 10 + CHECKBOX "Exécuter avec des droits différents", 14000, 25, 50, 150, 10 + LTEXT "Cette option peut vous permettre d'utiliser ce raccourci en tant qu'autre utilisateur ou de continuer vous-même en protégeant votre ordinateur et vos données des activés de programme non autorisées.", -1, 50, 60, 175, 40 + CHECKBOX "Lancer dans un espace mémoire séparé", 14001, 25, 100, 90, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 25, 120, 50, 15, WS_VISIBLE - PUSHBUTTON "Abort", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE + PUSHBUTTON "Annuler", IDCANCEL, 120, 120, 50, 15, WS_VISIBLE END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 130 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 5, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 5, 100, 10, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 10, 30, 50, 10 - LTEXT "File", 14005, 70, 30, 150, 10 - LTEXT "Opens with:", 14006, 10, 40, 50, 10 + LTEXT "Type de fichier:", 14004, 10, 30, 50, 10 + LTEXT "Fichier", 14005, 70, 30, 150, 10 + LTEXT "Ouvrir avec:", 14006, 10, 40, 50, 10 LTEXT "", 14007, 70, 40, 150, 10 - LTEXT "Location:", 14008, 10, 55, 45, 10 + LTEXT "Localisation:", 14008, 10, 55, 45, 10 LTEXT "", 14009, 70, 55, 200, 10 - LTEXT "Size:",14010, 10, 65, 45, 10 + LTEXT "Taille:",14010, 10, 65, 45, 10 LTEXT "", 14011, 70, 65, 150, 10 - LTEXT "Created:", 14014, 10, 80, 45, 10 + LTEXT "Créé:", 14014, 10, 80, 45, 10 LTEXT "", 14015, 70, 80, 150, 10 - LTEXT "Modified:", 14016, 10, 90, 45, 10 + LTEXT "Modifié:", 14016, 10, 90, 45, 10 LTEXT "", 14017, 70, 90, 150, 10 - LTEXT "Accessed:", 14018, 10, 100, 45, 10 + LTEXT "Accédé:", 14018, 10, 100, 45, 10 LTEXT "", 14019, 70, 100, 150, 10 - LTEXT "Attributes:", 14020, 10, 115, 45, 10 - CHECKBOX "&Read-only", 14021, 70, 115, 67, 10 - CHECKBOX "&Hidden", 14022, 140, 115, 50, 10 + LTEXT "Attributs:", 14020, 10, 115, 45, 10 + CHECKBOX "Lectu&re-seule", 14021, 70, 115, 67, 10 + CHECKBOX "Cac&hé", 14022, 140, 115, 50, 10 CHECKBOX "&Archive", 14023, 190, 115, 45, 10 END @@ -241,109 +242,109 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "File version: ", 14000, 10, 10, 45, 10 + LTEXT "Version du fichier: ", 14000, 10, 10, 45, 10 LTEXT "", 14001, 70, 10, 150, 10 LTEXT "Description: ", 14002, 10, 20, 45, 10 LTEXT "", 14003, 70, 20, 150, 10 LTEXT "Copyright: ", 14004, 10, 30, 45, 10 LTEXT "", 14005, 70, 30, 150, 10 - GROUPBOX "Other version information: ", 14006, 10, 45, 220, 90 - LTEXT "Item name: ", 14007, 20, 55, 50, 10 - LTEXT "Value: ", 14008, 130, 55, 45, 10 + GROUPBOX "Autres informations de version: ", 14006, 10, 45, 220, 90 + LTEXT "Nom de l'élément: ", 14007, 20, 55, 50, 10 + LTEXT "Valeur: ", 14008, 130, 55, 45, 10 LISTBOX 14009,20,65,95,60, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 130, 65, 95, 60, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END DRIVE_GENERAL_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Type:", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "File system:", -1, 15, 70, 100, 10 + LTEXT "Système de fichier:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Used space:", -1, 25, 90, 120, 10 + LTEXT "Espace utilisé:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Free space:", -1, 25, 105, 70, 10 + LTEXT "Espace libre:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacity:", -1, 25, 125, 80, 10 + LTEXT "Capacité:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 - LTEXT "Drive %s", 14010, 100, 170, 40, 10 - PUSHBUTTON "Disk Cleanup", 14011, 180, 175, 50, 15, WS_TABSTOP - CHECKBOX "Compress drive to save disk space", 14012, 15, 205, 180, 10, WS_DISABLED - CHECKBOX "Allow Indexing Service to index this disk for fast file searching", 14012, 15, 220, 200, 10, WS_DISABLED + LTEXT "Lecteur %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Nettoyage de disque", 14011, 180, 175, 50, 15, WS_TABSTOP + CHECKBOX "Compresser le lecteur pour gagner de l'espace disque", 14012, 15, 205, 180, 10, WS_DISABLED + CHECKBOX "Autoriser le service d'indexation à indexer ce disque pour une recherche rapide de fichiers", 14012, 15, 220, 200, 10, WS_DISABLED END DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Tools" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Error-checking", -1, 5, 5, 230, 60 - LTEXT "This option will check the volume for\nerrors.", -1, 40, 25, 160, 20 - PUSHBUTTON "Check Now...", 14000, 130, 45, 90, 15, WS_TABSTOP - GROUPBOX "Defragmentation", -1, 5, 65, 230, 60 - LTEXT "This option will defragment files on the volume", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragment Now...", 14001, 130, 105, 90, 15, WS_TABSTOP - GROUPBOX "Backup", -1, 5, 130, 230, 60 - LTEXT "This option will back up files on the volume.", -1, 40, 150, 160, 20 - PUSHBUTTON "Backup Now...", 14002, 130, 170, 90, 15, WS_TABSTOP +CAPTION "Outils" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Vérifcation-d'erreurs", -1, 5, 5, 230, 60 + LTEXT "Cette option vérifiera le volume pour éviter les\nerreurs.", -1, 40, 25, 160, 20 + PUSHBUTTON "Vérifier maintenant...", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Défragmentation", -1, 5, 65, 230, 60 + LTEXT "Cette option va défragmenter les fichiers sur ce volume", -1, 40, 85, 160, 20 + PUSHBUTTON "Défragmenter maintenant...", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Sauvegarde", -1, 5, 130, 230, 60 + LTEXT "Cette option va sauvegarder les fichiers sur le volume.", -1, 40, 150, 160, 20 + PUSHBUTTON "Sauvegarder maintenant...", 14002, 130, 170, 90, 15, WS_TABSTOP END DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Hardware" +CAPTION "Matériel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN END RUN_AS_DIALOG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Run As" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 - CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "The following user:", 14002, 10, 100, 90, 10 - LTEXT "User name:", -1, 20, 115, 60, 10 +CAPTION "Lancer en tant que" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Quel compte d'utilisateur désirez-vous utiliser pour lancer ce programme?", -1, 10, 20, 220, 20 + CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10 + LTEXT "Protéger mon ordinateur et mes données de l'activé de programme non autorisés", -1, 25, 57, 200, 10, WS_DISABLED + CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "L'utilisateur suivant:", 14002, 10, 100, 90, 10 + LTEXT "Nom d'utilisateur:", -1, 20, 115, 60, 10 COMBOBOX 14003, 70, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 10, WS_TABSTOP - LTEXT "Password:", -1, 20, 140, 60, 10 + LTEXT "Mot de passe:", -1, 20, 140, 60, 10 EDITTEXT 14005, 70, 140, 100, 10, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 10, WS_TABSTOP PUSHBUTTON "OK", 14007, 70, 170, 60, 15, WS_TABSTOP - PUSHBUTTON "Cancel", 14008, 140, 170, 60, 15, WS_TABSTOP + PUSHBUTTON "Annuler", 14008, 140, 170, 60, 15, WS_TABSTOP END BITBUCKET_PROPERTIES_DLG DIALOGEX 0, 0, 240, 190 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Recycle Bin Properties" +CAPTION "Propriétés de la corbeille" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 10, 10, 220, 50 - GROUPBOX "Settings for selected location", -1, 10, 80, 220, 70 - RADIOBUTTON "&Custom size:", 14001, 20, 90, 80, 10 + GROUPBOX "Paramètres pour la localisation sélectionnée", -1, 10, 80, 220, 70 + RADIOBUTTON "Taille personnalisée:", 14001, 20, 90, 80, 10 EDITTEXT 14002, 90, 90, 50, 10, WS_TABSTOP | ES_NUMBER - LTEXT "M&aximum size(MB):", -1, 20, 100, 70, 10 - RADIOBUTTON "Do not move files to the &Recycle Bin. Remove files immediately when deleted.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP - RADIOBUTTON "&Display delete confirmation dialog", 14004, 20, 155, 140, 10, WS_TABSTOP + LTEXT "T&aille maximale(Mo):", -1, 20, 100, 70, 10 + RADIOBUTTON "Ne pas déplace&r les fichiers vers la corbeille. Immédiatement effacer les fichiers quand ils sont supprimés.", 14003, 20, 115, 170, 20, BS_MULTILINE | WS_TABSTOP + RADIOBUTTON "Afficher la fenêtre &de confirmation de suppression", 14004, 20, 155, 140, 10, WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -358,19 +359,19 @@ IDS_SHV_COLUMN7 "Espace disponible" IDS_SHV_COLUMN8 "Nom" IDS_SHV_COLUMN9 "Commentaires" - IDS_SHV_COLUMN10 "Owner" - IDS_SHV_COLUMN11 "Group" - IDS_SHV_COLUMN_DELFROM "Original location" - IDS_SHV_COLUMN_DELDATE "Date deleted" + IDS_SHV_COLUMN10 "Propriétaire" + IDS_SHV_COLUMN11 "Groupe" + IDS_SHV_COLUMN_DELFROM "Localisation d'origine" + IDS_SHV_COLUMN_DELDATE "Date de suppression" /* special folders */ IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" - IDS_RECYCLEBIN_FOLDER_NAME "Trash" + IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" /* context menus */ - IDS_VIEW_LARGE "&Grands icônes" - IDS_VIEW_SMALL "&Petits icônes" + IDS_VIEW_LARGE "&Grandes icônes" + IDS_VIEW_SMALL "&Petites icônes" IDS_VIEW_LIST "&Liste" IDS_VIEW_DETAILS "&Détails" IDS_SELECT "Sélectionner" @@ -381,22 +382,22 @@ IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" - IDS_DELETEMULTIPLE_TEXT "Êtes-vous sût de vouloir supprimer ces %1 items ?" - IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?" - IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?" - IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all its content to the Trash?" - IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?" - IDS_CANTTRASH_TEXT "The item '%1' can't be sent to Trash. Do you want to delete it instead?" - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\n\nDo you want to replace it?" + IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s)?" + IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille?" + IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille?" + IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille?" + IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer?" + IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" - IDS_OVERWRITEFOLDER_TEXT "This folder already contains a folder named '%1'.\n\n"\ - "If the files in the destination folder have the same names as files in the\n"\ - "selected folder they will be replaced. Do you still want to move or copy\n"\ - "the folder?" + IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\n"\ + "Si les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\n"\ + "dossier sélectionné, ils seront remplacés. Voulez-vous toujours déplacer ou copier\n"\ + "le dossier?" /* message box strings */ IDS_RESTART_TITLE "Redémarrer" - IDS_RESTART_PROMPT "Voulez-vous simuler le redémarrage de Windows?" + IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur?" IDS_SHUTDOWN_TITLE "Arrêter" IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS?" @@ -429,9 +430,9 @@ IDS_COMMON_VIDEO "Documents\\Mes vidéos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" - IDS_DRIVE_FIXED "Local Disk" + IDS_DRIVE_FIXED "Disque local" IDS_DRIVE_CDROM "CDROM" - IDS_DRIVE_NETWORK "Network Disk" + IDS_DRIVE_NETWORK "Disque réseau" IDS_OPEN_WITH "Open With" IDS_OPEN_WITH_CHOOSE "Choose Program..." Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sun Nov 4 00:16:56 2007 @@ -223,8 +223,8 @@ STRINGTABLE BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" - IDS_CMT_MAGNIFY "Magnify" + IDS_SYS_ACCESSIBILITY "Accessibilité" + IDS_CMT_MAGNIFY "Loupe" END STRINGTABLE @@ -254,8 +254,8 @@ IDS_SHORT_SNAP "Capture d'écran.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Table des Caractères.lnk" - IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_CHARMAP "Table des Caractères.lnk" + IDS_SHORT_MAGNIFY "Loupe.lnk" END STRINGTABLE

1 0

[ekohl] 30092: Select the previous list view item when an environment variable has been deleted.
by ekohl＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: ekohl Date: Sat Nov 3 20:14:16 2007 New Revision: 30092 URL: http://svn.reactos.org/svn/reactos?rev=30092&view=rev Log: Select the previous list view item when an environment variable has been deleted. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Nov 3 20:14:16 2007 @@ -458,6 +458,14 @@ } (void)ListView_DeleteItem(hwndListView, iItem); + + /* Select the previous item */ + if (iItem > 0) + iItem--; + + ListView_SetItemState(hwndListView, iItem, + LVIS_FOCUSED | LVIS_SELECTED, + LVIS_FOCUSED | LVIS_SELECTED); } }

1 0

[ekohl] 30091: Find the real currently selected list view item. This fixes a bug where a non-selected item gets edited or deleted.
by ekohl＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: ekohl Date: Sat Nov 3 18:53:52 2007 New Revision: 30091 URL: http://svn.reactos.org/svn/reactos?rev=30091&view=rev Log: Find the real currently selected list view item. This fixes a bug where a non-selected item gets edited or deleted. Modified: trunk/reactos/dll/cpl/sysdm/environment.c Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Nov 3 18:53:52 2007 @@ -17,6 +17,34 @@ LPTSTR lpRawValue; LPTSTR lpCookedValue; } VARIABLE_DATA, *PVARIABLE_DATA; + + +static INT +GetSelectedListViewItem(HWND hwndListView) +{ + INT iCount; + INT iItem; + + iCount = SendMessage(hwndListView, + LVM_GETITEMCOUNT, + 0, + 0); + if (iCount != LB_ERR) + { + for (iItem = 0; iItem < iCount; iItem++) + { + if (SendMessage(hwndListView, + LVM_GETITEMSTATE, + iItem, + (LPARAM) LVIS_SELECTED) == LVIS_SELECTED) + { + return iItem; + } + } + } + + return -1; +} INT_PTR CALLBACK @@ -311,12 +339,12 @@ VOID OnNewVariable(HWND hwndDlg, - int iDlgItem) + INT iDlgItem) { HWND hwndListView; PVARIABLE_DATA VarData; LV_ITEM lvi; - int iItem; + INT iItem; hwndListView = GetDlgItem(hwndDlg, iDlgItem); @@ -358,16 +386,16 @@ VOID OnEditVariable(HWND hwndDlg, - int iDlgItem) + INT iDlgItem) { HWND hwndListView; PVARIABLE_DATA VarData; LV_ITEM lvi; - int iItem; + INT iItem; hwndListView = GetDlgItem(hwndDlg, iDlgItem); - iItem = ListView_GetSelectionMark(hwndListView); + iItem = GetSelectedListViewItem(hwndListView); if (iItem != -1) { memset(&lvi, 0x00, sizeof(lvi)); @@ -394,16 +422,16 @@ VOID OnDeleteVariable(HWND hwndDlg, - int iDlgItem) + INT iDlgItem) { HWND hwndListView; PVARIABLE_DATA VarData; LV_ITEM lvi; - int iItem; + INT iItem; hwndListView = GetDlgItem(hwndDlg, iDlgItem); - iItem = ListView_GetSelectionMark(hwndListView); + iItem = GetSelectedListViewItem(hwndListView); if (iItem != -1) { memset(&lvi, 0x00, sizeof(lvi)); @@ -436,13 +464,13 @@ VOID ReleaseListViewItems(HWND hwndDlg, - int iDlgItem) + INT iDlgItem) { HWND hwndListView; PVARIABLE_DATA VarData; - int nItemCount; LV_ITEM lvi; - int i; + INT nItemCount; + INT i; hwndListView = GetDlgItem(hwndDlg, iDlgItem); @@ -584,7 +612,7 @@ } /* Loop through all variables */ - while(ListView_GetItem(hwndListView, &lvi)) + while (ListView_GetItem(hwndListView, &lvi)) { /* Get the data in each item */ VarData = (PVARIABLE_DATA)lvi.lParam;

1 0

[ekohl] 30090: Coding style clean-up. No code changes.
by ekohl＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: ekohl Date: Sat Nov 3 17:39:08 2007 New Revision: 30090 URL: http://svn.reactos.org/svn/reactos?rev=30090&view=rev Log: Coding style clean-up. No code changes. Modified: trunk/reactos/dll/cpl/sysdm/advanced.c trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/hardprof.c trunk/reactos/dll/cpl/sysdm/hardware.c trunk/reactos/dll/cpl/sysdm/licence.c trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/startrec.c trunk/reactos/dll/cpl/sysdm/sysdm.c trunk/reactos/dll/cpl/sysdm/userprofile.c trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/advanced.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/advanced.c (original) +++ trunk/reactos/dll/cpl/sysdm/advanced.c Sat Nov 3 17:39:08 2007 @@ -28,58 +28,49 @@ case WM_COMMAND: { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_PERFOR: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_VIRTMEM), hwndDlg, (DLGPROC)VirtMemDlgProc); - } - break; + break; case IDC_USERPROFILE: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_USERPROFILE), hwndDlg, (DLGPROC)UserProfileDlgProc); - } - break; + break; case IDC_STAREC: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_STARTUPRECOVERY), hwndDlg, (DLGPROC)StartRecDlgProc); - } - break; + break; case IDC_ENVVAR: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), hwndDlg, (DLGPROC)EnvironmentDlgProc); - } - break; + break; case IDC_ERRORREPORT: - { ShellExecute(NULL, _T("open"), BugLink, NULL, NULL, SW_SHOWNORMAL); - } - break; + break; } } break; } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c (original) +++ trunk/reactos/dll/cpl/sysdm/general.c Sat Nov 3 17:39:08 2007 @@ -28,15 +28,15 @@ LastError = GetLastError(); - if((LastError == 0) || - !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - LastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsg, - 0, - NULL)) + if ((LastError == 0) || + !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + LastError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsg, + 0, + NULL)) { return; } @@ -91,7 +91,8 @@ lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize); - if (!lpBuf) return; + if (!lpBuf) + return; if (RegQueryValueEx(hKey, Value, @@ -136,7 +137,8 @@ lpBuf = HeapAlloc(GetProcessHeap(), 0, BufSize); - if (!lpBuf) return 0; + if (!lpBuf) + return 0; if (RegQueryValueEx(hKey, Value, @@ -145,7 +147,7 @@ (PBYTE)lpBuf, &BufSize) == ERROR_SUCCESS) { - if(BufSize > ((30 + 1) * sizeof(TCHAR))) + if (BufSize > ((30 + 1) * sizeof(TCHAR))) { /* Wrap the Processor Name String like XP does: * * - Take the first 30 characters and look for the last space. * @@ -159,8 +161,10 @@ szBuf[30] = 0; szLastSpace = _tcsrchr(szBuf, ' '); - if(szLastSpace == 0) + if (szLastSpace == 0) + { LastSpace = 30; + } else { LastSpace = (szLastSpace - szBuf); @@ -205,13 +209,13 @@ { TCHAR szDecimalSeparator[4]; - // Get the decimal separator for the current locale - if( GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(TCHAR)) > 0) + /* Get the decimal separator for the current locale */ + if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szDecimalSeparator, sizeof(szDecimalSeparator) / sizeof(TCHAR)) > 0) { UCHAR uDecimals; UINT uIntegral; - // Show the value with two decimals + /* Show the value with two decimals */ uIntegral = (UINT)*dFloatValue; uDecimals = (UCHAR)((UINT)(*dFloatValue * 100) - uIntegral * 100); @@ -337,10 +341,14 @@ dTotalPhys = (double)MemStat.ullTotalPhys / 1024; } else + { dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } } else + { dTotalPhys = (double)MemStat.ullTotalPhys / 1024; + } LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(TCHAR)); MakeFloatValueString(&dTotalPhys, Buf, szStr); @@ -369,17 +377,14 @@ UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: - { InitImageInfo(&ImgInfo); GetSystemInformation(hwndDlg); - } - break; + break; case WM_COMMAND: - { if (LOWORD(wParam) == IDC_LICENCE) { DialogBox(hApplet, @@ -389,14 +394,13 @@ return TRUE; } - } - break; + break; case WM_DRAWITEM: { LPDRAWITEMSTRUCT lpDrawItem; lpDrawItem = (LPDRAWITEMSTRUCT) lParam; - if(lpDrawItem->CtlID == IDC_ROSIMG) + if (lpDrawItem->CtlID == IDC_ROSIMG) { HDC hdcMem; LONG left; Modified: trunk/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardprof.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardprof.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardprof.c Sat Nov 3 17:39:08 2007 @@ -19,24 +19,21 @@ UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) + + switch (uMsg) { case WM_INITDIALOG: - { MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + break; case WM_COMMAND: - { if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; } - } - break; + break; } return FALSE; } @@ -52,36 +49,31 @@ UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) + + switch (uMsg) { case WM_INITDIALOG: - { MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + break; case WM_COMMAND: - { switch (LOWORD(wParam)) { case IDC_HRDPROFRENAME: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), hwndDlg, (DLGPROC)RenameProfDlgProc); - } + break; case IDOK: case IDCANCEL: - { EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; - } } - } - break; + break; } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hardware.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hardware.c (original) +++ trunk/reactos/dll/cpl/sysdm/hardware.c Sat Nov 3 17:39:08 2007 @@ -12,7 +12,8 @@ typedef BOOL (STDCALL *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unknown, int nCmdShow); -BOOL LaunchDeviceManager(HWND hWndParent) +static BOOL +LaunchDeviceManager(HWND hWndParent) { /* hack for ROS to start our devmgmt until we have mmc */ #ifdef __REACTOS__ @@ -49,37 +50,29 @@ { UNREFERENCED_PARAMETER(lParam); - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: - break; + break; case WM_COMMAND: - { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_HARDWARE_DEVICE_MANAGER: - { - if(!LaunchDeviceManager(hwndDlg)) + if (!LaunchDeviceManager(hwndDlg)) { /* FIXME */ } - return TRUE; - } case IDC_HARDWARE_PROFILE: - { DialogBox(hApplet, MAKEINTRESOURCE(IDD_HARDWAREPROFILES), hwndDlg, (DLGPROC)HardProfDlgProc); - return TRUE; - } } - } - break; + break; } return FALSE; Modified: trunk/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/licence.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/licence.c (original) +++ trunk/reactos/dll/cpl/sysdm/licence.c Sat Nov 3 17:39:08 2007 @@ -12,7 +12,7 @@ INT_PTR CALLBACK LicenceDlgProc(HWND hDlg, - UINT message, + UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -23,10 +23,9 @@ UNREFERENCED_PARAMETER(lParam); - switch (message) + switch (uMsg) { case WM_INITDIALOG: - { hIcon = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM), IMAGE_ICON, @@ -61,10 +60,8 @@ 0); return TRUE; - } case WM_COMMAND: - { if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { DestroyIcon(hIcon); @@ -72,8 +69,7 @@ LOWORD(wParam)); return TRUE; } - } - break; + break; } return FALSE; Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Sat Nov 3 17:39:08 2007 @@ -40,10 +40,10 @@ /* propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300 -#define IDC_HARDWARE_WIZARD 207 +#define IDC_HARDWARE_WIZARD 207 #define IDC_HARDWARE_PROFILE 209 #define IDC_HARDWARE_DRIVER_SIGN 210 -#define IDC_HARDWARE_DEVICE_MANAGER 211 +#define IDC_HARDWARE_DEVICE_MANAGER 211 /* propsheet - advanced */ Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Sat Nov 3 17:39:08 2007 @@ -1,4 +1,3 @@ - /* * PROJECT: ReactOS System Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory @@ -16,7 +15,8 @@ static TCHAR m_szMinidumpDir[MAX_PATH]; static DWORD m_dwCrashDumpEnabled = 0; -void SetTimeout(HWND hwndDlg, int Timeout) +static VOID +SetTimeout(HWND hwndDlg, INT Timeout) { if (Timeout == 0) { @@ -26,12 +26,15 @@ { EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); } + SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } -DWORD GetSystemDrive(TCHAR ** szSystemDrive) +static DWORD +GetSystemDrive(TCHAR **szSystemDrive) { DWORD dwBufSize; + /* get Path to freeldr.ini or boot.ini */ *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); if (szSystemDrive != NULL) @@ -59,34 +62,38 @@ *szSystemDrive = NULL; return FALSE; } + return dwBufSize; } + return FALSE; } -PBOOTRECORD ReadFreeldrSection(HINF hInf, TCHAR * szSectionName) -{ - PBOOTRECORD pRecord; - INFCONTEXT InfContext; - TCHAR szName[MAX_PATH]; - TCHAR szValue[MAX_PATH]; - DWORD LineLength; - - if (!SetupFindFirstLine(hInf, - szSectionName, - NULL, - &InfContext)) - { - /* failed to find section */ - return NULL; - } - - pRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); - if (pRecord == NULL) - { - return NULL; - } - _tcscpy(pRecord->szSectionName, szSectionName); +static PBOOTRECORD +ReadFreeldrSection(HINF hInf, TCHAR *szSectionName) +{ + PBOOTRECORD pRecord; + INFCONTEXT InfContext; + TCHAR szName[MAX_PATH]; + TCHAR szValue[MAX_PATH]; + DWORD LineLength; + + if (!SetupFindFirstLine(hInf, + szSectionName, + NULL, + &InfContext)) + { + /* failed to find section */ + return NULL; + } + + pRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BOOTRECORD)); + if (pRecord == NULL) + { + return NULL; + } + + _tcscpy(pRecord->szSectionName, szSectionName); do { @@ -107,7 +114,6 @@ { break; } - if (!_tcsnicmp(szName, _T("BootType"), 8)) { @@ -131,13 +137,15 @@ _tcscpy(pRecord->szOptions, szValue); } - }while(SetupFindNextLine(&InfContext, &InfContext)); + } + while (SetupFindNextLine(&InfContext, &InfContext)); return pRecord; } -int LoadFreeldrSettings(HINF hInf, HWND hwndDlg) +static INT +LoadFreeldrSettings(HINF hInf, HWND hwndDlg) { INFCONTEXT InfContext; PBOOTRECORD pRecord; @@ -228,15 +236,14 @@ /* we store the friendly name as key */ _tcscpy(szDefaultOs, szValue); } - } else { HeapFree(GetProcessHeap(), 0, pRecord); } } - - }while(SetupFindNextLine(&InfContext, &InfContext)); + } + while (SetupFindNextLine(&InfContext, &InfContext)); /* find default os in list */ lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); @@ -250,11 +257,14 @@ { SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } + SetTimeout(hwndDlg, TimeOut); + return TRUE; } -int LoadBootSettings(HINF hInf, HWND hwndDlg) +static INT +LoadBootSettings(HINF hInf, HWND hwndDlg) { INFCONTEXT InfContext; TCHAR szName[MAX_PATH]; @@ -304,7 +314,8 @@ _tcscpy(szDefaultOS, szValue); } - }while(SetupFindNextLine(&InfContext, &InfContext)); + } + while (SetupFindNextLine(&InfContext, &InfContext)); if (!SetupFindFirstLine(hInf, _T("operating systems"), @@ -366,7 +377,9 @@ } } - }while(SetupFindNextLine(&InfContext, &InfContext)); + } + while (SetupFindNextLine(&InfContext, &InfContext)); + /* find default os in list */ lResult = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); if (lResult != CB_ERR) @@ -374,22 +387,24 @@ /* set cur sel */ SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } + if(TimeOut) { SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } SetTimeout(hwndDlg, TimeOut); + return TRUE; } -void DeleteBootRecords(HWND hwndDlg) +static VOID +DeleteBootRecords(HWND hwndDlg) { LRESULT lIndex; LONG index; PBOOTRECORD pRecord; - lIndex = SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETCOUNT, (WPARAM)0, (LPARAM)0); if (lIndex == CB_ERR) return; @@ -402,10 +417,12 @@ HeapFree(GetProcessHeap(), 0, pRecord); } } + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_RESETCONTENT, (WPARAM)0, (LPARAM)0); } -LRESULT LoadOSList(HWND hwndDlg) +static LRESULT +LoadOSList(HWND hwndDlg) { DWORD dwBufSize; TCHAR *szSystemDrive; @@ -415,9 +432,9 @@ if (!dwBufSize) return FALSE; - _tcscpy(m_szFreeldrIni, szSystemDrive); _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (PathFileExists(m_szFreeldrIni)) { /* freeldr.ini exists */ @@ -435,6 +452,7 @@ } return FALSE; } + /* try load boot.ini settings */ _tcscpy(m_szFreeldrIni, szSystemDrive); _tcscat(m_szFreeldrIni, _T("\\boot.ini")); @@ -454,12 +472,15 @@ m_FreeLdrIni = 2; return TRUE; } - return FALSE; - } + + return FALSE; + } + return FALSE; } -void SetCrashDlgItems(HWND hwnd) +static VOID +SetCrashDlgItems(HWND hwnd) { if (m_dwCrashDumpEnabled == 0) { @@ -484,7 +505,8 @@ SendDlgItemMessage(hwnd, IDC_STRRECDEBUGCOMBO, CB_SETCURSEL, (WPARAM)m_dwCrashDumpEnabled, (LPARAM)0); } -void WriteStartupRecoveryOptions(HWND hwndDlg) +static VOID +WriteStartupRecoveryOptions(HWND hwndDlg) { HKEY hKey; DWORD lResult; @@ -526,7 +548,8 @@ RegCloseKey(hKey); } -void LoadRecoveryOptions(HWND hwndDlg) +static VOID +LoadRecoveryOptions(HWND hwndDlg) { HKEY hKey; DWORD dwValues; @@ -617,17 +640,19 @@ if (LoadString(hApplet, IDS_NO_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_FULL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_KERNEL_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); + if (LoadString(hApplet, IDS_MINI_DUMP, szValue, sizeof(szValue) / sizeof(TCHAR)) < sizeof(szValue) / sizeof(TCHAR)) SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szValue); SetCrashDlgItems(hwndDlg); RegCloseKey(hKey); } - /* Property page dialog callback */ @@ -647,26 +672,20 @@ switch(uMsg) { case WM_INITDIALOG: - { LoadRecoveryOptions(hwndDlg); return LoadOSList(hwndDlg); - } - break; case WM_COMMAND: - { switch(LOWORD(wParam)) { case IDC_STRRECEDIT: - { ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); - // FIXME use CreateProcess and wait untill finished - // DeleteBootRecords(hwndDlg); - // LoadOSList(hwndDlg); + // FIXME use CreateProcess and wait untill finished + // DeleteBootRecords(hwndDlg); + // LoadOSList(hwndDlg); break; - } + case IDOK: - { /* save timeout */ if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); @@ -681,7 +700,6 @@ DeleteBootRecords(hwndDlg); return TRUE; } - pRecord = (PBOOTRECORD) SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_GETITEMDATA, (WPARAM)lResult, (LPARAM)0); @@ -716,28 +734,27 @@ } } + WriteStartupRecoveryOptions(hwndDlg); DeleteBootRecords(hwndDlg); EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; - } + case IDCANCEL: - { DeleteBootRecords(hwndDlg); EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; - } + case IDC_STRECLIST: - { if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) SetTimeout(hwndDlg, 30); else SetTimeout(hwndDlg, 0); - } + break; + case IDC_STRRECDEBUGCOMBO: - { if (HIWORD(wParam) == CBN_SELCHANGE) { LRESULT lResult; @@ -753,16 +770,15 @@ { SendDlgItemMessage(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(m_szMinidumpDir) / sizeof(TCHAR), (LPARAM)m_szMinidumpDir); } + m_dwCrashDumpEnabled = lResult; SetCrashDlgItems(hwndDlg); } } break; - } - } - } - break; - } + break; + } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Sat Nov 3 17:39:08 2007 @@ -148,57 +148,56 @@ /* Control Panel Callback */ LONG CALLBACK -CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) -{ - int i = (int)lParam1; +CPlApplet(HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + INT i = (INT)lParam1; + UNREFERENCED_PARAMETER(hwndCPl); - switch(uMsg) + switch (uMsg) { case CPL_INIT: - { return TRUE; - } + case CPL_GETCOUNT: - { return NUM_APPLETS; - } + case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + } break; - } + case CPL_DBLCLK: - { Applets[i].AppletProc(); break; - } - } + } + return FALSE; } BOOL STDCALL -DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) +DllMain(HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) + + switch (dwReason) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: hApplet = hinstDLL; break; } + return TRUE; } Modified: trunk/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/userprofile.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/userprofile.c (original) +++ trunk/reactos/dll/cpl/sysdm/userprofile.c Sat Nov 3 17:39:08 2007 @@ -17,28 +17,20 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); - UNREFERENCED_PARAMETER(wParam); - UNREFERENCED_PARAMETER(hwndDlg); - - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: - { MessageBox(hwndDlg, _T("Dialog not yet implemented!"), NULL, 0); - } - break; + break; case WM_COMMAND: - { if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { EndDialog(hwndDlg, LOWORD(wParam)); return TRUE; } - } - break; + break; case WM_NOTIFY: { @@ -56,5 +48,6 @@ break; } } + return FALSE; } Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sat Nov 3 17:39:08 2007 @@ -20,22 +20,22 @@ DWORD dwDataSize; BOOL bRet = FALSE; - if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, - lpKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_QUERY_VALUE, - NULL, - &hkey, - NULL) == ERROR_SUCCESS) - { - if(RegQueryValueEx(hkey, - _T("PagingFiles"), - NULL, - &dwType, - NULL, - &dwDataSize) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, + lpKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_QUERY_VALUE, + NULL, + &hkey, + NULL) == ERROR_SUCCESS) + { + if (RegQueryValueEx(hkey, + _T("PagingFiles"), + NULL, + &dwType, + NULL, + &dwDataSize) == ERROR_SUCCESS) { pVirtMem->szPagingFiles = (LPTSTR)HeapAlloc(GetProcessHeap(), 0, @@ -44,12 +44,12 @@ { ZeroMemory(pVirtMem->szPagingFiles, dwDataSize); - if(RegQueryValueEx(hkey, - _T("PagingFiles"), - NULL, - &dwType, - (PBYTE)pVirtMem->szPagingFiles, - &dwDataSize) == ERROR_SUCCESS) + if (RegQueryValueEx(hkey, + _T("PagingFiles"), + NULL, + &dwType, + (PBYTE)pVirtMem->szPagingFiles, + &dwDataSize) == ERROR_SUCCESS) { bRet = TRUE; } @@ -117,10 +117,10 @@ /* copy the 'X:' portion */ lstrcpyn(szDrive, DrivePtr, sizeof(szDrive) / sizeof(TCHAR)); - if(GetDriveType(DrivePtr) == DRIVE_FIXED) + if (GetDriveType(DrivePtr) == DRIVE_FIXED) { /* does drive match the one in the registry ? */ - if(!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) + if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) { /* FIXME: we only check the first available pagefile in the reg */ InitialSize = GetPageFileSizes(pVirtMem->szPagingFiles); @@ -188,16 +188,15 @@ { HKEY hk = NULL; TCHAR szPagingFiles[2048]; + TCHAR szText[256]; INT i; INT nPos = 0; BOOL bErr = TRUE; - for(i = 0; i < pVirtMem->Count; ++i) - { - if(pVirtMem->Pagefile[i].bUsed) - { - TCHAR szText[256]; - + for (i = 0; i < pVirtMem->Count; ++i) + { + if (pVirtMem->Pagefile[i].bUsed) + { _stprintf(szText, _T("%s\\pagefile.sys %i %i"), pVirtMem->Pagefile[i].szDrive, pVirtMem->Pagefile[i].InitialValue, @@ -215,15 +214,15 @@ } } - if(RegCreateKeyEx(HKEY_LOCAL_MACHINE, - lpKey, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hk, - NULL) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, + lpKey, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hk, + NULL) == ERROR_SUCCESS) { if (RegSetValueEx(hk, _T("PagingFiles"), @@ -247,6 +246,7 @@ SetListBoxColumns(HWND hwndListBox) { const INT tabs[2] = {30, 170}; + SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)&tabs[0]); } @@ -292,12 +292,11 @@ LB_GETCURSEL, 0, 0); - - if(Index < pVirtMem->Count) + if (Index < pVirtMem->Count) { /* check if custom settings are checked */ - if(IsDlgButtonChecked(pVirtMem->hSelf, - IDC_CUSTOM) == BST_CHECKED) + if (IsDlgButtonChecked(pVirtMem->hSelf, + IDC_CUSTOM) == BST_CHECKED) { Value = GetDlgItemInt(pVirtMem->hSelf, IDC_INITIALSIZE, @@ -313,7 +312,9 @@ FALSE); } else + { pVirtMem->Pagefile[Index].InitialValue = Value; + } Value = GetDlgItemInt(pVirtMem->hSelf, IDC_MAXSIZE, @@ -329,7 +330,9 @@ FALSE); } else + { pVirtMem->Pagefile[Index].MaxValue = Value; + } } else { @@ -362,11 +365,11 @@ 0, 0); - if(Index < pVirtMem->Count) - { - - if(pVirtMem->Pagefile[Index].InitialValue != 0 && - pVirtMem->Pagefile[Index].MaxValue != 0) + if (Index < pVirtMem->Count) + { + + if (pVirtMem->Pagefile[Index].InitialValue != 0 && + pVirtMem->Pagefile[Index].MaxValue != 0) { /* enable and fill the custom values */ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); @@ -393,7 +396,7 @@ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); /* is it system managed */ - if(pVirtMem->Pagefile[Index].bUsed) + if (pVirtMem->Pagefile[Index].bUsed) { CheckDlgButton(pVirtMem->hSelf, IDC_SYSMANSIZE, @@ -415,7 +418,7 @@ static VOID OnOk(PVIRTMEM pVirtMem) { - if(pVirtMem->bSave == TRUE) + if (pVirtMem->bSave == TRUE) { WritePageFileSettings(pVirtMem); } @@ -491,7 +494,6 @@ break; case WM_COMMAND: - { switch (LOWORD(wParam)) { case IDCANCEL: @@ -529,8 +531,7 @@ } break; } - } - break; + break; } return FALSE;

1 0

[hpoussin] 30089: Move files to recycle bin when asked to
by hpoussin＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: hpoussin Date: Sat Nov 3 17:17:00 2007 New Revision: 30089 URL: http://svn.reactos.org/svn/reactos?rev=30089&view=rev Log: Move files to recycle bin when asked to Modified: trunk/reactos/dll/win32/shell32/recyclebin.c trunk/reactos/dll/win32/shell32/shell32.rbuild Modified: trunk/reactos/dll/win32/shell32/recyclebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recycleb… ============================================================================== --- trunk/reactos/dll/win32/shell32/recyclebin.c (original) +++ trunk/reactos/dll/win32/shell32/recyclebin.c Sat Nov 3 17:17:00 2007 @@ -806,6 +806,6 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) { - FIXME("(%s)\n", debugstr_w(wszPath)); - return FALSE; -} + TRACE("(%s)\n", debugstr_w(wszPath)); + return DeleteFileToRecycleBinW(wszPath); +} Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Sat Nov 3 17:17:00 2007 @@ -22,7 +22,6 @@ <library>ole32</library> <library>version</library> <library>devmgr</library> - <library>rtl</library> <library>winspool</library> <file>authors.c</file> <file>autocomplete.c</file>

1 0

[fireball] 30088: - Don't bother flushing volatile hives.
by fireball＠svn.reactos.org 03 Nov '07

03 Nov '07

Author: fireball Date: Sat Nov 3 16:59:26 2007 New Revision: 30088 URL: http://svn.reactos.org/svn/reactos?rev=30088&view=rev Log: - Don't bother flushing volatile hives. Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Sat Nov 3 16:59:26 2007 @@ -561,7 +561,9 @@ { Hive = CONTAINING_RECORD(Entry, CMHIVE, HiveList); - if (!(IsNoFileHive(Hive) || IsNoSynchHive(Hive))) + if (!(IsNoFileHive(Hive) || + IsNoSynchHive(Hive) || + (Hive->Hive.HiveFlags & HIVE_VOLATILE))) { /* Flush non-volatile hive */ CmiFlushRegistryHive(Hive); @@ -595,7 +597,9 @@ { Hive = CONTAINING_RECORD(Entry, CMHIVE, HiveList); - if (!(IsNoFileHive(Hive) || IsNoSynchHive(Hive))) + if (!(IsNoFileHive(Hive) || + IsNoSynchHive(Hive) || + (Hive->Hive.HiveFlags & HIVE_VOLATILE))) { /* Flush non-volatile hive */ CmiFlushRegistryHive(Hive);

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