January 2009 - Wine-commits

Michael Stefaniuc : gphoto.ds: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 2c5da7de49664621d0efeb1f696b5ebc9b9e6166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5da7de49664621d0efeb1f6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:36:42 2009 +0100 gphoto.ds: Remove superfluous pointer casts. --- dlls/gphoto2.ds/ds_image.c | 2 +- dlls/gphoto2.ds/ui.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index 8dbba1d..ae6e115 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -397,7 +397,7 @@ TW_UINT16 GPHOTO2_ImageNativeXferGet (pTW_IDENTITY pOrigin, * will likely crash after calling. * * Reason is that there is a lot of example code that does: - * bmpinfo = (LPBITMAPINFOHEADER)GlobalLock(hBITMAP); ... pointer access to bmpinfo + * bmpinfo = GlobalLock(hBITMAP); ... pointer access to bmpinfo * * Our current HBITMAP handles do not support getting GlobalLocked -> App Crash * diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 40afb9e..b769a6e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -133,7 +133,7 @@ static void PopulateImageList(HIMAGELIST *iList, HWND list) #else bitmap = 0; #endif - GetObjectA(bitmap,sizeof(BITMAP),(LPVOID)&bmpInfo); + GetObjectA(bitmap,sizeof(BITMAP),&bmpInfo); if (*iList == 0) {

1 0

Michael Stefaniuc : dmsynth: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 54353200591ee957731b5a0bbdc05eeb0a8074c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54353200591ee957731b5a0bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:36:25 2009 +0100 dmsynth: Remove superfluous pointer casts. --- dlls/dmsynth/dmsynth_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 6967e0c..607b865 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -167,11 +167,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &Synth_CF; + *ppv = &Synth_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = (LPVOID) &SynthSink_CF; + *ppv = &SynthSink_CF; IClassFactory_AddRef((IClassFactory*)*ppv); return S_OK; }

1 0

Michael Stefaniuc : ntprint: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 921b81c7720cbb903883a77ab8313bfc7d529eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=921b81c7720cbb903883a77ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:37:09 2009 +0100 ntprint: Remove superfluous pointer casts. --- dlls/ntprint/ntprint.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 32a2c08..e7779ba 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -102,7 +102,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID u } TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); - return (HANDLE) mi; + return mi; } /***************************************************** @@ -112,7 +112,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID u VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) { - monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + monitorinfo_t * mi = monitorinfo; TRACE("(%p)\n", mi); if (mi) { @@ -144,7 +144,7 @@ VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LPDWORD psize) { - monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + monitorinfo_t * mi = monitorinfo; LPWSTR nameW; DWORD len;

1 0

Michael Stefaniuc : hlink: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: b4d65f595ead9abbf385bac4b0db93a122812821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d65f595ead9abbf385bac4b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:36:33 2009 +0100 hlink: Remove superfluous pointer casts. --- dlls/hlink/extserv.c | 8 ++++---- dlls/hlink/link.c | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index c4e95ab..d3f9e58 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -40,10 +40,10 @@ typedef struct { LPWSTR headers; } ExtensionService; -#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) -#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) -#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) -#define EXTENSIONSERVICES(x) ((IExtensionServices*) &(x)->lpIExtensionServicesVtbl) +#define EXTSERVUNK(x) ((IUnknown*)&(x)->lpIUnknownVtbl) +#define AUTHENTICATE(x) (&(x)->lpIAuthenticateVtbl) +#define HTTPNEGOTIATE(x) (&(x)->lpIHttpNegotiateVtbl) +#define EXTENSIONSERVICES(x) (&(x)->lpIExtensionServicesVtbl) #define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 20841f8..689317d 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -82,8 +82,7 @@ static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) else if (This->Site) { IHlinkSite_GetMoniker(This->Site, This->SiteData, - OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, - (LPVOID)moniker); + OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, moniker); } } @@ -123,9 +122,9 @@ static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) *ppvObj = This; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ppvObj = (LPVOID*)&(This->lpPSVtbl); + *ppvObj = &(This->lpPSVtbl); else if (IsEqualIID(riid, &IID_IDataObject)) - *ppvObj = (LPVOID*)&(This->lpDOVtbl); + *ppvObj = &(This->lpDOVtbl); if (*ppvObj) {

1 0

Michael Stefaniuc : avifil32: Remove superfluous pointer casts.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 905ff8fdaada80406dfd70168450635f651c6dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905ff8fdaada80406dfd70168… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 27 11:36:14 2009 +0100 avifil32: Remove superfluous pointer casts. --- dlls/avifil32/avifile.c | 22 +++++++++++----------- dlls/avifil32/icmstream.c | 2 +- dlls/avifil32/wavfile.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 9f668c6..1719031 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -931,7 +931,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, { IAVIStreamImpl *This = (IAVIStreamImpl *)iface; - LPBITMAPINFOHEADER lpbiNew = (LPBITMAPINFOHEADER)format; + LPBITMAPINFOHEADER lpbiNew = format; TRACE("(%p,%d,%p,%d)\n", iface, pos, format, formatsize); @@ -976,7 +976,7 @@ static HRESULT WINAPI IAVIStream_fnSetFormat(IAVIStream *iface, LONG pos, return AVIERR_OK; } else { MMCKINFO ck; - LPBITMAPINFOHEADER lpbiOld = (LPBITMAPINFOHEADER)This->lpFormat; + LPBITMAPINFOHEADER lpbiOld = This->lpFormat; RGBQUAD *rgbNew = (RGBQUAD*)((LPBYTE)lpbiNew + lpbiNew->biSize); AVIPALCHANGE *lppc = NULL; UINT n; @@ -1688,7 +1688,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) return AVIERR_MEMORY; pStream->cbHandlerData = ck.cksize; - if (mmioRead(This->hmmio, (HPSTR)pStream->lpHandlerData, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, pStream->lpHandlerData, ck.cksize) != ck.cksize) return AVIERR_FILEREAD; break; case ckidSTREAMFORMAT: @@ -1702,11 +1702,11 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) return AVIERR_MEMORY; pStream->cbFormat = ck.cksize; - if (mmioRead(This->hmmio, (HPSTR)pStream->lpFormat, ck.cksize) != ck.cksize) + if (mmioRead(This->hmmio, pStream->lpFormat, ck.cksize) != ck.cksize) return AVIERR_FILEREAD; if (pStream->sInfo.fccType == streamtypeVIDEO) { - LPBITMAPINFOHEADER lpbi = (LPBITMAPINFOHEADER)pStream->lpFormat; + LPBITMAPINFOHEADER lpbi = pStream->lpFormat; /* some corrections to the video format */ if (lpbi->biClrUsed == 0 && lpbi->biBitCount <= 8) @@ -2059,7 +2059,7 @@ static HRESULT AVIFILE_ReadBlock(IAVIStreamImpl *This, DWORD pos, } else { if (mmioSeek(This->paf->hmmio, This->idxFrames[pos].dwChunkOffset + 2 * sizeof(DWORD), SEEK_SET) == -1) return AVIERR_FILEREAD; - if (mmioRead(This->paf->hmmio, (HPSTR)buffer, size) != size) + if (mmioRead(This->paf->hmmio, buffer, size) != size) return AVIERR_FILEREAD; } @@ -2206,7 +2206,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) if (mmioCreateChunk(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; if (pStream->lpFormat != NULL && ck.cksize > 0) { - if (mmioWrite(This->hmmio, (HPSTR)pStream->lpFormat, ck.cksize) != ck.cksize) + if (mmioWrite(This->hmmio, pStream->lpFormat, ck.cksize) != ck.cksize) return AVIERR_FILEWRITE; } if (mmioAscend(This->hmmio, &ck, 0) != S_OK) @@ -2218,7 +2218,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) ck.cksize = pStream->cbHandlerData; if (mmioCreateChunk(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; - if (mmioWrite(This->hmmio, (HPSTR)pStream->lpHandlerData, ck.cksize) != ck.cksize) + if (mmioWrite(This->hmmio, pStream->lpHandlerData, ck.cksize) != ck.cksize) return AVIERR_FILEWRITE; if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; @@ -2227,7 +2227,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) /* ... some optional additional extra chunk for this stream ... */ if (pStream->extra.lp != NULL && pStream->extra.cb > 0) { /* the chunk header(s) are already in the structure */ - if (mmioWrite(This->hmmio, (HPSTR)pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb) + if (mmioWrite(This->hmmio, pStream->extra.lp, pStream->extra.cb) != pStream->extra.cb) return AVIERR_FILEWRITE; } @@ -2302,7 +2302,7 @@ static HRESULT AVIFILE_SaveFile(IAVIFileImpl *This) /* write optional extra file chunks */ if (This->fileextra.lp != NULL && This->fileextra.cb > 0) { /* as for the streams, are the chunk header(s) in the structure */ - if (mmioWrite(This->hmmio, (HPSTR)This->fileextra.lp, This->fileextra.cb) != This->fileextra.cb) + if (mmioWrite(This->hmmio, This->fileextra.lp, This->fileextra.cb) != This->fileextra.cb) return AVIERR_FILEWRITE; } @@ -2562,7 +2562,7 @@ static HRESULT AVIFILE_WriteBlock(IAVIStreamImpl *This, DWORD block, if (mmioCreateChunk(This->paf->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; if (buffer != NULL && size > 0) { - if (mmioWrite(This->paf->hmmio, (HPSTR)buffer, size) != size) + if (mmioWrite(This->paf->hmmio, buffer, size) != size) return AVIERR_FILEWRITE; } if (mmioAscend(This->paf->hmmio, &ck, 0) != S_OK) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 8276e41..dba120b 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -538,7 +538,7 @@ static HRESULT WINAPI ICMStream_fnSetFormat(IAVIStream *iface, LONG pos, } } else { /* format change -- check that's only the palette */ - LPBITMAPINFOHEADER lpbi = (LPBITMAPINFOHEADER)format; + LPBITMAPINFOHEADER lpbi = format; if (lpbi->biSize != This->lpbiInput->biSize || lpbi->biWidth != This->lpbiInput->biWidth || diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index d67ea7e..2ec9b5e 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -908,7 +908,7 @@ static HRESULT WINAPI IAVIStream_fnRead(IAVIStream *iface, LONG start, if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) return AVIERR_FILEREAD; - if (mmioRead(This->hmmio, (HPSTR)buffer, buffersize) != buffersize) + if (mmioRead(This->hmmio, buffer, buffersize) != buffersize) return AVIERR_FILEREAD; /* fill out return parameters if given */ @@ -960,7 +960,7 @@ static HRESULT WINAPI IAVIStream_fnWrite(IAVIStream *iface, LONG start, if (mmioSeek(This->hmmio, This->ckData.dwDataOffset + start * This->sInfo.dwSampleSize, SEEK_SET) == -1) return AVIERR_FILEWRITE; - if (mmioWrite(This->hmmio, (HPSTR)buffer, buffersize) != buffersize) + if (mmioWrite(This->hmmio, buffer, buffersize) != buffersize) return AVIERR_FILEWRITE; This->sInfo.dwLength = max(This->sInfo.dwLength, (DWORD)start + samples);

1 0

Jeremy White : twain_32: Add an initial test framework for twain_32.dll.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 499603c360941ff60778f575ef76a3da9c32f5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499603c360941ff60778f575e… Author: Jeremy White <jwhite(a)winehq.org> Date: Mon Jan 26 11:40:49 2009 -0600 twain_32: Add an initial test framework for twain_32.dll. --- configure | 9 ++ configure.ac | 1 + dlls/twain_32/tests/Makefile.in | 13 +++ dlls/twain_32/tests/dsm.c | 166 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 19d95a0..5053163 100755 --- a/configure +++ b/configure @@ -26542,6 +26542,14 @@ dlls/twain_32/Makefile: dlls/twain_32/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/twain_32/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/twain_32/tests/Makefile" +test "x$enable_tests" != xno && ALL_TEST_DIRS="$ALL_TEST_DIRS \\ + twain_32/tests" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/twain_32/tests/Makefile: dlls/twain_32/tests/Makefile.in dlls/Maketest.rules" +ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/unicows/Makefile" test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ unicows" @@ -28578,6 +28586,7 @@ do "dlls/sxs/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/sxs/Makefile" ;; "dlls/tapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/tapi32/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; + "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; "dlls/updspapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/updspapi/Makefile" ;; "dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;; diff --git a/configure.ac b/configure.ac index 063ea15..12cc8e2 100644 --- a/configure.ac +++ b/configure.ac @@ -2110,6 +2110,7 @@ WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/twain_32/tests/Makefile.in b/dlls/twain_32/tests/Makefile.in new file mode 100644 index 0000000..708fb6d --- /dev/null +++ b/dlls/twain_32/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = twain_32.dll +IMPORTS = user32 gdi32 kernel32 + +CTESTS = \ + dsm.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c new file mode 100644 index 0000000..a915b53 --- /dev/null +++ b/dlls/twain_32/tests/dsm.c @@ -0,0 +1,166 @@ +/* Unit test suite for Twain DSM functions + * + * Copyright 2009 Jeremy White, CodeWeavers, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ +#include <stdarg.h> +#include <assert.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winerror.h" +#include "winuser.h" +#include "twain.h" + +#include "wine/test.h" + +static DSMENTRYPROC pDSM_Entry; + +static BOOL dsm_RegisterWindowClasses(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = DefWindowProc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "TWAIN_dsm_class"; + if (!RegisterClassA(&cls)) return FALSE; + + return TRUE; +} + + +static void get_condition_code(TW_IDENTITY *appid, TW_STATUS *status) +{ + TW_UINT16 rc; + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_STATUS, MSG_GET, status); + ok(rc == TWRC_SUCCESS, "Condition code not available, rc %d\n", rc); +} + +static void test_sources(TW_IDENTITY *appid) +{ + TW_UINT16 rc; + TW_IDENTITY source; + TW_STATUS status; + + memset(&source, 0, sizeof(source)); + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETFIRST, &source); + get_condition_code(appid, &status); + todo_wine + ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get first error code, rc %d, cc %d\n", rc, status.ConditionCode); + if (rc == TWRC_SUCCESS) + ok(status.ConditionCode == TWCC_SUCCESS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + if (rc == TWRC_FAILURE) + ok(status.ConditionCode == TWCC_NODS,"Get first invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + + while (rc == TWRC_SUCCESS) + { + trace("Got scanner %s\n", source.ProductName); + memset(&source, 0, sizeof(source)); + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETNEXT, &source); + get_condition_code(appid, &status); + ok(rc == TWRC_SUCCESS || rc == TWRC_ENDOFLIST, "Get next source failed, rc %d, cc %d\n", rc, status.ConditionCode); + } + + memset(&source, 0, sizeof(source)); + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_GETDEFAULT, &source); + get_condition_code(appid, &status); + ok(rc == TWRC_SUCCESS || rc == TWRC_FAILURE, "Get default error code, rc %d, cc %d\n", rc, status.ConditionCode); + if (rc == TWRC_SUCCESS) + { + todo_wine + ok(status.ConditionCode == TWCC_SUCCESS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + } + + if (rc == TWRC_FAILURE) + ok(status.ConditionCode == TWCC_NODS,"Get default invalid condition code, rc %d, cc %d\n", rc, status.ConditionCode); + + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + { + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_OPENDS, &source); + get_condition_code(appid, &status); + + if (rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS) + { + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_CLOSEDS, &source); + get_condition_code(appid, &status); + ok(rc == TWRC_SUCCESS, "Close DS Failed, rc %d, cc %d\n", rc, status.ConditionCode); + } + } + + if (winetest_interactive) + { + trace("Interactive, so trying userselect\n"); + memset(&source, 0, sizeof(source)); + rc = pDSM_Entry(appid, NULL, DG_CONTROL, DAT_IDENTITY, MSG_USERSELECT, &source); + get_condition_code(appid, &status); + ok(rc == TWRC_SUCCESS || rc == TWRC_CANCEL, "Userselect failed, rc %d, cc %d\n", rc, status.ConditionCode); + } + +} + +START_TEST(dsm) +{ + TW_IDENTITY appid; + TW_UINT16 rc; + HANDLE hwnd; + HMODULE htwain; + + if (!dsm_RegisterWindowClasses()) assert(0); + + htwain = LoadLibraryA("twain_32.dll"); + if (! htwain) + { + skip("twain_32.dll not available, skipping tests\n"); + return; + } + pDSM_Entry = (void*)GetProcAddress(htwain, "DSM_Entry"); + ok(pDSM_Entry != NULL, "Unable to GetProcAddress DSM_Entry\n"); + if (! pDSM_Entry) + { + skip("DSM_Entry not available, skipping tests\n"); + return; + } + + memset(&appid, 0, sizeof(appid)); + appid.Version.Language = TWLG_ENGLISH_USA; + appid.Version.Country = TWCY_USA; + appid.ProtocolMajor = TWON_PROTOCOLMAJOR; + appid.ProtocolMinor = TWON_PROTOCOLMINOR; + appid.SupportedGroups = DG_CONTROL | DG_IMAGE; + + hwnd = CreateWindow("TWAIN_dsm_class", "Twain Test", 0, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, GetModuleHandleA(0), NULL); + + rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); + ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d", rc); + + test_sources(&appid); + + rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_CLOSEDSM, (TW_MEMREF) &hwnd); + ok(rc == TWRC_SUCCESS, "MSG_CLOSEDSM returned %d", rc); + + DestroyWindow(hwnd); + FreeLibrary(htwain); +}

1 0

Paul Vriens : quartz/tests: Fix test failures on Win95 by using A-functions .
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: b4d246ba8f4d74353d8d275091e9aa695d9b8eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d246ba8f4d74353d8d27509… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Jan 27 10:15:50 2009 +0100 quartz/tests: Fix test failures on Win95 by using A-functions. --- dlls/quartz/tests/filtermapper.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index e8d3678..4a8a3bb 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -207,11 +207,10 @@ static void test_legacy_filter_registration(void) static const CHAR szFilterName[] = "Testfilter"; static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; CLSID clsidFilter; - WCHAR wszRegKey[MAX_PATH]; CHAR szRegKey[MAX_PATH]; - static const WCHAR wszClsid[] = {'C','L','S','I','D', 0}; static const CHAR szClsid[] = "CLSID"; - static const WCHAR wszSlash[] = {'\\', 0}; + WCHAR wszGuidstring[MAX_PATH]; + CHAR szGuidstring[MAX_PATH]; LONG lRet; HKEY hKey = NULL; IEnumMoniker *pEnum = NULL; @@ -234,12 +233,14 @@ static void test_legacy_filter_registration(void) hr = CoCreateGuid(&clsidFilter); ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); - lstrcpyW(wszRegKey, wszClsid); - lstrcatW(wszRegKey, wszSlash); - lRet = StringFromGUID2(&clsidFilter, wszRegKey + lstrlenW(wszRegKey), MAX_PATH - lstrlenW(wszRegKey)); + lRet = StringFromGUID2(&clsidFilter, wszGuidstring, MAX_PATH); ok(lRet > 0, "StringFromGUID2 failed\n"); if (!lRet) goto out; - WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0); + WideCharToMultiByte(CP_ACP, 0, wszGuidstring, -1, szGuidstring, MAX_PATH, 0, 0); + + lstrcpyA(szRegKey, szClsid); + lstrcatA(szRegKey, "\\"); + lstrcatA(szRegKey, szGuidstring); /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus * class key for it. */ @@ -303,11 +304,7 @@ static void test_legacy_filter_registration(void) lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); - lRet = StringFromGUID2(&clsidFilter, wszRegKey, MAX_PATH); - ok(lRet > 0, "StringFromGUID2 failed\n"); - WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0); - - lRet = RegDeleteKeyA(hKey, szRegKey); + lRet = RegDeleteKeyA(hKey, szGuidstring); ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); if (hKey) RegCloseKey(hKey);

1 0

Ge van Geldorp : d3d8/tests: Make tests pass on a W2K8 VM.
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: ae79b02ca6a4f9922c739329139850b90b2446bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae79b02ca6a4f9922c7393291… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jan 27 02:17:58 2009 +0100 d3d8/tests: Make tests pass on a W2K8 VM. --- dlls/d3d8/tests/device.c | 6 +++--- dlls/d3d8/tests/visual.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 444d89d..826061b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -815,7 +815,7 @@ static void test_scene(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr); if(!pDevice) { skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr); @@ -921,7 +921,7 @@ static void test_shader(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr); if(!pDevice) { skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr); @@ -1119,7 +1119,7 @@ static void test_limits(void) hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D8_CreateDevice failed with %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D8_CreateDevice failed with %#08x\n", hr); if(!pDevice) { skip("could not create device, IDirect3D8_CreateDevice returned %#08x\n", hr); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 9b2b968..5728269 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -134,7 +134,7 @@ static IDirect3DDevice8 *init_d3d8(void) present_parameters.AutoDepthStencilFormat = D3DFMT_D16; hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3D_CreateDevice returned: %#08x\n", hr); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL || broken(hr == D3DERR_NOTAVAILABLE), "IDirect3D_CreateDevice returned: %#08x\n", hr); return device_ptr; }

1 0

Alexandre Julliard : services: Add stub implementation for SERVICE_CONFIG_FAILURE_ACTIONS in ChangeServiceConfig2W .
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 746948551a1e49c9d5eb00ef3e7a29c077e5e695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=746948551a1e49c9d5eb00ef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 11:27:45 2009 +0100 services: Add stub implementation for SERVICE_CONFIG_FAILURE_ACTIONS in ChangeServiceConfig2W. --- include/wine/svcctl.idl | 29 ++++++++++++++++++++++++++++- programs/services/rpc.c | 7 ++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index 36bf476..1e9aae2 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -94,13 +94,40 @@ typedef struct _SERVICE_DESCRIPTIONW { LPWSTR lpDescription; } SERVICE_DESCRIPTIONW,*LPSERVICE_DESCRIPTIONW; -#define SERVICE_CONFIG_DESCRIPTION 1 +typedef enum _SC_ACTION_TYPE { + SC_ACTION_NONE = 0, + SC_ACTION_RESTART = 1, + SC_ACTION_REBOOT = 2, + SC_ACTION_RUN_COMMAND = 3 +} SC_ACTION_TYPE; + +typedef struct _SC_ACTION { + SC_ACTION_TYPE Type; + DWORD Delay; +} SC_ACTION,*LPSC_ACTION; + +typedef struct _SERVICE_FAILURE_ACTIONSW { + DWORD dwResetPeriod; + [unique] LPWSTR lpRebootMsg; + [unique] LPWSTR lpCommand; + DWORD cActions; + [size_is(cActions)] SC_ACTION *lpsaActions; +} SERVICE_FAILURE_ACTIONSW,*LPSERVICE_FAILURE_ACTIONSW; + +#define SERVICE_CONFIG_DESCRIPTION 1 +#define SERVICE_CONFIG_FAILURE_ACTIONS 2 +#define SERVICE_CONFIG_DELAYED_AUTO_START_INFO 3 +#define SERVICE_CONFIG_FAILURE_ACTIONS_FLAG 4 +#define SERVICE_CONFIG_SERVICE_SID_INFO 5 +#define SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO 6 +#define SERVICE_CONFIG_PRESHUTDOWN_INFO 7 cpp_quote("#endif") typedef [switch_type(DWORD)] union { [case (SERVICE_CONFIG_DESCRIPTION)] SERVICE_DESCRIPTIONW descr; + [case (SERVICE_CONFIG_FAILURE_ACTIONS)] SERVICE_FAILURE_ACTIONSW actions; } SERVICE_CONFIG2W; /* Compatible with Windows function 0x00 */ diff --git a/programs/services/rpc.c b/programs/services/rpc.c index cbb825e..9fd66a2 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -631,7 +631,12 @@ DWORD svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, DWORD level, SERVICE service_unlock( service->service_entry ); } break; - + case SERVICE_CONFIG_FAILURE_ACTIONS: + WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", + config->actions.dwResetPeriod, + wine_dbgstr_w(config->actions.lpRebootMsg), + wine_dbgstr_w(config->actions.lpCommand) ); + break; default: WINE_FIXME("level %u not implemented\n", level); err = ERROR_INVALID_LEVEL;

1 0

Alexandre Julliard : ntdll: Ignore spurious write faults for a write watch that has been reset already .
by Alexandre Julliard 27 Jan '09

27 Jan '09

Module: wine Branch: master Commit: 5e7f7db92386b2cd5109dd76948dff5a15ce1f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e7f7db92386b2cd5109dd769… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 27 11:22:06 2009 +0100 ntdll: Ignore spurious write faults for a write watch that has been reset already. --- dlls/ntdll/virtual.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 16e1e50..0b14564 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1474,11 +1474,15 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION; } - if ((err & EXCEPTION_WRITE_FAULT) && (*vprot & VPROT_WRITEWATCH)) + if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH)) { - *vprot &= ~VPROT_WRITEWATCH; - VIRTUAL_SetProt( view, page, page_size, *vprot ); - ret = STATUS_SUCCESS; + if (*vprot & VPROT_WRITEWATCH) + { + *vprot &= ~VPROT_WRITEWATCH; + VIRTUAL_SetProt( view, page, page_size, *vprot ); + } + /* ignore fault if page is writable now */ + if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } } server_leave_uninterrupted_section( &csVirtual, &sigset );

1 0