Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 31302: - Add a very bare bones implementation of IMAGE_ICON for CopyImage. - Move the IMAGE_BITMAP stuff to a seperate function which will eventually be rewritten.
by gedmurphy＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: gedmurphy Date: Tue Dec 18 16:49:38 2007 New Revision: 31302 URL: http://svn.reactos.org/svn/reactos?rev=31302&view=rev Log: - Add a very bare bones implementation of IMAGE_ICON for CopyImage. - Move the IMAGE_BITMAP stuff to a seperate function which will eventually be rewritten. Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Tue Dec 18 16:49:38 2007 @@ -268,8 +268,15 @@ if (hIcon && 0 != (fuLoad & LR_SHARED)) { +#if 0 NtUserSetCursorIconData((HICON)hIcon, NULL, NULL, hinst, hResInfo, (HRSRC)NULL); +#else + ICONINFO iconInfo; + + if(NtUserGetIconInfo(ResIcon, &iconInfo, NULL, NULL, NULL, FALSE)) + NtUserSetCursorIconData((HICON)hIcon, hinst, NULL, &iconInfo); +#endif } return hIcon; @@ -558,6 +565,276 @@ LoadBitmapW(HINSTANCE hInstance, LPCWSTR lpBitmapName) { return LoadImageW(hInstance, lpBitmapName, IMAGE_BITMAP, 0, 0, 0); +} + + +static HANDLE +CopyBmp(HANDLE hnd, + UINT type, + INT desiredx, + INT desiredy, + UINT flags) +{ + HBITMAP res = NULL; + DIBSECTION ds; + int objSize; + BITMAPINFO * bi; + + objSize = GetObjectW( hnd, sizeof(ds), &ds ); + if (!objSize) return 0; + if ((desiredx < 0) || (desiredy < 0)) return 0; + + if (flags & LR_COPYFROMRESOURCE) + { + FIXME("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); + } + + if (desiredx == 0) desiredx = ds.dsBm.bmWidth; + if (desiredy == 0) desiredy = ds.dsBm.bmHeight; + + /* Allocate memory for a BITMAPINFOHEADER structure and a + color table. The maximum number of colors in a color table + is 256 which corresponds to a bitmap with depth 8. + Bitmaps with higher depths don't have color tables. */ + bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!bi) return 0; + + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + bi->bmiHeader.biCompression = BI_RGB; + + if (flags & LR_CREATEDIBSECTION) + { + /* Create a DIB section. LR_MONOCHROME is ignored */ + void * bits; + HDC dc = CreateCompatibleDC(NULL); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB. + Get its attributes to create an exact copy */ + memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); + } + + /* Get the color table or the color masks */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + + bi->bmiHeader.biWidth = desiredx; + bi->bmiHeader.biHeight = desiredy; + bi->bmiHeader.biSizeImage = 0; + + res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); + DeleteDC(dc); + } + else + { + /* Create a device-dependent bitmap */ + + BOOL monochrome = (flags & LR_MONOCHROME); + + if (objSize == sizeof(DIBSECTION)) + { + /* The source bitmap is a DIB section. + Get its attributes */ + HDC dc = CreateCompatibleDC(NULL); + bi->bmiHeader.biSize = sizeof(bi->bmiHeader); + bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + DeleteDC(dc); + + if (!monochrome && ds.dsBm.bmBitsPixel == 1) + { + /* Look if the colors of the DIB are black and white */ + + monochrome = + (bi->bmiColors[0].rgbRed == 0xff + && bi->bmiColors[0].rgbGreen == 0xff + && bi->bmiColors[0].rgbBlue == 0xff + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0 + && bi->bmiColors[1].rgbGreen == 0 + && bi->bmiColors[1].rgbBlue == 0 + && bi->bmiColors[1].rgbReserved == 0) + || + (bi->bmiColors[0].rgbRed == 0 + && bi->bmiColors[0].rgbGreen == 0 + && bi->bmiColors[0].rgbBlue == 0 + && bi->bmiColors[0].rgbReserved == 0 + && bi->bmiColors[1].rgbRed == 0xff + && bi->bmiColors[1].rgbGreen == 0xff + && bi->bmiColors[1].rgbBlue == 0xff + && bi->bmiColors[1].rgbReserved == 0); + } + } + else if (!monochrome) + { + monochrome = ds.dsBm.bmBitsPixel == 1; + } + + if (monochrome) + { + res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); + } + else + { + HDC screenDC = GetDC(NULL); + res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); + ReleaseDC(NULL, screenDC); + } + } + + if (res) + { + /* Only copy the bitmap if it's a DIB section or if it's + compatible to the screen */ + BOOL copyContents; + + if (objSize == sizeof(DIBSECTION)) + { + copyContents = TRUE; + } + else + { + HDC screenDC = GetDC(NULL); + int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); + ReleaseDC(NULL, screenDC); + + copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); + } + + if (copyContents) + { + /* The source bitmap may already be selected in a device context, + use GetDIBits/StretchDIBits and not StretchBlt */ + + HDC dc; + void * bits; + + dc = CreateCompatibleDC(NULL); + + bi->bmiHeader.biWidth = ds.dsBm.bmWidth; + bi->bmiHeader.biHeight = ds.dsBm.bmHeight; + bi->bmiHeader.biSizeImage = 0; + bi->bmiHeader.biClrUsed = 0; + bi->bmiHeader.biClrImportant = 0; + + /* Fill in biSizeImage */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); + bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); + + if (bits) + { + HBITMAP oldBmp; + + /* Get the image bits of the source bitmap */ + GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); + + /* Copy it to the destination bitmap */ + oldBmp = SelectObject(dc, res); + StretchDIBits(dc, 0, 0, desiredx, desiredy, + 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, + bits, bi, DIB_RGB_COLORS, SRCCOPY); + SelectObject(dc, oldBmp); + + HeapFree(GetProcessHeap(), 0, bits); + } + + DeleteDC(dc); + } + + if (flags & LR_COPYDELETEORG) + { + DeleteObject(hnd); + } + } + HeapFree(GetProcessHeap(), 0, bi); + return res; +} + + +INT +GetIconCurBpp(PICONINFO pIconInfo) +{ + PBITMAPINFO pbi; + + pbi = (PBITMAPINFO)pIconInfo->hbmColor; + return pbi->bmiHeader.biBitCount; +} + + +static BOOL +SetCursorIconData( + HANDLE Handle, + HINSTANCE hMod, + LPWSTR lpResName, + PICONINFO pIconInfo) +{ + UNICODE_STRING Res; + + if (!Handle || !pIconInfo) + return FALSE; + + RtlInitUnicodeString(&Res, lpResName); + + return NtUserSetCursorIconData(Handle, hMod, &Res, pIconInfo); +} + + +/* bare bones icon copy implementation */ +static HANDLE +CopyIcoCur(HANDLE hIconCur, + UINT type, + INT desiredx, + INT desiredy, + UINT flags) +{ + HANDLE hNewIcon = NULL; + ICONINFO origIconInfo, newIconInfo; + SIZE origSize; + DWORD origBpp; + + if (!hIconCur) + return NULL; + + if (flags & LR_COPYFROMRESOURCE || flags & LR_CREATEDIBSECTION) + { + FIXME("FIXME: LR_COPYFROMRESOURCE and LR_CREATEDIBSECTION are yet not implemented for icons\n"); + } + + if (NtUserGetIconSize(hIconCur, 0, &origSize.cx, &origSize.cy)) + { + if (desiredx == 0) desiredx = origSize.cx; + if (desiredx == 0) desiredy = origSize.cy; + + if (NtUserGetIconInfo(hIconCur, &origIconInfo, NULL, NULL, &origBpp, TRUE)) + { + hNewIcon = (HANDLE)NtUserCallOneParam(0, ONEPARAM_ROUTINE_CREATECURICONHANDLE); + + if (hNewIcon) + { + /* the bitmaps returned from the NtUserGetIconInfo are copies of the original, + * so we can use these directly to build up our icon/cursor copy */ + RtlCopyMemory(&newIconInfo, &origIconInfo, sizeof(ICONINFO)); + + if (!SetCursorIconData(hNewIcon, NULL, NULL, &newIconInfo)) + { + if (newIconInfo.fIcon) + DestroyIcon(hNewIcon); + else + DestroyCursor(hNewIcon); + + hNewIcon = NULL; + } + } + + DeleteObject(origIconInfo.hbmMask); + DeleteObject(origIconInfo.hbmColor); + } + } + + + return hNewIcon; } @@ -589,195 +866,10 @@ switch (type) { case IMAGE_BITMAP: - { - HBITMAP res = NULL; - DIBSECTION ds; - int objSize; - BITMAPINFO * bi; - - objSize = GetObjectW( hnd, sizeof(ds), &ds ); - if (!objSize) return 0; - if ((desiredx < 0) || (desiredy < 0)) return 0; - - if (flags & LR_COPYFROMRESOURCE) - { - FIXME("FIXME: The flag LR_COPYFROMRESOURCE is not implemented for bitmaps\n"); - } - - if (desiredx == 0) desiredx = ds.dsBm.bmWidth; - if (desiredy == 0) desiredy = ds.dsBm.bmHeight; - - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!bi) return 0; - - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biPlanes = ds.dsBm.bmPlanes; - bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; - bi->bmiHeader.biCompression = BI_RGB; - - if (flags & LR_CREATEDIBSECTION) - { - /* Create a DIB section. LR_MONOCHROME is ignored */ - void * bits; - HDC dc = CreateCompatibleDC(NULL); - - if (objSize == sizeof(DIBSECTION)) - { - /* The source bitmap is a DIB. - Get its attributes to create an exact copy */ - memcpy(bi, &ds.dsBmih, sizeof(BITMAPINFOHEADER)); - } - - /* Get the color table or the color masks */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - - bi->bmiHeader.biWidth = desiredx; - bi->bmiHeader.biHeight = desiredy; - bi->bmiHeader.biSizeImage = 0; - - res = CreateDIBSection(dc, bi, DIB_RGB_COLORS, &bits, NULL, 0); - DeleteDC(dc); - } - else - { - /* Create a device-dependent bitmap */ - - BOOL monochrome = (flags & LR_MONOCHROME); - - if (objSize == sizeof(DIBSECTION)) - { - /* The source bitmap is a DIB section. - Get its attributes */ - HDC dc = CreateCompatibleDC(NULL); - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biBitCount = ds.dsBm.bmBitsPixel; - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - DeleteDC(dc); - - if (!monochrome && ds.dsBm.bmBitsPixel == 1) - { - /* Look if the colors of the DIB are black and white */ - - monochrome = - (bi->bmiColors[0].rgbRed == 0xff - && bi->bmiColors[0].rgbGreen == 0xff - && bi->bmiColors[0].rgbBlue == 0xff - && bi->bmiColors[0].rgbReserved == 0 - && bi->bmiColors[1].rgbRed == 0 - && bi->bmiColors[1].rgbGreen == 0 - && bi->bmiColors[1].rgbBlue == 0 - && bi->bmiColors[1].rgbReserved == 0) - || - (bi->bmiColors[0].rgbRed == 0 - && bi->bmiColors[0].rgbGreen == 0 - && bi->bmiColors[0].rgbBlue == 0 - && bi->bmiColors[0].rgbReserved == 0 - && bi->bmiColors[1].rgbRed == 0xff - && bi->bmiColors[1].rgbGreen == 0xff - && bi->bmiColors[1].rgbBlue == 0xff - && bi->bmiColors[1].rgbReserved == 0); - } - } - else if (!monochrome) - { - monochrome = ds.dsBm.bmBitsPixel == 1; - } - - if (monochrome) - { - res = CreateBitmap(desiredx, desiredy, 1, 1, NULL); - } - else - { - HDC screenDC = GetDC(NULL); - res = CreateCompatibleBitmap(screenDC, desiredx, desiredy); - ReleaseDC(NULL, screenDC); - } - } - - if (res) - { - /* Only copy the bitmap if it's a DIB section or if it's - compatible to the screen */ - BOOL copyContents; - - if (objSize == sizeof(DIBSECTION)) - { - copyContents = TRUE; - } - else - { - HDC screenDC = GetDC(NULL); - int screen_depth = GetDeviceCaps(screenDC, BITSPIXEL); - ReleaseDC(NULL, screenDC); - - copyContents = (ds.dsBm.bmBitsPixel == 1 || ds.dsBm.bmBitsPixel == screen_depth); - } - - if (copyContents) - { - /* The source bitmap may already be selected in a device context, - use GetDIBits/StretchDIBits and not StretchBlt */ - - HDC dc; - void * bits; - - dc = CreateCompatibleDC(NULL); - - bi->bmiHeader.biWidth = ds.dsBm.bmWidth; - bi->bmiHeader.biHeight = ds.dsBm.bmHeight; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biClrUsed = 0; - bi->bmiHeader.biClrImportant = 0; - - /* Fill in biSizeImage */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, NULL, bi, DIB_RGB_COLORS); - bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bi->bmiHeader.biSizeImage); - - if (bits) - { - HBITMAP oldBmp; - - /* Get the image bits of the source bitmap */ - GetDIBits(dc, hnd, 0, ds.dsBm.bmHeight, bits, bi, DIB_RGB_COLORS); - - /* Copy it to the destination bitmap */ - oldBmp = SelectObject(dc, res); - StretchDIBits(dc, 0, 0, desiredx, desiredy, - 0, 0, ds.dsBm.bmWidth, ds.dsBm.bmHeight, - bits, bi, DIB_RGB_COLORS, SRCCOPY); - SelectObject(dc, oldBmp); - - HeapFree(GetProcessHeap(), 0, bits); - } - - DeleteDC(dc); - } - - if (flags & LR_COPYDELETEORG) - { - DeleteObject(hnd); - } - } - HeapFree(GetProcessHeap(), 0, bi); - return res; - } + return CopyBmp(hnd, type, desiredx, desiredy, flags); + case IMAGE_ICON: - { - static BOOL IconMsgDisplayed = FALSE; - /* FIXME: support loading the image as shared from an instance */ - if (!IconMsgDisplayed) - { - FIXME("FIXME: CopyImage doesn't support IMAGE_ICON correctly!\n"); - IconMsgDisplayed = TRUE; - } - return CopyIcon(hnd); -// return CURSORICON_ExtCopy(hnd,type, desiredx, desiredy, flags); - } + return CopyIcoCur(hnd, type, desiredx, desiredy, flags); case IMAGE_CURSOR: { @@ -795,6 +887,6 @@ return CopyCursor(hnd); } } + return NULL; } -

1 0

[gedmurphy] 31301: - Fix NtUserGetIconInfo and use SEH directly. - Fix the NtUserSetCursorIconData definition and rewrite it (not fully complete)
by gedmurphy＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: gedmurphy Date: Tue Dec 18 16:49:00 2007 New Revision: 31301 URL: http://svn.reactos.org/svn/reactos?rev=31301&view=rev Log: - Fix NtUserGetIconInfo and use SEH directly. - Fix the NtUserSetCursorIconData definition and rewrite it (not fully complete) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Tue Dec 18 16:49:00 2007 @@ -623,12 +623,16 @@ STDCALL NtUserGetIconInfo( HANDLE hCurIcon, - PICONINFO IconInfo, DWORD UnkOne, DWORD UnkTwo, DWORD UnkThree, DWORD UnkFour ) + PICONINFO IconInfo, + PUNICODE_STRING lpInstName, // optional + PUNICODE_STRING lpResName, // optional + LPDWORD pbpp, // optional + BOOL bInternal) { ICONINFO ii; PCURICON_OBJECT CurIcon; PWINSTATION_OBJECT WinSta; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; DECLARE_RETURN(BOOL); @@ -656,12 +660,22 @@ RtlCopyMemory(&ii, &CurIcon->IconInfo, sizeof(ICONINFO)); /* Copy bitmaps */ - ii.hbmMask = BITMAPOBJ_CopyBitmap(ii.hbmMask); - ii.hbmColor = BITMAPOBJ_CopyBitmap(ii.hbmColor); + ii.hbmMask = BITMAPOBJ_CopyBitmap(CurIcon->IconInfo.hbmMask); + ii.hbmColor = BITMAPOBJ_CopyBitmap(CurIcon->IconInfo.hbmColor); /* Copy fields */ - Status = MmCopyToCaller(IconInfo, &ii, sizeof(ICONINFO)); - if(NT_SUCCESS(Status)) + _SEH_TRY + { + ProbeForWrite(IconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(IconInfo, &ii, sizeof(ICONINFO)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if (NT_SUCCESS(Status)) Ret = TRUE; else SetLastNtError(Status); @@ -1156,19 +1170,17 @@ * @implemented */ BOOL -STDCALL +NTAPI NtUserSetCursorIconData( - HANDLE hCurIcon, - PBOOL fIcon, - POINT *Hotspot, - HMODULE hModule, - HRSRC hRsrc, - HRSRC hGroupRsrc) + HANDLE Handle, + HMODULE hModule, + PUNICODE_STRING pstrResName, + PICONINFO pIconInfo) { PCURICON_OBJECT CurIcon; PWINSTATION_OBJECT WinSta; - NTSTATUS Status; - POINT SafeHotspot; + PBITMAPOBJ pBmpObj; + NTSTATUS Status = STATUS_SUCCESS; BOOL Ret = FALSE; DECLARE_RETURN(BOOL); @@ -1181,55 +1193,61 @@ RETURN( FALSE); } - if(!(CurIcon = UserGetCurIconObject(hCurIcon))) + if(!(CurIcon = UserGetCurIconObject(Handle))) { ObDereferenceObject(WinSta); RETURN(FALSE); } CurIcon->hModule = hModule; - CurIcon->hRsrc = hRsrc; - CurIcon->hGroupRsrc = hGroupRsrc; - - /* Copy fields */ - if(fIcon) - { - Status = MmCopyFromCaller(&CurIcon->IconInfo.fIcon, fIcon, sizeof(BOOL)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto done; - } - } + CurIcon->hRsrc = NULL; //hRsrc; + CurIcon->hGroupRsrc = NULL; //hGroupRsrc; + + _SEH_TRY + { + ProbeForRead(pIconInfo, sizeof(ICONINFO), 1); + RtlCopyMemory(&CurIcon->IconInfo, pIconInfo, sizeof(ICONINFO)); + + CurIcon->IconInfo.hbmMask = BITMAPOBJ_CopyBitmap(pIconInfo->hbmMask); + CurIcon->IconInfo.hbmColor = BITMAPOBJ_CopyBitmap(pIconInfo->hbmColor); + + if (CurIcon->IconInfo.hbmColor) + { + if ((pBmpObj = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmColor))) + { + CurIcon->Size.cx = pBmpObj->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = pBmpObj->SurfObj.sizlBitmap.cy; + BITMAPOBJ_UnlockBitmap(pBmpObj); + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + if (CurIcon->IconInfo.hbmMask) + { + if (CurIcon->IconInfo.hbmColor == NULL) + { + if ((pBmpObj = BITMAPOBJ_LockBitmap(CurIcon->IconInfo.hbmMask))) + { + CurIcon->Size.cx = pBmpObj->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = pBmpObj->SurfObj.sizlBitmap.cy; + BITMAPOBJ_UnlockBitmap(pBmpObj); + } + } + GDIOBJ_SetOwnership(GdiHandleTable, CurIcon->IconInfo.hbmMask, NULL); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END + + if(!NT_SUCCESS(Status)) + SetLastNtError(Status); else - { - if(!Hotspot) - Ret = TRUE; - } - - if(Hotspot) - { - Status = MmCopyFromCaller(&SafeHotspot, Hotspot, sizeof(POINT)); - if(NT_SUCCESS(Status)) - { - CurIcon->IconInfo.xHotspot = SafeHotspot.x; - CurIcon->IconInfo.yHotspot = SafeHotspot.y; - - Ret = TRUE; - } - else - SetLastNtError(Status); - } - - if(!fIcon && !Hotspot) - { Ret = TRUE; - } - -done: + ObDereferenceObject(WinSta); RETURN( Ret); - CLEANUP: DPRINT("Leave NtUserSetCursorIconData, ret=%i\n",_ret_); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Dec 18 16:49:00 2007 @@ -519,7 +519,7 @@ NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 NtUserSetCursorContents 2 -# NtUserSetCursorIconData 4 Wrong number of param ? +NtUserSetCursorIconData 4 NtUserSetCursorIconData 6 NtUserSetDbgTag 2 NtUserSetFocus 1

1 0

[fireball] 31300: - Recommit the fixed winebuild. The fix was to: * remove Colin's 31297. * spec32.c:625, substitute odp->name check with (odp->name || odp->export_name) check.
by fireball＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: fireball Date: Tue Dec 18 14:00:37 2007 New Revision: 31300 URL: http://svn.reactos.org/svn/reactos?rev=31300&view=rev Log: - Recommit the fixed winebuild. The fix was to: * remove Colin's 31297. * spec32.c:625, substitute odp->name check with (odp->name || odp->export_name) check. Modified: trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

1 0

[fireball] 31299: Filip Navara <xnavara at volny dot cz> 's christmas gift - Fix certain cases of deallocation inside registry hives. - Add debug output in case of a problem in HvpRemoveFree.
by fireball＠svn.reactos.org 18 Dec '07

18 Dec '07

Author: fireball Date: Tue Dec 18 13:13:45 2007 New Revision: 31299 URL: http://svn.reactos.org/svn/reactos?rev=31299&view=rev Log: Filip Navara <xnavara at volny dot cz> 's christmas gift - Fix certain cases of deallocation inside registry hives. - Add debug output in case of a problem in HvpRemoveFree. Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Tue Dec 18 13:13:45 2007 @@ -205,7 +205,7 @@ PHCELL_INDEX FreeCellData; PHCELL_INDEX pFreeCellOffset; HSTORAGE_TYPE Storage; - ULONG Index; + ULONG Index, FreeListIndex; ASSERT(RegistryHive->ReadOnly == FALSE); @@ -223,6 +223,24 @@ } pFreeCellOffset = FreeCellData; } + + /* Something bad happened, print a useful trace info and bugcheck */ + CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); + CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); + CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %d\n", Index); + for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%d]: ", FreeListIndex); + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; + while (*pFreeCellOffset != HCELL_NIL) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + pFreeCellOffset = FreeCellData; + } + CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); + } + CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); ASSERT(FALSE); } @@ -466,11 +484,23 @@ { if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) { - Neighbor->Size += Free->Size; + HCELL_INDEX NeighborCellIndex = + (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK); + + if (HvpComputeFreeListIndex(Neighbor->Size) != + HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + { + HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); + Neighbor->Size += Free->Size; + HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + } + else + Neighbor->Size += Free->Size; + if (CellType == Stable) - HvMarkCellDirty(RegistryHive, - (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset), FALSE); + HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); + return; } Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size);

1 0

[cfinck] 31298: Revert 31292, 31294 and 31297. Every change I try for fixing the build in one component breaks the build for another component. winebuild wasn't synchronized completely to the Wine version anyway, and the current Wine version removed support for the --pedll option we use, so a full clean sync isn't possible.
by cfinck＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: cfinck Date: Tue Dec 18 02:36:09 2007 New Revision: 31298 URL: http://svn.reactos.org/svn/reactos?rev=31298&view=rev Log: Revert 31292, 31294 and 31297. Every change I try for fixing the build in one component breaks the build for another component. winebuild wasn't synchronized completely to the Wine version anyway, and the current Wine version removed support for the --pedll option we use, so a full clean sync isn't possible. Modified: trunk/reactos/tools/winebuild/Makefile.in trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec16.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winebuild.man.in trunk/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/winebuild/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/Makefile.i… Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… Modified: trunk/reactos/tools/winebuild/spec16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec16.c?r… Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… Modified: trunk/reactos/tools/winebuild/winebuild.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?…

1 0

[cfinck] 31297: Get rid of make_internal_name() and only use the name or export name now, also for stub functions. This is already done this way when creating the SPEC files, but wasn't done when creating the C files with the stubs.
by cfinck＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: cfinck Date: Tue Dec 18 02:22:34 2007 New Revision: 31297 URL: http://svn.reactos.org/svn/reactos?rev=31297&view=rev Log: Get rid of make_internal_name() and only use the name or export name now, also for stub functions. This is already done this way when creating the SPEC files, but wasn't done when creating the C files with the stubs. Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c (original) +++ trunk/reactos/tools/winebuild/spec32.c Tue Dec 18 02:22:34 2007 @@ -61,28 +61,6 @@ } return 0; } - -/******************************************************************* - * make_internal_name - * - * Generate an internal name for an entry point. Used for stubs etc. - */ -static const char *make_internal_name( const ORDDEF *odp, DLLSPEC *spec, const char *prefix ) -{ - static char buffer[256]; - if (odp->name || odp->export_name) - { - char *p; - sprintf( buffer, "__wine_%s_%s_%s", prefix, spec->file_name, - odp->name ? odp->name : odp->export_name ); - /* make sure name is a legal C identifier */ - for (p = buffer; *p; p++) if (!isalnum(*p) && *p != '_') break; - if (!*p) return buffer; - } - sprintf( buffer, "__wine_%s_%s_%d", prefix, make_c_identifier(spec->file_name), odp->ordinal ); - return buffer; -} - /******************************************************************* * output_relay_debug @@ -353,7 +331,7 @@ { const ORDDEF *odp = &spec->entry_points[i]; if (odp->type != TYPE_STUB) continue; - output( "void %s(void) ", make_internal_name( odp, spec, "stub" ) ); + output( "void %s(void) ", (odp->name ? odp->name : odp->export_name) ); if (odp->name) output( "{ __wine_spec_unimplemented_stub(__wine_spec_file_name, \"%s\"); }\n", odp->name ); else if (odp->export_name) @@ -624,7 +602,7 @@ } if (NULL != odp->name) { - output("=%s", make_internal_name( odp, spec, "stub" )); + output("=%s", odp->name); } break; }

1 0

Re: [ros-diffs] [cfinck] 31296: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compile
by Steven Edwards 17 Dec '07

17 Dec '07

Hello, On Dec 17, 2007 5:01 PM, <cfinck(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=31296&view=rev > Log: > Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) > I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. Maybe there was a bug in older versions of binutils. Perhaps it was ignoring unresolved exports marked PRIVATE. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 1

[cfinck] 31296: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. This should fix the build breakage.
by cfinck＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: cfinck Date: Tue Dec 18 01:01:06 2007 New Revision: 31296 URL: http://svn.reactos.org/svn/reactos?rev=31296&view=rev Log: Rename DSOUND_DllRegisterServer to DllRegisterServer and DSOUND_DllUnregisterServer to DllUnregisterServer. (the same is already done in the other DirectX DLL's with SPEC files) I wonder how dsound.dll could be compiled in the past cause the SPEC file never referenced to these functions. This should fix the build breakage. Modified: trunk/reactos/dll/directx/dsound/regsvr.c Modified: trunk/reactos/dll/directx/dsound/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/regsvr.… ============================================================================== --- trunk/reactos/dll/directx/dsound/regsvr.c (original) +++ trunk/reactos/dll/directx/dsound/regsvr.c Tue Dec 18 01:01:06 2007 @@ -556,7 +556,7 @@ /*********************************************************************** * DllRegisterServer (DSOUND.@) */ -HRESULT WINAPI DSOUND_DllRegisterServer(void) +HRESULT WINAPI DllRegisterServer(void) { HRESULT hr; @@ -571,7 +571,7 @@ /*********************************************************************** * DllUnregisterServer (DSOUND.@) */ -HRESULT WINAPI DSOUND_DllUnregisterServer(void) +HRESULT WINAPI DllUnregisterServer(void) { HRESULT hr;

1 0

[gbrunmar] 31295: * Check SDKVersion and print error message if debug flag is specified. * New CreateD3D9 internal function to create a valid IDirect3D9 object.
by gbrunmar＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: gbrunmar Date: Tue Dec 18 00:22:40 2007 New Revision: 31295 URL: http://svn.reactos.org/svn/reactos?rev=31295&view=rev Log: * Check SDKVersion and print error message if debug flag is specified. * New CreateD3D9 internal function to create a valid IDirect3D9 object. Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Tue Dec 18 00:22:40 2007 @@ -13,42 +13,46 @@ #include <debug.h> -DLLAPI +#define DEBUG_MESSAGE_BUFFER_SIZE 512 + +static LPCSTR D3dError_WrongSdkVersion = + "D3D ERROR: D3D header version mismatch.\n" + "The application was compiled against and will only work with " + "D3D_SDK_VERSION (%d), but the currently installed runtime is " + "version (%d).\n" + "Recompile the application against the appropriate SDK for the installed runtime.\n" + "\n"; + HRESULT Direct3DShaderValidatorCreate9(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT PSGPError(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT PSGPSampleTexture(void) { UNIMPLEMENTED return 0; } -DLLAPI -HRESULT DebugSetLevel(void) +HRESULT DebugSetLevel(void) { UNIMPLEMENTED return 0; } -DLLAPI HRESULT DebugSetMute(DWORD dw1) { UNIMPLEMENTED return 0; } -DLLAPI IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion) { HINSTANCE hDebugDll; @@ -56,6 +60,7 @@ DWORD LoadDebugDllSize; LPDIRECT3D9 D3D9Obj = 0; LPDIRECT3DCREATE9 DebugDirect3DCreate9 = 0; + CHAR DebugMessageBuffer[DEBUG_MESSAGE_BUFFER_SIZE]; UNIMPLEMENTED @@ -70,10 +75,23 @@ { DebugDirect3DCreate9 = (LPDIRECT3DCREATE9)GetProcAddress(hDebugDll, "Direct3DCreate9"); - D3D9Obj = DebugDirect3DCreate9(SDKVersion); + return DebugDirect3DCreate9(SDKVersion); } } } + + if ((SDKVersion & 0x7FFFFFFF) != D3D_SDK_VERSION || (SDKVersion & 0x7FFFFFFF) != D3D9b_SDK_VERSION) + { + if (SDKVersion & 0x80000000) + { + FormatDebugString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, SDKVersion, D3D_SDK_VERSION); + OutputDebugStringA(DebugMessageBuffer); + } + + return NULL; + } + + CreateD3D9(&D3D9Obj); return D3D9Obj; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Tue Dec 18 00:22:40 2007 @@ -7,9 +7,13 @@ */ #include "d3d9_helpers.h" +#include <stdio.h> +#include <ddraw.h> +#include "d3d9_private.h" static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D"; + BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize) { @@ -32,3 +36,46 @@ return TRUE; } + +HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ) +{ + int BytesWritten; + va_list vargs; + + if (BufferSize == 0) + return DDERR_INVALIDPARAMS; + + va_start(vargs, FormatString); + BytesWritten = _vsnprintf(Buffer, BufferSize-1, FormatString, vargs); + + if (BytesWritten < BufferSize) + return DDERR_GENERIC; + + Buffer[BufferSize-1] = '\0'; + + return 0; +} + +HRESULT CreateD3D9(IDirect3D9** ppDirect3D9) +{ + LPDIRECTD3D9_INT pDirect3D9; + + if (ppDirect3D9 == 0) + return DDERR_INVALIDPARAMS; + + pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECTD3D9_INT)); + + if (0 == pDirect3D9) + return DDERR_OUTOFMEMORY; + + pDirect3D9->unknown000007 = 0; + pDirect3D9->lpInt = 0; + + //pDirect3D9->lpVtbl = &IDirect3D3_Vtbl; + pDirect3D9->dwProcessId = GetCurrentThreadId(); + pDirect3D9->dwIntRefCnt = 1; + + *ppDirect3D9 = (IDirect3D9*)pDirect3D9; + + return ERROR_SUCCESS; +} Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Tue Dec 18 00:22:40 2007 @@ -6,6 +6,14 @@ * PROGRAMERS: Gregor Brunmar <gregor (dot) brunmar (at) home (dot) se> */ +#include <d3d9.h> #include <windows.h> +/* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); + +/* Formats debug strings */ +HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); + +/* Creates a Direct3D9 object */ +HRESULT CreateD3D9(IDirect3D9** ppDirect3D9); Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Tue Dec 18 00:22:40 2007 @@ -11,9 +11,9 @@ #define DLLAPI __declspec(dllexport) -typedef IDirect3D9* WINAPI (*LPDIRECT3DCREATE9)(UINT); +typedef IDirect3D9* (WINAPI *LPDIRECT3DCREATE9)(UINT); -struct _tagDIRECTD3D9_INT_ +typedef struct _tagDIRECTD3D9_INT_ { /* 0x0000 */ LPVOID lpVtbl; /* LPDIRECTD3D9 functoions table */ /* 0x0004 */ CRITICAL_SECTION d3d9_cs; @@ -4594,4 +4594,4 @@ /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; /* 0x47b4 */ DWORD unknown004589; /*? 0x00000020 */ -} *DIRECTD3D9_INT; +} DIRECTD3D9_INT, *LPDIRECTD3D9_INT;

1 0

[fireball] 31294: - It should use only host headers.
by fireball＠svn.reactos.org 17 Dec '07

17 Dec '07

Author: fireball Date: Mon Dec 17 23:53:08 2007 New Revision: 31294 URL: http://svn.reactos.org/svn/reactos?rev=31294&view=rev Log: - It should use only host headers. Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/res16.c trunk/reactos/tools/winebuild/res32.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h (original) +++ trunk/reactos/tools/winebuild/build.h Mon Dec 17 23:53:08 2007 @@ -30,8 +30,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> - -#include "winglue.h" typedef enum { Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/import.c (original) +++ trunk/reactos/tools/winebuild/import.c Mon Dec 17 23:53:08 2007 @@ -35,8 +35,7 @@ # include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" struct import Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c (original) +++ trunk/reactos/tools/winebuild/main.c Mon Dec 17 23:53:08 2007 @@ -36,8 +36,7 @@ # include <getopt.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int UsePIC = 0; @@ -49,7 +48,7 @@ int save_temps = 0; int link_ext_symbols = 0; -#ifdef __i386__ +#if defined(__i386__) || defined(__x86_64__) enum target_cpu target_cpu = CPU_x86; #elif defined(__x86_64__) enum target_cpu target_cpu = CPU_x86_64; Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/parser.c (original) +++ trunk/reactos/tools/winebuild/parser.c Mon Dec 17 23:53:08 2007 @@ -32,8 +32,7 @@ #include <stdlib.h> #include <string.h> -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int current_line = 0; Modified: trunk/reactos/tools/winebuild/res16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res16.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res16.c (original) +++ trunk/reactos/tools/winebuild/res16.c Mon Dec 17 23:53:08 2007 @@ -38,8 +38,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" /* Unicode string or integer id */ Modified: trunk/reactos/tools/winebuild/res32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/res32.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/res32.c (original) +++ trunk/reactos/tools/winebuild/res32.c Mon Dec 17 23:53:08 2007 @@ -37,8 +37,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" /* Unicode string or integer id */ Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c (original) +++ trunk/reactos/tools/winebuild/spec32.c Mon Dec 17 23:53:08 2007 @@ -30,8 +30,7 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" +#include "winglue.h" //#include "wine/exception.h" #include "build.h" Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/utils.c (original) +++ trunk/reactos/tools/winebuild/utils.c Mon Dec 17 23:53:08 2007 @@ -31,8 +31,7 @@ # include <unistd.h> #endif -#include "windef.h" -#include "winnt.h" +#include "winglue.h" #include "build.h" #define MAX_TMP_FILES 8 Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h (original) +++ trunk/reactos/tools/winebuild/winglue.h Mon Dec 17 23:53:08 2007 @@ -1,10 +1,136 @@ #ifndef _WINGLUE_H #define _WINGLUE_H -/* Stuff missing in the host's PSDK */ -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned long DWORD; +typedef unsigned short WCHAR; +#if defined(_WIN64) +typedef unsigned __int64 UINT_PTR; +#else +typedef unsigned int UINT_PTR; +#endif + +#define LOBYTE(w) ((BYTE)(w)) +#define HIBYTE(w) ((BYTE)(((WORD)(w)>>8)&0xFF)) + +#define DLL_PROCESS_ATTACH 1 +#define DLL_PROCESS_DETACH 0 + +#define IMAGE_FILE_EXECUTABLE_IMAGE 2 +#define IMAGE_FILE_LARGE_ADDRESS_AWARE 32 +#define IMAGE_FILE_32BIT_MACHINE 256 +#define IMAGE_FILE_DLL 8192 +#define IMAGE_SUBSYSTEM_NATIVE 1 +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 +#define IMAGE_FILE_MACHINE_UNKNOWN 0 +#define IMAGE_FILE_MACHINE_I386 0x014c #define IMAGE_FILE_MACHINE_ALPHA 0x0184 +#define IMAGE_FILE_MACHINE_POWERPC 0x01f0 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_NT_SIGNATURE 0x00004550 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 #define IMAGE_SIZEOF_NT_OPTIONAL32_HEADER 224 #define IMAGE_SIZEOF_NT_OPTIONAL64_HEADER 240 +#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b +#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x20b +#if defined(_WIN64) +#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL64_HEADER +#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC +#else +#define IMAGE_SIZEOF_NT_OPTIONAL_HEADER IMAGE_SIZEOF_NT_OPTIONAL32_HEADER +#define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC +#endif + +#ifdef __GNUC__ +#ifndef NONAMELESSUNION +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#define _ANONYMOUS_UNION __extension__ +#define _ANONYMOUS_STRUCT __extension__ +#else +#if defined(__cplusplus) +#define _ANONYMOUS_UNION __extension__ +#endif /* __cplusplus */ +#endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ +#endif /* NONAMELESSUNION */ +#elif defined(__WATCOMC__) || defined(_MSC_VER) +#define _ANONYMOUS_UNION +#define _ANONYMOUS_STRUCT +#endif /* __GNUC__/__WATCOMC__ */ +#ifndef _ANONYMOUS_UNION +#define _ANONYMOUS_UNION +#define _UNION_NAME(x) x +#define DUMMYUNIONNAME u +#define DUMMYUNIONNAME2 u2 +#define DUMMYUNIONNAME3 u3 +#define DUMMYUNIONNAME4 u4 +#define DUMMYUNIONNAME5 u5 +#define DUMMYUNIONNAME6 u6 +#define DUMMYUNIONNAME7 u7 +#define DUMMYUNIONNAME8 u8 +#else +#define _UNION_NAME(x) +#define DUMMYUNIONNAME +#define DUMMYUNIONNAME2 +#define DUMMYUNIONNAME3 +#define DUMMYUNIONNAME4 +#define DUMMYUNIONNAME5 +#define DUMMYUNIONNAME6 +#define DUMMYUNIONNAME7 +#define DUMMYUNIONNAME8 +#endif +#ifndef _ANONYMOUS_STRUCT +#define _ANONYMOUS_STRUCT +#define _STRUCT_NAME(x) x +#define DUMMYSTRUCTNAME s +#define DUMMYSTRUCTNAME2 s2 +#define DUMMYSTRUCTNAME3 s3 +#else +#define _STRUCT_NAME(x) +#define DUMMYSTRUCTNAME +#define DUMMYSTRUCTNAME2 +#define DUMMYSTRUCTNAME3 +#endif + +typedef struct _IMAGE_RESOURCE_DIRECTORY { + DWORD Characteristics; + DWORD TimeDateStamp; + WORD MajorVersion; + WORD MinorVersion; + WORD NumberOfNamedEntries; + WORD NumberOfIdEntries; +} IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY; +_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + DWORD NameOffset:31; + DWORD NameIsString:1; + }DUMMYSTRUCTNAME; + DWORD Name; + WORD Id; + } DUMMYUNIONNAME; + _ANONYMOUS_UNION union { + DWORD OffsetToData; + _ANONYMOUS_STRUCT struct { + DWORD OffsetToDirectory:31; + DWORD DataIsDirectory:1; + } DUMMYSTRUCTNAME2; + } DUMMYUNIONNAME2; +} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; +typedef struct _IMAGE_RESOURCE_DATA_ENTRY { + DWORD OffsetToData; + DWORD Size; + DWORD CodePage; + DWORD Reserved; +} IMAGE_RESOURCE_DATA_ENTRY,*PIMAGE_RESOURCE_DATA_ENTRY; + +#ifndef max +#define max(a,b) ((a)>(b)?(a):(b)) +#endif +#ifndef min +#define min(a,b) ((a)<(b)?(a):(b)) +#endif #endif /* _WINGLUE_H */

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