January 2009 - Wine-commits

Michael Stefaniuc : gdi32: Remove superfluous pointer casts.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 667a1ed5bee45b8105ab400f1a86b04dd71dec6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=667a1ed5bee45b8105ab400f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 26 11:01:12 2009 +0100 gdi32: Remove superfluous pointer casts. --- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/enhmetafile.c | 3 +-- dlls/gdi32/enhmfdrv/init.c | 8 ++++---- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/freetype.c | 4 ++-- dlls/gdi32/metafile.c | 8 ++++---- dlls/gdi32/mfdrv/init.c | 6 +++--- dlls/gdi32/mfdrv/objects.c | 2 +- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/gdiobj.c | 2 +- 12 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index f7920df..76d2c98 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -270,7 +270,7 @@ HBRUSH WINAPI CreateDIBPatternBrush( HGLOBAL hbitmap, UINT coloruse ) */ HBRUSH WINAPI CreateDIBPatternBrushPt( const void* data, UINT coloruse ) { - const BITMAPINFO *info=(const BITMAPINFO*)data; + const BITMAPINFO *info=data; LOGBRUSH logbrush; if (!data) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c8a3c4c..bb67232 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -382,7 +382,7 @@ static HDC GetDCState( HDC hdc ) newdc->vportExtY = dc->vportExtY; newdc->BoundsRect = dc->BoundsRect; - newdc->hSelf = (HDC)handle; + newdc->hSelf = handle; newdc->thread = GetCurrentThreadId(); newdc->refcount = 1; newdc->saveLevel = 0; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7782c51..dabcf53 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -616,8 +616,8 @@ INT WINAPI GetDIBits( } colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize; - rgbTriples = (RGBTRIPLE *) colorPtr; - rgbQuads = (RGBQUAD *) colorPtr; + rgbTriples = colorPtr; + rgbQuads = colorPtr; /* Transfer color info */ diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index c329338..4cbd9e3 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2600,8 +2600,7 @@ static INT CALLBACK cbEnhPaletteCopy( HDC a, TRACE( "copying 0x%08x palettes\n", dwNumPalToCopy ); - memcpy( (LPVOID)info->lpPe, - (LPCVOID)(((LPCSTR)lpEof) + lpEof->offPalEntries), + memcpy( info->lpPe, (LPCSTR)lpEof + lpEof->offPalEntries, sizeof( *(info->lpPe) ) * dwNumPalToCopy ); /* Update the passed data as a return code */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index de135d2..c9c566a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -197,7 +197,7 @@ BOOL EMFDRV_WriteRecord( PHYSDEV dev, EMR *emr ) physDev->emh->nRecords++; if(physDev->hFile) { - if (!WriteFile(physDev->hFile, (char *)emr, emr->nSize, NULL, NULL)) + if (!WriteFile(physDev->hFile, emr, emr->nSize, NULL, NULL)) return FALSE; } else { DWORD nEmfSize = HeapSize(GetProcessHeap(), 0, physDev->emh); @@ -407,7 +407,7 @@ HDC WINAPI CreateEnhMetaFileW( EMFDRV_DeleteDC( dc ); return 0; } - if (!WriteFile( hFile, (LPSTR)physDev->emh, size, NULL, NULL )) { + if (!WriteFile( hFile, physDev->emh, size, NULL, NULL )) { EMFDRV_DeleteDC( dc ); return 0; } @@ -482,8 +482,8 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ return 0; } - if (!WriteFile(physDev->hFile, (LPSTR)physDev->emh, - sizeof(*physDev->emh), NULL, NULL)) + if (!WriteFile(physDev->hFile, physDev->emh, sizeof(*physDev->emh), + NULL, NULL)) { CloseHandle( physDev->hFile ); EMFDRV_DeleteDC( dc ); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7862565..c3f12f2 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -920,8 +920,8 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT } else if(dc->funcs->pGetTextExtentExPoint) { FIXME("calling GetTextExtentExPoint\n"); - ret = dc->funcs->pGetTextExtentExPoint( dc->physDev, (LPCWSTR)indices, - count, max_ext, nfit, dxs, size ); + ret = dc->funcs->pGetTextExtentExPoint( dc->physDev, indices, count, + max_ext, nfit, dxs, size ); } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 61ae475..ec78045 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4037,7 +4037,7 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) { const GSUB_CoverageFormat1* cf1; - cf1 = (GSUB_CoverageFormat1*)table; + cf1 = table; if (GET_BE_WORD(cf1->CoverageFormat) == 1) { @@ -4806,7 +4806,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, if (!buf || !buflen) break; memset(buf, 0, buflen); - dst = (unsigned int *)buf; + dst = buf; rgb = (format == WINE_GGO_HRGB_BITMAP || format == WINE_GGO_VRGB_BITMAP); if ( needsTransform ) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 83ea2aa..3806c74 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -804,8 +804,8 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT infohdr->biHeight, infohdr->biPlanes, infohdr->biBitCount, - (LPSTR)(mr->rdParm + - (sizeof(BITMAPINFOHEADER) / 2) + 4)))); + mr->rdParm + + (sizeof(BITMAPINFOHEADER) / 2) + 4))); break; case BS_DIBPATTERN: @@ -928,7 +928,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT mr->rdParm[11], /*Height*/ mr->rdParm[13], /*Planes*/ mr->rdParm[14], /*BitsPixel*/ - (LPSTR)&mr->rdParm[15]); /*bits*/ + &mr->rdParm[15]); /*bits*/ SelectObject(hdcSrc,hbitmap); StretchBlt(hdc, (SHORT)mr->rdParm[9], (SHORT)mr->rdParm[8], (SHORT)mr->rdParm[7], (SHORT)mr->rdParm[6], @@ -946,7 +946,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT mr->rdParm[8]/*Height*/, mr->rdParm[10]/*Planes*/, mr->rdParm[11]/*BitsPixel*/, - (LPSTR)&mr->rdParm[12]/*bits*/); + &mr->rdParm[12]/*bits*/); SelectObject(hdcSrc,hbitmap); BitBlt(hdc,(SHORT)mr->rdParm[6],(SHORT)mr->rdParm[5], (SHORT)mr->rdParm[4],(SHORT)mr->rdParm[3], diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index a1bee45..5525d34 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -339,8 +339,8 @@ static DC *MFDRV_CloseMetaFile( HDC hdc ) } physDev->mh->mtType = METAFILE_MEMORY; /* This is what windows does */ - if (!WriteFile(physDev->hFile, (LPSTR)physDev->mh, - sizeof(*physDev->mh), NULL, NULL)) { + if (!WriteFile(physDev->hFile, physDev->mh, sizeof(*physDev->mh), + NULL, NULL)) { MFDRV_DeleteDC( dc ); return 0; } @@ -457,7 +457,7 @@ BOOL MFDRV_WriteRecord( PHYSDEV dev, METARECORD *mr, DWORD rlen) break; case METAFILE_DISK: TRACE("Writing record to disk\n"); - if (!WriteFile(physDev->hFile, (char *)mr, rlen, NULL, NULL)) + if (!WriteFile(physDev->hFile, mr, rlen, NULL, NULL)) return FALSE; break; default: diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 8370a2c..b4f66ec 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -520,7 +520,7 @@ HPALETTE CDECL MFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPalette, BOOL bForceB BOOL creationSucceed; int sizeofPalette; - GetObjectA(hPalette, sizeof(WORD), (LPSTR) &wNumEntries); + GetObjectA(hPalette, sizeof(WORD), &wNumEntries); if (wNumEntries == 0) return 0; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index c18254b..f03d501 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1430,8 +1430,7 @@ static void REGION_CopyRegion(WINEREGION *dst, WINEREGION *src) dst->extents.top = src->extents.top; dst->extents.right = src->extents.right; dst->extents.bottom = src->extents.bottom; - memcpy((char *) dst->rects, (char *) src->rects, - (int) (src->numRects * sizeof(RECT))); + memcpy(dst->rects, src->rects, src->numRects * sizeof(RECT)); } return; } diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index 6f051b0..67a135e 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -110,7 +110,7 @@ struct hgdiobj_event static DWORD WINAPI thread_proc(void *param) { LOGPEN lp; - struct hgdiobj_event *hgdiobj_event = (struct hgdiobj_event *)param; + struct hgdiobj_event *hgdiobj_event = param; hgdiobj_event->hdc = CreateDC("display", NULL, NULL, NULL); ok(hgdiobj_event->hdc != NULL, "CreateDC error %u\n", GetLastError());

1 0

Vincent Pelletier : dinput: Fix gain-related bugs.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 15a33ab209987606bb1e6e2ee3961245b1cb9ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a33ab209987606bb1e6e2ee… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 24 00:59:48 2009 +0100 dinput: Fix gain-related bugs. --- dlls/dinput/effect_linuxinput.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index f225a65..7302d7f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -380,7 +380,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( } if (dwFlags & DIEP_GAIN) { - peff->dwGain = This->gain; + peff->dwGain = This->gain * 10000 / 0xFFFF; } if (dwFlags & DIEP_SAMPLEPERIOD) { @@ -628,7 +628,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( /* Gain and Sample Period settings are not supported by the linux * event system */ if (dwFlags & DIEP_GAIN) - This->gain = 0xFFFF * peff->dwGain / 1000; + This->gain = 0xFFFF * peff->dwGain / 10000; if (dwFlags & DIEP_SAMPLEPERIOD) TRACE("Sample period requested but no sample period functionality present.\n"); @@ -792,6 +792,7 @@ HRESULT linuxinput_create_effect( newEffect->ref = 1; newEffect->guid = *rguid; newEffect->fd = fd; + newEffect->gain = 0xFFFF; /* set the type. this cannot be changed over the effect's life. */ switch (type) {

1 0

Vincent Pelletier : dinput: Clamp lMagnitude to -10000..10000 range.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: e5abaf9f97b169536029ef8a0d73cf484ae61c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5abaf9f97b169536029ef8a0… Author: Vincent Pelletier <plr.vincent(a)gmail.com> Date: Sat Jan 24 03:45:11 2009 +0100 dinput: Clamp lMagnitude to -10000..10000 range. --- dlls/dinput/effect_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 7302d7f..2854b34 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -664,7 +664,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( if (peff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) return DIERR_INVALIDPARAM; tsp = (LPCDICONSTANTFORCE)(peff->lpvTypeSpecificParams); - This->effect.u.constant.level = (tsp->lMagnitude / 10) * 32; + 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))

1 0

Michael Stefaniuc : crypt32: Remove some more superfluous pointer casts.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 4eaaa913f89b922cfc260fbb17b6402ef0b97ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eaaa913f89b922cfc260fbb1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 26 11:01:47 2009 +0100 crypt32: Remove some more superfluous pointer casts. --- dlls/crypt32/cert.c | 38 +++++----- dlls/crypt32/chain.c | 4 +- dlls/crypt32/collectionstore.c | 26 ++++---- dlls/crypt32/context.c | 4 +- dlls/crypt32/crl.c | 14 ++-- dlls/crypt32/ctl.c | 23 +++--- dlls/crypt32/encode.c | 156 ++++++++++++++++------------------------ 7 files changed, 116 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4eaaa913f89b922cfc260…

1 0

Michael Stefaniuc : itss: Remove some superfluous pointer casts.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 07a7c1f8226156d994e5053ae99cddad332b5542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07a7c1f8226156d994e5053ae… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 26 11:01:19 2009 +0100 itss: Remove some superfluous pointer casts. --- dlls/itss/itss.c | 2 +- dlls/itss/moniker.c | 2 +- dlls/itss/protocol.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index 0722efa..3ecab25 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -363,7 +363,7 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj) its->ref = 1; TRACE("-> %p\n", its); - *ppObj = (LPVOID) its; + *ppObj = its; ITSS_LockModule(); return S_OK; diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 41e2bda..76630cd 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -473,7 +473,7 @@ HRESULT ITS_IParseDisplayName_create(IUnknown *pUnkOuter, LPVOID *ppObj) its->ref = 1; TRACE("-> %p\n", its); - *ppObj = (LPVOID) its; + *ppObj = its; ITSS_LockModule(); return S_OK; diff --git a/dlls/itss/protocol.c b/dlls/itss/protocol.c index c2277e2..a028c85 100644 --- a/dlls/itss/protocol.c +++ b/dlls/itss/protocol.c @@ -47,7 +47,7 @@ typedef struct { } ITSProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) -#define PROTINFO(x) ((IInternetProtocolInfo*) &(x)->lpInternetProtocolInfoVtbl) +#define PROTINFO(x) (&(x)->lpInternetProtocolInfoVtbl) static void release_chm(ITSProtocol *This) {

1 0

Hans Leidekker : setupapi: Implement SetupInstallFileExA/W.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: bd9c265cc26a4cf2c9141a99dadb2f9ccf4b6f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9c265cc26a4cf2c9141a99d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 26 11:03:50 2009 +0100 setupapi: Implement SetupInstallFileExA/W. --- dlls/setupapi/queue.c | 42 +++++++++++++++++++++++++++++++----------- dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index da20e6c..64eacbe 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1063,17 +1063,17 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, } /*********************************************************************** - * SetupInstallFileA (SETUPAPI.@) + * SetupInstallFileExA (SETUPAPI.@) */ -BOOL WINAPI SetupInstallFileA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, PCSTR root, - PCSTR dest, DWORD style, PSP_FILE_CALLBACK_A handler, PVOID context ) +BOOL WINAPI SetupInstallFileExA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, PCSTR root, + PCSTR dest, DWORD style, PSP_FILE_CALLBACK_A handler, PVOID context, PBOOL in_use ) { BOOL ret = FALSE; struct callback_WtoA_context ctx; UNICODE_STRING sourceW, rootW, destW; - TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), - debugstr_a(dest), style, handler, context); + TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), + debugstr_a(dest), style, handler, context, in_use); sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL; if (source && !RtlCreateUnicodeStringFromAsciiz( &sourceW, source )) @@ -1095,7 +1095,7 @@ BOOL WINAPI SetupInstallFileA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, ctx.orig_context = context; ctx.orig_handler = handler; - ret = SetupInstallFileW( hinf, inf_context, sourceW.Buffer, rootW.Buffer, destW.Buffer, style, QUEUE_callback_WtoA, &ctx ); + ret = SetupInstallFileExW( hinf, inf_context, sourceW.Buffer, rootW.Buffer, destW.Buffer, style, QUEUE_callback_WtoA, &ctx, in_use ); exit: RtlFreeUnicodeString( &sourceW ); @@ -1105,10 +1105,19 @@ exit: } /*********************************************************************** - * SetupInstallFileW (SETUPAPI.@) + * SetupInstallFileA (SETUPAPI.@) */ -BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source, PCWSTR root, - PCWSTR dest, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) +BOOL WINAPI SetupInstallFileA( HINF hinf, PINFCONTEXT inf_context, PCSTR source, PCSTR root, + PCSTR dest, DWORD style, PSP_FILE_CALLBACK_A handler, PVOID context ) +{ + return SetupInstallFileExA( hinf, inf_context, source, root, dest, style, handler, context, NULL ); +} + +/*********************************************************************** + * SetupInstallFileExW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source, PCWSTR root, + PCWSTR dest, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context, PBOOL in_use ) { static const WCHAR CopyFiles[] = {'C','o','p','y','F','i','l','e','s',0}; @@ -1116,8 +1125,10 @@ BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source WCHAR *buffer, *p, *inf_source = NULL; unsigned int len; - TRACE("%p %p %s %s %s %x %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), - debugstr_w(dest), style, handler, context); + TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), + debugstr_w(dest), style, handler, context, in_use); + + if (in_use) FIXME("no file in use support\n"); if (hinf) { @@ -1170,6 +1181,15 @@ BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source } /*********************************************************************** + * SetupInstallFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupInstallFileW( HINF hinf, PINFCONTEXT inf_context, PCWSTR source, PCWSTR root, + PCWSTR dest, DWORD style, PSP_FILE_CALLBACK_W handler, PVOID context ) +{ + return SetupInstallFileExW( hinf, inf_context, source, root, dest, style, handler, context, NULL ); +} + +/*********************************************************************** * SetupCommitFileQueueW (SETUPAPI.@) */ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBACK_W handler, diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6c86043..724b143 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -437,8 +437,8 @@ @ stdcall SetupInitializeFileLogA (str long) @ stdcall SetupInitializeFileLogW (wstr long) @ stdcall SetupInstallFileA(ptr ptr str str str long ptr ptr) -@ stub SetupInstallFileExA -@ stub SetupInstallFileExW +@ stdcall SetupInstallFileExA(ptr ptr str str str long ptr ptr ptr) +@ stdcall SetupInstallFileExW(ptr ptr wstr wstr wstr long ptr ptr ptr) @ stdcall SetupInstallFileW(ptr ptr wstr wstr wstr long ptr ptr) @ stdcall SetupInstallFilesFromInfSectionA(long long long str str long) @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long)

1 0

Michael Stefaniuc : msxml3: Remove superfluous pointer casts.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 6a5dda71430e09af24fa8fe896d6e4fe3a782a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5dda71430e09af24fa8fe89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 26 11:01:02 2009 +0100 msxml3: Remove superfluous pointer casts. --- dlls/msxml3/cdata.c | 12 ++++++------ dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/domdoc.c | 24 ++++++++++++------------ dlls/msxml3/node.c | 6 +++--- dlls/msxml3/saxreader.c | 37 +++++++++++++++---------------------- dlls/msxml3/tests/saxreader.c | 2 +- dlls/msxml3/text.c | 4 ++-- dlls/msxml3/xmldoc.c | 2 +- dlls/msxml3/xmlelem.c | 2 +- 9 files changed, 43 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a5dda71430e09af24fa8…

1 0

Reece Dunn : comctl32: Don' t generate a fixme message for the TBSTYLE_EX_DOUBLEBUFFER extended style.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 7fcc9629f8d15b6f73c6f9dd66ed519f55db4ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcc9629f8d15b6f73c6f9dd6… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Sun Jan 25 12:37:06 2009 +0000 comctl32: Don't generate a fixme message for the TBSTYLE_EX_DOUBLEBUFFER extended style. --- dlls/comctl32/toolbar.c | 1 + include/commctrl.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index fb2745f..d991ea1 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -225,6 +225,7 @@ typedef enum #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ TBSTYLE_EX_UNDOC1 | \ TBSTYLE_EX_MIXEDBUTTONS | \ + TBSTYLE_EX_DOUBLEBUFFER | \ TBSTYLE_EX_HIDECLIPPEDBUTTONS) /* all of the CCS_ styles */ diff --git a/include/commctrl.h b/include/commctrl.h index 426d70a..b055bee 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1099,7 +1099,7 @@ static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', #define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */ #define TBSTYLE_EX_MIXEDBUTTONS 0x00000008 #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010 /* don't show partially obscured buttons */ -#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar ??? */ +#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar */ #define TBIF_IMAGE 0x00000001 #define TBIF_TEXT 0x00000002

1 0

Rob Shearman : rpcrt4: Fix buffer overflow in UUID tests.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 2ec1e4a3935811602394531260448e24b5f8d4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ec1e4a393581160239453126… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sun Jan 25 17:07:20 2009 +0000 rpcrt4: Fix buffer overflow in UUID tests. --- dlls/rpcrt4/tests/rpc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index e50dcdc..bf538e4 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -764,9 +764,9 @@ static void test_RpcStringBindingFromBinding(void) ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status); } -static char *printGuid(char *buf, const UUID *guid) +static char *printGuid(char *buf, int size, const UUID *guid) { - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + snprintf(buf, size, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); @@ -792,8 +792,8 @@ static void test_UuidCreate(void) int i; char buf[39]; - memcpy(&and, &guid, sizeof(guid)); - memcpy(&or, &guid, sizeof(guid)); + and = guid; + or = guid; /* Generate a bunch of UUIDs and mask them. By the end, we expect * every randomly generated bit to have been zero at least once, * resulting in no bits set in the and mask except those which are not @@ -814,9 +814,9 @@ static void test_UuidCreate(void) *dst |= *src; } ok(UuidEqual(&and, &v4and, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &and)); + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &and)); ok(UuidEqual(&or, &v4or, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &or)); + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &or)); } else {

1 0

Andrew Talbot : shell32: Declare some functions static.
by Alexandre Julliard 26 Jan '09

26 Jan '09

Module: wine Branch: master Commit: 8838dcb4ce8ff79bc9f25040fdd8784cd7c6fb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8838dcb4ce8ff79bc9f25040f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 24 16:04:27 2009 +0000 shell32: Declare some functions static. --- dlls/shell32/pidl.c | 7 +++++-- dlls/shell32/pidl.h | 2 -- dlls/shell32/xdg.c | 2 +- dlls/shell32/xdg.h | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index bee7166..5dc07a1 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -55,6 +55,9 @@ WINE_DECLARE_DEBUG_CHANNEL(shell); extern LPVOID WINAPI Alloc(INT); extern BOOL WINAPI Free(LPVOID); +static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl); +static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl); + /************************************************************************* * ILGetDisplayNameEx [SHELL32.186] * @@ -1901,7 +1904,7 @@ LPPIDLDATA _ILGetDataPointer(LPCITEMIDLIST pidl) * _ILGetTextPointerW() * gets a pointer to the unicode long filename string stored in the pidl */ -LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) +static LPWSTR _ILGetTextPointerW(LPCITEMIDLIST pidl) { /* TRACE(pidl,"(pidl%p)\n", pidl);*/ @@ -1994,7 +1997,7 @@ LPSTR _ILGetTextPointer(LPCITEMIDLIST pidl) * _ILGetSTextPointer() * gets a pointer to the short filename string stored in the pidl */ -LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl) +static LPSTR _ILGetSTextPointer(LPCITEMIDLIST pidl) { /* TRACE(pidl,"(pidl%p)\n", pidl); */ diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index 65105ef..0a84c4c 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -254,8 +254,6 @@ LPITEMIDLIST _ILCreateEntireNetwork (void); */ LPPIDLDATA _ILGetDataPointer (LPCITEMIDLIST); LPSTR _ILGetTextPointer (LPCITEMIDLIST); -LPWSTR _ILGetTextPointerW (LPCITEMIDLIST); -LPSTR _ILGetSTextPointer (LPCITEMIDLIST); IID *_ILGetGUIDPointer (LPCITEMIDLIST pidl); FileStructW *_ILGetFileStructW (LPCITEMIDLIST pidl); diff --git a/dlls/shell32/xdg.c b/dlls/shell32/xdg.c index 0cb4272..4d2aacd 100644 --- a/dlls/shell32/xdg.c +++ b/dlls/shell32/xdg.c @@ -159,7 +159,7 @@ static char *load_path(int path_id) * * The paths are guaranteed to start with '/' */ -const char *XDG_GetPath(int path_id) +static const char *XDG_GetPath(int path_id) { if (path_id >= PATHS_COUNT || path_id < 0) { diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 4ff2dba..daa864f 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -25,7 +25,6 @@ #define XDG_CONFIG_DIRS 3 #define XDG_CACHE_HOME 4 -const char *XDG_GetPath(int path_id); char *XDG_BuildPath(int root_id, const char *subpath); int XDG_MakeDirs(const char *path);

1 0