January 2009 - Wine-commits

Francois Gouget : winapi_test: Updated so the generated tests work.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 2e668d25725bbe86a72e07a6f21b58cd86594651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e668d25725bbe86a72e07a6f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:18:27 2009 +0100 winapi_test: Updated so the generated tests work. --- dlls/gdi32/tests/generated.c | 2 +- dlls/kernel32/tests/generated.c | 2 +- dlls/ntdll/tests/generated.c | 2 +- dlls/rpcrt4/tests/generated.c | 45 +++++++++++++++++++++++++++++++++----- dlls/shell32/tests/generated.c | 28 +----------------------- dlls/shlwapi/tests/generated.c | 2 +- dlls/urlmon/tests/generated.c | 2 +- dlls/user32/tests/generated.c | 2 +- dlls/wininet/tests/generated.c | 2 +- tools/winapi/tests.dat | 4 +- tools/winapi/winapi_test | 4 +++ 11 files changed, 53 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e668d25725bbe86a72e0…

1 0

Andrew Talbot : msacm32: Declare a function static.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 4256608ed2b416259da1aa67c8381d5e4f95e569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4256608ed2b416259da1aa67c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 7 20:26:15 2009 +0000 msacm32: Declare a function static. --- dlls/msacm32/internal.c | 58 +++++++++++++++++++++++----------------------- dlls/msacm32/wineacm.h | 1 - 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 84898ea..cfc4708 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -711,6 +711,35 @@ void MSACM_WriteCurrentPriorities(void) RegCloseKey(hPriorityKey); } +static PWINE_ACMLOCALDRIVER MSACM_pFirstACMLocalDriver; +static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; + +static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) +{ + PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + + if (paldrv->pACMInstList) { + ERR("local driver instances still present after closing all drivers - memory leak\n"); + return NULL; + } + + if (paldrv == MSACM_pFirstACMLocalDriver) + MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; + if (paldrv == MSACM_pLastACMLocalDriver) + MSACM_pLastACMLocalDriver = paldrv->pPrevACMLocalDrv; + + if (paldrv->pPrevACMLocalDrv) + paldrv->pPrevACMLocalDrv->pNextACMLocalDrv = paldrv->pNextACMLocalDrv; + if (paldrv->pNextACMLocalDrv) + paldrv->pNextACMLocalDrv->pPrevACMLocalDrv = paldrv->pPrevACMLocalDrv; + + pNextACMLocalDriver = paldrv->pNextACMLocalDrv; + + HeapFree(MSACM_hHeap, 0, paldrv); + + return pNextACMLocalDriver; +} + /*********************************************************************** * MSACM_UnregisterDriver() */ @@ -824,9 +853,6 @@ MMRESULT MSACM_Message(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2 return MMSYSERR_INVALHANDLE; } -static PWINE_ACMLOCALDRIVER MSACM_pFirstACMLocalDriver; -static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; - PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) { PWINE_ACMLOCALDRIVER paldrv; @@ -1040,29 +1066,3 @@ LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST paldrv) ERR("unable to close driver instance\n"); return FALSE; } - -PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) -{ - PWINE_ACMLOCALDRIVER pNextACMLocalDriver; - - if (paldrv->pACMInstList) { - ERR("local driver instances still present after closing all drivers - memory leak\n"); - return NULL; - } - - if (paldrv == MSACM_pFirstACMLocalDriver) - MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; - if (paldrv == MSACM_pLastACMLocalDriver) - MSACM_pLastACMLocalDriver = paldrv->pPrevACMLocalDrv; - - if (paldrv->pPrevACMLocalDrv) - paldrv->pPrevACMLocalDrv->pNextACMLocalDrv = paldrv->pNextACMLocalDrv; - if (paldrv->pNextACMLocalDrv) - paldrv->pNextACMLocalDrv->pPrevACMLocalDrv = paldrv->pPrevACMLocalDrv; - - pNextACMLocalDriver = paldrv->pNextACMLocalDrv; - - HeapFree(MSACM_hHeap, 0, paldrv); - - return pNextACMLocalDriver; -} diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index fc03401..3c18a57 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -397,7 +397,6 @@ extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry); extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc); extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM); extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST); -extern PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER); /* extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver); */

1 0

Francois Gouget : quartz: OutputPin_DeliverNewSegment() is unused so remove it.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: 14d44a06ba99d5ecd327f783615cf88116f44aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d44a06ba99d5ecd327f7836… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 8 00:04:55 2009 +0100 quartz: OutputPin_DeliverNewSegment() is unused so remove it. --- dlls/quartz/pin.c | 16 ---------------- dlls/quartz/pin.h | 1 - 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 00165e5..78116fc 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -953,22 +953,6 @@ HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) return hr; } -HRESULT OutputPin_DeliverNewSegment(OutputPin * This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) -{ - HRESULT hr; - - EnterCriticalSection(This->pin.pCritSec); - { - if (!This->pin.pConnectedTo) - hr = VFW_E_NOT_CONNECTED; - else - hr = IPin_NewSegment(This->pin.pConnectedTo, tStart, tStop, dRate); - } - LeaveCriticalSection(This->pin.pCritSec); - - return hr; -} - HRESULT OutputPin_CommitAllocator(OutputPin * This) { HRESULT hr = S_OK; diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index df0f4fd..2cbaddb 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -187,7 +187,6 @@ HRESULT OutputPin_DecommitAllocator(OutputPin * This); HRESULT OutputPin_GetDeliveryBuffer(OutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags); HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample); HRESULT OutputPin_DeliverDisconnect(OutputPin * This); -HRESULT OutputPin_DeliverNewSegment(OutputPin * This, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate); /* Pull Pin */ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt);

1 0

Alexandre Julliard : user32/tests: Fix most of the macro abuse in the menu test.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: c72546153be877695494bf45c4b358dc5a304375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72546153be877695494bf45c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 12:15:25 2009 +0100 user32/tests: Fix most of the macro abuse in the menu test. --- dlls/user32/tests/menu.c | 999 ++++++++++++++++++++++++---------------------- 1 files changed, 513 insertions(+), 486 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c72546153be877695494b…

1 0

Alexandre Julliard : opengl32: Use INT_PTR instead of ptrdiff_t in generated code to avoid printf warnings .
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: fdd1bdf7c83b0a17cd721577023d250dbe1e6e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd1bdf7c83b0a17cd7215770… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 12:15:47 2009 +0100 opengl32: Use INT_PTR instead of ptrdiff_t in generated code to avoid printf warnings. --- dlls/opengl32/make_opengl | 16 +++--- dlls/opengl32/opengl_ext.c | 108 ++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd1bdf7c83b0a17cd721…

1 0

Alexandre Julliard : opengl32: Automatically download the GL spec files in make_opengl. Add a default value for the OpenGL version.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: cb0113ec5350475b849649d828c36ccd865e00f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb0113ec5350475b849649d82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 8 12:29:39 2009 +0100 opengl32: Automatically download the GL spec files in make_opengl. Add a default value for the OpenGL version. --- dlls/opengl32/make_opengl | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index b7c49a2..7235b28 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -3,14 +3,18 @@ use strict; # This script is called thus : # -# make_opengl path_to_spec_file opengl_version +# make_opengl [opengl_version] +# +# - It needs the gl.spec and gl.tm files in the current directory. +# These files are hosted in the OpenGL extension registry at +# opengl.org: # -# - path_to_spec_file is the path to the directory where the OpenGL -# spec files are located. These files are hosted in the OpenGL -# extension registry at opengl.org: # http://www.opengl.org/registry/api/gl.spec # http://www.opengl.org/registry/api/gl.tm # +# If they are not found in the current directory the script will +# attempt to download them from there. +# # The files used to be hosted and maintained by SGI. You can still find # find them in the sample implementation CVS tree which is located at # CVS_ROOT/projects/ogl-sample/main/doc/registry/specs. @@ -18,7 +22,7 @@ use strict; # http://oss.sgi.com/cgi-bin/cvsweb.cgi/projects/ogl-sample/main/doc/registry… # # - opengl_version is the OpenGL version emulated by the library -# (can be 1.0 to 1.5). +# (can be 1.0 to 1.5). The default is 1.2. # # This script generates the three following files : # @@ -283,13 +287,12 @@ sub GenerateThunk($$$$$) # # Extract and checks the number of arguments # -if (@ARGV != 2) { +if (@ARGV > 1) { my $name0=$0; $name0=~s%^.*/%%; - die "Usage: $name0 OpenGL_registry_location OpenGL_version\n"; + die "Usage: $name0 [version]\n"; } -my $registry_path = shift @ARGV; -my $version = shift @ARGV; +my $version = $ARGV[0] || "1.2"; if ($version eq "1.0") { %norm_categories = %cat_1_0; } elsif ($version eq "1.1") { @@ -307,10 +310,16 @@ if ($version eq "1.0") { } # +# Fetch the registry files +# +-f "gl.spec" || system "wget http://www.opengl.org/registry/api/gl.spec" || die "cannot download gl.spec"; +-f "gl.tm" || system "wget http://www.opengl.org/registry/api/gl.tm" || die "cannot download gl.tm"; + +# # Open the registry files # -open(TYPES, "$registry_path/gl.tm") || die "Could not open 'gl.tm'. Please check your path in the registry files.\n"; -open(REGISTRY, "$registry_path/gl.spec") || die "Could not open 'gl.spec'. Please check your path in the registry files.\n"; +open(TYPES, "gl.tm") || die "Could not open gl.tm"; +open(REGISTRY, "gl.spec") || die "Could not open gl.spec"; # # First, create a mapping between the pseudo types used in the spec file

1 0

Paul Vriens : msi/tests: Skip some tests if we don't have enough rights.
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: bb7efb1debf72bc48ce5ac8bcdacb0c65e3990bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb7efb1debf72bc48ce5ac8bc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 7 15:53:19 2009 +0100 msi/tests: Skip some tests if we don't have enough rights. --- dlls/msi/tests/package.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 871d673..aa0b6f3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9585,6 +9585,13 @@ static void test_MsiGetProductProperty(void) lstrcatA(keypath, prod_squashed); res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath, &userkey); + if (res == ERROR_ACCESS_DENIED) + { + skip("Not enough rights to perform tests\n"); + RegDeleteKeyA(prodkey, ""); + RegCloseKey(prodkey); + return; + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegCreateKeyA(userkey, "InstallProperties", &props);

1 0

Paul Vriens : shell32/tests: Fix test failures on Win9x, NT4 and Vista ( FO_RENAME).
by Alexandre Julliard 08 Jan '09

08 Jan '09

Module: wine Branch: master Commit: c2d3ed244df4065f4550a56b298309df931ec656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d3ed244df4065f4550a56b2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jan 8 11:28:35 2009 +0100 shell32/tests: Fix test failures on Win9x, NT4 and Vista (FO_RENAME). --- dlls/shell32/tests/shlfileop.c | 105 +++++++++++++++++++++++++++------------- 1 files changed, 71 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 6adced6..38caaf3 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -33,12 +33,14 @@ #endif /* Error codes could be pre-Win32 */ -#define DE_SAMEFILE 0x71 -#define DE_MANYSRC1DEST 0x72 -#define DE_OPCANCELLED 0x75 -#define DE_DESTSUBTREE 0x76 -#define DE_INVALIDFILES 0x7C -#define DE_DESTSAMETREE 0x7D +#define DE_SAMEFILE 0x71 +#define DE_MANYSRC1DEST 0x72 +#define DE_DIFFDIR 0x73 +#define DE_OPCANCELLED 0x75 +#define DE_DESTSUBTREE 0x76 +#define DE_INVALIDFILES 0x7C +#define DE_DESTSAMETREE 0x7D +#define DE_FILEDESTISFLD 0x80 #define expect_retval(ret, ret_prewin32)\ ok(retval == ret ||\ broken(retval == ret_prewin32),\ @@ -614,20 +616,34 @@ static void test_rename(void) set_curr_dir_path(from, "test1.txt\0"); set_curr_dir_path(to, "test4.txt\0"); - ok(SHFileOperationA(&shfo), "File is not renamed moving to other directory " - "when specifying directory name only\n"); - ok(file_exists("test1.txt"), "The file is removed\n"); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_ALREADY_EXISTS || + retval == DE_FILEDESTISFLD || /* Vista */ + broken(retval == ERROR_INVALID_NAME), /* Win9x, NT4 */ + "Expected ERROR_ALREADY_EXISTS or DE_FILEDESTISFLD, got %d\n", retval); + ok(file_exists("test1.txt"), "The file is renamed\n"); set_curr_dir_path(from, "test3.txt\0"); set_curr_dir_path(to, "test4.txt\\test1.txt\0"); - ok(!SHFileOperationA(&shfo), "File is renamed moving to other directory\n"); - ok(file_exists("test4.txt\\test1.txt"), "The file is not renamed\n"); + retval = SHFileOperationA(&shfo); + if (retval == DE_DIFFDIR) + { + /* Vista and W2K8 (broken or new behavior ?) */ + ok(!file_exists("test4.txt\\test1.txt"), "The file is renamed\n"); + } + else + { + ok(retval == ERROR_SUCCESS, "File is renamed moving to other directory\n"); + ok(file_exists("test4.txt\\test1.txt"), "The file is not renamed\n"); + } set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); - retval = SHFileOperationA(&shfo); /* W98 returns 0, W2K and newer returns ERROR_GEN_FAILURE, both do nothing */ - ok(!retval || retval == ERROR_GEN_FAILURE || retval == ERROR_INVALID_TARGET_HANDLE, - "Can't rename many files, retval = %d\n", retval); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_GEN_FAILURE || + retval == DE_MANYSRC1DEST || /* Vista */ + broken(retval == ERROR_SUCCESS), /* Win9x */ + "Expected ERROR_GEN_FAILURE or DE_MANYSRC1DEST , got %d\n", retval); ok(file_exists("test1.txt"), "The file is renamed - many files are specified\n"); memcpy(&shfo2, &shfo, sizeof(SHFILEOPSTRUCTA)); @@ -635,34 +651,37 @@ static void test_rename(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0test4.txt\0"); set_curr_dir_path(to, "test6.txt\0test7.txt\0test8.txt\0"); - retval = SHFileOperationA(&shfo2); /* W98 returns 0, W2K and newer returns ERROR_GEN_FAILURE, both do nothing */ - ok(!retval || retval == ERROR_GEN_FAILURE || retval == ERROR_INVALID_TARGET_HANDLE, - "Can't rename many files, retval = %d\n", retval); + retval = SHFileOperationA(&shfo2); + ok(retval == ERROR_GEN_FAILURE || + retval == DE_MANYSRC1DEST || /* Vista */ + broken(retval == ERROR_SUCCESS), /* Win9x */ + "Expected ERROR_GEN_FAILURE or DE_MANYSRC1DEST files, got %d\n", retval); ok(file_exists("test1.txt"), "The file is not renamed - many files are specified\n"); set_curr_dir_path(from, "test1.txt\0"); set_curr_dir_path(to, "test6.txt\0"); retval = SHFileOperationA(&shfo); - ok(!retval, "Rename file failed, retval = %d\n", retval); + ok(retval == ERROR_SUCCESS, "Rename file failed, retval = %d\n", retval); ok(!file_exists("test1.txt"), "The file is not renamed\n"); ok(file_exists("test6.txt"), "The file is not renamed\n"); set_curr_dir_path(from, "test6.txt\0"); set_curr_dir_path(to, "test1.txt\0"); retval = SHFileOperationA(&shfo); - ok(!retval, "Rename file back failed, retval = %d\n", retval); + ok(retval == ERROR_SUCCESS, "Rename file back failed, retval = %d\n", retval); set_curr_dir_path(from, "test4.txt\0"); set_curr_dir_path(to, "test6.txt\0"); retval = SHFileOperationA(&shfo); - ok(!retval, "Rename dir failed, retval = %d\n", retval); - ok(!file_exists("test4.txt"), "The dir is not renamed\n"); - ok(file_exists("test6.txt"), "The dir is not renamed\n"); + ok(retval == ERROR_SUCCESS, "Rename dir failed, retval = %d\n", retval); + ok(!dir_exists("test4.txt"), "The dir is not renamed\n"); + ok(dir_exists("test6.txt"), "The dir is not renamed\n"); set_curr_dir_path(from, "test6.txt\0"); set_curr_dir_path(to, "test4.txt\0"); retval = SHFileOperationA(&shfo); - ok(!retval, "Rename dir back failed, retval = %d\n", retval); + ok(retval == ERROR_SUCCESS, "Rename dir back failed, retval = %d\n", retval); + ok(dir_exists("test4.txt"), "The dir is not renamed\n"); /* try to rename more than one file to a single file */ shfo.pFrom = "test1.txt\0test2.txt\0"; @@ -670,7 +689,7 @@ static void test_rename(void) retval = SHFileOperationA(&shfo); ok(retval == ERROR_GEN_FAILURE || retval == DE_MANYSRC1DEST || /* Vista */ - broken(!retval), /* Win9x */ + broken(retval == ERROR_SUCCESS), /* Win9x */ "Expected ERROR_GEN_FAILURE or DE_MANYSRC1DEST, got %d\n", retval); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); ok(file_exists("test2.txt"), "Expected test2.txt to exist\n"); @@ -681,7 +700,8 @@ static void test_rename(void) shfo.pTo = "newfile\0"; retval = SHFileOperationA(&shfo); ok(retval == 1026 || - retval == ERROR_FILE_NOT_FOUND, /* Vista */ + retval == ERROR_FILE_NOT_FOUND || /* Vista */ + broken(retval == ERROR_SUCCESS), /* NT4 */ "Expected 1026 or ERROR_FILE_NOT_FOUND, got %d\n", retval); ok(!file_exists("newfile"), "Expected newfile to not exist\n"); @@ -689,28 +709,45 @@ static void test_rename(void) shfo.pFrom = "test1.txt\0"; shfo.pTo = "test2.txt\0"; retval = SHFileOperationA(&shfo); - ok(retval == ERROR_ALREADY_EXISTS, "Expected ERROR_ALREADY_EXISTS, got %d\n", retval); + if (retval == ERROR_SUCCESS) + { + /* Vista and W2K8 (broken or new behavior ?) */ + createTestFile("test1.txt"); + } + else + { + ok(retval == ERROR_ALREADY_EXISTS || + broken(retval == DE_OPCANCELLED) || /* NT4 */ + broken(retval == ERROR_INVALID_NAME), /* Win9x */ + "Expected ERROR_ALREADY_EXISTS, got %d\n", retval); + } /* pFrom is valid, but pTo is empty */ shfo.pFrom = "test1.txt\0"; shfo.pTo = "\0"; retval = SHFileOperationA(&shfo); - expect_retval(ERROR_CANCELLED, DE_OPCANCELLED /* Win9x */); + ok(retval == ERROR_CANCELLED || + retval == DE_DIFFDIR || /* Vista */ + broken(retval == DE_OPCANCELLED) || /* Win9x */ + broken(retval == 65652), /* NT4 */ + "Expected ERROR_CANCELLED or DE_DIFFDIR\n"); ok(file_exists("test1.txt"), "Expected test1.txt to exist\n"); /* pFrom is empty */ shfo.pFrom = "\0"; retval = SHFileOperationA(&shfo); ok(retval == ERROR_ACCESS_DENIED || - retval == ERROR_INVALID_TARGET_HANDLE, /* Vista */ - "Expected ERROR_ACCESS_DENIED or ERROR_INVALID_TARGET_HANDLE, got %d\n", retval); + retval == DE_MANYSRC1DEST || /* Vista */ + broken(retval == ERROR_SUCCESS), /* Win9x */ + "Expected ERROR_ACCESS_DENIED or DE_MANYSRC1DEST, got %d\n", retval); /* pFrom is NULL, commented out because it crashes on nt 4.0 */ -#if 0 - shfo.pFrom = NULL; - retval = SHFileOperationA(&shfo); - ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", retval); -#endif + if (0) + { + shfo.pFrom = NULL; + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", retval); + } } /* tests the FO_COPY action */

1 0

Hans Leidekker : setupapi: Add some tests for StringTableLookUpStringEx. Make them pass.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: 601870a4351753555bfa351a23328b2e1109c7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=601870a4351753555bfa351a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 7 13:22:49 2009 +0100 setupapi: Add some tests for StringTableLookUpStringEx. Make them pass. --- dlls/setupapi/stringtable.c | 5 +++-- dlls/setupapi/tests/stringtable.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index 1907fbb..fe319b8 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -273,6 +273,7 @@ StringTableAddStringEx(HSTRING_TABLE hStringTable, LPWSTR lpString, return ~0u; } memcpy(pStringTable->pSlots[i].pData, lpExtraData, dwExtraDataSize); + pStringTable->pSlots[i].dwSize = dwExtraDataSize; pStringTable->dwUsedSlots++; return i + 1; } @@ -492,7 +493,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable, if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - memcpy(lpExtraData, pStringTable->pSlots[i].pData, pStringTable->pSlots[i].dwSize); + memcpy(lpExtraData, pStringTable->pSlots[i].pData, (DWORD)lpReserved); return i + 1; } } @@ -501,7 +502,7 @@ StringTableLookUpStringEx(HSTRING_TABLE hStringTable, if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { if (lpExtraData) - memcpy(lpExtraData, pStringTable->pSlots[i].pData, pStringTable->pSlots[i].dwSize); + memcpy(lpExtraData, pStringTable->pSlots[i].pData, (DWORD)lpReserved); return i + 1; } } diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index f93f2d8..a209f23 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -44,6 +44,7 @@ static DWORD (WINAPI *pStringTableAddStringEx)(HSTRING_TABLE, LPWSTR, DWORD, static VOID (WINAPI *pStringTableDestroy)(HSTRING_TABLE); static HSTRING_TABLE (WINAPI *pStringTableDuplicate)(HSTRING_TABLE hStringTable); static HSTRING_TABLE (WINAPI *pStringTableInitialize)(VOID); +static HSTRING_TABLE (WINAPI *pStringTableInitializeEx)(DWORD, DWORD); static DWORD (WINAPI *pStringTableLookUpString)(HSTRING_TABLE, LPWSTR, DWORD); static DWORD (WINAPI *pStringTableLookUpStringEx)(HSTRING_TABLE, LPWSTR, DWORD, LPVOID, LPDWORD); static LPWSTR (WINAPI *pStringTableStringFromId)(HSTRING_TABLE, DWORD); @@ -65,6 +66,10 @@ static void load_it_up(void) if (!pStringTableInitialize) pStringTableInitialize = (void*)GetProcAddress(hdll, "pSetupStringTableInitialize"); + pStringTableInitializeEx = (void*)GetProcAddress(hdll, "StringTableInitializeEx"); + if (!pStringTableInitializeEx) + pStringTableInitializeEx = (void*)GetProcAddress(hdll, "pSetupStringTableInitializeEx"); + pStringTableAddString = (void*)GetProcAddress(hdll, "StringTableAddString"); if (!pStringTableAddString) pStringTableAddString = (void*)GetProcAddress(hdll, "pSetupStringTableAddString"); @@ -221,8 +226,10 @@ static void test_StringTableLookUpString(void) static void test_StringTableLookUpStringEx(void) { - DWORD retval, retval2, hstring, hString, hfoo; + static WCHAR uilevel[] = {'U','I','L','E','V','E','L',0}; + DWORD retval, retval2, hstring, hString, hfoo, data; HANDLE table, table2; + char buffer[4]; table = pStringTableInitialize(); ok(table != NULL,"Failed to Initialize String Table\n"); @@ -273,6 +280,30 @@ static void test_StringTableLookUpStringEx(void) retval, hString); pStringTableDestroy(table); + + table = pStringTableInitializeEx(0x1000, 0); + ok(table != NULL, "failed to initialize string table\n"); + + data = 0xaaaaaaaa; + retval = pStringTableAddStringEx(table, uilevel, 0x5, &data, sizeof(data)); + ok(retval != ~0u, "failed to add 'UILEVEL' to string table\n"); + + memset(buffer, 0x55, sizeof(buffer)); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)0); + ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); + ok(memcmp(buffer, &data, 4), "unexpected data\n"); + + memset(buffer, 0x55, sizeof(buffer)); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)2); + ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); + ok(!memcmp(buffer, &data, 2), "unexpected data\n"); + + memset(buffer, 0x55, sizeof(buffer)); + retval = pStringTableLookUpStringEx(table, uilevel, ST_CASE_SENSITIVE_COMPARE, buffer, (LPDWORD)sizeof(buffer)); + ok(retval != ~0u, "failed find 'UILEVEL' in string table\n"); + ok(!memcmp(buffer, &data, 4), "unexpected data\n"); + + pStringTableDestroy(table); } static void test_StringTableStringFromId(void)

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 07 Jan '09

07 Jan '09

Module: wine Branch: master Commit: ada97dc209a3a710929c624bc4b688f653b29257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada97dc209a3a710929c624bc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jan 7 12:22:02 2009 +0100 Assorted spelling fixes. --- dlls/rpcrt4/rpc_binding.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index e69f0f6..696887c 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1517,7 +1517,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, { RPC_STATUS status; - TRACE("SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", + TRACE("SecurityQos { Version=%d, Capabilities=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) { @@ -1647,7 +1647,7 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, { RPC_STATUS status; - TRACE("SecurityQos { Version=%d, Capabilties=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", + TRACE("SecurityQos { Version=%d, Capabilities=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) {

1 0