Ros-diffs May 2007

ros-diffs@reactos.org

17 participants
322 discussions

[fireball] 26847: - Make 2 disk read error messages different, so it's possible to see what fails more exactly.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 21 12:46:18 2007 New Revision: 26847 URL: http://svn.reactos.org/svn/reactos?rev=26847&view=rev Log: - Make 2 disk read error messages different, so it's possible to see what fails more exactly. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Mon May 21 12:46:18 2007 @@ -121,7 +121,7 @@ } // If we get here then the read failed - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in LBA mode", RegsOut.b.ah); return FALSE; } @@ -244,7 +244,7 @@ // If we retried 3 times then fail if (RetryCount >= 3) { - DiskError("Disk Read Failed", RegsOut.b.ah); + DiskError("Disk Read Failed in CHS mode, after retrying 3 times", RegsOut.b.ah); return FALSE; }

17 years, 7 months

[mbosma] 26846: Sorry, I forgot this one.

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon May 21 02:56:32 2007 New Revision: 26846 URL: http://svn.reactos.org/svn/reactos?rev=26846&view=rev Log: Sorry, I forgot this one. Modified: trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon May 21 02:56:32 2007 @@ -497,7 +497,7 @@ DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->cbDDMiscellaneousCallbacks; DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); - if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.dwExpectedSize) + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.ddRVal != DD_OK) { DxHeapMemFree(mpFourCC); DxHeapMemFree(mpTextures);

17 years, 7 months

[mbosma] 26845: Implement IDirectDraw7::GetAvailableVidMem.

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon May 21 02:48:19 2007 New Revision: 26845 URL: http://svn.reactos.org/svn/reactos?rev=26845&view=rev Log: Implement IDirectDraw7::GetAvailableVidMem. Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Mon May 21 02:48:19 2007 @@ -39,7 +39,6 @@ return E_NOINTERFACE; } - Main_DirectDraw_AddRef(iface); DX_STUB_str("DD_OK"); return DD_OK; @@ -104,17 +103,11 @@ return This->dwIntRefCnt; } -/* - * IMPLEMENT - * Status ok - */ HRESULT WINAPI Main_DirectDraw_Compact(LPDIRECTDRAW7 iface) { - /* MSDN say not implement but my question what does it return then */ - DX_WINDBG_trace(); - return DD_OK; + return DD_OK; // not implemented in ms ddraw } HRESULT WINAPI @@ -176,8 +169,41 @@ return DD_OK; } -/* - */ +HRESULT WINAPI +Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, + LPDWORD dwTotal, LPDWORD dwFree) +{ + LPDDRAWI_DIRECTDRAW_INT This = (LPDDRAWI_DIRECTDRAW_INT)iface; + DX_WINDBG_trace(); + + // There is no HEL implentation of this api + if (!(This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.dwFlags & DDHAL_MISCCB32_GETAVAILDRIVERMEMORY)) + { + return DDERR_NODIRECTDRAWHW; + } + + if ((!dwTotal && !dwFree) || !ddscaps) + { + return DDERR_INVALIDPARAMS; + } + + DDHAL_GETAVAILDRIVERMEMORYDATA memdata; + memdata.lpDD = This->lpLcl->lpGbl; + memdata.ddRVal = DDERR_INVALIDPARAMS; + memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); + + if (This->lpLcl->lpDDCB->cbDDMiscellaneousCallbacks.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_NODIRECTDRAWHW; + + if (dwTotal) + *dwTotal = memdata.dwTotal; + + if (dwFree) + *dwFree = memdata.dwFree; + + return memdata.ddRVal; +} + HRESULT WINAPI Main_DirectDraw_CreateSurface (LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, LPDIRECTDRAWSURFACE7 *ppSurf, IUnknown *pUnkOuter) { Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c Mon May 21 02:48:19 2007 @@ -155,17 +155,6 @@ DX_STUB; } -/* - * Status: Implentation removed due to rewrite - */ -HRESULT WINAPI -Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, - LPDWORD total, LPDWORD free) -{ - DX_WINDBG_trace(); - DX_STUB; -} - HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Mon May 21 02:48:19 2007 @@ -18,7 +18,6 @@ WCHAR classname[128]; WNDCLASSW wnd_class; - HRESULT WINAPI @@ -140,7 +139,6 @@ DX_WINDBG_trace(); - /* * ddgbl.dwPDevice is not longer in use in windows 2000 and higher * I am using it for device type @@ -149,8 +147,6 @@ * devicetypes = 3 : both hel are enable * devicetypes = 4 :loading a guid drv from the register */ - - if (reenable == FALSE) { @@ -364,7 +360,6 @@ HRESULT WINAPI StartDirectDrawHal(LPDIRECTDRAW iface, BOOL reenable) { - LPDWORD mpFourCC; DDHALINFO mHALInfo; BOOL newmode = FALSE; @@ -381,7 +376,6 @@ RtlZeroMemory(&mD3dDriverData, sizeof(D3DHAL_GLOBALDRIVERDATA)); RtlZeroMemory(&mD3dBufferCallbacks, sizeof(DDHAL_DDEXEBUFCALLBACKS)); - if (reenable == FALSE) { if (ddgbl.lpDDCBtmp == NULL) @@ -406,8 +400,6 @@ DxHeapMemFree(ddgbl.lpDDCBtmp); return DD_FALSE; } - - /* Some card disable the dx after it have been created so * we are force reanble it @@ -456,17 +448,15 @@ mpTextures = (DDSURFACEDESC*) DxHeapMemAlloc(sizeof(DDSURFACEDESC) * mD3dDriverData.dwNumTextureFormats); if (mpTextures == NULL) { - DxHeapMemFree( mpFourCC); + DxHeapMemFree(mpFourCC); DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call - } - return DD_FALSE; - } - + return DD_FALSE; + } + } /* Get all basic data from the driver */ - if (!DdQueryDirectDrawObject( - This->lpLcl->lpGbl, + if (!DdQueryDirectDrawObject(This->lpLcl->lpGbl, &mHALInfo, &ddgbl.lpDDCBtmp->HALDD, &ddgbl.lpDDCBtmp->HALDDSurface, @@ -478,15 +468,15 @@ mpFourCC, NULL)) { - DxHeapMemFree( mpFourCC); - DxHeapMemFree( mpTextures); + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); DxHeapMemFree(ddgbl.lpDDCBtmp); // FIXME Close DX fristcall and second call return DD_FALSE; } memcpy(&ddgbl.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); - memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); + memcpy(&ddgbl.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); This->lpLcl->lpGbl->dwNumFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; This->lpLcl->lpGbl->lpdwFourCC = mpFourCC; @@ -499,8 +489,22 @@ This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; /* FIXME convert mpTextures to DDHALMODEINFO */ - DxHeapMemFree( mpTextures); + DxHeapMemFree(mpTextures); /* FIXME D3D setup mD3dCallbacks and mD3dDriverData */ + DDHAL_GETDRIVERINFODATA DdGetDriverInfo = { 0 }; + DdGetDriverInfo.dwSize = sizeof (DDHAL_GETDRIVERINFODATA); + DdGetDriverInfo.guidInfo = GUID_MiscellaneousCallbacks; + DdGetDriverInfo.lpvData = (PVOID)&ddgbl.lpDDCBtmp->cbDDMiscellaneousCallbacks; + DdGetDriverInfo.dwExpectedSize = sizeof (DDHAL_DDMISCELLANEOUSCALLBACKS); + if(mHALInfo.GetDriverInfo (&DdGetDriverInfo) == DDHAL_DRIVER_NOTHANDLED || DdGetDriverInfo.dwExpectedSize) + { + DxHeapMemFree(mpFourCC); + DxHeapMemFree(mpTextures); + DxHeapMemFree(ddgbl.lpDDCBtmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + return DD_OK; }

17 years, 7 months

[fireball] 26844: - Fix WebBrowser struct declaration to conform with a new WIDL.

by fireball＠svn.reactos.org

Author: fireball Date: Sun May 20 15:29:22 2007 New Revision: 26844 URL: http://svn.reactos.org/svn/reactos?rev=26844&view=rev Log: - Fix WebBrowser struct declaration to conform with a new WIDL. Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h Sun May 20 15:29:22 2007 @@ -61,7 +61,7 @@ typedef struct ConnectionPoint ConnectionPoint; -typedef struct { +struct WebBrowser { /* Interfaces available via WebBrowser object */ const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; @@ -115,7 +115,7 @@ ConnectionPoint *cp_wbe2; ConnectionPoint *cp_wbe; ConnectionPoint *cp_pns; -} WebBrowser; +}; #define WEBBROWSER(x) ((IWebBrowser*) &(x)->lpWebBrowser2Vtbl) #define WEBBROWSER2(x) ((IWebBrowser2*) &(x)->lpWebBrowser2Vtbl)

17 years, 7 months

[ekohl] 26843: Update WIDL to rev 20070519.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 20 03:02:35 2007 New Revision: 26843 URL: http://svn.reactos.org/svn/reactos?rev=26843&view=rev Log: Update WIDL to rev 20070519. Modified: trunk/reactos/tools/widl/ChangeLog trunk/reactos/tools/widl/Makefile.in trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/hash.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/lex.yy.c trunk/reactos/tools/widl/parser.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib.c trunk/reactos/tools/widl/typelib.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.man.in trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/widl/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/ChangeLog?rev=2… Modified: trunk/reactos/tools/widl/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/Makefile.in?rev… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=26… Modified: trunk/reactos/tools/widl/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/hash.c?rev=2684… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=26… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=26… Modified: trunk/reactos/tools/widl/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/lex.yy.c?rev=26… Modified: trunk/reactos/tools/widl/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.h?rev=26… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=26… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=26… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=268… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=26… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=2… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=2… Modified: trunk/reactos/tools/widl/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.c?rev=2… Modified: trunk/reactos/tools/widl/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib.h?rev=2… Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=268… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=268… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=2684… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=2684… Modified: trunk/reactos/tools/widl/widl.man.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.man.in?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

17 years, 7 months

[hpoussin] 26842: Another try to fix release builds to please Colin_Finck...

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun May 20 00:45:17 2007 New Revision: 26842 URL: http://svn.reactos.org/svn/reactos?rev=26842&view=rev Log: Another try to fix release builds to please Colin_Finck... Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c Sun May 20 00:45:17 2007 @@ -356,4 +356,10 @@ } } +#else + +VOID DebugPrint(ULONG Mask, char *format, ...) +{ +} + #endif // defined DBG Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h Sun May 20 00:45:17 2007 @@ -76,8 +76,6 @@ #else - inline VOID DebugPrint(ULONG Mask, char *format, ...) {} - #define DebugInit() #define DbgPrint(_x_) { if (0) DebugPrint _x_; } #define DPRINT1(_x_) { if (0) printf _x_; }

17 years, 7 months

[dgorbachev] 26841: Do not use paged pool at page fault time; see bug report #2252.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sat May 19 19:13:37 2007 New Revision: 26841 URL: http://svn.reactos.org/svn/reactos?rev=26841&view=rev Log: Do not use paged pool at page fault time; see bug report #2252. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sat May 19 19:13:37 2007 @@ -313,7 +313,7 @@ { Table = Segment->PageDirectory.PageTables[DirectoryOffset] = - ExAllocatePoolWithTag(PagedPool, sizeof(SECTION_PAGE_TABLE), + ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), TAG_SECTION_PAGE_TABLE); if (Table == NULL) {

17 years, 7 months

[tkreuzer] 26840: fix drawing on resize

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat May 19 18:23:00 2007 New Revision: 26840 URL: http://svn.reactos.org/svn/reactos?rev=26840&view=rev Log: fix drawing on resize Modified: trunk/rosapps/fontview/display.c Modified: trunk/rosapps/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fontview/display.c?rev=268… ============================================================================== --- trunk/rosapps/fontview/display.c (original) +++ trunk/rosapps/fontview/display.c Sat May 19 18:23:00 2007 @@ -178,7 +178,7 @@ BeginPaint(hwnd, &ps); - /* fill with white */ + /* Fill with white */ FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); /* Draw the text */ @@ -193,17 +193,34 @@ Display_OnSize(HWND hwnd) { RECT rect; - SCROLLINFO si; + SCROLLINFO si; + int nOldPos; GetClientRect(hwnd, &rect); + /* Get the old pos */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + nOldPos = si.nPos; + /* Set the new page size */ - si.cbSize = sizeof(si); si.fMask = SIF_PAGE; si.nPage = rect.bottom; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); -// FIXME: handle exceeding of current pos -> redraw entire window -// if new page size is < curent pos: current pos = maximum whatever and then redraw + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + /* Get the new pos */ + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + + /* If the don't match ... */ + if (nOldPos != si.nPos) + { + /* ... scroll the window */ + ScrollWindowEx(hwnd, 0, -(si.nPos - nOldPos), NULL, NULL, NULL, NULL, SW_INVALIDATE); + UpdateWindow(hwnd); + } + return 0; } @@ -231,7 +248,7 @@ case SB_LINEDOWN: nPos = si.nPos + 10; break; -// case SB_THUMBTRACK: + case SB_THUMBTRACK: case SB_THUMBPOSITION: nPos = si.nTrackPos; break;

17 years, 7 months

[sgasiorek] 26839: - add support for ETO_GLYPH_INDEX in NtGdiExtTextOut. (fixes character shift problem in QT apps) see bug #975

by sgasiorek＠svn.reactos.org

Author: sgasiorek Date: Sat May 19 17:55:23 2007 New Revision: 26839 URL: http://svn.reactos.org/svn/reactos?rev=26839&view=rev Log: - add support for ETO_GLYPH_INDEX in NtGdiExtTextOut. (fixes character shift problem in QT apps) see bug #975 Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Sat May 19 17:55:23 2007 @@ -1863,7 +1863,11 @@ for (i = Start; i < Count; i++) { - glyph_index = FT_Get_Char_Index(face, *TempText); + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *TempText; + else + glyph_index = FT_Get_Char_Index(face, *TempText); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { @@ -1913,21 +1917,28 @@ for (i = 0; i < Count; i++) { - glyph_index = FT_Get_Char_Index(face, *String); + if (fuOptions & ETO_GLYPH_INDEX) + glyph_index = *String; + else + glyph_index = FT_Get_Char_Index(face, *String); + if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - - if (error) - { - DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); - IntUnLockFreeType; - goto fail; - } - glyph = face->glyph; - realglyph = NtGdiGlyphCacheSet(face, glyph_index, - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); + error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); + + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); + IntUnLockFreeType; + goto fail; + } + glyph = face->glyph; + realglyph = NtGdiGlyphCacheSet(face, + glyph_index, + TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, + glyph, + RenderMode); } // DbgPrint("realglyph: %x\n", realglyph); // DbgPrint("TextLeft: %d\n", TextLeft);

17 years, 7 months

[ekohl] 26838: Unicode.nls contains the Unicode case conversion tables. It does _not_ contain codepage tables.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat May 19 14:40:59 2007 New Revision: 26838 URL: http://svn.reactos.org/svn/reactos?rev=26838&view=rev Log: Unicode.nls contains the Unicode case conversion tables. It does _not_ contain codepage tables. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Sat May 19 14:40:59 2007 @@ -94,8 +94,6 @@ ; NLS Files -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","0",0x00000000,"unicode.nls" -;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","1",0x00000000,"unicode.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","37",0x00000000,"c_037.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","424",0x00000000,"c_424.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\CodePage","437",0x00000000,"c_437.nls"

17 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2007