Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [CRYPTUI] Let image list be automatically deleted (#5891)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3faa56d2c7eff8330dc57… commit 3faa56d2c7eff8330dc57cbb6beab808ba60ba04 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 16 14:58:49 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 16 14:58:49 2023 +0900 [CRYPTUI] Let image list be automatically deleted (#5891) Based on KRosUser's cryptui.patch. - Don't delete the image list because the list view will delete the image list automatically. CORE-17290 --- dll/win32/cryptui/main.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dll/win32/cryptui/main.c b/dll/win32/cryptui/main.c index f4dee4aded1..75f55df1c17 100644 --- a/dll/win32/cryptui/main.c +++ b/dll/win32/cryptui/main.c @@ -789,11 +789,15 @@ static LRESULT CALLBACK cert_mgr_advanced_dlg_proc(HWND hwnd, UINT msg, { case IDOK: save_cert_mgr_usages(hwnd); +#ifndef __REACTOS__ ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); +#endif EndDialog(hwnd, IDOK); break; case IDCANCEL: +#ifndef __REACTOS__ ImageList_Destroy((HIMAGELIST)GetWindowLongPtrW(hwnd, DWLP_USER)); +#endif EndDialog(hwnd, IDCANCEL); break; } @@ -1153,6 +1157,14 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, show_store_certs(hwnd, cert_mgr_index_to_store(tab, 0)); break; } +#ifdef __REACTOS__ + case WM_DESTROY: + free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); + close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); + data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER); + HeapFree(GetProcessHeap(), 0, data); + break; +#endif case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -1278,11 +1290,13 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, cert_mgr_do_remove(hwnd); break; case IDCANCEL: +#ifndef __REACTOS__ free_certs(GetDlgItem(hwnd, IDC_MGR_CERTS)); close_stores(GetDlgItem(hwnd, IDC_MGR_STORES)); data = (struct CertMgrData *)GetWindowLongPtrW(hwnd, DWLP_USER); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDCANCEL); break; } @@ -3717,7 +3731,9 @@ static UINT CALLBACK cert_properties_general_callback(HWND hwnd, UINT msg, data = (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); if (data) { +#ifndef __REACTOS__ ImageList_Destroy(data->imageList); +#endif HeapFree(GetProcessHeap(), 0, data); } break; @@ -4219,7 +4235,9 @@ static UINT CALLBACK hierarchy_callback(HWND hwnd, UINT msg, { case PSPCB_RELEASE: data = (struct hierarchy_data *)page->lParam; +#ifndef __REACTOS__ ImageList_Destroy(data->imageList); +#endif HeapFree(GetProcessHeap(), 0, data); break; } @@ -7321,6 +7339,13 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA select_cert_update_view_button(hwnd); break; } +#ifdef __REACTOS__ + case WM_DESTROY: + free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); + data = (struct SelectCertData *)GetWindowLongPtrW(hwnd, DWLP_USER); + HeapFree(GetProcessHeap(), 0, data); + break; +#endif case WM_NOTIFY: { NMHDR *hdr = (NMHDR *)lp; @@ -7378,17 +7403,21 @@ static LRESULT CALLBACK select_cert_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPA break; } *data->cert = CertDuplicateCertificateContext(cert); +#ifndef __REACTOS__ free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDOK); break; } case IDCANCEL: +#ifndef __REACTOS__ data = (struct SelectCertData *)GetWindowLongPtrW(hwnd, DWLP_USER); free_certs(GetDlgItem(hwnd, IDC_SELECT_CERTS)); ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); +#endif EndDialog(hwnd, IDCANCEL); break; case IDC_SELECT_VIEW_CERT:

1 year, 2 months

[reactos] 01/01: [NTDDRAW][NTGDI][VGADDI] Add missing \n to DPRINT() calls (#5952)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24757e30e9f26f2ff5237… commit 24757e30e9f26f2ff52371f29178f2a01b97a316 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Nov 15 21:07:27 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 21:07:27 2023 +0100 [NTDDRAW][NTGDI][VGADDI] Add missing \n to DPRINT() calls (#5952) Add missing \n to DPRINT() calls and demote some DPRINT1(). --- win32ss/drivers/displays/vga/main/enable.c | 9 +-- win32ss/gdi/ntgdi/dibobj.c | 6 +- win32ss/gdi/ntgdi/region.c | 21 +----- win32ss/reactx/ntddraw/d3d.c | 73 ++++++++++----------- win32ss/reactx/ntddraw/d3dkmt.c | 13 ++-- win32ss/reactx/ntddraw/dd.c | 26 ++++---- win32ss/reactx/ntddraw/ddraw.c | 64 +++++++----------- win32ss/reactx/ntddraw/ddsurf.c | 61 +++++++++-------- win32ss/reactx/ntddraw/dvp.c | 102 +++++++++++++---------------- win32ss/reactx/ntddraw/dxeng.c | 97 +++++++++++++-------------- win32ss/reactx/ntddraw/eng.c | 22 +++---- win32ss/reactx/ntddraw/mocomp.c | 58 ++++++++-------- 12 files changed, 237 insertions(+), 315 deletions(-) diff --git a/win32ss/drivers/displays/vga/main/enable.c b/win32ss/drivers/displays/vga/main/enable.c index 8a644b2280c..58f829aff30 100644 --- a/win32ss/drivers/displays/vga/main/enable.c +++ b/win32ss/drivers/displays/vga/main/enable.c @@ -281,7 +281,6 @@ DrvEnablePDEV(IN DEVMODEW *DM, return (DHPDEV) PDev; } - // DrvCompletePDEV // DESCRIPTION // Called after initialization of PDEV is complete. Supplies @@ -294,7 +293,6 @@ DrvCompletePDEV(IN DHPDEV PDev, ((PPDEV) PDev)->GDIDevHandle = Dev; // Handle to the DC } - BOOL APIENTRY DrvAssertMode(IN DHPDEV DPev, IN BOOL Enable) @@ -324,7 +322,7 @@ DrvAssertMode(IN DHPDEV DPev, else { /* Go back to last known mode */ - DPRINT( "ppdev: %x, KMDriver: %x", ppdev, ppdev->KMDriver ); + DPRINT("ppdev: %p, KMDriver: %p\n", ppdev, ppdev->KMDriver); if (EngDeviceIoControl(ppdev->KMDriver, IOCTL_VIDEO_RESET_DEVICE, NULL, 0, NULL, 0, &returnedDataLength)) { /* Failed to go back to mode */ @@ -335,7 +333,6 @@ DrvAssertMode(IN DHPDEV DPev, return TRUE; } - VOID APIENTRY DrvDisablePDEV(IN DHPDEV PDev) { @@ -352,7 +349,6 @@ DrvDisablePDEV(IN DHPDEV PDev) EngFreeMem(PDev); } - VOID APIENTRY DrvDisableSurface(IN DHPDEV PDev) { @@ -389,7 +385,6 @@ DrvDisableSurface(IN DHPDEV PDev) /* EngFreeMem(pdsurf); */ /* free the surface */ } - static VOID InitSavedBits(IN PPDEV ppdev) { @@ -429,7 +424,6 @@ InitSavedBits(IN PPDEV ppdev) ppdev->BitsSaved = FALSE; } - HSURF APIENTRY DrvEnableSurface(IN DHPDEV PDev) { @@ -516,7 +510,6 @@ error_done: return NULL; } - ULONG APIENTRY DrvGetModes(IN HANDLE Driver, IN ULONG DataSize, diff --git a/win32ss/gdi/ntgdi/dibobj.c b/win32ss/gdi/ntgdi/dibobj.c index 456210d880a..60eb419ca20 100644 --- a/win32ss/gdi/ntgdi/dibobj.c +++ b/win32ss/gdi/ntgdi/dibobj.c @@ -275,7 +275,7 @@ IntSetDIBits( else { /* Compressed format without a size. This is invalid. */ - DPRINT1("Compressed format without a size!"); + DPRINT1("Compressed format without a size\n"); return 0; } @@ -711,7 +711,6 @@ Exit: return ret; } - /* Converts a device-dependent bitmap to a DIB */ INT APIENTRY @@ -1218,7 +1217,6 @@ cleanup: return iResult; } - W32KAPI INT APIENTRY @@ -1537,7 +1535,6 @@ NtGdiStretchDIBitsInternal( return LinesCopied; } - HBITMAP FASTCALL IntCreateDIBitmap( @@ -2019,7 +2016,6 @@ DIB_CreateDIBSection( // hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); hSecure = (HANDLE)0x1; // HACK OF UNIMPLEMENTED KERNEL STUFF !!!! - // Create Device Dependent Bitmap and add DIB pointer //Size.cx = bm.bmWidth; //Size.cy = abs(bm.bmHeight); diff --git a/win32ss/gdi/ntgdi/region.c b/win32ss/gdi/ntgdi/region.c index 2edf76d4a9f..ff18100f2dd 100644 --- a/win32ss/gdi/ntgdi/region.c +++ b/win32ss/gdi/ntgdi/region.c @@ -120,7 +120,6 @@ SOFTWARE. // // - #include <win32k.h> #include <suppress.h> @@ -252,7 +251,6 @@ typedef struct INT incr1, incr2; /* Error increments */ } BRESINFO; - #define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \ BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ bres.m, bres.m1, bres.incr1, bres.incr2) @@ -260,8 +258,6 @@ typedef struct #define BRESINCRPGONSTRUCT(bres) \ BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2) - - /* * These are the data structures needed to scan * convert regions. Two different scan conversion @@ -324,7 +320,6 @@ typedef struct _EDGE_TABLE_ENTRY INT ClockWise; /* Flag for winding number rule */ } EDGE_TABLE_ENTRY; - typedef struct _SCANLINE_LIST { INT scanline; /* The scanline represented */ @@ -332,7 +327,6 @@ typedef struct _SCANLINE_LIST struct _SCANLINE_LIST *next; /* Next in the list */ } SCANLINE_LIST; - typedef struct { INT ymax; /* ymax for the polygon */ @@ -340,7 +334,6 @@ typedef struct SCANLINE_LIST scanlines; /* Header node */ } EDGE_TABLE; - /* * Here is a struct to help with storage allocation * so we can allocate a big chunk at a time, and then take @@ -354,7 +347,6 @@ typedef struct _SCANLINE_LISTBLOCK struct _SCANLINE_LISTBLOCK *next; } SCANLINE_LISTBLOCK; - /* * A few macros for the inner loops of the fill code where * performance considerations don't allow a procedure call. @@ -382,7 +374,6 @@ typedef struct _SCANLINE_LISTBLOCK } \ } - /* * Evaluate the given edge at the given scanline. * If the edge has expired, then we leave it and fix up @@ -561,7 +552,6 @@ IntDumpRegion(HRGN hRgn) } #endif /* Not NDEBUG */ - INT FASTCALL REGION_Complexity(PREGION prgn) @@ -569,7 +559,7 @@ REGION_Complexity(PREGION prgn) if (prgn == NULL) return NULLREGION; - DPRINT("Region Complexity -> %lu", prgn->rdh.nCount); + DPRINT("Region Complexity: %lu\n", prgn->rdh.nCount); switch (prgn->rdh.nCount) { case 0: @@ -801,7 +791,6 @@ empty: return NULLREGION; } - /*! * Attempt to merge the rects in the current band with those in the * previous one. Used only by REGION_RegionOp. @@ -1597,7 +1586,6 @@ REGION_SubtractNonO1( return TRUE; } - /*! * Overlapping band subtraction. x1 is the left-most point not yet * checked. @@ -1803,7 +1791,6 @@ REGION_XorRegion( return ret; } - /*! * Adds a rectangle to a REGION */ @@ -2210,10 +2197,8 @@ REGION_bXformRgn( return bResult; } - } - PREGION FASTCALL REGION_AllocRgnWithHandle( @@ -2304,7 +2289,6 @@ REGION_bAllocRgnAttr( return TRUE; } - // // Allocate User Space Region Handle. // @@ -2596,7 +2580,6 @@ IntGdiGetRgnBox( return ret; } - BOOL FASTCALL REGION_PtInRegion( @@ -3051,7 +3034,6 @@ REGION_FreeStorage( } } - /*********************************************************************** * REGION_PtsToRegion * @@ -3524,7 +3506,6 @@ IntRectInRegion( return Ret; } - // // NtGdi Exported Functions // diff --git a/win32ss/reactx/ntddraw/d3d.c b/win32ss/reactx/ntddraw/d3d.c index 8eb87a5879f..d41565a54b6 100644 --- a/win32ss/reactx/ntddraw/d3d.c +++ b/win32ss/reactx/ntddraw/d3d.c @@ -14,8 +14,9 @@ */ #include <win32k.h> -#include <debug.h> +// #define NDEBUG +#include <debug.h> /*++ * @name NtGdiDdCanCreateD3DBuffer @@ -54,7 +55,6 @@ * the correct struct is LPDDHAL_CANCREATESURFACEDATA. * *--*/ - DWORD APIENTRY NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, @@ -64,11 +64,11 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCanCreateD3DBuffer == NULL) { - DPRINT1("Warring no pfnDdCanCreateD3DBuffer"); + DPRINT1("Warning: no pfnDdCanCreateD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdCanCreateD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdCanCreateD3DBuffer\n"); return pfnDdCanCreateD3DBuffer(hDirectDraw,puCanCreateSurfaceData); } @@ -112,7 +112,7 @@ NtGdiDdCanCreateD3DBuffer(HANDLE hDirectDraw, * Do not forget LPD3DNTHAL_CONTEXTCREATEDATA is typecast of LPD3DHAL_CONTEXTCREATEDATA and thuse two struct are different size, * the correct struct is LPD3DHAL_CONTEXTCREATEDATA. *--*/ -BOOL +BOOL APIENTRY NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, HANDLE hSurfColor, @@ -123,11 +123,11 @@ NtGdiD3dContextCreate(HANDLE hDirectDrawLocal, if (pfnD3dContextCreate == NULL) { - DPRINT1("Warning: no pfnD3dContextCreate"); + DPRINT1("Warning: no pfnD3dContextCreate\n"); return FALSE; } - DPRINT1("Calling dxg.sys D3dContextCreate"); + DPRINT("Calling dxg.sys pfnD3dContextCreate\n"); return pfnD3dContextCreate(hDirectDrawLocal, hSurfColor, hSurfZ, pdcci); } @@ -158,11 +158,11 @@ NtGdiD3dContextDestroy(LPD3DNTHAL_CONTEXTDESTROYDATA pContextDestroyData) if ( pfnD3dContextDestroy == NULL) { - DPRINT1("Warning: no pfnD3dContextDestroy"); + DPRINT1("Warning: no pfnD3dContextDestroy\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dContextDestroy"); + DPRINT("Calling dxg.sys pfnD3dContextDestroy\n"); return pfnD3dContextDestroy(pContextDestroyData); } @@ -196,11 +196,11 @@ NtGdiD3dContextDestroyAll(LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcad) if (pfnD3dContextDestroyAll == NULL) { - DPRINT1("Warning: no pfnD3dContextDestroyAll"); + DPRINT1("Warning: no pfnD3dContextDestroyAll\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dContextDestroyAll"); + DPRINT("Calling dxg.sys pfnD3dContextDestroyAll\n"); return pfnD3dContextDestroyAll(pdcad); } @@ -271,11 +271,11 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warning: no pfnDdCreateD3DBuffer"); + DPRINT1("Warning: no pfnDdCreateD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdCreateD3DBuffer\n"); return pfnDdCreateD3DBuffer(hDirectDraw, hSurface, puSurfaceDescription, puSurfaceGlobalData, puSurfaceLocalData, puSurfaceMoreData, @@ -289,15 +289,16 @@ DWORD APIENTRY NtGdiDdDestroyD3DBuffer(HANDLE hSurface) { - PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn; - + PGD_DXDDDESTROYD3DBUFFER pfnDdDestroyD3DBuffer = + (PGD_DXDDDESTROYD3DBUFFER)gpDxFuncs[DXG_INDEX_DxDdDestroyD3DBuffer].pfn; + if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warning: no pfnDdDestroyD3DBuffer"); + DPRINT1("Warning: no pfnDdDestroyD3DBuffer\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdDestroyD3DBuffer"); + DPRINT("Calling dxg.sys pfnDdDestroyD3DBuffer\n"); return pfnDdDestroyD3DBuffer(hSurface); } @@ -314,19 +315,19 @@ NtGdiD3dDrawPrimitives2(HANDLE hCmdBuf, FLATPTR *pfpVidMemVtx, DWORD *pdwSizeVtx) { - PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn; - + PGD_D3DDRAWPRIMITIVES2 pfnD3dDrawPrimitives2 = + (PGD_D3DDRAWPRIMITIVES2)gpDxFuncs[DXG_INDEX_DxD3dDrawPrimitives2].pfn; + if (pfnD3dDrawPrimitives2 == NULL) { - DPRINT1("Warning: no pfnD3dDrawPrimitives2"); + DPRINT1("Warning: no pfnD3dDrawPrimitives2\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dDrawPrimitives2"); + DPRINT("Calling dxg.sys pfnD3dDrawPrimitives2\n"); return pfnD3dDrawPrimitives2(hCmdBuf,hVBuf,pded,pfpVidMemCmd,pdwSizeCmd,pfpVidMemVtx,pdwSizeVtx); } - /************************************************************************/ /* NtGdiD3dValidateTextureStageState */ /************************************************************************/ @@ -335,15 +336,15 @@ APIENTRY NtGdiDdLockD3D(HANDLE hSurface, PDD_LOCKDATA puLockData) { - PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn; - + PGD_DXDDLOCKD3D pfnDdLockD3D = (PGD_DXDDLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdLockD3D].pfn; + if (pfnDdLockD3D == NULL) { - DPRINT1("Warning: no pfnDdLockD3D"); + DPRINT1("Warning: no pfnDdLockD3D\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdLockD3D"); + DPRINT("Calling dxg.sys pfnDdLockD3D\n"); return pfnDdLockD3D(hSurface, puLockData); } @@ -354,15 +355,16 @@ DWORD APIENTRY NtGdiD3dValidateTextureStageState(LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) { - PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn; - + PGD_D3DVALIDATETEXTURESTAGESTATE pfnD3dValidateTextureStageState = + (PGD_D3DVALIDATETEXTURESTAGESTATE)gpDxFuncs[DXG_INDEX_DxD3dValidateTextureStageState].pfn; + if (pfnD3dValidateTextureStageState == NULL) { - DPRINT1("Warning: no pfnD3dValidateTextureStageState"); + DPRINT1("Warning: no pfnD3dValidateTextureStageState\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys D3dValidateTextureStageState"); + DPRINT("Calling dxg.sys pfnD3dValidateTextureStageState\n"); return pfnD3dValidateTextureStageState(pData); } @@ -375,18 +377,13 @@ NtGdiDdUnlockD3D(HANDLE hSurface, PDD_UNLOCKDATA puUnlockData) { PGD_DXDDUNLOCKD3D pfnDdUnlockD3D = (PGD_DXDDUNLOCKD3D)gpDxFuncs[DXG_INDEX_DxDdUnlockD3D].pfn; - + if (pfnDdUnlockD3D == NULL) { - DPRINT1("Warning: no pfnDdUnlockD3D"); + DPRINT1("Warning: no pfnDdUnlockD3D\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdUnlockD3D"); + DPRINT("Calling dxg.sys pfnDdUnlockD3D\n"); return pfnDdUnlockD3D(hSurface, puUnlockData); - } - - - - diff --git a/win32ss/reactx/ntddraw/d3dkmt.c b/win32ss/reactx/ntddraw/d3dkmt.c index cc0852e854d..93365364efc 100644 --- a/win32ss/reactx/ntddraw/d3dkmt.c +++ b/win32ss/reactx/ntddraw/d3dkmt.c @@ -7,7 +7,6 @@ */ #include <win32k.h> -#include <debug.h> DWORD APIENTRY @@ -39,10 +38,10 @@ NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) { D3DDDIFMT_P8, 8, BI_RGB, 256, 0x00000000, 0x00000000, 0x00000000 }, }; - if (!desc) + if (!desc) return STATUS_INVALID_PARAMETER; - if (!desc->pMemory) + if (!desc->pMemory) return STATUS_INVALID_PARAMETER; for (i = 0; i < sizeof(format_info) / sizeof(*format_info); ++i) @@ -54,7 +53,7 @@ NtGdiDdDDICreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc) } } - if (!format) + if (!format) return STATUS_INVALID_PARAMETER; if (desc->Width > (UINT_MAX & ~3) / (format->bit_count / 8) || @@ -109,11 +108,11 @@ DWORD APIENTRY NtGdiDdDDIDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc) { - if (!desc) + if (!desc) return STATUS_INVALID_PARAMETER; - if (GDI_HANDLE_GET_TYPE(desc->hDc) != GDI_OBJECT_TYPE_DC || - GDI_HANDLE_GET_TYPE(desc->hBitmap) != GDI_OBJECT_TYPE_BITMAP) + if (GDI_HANDLE_GET_TYPE(desc->hDc) != GDI_OBJECT_TYPE_DC || + GDI_HANDLE_GET_TYPE(desc->hBitmap) != GDI_OBJECT_TYPE_BITMAP) return STATUS_INVALID_PARAMETER; NtGdiDeleteObjectApp(desc->hBitmap); diff --git a/win32ss/reactx/ntddraw/dd.c b/win32ss/reactx/ntddraw/dd.c index 152daecf0d9..f5a9c683af5 100644 --- a/win32ss/reactx/ntddraw/dd.c +++ b/win32ss/reactx/ntddraw/dd.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -26,14 +28,14 @@ NtGdiDdCreateSurface(HANDLE hDirectDrawLocal, HANDLE *puhSurface) { PGD_DDCREATESURFACE pfnDdCreateSurface = (PGD_DDCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCreateSurface].pfn; - + if (pfnDdCreateSurface == NULL) { DPRINT1("Warning: no pfnDdCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurface\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurface\n"); return pfnDdCreateSurface(hDirectDrawLocal,hSurface,puSurfaceDescription,puSurfaceGlobalData, puSurfaceLocalData,puSurfaceMoreData,puCreateSurfaceData,puhSurface); } @@ -47,14 +49,14 @@ NtGdiDdWaitForVerticalBlank(HANDLE hDirectDraw, PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) { PGD_DXDDWAITFORVERTICALBLANK pfnDdWaitForVerticalBlank = (PGD_DXDDWAITFORVERTICALBLANK)gpDxFuncs[DXG_INDEX_DxDdWaitForVerticalBlank].pfn; - + if (pfnDdWaitForVerticalBlank == NULL) { DPRINT1("Warning: no pfnDdWaitForVerticalBlank\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); + DPRINT("Calling dxg.sys pfnDdWaitForVerticalBlank\n"); return pfnDdWaitForVerticalBlank(hDirectDraw, puWaitForVerticalBlankData); } @@ -67,14 +69,14 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) { PGD_DDCANCREATESURFACE pfnDdCanCreateSurface = (PGD_DDCANCREATESURFACE)gpDxFuncs[DXG_INDEX_DxDdCanCreateSurface].pfn; - + if (pfnDdCanCreateSurface == NULL) { DPRINT1("Warning: no pfnDdCanCreateSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCanCreateSurface\n"); + DPRINT("Calling dxg.sys pfnDdCanCreateSurface\n"); return pfnDdCanCreateSurface(hDirectDrawLocal,puCanCreateSurfaceData); } @@ -83,19 +85,19 @@ NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal, /* NtGdiDdGetScanLine */ /************************************************************************/ DWORD -APIENTRY +APIENTRY NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, PDD_GETSCANLINEDATA puGetScanLineData) { PGD_DXDDGETSCANLINE pfnDdGetScanLine = (PGD_DXDDGETSCANLINE)gpDxFuncs[DXG_INDEX_DxDdGetScanLine].pfn; - + if (pfnDdGetScanLine == NULL) { DPRINT1("Warning: no pfnDdGetScanLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetScanLine\n"); + DPRINT("Calling dxg.sys pfnDdGetScanLine\n"); return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); } @@ -116,15 +118,13 @@ NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw, DWORD dwSurfaceHandle) { PGD_DXDDCREATESURFACEEX pfnDdCreateSurfaceEx = (PGD_DXDDCREATESURFACEEX)gpDxFuncs[DXG_INDEX_DxDdCreateSurfaceEx].pfn; - + if (pfnDdCreateSurfaceEx == NULL) { DPRINT1("Warning: no pfnDdCreateSurfaceEx\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurfaceEx\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurfaceEx\n"); return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle); - } - diff --git a/win32ss/reactx/ntddraw/ddraw.c b/win32ss/reactx/ntddraw/ddraw.c index 76e32179182..8197c727a4f 100644 --- a/win32ss/reactx/ntddraw/ddraw.c +++ b/win32ss/reactx/ntddraw/ddraw.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> PGD_DXDDSTARTUPDXGRAPHICS gpfnStartupDxGraphics = NULL; @@ -19,7 +21,6 @@ extern DRVFN gaEngFuncs[]; extern ULONG gcEngFuncs; extern EDD_DIRECTDRAW_GLOBAL edd_DdirectDraw_Global; - DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl + 1]; HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext = 0; @@ -48,7 +49,6 @@ DxDdStartupDxGraphics( ULONG ulc1, * no code have been writen for it yet */ - /* FIXME: ReactOS does not loading the dxapi.sys or import functions from it yet */ // DxApiGetVersion() @@ -109,12 +109,11 @@ DxDdStartupDxGraphics( ULONG ulc1, gpDxFuncs[lstDrvFN[t].iFunc].pfn =lstDrvFN[t].pfn; } - DPRINT1("DirectX interface is activated\n"); - + DPRINT("DirectX interface is activated\n"); } - /* Return the status */ } + /* Return the status */ return Status; } @@ -146,7 +145,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateDirectDrawObject\n"); + DPRINT("Calling dxg.sys pfnDdCreateDirectDrawObject\n"); return pfnDdCreateDirectDrawObject(hdc); } @@ -201,7 +200,7 @@ NtGdiDxgGenericThunk(ULONG_PTR ulIndex, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDxgGenericThunk\n"); + DPRINT("Calling dxg.sys pfnDxgGenericThunk\n"); return pfnDxgGenericThunk(ulIndex, ulHandle, pdwSizeOfPtr1, pvPtr1, pdwSizeOfPtr2, pvPtr2); } @@ -220,7 +219,7 @@ NtGdiDdGetDriverState(PDD_GETDRIVERSTATEDATA pdata) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdGetDriverState\n"); + DPRINT("Calling dxg.sys pfnDdGetDriverState\n"); return pfnDdGetDriverState(pdata); } @@ -240,7 +239,7 @@ NtGdiDdColorControl(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdColorControl\n"); + DPRINT("Calling dxg.sys pfnDdColorControl\n"); return pfnDdColorControl(hSurface,puColorControlData); } @@ -265,7 +264,7 @@ NtGdiDdCreateSurfaceObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdCreateSurfaceObject\n"); + DPRINT("Calling dxg.sys pfnDdCreateSurfaceObject\n"); return pfnDdCreateSurfaceObject(hDirectDrawLocal, hSurface, puSurfaceLocal, puSurfaceMore, puSurfaceGlobal, bComplete); } @@ -290,9 +289,7 @@ NtGdiDdDeleteDirectDrawObject(HANDLE hDirectDrawLocal) return FALSE; } - DPRINT1("hDirectDrawLocal = %p \n", hDirectDrawLocal); - DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); - + DPRINT("Calling dxg.sys pfnDdDeleteDirectDrawObject(%p)\n", hDirectDrawLocal); return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); } @@ -312,7 +309,7 @@ NtGdiDdDeleteSurfaceObject(HANDLE hSurface) } /* Try and see if the handle is valid */ - DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); + DPRINT("Calling dxg.sys pfnDdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); } @@ -341,15 +338,11 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); - - + DPRINT("Calling dxg.sys pfnDdQueryDirectDrawObject\n"); return pfnDdQueryDirectDrawObject(hDirectDrawLocal, pHalInfo, pCallBackFlags, puD3dCallbacks, puD3dDriverData, puD3dBufferCallbacks, puD3dTextureFormats, puNumHeaps, puvmList, puNumFourCC, puFourCC); - } - /************************************************************************/ /* NtGdiDdReenableDirectDrawObject */ /************************************************************************/ @@ -359,7 +352,7 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, BOOL *pubNewMode) { #if DXDBG - BOOL status = FALSE; + BOOL status; #endif PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn; @@ -369,19 +362,16 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); - + DPRINT("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); #if DXDBG status = pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); - DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject\n"); - DPRINT1("return value : 0x%08x\n", status); + DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject, status: 0x%08x\n", status); return status; #else return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); #endif } - /************************************************************************/ /* NtGdiDdGetDriverInfo */ /************************************************************************/ @@ -399,11 +389,10 @@ NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDriverInfo\n"); + DPRINT("Calling dxg.sys pfnDdGetDriverInfo\n"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); } - /************************************************************************/ /* NtGdiDdGetAvailDriverMemory */ /************************************************************************/ @@ -420,11 +409,10 @@ NtGdiDdGetAvailDriverMemory(HANDLE hDirectDrawLocal, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); + DPRINT("Calling dxg.sys pfnDdGetAvailDriverMemory\n"); return pfnDdGetAvailDriverMemory(hDirectDrawLocal, puGetAvailDriverMemoryData); } - /************************************************************************/ /* NtGdiDdSetExclusiveMode */ /************************************************************************/ @@ -442,12 +430,10 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdSetExclusiveMode\n"); + DPRINT("Calling dxg.sys pfnDdSetExclusiveMode\n"); return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData); - } - /************************************************************************/ /* NtGdiDdFlipToGDISurface */ /************************************************************************/ @@ -464,9 +450,8 @@ NtGdiDdFlipToGDISurface(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdFlipToGDISurface\n"); + DPRINT("Calling dxg.sys pfnDdFlipToGDISurface\n"); return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData); - } /************************************************************************/ @@ -485,7 +470,7 @@ NtGdiDdGetDC(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDC\n"); + DPRINT("Calling dxg.sys pfnDdGetDC\n"); return pfnDdGetDC(hSurface, puColorTable); } @@ -506,11 +491,10 @@ NtGdiDdGetDxHandle(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetDxHandle\n"); + DPRINT("Calling dxg.sys pfnDdGetDxHandle\n"); return pfnDdGetDxHandle(hDirectDraw, hSurface, bRelease); } - /************************************************************************/ /* NtGdiDdReleaseDC */ /************************************************************************/ @@ -526,7 +510,7 @@ NtGdiDdReleaseDC(HANDLE hSurface) return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdReleaseDC\n"); + DPRINT("Calling dxg.sys pfnDdReleaseDC\n"); return pfnDdReleaseDC(hSurface); } @@ -547,7 +531,7 @@ NtGdiDdResetVisrgn(HANDLE hSurface, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdResetVisrgn\n"); + DPRINT("Calling dxg.sys pfnDdResetVisrgn\n"); return pfnDdResetVisrgn(hSurface, hwnd); } @@ -568,6 +552,6 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw, return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdSetGammaRamp\n"); + DPRINT("Calling dxg.sys pfnDdSetGammaRamp\n"); return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp); } diff --git a/win32ss/reactx/ntddraw/ddsurf.c b/win32ss/reactx/ntddraw/ddsurf.c index aacde0c03da..d2af6f86da4 100644 --- a/win32ss/reactx/ntddraw/ddsurf.c +++ b/win32ss/reactx/ntddraw/ddsurf.c @@ -9,6 +9,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -22,11 +24,11 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy) if (pfnDdDestroySurface == NULL) { - DPRINT1("Warning: no pfnDdDestroySurface"); + DPRINT1("Warning: no pfnDdDestroySurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdDestroySurface"); + DPRINT("Calling dxg.sys pfnDdDestroySurface\n"); return pfnDdDestroySurface(hSurface, bRealDestroy); } @@ -45,11 +47,11 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent, if (pfnDdDdFlip == NULL) { - DPRINT1("Warning: no pfnDdDdFlip"); + DPRINT1("Warning: no pfnDdDdFlip\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdDdFlip"); + DPRINT("Calling dxg.sys pfnDdDdFlip\n"); return pfnDdDdFlip(hSurfaceCurrent, hSurfaceTarget, hSurfaceCurrentLeft, hSurfaceTargetLeft, puFlipData); } @@ -66,11 +68,11 @@ NtGdiDdLock(HANDLE hSurface, if (pfnDdLock == NULL) { - DPRINT1("Warning: no pfnDdLock"); + DPRINT1("Warning: no pfnDdLock\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdLock"); + DPRINT("Calling dxg.sys pfnDdLock\n"); return pfnDdLock(hSurface, puLockData, hdcClip); } @@ -86,11 +88,11 @@ NtGdiDdUnlock(HANDLE hSurface, if (pfnDdUnlock == NULL) { - DPRINT1("Warning: no pfnDdUnlock"); + DPRINT1("Warning: no pfnDdUnlock\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdUnlock"); + DPRINT("Calling dxg.sys pfnDdUnlock\n"); return pfnDdUnlock(hSurface, puUnlockData); } @@ -107,11 +109,11 @@ NtGdiDdBlt(HANDLE hSurfaceDest, if (pfnDdBlt == NULL) { - DPRINT1("Warning: no pfnDdBlt"); + DPRINT1("Warning: no pfnDdBlt\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdBlt"); + DPRINT("Calling dxg.sys pfnDdBlt\n"); return pfnDdBlt(hSurfaceDest,hSurfaceSrc,puBltData); } @@ -127,19 +129,17 @@ NtGdiDdSetColorKey(HANDLE hSurface, if (pfnDdSetColorKey == NULL) { - DPRINT1("Warning: no pfnDdSetColorKey"); + DPRINT1("Warning: no pfnDdSetColorKey\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdSetColorKey"); + DPRINT("Calling dxg.sys pfnDdSetColorKey\n"); return pfnDdSetColorKey(hSurface,puSetColorKeyData); - } /************************************************************************/ /* NtGdiDdAddAttachedSurface */ /************************************************************************/ - DWORD APIENTRY NtGdiDdAddAttachedSurface(HANDLE hSurface, @@ -150,11 +150,11 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface, if (pfnDdAddAttachedSurface == NULL) { - DPRINT1("Warning: no pfnDdAddAttachedSurface"); + DPRINT1("Warning: no pfnDdAddAttachedSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdAddAttachedSurface"); + DPRINT("Calling dxg.sys pfnDdAddAttachedSurface\n"); return pfnDdAddAttachedSurface(hSurface,hSurfaceAttached,puAddAttachedSurfaceData); } @@ -170,11 +170,11 @@ NtGdiDdGetBltStatus(HANDLE hSurface, if (pfnDdGetBltStatus == NULL) { - DPRINT1("Warning: no pfnDdGetBltStatus"); + DPRINT1("Warning: no pfnDdGetBltStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetBltStatus"); + DPRINT("Calling dxg.sys pfnDdGetBltStatus\n"); return pfnDdGetBltStatus(hSurface,puGetBltStatusData); } @@ -190,11 +190,11 @@ NtGdiDdGetFlipStatus(HANDLE hSurface, if (pfnDdGetFlipStatus == NULL) { - DPRINT1("Warning: no pfnDdGetFlipStatus"); + DPRINT1("Warning: no pfnDdGetFlipStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdGetFlipStatus"); + DPRINT("Calling dxg.sys pfnDdGetFlipStatus\n"); return pfnDdGetFlipStatus(hSurface,puGetFlipStatusData); } @@ -211,18 +211,17 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination, if (pfnDdUpdateOverlay == NULL) { - DPRINT1("Warning: no pfnDdUpdateOverlay"); + DPRINT1("Warning: no pfnDdUpdateOverlay\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdUpdateOverlay"); + DPRINT("Calling dxg.sys pfnDdUpdateOverlay\n"); return pfnDdUpdateOverlay(hSurfaceDestination,hSurfaceSource,puUpdateOverlayData); } /************************************************************************/ /* NtGdiDdSetOverlayPosition */ /************************************************************************/ - DWORD APIENTRY NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, @@ -233,11 +232,11 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, if (pfnDdSetOverlayPosition == NULL) { - DPRINT1("Warning: no pfnDdSetOverlayPosition"); + DPRINT1("Warning: no pfnDdSetOverlayPosition\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdSetOverlayPosition"); + DPRINT("Calling dxg.sys pfnDdSetOverlayPosition\n"); return pfnDdSetOverlayPosition(hSurfaceSource,hSurfaceDestination,puSetOverlayPositionData); } @@ -260,11 +259,11 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest, if (pfnDdAlphaBlt == NULL) { - DPRINT1("Warning: no pfnDdAlphaBlt"); + DPRINT1("Warning: no pfnDdAlphaBlt\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys DdAlphaBlt"); + DPRINT("Calling dxg.sys pfnDdAlphaBlt\n"); return pfnDdAlphaBlt(hSurfaceDest,hSurfaceSrc,puBltData); } @@ -281,11 +280,11 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom, if (pfnDdAttachSurface == NULL) { - DPRINT1("Warning: no pfnDdAttachSurface"); + DPRINT1("Warning: no pfnDdAttachSurface\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnDdAttachSurface"); + DPRINT("Calling dxg.sys pfnDdAttachSurface\n"); return pfnDdAttachSurface(hSurfaceFrom,hSurfaceTo); } @@ -304,11 +303,11 @@ NtGdiDdUnattachSurface(HANDLE hSurface, PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; if (pfnDdUnattachSurface == NULL) { - DPRINT1("Warning: no pfnDdUnattachSurface"); + DPRINT1("Warning: no pfnDdUnattachSurface\n"); //return DDHAL_DRIVER_NOTHANDLED; return STATUS_NOT_IMPLEMENTED; } - DPRINT1("Calling on dxg.sys pfnDdUnattachSurface"); + DPRINT("Calling dxg.sys pfnDdUnattachSurface\n"); return pfnDdUnattachSurface(hSurface,hSurfaceAttached); } diff --git a/win32ss/reactx/ntddraw/dvp.c b/win32ss/reactx/ntddraw/dvp.c index f6d92053137..467390f0345 100644 --- a/win32ss/reactx/ntddraw/dvp.c +++ b/win32ss/reactx/ntddraw/dvp.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -21,14 +22,14 @@ NtGdiDvpCanCreateVideoPort(HANDLE hDirectDraw, PDD_CANCREATEVPORTDATA puCanCreateVPortData) { PGD_DVPCANCREATEVIDEOPORT pfnDvpCanCreateVideoPort = (PGD_DVPCANCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCanCreateVideoPort].pfn; - + if (pfnDvpCanCreateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpCanCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCanCreateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpCanCreateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpCanCreateVideoPort\n"); return pfnDvpCanCreateVideoPort(hDirectDraw, puCanCreateVPortData); } @@ -41,14 +42,14 @@ NtGdiDvpColorControl(HANDLE hVideoPort, PDD_VPORTCOLORDATA puVPortColorData) { PGD_DVPCOLORCONTROL pfnDvpColorControl = (PGD_DVPCOLORCONTROL)gpDxFuncs[DXG_INDEX_DxDvpColorControl].pfn; - + if (pfnDvpColorControl == NULL) { - DPRINT1("Warning: no pfnDvpColorControl"); + DPRINT1("Warning: no pfnDvpColorControl\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpColorControl"); + DPRINT("Calling dxg.sys pfnDvpColorControl\n"); return pfnDvpColorControl(hVideoPort, puVPortColorData); } @@ -61,14 +62,14 @@ NtGdiDvpCreateVideoPort(HANDLE hDirectDraw, PDD_CREATEVPORTDATA puCreateVPortData) { PGD_DVPCREATEVIDEOPORT pfnDvpCreateVideoPort = (PGD_DVPCREATEVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpCreateVideoPort].pfn; - + if (pfnDvpCreateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpCreateVideoPort"); + DPRINT1("Warning: no pfnDvpCreateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpCreateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpCreateVideoPort\n"); return pfnDvpCreateVideoPort(hDirectDraw, puCreateVPortData); } @@ -80,15 +81,16 @@ APIENTRY NtGdiDvpDestroyVideoPort(HANDLE hVideoPort, PDD_DESTROYVPORTDATA puDestroyVPortData) { - PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn; - + PGD_DVPDESTROYVIDEOPORT pfnDvpDestroyVideoPort = + (PGD_DVPDESTROYVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpDestroyVideoPort].pfn; + if (pfnDvpDestroyVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpDestroyVideoPort"); + DPRINT1("Warning: no pfnDvpDestroyVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpDestroyVideoPort"); + DPRINT("Calling dxg.sys pfnDvpDestroyVideoPort\n"); return pfnDvpDestroyVideoPort(hVideoPort, puDestroyVPortData); } @@ -102,19 +104,19 @@ NtGdiDvpFlipVideoPort(HANDLE hVideoPort, HANDLE hDDSurfaceTarget, PDD_FLIPVPORTDATA puFlipVPortData) { - PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; + PGD_DVPFLIPVIDEOPORT pfnDvpFlipVideoPort = + (PGD_DVPFLIPVIDEOPORT)gpDxFuncs[DXG_INDEX_DxDvpFlipVideoPort].pfn; if (pfnDvpFlipVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpFlipVideoPort"); + DPRINT1("Warning: no pfnDvpFlipVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpFlipVideoPort"); + DPRINT("Calling dxg.sys pfnDvpFlipVideoPort\n"); return pfnDvpFlipVideoPort(hVideoPort, hDDSurfaceCurrent, hDDSurfaceTarget, puFlipVPortData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortBandwidth */ /************************************************************************/ @@ -127,15 +129,14 @@ NtGdiDvpGetVideoPortBandwidth(HANDLE hVideoPort, if (pfnDvpGetVideoPortBandwidth == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth"); + DPRINT1("Warning: no pfnDvpGetVideoPortBandwidth\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortBandwidth"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortBandwidth\n"); return pfnDvpGetVideoPortBandwidth(hVideoPort, puGetVPortBandwidthData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortFlipStatus */ /************************************************************************/ @@ -148,15 +149,14 @@ NtGdiDvpGetVideoPortFlipStatus(HANDLE hDirectDraw, if (pfnDvpGetVideoPortFlipStatus == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus"); + DPRINT1("Warning: no pfnDvpGetVideoPortFlipStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortFlipStatus"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortFlipStatus\n"); return pfnDvpGetVideoPortFlipStatus(hDirectDraw, puGetVPortFlipStatusData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortInputFormats */ /************************************************************************/ @@ -169,15 +169,14 @@ NtGdiDvpGetVideoPortInputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortInputFormats == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortInputFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortInputFormats"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortInputFormats\n"); return pfnDvpGetVideoPortInputFormats(hVideoPort, puGetVPortInputFormatData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortLine */ /************************************************************************/ @@ -190,15 +189,14 @@ NtGdiDvpGetVideoPortLine(HANDLE hVideoPort, if (pfnDvpGetVideoPortLine == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortLine"); + DPRINT1("Warning: no pfnDvpGetVideoPortLine\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortLine"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortLine\n"); return pfnDvpGetVideoPortLine(hVideoPort, puGetVPortLineData); } - /************************************************************************/ /* NtGdiDvpGetVideoPortOutputFormats */ /************************************************************************/ @@ -211,16 +209,14 @@ NtGdiDvpGetVideoPortOutputFormats(HANDLE hVideoPort, if (pfnDvpGetVideoPortOutputFormats == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats"); + DPRINT1("Warning: no pfnDvpGetVideoPortOutputFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortOutputFormats"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortOutputFormats\n"); return pfnDvpGetVideoPortOutputFormats(hVideoPort, puGetVPortOutputFormatData); - } - /************************************************************************/ /* NtGdiDvpGetVideoPortConnectInfo */ /************************************************************************/ @@ -233,15 +229,14 @@ NtGdiDvpGetVideoPortConnectInfo(HANDLE hDirectDraw, if (pfnDvpGetVideoPortConnectInfo == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo"); + DPRINT1("Warning: no pfnDvpGetVideoPortConnectInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortConnectInfo"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortConnectInfo\n"); return pfnDvpGetVideoPortConnectInfo(hDirectDraw, puGetVPortConnectData); } - /************************************************************************/ /* NtGdiDvpGetVideoSignalStatus */ /************************************************************************/ @@ -254,16 +249,14 @@ NtGdiDvpGetVideoSignalStatus(HANDLE hVideoPort, if (pfnDvpGetVideoSignalStatus == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoSignalStatus"); + DPRINT1("Warning: no pfnDvpGetVideoSignalStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoSignalStatus"); + DPRINT("Calling dxg.sys pfnDvpGetVideoSignalStatus\n"); return pfnDvpGetVideoSignalStatus(hVideoPort, puGetVPortSignalData); - } - /************************************************************************/ /* NtGdiDvpUpdateVideoPort */ /************************************************************************/ @@ -278,16 +271,14 @@ NtGdiDvpUpdateVideoPort(HANDLE hVideoPort, if (pfnDvpUpdateVideoPort == NULL) { - DPRINT1("Warning: no pfnDvpUpdateVideoPort"); + DPRINT1("Warning: no pfnDvpUpdateVideoPort\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpUpdateVideoPort"); + DPRINT("Calling dxg.sys pfnDvpUpdateVideoPort\n"); return pfnDvpUpdateVideoPort(hVideoPort, phSurfaceVideo, phSurfaceVbi, puUpdateVPortData); - } - /************************************************************************/ /* NtGdiDvpWaitForVideoPortSync */ /************************************************************************/ @@ -300,15 +291,14 @@ NtGdiDvpWaitForVideoPortSync(HANDLE hVideoPort, if (pfnDvpWaitForVideoPortSync == NULL) { - DPRINT1("Warning: no pfnDvpWaitForVideoPortSync"); + DPRINT1("Warning: no pfnDvpWaitForVideoPortSync\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpWaitForVideoPortSync"); + DPRINT("Calling dxg.sys pfnDvpWaitForVideoPortSync\n"); return pfnDvpWaitForVideoPortSync(hVideoPort, puWaitForVPortSyncData); } - /************************************************************************/ /* NtGdiDvpAcquireNotification */ /************************************************************************/ @@ -322,15 +312,14 @@ NtGdiDvpAcquireNotification(HANDLE hVideoPort, if (pfnDvpAcquireNotification == NULL) { - DPRINT1("Warning: no pfnDvpAcquireNotification"); + DPRINT1("Warning: no pfnDvpAcquireNotification\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpAcquireNotification"); + DPRINT("Calling dxg.sys pfnDvpAcquireNotification\n"); return pfnDvpAcquireNotification(hVideoPort, hEvent, pNotify); } - /************************************************************************/ /* NtGdiDvpReleaseNotification */ /************************************************************************/ @@ -343,16 +332,14 @@ NtGdiDvpReleaseNotification(HANDLE hVideoPort, if (pfnDvpReleaseNotification == NULL) { - DPRINT1("Warning: no pfnDvpReleaseNotification"); + DPRINT1("Warning: no pfnDvpReleaseNotification\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpReleaseNotification"); + DPRINT("Calling dxg.sys pfnDvpReleaseNotification\n"); return pfnDvpReleaseNotification(hVideoPort, hEvent); - } - /************************************************************************/ /* NtGdiDvpGetVideoPortField */ /************************************************************************/ @@ -365,11 +352,10 @@ NtGdiDvpGetVideoPortField(HANDLE hVideoPort, if (pfnDvpGetVideoPortField == NULL) { - DPRINT1("Warning: no pfnDvpGetVideoPortField"); + DPRINT1("Warning: no pfnDvpGetVideoPortField\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDvpGetVideoPortField"); + DPRINT("Calling dxg.sys pfnDvpGetVideoPortField\n"); return pfnDvpGetVideoPortField(hVideoPort, puGetVPortFieldData); - } diff --git a/win32ss/reactx/ntddraw/dxeng.c b/win32ss/reactx/ntddraw/dxeng.c index bcd0db67e26..10c4b9937cb 100644 --- a/win32ss/reactx/ntddraw/dxeng.c +++ b/win32ss/reactx/ntddraw/dxeng.c @@ -8,6 +8,8 @@ */ #include <win32k.h> + +// #define NDEBUG #include <debug.h> HSEMAPHORE ghsemShareDevLock = NULL; @@ -60,7 +62,6 @@ DRVFN gaEngFuncs[] = {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} }; - /*++ * @name DxEngDispUniq * @implemented @@ -78,7 +79,7 @@ ULONG APIENTRY DxEngDispUniq(VOID) { - DPRINT1("ReactX Calling : DxEngDispUniq\n"); + DPRINT("ReactX Calling : DxEngDispUniq\n"); return GdiHandleTable->flDeviceUniq; } @@ -105,11 +106,10 @@ BOOL APIENTRY DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) { - DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n"); + DPRINT("ReactX Calling : DxEngGetDeviceGammaRamp\n"); return IntGetDeviceGammaRamp(hPDev, Ramp); } - /*++ * @name DxEngLockDC * @implemented @@ -130,11 +130,10 @@ PDC APIENTRY DxEngLockDC(HDC hDC) { - DPRINT1("ReactX Calling : DxEngLockDC\n"); + DPRINT("ReactX Calling : DxEngLockDC\n"); return DC_LockDc(hDC); } - /*++ * @name DxEngUnlockDC * @implemented @@ -155,7 +154,7 @@ BOOLEAN APIENTRY DxEngUnlockDC(PDC pDC) { - DPRINT1("ReactX Calling : DxEngUnlockDC\n"); + DPRINT("ReactX Calling : DxEngUnlockDC\n"); DC_UnlockDc(pDC); return TRUE; } @@ -179,7 +178,7 @@ BOOLEAN APIENTRY DxEngLockShareSem(VOID) { - DPRINT1("ReactX Calling : DxEngLockShareSem\n"); + DPRINT("ReactX Calling : DxEngLockShareSem\n"); if(!ghsemShareDevLock) ghsemShareDevLock = EngCreateSemaphore(); // Hax, should be in dllmain.c EngAcquireSemaphore(ghsemShareDevLock); return TRUE; @@ -202,7 +201,7 @@ BOOLEAN APIENTRY DxEngUnlockShareSem(VOID) { - DPRINT1("ReactX Calling : DxEngUnlockShareSem\n"); + DPRINT("ReactX Calling : DxEngUnlockShareSem\n"); EngReleaseSemaphore(ghsemShareDevLock); return TRUE; } @@ -233,7 +232,7 @@ BOOLEAN APIENTRY DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test) { - DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n"); + DPRINT("ReactX Calling : DxEngSetDeviceGammaRamp\n"); return IntSetDeviceGammaRamp(hPDev, Ramp, Test); } @@ -284,101 +283,100 @@ DxEngGetHdevData(HDEV hDev, DWORD_PTR retVal = 0; PPDEVOBJ PDev = (PPDEVOBJ)hDev; - DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); + DPRINT("ReactX Calling : DxEngGetHdevData, Type: %d\n", Type); #if 1 - DPRINT1("HDEV hDev %p\n", hDev); + DPRINT("hDev: %p\n", hDev); #endif switch ( Type ) { case DxEGShDevData_Surface: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Surface\n"); + DPRINT("requested DxEGShDevData_Surface\n"); retVal = (DWORD_PTR) PDev->pSurface; // ptr to Surface handle. break; case DxEGShDevData_hSpooler: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); + DPRINT("requested DxEGShDevData_hSpooler\n"); retVal = (DWORD_PTR) PDev->hSpooler; break; case DxEGShDevData_DitherFmt: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n"); + DPRINT("requested DxEGShDevData_DitherFmt\n"); retVal = (DWORD_PTR) PDev->devinfo.iDitherFormat; break; case DxEGShDevData_FxCaps: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps\n"); + DPRINT("requested DxEGShDevData_FxCaps\n"); retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps; break; case DxEGShDevData_FxCaps2: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_FxCaps2\n"); + DPRINT("requested DxEGShDevData_FxCaps2\n"); retVal = (DWORD_PTR) PDev->devinfo.flGraphicsCaps2; break; case DxEGShDevData_DrvFuncs: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DrvFuncs\n"); + DPRINT("requested DxEGShDevData_DrvFuncs\n"); retVal = (DWORD_PTR) &PDev->DriverFunctions; break; case DxEGShDevData_dhpdev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dhpdev\n"); + DPRINT("requested DxEGShDevData_dhpdev\n"); retVal = (DWORD_PTR) PDev->dhpdev; // DHPDEV break; case DxEGShDevData_eddg: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_eddg\n"); + DPRINT("requested DxEGShDevData_eddg\n"); retVal = (DWORD_PTR) PDev->pEDDgpl; break; case DxEGShDevData_dd_locks: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_locks\n"); + DPRINT("requested DxEGShDevData_dd_locks\n"); retVal = (DWORD_PTR) PDev->cDirectDrawDisableLocks; break; case DxEGShDevData_dd_flags: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_dd_flags\n"); + DPRINT("requested DxEGShDevData_dd_flags\n"); retVal = (DWORD_PTR) PDev->DxDd_Flags; break; case DxEGShDevData_disable: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_disable\n"); + DPRINT("requested DxEGShDevData_disable\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISABLED; break; case DxEGShDevData_metadev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_metadev\n"); + DPRINT("requested DxEGShDevData_metadev\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_META_DEVICE; break; case DxEGShDevData_display: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_display\n"); + DPRINT("requested DxEGShDevData_display\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_DISPLAY; break; case DxEGShDevData_Parent: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_Parent\n"); + DPRINT("requested DxEGShDevData_Parent\n"); retVal = (DWORD_PTR) PDev->ppdevParent; break; case DxEGShDevData_OpenRefs: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_OpenRefs\n"); + DPRINT("requested DxEGShDevData_OpenRefs\n"); retVal = (DWORD_PTR) PDev->cPdevOpenRefs != 0; break; case DxEGShDevData_palette: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_palette\n"); + DPRINT("requested DxEGShDevData_palette\n"); retVal = (DWORD_PTR) PDev->gdiinfo.flRaster & RC_PALETTE; break; case DxEGShDevData_ldev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_ldev\n"); + DPRINT("requested DxEGShDevData_ldev\n"); retVal = (DWORD_PTR) PDev->pldev; break; case DxEGShDevData_GDev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_GDev\n"); + DPRINT("requested DxEGShDevData_GDev\n"); retVal = (DWORD_PTR) PDev->pGraphicsDevice; // P"GRAPHICS_DEVICE" break; case DxEGShDevData_clonedev: - DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_clonedev\n"); + DPRINT("requested DxEGShDevData_clonedev\n"); retVal = (DWORD_PTR) PDev->flFlags & PDEV_CLONE_DEVICE; break; - default: + // TODO: Make this default a bit more useful. break; } #if 1 - DPRINT1("return value %08lx\n", retVal); + DPRINT("retVal: %08Ix\n", retVal); #endif return retVal; - } /*++ @@ -411,11 +409,11 @@ DxEngSetHdevData(HDEV hDev, { BOOLEAN retVal = FALSE; // Default, no set. - DPRINT1("ReactX Calling : DxEngSetHdevData DXEGSHDEVDATA : %ld\n", Type); + DPRINT("ReactX Calling : DxEngSetHdevData, Type: %d\n", Type); if (Type == DxEGShDevData_dd_locks) { - DPRINT1("Assigning value %d\n", Data); + DPRINT("Assigning value: %Iu\n", Data); ((PPDEVOBJ)hDev)->cDirectDrawDisableLocks = Data; retVal = TRUE; // Set } @@ -455,7 +453,7 @@ DxEngGetDCState(HDC hDC, PDC pDC = DC_LockDc(hDC); DWORD_PTR retVal = 0; - DPRINT1("ReactX Calling : DxEngGetDCState type : %lu\n", type); + DPRINT("ReactX Calling : DxEngGetDCState, type: %lu\n", type); if (pDC) { @@ -482,7 +480,7 @@ DxEngGetDCState(HDC hDC, DC_UnlockDc(pDC); } - DPRINT1("Return value %08lx\n", retVal); + DPRINT("retVal: %08Ix\n", retVal); return retVal; } @@ -504,7 +502,7 @@ BOOLEAN APIENTRY DxEngIncDispUniq(VOID) { - DPRINT1("ReactX Calling : DxEngIncDispUniq \n"); + DPRINT("ReactX Calling : DxEngIncDispUniq\n"); InterlockedIncrement((LONG*)&GdiHandleTable->flDeviceUniq); return TRUE; @@ -533,9 +531,9 @@ DxEngLockHdev(HDEV hDev) PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource; - DPRINT1("ReactX Calling : DxEngLockHdev \n"); + DPRINT("ReactX Calling : DxEngLockHdev\n"); - DPRINT1("hDev : 0x%p\n",hDev); + DPRINT("hDev: %p\n", hDev); Resource = (PERESOURCE)ppdev->hsemDevLock; @@ -570,7 +568,7 @@ DxEngUnlockHdev(HDEV hDev) PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource = (PERESOURCE)ppdev->hsemDevLock; - DPRINT1("ReactX Calling : DxEngUnlockHdev \n"); + DPRINT("ReactX Calling : DxEngUnlockHdev\n"); if (Resource) { @@ -580,7 +578,6 @@ DxEngUnlockHdev(HDEV hDev) return TRUE; } - /************************************************************************/ /* DxEngReferenceHdev */ /************************************************************************/ @@ -621,7 +618,6 @@ DxEngRedrawDesktop(VOID) return TRUE; } - ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ @@ -632,7 +628,7 @@ ULONG APIENTRY DxEngVisRgnUniq(VOID) { - DPRINT1("ReactX Calling : DxEngVisRgnUniq \n"); + DPRINT("ReactX Calling : DxEngVisRgnUniq\n"); return gulVisRgnUniqueness; } @@ -682,7 +678,6 @@ DxEngIsHdevLockedByCurrentThread(HDEV hDev) return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } - /************************************************************************/ /* DxEngUnreferenceHdev */ /************************************************************************/ @@ -729,7 +724,7 @@ DxEngCleanDC(HDC hdc) /************************************************************************/ BOOL APIENTRY DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { - DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + DPRINT("ReactX Calling : DxEngSetDCOwner\n"); return GreSetDCOwner(hObject, OwnerMask); } @@ -765,7 +760,7 @@ DxEngSetDCState(HDC hDC, DWORD SetType, DWORD Set) /************************************************************************/ HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) { - DPRINT1("ReactX Calling : DxEngSelectBitmap \n"); + DPRINT("ReactX Calling : DxEngSelectBitmap\n"); return NtGdiSelectBitmap(hdc, hbmp); } @@ -775,7 +770,7 @@ HBITMAP APIENTRY DxEngSelectBitmap(HDC hdc, HBITMAP hbmp) /************************************************************************/ BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) { - DPRINT1("ReactX Calling : DxEngSetBitmapOwner \n"); + DPRINT("ReactX Calling : DxEngSetBitmapOwner\n"); return GreSetBitmapOwner(hbmp, ulOwner); } @@ -785,7 +780,7 @@ BOOLEAN APIENTRY DxEngSetBitmapOwner(HBITMAP hbmp, ULONG ulOwner) /************************************************************************/ BOOLEAN APIENTRY DxEngDeleteSurface(HSURF hsurf) { - DPRINT1("ReactX Calling : DxEngDeleteSurface \n"); + DPRINT("ReactX Calling : DxEngDeleteSurface\n"); return EngDeleteSurface(hsurf); } @@ -804,7 +799,7 @@ DWORD APIENTRY DxEngGetSurfaceData(DWORD x1, DWORD x2) /************************************************************************/ SURFOBJ * APIENTRY DxEngAltLockSurface(HSURF hsurf) { - DPRINT1("ReactX Calling : DxEngAltLockSurface \n"); + DPRINT("ReactX Calling : DxEngAltLockSurface\n"); return EngLockSurface(hsurf); } diff --git a/win32ss/reactx/ntddraw/eng.c b/win32ss/reactx/ntddraw/eng.c index 426ea70a9e5..6e5a50611e5 100644 --- a/win32ss/reactx/ntddraw/eng.c +++ b/win32ss/reactx/ntddraw/eng.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -31,7 +32,7 @@ HeapVidMemAllocAligned(LPVIDMEM lpVidMem, return 0; } - DPRINT1("Calling dxg.sys pfnHeapVidMemAllocAligned\n"); + DPRINT("Calling dxg.sys pfnHeapVidMemAllocAligned\n"); return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } @@ -51,7 +52,7 @@ VidMemFree(LPVMEMHEAP pvmh, } else { - DPRINT1("Calling dxg.sys pfnVidMemFree\n"); + DPRINT("Calling dxg.sys pfnVidMemFree\n"); pfnVidMemFree(pvmh, ptr); } } @@ -78,7 +79,7 @@ EngAllocPrivateUserMem( return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnEngAllocPrivateUserMem\n"); + DPRINT("Calling dxg.sys pfnEngAllocPrivateUserMem\n"); return pfnEngAllocPrivateUserMem(psl, cjMemSize, ulTag); } @@ -98,7 +99,7 @@ EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, } else { - DPRINT1("Calling dxg.sys pfnEngFreePrivateUserMem\n"); + DPRINT("Calling dxg.sys pfnEngFreePrivateUserMem\n"); pfnEngFreePrivateUserMem(psl, pv); } } @@ -136,8 +137,7 @@ EngDxIoctl(ULONG ulIoctl, PGD_ENGDXIOCTL pfnEngDxIoctl = (PGD_ENGDXIOCTL)gpDxFuncs[DXG_INDEX_DxDdIoctl].pfn; DWORD retVal = DDERR_UNSUPPORTED; - DPRINT1("Calling dxg.sys pfnEngDxIoctl\n"); - + DPRINT("Calling dxg.sys pfnEngDxIoctl\n"); if (pfnEngDxIoctl != NULL) { retVal = pfnEngDxIoctl(ulIoctl, pBuffer, ulBufferSize); @@ -169,8 +169,7 @@ EngLockDirectDrawSurface(HANDLE hSurface) PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = (PGD_ENGLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdLockDirectDrawSurface].pfn; PDD_SURFACE_LOCAL retVal = NULL; - DPRINT1("Calling dxg.sys pfnEngLockDirectDrawSurface\n"); - + DPRINT("Calling dxg.sys pfnEngLockDirectDrawSurface\n"); if (pfnEngLockDirectDrawSurface != NULL) { retVal = pfnEngLockDirectDrawSurface(hSurface); @@ -179,7 +178,6 @@ EngLockDirectDrawSurface(HANDLE hSurface) return retVal; } - /*++ * @name EngUnlockDirectDrawSurface * @implemented @@ -203,8 +201,7 @@ EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = (PGD_ENGUNLOCKDIRECTDRAWSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnlockDirectDrawSurface].pfn; BOOL retVal = FALSE; - DPRINT1("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n"); - + DPRINT("Calling dxg.sys pfnEngUnlockDirectDrawSurface\n"); if (pfnEngUnlockDirectDrawSurface != NULL) { retVal = pfnEngUnlockDirectDrawSurface(pSurface); @@ -212,4 +209,3 @@ EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) return retVal; } - diff --git a/win32ss/reactx/ntddraw/mocomp.c b/win32ss/reactx/ntddraw/mocomp.c index ead4cfee453..e6a4879c960 100644 --- a/win32ss/reactx/ntddraw/mocomp.c +++ b/win32ss/reactx/ntddraw/mocomp.c @@ -8,8 +8,9 @@ * 19/1-2006 Magnus Olsen */ - #include <win32k.h> + +// #define NDEBUG #include <debug.h> /************************************************************************/ @@ -24,11 +25,11 @@ NtGdiDdBeginMoCompFrame(HANDLE hMoComp, if (pfnDdBeginMoCompFrame == NULL) { - DPRINT1("Warning: no pfnDdBeginMoCompFrame"); + DPRINT1("Warning: no pfnDdBeginMoCompFrame\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdBeginMoCompFrame"); + DPRINT("Calling dxg.sys pfnDdBeginMoCompFrame\n"); return pfnDdBeginMoCompFrame(hMoComp,puBeginFrameData); } @@ -43,32 +44,33 @@ NtGdiDdCreateMoComp(HANDLE hDirectDraw, PDD_CREATEMOCOMPDATA puCreateMoCompData) if (pfnDdCreateMoComp == NULL) { - DPRINT1("Warning: no pfnDdCreateMoComp"); + DPRINT1("Warning: no pfnDdCreateMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DdCreateMoComp"); + DPRINT("Calling dxg.sys pfnDdCreateMoComp\n"); return pfnDdCreateMoComp(hDirectDraw, puCreateMoCompData); } /************************************************************************/ /* NtGdiDdDestroyMoComp */ /************************************************************************/ -DWORD +DWORD APIENTRY NtGdiDdDestroyMoComp(HANDLE hMoComp, PDD_DESTROYMOCOMPDATA puBeginFrameData) { - PGD_DXDDDESTROYMOCOMP pfnDxDdDestroyMoComp = (PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn; + PGD_DXDDDESTROYMOCOMP pfnDdDestroyMoComp = + (PGD_DXDDDESTROYMOCOMP)gpDxFuncs[DXG_INDEX_DxDdDestroyMoComp].pfn; - if (pfnDxDdDestroyMoComp == NULL) + if (pfnDdDestroyMoComp == NULL) { - DPRINT1("Warning: no pfnDxDdDestroyMoComp"); + DPRINT1("Warning: no pfnDdDestroyMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys DxDdDestroyMoComp"); - return pfnDxDdDestroyMoComp(hMoComp, puBeginFrameData); + DPRINT("Calling dxg.sys pfnDdDestroyMoComp\n"); + return pfnDdDestroyMoComp(hMoComp, puBeginFrameData); } /************************************************************************/ @@ -83,11 +85,11 @@ NtGdiDdEndMoCompFrame(HANDLE hMoComp, if (pfnDdEndMoCompFrame == NULL) { - DPRINT1("Warning: no pfnDdEndMoCompFrame"); + DPRINT1("Warning: no pfnDdEndMoCompFrame\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdEndMoCompFrame"); + DPRINT("Calling dxg.sys pfnDdEndMoCompFrame\n"); return pfnDdEndMoCompFrame(hMoComp, puEndFrameData); } @@ -103,15 +105,14 @@ NtGdiDdGetInternalMoCompInfo(HANDLE hDirectDraw, if (pfnDdGetInternalMoCompInfo == NULL) { - DPRINT1("Warning: no pfnDdGetInternalMoCompInfo"); + DPRINT1("Warning: no pfnDdGetInternalMoCompInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetInternalMoCompInfo"); + DPRINT("Calling dxg.sys pfnDdGetInternalMoCompInfo\n"); return pfnDdGetInternalMoCompInfo(hDirectDraw, puGetInternalData); } - /************************************************************************/ /* NtGdiDdGetMoCompBuffInfo */ /************************************************************************/ @@ -124,11 +125,11 @@ NtGdiDdGetMoCompBuffInfo(HANDLE hDirectDraw, if (pfnDdGetMoCompBuffInfo == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompBuffInfo"); + DPRINT1("Warning: no pfnDdGetMoCompBuffInfo\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompBuffInfo"); + DPRINT("Calling dxg.sys pfnDdGetMoCompBuffInfo\n"); return pfnDdGetMoCompBuffInfo(hDirectDraw, puGetBuffData); } @@ -144,15 +145,14 @@ NtGdiDdGetMoCompFormats(HANDLE hDirectDraw, if (pfnDdGetMoCompFormats == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompFormats"); + DPRINT1("Warning: no pfnDdGetMoCompFormats\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompFormats"); + DPRINT("Calling dxg.sys pfnDdGetMoCompFormats\n"); return pfnDdGetMoCompFormats(hDirectDraw, puGetMoCompFormatsData); } - /************************************************************************/ /* NtGdiDdGetMoCompGuids */ /************************************************************************/ @@ -165,16 +165,14 @@ NtGdiDdGetMoCompGuids(HANDLE hDirectDraw, if (pfnDdGetMoCompGuids == NULL) { - DPRINT1("Warning: no pfnDdGetMoCompGuids"); + DPRINT1("Warning: no pfnDdGetMoCompGuids\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdGetMoCompGuids"); + DPRINT("Calling dxg.sys pfnDdGetMoCompGuids\n"); return pfnDdGetMoCompGuids(hDirectDraw, puGetMoCompGuidsData); } - - /************************************************************************/ /* NtGdiDdQueryMoCompStatus */ /************************************************************************/ @@ -187,15 +185,14 @@ NtGdiDdQueryMoCompStatus(HANDLE hMoComp, if (pfnDdQueryMoCompStatus == NULL) { - DPRINT1("Warning: no pfnDdQueryMoCompStatus"); + DPRINT1("Warning: no pfnDdQueryMoCompStatus\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdQueryMoCompStatus"); + DPRINT("Calling dxg.sys pfnDdQueryMoCompStatus\n"); return pfnDdQueryMoCompStatus(hMoComp, puQueryMoCompStatusData); } - /************************************************************************/ /* NtGdiDdRenderMoComp */ /************************************************************************/ @@ -208,11 +205,10 @@ NtGdiDdRenderMoComp(HANDLE hMoComp, if (pfnDdRenderMoComp == NULL) { - DPRINT1("Warning: no pfnDdRenderMoComp"); + DPRINT1("Warning: no pfnDdRenderMoComp\n"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling dxg.sys pfnDdRenderMoComp"); + DPRINT("Calling dxg.sys pfnDdRenderMoComp\n"); return pfnDdRenderMoComp(hMoComp, puRenderMoCompData); } -

1 year, 2 months

[reactos] 01/01: [NTDLL:LDR] Little fixes about SAL annotation and behavior (#5793)

by Ratin Gao

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd0a5498b04cf77e611cb… commit bd0a5498b04cf77e611cb6526fd88459be2a7b19 Author: Ratin Gao <ratin(a)knsoft.org> AuthorDate: Thu Nov 16 03:59:32 2023 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 20:59:32 2023 +0100 [NTDLL:LDR] Little fixes about SAL annotation and behavior (#5793) - Uniform function declarations in .c and .h with fixes and SAL2 improvements. - Use LDR_[UN]LOCK_LOADER_LOCK_FLAG_XXX correctly. - Fix incorrect UsedSize calculation in LdrQueryProcessModuleInformationEx (caught by ThFabba). - Whatever the callback request stop the enumeration or not in LdrEnumerateLoadedModules, the following operations should be the same. - Fix 2 incorrect DPRINT1 that printed incorrect parameter. - Return error if RtlAllocateHeap failed in LdrpGetProcedureAddress, and add comments about NT6.2 new changes. --- dll/ntdll/ldr/ldrapi.c | 103 ++++++++++++++++++++----------------- dll/ntdll/ldr/ldrinit.c | 54 ++++++++++--------- dll/ntdll/ldr/ldrutils.c | 7 ++- dll/win32/kernel32/client/loader.c | 2 +- sdk/include/ndk/ldrfuncs.h | 8 +-- sdk/include/ndk/ldrtypes.h | 2 +- sdk/include/ndk/rtlfuncs.h | 5 +- sdk/include/ndk/umfuncs.h | 18 +++---- sdk/lib/rtl/image.c | 24 +++++---- 9 files changed, 120 insertions(+), 103 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index f850ce6ddca..34517b1a251 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -309,10 +309,11 @@ LdrLockLoaderLock( NTSTATUS NTAPI DECLSPEC_HOTPATCH -LdrLoadDll(IN PWSTR SearchPath OPTIONAL, - IN PULONG DllCharacteristics OPTIONAL, - IN PUNICODE_STRING DllName, - OUT PVOID *BaseAddress) +LdrLoadDll( + _In_opt_ PWSTR SearchPath, + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *BaseAddress) { WCHAR StringBuffer[MAX_PATH]; UNICODE_STRING DllString1, DllString2; @@ -426,7 +427,7 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL, LdrpTopLevelDllBeingLoaded = OldTldDll; /* Release the lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); } _SEH2_END; @@ -793,7 +794,7 @@ Quickie: /* Release lock */ if (Locked) { - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); } @@ -840,10 +841,11 @@ LdrGetProcedureAddress( */ NTSTATUS NTAPI -LdrVerifyImageMatchesChecksum(IN HANDLE FileHandle, - IN PLDR_CALLBACK Callback, - IN PVOID CallbackContext, - OUT PUSHORT ImageCharacteristics) +LdrVerifyImageMatchesChecksum( + _In_ HANDLE FileHandle, + _In_ PLDR_CALLBACK Callback, + _In_ PVOID CallbackContext, + _Out_ PUSHORT ImageCharacteristics) { FILE_STANDARD_INFORMATION FileStandardInfo; PIMAGE_IMPORT_DESCRIPTOR ImportData; @@ -982,18 +984,19 @@ LdrVerifyImageMatchesChecksum(IN HANDLE FileHandle, NTSTATUS NTAPI -LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, - IN ULONG Reserved, - OUT PRTL_PROCESS_MODULES ModuleInformation, - IN ULONG Size, - OUT PULONG ReturnedSize OPTIONAL) +LdrQueryProcessModuleInformationEx( + _In_opt_ ULONG ProcessId, + _Reserved_ ULONG Reserved, + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize) { PLIST_ENTRY ModuleListHead, InitListHead; PLIST_ENTRY Entry, InitEntry; PLDR_DATA_TABLE_ENTRY Module, InitModule; PRTL_PROCESS_MODULE_INFORMATION ModulePtr = NULL; NTSTATUS Status = STATUS_SUCCESS; - ULONG UsedSize = sizeof(ULONG); + ULONG UsedSize = FIELD_OFFSET(RTL_PROCESS_MODULES, Modules); ANSI_STRING AnsiString; PCHAR p; @@ -1110,9 +1113,10 @@ LdrQueryProcessModuleInformationEx(IN ULONG ProcessId, */ NTSTATUS NTAPI -LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation, - IN ULONG Size, - OUT PULONG ReturnedSize OPTIONAL) +LdrQueryProcessModuleInformation( + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize) { /* Call Ex version of the API */ return LdrQueryProcessModuleInformationEx(0, 0, ModuleInformation, Size, ReturnedSize); @@ -1123,9 +1127,10 @@ LdrQueryProcessModuleInformation(IN PRTL_PROCESS_MODULES ModuleInformation, */ NTSTATUS NTAPI -LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, - IN PLDR_ENUM_CALLBACK EnumProc, - IN PVOID Context) +LdrEnumerateLoadedModules( + _Reserved_ ULONG ReservedFlag, + _In_ PLDR_ENUM_CALLBACK EnumProc, + _In_opt_ PVOID Context) { PLIST_ENTRY ListHead, ListEntry; PLDR_DATA_TABLE_ENTRY LdrEntry; @@ -1161,28 +1166,24 @@ LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, /* Break if we were asked to stop enumeration */ if (Stop) { - /* Release loader lock */ - Status = LdrUnlockLoaderLock(0, Cookie); - - /* Reset any successful status to STATUS_SUCCESS, but leave - failure to the caller */ - if (NT_SUCCESS(Status)) - Status = STATUS_SUCCESS; - - /* Return any possible failure status */ - return Status; + break; } /* Advance to the next module */ ListEntry = ListEntry->Flink; } - /* Release loader lock, it must succeed this time */ + /* Release loader lock */ Status = LdrUnlockLoaderLock(0, Cookie); ASSERT(NT_SUCCESS(Status)); - /* Return success */ - return STATUS_SUCCESS; + /* Reset any successful status to STATUS_SUCCESS, + * but leave failure to the caller */ + if (NT_SUCCESS(Status)) + Status = STATUS_SUCCESS; + + /* Return any possible failure status */ + return Status; } /* @@ -1190,7 +1191,8 @@ LdrEnumerateLoadedModules(IN BOOLEAN ReservedFlag, */ NTSTATUS NTAPI -LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) +LdrDisableThreadCalloutsForDll( + _In_ PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY LdrEntry; NTSTATUS Status; @@ -1240,8 +1242,9 @@ LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress) */ NTSTATUS NTAPI -LdrAddRefDll(IN ULONG Flags, - IN PVOID BaseAddress) +LdrAddRefDll( + _In_ ULONG Flags, + _In_ PVOID BaseAddress) { PLDR_DATA_TABLE_ENTRY LdrEntry; NTSTATUS Status = STATUS_SUCCESS; @@ -1316,7 +1319,7 @@ quickie: } /* Release the lock if needed */ - if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + if (Locked) LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Status; } @@ -1325,7 +1328,8 @@ quickie: */ NTSTATUS NTAPI -LdrUnloadDll(IN PVOID BaseAddress) +LdrUnloadDll( + _In_ PVOID BaseAddress) { NTSTATUS Status = STATUS_SUCCESS; PPEB Peb = NtCurrentPeb(); @@ -1601,10 +1605,11 @@ RtlDllShutdownInProgress(VOID) */ PIMAGE_BASE_RELOCATION NTAPI -LdrProcessRelocationBlock(IN ULONG_PTR Address, - IN ULONG Count, - IN PUSHORT TypeOffset, - IN LONG_PTR Delta) +LdrProcessRelocationBlock( + _In_ ULONG_PTR Address, + _In_ ULONG Count, + _In_ PUSHORT TypeOffset, + _In_ LONG_PTR Delta) { return LdrProcessRelocationBlockLongLong(Address, Count, TypeOffset, Delta); } @@ -1617,8 +1622,9 @@ LdrProcessRelocationBlock(IN ULONG_PTR Address, */ NTSTATUS NTAPI -LdrLoadAlternateResourceModule(IN PVOID Module, - IN PWSTR Buffer) +LdrLoadAlternateResourceModule( + _In_ PVOID Module, + _In_ PWSTR Buffer) { /* Is MUI Support enabled? */ if (!LdrAlternateResourcesEnabled()) return STATUS_SUCCESS; @@ -1632,7 +1638,8 @@ LdrLoadAlternateResourceModule(IN PVOID Module, */ BOOLEAN NTAPI -LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) +LdrUnloadAlternateResourceModule( + _In_ PVOID BaseAddress) { ULONG_PTR Cookie; @@ -1646,7 +1653,7 @@ LdrUnloadAlternateResourceModule(IN PVOID BaseAddress) } /* Release the loader lock */ - LdrUnlockLoaderLock(1, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); /* All done */ return TRUE; diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 2dc616a4afd..03e80968f3d 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -109,9 +109,10 @@ extern BOOLEAN RtlpUse16ByteSLists; */ NTSTATUS NTAPI -LdrOpenImageFileOptionsKey(IN PUNICODE_STRING SubKey, - IN BOOLEAN Wow64, - OUT PHANDLE NewKeyHandle) +LdrOpenImageFileOptionsKey( + _In_ PUNICODE_STRING SubKey, + _In_ BOOLEAN Wow64, + _Out_ PHANDLE NewKeyHandle) { PHANDLE RootKeyLocation; HANDLE RootKey; @@ -181,12 +182,13 @@ LdrOpenImageFileOptionsKey(IN PUNICODE_STRING SubKey, */ NTSTATUS NTAPI -LdrQueryImageFileKeyOption(IN HANDLE KeyHandle, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL) +LdrQueryImageFileKeyOption( + _In_ HANDLE KeyHandle, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength) { ULONG KeyInfo[256]; UNICODE_STRING ValueNameString, IntegerString; @@ -345,13 +347,14 @@ LdrQueryImageFileKeyOption(IN HANDLE KeyHandle, */ NTSTATUS NTAPI -LdrQueryImageFileExecutionOptionsEx(IN PUNICODE_STRING SubKey, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL, - IN BOOLEAN Wow64) +LdrQueryImageFileExecutionOptionsEx( + _In_ PUNICODE_STRING SubKey, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength, + _In_ BOOLEAN Wow64) { NTSTATUS Status; HANDLE KeyHandle; @@ -383,12 +386,13 @@ LdrQueryImageFileExecutionOptionsEx(IN PUNICODE_STRING SubKey, */ NTSTATUS NTAPI -LdrQueryImageFileExecutionOptions(IN PUNICODE_STRING SubKey, - IN PCWSTR ValueName, - IN ULONG Type, - OUT PVOID Buffer, - IN ULONG BufferSize, - OUT PULONG ReturnedLength OPTIONAL) +LdrQueryImageFileExecutionOptions( + _In_ PUNICODE_STRING SubKey, + _In_ PCWSTR ValueName, + _In_ ULONG Type, + _Out_ PVOID Buffer, + _In_ ULONG BufferSize, + _Out_opt_ PULONG ReturnedLength) { /* Call the newer function */ return LdrQueryImageFileExecutionOptionsEx(SubKey, @@ -1879,7 +1883,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, HeapParameters.Length = sizeof(HeapParameters); /* Check if we have Configuration Data */ -#define VALID_CONFIG_FIELD(Name) (ConfigSize >= (FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, Name) + sizeof(LoadConfig->Name))) +#define VALID_CONFIG_FIELD(Name) (ConfigSize >= RTL_SIZEOF_THROUGH_FIELD(IMAGE_LOAD_CONFIG_DIRECTORY, Name)) /* The 'original' load config ends after SecurityCookie */ if ((LoadConfig) && ConfigSize && (VALID_CONFIG_FIELD(SecurityCookie) || ConfigSize == LoadConfig->Size)) { @@ -2327,7 +2331,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (!NT_SUCCESS(Status)) { if (ShowSnaps) - DPRINT1("LDR: Unable to find post-import process init function, Status=0x%08lx\n", &Kernel32String, Status); + DPRINT1("LDR: Unable to find post-import process init function, Status=0x%08lx\n", Status); return Status; } Kernel32ProcessInitPostImportFunction = FunctionAddress; @@ -2340,7 +2344,7 @@ LdrpInitializeProcess(IN PCONTEXT Context, if (!NT_SUCCESS(Status)) { if (ShowSnaps) - DPRINT1("LDR: Unable to find BaseQueryModuleData, Status=0x%08lx\n", &Kernel32String, Status); + DPRINT1("LDR: Unable to find BaseQueryModuleData, Status=0x%08lx\n", Status); return Status; } Kernel32BaseQueryModuleData = FunctionAddress; diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 632aa83df04..69e2f8c152e 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2257,7 +2257,7 @@ LdrpGetProcedureAddress( _In_ BOOLEAN ExecuteInit) { NTSTATUS Status = STATUS_SUCCESS; - UCHAR ImportBuffer[64]; + UCHAR ImportBuffer[64]; // 128 since NT6.2 PLDR_DATA_TABLE_ENTRY LdrEntry; IMAGE_THUNK_DATA Thunk; PVOID ImageBase; @@ -2292,6 +2292,11 @@ LdrpGetProcedureAddress( ImportName = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length); + if (!ImportName) + { + /* Return STATUS_INSUFFICIENT_RESOURCES since NT6.2 */ + return STATUS_INVALID_PARAMETER; + } } else { diff --git a/dll/win32/kernel32/client/loader.c b/dll/win32/kernel32/client/loader.c index 2934b528699..c3a53eec0bc 100644 --- a/dll/win32/kernel32/client/loader.c +++ b/dll/win32/kernel32/client/loader.c @@ -657,7 +657,7 @@ GetModuleFileNameW(HINSTANCE hModule, } _SEH2_END /* Release the loader lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + LdrUnlockLoaderLock(LDR_UNLOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Length / sizeof(WCHAR); } diff --git a/sdk/include/ndk/ldrfuncs.h b/sdk/include/ndk/ldrfuncs.h index 9eb891928ca..52e682b57fb 100644 --- a/sdk/include/ndk/ldrfuncs.h +++ b/sdk/include/ndk/ldrfuncs.h @@ -97,8 +97,8 @@ LdrGetProcedureAddress( ULONG NTAPI LdrRelocateImage( - _In_ PVOID NewBase, - _In_ PCCH LoaderName, + _In_ PVOID BaseAddress, + _In_opt_ PCSTR LoaderName, _In_ ULONG Success, _In_ ULONG Conflict, _In_ ULONG Invalid @@ -139,9 +139,9 @@ LdrProcessRelocationBlockLongLong( NTSTATUS NTAPI LdrEnumerateLoadedModules( - _In_ BOOLEAN ReservedFlag, + _Reserved_ ULONG ReservedFlag, _In_ PLDR_ENUM_CALLBACK EnumProc, - _In_ PVOID Context + _In_opt_ PVOID Context ); #endif diff --git a/sdk/include/ndk/ldrtypes.h b/sdk/include/ndk/ldrtypes.h index fcc76cac8dc..3b71d022887 100644 --- a/sdk/include/ndk/ldrtypes.h +++ b/sdk/include/ndk/ldrtypes.h @@ -238,7 +238,7 @@ typedef struct _ALT_RESOURCE_MODULE // // Callback function for LdrEnumerateLoadedModules // -typedef VOID (NTAPI LDR_ENUM_CALLBACK)(_In_ PLDR_DATA_TABLE_ENTRY ModuleInformation, _In_ PVOID Parameter, _Out_ BOOLEAN *Stop); +typedef VOID (NTAPI LDR_ENUM_CALLBACK)(_In_ PLDR_DATA_TABLE_ENTRY ModuleInformation, _In_opt_ PVOID Context, _Out_ BOOLEAN *Stop); typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK; // diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index 41aedeb7e2d..29ab006cf25 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -3975,13 +3975,12 @@ RtlImageRvaToSection( _In_ ULONG Rva ); -NTSYSAPI ULONG NTAPI LdrRelocateImageWithBias( - _In_ PVOID NewAddress, + _In_ PVOID BaseAddress, _In_ LONGLONG AdditionalBias, - _In_ PCCH LoaderName, + _In_opt_ PCSTR LoaderName, _In_ ULONG Success, _In_ ULONG Conflict, _In_ ULONG Invalid diff --git a/sdk/include/ndk/umfuncs.h b/sdk/include/ndk/umfuncs.h index 5fa85a1e978..7c6618c45bf 100644 --- a/sdk/include/ndk/umfuncs.h +++ b/sdk/include/ndk/umfuncs.h @@ -158,9 +158,9 @@ NTSTATUS NTAPI LdrLoadDll( _In_opt_ PWSTR SearchPath, - _In_opt_ PULONG LoadFlags, - _In_ PUNICODE_STRING Name, - _Out_opt_ PVOID *BaseAddress + _In_opt_ PULONG DllCharacteristics, + _In_ PUNICODE_STRING DllName, + _Out_ PVOID *BaseAddress ); PIMAGE_BASE_RELOCATION @@ -177,18 +177,18 @@ NTAPI LdrQueryImageFileExecutionOptions( _In_ PUNICODE_STRING SubKey, _In_ PCWSTR ValueName, - _In_ ULONG ValueSize, + _In_ ULONG Type, _Out_ PVOID Buffer, _In_ ULONG BufferSize, - _Out_opt_ PULONG RetunedLength + _Out_opt_ PULONG ReturnedLength ); NTSTATUS NTAPI LdrQueryProcessModuleInformation( - _In_opt_ PRTL_PROCESS_MODULES ModuleInformation, - _In_opt_ ULONG Size, - _Out_ PULONG ReturnedSize + _Out_writes_bytes_to_(Size, *ReturnedSize) PRTL_PROCESS_MODULES ModuleInformation, + _In_ ULONG Size, + _Out_opt_ PULONG ReturnedSize ); VOID @@ -221,7 +221,7 @@ LdrVerifyImageMatchesChecksum( _In_ HANDLE FileHandle, _In_ PLDR_CALLBACK Callback, _In_ PVOID CallbackContext, - _Out_ PUSHORT ImageCharacterstics + _Out_ PUSHORT ImageCharacteristics ); NTSTATUS diff --git a/sdk/lib/rtl/image.c b/sdk/lib/rtl/image.c index 9efb3d19744..334839d0732 100644 --- a/sdk/lib/rtl/image.c +++ b/sdk/lib/rtl/image.c @@ -460,11 +460,11 @@ LdrProcessRelocationBlockLongLong( ULONG NTAPI LdrRelocateImage( - IN PVOID BaseAddress, - IN PCCH LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid) + _In_ PVOID BaseAddress, + _In_opt_ PCSTR LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid) { return LdrRelocateImageWithBias(BaseAddress, 0, LoaderName, Success, Conflict, Invalid); } @@ -472,12 +472,12 @@ LdrRelocateImage( ULONG NTAPI LdrRelocateImageWithBias( - IN PVOID BaseAddress, - IN LONGLONG AdditionalBias, - IN PCCH LoaderName, - IN ULONG Success, - IN ULONG Conflict, - IN ULONG Invalid) + _In_ PVOID BaseAddress, + _In_ LONGLONG AdditionalBias, + _In_opt_ PCSTR LoaderName, + _In_ ULONG Success, + _In_ ULONG Conflict, + _In_ ULONG Invalid) { PIMAGE_NT_HEADERS NtHeaders; PIMAGE_DATA_DIRECTORY RelocationDDir; @@ -487,6 +487,8 @@ LdrRelocateImageWithBias( PUSHORT TypeOffset; LONGLONG Delta; + UNREFERENCED_PARAMETER(LoaderName); + NtHeaders = RtlImageNtHeader(BaseAddress); if (NtHeaders == NULL)

1 year, 2 months

[reactos] 01/01: [FIND] Update Romanian (ro-RO) translation (#5965)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bd9e2d6beb50fc4048fb3… commit bd9e2d6beb50fc4048fb33f01c96e3a0372efb4e Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 12:27:09 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:27:09 2023 +0100 [FIND] Update Romanian (ro-RO) translation (#5965) --- base/applications/cmdutils/find/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/cmdutils/find/lang/ro-RO.rc b/base/applications/cmdutils/find/lang/ro-RO.rc index 7dd07f5ba39..607a2813ae4 100644 --- a/base/applications/cmdutils/find/lang/ro-RO.rc +++ b/base/applications/cmdutils/find/lang/ro-RO.rc @@ -16,7 +16,7 @@ FIND [/V] [/C] [/N] [/I] [/OFF[LINE]] ""șir"" [fișier...]\n\ /C Numără liniile ce conțin șirul.\n\ /N Numără rândurile afișate, începând cu 1.\n\ /I Ignoră diferențele între majuscule și minuscule.\n\ - /OFF[LINE] Nu omite fișierele care care au configurate atributul\n\ + /OFF[LINE] Nu omite fișierele care au configurate atributul\n\ offline (deconectat)." IDS_NO_SUCH_FILE "FIND: Fișierul «%s» nu există!\n" IDS_CANNOT_OPEN "FIND: Fișierul «%s» nu poate fi deschis!\n"

1 year, 2 months

[reactos] 01/01: [SHELL32] Don't display missing applications in "Open with..." (#5587)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51ba3b1fb469d420e7a4c… commit 51ba3b1fb469d420e7a4c2697db899f30c7357c6 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Nov 15 11:20:04 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:20:04 2023 +0100 [SHELL32] Don't display missing applications in "Open with..." (#5587) Don't display applications that don't exist. In Windows XP, Exe files that no longer exist are hidden but their registry entry is not deleted. JIRA issue: CORE-19117 --- dll/win32/shell32/COpenWithMenu.cpp | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index a7783eaf912..759f6c41436 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -78,7 +78,7 @@ class COpenWithList SApp *AddInternal(LPCWSTR pwszFilename); static BOOL LoadInfo(SApp *pApp); - static VOID GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd); + static BOOL GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd); BOOL LoadProgIdList(HKEY hKey, LPCWSTR pwszExt); static HANDLE OpenMRUList(HKEY hKey); BOOL LoadMRUList(HKEY hKey); @@ -217,6 +217,12 @@ LPCWSTR COpenWithList::GetName(SApp *pApp) { WARN("Failed to load %ls info\n", pApp->wszFilename); StringCbCopyW(pApp->wszName, sizeof(pApp->wszName), pApp->wszFilename); + + WCHAR wszPath[MAX_PATH]; + if (!GetPathFromCmd(wszPath, pApp->wszCmd)) + { + return NULL; + } } } @@ -231,7 +237,17 @@ HICON COpenWithList::GetIcon(SApp *pApp) WCHAR wszPath[MAX_PATH]; GetPathFromCmd(wszPath, pApp->wszCmd); - ExtractIconExW(wszPath, 0, NULL, &pApp->hIcon, 1); + if (!ExtractIconExW(wszPath, 0, NULL, &pApp->hIcon, 1)) + { + SHFILEINFO fi; + /* FIXME: Ideally we should include SHGFI_USEFILEATTRIBUTES because we already + ** know the file has no icons but SHGetFileInfo is broken in that case (CORE-19122). + ** Without SHGFI_USEFILEATTRIBUTES we needlessly hit the disk again but it will + ** return the correct default .exe icon. + */ + SHGetFileInfoW(wszPath, 0, &fi, sizeof(fi), SHGFI_ICON|SHGFI_SMALLICON|SHGFI_SHELLICONSIZE); + pApp->hIcon = fi.hIcon; + } } TRACE("%ls icon: %p\n", pApp->wszFilename, pApp->hIcon); @@ -321,6 +337,7 @@ BOOL COpenWithList::LoadInfo(COpenWithList::SApp *pApp) WCHAR wszBuf[100]; WCHAR *pResult; WCHAR wszPath[MAX_PATH]; + BOOL success = FALSE; GetPathFromCmd(wszPath, pApp->wszCmd); TRACE("LoadInfo %ls\n", wszPath); @@ -362,7 +379,8 @@ BOOL COpenWithList::LoadInfo(COpenWithList::SApp *pApp) /* Query name */ swprintf(wszBuf, L"\\StringFileInfo\\%04x%04x\\FileDescription", wLang, wCode); - if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cchLen)) + success = VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cchLen) && (cchLen > 1); + if (success) StringCchCopyNW(pApp->wszName, _countof(pApp->wszName), pResult, cchLen); else ERR("Cannot get app name\n"); @@ -373,10 +391,10 @@ BOOL COpenWithList::LoadInfo(COpenWithList::SApp *pApp) if (VerQueryValueW(pBuf, wszBuf, (LPVOID *)&pResult, &cchLen)) StringCchCopyNW(pApp->wszManufacturer, _countof(pApp->wszManufacturer), pResult, cchLen);*/ HeapFree(GetProcessHeap(), 0, pBuf); - return TRUE; + return success; } -VOID COpenWithList::GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd) +BOOL COpenWithList::GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd) { WCHAR wszBuf[MAX_PATH], *pwszDest = wszBuf; @@ -397,7 +415,8 @@ VOID COpenWithList::GetPathFromCmd(LPWSTR pwszAppPath, LPCWSTR pwszCmd) /* Expand evn vers and optionally search for path */ ExpandEnvironmentStrings(wszBuf, pwszAppPath, MAX_PATH); if (!PathFileExists(pwszAppPath)) - SearchPath(NULL, pwszAppPath, NULL, MAX_PATH, pwszAppPath, NULL); + return SearchPath(NULL, pwszAppPath, NULL, MAX_PATH, pwszAppPath, NULL); + return TRUE; } BOOL COpenWithList::LoadRecommended(LPCWSTR pwszFilePath) @@ -862,6 +881,7 @@ BOOL COpenWithDialog::IsNoOpen(HWND hwnd) VOID COpenWithDialog::AddApp(COpenWithList::SApp *pApp, BOOL bSelected) { LPCWSTR pwszName = m_pAppList->GetName(pApp); + if (!pwszName) return; HICON hIcon = m_pAppList->GetIcon(pApp); TRACE("AddApp Cmd %ls Name %ls\n", pApp->wszCmd, pwszName); @@ -875,7 +895,7 @@ VOID COpenWithDialog::AddApp(COpenWithList::SApp *pApp, BOOL bSelected) tvins.hParent = tvins.hInsertAfter = m_hOther; tvins.item.mask = TVIF_TEXT|TVIF_PARAM; - tvins.item.pszText = (LPWSTR)pwszName; + tvins.item.pszText = const_cast<LPWSTR>(pwszName); tvins.item.lParam = (LPARAM)pApp; if (hIcon) @@ -1189,6 +1209,7 @@ VOID COpenWithMenu::AddApp(PVOID pApp) { MENUITEMINFOW mii; LPCWSTR pwszName = m_pAppList->GetName((COpenWithList::SApp*)pApp); + if (!pwszName) return; ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); @@ -1196,7 +1217,7 @@ VOID COpenWithMenu::AddApp(PVOID pApp) mii.fType = MFT_STRING; mii.fState = MFS_ENABLED; mii.wID = m_idCmdLast; - mii.dwTypeData = (LPWSTR)pwszName; + mii.dwTypeData = const_cast<LPWSTR>(pwszName); mii.cch = wcslen(mii.dwTypeData); mii.dwItemData = (ULONG_PTR)pApp;

1 year, 2 months

[reactos] 01/01: [ADVAPI32] RegEnumKeyExW on HKCR keys must work with just KEY_ENUMERATE_SUB_KEYS access (#5872)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80257857302f6a72de32a… commit 80257857302f6a72de32af1da0f803425a02509f Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Nov 15 11:07:28 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:07:28 2023 +0100 [ADVAPI32] RegEnumKeyExW on HKCR keys must work with just KEY_ENUMERATE_SUB_KEYS access (#5872) This fixes Windows RegEdit when the same HKCR key exists in HKCU and HKLM. --- dll/win32/advapi32/reg/hkcr.c | 52 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dll/win32/advapi32/reg/hkcr.c b/dll/win32/advapi32/reg/hkcr.c index 21921ebb42b..59d53052879 100644 --- a/dll/win32/advapi32/reg/hkcr.c +++ b/dll/win32/advapi32/reg/hkcr.c @@ -214,6 +214,30 @@ GetPreferredHKCRKey( return ErrorCode; } +static +LONG +GetSubkeyInfoHelper( + _In_ HKEY hKey, + _Out_opt_ LPDWORD lpSubKeys, + _Out_opt_ LPDWORD lpMaxSubKeyLen) +{ + LONG err = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, lpSubKeys, lpMaxSubKeyLen, + NULL, NULL, NULL, NULL, NULL, NULL); + if (err != ERROR_ACCESS_DENIED) + return err; + + /* Windows RegEdit only uses KEY_ENUMERATE_SUB_KEYS when enumerating but + * KEY_QUERY_VALUE is required to get the info in EnumHKCRKey. + */ + if (RegOpenKeyExW(hKey, NULL, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + err = RegQueryInfoKeyW(hKey, NULL, NULL, NULL, lpSubKeys, lpMaxSubKeyLen, + NULL, NULL, NULL, NULL, NULL, NULL); + RegCloseKey(hKey); + } + return err; +} + /* HKCR version of RegCreateKeyExW. */ LONG WINAPI @@ -654,19 +678,7 @@ EnumHKCRKey( } /* Get some info on the HKCU side */ - ErrorCode = RegQueryInfoKeyW( - PreferredKey, - NULL, - NULL, - NULL, - &NumPreferredSubKeys, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL); + ErrorCode = GetSubkeyInfoHelper(PreferredKey, &NumPreferredSubKeys, NULL); if (ErrorCode != ERROR_SUCCESS) goto Exit; @@ -692,19 +704,7 @@ EnumHKCRKey( dwIndex -= NumPreferredSubKeys; /* Get some info */ - ErrorCode = RegQueryInfoKeyW( - FallbackKey, - NULL, - NULL, - NULL, - NULL, - &MaxFallbackSubKeyLen, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL); + ErrorCode = GetSubkeyInfoHelper(FallbackKey, NULL, &MaxFallbackSubKeyLen); if (ErrorCode != ERROR_SUCCESS) { ERR("Could not query info of key %p (Err: %d)\n", FallbackKey, ErrorCode);

1 year, 2 months

[reactos] 01/01: [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#5968)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2414a21a3870c4b6deee8… commit 2414a21a3870c4b6deee80b787c10354e0749a3c Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 12:02:12 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:02:12 2023 +0100 [MSCONFIG_NEW] Update Romanian (ro-RO) translation (#5968) --- base/applications/msconfig_new/lang/ro-RO.rc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/base/applications/msconfig_new/lang/ro-RO.rc b/base/applications/msconfig_new/lang/ro-RO.rc index 71c04bfaeca..65fa5c119f7 100644 --- a/base/applications/msconfig_new/lang/ro-RO.rc +++ b/base/applications/msconfig_new/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS System Configuration Tool + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -10,7 +16,7 @@ BEGIN ICON IDI_APPICON, IDC_STATIC, 14, 14, 20, 20 LTEXT "Program de configurare al sistemului\nVersiune 1.0", IDC_STATIC, 42, 14, 182, 17, SS_NOPREFIX // "Copyright (C) ReactOS Team 2005-"COPYRIGHT_YEAR"\n" - LTEXT "Drept de autor (C) Echipa ReactOS 2005-2015\n\ + LTEXT "Drept de autor (C) Echipa ReactOS 2005-2023\n\ Christoph von Wittich (Christoph(a)ApiViewer.de)\n\ Gregor Schneider (Gregor.Schneider(a)reactos.org)\n\ Hermès BÉLUSCA - MAÏTO (hermes.belusca(a)sfr.fr)", @@ -34,8 +40,8 @@ BEGIN PUSHBUTTON "Lansează &Restaurare sistem", IDC_BTN_SYSTEM_RESTORE_START, 146, 156, 124, 14 PUSHBUTTON "E&xtindere fișier…", IDC_BTN_FILE_EXTRACTION, 275, 156, 85, 14 GROUPBOX "Moduri de pornire sistem", IDC_STATIC, 5, 5, 356, 145 - LTEXT "Încarcă toate serviciile și modulele-pilot", IDC_STATIC, 25, 30, 322, 10 - LTEXT "Încarcă doar modulele-pilot de bază", IDC_STATIC, 25, 58, 322, 10 + LTEXT "Încarcă toate serviciile și driverele", IDC_STATIC, 25, 30, 322, 10 + LTEXT "Încarcă doar driverele de bază", IDC_STATIC, 25, 58, 322, 10 END IDD_SYSTEM_PAGE DIALOGEX 0, 0, 366, 175

1 year, 2 months

[reactos] 01/01: [EVENTVWR] Update Romanian (ro-RO) translation (#5979)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08820b747e2a3eb2ada14… commit 08820b747e2a3eb2ada1459061c518fd024c7706 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 12:01:46 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:01:46 2023 +0100 [EVENTVWR] Update Romanian (ro-RO) translation (#5979) --- base/applications/mscutils/eventvwr/lang/ro-RO.rc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/base/applications/mscutils/eventvwr/lang/ro-RO.rc b/base/applications/mscutils/eventvwr/lang/ro-RO.rc index d0c80923b9a..43964b4e8b0 100644 --- a/base/applications/mscutils/eventvwr/lang/ro-RO.rc +++ b/base/applications/mscutils/eventvwr/lang/ro-RO.rc @@ -4,6 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -13,12 +14,12 @@ BEGIN POPUP "&Jurnal" BEGIN MENUITEM "&Deschidere…", IDM_OPEN_EVENTLOG - MENUITEM "&Păstrare jurnal de evenimente ca…", IDM_SAVE_EVENTLOG + MENUITEM "&Salvează jurnal de evenimente ca…", IDM_SAVE_EVENTLOG MENUITEM "Î&nchide", IDM_CLOSE_EVENTLOG MENUITEM SEPARATOR MENUITEM "Înlăt&ură toate evenimentele", IDM_CLEAR_EVENTS MENUITEM "&Redenumire\tF2", IDM_RENAME_EVENTLOG - MENUITEM "&Configurare jurnal…", IDM_EVENTLOG_SETTINGS + MENUITEM "&Setări pentru jurnal…", IDM_EVENTLOG_SETTINGS MENUITEM SEPARATOR MENUITEM "I&eșire", IDM_EXIT END @@ -36,7 +37,7 @@ BEGIN MENUITEM "Afișează detalii de e&venimente", IDM_EVENT_DETAILS_VIEW MENUITEM "Afișează linii de g&rilaj", IDM_LIST_GRID_LINES MENUITEM SEPARATOR - MENUITEM "&Păstrează configurația la ieșire", IDM_SAVE_SETTINGS + MENUITEM "&Salvează setările la ieșire", IDM_SAVE_SETTINGS END POPUP "Aj&utor" BEGIN @@ -50,12 +51,12 @@ IDM_EVENTWR_CTX MENU BEGIN POPUP "" BEGIN - MENUITEM "&Open Event Log...", IDM_OPEN_EVENTLOG - MENUITEM "&Save Event Log as...", IDM_SAVE_EVENTLOG + MENUITEM "&Deschide jurnalul de evenimente...", IDM_OPEN_EVENTLOG + MENUITEM "Salv&ează jurnalul de evenimente ca...", IDM_SAVE_EVENTLOG MENUITEM SEPARATOR - MENUITEM "&Clear all Events", IDM_CLEAR_EVENTS - MENUITEM "&Rename\tF2", IDM_RENAME_EVENTLOG - MENUITEM "Log Se&ttings...", IDM_EVENTLOG_SETTINGS + MENUITEM "Șter&ge toate evenimentele", IDM_CLEAR_EVENTS + MENUITEM "&Redenumește\tF2", IDM_RENAME_EVENTLOG + MENUITEM "Setări de &jurnal...", IDM_EVENTLOG_SETTINGS END END @@ -129,7 +130,7 @@ BEGIN EDITTEXT IDC_CREATED_LABEL, 67, 69, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Modificat:", IDC_STATIC, 7, 81, 60, 8 EDITTEXT IDC_MODIFIED_LABEL, 67, 81, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Accessat:", IDC_STATIC, 7, 93, 60, 8 + LTEXT "Accesat:", IDC_STATIC, 7, 93, 60, 8 EDITTEXT IDC_ACCESSED_LABEL, 67, 93, 178, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL GROUPBOX "Dimensiune jurnal", IDC_STATIC, 7, 106, 238, 99 LTEXT "Dimensiune ma&ximă pentru jurnal:", IDC_STATIC, 17, 122, 58, 8 @@ -163,7 +164,7 @@ BEGIN IDS_EVENTLOG_USER "Jurnale de utilizator" IDS_SAVE_FILTER "Jurnal de evenimente (*.evt)\0*.evt\0" IDS_CLEAREVENTS_MSG "Doriți păstrarea acestui jurnal de evenimente înainte de a-l închide?" - IDS_RESTOREDEFAULTS "Do you want to restore all settings for this log to their default values?" + IDS_RESTOREDEFAULTS "Doriți să restaurați toate setările pentru acest jurnal la valorile lor implicite?" IDS_EVENTSTRINGIDNOTFOUND "Descrierea evenimentului cu ID-ul ( %lu ) în sursa ( %s ) nu a fost găsită. Este posibil ca în calculatorul local să nu existe informațiile de registru necesare sau fișierele dll de mesaje să afișeze mesaje de la un calculator din rețea.\n\nInformații aferente evenimentului:\n\n" END

1 year, 2 months

[reactos] 01/01: [MSCONFIG] Update Romanian (ro-RO) translation (#5967)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ada65e875652b8af186e… commit 4ada65e875652b8af186e0cd99215b50b3b2ca23 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 12:00:40 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 11:00:40 2023 +0100 [MSCONFIG] Update Romanian (ro-RO) translation (#5967) --- base/applications/msconfig/lang/ro-RO.rc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/base/applications/msconfig/lang/ro-RO.rc b/base/applications/msconfig/lang/ro-RO.rc index 88d0a00f733..eb272097684 100644 --- a/base/applications/msconfig/lang/ro-RO.rc +++ b/base/applications/msconfig/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS System Configuration Tool + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -68,8 +74,8 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Moduri de pornire sistem", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT - CONTROL "Pornire n&ormală - încarcă toate serviciile și modulele-pilot", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 - CONTROL "Pornire de &diagnostic - încarcă doar modulele-pilot de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 + CONTROL "Pornire n&ormală - încarcă toate serviciile și driverele", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 + CONTROL "Pornire de &diagnostic - încarcă doar driverele de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 CONTROL "Pornire s&electivă", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 AUTOCHECKBOX "&Procesează fișierul SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 AUTOCHECKBOX "Încarcă se&rviciile de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10

1 year, 2 months

[reactos] 01/01: [DEVMGR] Update Romanian (ro-RO) translation (#5960)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1313179a32b9d2664fae3… commit 1313179a32b9d2664fae3b7052d7dc97618d5e97 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Wed Nov 15 11:59:48 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Nov 15 10:59:48 2023 +0100 [DEVMGR] Update Romanian (ro-RO) translation (#5960) --- dll/win32/devmgr/lang/ro-RO.rc | 110 ++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index aa6842b766c..a79f5d8f49a 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -4,7 +4,7 @@ * PURPOSE: Romanian resource file * TRANSLATORS: Copyright 2009 Petru Dimitriu <petrimetri(a)gmail.com> * Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> - * Copyright 2022 Andrei Miloiu <miloiuandrei(a)gmail.com> + * Copyright 2022-2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -23,19 +23,19 @@ BEGIN IDS_ENABLEDEVICE "Folosește acest dispozitiv (activare)" IDS_DISABLEDEVICE "Nu folosi acest dispozitiv (dezactivare)" IDS_UNKNOWNDEVICE "Dispozitiv necunoscut" - IDS_NODRIVERLOADED "Pentru acest dispozitiv nu sunt instalate module-pilot." + IDS_NODRIVERLOADED "Pentru acest dispozitiv nu sunt instalate drivere." IDS_DEVONPARENT "pe %1" IDS_TROUBLESHOOTDEV "&Depanare…" IDS_ENABLEDEV "A&ctivare" - IDS_REINSTALLDRV "Reinstalea&ză modulul-pilot" + IDS_REINSTALLDRV "Reinstalea&ză Driverul" IDS_PROPERTIES "P&roprietăți" - IDS_UPDATEDRV "A&ctualizare modul-pilot…" + IDS_UPDATEDRV "A&ctualizare driver…" IDS_REBOOT "Repornire &calculator…" IDS_NOTAVAILABLE "Indisponibil" IDS_NOTDIGITALLYSIGNED "Nesemnat digital" - IDS_NODRIVERS "Fie nu sunt necesare module-pilot, fie nu a fost încărcat niciunul." + IDS_NODRIVERS "Fie nu sunt necesare drivere, fie nu a fost încărcat niciunul." IDS_RESOURCE_COLUMN "Tip de resursă" - IDS_SETTING_COLUMN "Configurație" + IDS_SETTING_COLUMN "Setare" IDS_RESOURCE_MEMORY_RANGE "Domeniu de memorie" IDS_RESOURCE_INTERRUPT "IRQ" IDS_RESOURCE_DMA "DMA" @@ -48,61 +48,61 @@ STRINGTABLE BEGIN IDS_DEV_NO_PROBLEM "Acest dispozitiv funcționează corect." IDS_DEV_NOT_CONFIGURED "Acest dispozitiv nu este configurat corect." - IDS_DEV_DEVLOADER_FAILED "Modulul-pilot nu a putut fi încărcat, deoarece calculatorul indică două tipuri de magistrale %1." - IDS_DEV_DEVLOADER_FAILED2 "Eșec la încărcarea modulelor-pilot pentru dispozitivul %1." - IDS_DEV_OUT_OF_MEMORY "Fie modulul-pilot este defect, fie sistemul are carențe de memorie sau de alte resurse." - IDS_DEV_ENTRY_IS_WRONG_TYPE "Acest dispozitiv nu funcționează corect deoarece fie modulul-pilot nu este corect, fie registrul de sistem este deteriorat." - IDS_DEV_LACKED_ARBITRATOR "Modulul-pilot al acestui dispozitiv solicită o resursă necunoscută în actualul sistem de operare." + IDS_DEV_DEVLOADER_FAILED "ReactOS nu a putut încărca driverul pentru acest dispozitiv deoarece calculatorul indică două tipuri de magistrale %1." + IDS_DEV_DEVLOADER_FAILED2 "Eșec la încărcarea driverelor pentru dispozitivul %1." + IDS_DEV_OUT_OF_MEMORY "Fie driverul este defect, fie sistemul are carențe de memorie sau de alte resurse." + IDS_DEV_ENTRY_IS_WRONG_TYPE "Acest dispozitiv nu funcționează corect deoarece fie Driverul nu este corect, fie registrul de sistem este deteriorat." + IDS_DEV_LACKED_ARBITRATOR "Driverul al acestui dispozitiv solicită o resursă pe care ReactOS nu știe cum să o gestioneze." IDS_DEV_BOOT_CONFIG_CONFLICT "Resursele necesare pentru acest dispozitiv sunt ocupate de un alt dispozitiv." - IDS_DEV_FAILED_FILTER "Modulele-pilot pentru acest dispozitiv necesită reinstalare." - IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu funcționează corect deoarece nu poate fi pornit mecanismul (ce conține fișierul %1) necesar pentru încărcarea modulelor-pilot." - IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu funcționează corect deoare fișierul %1 care încarcă modulele-pilot pentru acest dispozitiv, este deteriorat." - IDS_DEV_DEVLOADER_NOT_FOUND3 "Defecțiune dispozitiv: Încercați alte module-pilot pentru acest dispozitiv. Dacă problema persistă, consultați documentația din dotare." + IDS_DEV_FAILED_FILTER "Driverele pentru acest dispozitiv necesită reinstalare." + IDS_DEV_DEVLOADER_NOT_FOUND "Acest dispozitiv nu funcționează corect deoarece ReactOS nu poate porni încărca fișierul %1 ce încarcă driverele pentru dispozitiv." + IDS_DEV_DEVLOADER_NOT_FOUND2 "Acest dispozitiv nu funcționează corect deoare fișierul %1 care încarcă driverele pentru acest dispozitiv, este deteriorat." + IDS_DEV_DEVLOADER_NOT_FOUND3 "Defecțiune dispozitiv: Încercați alte drivere pentru acest dispozitiv. Dacă problema persistă, consultați documentația din dotare." IDS_DEV_INVALID_DATA "Acest dispozitiv nu funcționează corect, deoarece BIOS din calculator nu raportează corect resursele dispozitivului." IDS_DEV_INVALID_DATA2 "Acest dispozitiv nu funcționează corect, deoarece BIOS din dispozitiv nu raportează corect resursele dispozitivului. " - IDS_DEV_FAILED_START "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate modulele-pilot." - IDS_DEV_LIAR "Încercarea de a activa acest dispozitiv a provocat un blocaj în sistem. Prin urmare, nu mai este recomandată reactivarea acestui dispozitiv." + IDS_DEV_FAILED_START "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate driverele." + IDS_DEV_LIAR "ReactOS nu mai răspunde, în timp ce a încercat să pornească dispozitivul și prin urmare, nu va mai încerca să pornească acest dispozitiv." IDS_DEV_NORMAL_CONFLICT "Acest dispozitiv nu are la dispoziție resursele %1 necesare pentru a funcționa." - IDS_DEV_NOT_VERIFIED "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate modulele-pilot." + IDS_DEV_NOT_VERIFIED "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate driverele." IDS_DEV_NEED_RESTART "Funcționarea corectă a acestui dispozitiv necesită repornirea sistemului." IDS_DEV_REENUMERATION "Acest dispoztiv provoacă un conflict de resurse." - IDS_DEV_PARTIAL_LOG_CONF "Nu au putut fi identificate toate resursele utilizate de către acest dispozitiv." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS nu au putut fi identificate toate resursele folosite de acest dispozitiv." IDS_DEV_UNKNOWN_RESOURCE "Fișierul de informații %1 cere acestui sub-dispozitiv folosirea unei resurse pe care dispozitivul-parinte nu o are sau nu o recunoaște." - IDS_DEV_REINSTALL "Este necesară reinstalarea modulelor-pilot ale acestui dispozitiv." + IDS_DEV_REINSTALL "Este necesară reinstalarea driverelor ale acestui dispozitiv." IDS_DEV_REGISTRY "Este posibil ca registrul să fie deteriorat." - IDS_DEV_WILL_BE_REMOVED "Acest dispozitiv este pregătit pentru a fi deconectat." + IDS_DEV_WILL_BE_REMOVED "ReactOS deconectează acest dispozitiv." IDS_DEV_DISABLED "Acest dispozitiv nu este pornit." IDS_DEV_DISABLED2 "Acest dispozitiv este dezactivat." - IDS_DEV_DEVLOADER_NOT_READY "Nu au putut fi încărcate toate modulele-pilot necesare." + IDS_DEV_DEVLOADER_NOT_READY "Nu au putut fi încărcate toate driverele necesare." IDS_DEV_DEVLOADER_NOT_READY2 "" /* unused */ IDS_DEV_DEVLOADER_NOT_READY3 "" /* unused */ - IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate modulele-pilot." - IDS_DEV_MOVED "Pentru moment acest dispozitiv încă nu este pe deplin instalat." - IDS_DEV_TOO_EARLY "Pentru moment acest dispozitiv încă nu este pe deplin instalat." - IDS_DEV_NO_VALID_LOG_CONF "Nu au putut fi specificate resoursele necesare pentru acest dispozitiv." - IDS_DEV_FAILED_INSTALL "Modulele-pilot ale acestui dispozitiv nu sunt instalate." + IDS_DEV_DEVICE_NOT_THERE "Acest dispozitiv fie nu este prezent, fie nu funcționează corect, fie nu are instalate toate driverele." + IDS_DEV_MOVED "ReactOS este în proces de configurare a acestui dispozitiv." + IDS_DEV_TOO_EARLY "ReactOS este în proces de configurare a acestui dispozitiv." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS nu poate specifica resursele necesare pentru acest dispozitiv." + IDS_DEV_FAILED_INSTALL "Driverele ale acestui dispozitiv nu sunt instalate." IDS_DEV_HARDWARE_DISABLED "Acest dispozitiv este dezactivat deoarece BIOS nu i-a alocat resursele necesare." - IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv necesită o cerere de întrerupere (IRQ) care este folosită deja de alt dispozitiv și care nu poate fi folosită în comun.\nFie modificați configurația dispozitivelor pentru a rezolva problema gestiunii cererilor de întreruperi, fie eliminați modulul-pilot de mod-real care provoacă acest conflict." + IDS_DEV_CANT_SHARE_IRQ "Acest dispozitiv necesită o cerere de întrerupere (IRQ) care este folosită deja de alt dispozitiv și care nu poate fi folosită în comun.\nFie modificați configurația dispozitivelor pentru a rezolva problema gestiunii cererilor de întreruperi, fie eliminați Driverul de mod-real care provoacă acest conflict." IDS_DEV_FAILED_ADD "Acest dispozitiv nu funcționează corect deoarcere %1 nu funcționează corect." - IDS_DEV_DISABLED_SERVICE "Nu au putut fi instalate modulele-pilot pentru acest dispozitiv deoarece locația de stocare a fișierelor necesare pentru instalare nu a putut fi accesată." - IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu răspunde la comenzile modulului-pilot." - IDS_DEV_NO_SOFTCONFIG "Configurația acestui dispozitiv nu poate fi determinată. Consultați-i documentația din dotare și utilizați compartimentul „Resurse” pentru a-i stabili configurația corectă." + IDS_DEV_DISABLED_SERVICE "ReactOS nu poate instala driverele pentru acest dispozitiv deoarece locația de stocare a fișierelor necesare pentru instalare nu a putut fi accesată." + IDS_DEV_TRANSLATION_FAILED "Acest dispozitiv nu răspunde la comenzile driverului." + IDS_DEV_NO_SOFTCONFIG "ReactOS nu poate determina setările acestui dispozitiv. Consultați-i documentația din dotare și utilizați compartimentul „Resurse” pentru a-i stabili configurația corectă." IDS_DEV_BIOS_TABLE "Microprogramele din sistemul calculatorului dumneavoastră nu conțin suficiente informații pentru a configura și a putea utiliza acest dispozitiv.\nPentru a utiliza acest dispozitiv, contactați producatorul calculatorului în vederea obținerii de actualizări pentru microprograme sau BIOS." IDS_DEV_IRQ_TRANSLATION_FAILED "Acest dispozitiv a solicitat o întrerupere PCI însă este configurat pentru întreruperi ISA (sau viceversa).\nUtilizați programele de configurare din dotare pentru a reconfigura întreruperile pentru acest dispozitiv." - IDS_DEV_FAILED_DRIVER_ENTRY "Modulul-pilot al acestui dispozitiv nu a putut fi pornit." - IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "Modulul-pilot al acestui dispozitiv nu a putut fi încărcat, deoarece acesta deja este încărcat în memorie." - IDS_DEV_DRIVER_FAILED_LOAD "Modulul-pilot al acestui dispozitiv nu a putut fi încărcat, deoarece fie lipsește, fie este deteriorat." - IDS_DEV_DRIVER_SERVICE_KEY_INVALID "Acest dispozitiv nu poate fi accesat, deoarece informația cheii din registru fie lipsește, fie a fost înregistrată incorect." - IDS_DEV_LEGACY_SERVICE_NO_DEVICES "Modulul-pilot pentru acest dispozitiv a fost încărcat cu succes, însă dispozitivul nu mai poate fi găsit." - IDS_DEV_DUPLICATE_DEVICE "Modulul-pilot nu a putut fi încărcat, deoarece în sistem deja exista un dispozitiv în funcțiune de acest fel." - IDS_DEV_FAILED_POST_START "Acest dispozitiv a fost oprit, deoarece au fost depistate probleme cu el." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS nu poate inițializa driverul acestui dispozitiv." + IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS nu poate încărca driverul al acestui dispozitiv deoarece acesta deja este încărcat în memorie." + IDS_DEV_DRIVER_FAILED_LOAD "ReactOS nu poate încărca driverul al acestui dispozitiv deoarece fie lipsește, fie este deteriorat." + IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS nu poate accesa acest dispozitiv deoarece informația cheii din registru fie lipsește, fie a fost înregistrată incorect." + IDS_DEV_LEGACY_SERVICE_NO_DEVICES "ReactOS a încărcat driverul dispozitivului cu succes, însă nu poate găsi dispozitivul." + IDS_DEV_DUPLICATE_DEVICE "ReactOS nu poate încărca driverul deoarece în sistem deja exista un dispozitiv în funcțiune de acest fel." + IDS_DEV_FAILED_POST_START "ReactOS a oprit acest dispozitiv deoarece au fost depistate probleme cu el." IDS_DEV_HALTED "O aplicație sau un serviciu a oprit acest dispozitiv." IDS_DEV_PHANTOM "La moment, acest dispozitiv nu este conectat la calculator." - IDS_DEV_SYSTEM_SHUTDOWN "Dispozitivul nu poate fi accesat, deoarece sistemul de operare este în curs de închidere." - IDS_DEV_HELD_FOR_EJECT "Dispozitivul nu poate fi utilizat, deoarece acesta a fost deja pregătit pentru a fi deconectat." - IDS_DEV_DRIVER_BLOCKED "Modulul-pilot al acestui dispozitiv a fost oprit din cauza unor probleme de compatibilitate. Contactați furnizorul dispozitivului pentru o versiune compatibilă." - IDS_DEV_REGISTRY_TOO_LARGE "Dispozitivul nu poate fi pornit, deoarece secțiunea registrului de sistem este prea mare (depășind limita admisă a dimensiunii totale a registrului)." - IDS_DEV_SETPROPERTIES_FAILED "Configurația acestui dispozitiv nu a putut fi modificată." + IDS_DEV_SYSTEM_SHUTDOWN "ReactOS nu poate obține acces la acest dispozitiv deoarece sistemul de operare este în curs de închidere." + IDS_DEV_HELD_FOR_EJECT "ReactOS nu poate folosi acest dispozitiv deoarece acesta a fost deja pregătit pentru a fi deconectat." + IDS_DEV_DRIVER_BLOCKED "Driverul al acestui dispozitiv a fost oprit din cauza unor probleme de compatibilitate. Contactați furnizorul dispozitivului pentru o versiune compatibilă." + IDS_DEV_REGISTRY_TOO_LARGE "ReactOS nu poate porni dispozitive noi deoarece secțiunea registrului de sistem este prea mare (depășind limita admisă a dimensiunii totale a registrului)." + IDS_DEV_SETPROPERTIES_FAILED "ReactOS nu a putut schimba setările acestui dispozitiv." END STRINGTABLE @@ -170,7 +170,7 @@ END IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Module-pilot" +CAPTION "Drivere" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -179,23 +179,23 @@ BEGIN EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Dată:", -1, 15, 53, 80, 8, SS_NOPREFIX EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Versiunea modulului-pilot:", -1, 15, 67, 82, 8, SS_NOPREFIX + LTEXT "Versiunea driverului:", -1, 15, 67, 82, 8, SS_NOPREFIX EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Semnatar digital:", -1, 15, 81, 81, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalii…", IDC_DRIVERDETAILS, 7, 106, 75, 15 - LTEXT "Mai multe detalii despre modulele-pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX + LTEXT "Mai multe detalii despre driverele.", -1, 91, 110, 154, 17, SS_NOPREFIX PUSHBUTTON "&Actualizare…", IDC_UPDATEDRIVER, 7, 134, 75, 15 - LTEXT "Actualizați modulul-pilot pentru dispozitiv.", -1, 91, 138, 154, 17, SS_NOPREFIX + LTEXT "Actualizați Driverul pentru dispozitiv.", -1, 91, 138, 154, 17, SS_NOPREFIX PUSHBUTTON "&Restabilește", IDC_ROLLBACKDRIVER, 7, 162, 75, 15 - LTEXT "Dacă dispozitivul manifestă disfuncții după actualizarea modulului-pilot, restabiliți o versiune precedentă.", -1, 91, 162, 154, 25, SS_NOPREFIX + LTEXT "Dacă dispozitivul manifestă disfuncții după actualizarea driverului, restabiliți o versiune precedentă.", -1, 91, 162, 154, 25, SS_NOPREFIX PUSHBUTTON "De&zinstalează", IDC_UNINSTALLDRIVER, 7, 190, 75, 15 - LTEXT "Pentru a dezinstala un modul-pilot (opțiuni avansate).", -1, 91, 194, 154, 17, SS_NOPREFIX + LTEXT "Pentru a dezinstala un driver (opțiuni avansate).", -1, 91, 194, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME -CAPTION "Detaliile modulului-pilot" +CAPTION "Detaliile driverului" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -235,7 +235,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Configurație de resurse:", -1, 7, 36, 204, 8 + LTEXT "Setările de resurse:", -1, 7, 36, 204, 8 CONTROL "", IDC_DRIVERRESOURCES, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_SORTASCENDING | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 7, 46, 238, 80 @@ -303,7 +303,7 @@ BEGIN END STRINGTABLE DISCARDABLE BEGIN - IDS_MENU_UPDATE "Actualizare modul-pilot…" + IDS_MENU_UPDATE "Actualizare driver…" IDS_MENU_ENABLE "Activează" IDS_MENU_DISABLE "Dezactivează" IDS_MENU_UNINSTALL "Dezinstalează" @@ -318,7 +318,7 @@ BEGIN IDS_TOOLTIP_SCAN "Scanează configurația fizică" IDS_TOOLTIP_ENABLE "Activează" IDS_TOOLTIP_DISABLE "Dezactivează" - IDS_TOOLTIP_UPDATE "Actualizare modul-pilot…" + IDS_TOOLTIP_UPDATE "Actualizare driver…" IDS_TOOLTIP_UNINSTALL "Dezinstalează" END @@ -330,8 +330,8 @@ BEGIN IDS_HINT_SCAN " Scanare pentru depistarea schimbărilor în configurația sistemului." IDS_HINT_ENABLE " Activare dispozitiv selectat." IDS_HINT_DISABLE " Dezactivare dispozitiv selectat." - IDS_HINT_UPDATE " Lansare asistent de actualizare a modulului-pilot pentru dispozitivul selestat." - IDS_HINT_UNINSTALL " Dezinstalare modul-pilot pentru dispozitivul selectat." + IDS_HINT_UPDATE " Lansare asistent de actualizare a driverului pentru dispozitivul selestat." + IDS_HINT_UNINSTALL " Dezinstalare driver pentru dispozitivul selectat." IDS_HINT_ADD " Adăugare dispozitiv non-PNP în calculator." IDS_HINT_ABOUT " Despre Gestionarul de dispozitive." IDS_HINT_EXIT " Ieșire din program."

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs