Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[gedmurphy] 22383: [AUDIT] cards.dll Filip confirms this code is clean.
by gedmurphy＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: gedmurphy Date: Sat Jun 17 18:21:37 2006 New Revision: 22383 URL: http://svn.reactos.ru/svn/reactos?rev=22383&view=rev Log: [AUDIT] cards.dll Filip confirms this code is clean. Modified: trunk/reactos/dll/win32/cards/cards.c (props changed) trunk/reactos/dll/win32/cards/cards.def (props changed) trunk/reactos/dll/win32/cards/cards.h (props changed) trunk/reactos/dll/win32/cards/cards.rc (props changed) Propchange: trunk/reactos/dll/win32/cards/cards.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/cards/cards.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/cards/cards.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/cards/cards.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[gedmurphy] 22382: remove the monitor bitmap as per bug 1497
by gedmurphy＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: gedmurphy Date: Sat Jun 17 16:31:31 2006 New Revision: 22382 URL: http://svn.reactos.ru/svn/reactos?rev=22382&view=rev Log: remove the monitor bitmap as per bug 1497 Removed: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/resources/monitor.bmp Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/desk/background.c Sat Jun 17 16:31:31 2006 @@ -42,9 +42,6 @@ HWND g_hColorButton = NULL; HIMAGELIST g_hShellImageList = NULL; - -static HBITMAP hBitmap = NULL; -static int cxSource, cySource; /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ void AddListViewItems() @@ -229,7 +226,6 @@ DWORD bufferSize = sizeof(szBuffer); DWORD varType = REG_SZ; LONG result; - BITMAP bitmap; g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); @@ -284,15 +280,6 @@ } RegCloseKey(regKey); - - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (hBitmap != NULL) - { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } } void OnColorButton() @@ -582,23 +569,6 @@ } } break; - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - - hdc = BeginPaint(hwndDlg, &ps); - - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - - TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); - - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); - - } break; - case WM_DRAWITEM: { LPDRAWITEMSTRUCT drawItem; @@ -646,8 +616,6 @@ if(g_pWallpaperBitmap != NULL) DibFreeImage(g_pWallpaperBitmap); - DeleteObject(hBitmap); - } break; } Removed: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/resources/monitor.bmp URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== Binary file - no diff available. Modified: branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/dll/cpl… ============================================================================== --- branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c (original) +++ branches/ros-branch-0_3_0/reactos/dll/cpl/desk/settings.c Sat Jun 17 16:31:31 2006 @@ -44,9 +44,6 @@ static PDISPLAY_DEVICE_ENTRY DisplayDeviceList = NULL; static PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice = NULL; - -HBITMAP hBitmap = NULL; -int cxSource, cySource; static VOID UpdateDisplay(IN HWND hwndDlg) @@ -267,7 +264,6 @@ DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; - BITMAP bitmap; /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); @@ -299,15 +295,6 @@ /* FIXME: multi video adapter */ /* FIXME: choose selected adapter being the primary one */ } - - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (hBitmap != NULL) - { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } } static VOID @@ -571,24 +558,6 @@ } break; } - - case WM_PAINT: - { - PAINTSTRUCT ps; - HDC hdc, hdcMem; - - hdc = BeginPaint(hwndDlg, &ps); - - hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - - TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); - - DeleteDC(hdcMem); - EndPaint(hwndDlg, &ps); - - } break; - case WM_DESTROY: { PDISPLAY_DEVICE_ENTRY Current = DisplayDeviceList; @@ -605,8 +574,6 @@ HeapFree(GetProcessHeap(), 0, Current); Current = Next; } - - DeleteObject(hBitmap); } } return FALSE;

1 0

[fireball] 22381: - Add 2 more Ob Methods (currently turned off in testing) - Add Open method to tests - Make debug output of Ob Methods more informative - Add Ob Methods counting tests
by fireball＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: fireball Date: Sat Jun 17 16:18:08 2006 New Revision: 22381 URL: http://svn.reactos.ru/svn/reactos?rev=22381&view=rev Log: - Add 2 more Ob Methods (currently turned off in testing) - Add Open method to tests - Make debug output of Ob Methods more informative - Add Ob Methods counting tests Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c Modified: trunk/reactos/drivers/test/kmtest/ntos_ob.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/test/kmtest/ntos_ob… ============================================================================== --- trunk/reactos/drivers/test/kmtest/ntos_ob.c (original) +++ trunk/reactos/drivers/test/kmtest/ntos_ob.c Sat Jun 17 16:18:08 2006 @@ -64,6 +64,9 @@ HANDLE ObHandle2[NUM_OBTYPES]; HANDLE DirectoryHandle; +USHORT DumpCount, OpenCount, CloseCount, DeleteCount, + ParseCount, OkayToCloseCount, QueryNameCount; + /* PRIVATE FUNCTIONS **********************************************************/ VOID @@ -72,9 +75,10 @@ IN POB_DUMP_CONTROL DumpControl) { DbgPrint("DumpProc() called\n"); -} - -// prototype doesn't match Win2003! (causes BSOD) + DumpCount++; +} + +// Tested in Win2k3 VOID NTAPI OpenProc(IN OB_OPEN_REASON OpenReason, @@ -83,8 +87,9 @@ IN ACCESS_MASK GrantedAccess, IN ULONG HandleCount) { - DbgPrint("OpenProc() called\n"); - DbgBreakPoint(); + DbgPrint("OpenProc() 0x%p, OpenReason %d, HC %d, AM 0x%X\n", + Object, OpenReason, HandleCount, GrantedAccess); + OpenCount++; } // Tested in Win2k3 @@ -96,7 +101,9 @@ IN ULONG ProcessHandleCount, IN ULONG SystemHandleCount) { - DPRINT("CloseProc() called for Object=0x%p\n", Object); + DbgPrint("CloseProc() 0x%p, PHC %d, SHC %d, AM 0x%X\n", Object, + ProcessHandleCount, SystemHandleCount, GrantedAccess); + CloseCount++; } // Tested in Win2k3 @@ -104,7 +111,8 @@ NTAPI DeleteProc(IN PVOID Object) { - DPRINT("DeleteProc() called for Object=0x%p\n", Object); + DbgPrint("DeleteProc() 0x%p\n", Object); + DeleteCount++; } NTSTATUS @@ -122,8 +130,43 @@ { DbgPrint("ParseProc() called\n"); *Object = NULL; + + ParseCount++; return STATUS_OBJECT_NAME_NOT_FOUND;//STATUS_SUCCESS; } + +// Tested in Win2k3 +NTSTATUS +NTAPI +OkayToCloseProc(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN HANDLE Handle, + IN KPROCESSOR_MODE AccessMode) +{ + DbgPrint("OkayToCloseProc() 0x%p, H 0x%p, AM 0x%X\n", Object, Handle, + AccessMode); + OkayToCloseCount++; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +QueryNameProc(IN PVOID Object, + IN BOOLEAN HasObjectName, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE AccessMode) +{ + DbgPrint("QueryNameProc() 0x%p, HON %d, Len %d, AM 0x%X\n", + Object, HasObjectName, Length, AccessMode); + QueryNameCount++; + + ObjectNameInfo = NULL; + ReturnLength = 0; + return STATUS_OBJECT_NAME_NOT_FOUND; +} + VOID ObtCreateObjectTypes() @@ -158,8 +201,16 @@ ObTypeInitializer[i].CloseProcedure = (OB_CLOSE_METHOD)CloseProc; ObTypeInitializer[i].DeleteProcedure = (OB_DELETE_METHOD)DeleteProc; ObTypeInitializer[i].DumpProcedure = (OB_DUMP_METHOD)DumpProc; - //ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; + ObTypeInitializer[i].OpenProcedure = (OB_OPEN_METHOD)OpenProc; ObTypeInitializer[i].ParseProcedure = (OB_PARSE_METHOD)ParseProc; + //ObTypeInitializer[i].OkayToCloseProcedure = + // (OB_OKAYTOCLOSE_METHOD)OkayToCloseProc; + + //ObTypeInitializer[i].QueryNameProcedure = + // (OB_QUERYNAME_METHOD)QueryNameProc; + + //ObTypeInitializer[i].SecurityProcedure = + // (OB_SECURITY_METHOD)SecurityProc; Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], (PSECURITY_DESCRIPTOR)NULL, &ObTypes[i]); @@ -188,6 +239,8 @@ { PVOID ObBody1[2]; NTSTATUS Status; + USHORT OpenSave, CloseSave, DeleteSave, ParseSave, + OkayToCloseSave, QueryNameSave; // Create two objects RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); @@ -210,6 +263,11 @@ ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); + // save counters + OpenSave=OpenCount; CloseSave=CloseCount; DeleteSave=DeleteCount; + ParseSave=ParseCount; OkayToCloseSave=OkayToCloseCount; + QueryNameSave=QueryNameCount; + // Insert them Status = ObInsertObject(ObBody[0], NULL, STANDARD_RIGHTS_ALL, 0, &ObBody[0], &ObHandle1[0]); @@ -218,12 +276,34 @@ ok(ObBody[0] != NULL, "Object body = NULL"); ok(ObHandle1[0] != NULL, "Handle = NULL"); + // check counters + ok(OpenSave+1 == OpenCount, "Open method calls mismatch\n"); + ok(CloseSave == CloseCount, "Excessive Close method call\n"); + ok(DeleteSave == DeleteCount, "Excessive Delete method call\n"); + ok(ParseSave == ParseCount, "Excessive Parse method call\n"); + + // save counters + OpenSave=OpenCount; CloseSave=CloseCount; DeleteSave=DeleteCount; + ParseSave=ParseCount; OkayToCloseSave=OkayToCloseCount; + QueryNameSave=QueryNameCount; + Status = ObInsertObject(ObBody[1], NULL, GENERIC_ALL, 0, &ObBody[1], &ObHandle1[1]); ok(Status == STATUS_SUCCESS, "Failed to insert object 1 with status=0x%lX", Status); ok(ObBody[1] != NULL, "Object body = NULL"); ok(ObHandle1[1] != NULL, "Handle = NULL"); + + // check counters + ok(OpenSave+1 == OpenCount, "Open method calls mismatch\n"); + ok(CloseSave == CloseCount, "Excessive Close method call\n"); + ok(DeleteSave == DeleteCount, "Excessive Delete method call\n"); + ok(ParseSave == ParseCount, "Excessive Parse method call\n"); + + // save counters + OpenSave=OpenCount; CloseSave=CloseCount; DeleteSave=DeleteCount; + ParseSave=ParseCount; OkayToCloseSave=OkayToCloseCount; + QueryNameSave=QueryNameCount; // Now create an object of type 0, of the same name and expect it to fail // inserting, but success creation @@ -235,6 +315,12 @@ NULL, (ULONG)sizeof(MY_OBJECT1), 0L, 0L, (PVOID *)&ObBody1[0]); ok(Status == STATUS_SUCCESS, "Failed to create object with status=0x%lX", Status); + + // check counters + ok(OpenSave == OpenCount, "Excessive Open method call\n"); + ok(CloseSave == CloseCount, "Excessive Close method call\n"); + ok(DeleteSave == DeleteCount, "Excessive Delete method call\n"); + ok(ParseSave == ParseCount, "Excessive Parse method call\n"); Status = ObInsertObject(ObBody1[0], NULL, GENERIC_ALL, 0, &ObBody1[1], &ObHandle2[0]); @@ -244,15 +330,44 @@ "Object bodies doesn't match, 0x%p != 0x%p", ObBody[0], ObBody1[1]); ok(ObHandle2[0] != NULL, "Bad handle returned 0x%lX", (ULONG)ObHandle2[0]); + DPRINT1("%d %d %d %d %d %d %d\n", DumpCount, OpenCount, // deletecount+1 + CloseCount, DeleteCount, ParseCount, OkayToCloseCount, QueryNameCount); + + // check counters and then save + ok(OpenSave+1 == OpenCount, "Excessive Open method call\n"); + ok(CloseSave == CloseCount, "Excessive Close method call\n"); + ok(DeleteSave+1 == DeleteCount, "Delete method call mismatch\n"); + ok(ParseSave == ParseCount, "Excessive Parse method call\n"); + OpenSave=OpenCount; CloseSave=CloseCount; DeleteSave=DeleteCount; + ParseSave=ParseCount; OkayToCloseSave=OkayToCloseCount; + QueryNameSave=QueryNameCount; + // Close its handle Status = ZwClose(ObHandle2[0]); ok(Status == STATUS_SUCCESS, "Failed to close handle status=0x%lX", Status); + + // check counters and then save + ok(OpenSave == OpenCount, "Excessive Open method call\n"); + ok(CloseSave+1 == CloseCount, "Close method call mismatch\n"); + ok(DeleteSave == DeleteCount, "Excessive Delete method call\n"); + ok(ParseSave == ParseCount, "Excessive Parse method call\n"); + OpenSave=OpenCount; CloseSave=CloseCount; DeleteSave=DeleteCount; + ParseSave=ParseCount; OkayToCloseSave=OkayToCloseCount; + QueryNameSave=QueryNameCount; + // Object referenced 2 times: // 1) ObInsertObject // 2) AdditionalReferences ObDereferenceObject(ObBody1[1]); + + //DPRINT1("%d %d %d %d %d %d %d\n", DumpCount, OpenCount, // no change + // CloseCount, DeleteCount, ParseCount, OkayToCloseCount, QueryNameCount); + ok(OpenSave == OpenCount, "Open method call mismatch\n"); + ok(CloseSave == CloseCount, "Close method call mismatch\n"); + ok(DeleteSave == DeleteCount, "Delete method call mismatch\n"); + ok(ParseSave == ParseCount, "Parse method call mismatch\n"); } VOID @@ -381,6 +496,9 @@ { StartTest(); + DumpCount = 0; OpenCount = 0; CloseCount = 0; + DeleteCount = 0; ParseCount = 0; + // Create object-types to use in tests ObtCreateObjectTypes(); DPRINT("ObtCreateObjectTypes() done\n");

1 0

[jimtabor] 22380: Add two static control styles, SS_EDITCONTROL and SS_REALSIZECONTROL.
by jimtabor＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: jimtabor Date: Sat Jun 17 09:18:49 2006 New Revision: 22380 URL: http://svn.reactos.ru/svn/reactos?rev=22380&view=rev Log: Add two static control styles, SS_EDITCONTROL and SS_REALSIZECONTROL. Modified: trunk/reactos/include/winuser.h Modified: trunk/reactos/include/winuser.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winuser.h?rev=22380… ============================================================================== --- trunk/reactos/include/winuser.h (original) +++ trunk/reactos/include/winuser.h Sat Jun 17 09:18:49 2006 @@ -306,6 +306,7 @@ #define SS_BLACKRECT 4 #define SS_CENTER 1 #define SS_CENTERIMAGE 512 +#define SS_EDITCONTROL 0x2000 #define SS_ENHMETAFILE 15 #define SS_ETCHEDFRAME 18 #define SS_ETCHEDHORZ 16 @@ -318,6 +319,7 @@ #define SS_NOPREFIX 128 #define SS_NOTIFY 256 #define SS_OWNERDRAW 0xd +#define SS_REALSIZECONTROL 0x040 #define SS_REALSIZEIMAGE 0x800 #define SS_RIGHT 2 #define SS_RIGHTJUST 0x400

1 0

[jimtabor] 22379: Missed removing unused variables during manual patching.
by jimtabor＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: jimtabor Date: Sat Jun 17 09:04:51 2006 New Revision: 22379 URL: http://svn.reactos.ru/svn/reactos?rev=22379&view=rev Log: Missed removing unused variables during manual patching. Modified: trunk/reactos/dll/win32/user32/controls/combo.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/c… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Sat Jun 17 09:04:51 2006 @@ -2096,7 +2096,7 @@ else /* unlike the unicode version, the ansi version does not overwrite the string if converting case */ { - char *p, *string = NULL; + char *string = NULL; LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) { @@ -2129,7 +2129,6 @@ } else { - char *p; if( lphc->dwStyle & CBS_LOWERCASE ) CharLowerA((LPSTR)lParam); else if( lphc->dwStyle & CBS_UPPERCASE )

1 0

[jimtabor] 22378: Sync with wine.
by jimtabor＠svn.reactos.org 17 Jun '06

17 Jun '06

Author: jimtabor Date: Sat Jun 17 09:02:55 2006 New Revision: 22378 URL: http://svn.reactos.ru/svn/reactos?rev=22378&view=rev Log: Sync with wine. Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/i… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c Sat Jun 17 09:02:55 2006 @@ -53,7 +53,7 @@ HWND ICONTITLE_Create( HWND owner ) { HWND hWnd; - HINSTANCE instance = (HINSTANCE)GetWindowLongA( owner, GWL_HINSTANCE ); + HINSTANCE instance = (HINSTANCE)GetWindowLongPtrA( owner, GWLP_HINSTANCE ); LONG style = WS_CLIPSIBLINGS; if (!IsWindowEnabled(owner)) style |= WS_DISABLED; @@ -142,7 +142,7 @@ { if( GetWindowLongA( hwnd, GWL_STYLE ) & WS_CHILD ) { - hBrush = (HBRUSH) GetClassLongA(hwnd, GCL_HBRBACKGROUND); + hBrush = (HBRUSH) GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND); if( hBrush ) { INT level;

1 0

[jimtabor] 22377: Vitaly Lipatov : Fix character conversion in combo box. Which needed to be synced to wine.
by jimtabor＠svn.reactos.org 16 Jun '06

16 Jun '06

Author: jimtabor Date: Fri Jun 16 19:33:59 2006 New Revision: 22377 URL: http://svn.reactos.ru/svn/reactos?rev=22377&view=rev Log: Vitaly Lipatov : Fix character conversion in combo box. Which needed to be synced to wine. Modified: trunk/reactos/dll/win32/user32/controls/combo.c Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/c… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Fri Jun 16 19:33:59 2006 @@ -432,6 +432,10 @@ lprLB->right = lprLB->left + lphc->droppedWidth; } + /* don't allow negative window width */ + if (lprEdit->right < lprEdit->left) + lprEdit->right = lprEdit->left; + TRACE("\ttext\t= (%ld,%ld-%ld,%ld)\n", lprEdit->left, lprEdit->top, lprEdit->right, lprEdit->bottom); @@ -1839,6 +1843,19 @@ pcbi->hwndItem = lphc->hWndEdit; pcbi->hwndList = lphc->hWndLBox; return TRUE; +} + +static char *strdupA(LPCSTR str) +{ + char *ret; + DWORD len; + + if(!str) return NULL; + + len = strlen(str); + ret = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(ret, str, len + 1); + return ret; } /*********************************************************************** @@ -2068,17 +2085,33 @@ /* fall through */ #endif case CB_ADDSTRING: - { - UINT msg = LB_ADDSTRING; - if( lphc->dwStyle & CBS_LOWERCASE ) - msg = LB_ADDSTRING_LOWER; - else if( lphc->dwStyle & CBS_UPPERCASE ) - msg = LB_ADDSTRING_UPPER; - if( unicode ) - return SendMessageW(lphc->hWndLBox, msg, 0, lParam); - else - return SendMessageA(lphc->hWndLBox, msg, 0, lParam); - } + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); + } + else /* unlike the unicode version, the ansi version does not overwrite + the string if converting case */ + { + char *p, *string = NULL; + LRESULT ret; + if( lphc->dwStyle & CBS_LOWERCASE ) + { + string = strdupA((LPSTR)lParam); + CharLowerA(string); + } + else if( lphc->dwStyle & CBS_UPPERCASE ) + { + string = strdupA((LPSTR)lParam); + CharUpperA(string); + } + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); + HeapFree(GetProcessHeap(), 0, string); + return ret; + } #ifndef __REACTOS__ case CB_INSERTSTRING16: wParam = (INT)(INT16)wParam; @@ -2086,17 +2119,23 @@ /* fall through */ #endif case CB_INSERTSTRING: - { - UINT msg = LB_INSERTSTRING; - if( lphc->dwStyle & CBS_LOWERCASE ) - msg = LB_INSERTSTRING_LOWER; - else if( lphc->dwStyle & CBS_UPPERCASE ) - msg = LB_INSERTSTRING_UPPER; - if( unicode ) - return SendMessageW(lphc->hWndLBox, msg, 0, lParam); + if( unicode ) + { + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerW((LPWSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } else - return SendMessageA(lphc->hWndLBox, msg, 0, lParam); - } + { + char *p; + if( lphc->dwStyle & CBS_LOWERCASE ) + CharLowerA((LPSTR)lParam); + else if( lphc->dwStyle & CBS_UPPERCASE ) + CharUpperA((LPSTR)lParam); + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } #ifndef __REACTOS__ case CB_DELETESTRING16: #endif

1 0

[jimtabor] 22376: qingdoa daoo : Fix selection handling for listboxes with LBS_EXTENDEDSEL style. Also synced to wine.
by jimtabor＠svn.reactos.org 16 Jun '06

16 Jun '06

Author: jimtabor Date: Fri Jun 16 19:32:06 2006 New Revision: 22376 URL: http://svn.reactos.ru/svn/reactos?rev=22376&view=rev Log: qingdoa daoo : Fix selection handling for listboxes with LBS_EXTENDEDSEL style. Also synced to wine. Modified: trunk/reactos/dll/win32/user32/controls/listbox.c Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/l… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Fri Jun 16 19:32:06 2006 @@ -1240,6 +1240,9 @@ static LRESULT LISTBOX_SetItemHeight( LB_DESCR *descr, INT index, INT height, BOOL repaint ) { + if (height > MAXBYTE) + return -1; + if (!height) height = 1; if (descr->style & LBS_OWNERDRAWVARIABLE) @@ -1436,11 +1439,13 @@ /* A few sanity checks */ if (descr->style & LBS_NOSEL) return LB_ERR; - if ((last == -1) && (descr->nb_items == 0)) return LB_OKAY; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; - if (last == -1) last = descr->nb_items - 1; - if ((first < 0) || (first >= descr->nb_items)) return LB_ERR; - if ((last < 0) || (last >= descr->nb_items)) return LB_ERR; + + if (!descr->nb_items) return LB_OKAY; + + if (last == -1 || last >= descr->nb_items) last = descr->nb_items - 1; + if (first < 0) first = 0; + if (last < first) return LB_OKAY; if (on) /* Turn selection on */ { @@ -1817,7 +1822,7 @@ else if (count < descr->nb_items) { while (count < descr->nb_items) - if ((ret = LISTBOX_RemoveItem( descr, -1 )) < 0) + if ((ret = LISTBOX_RemoveItem( descr, (descr->nb_items - 1) )) < 0) return ret; } return LB_OKAY; @@ -1978,8 +1983,7 @@ descr->top_item + page * descr->page_size, TRUE ); break; case SB_THUMBPOSITION: - LISTBOX_SetTopItem( descr, pos*descr->page_size, - TRUE ); + LISTBOX_SetTopItem( descr, pos*descr->page_size, TRUE ); break; case SB_THUMBTRACK: info.cbSize = sizeof(info); @@ -2203,7 +2207,6 @@ /* Check Vertical scroll bar */ if (style & WS_VSCROLL) { - clientRect.right += GetSystemMetrics(SM_CXVSCROLL); if (PtInRect( &clientRect, mousePos )) nHitTestType = HTVSCROLL; @@ -3163,10 +3166,11 @@ case WM_GETDLGCODE: return DLGC_WANTARROWS | DLGC_WANTCHARS; + case WM_PRINTCLIENT: case WM_PAINT: { PAINTSTRUCT ps; - HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( hwnd, &ps ); + HDC hdc = ( wParam ) ? ((HDC)wParam) : BeginPaint( descr->self, &ps ); ret = LISTBOX_Paint( descr, hdc ); if( !wParam ) EndPaint( hwnd, &ps ); }

1 0

[janderwald] 22375: french translation by Usurp
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Fri Jun 16 00:50:47 2006 New Revision: 22375 URL: http://svn.reactos.ru/svn/reactos?rev=22375&view=rev Log: french translation by Usurp Added: trunk/reactos/dll/cpl/powercfg/fr.rc Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc Added: trunk/reactos/dll/cpl/powercfg/fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/fr.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/fr.rc (added) +++ trunk/reactos/dll/cpl/powercfg/fr.rc Fri Jun 16 00:50:47 2006 @@ -1,0 +1,162 @@ +// French (fr) resources by Usurp (spetreolle at users dot sourceforge dot net) + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGEPOWERSHEMES DIALOGEX 0, 0, 250, 220 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Profils d'alimentation" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_ACDC, IDI_ACDC, 7,7,28,22 + LTEXT "Choisissez le profil d'alimentation le plus approprié pour cet ordinateur. Notez que modifier les réglages suivants modifiera le profil sélectionné.", + -1,45,13,194,36 + GROUPBOX "P&rofils d'alimentation", -1, 7,57,240,46 + COMBOBOX IDC_ENERGYLIST, 14,70,224,92, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Sauvegarder sous...", -1, 100,85,75,15,WS_DISABLED + PUSHBUTTON "&Supprimer", -1, 180,85,55,15,WS_DISABLED + GROUPBOX "Inconnu", IDC_GRPDETAIL, 7,108,240,105 + LTEXT "Alimentation:",IDC_SAT,15,120,60,10 + LTEXT "Branché",IDC_SAC,100,120,45,15 + ICON IDI_AC, IDC_IAC, 75,115,25,15 + LTEXT "Sur piles",IDC_SDC,197,120,45,15 + ICON IDI_DC, IDC_IDC, 165,115,25,15 + LTEXT "Eteindre le &moniteur:",IDC_MONITOR,15,145,80,10 + COMBOBOX IDC_MONITORACLIST, 100,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_MONITORDCLIST, 175,140,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Eteindre les d&isques durs:",IDC_DISK,15,160,80,10 + COMBOBOX IDC_DISKACLIST, 100,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DISKDCLIST, 175,155,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mode s&tandby:",IDC_STANDBY,15,180,80,10 + COMBOBOX IDC_STANDBYACLIST, 100,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STANDBYDCLIST, 175,175,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Mise en veille du système:",IDC_HYBERNATE,15,195,80,10 + COMBOBOX IDC_HYBERNATEACLIST, 100,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_HYBERNATEDCLIST, 175,190,65,150, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEALARMS DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alarmes" +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Alarme de batterie faible",-1,10,15,235,95 + CONTROL "Activer l'alarme de batterie faible quand le niveau d'énergie atteint:",IDC_ALARM1, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,180,15 + LTEXT "Inconnu",IDC_ALARMVALUE1,200,25,40,10 + LTEXT "0%",-1,20,40,15,15 + CONTROL "Slider1",IDC_ALARMBAR1,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,40,170,15 + LTEXT "100%",-1,215,40,25,10 + PUSHBUTTON "Action d'alarme...",-1,20,70,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,70,50,10 + LTEXT "Inconnu",IDC_ALARMMSG1,145,70,95,10 + LTEXT "Action:",-1,95,80,45,10 + LTEXT "Inconnu",IDC_ALARMAKTION1,145,80,95,10 + LTEXT "Lancer le Programme:",-1,95,90,50,10 + LTEXT "Inconnu",IDC_ALARMPROG1,150,90,40,10 + + GROUPBOX "Alarme de batterie Critique",-1,10,115,235,95 + CONTROL "Activer l'alarme de batterie critique quand le niveau d'énergie atteint:",IDC_ALARM2, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,125,180,15 + LTEXT "Inconnu",IDC_ALARMVALUE2,200,125,40,10 + LTEXT "0%",-1,20,140,15,15 + CONTROL "Slider1",IDC_ALARMBAR2,"msctls_trackbar32",TBS_HORZ | + TBS_AUTOTICKS | WS_TABSTOP,30,140,170,15 + LTEXT "100%",-1,215,140,25,10 + PUSHBUTTON "Action d'alarme...",-1,20,170,70,15,WS_DISABLED + LTEXT "Notification:",-1,95,170,50,10 + LTEXT "Inconnu",IDC_ALARMMSG2,145,170,95,10 + LTEXT "Action:",-1,95,180,45,10 + LTEXT "Inconnu",IDC_ALARMAKTION2,145,180,95,10 + LTEXT "Lancer le Programme:",-1,95,190,50,10 + LTEXT "Inconnu",IDC_ALARMPROG2,150,190,40,10 +END + +IDD_PROPPAGEADVANCED DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Avancé" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_ACDC,IDI_ACDC,5,5,20,20 + LTEXT "Choisissez les options d'économie d'énergie que vous voulez utiliser.",-1,30,5,205,20 + GROUPBOX "Options",-1,5,35,225,55 + CONTROL "Toujours &afficher l'icone sur la barre des taches",IDC_SYSTRAYBATTERYMETER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,45,200,10 + CONTROL "&Demander un mot de passe pour sortir de la mise en veille",IDC_PASSWORDLOGON,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,55,200,10 + CONTROL "&Luminosité faible quand l'ordinateur est sur piles.",IDC_VIDEODIMDISPLAY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,15,65,200,10 + GROUPBOX "Boutons d'alimentation",-1,5,100,230,105 + LTEXT "&Quand je ferme le couvercle de mon portable:", IDC_SLIDCLOSE,10,110,210,10 + COMBOBOX IDC_LIDCLOSE,10,120,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Quand j'appuie sur le bouton Power de l'ordinateur:", IDC_SPOWERBUTTON,10,135,210,10 + COMBOBOX IDC_POWERBUTTON,10,150,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + LTEXT "Quand j'appuie sur le bouton Sleep de l'ordinateur:", IDC_SSLEEPBUTTON,10,165,210,10 + COMBOBOX IDC_SLEEPBUTTON,10,180,220,90,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_PROPPAGEHIBERNATE DIALOG DISCARDABLE 0, 0, 250, 220 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Mise en veille" +FONT 8, "MS Sans Serif" +BEGIN + ICON IDI_SCREEN,IDI_SCREEN,5,5,20,20 + LTEXT "Quand votre ordinateur se met en veille, il enregistre tout ce qu'il a en memoire sur le disque dur et s'arrête. Quand votre ordinateur sort de la mise en veille, il reprend son état précédent. ", + -1,35,5,195,35 + GROUPBOX "Mise en veille",-1,5,45,235,25 + CONTROL "Activer la mise en veille",IDC_HIBERNATEFILE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,10,55,210,10 + GROUPBOX "Espace disque pour la mise en veille",-1,5,80,240,60 + LTEXT "Espace disque libre:",-1,10,90,100,10 + LTEXT "Inconnu",IDC_FREESPACE,120,90,70,10 + LTEXT "Espace disque nécessaire :",-1,10,100,115,10 + LTEXT "Inconnu",IDC_SPACEFORHIBERNATEFILE,120,100,55,10 + LTEXT "Vous devez libérer de l'espace avant que votre ordinateur se mette en veille. ",IDC_TOLESSFREESPACE,10,115,220,20 +END + +STRINGTABLE +BEGIN + IDS_CPLNAME_1 "Options d'alimentation" + IDS_CPLDESCRIPTION_1 "Configure les Options d'alimentation de votre ordinateur." + IDS_PROCENT "%i%%" + IDS_SOUND "Son" + IDS_TEXT "Texte" + IDS_CONFIG1 "Réglages pour le profil d'alimentation %1" + IDS_CONFIG2 "Réglages avancés pour %1" + + IDS_SIZEBYTS "%i octets" + IDS_SIZEMB "%i MB" + + IDS_NOACTION "Ne rien faire" + + IDS_PowerActionNone1 "Pas d'action" + IDS_PowerActionUnknown "Inconnue" + IDS_PowerActionSleep "Stand by" + IDS_PowerActionHibernate "Mettre en veille" + IDS_PowerActionShutdown "Eteindre" + IDS_PowerActionRestart "Redémarrer" + IDS_PowerActionShutdownOff "Arreter le système et éteindre" + IDS_PowerActionWarmEject "Me demander quoi faire" + IDS_PowerActionNone2 "Aucune" + + IDS_TIMEOUT1 "Après 1 min" + IDS_TIMEOUT2 "Après 2 mins" + IDS_TIMEOUT3 "Après 3 mins" + IDS_TIMEOUT4 "Après 5 mins" + IDS_TIMEOUT5 "Après 10 mins" + IDS_TIMEOUT6 "Après 15 mins" + IDS_TIMEOUT7 "Après 20 mins" + IDS_TIMEOUT8 "Après 25 mins" + IDS_TIMEOUT9 "Après 30 mins" + IDS_TIMEOUT10 "Après 45 mins" + IDS_TIMEOUT11 "Après 1 heure" + IDS_TIMEOUT12 "Après 2 heures" + IDS_TIMEOUT13 "Après 3 heures" + IDS_TIMEOUT14 "Après 4 heures" + IDS_TIMEOUT15 "Après 5 heures" + IDS_TIMEOUT16 "Jamais" +END + Modified: trunk/reactos/dll/cpl/powercfg/powercfg.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.r… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.rc (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.rc Fri Jun 16 00:50:47 2006 @@ -17,3 +17,4 @@ #include "en.rc" #include "de.rc" #include "ru.rc" +#include "fr.rc"

1 0

[janderwald] 22374: add powercfg, powerprof to bootcd
by janderwald＠svn.reactos.org 15 Jun '06

15 Jun '06

Author: janderwald Date: Thu Jun 15 22:29:23 2006 New Revision: 22374 URL: http://svn.reactos.ru/svn/reactos?rev=22374&view=rev Log: add powercfg, powerprof to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/packages/reac… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Thu Jun 15 22:29:23 2006 @@ -106,6 +106,7 @@ dll\cpl\main\main.cpl 1 dll\cpl\mmsys\mmsys.cpl 1 dll\cpl\ncpa\ncpa.cpl 1 +dll\cpl\powercfg\powercfg.cpl 1 dll\cpl\sysdm\sysdm.cpl 1 dll\cpl\timedate\timedate.cpl 1 @@ -191,6 +192,7 @@ dll\win32\olepro32\olepro32.dll 1 dll\win32\opengl32\opengl32.dll 1 dll\win32\psapi\psapi.dll 1 +dll\win32\powrprof\powrprof.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\richedit\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
60
Older →

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 June 2006