Ros-diffs April 2006

ros-diffs@reactos.org

14 participants
324 discussions

[frik85] 21679: Update german language file

by frik85＠svn.reactos.org

Author: frik85 Date: Fri Apr 21 10:51:59 2006 New Revision: 21679 URL: http://svn.reactos.ru/svn/reactos?rev=21679&view=rev Log: Update german language file Modified: trunk/reactos/dll/cpl/desk/de.rc Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=2167… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Fri Apr 21 10:51:59 2006 @@ -1,55 +1,51 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Desktop" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Hintergrundbild:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Durchsuchen...",IDC_BROWSE_BUTTON,186,135,56,14 - PUSHBUTTON "&Farbe...",IDC_COLOR_BUTTON,186,155,56,14 - LTEXT "Ausrichtung:",IDC_STATIC,186,98,43,8 - COMBOBOX IDC_PLACEMENT_COMBO,186,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER + | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Wählen SIe ein Bild aus welches Sie als Desktop Hintergrund verwenden wollen:", IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Durchsuchen...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Farbe...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "&Ausrichtung:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Bildschirmschoner" +CAPTION "Bildschrimschoner" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "&Bildschrimschoner",IDC_SCREENS_DUMMY, 5, 7, 238, 136 - LTEXT "Liste der Bildschrimschoner:",IDC_STATIC,13, 24, 100, 9 + LTEXT "Liste der Bildschrimschoner:",IDC_STATIC,13, 24, 71, 9 CONTROL "",IDC_SCREENS_CHOICES,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP,13, 34, 171, 69 - PUSHBUTTON "&Löschen",IDC_SCREENS_DELETE, 190,47,45,10 - PUSHBUTTON "&Hinzufügen",IDC_SCREENS_ADD_BUTTON, 190,34,45,10 + PUSHBUTTON "&Löschen",IDC_SCREENS_DELETE, 190,47,39,10 + PUSHBUTTON "&Hinzufügen",IDC_SCREENS_ADD_BUTTON, 190,34,39,10 - PUSHBUTTON "&Einstellungen...",IDC_SCREENS_SETTINGS,140, 124, 55, 12,WS_GROUP - PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,200, 124, 37, 12 + PUSHBUTTON "&Einstellungen...",IDC_SCREENS_SETTINGS,140, 124, 48, 12,WS_GROUP + PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC,192, 124, 43, 12 CONTROL "&Passwortschutz bei Reaktivierung.",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 122, 18 + BS_AUTOCHECKBOX | WS_TABSTOP,13, 121, 119, 18 - LTEXT "&Warte:",IDC_STATIC,13, 110, 20, 9 - EDITTEXT IDC_SCREENS_TIMEDELAY,38, 109, 31, 12,ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | + LTEXT "&Warte:",IDC_STATIC,13, 110, 17, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY,33, 109, 31, 12,ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP,52, 109, 12, 12 - LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.",IDC_STATIC,75, 111, 165, 9 + LTEXT "Minuten, bis der Bildschirmschoner angezeigt wird.",IDC_STATIC,70, 111, 147, 9 GROUPBOX "&Energiesparfunktion des Bildschirms",IDC_SCREENS_DUMMY2,5, 146, 238, 35 LTEXT "Um die Energiesparfunktion des Bildschrims einzustellen, klicken Sie auf Energiesparfunktion.", IDC_STATIC,16, 159, 155, 19 - PUSHBUTTON "Energ&iesparfunk.",IDC_SCREENS_POWER_BUTTON,175, 162, 60, 12 + PUSHBUTTON "Energ&iesparfunk.",IDC_SCREENS_POWER_BUTTON,180, 162, 57, 12 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -70,8 +66,8 @@ LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Bi&ldschirmauflösung",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP, - 32,130,60,17 - LTEXT "Niedrig",1815,9,130,25,8,NOT WS_GROUP + 30,130,58,17 + LTEXT "Niedrig",1815,9,130,15,8,NOT WS_GROUP LTEXT "Hoch",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farbqualität",1817,125,120,115,43 @@ -82,11 +78,11 @@ PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,306,165,56,14 END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLNAME "Anzeige" IDS_CPLDESCRIPTION "Passt die Darstellung des Hintergrundbildes und des Bildschirmschoners an." - + IDS_NONE "(Keine)" IDS_CENTER "Zentriert" IDS_STRETCH "Gestreckt"

18 years, 6 months

[gedmurphy] 21678: Add the same bitmap to the settings page too. Needs the background masking out though ...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 21 02:25:53 2006 New Revision: 21678 URL: http://svn.reactos.ru/svn/reactos?rev=21678&view=rev Log: Add the same bitmap to the settings page too. Needs the background masking out though ... Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Fri Apr 21 02:25:53 2006 @@ -43,8 +43,8 @@ HIMAGELIST g_hShellImageList = NULL; -HBITMAP hBitmap = NULL; -int cxSource, cySource; +static HBITMAP hBitmap = NULL; +static int cxSource, cySource; /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ void AddListViewItems() Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Apr 21 02:25:53 2006 @@ -44,6 +44,9 @@ static PDISPLAY_DEVICE_ENTRY DisplayDeviceList = NULL; static PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice = NULL; + +HBITMAP hBitmap = NULL; +int cxSource, cySource; static VOID UpdateDisplay(IN HWND hwndDlg) @@ -261,6 +264,7 @@ DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; + BITMAP bitmap; /* Get video cards list */ displayDevice.cb = (DWORD)sizeof(DISPLAY_DEVICE); @@ -292,6 +296,15 @@ /* 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 @@ -555,6 +568,24 @@ } break; } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + + hdc = BeginPaint(hwndDlg, &ps); + + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + + BitBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, SRCCOPY); + + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + + } break; + case WM_DESTROY: { PDISPLAY_DEVICE_ENTRY Current = DisplayDeviceList; @@ -571,6 +602,8 @@ HeapFree(GetProcessHeap(), 0, Current); Current = Next; } + + DeleteObject(hBitmap); } } return FALSE;

18 years, 6 months

[gedmurphy] 21677: Display a monitor behind the background picker on the display control panel. Other languages needs their resources updating so it doesn't look messy. No time to do it, it's too late ; )

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Apr 21 02:18:12 2006 New Revision: 21677 URL: http://svn.reactos.ru/svn/reactos?rev=21677&view=rev Log: Display a monitor behind the background picker on the display control panel. Other languages needs their resources updating so it doesn't look messy. No time to do it, it's too late ;) Added: trunk/reactos/dll/cpl/desk/resources/monitor.bmp (with props) Modified: trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/desk/en.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Fri Apr 21 02:18:12 2006 @@ -42,6 +42,9 @@ HWND g_hColorButton = NULL; HIMAGELIST g_hShellImageList = NULL; + +HBITMAP hBitmap = NULL; +int cxSource, cySource; /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ void AddListViewItems() @@ -226,6 +229,7 @@ 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); @@ -280,6 +284,15 @@ } 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() @@ -569,6 +582,23 @@ } } break; + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc, hdcMem; + + hdc = BeginPaint(hwndDlg, &ps); + + hdcMem = CreateCompatibleDC(hdc); + SelectObject(hdcMem, hBitmap); + + BitBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, SRCCOPY); + + DeleteDC(hdcMem); + EndPaint(hwndDlg, &ps); + + } break; + case WM_DRAWITEM: { LPDRAWITEMSTRUCT drawItem; @@ -616,6 +646,8 @@ if(g_pWallpaperBitmap != NULL) DibFreeImage(g_pWallpaperBitmap); + DeleteObject(hBitmap); + } break; } Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Fri Apr 21 02:18:12 2006 @@ -11,6 +11,7 @@ #include <reactos/version.rc> IDC_DESK_ICON ICON "resources/applet.ico" +IDC_MONITOR BITMAP "resources/monitor.bmp" #include "en.rc" #include "cz.rc" Modified: trunk/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/en.rc?rev=2167… ============================================================================== --- trunk/reactos/dll/cpl/desk/en.rc (original) +++ trunk/reactos/dll/cpl/desk/en.rc Fri Apr 21 02:18:12 2006 @@ -1,22 +1,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 188 +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Background" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW,78,10, - 90,65,WS_EX_STATICEDGE - CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | - LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | - WS_BORDER | WS_TABSTOP,7,99,173,71 - LTEXT "Select an image to use as your desktop wallpaper:", - IDC_STATIC,8,87,180,8 - PUSHBUTTON "&Browse...",IDC_BROWSE_BUTTON,187,135,50,14 - PUSHBUTTON "&Color...",IDC_COLOR_BUTTON,187,155,50,14 - LTEXT "Placement:",IDC_STATIC,187,98,36,8 - COMBOBOX IDC_PLACEMENT_COMBO,187,108,50,90,CBS_DROPDOWNLIST | - CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER + | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Select an image to use as your desktop wallpaper:", IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Color...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "Placement:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END IDD_SCREENSAVER DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Fri Apr 21 02:18:12 2006 @@ -25,12 +25,14 @@ /* Background Page */ #define IDC_BACKGROUND_LIST 1000 -#define IDC_BACKGROUND_PREVIEW 1001 -#define IDC_BROWSE_BUTTON 1002 -#define IDC_COLOR_BUTTON 1003 -#define IDC_PLACEMENT_COMBO 1004 -#define IDS_BACKGROUND_COMDLG_FILTER 1005 -#define IDS_SUPPORTED_EXT 1006 +#define IDC_MONITOR 1001 +#define IDC_BACKGROUND_PREVIEW 1002 +#define IDC_BROWSE_BUTTON 1003 +#define IDC_COLOR_BUTTON 1004 +#define IDC_PLACEMENT_COMBO 1005 +#define IDS_BACKGROUND_COMDLG_FILTER 1006 +#define IDS_SUPPORTED_EXT 1007 + /* Screensaver Page */ #define IDC_SCREENS_CHOICES 1010 Added: trunk/reactos/dll/cpl/desk/resources/monitor.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/desk/resources/moni… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/desk/resources/monitor.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

18 years, 6 months

[gedmurphy] 21676: Don't open other files until the HTML has been written, just in case it fails.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Apr 20 23:16:34 2006 New Revision: 21676 URL: http://svn.reactos.ru/svn/reactos?rev=21676&view=rev Log: Don't open other files until the HTML has been written, just in case it fails. Modified: trunk/web/reactos.org/scripts/audit_progress.pl Modified: trunk/web/reactos.org/scripts/audit_progress.pl URL: http://svn.reactos.ru/svn/reactos/trunk/web/reactos.org/scripts/audit_progr… ============================================================================== --- trunk/web/reactos.org/scripts/audit_progress.pl (original) +++ trunk/web/reactos.org/scripts/audit_progress.pl Thu Apr 20 23:16:34 2006 @@ -40,13 +40,12 @@ $done_pct = 100; } +output_html(); + open LOCK, "> $locked_files" or die "couldn't open $locked_files for writing: $!\n"; - print LOCK "Number of locked files: $unclean_files\n\n"; print LOCK @locked_files; - -output_html(); open LOG, ">> $log_file" or die "couldn't open $log_file for writing: $!\n";

18 years, 6 months

[tretiakov] 21675: [AUDIT] \trunk\reactos\lib\uuid (Unlocked) Wine code.

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Apr 20 20:19:57 2006 New Revision: 21675 URL: http://svn.reactos.ru/svn/reactos?rev=21675&view=rev Log: [AUDIT] \trunk\reactos\lib\uuid (Unlocked) Wine code. Modified: trunk/reactos/lib/uuid/uuid.c (props changed) Propchange: trunk/reactos/lib/uuid/uuid.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

[tretiakov] 21674: Add GDB property for debugging with gdb

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Apr 20 20:13:50 2006 New Revision: 21674 URL: http://svn.reactos.ru/svn/reactos?rev=21674&view=rev Log: Add GDB property for debugging with gdb Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=21674&r1… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Thu Apr 20 20:13:50 2006 @@ -24,11 +24,14 @@ <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + + <if property="GDB" value="0"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> <compilerflag>-Wpointer-arith</compilerflag> <include>.</include> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/config.template.rbuild?rev=… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Thu Apr 20 20:13:50 2006 @@ -53,4 +53,11 @@ --> <property name="DBG" value="1" /> + + +<property name="GDB" value="0" /> + </rbuild>

18 years, 6 months

[tretiakov] 21673: Update tests

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Apr 20 20:00:36 2006 New Revision: 21673 URL: http://svn.reactos.ru/svn/reactos?rev=21673&view=rev Log: Update tests Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/testsets/… ============================================================================== --- trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c (original) +++ trunk/reactos/base/applications/testsets/rpcrt4/context_handles/client.c Thu Apr 20 20:00:36 2006 @@ -337,26 +337,42 @@ } +int interactive = 0; +void interact() +{ + if(interactive) + { + printf("\nPress any key to continue..."); + getch(); + printf("\n\n"); + } +} + void main(int argc, char **argv) { RPC_STATUS status; unsigned long ulCode; PCTXTYPE hContext; char *pszStringBinding = NULL; - int test_num = 0; RPC_BINDING_HANDLE Handle = 0; char buffer[255]; + int test_num = 0; + int test_value = 31337; + if(argc<2) { - printf("USAGE: client.exe <test_number>\n" + printf("USAGE: client.exe <test_number> [test_value] [interactive]\n" "Available tests:\n" "0. General test\n" - "1. NULL pointer test\n"); + "1. NULL pointer test\n" + "2. Context rundown routine"); return; } test_num = atoi(argv[1]); + if(argc>2) test_value = atoi(argv[2]); + if(argc>3) interactive = 1; status = RpcStringBindingCompose(NULL, "ncacn_np", @@ -384,9 +400,10 @@ switch(test_num) { case 0: - m_CtxOpen(&hContext, 31337); + m_CtxOpen(&hContext, test_value); RpcBindingFree(&hBinding); m_CtxHello(hContext); + interact(); m_CtxClose(&hContext); break; case 1: @@ -402,7 +419,7 @@ } RpcEndExcept - m_CtxOpen2(&hContext, 31337); + m_CtxOpen2(&hContext, test_value); ///////////////////////////////////////////////////////////////////////////////////////// RpcTryExcept @@ -415,9 +432,12 @@ printf("NDRCContextMarshall(NULL) reported exception = %d\n", RpcExceptionCode()); } RpcEndExcept - - ///////////////////////////////////////////////////////////////////////////////////////// + break; + case 2: + CtxOpen(&hContext, test_value); + interact(); + ExitProcess(0); break; default: printf("Unknown test %d\n", test_num); Modified: trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/testsets/… ============================================================================== --- trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c (original) +++ trunk/reactos/base/applications/testsets/rpcrt4/context_handles/server.c Thu Apr 20 20:00:36 2006 @@ -6,19 +6,19 @@ void CtxOpen( PCTXTYPE *pphContext, long Value) { - printf("CtxOpen()\n"); + printf("CtxOpen(): Value=%d\n",Value); *pphContext = (PCTXTYPE)midl_user_allocate( sizeof(CTXTYPE) ); **pphContext = Value; } void CtxHello( PCTXTYPE phContext ) { - printf("Hello, World! Context value: %d\n", *phContext); + printf("CtxHello(): Hello, World! Context value: %d\n", *phContext); } void CtxClose(PCTXTYPE *pphContext ) { - printf("CtxClose()\n"); + printf("CtxClose(): %d\n", **pphContext); midl_user_free(*pphContext); *pphContext = NULL; } @@ -62,7 +62,8 @@ void __RPC_USER PCTXTYPE_rundown( PCTXTYPE hContext) { - printf("Context rundown \n"); + PCTXTYPE pCtx = (PCTXTYPE)hContext; + printf("Context rundown: Value=%d \n", *pCtx); midl_user_free(hContext); }

18 years, 6 months

[tretiakov] 21672: Implement context handle support for servers: NdrServerContextMarshall, NdrServerContextUnmarshall, NDRSContextMarshall, NDRSContextUnmarshall. MSDN context handle examples now work in ros. Context rundown routines don't work yet.

by tretiakov＠svn.reactos.org

Author: tretiakov Date: Thu Apr 20 19:45:01 2006 New Revision: 21672 URL: http://svn.reactos.ru/svn/reactos?rev=21672&view=rev Log: Implement context handle support for servers: NdrServerContextMarshall, NdrServerContextUnmarshall, NDRSContextMarshall, NDRSContextUnmarshall. MSDN context handle examples now work in ros. Context rundown routines don't work yet. Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.c Thu Apr 20 19:45:01 2006 @@ -25,6 +25,110 @@ #include "rpc_binding.h" #include "ndr_contexth.h" +static SContextHandle *CtxList = NULL; + +static CRITICAL_SECTION CtxList_cs; +static CRITICAL_SECTION_DEBUG CtxList_cs_debug = +{ + 0, 0, &CtxList_cs, + { &CtxList_cs_debug.ProcessLocksList, &CtxList_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": CtxList_cs") } +}; +static CRITICAL_SECTION CtxList_cs = { &CtxList_cs_debug, -1, 0, 0, 0, 0 }; + +SContextHandle* RPCRT4_SrvAllocCtxHdl() +{ + SContextHandle *Hdl, *Tmp; + + if((Hdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(SContextHandle)))==NULL) return NULL; + + EnterCriticalSection(&CtxList_cs); + + if(!CtxList) CtxList = Hdl; + else + { + for(Tmp = CtxList; Tmp->Next; Tmp = Tmp->Next); + Tmp->Next = Hdl; + Hdl->Prev = Tmp; + } + + LeaveCriticalSection(&CtxList_cs); + + return Hdl; +} + +void RPCRT4_SrvFreeCtxHdl(SContextHandle *Hdl) +{ + EnterCriticalSection(&CtxList_cs); + + if(Hdl->Prev && Hdl->Next) + { + ((SContextHandle*)Hdl->Prev)->Next = Hdl->Next; + ((SContextHandle*)Hdl->Next)->Prev = Hdl->Prev; + } + else if(Hdl->Next) + { + ((SContextHandle*)Hdl->Next)->Prev = NULL; + CtxList = (SContextHandle*)Hdl->Next; + } + else if(Hdl->Prev) + ((SContextHandle*)Hdl->Prev)->Next = NULL; + else CtxList = NULL; + + HeapFree(GetProcessHeap(), 0, Hdl); + LeaveCriticalSection(&CtxList_cs); +} + +SContextHandle* RPCRT4_SrvFindCtxHdl(ContextHandleNdr *CtxNdr) +{ + SContextHandle *Hdl, *Ret=NULL; + RPC_STATUS status; + EnterCriticalSection(&CtxList_cs); + + for(Hdl = CtxList; Hdl; Hdl = Hdl->Next) + if(UuidCompare(&Hdl->Ndr.uuid, &CtxNdr->uuid, &status)==0) + { + Ret = Hdl; + break; + } + + LeaveCriticalSection(&CtxList_cs); + return Ret; +} + +SContextHandle* RPCRT4_SrvUnmarshallCtxHdl(ContextHandleNdr *Ndr) +{ + SContextHandle *Hdl = NULL; + RPC_STATUS status; + + if(!Ndr) + { + if((Hdl = RPCRT4_SrvAllocCtxHdl())==NULL) + RpcRaiseException(ERROR_OUTOFMEMORY); + + UuidCreate(&Hdl->Ndr.uuid); + } + else if(!UuidIsNil(&Ndr->uuid, &status)) + Hdl = RPCRT4_SrvFindCtxHdl(Ndr); + + return Hdl; +} + +void RPCRT4_SrvMarshallCtxHdl(SContextHandle *Hdl, ContextHandleNdr *Ndr) +{ + if(!Hdl->Value) + { + RPCRT4_SrvFreeCtxHdl(Hdl); + ZeroMemory(Ndr, sizeof(ContextHandleNdr)); + } + else memcpy(Ndr, &Hdl->Ndr, sizeof(ContextHandleNdr)); +} + +void RPCRT4_DoContextRundownIfNeeded(RpcConnection *Conn) +{ + +} /*********************************************************************** * NDRCContextBinding @@ -103,11 +207,12 @@ NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { - if(!pContextHandle) + + if(!pContextHandle || !BindHandle) RpcRaiseException(ERROR_INVALID_HANDLE); - + NDRCContextUnmarshall(pContextHandle, - ((CContextHandle*)pContextHandle)->Binding, + (CContextHandle*)BindHandle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation); @@ -165,39 +270,24 @@ } /*********************************************************************** - * NDRSContextMarshall2 - */ -void WINAPI NDRSContextMarshall2(IN RPC_BINDING_HANDLE BindingHandle, - IN NDR_SCONTEXT CContext, - OUT void *pBuff, - IN NDR_RUNDOWN userRunDownIn, - IN void *CtxGuard, - IN unsigned long Flags) -{ - FIXME("stub\n"); -} - -/*********************************************************************** - * NDRSContextUnmarshall2 - */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(IN RPC_BINDING_HANDLE BindingHandle, - IN void *pBuff, - IN unsigned long DataRepresentation, - IN void *CtxGuard, - IN unsigned long Flags) -{ - FIXME("stub\n"); - return NULL; -} - -/*********************************************************************** * NdrServerContextMarshall */ void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine) { - FIXME("(%p, %p, %p): stub\n", pStubMsg, ContextHandle, RundownRoutine); + SContextHandle *Hdl; + RpcBinding *Binding; + + if(!ContextHandle) + RpcRaiseException(ERROR_INVALID_HANDLE); + + Hdl = (SContextHandle*)ContextHandle; + Binding = (RpcBinding*)pStubMsg->RpcMsg->Handle; + Hdl->Rundown = RundownRoutine; + Hdl->Conn = Binding->FromConn; + RPCRT4_SrvMarshallCtxHdl(Hdl, (ContextHandleNdr*)pStubMsg->Buffer); + pStubMsg->Buffer += sizeof(ContextHandleNdr); } /*********************************************************************** @@ -205,8 +295,10 @@ */ NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) { - FIXME("(%p): stub\n", pStubMsg); - return NULL; + SContextHandle *Hdl; + + Hdl = RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pStubMsg->Buffer); + return (NDR_SCONTEXT)Hdl; } /*********************************************************************** @@ -237,7 +329,14 @@ OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) { - FIXME("stub\n"); + SContextHandle *Hdl; + + if(!CContext) + RpcRaiseException(ERROR_INVALID_HANDLE); + + Hdl = (SContextHandle*)CContext; + Hdl->Rundown = userRunDownIn; + RPCRT4_SrvMarshallCtxHdl(Hdl, (ContextHandleNdr*)pBuff); } /*********************************************************************** @@ -246,8 +345,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall(IN void *pBuff, IN unsigned long DataRepresentation) { - FIXME("stub\n"); - return NULL; + return (NDR_SCONTEXT) RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pBuff); } /*********************************************************************** Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_contex… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexth.h Thu Apr 20 19:45:01 2006 @@ -36,4 +36,25 @@ ContextHandleNdr Ndr; } CContextHandle; +/* + Keep this structure compatible with public rpcndr.h + declaration, otherwise NDRSContextValue macro won't work. + typedef struct { + void *pad[2]; + void *userContext; + } *NDR_SCONTEXT; +*/ + +typedef struct _SContextHandle +{ + PVOID Prev; + PVOID Next; + PVOID Value; + NDR_RUNDOWN Rundown; + RpcConnection *Conn; + ContextHandleNdr Ndr; +} SContextHandle; + +void RPCRT4_DoContextRundownIfNeeded(RpcConnection *Conn); + #endif //__WINE_NDR_CONTEXTH_H Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.spe… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Thu Apr 20 19:45:01 2006 @@ -140,10 +140,10 @@ @ stdcall NDRCContextBinding(ptr) @ stdcall NDRCContextMarshall(ptr ptr) @ stdcall NDRCContextUnmarshall(ptr ptr ptr long) -@ stdcall NDRSContextMarshall2(ptr ptr ptr ptr ptr long) +@ stub NDRSContextMarshall2 @ stdcall NDRSContextMarshall(ptr ptr ptr) @ stdcall NDRSContextMarshallEx(ptr ptr ptr ptr) -@ stdcall NDRSContextUnmarshall2(ptr ptr ptr ptr long) +@ stub NDRSContextUnmarshall2 @ stdcall NDRSContextUnmarshall(ptr long) @ stdcall NDRSContextUnmarshallEx(ptr ptr long) @ stub NDRcopy

18 years, 6 months

[cwittich] 21671: draw icons with the correct size fixes the last Miranda menu issue I know of

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Apr 20 11:03:58 2006 New Revision: 21671 URL: http://svn.reactos.ru/svn/reactos?rev=21671&view=rev Log: draw icons with the correct size fixes the last Miranda menu issue I know of Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/dr… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Thu Apr 20 11:03:58 2006 @@ -29,7 +29,7 @@ /* INCLUDES *******************************************************************/ #include <user32.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ @@ -1487,7 +1487,7 @@ return DrawTextA(hdc, (LPSTR)lp, (INT)wp, rc, dtflags); case DST_ICON: - return DrawIcon(hdc, rc->left, rc->top, (HICON)lp); + return DrawIconEx(hdc, rc->left, rc->top, (HICON)lp, cx, cy, 0, NULL, DI_NORMAL); case DST_BITMAP: memdc = CreateCompatibleDC(hdc);

18 years, 6 months

[greatlrd] 21670: bug 1346 : patch from w3seek : Support SE_FILE_OBJECT in GetNamedSecurityInfo

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Apr 20 08:36:18 2006 New Revision: 21670 URL: http://svn.reactos.ru/svn/reactos?rev=21670&view=rev Log: bug 1346 : patch from w3seek : Support SE_FILE_OBJECT in GetNamedSecurityInfo Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c (contents, props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.def (props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.h (props changed) trunk/reactos/dll/win32/ntmarta/ntmarta.rc (props changed) Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.c… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Thu Apr 20 08:36:18 2006 @@ -437,6 +437,7 @@ BOOL Write) { LPWSTR lpPath; + NTSTATUS Status; ACCESS_MASK DesiredAccess = (ACCESS_MASK)0; DWORD Ret = ERROR_SUCCESS; @@ -496,6 +497,45 @@ /* open a handle to the path depending on the object type */ switch (ObjectType) { + case SE_FILE_OBJECT: + { + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING FileName; + + if (!RtlDosPathNameToNtPathName_U(pObjectName, + &FileName, + NULL, + NULL)) + { + Ret = ERROR_INVALID_NAME; + goto Cleanup; + } + + InitializeObjectAttributes(&ObjectAttributes, + &FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(Handle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_SYNCHRONOUS_IO_NONALERT); + + RtlFreeHeap(RtlGetProcessHeap(), + 0, + FileName.Buffer); + + if (!NT_SUCCESS(Status)) + { + Ret = RtlNtStatusToDosError(Status); + } + break; + } + case SE_REGISTRY_KEY: { static const struct @@ -679,6 +719,9 @@ break; case SE_FILE_OBJECT: + NtClose(Handle); + break; + case SE_KERNEL_OBJECT: case SE_WINDOW_OBJECT: CloseHandle(Handle); Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/ntmarta/ntmarta.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2006