Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/04: [NTOS:KE] Add function comments
by Timo Kreuzer 05 Mar '19

05 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=addc01d90b41245624ef3… commit addc01d90b41245624ef3d5c739ad4b79f0a3bdb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jul 12 15:36:11 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Mar 6 00:39:25 2019 +0100 [NTOS:KE] Add function comments --- ntoskrnl/ke/i386/ctxswitch.S | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/ntoskrnl/ke/i386/ctxswitch.S b/ntoskrnl/ke/i386/ctxswitch.S index bbeb462d11..1151a021b1 100644 --- a/ntoskrnl/ke/i386/ctxswitch.S +++ b/ntoskrnl/ke/i386/ctxswitch.S @@ -23,6 +23,27 @@ EXTERN _KeI386FxsrPresent:DWORD /* FUNCTIONS ****************************************************************/ .code +/*++ + * KiSwapContextInternal + * + * \brief + * The KiSwapContextInternal routine switches context to another thread. + * + * BOOLEAN USERCALL KiSwapContextInternal(); + * + * Params: + * ESI - Pointer to the KTHREAD to which the caller wishes to + * switch to. + * EDI - Pointer to the KTHREAD to which the caller wishes to + * switch from. + * + * \returns + * APC state. + * + * \remarks + * Absolutely all registers except ESP can be trampled here for maximum code flexibility. + * + *--*/ PUBLIC @KiSwapContextInternal@0 @KiSwapContextInternal@0: /* Build switch frame */ @@ -31,6 +52,33 @@ PUBLIC @KiSwapContextInternal@0 jmp @KiSwapContextEntry@8 +/** + * KiSwapContext + * + * \brief + * The KiSwapContext routine switches context to another thread. + * + * BOOLEAN FASTCALL + * KiSwapContext(PKTHREAD CurrentThread, PKTHREAD TargetThread); + * + * \param CurrentThread + * Pointer to the KTHREAD of the current thread. + * + * \param TargetThread + * Pointer to the KTHREAD to which the caller wishes to switch to. + * + * \returns + * The WaitStatus of the Target Thread. + * + * \remarks + * This is a wrapper around KiSwapContextInternal which will save all the + * non-volatile registers so that the Internal function can use all of + * them. It will also save the old current thread and set the new one. + * + * The calling thread does not return after KiSwapContextInternal until + * another thread switches to IT. + * + *--*/ PUBLIC @KiSwapContext@8 @KiSwapContext@8: /* Save 4 registers */

1 0

[reactos] 01/01: [NtGDI] Fix crash and simplify code.
by James Tabor 05 Mar '19

05 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f35bb6e4c805404cfd880… commit f35bb6e4c805404cfd8808eca51698ee48610460 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 17:05:23 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 17:05:23 2019 -0600 [NtGDI] Fix crash and simplify code. Revert previous changes. simplify rendering check. Fix missed unlocking which caused a crash. --- win32ss/gdi/ntgdi/freetype.c | 50 +------------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7aa65f2c35..197304d469 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -50,16 +50,6 @@ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; FT_Library g_FreeTypeLibrary; -typedef struct -{ - FT_Int major; - FT_Int minor; - FT_Int patch; -} FT_Version_t; -static FT_Version_t FT_Version; -static DWORD FT_SimpleVersion; -#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch)) - /* special font names */ static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett"); @@ -651,13 +641,6 @@ InitFontSupport(VOID) return FALSE; } - FT_Library_Version(g_FreeTypeLibrary,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); - - DPRINT1("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch); - FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) | - ((FT_Version.minor << 8) & 0x00ff00) | - ((FT_Version.patch ) & 0x0000ff); - IntLoadSystemFonts(); IntLoadFontSubstList(&g_FontSubstListHead); @@ -1655,40 +1638,10 @@ IntGdiCleanupPrivateFontsForProcess(VOID) } while (Entry); } -static BOOL is_hinting_enabled(void) -{ - static int enabled = -1; - - if (enabled == -1) - { - /* Use the >= 2.2.0 function if available */ - FT_TrueTypeEngineType type = FT_Get_TrueType_Engine_Type(g_FreeTypeLibrary); - enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); - - DPRINT1("hinting is %senabled\n", enabled ? "" : "NOT "); - } - return enabled; -} - -static BOOL is_subpixel_rendering_enabled( void ) -{ - static int enabled = -1; - if (enabled == -1) - { - /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ - if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1)) - enabled = TRUE; - else enabled = FALSE; - - DPRINT1("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); - } - return enabled; -} - BOOL FASTCALL IntIsFontRenderingEnabled(VOID) { - return is_hinting_enabled() && is_subpixel_rendering_enabled() && g_RenderingEnabled; + return (gpsi->BitsPixel > 8) && g_RenderingEnabled; } VOID FASTCALL @@ -5616,7 +5569,6 @@ IntExtTextOutW( String, Count, (const INT *)Dx); - DC_UnlockDc(dc); return bResult; }

1 0

[reactos] 02/02: Merge branch 'master' of https://github.com/reactos/reactos
by James Tabor 05 Mar '19

05 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=12cfd71058e2953ab11db… commit 12cfd71058e2953ab11dbee61fa6f2608e116ddb Merge: 3377fe184e dbb69cb2d9 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 16:03:31 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 16:03:31 2019 -0600 Merge branch 'master' of https://github.com/reactos/reactos boot/bootdata/hivedef.inf | 4 ++-- boot/bootdata/hivesft.inf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[reactos] 01/02: [NtGDI] Change TextOut
by James Tabor 05 Mar '19

05 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3377fe184efa77e7c4971… commit 3377fe184efa77e7c4971c2ac70ed33ab12f0724 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue Mar 5 16:03:15 2019 -0600 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue Mar 5 16:03:15 2019 -0600 [NtGDI] Change TextOut Separate TextOut for internal use. Use flTextAlign internally. Not sure why GetDeviceCap was used for determining rendering. SVN commit logs are unavailable. Include code from wine that might make more sense. --- win32ss/gdi/ntgdi/font.c | 2 +- win32ss/gdi/ntgdi/freetype.c | 125 +++++++++++++++++++++++++++++++++---------- 2 files changed, 97 insertions(+), 30 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c index d106e57ac0..a48904cd8e 100644 --- a/win32ss/gdi/ntgdi/font.c +++ b/win32ss/gdi/ntgdi/font.c @@ -410,7 +410,7 @@ IntGetFontLanguageInfo(PDC Dc) pdcattr = Dc->pdcattr; /* This might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if ( pdcattr->lTextAlign & TA_RTLREADING ) + if ( pdcattr->flTextAlign & TA_RTLREADING ) if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) result|=GCP_REORDER; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index d76d63dfea..7aa65f2c35 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -50,6 +50,16 @@ static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; FT_Library g_FreeTypeLibrary; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; +static FT_Version_t FT_Version; +static DWORD FT_SimpleVersion; +#define FT_VERSION_VALUE(major, minor, patch) (((major) << 16) | ((minor) << 8) | (patch)) + /* special font names */ static const UNICODE_STRING g_MarlettW = RTL_CONSTANT_STRING(L"Marlett"); @@ -641,6 +651,13 @@ InitFontSupport(VOID) return FALSE; } + FT_Library_Version(g_FreeTypeLibrary,&FT_Version.major,&FT_Version.minor,&FT_Version.patch); + + DPRINT1("FreeType version is %d.%d.%d\n",FT_Version.major,FT_Version.minor,FT_Version.patch); + FT_SimpleVersion = ((FT_Version.major << 16) & 0xff0000) | + ((FT_Version.minor << 8) & 0x00ff00) | + ((FT_Version.patch ) & 0x0000ff); + IntLoadSystemFonts(); IntLoadFontSubstList(&g_FontSubstListHead); @@ -1638,17 +1655,40 @@ IntGdiCleanupPrivateFontsForProcess(VOID) } while (Entry); } -BOOL FASTCALL -IntIsFontRenderingEnabled(VOID) +static BOOL is_hinting_enabled(void) { - BOOL Ret = g_RenderingEnabled; - HDC hDC; + static int enabled = -1; - hDC = IntGetScreenDC(); - if (hDC) - Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && g_RenderingEnabled; + if (enabled == -1) + { + /* Use the >= 2.2.0 function if available */ + FT_TrueTypeEngineType type = FT_Get_TrueType_Engine_Type(g_FreeTypeLibrary); + enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); - return Ret; + DPRINT1("hinting is %senabled\n", enabled ? "" : "NOT "); + } + return enabled; +} + +static BOOL is_subpixel_rendering_enabled( void ) +{ + static int enabled = -1; + if (enabled == -1) + { + /* FreeType >= 2.8.1 offers LCD-optimezed rendering without lcd filters. */ + if (FT_SimpleVersion >= FT_VERSION_VALUE(2, 8, 1)) + enabled = TRUE; + else enabled = FALSE; + + DPRINT1("subpixel rendering is %senabled\n", enabled ? "" : "NOT "); + } + return enabled; +} + +BOOL FASTCALL +IntIsFontRenderingEnabled(VOID) +{ + return is_hinting_enabled() && is_subpixel_rendering_enabled() && g_RenderingEnabled; } VOID FASTCALL @@ -5506,8 +5546,8 @@ IntNormalizeAngle(LONG nTenthAngle) BOOL APIENTRY -GreExtTextOutW( - IN HDC hDC, +IntExtTextOutW( + IN PDC dc, IN INT XStart, IN INT YStart, IN UINT fuOptions, @@ -5523,7 +5563,6 @@ GreExtTextOutW( * appropriate) */ - DC *dc; PDC_ATTR pdcattr; SURFOBJ *SurfObj; SURFACE *psurf = NULL; @@ -5565,19 +5604,8 @@ GreExtTextOutW( return FALSE; } - /* NOTE: This function locks the screen DC, so it must never be called - with a DC already locked */ Render = IntIsFontRenderingEnabled(); - // TODO: Write test-cases to exactly match real Windows in different - // bad parameters (e.g. does Windows check the DC or the RECT first?). - dc = DC_LockDc(hDC); - if (!dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (PATH_IsPathOpen(dc->dclevel)) { bResult = PATH_ExtTextOut(dc, @@ -5608,7 +5636,7 @@ GreExtTextOutW( IntLPtoDP(dc, (POINT *)lprc, 2); } - if (pdcattr->lTextAlign & TA_UPDATECP) + if (pdcattr->flTextAlign & TA_UPDATECP) { Start.x = pdcattr->ptlCurrent.x; Start.y = pdcattr->ptlCurrent.y; @@ -5743,7 +5771,7 @@ GreExtTextOutW( use_kerning = FT_HAS_KERNING(face); previous = 0; if ((fuOptions & ETO_OPAQUE) || - (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT)) || + (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT)) || memcmp(&mat, &identityMat, sizeof(mat)) != 0 || plf->lfUnderline || plf->lfStrikeOut) { @@ -5813,12 +5841,12 @@ GreExtTextOutW( } // Process the X and Y alignments. - if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) + if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) { XStart64 = -DeltaX64 / 2; YStart64 = -DeltaY64 / 2; } - else if ((pdcattr->lTextAlign & TA_RIGHT) == TA_RIGHT) + else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) { XStart64 = -DeltaX64; YStart64 = -DeltaY64; @@ -5849,13 +5877,13 @@ GreExtTextOutW( /* Process the vertical alignment */ #define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) RtlZeroMemory(vecs, sizeof(vecs)); - if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) + if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE) { vecs[1].y = -FontGDI->tmAscent << 16; // upper left vecs[4].y = 0; // baseline vecs[0].y = FontGDI->tmDescent << 16; // lower left } - else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM) { vecs[1].y = -FontGDI->tmHeight << 16; // upper left vecs[4].y = -FontGDI->tmDescent << 16; // baseline @@ -6236,7 +6264,7 @@ GreExtTextOutW( MouseSafetyOnDrawEnd(dc->ppdev); } - if (pdcattr->lTextAlign & TA_UPDATECP) { + if (pdcattr->flTextAlign & TA_UPDATECP) { pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; } @@ -6252,6 +6280,45 @@ Cleanup: if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); + return bResult; +} + + +BOOL +APIENTRY +GreExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL PRECTL lprc, + IN LPCWSTR String, + IN INT Count, + IN OPTIONAL LPINT Dx, + IN DWORD dwCodePage) +{ + BOOL bResult; + DC *dc; + + // TODO: Write test-cases to exactly match real Windows in different + // bad parameters (e.g. does Windows check the DC or the RECT first?). + dc = DC_LockDc(hDC); + if (!dc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + bResult = IntExtTextOutW( dc, + XStart, + YStart, + fuOptions, + lprc, + String, + Count, + Dx, + dwCodePage ); + DC_UnlockDc(dc); return bResult;

1 0

[reactos] 01/01: [BOOTDATA] Comment out (but still keep it for documentation purposes only) the overridden default user shell, since we use by default the one specified in HKLM Winlogon key. If people want to override it for a given user, or at a global level, they can do it later.
by Hermès Bélusca-Maïto 05 Mar '19

05 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbb69cb2d940278910a40… commit dbb69cb2d940278910a40d1228389a7a1fd1aea8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 5 22:33:35 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 5 22:33:35 2019 +0100 [BOOTDATA] Comment out (but still keep it for documentation purposes only) the overridden default user shell, since we use by default the one specified in HKLM Winlogon key. If people want to override it for a given user, or at a global level, they can do it later. See CORE-15807 --- boot/bootdata/hivedef.inf | 4 ++-- boot/bootdata/hivesft.inf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/bootdata/hivedef.inf b/boot/bootdata/hivedef.inf index b9411a27cc..844ba9c7d3 100644 --- a/boot/bootdata/hivedef.inf +++ b/boot/bootdata/hivedef.inf @@ -1893,9 +1893,9 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010003,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 -; default shell +; Default shell for the current user (overrides the defaults from the HKLM Winlogon sub-key) HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 -HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +;HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Policies",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Run",,0x00000012 diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index efd5c0833e..ba5b3919e1 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1467,7 +1467,7 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FATX",0x00000000,"ufatx.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","EXT2",0x00000000,"uext2.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","BtrFS",0x00000000,"ubtrfs.dll" -; Winlogon settings +; Global Winlogon settings HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe"

1 0

[reactos] 14/14: [REACTOS] Fix 64 bit issues
by Timo Kreuzer 04 Mar '19

04 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5f6ea2965e26cb28aa07… commit f5f6ea2965e26cb28aa0743b93ce1ec43c827774 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 6 23:14:09 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [REACTOS] Fix 64 bit issues --- dll/win32/advapi32/service/sctrl.c | 6 +++--- dll/win32/windowscodecs/typeof.h | 6 ++++-- drivers/network/tcpip/tcpip/ninfo.c | 4 ++-- sdk/include/psdk/imagehlp.h | 6 ++++++ sdk/lib/atl/atlbase.h | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index ec5a4cc4bf..68ec2a6ac6 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -174,7 +174,7 @@ ScServiceMainStubA(LPVOID Context) /* Set service tag */ Teb = NtCurrentTeb(); - Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + Teb->SubProcessTag = UlongToPtr(ThreadParams->dwServiceTag); /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, @@ -203,7 +203,7 @@ ScServiceMainStubW(LPVOID Context) /* Set service tag */ Teb = NtCurrentTeb(); - Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + Teb->SubProcessTag = UlongToPtr(ThreadParams->dwServiceTag); /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, @@ -552,7 +552,7 @@ ScControlService(PACTIVE_SERVICE lpService, TRACE("Service: %S\n", (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); /* Set service tag */ - NtCurrentTeb()->SubProcessTag = (PVOID)lpService->dwServiceTag; + NtCurrentTeb()->SubProcessTag = UlongToPtr(lpService->dwServiceTag); if (lpService->HandlerFunction) { diff --git a/dll/win32/windowscodecs/typeof.h b/dll/win32/windowscodecs/typeof.h index 12e6b8bcc4..b20434b7cc 100644 --- a/dll/win32/windowscodecs/typeof.h +++ b/dll/win32/windowscodecs/typeof.h @@ -1,9 +1,11 @@ #define typeof(X_) __typeof_ ## X_ #ifdef _WIN64 +#define __typeof_uintptr unsigned long long #define __typeof_intptr long long #define __typeof_longptr long long #else +#define __typeof_uintptr unsigned int #define __typeof_intptr int #define __typeof_longptr long #endif @@ -38,7 +40,7 @@ typedef void (__cdecl typeof(jpeg_set_defaults))(struct jpeg_compress_struct *); typedef unsigned int (__cdecl typeof(jpeg_write_scanlines))(struct jpeg_compress_struct *, char **, unsigned int); typedef void (*png_error_ptr_1)(struct png_struct_def *, const char *); -typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, unsigned int); +typedef void (*png_rw_ptr_1)(struct png_struct_def *, unsigned char *, __typeof_uintptr); typedef void (*png_flush_ptr_1)(struct png_struct_def *); typedef struct png_info_def* (__cdecl typeof(png_create_info_struct))(struct png_struct_def *); typedef struct png_struct_def * (__cdecl typeof(png_create_read_struct))(const char *, void *, png_error_ptr_1, png_error_ptr_1); @@ -80,7 +82,7 @@ typedef void (__cdecl typeof(png_set_PLTE))(struct png_struct_def *, struct png_ typedef void (__cdecl typeof(png_set_tRNS))(struct png_struct_def *, struct png_info_def *, const unsigned char *, int, const struct png_color_16_struct *); typedef void (__cdecl typeof(png_set_filter))(struct png_struct_def *, int, int); typedef void *thandle_t_1; -typedef int (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); +typedef __typeof_intptr (*TIFFReadWriteProc_1)(thandle_t_1, void *, __typeof_intptr); typedef unsigned int (*TIFFSeekProc_1)(void *, unsigned int, int); typedef int (*TIFFCloseProc_1)(thandle_t_1); typedef unsigned int (*TIFFSizeProc_1)(thandle_t_1); diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c index 5c0952b033..30a59480a2 100644 --- a/drivers/network/tcpip/tcpip/ninfo.c +++ b/drivers/network/tcpip/tcpip/ninfo.c @@ -203,7 +203,7 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile, Size = sizeof(MIB_TCPROW); } - TcpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; + TcpRow.dwOwningPid = HandleToUlong(AddrFile->ProcessId); TcpRow.liCreateTimestamp = AddrFile->CreationTime; if (AddrFile->Listener != NULL) @@ -290,7 +290,7 @@ TDI_STATUS InfoTdiQueryGetConnectionUdpTable(PADDRESS_FILE AddrFile, UdpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address; UdpRow.dwLocalPort = AddrFile->Port; - UdpRow.dwOwningPid = (DWORD)AddrFile->ProcessId; + UdpRow.dwOwningPid = HandleToUlong(AddrFile->ProcessId); UdpRow.liCreateTimestamp = AddrFile->CreationTime; UdpRow.dwFlags = 0; /* FIXME */ if (Class == TcpUdpClassOwner) diff --git a/sdk/include/psdk/imagehlp.h b/sdk/include/psdk/imagehlp.h index bed6492d6b..99227b2435 100644 --- a/sdk/include/psdk/imagehlp.h +++ b/sdk/include/psdk/imagehlp.h @@ -18,6 +18,12 @@ #ifndef _IMAGEHLP_H #define _IMAGEHLP_H +#ifdef _WIN64 +#ifndef _IMAGEHLP64 +#define _IMAGEHLP64 +#endif +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/sdk/lib/atl/atlbase.h b/sdk/lib/atl/atlbase.h index d327aadf4d..598abc3f3d 100644 --- a/sdk/lib/atl/atlbase.h +++ b/sdk/lib/atl/atlbase.h @@ -1231,7 +1231,7 @@ public: LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) throw() { - ULONG length; + SIZE_T length; switch (dwType) { case REG_SZ:

1 0

[reactos] 13/14: [LIBTIRPC] Silence MSVC warnings
by Timo Kreuzer 04 Mar '19

04 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3377a5c021899557bd0… commit 3d3377a5c021899557bd015b09ca8aae9816c075 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jan 5 12:06:17 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [LIBTIRPC] Silence MSVC warnings --- dll/3rdparty/libtirpc/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index aaa4ac036c..46714d6d71 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -2,7 +2,7 @@ spec2def(libtirpc.dll libtirpc/libtirpc.spec ADD_IMPORTLIB) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup) +add_definitions(-DUNICODE -D_WIN32 -DPORTMAP -Dstrdup=_strdup -D_CRT_NONSTDC_NO_DEPRECATE=1) include_directories(${REACTOS_SOURCE_DIR}/dll/3rdparty/libtirpc/tirpc) @@ -94,6 +94,7 @@ add_library(libtirpc SHARED ${CMAKE_CURRENT_BINARY_DIR}/libtirpc.def) if(MSVC AND (NOT USE_CLANG_CL)) + add_target_compile_flags(libtirpc "/wd4101 /wd4133 /wd4473 /wd4477") else() # FIXME: Tons of warnings. add_target_compile_flags(libtirpc "-w")

1 0

[reactos] 12/14: [GDI32] Add casts to silence warnings on x64
by Timo Kreuzer 04 Mar '19

04 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dabd235ec1ac0ae9dfb2… commit 7dabd235ec1ac0ae9dfb2a1b0e78cef2216bc987 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 15:29:13 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [GDI32] Add casts to silence warnings on x64 The cast is required, because FARPROC is only compatible with function pointer types that return INT_PTR and the ones used return int/BOOL. --- win32ss/gdi/gdi32/misc/wingl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/gdi32/misc/wingl.c b/win32ss/gdi/gdi32/misc/wingl.c index 13fee27278..3e993443f9 100644 --- a/win32ss/gdi/gdi32/misc/wingl.c +++ b/win32ss/gdi/gdi32/misc/wingl.c @@ -84,20 +84,20 @@ static BOOL OpenGLEnable(void) thread-safe */ } - - if (!OpenGLInitFunction("wglChoosePixelFormat", &glChoosePixelFormat)) + /* The cast is required on x64, because FARPROC has INT_PTR sized return */ + if (!OpenGLInitFunction("wglChoosePixelFormat", (FARPROC*)&glChoosePixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglSetPixelFormat", &glSetPixelFormat)) + if (!OpenGLInitFunction("wglSetPixelFormat", (FARPROC*)&glSetPixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglSwapBuffers", &glSwapBuffers)) + if (!OpenGLInitFunction("wglSwapBuffers", (FARPROC*)&glSwapBuffers)) Ret = FALSE; - if (!OpenGLInitFunction("wglDescribePixelFormat", &glDescribePixelFormat)) + if (!OpenGLInitFunction("wglDescribePixelFormat", (FARPROC*)&glDescribePixelFormat)) Ret = FALSE; - if (!OpenGLInitFunction("wglGetPixelFormat", &glGetPixelFormat)) + if (!OpenGLInitFunction("wglGetPixelFormat", (FARPROC*)&glGetPixelFormat)) Ret = FALSE; return Ret;

1 0

[reactos] 11/14: [GDI32] Fix bDDCreateSurface
by Timo Kreuzer 04 Mar '19

04 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=711dbd19f7ea9d51c2a0b… commit 711dbd19f7ea9d51c2a0bf52ae5bf9d2fa23f32d Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 13 15:09:57 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [GDI32] Fix bDDCreateSurface --- win32ss/gdi/gdi32/misc/gdientry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/gdi/gdi32/misc/gdientry.c b/win32ss/gdi/gdi32/misc/gdientry.c index 61943bfa5b..dffa8ab63f 100644 --- a/win32ss/gdi/gdi32/misc/gdientry.c +++ b/win32ss/gdi/gdi32/misc/gdientry.c @@ -1409,7 +1409,7 @@ bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, RtlMoveMemory(&SurfaceMore.ddsCapsEx, &pSurface->ddckCKDestBlt, sizeof(DDSCAPSEX)); - SurfaceMore.dwSurfaceHandle = (DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl; + SurfaceMore.dwSurfaceHandle = pSurface->lpSurfMore->dwSurfaceHandle; /* Set up SurfaceGlobal struct */ SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem;

1 0

[reactos] 10/14: [DXG] Fix 64 bit build
by Timo Kreuzer 04 Mar '19

04 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2620930066713461f9e92… commit 2620930066713461f9e9225febc17a29d4ae9933 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 6 23:41:52 2019 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Mar 4 21:58:42 2019 +0100 [DXG] Fix 64 bit build --- win32ss/reactx/dxg/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/win32ss/reactx/dxg/main.c b/win32ss/reactx/dxg/main.c index cba89cb604..7bcd329b9e 100644 --- a/win32ss/reactx/dxg/main.c +++ b/win32ss/reactx/dxg/main.c @@ -40,9 +40,7 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, { PDRVFN drv_func; - ULONG peng_funcs; - PULONG peng_func; - + PFN *peng_funcs; UINT i; /* Test see if the data is vaild we got from win32k.sys */ @@ -75,9 +73,9 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, * and if it really are exported */ - peng_funcs = (ULONG)&gpEngFuncs; + peng_funcs = (PFN*)&gpEngFuncs; - for (i=1 ; i < DXENG_INDEX_DxEngLoadImage + 1; i++) + for (i = 1; i < DXENG_INDEX_DxEngLoadImage + 1; i++) { drv_func = &pDxEngDrv->pdrvfn[i]; @@ -86,8 +84,8 @@ DxDdStartupDxGraphics (ULONG SizeEngDrv, { return STATUS_INTERNAL_ERROR; } - peng_func = (PULONG)(peng_funcs+(i * sizeof(ULONG))); - *peng_func = (ULONG)drv_func->pfn; + + peng_funcs[i] = drv_func->pfn; } /* Note 12/1-2004 : Why is this set to 0x618 */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs