Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK][SHELL32_APITEST] Fix some warnings (#7031)

Browse source
This commit is contained in:
Whindmar Saksit 2025-07-06 21:12:37 +02:00 • committed by GitHub
parent c0ea1c0e9f
commit 212a1a5c74
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/applications/network/telnet/src/tnconfig.cpp
View file

@ -547,7 +547,7 @@ void TConfig::keyfile_init() {
// if there is no environment variable // if there is no environment variable
GetPrivateProfileString("Keyboard", "Keyfile", "", keyfile, GetPrivateProfileString("Keyboard", "Keyfile", "", keyfile,
sizeof(keyfile), inifile); sizeof(keyfile), inifile);
if(keyfile == 0 || *keyfile == 0) { if (!*keyfile) {
// and there is no profile string // and there is no profile string
strcpy(keyfile, startdir); strcpy(keyfile, startdir);
if (sizeof(keyfile) >= strlen(keyfile)+strlen("telnet.cfg")) { if (sizeof(keyfile) >= strlen(keyfile)+strlen("telnet.cfg")) {

4
base/applications/wordpad/wordpad.c
View file

@ -2046,9 +2046,9 @@ static LRESULT OnNotify( HWND hWnd, LPARAM lParam)
update_font_list(); update_font_list();
sprintf( buf,"selection = %d..%d, line count=%ld", sprintf( buf,"Selection: %d..%d | Lines: %u",
pSC->chrg.cpMin, pSC->chrg.cpMax, pSC->chrg.cpMin, pSC->chrg.cpMax,
SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0)); (UINT)SendMessageW(hwndEditor, EM_GETLINECOUNT, 0, 0));
SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf);
SendMessageW(hWnd, WM_USER, 0, 0); SendMessageW(hWnd, WM_USER, 0, 0);
return 1; return 1;

2
dll/win32/dbghelp/symbol.c
View file

@ -19,7 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef NONAMELESSUNION /* Required to avoid a warning when NOT CMAKE_CROSSCOMPILING */
#define NONAMELESSUNION #define NONAMELESSUNION
#endif
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>

8
modules/rostests/apitests/shell32/SHChangeNotify.cpp
View file

@ -213,7 +213,7 @@ static void DoStepCheck(INT iStage, INT iStep, LPCSTR checks)
} }
LPCSTR answer = NULL; LPCSTR answer = NULL;
INT lineno; INT lineno = 0;
switch (iStage) switch (iStage)
{ {
case 0: case 0:
@ -285,11 +285,7 @@ static void DoStepCheck(INT iStage, INT iStep, LPCSTR checks)
} }
break; break;
} }
default: DEFAULT_UNREACHABLE;
{
assert(0);
break;
}
} }
ok(lstrcmpA(checks, answer) == 0, ok(lstrcmpA(checks, answer) == 0,

1
modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
View file

@ -28,7 +28,6 @@
#define shell32_hInstance GetModuleHandle(NULL) #define shell32_hInstance GetModuleHandle(NULL)
#define IDS_FILE_NOT_FOUND (-1) #define IDS_FILE_NOT_FOUND (-1)
static const WCHAR wszOpen[] = L"open";
static const WCHAR wszExe[] = L".exe"; static const WCHAR wszExe[] = L".exe";
static const WCHAR wszCom[] = L".com"; static const WCHAR wszCom[] = L".com";

10
modules/rostests/apitests/shell32/shell32_apitest_sub.cpp
View file

@ -91,8 +91,8 @@ static BOOL InitSHCN(HWND hwnd)
assert(s_iStage < NUM_STAGE); assert(s_iStage < NUM_STAGE);
SHChangeNotifyEntry entry; SHChangeNotifyEntry entry;
INT sources; INT sources = 0;
LONG events; LONG events = EVENTS;
switch (s_iStage) switch (s_iStage)
{ {
case 0: case 0:
@ -176,11 +176,7 @@ static BOOL InitSHCN(HWND hwnd)
events = EVENTS; events = EVENTS;
break; break;
} }
default: DEFAULT_UNREACHABLE;
{
assert(0);
break;
}
} }
s_uRegID = SHChangeNotifyRegister(hwnd, sources, events, WM_SHELL_NOTIFY, 1, &entry); s_uRegID = SHChangeNotifyRegister(hwnd, sources, events, WM_SHELL_NOTIFY, 1, &entry);

16
sdk/include/psdk/ddraw.h
View file

@ -2,17 +2,17 @@
#ifndef __DDRAW_INCLUDED__ #ifndef __DDRAW_INCLUDED__
#define __DDRAW_INCLUDED__ #define __DDRAW_INCLUDED__
#if defined(_WIN32) && !defined(_NO_COM ) #if defined(_WIN32) && !defined(_NO_COM)
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <objbase.h> #include <objbase.h>
#else #else
#define IUnknown void #define IUnknown void
#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) #if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT)
#ifndef CO_E_NOTINITIALIZED /* Avoid conflict warning with _HRESULT_TYPEDEF_(0x800401F0L) in winerror.h */ #ifndef CO_E_NOTINITIALIZED /* Avoid conflict warning with _HRESULT_TYPEDEF_(0x800401F0L) in winerror.h */
#define CO_E_NOTINITIALIZED 0x800401F0L #define CO_E_NOTINITIALIZED 0x800401F0L
#endif
#endif #endif
#endif #endif
#endif
#define _FACDD 0x876 #define _FACDD 0x876

2
sdk/include/reactos/wine/test.h
View file

@ -764,7 +764,7 @@ const char *wine_dbgstr_guid( const GUID *guid )
if (!guid) return "(null)"; if (!guid) return "(null)";
res = get_temp_buffer( 39 ); /* CHARS_IN_GUID */ res = get_temp_buffer( 39 ); /* CHARS_IN_GUID */
sprintf( res, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", sprintf( res, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], (unsigned int)guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
guid->Data4[5], guid->Data4[6], guid->Data4[7] ); guid->Data4[5], guid->Data4[6], guid->Data4[7] );
return res; return res;

2
sdk/lib/crt/startup/gs_support.c
View file

@ -29,7 +29,7 @@
typedef LONG NTSTATUS; /* same as in ntdef.h / winternl.h */ typedef LONG NTSTATUS; /* same as in ntdef.h / winternl.h */
#define UNW_FLAG_NHANDLER 0x00 #define UNW_FLAG_NHANDLER 0x0
typedef union typedef union
{ {

2
subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
View file

@ -212,7 +212,7 @@ WORD DosIfCharYesNo(WORD Char)
if (Char == YesNoTable[0]) if (Char == YesNoTable[0])
return 0x0001; return 0x0001;
/* Unknown type */ /* Unknown type */
return 0x0002; return 0x0002;
} }
CHAR DosToUpper(CHAR Char) CHAR DosToUpper(CHAR Char)