Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17016: Merge 16737 from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16737 from trunk: Fix some bugs in DIB mapping code to prevent instant system crashes. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c 2005-08-03 17:14:26 UTC (rev 17015) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/objects/dib.c 2005-08-03 17:15:11 UTC (rev 17016) @@ -175,7 +175,7 @@ RECTL DestRect; XLATEOBJ *XlateObj; PPALGDI hDCPalette; - //RGBQUAD *lpRGB; + //RGBQUAD *lpRGB; HPALETTE DDB_Palette, DIB_Palette; ULONG DDB_Palette_Type, DIB_Palette_Type; INT DIBWidth; @@ -190,7 +190,7 @@ //if (ColorUse == DIB_PAL_COLORS) // lpRGB = DIB_MapPaletteColors(hDC, bmi); //else - // lpRGB = &bmi->bmiColors[0]; + // lpRGB = &bmi->bmiColors; DestSurf = &bitmap->SurfObj; @@ -810,6 +810,7 @@ UINT Entries = 0; BITMAP bm; SIZEL Size; + RGBQUAD *lpRGB; DPRINT("format (%ld,%ld), planes %d, bpp %d, size %ld, colors %ld (%s)\n", bi->biWidth, bi->biHeight, bi->biPlanes, bi->biBitCount, @@ -846,7 +847,9 @@ } if(usage == DIB_PAL_COLORS) - memcpy(bmi->bmiColors, (UINT *)DIB_MapPaletteColors(dc, bmi), sizeof(UINT *)); + lpRGB = DIB_MapPaletteColors(dc, bmi); + else + lpRGB = bmi->bmiColors; // Allocate Memory for DIB and fill structure if (bm.bmBits) @@ -869,9 +872,9 @@ else switch(bi->biBitCount) { case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0x7c00; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x03e0; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x001f; break; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; case 24: dib->dsBitfields[0] = 0xff0000; @@ -880,9 +883,9 @@ break; case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)bmi->bmiColors : 0xff0000; - dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 1) : 0x00ff00; - dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)bmi->bmiColors + 2) : 0x0000ff; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; + dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; break; } dib->dshSection = section; @@ -901,12 +904,20 @@ bm.bmBits); if (! res) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; } bmp = BITMAPOBJ_LockBitmap(res); if (NULL == bmp) { + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); return NULL; @@ -921,7 +932,7 @@ if(bi->biBitCount == 8) { Entries = 256; } if (Entries) - bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, bmi->bmiColors); + bmp->hDIBPalette = PALETTE_AllocPaletteIndexedRGB(Entries, lpRGB); else bmp->hDIBPalette = PALETTE_AllocPalette(PAL_BITFIELDS, 0, NULL, dib->dsBitfields[0], @@ -946,6 +957,11 @@ if (res) { BITMAPOBJ_FreeBitmap(res); res = 0; } } + if (lpRGB != bmi->bmiColors) + { + ExFreePool(lpRGB); + } + if (bmp) { BITMAPOBJ_UnlockBitmap(bmp); @@ -1097,6 +1113,12 @@ return NULL; } + if (palGDI->Mode != PAL_INDEXED) + { + PALETTE_UnlockPalette(palGDI); + return NULL; + } + nNumColors = 1 << lpbmi->bmiHeader.biBitCount; if (lpbmi->bmiHeader.biClrUsed) {

1 0

[navaraf] 17015: Merge 16736 from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16736 from trunk: Properly setup the I/O stack location in IopSecurityFile. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c 2005-08-03 17:13:51 UTC (rev 17014) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/io/file.c 2005-08-03 17:14:26 UTC (rev 17015) @@ -324,6 +324,7 @@ /* Set Stack Parameters */ StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = MajorFunction; StackPtr->FileObject = FileObject; /* Set Parameters */

1 0

[navaraf] 17014: Merge 16735 from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16735 from trunk: Don't allow setting menu for child windows in IntSetMenu. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:13:04 UTC (rev 17013) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:13:51 UTC (rev 17014) @@ -499,13 +499,19 @@ { PMENU_OBJECT OldMenuObject, NewMenuObject = NULL; + if ((WindowObject->Style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + *Changed = (WindowObject->IDMenu != (UINT) Menu); if (! *Changed) { return TRUE; } - if (0 != WindowObject->IDMenu) + if (WindowObject->IDMenu) { OldMenuObject = IntGetMenuObject((HMENU) WindowObject->IDMenu); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self);

1 0

[navaraf] 17013: Merge 16728 (ion) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16728 (ion) from trunk: - Don't try to get the length of a possibly empty string. This fixes many menu applications (such as WinRAR). However I'm now getting a bug due to a double-free. It seems a GDI Object is being freed twice. Can anyone check this out please? Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c --- branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 17:10:45 UTC (rev 17012) +++ branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 17:13:04 UTC (rev 17013) @@ -3771,8 +3771,11 @@ } RtlCopyMemory(mii, &miiW, miiW.cbSize); - mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); + if (AnsiBuffer) + { + mii->dwTypeData = AnsiBuffer; + mii->cch = strlen(AnsiBuffer); + } return TRUE; }

1 0

[navaraf] 17012: Merge 16725 from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16725 from trunk: Build Wine DLLs without the UNICODE and _UNICODE definitions. (Note: The Wine DLLs use A/W functions explicitely, so this doesn't have any performance impact.) Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml _____ Modified: branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml --- branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/comctl32/comctl32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,49 +1,47 @@ -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true"> - <importlibrary definition="comctl32.spec.def" /> - <include base="comctl32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>winmm</library> - <file>animate.c</file> - <file>comboex.c</file> - <file>comctl32undoc.c</file> - <file>commctrl.c</file> - <file>datetime.c</file> - <file>draglist.c</file> - <file>flatsb.c</file> - <file>header.c</file> - <file>hotkey.c</file> - <file>imagelist.c</file> - <file>ipaddress.c</file> - <file>listview.c</file> - <file>monthcal.c</file> - <file>nativefont.c</file> - <file>pager.c</file> - <file>progress.c</file> - <file>propsheet.c</file> - <file>rebar.c</file> - <file>smoothscroll.c</file> - <file>string.c</file> - <file>status.c</file> - <file>syslink.c</file> - <file>tab.c</file> - <file>toolbar.c</file> - <file>tooltips.c</file> - <file>trackbar.c</file> - <file>treeview.c</file> - <file>updown.c</file> - <file>rsrc.rc</file> - <file>comctl32.spec</file> -</module> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" warnings="true"> + <importlibrary definition="comctl32.spec.def" /> + <include base="comctl32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>winmm</library> + <file>animate.c</file> + <file>comboex.c</file> + <file>comctl32undoc.c</file> + <file>commctrl.c</file> + <file>datetime.c</file> + <file>draglist.c</file> + <file>flatsb.c</file> + <file>header.c</file> + <file>hotkey.c</file> + <file>imagelist.c</file> + <file>ipaddress.c</file> + <file>listview.c</file> + <file>monthcal.c</file> + <file>nativefont.c</file> + <file>pager.c</file> + <file>progress.c</file> + <file>propsheet.c</file> + <file>rebar.c</file> + <file>smoothscroll.c</file> + <file>string.c</file> + <file>status.c</file> + <file>syslink.c</file> + <file>tab.c</file> + <file>toolbar.c</file> + <file>tooltips.c</file> + <file>trackbar.c</file> + <file>treeview.c</file> + <file>updown.c</file> + <file>rsrc.rc</file> + <file>comctl32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml --- branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/comdlg32/comdlg32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,34 +1,32 @@ -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false"> - <importlibrary definition="comdlg32.spec.def" /> - <include base="comdlg32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>comctl32</library> - <library>shell32</library> - <library>shlwapi</library> - <library>winspool</library> - <file>cdlg32.c</file> - <file>colordlg.c</file> - <file>filedlg.c</file> - <file>filedlg31.c</file> - <file>filedlgbrowser.c</file> - <file>filetitle.c</file> - <file>finddlg32.c</file> - <file>fontdlg.c</file> - <file>printdlg.c</file> - <file>rsrc.rc</file> - <file>comdlg32.spec</file> -</module> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" warnings="true" usewrc="false"> + <importlibrary definition="comdlg32.spec.def" /> + <include base="comdlg32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>shell32</library> + <library>shlwapi</library> + <library>winspool</library> + <file>cdlg32.c</file> + <file>colordlg.c</file> + <file>filedlg.c</file> + <file>filedlg31.c</file> + <file>filedlgbrowser.c</file> + <file>filetitle.c</file> + <file>finddlg32.c</file> + <file>fontdlg.c</file> + <file>printdlg.c</file> + <file>rsrc.rc</file> + <file>comdlg32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml --- branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/dbghelp/dbghelp.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,36 +1,34 @@ -<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true"> - <importlibrary definition="dbghelp.spec.def" /> - <include base="dbghelp">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>psapi</library> - <library>pseh</library> - <file>coff.c</file> - <file>dbghelp.c</file> - <file>elf_module.c</file> - <file>image.c</file> - <file>memory.c</file> - <file>minidump.c</file> - <file>module.c</file> - <file>msc.c</file> - <file>path.c</file> - <file>pe_module.c</file> - <file>regex.c</file> - <file>source.c</file> - <file>stabs.c</file> - <file>stack.c</file> - <file>storage.c</file> - <file>symbol.c</file> - <file>type.c</file> - <file>dbghelp.rc</file> - <file>dbghelp.spec</file> -</module> +<module name="dbghelp" type="win32dll" baseaddress="${BASEADDRESS_DBGHELP}" installbase="system32" installname="dbghelp.dll" warnings="true"> + <importlibrary definition="dbghelp.spec.def" /> + <include base="dbghelp">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>psapi</library> + <library>pseh</library> + <file>coff.c</file> + <file>dbghelp.c</file> + <file>elf_module.c</file> + <file>image.c</file> + <file>memory.c</file> + <file>minidump.c</file> + <file>module.c</file> + <file>msc.c</file> + <file>path.c</file> + <file>pe_module.c</file> + <file>regex.c</file> + <file>source.c</file> + <file>stabs.c</file> + <file>stack.c</file> + <file>storage.c</file> + <file>symbol.c</file> + <file>type.c</file> + <file>dbghelp.rc</file> + <file>dbghelp.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml --- branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/msvideo/msvfw32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,21 +1,19 @@ -<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> - <importlibrary definition="msvfw32.spec.def" /> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>winmm</library> - <library>gdi32</library> - <library>comctl32</library> - <library>kernel32</library> - <library>ntdll</library> - <file>drawdib.c</file> - <file>mciwnd.c</file> - <file>msvfw32.rc</file> - <file>msvideo_main.c</file> - <file>msvfw32.spec</file> -</module> +<module name="msvfw32" type="win32dll" baseaddress="${BASEADDRESS_MSVFW32}" installbase="system32" installname="msvfw32.dll"> + <importlibrary definition="msvfw32.spec.def" /> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>winmm</library> + <library>gdi32</library> + <library>comctl32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>drawdib.c</file> + <file>mciwnd.c</file> + <file>msvfw32.rc</file> + <file>msvideo_main.c</file> + <file>msvfw32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml --- branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/netapi32/netapi32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,30 +1,28 @@ -<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true"> - <importlibrary definition="netapi32.spec.def" /> - <include base="netapi32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SVRAPI_" /> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>ws2_32</library> - <library>iphlpapi</library> - <file>access.c</file> - <file>apibuf.c</file> - <file>browsr.c</file> - <file>nbcmdqueue.c</file> - <file>nbnamecache.c</file> - <file>nbt.c</file> - <file>netapi32.c</file> - <file>netbios.c</file> - <file>wksta.c</file> - <file>netapi32.rc</file> - <file>netapi32.spec</file> -</module> +<module name="netapi32" type="win32dll" baseaddress="${BASEADDRESS_NETAPI32}" installbase="system32" installname="netapi32.dll" warnings="true"> + <importlibrary definition="netapi32.spec.def" /> + <include base="netapi32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SVRAPI_" /> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>ws2_32</library> + <library>iphlpapi</library> + <file>access.c</file> + <file>apibuf.c</file> + <file>browsr.c</file> + <file>nbcmdqueue.c</file> + <file>nbnamecache.c</file> + <file>nbt.c</file> + <file>netapi32.c</file> + <file>netbios.c</file> + <file>wksta.c</file> + <file>netapi32.rc</file> + <file>netapi32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml --- branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/ole32/ole32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,54 +1,52 @@ -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true"> - <importlibrary definition="ole32.spec.def" /> - <include base="ole32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>rpcrt4</library> - <file>antimoniker.c</file> - <file>bindctx.c</file> - <file>clipboard.c</file> - <file>compobj.c</file> - <file>compositemoniker.c</file> - <file>datacache.c</file> - <file>dictionary.c</file> - <file>defaulthandler.c</file> - <file>errorinfo.c</file> - <file>filemoniker.c</file> - <file>ftmarshal.c</file> - <file>git.c</file> - <file>hglobalstream.c</file> - <file>ifs.c</file> - <file>itemmoniker.c</file> - <file>marshal.c</file> - <file>memlockbytes.c</file> - <file>moniker.c</file> - <file>ole2.c</file> - <file>ole2stubs.c</file> - <file>ole2impl.c</file> - <file>ole32_main.c</file> - <file>oleobj.c</file> - <file>oleproxy.c</file> - <file>regsvr.c</file> - <file>rpc.c</file> - <file>stg_bigblockfile.c</file> - <file>stg_prop.c</file> - <file>stg_stream.c</file> - <file>storage32.c</file> - <file>stubmanager.c</file> - <file>ole32res.rc</file> - <file>ole32.spec</file> -</module> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" warnings="true"> + <importlibrary definition="ole32.spec.def" /> + <include base="ole32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <file>antimoniker.c</file> + <file>bindctx.c</file> + <file>clipboard.c</file> + <file>compobj.c</file> + <file>compositemoniker.c</file> + <file>datacache.c</file> + <file>dictionary.c</file> + <file>defaulthandler.c</file> + <file>errorinfo.c</file> + <file>filemoniker.c</file> + <file>ftmarshal.c</file> + <file>git.c</file> + <file>hglobalstream.c</file> + <file>ifs.c</file> + <file>itemmoniker.c</file> + <file>marshal.c</file> + <file>memlockbytes.c</file> + <file>moniker.c</file> + <file>ole2.c</file> + <file>ole2stubs.c</file> + <file>ole2impl.c</file> + <file>ole32_main.c</file> + <file>oleobj.c</file> + <file>oleproxy.c</file> + <file>regsvr.c</file> + <file>rpc.c</file> + <file>stg_bigblockfile.c</file> + <file>stg_prop.c</file> + <file>stg_stream.c</file> + <file>storage32.c</file> + <file>stubmanager.c</file> + <file>ole32res.rc</file> + <file>ole32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml --- branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/oleaut32/oleaut32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,45 +1,43 @@ -<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true"> - <importlibrary definition="oleaut32.spec.def" /> - <include base="oleaut32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <define name="_OLEAUT32_" /> - <define name="COM_NO_WINDOWS_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>rpcrt4</library> - <library>ole32</library> - <library>comctl32</library> - <library>urlmon</library> - <file>connpt.c</file> - <file>dispatch.c</file> - <file>hash.c</file> - <file>oaidl_p.c</file> - <file>oleaut.c</file> - <file>olefont.c</file> - <file>olepicture.c</file> - <file>recinfo.c</file> - <file>regsvr.c</file> - <file>safearray.c</file> - <file>stubs.c</file> - <file>tmarshal.c</file> - <file>typelib.c</file> - <file>typelib2.c</file> - <file>usrmarshal.c</file> - <file>varformat.c</file> - <file>variant.c</file> - <file>vartype.c</file> - <file>oleaut32.spec</file> -</module> +<module name="oleaut32" type="win32dll" baseaddress="${BASEADDRESS_OLEAUT32}" installbase="system32" installname="oleaut32.dll" warnings="true"> + <importlibrary definition="oleaut32.spec.def" /> + <include base="oleaut32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_OLEAUT32_" /> + <define name="COM_NO_WINDOWS_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <library>ole32</library> + <library>comctl32</library> + <library>urlmon</library> + <file>connpt.c</file> + <file>dispatch.c</file> + <file>hash.c</file> + <file>oaidl_p.c</file> + <file>oleaut.c</file> + <file>olefont.c</file> + <file>olepicture.c</file> + <file>recinfo.c</file> + <file>regsvr.c</file> + <file>safearray.c</file> + <file>stubs.c</file> + <file>tmarshal.c</file> + <file>typelib.c</file> + <file>typelib2.c</file> + <file>usrmarshal.c</file> + <file>varformat.c</file> + <file>variant.c</file> + <file>vartype.c</file> + <file>oleaut32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml --- branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/olepro32/olepro32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,19 +1,17 @@ -<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> - <importlibrary definition="olepro32.spec.def" /> - <include base="olepro32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>oleaut32</library> - <file>olepro32stubs.c</file> - <file>olepro32.rc</file> - <file>olepro32.spec</file> -</module> +<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll"> + <importlibrary definition="olepro32.spec.def" /> + <include base="olepro32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>oleaut32</library> + <file>olepro32stubs.c</file> + <file>olepro32.rc</file> + <file>olepro32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml --- branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/riched20/riched20.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -2,8 +2,6 @@ <importlibrary definition="riched20.spec.def" /> <include base="riched20">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml --- branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/richedit/riched32.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,19 +1,17 @@ -<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> - <importlibrary definition="riched32.spec.def" /> - <include base="riched32">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>user32</library> - <library>riched20</library> - <file>richedit.c</file> - <file>riched32.spec</file> -</module> +<module name="riched32" type="win32dll" baseaddress="${BASEADDRESS_RICHED32}" installbase="system32" installname="riched32.dll"> + <importlibrary definition="riched32.spec.def" /> + <include base="riched32">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>riched20</library> + <file>richedit.c</file> + <file>riched32.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml --- branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/rpcrt4/rpcrt4.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,37 +1,35 @@ -<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true"> - <importlibrary definition="rpcrt4.spec.def" /> - <include base="rpcrt4">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <define name="_RPCRT4_" /> - <define name="COM_NO_WINDOWS_H" /> - <define name="MSWMSG" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>iphlpapi</library> - <file>cproxy.c</file> - <file>cpsf.c</file> - <file>cstub.c</file> - <file>ndr_marshall.c</file> - <file>ndr_midl.c</file> - <file>ndr_ole.c</file> - <file>ndr_stubless.c</file> - <file>rpc_binding.c</file> - <file>rpc_epmap.c</file> - <file>rpc_message.c</file> - <file>rpc_server.c</file> - <file>rpcrt4_main.c</file> - <file>rpcss_np_client.c</file> - <file>rpcrt4.rc</file> - <file>rpcrt4.spec</file> -</module> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true"> + <importlibrary definition="rpcrt4.spec.def" /> + <include base="rpcrt4">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_RPCRT4_" /> + <define name="COM_NO_WINDOWS_H" /> + <define name="MSWMSG" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>iphlpapi</library> + <file>cproxy.c</file> + <file>cpsf.c</file> + <file>cstub.c</file> + <file>ndr_marshall.c</file> + <file>ndr_midl.c</file> + <file>ndr_ole.c</file> + <file>ndr_stubless.c</file> + <file>rpc_binding.c</file> + <file>rpc_epmap.c</file> + <file>rpc_message.c</file> + <file>rpc_server.c</file> + <file>rpcrt4_main.c</file> + <file>rpcss_np_client.c</file> + <file>rpcrt4.rc</file> + <file>rpcrt4.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml --- branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/shdocvw/shdocvw.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,32 +1,30 @@ -<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" warnings="true"> - <importlibrary definition="shdocvw.spec.def" /> - <include base="shdocvw">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SHDOCVW_" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>ole32</library> - <library>urlmon</library> - <file>classinfo.c</file> - <file>events.c</file> - <file>factory.c</file> - <file>misc.c</file> - <file>oleobject.c</file> - <file>persist.c</file> - <file>regsvr.c</file> - <file>shdocvw_main.c</file> - <file>webbrowser.c</file> - <file>shdocvw.rc</file> - <file>shdocvw.spec</file> -</module> +<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" warnings="true"> + <importlibrary definition="shdocvw.spec.def" /> + <include base="shdocvw">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHDOCVW_" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>ole32</library> + <library>urlmon</library> + <file>classinfo.c</file> + <file>events.c</file> + <file>factory.c</file> + <file>misc.c</file> + <file>oleobject.c</file> + <file>persist.c</file> + <file>regsvr.c</file> + <file>shdocvw_main.c</file> + <file>webbrowser.c</file> + <file>shdocvw.rc</file> + <file>shdocvw.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml --- branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/shlwapi/shlwapi.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,42 +1,40 @@ -<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true"> - <importlibrary definition="shlwapi.spec.def" /> - <include base="shlwapi">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_SHLWAPI_"/> - <define name="WINSHLWAPI">""</define> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> - <library>wine</library> - <library>uuid</library> - <library>msvcrt</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>gdi32</library> - <library>user32</library> - <library>ole32</library> - <library>oleaut32</library> - <file>assoc.c</file> - <file>clist.c</file> - <file>istream.c</file> - <file>msgbox.c</file> - <file>ordinal.c</file> - <file>path.c</file> - <file>reg.c</file> - <file>regstream.c</file> - <file>shlwapi_main.c</file> - <file>stopwatch.c</file> - <file>string.c</file> - <file>thread.c</file> - <file>url.c</file> - <file>wsprintf.c</file> - <file>shlwapi.rc</file> - <file>shlwapi.spec</file> -</module> +<module name="shlwapi" type="win32dll" baseaddress="${BASEADDRESS_SHLWAPI}" installbase="system32" installname="shlwapi.dll" warnings="true"> + <importlibrary definition="shlwapi.spec.def" /> + <include base="shlwapi">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHLWAPI_"/> + <define name="WINSHLWAPI">""</define> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <library>wine</library> + <library>uuid</library> + <library>msvcrt</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>ole32</library> + <library>oleaut32</library> + <file>assoc.c</file> + <file>clist.c</file> + <file>istream.c</file> + <file>msgbox.c</file> + <file>ordinal.c</file> + <file>path.c</file> + <file>reg.c</file> + <file>regstream.c</file> + <file>shlwapi_main.c</file> + <file>stopwatch.c</file> + <file>string.c</file> + <file>thread.c</file> + <file>url.c</file> + <file>wsprintf.c</file> + <file>shlwapi.rc</file> + <file>shlwapi.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml --- branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/urlmon/urlmon.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,29 +1,27 @@ -<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true"> - <importlibrary definition="urlmon.spec.def" /> - <include base="urlmon">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <define name="_STDDEF_H" /> - <library>wine</library> - <library>uuid</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>ole32</library> - <library>shlwapi</library> - <library>cabinet</library> - <library>wininet</library> - <file>regsvr.c</file> - <file>sec_mgr.c</file> - <file>umon.c</file> - <file>umstream.c</file> - <file>urlmon_main.c</file> - <file>urlmon.spec</file> -</module> +<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" warnings="true"> + <importlibrary definition="urlmon.spec.def" /> + <include base="urlmon">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>ole32</library> + <library>shlwapi</library> + <library>cabinet</library> + <library>wininet</library> + <file>regsvr.c</file> + <file>sec_mgr.c</file> + <file>umon.c</file> + <file>umstream.c</file> + <file>urlmon_main.c</file> + <file>urlmon.spec</file> +</module> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml --- branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/wininet/wininet.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -2,8 +2,6 @@ <importlibrary definition="wininet.spec.def" /> <include base="wininet">.</include> <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> _____ Modified: branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml --- branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml 2005-08-03 17:10:30 UTC (rev 17011) +++ branches/ros-branch-0_2_7/reactos/lib/winmm/winmm.xml 2005-08-03 17:10:45 UTC (rev 17012) @@ -1,27 +1,25 @@ -<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true"> - <importlibrary definition="winmm.spec.def" /> - <include base="winmm">.</include> - <include base="ReactOS">include/wine</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> - <define name="__REACTOS__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>ntdll</library> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <file>driver.c</file> - <file>joystick.c</file> - <file>lolvldrv.c</file> - <file>mci.c</file> - <file>mmio.c</file> - <file>playsound.c</file> - <file>time.c</file> - <file>winmm.c</file> - <file>winmm_res.rc</file> - <file>winmm.spec</file> -</module> +<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" warnings="true"> + <importlibrary definition="winmm.spec.def" /> + <include base="winmm">.</include> + <include base="ReactOS">include/wine</include> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> [truncated at 1000 lines; 16 more skipped]

1 0

[navaraf] 17011: Merge 16727 (ion/hbirr) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16727 (ion/hbirr) from trunk: - Message Queue Fix, resolves a number of application regressions (Total Commander works again, for example). Patch by Hartmut Birr. To be commited into 0.2.7 after more testing. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:07:01 UTC (rev 17010) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/window.c 2005-08-03 17:10:30 UTC (rev 17011) @@ -1577,6 +1577,7 @@ IntSetMenu(WindowObject, hMenu, &MenuChanged); } WindowObject->MessageQueue = PsGetWin32Thread()->MessageQueue; + IntReferenceMessageQueue(WindowObject->MessageQueue); WindowObject->Parent = (ParentWindow ? ParentWindow->Self : NULL); if((OwnerWindow = IntGetWindowObject(OwnerWindowHandle))) { @@ -2180,7 +2181,7 @@ if (Window->MessageQueue->CaptureWindow == Window->Self) Window->MessageQueue->CaptureWindow = NULL; IntUnLockMessageQueue(Window->MessageQueue); - + IntDereferenceMessageQueue(Window->MessageQueue); /* Call hooks */ #if 0 /* FIXME */ if (HOOK_CallHooks(WH_CBT, HCBT_DESTROYWND, (WPARAM) hwnd, 0, TRUE))

1 0

[navaraf] 17010: Merge 16597 (hbirr) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16597 (hbirr) from trunk: Used the kernel base address from the loader structure instead MmSystemRangeStart. MmSystemRangeStart isn't the base address with the 3GB switch. Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/generic/halinit.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -38,7 +38,7 @@ if (BootPhase == 0) { RtlZeroMemory(&HalpHooks, sizeof(HALP_HOOKS)); - HalpInitPhase0(); + HalpInitPhase0(LoaderBlock); } else if (BootPhase == 1) { _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h --- branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/include/halp.h 2005-08-03 17:07:01 UTC (rev 17010) @@ -38,7 +38,7 @@ PVOID HalpMapPhysMemory(ULONG PhysAddr, ULONG Size); /* Non-generic initialization */ -VOID HalpInitPhase0 (VOID); +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); /* DMA Page Register Structure 080 DMA RESERVED _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/mp/apic.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -83,6 +83,8 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) +extern ULONG_PTR KernelBase; + /* FUNCTIONS *********************************************************************/ extern ULONG Read8254Timer(VOID); @@ -1035,7 +1037,7 @@ /* Write the page directory page */ Ke386GetPageTableDirectory(Common->PageDirectory); /* Write the kernel entry point */ - Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader(MmSystemRangeStart)->OptionalHeader.AddressO fEntryPoint + (ULONG_PTR)MmSystemRangeStart; + Common->NtProcessStartup = (ULONG_PTR)RtlImageNtHeader((PVOID)KernelBase)->OptionalHeader.AddressOf EntryPoint + KernelBase; /* Write the state of the mae mode */ Common->PaeModeEnabled = Ke386GetCr4() & X86_CR4_PAE ? 1 : 0; _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/mp/halinit_mp.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -18,10 +18,11 @@ /* FUNCTIONS ***************************************************************/ extern BOOLEAN HaliFindSmpConfig(VOID); +ULONG_PTR KernelBase; /*********************************************************************** ****/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { static BOOLEAN MPSInitialized = FALSE; @@ -29,7 +30,7 @@ /* Only initialize MP system once. Once called the first time, each subsequent call is part of the initialization sequence - for an application processor. */ + for an application processor. */ DPRINT("HalpInitPhase0()\n"); @@ -45,6 +46,10 @@ { KEBUGCHECK(0); } + + /* store the kernel base for later use */ + KernelBase = ((PLOADER_MODULE)LoaderBlock->ModsAddr)[0].ModStart; + } /* EOF */ _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/up/halinit_up.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -18,7 +18,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpInitPICs(); _____ Modified: branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c --- branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c 2005-08-03 17:05:36 UTC (rev 17009) +++ branches/ros-branch-0_2_7/reactos/hal/halx86/xbox/halinit_xbox.c 2005-08-03 17:07:01 UTC (rev 17010) @@ -22,7 +22,7 @@ /* FUNCTIONS ***************************************************************/ VOID -HalpInitPhase0(VOID) +HalpInitPhase0(PLOADER_PARAMETER_BLOCK LoaderBlock) { HalpHooks.InitPciBus = HalpXboxInitPciBus;

1 0

[navaraf] 17009: Merge 16596 (hbirr) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16596 (hbirr) from trunk: Replaced KERNEL_BASE by MmSystemRangeStart. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/ke/i386/exp.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -469,7 +469,7 @@ * Complete CPU context */ { - unsigned int cr2; + ULONG_PTR cr2; NTSTATUS Status; ULONG Esp0; @@ -528,7 +528,7 @@ */ if (ExceptionNr == 14) { - if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= KERNEL_BASE) + if (Ke386NoExecute && Tf->ErrorCode & 0x10 && cr2 >= (ULONG_PTR)MmSystemRangeStart) { KEBUGCHECKWITHTF(ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY, 0, 0, 0, 0, Tf); } _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 16:17:15 UTC (rev 17008) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/marea.c 2005-08-03 17:05:36 UTC (rev 17009) @@ -971,7 +971,7 @@ *BaseAddress = MM_ROUND_DOWN(*BaseAddress, Granularity); if (AddressSpace->LowestAddress == MmSystemRangeStart && - *BaseAddress < (PVOID)KERNEL_BASE) + *BaseAddress < MmSystemRangeStart) { CHECKPOINT; return STATUS_ACCESS_VIOLATION;

1 0

[navaraf] 17008: Merge 16594 (jc) from trunk:
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Merge 16594 (jc) from trunk: GetMenuStringA and GetMenuStringW inverted the MF_BYPOSITION parameter. Buffers were incorrectly copied in and wrong size returned in GetMenuItemInfoA ansi-structures. GetMenuString now works the same on both windows and ROS. Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c _____ Modified: branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c --- branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 16:15:15 UTC (rev 17007) +++ branches/ros-branch-0_2_7/reactos/lib/user32/windows/menu.c 2005-08-03 16:17:15 UTC (rev 17008) @@ -3772,7 +3772,7 @@ RtlCopyMemory(mii, &miiW, miiW.cbSize); mii->dwTypeData = AnsiBuffer; - + mii->cch = strlen(AnsiBuffer); return TRUE; } @@ -3864,11 +3864,11 @@ MENUITEMINFOA mii; mii.dwTypeData = lpString; mii.fMask = MIIM_STRING; + mii.fType = MF_STRING; mii.cbSize = sizeof(MENUITEMINFOA); mii.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&mii))) return 0; else return mii.cch; @@ -3893,10 +3893,9 @@ miiW.cbSize = sizeof(MENUITEMINFOW); miiW.cch = nMaxCount; - UNIMPLEMENTED; - if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)(MF_BYPOSITION & uFlag),&miiW))) return 0; - else + else return miiW.cch; } @@ -4318,11 +4317,11 @@ mii.fState = MFS_ENABLED; UNIMPLEMENTED; - + if(!GetMenuItemInfoA( hMnu, uPosition, (BOOL)!(MF_BYPOSITION & uFlags), - &mii)) return FALSE; + &mii)) return FALSE; if(uFlags & MF_BITMAP) { @@ -4341,7 +4340,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } /* Item beginning with a backspace is a help item */ if (*lpNewItem == '\b') { @@ -4352,7 +4351,7 @@ mii.dwTypeData = (LPSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY; @@ -4439,7 +4438,7 @@ if(mii.dwTypeData != NULL) { HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } + } if (*lpNewItem == '\b') { mii.fType |= MF_HELP; @@ -4449,7 +4448,7 @@ mii.dwTypeData = (LPWSTR)lpNewItem; mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); } - + if(uFlags & MF_RIGHTJUSTIFY) { mii.fType |= MFT_RIGHTJUSTIFY;

1 0

[navaraf] 17007: Fixed the size of the hyperspace area. Partial merge of 16592 from trunk.
by navaraf＠svn.reactos.com 03 Aug '05

03 Aug '05

Fixed the size of the hyperspace area. Partial merge of 16592 from trunk. Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c _____ Modified: branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c --- branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c 2005-08-03 16:11:00 UTC (rev 17006) +++ branches/ros-branch-0_2_7/reactos/ntoskrnl/mm/i386/page.c 2005-08-03 16:15:15 UTC (rev 17007) @@ -40,7 +40,7 @@ #define PAE_PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (512))) #define HYPERSPACE (Ke386Pae ? 0xc0800000 : 0xc0400000) -#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < 0xc0c00000)) +#define IS_HYPERSPACE(v) (((ULONG)(v) >= HYPERSPACE && (ULONG)(v) < HYPERSPACE + 0x400000)) ULONG MmGlobalKernelPageDirectory[1024]; ULONGLONG MmGlobalKernelPageDirectoryForPAE[2048]; @@ -2371,32 +2371,41 @@ MEMORY_AREA* hyperspace_desc = NULL; PHYSICAL_ADDRESS BoundaryAddressMultiple; PVOID BaseAddress; + NTSTATUS Status; DPRINT("MiInitPageDirectoryMap()\n"); BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x800000 : 0x400000, - 0, - &kernel_map_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + Ke386Pae ? 0x800000 : 0x400000, + 0, + &kernel_map_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } BaseAddress = (PVOID)HYPERSPACE; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Ke386Pae ? 0x400000 : 0x800000, - 0, - &hyperspace_desc, - TRUE, - FALSE, - BoundaryAddressMultiple); + Status = MmCreateMemoryArea(NULL, + MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM, + &BaseAddress, + 0x400000, + 0, + &hyperspace_desc, + TRUE, + FALSE, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } } /* EOF */

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