April 2007 - Wine-commits - list.winehq.org

Michael Stefaniuc : janitorial: Pass HEAP_ZERO_MEMORY as flag to HeapAlloc( ) instead of zeroing out the allocated memory in a later call.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 5f62da109e978e23be6c7ff0850dd64080ad26ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f62da109e978e23be6c7ff08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 25 00:57:55 2007 +0200 janitorial: Pass HEAP_ZERO_MEMORY as flag to HeapAlloc() instead of zeroing out the allocated memory in a later call. --- dlls/dbghelp/module.c | 4 +--- dlls/gdi32/tests/font.c | 3 +-- dlls/imm32/imm.c | 3 +-- dlls/msvfw32/msvideo_main.c | 3 +-- dlls/ntdll/tests/port.c | 6 ++---- dlls/ole32/storage32.c | 5 +---- dlls/winex11.drv/xfont.c | 7 ++----- dlls/wininet/ftp.c | 3 +-- dlls/wininet/internet.c | 5 ++--- dlls/winspool.drv/info.c | 5 ++--- programs/oleview/tree.c | 3 +-- programs/oleview/typelib.c | 3 +-- 12 files changed, 16 insertions(+), 34 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 21c8830..c2a3f04 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -129,11 +129,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, struct module* module; assert(type == DMT_ELF || type == DMT_PE); - if (!(module = HeapAlloc(GetProcessHeap(), 0, sizeof(*module)))) + if (!(module = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*module)))) return NULL; - memset(module, 0, sizeof(*module)); - module->next = pcs->lmodules; pcs->lmodules = module; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fefb448..bfe2a47 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -482,8 +482,7 @@ static void test_text_extents(void) } len = lstrlenW(wt); - extents = HeapAlloc(GetProcessHeap(), 0, len * sizeof extents[0]); - memset(extents, 0, len * sizeof extents[0]); + extents = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof extents[0]); extents[0] = 1; /* So that the increasing sequence test will fail if the extents array is untouched. */ GetTextExtentExPointW(hdc, wt, len, 32767, &fit1, extents, &sz1); diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0aa28f0..bc3f7a9 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -313,8 +313,7 @@ HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; - new_context = HeapAlloc(GetProcessHeap(),0,sizeof(InputContextData)); - ZeroMemory(new_context,sizeof(InputContextData)); + new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); return (HIMC)new_context; } diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 7651687..1361d30 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1294,10 +1294,9 @@ HANDLE VFWAPI ICImageDecompress( cbHdr = ICDecompressGetFormatSize(hic,lpbiIn); if ( cbHdr < sizeof(BITMAPINFOHEADER) ) goto err; - pHdr = HeapAlloc(GetProcessHeap(),0,cbHdr+sizeof(RGBQUAD)*256); + pHdr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,cbHdr+sizeof(RGBQUAD)*256); if ( pHdr == NULL ) goto err; - ZeroMemory( pHdr, cbHdr+sizeof(RGBQUAD)*256 ); if ( ICDecompressGetFormat( hic, lpbiIn, (BITMAPINFO*)pHdr ) != ICERR_OK ) goto err; lpbiOut = (BITMAPINFO*)pHdr; diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index c64067d..9715917 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -199,10 +199,9 @@ static DWORD WINAPI test_ports_client(LPVOID arg) ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %d\n", status); size = FIELD_OFFSET(LPC_MESSAGE, Data) + MAX_MESSAGE_LEN; - LpcMessage = HeapAlloc(GetProcessHeap(), 0, size); + LpcMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); out = HeapAlloc(GetProcessHeap(), 0, size); - memset(LpcMessage, 0, size); LpcMessage->DataSize = lstrlen(REQUEST1) + 1; LpcMessage->MessageSize = FIELD_OFFSET(LPC_MESSAGE, Data) + LpcMessage->DataSize; lstrcpy((LPSTR)LpcMessage->Data, REQUEST1); @@ -252,8 +251,7 @@ static void test_ports_server(void) if (status != STATUS_SUCCESS) return; size = FIELD_OFFSET(LPC_MESSAGE, Data) + MAX_MESSAGE_LEN; - LpcMessage = HeapAlloc(GetProcessHeap(), 0, size); - memset(LpcMessage, 0, size); + LpcMessage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); while (TRUE) { diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 97f53df..5b4314f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4223,16 +4223,13 @@ static StorageInternalImpl* StorageInternalImpl_Construct( /* * Allocate space for the new storage object */ - newStorage = HeapAlloc(GetProcessHeap(), 0, sizeof(StorageInternalImpl)); + newStorage = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StorageInternalImpl)); if (newStorage!=0) { - memset(newStorage, 0, sizeof(StorageInternalImpl)); - /* * Initialize the stream list */ - list_init(&newStorage->base.strmHead); /* diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 60bd70d..b53da7e 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -2035,13 +2035,10 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in if( !fr ) /* add new family */ { n_ff++; - fr = HeapAlloc(GetProcessHeap(), 0, sizeof(fontResource)); + fr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(fontResource)); if (fr) { - memset(fr, 0, sizeof(fontResource)); - - fr->resource = HeapAlloc(GetProcessHeap(), 0, sizeof(LFD)); - memset(fr->resource, 0, sizeof(LFD)); + fr->resource = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LFD)); TRACE("family: -%s-%s-\n", lfd.foundry, lfd.family ); fr->resource->foundry = HeapAlloc(GetProcessHeap(), 0, strlen(lfd.foundry)+1); diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 40026fd..604f383 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2673,8 +2673,7 @@ static BOOL FTP_SendData(LPWININETFTPSESSIONW lpwfs, INT nDataSocket, HANDLE hFi CHAR *lpszBuffer; TRACE("\n"); - lpszBuffer = HeapAlloc(GetProcessHeap(), 0, sizeof(CHAR)*DATA_PACKET_SIZE); - memset(lpszBuffer, 0, sizeof(CHAR)*DATA_PACKET_SIZE); + lpszBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHAR)*DATA_PACKET_SIZE); /* Get the size of the file. */ GetFileInformationByHandle(hFile, &fi); diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6345a5b..3bfa62f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -467,14 +467,13 @@ HINTERNET WINAPI InternetOpenW(LPCWSTR lpszAgent, DWORD dwAccessType, /* Clear any error information */ INTERNET_SetLastError(0); - lpwai = HeapAlloc(GetProcessHeap(), 0, sizeof(WININETAPPINFOW)); + lpwai = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WININETAPPINFOW)); if (NULL == lpwai) { INTERNET_SetLastError(ERROR_OUTOFMEMORY); goto lend; } - - memset(lpwai, 0, sizeof(WININETAPPINFOW)); + lpwai->hdr.htype = WH_HINIT; lpwai->hdr.dwFlags = dwFlags; lpwai->hdr.dwRefCount = 1; diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8ecf795..a6d65ea 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2876,10 +2876,9 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } if(pi->pDevMode) dmW = pi->pDevMode; - else + else { - dmW = HeapAlloc(GetProcessHeap(), 0, size); - ZeroMemory(dmW,size); + dmW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); dmW->dmSize = size; if (0>DocumentPropertiesW(0,0,pi->pPrinterName,dmW,NULL,DM_OUT_BUFFER)) { diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index d776740..348c4f2 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -41,8 +41,7 @@ static LPARAM CreateITEM_INFO(INT flag, const WCHAR *info, const WCHAR *clsid, c { ITEM_INFO *reg; - reg = HeapAlloc(GetProcessHeap(), 0, sizeof(ITEM_INFO)); - memset(reg, 0, sizeof(ITEM_INFO)); + reg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITEM_INFO)); reg->cFlag = flag; lstrcpyW(reg->info, info); diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index baba628..1acdd84 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -258,9 +258,8 @@ static TYPELIB_DATA *InitializeTLData(void) { TYPELIB_DATA *pTLData; - pTLData = HeapAlloc(GetProcessHeap(), 0, sizeof(TYPELIB_DATA)); + pTLData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TYPELIB_DATA)); - memset(pTLData, 0, sizeof(TYPELIB_DATA)); pTLData->idl = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); pTLData->idl[0] = '\0';

1 0

Michael Stefaniuc : winealsa: Do not check for non-NULL before HeapFree' ing a variable as the check is redundant.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 34b0161d02a6e8f115d7c671603e81789d34e801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b0161d02a6e8f115d7c6716… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 25 01:13:43 2007 +0200 winealsa: Do not check for non-NULL before HeapFree'ing a variable as the check is redundant. --- dlls/winealsa.drv/mixer.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 4a39d2b..84701f6 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -505,10 +505,8 @@ static void ALSA_MixerInit(void) eclose: WARN("Error occured initialising mixer: %s\n", snd_strerror(err)); - if (mixdev[mixnum].lines) - HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines); - if (mixdev[mixnum].controls) - HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls); + HeapFree(GetProcessHeap(), 0, mixdev[mixnum].lines); + HeapFree(GetProcessHeap(), 0, mixdev[mixnum].controls); snd_mixer_close(mixdev[mixnum].mix); } cards = mixnum; @@ -649,8 +647,7 @@ static DWORD WINAPI ALSA_MixerPollThread(LPVOID lParam) die: TRACE("Shutting down\n"); - if (pfds) - HeapFree(GetProcessHeap(), 0, pfds); + HeapFree(GetProcessHeap(), 0, pfds); y = read(msg_pipe[0], &x, sizeof(x)); close(msg_pipe[1]);

1 0

Andrew Talbot : dmband: Constify some variables.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 318ebd2289632e315ef4d6bea27907738bdcc78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=318ebd2289632e315ef4d6bea… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:49:18 2007 +0100 dmband: Constify some variables. --- dlls/dmband/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 4c4ca43..97922e6 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -116,7 +116,7 @@ static const char *debugstr_month (DWORD dwMonth) { } /* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (LPFILETIME time) { +static const char *debugstr_filetime (const FILETIME *time) { SYSTEMTIME sysTime; if (!time) return "'null'"; @@ -129,7 +129,7 @@ static const char *debugstr_filetime (LPFILETIME time) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (LPDMUS_VERSION version) { +static const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS),

1 0

Yuval Fledel : include: Introduce SECPKG_INTERFACE_VERSION and extend PSECPKG_FUNCTION_TABLE accordingly .
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: b7b379b04eebe1a92b9f7d5e3c3301c535613630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b379b04eebe1a92b9f7d5e3… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Wed Apr 25 00:48:42 2007 +0300 include: Introduce SECPKG_INTERFACE_VERSION and extend PSECPKG_FUNCTION_TABLE accordingly. --- include/ntsecpkg.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index f6437f4..8cca976 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -30,6 +30,11 @@ extern "C" { #define SECPKG_STATE_WORKSTATION 0x08 #define SECPKG_STATE_STANDALONE 0x10 +/* Version magics as passed to or returned from Sp[Lsa,Mode]ModeInitialize */ +#define SECPKG_INTERFACE_VERSION 0x10000 +#define SECPKG_INTERFACE_VERSION_2 0x20000 +#define SECPKG_INTERFACE_VERSION_3 0x40000 + /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { LsaTokenInformationNull, @@ -336,6 +341,10 @@ typedef NTSTATUS (NTAPI SpAddCredentialsFn)(LSA_SEC_HANDLE, PUNICODE_STRING, PUNICODE_STRING, ULONG, PVOID, PVOID, PVOID, PTimeStamp); typedef NTSTATUS (NTAPI SpSetExtendedInformationFn)( SECPKG_EXTENDED_INFORMATION_CLASS, PSECPKG_EXTENDED_INFORMATION); +typedef NTSTATUS (NTAPI SpSetContextAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, + ULONG); +typedef NTSTATUS (NTAPI SpSetCredentialsAttributesFn)(LSA_SEC_HANDLE, ULONG, + PVOID, ULONG); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -388,9 +397,21 @@ typedef struct SECPKG_FUNCTION_TABLE { SpQueryContextAttributesFn *SpQueryContextAttributes; SpAddCredentialsFn *SpAddCredentials; SpSetExtendedInformationFn *SetExtendedInformation; + /* Packages with version SECPKG_INTERFACE_VERSION end here */ + SpSetContextAttributesFn *SpSetContextAttributes; + /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */ + SpSetCredentialsAttributesFn *SetCredentialsAttributes; + /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE; +/* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ +#define SECPKG_FUNCTION_TABLE_SIZE_1 offsetof(SECPKG_FUNCTION_TABLE, \ + SpSetContextAttributes) +#define SECPKG_FUNCTION_TABLE_SIZE_2 offsetof(SECPKG_FUNCTION_TABLE, \ + SetCredentialsAttributes) +#define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) + /* dispatch tables of user-mode functions implemented by SSP/AP */ typedef struct SECPKG_USER_FUNCTION_TABLE { SpInstanceInitFn *InstanceInit;

1 0

Andrew Talbot : dmime: Constify some variables.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 835d478fca5e3ce9581ce0ae36d3538939a1f93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=835d478fca5e3ce9581ce0ae3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:50:56 2007 +0100 dmime: Constify some variables. --- dlls/dmime/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 7078b21..d61d7d6 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -242,7 +242,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (LPDMUS_VERSION version) { +static const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), @@ -269,7 +269,7 @@ static const char *debugstr_month (DWORD dwMonth) { } /* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (LPFILETIME time) { +static const char *debugstr_filetime (const FILETIME *time) { SYSTEMTIME sysTime; if (!time) return "'null'";

1 0

Andrew Talbot : dmstyle: Constify some variables.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: cd86d218b64dc213906cec3efd458ca7e8aa5dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd86d218b64dc213906cec3ef… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:52:52 2007 +0100 dmstyle: Constify some variables. --- dlls/dmstyle/dmutils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index d894015..0dcc4f5 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -256,7 +256,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -static const char *debugstr_dmversion (LPDMUS_VERSION version) { +static const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", HIWORD(version->dwVersionMS),LOWORD(version->dwVersionMS), @@ -283,7 +283,7 @@ static const char *debugstr_month (DWORD dwMonth) { } /* FILETIME struct to string conversion for debug messages */ -static const char *debugstr_filetime (LPFILETIME time) { +static const char *debugstr_filetime (const FILETIME *time) { SYSTEMTIME sysTime; if (!time) return "'null'";

1 0

Michał Wiernowolski : winealsa: Improved handling of SysEx MIDI messages.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: a45ffebee4e00cff08f3a7c9f1bc6fe5265ef6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45ffebee4e00cff08f3a7c9f… Author: Michał Wiernowolski <mihalw(a)gmail.com> Date: Tue Apr 24 20:47:16 2007 +0200 winealsa: Improved handling of SysEx MIDI messages. --- dlls/winealsa.drv/midi.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 09018aa..90d52e6 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -351,17 +351,19 @@ static DWORD WINAPI midRecThread(LPVOID arg) LPBYTE ptr = (BYTE*) ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; - /* FIXME: Should handle sysex greater that a single buffer */ + /* FIXME: Should handle sysex greater than lpMidiHdr->dwBufferLength */ EnterCriticalSection(&crit_sect); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - if (len <= lpMidiHdr->dwBufferLength) { - lpMidiHdr->dwBytesRecorded = len; - memcpy(lpMidiHdr->lpData, ptr, len); - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; - if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) - WARN("Couldn't notify client\n"); + if (lpMidiHdr->dwBytesRecorded + len <= lpMidiHdr->dwBufferLength) { + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr, len); + lpMidiHdr->dwBytesRecorded += len; + if (*(ptr + (len-1)) == 0xF7) { + lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; + lpMidiHdr->dwFlags |= MHDR_DONE; + MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) + WARN("Couldn't notify client\n"); + } } else FIXME("No enough space in the buffer to store sysex!\n"); } else

1 0

Andrew Talbot : dmcompos: Constify a variable.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 82e5990a3933bd34f13d405c3405b788d1b1af4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e5990a3933bd34f13d405c3… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:55:46 2007 +0100 dmcompos: Constify a variable. --- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmcompos/dmcompos_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 593e6e8..9279fc0 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -360,7 +360,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index d3053bd..9c43c18 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -157,7 +157,7 @@ extern int even_or_odd (DWORD number); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */

1 0

Andrew Talbot : dmusic: Constify a variable.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: 391b1c24a2e8f983298bf0da8cc5192fe699e5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391b1c24a2e8f983298bf0da8… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:57:16 2007 +0100 dmusic: Constify a variable. --- dlls/dmusic/dmusic_main.c | 2 +- dlls/dmusic/dmusic_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 1eb508f..91b687e 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -216,7 +216,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index d5589d9..4f59a39 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -305,7 +305,7 @@ extern int even_or_odd (DWORD number); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */

1 0

Andrew Talbot : dmscript: Constify a variable.
by Alexandre Julliard 25 Apr '07

25 Apr '07

Module: wine Branch: master Commit: ac43c850a8839357e78b90c540d060443b00458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac43c850a8839357e78b90c54… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Apr 24 20:56:42 2007 +0100 dmscript: Constify a variable. --- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmscript/dmscript_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 67f2b10..248b660 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -644,7 +644,7 @@ const char *debugstr_fourcc (DWORD fourcc) { } /* DMUS_VERSION struct to string conversion for debug messages */ -const char *debugstr_dmversion (LPDMUS_VERSION version) { +const char *debugstr_dmversion (const DMUS_VERSION *version) { if (!version) return "'null'"; return wine_dbg_sprintf ("\'%i,%i,%i,%i\'", (int)((version->dwVersionMS & 0xFFFF0000) >> 8), (int)(version->dwVersionMS & 0x0000FFFF), diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 32ccd81..8696613 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -134,7 +134,7 @@ extern int even_or_odd (DWORD number); /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc); /* DMUS_VERSION struct to string conversion for debug messages */ -extern const char *debugstr_dmversion (LPDMUS_VERSION version); +extern const char *debugstr_dmversion (const DMUS_VERSION *version); /* returns name of given GUID */ extern const char *debugstr_dmguid (const GUID *id); /* returns name of given error code */

1 0