December 2007 - Wine-Commits

James Hawkins : msi: Remove two tests that depend on the sort order of RegEnumValue.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 2634d86a08eab0bf91e32376c7c770b015f37d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2634d86a08eab0bf91e32376c… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 7 14:49:11 2007 -0600 msi: Remove two tests that depend on the sort order of RegEnumValue. --- dlls/msi/tests/msi.c | 18 ------------------ 1 files changed, 0 insertions(+), 18 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 963abc2..1924411 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -1434,15 +1434,6 @@ static void test_MsiGetProductCode(void) res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - /* another product value exists */ - lstrcpyA(product, "prod"); - r = MsiGetProductCodeA(component, product); - todo_wine - { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); - ok(!lstrcmpA(product, prodcode2), "Expected %s, got %s\n", prodcode2, product); - } - lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); lstrcatA(keypath, "Installer\\Managed\\"); lstrcatA(keypath, usersid); @@ -1556,15 +1547,6 @@ static void test_MsiGetProductCode(void) res = RegSetValueExA(compkey, prod2_squashed, 0, REG_SZ, (const BYTE *)"C:\\another", 10); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - /* another product value exists */ - lstrcpyA(product, "prod"); - r = MsiGetProductCodeA(component, product); - todo_wine - { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %d\n", r); - ok(!lstrcmpA(product, prodcode2), "Expected %s, got %s\n", prodcode2, product); - } - lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\"); lstrcatA(keypath, "Installer\\Managed\\"); lstrcatA(keypath, usersid);

1 0

Andrew Talbot : dmusic: Remove unneeded casts.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 8a4db52f2a43f0a533d4bc7d07dc79b3278a1a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4db52f2a43f0a533d4bc7d0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 8 15:33:51 2007 +0000 dmusic: Remove unneeded casts. --- dlls/dmusic/collection.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index d9ef658..06842c5 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -118,7 +118,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr tmpEntry = LIST_ENTRY(listEntry, DMUS_PRIVATE_INSTRUMENTENTRY, entry); IDirectMusicInstrument_GetPatch (tmpEntry->pInstrument, &dwInstPatch); if (dwPatch == dwInstPatch) { - *ppInstrument = (LPDIRECTMUSICINSTRUMENT)tmpEntry->pInstrument; + *ppInstrument = tmpEntry->pInstrument; IDirectMusicInstrument_AddRef (tmpEntry->pInstrument); IDirectMusicInstrumentImpl_Custom_Load (tmpEntry->pInstrument, This->pStm); /* load instrument before returning it */ TRACE(": returning instrument %p\n", *ppInstrument); diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index b9f380d..34edce9 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -134,7 +134,7 @@ static HRESULT WINAPI IDirectMusic8Impl_CreatePort (LPDIRECTMUSIC8 iface, REFCLS if (!This->ppPorts) This->ppPorts = HeapAlloc(GetProcessHeap(), 0, sizeof(LPDIRECTMUSICPORT) * This->nrofports); else This->ppPorts = HeapReAlloc(GetProcessHeap(), 0, This->ppPorts, sizeof(LPDIRECTMUSICPORT) * This->nrofports); This->ppPorts[This->nrofports - 1] = pNewPort; - *ppPort = (LPDIRECTMUSICPORT) pNewPort; + *ppPort = pNewPort; return S_OK; } } diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 24901ba..2b62998 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -54,7 +54,7 @@ static ULONG WINAPI DirectMusicCF_Release(LPCLASSFACTORY iface) { static HRESULT WINAPI DirectMusicCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { TRACE ("(%p, %s, %p)\n", pOuter, debugstr_dmguid(riid), ppobj); - return DMUSIC_CreateDirectMusicImpl (riid, (LPVOID*) ppobj, pOuter); + return DMUSIC_CreateDirectMusicImpl (riid, ppobj, pOuter); } static HRESULT WINAPI DirectMusicCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {

1 0

Andrew Talbot : dmloader: Remove unneeded casts.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 9e55f92b29c9e3b1f201f9ca84fbb9830eab3c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e55f92b29c9e3b1f201f9ca8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 8 08:41:22 2007 +0000 dmloader: Remove unneeded casts. --- dlls/dmloader/loaderstream.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 2a1938f..97047cf 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -179,16 +179,16 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Clone (LPSTREAM iface if (SUCCEEDED(result)) { LARGE_INTEGER liNewPosition; liNewPosition.QuadPart = ullCurrentPosition.QuadPart; - result = IDirectMusicLoaderFileStream_IStream_Seek ((LPSTREAM)pOther, liNewPosition, STREAM_SEEK_SET, &ullCurrentPosition); + result = IDirectMusicLoaderFileStream_IStream_Seek (pOther, liNewPosition, STREAM_SEEK_SET, &ullCurrentPosition); } if (FAILED(result)) { TRACE(": failed\n"); - IDirectMusicLoaderFileStream_IStream_Release ((LPSTREAM)pOther); + IDirectMusicLoaderFileStream_IStream_Release (pOther); return result; } } TRACE(": succeeded\n"); - *ppstm = (IStream*)pOther; + *ppstm = pOther; return S_OK; } @@ -452,7 +452,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Clone (LPSTREAM i IDirectMusicLoaderResourceStream_Attach (pOther, This->pbMemData, This->llMemLength, This->llPos, This->pLoader); TRACE(": succeeded\n"); - *ppstm = (IStream*)pOther; + *ppstm = pOther; return S_OK; } @@ -670,7 +670,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Clone (LPSTREAM if IDirectMusicLoaderGenericStream_Attach (pOther, pLowLevel, This->pLoader); TRACE(": succeeded\n"); - *ppstm = (IStream*)pOther; + *ppstm = pOther; return S_OK; }

1 0

Alexandre Julliard : kernel32: Read label and serial from the filesystem when the device is accessible but unknown .
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: c5d63b55352f85a56e63dc0aaf5f74084de1403a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d63b55352f85a56e63dc0aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 8 19:53:24 2007 +0100 kernel32: Read label and serial from the filesystem when the device is accessible but unknown. --- dlls/kernel32/volume.c | 109 ++++++++++++++++++++++++++--------------------- 1 files changed, 60 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7f07f56..1869d0d 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -161,6 +161,52 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) return TRUE; } +/* get the label by reading it from a file at the root of the filesystem */ +static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) +{ + HANDLE handle; + WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; + + labelW[0] = device[4]; + handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[256], *p; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + p = buffer + size; + while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; + *p = 0; + if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, len )) + label[len-1] = 0; + } + else label[0] = 0; +} + +/* get the serial number by reading it from a file at the root of the filesystem */ +static DWORD get_filesystem_serial( const WCHAR *device ) +{ + HANDLE handle; + WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; + + serialW[0] = device[4]; + handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[32]; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + buffer[size] = 0; + return strtoul( buffer, NULL, 16 ); + } + else return 0; +} /* fetch the type of a drive from the registry */ static UINT get_registry_drive_type( const WCHAR *root ) @@ -256,10 +302,11 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /* try a fixed disk, with a FAT partition */ if (SetFilePointer( handle, 0, NULL, FILE_BEGIN ) != 0 || - !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || - size != SUPERBLOCK_SIZE) + !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL )) return FS_ERROR; + if (size < SUPERBLOCK_SIZE) return FS_UNKNOWN; + /* FIXME: do really all FAT have their name beginning with * "FAT" ? (At least FAT12, FAT16 and FAT32 have :) */ @@ -332,7 +379,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock, +static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, const BYTE *superblock, WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; @@ -341,9 +388,11 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock switch(type) { case FS_ERROR: - case FS_UNKNOWN: label_len = 0; break; + case FS_UNKNOWN: + get_filesystem_label( device, label, len ); + return; case FS_FAT1216: label_ptr = superblock + 0x2b; label_len = 11; @@ -384,13 +433,14 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( enum fs_type type, const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( const WCHAR *device, enum fs_type type, const BYTE *superblock ) { switch(type) { case FS_ERROR: - case FS_UNKNOWN: break; + case FS_UNKNOWN: + return get_filesystem_serial( device ); case FS_FAT1216: return GETLONG( superblock, 0x27 ); case FS_FAT32: @@ -519,8 +569,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); if (type == FS_ERROR) return FALSE; - if (label && label_len) VOLUME_GetSuperblockLabel( type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); goto fill_fs_info; } else TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); @@ -544,47 +594,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, break; } - if (label && label_len) - { - WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; - - labelW[0] = device[4]; - handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[256], *p; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - p = buffer + size; - while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; - *p = 0; - if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, label_len )) - label[label_len-1] = 0; - } - else label[0] = 0; - } - if (serial) - { - WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; - - serialW[0] = device[4]; - handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[32]; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - buffer[size] = 0; - *serial = strtoul( buffer, NULL, 16 ); - } - else *serial = 0; - } + if (label && label_len) get_filesystem_label( device, label, label_len ); + if (serial) *serial = get_filesystem_serial( device ); fill_fs_info: /* now fill in the information that depends on the file system type */

1 0

James Hawkins : msi: Reimplement MsiGetProductCode.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 44349af11ac90d70b186ed05203e9dd2371b7b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44349af11ac90d70b186ed052… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 7 14:49:54 2007 -0600 msi: Reimplement MsiGetProductCode. --- dlls/msi/msi.c | 68 ++++++++++++++++++++++++++----------- dlls/msi/tests/msi.c | 92 +++++++++++++------------------------------------ 2 files changed, 73 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44349af11ac90d70b186e…

1 0

James Hawkins : msi: Handle the CompLocator table in the AppSearch action.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: e6431cd06e2efcbca33becacbd0d74b491d25ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6431cd06e2efcbca33becacb… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 7 14:51:17 2007 -0600 msi: Handle the CompLocator table in the AppSearch action. --- dlls/msi/appsearch.c | 70 ++++++++++++++++++++++++++++++++++++++------- dlls/msi/tests/package.c | 20 ++---------- 2 files changed, 63 insertions(+), 27 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 64b2d48..5f5bba8 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -28,6 +28,7 @@ #include "msiquery.h" #include "msidefs.h" #include "winver.h" +#include "shlwapi.h" #include "wine/unicode.h" #include "wine/debug.h" #include "msipriv.h" @@ -157,30 +158,77 @@ static void ACTION_FreeSignature(MSISIGNATURE *sig) static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATURE *sig) { static const WCHAR query[] = { - 's','e','l','e','c','t',' ','*',' ', - 'f','r','o','m',' ', - 'C','o','m','p','L','o','c','a','t','o','r',' ', - 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e','_',' ','=',' ', + 'S','E','L','E','C','T',' ','*',' ', + 'F','R','O','M',' ', + '`','C','o','m','p','L','o','c','a','t','o','r','`',' ', + 'W','H','E','R','E',' ','`','S','i','g','n','a','t','u','r','e','_','`',' ','=',' ', '\'','%','s','\'',0}; - MSIRECORD *row; - LPWSTR guid; + static const WCHAR sigquery[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','S','i','g','n','a','t','u','r','e','`',' ', + 'W','H','E','R','E',' ','`','S','i','g','n','a','t','u','r','e','`',' ','=',' ', + '\'','%','s','\'',0}; + + MSIRECORD *row, *rec; + LPCWSTR signature, guid; + BOOL sigpresent = TRUE; + BOOL isdir; + UINT type; + WCHAR path[MAX_PATH]; + DWORD size = MAX_PATH; + LPWSTR ptr; + DWORD attr; TRACE("%s\n", debugstr_w(sig->Name)); *appValue = NULL; - row = MSI_QueryGetRecord( package->db, query, sig->Name ); + row = MSI_QueryGetRecord(package->db, query, sig->Name); if (!row) { TRACE("failed to query CompLocator for %s\n", debugstr_w(sig->Name)); return ERROR_SUCCESS; } - guid = msi_dup_record_field( row, 2 ); - FIXME("AppSearch CompLocator (%s) unimplemented\n", debugstr_w(guid)); - msi_free( guid ); - msiobj_release( &row->hdr ); + signature = MSI_RecordGetString(row, 1); + guid = MSI_RecordGetString(row, 2); + type = MSI_RecordGetInteger(row, 3); + + rec = MSI_QueryGetRecord(package->db, sigquery, signature); + if (!rec) + sigpresent = FALSE; + + *path = '\0'; + MsiLocateComponentW(guid, path, &size); + if (!*path) + goto done; + + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES) + goto done; + isdir = (attr & FILE_ATTRIBUTE_DIRECTORY); + + if (type != msidbLocatorTypeDirectory && sigpresent && !isdir) + { + *appValue = strdupW(path); + } + else if (!sigpresent && (type != msidbLocatorTypeDirectory || isdir)) + { + if (type == msidbLocatorTypeFileName) + { + ptr = strrchrW(path, '\\'); + *(ptr + 1) = '\0'; + } + else + PathAddBackslashW(path); + + *appValue = strdupW(path); + } + +done: + if (rec) msiobj_release(&rec->hdr); + msiobj_release(&row->hdr); return ERROR_SUCCESS; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e4ba8e5..b52aab8 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5228,10 +5228,7 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\abelisaurus"); - todo_wine - { - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); - } + ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "BACTROSAURUS", prop, &size); @@ -5254,10 +5251,7 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\"); - todo_wine - { - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); - } + ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "FALCARIUS", prop, &size); @@ -5300,10 +5294,7 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\"); - todo_wine - { - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); - } + ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "NEOSODON", prop, &size); @@ -5311,10 +5302,7 @@ static void test_complocator(void) lstrcpyA(expected, CURR_DIR); lstrcatA(expected, "\\neosodon\\"); - todo_wine - { - ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); - } + ok(!lstrcmpA(prop, expected), "Expected %s, got %s\n", expected, prop); size = MAX_PATH; r = MsiGetPropertyA(hpkg, "OLOROTITAN", prop, &size);

1 0

Andrew Talbot : dmime: Remove unneeded casts.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 301b867909c003d5e1c65ee7fe18d3cae19d6661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301b867909c003d5e1c65ee7f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 7 23:01:46 2007 +0000 dmime: Remove unneeded casts. --- dlls/dmime/audiopath.c | 10 +++++----- dlls/dmime/performance.c | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 2deb846..448160f 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectI DMUSIC_CreateDirectMusicGraphImpl (&IID_IDirectMusicGraph, (LPVOID*)&pGraph, NULL); This->pToolGraph = (IDirectMusicGraph*) pGraph; } - *ppObject = (LPDIRECTMUSICGRAPH) This->pToolGraph; + *ppObject = This->pToolGraph; IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) *ppObject); return S_OK; } @@ -158,7 +158,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectI case DMUS_PATH_PERFORMANCE: { /* TODO check wanted GUID */ - *ppObject = (LPDIRECTMUSICPERFORMANCE8) This->pPerf; + *ppObject = This->pPerf; IUnknown_AddRef((LPUNKNOWN) *ppObject); return S_OK; } @@ -167,16 +167,16 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_GetObjectI case DMUS_PATH_PERFORMANCE_GRAPH: { IDirectMusicGraph* pPerfoGraph = NULL; - IDirectMusicPerformance8_GetGraph((LPDIRECTMUSICPERFORMANCE8) This->pPerf, &pPerfoGraph); + IDirectMusicPerformance8_GetGraph(This->pPerf, &pPerfoGraph); if (NULL == pPerfoGraph) { IDirectMusicGraphImpl* pGraph = NULL; DMUSIC_CreateDirectMusicGraphImpl (&IID_IDirectMusicGraph, (LPVOID*)&pGraph, NULL); - IDirectMusicPerformance8_SetGraph((LPDIRECTMUSICPERFORMANCE8) This->pPerf, (IDirectMusicGraph*) pGraph); + IDirectMusicPerformance8_SetGraph(This->pPerf, (IDirectMusicGraph*) pGraph); /* we need release as SetGraph do an AddRef */ IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) pGraph); pPerfoGraph = (LPDIRECTMUSICGRAPH) pGraph; } - *ppObject = (LPDIRECTMUSICGRAPH) pPerfoGraph; + *ppObject = pPerfoGraph; return S_OK; } break; diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 4013106..51a4b25 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -219,8 +219,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC } if (NULL != pDirectSound) { - This->pDirectSound = (IDirectSound*) pDirectSound; - IDirectSound_AddRef((LPDIRECTSOUND) This->pDirectSound); + This->pDirectSound = pDirectSound; + IDirectSound_AddRef(This->pDirectSound); } else { HRESULT hr; hr = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); @@ -242,7 +242,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { /* app creates it's own dmusic object and gives it to performance */ This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; - IDirectMusic8_AddRef((LPDIRECTMUSIC8) This->pDirectMusic); + IDirectMusic8_AddRef(This->pDirectMusic); } else { /* app allows the performance to initialise itfself and needs a pointer to object*/ CoCreateInstance (&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); @@ -451,8 +451,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGraph (LPDIRECTMUSICPERFOR IDirectMusicPerformance8Impl *This = (IDirectMusicPerformance8Impl *)iface; FIXME("(%p, %p): to check\n", This, ppGraph); if (NULL != This->pToolGraph) { - *ppGraph = (LPDIRECTMUSICGRAPH) This->pToolGraph; - IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) *ppGraph); + *ppGraph = This->pToolGraph; + IDirectMusicGraph_AddRef(*ppGraph); } else { return E_FAIL; } @@ -466,11 +466,11 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph (LPDIRECTMUSICPERFOR if (NULL != This->pToolGraph) { /* Todo clean buffers and tools before */ - IDirectMusicGraph_Release((LPDIRECTMUSICGRAPH) This->pToolGraph); + IDirectMusicGraph_Release(This->pToolGraph); } This->pToolGraph = pGraph; if (NULL != This->pToolGraph) { - IDirectMusicGraph_AddRef((LPDIRECTMUSICGRAPH) This->pToolGraph); + IDirectMusicGraph_AddRef(This->pToolGraph); } return S_OK; } @@ -690,11 +690,11 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown (LPDIRECTMUSICPERFO CloseHandle(This->procThread); } if (NULL != This->pDirectSound) { - IDirectSound_Release((LPDIRECTSOUND) This->pDirectSound); + IDirectSound_Release(This->pDirectSound); This->pDirectSound = NULL; } if (NULL != This->pDirectMusic) { - IDirectMusic8_Release((LPDIRECTMUSIC8) This->pDirectMusic); + IDirectMusic8_Release(This->pDirectMusic); This->pDirectMusic = NULL; } return S_OK; @@ -785,7 +785,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio (LPDIRECTMUSICPERFO This->pParams.dwFeatures = dwFlags; This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink; } - hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, (IDirectMusicAudioPath**) &This->pDefaultPath); + hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); PostMessageToProcessMsgThread(This, PROCESSMSG_START); @@ -829,7 +829,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateAudioPath (LPDIRECTMUSI /** TODO */ - *ppNewPath = (LPDIRECTMUSICAUDIOPATH) pPath; + *ppNewPath = pPath; return IDirectMusicAudioPath_Activate(*ppNewPath, fActivate); } @@ -921,7 +921,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath (LPDI } default_path->pPrimary = buffer; - *ppNewPath = (LPDIRECTMUSICAUDIOPATH) pPath; + *ppNewPath = pPath; TRACE(" returning IDirectMusicPerformance interface at %p.\n", *ppNewPath); @@ -933,13 +933,13 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetDefaultAudioPath (LPDIRECT FIXME("(%p, %p): semi-stub\n", This, pAudioPath); if (NULL != This->pDefaultPath) { - IDirectMusicAudioPath_Release((LPDIRECTMUSICAUDIOPATH) This->pDefaultPath); + IDirectMusicAudioPath_Release(This->pDefaultPath); ((IDirectMusicAudioPathImpl*) This->pDefaultPath)->pPerf = NULL; This->pDefaultPath = NULL; } This->pDefaultPath = pAudioPath; if (NULL != This->pDefaultPath) { - IDirectMusicAudioPath_AddRef((LPDIRECTMUSICAUDIOPATH) This->pDefaultPath); + IDirectMusicAudioPath_AddRef(This->pDefaultPath); ((IDirectMusicAudioPathImpl*) This->pDefaultPath)->pPerf = (IDirectMusicPerformance8*) This; } @@ -952,7 +952,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetDefaultAudioPath (LPDIRECT FIXME("(%p, %p): semi-stub (%p)\n", This, ppAudioPath, This->pDefaultPath); if (NULL != This->pDefaultPath) { - *ppAudioPath = (LPDIRECTMUSICAUDIOPATH) This->pDefaultPath; + *ppAudioPath = This->pDefaultPath; IDirectMusicAudioPath_AddRef(*ppAudioPath); } else { *ppAudioPath = NULL;

1 0

Alexandre Julliard : kernel32: Revert change that slipped in commit db24d3af9a6e56c3036ba0a3e5d62dae4f2676d3 by mistake .
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 6a3dd1ecf9571da6fd22a8bcb5b8f571e22481be URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a3dd1ecf9571da6fd22a8bcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 8 19:49:52 2007 +0100 kernel32: Revert change that slipped in commit db24d3af9a6e56c3036ba0a3e5d62dae4f2676d3 by mistake. --- dlls/kernel32/volume.c | 114 ++++++++++++++++++++---------------------------- 1 files changed, 47 insertions(+), 67 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 655fda1..7f07f56 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -58,14 +58,11 @@ enum fs_type { FS_ERROR, /* error accessing the device */ FS_UNKNOWN, /* unknown file system */ - FS_PLACEHOLDER, /* Wine placeholder for drive device */ FS_FAT1216, FS_FAT32, FS_ISO9660 }; -static const char wine_placeholder[] = "Wine device placeholder"; - static const WCHAR drive_types[][8] = { { 0 }, /* DRIVE_UNKNOWN */ @@ -164,52 +161,6 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) return TRUE; } -/* get the label by reading it from a file at the root of the filesystem */ -static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) -{ - HANDLE handle; - WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; - - labelW[0] = device[4]; - handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[256], *p; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - p = buffer + size; - while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; - *p = 0; - if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, len )) - label[len-1] = 0; - } - else label[0] = 0; -} - -/* get the serial number by reading it from a file at the root of the filesystem */ -static DWORD get_filesystem_serial( const WCHAR *device ) -{ - HANDLE handle; - WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; - - serialW[0] = device[4]; - handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[32]; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - buffer[size] = 0; - return strtoul( buffer, NULL, 16 ); - } - else return 0; -} /* fetch the type of a drive from the registry */ static UINT get_registry_drive_type( const WCHAR *root ) @@ -305,15 +256,10 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /* try a fixed disk, with a FAT partition */ if (SetFilePointer( handle, 0, NULL, FILE_BEGIN ) != 0 || - !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL )) + !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || + size != SUPERBLOCK_SIZE) return FS_ERROR; - if (size >= sizeof(wine_placeholder)-1 && - !memcmp( buff, wine_placeholder, sizeof(wine_placeholder)-1 )) - return FS_PLACEHOLDER; - - if (size != SUPERBLOCK_SIZE) return FS_ERROR; - /* FIXME: do really all FAT have their name beginning with * "FAT" ? (At least FAT12, FAT16 and FAT32 have :) */ @@ -386,7 +332,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, const BYTE *superblock, +static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock, WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; @@ -398,9 +344,6 @@ static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, c case FS_UNKNOWN: label_len = 0; break; - case FS_PLACEHOLDER: - get_filesystem_label( device, label, len ); - break; case FS_FAT1216: label_ptr = superblock + 0x2b; label_len = 11; @@ -441,15 +384,13 @@ static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, c /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( const WCHAR *device, enum fs_type type, const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( enum fs_type type, const BYTE *superblock ) { switch(type) { case FS_ERROR: case FS_UNKNOWN: break; - case FS_PLACEHOLDER: - return get_filesystem_serial( device ); case FS_FAT1216: return GETLONG( superblock, 0x27 ); case FS_FAT32: @@ -578,8 +519,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); if (type == FS_ERROR) return FALSE; - if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( type, superblock ); goto fill_fs_info; } else TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); @@ -603,8 +544,47 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, break; } - if (label && label_len) get_filesystem_label( device, label, label_len ); - if (serial) *serial = get_filesystem_serial( device ); + if (label && label_len) + { + WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; + + labelW[0] = device[4]; + handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[256], *p; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + p = buffer + size; + while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; + *p = 0; + if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, label_len )) + label[label_len-1] = 0; + } + else label[0] = 0; + } + if (serial) + { + WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; + + serialW[0] = device[4]; + handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[32]; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + buffer[size] = 0; + *serial = strtoul( buffer, NULL, 16 ); + } + else *serial = 0; + } fill_fs_info: /* now fill in the information that depends on the file system type */

1 0

Alexandre Julliard : opengl32: ntdll import is still needed when building without optimizations.
by Alexandre Julliard Dec. 8, 2007

Dec. 8, 2007

Module: wine Branch: master Commit: 24241c0847261bc0f1c13e877c0afb811f802d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24241c0847261bc0f1c13e877… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 8 19:49:22 2007 +0100 opengl32: ntdll import is still needed when building without optimizations. --- dlls/opengl32/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 7e32d6b..7c06f5e 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = opengl32.dll IMPORTLIB = libopengl32.$(IMPLIBEXT) -IMPORTS = user32 gdi32 advapi32 kernel32 +IMPORTS = user32 gdi32 advapi32 kernel32 ntdll EXTRAINCL = @X_CFLAGS@ EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@

1 0

Maarten Lankhorst : winealsa: Clear dwBytesRecorded in waveheader when adding buffer.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 322cd0b9796ed2ed7c70f7298c90980bbe064f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=322cd0b9796ed2ed7c70f7298… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Fri Dec 7 10:50:09 2007 +0100 winealsa: Clear dwBytesRecorded in waveheader when adding buffer. --- dlls/winealsa.drv/wavein.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 652e0cd..200879b 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -604,6 +604,7 @@ static DWORD widAddBuffer(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) lpWaveHdr->dwFlags &= ~WHDR_DONE; lpWaveHdr->dwFlags |= WHDR_INQUEUE; + lpWaveHdr->dwBytesRecorded = 0; lpWaveHdr->lpNext = 0; ALSA_AddRingMessage(&WInDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD)lpWaveHdr, FALSE);

1 0