Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 27223: Fix bug #2312 and add a check to show only the relevant information for Windows/Unix users See issue #2312 for more details.
by cfinck＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: cfinck Date: Mon Jun 18 15:58:35 2007 New Revision: 27223 URL: http://svn.reactos.org/svn/reactos?rev=27223&view=rev Log: Fix bug #2312 and add a check to show only the relevant information for Windows/Unix users See issue #2312 for more details. Modified: trunk/rosapps/makefile Modified: trunk/rosapps/makefile URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/makefile?rev=27223&r1=2722… ============================================================================== --- trunk/rosapps/makefile (original) +++ trunk/rosapps/makefile Mon Jun 18 15:58:35 2007 @@ -3,11 +3,18 @@ @echo --- @echo 1. copy the rosapps folder into the reactos\modules folder @echo 2. link reactos/modules/rosapps to rosapps - @echo UNIX - @echo cd $${ROS_SRC_ROOT}/reactos/modules - @echo ln -s $${ROS_SRC_ROOT}/rosapps rosapps - @echo WINDOWS - @echo cd %%ROS_SRC_ROOT%%\reactos\modules - @echo junction rosapps %%ROS_SRC_ROOT%%\rosapps + +ifeq ($(shell uname),) +# Information for Windows users + + @echo cd %%_ROSSOURCEDIR%%\reactos\modules + @echo junction rosapps %%_ROSSOURCEDIR%%\rosapps +else +# Information for UNIX users + + @echo " cd \$$_ROSSOURCEDIR/reactos/modules" + @echo " ln -s \$$_ROSSOURCEDIR/rosapps rosapps" +endif + @echo --- @echo Eventually you can run "make depends" in the \reactos directory to compile it.

1 0

[cwittich] 27222: added explorer-like addressbar
by cwittich＠svn.reactos.org 18 Jun '07

18 Jun '07

Author: cwittich Date: Mon Jun 18 04:09:37 2007 New Revision: 27222 URL: http://svn.reactos.org/svn/reactos?rev=27222&view=rev Log: added explorer-like addressbar Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/main.h Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Mon Jun 18 04:09:37 2007 @@ -71,8 +71,9 @@ SetRect(&rt, 0, 0, cx, cy); cx = pChildWnd->nSplitPos + SPLIT_WIDTH/2; - DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); - DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hAddressBarWnd, 0, rt.left, rt.top, rt.right-rt.left, 23, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hTreeWnd, 0, rt.left, rt.top + 25, pChildWnd->nSplitPos-SPLIT_WIDTH/2-rt.left, rt.bottom-rt.top - 30, SWP_NOZORDER|SWP_NOACTIVATE); + DeferWindowPos(hdwp, pChildWnd->hListWnd, 0, rt.left+cx , rt.top + 25, rt.right-cx, rt.bottom-rt.top, SWP_NOZORDER|SWP_NOACTIVATE); EndDeferWindowPos(hdwp); } @@ -253,6 +254,28 @@ } } + +LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldwndproc; + static TCHAR s_szNode[256]; + oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA); + + switch (uMsg) + { + case WM_KEYUP: + if (wParam == VK_RETURN) + { + GetWindowText(hwnd, s_szNode, sizeof(s_szNode) / sizeof(s_szNode[0])); + SelectNode(g_pChildWnd->hTreeWnd, s_szNode); + } + break; + default: + break; + } + return CallWindowProc(oldwndproc, hwnd, uMsg, wParam, lParam); +} + /******************************************************************************* * * FUNCTION: ChildWndProc(HWND, unsigned, WORD, LONG) @@ -273,6 +296,7 @@ switch (message) { case WM_CREATE: { + WNDPROC oldproc; TCHAR buffer[MAX_PATH]; /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); @@ -283,10 +307,18 @@ _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; pChildWnd->hWnd = hWnd; - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); + pChildWnd->hAddressBarWnd = CreateWindowEx(WS_EX_CLIENTEDGE, _T("Edit"), NULL, WS_CHILD | WS_VISIBLE | WS_CHILDWINDOW | WS_TABSTOP, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + hWnd, (HMENU)0, hInst, 0); + pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); - break; + + /* Subclass the AddressBar */ + oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC); + SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_USERDATA, (DWORD_PTR)oldproc); + SetWindowLongPtr(pChildWnd->hAddressBarWnd, GWL_WNDPROC, (DWORD_PTR)AddressBarProc); + break; } case WM_COMMAND: if (!_CmdWndProc(hWnd, message, wParam, lParam)) { @@ -424,6 +456,7 @@ if (fullPath) { _stprintf(fullPath, _T("%s\\%s"), rootName, keyPath); SendMessage(hStatusBar, SB_SETTEXT, 0, (LPARAM)fullPath); + SendMessage(pChildWnd->hAddressBarWnd, WM_SETTEXT, 0, (LPARAM)fullPath); HeapFree(GetProcessHeap(), 0, fullPath); { Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h (original) +++ trunk/reactos/base/applications/regedit/main.h Mon Jun 18 04:09:37 2007 @@ -57,6 +57,7 @@ HWND hWnd; HWND hTreeWnd; HWND hListWnd; + HWND hAddressBarWnd; int nFocusPanel; /* 0: left 1: right */ int nSplitPos; WINDOWPLACEMENT pos;

1 0

[greatlrd] 27221: Time to cellbrate we got bltblt hal working again 1. Createsurface can only create one surface at moment 2. crash can occured if wrong param are being putin to createsurface for no error check are done. 3. createsurface are still under havy devloping
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Mon Jun 18 03:43:21 2007 New Revision: 27221 URL: http://svn.reactos.org/svn/reactos?rev=27221&view=rev Log: Time to cellbrate we got bltblt hal working again 1. Createsurface can only create one surface at moment 2. crash can occured if wrong param are being putin to createsurface for no error check are done. 3. createsurface are still under havy devloping Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 03:43:21 2007 @@ -121,8 +121,29 @@ ThisSurfInt->lpLcl = ThisSurfLcl; ThisSurfLcl->lpGbl = ThisSurfaceGbl; + + ThisSurfLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl; - + ThisSurfaceGbl->lpDDHandle = pDDraw->lpLcl->lpGbl; + + /* FIXME ? */ + ThisSurfaceGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + ThisSurfaceGbl->wWidth = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayWidth; + ThisSurfaceGbl->wHeight = pDDraw->lpLcl->lpGbl->vmiData.dwDisplayHeight; + ThisSurfaceGbl->lPitch = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + ThisSurfaceGbl->dwLinearSize = pDDraw->lpLcl->lpGbl->vmiData.lDisplayPitch; + } + else + { + ThisSurfaceGbl->wWidth = (WORD)pDDSD->dwWidth; + ThisSurfaceGbl->wHeight = (WORD)pDDSD->dwHeight; + ThisSurfaceGbl->lPitch = pDDSD->lPitch; + ThisSurfaceGbl->dwLinearSize = pDDSD->lPitch; + } /* FIXME set right version */ ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; @@ -135,6 +156,9 @@ ThisSurfLcl->dwProcessId = GetCurrentProcessId(); + + + /* FIXME the lpLnk */ /* FIXME the ref counter */ } @@ -142,10 +166,48 @@ /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ + /* FIXME bIsDifferentPixelFormat being set to true or false with automatic detcitons */ + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + + mDdCanCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; + mDdCanCreateSurface.CanCreateSurface = pDDraw->lpLcl->lpDDCB->HALDD.CanCreateSurface; + mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + mDdCanCreateSurface.ddRVal = DDERR_GENERIC; + + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str("mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED fail"); + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + DX_STUB_str("mDdCanCreateSurface fail"); + return DDERR_NOTINITIALIZED; + } + + mDdCreateSurface.lpDD = pDDraw->lpLcl->lpGbl; + mDdCreateSurface.CreateSurface = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreateSurface; + mDdCreateSurface.ddRVal = DDERR_GENERIC; + mDdCreateSurface.dwSCnt = slist_int[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; + mDdCreateSurface.lplpSList = slist_lcl; + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } *ppSurf = &slist_int[0]->lpVtbl; - return DD_FALSE; + return DD_OK; } + + void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c Mon Jun 18 03:43:21 2007 @@ -80,7 +80,7 @@ DX_WINDBG_trace(); - if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags + if (( ThisDest->lpLcl->lpGbl->lpDD->lpDDCBtmp->HALDDSurface.dwFlags & DDHAL_SURFCB32_BLT) != DDHAL_SURFCB32_BLT) { return DDERR_GENERIC; @@ -95,7 +95,7 @@ } mDdBlt.lpDD = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl; - mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.Blt; + mDdBlt.Blt = ThisDest->lpLcl->lpSurfMore->lpDD_lcl->lpGbl->lpDDCBtmp->HALDDSurface.Blt; mDdBlt.lpDDDestSurface = ThisDest->lpLcl->lpSurfMore->slist[0]; ThisDest->lpLcl->lpSurfMore->slist[0]->hDC =

1 0

[greatlrd] 27220: last commit for today fixing some compile warings for ddraw.
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Mon Jun 18 02:11:08 2007 New Revision: 27220 URL: http://svn.reactos.org/svn/reactos?rev=27220&view=rev Log: last commit for today fixing some compile warings for ddraw. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Mon Jun 18 02:11:08 2007 @@ -266,4 +266,5 @@ _SEH_END; return retVal; -} +} + Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 02:11:08 2007 @@ -121,11 +121,13 @@ ThisSurfInt->lpLcl = ThisSurfLcl; ThisSurfLcl->lpGbl = ThisSurfaceGbl; - ThisSurfLcl->lpSurfMore = ThisSurfaceMore; + ThisSurfaceGbl->lpDD = pDDraw->lpLcl->lpGbl; + /* FIXME set right version */ ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + ThisSurfLcl->lpSurfMore = ThisSurfaceMore; ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); ThisSurfaceMore->lpDD_int = pDDraw; ThisSurfaceMore->lpDD_lcl = pDDraw->lpLcl;

1 0

[arty] 27219: Fix getting .idata and .edata addresses. Keep freeldr linkage up to date. ldscript -- don't sort .idata$2 so we get modules linked in natural order.
by arty＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: arty Date: Mon Jun 18 02:05:45 2007 New Revision: 27219 URL: http://svn.reactos.org/svn/reactos?rev=27219&view=rev Log: Fix getting .idata and .edata addresses. Keep freeldr linkage up to date. ldscript -- don't sort .idata$2 so we get modules linked in natural order. Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/header.h branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h branches/powerpc/reactos/tools/ppc-build/ldscript branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/compdvr.cpp Mon Jun 18 02:05:45 2007 @@ -169,6 +169,8 @@ args.insert(args.begin()+2,ldscript); args.insert(args.begin()+1,"--emit-relocs"); args.insert(args.begin()+1,"-dc"); + args.insert(args.begin()+1,"-z"); + args.insert(args.begin()+2,"defs"); args.insert(args.begin()+1,"-r"); for( size_t i = 0; i < args.size(); i++ ) { Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.cpp Mon Jun 18 02:05:45 2007 @@ -83,9 +83,9 @@ le32write_postinc(dataptr, 0); le32write_postinc(dataptr, 10); // # Directories // "Directories" - le32pwrite_postinc(dataptr, getExportInfo()); - le32pwrite_postinc(dataptr, getImportInfo()); - le32pwrite_postinc(dataptr, getResourceInfo()); + le32pwrite_postinc(dataptr, getExportInfo(sectionRvaSet)); + le32pwrite_postinc(dataptr, getImportInfo(sectionRvaSet)); + le32pwrite_postinc(dataptr, getResourceInfo(sectionRvaSet)); le32pwrite_postinc(dataptr, getExceptionInfo()); le32pwrite_postinc(dataptr, getSecurityInfo()); le32pwrite_postinc(dataptr, getRelocInfo()); @@ -155,28 +155,37 @@ return IMAGE_FILE_MACHINE_POWERPCBE; /* for now */ } -u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::string &name) +u32pair_t getNamedSectionInfo(ElfObjectFile *eof, const std::vector<section_mapping_t> &mapping, const std::string &name) { const ElfObjectFile::Section *sect = eof->getNamedSection(name); + uint32_t sectaddr; + int i; + if(sect) - return std::make_pair(sect->getStartRva(), sect->logicalSize()); - else - return std::make_pair(0,0); -} - -u32pair_t ElfPeHeader::getExportInfo() const -{ - return getNamedSectionInfo(eof, ".edata"); -} - -u32pair_t ElfPeHeader::getImportInfo() const -{ - return getNamedSectionInfo(eof, ".idata"); -} - -u32pair_t ElfPeHeader::getResourceInfo() const -{ - return getNamedSectionInfo(eof, ".rsrc"); + { + for(i = 0; i < mapping.size(); i++) + if(mapping[i].index == sect->getNumber()) + { + return std::make_pair + (mapping[i].rva, sect->logicalSize()); + } + } + return std::make_pair(0,0); +} + +u32pair_t ElfPeHeader::getExportInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".edata"); +} + +u32pair_t ElfPeHeader::getImportInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".idata"); +} + +u32pair_t ElfPeHeader::getResourceInfo(const std::vector<section_mapping_t> &mapping) const +{ + return getNamedSectionInfo(eof, mapping, ".rsrc"); } u32pair_t ElfPeHeader::getExceptionInfo() const @@ -215,7 +224,7 @@ } uint32_t ElfPeHeader::getEntryPoint -(const std::vector<ElfPeHeader::section_mapping_t> &secmap, +(const std::vector<section_mapping_t> &secmap, const ElfObjectFile::Symbol *entry) const { if(entry == NULL) return computeSize(); Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/header.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/header.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/header.h Mon Jun 18 02:05:45 2007 @@ -6,6 +6,18 @@ #include "pedef.h" #include "util.h" #include "objectfile.h" + +typedef struct section_mapping_t { + const ElfObjectFile::Section *section; + uint32_t rva; + int index; + + section_mapping_t + (const ElfObjectFile::Section *sect, uint32_t rva, int index) : + section(sect), rva(rva), index(index) { } + section_mapping_t(const section_mapping_t &other) : + section(other.section), rva(other.rva), index(other.index) { } +} section_mapping_t; class ElfPeHeader { public: @@ -24,27 +36,15 @@ const ElfObjectFile::secdata_t &getData() const; private: - typedef struct section_mapping_t { - const ElfObjectFile::Section *section; - uint32_t rva; - int index; - - section_mapping_t - (const ElfObjectFile::Section *sect, uint32_t rva, int index) : - section(sect), rva(rva), index(index) { } - section_mapping_t(const section_mapping_t &other) : - section(other.section), rva(other.rva), index(other.index) { } - } section_mapping_t; - void createHeaderSection(); uint32_t getSectionRvas(std::vector<section_mapping_t> &rvas) const; uint32_t getEntryPoint(const std::vector<section_mapping_t> &rvas, const ElfObjectFile::Symbol *entry) const; int computeSize() const; int getExeFlags() const { return 0; } int getDllFlags() const { return dll ? IMAGE_FILE_DLL : 0; } - u32pair_t getExportInfo() const; - u32pair_t getImportInfo() const; - u32pair_t getResourceInfo() const; + u32pair_t getExportInfo(const std::vector<section_mapping_t> &rvas) const; + u32pair_t getImportInfo(const std::vector<section_mapping_t> &rvas) const; + u32pair_t getResourceInfo(const std::vector<section_mapping_t> &rvas) const; u32pair_t getExceptionInfo() const; u32pair_t getSecurityInfo() const; u32pair_t getRelocInfo() const; Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.cpp Mon Jun 18 02:05:45 2007 @@ -28,7 +28,7 @@ { s = elf_nextscn(elfHeader, s); if(!s) break; - sect = new Section(*this, s); + sect = new Section(*this, i, s); sections.push_back(sect); sections_by_name.insert(std::make_pair(sect->getName(), sect)); } Modified: branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h (original) +++ branches/powerpc/reactos/tools/ppc-build/elfpe/objectfile.h Mon Jun 18 02:05:45 2007 @@ -24,11 +24,12 @@ class Section { public: Section(const Section &other) : - obj(other.obj), section(other.section), have_data(false) { + obj(other.obj), section(other.section), have_data(false), + number(other.number) { e32shdr = elf32_getshdr(section); } - Section(ElfObjectFile &obj, Elf_Scn *sechdr) : - obj(&obj), section(sechdr), have_data(false) { + Section(ElfObjectFile &obj, int number, Elf_Scn *sechdr) : + obj(&obj), section(sechdr), have_data(false), number(number) { e32shdr = elf32_getshdr(section); } Section &operator = (const Section &other) { @@ -36,6 +37,7 @@ have_data = false; section = other.section; e32shdr = other.e32shdr; + number = other.number; } operator bool () { return !!section; } std::string getName() const { @@ -44,6 +46,10 @@ int getType() const { return e32shdr->sh_type; + } + + int getNumber() const { + return number; } int getLink() const { @@ -80,6 +86,7 @@ private: const ElfObjectFile *obj; + int number; Elf_Scn *section; Elf32_Shdr *e32shdr; mutable bool have_data; Modified: branches/powerpc/reactos/tools/ppc-build/ldscript URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/ldscript (original) +++ branches/powerpc/reactos/tools/ppc-build/ldscript Mon Jun 18 02:05:45 2007 @@ -28,7 +28,7 @@ } .idata : { - SORT(*)(.idata$2) + *(.idata$2) SORT(*)(.idata$3) LONG(0); LONG(0); LONG(0); LONG(0); LONG(0); SORT(*)(.idata$4) Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Mon Jun 18 02:05:45 2007 @@ -53,6 +53,7 @@ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o \ + obj-ppc/boot/freeldr/freeldr/arch/powerpc/loader.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_ide.o \ obj-ppc/boot/freeldr/freeldr/arch/powerpc/prep_pci.o \

1 0

[greatlrd] 27218: 1. fixed typo in DD->GetCaps 2. Started implement Createsurface for real this time. thanks to all old try and error the new desgin make more sent and are more clean. still Createsruface does not working yet. 3. Fixed some comment tags for some whant start writing doc for thuse api you are wellcome
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Mon Jun 18 01:49:35 2007 New Revision: 27218 URL: http://svn.reactos.org/svn/reactos?rev=27218&view=rev Log: 1. fixed typo in DD->GetCaps 2. Started implement Createsurface for real this time. thanks to all old try and error the new desgin make more sent and are more clean. still Createsruface does not working yet. 3. Fixed some comment tags for some whant start writing doc for thuse api you are wellcome Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface.h trunk/reactos/dll/directx/ddraw/main.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Mon Jun 18 01:49:35 2007 @@ -98,7 +98,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -124,7 +124,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -206,7 +206,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -232,7 +232,7 @@ memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); } */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + memset(&myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Mon Jun 18 01:49:35 2007 @@ -12,6 +12,7 @@ /* PSEH for SEH Support */ #include <pseh/pseh.h> + /* * all param have been checked if they are vaild before they are call to * Internal_CreateSurface, if not please fix the code in the functions @@ -25,71 +26,123 @@ { DDSURFACEDESC2 desc; - /* Test se if the pointers are vaild */ - if ((IsBadReadPtr(pDDraw,sizeof(LPDDRAWI_DIRECTDRAW_INT))) || - (IsBadReadPtr(pDDSD,sizeof(LPDDSURFACEDESC2))) || - (IsBadWritePtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7))) || - (IsBadReadPtr(ppSurf,sizeof(LPDIRECTDRAWSURFACE7)))) - { - return DDERR_INVALIDPARAMS; - } - - /* make local backup of DDSURFACEDESC2 */ - RtlCopyMemory(&desc, pDDSD, sizeof(DDSURFACEDESC2)); - - /* - * pDDSD->dwCaps can not contain both DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY - * if both are define ddraw.dll will return error code 0x88760064 - */ - if ( (desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) && - (desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) - { - return DDERR_INVALIDCAPS; - } - - /* check if pDDSD.dwFlags DDSD_LPSURFACE is set or not */ - if (desc.dwFlags & DDSD_LPSURFACE) - { - /* - * DDSD_LPSURFACE flag is set now we start vaildate see if - * pDDSD->lpSurface are a pointer or not - */ - if (IsBadReadPtr(desc.lpSurface,sizeof(LPVOID)) || - (desc.dwFlags - (desc.dwFlags & DDSD_ALL))) + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface = { 0 }; + DDHAL_CREATESURFACEDATA mDdCreateSurface = { 0 }; + + LPDDRAWI_DDRAWSURFACE_INT ThisSurfInt; + LPDDRAWI_DDRAWSURFACE_LCL ThisSurfLcl; + LPDDRAWI_DDRAWSURFACE_GBL ThisSurfaceGbl; + LPDDRAWI_DDRAWSURFACE_MORE ThisSurfaceMore; + + LPDDRAWI_DDRAWSURFACE_INT * slist_int; + LPDDRAWI_DDRAWSURFACE_LCL * slist_lcl; + LPDDRAWI_DDRAWSURFACE_GBL * slist_gbl; + LPDDRAWI_DDRAWSURFACE_MORE * slist_more; + DWORD num_of_surf=1; + DWORD count; + + + /* Fixme adding vaidlate of income param */ + + /* FIXME count our how many surface we need */ + + DxHeapMemAlloc(slist_int, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_INT ) ); + if( slist_int == NULL) + { + return DDERR_OUTOFMEMORY; + } + + DxHeapMemAlloc(slist_lcl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_LCL ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + /* for more easy to free the memory if something goes wrong */ + DxHeapMemAlloc(slist_gbl, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_GBL ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + /* for more easy to free the memory if something goes wrong */ + DxHeapMemAlloc(slist_more, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_MORE ) ); + if( slist_lcl == NULL ) + { + DxHeapMemFree(slist_int); + return DDERR_OUTOFMEMORY; + } + + + + + for( count=0; count < num_of_surf; count++ ) + { + /* Alloc the surface interface and need members */ + DxHeapMemAlloc(ThisSurfInt, sizeof( DDRAWI_DDRAWSURFACE_INT ) ); + if( ThisSurfInt == NULL ) { - return DDERR_INVALIDPARAMS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* only support dx7 interface for DDSD_LPSURFACE older interface do not support it */ - if (pDDraw->lpVtbl != &DirectDraw7_Vtable) + DxHeapMemAlloc(ThisSurfLcl, sizeof( DDRAWI_DDRAWSURFACE_LCL ) ); + if( ThisSurfLcl == NULL ) { - return DDERR_INVALIDPARAMS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* vaildate the caps */ - if (desc.ddsCaps.dwCaps & ( DDSCAPS_COMPLEX | DDSCAPS_RESERVED2 | DDSCAPS_RESERVED3 | - DDSCAPS_VIDEOPORT | DDSCAPS_PRIMARYSURFACE | DDSCAPS_OVERLAY )) + DxHeapMemAlloc(ThisSurfaceGbl, sizeof( DDRAWI_DDRAWSURFACE_GBL ) ); + if( ThisSurfaceGbl == NULL ) { - return DDERR_INVALIDCAPS; + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; } - /* more code will follow */ - } - else - { - /* - * DDSD_LPSURFACE flag are not set - * remove all wrong flags are being set - */ - - desc.dwFlags = desc.dwFlags & DDSD_ALL; - } - - /* more code will follow */ - - - - return DDERR_GENERIC; + DxHeapMemAlloc(ThisSurfaceMore, sizeof( DDRAWI_DDRAWSURFACE_MORE ) ); + if( ThisSurfaceMore == NULL ) + { + /* Fixme free the memory */ + return DDERR_OUTOFMEMORY; + } + + /* setup a list only one we really need is slist_lcl + rest of slist shall be release before a return */ + + slist_int[count] = ThisSurfInt; + slist_lcl[count] = ThisSurfLcl; + slist_gbl[count] = ThisSurfaceGbl; + slist_more[count] = ThisSurfaceMore; + + /* Start now fill in the member as they shall look like before call to createsurface */ + + ThisSurfInt->lpLcl = ThisSurfLcl; + ThisSurfLcl->lpGbl = ThisSurfaceGbl; + ThisSurfLcl->lpSurfMore = ThisSurfaceMore; + + /* FIXME set right version */ + ThisSurfInt->lpVtbl = &DirectDrawSurface7_Vtable; + + ThisSurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + ThisSurfaceMore->lpDD_int = pDDraw; + ThisSurfaceMore->lpDD_lcl = pDDraw->lpLcl; + ThisSurfaceMore->slist = slist_lcl; + + ThisSurfLcl->dwProcessId = GetCurrentProcessId(); + + /* FIXME the lpLnk */ + /* FIXME the ref counter */ + } + + + /* Fixme call on DdCanCreate then on DdCreateSurface createsurface data here */ + + + *ppSurf = &slist_int[0]->lpVtbl; + return DD_FALSE; } void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc) @@ -101,34 +154,34 @@ HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, - LPDDRAWI_DDRAWSURFACE_INT *That, - LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, + LPDDRAWI_DDRAWSURFACE_INT That, + LPDDRAWI_DDRAWSURFACE_LCL lpLcl, LPDDSURFACEDESC2 pDDSD) { DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; DDHAL_CREATESURFACEDATA mDdCreateSurface; - DxHeapMemAlloc( That[0]->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (That[0]->lpLcl->lpSurfMore == NULL) + DxHeapMemAlloc( That->lpLcl->lpSurfMore, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + if (That->lpLcl->lpSurfMore == NULL) { DxHeapMemFree(That); return DDERR_OUTOFMEMORY; } - That[0]->lpLcl->lpSurfMore->slist = lpLcl; - - That[0]->lpVtbl = &DirectDrawSurface7_Vtable; - That[0]->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - That[0]->lpLcl->lpSurfMore->lpDD_int = This; - That[0]->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; - That[0]->lpLcl->lpSurfMore->slist[0] = That[0]->lpLcl; - That[0]->lpLcl->dwProcessId = GetCurrentProcessId(); + // That->lpLcl->lpSurfMore->slist = lpLcl; + + That->lpVtbl = &DirectDrawSurface7_Vtable; + That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + That->lpLcl->lpSurfMore->lpDD_int = This; + That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; + That->lpLcl->lpSurfMore->slist[0] = That->lpLcl; + That->lpLcl->dwProcessId = GetCurrentProcessId(); mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; if (pDDSD->dwFlags & DDSD_PIXELFORMAT) { - That[0]->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; + That->lpLcl->dwFlags |= DDRAWISURF_HASPIXELFORMAT; mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; } else @@ -142,14 +195,14 @@ mDdCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; mDdCreateSurface.ddRVal = DDERR_GENERIC; - mDdCreateSurface.dwSCnt = That[0]->dwIntRefCnt + 1; // is this correct + mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; - - That[0]->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; - - This->lpLcl->lpPrimary = That[0]; + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + + That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; + + This->lpLcl->lpPrimary = That; if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -160,7 +213,7 @@ return DDERR_NOTINITIALIZED; } - mDdCreateSurface.lplpSList = That[0]->lpLcl->lpSurfMore->slist; + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { @@ -172,10 +225,10 @@ return mDdCreateSurface.ddRVal; } - That[0]->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; - - That[0]->lpLink = This->lpLcl->lpGbl->dsList; - This->lpLcl->lpGbl->dsList = That[0]; + That->lpLcl->lpSurfMore->slist = mDdCreateSurface.lplpSList ; + + That->lpLink = This->lpLcl->lpGbl->dsList; + This->lpLcl->lpGbl->dsList = That; return DD_OK; } Modified: trunk/reactos/dll/directx/ddraw/Surface/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface.h (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface.h Mon Jun 18 01:49:35 2007 @@ -71,5 +71,6 @@ // internal functions HRESULT CreateOverlaySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDSURFACEDESC2 pDDSD); HRESULT CreateBackBufferSurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That, LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); -HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT *That,LPDDRAWI_DDRAWSURFACE_LCL *lpLcl, LPDDSURFACEDESC2 pDDSD); +HRESULT CreatePrimarySurface(LPDDRAWI_DIRECTDRAW_INT This, LPDDRAWI_DDRAWSURFACE_INT That,LPDDRAWI_DDRAWSURFACE_LCL lpLcl, LPDDSURFACEDESC2 pDDSD); + Modified: trunk/reactos/dll/directx/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main.c?r… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main.c (original) +++ trunk/reactos/dll/directx/ddraw/main.c Mon Jun 18 01:49:35 2007 @@ -18,6 +18,28 @@ CRITICAL_SECTION ddcs; // This function is exported by the dll + + + +/*++ +* @name DirectDrawCreateClipper +* +* The DirectDrawCreateClipper routine <FILLMEIN>. +* +* @param dwFlags +* <FILLMEIN>. +* +* @param lplpDDClipper +* <FILLMEIN>. +* +* @param pUnkOuter +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI DirectDrawCreateClipper (DWORD dwFlags, LPDIRECTDRAWCLIPPER* lplpDDClipper, LPUNKNOWN pUnkOuter) { @@ -26,10 +48,26 @@ return Main_DirectDraw_CreateClipper(NULL, dwFlags, lplpDDClipper, pUnkOuter); } -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ +/*++ +* @name DirectDrawCreate +* +* The DirectDrawCreate routine <FILLMEIN>. +* +* @param lpGUID +* <FILLMEIN>. +* +* @param lplpDD +* <FILLMEIN>. +* +* @param pUnkOuter +* Alwas set to NULL other wise will DirectDrawCreate fail it return +* errror code CLASS_E_NOAGGREGATION +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI @@ -64,11 +102,26 @@ return retVal; } -/* - * IMPLEMENT - * Status this api is finish and is 100% correct - */ - +/*++ +* @name DirectDrawCreateEx +* +* The DirectDrawCreateEx routine <FILLMEIN>. +* +* @param lpGUID +* <FILLMEIN>. +* +* @param lplpDD +* <FILLMEIN>. +* +* @param pUnkOuter +* Alwas set to NULL other wise will DirectDrawCreateEx fail it return +* errror code CLASS_E_NOAGGREGATION +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ HRESULT WINAPI DirectDrawCreateEx(LPGUID lpGUID, @@ -187,6 +240,46 @@ sizeof(D3DHAL_DP2COMMAND) + ( D3DHAL_DP2COMMAND->wStateCount * sizeof(D3DHAL_DP2VIEWPORTINFO)); to get the xxxx end positions. */ + +/*++ +* @name D3DParseUnknownCommand +* +* The D3DParseUnknownCommand routine <FILLMEIN>. +* +* @param lpCmd +* Is a typcast to LPD3DHAL_DP2COMMAND struct +* typedef struct _D3DHAL_DP2COMMAND +* { +* BYTE bCommand; +* BYTE bReserved; +* union +* { +* WORD wPrimitiveCount; +* WORD wStateCount; +* }; +* } D3DHAL_DP2COMMAND, *LPD3DHAL_DP2COMMAND; +* +* lpCmd->bCommand +* only accpect D3DDP2OP_VIEWPORTINFO, and undocument command 0x0D +* rest of the command will be return error code for. +* + Command 0x0D +* dp2command->bReserved +* is how big struect we got in wStateCount or how many wStateCount we got +* do not known more about it, no info in msdn about it either. +* +* Command D3DDP2OP_VIEWPORTINFO +* <FILLMEIN>. +* +* @param lpRetCmd +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks + +* +*--*/ HRESULT WINAPI D3DParseUnknownCommand( LPVOID lpCmd, Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon Jun 18 01:49:35 2007 @@ -127,7 +127,7 @@ } else if (IsEqualGUID(&IID_IDirectDraw, id)) { - /* DirectDraw4 Vtable */ + /* DirectDraw Vtable */ This->lpVtbl = &DirectDraw_Vtable; *pIface = (LPDIRECTDRAW)&This->lpVtbl; Main_DirectDraw_AddRef((LPDIRECTDRAW7)This);

1 0

[arty] 27217: - Some random imports from ntoskrnl (ndis header, bugcodes) - Lean out ntoskrnl entry point to make it more like the new style in trunk - Implement loading by imports in freeldr and move import resolution there - Fix ppcmmu BAT snooping - We'll remove our serial debug hack in KiSystemService once we verify kdcom/kd serial works
by arty＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: arty Date: Mon Jun 18 01:18:25 2007 New Revision: 27217 URL: http://svn.reactos.org/svn/reactos?rev=27217&view=rev Log: - Some random imports from ntoskrnl (ndis header, bugcodes) - Lean out ntoskrnl entry point to make it more like the new style in trunk - Implement loading by imports in freeldr and move import resolution there - Fix ppcmmu BAT snooping - We'll remove our serial debug hack in KiSystemService once we verify kdcom/kd serial works Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/powerpc/reactos/include/ddk/ndis.h branches/powerpc/reactos/include/reactos/bugcodes.h branches/powerpc/reactos/include/reactos/buildno.h branches/powerpc/reactos/include/reactos/errcodes.h branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h branches/powerpc/reactos/ntoskrnl/bugcodes.rc branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/powerpc/reactos/ntoskrnl/ke/freeldr.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Mon Jun 18 01:18:25 2007 @@ -30,7 +30,7 @@ #define NDEBUG #include <debug.h> -static PVOID KernelMemory = 0; +PVOID KernelMemory = 0; extern boot_infos_t BootInfo; /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ @@ -39,20 +39,6 @@ /* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */ #define PDE_SHIFT 22 #define PDE_SHIFT_PAE 18 - - -/* Converts a Relative Address read from the Kernel into a Physical Address */ -ULONG RaToPa(ULONG p) { - return (ULONG)(KernelMemory) + p; -} - -/* Converts a Phsyical Address Pointer into a Page Frame Number */ -#define PaPtrToPfn(p) \ - (((ULONG_PTR)&p) >> PFN_SHIFT) - -/* Converts a Phsyical Address into a Page Frame Number */ -#define PaToPfn(p) \ - ((p) >> PFN_SHIFT) #define STARTUP_BASE 0xC0000000 #define HYPERSPACE_BASE 0xC0400000 @@ -74,7 +60,7 @@ #define BAT_GRANULARITY (64 * 1024) -#define KernelMemorySize (16 * 1024 * 1024) +#define KernelMemorySize (8 * 1024 * 1024) #define KernelEntryPoint (KernelEntry - KERNEL_BASE_PHYS) + KernelBase #define XROUNDUP(x,n) ((((ULONG)x) + ((n) - 1)) & (~((n) - 1))) @@ -95,6 +81,15 @@ /* Dummy to bring in memmove */ PVOID memmove_dummy = memmove; + +PLOADER_MODULE +NTAPI +LdrGetModuleObject(PCHAR ModuleName); + +NTSTATUS +NTAPI +LdrPEFixupImports(IN PVOID DllBase, + IN PCHAR DllName); /* FUNCTIONS *****************************************************************/ @@ -116,34 +111,6 @@ *--*/ typedef void (*KernelEntryFn)( void * ); - -VOID -DrawDigit(boot_infos_t *BootInfo, ULONG Digit, int x, int y) -{ - int i,j,k; - - for( i = 0; i < 7; i++ ) { - for( j = 0; j < 8; j++ ) { - for( k = 0; k < BootInfo->dispDeviceDepth/8; k++ ) { - SetPhysByte(((ULONG_PTR)BootInfo->dispDeviceBase)+ - k + - (((j+x) * (BootInfo->dispDeviceDepth/8)) + - ((i+y) * (BootInfo->dispDeviceRowBytes))), - BootInfo->dispFont[Digit][i*8+j] == ' ' ? 0 : 255); - } - } - } -} - -VOID -DrawNumber(boot_infos_t *BootInfo, ULONG Number, int x, int y) -{ - int i; - - for( i = 0; i < 8; i++, Number<<=4 ) { - DrawDigit(BootInfo,(Number>>28)&0xf,x+(i*8),y); - } -} int MmuPageMiss(int inst, ppc_trap_frame_t *trap) { @@ -161,24 +128,35 @@ { KernelEntryFn KernelEntryAddress = (KernelEntryFn)(KernelEntry + KernelBase); - ULONG_PTR i, page; + ULONG_PTR i, j, page, count; + PCHAR ModHeader; boot_infos_t *LocalBootInfo = &BootInfo; LocalBootInfo->dispFont = (font_char *)&LocalBootInfo[1]; LoaderBlock.ArchExtra = (ULONG)LocalBootInfo; ppc_map_info_t *info = MmAllocateMemory(0x80 * sizeof(*info)); + for(i = 0; i < LoaderBlock.ModsCount; i++) + { + ModHeader = ((PCHAR)reactos_modules[i].ModStart); + if(ModHeader[0] == 'M' && ModHeader[1] == 'Z') + LdrPEFixupImports + ((PVOID)reactos_modules[i].ModStart, + (PCHAR)reactos_modules[i].String); + } + /* We'll use vsid 1 for freeldr (expendable) */ for(i = 0; i < 8; i++) { MmuAllocVsid(16 + i); - MmuSetVsid(i, i+1, 1); - } + } + MmuSetVsid(0, 8, 1); + /* Vsid 0 is reactos kernel */ for(i = 8; i < 16; i++) { MmuAllocVsid(i); - MmuSetVsid(i, i+1, 0); - } + } + MmuSetVsid(8, 16, 0); MmuSetPageCallback(MmuPageMiss); @@ -197,19 +175,37 @@ MmuMapPage(info, page); /* Map module name strings */ - for( i = 0; i < LoaderBlock.ModsCount; i++ ) + for( count = 0, i = 0; i < LoaderBlock.ModsCount; i++ ) { page = ROUND_DOWN(((ULONG)reactos_modules[i].String), (1<<PFN_SHIFT)); - info[i].flags = MMU_ALL_RW; - info[i].proc = 1; - info[i].addr = page; - info[i].phys = page; // PpcVirt2phys(page, 0); - MmuMapPage(info, 1); - } - - info[i].addr = (ULONG)&LoaderBlock; - info[i].phys = info[i].addr; - MmuMapPage(info, 1); + for( j = 0; j < count; j++ ) + { + if(info[j].addr == page) break; + } + if( j != count ) + { + info[count].flags = MMU_ALL_RW; + info[count].proc = 1; + info[count].addr = page; + info[count].phys = page; // PpcVirt2phys(page, 0); + count++; + } + } + + page = ROUND_DOWN((vaddr_t)&LoaderBlock, (1 << PAGE_SHIFT)); + for( j = 0; j < count; j++ ) + { + if(info[j].addr == page) break; + } + if( j != count ) + { + info[count].flags = MMU_ALL_RW; + info[count].proc = 1; + info[count].addr = page; + info[count].phys = page; // PpcVirt2phys(page, 0); + count++; + } + MmuMapPage(info, count); MmuTurnOn(KernelEntryAddress, (void*)&LoaderBlock); @@ -364,6 +360,16 @@ PCHAR sptr; Elf32_Ehdr ehdr; Elf32_Shdr *shdr; + LPSTR TempName; + + TempName = strrchr(ImageName, '\\'); + if(TempName) TempName++; else TempName = (LPSTR)ImageName; + ModuleData = LdrGetModuleObject(TempName); + + if(ModuleData) + { + return TRUE; + } if(!KernelAddr) KernelAddr = (ULONG)NextModuleBase - (ULONG)KernelMemory + KernelBase; @@ -579,6 +585,11 @@ ModuleData->ModEnd = NextModuleBase; ModuleData->String = (ULONG)MmAllocateMemory(strlen(ImageName)+1); strcpy((PCHAR)ModuleData->String, ImageName); + printf("Module %s (%x-%x) next at %x\n", + ModuleData->String, + ModuleData->ModStart, + ModuleData->ModEnd, + NextModuleBase); LoaderBlock.ModsCount++; /* Return Success */ @@ -627,8 +638,6 @@ LPSTR NameBuffer; LPSTR TempName; - printf("Load module %s at %x\n", ModuleName, (ULONG)NextModuleBase - (ULONG)KernelMemory + KernelBase); - /* Get current module data structure and module name string array */ ModuleData = &reactos_modules[LoaderBlock.ModsCount]; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Mon Jun 18 01:18:25 2007 @@ -34,7 +34,8 @@ BOOLEAN PpcPrepConsKbHit() { - return GetPhysByte(prep_serial+5) & 1; + return 1; + //return GetPhysByte(prep_serial+5) & 1; } int PpcPrepConsGetCh() Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Mon Jun 18 01:18:25 2007 @@ -76,6 +76,7 @@ <file>prep_pci.c</file> <file>prep_vga.c</file> <file>mboot.c</file> + <file>loader.c</file> </module> </if> </directory> Modified: branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c Mon Jun 18 01:18:25 2007 @@ -35,6 +35,7 @@ unsigned long reactos_disk_count = 0; CHAR szHalName[255]; CHAR szBootPath[255]; +CHAR SystemRoot[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; @@ -199,6 +200,8 @@ CHAR szFileName[256]; ULONG BufferSize; + strcpy(SystemRoot, szSystemRoot); + /* open the codepage key */ rc = RegOpenKey(NULL, L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage", @@ -300,7 +303,7 @@ return(TRUE); } -static BOOLEAN +BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos) { @@ -312,6 +315,25 @@ /* Open the Driver */ FilePointer = FsOpenFile(szFileName); + + /* Try under the system root in the main dir and drivers */ + if (FilePointer == NULL) + { + strcpy(value, SystemRoot); + strcat(value, "SYSTEM32\\"); + strcat(value, szFileName); + printf("Trying %s\n", value); + FilePointer = FsOpenFile(value); + } + + if (FilePointer == NULL) + { + strcpy(value, SystemRoot); + strcat(value, "SYSTEM32\\DRIVERS\\"); + strcat(value, szFileName); + printf("Trying %s\n", value); + FilePointer = FsOpenFile(value); + } /* Make sure we did */ if (FilePointer == NULL) { Modified: branches/powerpc/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ddk/ndi… ============================================================================== --- branches/powerpc/reactos/include/ddk/ndis.h (original) +++ branches/powerpc/reactos/include/ddk/ndis.h Mon Jun 18 01:18:25 2007 @@ -1806,7 +1806,7 @@ VirtualAddress, \ Length) \ { \ - if (VirtualAddress) \ + if (ARGUMENT_PRESENT(VirtualAddress)) \ *((PVOID*)VirtualAddress) = MmGetSystemAddressForMdl(Buffer); \ \ *((PUINT)Length) = MmGetMdlByteCount(Buffer); \ @@ -2022,48 +2022,52 @@ * OUT PNDIS_BUFFER *FirstBuffer OPTIONAL, * OUT PUINT TotalPacketLength OPTIONAL); */ -#define NdisQueryPacket(Packet, \ - PhysicalBufferCount, \ - BufferCount, \ - FirstBuffer, \ - TotalPacketLength) \ -{ \ - if (FirstBuffer) \ - *((PNDIS_BUFFER*)FirstBuffer) = (Packet)->Private.Head; \ - if ((TotalPacketLength) || (BufferCount) || (PhysicalBufferCount)) \ - { \ - if (!(Packet)->Private.ValidCounts) { \ - UINT _Offset; \ - UINT _PacketLength; \ - PNDIS_BUFFER _NdisBuffer; \ - UINT _PhysicalBufferCount = 0; \ - UINT _TotalPacketLength = 0; \ - UINT _Count = 0; \ - \ - for (_NdisBuffer = (Packet)->Private.Head; \ - _NdisBuffer != (PNDIS_BUFFER)NULL; \ - _NdisBuffer = _NdisBuffer->Next) \ - { \ - _PhysicalBufferCount += NDIS_BUFFER_TO_SPAN_PAGES(_NdisBuffer); \ - NdisQueryBufferOffset(_NdisBuffer, &_Offset, &_PacketLength); \ - _TotalPacketLength += _PacketLength; \ - _Count++; \ - } \ - (Packet)->Private.PhysicalCount = _PhysicalBufferCount; \ - (Packet)->Private.TotalLength = _TotalPacketLength; \ - (Packet)->Private.Count = _Count; \ - (Packet)->Private.ValidCounts = TRUE; \ - } \ - \ - if (PhysicalBufferCount) \ - *((PUINT)PhysicalBufferCount) = (Packet)->Private.PhysicalCount; \ - \ - if (BufferCount) \ - *((PUINT)BufferCount) = (Packet)->Private.Count; \ - \ - if (TotalPacketLength) \ - *((PUINT)TotalPacketLength) = (Packet)->Private.TotalLength; \ - } \ +static __inline +VOID +NdisQueryPacket( + IN PNDIS_PACKET Packet, + OUT PUINT PhysicalBufferCount OPTIONAL, + OUT PUINT BufferCount OPTIONAL, + OUT PNDIS_BUFFER *FirstBuffer OPTIONAL, + OUT PUINT TotalPacketLength OPTIONAL) +{ + if (FirstBuffer) + *FirstBuffer = Packet->Private.Head; + if (TotalPacketLength || BufferCount || PhysicalBufferCount) + { + if (!Packet->Private.ValidCounts) + { + UINT Offset; + UINT PacketLength; + PNDIS_BUFFER NdisBuffer; + UINT PhysicalBufferCount = 0; + UINT TotalPacketLength = 0; + UINT Count = 0; + + for (NdisBuffer = Packet->Private.Head; + NdisBuffer != (PNDIS_BUFFER)NULL; + NdisBuffer = NdisBuffer->Next) + { + PhysicalBufferCount += NDIS_BUFFER_TO_SPAN_PAGES(NdisBuffer); + NdisQueryBufferOffset(NdisBuffer, &Offset, &PacketLength); + TotalPacketLength += PacketLength; + Count++; + } + Packet->Private.PhysicalCount = PhysicalBufferCount; + Packet->Private.TotalLength = TotalPacketLength; + Packet->Private.Count = Count; + Packet->Private.ValidCounts = TRUE; + } + + if (PhysicalBufferCount) + *PhysicalBufferCount = Packet->Private.PhysicalCount; + + if (BufferCount) + *BufferCount = Packet->Private.Count; + + if (TotalPacketLength) + *TotalPacketLength = Packet->Private.TotalLength; + } } /* @@ -2281,7 +2285,7 @@ #endif -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_IX86) || defined(_M_AMD64) || defined(_M_PPC) /* * VOID @@ -2305,17 +2309,17 @@ #else #define NdisMoveMappedMemory(Destination, Source, Length) \ -{ \ - PUCHAR _Dest = Destination, _Src = Source, _End = _Dest + Length; \ - while (_Dest < _End) \ - *_Dest++ = _Src++; \ +{ + PUCHAR _Dest = Destination, _Src = Source, _End = _Dest + Length; + while (_Dest < _End) + *_Dest++ = _Src++; } #define NdisZeroMappedMemory(Destination, Length) \ -{ \ - PUCHAR _Dest = Destination, _End = _Dest + Length; \ - while (_Dest < _End) \ - *_Dest++ = 0; \ +{ + PUCHAR _Dest = Destination, _End = _Dest + Length; + while (_Dest < _End) + *_Dest++ = 0; } #endif /* _M_IX86 or _M_AMD64 */ @@ -4126,6 +4130,7 @@ KEVENT DpcsCompletedEvent; } NDIS_INTERRUPT, *PNDIS_INTERRUPT; + typedef enum _NDIS_WORK_ITEM_TYPE { NdisWorkItemRequest, NdisWorkItemSend, @@ -4255,19 +4260,19 @@ IN PUCHAR Packet, IN ULONG PacketSize); -typedef VOID DDKFASTAPI +typedef VOID FASTCALL (*NDIS_M_DEQUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, OUT PVOID *WorkItemContext); -typedef NDIS_STATUS DDKFASTAPI +typedef NDIS_STATUS FASTCALL (*NDIS_M_QUEUE_NEW_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, IN PVOID WorkItemContext); -typedef NDIS_STATUS DDKFASTAPI +typedef NDIS_STATUS FASTCALL (*NDIS_M_QUEUE_WORK_ITEM)( IN PNDIS_MINIPORT_BLOCK Miniport, IN NDIS_WORK_ITEM_TYPE WorkItemType, @@ -4294,7 +4299,7 @@ (*NDIS_M_SEND_RESOURCES_HANDLER)( IN NDIS_HANDLE MiniportAdapterHandle); -typedef BOOLEAN DDKFASTAPI +typedef BOOLEAN FASTCALL (*NDIS_M_START_SENDS)( IN PNDIS_MINIPORT_BLOCK Miniport); Modified: branches/powerpc/reactos/include/reactos/bugcodes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/bugcodes.h (original) +++ branches/powerpc/reactos/include/reactos/bugcodes.h Mon Jun 18 01:18:25 2007 @@ -1,10 +1,10 @@ /* This file is generated with wmc version 0.3.0. Do not edit! */ /* Source : ntoskrnl/ntoskrnl.mc */ /* Cmdline: wmc -i -H include/reactos/bugcodes.h -o ntoskrnl/bugcodes.rc ntoskrnl/ntoskrnl.mc */ -/* Date : Sun Apr 1 07:41:30 2007 */ - -#ifndef __WMCGENERATED_460f622a_H -#define __WMCGENERATED_460f622a_H +/* Date : Wed Jun 13 06:44:39 2007 */ + +#ifndef __WMCGENERATED_466f9257_H +#define __WMCGENERATED_466f9257_H /* Severity codes */ #define STATUS_SEVERITY_ERROR 0x3 @@ -550,6 +550,22 @@ /* Approx. msg: The BIOS in this system is not fully ACPI compliant. Please contact your */ #define ACPI_BIOS_ERROR ((ULONG)0x000000a5L) +/* MessageId : 0x400000a8 */ +/* Approx. msg: The system is booting in safemode - Minimal Services */ +#define BOOTING_IN_SAFEMODE_MINIMAL ((ULONG)0x400000a8L) + +/* MessageId : 0x400000a9 */ +/* Approx. msg: The system is booting in safemode - Minimal Services with Network */ +#define BOOTING_IN_SAFEMODE_NETWORK ((ULONG)0x400000a9L) + +/* MessageId : 0x400000aa */ +/* Approx. msg: The system is booting in safemode - Directory Services Repair */ +#define BOOTING_IN_SAFEMODE_DSREPAIR ((ULONG)0x400000aaL) + +/* MessageId : 0x400000b7 */ +/* Approx. msg: Boot Logging Enabled */ +#define BOOTLOG_ENABLED ((ULONG)0x400000b7L) + /* MessageId : 0x000000be */ /* Approx. msg: ATTEMPTED_WRITE_TO_READONLY_MEMORY */ #define ATTEMPTED_WRITE_TO_READONLY_MEMORY ((ULONG)0x000000beL) @@ -635,7 +651,7 @@ #define WINDOWS_NT_INFO_STRING ((ULONG)0x40000088L) /* MessageId : 0x40000089 */ -/* Approx. msg: MulitProcessor Kernel */ +/* Approx. msg: MultiProcessor Kernel */ #define WINDOWS_NT_MP_STRING ((ULONG)0x40000089L) /* MessageId : 0x4000009d */ Modified: branches/powerpc/reactos/include/reactos/buildno.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/buildno.h (original) +++ branches/powerpc/reactos/include/reactos/buildno.h Mon Jun 18 01:18:25 2007 @@ -1,9 +1,9 @@ /* Do not edit - Machine generated */ #ifndef _INC_REACTOS_BUILDNO #define _INC_REACTOS_BUILDNO -#define KERNEL_VERSION_BUILD 20070523 -#define KERNEL_VERSION_BUILD_STR "20070523-rUNKNOWN" -#define KERNEL_VERSION_BUILD_RC "20070523-rUNKNOWN\0" +#define KERNEL_VERSION_BUILD 20070613 +#define KERNEL_VERSION_BUILD_STR "20070613-rUNKNOWN" +#define KERNEL_VERSION_BUILD_RC "20070613-rUNKNOWN\0" #define KERNEL_RELEASE_RC "0.4-SVN\0" #define KERNEL_RELEASE_STR "0.4-SVN" #define KERNEL_VERSION_RC "0.4-SVN\0" Modified: branches/powerpc/reactos/include/reactos/errcodes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/errcodes.h (original) +++ branches/powerpc/reactos/include/reactos/errcodes.h Mon Jun 18 01:18:25 2007 @@ -1,10 +1,10 @@ /* This file is generated with wmc version 0.3.0. Do not edit! */ /* Source : dll/win32/kernel32/kernel32.mc */ /* Cmdline: wmc -i -U -H include/reactos/errcodes.h -o dll/win32/kernel32/errcodes.rc dll/win32/kernel32/kernel32.mc */ -/* Date : Wed May 23 04:08:35 2007 */ - -#ifndef __WMCGENERATED_4653be43_H -#define __WMCGENERATED_4653be43_H +/* Date : Wed Jun 13 06:13:07 2007 */ + +#ifndef __WMCGENERATED_466f8af3_H +#define __WMCGENERATED_466f8af3_H /* Severity codes */ #define STATUS_SEVERITY_ERROR 0x3 Modified: branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… ============================================================================== --- branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h (original) +++ branches/powerpc/reactos/include/reactos/ppcmmu/mmu.h Mon Jun 18 01:18:25 2007 @@ -96,15 +96,14 @@ int (*mmumain)(int action, void *arg1, void *arg2, void *arg3) = (void *)MMUCODE; __asm__("bl 1f\n\t" "\n1:\n\t" - "mflr 0\n\t" - "stw 0,0(%0)" : : "r" (&pc)); + "mflr %0\n\t" : "=r" (pc)); for(i = 0, gotbat = 0; i < 4 && gotbat < 2; i++) { GetBat(i, 1, &batu, &batl); - if(batu & 0x3fc) + if(batu & 0xffc) { - mask = ~(0x1ffff | ((batu & 0x3fc)>>2)<<17); + mask = ~(0x1ffff | ((batu & 0xffc)>>2)<<17); if(!(batu & 2) || ((batu & mask) != (pc & mask))) usebat[gotbat++] = i; } else { Modified: branches/powerpc/reactos/ntoskrnl/bugcodes.rc URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/bugcod… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/bugcodes.rc (original) +++ branches/powerpc/reactos/ntoskrnl/bugcodes.rc Mon Jun 18 01:18:25 2007 @@ -1,40 +1,46 @@ /* This file is generated with wmc version 0.3.0. Do not edit! */ /* Source : ntoskrnl/ntoskrnl.mc */ /* Cmdline: wmc -i -H include/reactos/bugcodes.h -o ntoskrnl/bugcodes.rc ntoskrnl/ntoskrnl.mc */ -/* Date : Wed May 23 04:08:35 2007 */ +/* Date : Wed Jun 13 06:44:39 2007 */ 1 MESSAGETABLE LANGUAGE 0x9, 0x1 { - /* NBlocks */ 0x0000001bL, - /* Lo,Hi,Offs */ 0x00000000L, 0x00000039L, 0x00000148L, - /* Lo,Hi,Offs */ 0x0000003eL, 0x00000042L, 0x00000c74L, - /* Lo,Hi,Offs */ 0x00000044L, 0x00000045L, 0x00000e04L, - /* Lo,Hi,Offs */ 0x00000048L, 0x00000059L, 0x00000e4cL, - /* Lo,Hi,Offs */ 0x0000005cL, 0x0000007bL, 0x00001060L, - /* Lo,Hi,Offs */ 0x0000007dL, 0x00000080L, 0x00001588L, - /* Lo,Hi,Offs */ 0x0000008eL, 0x0000008eL, 0x000017acL, - /* Lo,Hi,Offs */ 0x00000094L, 0x00000094L, 0x000017c8L, - /* Lo,Hi,Offs */ 0x00000096L, 0x00000096L, 0x000017ecL, - /* Lo,Hi,Offs */ 0x000000a5L, 0x000000a5L, 0x0000180cL, - /* Lo,Hi,Offs */ 0x000000beL, 0x000000beL, 0x00001880L, - /* Lo,Hi,Offs */ 0x000000c3L, 0x000000c3L, 0x00001918L, - /* Lo,Hi,Offs */ 0x000000c5L, 0x000000c5L, 0x00001a84L, - /* Lo,Hi,Offs */ 0x000000c8L, 0x000000c8L, 0x00001d04L, - /* Lo,Hi,Offs */ 0x000000cbL, 0x000000cbL, 0x00001df4L, - /* Lo,Hi,Offs */ 0x000000ceL, 0x000000ceL, 0x00001e20L, - /* Lo,Hi,Offs */ 0x000000d0L, 0x000000d1L, 0x00001e5cL, - /* Lo,Hi,Offs */ 0x000000d3L, 0x000000d4L, 0x00001ea0L, - /* Lo,Hi,Offs */ 0x000000d8L, 0x000000d8L, 0x00001f08L, - /* Lo,Hi,Offs */ 0x000000e0L, 0x000000e5L, 0x00001f28L, - /* Lo,Hi,Offs */ 0x000000e9L, 0x000000eaL, 0x0000217cL, - /* Lo,Hi,Offs */ 0x000000efL, 0x000000efL, 0x0000229cL, - /* Lo,Hi,Offs */ 0x000000f4L, 0x000000f4L, 0x000022b8L, - /* Lo,Hi,Offs */ 0x000000faL, 0x000000faL, 0x000022dcL, - /* Lo,Hi,Offs */ 0x000000fcL, 0x000000fcL, 0x00002300L, - /* Lo,Hi,Offs */ 0x4000009aL, 0x4000009fL, 0x0000232cL, - /* Lo,Hi,Offs */ 0x8000007fL, 0x80000083L, 0x000024b8L, + /* NBlocks */ 0x00000021L, + /* Lo,Hi,Offs */ 0x00000000L, 0x00000039L, 0x00000190L, + /* Lo,Hi,Offs */ 0x0000003eL, 0x00000042L, 0x00000cbcL, + /* Lo,Hi,Offs */ 0x00000044L, 0x00000045L, 0x00000e4cL, + /* Lo,Hi,Offs */ 0x00000048L, 0x00000059L, 0x00000e94L, + /* Lo,Hi,Offs */ 0x0000005cL, 0x0000007bL, 0x000010a8L, + /* Lo,Hi,Offs */ 0x0000007dL, 0x00000080L, 0x000015d0L, + /* Lo,Hi,Offs */ 0x0000008eL, 0x00000090L, 0x000017f4L, + /* Lo,Hi,Offs */ 0x00000094L, 0x00000094L, 0x00001850L, + /* Lo,Hi,Offs */ 0x00000096L, 0x00000096L, 0x00001874L, + /* Lo,Hi,Offs */ 0x000000a0L, 0x000000a0L, 0x00001894L, + /* Lo,Hi,Offs */ 0x000000a5L, 0x000000a5L, 0x000018b0L, + /* Lo,Hi,Offs */ 0x000000beL, 0x000000beL, 0x00001924L, + /* Lo,Hi,Offs */ 0x000000c3L, 0x000000c3L, 0x000019bcL, + /* Lo,Hi,Offs */ 0x000000c5L, 0x000000c5L, 0x00001b28L, + /* Lo,Hi,Offs */ 0x000000c8L, 0x000000c8L, 0x00001da8L, + /* Lo,Hi,Offs */ 0x000000cbL, 0x000000cbL, 0x00001e98L, + /* Lo,Hi,Offs */ 0x000000ceL, 0x000000ceL, 0x00001ec4L, + /* Lo,Hi,Offs */ 0x000000d0L, 0x000000d1L, 0x00001f00L, + /* Lo,Hi,Offs */ 0x000000d3L, 0x000000d4L, 0x00001f44L, + /* Lo,Hi,Offs */ 0x000000d8L, 0x000000d8L, 0x00001facL, + /* Lo,Hi,Offs */ 0x000000e0L, 0x000000e5L, 0x00001fccL, + /* Lo,Hi,Offs */ 0x000000e9L, 0x000000eaL, 0x00002220L, + /* Lo,Hi,Offs */ 0x000000efL, 0x000000efL, 0x00002340L, + /* Lo,Hi,Offs */ 0x000000f4L, 0x000000f4L, 0x0000235cL, + /* Lo,Hi,Offs */ 0x000000faL, 0x000000faL, 0x00002380L, + /* Lo,Hi,Offs */ 0x000000fcL, 0x000000fcL, 0x000023a4L, + /* Lo,Hi,Offs */ 0x4000007eL, 0x4000007eL, 0x000023d0L, + /* Lo,Hi,Offs */ 0x40000087L, 0x40000089L, 0x000023fcL, + /* Lo,Hi,Offs */ 0x4000009dL, 0x4000009dL, 0x00002458L, + /* Lo,Hi,Offs */ 0x4000009fL, 0x4000009fL, 0x00002484L, + /* Lo,Hi,Offs */ 0x400000a8L, 0x400000aaL, 0x00002564L, + /* Lo,Hi,Offs */ 0x400000b7L, 0x400000b7L, 0x0000262cL, + /* Lo,Hi,Offs */ 0x8000007fL, 0x80000083L, 0x00002648L, /* Msg 0x00000000 */ 0x0048, 0x0000, "The bug code is undefined. Please use an existing code instead.\n\x00\x00\x00\x00", @@ -424,11 +430,20 @@ /* Msg 0x0000008e */ 0x001c, 0x0000, "SPIN_LOCK_INIT_FAILURE\n\x00", + /* Msg 0x0000008f */ 0x0020, 0x0000, + "PP0_INITIALIZATION_FAILED\n\x00\x00", + + /* Msg 0x00000090 */ 0x0020, 0x0000, + "PP1_INITIALIZATION_FAILED\n\x00\x00", + /* Msg 0x00000094 */ 0x0024, 0x0000, "KERNEL_STACK_LOCKED_AT_EXIT\n\x00\x00\x00\x00", /* Msg 0x00000096 */ 0x0020, 0x0000, "INVALID_WORK_QUEUE_ITEM\n\x00\x00\x00\x00", + + /* Msg 0x000000a0 */ 0x001c, 0x0000, + "INTERNAL_POWER_ERROR\n\x00\x00\x00", /* Msg 0x000000a5 */ 0x0074, 0x0000, "The BIOS in this system is not fully ACPI compliant. Please contact you", @@ -530,19 +545,19 @@ /* Msg 0x000000fc */ 0x002c, 0x0000, "ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY\n\x00\x00", - /* Msg 0x4000009a */ 0x0024, 0x0000, - "ReactOS Version %s (Build %s)\n\x00\x00", - - /* Msg 0x4000009b */ 0x0014, 0x0000, + /* Msg 0x4000007e */ 0x002c, 0x0000, + "ReactOS (R) Version %hs (Build %u%hs)\n\x00\x00", + + /* Msg 0x40000087 */ 0x0014, 0x0000, "Service Pack\n\x00\x00\x00", - /* Msg 0x4000009c */ 0x002c, 0x0000, + /* Msg 0x40000088 */ 0x002c, 0x0000, "%u System Processor [%u MB Memory] %Z\n\x00\x00", - /* Msg 0x4000009d */ 0x001c, 0x0000, - "MulitProcessor Kernel\n\x00\x00", - - /* Msg 0x4000009e */ 0x002c, 0x0000, + /* Msg 0x40000089 */ 0x001c, 0x0000, + "MultiProcessor Kernel\n\x00\x00", + + /* Msg 0x4000009d */ 0x002c, 0x0000, "%u System Processors [%u MB Memory] %Z\n\x00", /* Msg 0x4000009f */ 0x00e0, 0x0000, @@ -550,6 +565,18 @@ "e,\n and you\\n are welcome to change it and/or distribute copies of it ", "under\n certain\\n conditions. There is absolutely no warranty for React", "OS.\\n\n\x00\x00\x00\x00", + + /* Msg 0x400000a8 */ 0x003c, 0x0000, + "The system is booting in safemode - Minimal Services\n\x00\x00\x00", + + /* Msg 0x400000a9 */ 0x0048, 0x0000, + "The system is booting in safemode - Minimal Services with Network\n\x00\x00", + + /* Msg 0x400000aa */ 0x0044, 0x0000, + "The system is booting in safemode - Directory Services Repair\n\x00\x00", + + /* Msg 0x400000b7 */ 0x001c, 0x0000, + "Boot Logging Enabled\n\x00\x00\x00", /* Msg 0x8000007f */ 0x0064, 0x0000, "A problem has been detected and ReactOS has been shut down to prevent da", Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h Mon Jun 18 01:18:25 2007 @@ -17,6 +17,7 @@ #ifdef _NTOSKRNL_ +#define NUM_BOOT_DRIVERS 32 #define KeGetCurrentThread _KeGetCurrentThread #define KeGetPreviousMode _KeGetPreviousMode #undef PsGetCurrentProcess @@ -353,4 +354,12 @@ C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); #endif +#ifdef _PPC_ +#define SWAPD(x) ((((x)&0xff)<<24)|(((x)&0xff00)<<8)|(((x)>>8)&0xff00)|(((x)>>24)&0xff)) +#define SWAPW(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff)) +#else +#define SWAPD(x) x +#define SWAPW(x) x +#endif + #endif /* INCLUDE_INTERNAL_NTOSKRNL_H */ Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/freeldr.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/freeldr.c Mon Jun 18 01:18:25 2007 @@ -17,8 +17,9 @@ /* FreeLDR Module Data */ LOADER_MODULE KeLoaderModules[64]; +LDR_DATA_TABLE_ENTRY ModuleObject[NUM_BOOT_DRIVERS]; ULONG KeLoaderModuleCount; -static CHAR KeLoaderModuleStrings[64][256]; +CHAR KeLoaderModuleStrings[64][256]; /* FreeLDR Memory Data */ ADDRESS_RANGE KeMemoryMap[64]; @@ -32,9 +33,6 @@ ROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; static CHAR KeLoaderCommandLine[256]; BOOLEAN AcpiTableDetected; - -/* FreeLDR PE Hack Data */ -extern LDR_DATA_TABLE_ENTRY HalModuleObject; /* NT Loader Data */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; @@ -221,7 +219,7 @@ else if (!(_stricmp(DriverName, "hal.dll"))) { /* The HAL actually gets loaded somewhere else */ - ModStart = HalModuleObject.DllBase; + ModStart = ModuleObject[1].DllBase; /* Create an MD for the HAL */ MdEntry = &BldrMemoryDescriptors[i]; @@ -296,10 +294,6 @@ #endif } -VOID -INIT_FUNCTION -NTAPI -LdrpSettleHal(PVOID NewHalBase); VOID NTAPI KiSetupSyscallHandler(); @@ -314,7 +308,6 @@ ULONG StartKernelBase; ULONG HalBase; ULONG DriverBase; - ULONG DriverSize; PLOADER_PARAMETER_BLOCK NtLoaderBlock; CHAR* s; #ifdef _M_IX86 @@ -406,6 +399,11 @@ strcpy(KeLoaderModuleStrings[i], (PCHAR)KeLoaderModules[i].String); } + DPRINT1("Module %08x-%08x: %s\n", + KeLoaderModules[i].ModStart, + KeLoaderModules[i].ModEnd, + KeLoaderModuleStrings[i]); + #ifdef _M_PPC KeLoaderModules[i].ModStart += KSEG0_BASE - StartKernelBase; KeLoaderModules[i].ModEnd += KSEG0_BASE - StartKernelBase; @@ -429,9 +427,8 @@ /* Choose last module address as the final kernel address */ MmFreeLdrLastKernelAddress = - ROUND_UP(KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd, 0x10000); - - /* Select the HAL Base */ + KeLoaderModules[KeRosLoaderBlock.ModsCount - 1].ModEnd; + HalBase = KeLoaderModules[1].ModStart; /* Choose Driver Base */ @@ -442,48 +439,21 @@ LdrHalBase = (ULONG_PTR)DriverBase; #endif + /* Convert the loader block */ + KiRosFrldrLpbToNtLpb(&KeRosLoaderBlock, &NtLoaderBlock); + /* Initialize Module Management */ - LdrInitModuleManagement((PVOID)KeLoaderModules[0].ModStart); - -#ifdef _M_PPC - LdrpSettleHal((PVOID)DriverBase); -#endif - - /* Load HAL.DLL with the PE Loader */ - LdrSafePEProcessModule((PVOID)HalBase, - (PVOID)DriverBase, - (PVOID)KeLoaderModules[0].ModStart, - &DriverSize); - - /* Increase the last kernel address with the size of HAL */ - MmFreeLdrLastKernelAddress += PAGE_ROUND_UP(DriverSize); - -#ifdef _M_IX86 - /* Now select the final beginning and ending Kernel Addresses */ - MmFreeLdrFirstKrnlPhysAddr = KeLoaderModules[0].ModStart - - KSEG0_BASE + 0x200000; - MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - - KSEG0_BASE + 0x200000; -#endif + /* LdrInitModuleManagement((PVOID)KeLoaderModules[0].ModStart); */ /* Setup the IDT */ KeInitExceptions(); // ONCE HACK BELOW IS GONE, MOVE TO KISYSTEMSTARTUP! KeInitInterrupts(); // ROS HACK DEPRECATED SOON BY NEW HAL - /* Load the Kernel with the PE Loader */ - LdrSafePEProcessModule((PVOID)KeLoaderModules[0].ModStart, - (PVOID)KeLoaderModules[0].ModStart, - (PVOID)DriverBase, - &DriverSize); - /* Sets up the VDM Data */ #ifdef _M_IX86 NtEarlyInitVdm(); #endif - /* Convert the loader block */ - KiRosFrldrLpbToNtLpb(&KeRosLoaderBlock, &NtLoaderBlock); - /* Do general System Startup */ KiSystemStartup(NtLoaderBlock); } Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c (original) +++ branches/powerpc/reactos/ntoskrnl/ke/powerpc/ppc_irq.c Mon Jun 18 01:18:25 2007 @@ -822,14 +822,13 @@ NTAPI KiSystemService(ppc_trap_frame_t *trap_frame) { - SetPhysByte(0x800003f8, 'S'); - SetPhysByte(0x800003f8, 'C'); - SetPhysByte(0x800003f8, '!'); - SetPhysByte(0x800003f8, '\r'); - SetPhysByte(0x800003f8, '\n'); + int i; switch(trap_frame->gpr[8]) { case 0x10000: /* DebugService */ + for( i = 0; i < trap_frame->gpr[5]; i++ ) + SetPhysByte(0x800003f8, ((PCHAR)trap_frame->gpr[4])[i]); + trap_frame->gpr[3] = KdpServiceDispatcher (trap_frame->gpr[3], (PCHAR)trap_frame->gpr[4], Modified: branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ntoskr… ============================================================================== --- branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/powerpc/reactos/ntoskrnl/ntoskrnl.rbuild Mon Jun 18 01:18:25 2007 @@ -251,10 +251,6 @@ <file>kdinit.c</file> <file>kdio.c</file> <file>kdmain.c</file> - </directory> - <directory name="ldr"> - <file>loader.c</file> - <file>rtl.c</file> </directory> <directory name="lpc"> <file>close.c</file>

1 0

[greatlrd] 27216: GetCaps are complete, not tested in all case but almost all
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Sun Jun 17 19:19:59 2007 New Revision: 27216 URL: http://svn.reactos.org/svn/reactos?rev=27216&view=rev Log: GetCaps are complete, not tested in all case but almost all Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild Added: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (added) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Sun Jun 17 19:19:59 2007 @@ -1,0 +1,269 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/ddraw/ddraw_main.c + * PURPOSE: IDirectDraw7 Implementation + * PROGRAMMER: Magnus Olsen + * + */ + +/* TODO + * lpddNLVHELCaps and lpddNLVCaps + * Thouse two can be null or inviald in lpGBL + * we need add code in startup to detect if we have lpddNLVCaps set + * ms HEL does not support lpddNLVHELCaps shall we do that ? + * ms HEL does not support dwVidMemTotal and dwVidMemFree shall we implement a emulate of them ? + */ + +#include "rosdraw.h" + +#include <string.h> + +/* PSEH for SEH Support */ +#include <pseh/pseh.h> + + +HRESULT WINAPI +Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, + LPDDCAPS pHELCaps) +{ + HRESULT retVal = DDERR_INVALIDPARAMS; + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + + DX_WINDBG_trace(); + + _SEH_TRY + { + if ((!pDriverCaps) && (!pHELCaps)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + if (pDriverCaps) + { + /* Setup hardware caps */ + DDSCAPS2 ddscaps = { 0 }; + LPDDCORECAPS CoreCaps = (LPDDCORECAPS)&This->lpLcl->lpGbl->ddCaps; + + DWORD dwTotal = 0; + DWORD dwFree = 0; + + Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + + switch (pDriverCaps->dwSize) + { + case sizeof(DDCAPS_DX1): + { + LPDDCAPS_DX1 myCaps = (LPDDCAPS_DX1) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX1)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX1); + + retVal = DD_OK; + } + break; + + case sizeof(DDCAPS_DX3): + { + LPDDCAPS_DX3 myCaps = (LPDDCAPS_DX3) pDriverCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX3); + + retVal = DD_OK; + } + break; + + case sizeof(DDCAPS_DX5): + { + LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; + + /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX5); + + retVal = DD_OK; + } + break; + + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): + { + LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; + + /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + + myCaps->ddsCaps.dwCaps = myCaps->ddsOldCaps.dwCaps; + myCaps->ddsCaps.dwCaps2 = 0; + myCaps->ddsCaps.dwCaps3 = 0; + myCaps->ddsCaps.dwCaps4 = 0; + myCaps->dwSize = sizeof(DDCAPS_DX7); + + } + break; + + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } + + if (pHELCaps) + { + /* Setup software caps */ + DDSCAPS2 ddscaps = { 0 }; + LPDDCORECAPS CoreCaps = (LPDDCORECAPS)&This->lpLcl->lpGbl->ddHELCaps; + + DWORD dwTotal = 0; + DWORD dwFree = 0; + + Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); + + switch (pHELCaps->dwSize) + { + case sizeof(DDCAPS_DX1): + { + LPDDCAPS_DX1 myCaps = (LPDDCAPS_DX1) pHELCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX1)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX1); + + retVal = DD_OK; + } + break; + + case sizeof(DDCAPS_DX3): + { + LPDDCAPS_DX3 myCaps = (LPDDCAPS_DX3) pHELCaps; + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX3); + + retVal = DD_OK; + } + break; + + case sizeof(DDCAPS_DX5): + { + LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pHELCaps; + + /* FIXME This->lpLcl->lpGbl->lpddNLVHELCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVHELCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + myCaps->dwSize = sizeof(DDCAPS_DX5); + + retVal = DD_OK; + } + break; + + /* DDCAPS_DX6 is same as DDCAPS_DX7 */ + case sizeof(DDCAPS_DX7): + { + LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pHELCaps; + + /* FIXME This->lpLcl->lpGbl->lpddNLVHELCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVHELCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVHELCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) + { + memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); + } + + myCaps->dwVidMemFree = dwFree; + myCaps->dwVidMemTotal = dwTotal; + + myCaps->ddsCaps.dwCaps = myCaps->ddsOldCaps.dwCaps; + myCaps->ddsCaps.dwCaps2 = 0; + myCaps->ddsCaps.dwCaps3 = 0; + myCaps->ddsCaps.dwCaps4 = 0; + myCaps->dwSize = sizeof(DDCAPS_DX7); + + } + break; + + default: + retVal = DDERR_INVALIDPARAMS; + break; + } + } + + + } + _SEH_HANDLE + { + retVal = DD_FALSE; + } + _SEH_END; + + return retVal; +} Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 17 19:19:59 2007 @@ -450,168 +450,6 @@ //LeaveCriticalSection(&ddcs); return retVal; } - -HRESULT WINAPI -Main_DirectDraw_GetCaps( LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, - LPDDCAPS pHELCaps) -{ - HRESULT retVal = DDERR_INVALIDPARAMS; - LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; - - DX_WINDBG_trace(); - - _SEH_TRY - { - if ((!pDriverCaps) && (!pHELCaps)) - { - retVal = DDERR_INVALIDPARAMS; - _SEH_LEAVE; - } - - if (pDriverCaps) - { - /* Setup hardware caps */ - DDSCAPS2 ddscaps = { 0 }; - LPDDCORECAPS CoreCaps = (LPDDCORECAPS)&This->lpLcl->lpGbl->ddCaps; - - DWORD dwTotal = 0; - DWORD dwFree = 0; - - Main_DirectDraw_GetAvailableVidMem4(iface, &ddscaps, &dwTotal, &dwFree); - - switch (pDriverCaps->dwSize) - { - case sizeof(DDCAPS_DX1): - { - LPDDCAPS_DX1 myCaps = (LPDDCAPS_DX1) pDriverCaps; - - if (CoreCaps->dwSize == sizeof(DDCORECAPS)) - { - memcpy(myCaps, CoreCaps, sizeof(DDCAPS_DX1)); - } - - myCaps->dwVidMemFree = dwFree; - myCaps->dwVidMemTotal = dwTotal; - myCaps->dwSize = sizeof(DDCAPS_DX1); - - retVal = DD_OK; - } - break; - - case sizeof(DDCAPS_DX3): - { - LPDDCAPS_DX3 myCaps = (LPDDCAPS_DX3) pDriverCaps; - - if (CoreCaps->dwSize == sizeof(DDCORECAPS)) - { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCAPS_DX3)); - } - - myCaps->dwVidMemFree = dwFree; - myCaps->dwVidMemTotal = dwTotal; - myCaps->dwSize = sizeof(DDCAPS_DX3); - - retVal = DD_OK; - } - break; - - case sizeof(DDCAPS_DX5): - { - LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; - - /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c - if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) - { - memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); - } - */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); - - if (CoreCaps->dwSize == sizeof(DDCORECAPS)) - { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); - } - - myCaps->dwVidMemFree = dwFree; - myCaps->dwVidMemTotal = dwTotal; - myCaps->dwSize = sizeof(DDCAPS_DX5); - - retVal = DD_OK; - } - break; - - /* DDCAPS_DX6 is same as DDCAPS_DX7 */ - case sizeof(DDCAPS_DX7): - { - LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; - - /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c - if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) - { - memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); - } - */ - memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); - - if (CoreCaps->dwSize == sizeof(DDCORECAPS)) - { - memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); - } - - myCaps->dwVidMemFree = dwFree; - myCaps->dwVidMemTotal = dwTotal; - - myCaps->ddsCaps.dwCaps = myCaps->ddsOldCaps.dwCaps; - myCaps->ddsCaps.dwCaps2 = 0; - myCaps->ddsCaps.dwCaps3 = 0; - myCaps->ddsCaps.dwCaps4 = 0; - myCaps->dwSize = sizeof(DDCAPS_DX7); - - } - break; - - default: - retVal = DDERR_INVALIDPARAMS; - break; - } - } - - if (pHELCaps) - { - /* Setup software caps */ - switch (pHELCaps->dwSize) - { - case sizeof(DDCAPS_DX1): - retVal = DDERR_INVALIDPARAMS; - break; - case sizeof(DDCAPS_DX3): - retVal = DDERR_INVALIDPARAMS; - break; - case sizeof(DDCAPS_DX5): - retVal = DDERR_INVALIDPARAMS; - break; - - /* DDCAPS_DX6 is same as DDCAPS_DX7 */ - case sizeof(DDCAPS_DX7): - retVal = DDERR_INVALIDPARAMS; - break; - default: - retVal = DDERR_INVALIDPARAMS; - break; - } - } - } - _SEH_HANDLE - { - retVal = DD_FALSE; - } - _SEH_END; - - return retVal; -} - - - /* @@ -699,7 +537,7 @@ Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, /* (GetCaps testing / devloping) */ + Main_DirectDraw_GetCaps, /* (GetCaps done) */ Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ Main_DirectDraw_GetGDISurface, Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild Sun Jun 17 19:19:59 2007 @@ -27,6 +27,7 @@ <file>ddraw_main.c</file> <file>ddraw_displaymode.c</file> <file>ddraw_setcooperativelevel.c</file> + <file>GetCaps.c</file> <file>GetDeviceIdentifier.c</file> <file>ddraw_stubs.c</file> <file>callbacks_dd_hel.c</file>

1 0

[dgorbachev] 27215: Activate debug message about misbehaving "userinit.exe"
by dgorbachev＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: dgorbachev Date: Sun Jun 17 19:18:06 2007 New Revision: 27215 URL: http://svn.reactos.org/svn/reactos?rev=27215&view=rev Log: Activate debug message about misbehaving "userinit.exe" Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Sun Jun 17 19:18:06 2007 @@ -290,7 +290,7 @@ if (Header->PointerCount < Header->HandleCount) { - DPRINT("Misbehaving object: %wZ\n", &Header->Type->Name); + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return Header->PointerCount; } @@ -301,7 +301,7 @@ /* Sanity check */ if (Header->HandleCount) { - DPRINT("Misbehaving object: %wZ\n", &Header->Type->Name); + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); return Header->PointerCount; }

1 0

[greatlrd] 27214: DD->GetCaps for hal are so complete we can do with current startup process we are missing setting This->lpLcl->lpGbl->lpddNLVCaps fixed a smaller bugs in caps data
by greatlrd＠svn.reactos.org 17 Jun '07

17 Jun '07

Author: greatlrd Date: Sun Jun 17 18:46:04 2007 New Revision: 27214 URL: http://svn.reactos.org/svn/reactos?rev=27214&view=rev Log: DD->GetCaps for hal are so complete we can do with current startup process we are missing setting This->lpLcl->lpGbl->lpddNLVCaps fixed a smaller bugs in caps data Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Sun Jun 17 18:46:04 2007 @@ -519,19 +519,19 @@ { LPDDCAPS_DX5 myCaps = (LPDDCAPS_DX5) pDriverCaps; + /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); + if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { memcpy(&myCaps->dwCaps, &CoreCaps->dwCaps, sizeof(DDCORECAPS)); } - /* FIXME - DWORD dwNLVBCaps; - DWORD dwNLVBCaps2; - DWORD dwNLVBCKeyCaps; - DWORD dwNLVBFXCaps; - DWORD dwNLVBRops[DD_ROP_SPACE]; - */ - myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; myCaps->dwSize = sizeof(DDCAPS_DX5); @@ -544,6 +544,14 @@ case sizeof(DDCAPS_DX7): { LPDDCAPS_DX7 myCaps = (LPDDCAPS_DX7) pDriverCaps; + + /* FIXME This->lpLcl->lpGbl->lpddNLVCaps are not set in startup.c + if (This->lpLcl->lpGbl->lpddNLVCaps->dwSize == sizeof(DDNONLOCALVIDMEMCAPS)) + { + memcpy(&myCaps->dwNLVBCaps, This->lpLcl->lpGbl->lpddNLVCaps, sizeof(DDNONLOCALVIDMEMCAPS)); + } + */ + memset(myCaps->dwNLVBCaps,0,sizeof(DDNONLOCALVIDMEMCAPS)); if (CoreCaps->dwSize == sizeof(DDCORECAPS)) { @@ -553,18 +561,10 @@ myCaps->dwVidMemFree = dwFree; myCaps->dwVidMemTotal = dwTotal; - /* FIXME - DWORD dwNLVBCaps; - DWORD dwNLVBCaps2; - DWORD dwNLVBCKeyCaps; - DWORD dwNLVBFXCaps; - DWORD dwNLVBRops[DD_ROP_SPACE]; - */ - - myCaps->ddsCaps.dwCaps = ddscaps.dwCaps; - myCaps->ddsCaps.dwCaps2 = ddscaps.dwCaps2; - myCaps->ddsCaps.dwCaps3 = ddscaps.dwCaps3; - myCaps->ddsCaps.dwCaps4 = ddscaps.dwCaps4; + myCaps->ddsCaps.dwCaps = myCaps->ddsOldCaps.dwCaps; + myCaps->ddsCaps.dwCaps2 = 0; + myCaps->ddsCaps.dwCaps3 = 0; + myCaps->ddsCaps.dwCaps4 = 0; myCaps->dwSize = sizeof(DDCAPS_DX7); } @@ -699,7 +699,7 @@ Main_DirectDraw_EnumDisplayModes, /* (EnumDisplayModes testing / devloping) */ Main_DirectDraw_EnumSurfaces, Main_DirectDraw_FlipToGDISurface, - Main_DirectDraw_GetCaps, + Main_DirectDraw_GetCaps, /* (GetCaps testing / devloping) */ Main_DirectDraw_GetDisplayMode, /* (GetDisplayMode testing / devloping) */ Main_DirectDraw_GetFourCCCodes, /* (GetFourCCCodes done) */ Main_DirectDraw_GetGDISurface,

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