December 2007 - Wine-commits

Rob Shearman : rpcrt4: Print an error if stub buffer pointer is passed into safe_copy_from_buffer .
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 17eb6f44adec6f6ad43f861150a1d2473c79fde5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17eb6f44adec6f6ad43f86115… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 20 18:01:16 2007 +0000 rpcrt4: Print an error if stub buffer pointer is passed into safe_copy_from_buffer. Also print an error message if there was an overflow. --- dlls/rpcrt4/ndr_marshall.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 2322c78..c5cebea 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -664,7 +664,13 @@ static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, U { if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) + { + ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %u\n", + pStubMsg->Buffer, pStubMsg->BufferEnd, size); RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + if (p == pStubMsg->Buffer) + ERR("pointer is the same as the buffer\n"); memcpy(p, pStubMsg->Buffer, size); pStubMsg->Buffer += size; }

1 0

Rob Shearman : rpcrt4: Fix a memory leak from the get_filename call in the server tests.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 366fd6e3afcfce57f1a1b50ae3561f43cf880b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366fd6e3afcfce57f1a1b50ae… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 20 18:01:21 2007 +0000 rpcrt4: Fix a memory leak from the get_filename call in the server tests. --- dlls/rpcrt4/tests/server.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 0869c88..9ddde43 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -667,6 +667,7 @@ basic_tests(void) str = get_filename(); ok(!strcmp(str, __FILE__), "get_filename() returned %s instead of %s\n", str, __FILE__); + midl_user_free(str); } static void

1 0

Rob Shearman : kernel32: Add a test for calling VirtualAlloc on a view of a SEC_RESERVE file mapping .
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: e55854ddc56c50bb96285886dd12dd795e96bc64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55854ddc56c50bb96285886d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 20 18:01:27 2007 +0000 kernel32: Add a test for calling VirtualAlloc on a view of a SEC_RESERVE file mapping. --- dlls/kernel32/tests/virtual.c | 62 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 54918cf..dad82f6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -27,6 +27,7 @@ #include "wine/test.h" #define NUM_THREADS 4 +#define MAPPING_SIZE 0x100000 static HINSTANCE hkernel32; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); @@ -270,8 +271,9 @@ static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; HANDLE file, mapping; - void *ptr; + void *ptr, *ptr2; MEMORY_BASIC_INFORMATION info; + BOOL ret; SetLastError(0xdeadbeef); file = CreateFileA( testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); @@ -496,6 +498,64 @@ todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLast CloseHandle( mapping ); CloseHandle( file ); + + /* read/write mapping with SEC_RESERVE */ + mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE | SEC_RESERVE, 0, MAPPING_SIZE, NULL); + ok(mapping != INVALID_HANDLE_VALUE, "CreateFileMappingA failed with error %d\n", GetLastError()); + + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok(ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); + ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); + ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); +todo_wine + ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); +todo_wine + ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + + ptr = VirtualAlloc(ptr, 0x10000, MEM_COMMIT, PAGE_READWRITE); + ok(ptr != NULL, "VirtualAlloc failed with error %d\n", GetLastError()); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); + ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); + ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); +todo_wine + ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + ok(info.Protect == PAGE_READWRITE, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + + ptr2 = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + /* on NT ptr != ptr2 but on Win9x ptr == ptr2 */ + ok(ptr2 != NULL, "MapViewOfFile failed with error %d\n", GetLastError()); + trace("mapping same section resulted in views %p and %p\n", ptr, ptr2); + + /* shows that the VirtualAlloc above affects the mapping, not just the + * virtual memory in this process - it also affects all other processes + * with a view of the mapping, but that isn't tested here */ + ret = VirtualQuery(ptr2, &info, sizeof(info)); + ok(ret, "VirtualQuery failed with error %d\n", GetLastError()); + ok(info.BaseAddress == ptr2, "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); + ok(info.AllocationBase == ptr2, "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); + ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); +todo_wine + ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); + ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); + ok(info.Protect == PAGE_READWRITE, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); + + ret = UnmapViewOfFile(ptr2); + ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); + ret = UnmapViewOfFile(ptr); + ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); + CloseHandle(mapping); } static DWORD (WINAPI *pNtMapViewOfSection)( HANDLE handle, HANDLE process, PVOID *addr_ptr,

1 0

Alexandre Julliard : kernel32: Store the initial directory as a full path in the process parameters.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: a4269c8eed130acd3a767ca36da80265e0340a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4269c8eed130acd3a767ca36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 12:42:28 2007 +0100 kernel32: Store the initial directory as a full path in the process parameters. --- dlls/kernel32/process.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d770fd7..4a97ec3 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1175,7 +1175,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST const STARTUPINFOW *startup ) { RTL_USER_PROCESS_PARAMETERS *params; - UNICODE_STRING image_str, cmdline_str, curdir_str, desktop, title, runtime; + UNICODE_STRING image_str, cmdline_str, curdir_str, desktop, title, runtime, newdir; NTSTATUS status; WCHAR buffer[MAX_PATH]; @@ -1186,7 +1186,17 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST RtlInitUnicodeString( &image_str, buffer ); RtlInitUnicodeString( &cmdline_str, cmdline ); - if (cur_dir) RtlInitUnicodeString( &curdir_str, cur_dir ); + newdir.Buffer = NULL; + if (cur_dir) + { + if (RtlDosPathNameToNtPathName_U( cur_dir, &newdir, NULL, NULL )) + { + /* skip \??\ prefix */ + curdir_str.Buffer = newdir.Buffer + 4; + curdir_str.Length = newdir.Length - 4 * sizeof(WCHAR); + } + else cur_dir = NULL; + } if (startup->lpDesktop) RtlInitUnicodeString( &desktop, startup->lpDesktop ); if (startup->lpTitle) RtlInitUnicodeString( &title, startup->lpTitle ); if (startup->lpReserved2 && startup->cbReserved2) @@ -1203,6 +1213,7 @@ static RTL_USER_PROCESS_PARAMETERS *create_user_params( LPCWSTR filename, LPCWST startup->lpDesktop ? &desktop : NULL, NULL, (startup->lpReserved2 && startup->cbReserved2) ? &runtime : NULL ); + RtlFreeUnicodeString( &newdir ); if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) );

1 0

Rob Shearman : widl: Tweak the rules for when to call pfnFree for arrays.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: b57a322b0268e6904d23b65cb2cd65045bed021d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57a322b0268e6904d23b65cb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Dec 21 09:41:40 2007 +0000 widl: Tweak the rules for when to call pfnFree for arrays. Varying arrays that aren't unmarshalled shouldn't be freed, but conformant arrays that aren't unmarshalled should. --- tools/widl/typegen.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b0edc29..d245c97 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2765,9 +2765,10 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { /* these are all unmarshalled by pointing into the buffer on the * server side */ - if (type->type != RPC_FC_SMFARRAY && - type->type != RPC_FC_LGFARRAY && - type->type != RPC_FC_CARRAY) + if (type->type == RPC_FC_BOGUS_ARRAY || + type->type == RPC_FC_CVARRAY || + (type->type == RPC_FC_SMVARRAY && type->type == RPC_FC_LGVARRAY && in_attr) || + (type->type == RPC_FC_CARRAY && type->type == RPC_FC_CARRAY && !in_attr)) { print_file(file, indent, "if (%s)\n", var->name); indent++;

1 0

Andrew Talbot : kernel32: Remove unneeded casts.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: ca6003b8f07392b384e4c9f96f32d7bc503fa7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca6003b8f07392b384e4c9f96… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 12:17:33 2007 +0000 kernel32: Remove unneeded casts. --- dlls/kernel32/thunk.c | 10 +++++----- dlls/kernel32/toolhelp.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index c35302e..5487b34 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -709,7 +709,7 @@ DWORD WINAPI ThunkInitLS( if (!addr[1]) return 0; - *(DWORD*)thunk = addr[1]; + *thunk = addr[1]; return addr[1]; } @@ -1645,7 +1645,7 @@ static BOOL THUNK_Init(void) ThunkletHeap = HeapCreate( 0, 0x10000, 0x10000 ); if (!ThunkletHeap) return FALSE; - ThunkletCodeSel = SELECTOR_AllocBlock( (void *)ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE ); + ThunkletCodeSel = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE ); thunk = HeapAlloc( ThunkletHeap, 0, 5 ); if (!thunk) return FALSE; @@ -1712,7 +1712,7 @@ static FARPROC THUNK_AllocLSThunklet( SEGPTR target, DWORD relay, thunk->jmp_glue = 0xE9; thunk->target = (DWORD)target; - thunk->relay = (DWORD)relay; + thunk->relay = relay; thunk->glue = (DWORD)glue - (DWORD)&thunk->type; thunk->type = THUNKLET_TYPE_LS; @@ -1746,7 +1746,7 @@ static SEGPTR THUNK_AllocSLThunklet( FARPROC target, DWORD relay, thunk->jmp_glue = 0xEA; thunk->target = (DWORD)target; - thunk->relay = (DWORD)relay; + thunk->relay = relay; thunk->glue = (DWORD)glue; thunk->type = THUNKLET_TYPE_SL; @@ -2076,7 +2076,7 @@ SEGPTR WINAPI Get16DLLAddress(HMODULE16 handle, LPSTR func_name) if (!code_sel32) { if (!ThunkletHeap) THUNK_Init(); - code_sel32 = SELECTOR_AllocBlock( (void *)ThunkletHeap, 0x10000, + code_sel32 = SELECTOR_AllocBlock( ThunkletHeap, 0x10000, WINE_LDT_FLAGS_CODE | WINE_LDT_FLAGS_32BIT ); if (!code_sel32) return 0; } diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index 0464b6c..436a08f 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -98,7 +98,7 @@ static BOOL fetch_module( DWORD process, DWORD flags, LDR_MODULE** ldr_mod, ULON &pbi, sizeof(pbi), NULL ); if (!status) { - if (ReadProcessMemory( hProcess, &((PEB*)pbi.PebBaseAddress)->LdrData, + if (ReadProcessMemory( hProcess, &pbi.PebBaseAddress->LdrData, &pLdrData, sizeof(pLdrData), NULL ) && ReadProcessMemory( hProcess, &pLdrData->InLoadOrderModuleList.Flink,

1 0

Andrew Talbot : mapi32: Remove unneeded casts.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: d05a511d0b7bdd611ba711752de1603ac0375217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05a511d0b7bdd611ba711752… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 12:17:37 2007 +0000 mapi32: Remove unneeded casts. --- dlls/mapi32/imalloc.c | 8 ++++---- dlls/mapi32/prop.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mapi32/imalloc.c b/dlls/mapi32/imalloc.c index 1562b7b..c5b4570 100644 --- a/dlls/mapi32/imalloc.c +++ b/dlls/mapi32/imalloc.c @@ -127,9 +127,9 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) return LocalAlloc(LMEM_FIXED, cb); if (cb) - return LocalReAlloc((HANDLE) pv, cb, LMEM_MOVEABLE); + return LocalReAlloc(pv, cb, LMEM_MOVEABLE); - LocalFree((HANDLE) pv); + LocalFree(pv); return NULL; } @@ -139,7 +139,7 @@ static LPVOID WINAPI IMAPIMalloc_fnRealloc(LPMALLOC iface, LPVOID pv, DWORD cb) static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - LocalFree((HANDLE) pv); + LocalFree(pv); } /************************************************************************** @@ -148,7 +148,7 @@ static void WINAPI IMAPIMalloc_fnFree(LPMALLOC iface, LPVOID pv) static DWORD WINAPI IMAPIMalloc_fnGetSize(LPMALLOC iface, LPVOID pv) { TRACE("(%p)->(%p)\n", iface, pv); - return LocalSize((HANDLE) pv); + return LocalSize(pv); } /************************************************************************** diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 484e64a..e58df4d 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -928,7 +928,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, LPVOID lpNew, ULONG *lpCount) { static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */ - LPSPropValue lpDest = (LPSPropValue)lpProps; + LPSPropValue lpDest = lpProps; ULONG ulCount = cValues * sizeof(SPropValue); ULONG ulLen, i; int iter; @@ -964,7 +964,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, break; case PT_STRING8: ulLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.lpszA) + 1u; - lpDest->Value.lpszA = (LPSTR)RELOC_PTR(lpDest->Value.lpszA); + lpDest->Value.lpszA = RELOC_PTR(lpDest->Value.lpszA); if (bBadPtr) ulLen = lstrlenA(lpDest->Value.lpszA) + 1u; ulCount += ulLen; @@ -999,7 +999,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, { ULONG ulStrLen = bBadPtr ? 0 : lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; - lpDest->Value.MVszA.lppszA[i] = (LPSTR)RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); + lpDest->Value.MVszA.lppszA[i] = RELOC_PTR(lpDest->Value.MVszA.lppszA[i]); if (bBadPtr) ulStrLen = lstrlenA(lpDest->Value.MVszA.lppszA[i]) + 1u; ulCount += ulStrLen;

1 0

Andrew Talbot : kernel32: Revert the removal of a cast from a macro.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 4a35f62deb58b03b8d6efa608e8d7f5830422847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a35f62deb58b03b8d6efa608… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 18:20:15 2007 +0000 kernel32: Revert the removal of a cast from a macro. --- dlls/kernel32/local16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index 5716281..e250d84 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -133,7 +133,7 @@ typedef struct /* All local heap allocations are aligned on 4-byte boundaries */ #define LALIGN(word) (((word) + 3) & ~3) -#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((ptr)+(arena))) +#define ARENA_PTR(ptr,arena) ((LOCALARENA *)((char *)(ptr)+(arena))) #define ARENA_PREV(ptr,arena) (ARENA_PTR((ptr),(arena))->prev & ~3) #define ARENA_NEXT(ptr,arena) (ARENA_PTR((ptr),(arena))->next) #define ARENA_FLAGS(ptr,arena) (ARENA_PTR((ptr),(arena))->prev & 3)

1 0

Andrew Talbot : mciavi32: Remove unneeded casts.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: 22f43db86331532b95644ccae072f749ea2e7b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f43db86331532b95644ccae… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 22:45:34 2007 +0000 mciavi32: Remove unneeded casts. --- dlls/mciavi32/mciavi.c | 4 ++-- dlls/mciavi32/mmoutput.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index dbd2a3b..84f9077 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -305,7 +305,7 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); - wma = (WINE_MCIAVI *)MCIAVI_mciGetOpenDev(wDevID); + wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; EnterCriticalSection(&wma->cs); @@ -402,7 +402,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - wma = (WINE_MCIAVI *)MCIAVI_mciGetOpenDev(wDevID); + wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; EnterCriticalSection(&wma->cs); diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 1be8266..d1ed699 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -494,7 +494,7 @@ paint_frame: static void CALLBACK MCIAVI_waveCallback(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - WINE_MCIAVI *wma = (WINE_MCIAVI *)MCIAVI_mciGetOpenDev(dwInstance); + WINE_MCIAVI *wma = MCIAVI_mciGetOpenDev(dwInstance); if (!wma) return;

1 0

Andrew Talbot : mciseq: Remove unneeded casts.
by Alexandre Julliard 21 Dec '07

21 Dec '07

Module: wine Branch: master Commit: b98bfac4cc2d4ac13a601fd3bb743b68abfa5b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98bfac4cc2d4ac13a601fd3b… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Dec 20 22:45:37 2007 +0000 mciseq: Remove unneeded casts. --- dlls/mciseq/mcimidi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 7fc8c6a..92f5039 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -863,9 +863,9 @@ static DWORD MIDI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar TRACE("hFile closed !\n"); } HeapFree(GetProcessHeap(), 0, wmm->tracks); - HeapFree(GetProcessHeap(), 0, (LPWSTR)wmm->lpstrElementName); - HeapFree(GetProcessHeap(), 0, (LPSTR)wmm->lpstrCopyright); - HeapFree(GetProcessHeap(), 0, (LPSTR)wmm->lpstrName); + HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); } else { TRACE("Shouldn't happen... nUseCount=%d\n", wmm->nUseCount); return MCIERR_INTERNAL;

1 0