January 2006 - Wine-Commits

Mike McCormack : wineboot: Use WIN32_LEAN_AND_MEAN.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: cb6983fb304756d914565c8cb7d86a68be8f7c2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb6983fb304756d914565c8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:41:09 2006 +0100 wineboot: Use WIN32_LEAN_AND_MEAN. Use HeapAlloc/HeapFree instead of malloc/free. --- programs/wineboot/wineboot.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index f56143a..4e9270e 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -51,6 +51,8 @@ * processed (requires translations from Unicode to Ansi). */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include <windows.h> #include <wine/debug.h> @@ -240,7 +242,7 @@ static BOOL pendingRename(void) goto end; } - buffer=malloc( dataLength ); + buffer=HeapAlloc( GetProcessHeap(),0,dataLength ); if( buffer==NULL ) { WINE_ERR("Couldn't allocate %lu bytes for the value\n", dataLength ); @@ -325,7 +327,7 @@ static BOOL pendingRename(void) end: if( buffer!=NULL ) - free(buffer); + HeapFree(GetProcessHeap(), 0, buffer); if( hSession!=NULL ) RegCloseKey( hSession ); @@ -460,7 +462,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, goto end; } - if( (szCmdLine=malloc(nMaxCmdLine))==NULL ) + if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL ) { WINE_ERR("Couldn't allocate memory for the commands to be executed\n"); @@ -468,7 +470,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, goto end; } - if( (szValue=malloc((++nMaxValue)*sizeof(*szValue)))==NULL ) + if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL ) { WINE_ERR("Couldn't allocate memory for the value names\n");

1 0

Mike McCormack : kernel32: Define SCS_64BIT_BINARY.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 91199249ecb18d9e8729535464145c0727dcd9ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91199249ecb18d9e8729535… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:40:33 2006 +0100 kernel32: Define SCS_64BIT_BINARY. --- include/winbase.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index f574085..b6d98cc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1171,6 +1171,7 @@ typedef struct _WIN32_STREAM_ID { #define SCS_PIF_BINARY 3 #define SCS_POSIX_BINARY 4 #define SCS_OS216_BINARY 5 +#define SCS_64BIT_BINARY 6 /* flags for DefineDosDevice */ #define DDD_RAW_TARGET_PATH 0x00000001

1 0

Mike McCormack : ntdll: Use the NTAPI definition of EXCEPTION_ACCESS_VIOLATION.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: a3348cf4a0179a4d2097d59c27096d5f9d250fe9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3348cf4a0179a4d2097d59… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:40:25 2006 +0100 ntdll: Use the NTAPI definition of EXCEPTION_ACCESS_VIOLATION. --- dlls/ntdll/exception.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index d4c4b32..c1677b6 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -568,7 +568,7 @@ DWORD __wine_exception_handler( EXCEPTIO if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ { - if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) + if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) return ExceptionContinueSearch; } else if (wine_frame->u.filter)

1 0

Mike McCormack : ntdll: Add a stub implementation of NtNotifyChangeDirectoryFile.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 0c728255a4f0188acf379aa750437b6c3cd11d87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c728255a4f0188acf379aa… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:40:11 2006 +0100 ntdll: Add a stub implementation of NtNotifyChangeDirectoryFile. --- dlls/ntdll/directory.c | 15 +++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 291e2a8..a86b9a4 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1777,3 +1777,18 @@ done: RtlReleasePebLock(); return status; } + +/****************************************************************************** + * NtNotifyChangeDirectoryFile [NTDLL.@] + */ +NTSTATUS WINAPI +NtNotifyChangeDirectoryFile( HANDLE FileHandle, HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, PVOID ApcContext, + PIO_STATUS_BLOCK IoStatusBlock, PVOID Buffer, + ULONG BufferSize, ULONG CompletionFilter, BOOLEAN WatchTree ) +{ + FIXME("%p %p %p %p %p %p %lu %lu %d\n", + FileHandle, Event, ApcRoutine, ApcContext, IoStatusBlock, + Buffer, BufferSize, CompletionFilter, WatchTree ); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 22fe7da..433ca6e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -200,7 +200,7 @@ # @ stub NtMapUserPhysicalPagesScatter @ stdcall NtMapViewOfSection(long long ptr long long ptr ptr long long long) # @ stub NtModifyBootEntry -@ stub NtNotifyChangeDirectoryFile +@ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) # @ stub NtNotifyChangeMultipleKeys @ stdcall NtOpenDirectoryObject(long long long)

1 0

Robert Reif : dsound: Make dumpCooperativeLevel global.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: eb919b52636fcc18728c300c45b624dcc7d9ca9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eb919b52636fcc18728c300… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jan 16 20:39:52 2006 +0100 dsound: Make dumpCooperativeLevel global. Remove extern from some function prototypes. --- dlls/dsound/dsound.c | 2 +- dlls/dsound/dsound_private.h | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 1adb347..6645663 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -45,7 +45,7 @@ static ULONG WINAPI IDirectSound8_IUnkno static ULONG WINAPI IDirectSound8_IDirectSound_AddRef(LPDIRECTSOUND iface); static ULONG WINAPI IDirectSound8_IDirectSound8_AddRef(LPDIRECTSOUND8 iface); -static const char * dumpCooperativeLevel(DWORD level) +const char * dumpCooperativeLevel(DWORD level) { static char unknown[32]; #define LE(x) case x: return #x diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 89b00f1..efaa864 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -491,9 +491,8 @@ struct IClassFactoryImpl extern IClassFactoryImpl DSOUND_CAPTURE_CF; extern IClassFactoryImpl DSOUND_FULLDUPLEX_CF; -void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); -void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); -void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); +/******************************************************************************* + */ /* dsound.c */ @@ -520,6 +519,9 @@ void DSOUND_ForceRemix(IDirectSoundBuffe void DSOUND_MixCancelAt(IDirectSoundBufferImpl *dsb, DWORD buf_writepos); void DSOUND_WaveQueue(DirectSoundDevice *device, DWORD mixq); void DSOUND_PerformMix(DirectSoundDevice *device); +void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan); +void DSOUND_AmpFactorToVolPan(PDSVOLUMEPAN volpan); +void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb); void CALLBACK DSOUND_timer(UINT timerID, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); void CALLBACK DSOUND_callback(HWAVEOUT hwo, UINT msg, DWORD dwUser, DWORD dw1, DWORD dw2); @@ -555,6 +557,7 @@ extern GUID DSOUND_renderer_guids[MAXWAV extern DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS]; extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -extern HRESULT mmErr(UINT err); -extern void setup_dsound_options(void); -extern const char * get_device_id(LPCGUID pGuid); +HRESULT mmErr(UINT err); +void setup_dsound_options(void); +const char * get_device_id(LPCGUID pGuid); +const char * dumpCooperativeLevel(DWORD level);

1 0

Robert Reif : dsound: Make some capture functions global.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 34ec3a633abb3391325da4cd6824d193ad1cf684 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=34ec3a633abb3391325da4c… Author: Robert Reif <reif(a)earthlink.net> Date: Mon Jan 16 20:39:14 2006 +0100 dsound: Make some capture functions global. --- dlls/dsound/capture.c | 9 +++------ dlls/dsound/dsound_private.h | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 06d0f3a..8b42582 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -447,8 +447,7 @@ IDirectSoundCaptureImpl_Release( LPDIREC return ref; } -static HRESULT WINAPI -IDirectSoundCaptureImpl_CreateCaptureBuffer( +HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( LPDIRECTSOUNDCAPTURE iface, LPCDSCBUFFERDESC lpcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, @@ -494,8 +493,7 @@ IDirectSoundCaptureImpl_CreateCaptureBuf return hr; } -static HRESULT WINAPI -IDirectSoundCaptureImpl_GetCaps( +HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( LPDIRECTSOUNDCAPTURE iface, LPDSCCAPS lpDSCCaps ) { @@ -528,8 +526,7 @@ IDirectSoundCaptureImpl_GetCaps( return DS_OK; } -static HRESULT WINAPI -IDirectSoundCaptureImpl_Initialize( +HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( LPDIRECTSOUNDCAPTURE iface, LPCGUID lpcGUID ) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 77070ec..89b00f1 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -527,6 +527,20 @@ void CALLBACK DSOUND_callback(HWAVEOUT h void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb); +/* capture.c */ + +HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( + LPDIRECTSOUNDCAPTURE iface, + LPCDSCBUFFERDESC lpcDSCBufferDesc, + LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, + LPUNKNOWN pUnk); +HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( + LPDIRECTSOUNDCAPTURE iface, + LPDSCCAPS lpDSCCaps); +HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( + LPDIRECTSOUNDCAPTURE iface, + LPCGUID lpcGUID); + #define STATE_STOPPED 0 #define STATE_STARTING 1 #define STATE_PLAYING 2

1 0

Mike McCormack : kernel32: Add FILE_NOTIFY_INFORMATION.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: b8e5e0168a70432e6991289643254074b103b42b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b8e5e0168a70432e6991289… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:38:39 2006 +0100 kernel32: Add FILE_NOTIFY_INFORMATION. --- include/winnt.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 9efe87b..f55203d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3851,6 +3851,13 @@ typedef union _FILE_SEGMENT_ELEMENT { ULONGLONG Alignment; } FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT; +typedef struct _FILE_NOTIFY_INFORMATION { + DWORD NextEntryOffset; + DWORD Action; + DWORD FileNameLength; + WCHAR FileName[1]; +} FILE_NOTIFY_INFORMATION, *PFILE_NOTIFY_INFORMATION; + /* ----------------------------- begin registry ----------------------------- */ /* Registry security values */

1 0

Mike McCormack : make_ctests: Declare WIN32_LEAN_AND_MEAN when compiling testlist.c.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 48cbfd7e4c003bb93c02db260ad7b11b8b2550da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=48cbfd7e4c003bb93c02db2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:38:53 2006 +0100 make_ctests: Declare WIN32_LEAN_AND_MEAN when compiling testlist.c. --- tools/make_ctests.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/make_ctests.c b/tools/make_ctests.c index 3dd99df..de3ed0e 100644 --- a/tools/make_ctests.c +++ b/tools/make_ctests.c @@ -117,6 +117,7 @@ int main( int argc, const char** argv ) fprintf( out, "/* Automatically generated file; DO NOT EDIT!! */\n" "\n" + "#define WIN32_LEAN_AND_MEAN\n" "#include <windows.h>\n\n" "#define STANDALONE\n" "#include \"wine/test.h\"\n\n" );

1 0

Mike McCormack : msi: Eliminate a fixed length buffer.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 477bce38dc5b0efeb55b5cc407b3ff32eed19c3f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=477bce38dc5b0efeb55b5cc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:38:28 2006 +0100 msi: Eliminate a fixed length buffer. --- dlls/msi/action.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6f4ce41..61dd099 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2849,10 +2849,8 @@ static UINT ACTION_RegisterTypeLibraries static UINT ITERATE_CreateShortcuts(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = (MSIPACKAGE*)param; - LPWSTR target_file, target_folder; + LPWSTR target_file, target_folder, filename; LPCWSTR buffer; - WCHAR filename[0x100]; - DWORD sz; MSICOMPONENT *comp; static const WCHAR szlnk[]={'.','l','n','k',0}; IShellLinkW *sl; @@ -2899,13 +2897,13 @@ static UINT ITERATE_CreateShortcuts(MSIR /* may be needed because of a bug somehwere else */ create_full_pathW(target_folder); - sz = 0x100; - MSI_RecordGetStringW(row,3,filename,&sz); + filename = msi_dup_record_field( row, 3 ); reduce_to_longfilename(filename); if (!strchrW(filename,'.') || strcmpiW(strchrW(filename,'.'),szlnk)) strcatW(filename,szlnk); target_file = build_directory_name(2, target_folder, filename); msi_free(target_folder); + msi_free(filename); buffer = MSI_RecordGetString(row,5); if (strchrW(buffer,'['))

1 0

Hans Leidekker : gdi: better implementation for GetCharABCWidthsFloat{A, W}.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: f8125a98d8dbd1979021d69df6ebe701fe6c3e39 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8125a98d8dbd1979021d69… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 16 20:38:17 2006 +0100 gdi: better implementation for GetCharABCWidthsFloat{A,W}. --- dlls/gdi/font.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 72 insertions(+), 10 deletions(-) diff --git a/dlls/gdi/font.c b/dlls/gdi/font.c index e6a00a3..ffebd7e 100644 --- a/dlls/gdi/font.c +++ b/dlls/gdi/font.c @@ -2785,22 +2785,84 @@ GetCharacterPlacementW( /************************************************************************* * GetCharABCWidthsFloatA [GDI32.@] + * + * See GetCharABCWidthsFloatW. */ -BOOL WINAPI GetCharABCWidthsFloatA(HDC hdc, UINT iFirstChar, UINT iLastChar, - LPABCFLOAT lpABCF) +BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) { - FIXME_(gdi)("GetCharABCWidthsFloatA, stub\n"); - return 0; + INT i, wlen, count = (INT)(last - first + 1); + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + if (count <= 0) return FALSE; + + str = HeapAlloc(GetProcessHeap(), 0, count); + + for(i = 0; i < count; i++) + str[i] = (BYTE)(first + i); + + wstr = FONT_mbtowc( hdc, str, count, &wlen, NULL ); + + for (i = 0; i < wlen; i++) + { + if (!GetCharABCWidthsFloatW( hdc, wstr[i], wstr[i], abcf )) + { + ret = FALSE; + break; + } + abcf++; + } + + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, wstr ); + + return ret; } /************************************************************************* * GetCharABCWidthsFloatW [GDI32.@] - */ -BOOL WINAPI GetCharABCWidthsFloatW(HDC hdc, UINT iFirstChar, - UINT iLastChar, LPABCFLOAT lpABCF) -{ - FIXME_(gdi)("GetCharABCWidthsFloatW, stub\n"); - return 0; + * + * Retrieves widths of a range of characters. + * + * PARAMS + * hdc [I] Handle to device context. + * first [I] First character in range to query. + * last [I] Last character in range to query. + * abcf [O] Array of LPABCFLOAT structures. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * BUGS + * Only works with TrueType fonts. It also doesn't return real + * floats but converted integers because it's implemented on + * top of GetCharABCWidthsW. + */ +BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) +{ + ABC *abc; + unsigned int i, size = sizeof(ABC) * (last - first + 1); + BOOL ret; + + TRACE("%p, %d, %d, %p - partial stub\n", hdc, first, last, abcf); + + abc = HeapAlloc( GetProcessHeap(), 0, size ); + if (!abc) return FALSE; + + ret = GetCharABCWidthsW( hdc, first, last, abc ); + if (ret == TRUE) + { + for (i = first; i <= last; i++, abc++, abcf++) + { + abcf->abcfA = abc->abcA; + abcf->abcfB = abc->abcB; + abcf->abcfC = abc->abcC; + } + } + HeapFree( GetProcessHeap(), 0, abc ); + return ret; } /*************************************************************************

1 0