July 2008 - Wine-Commits - list.winehq.org

Jon Griffiths : include: Avoid TEXT() in sddl component tags, hide them when building Wine.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: e19a904139c76b3cc2a21a75c9c3ccefc9b368ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19a904139c76b3cc2a21a75c… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Thu Jul 3 23:29:15 2008 -0700 include: Avoid TEXT() in sddl component tags, hide them when building Wine. --- include/sddl.h | 93 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 65 insertions(+), 28 deletions(-) diff --git a/include/sddl.h b/include/sddl.h index 5c586a3..866b699 100644 --- a/include/sddl.h +++ b/include/sddl.h @@ -15,46 +15,83 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #ifndef __SDDL_H__ #define __SDDL_H__ - #ifdef __cplusplus extern "C" { #endif -/* - * SDDL Version information - */ -#define SDDL_REVISION_1 1 -#define SDDL_REVISION SDDL_REVISION_1 +/* Versioning */ +#define SDDL_REVISION_1 1 +#define SDDL_REVISION SDDL_REVISION_1 -/* - * SDDL Component tags - */ -#define SDDL_OWNER TEXT("O") -#define SDDL_GROUP TEXT("G") -#define SDDL_DACL TEXT("D") -#define SDDL_SACL TEXT("S") +#ifndef __WINESRC__ +/* Component tags */ +#ifndef UNICODE +# define SDDL_OWNER "O" +# define SDDL_GROUP "G" +# define SDDL_DACL "D" +# define SDDL_SACL "S" +#else +# if defined(__GNUC__) +# define SDDL_OWNER (const WCHAR[]){ 'O',0 } +# define SDDL_GROUP (const WCHAR[]){ 'G',0 } +# define SDDL_DACL (const WCHAR[]){ 'D',0 } +# define SDDL_SACL (const WCHAR[]){ 'S',0 } +# elif defined(_MSC_VER) +# define SDDL_OWNER L"O" +# define SDDL_GROUP L"G" +# define SDDL_DACL L"D" +# define SDDL_SACL L"S" +# else + static const WCHAR SDDL_OWNER[] = { 'O',0 }; + static const WCHAR SDDL_GROUP[] = { 'G',0 }; + static const WCHAR SDDL_DACL[] = { 'D',0 }; + static const WCHAR SDDL_SACL[] = { 'S',0 }; +# endif +#endif /* UNICODE */ -/* - * SDDL Separators - character version - */ +/* Separators as characters */ /* SDDL_SEPERATORC is not a typo, as per Microsoft's headers */ -#define SDDL_SEPERATORC TEXT(";") -#define SDDL_DELIMINATORC TEXT(":") -#define SDDL_ACE_BEGINC TEXT("(") -#define SDDL_ACE_ENDC TEXT(")") +#ifndef UNICODE +# define SDDL_SEPERATORC ';' +# define SDDL_DELIMINATORC ':' +# define SDDL_ACE_BEGINC '(' +# define SDDL_ACE_ENDC ')' +#else +# define SDDL_SEPERATORC ((WCHAR)';') +# define SDDL_DELIMINATORC ((WCHAR)':') +# define SDDL_ACE_BEGINC ((WCHAR)'(') +# define SDDL_ACE_ENDC ((WCHAR)')') +#endif /* UNICODE */ -/* - * SDDL Separators - string version - */ +/* Separators as strings */ /* SDDL_SEPERATOR is not a typo, as per Microsoft's headers */ -#define SDDL_SEPERATOR TEXT(";") -#define SDDL_DELIMINATOR TEXT(":") -#define SDDL_ACE_BEGIN TEXT("(") -#define SDDL_ACE_END TEXT(")") +#ifndef UNICODE +# define SDDL_SEPERATOR ";" +# define SDDL_DELIMINATOR ":" +# define SDDL_ACE_BEGIN "(" +# define SDDL_ACE_END ")" +#else +# if defined(__GNUC__) +# define SDDL_SEPERATOR (const WCHAR[]){ ';',0 } +# define SDDL_DELIMINATOR (const WCHAR[]){ ':',0 } +# define SDDL_ACE_BEGIN (const WCHAR[]){ '(',0 } +# define SDDL_ACE_END (const WCHAR[]){ ')',0 } +# elif defined(_MSC_VER) +# define SDDL_SEPERATOR L";" +# define SDDL_DELIMINATOR L":" +# define SDDL_ACE_BEGIN L"(" +# define SDDL_ACE_END L")" +# else + static const WCHAR SDDL_SEPERATOR[] = { ';',0 }; + static const WCHAR SDDL_DELIMINATOR[] = { ':',0 }; + static const WCHAR SDDL_ACE_BEGIN[] = { '(',0 }; + static const WCHAR SDDL_ACE_END[] = { ')',0 }; +# endif +#endif /* UNICODE */ +#endif /* __WINESRC__ */ BOOL WINAPI ConvertSidToStringSidA( PSID, LPSTR* ); BOOL WINAPI ConvertSidToStringSidW( PSID, LPWSTR* );

1 0

Jon Griffiths : msvcrt: Make tests for [w]makepath pass.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 7b7cd31f058652d6f8ae760650be34b9f4d32ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7cd31f058652d6f8ae76065… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Thu Jul 3 12:30:18 2008 -0700 msvcrt: Make tests for [w]makepath pass. --- dlls/msvcrt/dir.c | 73 +++++++++++++++++++++++------------------------ dlls/msvcrt/tests/dir.c | 34 ++++++++-------------- 2 files changed, 48 insertions(+), 59 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 7b1199c..0a28c59 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -865,28 +865,29 @@ VOID CDECL _makepath(char * path, const char * drive, { *p++ = drive[0]; *p++ = ':'; - *p = 0; } if (directory && directory[0]) { - strcpy(p, directory); - p += strlen(directory) - 1; - if (*p != '/' && *p != '\\') { - strcat(p, "\\"); - p++; - } - p++; + unsigned int len = strlen(directory); + memmove(p, directory, len); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } if (filename && filename[0]) { - strcpy(p, filename); - if (extension && extension[0]) - { - if ( extension[0] != '.' ) - strcat(p,"."); - strcat(p,extension); - } + unsigned int len = strlen(filename); + memmove(p, filename, len); + p += len; + } + if (extension && extension[0]) + { + if (extension[0] != '.') + *p++ = '.'; + strcpy(p, extension); } + else + *p = '\0'; TRACE("returning %s\n",path); } @@ -898,43 +899,41 @@ VOID CDECL _makepath(char * path, const char * drive, VOID CDECL _wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const MSVCRT_wchar_t *directory, const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *extension) { - MSVCRT_wchar_t ch; + MSVCRT_wchar_t *p = path; + TRACE("%s %s %s %s\n", debugstr_w(drive), debugstr_w(directory), debugstr_w(filename), debugstr_w(extension)); if ( !path ) return; - path[0] = 0; if (drive && drive[0]) { - path[0] = drive[0]; - path[1] = ':'; - path[2] = 0; + *p++ = drive[0]; + *p++ = ':'; } if (directory && directory[0]) { - strcatW(path, directory); - ch = path[strlenW(path) - 1]; - if (ch != '/' && ch != '\\') - { - static const MSVCRT_wchar_t backslashW[] = {'\\',0}; - strcatW(path, backslashW); - } + unsigned int len = strlenW(directory); + memmove(p, directory, len * sizeof(MSVCRT_wchar_t)); + p += len; + if (p[-1] != '/' && p[-1] != '\\') + *p++ = '\\'; } if (filename && filename[0]) { - strcatW(path, filename); - if (extension && extension[0]) - { - if ( extension[0] != '.' ) - { - static const MSVCRT_wchar_t dotW[] = {'.',0}; - strcatW(path, dotW); - } - strcatW(path, extension); - } + unsigned int len = strlenW(filename); + memmove(p, filename, len * sizeof(MSVCRT_wchar_t)); + p += len; + } + if (extension && extension[0]) + { + if (extension[0] != '.') + *p++ = '.'; + strcpyW(p, extension); } + else + *p = '\0'; TRACE("returning %s\n", debugstr_w(path)); } diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 507add2..11a9820 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -39,14 +39,12 @@ typedef struct const char* file; const char* ext; const char* expected; - BOOL todoA; - BOOL todoW; } makepath_case; #define USE_BUFF ((char*)~0ul) static const makepath_case makepath_cases[] = { - { NULL, NULL, NULL, NULL, NULL, "", TRUE }, /* 0 */ + { NULL, NULL, NULL, NULL, NULL, "" }, /* 0 */ { NULL, "c", NULL, NULL, NULL, "c:" }, { NULL, "c:", NULL, NULL, NULL, "c:" }, { NULL, "c:\\", NULL, NULL, NULL, "c:" }, @@ -56,15 +54,15 @@ static const makepath_case makepath_cases[] = { NULL, NULL, NULL, "file", NULL, "file" }, { NULL, NULL, NULL, "\\file", NULL, "\\file" }, { NULL, NULL, NULL, "file", NULL, "file" }, - { NULL, NULL, NULL, NULL, "ext", ".ext", TRUE, TRUE }, /* 10 */ - { NULL, NULL, NULL, NULL, ".ext", ".ext", TRUE, TRUE }, - { "foo", NULL, NULL, NULL, NULL, "", TRUE }, - { "foo", USE_BUFF, NULL, NULL, NULL, "f:", FALSE, TRUE }, - { "foo", NULL, USE_BUFF, NULL, NULL, "foo\\", FALSE, TRUE }, - { "foo", NULL, NULL, USE_BUFF, NULL, "foo", FALSE, TRUE }, - { "foo", NULL, USE_BUFF, "file", NULL, "foo\\file", FALSE, TRUE }, - { "foo", NULL, USE_BUFF, "file", "ext", "foo\\file.ext", FALSE, TRUE }, - { "foo", NULL, NULL, USE_BUFF, "ext", "foo.ext", FALSE, TRUE }, + { NULL, NULL, NULL, NULL, "ext", ".ext" }, /* 10 */ + { NULL, NULL, NULL, NULL, ".ext", ".ext" }, + { "foo", NULL, NULL, NULL, NULL, "" }, + { "foo", USE_BUFF, NULL, NULL, NULL, "f:" }, + { "foo", NULL, USE_BUFF, NULL, NULL, "foo\\" }, + { "foo", NULL, NULL, USE_BUFF, NULL, "foo" }, + { "foo", NULL, USE_BUFF, "file", NULL, "foo\\file" }, + { "foo", NULL, USE_BUFF, "file", "ext", "foo\\file.ext" }, + { "foo", NULL, NULL, USE_BUFF, "ext", "foo.ext" }, /* remaining combinations of USE_BUFF crash native */ { NULL, "c", "dir", "file", "ext", "c:dir\\file.ext" }, { NULL, "c:", "dir", "file", "ext", "c:dir\\file.ext" }, /* 20 */ @@ -98,11 +96,7 @@ static void test_makepath(void) p->ext == USE_BUFF ? buffer : p->ext); buffer[MAX_PATH - 1] = '\0'; - if (p->todoA) todo_wine { - ok(!strcmp(p->expected, buffer), "got '%s' for case %d\n", buffer, i); - } - else - ok(!strcmp(p->expected, buffer), "got '%s' for case %d\n", buffer, i); + ok(!strcmp(p->expected, buffer), "got '%s' for case %d\n", buffer, i); /* Unicode */ if (p->drive != USE_BUFF) MultiByteToWideChar(CP_ACP, 0, p->drive, -1, driveW, MAX_PATH); @@ -123,11 +117,7 @@ static void test_makepath(void) bufferW[MAX_PATH - 1] = '\0'; WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_PATH, NULL, NULL); - if (p->todoW) todo_wine { - ok(!strcmp(p->expected, buffer), "got '%s' for unicode case %d\n", buffer, i); - } - else - ok(!strcmp(p->expected, buffer), "got '%s' for unicode case %d\n", buffer, i); + ok(!strcmp(p->expected, buffer), "got '%s' for unicode case %d\n", buffer, i); } }

1 0

Jon Griffiths : msvcrt: Tests for [w]makepath.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: afb3593274f5819285ada4559087af04f14177e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb3593274f5819285ada4559… Author: Jon Griffiths <jon_p_griffiths(a)yahoo.com> Date: Thu Jul 3 12:27:24 2008 -0700 msvcrt: Tests for [w]makepath. --- dlls/msvcrt/tests/dir.c | 101 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 93 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/dir.c b/dlls/msvcrt/tests/dir.c index 6929a76..507add2 100644 --- a/dlls/msvcrt/tests/dir.c +++ b/dlls/msvcrt/tests/dir.c @@ -31,19 +31,104 @@ #include <process.h> #include <errno.h> +typedef struct +{ + const char* buffer; + const char* drive; + const char* dir; + const char* file; + const char* ext; + const char* expected; + BOOL todoA; + BOOL todoW; +} makepath_case; + +#define USE_BUFF ((char*)~0ul) +static const makepath_case makepath_cases[] = +{ + { NULL, NULL, NULL, NULL, NULL, "", TRUE }, /* 0 */ + { NULL, "c", NULL, NULL, NULL, "c:" }, + { NULL, "c:", NULL, NULL, NULL, "c:" }, + { NULL, "c:\\", NULL, NULL, NULL, "c:" }, + { NULL, NULL, "dir", NULL, NULL, "dir\\" }, + { NULL, NULL, "dir\\", NULL, NULL, "dir\\" }, + { NULL, NULL, "\\dir", NULL, NULL, "\\dir\\" }, + { NULL, NULL, NULL, "file", NULL, "file" }, + { NULL, NULL, NULL, "\\file", NULL, "\\file" }, + { NULL, NULL, NULL, "file", NULL, "file" }, + { NULL, NULL, NULL, NULL, "ext", ".ext", TRUE, TRUE }, /* 10 */ + { NULL, NULL, NULL, NULL, ".ext", ".ext", TRUE, TRUE }, + { "foo", NULL, NULL, NULL, NULL, "", TRUE }, + { "foo", USE_BUFF, NULL, NULL, NULL, "f:", FALSE, TRUE }, + { "foo", NULL, USE_BUFF, NULL, NULL, "foo\\", FALSE, TRUE }, + { "foo", NULL, NULL, USE_BUFF, NULL, "foo", FALSE, TRUE }, + { "foo", NULL, USE_BUFF, "file", NULL, "foo\\file", FALSE, TRUE }, + { "foo", NULL, USE_BUFF, "file", "ext", "foo\\file.ext", FALSE, TRUE }, + { "foo", NULL, NULL, USE_BUFF, "ext", "foo.ext", FALSE, TRUE }, + /* remaining combinations of USE_BUFF crash native */ + { NULL, "c", "dir", "file", "ext", "c:dir\\file.ext" }, + { NULL, "c:", "dir", "file", "ext", "c:dir\\file.ext" }, /* 20 */ + { NULL, "c:\\", "dir", "file", "ext", "c:dir\\file.ext" } +}; + static void test_makepath(void) { + WCHAR driveW[MAX_PATH]; + WCHAR dirW[MAX_PATH]; + WCHAR fileW[MAX_PATH]; + WCHAR extW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; char buffer[MAX_PATH]; - _makepath(buffer, "C", "\\foo", "dummy", "txt"); - ok( strcmp(buffer, "C:\\foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); - _makepath(buffer, "C:", "\\foo\\", "dummy", ".txt"); - ok( strcmp(buffer, "C:\\foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); + unsigned int i, n; + + for (i = 0; i < sizeof(makepath_cases)/sizeof(makepath_cases[0]); ++i) + { + const makepath_case* p = &makepath_cases[i]; + + memset(buffer, 'X', MAX_PATH); + if (p->buffer) + strcpy(buffer, p->buffer); + + /* Ascii */ + _makepath(buffer, + p->drive == USE_BUFF ? buffer : p->drive, + p->dir == USE_BUFF ? buffer : p->dir, + p->file == USE_BUFF? buffer : p->file, + p->ext == USE_BUFF ? buffer : p->ext); + + buffer[MAX_PATH - 1] = '\0'; + if (p->todoA) todo_wine { + ok(!strcmp(p->expected, buffer), "got '%s' for case %d\n", buffer, i); + } + else + ok(!strcmp(p->expected, buffer), "got '%s' for case %d\n", buffer, i); + + /* Unicode */ + if (p->drive != USE_BUFF) MultiByteToWideChar(CP_ACP, 0, p->drive, -1, driveW, MAX_PATH); + if (p->dir != USE_BUFF) MultiByteToWideChar(CP_ACP, 0, p->dir, -1, dirW, MAX_PATH); + if (p->file != USE_BUFF) MultiByteToWideChar(CP_ACP, 0, p->file, -1, fileW, MAX_PATH); + if (p->ext != USE_BUFF) MultiByteToWideChar(CP_ACP, 0, p->ext, -1, extW, MAX_PATH); + + memset(buffer, 0, MAX_PATH); + for (n = 0; n < MAX_PATH; ++n) + bufferW[n] = 'X'; + if (p->buffer) MultiByteToWideChar( CP_ACP, 0, p->buffer, -1, bufferW, MAX_PATH); + + _wmakepath(bufferW, + p->drive == USE_BUFF ? bufferW : p->drive ? driveW : NULL, + p->dir == USE_BUFF ? bufferW : p->dir ? dirW : NULL, + p->file == USE_BUFF? bufferW : p->file ? fileW : NULL, + p->ext == USE_BUFF ? bufferW : p->ext ? extW : NULL); - /* this works with native and e.g. Freelancer depends on it */ - strcpy(buffer, "foo"); - _makepath(buffer, NULL, buffer, "dummy.txt", NULL); - ok( strcmp(buffer, "foo\\dummy.txt") == 0, "unexpected result: %s\n", buffer); + bufferW[MAX_PATH - 1] = '\0'; + WideCharToMultiByte(CP_ACP, 0, bufferW, -1, buffer, MAX_PATH, NULL, NULL); + if (p->todoW) todo_wine { + ok(!strcmp(p->expected, buffer), "got '%s' for unicode case %d\n", buffer, i); + } + else + ok(!strcmp(p->expected, buffer), "got '%s' for unicode case %d\n", buffer, i); + } } static void test_fullpath(void)

1 0

Stefan Leichter : rasapi32: Added some more tests for RasEnumDevicesA, fix Wine not to crash on the tests.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 5e15187fd07754277c9643e47379a0fafdca432a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e15187fd07754277c9643e47… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Jul 6 15:15:37 2008 +0200 rasapi32: Added some more tests for RasEnumDevicesA, fix Wine not to crash on the tests. --- dlls/rasapi32/rasapi.c | 2 +- dlls/rasapi32/tests/rasapi.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 2ba62e9..f14694a 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -249,7 +249,7 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l return ERROR_INVALID_PARAMETER; FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); - if (*lpcb < sizeof(RASDEVINFOA)) { + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; } diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index a435180..eba492f 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -53,14 +53,78 @@ static void test_rasenum(void) return; } + /* test first parameter */ result = pRasEnumDevicesA(NULL, &cb, &cDevices); trace("RasEnumDevicesA: buffersize %d\n", cb); ok(result == ERROR_BUFFER_TOO_SMALL, "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + cb = sizeof(rasDevInfo); + result = pRasEnumDevicesA(NULL, &cb, &cDevices); + ok(result == ERROR_BUFFER_TOO_SMALL, + "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + + rasDevInfo.dwSize = 0; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + todo_wine + ok(result == ERROR_INVALID_SIZE, + "Expected ERROR_INVALID_SIZE, got %08d\n", result); + + rasDevInfo.dwSize = sizeof(rasDevInfo) -1; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + todo_wine + ok(result == ERROR_INVALID_SIZE, + "Expected ERROR_INVALID_SIZE, got %08d\n", result); + + rasDevInfo.dwSize = sizeof(rasDevInfo) +1; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + todo_wine + ok(result == ERROR_INVALID_SIZE, + "Expected ERROR_INVALID_SIZE, got %08d\n", result); + + /* test second parameter */ + rasDevInfo.dwSize = sizeof(rasDevInfo); result = pRasEnumDevicesA(&rasDevInfo, NULL, &cDevices); ok(result == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + cb = 0; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + ok(result == ERROR_BUFFER_TOO_SMALL, + "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + + cb = sizeof(rasDevInfo) -1; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + ok(result == ERROR_BUFFER_TOO_SMALL, + "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + + cb = sizeof(rasDevInfo) +1; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + todo_wine + ok(result == ERROR_BUFFER_TOO_SMALL, + "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + + /* test third parameter */ + cb = sizeof(rasDevInfo); + result = pRasEnumDevicesA(&rasDevInfo, &cb, NULL); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + /* test combinations of invalid parameters */ + result = pRasEnumDevicesA(NULL, NULL, &cDevices); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + result = pRasEnumDevicesA(NULL, &cb, NULL); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); + + cb = 0; + rasDevInfo.dwSize = 0; + result = pRasEnumDevicesA(&rasDevInfo, &cb, &cDevices); + todo_wine + ok(result == ERROR_INVALID_SIZE, + "Expected ERROR_INVALID_SIZE, got %08d\n", result); } START_TEST(rasapi)

1 0

Stefan Leichter : rasapi32: Added some tests for RasEnumDevicesA ( based on a patch by Austin English),
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: b8c6d8e59833c408010c7cdbfefabc4550460a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c6d8e59833c408010c7cdbf… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Jul 6 13:47:34 2008 +0200 rasapi32: Added some tests for RasEnumDevicesA (based on a patch by Austin English), --- .gitignore | 1 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/rasapi32/rasapi.c | 3 ++ dlls/rasapi32/tests/Makefile.in | 13 +++++++ dlls/rasapi32/tests/rasapi.c | 71 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 ++ programs/winetest/winetest.rc | 1 + 10 files changed, 99 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 766d4d5..05ffba6 100644 --- a/.gitignore +++ b/.gitignore @@ -311,6 +311,7 @@ programs/winetest/psapi_test.exe programs/winetest/qedit_test.exe programs/winetest/qmgr_test.exe programs/winetest/quartz_test.exe +programs/winetest/rasapi32_test.exe programs/winetest/riched20_test.exe programs/winetest/riched32_test.exe programs/winetest/rpcrt4_test.exe diff --git a/Makefile.in b/Makefile.in index 7ad6faa..1b35079 100644 --- a/Makefile.in +++ b/Makefile.in @@ -407,6 +407,7 @@ ALL_MAKEFILES = \ dlls/quartz/tests/Makefile \ dlls/query/Makefile \ dlls/rasapi32/Makefile \ + dlls/rasapi32/tests/Makefile \ dlls/resutils/Makefile \ dlls/riched20/Makefile \ dlls/riched20/tests/Makefile \ @@ -835,6 +836,7 @@ dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules dlls/rasapi32/Makefile: dlls/rasapi32/Makefile.in dlls/Makedll.rules +dlls/rasapi32/tests/Makefile: dlls/rasapi32/tests/Makefile.in dlls/Maketest.rules dlls/resutils/Makefile: dlls/resutils/Makefile.in dlls/Makedll.rules dlls/riched20/Makefile: dlls/riched20/Makefile.in dlls/Makedll.rules dlls/riched20/tests/Makefile: dlls/riched20/tests/Makefile.in dlls/Maketest.rules diff --git a/configure b/configure index 039597b..257dfeb 100755 --- a/configure +++ b/configure @@ -22183,6 +22183,8 @@ ac_config_files="$ac_config_files dlls/query/Makefile" ac_config_files="$ac_config_files dlls/rasapi32/Makefile" +ac_config_files="$ac_config_files dlls/rasapi32/tests/Makefile" + ac_config_files="$ac_config_files dlls/resutils/Makefile" ac_config_files="$ac_config_files dlls/riched20/Makefile" @@ -23334,6 +23336,7 @@ do "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;; "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;; "dlls/rasapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/Makefile" ;; + "dlls/rasapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/tests/Makefile" ;; "dlls/resutils/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/resutils/Makefile" ;; "dlls/riched20/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/Makefile" ;; "dlls/riched20/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/riched20/tests/Makefile" ;; diff --git a/configure.ac b/configure.ac index bd764a3..fa925b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1947,6 +1947,7 @@ AC_CONFIG_FILES([dlls/quartz/Makefile]) AC_CONFIG_FILES([dlls/quartz/tests/Makefile]) AC_CONFIG_FILES([dlls/query/Makefile]) AC_CONFIG_FILES([dlls/rasapi32/Makefile]) +AC_CONFIG_FILES([dlls/rasapi32/tests/Makefile]) AC_CONFIG_FILES([dlls/resutils/Makefile]) AC_CONFIG_FILES([dlls/riched20/Makefile]) AC_CONFIG_FILES([dlls/riched20/tests/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 92919fa..d130f35 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -342,6 +342,7 @@ TESTSUBDIRS = \ qedit/tests \ qmgr/tests \ quartz/tests \ + rasapi32/tests \ riched20/tests \ riched32/tests \ rpcrt4/tests \ diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 0977ffe..2ba62e9 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -245,6 +245,9 @@ DWORD WINAPI RasEnumAutodialAddressesW(LPWSTR *a, LPDWORD b, LPDWORD c) */ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD lpcDevices) { + if (!lpcb || !lpcDevices) + return ERROR_INVALID_PARAMETER; + FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); if (*lpcb < sizeof(RASDEVINFOA)) { *lpcb = sizeof(RASDEVINFOA); diff --git a/dlls/rasapi32/tests/Makefile.in b/dlls/rasapi32/tests/Makefile.in new file mode 100644 index 0000000..c6f079a --- /dev/null +++ b/dlls/rasapi32/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = rasapi32.dll +IMPORTS = kernel32 + +CTESTS = \ + rasapi.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c new file mode 100644 index 0000000..a435180 --- /dev/null +++ b/dlls/rasapi32/tests/rasapi.c @@ -0,0 +1,71 @@ +/* +* Unit test suite for rasapi32 functions +* +* Copyright 2008 Austin English +* +* 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 <stdio.h> +#include <wine/test.h> +#include <windef.h> +#include <winbase.h> +#include "ras.h" + +static HMODULE hmodule; +static DWORD (WINAPI *pRasEnumDevicesA)(LPRASDEVINFOA, LPDWORD, LPDWORD); + +#define RASAPI32_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hmodule, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + +static void InitFunctionPtrs(void) +{ + hmodule = LoadLibraryA("rasapi32.dll"); + + RASAPI32_GET_PROC(RasEnumDevicesA) +} + +static void test_rasenum(void) +{ + DWORD result; + DWORD cDevices = 0; + DWORD cb = 0; + RASDEVINFOA rasDevInfo; + rasDevInfo.dwSize = sizeof(rasDevInfo); + + if(!pRasEnumDevicesA) { + win_skip("Skipping RasEnumDevicesA tests, function not present\n"); + return; + } + + result = pRasEnumDevicesA(NULL, &cb, &cDevices); + trace("RasEnumDevicesA: buffersize %d\n", cb); + ok(result == ERROR_BUFFER_TOO_SMALL, + "Expected ERROR_BUFFER_TOO_SMALL, got %08d\n", result); + + result = pRasEnumDevicesA(&rasDevInfo, NULL, &cDevices); + ok(result == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08d\n", result); +} + +START_TEST(rasapi) +{ + InitFunctionPtrs(); + + test_rasenum(); +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 89e0f5d..9431466 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -81,6 +81,7 @@ TESTBINS = \ qedit_test.exe \ qmgr_test.exe \ quartz_test.exe \ + rasapi32_test.exe \ riched20_test.exe \ riched32_test.exe \ rpcrt4_test.exe \ @@ -220,6 +221,8 @@ qmgr_test.exe: $(DLLDIR)/qmgr/tests/qmgr_test.exe$(DLLEXT) cp $(DLLDIR)/qmgr/tests/qmgr_test.exe$(DLLEXT) $@ && $(STRIP) $@ quartz_test.exe: $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@ +rasapi32_test.exe: $(DLLDIR)/rasapi32/tests/rasapi32_test.exe$(DLLEXT) + cp $(DLLDIR)/rasapi32/tests/rasapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ riched20_test.exe: $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) cp $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) $@ && $(STRIP) $@ riched32_test.exe: $(DLLDIR)/riched32/tests/riched32_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 5c78c8f..8a293a8 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -142,6 +142,7 @@ psapi_test.exe TESTRES "psapi_test.exe" qedit_test.exe TESTRES "qedit_test.exe" qmgr_test.exe TESTRES "qmgr_test.exe" quartz_test.exe TESTRES "quartz_test.exe" +rasapi32_test.exe TESTRES "rasapi32_test.exe" riched20_test.exe TESTRES "riched20_test.exe" riched32_test.exe TESTRES "riched32_test.exe" rpcrt4_test.exe TESTRES "rpcrt4_test.exe"

1 0

Alexandre Julliard : Maketest.rules: Use the cross-compiled import libraries for crosstest instead of the MinGW ones .
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 9e7deebcb81eb03b0433a60c10603dc5aa0d7081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7deebcb81eb03b0433a60c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 9 11:55:52 2008 +0200 Maketest.rules: Use the cross-compiled import libraries for crosstest instead of the MinGW ones. Don't pass the configure-specific gcc flags to the cross-compiler. --- dlls/Maketest.rules.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 5256900..4bc23e2 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -58,7 +58,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) .SUFFIXES: .cross.o .res.cross.o .c.cross.o: - $(CROSSCC) -c $(ALLCFLAGS) -o $@ $< + $(CROSSCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) -o $@ $< .res.res.cross.o: $(CROSSWINDRES) -i $< -o $@ @@ -66,7 +66,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) ../$(TESTDLL)$(DLLEXT) crosstest:: @CROSSTEST@ $(CROSSTEST): $(CROSSOBJS) Makefile.in - $(CROSSCC) $(CROSSOBJS) -o $@ $(ALL_LIBS) + $(CROSSCC) $(CROSSOBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-L$(DLLDIR)/%) $(ALL_LIBS) $(CROSSOBJS): $(IDL_GEN_HEADERS)

1 0

Alexandre Julliard : make_makefiles: Add rules for cross-compiling all import libs from the dlls directory.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 26c930b32d84f5c55d89b94595d74b74e73ecf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c930b32d84f5c55d89b9459… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 9 11:55:00 2008 +0200 make_makefiles: Add rules for cross-compiling all import libs from the dlls directory. --- dlls/Makefile.in | 680 ++++++++++++++++++++++++++++++-------------------- tools/make_makefiles | 24 ++- 2 files changed, 431 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26c930b32d84f5c55d89b…

1 0

Alexandre Julliard : make_makefiles: Add more wildcard patterns in . gitignore.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: e9a34e919e0d2d19ce3018c6e33a7f46d6bba52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a34e919e0d2d19ce3018c6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 9 11:53:03 2008 +0200 make_makefiles: Add more wildcard patterns in .gitignore. --- .gitignore | 380 +------------------------------------------------- tools/make_makefiles | 11 +- 2 files changed, 8 insertions(+), 383 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9a34e919e0d2d19ce301…

1 0

Alexandre Julliard : msxml3/tests: Fix test cleanup.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 33128dbb2291f9b70c5561bd8e04fb15d9c2444a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33128dbb2291f9b70c5561bd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 9 11:46:44 2008 +0200 msxml3/tests: Fix test cleanup. --- dlls/msxml3/tests/domdoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 08b8476..f914e09 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3306,6 +3306,7 @@ static void test_DocumentSaveToFile(void) ok(read != 0, "could not read file\n"); ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); + CloseHandle(file); DeleteFile("test.xml"); }

1 0

Daniel Remenak : shell32: Fix crash regression in browse for folder dialog.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 806385248a5695f448b387baf3145ea3ecd3dd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=806385248a5695f448b387baf… Author: Daniel Remenak <DanielR(a)gibbscam.com> Date: Tue Jul 8 17:49:13 2008 -0700 shell32: Fix crash regression in browse for folder dialog. --- dlls/shell32/brsfolder.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index dd04d93..91e8cc3 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -605,6 +605,10 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) info->szMin.cx = rcWnd.right - rcWnd.left; info->szMin.cy = rcWnd.bottom - rcWnd.top; } + else + { + info->layout = NULL; + } if (lpBrowseInfo->lpszTitle) SetWindowTextW( GetDlgItem(hWnd, IDD_TITLE), lpBrowseInfo->lpszTitle );

1 0