diff --git a/reactos/base/applications/sndrec32/sndrec32.cpp b/reactos/base/applications/sndrec32/sndrec32.cpp index 830e232ce63..3206c2f40c8 100644 --- a/reactos/base/applications/sndrec32/sndrec32.cpp +++ b/reactos/base/applications/sndrec32/sndrec32.cpp @@ -766,7 +766,7 @@ WndProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ) isnew = TRUE; display_dur = TRUE; - ZeroMemory( file_path, MAX_PATH ); + ZeroMemory( file_path, MAX_PATH * sizeof(TCHAR) ); EnableWindow( slider, FALSE ); diff --git a/reactos/base/system/smss/client.c b/reactos/base/system/smss/client.c index 4ad46e99d5f..5dee5421af4 100644 --- a/reactos/base/system/smss/client.c +++ b/reactos/base/system/smss/client.c @@ -441,7 +441,7 @@ SmCreateClient (PRTL_USER_PROCESS_INFORMATION ProcessInfo, PWSTR ProgramName) */ RtlCopyMemory (SmpClientDirectory.CandidateClient->ProgramName, ProgramName, - SM_SB_NAME_MAX_LENGTH); + SM_SB_NAME_MAX_LENGTH * sizeof(WCHAR)); } } else { DPRINT1("SM: %s: CandidateClient %p pending!\n", __FUNCTION__, diff --git a/reactos/dll/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c index 4908514166a..0662ea8140c 100644 --- a/reactos/dll/cpl/desk/screensaver.c +++ b/reactos/dll/cpl/desk/screensaver.c @@ -450,7 +450,7 @@ AddScreenSavers(HWND hwndDlg, PDATA pData) lpBackSlash = _tcsrchr(szSearchPath, _T('\\')); if (lpBackSlash != NULL) { - lpBackSlash = '\0'; + *lpBackSlash = '\0'; SearchScreenSavers(hwndScreenSavers, szSearchPath, pData); } } diff --git a/reactos/dll/win32/browseui/bandsite.cpp b/reactos/dll/win32/browseui/bandsite.cpp index a751281c8be..8ecf2a436e3 100644 --- a/reactos/dll/win32/browseui/bandsite.cpp +++ b/reactos/dll/win32/browseui/bandsite.cpp @@ -719,7 +719,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD n if (fRebarWindow == NULL) return E_FAIL; - if (IsEqualIID(pguidCmdGroup, IID_IDeskBand)) + if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { switch (nCmdID) { diff --git a/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc b/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc index 58d1fb2eee3..63e3902b0ff 100644 --- a/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc +++ b/reactos/dll/win32/glu32/libnurbs/internals/mapdesc.cc @@ -90,7 +90,7 @@ Mapdesc::setBboxsize( INREAL *mat ) } void -Mapdesc::identify( REAL dest[MAXCOORDS][MAXCOORDS] ) +Mapdesc::identify( REAL (&dest)[MAXCOORDS][MAXCOORDS] ) { memset( dest, 0, sizeof( dest ) ); for( int i=0; i != hcoords; i++ ) diff --git a/reactos/dll/win32/oleaut32/typelib2.c b/reactos/dll/win32/oleaut32/typelib2.c index 1333b68eaad..5057fc61fda 100644 --- a/reactos/dll/win32/oleaut32/typelib2.c +++ b/reactos/dll/win32/oleaut32/typelib2.c @@ -317,7 +317,7 @@ static int ctl2_find_guid( while (offset != -1) { guidentry = (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][offset]; - if (IsEqualGUID(guidentry, guid)) return offset; + if (IsEqualGUID(*guidentry, guid)) return offset; offset = guidentry->next_hash; } diff --git a/reactos/dll/win32/rsaenh/sha2.c b/reactos/dll/win32/rsaenh/sha2.c index ea5bb28b48f..76e7184a0c2 100644 --- a/reactos/dll/win32/rsaenh/sha2.c +++ b/reactos/dll/win32/rsaenh/sha2.c @@ -563,7 +563,7 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { } /* Clean up state data: */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); usedspace = 0; } @@ -584,7 +584,7 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA256_DIGEST_LENGTH); return buffer; @@ -893,7 +893,7 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA512_End(SHA512_CTX* context, char buffer[]) { @@ -913,7 +913,7 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA512_DIGEST_LENGTH); return buffer; @@ -968,7 +968,7 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { } /* Zero out state data */ - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } char *SHA384_End(SHA384_CTX* context, char buffer[]) { @@ -988,7 +988,7 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { } *buffer = 0; } else { - MEMSET_BZERO(context, sizeof(context)); + MEMSET_BZERO(context, sizeof(*context)); } MEMSET_BZERO(digest, SHA384_DIGEST_LENGTH); return buffer; diff --git a/reactos/dll/win32/shell32/pidl.c b/reactos/dll/win32/shell32/pidl.c index f229bd9626a..59985de032b 100644 --- a/reactos/dll/win32/shell32/pidl.c +++ b/reactos/dll/win32/shell32/pidl.c @@ -1157,7 +1157,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, if (len < sizeof(WIN32_FIND_DATAW)) return E_INVALIDARG; - ZeroMemory(pfd, sizeof (WIN32_FIND_DATAA)); + ZeroMemory(pfd, sizeof (WIN32_FIND_DATAW)); _ILGetFileDateTime( pidl, &(pfd->ftLastWriteTime)); pfd->dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); pfd->nFileSizeLow = _ILGetFileSize ( pidl, NULL, 0); diff --git a/reactos/drivers/storage/ide/uniata/id_dma.cpp b/reactos/drivers/storage/ide/uniata/id_dma.cpp index 083d8557753..199120eadc7 100644 --- a/reactos/drivers/storage/ide/uniata/id_dma.cpp +++ b/reactos/drivers/storage/ide/uniata/id_dma.cpp @@ -1607,7 +1607,7 @@ l_ATA_SILICON_IMAGE_ID: { 0xc2, 0x82, 0x042, 0x8a, 0x4a, 0x0a } }; static const UCHAR cmd_wdma_modes[] = { 0x87, 0x32, 0x3f }; static const UCHAR cmd_pio_modes[] = { 0xa9, 0x57, 0x44, 0x32, 0x3f }; - ULONG treg = 0x54 + (dev < 3) ? (dev << 1) : 7; + ULONG treg = 0x54 + ((dev < 3) ? (dev << 1) : 7); udmamode = min(udmamode, 5); /* enable UDMA mode */ diff --git a/reactos/ntoskrnl/config/cmcontrl.c b/reactos/ntoskrnl/config/cmcontrl.c index 1e481e455c0..81d8086cb10 100644 --- a/reactos/ntoskrnl/config/cmcontrl.c +++ b/reactos/ntoskrnl/config/cmcontrl.c @@ -118,7 +118,7 @@ CmGetSystemControlValues(IN PVOID SystemHiveData, if (!SystemHiveData) return; /* Initialize the Hive View List and the security cache */ - RtlZeroMemory(SystemHive, sizeof(SystemHive)); + RtlZeroMemory(SystemHive, sizeof(*SystemHive)); CmpInitHiveViewList((PCMHIVE)SystemHive); CmpInitSecurityCache((PCMHIVE)SystemHive); diff --git a/reactos/subsystems/win32/win32k/eng/gradient.c b/reactos/subsystems/win32/win32k/eng/gradient.c index 38d663c7723..a4070eb61cc 100644 --- a/reactos/subsystems/win32/win32k/eng/gradient.c +++ b/reactos/subsystems/win32/win32k/eng/gradient.c @@ -298,7 +298,7 @@ IntEngGradientFillRect( #define SMALLER(a,b) (a->y < b->y) || (a->y == b->y && a->x < b->x) #define SWAP(a,b,c) c = a;\ a = b;\ - a = c + b = c #define NLINES 3 BOOL FASTCALL IntEngGradientFillTriangle( diff --git a/reactos/subsystems/win32/win32k/objects/bitblt.c b/reactos/subsystems/win32/win32k/objects/bitblt.c index 9be4017f917..6f0f1f78d82 100644 --- a/reactos/subsystems/win32/win32k/objects/bitblt.c +++ b/reactos/subsystems/win32/win32k/objects/bitblt.c @@ -667,7 +667,7 @@ GreStretchBltMask( MaskPoint.y = YOriginMask; IntLPtoDP(DCMask, &MaskPoint, 1); MaskPoint.x += DCMask->ptlDCOrig.x; - MaskPoint.y += DCMask->ptlDCOrig.x; + MaskPoint.y += DCMask->ptlDCOrig.y; } /* Perform the bitblt operation */