January 2009 - Wine-Commits

Hervé Chanal : shell32: A new icon for trash_file.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: cd52a206377c94ea263f45c274d58e3838343e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd52a206377c94ea263f45c27… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Tue Jan 27 16:43:29 2009 +0100 shell32: A new icon for trash_file. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/trash_file.ico | Bin 5430 -> 15086 bytes dlls/shell32/trash_file.svg | 493 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 495 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd52a206377c94ea263f4…

1 0

Hervé Chanal : shell32: A new icon for mycomputer.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 46d2a670d2fb508418e897c4b3045f8f34f6a7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d2a670d2fb508418e897c4b… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Tue Jan 27 16:41:21 2009 +0100 shell32: A new icon for mycomputer. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/mycomputer.ico | Bin 2998 -> 15086 bytes dlls/shell32/mycomputer.svg | 1127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1129 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46d2a670d2fb508418e89…

1 0

Huw Davies : ole32: Move functions around in file to avoid forward declarations.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: cc7edbe3b590e62361d0f5648ab6a26b044f1216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7edbe3b590e62361d0f5648… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 27 17:03:55 2009 +0000 ole32: Move functions around in file to avoid forward declarations. --- dlls/ole32/stg_bigblockfile.c | 488 +++++++++++++++++++---------------------- 1 files changed, 231 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc7edbe3b590e62361d0f…

1 0

Huw Davies : ole32: Add a helper function to return the file size and modify EnsureExists to use it .
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: bfc32ae0c615b12dd61fe7c2b444f1b4ff5e2dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc32ae0c615b12dd61fe7c2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 27 17:13:28 2009 +0000 ole32: Add a helper function to return the file size and modify EnsureExists to use it. --- dlls/ole32/stg_bigblockfile.c | 37 +++++++++++++++++++++++++++++-------- dlls/ole32/storage32.h | 4 ++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 24d8d95..1ab3369 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -827,10 +827,12 @@ HRESULT BIGBLOCKFILE_WriteAt(BigBlockFile *This, ULARGE_INTEGER offset, * Sets the size of the file. * */ -void BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) +HRESULT BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) { + HRESULT hr = S_OK; + if (This->filesize.u.LowPart == newSize.u.LowPart) - return; + return hr; TRACE("from %u to %u\n", This->filesize.u.LowPart, newSize.u.LowPart); @@ -882,6 +884,20 @@ void BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) This->filesize.u.HighPart = newSize.u.HighPart; BIGBLOCKFILE_RemapAllMappedPages(This); + return hr; +} + +/****************************************************************************** + * BIGBLOCKFILE_GetSize + * + * Gets the size of the file. + * + */ +static HRESULT BIGBLOCKFILE_GetSize(BigBlockFile *This, ULARGE_INTEGER *size) +{ + HRESULT hr = S_OK; + *size = This->filesize; + return hr; } /****************************************************************************** @@ -889,22 +905,27 @@ void BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) * * Grows the file if necessary to make sure the block is valid. */ -void BIGBLOCKFILE_EnsureExists(BigBlockFile *This, ULONG index) +HRESULT BIGBLOCKFILE_EnsureExists(BigBlockFile *This, ULONG index) { + ULARGE_INTEGER size; + HRESULT hr; + /* Block index starts at -1 translate to zero based index */ if (index == 0xffffffff) index = 0; else index++; + hr = BIGBLOCKFILE_GetSize(This, &size); + if(FAILED(hr)) return hr; + /* make sure that the block physically exists */ - if ((This->blocksize * (index + 1)) > This->filesize.u.LowPart) + if ((This->blocksize * (index + 1)) > size.QuadPart) { ULARGE_INTEGER newSize; - newSize.u.HighPart = 0; - newSize.u.LowPart = This->blocksize * (index + 1); - - BIGBLOCKFILE_SetSize(This, newSize); + newSize.QuadPart = This->blocksize * (index + 1); + hr = BIGBLOCKFILE_SetSize(This, newSize); } + return hr; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 639ec6a..1e40b3a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -164,8 +164,8 @@ BigBlockFile* BIGBLOCKFILE_Construct(HANDLE hFile, ULONG blocksize, BOOL fileBased); void BIGBLOCKFILE_Destructor(LPBIGBLOCKFILE This); -void BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); -void BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); +HRESULT BIGBLOCKFILE_EnsureExists(LPBIGBLOCKFILE This, ULONG index); +HRESULT BIGBLOCKFILE_SetSize(LPBIGBLOCKFILE This, ULARGE_INTEGER newSize); HRESULT BIGBLOCKFILE_ReadAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, void* buffer, ULONG size, ULONG* bytesRead); HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset,

1 0

Huw Davies : ole32: The bigblockfile on ILockBytes implementation should work on any ILockBytes not just those based on HGLOBAL .
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: bc93467f5d3cfe55ab27608984bd753daab97197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc93467f5d3cfe55ab2760898… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 27 17:35:18 2009 +0000 ole32: The bigblockfile on ILockBytes implementation should work on any ILockBytes not just those based on HGLOBAL. --- dlls/ole32/stg_bigblockfile.c | 144 +++++++++++++++-------------------------- 1 files changed, 53 insertions(+), 91 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index 1ab3369..19151b9 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -113,8 +113,6 @@ struct BigBlockFile MappedPage *victimhead, *victimtail; ULONG num_victim_pages; ILockBytes *pLkbyt; - HGLOBAL hbytearray; - LPVOID pbytearray; }; /*********************************************************** @@ -165,10 +163,7 @@ static inline void BIGBLOCKFILE_Zero(BlockBits *bb) */ static BOOL BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile) { - This->pLkbyt = NULL; - This->hbytearray = 0; - This->pbytearray = NULL; - + This->pLkbyt = NULL; This->hfile = hFile; if (This->hfile == INVALID_HANDLE_VALUE) @@ -204,40 +199,22 @@ static BOOL BIGBLOCKFILE_FileInit(LPBIGBLOCKFILE This, HANDLE hFile) } /****************************************************************************** - * BIGBLOCKFILE_MemInit + * BIGBLOCKFILE_LockBytesInit * - * Initialize a big block object supported by an ILockBytes on HGLOABL. + * Initialize a big block object supported by an ILockBytes. */ -static BOOL BIGBLOCKFILE_MemInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt) +static BOOL BIGBLOCKFILE_LockBytesInit(LPBIGBLOCKFILE This, ILockBytes* plkbyt) { - This->hfile = 0; - This->hfilemap = 0; - - /* - * Retrieve the handle to the byte array from the LockByte object. - */ - if (GetHGlobalFromILockBytes(plkbyt, &(This->hbytearray)) != S_OK) - { - FIXME("May not be an ILockBytes on HGLOBAL\n"); - return FALSE; - } - - This->pLkbyt = plkbyt; - - /* - * Increment the reference count of the ILockByte object since - * we're keeping a reference to it. - */ - ILockBytes_AddRef(This->pLkbyt); - - This->filesize.u.LowPart = GlobalSize(This->hbytearray); - This->filesize.u.HighPart = 0; - - This->pbytearray = GlobalLock(This->hbytearray); + This->hfile = 0; + This->hfilemap = 0; + This->pLkbyt = plkbyt; + ILockBytes_AddRef(This->pLkbyt); - TRACE("mem on %p len %u\n", This->pbytearray, This->filesize.u.LowPart); + /* We'll get the size directly with ILockBytes_Stat */ + This->filesize.QuadPart = 0; - return TRUE; + TRACE("ILockBytes %p\n", This->pLkbyt); + return TRUE; } /****************************************************************************** @@ -277,34 +254,27 @@ static void BIGBLOCKFILE_LinkHeadPage(MappedPage **head, MappedPage *page) static BOOL BIGBLOCKFILE_MapPage(BigBlockFile *This, MappedPage *page) { DWORD lowoffset = PAGE_SIZE * page->page_index; + DWORD numBytesToMap; + DWORD desired_access; - if (This->fileBased) - { - DWORD numBytesToMap; - DWORD desired_access; - - if( !This->hfilemap ) - return FALSE; + assert(This->fileBased); - if (lowoffset + PAGE_SIZE > This->filesize.u.LowPart) - numBytesToMap = This->filesize.u.LowPart - lowoffset; - else - numBytesToMap = PAGE_SIZE; + if( !This->hfilemap ) + return FALSE; - if (This->flProtect == PAGE_READONLY) - desired_access = FILE_MAP_READ; - else - desired_access = FILE_MAP_WRITE; + if (lowoffset + PAGE_SIZE > This->filesize.u.LowPart) + numBytesToMap = This->filesize.u.LowPart - lowoffset; + else + numBytesToMap = PAGE_SIZE; - page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0, - lowoffset, numBytesToMap); - page->mapped_bytes = numBytesToMap; - } + if (This->flProtect == PAGE_READONLY) + desired_access = FILE_MAP_READ; else - { - page->lpBytes = (LPBYTE)This->pbytearray + lowoffset; - page->mapped_bytes = PAGE_SIZE; - } + desired_access = FILE_MAP_WRITE; + + page->lpBytes = MapViewOfFile(This->hfilemap, desired_access, 0, + lowoffset, numBytesToMap); + page->mapped_bytes = numBytesToMap; TRACE("mapped page %u to %p\n", page->page_index, page->lpBytes); @@ -392,10 +362,13 @@ static void * BIGBLOCKFILE_GetMappedView( static void BIGBLOCKFILE_UnmapPage(LPBIGBLOCKFILE This, MappedPage *page) { TRACE("%d at %p\n", page->page_index, page->lpBytes); + + assert(This->fileBased); + if (page->refcnt > 0) ERR("unmapping inuse page %p\n", page->lpBytes); - if (This->fileBased && page->lpBytes) + if (page->lpBytes) UnmapViewOfFile(page->lpBytes); page->lpBytes = NULL; @@ -764,7 +737,7 @@ BigBlockFile *BIGBLOCKFILE_Construct(HANDLE hFile, ILockBytes* pLkByt, DWORD ope } else { - if (!BIGBLOCKFILE_MemInit(This, pLkByt)) + if (!BIGBLOCKFILE_LockBytesInit(This, pLkByt)) { HeapFree(GetProcessHeap(), 0, This); return NULL; @@ -790,7 +763,6 @@ void BIGBLOCKFILE_Destructor(BigBlockFile *This) } else { - GlobalUnlock(This->hbytearray); ILockBytes_Release(This->pLkbyt); } @@ -830,6 +802,10 @@ HRESULT BIGBLOCKFILE_WriteAt(BigBlockFile *This, ULARGE_INTEGER offset, HRESULT BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) { HRESULT hr = S_OK; + LARGE_INTEGER newpos; + + if (!This->fileBased) + return ILockBytes_SetSize(This->pLkbyt, newSize); if (This->filesize.u.LowPart == newSize.u.LowPart) return hr; @@ -849,40 +825,19 @@ HRESULT BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) BIGBLOCKFILE_UnmapAllMappedPages(This); - if (This->fileBased) + newpos.QuadPart = newSize.QuadPart; + if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) { - LARGE_INTEGER newpos; + if( This->hfilemap ) CloseHandle(This->hfilemap); - newpos.QuadPart = newSize.QuadPart; - if (SetFilePointerEx(This->hfile, newpos, NULL, FILE_BEGIN)) - { - if( This->hfilemap ) CloseHandle(This->hfilemap); - - SetEndOfFile(This->hfile); + SetEndOfFile(This->hfile); - /* re-create the file mapping object */ - This->hfilemap = CreateFileMappingA(This->hfile, - NULL, - This->flProtect, - 0, 0, - NULL); - } - } - else - { - GlobalUnlock(This->hbytearray); - - /* Resize the byte array object. */ - ILockBytes_SetSize(This->pLkbyt, newSize); - - /* Re-acquire the handle, it may have changed */ - GetHGlobalFromILockBytes(This->pLkbyt, &This->hbytearray); - This->pbytearray = GlobalLock(This->hbytearray); + /* re-create the file mapping object */ + This->hfilemap = CreateFileMappingA(This->hfile, NULL, This->flProtect, + 0, 0, NULL); } - This->filesize.u.LowPart = newSize.u.LowPart; - This->filesize.u.HighPart = newSize.u.HighPart; - + This->filesize = newSize; BIGBLOCKFILE_RemapAllMappedPages(This); return hr; } @@ -896,7 +851,14 @@ HRESULT BIGBLOCKFILE_SetSize(BigBlockFile *This, ULARGE_INTEGER newSize) static HRESULT BIGBLOCKFILE_GetSize(BigBlockFile *This, ULARGE_INTEGER *size) { HRESULT hr = S_OK; - *size = This->filesize; + if(This->fileBased) + *size = This->filesize; + else + { + STATSTG stat; + hr = ILockBytes_Stat(This->pLkbyt, &stat, STATFLAG_NONAME); + if(SUCCEEDED(hr)) *size = stat.cbSize; + } return hr; }

1 0

Paul Vriens : kernel32/tests: Fill the buffer to show a bug in Wine.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: dda0fe451d66b396226014b53f6cb837c37cadd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda0fe451d66b396226014b53… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 28 09:00:26 2009 +0100 kernel32/tests: Fill the buffer to show a bug in Wine. --- dlls/kernel32/tests/profile.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index b07bfc8..e07ece3 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -215,22 +215,27 @@ static void test_profile_sections_names(void) CloseHandle( h); /* Test with sufficiently large buffer */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 29, testfile3 ); ok( ret == 27, "expected return size 27, got %d\n", ret ); ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Test with exactly fitting buffer */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 28, testfile3 ); ok( ret == 26, "expected return size 26, got %d\n", ret ); + todo_wine ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Test with a buffer too small */ + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 27, testfile3 ); ok( ret == 25, "expected return size 25, got %d\n", ret ); + todo_wine ok( buf[ret+1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Tests on nonexistent file */ - memset(buf, 0xcc, sizeof(buf)); + memset(buf, 0xc, sizeof(buf)); ret = GetPrivateProfileSectionNamesA( buf, 10, ".\\not_here.ini" ); ok( ret == 0, "expected return size 0, got %d\n", ret ); ok( buf[0] == 0, "returned buffer not terminated with null\n" ); @@ -238,6 +243,7 @@ static void test_profile_sections_names(void) /* Test with sufficiently large buffer */ SetLastError(0xdeadbeef); + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 29, testfile3W ); if (ret == 0 && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { @@ -249,11 +255,13 @@ static void test_profile_sections_names(void) ok( bufW[ret-1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Test with exactly fitting buffer */ + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 28, testfile3W ); ok( ret == 26, "expected return size 26, got %d\n", ret ); ok( bufW[ret+1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" ); /* Test with a buffer too small */ + memset(bufW, 0xcc, sizeof(bufW)); ret = GetPrivateProfileSectionNamesW( bufW, 27, testfile3W ); ok( ret == 25, "expected return size 25, got %d\n", ret ); ok( bufW[ret+1] == 0 && bufW[ret] == 0, "returned buffer not terminated with double-null\n" );

1 0

Huw Davies : ole32: Move private data structure out of header file.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 70ee1123376cfd137ea778fbea225c780588765f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ee1123376cfd137ea778fbe… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 27 15:27:08 2009 +0000 ole32: Move private data structure out of header file. --- dlls/ole32/stg_bigblockfile.c | 18 ++++++++++++++++++ dlls/ole32/storage32.h | 20 -------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/stg_bigblockfile.c b/dlls/ole32/stg_bigblockfile.c index a2ee1de..0d7b366 100644 --- a/dlls/ole32/stg_bigblockfile.c +++ b/dlls/ole32/stg_bigblockfile.c @@ -85,6 +85,8 @@ typedef struct * file this mapping represents. (The mappings are always * PAGE_SIZE-aligned.) */ + +typedef struct MappedPage MappedPage; struct MappedPage { MappedPage *next; @@ -99,6 +101,22 @@ struct MappedPage BlockBits writable_blocks; }; +struct BigBlockFile +{ + BOOL fileBased; + ULARGE_INTEGER filesize; + ULONG blocksize; + HANDLE hfile; + HANDLE hfilemap; + DWORD flProtect; + MappedPage *maplist; + MappedPage *victimhead, *victimtail; + ULONG num_victim_pages; + ILockBytes *pLkbyt; + HGLOBAL hbytearray; + LPVOID pbytearray; +}; + /*********************************************************** * Prototypes for private methods */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index b358ed2..639ec6a 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -152,27 +152,7 @@ struct StgProperty * this section appear in stg_bigblockfile.c */ -/* - * Declaration of the data structures - */ typedef struct BigBlockFile BigBlockFile,*LPBIGBLOCKFILE; -typedef struct MappedPage MappedPage,*LPMAPPEDPAGE; - -struct BigBlockFile -{ - BOOL fileBased; - ULARGE_INTEGER filesize; - ULONG blocksize; - HANDLE hfile; - HANDLE hfilemap; - DWORD flProtect; - MappedPage *maplist; - MappedPage *victimhead, *victimtail; - ULONG num_victim_pages; - ILockBytes *pLkbyt; - HGLOBAL hbytearray; - LPVOID pbytearray; -}; /* * Declaration of the functions used to manipulate the BigBlockFile

1 0

Michael Stefaniuc : dinput: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: c0d2a21dd14163eb49629e36a385f04c3a286969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d2a21dd14163eb49629e36a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 10:24:42 2009 +0100 dinput: Remove superfluous pointer casts. --- dlls/dinput/device.c | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/effect_linuxinput.c | 20 ++++++++++---------- dlls/dinput/tests/device.c | 2 +- dlls/dinput/tests/joystick.c | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 8e226cc..941206c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -269,7 +269,7 @@ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df { int i; const char *in_c = in; - char *out_c = (char *) out; + char *out_c = out; memset(out, 0, size); if (df->dt == NULL) { diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6c2a9ed..46e4e28 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -869,7 +869,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( IsEqualCLSID( &IID_IClassFactory, riid ) ) { - *ppv = (LPVOID)&DINPUT_CF; + *ppv = &DINPUT_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 2854b34..155d800 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -423,19 +423,19 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( return diErr; else { if (This->effect.type == FF_PERIODIC) { - LPDIPERIODIC tsp = (LPDIPERIODIC)(peff->lpvTypeSpecificParams); + LPDIPERIODIC tsp = peff->lpvTypeSpecificParams; tsp->dwMagnitude = (This->effect.u.periodic.magnitude / 33) * 10; tsp->lOffset = (This->effect.u.periodic.offset / 33) * 10; tsp->dwPhase = (This->effect.u.periodic.phase / 33) * 36; tsp->dwPeriod = (This->effect.u.periodic.period * 1000); } else if (This->effect.type == FF_CONSTANT) { - LPDICONSTANTFORCE tsp = (LPDICONSTANTFORCE)(peff->lpvTypeSpecificParams); + LPDICONSTANTFORCE tsp = peff->lpvTypeSpecificParams; tsp->lMagnitude = (This->effect.u.constant.level / 33) * 10; } else if (This->effect.type == FF_SPRING || This->effect.type == FF_FRICTION || This->effect.type == FF_INERTIA || This->effect.type == FF_DAMPER) { - LPDICONDITION tsp = (LPDICONDITION)(peff->lpvTypeSpecificParams); + LPDICONDITION tsp = peff->lpvTypeSpecificParams; int i; for (i = 0; i < 2; ++i) { tsp[i].lOffset = (This->effect.u.condition[i].center / 33) * 10; @@ -446,7 +446,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( tsp[i].lDeadBand = (This->effect.u.condition[i].deadband / 33) * 10; } } else if (This->effect.type == FF_RAMP) { - LPDIRAMPFORCE tsp = (LPDIRAMPFORCE)(peff->lpvTypeSpecificParams); + LPDIRAMPFORCE tsp = peff->lpvTypeSpecificParams; tsp->lStart = (This->effect.u.ramp.start_level / 33) * 10; tsp->lEnd = (This->effect.u.ramp.end_level / 33) * 10; } @@ -654,7 +654,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( LPCDIPERIODIC tsp; if (peff->cbTypeSpecificParams != sizeof(DIPERIODIC)) return DIERR_INVALIDPARAM; - tsp = (LPCDIPERIODIC)(peff->lpvTypeSpecificParams); + tsp = peff->lpvTypeSpecificParams; This->effect.u.periodic.magnitude = (tsp->dwMagnitude / 10) * 32; This->effect.u.periodic.offset = (tsp->lOffset / 10) * 32; This->effect.u.periodic.phase = (tsp->dwPhase / 9) * 8; /* == (/ 36 * 32) */ @@ -663,17 +663,17 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( LPCDICONSTANTFORCE tsp; if (peff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; - tsp = (LPCDICONSTANTFORCE)(peff->lpvTypeSpecificParams); + tsp = peff->lpvTypeSpecificParams; This->effect.u.constant.level = (max(min(tsp->lMagnitude, 10000), -10000) / 10) * 32; } else if (type == DIEFT_RAMPFORCE) { LPCDIRAMPFORCE tsp; if (peff->cbTypeSpecificParams != sizeof(DIRAMPFORCE)) return DIERR_INVALIDPARAM; - tsp = (LPCDIRAMPFORCE)(peff->lpvTypeSpecificParams); + tsp = peff->lpvTypeSpecificParams; This->effect.u.ramp.start_level = (tsp->lStart / 10) * 32; This->effect.u.ramp.end_level = (tsp->lStart / 10) * 32; } else if (type == DIEFT_CONDITION) { - LPCDICONDITION tsp = (LPCDICONDITION)(peff->lpvTypeSpecificParams); + LPCDICONDITION tsp = peff->lpvTypeSpecificParams; if (peff->cbTypeSpecificParams == sizeof(DICONDITION)) { /* One condition block. This needs to be rotated to direction, * and expanded to separate x and y conditions. */ @@ -879,7 +879,7 @@ HRESULT linuxinput_get_info_A( info->dwDynamicParams = info->dwStaticParams; /* yes, this is windows behavior (print the GUID_Name for name) */ - strcpy((char*)info->tszName, _dump_dinput_GUID(rguid)); + strcpy(info->tszName, _dump_dinput_GUID(rguid)); return DI_OK; } @@ -914,7 +914,7 @@ HRESULT linuxinput_get_info_W( /* yes, this is windows behavior (print the GUID_Name for name) */ MultiByteToWideChar(CP_ACP, 0, _dump_dinput_GUID(rguid), -1, - (WCHAR*)info->tszName, MAX_PATH); + info->tszName, MAX_PATH); return DI_OK; } diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index e59d8c3..83c18f1 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -120,7 +120,7 @@ struct enum_data static BOOL CALLBACK enum_devices(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef) { - struct enum_data *data = (struct enum_data*)pvRef; + struct enum_data *data = pvRef; LPDIRECTINPUTDEVICE device; HRESULT hr; diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 789317e..371f7ee 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -96,7 +96,7 @@ static BOOL CALLBACK EnumAxes( VOID* pContext) { HRESULT hr; - JoystickInfo * info = (JoystickInfo *)pContext; + JoystickInfo * info = pContext; if (IsEqualIID(&pdidoi->guidType, &GUID_XAxis) || IsEqualIID(&pdidoi->guidType, &GUID_YAxis) || @@ -171,7 +171,7 @@ static BOOL CALLBACK EnumJoysticks( LPVOID pvRef) { HRESULT hr; - UserData * data = (UserData *)pvRef; + UserData * data = pvRef; LPDIRECTINPUTDEVICE pJoystick; DIDATAFORMAT format; DIDEVCAPS caps; @@ -267,7 +267,7 @@ static BOOL CALLBACK EnumJoysticks( info.lMin = 0; info.lMax = 0xffff; /* enumerate objects */ - hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); + hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, &info, DIDFT_ALL); ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); ok(caps.dwAxes == info.axis, "Number of enumerated axes (%d) doesn't match capabilities (%d)\n", info.axis, caps.dwAxes); @@ -280,7 +280,7 @@ static BOOL CALLBACK EnumJoysticks( info.lMin = -2000; info.lMax = +2000; info.dZone= 123; - hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); + hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, &info, DIDFT_ALL); ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceInfo(pJoystick, 0);

1 0

Michael Stefaniuc : crypt32: Remove remaining superfluous pointer casts.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 903585162daaf3d1a20a89ebb3fe605156bf2b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903585162daaf3d1a20a89ebb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 10:25:22 2009 +0100 crypt32: Remove remaining superfluous pointer casts. --- dlls/crypt32/filestore.c | 26 ++++++++-------- dlls/crypt32/msg.c | 73 +++++++++++++++++++++------------------------ dlls/crypt32/object.c | 26 ++++++++-------- dlls/crypt32/oid.c | 22 +++++++------- dlls/crypt32/provstore.c | 10 +++--- dlls/crypt32/regstore.c | 16 +++++----- dlls/crypt32/serialize.c | 10 +++--- dlls/crypt32/store.c | 56 +++++++++++++++++------------------ 8 files changed, 116 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=903585162daaf3d1a20a8…

1 0

Michael Stefaniuc : setupapi: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: ffae0123ac46ba6dfac74d7c84422073fd53b580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffae0123ac46ba6dfac74d7c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 28 10:24:55 2009 +0100 setupapi: Remove superfluous pointer casts. --- dlls/setupapi/devinst.c | 44 ++++++++++++++++++++++---------------------- dlls/setupapi/diskspace.c | 4 ++-- dlls/setupapi/fakedll.c | 2 +- dlls/setupapi/parser.c | 2 +- dlls/setupapi/queue.c | 4 ++-- dlls/setupapi/setupcab.c | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffae0123ac46ba6dfac74…

1 0