Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MOUNTMGR][NDIS]

Browse source 
Fix some string length calculations.

[CRT]
Declare variables extern.

[DMUSIC]
Fix a bug, already fixed in Wine.

svn path=/trunk/; revision=57248
This commit is contained in:
Dmitry Gorbachev 2012-09-06 21:11:44 +00:00
parent 267f517b43
commit 082e2570bc
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/directx/dmusic/collection.c
View file

@ -209,8 +209,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto
if (pDesc->dwValidData & DMUS_OBJ_DATE) if (pDesc->dwValidData & DMUS_OBJ_DATE)
This->pDesc->ftDate = pDesc->ftDate; This->pDesc->ftDate = pDesc->ftDate;
if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); This->pDesc->llMemLength = pDesc->llMemLength;
memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
} }
if (pDesc->dwValidData & DMUS_OBJ_STREAM) { if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
/* according to MSDN, we copy the stream */ /* according to MSDN, we copy the stream */

2
reactos/drivers/filters/mountmgr/mountmgr.c
View file

@ -38,7 +38,7 @@ PDEVICE_OBJECT gdeviceObject;
KEVENT UnloadEvent; KEVENT UnloadEvent;
LONG Unloading; LONG Unloading;
PWSTR Cunc = L"\\??\\C:"; static const WCHAR Cunc[] = L"\\??\\C:";
/* /*
* TODO: * TODO:

6
reactos/drivers/network/ndis/ndis/misc.c
View file

@ -139,7 +139,7 @@ NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj )
return (NDIS_HANDLE)obj; return (NDIS_HANDLE)obj;
} }
const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; static const WCHAR NDIS_FILE_FOLDER[] = L"\\SystemRoot\\System32\\Drivers\\";
/* /*
* @implemented * @implemented
@ -242,8 +242,8 @@ NdisOpenFile(
*Status = NDIS_STATUS_SUCCESS; *Status = NDIS_STATUS_SUCCESS;
FullFileName.Buffer = NULL; FullFileName.Buffer = NULL;
FullFileName.Length = sizeof(NDIS_FILE_FOLDER); FullFileName.Length = sizeof(NDIS_FILE_FOLDER) - sizeof(UNICODE_NULL);
FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); FullFileName.MaximumLength = FileName->MaximumLength + FullFileName.Length;
FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength ); FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength );
if ( !FullFileName.Buffer ) if ( !FullFileName.Buffer )

4
reactos/lib/sdk/crt/locale/locale.c
View file

@ -74,8 +74,8 @@ typedef struct {
LANGID found_lang_id; LANGID found_lang_id;
} locale_search_t; } locale_search_t;
unsigned int __setlc_active; extern unsigned int __setlc_active;
unsigned int __unguarded_readlc_active; extern unsigned int __unguarded_readlc_active;
int _current_category; /* used by setlocale */ int _current_category; /* used by setlocale */
const char *_current_locale; const char *_current_locale;