Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mf] 18378: fix crash because of NULL command line pointer

by mf＠svn.reactos.com

fix crash because of NULL command line pointer Modified: trunk/reactos/subsys/system/explorer/explorer.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-09 15:12:01 UTC (rev 18377) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-10-09 15:12:13 UTC (rev 18378) @@ -561,7 +561,8 @@ cmd._cmdShow = cmdShow; // parse command line options, which may overwrite the MDI flag - cmd.ParseCmdLine(lpCmdLine); + if (lpCmdLine) + cmd.ParseCmdLine(lpCmdLine); // create main window MainFrameBase::Create(cmd);

19 years

[mf] 18377: fix crash because of NULL command line pointer

by mf＠svn.reactos.com

fix crash because of NULL command line pointer Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-10-09 15:04:18 UTC (rev 18376) +++ branches/lean-explorer/reactos/subsys/system/explorer/explorer.cpp 2005-10-09 15:12:01 UTC (rev 18377) @@ -448,7 +448,8 @@ cmd._cmdShow = cmdShow; // parse command line options - cmd.ParseCmdLine(lpCmdLine); + if (lpCmdLine) + cmd.ParseCmdLine(lpCmdLine); // Open the first child window after initializing the application if (cmd.IsValidPath())

19 years

[mf] 18376: Fix from watz@gmx.net for Bugzilla Entry 862: When you resize the taskmanager window, the history graph is not updated anymore. When the window is resized back to default (smallest possible width) it

by mf＠svn.reactos.com

Fix from watz(a)gmx.net for Bugzilla Entry 862: When you resize the taskmanager window, the history graph is not updated anymore. When the window is resized back to default (smallest possible width) it draws again. Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c Modified: trunk/reactos/subsys/system/taskmgr/graphctl.h _____ Modified: trunk/reactos/subsys/system/taskmgr/graphctl.c --- trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-09 13:05:49 UTC (rev 18375) +++ trunk/reactos/subsys/system/taskmgr/graphctl.c 2005-10-09 15:04:18 UTC (rev 18376) @@ -121,7 +121,7 @@ this->m_hWnd = hWnd; GraphCtrl_Resize(this); if (result != 0) - GraphCtrl_InvalidateCtrl(this); + GraphCtrl_InvalidateCtrl(this, FALSE); return result; } @@ -134,7 +134,7 @@ this->m_dRange = this->m_dUpperLimit - this->m_dLowerLimit; this->m_dVerticalFactor = (double)this->m_nPlotHeight / this->m_dRange; /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this); + GraphCtrl_InvalidateCtrl(this, FALSE); } #if 0 @@ -157,7 +157,7 @@ { this->m_crGridColor = color; /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this); + GraphCtrl_InvalidateCtrl(this, FALSE); } void GraphCtrl_SetPlotColor(TGraphCtrl* this, int plot, COLORREF color) @@ -166,7 +166,7 @@ DeleteObject(this->m_penPlot[plot]); this->m_penPlot[plot] = CreatePen(PS_SOLID, 0, this->m_crPlotColor[plot]); /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this); + GraphCtrl_InvalidateCtrl(this, FALSE); } void GraphCtrl_SetBackgroundColor(TGraphCtrl* this, COLORREF color) @@ -175,10 +175,10 @@ DeleteObject(this->m_brushBack); this->m_brushBack = CreateSolidBrush(this->m_crBackColor); /* clear out the existing garbage, re-start with a clean plot */ - GraphCtrl_InvalidateCtrl(this); + GraphCtrl_InvalidateCtrl(this, FALSE); } -void GraphCtrl_InvalidateCtrl(TGraphCtrl* this) +void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize) { /* There is a lot of drawing going on here - particularly in terms of */ /* drawing the grid. Don't panic, this is all being drawn (only once) */ @@ -203,6 +203,17 @@ this->m_bitmapGrid = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); this->m_bitmapOldGrid = (HBITMAP)SelectObject(this->m_dcGrid, this->m_bitmapGrid); } + else if(bResize) + { + // the size of the drawing area has changed + // so create a new bitmap of the appropriate size + if(this->m_bitmapGrid != NULL) + { + DeleteObject(this->m_bitmapGrid); + this->m_bitmapGrid = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); + SelectObject(this->m_dcGrid, this->m_bitmapGrid); + } + } SetBkColor(this->m_dcGrid, this->m_crBackColor); @@ -324,6 +335,17 @@ this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); this->m_bitmapOldPlot = (HBITMAP)SelectObject(this->m_dcPlot, this->m_bitmapPlot); } + else if(bResize) + { + // the size of the drawing area has changed + // so create a new bitmap of the appropriate size + if(this->m_bitmapPlot != NULL) + { + DeleteObject(this->m_bitmapPlot); + this->m_bitmapPlot = CreateCompatibleBitmap(dc, this->m_nClientWidth, this->m_nClientHeight); + SelectObject(this->m_dcPlot, this->m_bitmapPlot); + } + } /* make sure the plot bitmap is cleared */ SetBkColor(this->m_dcPlot, this->m_crBackColor); @@ -591,12 +613,12 @@ if (hWnd == hPerformancePageMemUsageHistoryGraph) { GraphCtrl_Resize(&PerformancePageMemUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageMemUsageHistoryGraph); + GraphCtrl_InvalidateCtrl(&PerformancePageMemUsageHistoryGraph, TRUE); } if (hWnd == hPerformancePageCpuUsageHistoryGraph) { GraphCtrl_Resize(&PerformancePageCpuUsageHistoryGraph); - GraphCtrl_InvalidateCtrl(&PerformancePageCpuUsageHistoryGraph); + GraphCtrl_InvalidateCtrl(&PerformancePageCpuUsageHistoryGraph, TRUE); } return 0; _____ Modified: trunk/reactos/subsys/system/taskmgr/graphctl.h --- trunk/reactos/subsys/system/taskmgr/graphctl.h 2005-10-09 13:05:49 UTC (rev 18375) +++ trunk/reactos/subsys/system/taskmgr/graphctl.h 2005-10-09 15:04:18 UTC (rev 18376) @@ -93,7 +93,7 @@ UINT nID); void GraphCtrl_Dispose(TGraphCtrl* this); void GraphCtrl_DrawPoint(TGraphCtrl* this); -void GraphCtrl_InvalidateCtrl(TGraphCtrl* this); +void GraphCtrl_InvalidateCtrl(TGraphCtrl* this, BOOL bResize); void GraphCtrl_Paint(TGraphCtrl* this, HWND hWnd, HDC dc); void GraphCtrl_Reset(TGraphCtrl* this); void GraphCtrl_Resize(TGraphCtrl* this);

19 years

[mf] 18375: replace "search computer" start menu entry by a "not yet implemented" message to avoid the crash because of the currently missing SHFindComputer() implementation in shell32.dll

by mf＠svn.reactos.com

replace "search computer" start menu entry by a "not yet implemented" message to avoid the crash because of the currently missing SHFindComputer() implementation in shell32.dll Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-10-09 12:41:35 UTC (rev 18374) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-10-09 13:05:49 UTC (rev 18375) @@ -2011,7 +2011,7 @@ // browse menu case IDC_NETWORK: -#ifdef _ROS_ // to be removed when network will be implemented +#ifdef _ROS_ ///@todo to be removed when network browsing will be implemented in shell namespace MessageBox(0, TEXT("network not yet implemented"), ResString(IDS_TITLE), MB_OK); #else CreateSubmenu(id, CSIDL_NETWORK, ResString(IDS_NETWORK)); @@ -2062,11 +2062,13 @@ void StartMenuHandler::ShowSearchComputer() { +#ifndef _ROS_ ///@todo to be removed when SHFindComputer() will be implemented in shell32.dll static DynamicFct<SHFINDCOMPUTER> SHFindComputer(TEXT("SHELL32"), 91); if (SHFindComputer) (*SHFindComputer)(NULL, NULL); else +#endif MessageBox(0, TEXT("SHFindComputer() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); }

19 years

[mf] 18374: german patch for cmd.exe from Bugzilla Entry 872

by mf＠svn.reactos.com

german patch for cmd.exe from Bugzilla Entry 872 Modified: trunk/reactos/subsys/system/cmd/De.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-10-09 11:57:15 UTC (rev 18373) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-10-09 12:41:35 UTC (rev 18374) @@ -574,6 +574,7 @@ STRING_CHOICE_ERROR, "Ungueltige Option. Erwartetes Format: /C[:]options" STRING_CHOICE_ERROR_TXT, "Ungueltige Option. Erwartetes Format: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION, "Ungueltige Option: %s" +STRING_MD_ERROR, "A subdirectory or file already exists.\n" STRING_CMD_ERROR1, "Die Eingaben konnten nicht umgeleitet werden (von der Datei) %s\n" STRING_CMD_ERROR2, "Error creating temporary file for pipe data\n" STRING_CMD_ERROR3, "%s kann nicht in die Datei umgeleitet werden \n"

19 years

[mf] 18373: fix access violation in SaveBoard()

by mf＠svn.reactos.com

fix access violation in SaveBoard() Modified: trunk/rosapps/games/winemine/main.c _____ Modified: trunk/rosapps/games/winemine/main.c --- trunk/rosapps/games/winemine/main.c 2005-10-09 11:24:51 UTC (rev 18372) +++ trunk/rosapps/games/winemine/main.c 2005-10-09 11:57:15 UTC (rev 18373) @@ -388,14 +388,13 @@ { DWORD disp; HKEY hkey; - SECURITY_ATTRIBUTES sa; unsigned i; char data[16]; char key_name[8]; if( RegCreateKeyEx( HKEY_LOCAL_MACHINE, "Software\\Wine\\WineMine", 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, &sa, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, &disp ) != ERROR_SUCCESS) return;

19 years

[mf] 18372: display source rectangle

by mf＠svn.reactos.com

display source rectangle Modified: trunk/rosapps/devutils/zoomin/framewnd.c _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-09 08:38:29 UTC (rev 18371) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-10-09 11:24:51 UTC (rev 18372) @@ -36,9 +36,12 @@ static int s_factor = 2; // zoom factor -static POINT s_srcPos = {0, 0}; // zoom factor +static POINT s_srcPos = {0, 0}; // source rectangle position +static RECT s_lastSrc = {-1,-1,-1,-1}; // last cursor position +BOOL s_dragging = FALSE; + //////////////////////////////////////////////////////////////////////// //////// // Local module support methods // @@ -97,15 +100,15 @@ case WM_PAINT: { PAINTSTRUCT ps; HDC hdcMem; - RECT rect; + RECT clnt; SIZE size; BeginPaint(hWnd, &ps); hdcMem = GetDC(GetDesktopWindow()); - GetClientRect(hWnd, &rect); - size.cx = rect.right / s_factor; - size.cy = rect.bottom / s_factor; + GetClientRect(hWnd, &clnt); + size.cx = clnt.right / s_factor; + size.cy = clnt.bottom / s_factor; StretchBlt(ps.hdc, 0, 0, size.cx*s_factor, size.cy*s_factor, hdcMem, s_srcPos.x, s_srcPos.y, size.cx, size.cy, SRCCOPY); @@ -114,39 +117,68 @@ break;} case WM_TIMER: - if (GetCapture() == hWnd) { - RECT rect; + if (s_dragging && GetCapture()==hWnd) { + RECT clnt, rect; int width = GetSystemMetrics(SM_CXSCREEN); int height = GetSystemMetrics(SM_CYSCREEN); - GetClientRect(hWnd, &rect); - GetCursorPos(&s_srcPos); - s_srcPos.x -= rect.right / s_factor / 2; - s_srcPos.y -= rect.bottom / s_factor / 2; + GetClientRect(hWnd, &clnt); + s_srcPos.x -= clnt.right / s_factor / 2; + s_srcPos.y -= clnt.bottom / s_factor / 2; + if (s_srcPos.x < 0) s_srcPos.x = 0; - else if (s_srcPos.x+rect.right/s_factor > width) - s_srcPos.x = width - rect.right/s_factor; + else if (s_srcPos.x+clnt.right/s_factor > width) + s_srcPos.x = width - clnt.right/s_factor; if (s_srcPos.y < 0) s_srcPos.y = 0; - else if (s_srcPos.y+rect.bottom/s_factor > height) - s_srcPos.y = height - rect.bottom/s_factor; + else if (s_srcPos.y+clnt.bottom/s_factor > height) + s_srcPos.y = height - clnt.bottom/s_factor; + + if (memcmp(&rect, &s_lastSrc, sizeof(RECT))) { + HDC hdc = GetDC(0); + + if (s_lastSrc.bottom != -1) + DrawFocusRect(hdc, &s_lastSrc); + + rect.left = s_srcPos.x - 1; + rect.top = s_srcPos.y - 1; + rect.right = rect.left + clnt.right/s_factor + 2; + rect.bottom = rect.top + clnt.bottom/s_factor + 2; + DrawFocusRect(hdc, &rect); + + ReleaseDC(0, hdc); + + s_lastSrc = rect; + } } InvalidateRect(hWnd, NULL, FALSE); + UpdateWindow(hWnd); break; case WM_LBUTTONDOWN: + s_dragging = TRUE; SetCapture(hWnd); break; case WM_LBUTTONUP: - ReleaseCapture(); + case WM_CANCELMODE: + if (s_dragging) { + HDC hdc = GetDC(0); + DrawFocusRect(hdc, &s_lastSrc); + ReleaseDC(0, hdc); + + s_lastSrc.bottom = -1; + + s_dragging = FALSE; + ReleaseCapture(); + } break; case WM_DESTROY:

19 years

[ekohl] 18371: - Support [out, unique] base type parameters.

by ekohl＠svn.reactos.com

- Support [out, unique] base type parameters. Modified: trunk/reactos/tools/widl/ChangeLog _____ Modified: trunk/reactos/tools/widl/ChangeLog --- trunk/reactos/tools/widl/ChangeLog 2005-10-09 08:36:50 UTC (rev 18370) +++ trunk/reactos/tools/widl/ChangeLog 2005-10-09 08:38:29 UTC (rev 18371) @@ -1,5 +1,12 @@ ChangeLog +2005-10-09 ekohl + + tools/widl/client.c + tools/widl/server.c + +- Support [out, unique] base type parameters. + 2005-08-07 ekohl tools/widl/server.c

19 years

[ekohl] 18370: - Support [out, unique] base type parameters.

by ekohl＠svn.reactos.com

- Support [out, unique] base type parameters. Modified: trunk/reactos/tools/widl/client.c Modified: trunk/reactos/tools/widl/server.c _____ Modified: trunk/reactos/tools/widl/client.c --- trunk/reactos/tools/widl/client.c 2005-10-09 00:45:33 UTC (rev 18369) +++ trunk/reactos/tools/widl/client.c 2005-10-09 08:36:50 UTC (rev 18370) @@ -333,7 +333,8 @@ if (is_base_type(var->type)) { print_client("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_client("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); + print_client("0x%02x, /* FC_<type> */\n", + get_base_type(var->type->type)); } else if (var->type->type == RPC_FC_RP) { @@ -361,27 +362,18 @@ } else if (var->ptr_level == 1) { -// if (is_base_type(var->type)) -// { - if (in_attr & !out_attr) - print_client("0x4d, /* FC_IN_PARAM */\n"); - else if (!in_attr & out_attr) - print_client("0x51, /* FC_OUT_PARAM */\n"); - else if (in_attr & out_attr) - print_client("0x50, /* FC_IN_OUT_PARAM */\n"); - fprintf(client, "#ifndef _ALPHA_\n"); - print_client("0x01,\n"); - fprintf(client, "#else\n"); - print_client("0x02,\n"); - fprintf(client, "#endif\n"); - print_client("NdrFcShort(0x%x),\n", type_offset); -// } -// else -// { -// error("%s:%d Unknown/unsupported type 0x%x\n", -// __FUNCTION__,__LINE__, var->type->type); -// return; -// } + if (in_attr & !out_attr) + print_client("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_client("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_client("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(client, "#ifndef _ALPHA_\n"); + print_client("0x01,\n"); + fprintf(client, "#else\n"); + print_client("0x02,\n"); + fprintf(client, "#endif\n"); + print_client("NdrFcShort(0x%x),\n", type_offset); } else { @@ -481,7 +473,7 @@ print_client("0x11, 0x%02X, /* FC_RP, [flags] */\n", flags); print_client("NdrFcShort(0x%02X),\n", 0x02); print_client("0x%02X,\n", var->type->ref->ref->type); - print_client("0x%02X,\n", 3); /* alignment -1 */ + print_client("0x%02X,\n", 3); /* alignment - 1 */ print_client("NdrFcShort(0x%02X),\n", get_type_size(var->type->ref->ref, 4)); field = var->type->ref->ref->fields; @@ -576,7 +568,7 @@ if (ref_attr) print_client("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else if (unique_attr) - print_client("0x12, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + print_client("0x12, 0x0c, /* FC_UP [allocated_on_stack] [simple_pointer] */\n"); else if (ptr_attr) print_client("0x14, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); } @@ -1196,6 +1188,7 @@ unsigned int last_size = 0; int out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; var_t *var; var_t *def; @@ -1214,6 +1207,12 @@ sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); string_attr = is_attr(var->attrs, ATTR_STRING); + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (out_attr) { if (var->ptr_level > 1) @@ -1309,15 +1308,30 @@ if (alignment != 0) print_client("_StubMsg.Buffer += %u;\n", alignment); - print_client("*"); - write_name(client, var); - fprintf(client, " = *(("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); + if (unique_attr) + { + print_client("NdrPointerUnmarshall(\n"); + indent++; + print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_client("(unsigned char __RPC_FAR * __RPC_FAR *)&%s,\n", var->name); + print_client("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u],\n", + local_type_offset); + print_client("(unsigned char)0);\n"); + indent--; + fprintf(client, "\n"); + } + else + { + print_client("*"); + write_name(client, var); + fprintf(client, " = *(("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, " __RPC_FAR *)_StubMsg.Buffer);\n"); - print_client("_StubMsg.Buffer += sizeof("); - write_type(client, var->type, NULL, var->tname); - fprintf(client, ");\n"); + print_client("_StubMsg.Buffer += sizeof("); + write_type(client, var->type, NULL, var->tname); + fprintf(client, ");\n"); + } } last_size = size; _____ Modified: trunk/reactos/tools/widl/server.c --- trunk/reactos/tools/widl/server.c 2005-10-09 00:45:33 UTC (rev 18369) +++ trunk/reactos/tools/widl/server.c 2005-10-09 08:36:50 UTC (rev 18370) @@ -338,7 +338,8 @@ if (is_base_type(var->type)) { print_server("0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - print_server("0x%02x, /* FC_<type> */\n", get_base_type(var->type->type)); + print_server("0x%02x, /* FC_<type> */\n", + get_base_type(var->type->type)); } else if (var->type->type == RPC_FC_RP) { @@ -364,27 +365,18 @@ } else if (var->ptr_level == 1) { -// if (is_base_type(var->type)) -// { - if (in_attr & !out_attr) - print_server("0x4d, /* FC_IN_PARAM */\n"); - else if (!in_attr & out_attr) - print_server("0x51, /* FC_OUT_PARAM */\n"); - else if (in_attr & out_attr) - print_server("0x50, /* FC_IN_OUT_PARAM */\n"); - fprintf(server, "#ifndef _ALPHA_\n"); - print_server("0x01,\n"); - fprintf(server, "#else\n"); - print_server("0x02,\n"); - fprintf(server, "#endif\n"); - print_server("NdrFcShort(0x%x),\n", type_offset); -// } -// else -// { -// error("%s:%d Unknown/unsupported type 0x%x\n", -// __FUNCTION__,__LINE__, var->type->type); -// return; -// } + if (in_attr & !out_attr) + print_server("0x4d, /* FC_IN_PARAM */\n"); + else if (!in_attr & out_attr) + print_server("0x51, /* FC_OUT_PARAM */\n"); + else if (in_attr & out_attr) + print_server("0x50, /* FC_IN_OUT_PARAM */\n"); + fprintf(server, "#ifndef _ALPHA_\n"); + print_server("0x01,\n"); + fprintf(server, "#else\n"); + print_server("0x02,\n"); + fprintf(server, "#endif\n"); + print_server("NdrFcShort(0x%x),\n", type_offset); } type_offset += get_var_type_offset(var); @@ -478,7 +470,7 @@ print_server("0x11, 0x%02X, /* FC_RP, [flags] */\n", flags); print_server("NdrFcShort(0x%02X),\n", 0x02); print_server("0x%02X,\n", var->type->ref->ref->type); - print_server("0x%02X,\n", 3); /* alignment -1 */ + print_server("0x%02X,\n", 3); /* alignment - 1 */ print_server("NdrFcShort(0x%02X),\n", get_type_size(var->type->ref->ref, 4)); field = var->type->ref->ref->fields; @@ -573,7 +565,7 @@ if (ref_attr) print_server("0x11, 0x0c, /* FC_RP [allocated_on_stack] [simple_pointer] */\n"); else if (unique_attr) - print_server("0x12, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); + print_server("0x12, 0x0c, /* FC_UP [allocated_on_stack] [simple_pointer] */\n"); else if (ptr_attr) print_server("0x14, 0x0c, /* FC_FP [allocated_on_stack] [simple_pointer] */\n"); } @@ -875,7 +867,7 @@ print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", - local_type_offset + 4); /* FIXME */ + local_type_offset + 4); indent--; fprintf(server,"\n"); } @@ -1213,6 +1205,7 @@ var_t *def; int out_attr; int string_attr; + int ptr_attr, ref_attr, unique_attr; void *sizeis_attr; unsigned int local_type_offset = *type_offset; @@ -1231,6 +1224,12 @@ sizeis_attr = get_attrp(var->attrs, ATTR_SIZEIS); string_attr = is_attr(var->attrs, ATTR_STRING); + ptr_attr = is_attr(var->attrs, ATTR_PTR); + ref_attr = is_attr(var->attrs, ATTR_REF); + unique_attr = is_attr(var->attrs, ATTR_UNIQUE); + if (ptr_attr + ref_attr + unique_attr == 0) + ref_attr = 1; + if (sizeis_attr != NULL) { if (string_attr) @@ -1326,16 +1325,30 @@ if (var->ptr_level == 1) { - fprintf(server, "\n"); - print_server("*(("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, " __RPC_FAR *)_StubMsg.Buffer) = *"); - write_name(server, var); - fprintf(server, ";\n"); + if (unique_attr) + { + print_server("NdrPointerMarshall(\n"); + indent++; + print_server("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); + print_server("(unsigned char __RPC_FAR *)%s,\n", var->name); + print_server("(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%u]);\n", + local_type_offset); + indent--; + fprintf(server, "\n"); + } + else + { + fprintf(server, "\n"); + print_server("*(("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, " __RPC_FAR *)_StubMsg.Buffer) = *"); + write_name(server, var); + fprintf(server, ";\n"); - print_server("_StubMsg.Buffer += sizeof("); - write_type(server, var->type, NULL, var->tname); - fprintf(server, ");"); + print_server("_StubMsg.Buffer += sizeof("); + write_type(server, var->type, NULL, var->tname); + fprintf(server, ");"); + } } else {

19 years

[blight] 18369: Add /BREAK option.

by blight＠svn.reactos.com

Add /BREAK option. Enter KDB on bootup only if /BREAK options is given. (You can also use KDBinit to enter KDB a little later than with /BREAK) Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/kd/kdinit.c _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-10-09 00:25:19 UTC (rev 18368) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-10-09 00:45:33 UTC (rev 18369) @@ -615,7 +615,7 @@ /* Report all resources used by hal */ HalReportResourceUsage(); - + /* Clear the screen to blue */ HalInitSystem(2, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); @@ -635,7 +635,8 @@ ExpInitTimeZoneInfo(); /* Enter the kernel debugger before starting up the boot drivers */ - if (KdDebuggerEnabled) KdbEnter(); + if (KdDebuggerEnabled && KdpEarlyBreak) + DbgBreakPoint(); /* Setup Drivers and Root Device Node */ IoInit2(BootLog); _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-10-09 00:25:19 UTC (rev 18368) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-10-09 00:45:33 UTC (rev 18369) @@ -280,4 +280,7 @@ /* The KD Native Provider List */ extern LIST_ENTRY KdProviders; +/* Whether to enter KDB as early as possible or not */ +extern BOOLEAN KdpEarlyBreak; + #endif /* __INCLUDE_INTERNAL_KERNEL_DEBUGGER_H */ _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-10-09 00:25:19 UTC (rev 18368) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-10-09 00:45:33 UTC (rev 18369) @@ -27,6 +27,7 @@ PKDP_INIT_ROUTINE WrapperInitRoutine; KD_DISPATCH_TABLE WrapperTable; #endif +BOOLEAN KdpEarlyBreak = FALSE; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; @@ -180,6 +181,12 @@ p2 = KdpGetDebugMode(p2); p2 = KdpGetWrapperDebugMode(p2, LoaderBlock); } + /* Check for early breakpoint */ + else if (!_strnicmp(p2, "BREAK", 5)) + { + p2 += 5; + KdpEarlyBreak = TRUE; + } /* Check for Kernel Debugging Enable */ else if (!_strnicmp(p2, "DEBUG", 5)) {

19 years

← Newer
1
...
52
53
54
55
56
57
58
...
74
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 October 2005